From 61b24483a71d048b0c3b99b335d3071f5daaccdb Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Tue, 15 Apr 2025 09:38:02 +0100
Subject: [PATCH 001/413] Deploy to new node

Our production node has been replaced; `fizzy-app-101` is the new one.
---
 config/deploy.production.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/deploy.production.yml b/config/deploy.production.yml
index 4359af231..38cc04500 100644
--- a/config/deploy.production.yml
+++ b/config/deploy.production.yml
@@ -1,10 +1,10 @@
 servers:
   web:
     hosts:
-      - once-fizzy-101
+      - fizzy-app-101
   jobs:
     hosts:
-      - once-fizzy-101
+      - fizzy-app-101
 
 proxy:
   hosts:

From 7e5f71fedd0eaf9631051b028d2042039a33d741 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 15:17:30 +0200
Subject: [PATCH 002/413] We will only have one account record per account

Not sure why this was added in the first place.
---
 ...250415131630_remove_accounts_name_index.rb |   5 +
 db/schema.rb                                  |   3 +-
 db/schema_cache.yml                           | 352 +++++++++---------
 3 files changed, 174 insertions(+), 186 deletions(-)
 create mode 100644 db/migrate/20250415131630_remove_accounts_name_index.rb

diff --git a/db/migrate/20250415131630_remove_accounts_name_index.rb b/db/migrate/20250415131630_remove_accounts_name_index.rb
new file mode 100644
index 000000000..bb5921619
--- /dev/null
+++ b/db/migrate/20250415131630_remove_accounts_name_index.rb
@@ -0,0 +1,5 @@
+class RemoveAccountsNameIndex < ActiveRecord::Migration[8.1]
+  def change
+    remove_index :accounts, :name
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 51aa255e4..b4fada365 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_12_170620) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_15_131630) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -28,7 +28,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_12_170620) do
     t.string "name", null: false
     t.datetime "updated_at", null: false
     t.index ["join_code"], name: "index_accounts_on_join_code", unique: true
-    t.index ["name"], name: "index_accounts_on_name", unique: true
   end
 
   create_table "action_text_markdowns", force: :cascade do |t|
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 951138801..dbe786903 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -50,26 +50,6 @@ columns:
     default_function:
     collation:
     comment:
-  - &9 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: updated_at
-    cast_type: *3
-    sql_type_metadata: *4
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: user_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: involvement
@@ -90,6 +70,26 @@ columns:
     default_function:
     collation:
     comment:
+  - &9 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: updated_at
+    cast_type: *3
+    sql_type_metadata: *4
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: user_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   accounts:
   - *5
   - *6
@@ -443,6 +443,16 @@ columns:
     default_function:
     collation:
     comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: last_active_at
+    cast_type: *3
+    sql_type_metadata: *4
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: stage_id
@@ -474,18 +484,9 @@ columns:
     collation:
     comment:
   - *9
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: last_active_at
-    cast_type: *3
-    sql_type_metadata: *4
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   closure_reasons:
   - *5
+  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: label
@@ -496,12 +497,21 @@ columns:
     default_function:
     collation:
     comment:
-  - *6
   - *9
   closures:
   - *5
   - *21
   - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: reason
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
@@ -513,16 +523,6 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: reason
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   collections:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -906,6 +906,16 @@ columns:
     comment:
   workflow_stages:
   - *5
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: color
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   - *6
   - *10
   - *9
@@ -919,16 +929,6 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: color
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   workflows:
   - *5
   - *6
@@ -1012,10 +1012,9 @@ indexes:
   accesses:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_collection_id_and_user_id
-    unique: true
+    name: index_accesses_on_user_id
+    unique: false
     columns:
-    - collection_id
     - user_id
     lengths: {}
     orders: {}
@@ -1045,9 +1044,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_user_id
-    unique: false
+    name: index_accesses_on_collection_id_and_user_id
+    unique: true
     columns:
+    - collection_id
     - user_id
     lengths: {}
     orders: {}
@@ -1060,22 +1060,6 @@ indexes:
     comment:
     valid: true
   accounts:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: accounts
-    name: index_accounts_on_name
-    unique: true
-    columns:
-    - name
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accounts
     name: index_accounts_on_join_code
@@ -1267,10 +1251,9 @@ indexes:
   assignments:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assignments
-    name: index_assignments_on_assignee_id_and_card_id
-    unique: true
+    name: index_assignments_on_card_id
+    unique: false
     columns:
-    - assignee_id
     - card_id
     lengths: {}
     orders: {}
@@ -1284,9 +1267,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assignments
-    name: index_assignments_on_card_id
-    unique: false
+    name: index_assignments_on_assignee_id_and_card_id
+    unique: true
     columns:
+    - assignee_id
     - card_id
     lengths: {}
     orders: {}
@@ -1333,38 +1317,6 @@ indexes:
     comment:
     valid: true
   cards:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: cards
-    name: index_cards_on_collection_id
-    unique: false
-    columns:
-    - collection_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: cards
-    name: index_cards_on_activity_score_order
-    unique: false
-    columns:
-    - activity_score_order
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: cards
     name: index_cards_on_stage_id
@@ -1398,15 +1350,46 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: cards
+    name: index_cards_on_collection_id
+    unique: false
+    columns:
+    - collection_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: cards
+    name: index_cards_on_activity_score_order
+    unique: false
+    columns:
+    - activity_score_order
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   closure_reasons: []
   closures:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: closures
-    name: index_closures_on_card_id_and_created_at
+    name: index_closures_on_user_id
     unique: false
     columns:
-    - card_id
-    - created_at
+    - user_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1435,10 +1418,11 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: closures
-    name: index_closures_on_user_id
+    name: index_closures_on_card_id_and_created_at
     unique: false
     columns:
-    - user_id
+    - card_id
+    - created_at
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1450,22 +1434,6 @@ indexes:
     comment:
     valid: true
   collections:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: collections
-    name: index_collections_on_creator_id
-    unique: false
-    columns:
-    - creator_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: collections
     name: index_collections_on_workflow_id
@@ -1482,13 +1450,29 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: collections
+    name: index_collections_on_creator_id
+    unique: false
+    columns:
+    - creator_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   collections_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: collections_filters
-    name: index_collections_filters_on_collection_id
+    name: index_collections_filters_on_filter_id
     unique: false
     columns:
-    - collection_id
+    - filter_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1501,10 +1485,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: collections_filters
-    name: index_collections_filters_on_filter_id
+    name: index_collections_filters_on_collection_id
     unique: false
     columns:
-    - filter_id
+    - collection_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1551,22 +1535,6 @@ indexes:
     valid: true
   event_summaries: []
   events:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: events
-    name: index_events_on_card_id
-    unique: false
-    columns:
-    - card_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: events
     name: index_events_on_summary_id_and_action
@@ -1600,6 +1568,22 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: events
+    name: index_events_on_card_id
+    unique: false
+    columns:
+    - card_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: filters
@@ -1685,22 +1669,6 @@ indexes:
     comment:
     valid: true
   messages:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: messages
-    name: index_messages_on_card_id
-    unique: false
-    columns:
-    - card_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: messages
     name: index_messages_on_messageable
@@ -1718,10 +1686,9 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  notifications:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: notifications
-    name: index_notifications_on_card_id
+    table: messages
+    name: index_messages_on_card_id
     unique: false
     columns:
     - card_id
@@ -1735,6 +1702,7 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  notifications:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
     name: index_notifications_on_user_id
@@ -1804,13 +1772,28 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: notifications
+    name: index_notifications_on_card_id
+    unique: false
+    columns:
+    - card_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   pins:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: pins
-    name: index_pins_on_card_id_and_user_id
-    unique: true
+    name: index_pins_on_user_id
+    unique: false
     columns:
-    - card_id
     - user_id
     lengths: {}
     orders: {}
@@ -1840,9 +1823,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: pins
-    name: index_pins_on_user_id
-    unique: false
+    name: index_pins_on_card_id_and_user_id
+    unique: true
     columns:
+    - card_id
     - user_id
     lengths: {}
     orders: {}
@@ -1908,10 +1892,9 @@ indexes:
   taggings:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: taggings
-    name: index_taggings_on_card_id_and_tag_id
-    unique: true
+    name: index_taggings_on_tag_id
+    unique: false
     columns:
-    - card_id
     - tag_id
     lengths: {}
     orders: {}
@@ -1925,9 +1908,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: taggings
-    name: index_taggings_on_tag_id
-    unique: false
+    name: index_taggings_on_card_id_and_tag_id
+    unique: true
     columns:
+    - card_id
     - tag_id
     lengths: {}
     orders: {}
@@ -1976,10 +1960,10 @@ indexes:
   watches:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: watches
-    name: index_watches_on_card_id
+    name: index_watches_on_user_id
     unique: false
     columns:
-    - card_id
+    - user_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1992,10 +1976,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: watches
-    name: index_watches_on_user_id
+    name: index_watches_on_card_id
     unique: false
     columns:
-    - user_id
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -2024,4 +2008,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250412170620
+version: 20250415131630

From 2ace519d9119d42434aed27f6592c12c87f623ec Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 15:35:10 +0200
Subject: [PATCH 003/413] There is only one account, so just check join code
 directly

---
 app/controllers/users_controller.rb | 6 +++---
 app/views/users/new.html.erb        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4069e5aaa..39ce73313 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,7 +2,7 @@ class UsersController < ApplicationController
   require_unauthenticated_access only: %i[ new create ]
 
   before_action :set_user, only: %i[ show edit update destroy ]
-  before_action :set_account_from_join_code, only: %i[ new create ]
+  before_action :ensure_join_code_is_valid, only: %i[ new create ]
   before_action :ensure_permission_to_administer_user, only:  %i[ update destroy ]
 
   def index
@@ -36,8 +36,8 @@ class UsersController < ApplicationController
   end
 
   private
-    def set_account_from_join_code
-      @account = Account.find_by_join_code!(params[:join_code])
+    def ensure_join_code_is_valid
+      head :forbidden unless Account.sole.join_code == params[:join_code]
     end
 
     def set_user
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index fa9ca8312..40f078bdc 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -11,7 +11,7 @@
 <div class="panel shadow center">
   <h1 class="margin-none-block-start margin-block-end-double">Fizzy</h1>
 
-  <%= form_with model: @user, url: join_path(@account.join_code), class: "flex flex-column gap" do |form| %>
+  <%= form_with model: @user, url: join_path(params[:join_code]), class: "flex flex-column gap" do |form| %>
     <div class="flex align-center gap">
       <label class="flex align-center gap input input--actor">
         <%= form.text_field :name, class: "input full-width", autocomplete: "name", placeholder: "Name", autofocus: true, required: true, data: { "1p-ignore": true } %>

From abd2af3d8a90b627659606a1ef0f245bdf4f39c7 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 15:35:28 +0200
Subject: [PATCH 004/413] Dont need an index for a single record

---
 ...5131804_remove_accounts_join_code_index.rb |  5 +++++
 db/schema.rb                                  |  3 +--
 db/schema_cache.yml                           | 20 ++-----------------
 3 files changed, 8 insertions(+), 20 deletions(-)
 create mode 100644 db/migrate/20250415131804_remove_accounts_join_code_index.rb

diff --git a/db/migrate/20250415131804_remove_accounts_join_code_index.rb b/db/migrate/20250415131804_remove_accounts_join_code_index.rb
new file mode 100644
index 000000000..30a312211
--- /dev/null
+++ b/db/migrate/20250415131804_remove_accounts_join_code_index.rb
@@ -0,0 +1,5 @@
+class RemoveAccountsJoinCodeIndex < ActiveRecord::Migration[8.1]
+  def change
+    remove_index :accounts, :join_code
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b4fada365..06a8eb245 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_15_131630) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_15_131804) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -27,7 +27,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_15_131630) do
     t.string "join_code"
     t.string "name", null: false
     t.datetime "updated_at", null: false
-    t.index ["join_code"], name: "index_accounts_on_join_code", unique: true
   end
 
   create_table "action_text_markdowns", force: :cascade do |t|
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index dbe786903..f662880fe 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -1059,23 +1059,7 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  accounts:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: accounts
-    name: index_accounts_on_join_code
-    unique: true
-    columns:
-    - join_code
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
+  accounts: []
   action_text_markdowns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: action_text_markdowns
@@ -2008,4 +1992,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250415131630
+version: 20250415131804

From af0a42080b8ddc667d1e026839b0068b9590d633 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 15:35:39 +0200
Subject: [PATCH 005/413] Allow users to edit themselves

---
 app/models/user/role.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user/role.rb b/app/models/user/role.rb
index 1b5648679..9a3da7432 100644
--- a/app/models/user/role.rb
+++ b/app/models/user/role.rb
@@ -16,6 +16,6 @@ module User::Role
   end
 
   def can_administer?(other)
-    admin? && other != self
+    admin? || other == self
   end
 end

From 2e8df456805597eb07135915b7115a2cd5ca4b25 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 15:36:11 +0200
Subject: [PATCH 006/413] Flesh out tests for users controller

---
 test/controllers/users_controller_test.rb | 27 ++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 3b914ea23..e85a9a2b1 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -1,15 +1,36 @@
 require "test_helper"
 
 class UsersControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
+  test "new" do
+    get new_user_path(params: { join_code: "bad" })
+    assert_response :forbidden
+
+    get new_user_path(params: { join_code: accounts(:"37s").join_code })
+    assert_response :ok
+  end
+
+  test "create" do
+    assert_difference -> { User.active.count }, +1 do
+      post users_path(params: { join_code: accounts(:"37s").join_code }),
+        params: { user: { name: "Dash", email_address: "dash@example.com", password: "123" } } 
+      assert_redirected_to root_path
+    end
+
+    follow_redirect!
+    assert_response :ok
   end
 
   test "update" do
-    assert true
+    sign_in_as :kevin
+
+    put user_path(users(:kevin)), params: { user: { name: "New Kevin" } }
+    assert_redirected_to user_path(users(:kevin))
+    assert_equal "New Kevin", users(:kevin).reload.name
   end
 
   test "destroy" do
+    sign_in_as :kevin
+
     assert_difference -> { User.active.count }, -1 do
       delete user_path(users(:david))
     end

From 93178636cd39e1ae5237ce74e70064cdbed6f8e2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 15:41:01 +0200
Subject: [PATCH 007/413] Flesh out all the tests

---
 test/controllers/users_controller_test.rb | 31 ++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index e85a9a2b1..3efbe0489 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -1,6 +1,14 @@
 require "test_helper"
 
 class UsersControllerTest < ActionDispatch::IntegrationTest
+  test "index" do
+    sign_in_as :kevin
+
+    get users_path
+    assert_match /#{users(:david).name}/, @response.body 
+    assert_match /#{users(:kevin).name}/, @response.body 
+  end
+
   test "new" do
     get new_user_path(params: { join_code: "bad" })
     assert_response :forbidden
@@ -20,14 +28,35 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_response :ok
   end
 
-  test "update" do
+  test "show" do
     sign_in_as :kevin
 
+    get user_path(users(:david))
+    assert_match /#{users(:david).name}/, @response.body 
+  end
+
+  test "update oneself" do
+    sign_in_as :kevin
+
+    get edit_user_path(users(:kevin))
+    assert_response :ok
+
     put user_path(users(:kevin)), params: { user: { name: "New Kevin" } }
     assert_redirected_to user_path(users(:kevin))
     assert_equal "New Kevin", users(:kevin).reload.name
   end
 
+  test "update other as admin" do
+    sign_in_as :kevin
+
+    get edit_user_path(users(:david))
+    assert_response :ok
+
+    put user_path(users(:david)), params: { user: { name: "New David" } }
+    assert_redirected_to user_path(users(:david))
+    assert_equal "New David", users(:david).reload.name
+  end
+
   test "destroy" do
     sign_in_as :kevin
 

From a6a96fd5c87ebc859e90896b462ef296ff9a0346 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 15:55:29 +0200
Subject: [PATCH 008/413] Dont repeat the same checks from doing, make it
 clearer where the difference is

---
 app/models/card/engageable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/card/engageable.rb b/app/models/card/engageable.rb
index f811b639a..58138df6a 100644
--- a/app/models/card/engageable.rb
+++ b/app/models/card/engageable.rb
@@ -29,7 +29,7 @@ module Card::Engageable
   end
 
   def considering?
-    active? && published? && !doing?
+    active? && published? && engagement.blank?
   end
 
   def engage

From 680611503d8eef6570a9f6e2ed243517afd8429d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 16:00:29 +0200
Subject: [PATCH 009/413] Distinguish between administering and just changing

---
 app/controllers/users_controller.rb | 6 +++---
 app/models/user/role.rb             | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 39ce73313..3dfd0d26a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,7 +3,7 @@ class UsersController < ApplicationController
 
   before_action :set_user, only: %i[ show edit update destroy ]
   before_action :ensure_join_code_is_valid, only: %i[ new create ]
-  before_action :ensure_permission_to_administer_user, only:  %i[ update destroy ]
+  before_action :ensure_permission_to_change_user, only:  %i[ update destroy ]
 
   def index
     @users = User.active
@@ -44,8 +44,8 @@ class UsersController < ApplicationController
       @user = User.active.find(params[:id])
     end
 
-    def ensure_permission_to_administer_user
-      head :forbidden unless Current.user.can_administer?(@user)
+    def ensure_permission_to_change_user
+      head :forbidden unless Current.user.can_change?(@user)
     end
 
     def user_params
diff --git a/app/models/user/role.rb b/app/models/user/role.rb
index 9a3da7432..3d2310a1f 100644
--- a/app/models/user/role.rb
+++ b/app/models/user/role.rb
@@ -15,7 +15,11 @@ module User::Role
     end
   end
 
-  def can_administer?(other)
+  def can_change?(other)
     admin? || other == self
   end
+
+  def can_administer?(other)
+    admin? && other != self
+  end
 end

From 5d22809e29c8d9e411f4bb477921367e3d9ce7a4 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 16:03:14 +0200
Subject: [PATCH 010/413] No public use of this concept, so inline it

---
 app/models/user/role.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/user/role.rb b/app/models/user/role.rb
index 3d2310a1f..6f3df1c9c 100644
--- a/app/models/user/role.rb
+++ b/app/models/user/role.rb
@@ -5,8 +5,7 @@ module User::Role
     enum :role, %i[ admin member system ].index_by(&:itself), scopes: false
 
     scope :member, -> { where(role: :member) }
-    scope :without_system, -> { where.not(role: :system) }
-    scope :active, -> { without_system.where(active: true) }
+    scope :active, -> { where(active: true).where.not(role: :system) }
   end
 
   class_methods do

From 8e479dddbaec9d8eef90edce0cde37ebb5259704 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 16:04:11 +0200
Subject: [PATCH 011/413] Clearer still

---
 app/models/user/role.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user/role.rb b/app/models/user/role.rb
index 6f3df1c9c..4a90410b5 100644
--- a/app/models/user/role.rb
+++ b/app/models/user/role.rb
@@ -5,7 +5,7 @@ module User::Role
     enum :role, %i[ admin member system ].index_by(&:itself), scopes: false
 
     scope :member, -> { where(role: :member) }
-    scope :active, -> { where(active: true).where.not(role: :system) }
+    scope :active, -> { where(active: true, role: %i[ admin member ]) }
   end
 
   class_methods do

From f30a9308d2e64eec42fc1fae2722a61b2b6e9de3 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 16:13:54 +0200
Subject: [PATCH 012/413] Line up scopes in order of the flow

---
 app/models/card/engageable.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/card/engageable.rb b/app/models/card/engageable.rb
index 58138df6a..cdb26ca8a 100644
--- a/app/models/card/engageable.rb
+++ b/app/models/card/engageable.rb
@@ -6,10 +6,9 @@ module Card::Engageable
   included do
     has_one :engagement, dependent: :destroy, class_name: "Card::Engagement"
 
-    scope :doing, -> { published.active.joins(:engagement) }
     scope :considering, -> { published_or_drafted_by(Current.user).active.where.missing(:engagement) }
-
-    scope :stagnated, -> { doing.where(last_active_at: ..STAGNATED_AFTER.ago) }
+    scope :doing,       -> { published.active.joins(:engagement) }
+    scope :stagnated,   -> { doing.where(last_active_at: ..STAGNATED_AFTER.ago) }
   end
 
   class_methods do

From b9f5293231585f662a81868884bf2c61403e93cc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 16:15:13 +0200
Subject: [PATCH 013/413] Style

---
 app/models/card/engageable.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/card/engageable.rb b/app/models/card/engageable.rb
index cdb26ca8a..800088f72 100644
--- a/app/models/card/engageable.rb
+++ b/app/models/card/engageable.rb
@@ -13,9 +13,7 @@ module Card::Engageable
 
   class_methods do
     def auto_reconsider_all_stagnated
-      stagnated.find_each do |card|
-        card.reconsider
-      end
+      stagnated.find_each(&:reconsider)
     end
   end
 

From ac65f39c0dc26488ec66288a4a051d8e2e9200fb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 16:32:56 +0200
Subject: [PATCH 014/413] Inline anemic partial

---
 app/views/cards/_publish.html.erb | 3 ---
 app/views/cards/show.html.erb     | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 app/views/cards/_publish.html.erb

diff --git a/app/views/cards/_publish.html.erb b/app/views/cards/_publish.html.erb
deleted file mode 100644
index 1f2199ece..000000000
--- a/app/views/cards/_publish.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= button_to card_publish_path(card), class: "btn txt-small btn--link", style: "--btn-background: #{card.color}" do %>
-  <span>Post to project</span>
-<% end %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index f0151c3ce..f1f2ea95a 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -16,7 +16,10 @@
     <div class="fill-selected position-sticky flex align-center gap-half fill-highlight justify-center border-block margin-block-end"
           style="view-transition-name: draft-banner;">
       This is a draft, it’s only visible to you.
-      <%= render "cards/publish", card: @card %>
+
+      <%= button_to card_publish_path(@card), class: "btn txt-small btn--link", style: "--btn-background: #{@card.color}" do %>
+        <span>Post to project</span>
+      <% end %>
     </div>
   <% end %>
 

From 2ea898324f02cf2ee569ad88187f825717042ad5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 16:36:40 +0200
Subject: [PATCH 015/413] We can just set the namespace directly in the class
 name

---
 app/controllers/notifications/settings_controller.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/controllers/notifications/settings_controller.rb b/app/controllers/notifications/settings_controller.rb
index a94345746..5dbf1a867 100644
--- a/app/controllers/notifications/settings_controller.rb
+++ b/app/controllers/notifications/settings_controller.rb
@@ -1,7 +1,5 @@
-module Notifications
-  class SettingsController < ApplicationController
-    def show
-      @collections = Current.user.collections.alphabetically
-    end
+class Notifications::SettingsController < ApplicationController
+  def show
+    @collections = Current.user.collections.alphabetically
   end
 end

From 73f272f1320b2bc4a654c5cd8a73b789729058ce Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 15 Apr 2025 19:14:50 +0200
Subject: [PATCH 016/413] Use one controller for all notification readings

---
 .../notifications/mark_all_reads_controller.rb | 18 ------------------
 .../notifications/readings_controller.rb       | 14 ++++++++++++++
 app/controllers/notifications_controller.rb    | 10 ----------
 app/helpers/notifications_helper.rb            |  2 +-
 app/views/notifications/_tray.html.erb         |  8 ++++----
 app/views/notifications/index.html.erb         |  9 +++------
 .../create.turbo_stream.erb}                   |  0
 config/routes.rb                               | 18 +++++++-----------
 .../mark_all_reads_controller_test.rb          |  2 +-
 9 files changed, 30 insertions(+), 51 deletions(-)
 delete mode 100644 app/controllers/notifications/mark_all_reads_controller.rb
 create mode 100644 app/controllers/notifications/readings_controller.rb
 rename app/views/notifications/{mark_read.turbo_stream.erb => readings/create.turbo_stream.erb} (100%)

diff --git a/app/controllers/notifications/mark_all_reads_controller.rb b/app/controllers/notifications/mark_all_reads_controller.rb
deleted file mode 100644
index 8b6450515..000000000
--- a/app/controllers/notifications/mark_all_reads_controller.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class Notifications::MarkAllReadsController < ApplicationController
-  def create
-    Current.user.notifications.unread.read_all
-
-    set_page_and_extract_portion_from Current.user.notifications.read.ordered if request.format.turbo_stream?
-
-    Turbo::StreamsChannel.broadcast_update_to(
-      [ Current.user, :notifications ],
-      target: "notifications",
-      html: ""
-    )
-
-    respond_to do |format|
-      format.turbo_stream
-      format.html
-    end
-  end
-end
diff --git a/app/controllers/notifications/readings_controller.rb b/app/controllers/notifications/readings_controller.rb
new file mode 100644
index 000000000..9da4fb827
--- /dev/null
+++ b/app/controllers/notifications/readings_controller.rb
@@ -0,0 +1,14 @@
+class Notifications::ReadingsController < ApplicationController
+  def create
+    @notification = Current.user.notifications.find(params[:id])
+    @notification.update!(read_at: Time.current)
+  end
+
+  def create_all
+    Current.user.notifications.unread.read_all
+
+    set_page_and_extract_portion_from Current.user.notifications.read.ordered if request.format.turbo_stream?
+
+    Turbo::StreamsChannel.broadcast_update_to [ Current.user, :notifications ], target: "notifications", html: ""
+  end
+end
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 403828c2b..83e5db488 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -6,14 +6,4 @@ class NotificationsController < ApplicationController
       @unread = Current.user.notifications.unread.ordered
     end
   end
-
-  def mark_read
-    @notification = Current.user.notifications.find(params[:id])
-    @notification.update!(read_at: Time.current)
-
-    respond_to do |format|
-      format.html { redirect_back fallback_location: notifications_path }
-      format.turbo_stream
-    end
-  end
 end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index ca62626cf..656edad54 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -32,7 +32,7 @@ module NotificationsHelper
   end
 
   def notification_mark_read_button(notification)
-    button_to mark_read_notification_path(notification),
+    button_to read_notification_path(notification),
       class: "notification__unread_indicator btn borderless",
       title: "Mark as read",
       data: { turbo_frame: "_top" } do
diff --git a/app/views/notifications/_tray.html.erb b/app/views/notifications/_tray.html.erb
index 8e12e58f4..390e47054 100644
--- a/app/views/notifications/_tray.html.erb
+++ b/app/views/notifications/_tray.html.erb
@@ -6,7 +6,7 @@
               dialog_modal_value: false, 
               dialog_target: "dialog", 
               action: "keydown.esc->dialog#close:stop click@document->dialog#closeOnClickOutside" } do %>
-  <%= turbo_frame_tag("notifications", src: notifications_tray_path) -%>
+  <%= turbo_frame_tag("notifications", src: tray_notifications_path) -%>
 
   <%= link_to notifications_path, class: "tray__overflow border-radius txt-normal", data: { action: "click->dialog#close"} do %>
     <div class="notification__content border-radius shadow fill-white flex align-center txt-align-center gap full-width border txt-ink txt-small">
@@ -17,9 +17,9 @@
   <% end %>
 
   <div class="tray__actions notification-tray__actions border border-radius">
-    <%= button_to notifications_mark_all_read_path, 
-        class: "notification-tray__read_action btn btn--reversed fill-transparent borderless flex-item-justify-start shadow txt-xx-small", 
-        data: { action: "click->dialog#close", turbo_frame: "notifications" } do %>
+    <%= button_to read_all_notifications_path,
+          class: "notification-tray__read_action btn btn--reversed fill-transparent borderless flex-item-justify-start shadow txt-xx-small", 
+          data: { action: "click->dialog#close", turbo_frame: "notifications" } do %>
       <%= icon_tag "check" %>
       <span class="for-screen-reader">Mark all read</span>
     <% end %>
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index bab485363..806615ce3 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -6,9 +6,8 @@
 
     <h1 class="txt-x-large"><%= @page_title %></h1>
 
-    <%= link_to notifications_settings_path, class: "btn flex-item-justify-end" do %>
-      <%= icon_tag "settings" %>
-      <span class="for-screen-reader">Notification settings</span>
+    <%= link_to settings_notifications_path, class: "btn flex-item-justify-end" do %>
+      <%= icon_tag "settings" %> <span class="for-screen-reader">Notification settings</span>
     <% end %>
   </nav>
 <% end %>
@@ -18,9 +17,7 @@
     <% if @unread.any? %>
       <div class="flex align-center justify-space-between margin-block-start margin-block-end-half">
         <h2 class="txt-medium txt-uppercase txt-alert">New for you</h2>
-        <%= button_to notifications_mark_all_read_path, class: "btn txt-small" do %>
-          Mark all as read
-        <% end %>
+        <%= button_to "Mark all as read", read_all_notifications_path, class: "btn txt-small" %>
       </div>
 
       <%= render @unread %>
diff --git a/app/views/notifications/mark_read.turbo_stream.erb b/app/views/notifications/readings/create.turbo_stream.erb
similarity index 100%
rename from app/views/notifications/mark_read.turbo_stream.erb
rename to app/views/notifications/readings/create.turbo_stream.erb
diff --git a/config/routes.rb b/config/routes.rb
index 6eb05dd50..beeae1a5b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -46,20 +46,16 @@ Rails.application.routes.draw do
   end
 
 
-  resources :notifications, only: :index
-  namespace :notifications do
-    resource :tray, only: :show
-    resource :mark_all_read, only: :create
-    resources :mark_read, only: :create
-    resource :settings, only: :show
-  end
-
   resources :notifications do
-    member do
-      post :mark_read
+    scope module: :notifications do
+      get "tray",     to: "trays#show", on: :collection
+      get "settings", to: "settings#show", on: :collection
+
+      post "readings", to: "readings#create_all", on: :collection, as: :read_all
+      post "reading",  to: "readings#create",     on: :member,     as: :read
     end
   end
-
+ 
   resources :filters
 
   resources :events, only: :index
diff --git a/test/controllers/notifications/mark_all_reads_controller_test.rb b/test/controllers/notifications/mark_all_reads_controller_test.rb
index 2fa423b3a..31ca45a68 100644
--- a/test/controllers/notifications/mark_all_reads_controller_test.rb
+++ b/test/controllers/notifications/mark_all_reads_controller_test.rb
@@ -8,7 +8,7 @@ class Notifications::MarkAllReadsControllerTest < ActionDispatch::IntegrationTes
   test "show" do
     assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
       assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do
-        post notifications_mark_all_read_path
+        post read_all_notifications_path
       end
     end
 

From 375afeac7b186b44e783fb077c5a4a84508cfbcd Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 11:55:35 +0200
Subject: [PATCH 017/413] Fix test

---
 test/controllers/notifications/trays_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/controllers/notifications/trays_controller_test.rb b/test/controllers/notifications/trays_controller_test.rb
index d49455ae1..07034fff0 100644
--- a/test/controllers/notifications/trays_controller_test.rb
+++ b/test/controllers/notifications/trays_controller_test.rb
@@ -6,7 +6,7 @@ class Notifications::TraysControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "show" do
-    get notifications_tray_path
+    get tray_notifications_path
 
     assert_response :success
     assert_select "div", text: /Layout is broken/

From 50e4587dd9ad06febe3aa2046cc6b537a389ee1e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 11:56:21 +0200
Subject: [PATCH 018/413] Fix trailing spaces

---
 config/routes.rb                          | 2 +-
 test/controllers/users_controller_test.rb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index beeae1a5b..61271338a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,7 +55,7 @@ Rails.application.routes.draw do
       post "reading",  to: "readings#create",     on: :member,     as: :read
     end
   end
- 
+
   resources :filters
 
   resources :events, only: :index
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 3efbe0489..ff7ec0f2c 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -5,8 +5,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     sign_in_as :kevin
 
     get users_path
-    assert_match /#{users(:david).name}/, @response.body 
-    assert_match /#{users(:kevin).name}/, @response.body 
+    assert_match /#{users(:david).name}/, @response.body
+    assert_match /#{users(:kevin).name}/, @response.body
   end
 
   test "new" do
@@ -20,7 +20,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   test "create" do
     assert_difference -> { User.active.count }, +1 do
       post users_path(params: { join_code: accounts(:"37s").join_code }),
-        params: { user: { name: "Dash", email_address: "dash@example.com", password: "123" } } 
+        params: { user: { name: "Dash", email_address: "dash@example.com", password: "123" } }
       assert_redirected_to root_path
     end
 
@@ -32,7 +32,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     sign_in_as :kevin
 
     get user_path(users(:david))
-    assert_match /#{users(:david).name}/, @response.body 
+    assert_match /#{users(:david).name}/, @response.body
   end
 
   test "update oneself" do

From 3fc34257c49634a566ddbca80dc2e12c6ff8e814 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 11:59:58 +0200
Subject: [PATCH 019/413] No longer used

---
 .../notifications/mark_all_reads/create.html.erb   |  1 -
 .../mark_all_reads/create.turbo_stream.erb         | 14 --------------
 2 files changed, 15 deletions(-)
 delete mode 100644 app/views/notifications/mark_all_reads/create.html.erb
 delete mode 100644 app/views/notifications/mark_all_reads/create.turbo_stream.erb

diff --git a/app/views/notifications/mark_all_reads/create.html.erb b/app/views/notifications/mark_all_reads/create.html.erb
deleted file mode 100644
index 52d6bcd10..000000000
--- a/app/views/notifications/mark_all_reads/create.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= turbo_frame_tag "notifications" %>
diff --git a/app/views/notifications/mark_all_reads/create.turbo_stream.erb b/app/views/notifications/mark_all_reads/create.turbo_stream.erb
deleted file mode 100644
index 6d8b0f0a6..000000000
--- a/app/views/notifications/mark_all_reads/create.turbo_stream.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= turbo_stream.update "notifications_list" do %>
-  <div class="pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink);">
-    <strong>Nothing new for you.</strong>
-  </div>
-<% end %>
-
-<% if @page&.records&.any? %>
-  <%= turbo_stream.update "notifications_list_read" do %>
-    <h2 class="txt-medium margin-block-start-double margin-block-end-half txt-uppercase translucent">Previously seen</h2>
-    <%= render partial: "notifications/notification", collection: @page.records %>
-  <% end %>
-<% end %>
-
-<%= turbo_stream.update "notifications" %> 
\ No newline at end of file

From 980345d1767b88d69bce53e2143508d4530b6adc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 12:00:11 +0200
Subject: [PATCH 020/413] Drop the frame, we will do it with streams

---
 app/views/notifications/trays/show.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/notifications/trays/show.html.erb b/app/views/notifications/trays/show.html.erb
index 051055670..8d556c9b8 100644
--- a/app/views/notifications/trays/show.html.erb
+++ b/app/views/notifications/trays/show.html.erb
@@ -1,3 +1 @@
-<%= turbo_frame_tag "notifications" do %>
-  <%= render collection: @notifications, partial: "notifications/notification" %>
-<% end %>
+<%= render partial: "notifications/notification", collection: @notifications %>

From 13c44ba6509e3c383435321dc126d4f8bafb245d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 12:00:54 +0200
Subject: [PATCH 021/413] Actually need it for the lazy load of course

---
 app/views/notifications/trays/show.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/notifications/trays/show.html.erb b/app/views/notifications/trays/show.html.erb
index 8d556c9b8..1e131caf6 100644
--- a/app/views/notifications/trays/show.html.erb
+++ b/app/views/notifications/trays/show.html.erb
@@ -1 +1,3 @@
-<%= render partial: "notifications/notification", collection: @notifications %>
+<%= turbo_frame_tag "notifications" do %>
+  <%= render partial: "notifications/notification", collection: @notifications %>
+<% end %>

From d00a0433e9cbdb389a69c0b2c686c603a4cd8502 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 15:34:28 +0200
Subject: [PATCH 022/413] Inline anemic method

---
 app/controllers/cards/readings_controller.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/controllers/cards/readings_controller.rb b/app/controllers/cards/readings_controller.rb
index 669d959d8..dbb379b15 100644
--- a/app/controllers/cards/readings_controller.rb
+++ b/app/controllers/cards/readings_controller.rb
@@ -2,12 +2,7 @@ class Cards::ReadingsController < ApplicationController
   include CardScoped
 
   def create
-    mark_card_notifications_read
+    Current.user.notifications.unread.where(card: @card).read_all
     @notifications = Current.user.notifications.unread.ordered.limit(20)
   end
-
-  private
-    def mark_card_notifications_read
-      Current.user.notifications.unread.where(card: @card).read_all
-    end
 end

From f9952e0fd6e6be54672144dee06aa69bc81347cc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 15:52:02 +0200
Subject: [PATCH 023/413] Style

---
 app/views/notifications/_tray.html.erb | 27 ++++++++++----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/views/notifications/_tray.html.erb b/app/views/notifications/_tray.html.erb
index 390e47054..9b3c55867 100644
--- a/app/views/notifications/_tray.html.erb
+++ b/app/views/notifications/_tray.html.erb
@@ -1,14 +1,11 @@
 <%= turbo_stream_from Current.user, :notifications %>
 
-<%= tag.dialog id: "notification-tray", class: "tray notification-tray",
-      data: { controller: "dialog", 
-              turbo_permanent: true, 
-              dialog_modal_value: false, 
-              dialog_target: "dialog", 
-              action: "keydown.esc->dialog#close:stop click@document->dialog#closeOnClickOutside" } do %>
-  <%= turbo_frame_tag("notifications", src: tray_notifications_path) -%>
+<dialog class="tray notification-tray"
+    data-controller="dialog" data-dialog-modal-value="false" data-dialog-target="dialog"
+    data-action="keydown.esc->dialog#close:stop click@document->dialog#closeOnClickOutside">
+  <%= turbo_frame_tag "notifications", src: tray_notifications_path %>
 
-  <%= link_to notifications_path, class: "tray__overflow border-radius txt-normal", data: { action: "click->dialog#close"} do %>
+  <%= link_to notifications_path, class: "tray__overflow border-radius txt-normal", data: { action: "click->dialog#close" } do %>
     <div class="notification__content border-radius shadow fill-white flex align-center txt-align-center gap full-width border txt-ink txt-small">
       <div class="flex flex-column txt-tight-lines min-width flex-item-grow">
         <strong>+ More…</strong>
@@ -20,19 +17,15 @@
     <%= button_to read_all_notifications_path,
           class: "notification-tray__read_action btn btn--reversed fill-transparent borderless flex-item-justify-start shadow txt-xx-small", 
           data: { action: "click->dialog#close", turbo_frame: "notifications" } do %>
-      <%= icon_tag "check" %>
-      <span class="for-screen-reader">Mark all read</span>
+      <%= icon_tag "check" %> <span class="for-screen-reader">Mark all read</span>
     <% end %>
 
-    <%= link_to notifications_path, 
+    <%= link_to tag.span("Notifications"), notifications_path,
           class: "btn btn--reversed borderless fill-transparent translucent shadow center txt-uppercase txt-x-small", 
-          data: { action: "click->dialog#close"} do %>
-      <span>Notifications</span>
-    <% end %>
+          data: { action: "click->dialog#close" } %>
 
     <span class="btn btn--placeholder txt-xx-small borderless"></span>
   </div>
 
-  <button class="tray__expander" data-action="dialog#toggle" aria-label="Expand notifications stack">
-  </button>
-<% end %>
+  <button class="tray__expander" data-action="dialog#toggle" aria-label="Expand notifications stack"></button>
+</dialog>

From 5932bf931674344a2ea4295ec47dbad16b49e4c9 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:21:16 +0200
Subject: [PATCH 024/413] This is rare enough that a redirect is fine

---
 app/controllers/notifications/readings_controller.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/controllers/notifications/readings_controller.rb b/app/controllers/notifications/readings_controller.rb
index 9da4fb827..3c1c47c1a 100644
--- a/app/controllers/notifications/readings_controller.rb
+++ b/app/controllers/notifications/readings_controller.rb
@@ -6,9 +6,6 @@ class Notifications::ReadingsController < ApplicationController
 
   def create_all
     Current.user.notifications.unread.read_all
-
-    set_page_and_extract_portion_from Current.user.notifications.read.ordered if request.format.turbo_stream?
-
-    Turbo::StreamsChannel.broadcast_update_to [ Current.user, :notifications ], target: "notifications", html: ""
+    redirect_to notifications_path
   end
 end

From 8ff71b265078ff96795be506ddf9f1c9ea7606d1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:21:31 +0200
Subject: [PATCH 025/413] Dont turbo stream when coming from a read_all
 redirect

---
 app/controllers/notifications_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 83e5db488..cbce6a92d 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -5,5 +5,10 @@ class NotificationsController < ApplicationController
     if @page.first?
       @unread = Current.user.notifications.unread.ordered
     end
+
+    respond_to do |format|
+      format.turbo_stream if current_page_param
+      format.html
+    end
   end
 end

From 397fc1d2bd012e8100fe3e1c0f6ceadda752c8b3 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:21:54 +0200
Subject: [PATCH 026/413] Only broadcast creations

---
 app/models/notification.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 3980c3d8d..d4ea87a95 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -9,16 +9,18 @@ class Notification < ApplicationRecord
   scope :ordered, -> { order(read_at: :desc, created_at: :desc) }
 
   delegate :creator, to: :event
+  after_create_commit :broadcast
 
-  broadcasts_to ->(notification) { [ notification.user, :notifications ] }, inserts_by: :prepend
-
-  class << self
-    def read_all
-      update!(read_at: Time.current)
-    end
+  def self.read_all
+    update!(read_at: Time.current)
   end
 
   def read?
     read_at.present?
   end
+
+  private
+    def broadcast
+      broadcast_prepend_to user, :notifications, target: "notifications"
+    end
 end

From 158b694d311957905cd21b01a22d10a537f16cc8 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:22:36 +0200
Subject: [PATCH 027/413] Simplify the containers

Need to use CSS to hide headings in empty containers
---
 app/views/notifications/index.html.erb        | 39 ++++++++++---------
 .../readings/create.turbo_stream.erb          |  9 +----
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 806615ce3..a4b441323 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -1,4 +1,5 @@
 <% @page_title = "Notifications" %>
+<% @hide_footer_frames = true %>
 
 <% content_for :header do %>
   <nav class="align-start">
@@ -13,27 +14,27 @@
 <% end %>
 
 <section class="panel center borderless unpad flex flex-column gap-half">
-  <%= turbo_frame_tag "notifications_list" do %>
-    <% if @unread.any? %>
-      <div class="flex align-center justify-space-between margin-block-start margin-block-end-half">
-        <h2 class="txt-medium txt-uppercase txt-alert">New for you</h2>
-        <%= button_to "Mark all as read", read_all_notifications_path, class: "btn txt-small" %>
-      </div>
+  <% if @unread.any? %>
+    <div class="flex align-center justify-space-between margin-block-start margin-block-end-half">
+      <h2 class="txt-medium txt-uppercase txt-alert">New for you</h2>
+      <%= button_to "Mark all as read", read_all_notifications_path, class: "btn txt-small" %>
+    </div>
 
-      <%= render @unread %>
-    <% else %>
-      <div class="pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink); --border-radius: 0.2em;">
-        <strong>Nothing new for you.</strong>
-      </div>
-    <% end %>
+    <%= render @unread %>
+  <% else %>
+    <div class="pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink); --border-radius: 0.2em;">
+      <strong>Nothing new for you.</strong>
+    </div>
   <% end %>
 </section>
 
-<% if @page.records.any? %>
-  <section id="notifications_list_read" class="notificiations-list--read panel center borderless unpad flex flex-column gap-half margin-block-start">
-    <h2 class="txt-medium margin-block-start-double margin-block-end-half txt-uppercase translucent">Previously seen</h2>
-    <%= render @page.records %>
-  </section>
+<%# FIXME: Need to hide this section if there are no notification records in it, but then it needs to appear when any are added %>
+<section class="notificiations-list--read panel center borderless unpad flex flex-column gap-half margin-block-start">
+  <h2 class="txt-medium margin-block-start-double margin-block-end-half txt-uppercase translucent">Previously seen</h2>
 
-  <%= notifications_next_page_link(@page) %>
-<% end %>
+  <div id="notifications_list_read">
+    <%= render @page.records %>
+  </div>
+</section>
+
+<%= notifications_next_page_link(@page) if @page.records.any? %>
diff --git a/app/views/notifications/readings/create.turbo_stream.erb b/app/views/notifications/readings/create.turbo_stream.erb
index 78996e2d3..44bf1e545 100644
--- a/app/views/notifications/readings/create.turbo_stream.erb
+++ b/app/views/notifications/readings/create.turbo_stream.erb
@@ -1,9 +1,2 @@
 <%= turbo_stream.remove @notification %>
-
-<% if Current.user.notifications.unread.none? %>
-  <%= turbo_stream.update "notifications_list" do %>
-    <div class="pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink);">
-      <strong>Nothing new for you.</strong>
-    </div>
-  <% end %>
-<% end %> 
\ No newline at end of file
+<%= turbo_stream.prepend :notifications_list_read, partial: "notifications/notification", locals: { notification: @notification } %>

From ac3307ee230babd9e52ae620bdc4ef199782d822 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:23:05 +0200
Subject: [PATCH 028/413] Allow for the footer frames to be hidden on the
 notifications page

Otherwise you will have multiple notification dom elements with the same
id.
---
 app/views/layouts/application.html.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e886c519f..fd857fafe 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -46,10 +46,12 @@
     <footer id="footer">
       <%= yield :footer %>
 
-      <% if Current.user %>
-        <%= render "notifications/tray" %>
-        <%= render "my/pins/tray" %>
-        <%= turbo_frame_tag "terminal", src: terminal_path, data: { turbo_permanent: true } %>
+      <% if Current.user && !@hide_footer_frames %>
+        <div id="footer_frames" data-turbo-permanent="true">
+          <%= render "notifications/tray" %>
+          <%= render "my/pins/tray" %>
+          <%= turbo_frame_tag "terminal", src: terminal_path %>
+        </div>
       <% end %>
     </footer>
 

From 91194d1b66556b82646c57819dfd4abb49c5ea09 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:37:06 +0200
Subject: [PATCH 029/413] Fixed up controller test

---
 .../mark_all_reads_controller_test.rb         | 17 --------------
 .../notifications/readings_controller_test.rb | 23 +++++++++++++++++++
 2 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 test/controllers/notifications/mark_all_reads_controller_test.rb
 create mode 100644 test/controllers/notifications/readings_controller_test.rb

diff --git a/test/controllers/notifications/mark_all_reads_controller_test.rb b/test/controllers/notifications/mark_all_reads_controller_test.rb
deleted file mode 100644
index 31ca45a68..000000000
--- a/test/controllers/notifications/mark_all_reads_controller_test.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "test_helper"
-
-class Notifications::MarkAllReadsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "show" do
-    assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
-      assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do
-        post read_all_notifications_path
-      end
-    end
-
-    assert_response :success
-  end
-end
diff --git a/test/controllers/notifications/readings_controller_test.rb b/test/controllers/notifications/readings_controller_test.rb
new file mode 100644
index 000000000..75a8a4875
--- /dev/null
+++ b/test/controllers/notifications/readings_controller_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class Notifications::ReadingsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "create" do
+    assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+      post read_notification_path(notifications(:logo_published_kevin), format: :turbo_stream)
+      assert_response :success
+    end
+  end
+
+  test "create all" do
+    assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+      assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do
+        post read_all_notifications_path
+        assert_redirected_to notifications_path
+      end
+    end
+  end
+end

From 4bb9085737cecf1b7ad6bfc17ab97a0790363f99 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:41:22 +0200
Subject: [PATCH 030/413] Hide implementation detail of reading

---
 app/controllers/notifications/readings_controller.rb | 2 +-
 app/models/notification.rb                           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/notifications/readings_controller.rb b/app/controllers/notifications/readings_controller.rb
index 3c1c47c1a..5f593fa95 100644
--- a/app/controllers/notifications/readings_controller.rb
+++ b/app/controllers/notifications/readings_controller.rb
@@ -1,7 +1,7 @@
 class Notifications::ReadingsController < ApplicationController
   def create
     @notification = Current.user.notifications.find(params[:id])
-    @notification.update!(read_at: Time.current)
+    @notification.read
   end
 
   def create_all
diff --git a/app/models/notification.rb b/app/models/notification.rb
index d4ea87a95..617b2c0d4 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -15,6 +15,10 @@ class Notification < ApplicationRecord
     update!(read_at: Time.current)
   end
 
+  def read
+    update!(read_at: Time.current)
+  end
+
   def read?
     read_at.present?
   end

From 134e7f5d6e007fb95ff5cf77e67ae3d5a8df6d17 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 09:41:48 -0500
Subject: [PATCH 031/413] No longer used

---
 app/views/cards/_date.html.erb | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 app/views/cards/_date.html.erb

diff --git a/app/views/cards/_date.html.erb b/app/views/cards/_date.html.erb
deleted file mode 100644
index cc19afe32..000000000
--- a/app/views/cards/_date.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if card.due_on.present? %>
-  <%= form_with model: card, url: collection_card_path(card.collection, card), data: { controller: "form" } do |form| %>
-    <label class="card__detail card__date">
-      <span class="for-screen-reader">Change the due date</span>
-      <span class="card__date-text"><%= html_escape card.due_on.strftime("%b <br> %d").html_safe %></span>
-      <%= form.date_field :due_on, class: "input input--hidden", data: { action: "change->form#submit click->form#showPicker" } %>
-    </label>
-  <% end %>
-<% end %>

From 98401b95360aa125bf934f4585b1a759cca0d105 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:44:04 +0200
Subject: [PATCH 032/413] Explain this

---
 app/controllers/notifications_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index cbce6a92d..8471b20c0 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -7,7 +7,7 @@ class NotificationsController < ApplicationController
     end
 
     respond_to do |format|
-      format.turbo_stream if current_page_param
+      format.turbo_stream if current_page_param # Allows read-all action to side step pagination
       format.html
     end
   end

From 2757cd8e62b0f37fe5d9f3b51e9f4dd976207d9d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:49:16 +0200
Subject: [PATCH 033/413] Dont render inline

---
 app/models/notification.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 617b2c0d4..e6a32ef3c 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -25,6 +25,6 @@ class Notification < ApplicationRecord
 
   private
     def broadcast
-      broadcast_prepend_to user, :notifications, target: "notifications"
+      broadcast_prepend_later_to user, :notifications, target: "notifications"
     end
 end

From 6135909b7e7b34ffdc7430a8b609c1b561085ba4 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:51:18 +0200
Subject: [PATCH 034/413] Card readings just need to remove the notification

No need to broadcast everything again
---
 app/controllers/cards/readings_controller.rb     | 4 ++--
 app/views/cards/readings/create.turbo_stream.erb | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/controllers/cards/readings_controller.rb b/app/controllers/cards/readings_controller.rb
index dbb379b15..bbc4d53c0 100644
--- a/app/controllers/cards/readings_controller.rb
+++ b/app/controllers/cards/readings_controller.rb
@@ -2,7 +2,7 @@ class Cards::ReadingsController < ApplicationController
   include CardScoped
 
   def create
-    Current.user.notifications.unread.where(card: @card).read_all
-    @notifications = Current.user.notifications.unread.ordered.limit(20)
+    @notification = Current.user.notifications.find_by(card: @card)
+    @notification.read
   end
 end
diff --git a/app/views/cards/readings/create.turbo_stream.erb b/app/views/cards/readings/create.turbo_stream.erb
index 8f758752e..1f3b07b47 100644
--- a/app/views/cards/readings/create.turbo_stream.erb
+++ b/app/views/cards/readings/create.turbo_stream.erb
@@ -1,3 +1 @@
-<%= turbo_stream.update "notifications" do %>
-  <%= render collection: @notifications, partial: "notifications/notification" %>
-<% end %>
+<%= turbo_stream.remove @notification %>

From 78fb19789cd0ad73ea2733a855a6f0d403d56d72 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 09:55:41 -0500
Subject: [PATCH 035/413] Clearer assignment icon

---
 app/assets/images/person-add.svg                   | 1 +
 app/assets/stylesheets/icons.css                   | 1 +
 app/views/cards/display/common/_assignees.html.erb | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/images/person-add.svg

diff --git a/app/assets/images/person-add.svg b/app/assets/images/person-add.svg
new file mode 100644
index 000000000..9c8e13b8c
--- /dev/null
+++ b/app/assets/images/person-add.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m23.1 12.9h-3v3c0 .5-.4.9-.9.9s-.9-.4-.9-.9v-3h-3c-.5 0-.9-.4-.9-.9s.4-.9.9-.9h3v-3c0-.5.4-.9.9-.9s.9.4.9.9v3s3 0 3 0c.5 0 .9.4.9.9s-.4.9-.9.9zm-7.6 8.2h-15c-.3 0-.5-.2-.5-.5.1-2.1 1.1-2.6 3.2-3.4 2-.7 2.6-1.5 2.8-3.3-.3-.2-.6-.5-.9-.8-.5-.6-.8-1.4-.9-2.1-.5 0-.9-1.1-.9-1.8s.3-1 .5-1 0 0 .1 0c-.1-.5-.2-1-.2-1.4 0-2.6 1.1-4.1 4.3-4.1s1.7.4 2 .9c.2-.1.4-.2.6-.2.8 0 1.8 1 1.8 3.3 0 .5 0 1-.2 1.4h.1c.2 0 .5.2.5 1s-.4 1.8-.9 1.8c0 .8-.4 1.5-.9 2.1-.3.3-.6.5-.9.8.1 1.8.8 2.5 2.8 3.3 2.1.8 3 1.3 3.2 3.4 0 .3-.2.5-.5.5z" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/assets/stylesheets/icons.css b/app/assets/stylesheets/icons.css
index 987210def..bc6f9e77f 100644
--- a/app/assets/stylesheets/icons.css
+++ b/app/assets/stylesheets/icons.css
@@ -50,6 +50,7 @@
   .icon--password { --svg: url("password.svg "); }
   .icon--pencil { --svg: url("pencil.svg "); }
   .icon--person { --svg: url("person.svg "); }
+  .icon--person-add { --svg: url("person-add.svg "); }
   .icon--picture-add { --svg: url("picture-add.svg "); }
   .icon--picture-double { --svg: url("picture-double.svg "); }
   .icon--picture-remove { --svg: url("picture-remove.svg "); }
diff --git a/app/views/cards/display/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb
index 58b4b67c5..7cfa48447 100644
--- a/app/views/cards/display/common/_assignees.html.erb
+++ b/app/views/cards/display/common/_assignees.html.erb
@@ -5,7 +5,7 @@
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
     <button class="btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
-      <%= icon_tag "add" %>
+      <%= icon_tag "person-add" %>
       <span class="for-screen-reader">Assign</span>
     </button>
 

From 5ce289642f65231b8b3b3643b21c9f67d4f181cf Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:57:54 +0200
Subject: [PATCH 036/413] Rely on caching of notifications

---
 app/views/notifications/index.html.erb      | 4 ++--
 app/views/notifications/trays/show.html.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index a4b441323..fff162709 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -20,7 +20,7 @@
       <%= button_to "Mark all as read", read_all_notifications_path, class: "btn txt-small" %>
     </div>
 
-    <%= render @unread %>
+    <%= render partial: "notifications/notification", collection: @unread, cached: true %>
   <% else %>
     <div class="pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink); --border-radius: 0.2em;">
       <strong>Nothing new for you.</strong>
@@ -33,7 +33,7 @@
   <h2 class="txt-medium margin-block-start-double margin-block-end-half txt-uppercase translucent">Previously seen</h2>
 
   <div id="notifications_list_read">
-    <%= render @page.records %>
+    <%= render partial: "notifications/notification", collection: @page.records, cached: true %>
   </div>
 </section>
 
diff --git a/app/views/notifications/trays/show.html.erb b/app/views/notifications/trays/show.html.erb
index 1e131caf6..f61c52d51 100644
--- a/app/views/notifications/trays/show.html.erb
+++ b/app/views/notifications/trays/show.html.erb
@@ -1,3 +1,3 @@
 <%= turbo_frame_tag "notifications" do %>
-  <%= render partial: "notifications/notification", collection: @notifications %>
+  <%= render partial: "notifications/notification", collection: @notifications, cached: true %>
 <% end %>

From d8ec2c33642f97bf22a9878da1cb35caac7344ba Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 16:58:03 +0200
Subject: [PATCH 037/413] More natural to fetch that which will be shown first

---
 app/controllers/notifications_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 8471b20c0..44dc0f604 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -1,11 +1,11 @@
 class NotificationsController < ApplicationController
   def index
-    set_page_and_extract_portion_from Current.user.notifications.read.ordered
-
-    if @page.first?
+    unless current_page_param
       @unread = Current.user.notifications.unread.ordered
     end
 
+    set_page_and_extract_portion_from Current.user.notifications.read.ordered
+
     respond_to do |format|
       format.turbo_stream if current_page_param # Allows read-all action to side step pagination
       format.html

From 2ced8e643d71bb24658a8c1b616af3e14092392a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 17:01:32 +0200
Subject: [PATCH 038/413] Clarify a bit

---
 app/models/notification.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index e6a32ef3c..9fbb94a5b 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -9,7 +9,7 @@ class Notification < ApplicationRecord
   scope :ordered, -> { order(read_at: :desc, created_at: :desc) }
 
   delegate :creator, to: :event
-  after_create_commit :broadcast
+  after_create_commit :broadcast_unread
 
   def self.read_all
     update!(read_at: Time.current)
@@ -24,7 +24,7 @@ class Notification < ApplicationRecord
   end
 
   private
-    def broadcast
+    def broadcast_unread
       broadcast_prepend_later_to user, :notifications, target: "notifications"
     end
 end

From cfa2f2d1f930ea93a76f175307caab5ce8dd6a35 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 17:02:48 +0200
Subject: [PATCH 039/413] Trailing spaces

---
 app/views/notifications/_tray.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/notifications/_tray.html.erb b/app/views/notifications/_tray.html.erb
index 9b3c55867..9095f1946 100644
--- a/app/views/notifications/_tray.html.erb
+++ b/app/views/notifications/_tray.html.erb
@@ -15,13 +15,13 @@
 
   <div class="tray__actions notification-tray__actions border border-radius">
     <%= button_to read_all_notifications_path,
-          class: "notification-tray__read_action btn btn--reversed fill-transparent borderless flex-item-justify-start shadow txt-xx-small", 
+          class: "notification-tray__read_action btn btn--reversed fill-transparent borderless flex-item-justify-start shadow txt-xx-small",
           data: { action: "click->dialog#close", turbo_frame: "notifications" } do %>
       <%= icon_tag "check" %> <span class="for-screen-reader">Mark all read</span>
     <% end %>
 
     <%= link_to tag.span("Notifications"), notifications_path,
-          class: "btn btn--reversed borderless fill-transparent translucent shadow center txt-uppercase txt-x-small", 
+          class: "btn btn--reversed borderless fill-transparent translucent shadow center txt-uppercase txt-x-small",
           data: { action: "click->dialog#close" } %>
 
     <span class="btn btn--placeholder txt-xx-small borderless"></span>

From d22bea8ac567307eac3e1dbcd262401f7f2572c4 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 10:05:02 -0500
Subject: [PATCH 040/413] Change alignment

---
 app/assets/stylesheets/card-perma.css    | 10 ++--------
 app/views/cards/_closure_toggle.html.erb |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index 3b64b2200..af825bb32 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -6,7 +6,7 @@
     --actions-inline-inset: 4rem;
     --color-container: color-mix(in srgb, var(--card-color) 33%, var(--color-bg));
     --padding-inline: calc(var(--block-space-double) + var(--block-space));
-    --padding-block: var(--block-space-double) calc(var(--block-space-double) + var(--block-space-half));
+    --padding-block: calc(var(--block-space-double) + var(--block-space-half));
 
     align-items: start;
     column-gap: var(--inline-space);
@@ -60,12 +60,7 @@
   /* -------------------------------------------------------------------------- */
 
   .card-perma__notch {
-    --card-notch-padding: 0.5ch;
-    --border-radius: 1em;
-
     align-items: center;
-    background-color: var(--color-bg);
-    border-radius: 99rem;
     color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
     display: inline-flex;
     inline-size: auto;
@@ -99,8 +94,7 @@
 
   .card-perma__notch--bottom {
     grid-area: notch-bottom;
-    padding: calc(var(--block-space) * 0.75) calc(var(--block-space) * 0.66);
-    translate: 0 -50%;
+    translate: 0 -25%;
 
     &:has([open]) {
       z-index: 1;
diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb
index 76edfa091..7958b0887 100644
--- a/app/views/cards/_closure_toggle.html.erb
+++ b/app/views/cards/_closure_toggle.html.erb
@@ -1,4 +1,4 @@
-<div class="card-perma__notch card-perma__notch--bottom" id="<%= dom_id(@card, :card_closure_toggle) %> style="--card-color: <%= @card.color %>">
+<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(@card, :card_closure_toggle) %> style="--card-color: <%= @card.color %>">
   <% if card.closed? %>
     <span class="card-perma__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
     <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %>

From dd39d0339854b2f66b32918aa4109adba8e54107 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 10:06:48 -0500
Subject: [PATCH 041/413] Copy edit

---
 app/views/cards/display/common/_meta.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index d2ba79b98..94c5f477a 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -20,7 +20,7 @@
       Reported by <strong><%= familiar_name_for(card.creator) %></strong>
     </span>
     <span class="card__meta-item card__meta-item--assigned overflow-ellipsis">
-      Assigned to <%= card.assignees.any? ? card.assignees.map { |assignee| "<strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe : "no one" %>
+      <%= card.assignees.any? ? card.assignees.map { |assignee| "Assigned to <strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe : "Not assigned" %>
     </span>
   </div>
 

From 00cbe8101c15ae839e0d04804fb2c4c091e4326c Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 17:07:43 +0200
Subject: [PATCH 042/413] Slim it down

---
 app/views/notifications/index.turbo_stream.erb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/views/notifications/index.turbo_stream.erb b/app/views/notifications/index.turbo_stream.erb
index 00d744dcd..4d74e0941 100644
--- a/app/views/notifications/index.turbo_stream.erb
+++ b/app/views/notifications/index.turbo_stream.erb
@@ -1,7 +1,2 @@
-<%= turbo_stream.append :notifications_list_read do %>
-  <%= render @page.records %>
-<% end %>
-
-<%= turbo_stream.replace :next_page do %>
-  <%= notifications_next_page_link(@page) %>
-<% end %>
+<%= turbo_stream.append :notifications_list_read, partial: "notifications/notification", collection: @page.records %>
+<%= turbo_stream.replace :next_page, notifications_next_page_link(@page) %>

From 5dc6e0394fe7f27478f26f7e5456c4b72a411e76 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 17:12:20 +0200
Subject: [PATCH 043/413] Style

---
 app/controllers/notifications_controller.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 44dc0f604..d188e3a1e 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -1,9 +1,6 @@
 class NotificationsController < ApplicationController
   def index
-    unless current_page_param
-      @unread = Current.user.notifications.unread.ordered
-    end
-
+    @unread = Current.user.notifications.unread.ordered unless current_page_param
     set_page_and_extract_portion_from Current.user.notifications.read.ordered
 
     respond_to do |format|

From 7c5a58bf4da160df02f61db5b9c4db920d7f4cc1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Wed, 16 Apr 2025 17:12:31 +0200
Subject: [PATCH 044/413] Note that this need to be able to dynamically appear

---
 app/views/notifications/index.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index fff162709..bf83657ee 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -22,6 +22,7 @@
 
     <%= render partial: "notifications/notification", collection: @unread, cached: true %>
   <% else %>
+    <%# FIXME: Need to reveal this section if there are unread notification records in it %>
     <div class="pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink); --border-radius: 0.2em;">
       <strong>Nothing new for you.</strong>
     </div>

From bee27c9ce90e420b13e304c2aed365a2e7dfc926 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 10:37:46 -0500
Subject: [PATCH 045/413] Whitespace

---
 test/controllers/users_controller_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 3efbe0489..ff7ec0f2c 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -5,8 +5,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     sign_in_as :kevin
 
     get users_path
-    assert_match /#{users(:david).name}/, @response.body 
-    assert_match /#{users(:kevin).name}/, @response.body 
+    assert_match /#{users(:david).name}/, @response.body
+    assert_match /#{users(:kevin).name}/, @response.body
   end
 
   test "new" do
@@ -20,7 +20,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   test "create" do
     assert_difference -> { User.active.count }, +1 do
       post users_path(params: { join_code: accounts(:"37s").join_code }),
-        params: { user: { name: "Dash", email_address: "dash@example.com", password: "123" } } 
+        params: { user: { name: "Dash", email_address: "dash@example.com", password: "123" } }
       assert_redirected_to root_path
     end
 
@@ -32,7 +32,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     sign_in_as :kevin
 
     get user_path(users(:david))
-    assert_match /#{users(:david).name}/, @response.body 
+    assert_match /#{users(:david).name}/, @response.body
   end
 
   test "update oneself" do

From 5c4c06d74c4cec987f978553d7e11e262237338e Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 09:41:48 -0500
Subject: [PATCH 046/413] No longer used

---
 app/views/cards/_date.html.erb | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 app/views/cards/_date.html.erb

diff --git a/app/views/cards/_date.html.erb b/app/views/cards/_date.html.erb
deleted file mode 100644
index cc19afe32..000000000
--- a/app/views/cards/_date.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if card.due_on.present? %>
-  <%= form_with model: card, url: collection_card_path(card.collection, card), data: { controller: "form" } do |form| %>
-    <label class="card__detail card__date">
-      <span class="for-screen-reader">Change the due date</span>
-      <span class="card__date-text"><%= html_escape card.due_on.strftime("%b <br> %d").html_safe %></span>
-      <%= form.date_field :due_on, class: "input input--hidden", data: { action: "change->form#submit click->form#showPicker" } %>
-    </label>
-  <% end %>
-<% end %>

From beae3d9a6b862df61e7c476605e19fc2de3f44d8 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 09:55:41 -0500
Subject: [PATCH 047/413] Clearer assignment icon

---
 app/assets/images/person-add.svg                   | 1 +
 app/assets/stylesheets/icons.css                   | 1 +
 app/views/cards/display/common/_assignees.html.erb | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/images/person-add.svg

diff --git a/app/assets/images/person-add.svg b/app/assets/images/person-add.svg
new file mode 100644
index 000000000..9c8e13b8c
--- /dev/null
+++ b/app/assets/images/person-add.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m23.1 12.9h-3v3c0 .5-.4.9-.9.9s-.9-.4-.9-.9v-3h-3c-.5 0-.9-.4-.9-.9s.4-.9.9-.9h3v-3c0-.5.4-.9.9-.9s.9.4.9.9v3s3 0 3 0c.5 0 .9.4.9.9s-.4.9-.9.9zm-7.6 8.2h-15c-.3 0-.5-.2-.5-.5.1-2.1 1.1-2.6 3.2-3.4 2-.7 2.6-1.5 2.8-3.3-.3-.2-.6-.5-.9-.8-.5-.6-.8-1.4-.9-2.1-.5 0-.9-1.1-.9-1.8s.3-1 .5-1 0 0 .1 0c-.1-.5-.2-1-.2-1.4 0-2.6 1.1-4.1 4.3-4.1s1.7.4 2 .9c.2-.1.4-.2.6-.2.8 0 1.8 1 1.8 3.3 0 .5 0 1-.2 1.4h.1c.2 0 .5.2.5 1s-.4 1.8-.9 1.8c0 .8-.4 1.5-.9 2.1-.3.3-.6.5-.9.8.1 1.8.8 2.5 2.8 3.3 2.1.8 3 1.3 3.2 3.4 0 .3-.2.5-.5.5z" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/assets/stylesheets/icons.css b/app/assets/stylesheets/icons.css
index 987210def..bc6f9e77f 100644
--- a/app/assets/stylesheets/icons.css
+++ b/app/assets/stylesheets/icons.css
@@ -50,6 +50,7 @@
   .icon--password { --svg: url("password.svg "); }
   .icon--pencil { --svg: url("pencil.svg "); }
   .icon--person { --svg: url("person.svg "); }
+  .icon--person-add { --svg: url("person-add.svg "); }
   .icon--picture-add { --svg: url("picture-add.svg "); }
   .icon--picture-double { --svg: url("picture-double.svg "); }
   .icon--picture-remove { --svg: url("picture-remove.svg "); }
diff --git a/app/views/cards/display/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb
index 58b4b67c5..7cfa48447 100644
--- a/app/views/cards/display/common/_assignees.html.erb
+++ b/app/views/cards/display/common/_assignees.html.erb
@@ -5,7 +5,7 @@
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
     <button class="btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
-      <%= icon_tag "add" %>
+      <%= icon_tag "person-add" %>
       <span class="for-screen-reader">Assign</span>
     </button>
 

From 00dd312cd694b3e138af2a6503e1112293cc2b60 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 10:05:02 -0500
Subject: [PATCH 048/413] Change alignment

---
 app/assets/stylesheets/card-perma.css    | 10 ++--------
 app/views/cards/_closure_toggle.html.erb |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index 3b64b2200..af825bb32 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -6,7 +6,7 @@
     --actions-inline-inset: 4rem;
     --color-container: color-mix(in srgb, var(--card-color) 33%, var(--color-bg));
     --padding-inline: calc(var(--block-space-double) + var(--block-space));
-    --padding-block: var(--block-space-double) calc(var(--block-space-double) + var(--block-space-half));
+    --padding-block: calc(var(--block-space-double) + var(--block-space-half));
 
     align-items: start;
     column-gap: var(--inline-space);
@@ -60,12 +60,7 @@
   /* -------------------------------------------------------------------------- */
 
   .card-perma__notch {
-    --card-notch-padding: 0.5ch;
-    --border-radius: 1em;
-
     align-items: center;
-    background-color: var(--color-bg);
-    border-radius: 99rem;
     color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
     display: inline-flex;
     inline-size: auto;
@@ -99,8 +94,7 @@
 
   .card-perma__notch--bottom {
     grid-area: notch-bottom;
-    padding: calc(var(--block-space) * 0.75) calc(var(--block-space) * 0.66);
-    translate: 0 -50%;
+    translate: 0 -25%;
 
     &:has([open]) {
       z-index: 1;
diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb
index 76edfa091..7958b0887 100644
--- a/app/views/cards/_closure_toggle.html.erb
+++ b/app/views/cards/_closure_toggle.html.erb
@@ -1,4 +1,4 @@
-<div class="card-perma__notch card-perma__notch--bottom" id="<%= dom_id(@card, :card_closure_toggle) %> style="--card-color: <%= @card.color %>">
+<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(@card, :card_closure_toggle) %> style="--card-color: <%= @card.color %>">
   <% if card.closed? %>
     <span class="card-perma__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
     <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %>

From b5090c4b214b454b47a8257eaa41877dbed535d7 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 10:06:48 -0500
Subject: [PATCH 049/413] Copy edit

---
 app/views/cards/display/common/_meta.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index d2ba79b98..94c5f477a 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -20,7 +20,7 @@
       Reported by <strong><%= familiar_name_for(card.creator) %></strong>
     </span>
     <span class="card__meta-item card__meta-item--assigned overflow-ellipsis">
-      Assigned to <%= card.assignees.any? ? card.assignees.map { |assignee| "<strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe : "no one" %>
+      <%= card.assignees.any? ? card.assignees.map { |assignee| "Assigned to <strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe : "Not assigned" %>
     </span>
   </div>
 

From 91df76928b6d1459a9cf3f8739d655e67f07e77e Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Wed, 16 Apr 2025 16:51:29 +0100
Subject: [PATCH 050/413] Add fizzy-app-102 as a replica

The setup here is a bit rough while we settle some of the details, but
the gist of it is:

- Define accessories to run the primary/replica processes
- Add a web-replica role, which is similar to web but has the
  replication-side accessory
- Load the beamer extension on the app's primary tenanted database

Note that we aren't sending any traffic into the replica yet, but it
would be functional to do so. This stage is mainly about testing the
database replication.
---
 Dockerfile                   |  5 +++++
 config/database.yml          |  2 ++
 config/deploy.production.yml |  3 +++
 config/deploy.yml            | 36 +++++++++++++++++++++++++++++++++---
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 63e46037c..e0712a39a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,6 +38,10 @@ RUN bundle exec bootsnap precompile app/ lib/
 RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
 
 
+# Fetch beamer library
+FROM basecamp/beamer:latest AS beamer
+
+
 # Final stage for app image
 FROM base
 
@@ -49,6 +53,7 @@ RUN apt-get update -qq && \
 # Copy built artifacts: gems, application
 COPY --from=build /usr/local/bundle /usr/local/bundle
 COPY --from=build /rails /rails
+COPY --from=beamer /home/beamer/bin/beamer.so /rails/bin/lib/beamer.so
 
 # Run and own only the runtime files as a non-root user for security
 RUN useradd rails --create-home --shell /bin/bash && \
diff --git a/config/database.yml b/config/database.yml
index 17e777cd0..82c7475e1 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -45,6 +45,8 @@ production:
     <<: *default
     database: storage/tenants/<%= Rails.env %>/%{tenant}/db/main.sqlite3
     tenanted: true
+    extensions:
+      - ./bin/lib/beamer.so
   primary_original:
     <<: *default
     database: storage/production.sqlite3
diff --git a/config/deploy.production.yml b/config/deploy.production.yml
index 38cc04500..00a4b176e 100644
--- a/config/deploy.production.yml
+++ b/config/deploy.production.yml
@@ -5,6 +5,9 @@ servers:
   jobs:
     hosts:
       - fizzy-app-101
+  web-replica:
+    hosts:
+      - fizzy-app-102
 
 proxy:
   hosts:
diff --git a/config/deploy.yml b/config/deploy.yml
index 9617a8b87..29eb15ba4 100644
--- a/config/deploy.yml
+++ b/config/deploy.yml
@@ -1,10 +1,42 @@
 service: fizzy
 image: basecamp/fizzy
 
+
+x-basecamp-registry: &basecamp-registry
+  username: bcbot
+  password:
+    - BASECAMP_REGISTRY_PASSWORD
+
+x-beamer-accessory: &beamer-accessory
+  image: basecamp/beamer
+  registry:
+    <<: *basecamp-registry
+  options:
+    user: 1000 # Match the UID of the Rails app, for volume permissions
+  volumes:
+    - fizzy:/storage
+
+
 servers:
   jobs:
     cmd: bin/jobs
 
+accessories:
+  beamer-primary:
+    <<: *beamer-accessory
+    service: beamer-primary
+    cmd: beamer primary --debug --remove-after=1h --dir=/storage
+    port: 5000:80
+    roles:
+      - web
+
+  beamer-replica:
+    <<: *beamer-accessory
+    service: beamer-replica
+    cmd: beamer replica --debug --primary=http://fizzy-app-101:5000/ --dir=/storage
+    roles:
+      - web-replica
+
 volumes:
   - fizzy:/rails/storage
 
@@ -12,9 +44,7 @@ proxy:
   ssl: true
 
 registry:
-  username: bcbot
-  password:
-    - BASECAMP_REGISTRY_PASSWORD
+  <<: *basecamp-registry
 
 builder:
   arch: amd64

From 7b3b5c471b7e994c6d85edf42c6c4f820659959d Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 18:53:26 -0500
Subject: [PATCH 051/413] Add a description filed for cards

---
 app/assets/stylesheets/cards.css          | 24 ++++++++++----
 app/assets/stylesheets/house.css          |  3 +-
 app/controllers/cards_controller.rb       |  2 +-
 app/models/card.rb                        |  2 ++
 app/views/cards/display/_perma.html.erb   | 34 ++++++++++++++------
 app/views/cards/display/_preview.html.erb |  4 +--
 app/views/cards/edit.html.erb             | 27 ++++++++++------
 app/views/cards/show.html.erb             | 38 +++++------------------
 8 files changed, 74 insertions(+), 60 deletions(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 6f869df5c..d8a484ab0 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -99,18 +99,32 @@
     padding-block: var(--card-padding-block);
   }
 
+  .card__description {
+    house-md-toolbar,
+    .house-md-content {
+      color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
+    }
+  }
+
   .card__title {
     --hover-size: 0;
     --input-border-radius: 0;
+    --input-color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
+    --lines: 3;
 
+    color: inherit;
     flex: 2 1 75%;
     font-size: var(--text-xx-large);
     font-weight: 900;
-    line-height: 1.1;
+    line-height: 1.2;
     min-block-size: 3lh;
     text-wrap: balance;
 
-    .card__title-field {
+    .card-perma__bg & {
+      min-block-size: unset;
+    }
+
+    .card-field__title {
       &:is(textarea)::placeholder {
         color: inherit;
         opacity: 0.5;
@@ -118,8 +132,6 @@
     }
 
     .card__title-link {
-      --lines: 3;
-
       color: inherit;
     }
   }
@@ -130,11 +142,11 @@
     flex-direction: column;
     max-width: 100%;
     min-width: 0;
-    padding-block: var(--block-space);
+    padding-block: var(--block-space-half);
   }
 
   .card__move-button {
-    --btn-background: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
+    --btn-background: color-mix(in srgb, inherit 40%, var(--color-ink));
 
     margin-block-start: calc(var(--block-space) * 1.2);
     margin-inline-end: calc(var(--inline-space) * -4);
diff --git a/app/assets/stylesheets/house.css b/app/assets/stylesheets/house.css
index 30982ad76..e1ce84325 100644
--- a/app/assets/stylesheets/house.css
+++ b/app/assets/stylesheets/house.css
@@ -58,7 +58,6 @@
 
   /* Markdown Content */
   .house-md-content {
-    caret-color: var(--color-link);
     flex-grow: 1;
     font-family: var(--font-sans);
     text-align: left;
@@ -67,7 +66,7 @@
 
     &.house-md-content-empty::before {
       content: attr(placeholder);
-      color: var(--color-ink);
+      color: currentColor;
       opacity: 0.5;
       pointer-events: none;
       display: block;
diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb
index e62146d4e..1eed61b62 100644
--- a/app/controllers/cards_controller.rb
+++ b/app/controllers/cards_controller.rb
@@ -49,6 +49,6 @@ class CardsController < ApplicationController
     end
 
     def card_params
-      params.expect(card: [ :status, :title, :color, :due_on, :image, :draft_comment, tag_ids: [] ])
+      params.expect(card: [ :status, :title, :description, :color, :due_on, :image, :draft_comment, tag_ids: [] ])
     end
 end
diff --git a/app/models/card.rb b/app/models/card.rb
index e2191aa41..f0923af91 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -3,6 +3,8 @@ class Card < ApplicationRecord
     Messages, Notifiable, Pinnable, Closeable, Scorable, Searchable, Staged,
     Statuses, Taggable, Watchable
 
+  has_markdown :description
+
   belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
diff --git a/app/views/cards/display/_perma.html.erb b/app/views/cards/display/_perma.html.erb
index f70b9d2c8..9b9cc7cbd 100644
--- a/app/views/cards/display/_perma.html.erb
+++ b/app/views/cards/display/_perma.html.erb
@@ -8,20 +8,36 @@
     </header>
 
     <div class="card__body flex gap full-width flex-item-grow">
-      <h1 class="card__title">
-        <% if card.published? %>
-          <%= turbo_frame_tag card, :edit do %>
-            <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link overflow-line-clamp" %>
-          <% end %>
-        <% else %>
-          <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", data: { controller: "auto-save" } do |form| %>
+      <% if card.published? %>
+        <%= turbo_frame_tag card, :edit do %>
+          <div class="full-width">
+            <h1 class="card__title flex align-start gap-half">
+              <span><%= card.title %></span>
+              <%= link_to edit_collection_card_path(card.collection, card), class: "btn txt-small margin-block-start-half" do %>
+                <%= icon_tag "pencil" %>
+                <span class="for-screen-reader">Edit</span>
+              <% end %>
+            </h1>
+            <p class="card__description margin-block-half">
+              <%= sanitize card.description_html %>
+            </p>
+          </div>
+        <% end %>
+      <% else %>
+        <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "full-width", data: { controller: "auto-save" } do |form| %>
+          <h1 class="card__title">
             <%= form.text_area :title, placeholder: "Name it…",
                   class: "input input--textarea full-width borderless txt-align-start #{ "fill-highlight" if card.creating? }",
                   autofocus: card.title.blank?,
                   data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
-          <% end %>
+          </h1>
+          <div class="card__description margin-block-half">
+            <%= form.markdown_area :description, class: "input input--textarea full-width fill-white borderless txt-align-start card-field__description #{ "fill-highlight" if card.creating? }",
+                  placeholder: "Add some notes, context, pictures, or video about this…",
+                  data: { action: "auto-save#change blur->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
+          </div>
         <% end %>
-      </h1>
+      <% end %>
 
       <% if card.doing? %>
         <%= turbo_frame_tag dom_id(@card, :stages) do %>
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 7d673308c..9bd44aa81 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -6,8 +6,8 @@
     </header>
 
     <div class="card__body flex gap full-width flex-item-grow">
-      <h1 class="card__title">
-        <span class="card__title-link overflow-line-clamp"><%= card.title %></span>
+      <h1 class="card__title overflow-line-clamp">
+        <%= card.title %>
       </h1>
 
       <%= link_to collection_card_path(card.collection, card), class: "card__link" do %>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index 5e5e0d1d9..9ebf63e8e 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -1,13 +1,22 @@
 <%= turbo_frame_tag @card, :edit do %>
-  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "flex flex-column gap full-width", data: { controller: "form" } do |form| %>
-    <%= form.label :title, class: "flex flex-column align-center" do %>
-      <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card__title-field",
-            required: true, autofocus: true, placeholder: "Name it…",
-            rows: 3,
-            data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" },
-            style: "color: var(--spat-color); --input-border-radius: 0" %>
-    <% end %>
-    <%= form.button "Save", type: :submit, hidden: true %>
+  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "full-width", data: { controller: "form paste" } do |form| %>
+    <h1 class="card__title flex align-start gap-half">
+      <%= form.label :title, class: "flex flex-column align-center" do %>
+        <%= form.text_area :title, class: "input input--textarea full-width borderless fill-white txt-align-start card-field__title",
+              required: true, autofocus: true, placeholder: "Name it…",
+              rows: 1,
+              data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" } %>
+      <% end %>
+      <%= form.button type: :submit, class: "btn txt-small margin-block-start-half" do %>
+        <%= icon_tag "check" %>
+        <span class="for-screen-reader">Save</span>
+      <% end %>
+    </h1>
+    <div class="card__description margin-block-half">
+      <%= form.markdown_area :description, class: "input input--textarea full-width fill-white borderless txt-align-start card-field__description",
+            placeholder: "Add some notes, context, pictures, or video about this…",
+            data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
+    </div>
     <%= link_to "Close editor and discard changes", collection_card_path(@card.collection, @card), data: { form_target: "cancel" }, hidden: true %>
   <% end %>
 <% end %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index f1f2ea95a..af59aad87 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -30,7 +30,7 @@
 <% end %>
 
 <div data-controller="beacon" data-beacon-url-value="<%= card_reading_url(@card) %>">
-  <section id="<%= dom_id(@card, :card_container) %>" class="card-perma <%= "card-perma--pointing" unless @card.published? %>" style="--card-color: <%= @card.color %>;">
+  <section id="<%= dom_id(@card, :card_container) %>" class="card-perma" style="--card-color: <%= @card.color %>;">
 
     <%= render "cards/doing_toggle", card: @card %>
 
@@ -57,7 +57,12 @@
       </aside>
     <% end %>
 
-    <% unless @card.drafted? || @card.creating? %>
+    <% if @card.creating? %>
+      <div class="card-perma__notch card-perma__notch--bottom">
+        <%= button_to "Create card", card_publish_path(@card), class: "btn btn--reversed" %>
+        <%= button_to "Save as draft", collection_card_path(@card.collection, @card), name: "card[status]", value: "drafted", method: :put, class: "btn" %>
+      </div>
+    <% elsif @card.published? %>
       <%= render "cards/closure_toggle", card: @card %>
     <% end %>
   </section>
@@ -65,34 +70,5 @@
 
   <% if @card.published? %>
     <%= render "cards/messages", card: @card %>
-  <% else %>
-    <div class="comments pad-block">
-      <div class="comment comment--new flex-inline align-start full-width">
-        <figure class="comment__avatar flex-item-no-shrink" aria-hidden="true">
-          <%= avatar_tag Current.user, hidden_for_screen_reader: true %>
-        </figure>
-
-        <div class="comment__content flex-inline flex-column full-width">
-          <div class="comment__body txt-align-start">
-            <form data-controller="outlet-auto-save paste"
-                class="flex flex-column gap full-width"
-                data-outlet-auto-save-auto-save-outlet="#card_form"
-                data-action="paste->paste#pasteFiles">
-              <%= tag.house_md @card.draft_comment, name: "card[draft_comment]", class: "input comment__input",
-                    form: "card_form",
-                    placeholder: new_comment_placeholder(@card),
-                    data: { action: "house-md:change->outlet-auto-save#change focusout->outlet-auto-save#submit", uploads_url: uploads_url(format: "json") } %>
-            </form>
-
-            <% if @card.creating? %>
-              <div class="margin-block-start flex align-center gap">
-                <%= button_to "Create card", card_publish_path(@card), class: "btn btn--reversed" %>
-                <%= button_to "Save as draft", collection_card_path(@card.collection, @card), name: "card[status]", value: "drafted", method: :put, class: "btn" %>
-              </div>
-            <% end %>
-          </div>
-        </div>
-      </div>
-    </div>
   <% end %>
 </div>

From d257cb5fb6fe29d351f4b8d7846eb211ca993650 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 18:57:47 -0500
Subject: [PATCH 052/413] No longer used

---
 app/controllers/cards_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb
index 1eed61b62..c2c932cb5 100644
--- a/app/controllers/cards_controller.rb
+++ b/app/controllers/cards_controller.rb
@@ -49,6 +49,6 @@ class CardsController < ApplicationController
     end
 
     def card_params
-      params.expect(card: [ :status, :title, :description, :color, :due_on, :image, :draft_comment, tag_ids: [] ])
+      params.expect(card: [ :status, :title, :description, :image, tag_ids: [] ])
     end
 end

From 47d0ae98a1f352539ea2b0fcf671cde3952b3102 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 19:01:21 -0500
Subject: [PATCH 053/413] Remove DraftCommenting

---
 app/models/card.rb                        |  2 +-
 app/models/card/draft_commenting.rb       | 33 --------------------
 test/controllers/cards_controller_test.rb |  6 ++--
 test/models/card/messages_test.rb         | 37 -----------------------
 4 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 app/models/card/draft_commenting.rb

diff --git a/app/models/card.rb b/app/models/card.rb
index f0923af91..321a4f90e 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,5 +1,5 @@
 class Card < ApplicationRecord
-  include Assignable, Colored, DraftCommenting, Engageable, Eventable, Golden,
+  include Assignable, Colored, Engageable, Eventable, Golden,
     Messages, Notifiable, Pinnable, Closeable, Scorable, Searchable, Staged,
     Statuses, Taggable, Watchable
 
diff --git a/app/models/card/draft_commenting.rb b/app/models/card/draft_commenting.rb
deleted file mode 100644
index 615d23916..000000000
--- a/app/models/card/draft_commenting.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Card::DraftCommenting
-  extend ActiveSupport::Concern
-
-  included do
-    after_save :capture_draft_comment
-  end
-
-  def draft_comment
-    find_or_build_initial_comment.body.content
-  end
-
-  def draft_comment=(body)
-    if body.present?
-      @draft_comment = body
-    else
-      messages.comments.destroy_all
-    end
-  end
-
-  private
-    def find_or_build_initial_comment
-      message = messages.comments.first || messages.new(messageable: Comment.new)
-      message.comment
-    end
-
-    def capture_draft_comment
-      if @draft_comment.present?
-        find_or_build_initial_comment.update! body: @draft_comment, creator: creator
-      end
-
-      @draft_comment = nil
-    end
-end
diff --git a/test/controllers/cards_controller_test.rb b/test/controllers/cards_controller_test.rb
index e794e7898..5651ebcb9 100644
--- a/test/controllers/cards_controller_test.rb
+++ b/test/controllers/cards_controller_test.rb
@@ -36,19 +36,17 @@ class CardsControllerTest < ActionDispatch::IntegrationTest
     patch collection_card_path(collections(:writebook), cards(:logo)), params: {
       card: {
         title: "Logo needs to change",
-        due_on: 1.week.from_now,
         image: fixture_file_upload("moon.jpg", "image/jpeg"),
-        draft_comment: "Something more in-depth",
+        description: "Something more in-depth",
         tag_ids: [ tags(:mobile).id ] } }
     assert_redirected_to collection_card_path(collections(:writebook), cards(:logo))
 
     card = cards(:logo).reload
     assert_equal "Logo needs to change", card.title
-    assert_equal 1.week.from_now.to_date, card.due_on
     assert_equal "moon.jpg", card.image.filename.to_s
     assert_equal [ tags(:mobile) ], card.tags
 
-    assert_equal "Something more in-depth", card.messages.comments.first.comment.body_plain_text.strip
+    assert_equal "Something more in-depth", card.description_plain_text.strip
   end
 
   test "users can only see cards in collections they have access to" do
diff --git a/test/models/card/messages_test.rb b/test/models/card/messages_test.rb
index 08ade7f0f..31d730306 100644
--- a/test/models/card/messages_test.rb
+++ b/test/models/card/messages_test.rb
@@ -6,41 +6,4 @@ class Card::MessagesTest < ActiveSupport::TestCase
 
     assert_empty card.messages
   end
-
-  test "creating a card with an initial draft comment" do
-    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    assert_equal 1, card.messages.count
-    assert_equal "This is a comment", card.draft_comment.strip
-  end
-
-  test "updating the draft comment" do
-    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    card.update! draft_comment: "This is an updated comment"
-
-    assert_equal 1, card.messages.count
-    assert_equal "This is an updated comment", card.draft_comment.strip
-  end
-
-  test "setting the draft comment to be blank removes it" do
-    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    card.update! draft_comment: " "
-
-    assert card.messages.first.nil?
-  end
-
-  test "omitting the draft comment does not remove it" do
-    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    card.update! title: "Newer"
-
-    assert_equal 1, card.messages.count
-    assert_equal "This is a comment", card.draft_comment.strip
-  end
 end

From 94ccbdb6013ebed36bbc3962fd48e760e5544024 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 16 Apr 2025 19:06:18 -0500
Subject: [PATCH 054/413] Fix close card notch state

---
 app/views/cards/_closure_toggle.html.erb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb
index 7958b0887..661b8edea 100644
--- a/app/views/cards/_closure_toggle.html.erb
+++ b/app/views/cards/_closure_toggle.html.erb
@@ -1,9 +1,11 @@
-<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(@card, :card_closure_toggle) %> style="--card-color: <%= @card.color %>">
+<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(@card, :card_closure_toggle) %>" style="--card-color: <%= @card.color %>">
   <% if card.closed? %>
-    <span class="card-perma__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
-    <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %>
-      <span class="pad-inline-end">Un-do</span>
-    <% end %>
+    <div class="flex gap-half margin-block-start-double margin-block-end">
+      <span class="card-perma__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
+      <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %>
+        <span class="pad-inline-end">Un-do</span>
+      <% end %>
+    </div>
   <% else %>
     <details class="expander" data-controller="details" data-details-target="details" data-action="keydown.esc->details#close click@document->details#closeOnClickOutside">
       <summary class="expander__button btn borderless">

From 6c8fe164b3369c992bc3f0c973728ed3fe18e146 Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Thu, 17 Apr 2025 09:37:34 +0100
Subject: [PATCH 055/413] Read a card should dismiss all notifications

Previous code assumed that there was a single notification to dismiss
for that card, but in practice there can be zero or many. If it's zero,
we need to avoid the crash. If it's many, we should dismiss them all.

Also re-rendering the notification stack after dismissing enables us to
remove all the removed cards, as well as reveal any older ones that were
previously outside the visible page size.

This reverts commit 6135909b7e7b34ffdc7430a8b609c1b561085ba4.
---
 app/controllers/cards/readings_controller.rb     | 4 ++--
 app/views/cards/readings/create.turbo_stream.erb | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/cards/readings_controller.rb b/app/controllers/cards/readings_controller.rb
index bbc4d53c0..dbb379b15 100644
--- a/app/controllers/cards/readings_controller.rb
+++ b/app/controllers/cards/readings_controller.rb
@@ -2,7 +2,7 @@ class Cards::ReadingsController < ApplicationController
   include CardScoped
 
   def create
-    @notification = Current.user.notifications.find_by(card: @card)
-    @notification.read
+    Current.user.notifications.unread.where(card: @card).read_all
+    @notifications = Current.user.notifications.unread.ordered.limit(20)
   end
 end
diff --git a/app/views/cards/readings/create.turbo_stream.erb b/app/views/cards/readings/create.turbo_stream.erb
index 1f3b07b47..8f758752e 100644
--- a/app/views/cards/readings/create.turbo_stream.erb
+++ b/app/views/cards/readings/create.turbo_stream.erb
@@ -1 +1,3 @@
-<%= turbo_stream.remove @notification %>
+<%= turbo_stream.update "notifications" do %>
+  <%= render collection: @notifications, partial: "notifications/notification" %>
+<% end %>

From a5de4863fa7bd22a1ac0a35fc8a9b77982e784fc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 11:39:05 +0200
Subject: [PATCH 056/413] Allow for multiple notifications to be read

cc @kevinmcconnell
---
 app/controllers/cards/readings_controller.rb       |  4 ++--
 app/views/cards/readings/create.turbo_stream.erb   |  4 ++--
 test/controllers/cards/readings_controller_test.rb | 12 +++++++++++-
 test/fixtures/notifications.yml                    |  7 +++++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/controllers/cards/readings_controller.rb b/app/controllers/cards/readings_controller.rb
index dbb379b15..2d8b51ac6 100644
--- a/app/controllers/cards/readings_controller.rb
+++ b/app/controllers/cards/readings_controller.rb
@@ -2,7 +2,7 @@ class Cards::ReadingsController < ApplicationController
   include CardScoped
 
   def create
-    Current.user.notifications.unread.where(card: @card).read_all
-    @notifications = Current.user.notifications.unread.ordered.limit(20)
+    @notifications = Current.user.notifications.where(card: @card)
+    @notifications.each(&:read)
   end
 end
diff --git a/app/views/cards/readings/create.turbo_stream.erb b/app/views/cards/readings/create.turbo_stream.erb
index 8f758752e..5d7fe7801 100644
--- a/app/views/cards/readings/create.turbo_stream.erb
+++ b/app/views/cards/readings/create.turbo_stream.erb
@@ -1,3 +1,3 @@
-<%= turbo_stream.update "notifications" do %>
-  <%= render collection: @notifications, partial: "notifications/notification" %>
+<% @notifications.each do |notification| %>
+  <%= turbo_stream.remove notification %>
 <% end %>
diff --git a/test/controllers/cards/readings_controller_test.rb b/test/controllers/cards/readings_controller_test.rb
index c169517e2..a880e46c7 100644
--- a/test/controllers/cards/readings_controller_test.rb
+++ b/test/controllers/cards/readings_controller_test.rb
@@ -5,11 +5,21 @@ class Cards::ReadingsControllerTest < ActionDispatch::IntegrationTest
     sign_in_as :kevin
   end
 
-  test "index" do
+  test "read one notification on card visit" do
     assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
       post card_reading_path(cards(:logo)), as: :turbo_stream
     end
 
     assert_response :success
   end
+
+  test "read multiple notifications on card visit" do
+    assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+    assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
+      post card_reading_path(cards(:logo)), as: :turbo_stream
+    end
+    end
+
+    assert_response :success
+  end
 end
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index d6db9d360..7579f8eb6 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -5,6 +5,13 @@ logo_published_kevin:
   resource: logo (Card)
   created_at: <%= 1.week.ago %>
 
+logo_assignment_kevin:
+  user: kevin
+  event: logo_assignment_km
+  card: logo
+  resource: logo (Card)
+  created_at: <%= 1.week.ago %>
+
 layout_commented_kevin:
   user: kevin
   event: layout_commented

From bf99da8914242f1ac70daf47adb5719fb6b55a07 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 13:33:20 +0200
Subject: [PATCH 057/413] Style

---
 app/views/cards/show.html.erb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index f1f2ea95a..b25af4f3c 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -31,18 +31,14 @@
 
 <div data-controller="beacon" data-beacon-url-value="<%= card_reading_url(@card) %>">
   <section id="<%= dom_id(@card, :card_container) %>" class="card-perma <%= "card-perma--pointing" unless @card.published? %>" style="--card-color: <%= @card.color %>;">
-
     <%= render "cards/doing_toggle", card: @card %>
 
     <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
       <%= render "cards/golden_toggle", card: @card if @card.doing? %>
       <%= render "cards/image", card: @card %>
       <%= button_to collection_card_path(@card.collection, @card),
-            method: :delete,
-            class: "btn",
-            data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
-        <%= icon_tag "trash" %>
-        <span class="for-screen-reader">Delete</span>
+            method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
+        <%= icon_tag "trash" %> <span class="for-screen-reader">Delete</span>
       <% end %>
     </aside>
 

From b5d6d40462a991824071a806759e352d6730e10a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 13:42:06 +0200
Subject: [PATCH 058/413] Use domain language termn

---
 .../cards/{_doing_toggle.html.erb => _engagement.html.erb}      | 0
 app/views/cards/show.html.erb                                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/views/cards/{_doing_toggle.html.erb => _engagement.html.erb} (100%)

diff --git a/app/views/cards/_doing_toggle.html.erb b/app/views/cards/_engagement.html.erb
similarity index 100%
rename from app/views/cards/_doing_toggle.html.erb
rename to app/views/cards/_engagement.html.erb
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index b25af4f3c..813fff2bc 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -31,7 +31,7 @@
 
 <div data-controller="beacon" data-beacon-url-value="<%= card_reading_url(@card) %>">
   <section id="<%= dom_id(@card, :card_container) %>" class="card-perma <%= "card-perma--pointing" unless @card.published? %>" style="--card-color: <%= @card.color %>;">
-    <%= render "cards/doing_toggle", card: @card %>
+    <%= render "cards/engagement", card: @card %>
 
     <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
       <%= render "cards/golden_toggle", card: @card if @card.doing? %>

From 0c743d27a8436378200486f9f5564baa2c51232f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 13:42:49 +0200
Subject: [PATCH 059/413] There is no more/less flicker with morphing

Where did you see the flickering that this solved, @jorgemanrubia?
---
 app/views/cards/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index 813fff2bc..5e96fc2b2 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -48,8 +48,8 @@
 
     <% if @card.published? %>
       <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
-        <%= turbo_frame_tag dom_id(@card, :watch), src: card_watch_path(@card), refresh: :morph %>
-        <%= turbo_frame_tag dom_id(@card, :pin), src: card_pin_path(@card), refresh: :morph %>
+        <%= turbo_frame_tag dom_id(@card, :watch), src: card_watch_path(@card) %>
+        <%= turbo_frame_tag dom_id(@card, :pin), src: card_pin_path(@card) %>
       </aside>
     <% end %>
 

From 07e801b74c3afcc0f867714cc2b2735d534d7fb1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 13:52:55 +0200
Subject: [PATCH 060/413] Fix pinning to tray

They need to have a complete dom element that is unique
---
 app/controllers/cards/pins_controller.rb | 2 +-
 app/views/my/pins/_pin.html.erb          | 3 +++
 app/views/my/pins/index.html.erb         | 6 +-----
 3 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 app/views/my/pins/_pin.html.erb

diff --git a/app/controllers/cards/pins_controller.rb b/app/controllers/cards/pins_controller.rb
index 76c5aa723..1f6c1aaa8 100644
--- a/app/controllers/cards/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -20,7 +20,7 @@ class Cards::PinsController < ApplicationController
 
   private
     def broadcast_my_new(pin)
-      pin.card.broadcast_prepend_later_to [ Current.user, :pins ], target: "pins", partial: "cards/display/preview"
+      pin.broadcast_prepend_later_to [ Current.user, :pins ], target: "pins", partial: "my/pins/pin"
     end
 
     def broadcast_my_removed(pin)
diff --git a/app/views/my/pins/_pin.html.erb b/app/views/my/pins/_pin.html.erb
new file mode 100644
index 000000000..66d177b28
--- /dev/null
+++ b/app/views/my/pins/_pin.html.erb
@@ -0,0 +1,3 @@
+<div class="pin tray__item" id="<%= dom_id pin %>">
+  <%= render "cards/display/preview", card: pin.card %>
+</div>
diff --git a/app/views/my/pins/index.html.erb b/app/views/my/pins/index.html.erb
index 519070aec..bee9fe10b 100644
--- a/app/views/my/pins/index.html.erb
+++ b/app/views/my/pins/index.html.erb
@@ -1,7 +1,3 @@
 <%= turbo_frame_tag "pins" do %>
-  <% @pins.map(&:card).each do |card| %>
-    <div class="pin tray__item">
-      <%= render partial: "cards/display/preview", locals: { card: card } %>
-    </div>
-  <% end %>
+  <%= render partial: "my/pins/pin", collection: @pins %>
 <% end %>

From fc0cf3917f016e0fe00fc7c340ed1d4dff262b7f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:05:26 +0200
Subject: [PATCH 061/413] Pin without redirect

Use turbo stream response to save on the redirect latency
---
 app/controllers/cards/pins_controller.rb       |  4 ----
 app/views/cards/pins/_pin.html.erb             | 11 +++++++++++
 app/views/cards/pins/create.turbo_stream.erb   |  1 +
 app/views/cards/pins/destroy.turbo_stream.erb  |  1 +
 app/views/cards/pins/show.html.erb             | 12 +-----------
 test/controllers/cards/pins_controller_test.rb |  8 ++++----
 6 files changed, 18 insertions(+), 19 deletions(-)
 create mode 100644 app/views/cards/pins/_pin.html.erb
 create mode 100644 app/views/cards/pins/create.turbo_stream.erb
 create mode 100644 app/views/cards/pins/destroy.turbo_stream.erb

diff --git a/app/controllers/cards/pins_controller.rb b/app/controllers/cards/pins_controller.rb
index 1f6c1aaa8..c6317f095 100644
--- a/app/controllers/cards/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -6,16 +6,12 @@ class Cards::PinsController < ApplicationController
 
   def create
     pin = @card.pin_by Current.user
-
     broadcast_my_new pin
-    redirect_to card_pin_path(@card)
   end
 
   def destroy
     pin = @card.unpin_by Current.user
-
     broadcast_my_removed pin
-    redirect_to card_pin_path(@card)
   end
 
   private
diff --git a/app/views/cards/pins/_pin.html.erb b/app/views/cards/pins/_pin.html.erb
new file mode 100644
index 000000000..e08308829
--- /dev/null
+++ b/app/views/cards/pins/_pin.html.erb
@@ -0,0 +1,11 @@
+<div id="<%= dom_id(card, :pin_button) %>">
+  <% if card.pinned_by? Current.user %>
+    <%= button_to card_pin_path(card), method: :delete, class: "btn btn--reversed" do %>
+      <%= icon_tag "pinned" %> <span class="for-screen-reader">Un-pin this card</span>
+    <% end %>
+  <% else %>
+    <%= button_to card_pin_path(card), class: "btn" do %>
+      <%= icon_tag "unpinned" %> <span class="for-screen-reader">Pin this card</span>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/cards/pins/create.turbo_stream.erb b/app/views/cards/pins/create.turbo_stream.erb
new file mode 100644
index 000000000..752fc594d
--- /dev/null
+++ b/app/views/cards/pins/create.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin", locals: { card: @card } %>
diff --git a/app/views/cards/pins/destroy.turbo_stream.erb b/app/views/cards/pins/destroy.turbo_stream.erb
new file mode 100644
index 000000000..752fc594d
--- /dev/null
+++ b/app/views/cards/pins/destroy.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin", locals: { card: @card } %>
diff --git a/app/views/cards/pins/show.html.erb b/app/views/cards/pins/show.html.erb
index 64eb1ad5c..0343f1b68 100644
--- a/app/views/cards/pins/show.html.erb
+++ b/app/views/cards/pins/show.html.erb
@@ -1,13 +1,3 @@
 <%= turbo_frame_tag dom_id(@card, :pin) do %>
-  <% if @card.pinned_by? Current.user %>
-    <%= button_to card_pin_path(@card), method: :delete, class: "btn btn--reversed" do %>
-      <%= icon_tag "pinned" %>
-      <span class="for-screen-reader">Un-pin this card</span>
-    <% end %>
-  <% else %>
-    <%= button_to card_pin_path(@card), class: "btn" do %>
-      <%= icon_tag "unpinned" %>
-      <span class="for-screen-reader">Pin this card</span>
-    <% end %>
-  <% end %>
+  <%= render "cards/pins/pin", card: @card %>
 <% end %>
diff --git a/test/controllers/cards/pins_controller_test.rb b/test/controllers/cards/pins_controller_test.rb
index 39b12a053..82f0534c5 100644
--- a/test/controllers/cards/pins_controller_test.rb
+++ b/test/controllers/cards/pins_controller_test.rb
@@ -9,23 +9,23 @@ class Cards::PinsControllerTest < ActionDispatch::IntegrationTest
     assert_changes -> { cards(:layout).pinned_by?(users(:kevin)) }, from: false, to: true do
       perform_enqueued_jobs do
         assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do
-          post card_pin_path(cards(:layout))
+          post card_pin_path(cards(:layout)), as: :turbo_stream
         end
       end
     end
 
-    assert_redirected_to card_pin_path(cards(:layout))
+    assert_response :success
   end
 
   test "destroy" do
     assert_changes -> { cards(:shipping).pinned_by?(users(:kevin)) }, from: true, to: false do
       perform_enqueued_jobs do
         assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do
-          delete card_pin_path(cards(:shipping))
+          delete card_pin_path(cards(:shipping)), as: :turbo_stream
         end
       end
     end
 
-    assert_redirected_to card_pin_path(cards(:shipping))
+    assert_response :success
   end
 end

From bddd624e412c7ef7f3168d6918d20c6917b697a3 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:14:03 +0200
Subject: [PATCH 062/413] Match template name to container id

---
 app/views/cards/pins/{_pin.html.erb => _pin_button.html.erb} | 0
 app/views/cards/pins/create.turbo_stream.erb                 | 2 +-
 app/views/cards/pins/show.html.erb                           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename app/views/cards/pins/{_pin.html.erb => _pin_button.html.erb} (100%)

diff --git a/app/views/cards/pins/_pin.html.erb b/app/views/cards/pins/_pin_button.html.erb
similarity index 100%
rename from app/views/cards/pins/_pin.html.erb
rename to app/views/cards/pins/_pin_button.html.erb
diff --git a/app/views/cards/pins/create.turbo_stream.erb b/app/views/cards/pins/create.turbo_stream.erb
index 752fc594d..b1dd787e9 100644
--- a/app/views/cards/pins/create.turbo_stream.erb
+++ b/app/views/cards/pins/create.turbo_stream.erb
@@ -1 +1 @@
-<%= turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin", locals: { card: @card } %>
+<%= turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin_button", locals: { card: @card } %>
diff --git a/app/views/cards/pins/show.html.erb b/app/views/cards/pins/show.html.erb
index 0343f1b68..c8ac69d7e 100644
--- a/app/views/cards/pins/show.html.erb
+++ b/app/views/cards/pins/show.html.erb
@@ -1,3 +1,3 @@
 <%= turbo_frame_tag dom_id(@card, :pin) do %>
-  <%= render "cards/pins/pin", card: @card %>
+  <%= render "cards/pins/pin_button", card: @card %>
 <% end %>

From 8fe82410690914800f620a9a5f7be8e7cdee4e31 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:14:08 +0200
Subject: [PATCH 063/413] Reuse create template

---
 app/views/cards/pins/destroy.turbo_stream.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/pins/destroy.turbo_stream.erb b/app/views/cards/pins/destroy.turbo_stream.erb
index 752fc594d..d54dea5f1 100644
--- a/app/views/cards/pins/destroy.turbo_stream.erb
+++ b/app/views/cards/pins/destroy.turbo_stream.erb
@@ -1 +1 @@
-<%= turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin", locals: { card: @card } %>
+<%= render template: "cards/pins/create" %>

From 1437bcb3b73b353c4bf276d53294677d29ea00a7 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:29:12 +0200
Subject: [PATCH 064/413] Clearer about where these are being sent

---
 app/controllers/cards/pins_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/cards/pins_controller.rb b/app/controllers/cards/pins_controller.rb
index c6317f095..2e0d12554 100644
--- a/app/controllers/cards/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -6,20 +6,20 @@ class Cards::PinsController < ApplicationController
 
   def create
     pin = @card.pin_by Current.user
-    broadcast_my_new pin
+    broadcast_add_to_tray pin
   end
 
   def destroy
     pin = @card.unpin_by Current.user
-    broadcast_my_removed pin
+    broadcast_remove_from_tray pin
   end
 
   private
-    def broadcast_my_new(pin)
+    def broadcast_add_to_tray(pin)
       pin.broadcast_prepend_later_to [ Current.user, :pins ], target: "pins", partial: "my/pins/pin"
     end
 
-    def broadcast_my_removed(pin)
+    def broadcast_remove_from_tray(pin)
       pin.broadcast_remove_to [ Current.user, :pins ]
     end
 end

From 87ce4a623b17628a44364deff8befc50c20b6f74 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:31:02 +0200
Subject: [PATCH 065/413] Even clearer about where these pins are going

---
 app/controllers/cards/pins_controller.rb | 4 ++--
 app/views/my/pins/_tray.html.erb         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/cards/pins_controller.rb b/app/controllers/cards/pins_controller.rb
index 2e0d12554..68430ff06 100644
--- a/app/controllers/cards/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -16,10 +16,10 @@ class Cards::PinsController < ApplicationController
 
   private
     def broadcast_add_to_tray(pin)
-      pin.broadcast_prepend_later_to [ Current.user, :pins ], target: "pins", partial: "my/pins/pin"
+      pin.broadcast_prepend_later_to [ Current.user, :pins_tray ], target: "pins", partial: "my/pins/pin"
     end
 
     def broadcast_remove_from_tray(pin)
-      pin.broadcast_remove_to [ Current.user, :pins ]
+      pin.broadcast_remove_to [ Current.user, :pins_tray ]
     end
 end
diff --git a/app/views/my/pins/_tray.html.erb b/app/views/my/pins/_tray.html.erb
index 70c1d5a16..ddd39fdfe 100644
--- a/app/views/my/pins/_tray.html.erb
+++ b/app/views/my/pins/_tray.html.erb
@@ -1,4 +1,4 @@
-<%= turbo_stream_from Current.user, :pins %>
+<%= turbo_stream_from Current.user, :pins_tray %>
 
 <%= tag.dialog id: "pin-tray", class: "tray pin-tray",
       data: { controller: "dialog", turbo_permanent: true, dialog_modal_value: false, dialog_target: "dialog", action: "keydown.esc->dialog#close:stop click@document->dialog#closeOnClickOutside" } do %>

From 4d0dddec46c09b96b402805e30a96cf0e0f771eb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:31:28 +0200
Subject: [PATCH 066/413] No need to loop through a job when this is the sole
 point of the action

---
 app/controllers/cards/pins_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/cards/pins_controller.rb b/app/controllers/cards/pins_controller.rb
index 68430ff06..235393178 100644
--- a/app/controllers/cards/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -16,7 +16,7 @@ class Cards::PinsController < ApplicationController
 
   private
     def broadcast_add_to_tray(pin)
-      pin.broadcast_prepend_later_to [ Current.user, :pins_tray ], target: "pins", partial: "my/pins/pin"
+      pin.broadcast_prepend_to [ Current.user, :pins_tray ], target: "pins", partial: "my/pins/pin"
     end
 
     def broadcast_remove_from_tray(pin)

From 7b5a1c0232fda05fbea87b1276bfb407d7e7ccea Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:32:26 +0200
Subject: [PATCH 067/413] Fix test

---
 test/controllers/cards/pins_controller_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/controllers/cards/pins_controller_test.rb b/test/controllers/cards/pins_controller_test.rb
index 82f0534c5..3bc569827 100644
--- a/test/controllers/cards/pins_controller_test.rb
+++ b/test/controllers/cards/pins_controller_test.rb
@@ -8,7 +8,7 @@ class Cards::PinsControllerTest < ActionDispatch::IntegrationTest
   test "create" do
     assert_changes -> { cards(:layout).pinned_by?(users(:kevin)) }, from: false, to: true do
       perform_enqueued_jobs do
-        assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do
+        assert_turbo_stream_broadcasts([ users(:kevin), :pins_tray ], count: 1) do
           post card_pin_path(cards(:layout)), as: :turbo_stream
         end
       end
@@ -20,7 +20,7 @@ class Cards::PinsControllerTest < ActionDispatch::IntegrationTest
   test "destroy" do
     assert_changes -> { cards(:shipping).pinned_by?(users(:kevin)) }, from: true, to: false do
       perform_enqueued_jobs do
-        assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do
+        assert_turbo_stream_broadcasts([ users(:kevin), :pins_tray ], count: 1) do
           delete card_pin_path(cards(:shipping)), as: :turbo_stream
         end
       end

From f24287915f229d325a6eafede83ba0e989fb8f6d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:52:35 +0200
Subject: [PATCH 068/413] Extract partials that can be rerendered

---
 .../_card_description_as_a_comment.html.erb   | 29 ++++++++++
 app/views/cards/_container.html.erb           | 27 +++++++++
 app/views/cards/show.html.erb                 | 58 +------------------
 3 files changed, 58 insertions(+), 56 deletions(-)
 create mode 100644 app/views/cards/_card_description_as_a_comment.html.erb
 create mode 100644 app/views/cards/_container.html.erb

diff --git a/app/views/cards/_card_description_as_a_comment.html.erb b/app/views/cards/_card_description_as_a_comment.html.erb
new file mode 100644
index 000000000..5e7a1cd71
--- /dev/null
+++ b/app/views/cards/_card_description_as_a_comment.html.erb
@@ -0,0 +1,29 @@
+<div class="comments pad-block">
+  <div class="comment comment--new flex-inline align-start full-width">
+    <figure class="comment__avatar flex-item-no-shrink" aria-hidden="true">
+      <%= avatar_tag Current.user, hidden_for_screen_reader: true %>
+    </figure>
+
+    <div class="comment__content flex-inline flex-column full-width">
+      <div class="comment__body txt-align-start">
+        <form data-controller="outlet-auto-save paste"
+              class="flex flex-column gap full-width"
+              data-outlet-auto-save-auto-save-outlet="#card_form"
+              data-action="paste->paste#pasteFiles">
+              <%= tag.house_md card.draft_comment, name: "card[draft_comment]", class: "input comment__input",
+                form: "card_form",
+                placeholder: new_comment_placeholder(card),
+                data: { action: "house-md:change->outlet-auto-save#change focusout->outlet-auto-save#submit", uploads_url: uploads_url(format: "json") } %>
+        </form>
+
+        <% if card.creating? %>
+          <div class="margin-block-start flex align-center gap">
+            <%= button_to "Create card", card_publish_path(card), class: "btn btn--reversed" %>
+            <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn" %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
new file mode 100644
index 000000000..4ac920e40
--- /dev/null
+++ b/app/views/cards/_container.html.erb
@@ -0,0 +1,27 @@
+<section id="<%= dom_id(card, :card_container) %>" class="card-perma <%= "card-perma--pointing" unless card.published? %>" style="--card-color: <%= card.color %>;">
+  <%= render "cards/engagement", card: card %>
+
+  <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
+    <%= render "cards/golden_toggle", card: card if card.doing? %>
+    <%= render "cards/image", card: card %>
+    <%= button_to collection_card_path(card.collection, card),
+      method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
+      <%= icon_tag "trash" %> <span class="for-screen-reader">Delete</span>
+    <% end %>
+  </aside>
+
+  <div class="card-perma__bg">
+    <%= render "cards/display/perma", card: card %>
+  </div>
+
+  <% if card.published? %>
+    <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
+      <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
+      <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>
+    </aside>
+  <% end %>
+
+  <% unless card.drafted? || card.creating? %>
+    <%= render "cards/closure_toggle", card: card %>
+  <% end %>
+</section>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index 5e96fc2b2..d3ff6554a 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -30,65 +30,11 @@
 <% end %>
 
 <div data-controller="beacon" data-beacon-url-value="<%= card_reading_url(@card) %>">
-  <section id="<%= dom_id(@card, :card_container) %>" class="card-perma <%= "card-perma--pointing" unless @card.published? %>" style="--card-color: <%= @card.color %>;">
-    <%= render "cards/engagement", card: @card %>
-
-    <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
-      <%= render "cards/golden_toggle", card: @card if @card.doing? %>
-      <%= render "cards/image", card: @card %>
-      <%= button_to collection_card_path(@card.collection, @card),
-            method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
-        <%= icon_tag "trash" %> <span class="for-screen-reader">Delete</span>
-      <% end %>
-    </aside>
-
-    <div class="card-perma__bg">
-      <%= render "cards/display/perma", card: @card %>
-    </div>
-
-    <% if @card.published? %>
-      <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
-        <%= turbo_frame_tag dom_id(@card, :watch), src: card_watch_path(@card) %>
-        <%= turbo_frame_tag dom_id(@card, :pin), src: card_pin_path(@card) %>
-      </aside>
-    <% end %>
-
-    <% unless @card.drafted? || @card.creating? %>
-      <%= render "cards/closure_toggle", card: @card %>
-    <% end %>
-  </section>
-
+  <%= render "cards/container", card: @card %>
 
   <% if @card.published? %>
     <%= render "cards/messages", card: @card %>
   <% else %>
-    <div class="comments pad-block">
-      <div class="comment comment--new flex-inline align-start full-width">
-        <figure class="comment__avatar flex-item-no-shrink" aria-hidden="true">
-          <%= avatar_tag Current.user, hidden_for_screen_reader: true %>
-        </figure>
-
-        <div class="comment__content flex-inline flex-column full-width">
-          <div class="comment__body txt-align-start">
-            <form data-controller="outlet-auto-save paste"
-                class="flex flex-column gap full-width"
-                data-outlet-auto-save-auto-save-outlet="#card_form"
-                data-action="paste->paste#pasteFiles">
-              <%= tag.house_md @card.draft_comment, name: "card[draft_comment]", class: "input comment__input",
-                    form: "card_form",
-                    placeholder: new_comment_placeholder(@card),
-                    data: { action: "house-md:change->outlet-auto-save#change focusout->outlet-auto-save#submit", uploads_url: uploads_url(format: "json") } %>
-            </form>
-
-            <% if @card.creating? %>
-              <div class="margin-block-start flex align-center gap">
-                <%= button_to "Create card", card_publish_path(@card), class: "btn btn--reversed" %>
-                <%= button_to "Save as draft", collection_card_path(@card.collection, @card), name: "card[status]", value: "drafted", method: :put, class: "btn" %>
-              </div>
-            <% end %>
-          </div>
-        </div>
-      </div>
-    </div>
+    <%= render "cards/card_description_as_a_comment", card: @card %>
   <% end %>
 </div>

From ab1835294d3f470e3e1c31fa09c556ae3c65e4e5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:53:45 +0200
Subject: [PATCH 069/413] Style

---
 app/views/cards/_container.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 4ac920e40..183315dcb 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -5,7 +5,7 @@
     <%= render "cards/golden_toggle", card: card if card.doing? %>
     <%= render "cards/image", card: card %>
     <%= button_to collection_card_path(card.collection, card),
-      method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
+          method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
       <%= icon_tag "trash" %> <span class="for-screen-reader">Delete</span>
     <% end %>
   </aside>

From 547e5ea24fb7217eed627286d0d2742f551ebc34 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:54:29 +0200
Subject: [PATCH 070/413] Rerender instead of redirect

---
 app/controllers/cards/goldnesses_controller.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/cards/goldnesses_controller.rb b/app/controllers/cards/goldnesses_controller.rb
index 4be611d14..2c37ad80a 100644
--- a/app/controllers/cards/goldnesses_controller.rb
+++ b/app/controllers/cards/goldnesses_controller.rb
@@ -3,11 +3,16 @@ class Cards::GoldnessesController < ApplicationController
 
   def create
     @card.gild
-    redirect_to @card
+    rerender_card_container
   end
 
   def destroy
     @card.ungild
-    redirect_to @card
+    rerender_card_container
   end
+
+  private
+    def rerender_card_container
+      render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", locals: { card: @card.reload })
+    end
 end

From 06da295f44d30df7883a34f3e4ddc17389f3ece7 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:56:53 +0200
Subject: [PATCH 071/413] Fix tests

---
 .../cards/goldnesses_controller_test.rb        | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/test/controllers/cards/goldnesses_controller_test.rb b/test/controllers/cards/goldnesses_controller_test.rb
index b8cfb9469..50fd411b0 100644
--- a/test/controllers/cards/goldnesses_controller_test.rb
+++ b/test/controllers/cards/goldnesses_controller_test.rb
@@ -6,22 +6,16 @@ class Cards::GoldnessesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "create" do
-    card = cards(:text)
-
-    assert_changes -> { card.reload.golden? }, from: false, to: true do
-      post card_goldness_path(card)
+    assert_changes -> { cards(:text).reload.golden? }, from: false, to: true do
+      post card_goldness_path(cards(:text)), as: :turbo_stream
+      assert_response :success
     end
-
-    assert_redirected_to collection_card_path(card.collection, card)
   end
 
   test "destroy" do
-    card = cards(:logo)
-
-    assert_changes -> { card.reload.golden? }, from: true, to: false do
-      delete card_goldness_path(card)
+    assert_changes -> { cards(:logo).reload.golden? }, from: true, to: false do
+      delete card_goldness_path(cards(:logo)), as: :turbo_stream
+      assert_response :success
     end
-
-    assert_redirected_to collection_card_path(card.collection, card)
   end
 end

From 770029c26d09beae97a9c288ae22ada08a7fa5a8 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 14:59:15 +0200
Subject: [PATCH 072/413] Stick with domain language

---
 app/views/cards/_container.html.erb                         | 2 +-
 app/views/cards/{_golden_toggle.html.erb => _gild.html.erb} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/views/cards/{_golden_toggle.html.erb => _gild.html.erb} (100%)

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 183315dcb..4807d0028 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -2,7 +2,7 @@
   <%= render "cards/engagement", card: card %>
 
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
-    <%= render "cards/golden_toggle", card: card if card.doing? %>
+    <%= render "cards/gild", card: card if card.doing? %>
     <%= render "cards/image", card: card %>
     <%= button_to collection_card_path(card.collection, card),
           method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
diff --git a/app/views/cards/_golden_toggle.html.erb b/app/views/cards/_gild.html.erb
similarity index 100%
rename from app/views/cards/_golden_toggle.html.erb
rename to app/views/cards/_gild.html.erb

From d019e282ae43aabe3e88d900a4ebe757f07c7f57 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:00:14 +0200
Subject: [PATCH 073/413] Better name

---
 ..._comment.html.erb => _description_as_draft_comment.html.erb} | 0
 app/views/cards/show.html.erb                                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/views/cards/{_card_description_as_a_comment.html.erb => _description_as_draft_comment.html.erb} (100%)

diff --git a/app/views/cards/_card_description_as_a_comment.html.erb b/app/views/cards/_description_as_draft_comment.html.erb
similarity index 100%
rename from app/views/cards/_card_description_as_a_comment.html.erb
rename to app/views/cards/_description_as_draft_comment.html.erb
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index d3ff6554a..df993c968 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -35,6 +35,6 @@
   <% if @card.published? %>
     <%= render "cards/messages", card: @card %>
   <% else %>
-    <%= render "cards/card_description_as_a_comment", card: @card %>
+    <%= render "cards/description_as_draft_comment", card: @card %>
   <% end %>
 </div>

From 7adbd8d6348e1885bb12a9db2eada25c98df1c9a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:20:27 +0200
Subject: [PATCH 074/413] Use card rerendering instead of redirects

---
 app/controllers/cards/assignments_controller.rb       |  1 +
 app/controllers/cards/closures_controller.rb          |  4 ++--
 app/controllers/cards/engagements_controller.rb       |  4 ++--
 app/controllers/cards/goldnesses_controller.rb        |  5 -----
 app/controllers/cards/stagings_controller.rb          |  2 ++
 app/controllers/cards/taggings_controller.rb          |  1 +
 app/controllers/concerns/card_scoped.rb               |  4 ++++
 app/views/cards/assignments/create.turbo_stream.erb   |  1 -
 app/views/cards/stagings/create.turbo_stream.erb      |  8 --------
 app/views/cards/taggings/create.turbo_stream.erb      |  1 -
 test/controllers/cards/assignments_controller_test.rb |  4 ++--
 test/controllers/cards/closures_controller_test.rb    |  6 ++----
 test/controllers/cards/engagements_controller_test.rb | 11 +++++++----
 test/controllers/cards/goldnesses_controller_test.rb  |  4 ++--
 test/controllers/cards/taggings_controller_test.rb    |  4 ++--
 test/test_helper.rb                                   |  2 +-
 test/test_helpers/card_test_helper.rb                 |  5 +++++
 17 files changed, 33 insertions(+), 34 deletions(-)
 delete mode 100644 app/views/cards/assignments/create.turbo_stream.erb
 delete mode 100644 app/views/cards/stagings/create.turbo_stream.erb
 delete mode 100644 app/views/cards/taggings/create.turbo_stream.erb
 create mode 100644 test/test_helpers/card_test_helper.rb

diff --git a/app/controllers/cards/assignments_controller.rb b/app/controllers/cards/assignments_controller.rb
index 63dce613c..bba888bf4 100644
--- a/app/controllers/cards/assignments_controller.rb
+++ b/app/controllers/cards/assignments_controller.rb
@@ -6,5 +6,6 @@ class Cards::AssignmentsController < ApplicationController
 
   def create
     @card.toggle_assignment @collection.users.active.find(params[:assignee_id])
+    rerender_card_container
   end
 end
diff --git a/app/controllers/cards/closures_controller.rb b/app/controllers/cards/closures_controller.rb
index 3682552ee..f79608036 100644
--- a/app/controllers/cards/closures_controller.rb
+++ b/app/controllers/cards/closures_controller.rb
@@ -3,11 +3,11 @@ class Cards::ClosuresController < ApplicationController
 
   def create
     @card.close(user: Current.user, reason: params[:reason])
-    redirect_to @card
+    rerender_card_container
   end
 
   def destroy
     @card.reopen
-    redirect_to @card
+    rerender_card_container
   end
 end
diff --git a/app/controllers/cards/engagements_controller.rb b/app/controllers/cards/engagements_controller.rb
index 72025d16a..e1178f1b3 100644
--- a/app/controllers/cards/engagements_controller.rb
+++ b/app/controllers/cards/engagements_controller.rb
@@ -3,11 +3,11 @@ class Cards::EngagementsController < ApplicationController
 
   def create
     @card.engage
-    redirect_to @card
+    rerender_card_container
   end
 
   def destroy
     @card.reconsider
-    redirect_to @card
+    rerender_card_container
   end
 end
diff --git a/app/controllers/cards/goldnesses_controller.rb b/app/controllers/cards/goldnesses_controller.rb
index 2c37ad80a..fb6076eec 100644
--- a/app/controllers/cards/goldnesses_controller.rb
+++ b/app/controllers/cards/goldnesses_controller.rb
@@ -10,9 +10,4 @@ class Cards::GoldnessesController < ApplicationController
     @card.ungild
     rerender_card_container
   end
-
-  private
-    def rerender_card_container
-      render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", locals: { card: @card.reload })
-    end
 end
diff --git a/app/controllers/cards/stagings_controller.rb b/app/controllers/cards/stagings_controller.rb
index 071d19f5a..728cad8a5 100644
--- a/app/controllers/cards/stagings_controller.rb
+++ b/app/controllers/cards/stagings_controller.rb
@@ -9,6 +9,8 @@ class Cards::StagingsController < ApplicationController
     else
       @card.update!(stage: nil)
     end
+    
+    rerender_card_container
   end
 
   private
diff --git a/app/controllers/cards/taggings_controller.rb b/app/controllers/cards/taggings_controller.rb
index 710b59fdd..a44b8a4df 100644
--- a/app/controllers/cards/taggings_controller.rb
+++ b/app/controllers/cards/taggings_controller.rb
@@ -7,6 +7,7 @@ class Cards::TaggingsController < ApplicationController
 
   def create
     @card.toggle_tag_with sanitized_tag_title_param
+    rerender_card_container
   end
 
   private
diff --git a/app/controllers/concerns/card_scoped.rb b/app/controllers/concerns/card_scoped.rb
index ef40d56e3..e89bf7f4d 100644
--- a/app/controllers/concerns/card_scoped.rb
+++ b/app/controllers/concerns/card_scoped.rb
@@ -13,4 +13,8 @@ module CardScoped
     def set_collection
       @collection = @card.collection
     end
+
+    def rerender_card_container
+      render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", locals: { card: @card.reload })
+    end
 end
diff --git a/app/views/cards/assignments/create.turbo_stream.erb b/app/views/cards/assignments/create.turbo_stream.erb
deleted file mode 100644
index f05f15d8d..000000000
--- a/app/views/cards/assignments/create.turbo_stream.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= turbo_stream.replace([ @card, :meta ], partial: "cards/display/perma/meta", locals: { card: @card }) %>
diff --git a/app/views/cards/stagings/create.turbo_stream.erb b/app/views/cards/stagings/create.turbo_stream.erb
deleted file mode 100644
index ac3942d6a..000000000
--- a/app/views/cards/stagings/create.turbo_stream.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= turbo_stream.replace dom_id(@card, "stages") do %>
-  <%= render partial: "cards/stagings/stages", locals: { card: @card } %>
-<% end %>
-
-<%= turbo_stream.set_css_variable dom_id(@card, :card_closure_toggle), name: "--card-color", value: @card.color %>
-<%= turbo_stream.set_css_variable dom_id(@card, :card_container), name: "--card-color", value: @card.color %>
-<%= turbo_stream.set_css_variable dom_id(@card, :card_engagement_toggle), name: "--card-color", value: @card.color %>
-<%= turbo_stream.set_css_variable dom_id(@card, :ticket), name: "--card-color", value: @card.color %>
diff --git a/app/views/cards/taggings/create.turbo_stream.erb b/app/views/cards/taggings/create.turbo_stream.erb
deleted file mode 100644
index f1775e2f8..000000000
--- a/app/views/cards/taggings/create.turbo_stream.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= turbo_stream.replace([ @card, :tags ], partial: "cards/display/perma/tags", locals: { card: @card }) %>
diff --git a/test/controllers/cards/assignments_controller_test.rb b/test/controllers/cards/assignments_controller_test.rb
index c92f57627..e0629aee4 100644
--- a/test/controllers/cards/assignments_controller_test.rb
+++ b/test/controllers/cards/assignments_controller_test.rb
@@ -13,12 +13,12 @@ class Cards::AssignmentsControllerTest < ActionDispatch::IntegrationTest
   test "create" do
     assert_changes "cards(:logo).assigned_to?(users(:david))", from: false, to: true do
       post card_assignments_path(cards(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream
+      assert_card_container_rerendered(cards(:logo))
     end
-    assert_response :success
 
     assert_changes "cards(:logo).assigned_to?(users(:david))", from: true, to: false do
       post card_assignments_path(cards(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream
+      assert_card_container_rerendered(cards(:logo))
     end
-    assert_response :success
   end
 end
diff --git a/test/controllers/cards/closures_controller_test.rb b/test/controllers/cards/closures_controller_test.rb
index 1729010a9..1e8f85871 100644
--- a/test/controllers/cards/closures_controller_test.rb
+++ b/test/controllers/cards/closures_controller_test.rb
@@ -10,11 +10,10 @@ class Cards::ClosuresControllerTest < ActionDispatch::IntegrationTest
 
     assert_changes -> { card.reload.closed? }, from: false, to: true do
       post card_closure_path(card, reason: "Scope too big")
+      assert_card_container_rerendered(card)
     end
 
     assert_equal "Scope too big", card.closure.reason
-
-    assert_redirected_to collection_card_path(card.collection, card)
   end
 
   test "destroy" do
@@ -22,8 +21,7 @@ class Cards::ClosuresControllerTest < ActionDispatch::IntegrationTest
 
     assert_changes -> { card.reload.closed? }, from: true, to: false do
       delete card_closure_path(card)
+      assert_card_container_rerendered(card)
     end
-
-    assert_redirected_to collection_card_path(card.collection, card)
   end
 end
diff --git a/test/controllers/cards/engagements_controller_test.rb b/test/controllers/cards/engagements_controller_test.rb
index 1e966108c..6b4265b86 100644
--- a/test/controllers/cards/engagements_controller_test.rb
+++ b/test/controllers/cards/engagements_controller_test.rb
@@ -10,9 +10,8 @@ class Cards::EngagementsControllerTest < ActionDispatch::IntegrationTest
 
     assert_changes -> { card.reload.doing? }, from: false, to: true do
       post card_engagement_path(card)
+      assert_card_container_rerendered(card)
     end
-
-    assert_redirected_to collection_card_path(card.collection, card)
   end
 
   test "destroy" do
@@ -20,8 +19,12 @@ class Cards::EngagementsControllerTest < ActionDispatch::IntegrationTest
 
     assert_changes -> { card.reload.doing? }, from: true, to: false do
       delete card_engagement_path(card)
+      assert_card_container_rerendered(card)
     end
-
-    assert_redirected_to collection_card_path(card.collection, card)
   end
+
+  private
+    def assert_card_container_rerendered(card)
+      assert_turbo_stream action: :replace, target: dom_id(card, :card_container)
+    end
 end
diff --git a/test/controllers/cards/goldnesses_controller_test.rb b/test/controllers/cards/goldnesses_controller_test.rb
index 50fd411b0..447aa2b71 100644
--- a/test/controllers/cards/goldnesses_controller_test.rb
+++ b/test/controllers/cards/goldnesses_controller_test.rb
@@ -8,14 +8,14 @@ class Cards::GoldnessesControllerTest < ActionDispatch::IntegrationTest
   test "create" do
     assert_changes -> { cards(:text).reload.golden? }, from: false, to: true do
       post card_goldness_path(cards(:text)), as: :turbo_stream
-      assert_response :success
+      assert_card_container_rerendered(cards(:text))
     end
   end
 
   test "destroy" do
     assert_changes -> { cards(:logo).reload.golden? }, from: true, to: false do
       delete card_goldness_path(cards(:logo)), as: :turbo_stream
-      assert_response :success
+      assert_card_container_rerendered(cards(:logo))
     end
   end
 end
diff --git a/test/controllers/cards/taggings_controller_test.rb b/test/controllers/cards/taggings_controller_test.rb
index ad5a8fa91..60f4cf743 100644
--- a/test/controllers/cards/taggings_controller_test.rb
+++ b/test/controllers/cards/taggings_controller_test.rb
@@ -13,14 +13,14 @@ class Cards::TaggingsControllerTest < ActionDispatch::IntegrationTest
   test "toggle tag on" do
     assert_changes "cards(:logo).tagged_with?(tags(:mobile))", from: false, to: true do
       post card_taggings_path(cards(:logo)), params: { tag_title: tags(:mobile).title }, as: :turbo_stream
+      assert_card_container_rerendered(cards(:logo))
     end
-    assert_response :success
   end
 
   test "toggle tag off" do
     assert_changes "cards(:logo).tagged_with?(tags(:web))", from: true, to: false do
       post card_taggings_path(cards(:logo)), params: { tag_title: tags(:web).title }, as: :turbo_stream
+      assert_card_container_rerendered(cards(:logo))
     end
-    assert_response :success
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f7cc1e088..1447430b1 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,6 +10,6 @@ module ActiveSupport
     # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
     fixtures :all
 
-    include ChangeTestHelper, SessionTestHelper
+    include CardTestHelper, ChangeTestHelper, SessionTestHelper
   end
 end
diff --git a/test/test_helpers/card_test_helper.rb b/test/test_helpers/card_test_helper.rb
new file mode 100644
index 000000000..6de139c86
--- /dev/null
+++ b/test/test_helpers/card_test_helper.rb
@@ -0,0 +1,5 @@
+module CardTestHelper
+  def assert_card_container_rerendered(card)
+    assert_turbo_stream action: :replace, target: dom_id(card, :card_container)
+  end
+end

From 4dbd8205cebed7d1bc73475ba6bcd59b558718cc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:21:14 +0200
Subject: [PATCH 075/413] Fix trailing space

---
 app/controllers/cards/stagings_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/cards/stagings_controller.rb b/app/controllers/cards/stagings_controller.rb
index 728cad8a5..37d4f91d7 100644
--- a/app/controllers/cards/stagings_controller.rb
+++ b/app/controllers/cards/stagings_controller.rb
@@ -9,7 +9,7 @@ class Cards::StagingsController < ApplicationController
     else
       @card.update!(stage: nil)
     end
-    
+
     rerender_card_container
   end
 

From b788ef1638c296d36536f696a99a700d68ff8b14 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:23:40 +0200
Subject: [PATCH 076/413] Match domain language

---
 app/views/cards/{_closure_toggle.html.erb => _closure.html.erb} | 0
 app/views/cards/_container.html.erb                             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/views/cards/{_closure_toggle.html.erb => _closure.html.erb} (100%)

diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure.html.erb
similarity index 100%
rename from app/views/cards/_closure_toggle.html.erb
rename to app/views/cards/_closure.html.erb
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 4807d0028..69f486b97 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -22,6 +22,6 @@
   <% end %>
 
   <% unless card.drafted? || card.creating? %>
-    <%= render "cards/closure_toggle", card: card %>
+    <%= render "cards/closure", card: card %>
   <% end %>
 </section>

From df1f6234356ea1dadefc0fc2ff9c02f373d30042 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:25:11 +0200
Subject: [PATCH 077/413] Group partials for container

---
 app/views/cards/_container.html.erb                  | 8 ++++----
 app/views/cards/{ => container}/_closure.html.erb    | 0
 app/views/cards/{ => container}/_engagement.html.erb | 0
 app/views/cards/{ => container}/_gild.html.erb       | 0
 app/views/cards/{ => container}/_image.html.erb      | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename app/views/cards/{ => container}/_closure.html.erb (100%)
 rename app/views/cards/{ => container}/_engagement.html.erb (100%)
 rename app/views/cards/{ => container}/_gild.html.erb (100%)
 rename app/views/cards/{ => container}/_image.html.erb (100%)

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 69f486b97..86844aaa6 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -1,9 +1,9 @@
 <section id="<%= dom_id(card, :card_container) %>" class="card-perma <%= "card-perma--pointing" unless card.published? %>" style="--card-color: <%= card.color %>;">
-  <%= render "cards/engagement", card: card %>
+  <%= render "cards/container/engagement", card: card %>
 
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
-    <%= render "cards/gild", card: card if card.doing? %>
-    <%= render "cards/image", card: card %>
+    <%= render "cards/container/gild", card: card if card.doing? %>
+    <%= render "cards/container/image", card: card %>
     <%= button_to collection_card_path(card.collection, card),
           method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
       <%= icon_tag "trash" %> <span class="for-screen-reader">Delete</span>
@@ -22,6 +22,6 @@
   <% end %>
 
   <% unless card.drafted? || card.creating? %>
-    <%= render "cards/closure", card: card %>
+    <%= render "cards/container/closure", card: card %>
   <% end %>
 </section>
diff --git a/app/views/cards/_closure.html.erb b/app/views/cards/container/_closure.html.erb
similarity index 100%
rename from app/views/cards/_closure.html.erb
rename to app/views/cards/container/_closure.html.erb
diff --git a/app/views/cards/_engagement.html.erb b/app/views/cards/container/_engagement.html.erb
similarity index 100%
rename from app/views/cards/_engagement.html.erb
rename to app/views/cards/container/_engagement.html.erb
diff --git a/app/views/cards/_gild.html.erb b/app/views/cards/container/_gild.html.erb
similarity index 100%
rename from app/views/cards/_gild.html.erb
rename to app/views/cards/container/_gild.html.erb
diff --git a/app/views/cards/_image.html.erb b/app/views/cards/container/_image.html.erb
similarity index 100%
rename from app/views/cards/_image.html.erb
rename to app/views/cards/container/_image.html.erb

From 62088b66d156e9902f822d10ecb99136498cee4b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:30:55 +0200
Subject: [PATCH 078/413] Suffix qualifier is unnnecessary

---
 app/controllers/cards/assignments_controller.rb | 2 +-
 app/controllers/cards/closures_controller.rb    | 4 ++--
 app/controllers/cards/engagements_controller.rb | 4 ++--
 app/controllers/cards/goldnesses_controller.rb  | 4 ++--
 app/controllers/cards/stagings_controller.rb    | 2 +-
 app/controllers/cards/taggings_controller.rb    | 2 +-
 app/controllers/concerns/card_scoped.rb         | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/cards/assignments_controller.rb b/app/controllers/cards/assignments_controller.rb
index bba888bf4..d2d8b8aa6 100644
--- a/app/controllers/cards/assignments_controller.rb
+++ b/app/controllers/cards/assignments_controller.rb
@@ -6,6 +6,6 @@ class Cards::AssignmentsController < ApplicationController
 
   def create
     @card.toggle_assignment @collection.users.active.find(params[:assignee_id])
-    rerender_card_container
+    rerender_card
   end
 end
diff --git a/app/controllers/cards/closures_controller.rb b/app/controllers/cards/closures_controller.rb
index f79608036..ac2e0ec46 100644
--- a/app/controllers/cards/closures_controller.rb
+++ b/app/controllers/cards/closures_controller.rb
@@ -3,11 +3,11 @@ class Cards::ClosuresController < ApplicationController
 
   def create
     @card.close(user: Current.user, reason: params[:reason])
-    rerender_card_container
+    rerender_card
   end
 
   def destroy
     @card.reopen
-    rerender_card_container
+    rerender_card
   end
 end
diff --git a/app/controllers/cards/engagements_controller.rb b/app/controllers/cards/engagements_controller.rb
index e1178f1b3..9baaa7609 100644
--- a/app/controllers/cards/engagements_controller.rb
+++ b/app/controllers/cards/engagements_controller.rb
@@ -3,11 +3,11 @@ class Cards::EngagementsController < ApplicationController
 
   def create
     @card.engage
-    rerender_card_container
+    rerender_card
   end
 
   def destroy
     @card.reconsider
-    rerender_card_container
+    rerender_card
   end
 end
diff --git a/app/controllers/cards/goldnesses_controller.rb b/app/controllers/cards/goldnesses_controller.rb
index fb6076eec..95a821fc3 100644
--- a/app/controllers/cards/goldnesses_controller.rb
+++ b/app/controllers/cards/goldnesses_controller.rb
@@ -3,11 +3,11 @@ class Cards::GoldnessesController < ApplicationController
 
   def create
     @card.gild
-    rerender_card_container
+    rerender_card
   end
 
   def destroy
     @card.ungild
-    rerender_card_container
+    rerender_card
   end
 end
diff --git a/app/controllers/cards/stagings_controller.rb b/app/controllers/cards/stagings_controller.rb
index 37d4f91d7..a3fa96d64 100644
--- a/app/controllers/cards/stagings_controller.rb
+++ b/app/controllers/cards/stagings_controller.rb
@@ -10,7 +10,7 @@ class Cards::StagingsController < ApplicationController
       @card.update!(stage: nil)
     end
 
-    rerender_card_container
+    rerender_card
   end
 
   private
diff --git a/app/controllers/cards/taggings_controller.rb b/app/controllers/cards/taggings_controller.rb
index a44b8a4df..1d46d6a78 100644
--- a/app/controllers/cards/taggings_controller.rb
+++ b/app/controllers/cards/taggings_controller.rb
@@ -7,7 +7,7 @@ class Cards::TaggingsController < ApplicationController
 
   def create
     @card.toggle_tag_with sanitized_tag_title_param
-    rerender_card_container
+    rerender_card
   end
 
   private
diff --git a/app/controllers/concerns/card_scoped.rb b/app/controllers/concerns/card_scoped.rb
index e89bf7f4d..65cd75920 100644
--- a/app/controllers/concerns/card_scoped.rb
+++ b/app/controllers/concerns/card_scoped.rb
@@ -14,7 +14,7 @@ module CardScoped
       @collection = @card.collection
     end
 
-    def rerender_card_container
+    def rerender_card
       render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", locals: { card: @card.reload })
     end
 end

From ac9cbad4f92afe4d614ec0189050af065c4dc4cd Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:32:09 +0200
Subject: [PATCH 079/413] I like this even better

---
 app/controllers/cards/assignments_controller.rb | 2 +-
 app/controllers/cards/closures_controller.rb    | 4 ++--
 app/controllers/cards/engagements_controller.rb | 4 ++--
 app/controllers/cards/goldnesses_controller.rb  | 4 ++--
 app/controllers/cards/stagings_controller.rb    | 2 +-
 app/controllers/cards/taggings_controller.rb    | 2 +-
 app/controllers/concerns/card_scoped.rb         | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/cards/assignments_controller.rb b/app/controllers/cards/assignments_controller.rb
index d2d8b8aa6..0dd3d460e 100644
--- a/app/controllers/cards/assignments_controller.rb
+++ b/app/controllers/cards/assignments_controller.rb
@@ -6,6 +6,6 @@ class Cards::AssignmentsController < ApplicationController
 
   def create
     @card.toggle_assignment @collection.users.active.find(params[:assignee_id])
-    rerender_card
+    render_card_replacement
   end
 end
diff --git a/app/controllers/cards/closures_controller.rb b/app/controllers/cards/closures_controller.rb
index ac2e0ec46..29dcfd30c 100644
--- a/app/controllers/cards/closures_controller.rb
+++ b/app/controllers/cards/closures_controller.rb
@@ -3,11 +3,11 @@ class Cards::ClosuresController < ApplicationController
 
   def create
     @card.close(user: Current.user, reason: params[:reason])
-    rerender_card
+    render_card_replacement
   end
 
   def destroy
     @card.reopen
-    rerender_card
+    render_card_replacement
   end
 end
diff --git a/app/controllers/cards/engagements_controller.rb b/app/controllers/cards/engagements_controller.rb
index 9baaa7609..50a6daa83 100644
--- a/app/controllers/cards/engagements_controller.rb
+++ b/app/controllers/cards/engagements_controller.rb
@@ -3,11 +3,11 @@ class Cards::EngagementsController < ApplicationController
 
   def create
     @card.engage
-    rerender_card
+    render_card_replacement
   end
 
   def destroy
     @card.reconsider
-    rerender_card
+    render_card_replacement
   end
 end
diff --git a/app/controllers/cards/goldnesses_controller.rb b/app/controllers/cards/goldnesses_controller.rb
index 95a821fc3..1a0912a24 100644
--- a/app/controllers/cards/goldnesses_controller.rb
+++ b/app/controllers/cards/goldnesses_controller.rb
@@ -3,11 +3,11 @@ class Cards::GoldnessesController < ApplicationController
 
   def create
     @card.gild
-    rerender_card
+    render_card_replacement
   end
 
   def destroy
     @card.ungild
-    rerender_card
+    render_card_replacement
   end
 end
diff --git a/app/controllers/cards/stagings_controller.rb b/app/controllers/cards/stagings_controller.rb
index a3fa96d64..102c17599 100644
--- a/app/controllers/cards/stagings_controller.rb
+++ b/app/controllers/cards/stagings_controller.rb
@@ -10,7 +10,7 @@ class Cards::StagingsController < ApplicationController
       @card.update!(stage: nil)
     end
 
-    rerender_card
+    render_card_replacement
   end
 
   private
diff --git a/app/controllers/cards/taggings_controller.rb b/app/controllers/cards/taggings_controller.rb
index 1d46d6a78..a8fe7ecf9 100644
--- a/app/controllers/cards/taggings_controller.rb
+++ b/app/controllers/cards/taggings_controller.rb
@@ -7,7 +7,7 @@ class Cards::TaggingsController < ApplicationController
 
   def create
     @card.toggle_tag_with sanitized_tag_title_param
-    rerender_card
+    render_card_replacement
   end
 
   private
diff --git a/app/controllers/concerns/card_scoped.rb b/app/controllers/concerns/card_scoped.rb
index 65cd75920..2ea4752c4 100644
--- a/app/controllers/concerns/card_scoped.rb
+++ b/app/controllers/concerns/card_scoped.rb
@@ -14,7 +14,7 @@ module CardScoped
       @collection = @card.collection
     end
 
-    def rerender_card
+    def render_card_replacement
       render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", locals: { card: @card.reload })
     end
 end

From 182d1c934b24d4d84c029f8fc0a88c9b0b16ec1a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:35:56 +0200
Subject: [PATCH 080/413] Note that we dont want to keep reloading these frames

---
 app/views/cards/_container.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 86844aaa6..76bc48262 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -15,6 +15,7 @@
   </div>
 
   <% if card.published? %>
+    <%# FIXME: Let's move this aside outside of the card container section so these frames don't reload/flicker when card is replaced %>
     <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
       <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
       <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>

From b508a93aba382bdd76940b791feca1f6e7e8eb60 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:36:11 +0200
Subject: [PATCH 081/413] Style

---
 app/views/cards/_container.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 76bc48262..4557379c2 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -1,9 +1,11 @@
-<section id="<%= dom_id(card, :card_container) %>" class="card-perma <%= "card-perma--pointing" unless card.published? %>" style="--card-color: <%= card.color %>;">
+<section id="<%= dom_id(card, :card_container) %>"
+    class="card-perma <%= "card-perma--pointing" unless card.published? %>" style="--card-color: <%= card.color %>;">
   <%= render "cards/container/engagement", card: card %>
 
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
     <%= render "cards/container/gild", card: card if card.doing? %>
     <%= render "cards/container/image", card: card %>
+
     <%= button_to collection_card_path(card.collection, card),
           method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
       <%= icon_tag "trash" %> <span class="for-screen-reader">Delete</span>

From 63b2abe020ef8f4809be41919ae97d47f75ca0be Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:38:47 +0200
Subject: [PATCH 082/413] Remove duplicated conditional

---
 app/views/cards/_container.html.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 4557379c2..f6e8101c4 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -22,9 +22,7 @@
       <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
       <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>
     </aside>
-  <% end %>
 
-  <% unless card.drafted? || card.creating? %>
     <%= render "cards/container/closure", card: card %>
   <% end %>
 </section>

From 461c104ac210dfbd553fa3bd3a45e0912ccad811 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:42:07 +0200
Subject: [PATCH 083/413] Extract helper method to keep partial at a uniform
 level of abstraction

---
 app/helpers/cards_helper.rb         | 8 ++++++++
 app/views/cards/_container.html.erb | 5 +----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
index e13defa96..028a4e715 100644
--- a/app/helpers/cards_helper.rb
+++ b/app/helpers/cards_helper.rb
@@ -29,4 +29,12 @@ module CardsHelper
       **options,
       &block
   end
+
+  def button_to_delete_card(card)
+    button_to collection_card_path(card.collection, card),
+        method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do
+      concat(icon_tag("trash"))
+      concat(tag.span("Delete", class: "for-screen-reader"))
+    end
+  end
 end
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index f6e8101c4..d3a2f1423 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -6,10 +6,7 @@
     <%= render "cards/container/gild", card: card if card.doing? %>
     <%= render "cards/container/image", card: card %>
 
-    <%= button_to collection_card_path(card.collection, card),
-          method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
-      <%= icon_tag "trash" %> <span class="for-screen-reader">Delete</span>
-    <% end %>
+    <%= button_to_delete_card(card) %>
   </aside>
 
   <div class="card-perma__bg">

From 0e442ac0d04840cbeea1758571d85690541bad63 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 15:56:54 +0200
Subject: [PATCH 084/413] Use card replacement for card updates too

---
 app/controllers/cards_controller.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb
index e62146d4e..25428545f 100644
--- a/app/controllers/cards_controller.rb
+++ b/app/controllers/cards_controller.rb
@@ -25,16 +25,16 @@ class CardsController < ApplicationController
   def edit
   end
 
+  def update
+    @card.update! card_params
+    render_card_replacement
+  end
+
   def destroy
     @card.destroy!
     redirect_to cards_path(collection_ids: [ @card.collection ]), notice: ("Card deleted" unless @card.creating?)
   end
 
-  def update
-    @card.update! card_params
-    redirect_to @card
-  end
-
   private
     def set_card
       @card = @collection.cards.find params[:id]
@@ -51,4 +51,8 @@ class CardsController < ApplicationController
     def card_params
       params.expect(card: [ :status, :title, :color, :due_on, :image, :draft_comment, tag_ids: [] ])
     end
+
+    def render_card_replacement
+      render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", locals: { card: @card.reload })
+    end
 end

From b8775d41f51193aa900b81b725c895dce8e79339 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 16:06:28 +0200
Subject: [PATCH 085/413] Inline perma to container partial

Reveals all the container elements and perma wasnt used elsewhere.
---
 app/views/cards/_container.html.erb       | 20 +++++++++++-
 app/views/cards/container/_title.html.erb | 14 ++++++++
 app/views/cards/display/_perma.html.erb   | 39 -----------------------
 3 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 app/views/cards/container/_title.html.erb
 delete mode 100644 app/views/cards/display/_perma.html.erb

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index d3a2f1423..a817a21af 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -10,7 +10,25 @@
   </aside>
 
   <div class="card-perma__bg">
-    <%= render "cards/display/perma", card: card %>
+    <%= card_article_tag card, class: "card" do %>
+      <header class="card__header flex align-center gap min-width">
+        <%= link_to card.collection.name, cards_path(collection_ids: [ card.collection ]),
+              class: "card__collection txt-uppercase overflow-ellipsis txt-reversed" %>
+
+        <%= render "cards/display/perma/tags", card: card %>
+      </header>
+
+      <div class="card__body flex gap full-width flex-item-grow">
+        <%= render "cards/container/title", card: card %>
+        <%= render "cards/stagings/stages", card: card if card.doing? %>
+      </div>
+
+      <footer class="card__footer full-width flex align-start gap">
+        <%= render "cards/display/perma/meta", card: card %>
+      </footer>
+
+      <%= render "cards/display/common/background", card: card %>
+    <% end %>
   </div>
 
   <% if card.published? %>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
new file mode 100644
index 000000000..b62eb2fb4
--- /dev/null
+++ b/app/views/cards/container/_title.html.erb
@@ -0,0 +1,14 @@
+<h1 class="card__title">
+  <% if card.published? %>
+    <%= turbo_frame_tag card, :edit do %>
+      <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link overflow-line-clamp" %>
+    <% end %>
+  <% else %>
+    <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", data: { controller: "auto-save" } do |form| %>
+      <%= form.text_area :title, placeholder: "Name it…",
+            class: "input input--textarea full-width borderless txt-align-start #{ "fill-highlight" if card.creating? }",
+            autofocus: card.title.blank?,
+            data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
+    <% end %>
+  <% end %>
+</h1>
diff --git a/app/views/cards/display/_perma.html.erb b/app/views/cards/display/_perma.html.erb
deleted file mode 100644
index f70b9d2c8..000000000
--- a/app/views/cards/display/_perma.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<% cache card do %>
-  <%= card_article_tag card, class: "card" do %>
-    <header class="card__header flex align-center gap min-width">
-      <%= link_to card.collection.name, cards_path(collection_ids: [card.collection]),
-            class: "card__collection txt-uppercase overflow-ellipsis txt-reversed" %>
-
-      <%= render "cards/display/perma/tags", card: card %>
-    </header>
-
-    <div class="card__body flex gap full-width flex-item-grow">
-      <h1 class="card__title">
-        <% if card.published? %>
-          <%= turbo_frame_tag card, :edit do %>
-            <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link overflow-line-clamp" %>
-          <% end %>
-        <% else %>
-          <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", data: { controller: "auto-save" } do |form| %>
-            <%= form.text_area :title, placeholder: "Name it…",
-                  class: "input input--textarea full-width borderless txt-align-start #{ "fill-highlight" if card.creating? }",
-                  autofocus: card.title.blank?,
-                  data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
-          <% end %>
-        <% end %>
-      </h1>
-
-      <% if card.doing? %>
-        <%= turbo_frame_tag dom_id(@card, :stages) do %>
-          <%= render "cards/stagings/stages", card: card %>
-        <% end %>
-      <% end %>
-    </div>
-
-    <footer class="card__footer full-width flex align-start gap">
-      <%= render "cards/display/perma/meta", card: card %>
-    </footer>
-
-    <%= render "cards/display/common/background", card: card %>
-  <% end %>
-<% end %>

From 36e9ff47fb9b7da2b25394f9d785b868b44007fe Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Thu, 17 Apr 2025 16:27:01 +0100
Subject: [PATCH 086/413] Less noisy logging in production

---
 config/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/deploy.yml b/config/deploy.yml
index 29eb15ba4..3ee355012 100644
--- a/config/deploy.yml
+++ b/config/deploy.yml
@@ -25,7 +25,7 @@ accessories:
   beamer-primary:
     <<: *beamer-accessory
     service: beamer-primary
-    cmd: beamer primary --debug --remove-after=1h --dir=/storage
+    cmd: beamer primary --remove-after=1h --dir=/storage
     port: 5000:80
     roles:
       - web
@@ -33,7 +33,7 @@ accessories:
   beamer-replica:
     <<: *beamer-accessory
     service: beamer-replica
-    cmd: beamer replica --debug --primary=http://fizzy-app-101:5000/ --dir=/storage
+    cmd: beamer replica --primary=http://fizzy-app-101:5000/ --dir=/storage
     roles:
       - web-replica
 

From 09e544a881de6c62de6b898860fe456ba2f62d08 Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Thu, 17 Apr 2025 16:28:20 +0100
Subject: [PATCH 087/413] Run beamer accessories in production only

---
 config/deploy.production.yml | 29 +++++++++++++++++++++++++++++
 config/deploy.yml            | 36 +++---------------------------------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/config/deploy.production.yml b/config/deploy.production.yml
index 00a4b176e..cc05d75b5 100644
--- a/config/deploy.production.yml
+++ b/config/deploy.production.yml
@@ -18,3 +18,32 @@ proxy:
 
 ssh:
   user: app
+
+
+x-beamer-accessory: &beamer-accessory
+  image: basecamp/beamer
+  registry:
+    username: bcbot
+    password:
+      - BASECAMP_REGISTRY_PASSWORD
+  options:
+    user: 1000 # Match the UID of the Rails app, for volume permissions
+  volumes:
+    - fizzy:/storage
+
+
+accessories:
+  beamer-primary:
+    <<: *beamer-accessory
+    service: beamer-primary
+    cmd: beamer primary --remove-after=1h --dir=/storage
+    port: 5000:80
+    roles:
+      - web
+
+  beamer-replica:
+    <<: *beamer-accessory
+    service: beamer-replica
+    cmd: beamer replica --primary=http://fizzy-app-101:5000/ --dir=/storage
+    roles:
+      - web-replica
diff --git a/config/deploy.yml b/config/deploy.yml
index 3ee355012..9617a8b87 100644
--- a/config/deploy.yml
+++ b/config/deploy.yml
@@ -1,42 +1,10 @@
 service: fizzy
 image: basecamp/fizzy
 
-
-x-basecamp-registry: &basecamp-registry
-  username: bcbot
-  password:
-    - BASECAMP_REGISTRY_PASSWORD
-
-x-beamer-accessory: &beamer-accessory
-  image: basecamp/beamer
-  registry:
-    <<: *basecamp-registry
-  options:
-    user: 1000 # Match the UID of the Rails app, for volume permissions
-  volumes:
-    - fizzy:/storage
-
-
 servers:
   jobs:
     cmd: bin/jobs
 
-accessories:
-  beamer-primary:
-    <<: *beamer-accessory
-    service: beamer-primary
-    cmd: beamer primary --remove-after=1h --dir=/storage
-    port: 5000:80
-    roles:
-      - web
-
-  beamer-replica:
-    <<: *beamer-accessory
-    service: beamer-replica
-    cmd: beamer replica --primary=http://fizzy-app-101:5000/ --dir=/storage
-    roles:
-      - web-replica
-
 volumes:
   - fizzy:/rails/storage
 
@@ -44,7 +12,9 @@ proxy:
   ssl: true
 
 registry:
-  <<: *basecamp-registry
+  username: bcbot
+  password:
+    - BASECAMP_REGISTRY_PASSWORD
 
 builder:
   arch: amd64

From e00edb444dd0c3ca9e543dccc3ff77ee30f9e075 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 14:10:35 -0500
Subject: [PATCH 088/413] Update ink and inverted colors

---
 app/assets/stylesheets/_global.css       | 17 ++++++++++-------
 app/assets/stylesheets/base.css          |  2 +-
 app/assets/stylesheets/buttons.css       | 14 +++++++-------
 app/assets/stylesheets/card-columns.css  |  2 +-
 app/assets/stylesheets/card-perma.css    |  6 +++---
 app/assets/stylesheets/cards.css         |  8 ++++----
 app/assets/stylesheets/events.css        |  6 +++---
 app/assets/stylesheets/expander.css      |  2 +-
 app/assets/stylesheets/flash.css         |  2 +-
 app/assets/stylesheets/house.css         |  6 +++---
 app/assets/stylesheets/inputs.css        |  4 ++--
 app/assets/stylesheets/lightbox.css      |  2 +-
 app/assets/stylesheets/notifications.css |  2 +-
 app/assets/stylesheets/panels.css        |  2 +-
 app/assets/stylesheets/pins.css          |  2 +-
 app/assets/stylesheets/syntax.css        |  2 +-
 app/assets/stylesheets/trays.css         |  2 +-
 app/assets/stylesheets/utilities.css     |  6 +++---
 app/assets/stylesheets/workflows.css     |  4 ++--
 app/views/events/_event.html.erb         |  2 +-
 public/406-unsupported-browser.html      | 22 +++++++++++-----------
 21 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 3dbe697a3..5252d7c47 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -34,8 +34,9 @@
   --btn-size: 2.65em;
 
   /* Color values */
-  --lch-black: 27.13% 0.1035 284.77;
-  --lch-white: 100% 0 0;
+  --lch-ink: 27.13% 0.1035 284.77;
+  --lch-ink-inverted: 100% 0 0;
+
   --lch-gray-light: 96% 0.005 96;
   --lch-gray: 92% 0.005 96;
   --lch-gray-dark: 75% 0.005 96;
@@ -53,12 +54,14 @@
   --lch-light-blue: 84.94% 0.048 216.62;
 
   /* Color abstractions */
+  --color-ink: oklch(var(--lch-ink));
+  --color-ink-inverted: oklch(var(--lch-ink-inverted));
+  --color-canvas: oklch(var(--lch-ink-inverted));
+
+
   --color-negative: oklch(var(--lch-red));
   --color-positive: oklch(var(--lch-green));
   --color-positive-light: oklch(var(--lch-green-light));
-  --color-bg: oklch(var(--lch-white));
-  --color-ink: oklch(var(--lch-black));
-  --color-ink-reversed: oklch(var(--lch-white));
   --color-link: oklch(var(--lch-blue));
   --color-subtle-light: oklch(var(--lch-gray-light));
   --color-subtle: oklch(var(--lch-gray));
@@ -73,8 +76,8 @@
   --color-golden: oklch(var(--lch-golden));
 
   @media (prefers-color-scheme: dark) {
-    --lch-black: 100% 0 0;
-    --lch-white: 0% 0 0;
+    --lch-ink: 100% 0 0;
+    --lch-ink-inverted: 0% 0 0;
     --lch-gray-light: 25.2% 0 0;
     --lch-gray: 30.12% 0 0;
     --lch-gray-dark: 44.95% 0 0;
diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css
index 9301bbc61..08368757e 100644
--- a/app/assets/stylesheets/base.css
+++ b/app/assets/stylesheets/base.css
@@ -18,7 +18,7 @@
     -moz-osx-font-smoothing: grayscale;
     -webkit-font-smoothing: antialiased;
     -webkit-text-size-adjust: none;
-    background: var(--color-bg);
+    background: var(--color-canvas);
     color: var(--color-ink);
     font-family: var(--font-sans);
     interpolate-size: allow-keywords;
diff --git a/app/assets/stylesheets/buttons.css b/app/assets/stylesheets/buttons.css
index 210c81bd7..fea991bff 100644
--- a/app/assets/stylesheets/buttons.css
+++ b/app/assets/stylesheets/buttons.css
@@ -4,7 +4,7 @@
     --btn-border-radius: 2em;
 
     align-items: center;
-    background-color: var(--btn-background, var(--color-bg));
+    background-color: var(--btn-background, var(--color-canvas));
     border-radius: var(--btn-border-radius);
     border: var(--btn-border-size, 1px) solid var(--btn-border-color, var(--color-subtle-dark));
     color: var(--btn-color, var(--color-ink));
@@ -112,7 +112,7 @@
 
     &:has(input:checked)  {
       --btn-background: var(--color-ink);
-      --btn-color: var(--color-ink-reversed);
+      --btn-color: var(--color-ink-inverted);
       --outline-color: var(--color-ink);
 
       .checked {
@@ -137,13 +137,13 @@
   /* Variants */
   .btn--link {
     --btn-background: var(--color-link);
-    --btn-color: var(--color-ink-reversed);
+    --btn-color: var(--color-ink-inverted);
     --outline-color: var(--color-link);
   }
 
   .btn--negative {
     --btn-background: var(--color-negative);
-    --btn-color: var(--color-ink-reversed);
+    --btn-color: var(--color-ink-inverted);
     --outline-color: var(--color-negative);
   }
 
@@ -163,7 +163,7 @@
 
   .btn--positive {
     --btn-background: var(--color-positive);
-    --btn-color: var(--color-ink-reversed);
+    --btn-color: var(--color-ink-inverted);
     --outline-color: var(--color-positive);
   }
 
@@ -173,12 +173,12 @@
 
   .btn--reversed {
     --btn-background: var(--color-ink);
-    --btn-color: var(--color-bg);
+    --btn-color: var(--color-canvas);
     --outline-color: var(--color-ink);
   }
 
   :is(.btn--link, .btn--negative, .btn--positive, .btn--reversed) {
-    --btn-border-color: var(--color-bg);
+    --btn-border-color: var(--color-canvas);
   }
 
   .btn--success {
diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index 022201a26..268d82463 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -77,7 +77,7 @@
       --text-xx-large: 1.6em;
       --text-small: 1.1em;
 
-      background-color: var(--color-bg);
+      background-color: var(--color-canvas);
       box-shadow: 0 0 0 1px var(--color-subtle);
       line-height: 1.2;
 
diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index af825bb32..77be4096d 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -4,7 +4,7 @@
   .card-perma {
     --actions-block-inset: 1.5rem;
     --actions-inline-inset: 4rem;
-    --color-container: color-mix(in srgb, var(--card-color) 33%, var(--color-bg));
+    --color-container: color-mix(in srgb, var(--card-color) 33%, var(--color-canvas));
     --padding-inline: calc(var(--block-space-double) + var(--block-space));
     --padding-block: calc(var(--block-space-double) + var(--block-space-half));
 
@@ -87,7 +87,7 @@
 
       &:has(input:checked)  {
         --btn-background: var(--card-color);
-        --btn-color: var(--color-ink-reversed);
+        --btn-color: var(--color-ink-inverted);
       }
     }
   }
@@ -102,7 +102,7 @@
 
     .btn:not(.popup__item, .btn--plain) {
       --btn-background: var(--card-color);
-      --btn-color: var(--color-ink-reversed);
+      --btn-color: var(--color-ink-inverted);
     }
 
     .btn--plain {
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 6f869df5c..304ac51c2 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -7,7 +7,7 @@
     --border-size: 0;
 
     aspect-ratio: var(--card-aspect-ratio, auto);
-    background-color: color-mix(in srgb, var(--card-color) 4%, var(--color-bg));
+    background-color: color-mix(in srgb, var(--card-color) 4%, var(--color-canvas));
     border-radius: 0.5em;
     box-shadow: var(--shadow);
     color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
@@ -29,9 +29,9 @@
   }
 
   .card--golden.card--doing {
-    --border-color: var(--color-bg) !important;
+    --border-color: var(--color-canvas) !important;
 
-    background-color: var(--color-bg);
+    background-color: var(--color-canvas);
     background-image: linear-gradient(90deg, oklch(var(--lch-golden) / 0.5) 0%, oklch(var(--lch-golden) / 0.1) 50%, oklch(var(--lch-golden) / 0.75) 100%);
     box-shadow:
       0 0 0.5em 0.2em var(--color-golden),
@@ -203,7 +203,7 @@
   }
 
   .card__closed-title {
-    color: var(--color-ink-reversed);
+    color: var(--color-ink-inverted);
     font-size: var(--text-rel-large);
     font-weight: 900;
     text-shadow:
diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 0b19fe853..dd2e8dc80 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -17,7 +17,7 @@
   }
 
   .events__day-header {
-    background-color: var(--color-bg);
+    background-color: var(--color-canvas);
     block-size: var(--grid-lines);
     display: block;
     position: relative;
@@ -25,7 +25,7 @@
   }
 
   .events__day-header-content {
-    background-color: var(--color-bg);
+    background-color: var(--color-canvas);
     display: inline-flex;
     font-size: 0.8em;
     inset: calc(var(--grid-lines) - 1em) auto -1em;
@@ -55,7 +55,7 @@
 
   .events--none {
     background-color: var(--color-container);
-    border-block-start: var(--grid-lines) solid var(--color-bg);
+    border-block-start: var(--grid-lines) solid var(--color-canvas);
     padding-block: 3em;
     margin: auto var(--grid-lines) calc(var(--grid-lines) * -1) auto;
   }
diff --git a/app/assets/stylesheets/expander.css b/app/assets/stylesheets/expander.css
index e7be6c769..a1f6da0dc 100644
--- a/app/assets/stylesheets/expander.css
+++ b/app/assets/stylesheets/expander.css
@@ -107,6 +107,6 @@
 
   &:hover,
   &:focus-visible {
-    background-color: oklch(var(--lch-white) / 15%);
+    background-color: oklch(var(--lch-ink-inverted) / 15%);
   }
 }
diff --git a/app/assets/stylesheets/flash.css b/app/assets/stylesheets/flash.css
index 8e5d08d67..8eaddb0aa 100644
--- a/app/assets/stylesheets/flash.css
+++ b/app/assets/stylesheets/flash.css
@@ -12,7 +12,7 @@
     animation: appear-then-fade 3s 300ms both;
     background-color: var(--flash-background, var(--color-ink));
     border-radius: 4em;
-    color: var(--flash-color, var(--color-ink-reversed));
+    color: var(--flash-color, var(--color-ink-inverted));
     display: inline-flex;
     font-size: var(--font-size-medium);
     margin: 0 auto;
diff --git a/app/assets/stylesheets/house.css b/app/assets/stylesheets/house.css
index 30982ad76..429c0de0b 100644
--- a/app/assets/stylesheets/house.css
+++ b/app/assets/stylesheets/house.css
@@ -93,7 +93,7 @@
 
     &[status="failed"] {
       background-color: var(--color-negative);
-      color: var(--color-ink-reversed);
+      color: var(--color-ink-inverted);
       font-weight: bold;
       padding: 0.5em;
     }
@@ -112,13 +112,13 @@
     cursor: pointer;
 
     house-md-upload[status="failed"] & {
-      color: var(--color-ink-reversed);
+      color: var(--color-ink-inverted);
       display: inline-block;
     }
 
     &::before {
       content: '×';
-      color: var(--color-ink-reversed);
+      color: var(--color-ink-inverted);
       font-size: 24px;
       font-weight: bold;
       position: absolute;
diff --git a/app/assets/stylesheets/inputs.css b/app/assets/stylesheets/inputs.css
index 5e3ba772c..781649ce5 100644
--- a/app/assets/stylesheets/inputs.css
+++ b/app/assets/stylesheets/inputs.css
@@ -135,7 +135,7 @@
     &:has(:focus-visible) {
       .switch__btn {
         box-shadow:
-          0 0 0 var(--outline-size) var(--color-bg),
+          0 0 0 var(--outline-size) var(--color-canvas),
           0 0 0 calc(var(--outline-size) * 2) var(--color-ink);
       }
     }
@@ -156,7 +156,7 @@
     transition: 150ms ease;
 
     &::before {
-      background-color: var(--color-ink-reversed);
+      background-color: var(--color-ink-inverted);
       block-size: 1.35em;
       border-radius: 50%;
       content: "";
diff --git a/app/assets/stylesheets/lightbox.css b/app/assets/stylesheets/lightbox.css
index 6dabfefc4..a9cef43ad 100644
--- a/app/assets/stylesheets/lightbox.css
+++ b/app/assets/stylesheets/lightbox.css
@@ -2,7 +2,7 @@
   .lightbox {
     --backdrop-speed: 150ms;
 
-    background-color: oklch(var(--lch-white) / 0.66);
+    background-color: oklch(var(--lch-ink-inverted) / 0.66);
     block-size: 100dvh;
     border: 0;
     inline-size: 100dvw;
diff --git a/app/assets/stylesheets/notifications.css b/app/assets/stylesheets/notifications.css
index d8779c2e6..bf8575ed4 100644
--- a/app/assets/stylesheets/notifications.css
+++ b/app/assets/stylesheets/notifications.css
@@ -62,7 +62,7 @@
 
   .notification__unread_indicator {
     --btn-background: var(--color-marker);
-    --btn-border-color: var(--color-bg);
+    --btn-border-color: var(--color-canvas);
     --btn-icon-size: 0.7em;
     --btn-padding: 0;
     --btn-size: 1.2em;
diff --git a/app/assets/stylesheets/panels.css b/app/assets/stylesheets/panels.css
index 108d7c42a..8b3c23151 100644
--- a/app/assets/stylesheets/panels.css
+++ b/app/assets/stylesheets/panels.css
@@ -1,6 +1,6 @@
 @layer components {
   .panel {
-    background-color: var(--color-bg);
+    background-color: var(--color-canvas);
     border: var(--panel-border-size, 1px) solid var(--panel-border-color, var(--color-subtle));
     border-radius: var(--panel-border-radius, 1em);
     color: var(--color-ink);
diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css
index e42f2d3e7..b8e44d7e2 100644
--- a/app/assets/stylesheets/pins.css
+++ b/app/assets/stylesheets/pins.css
@@ -30,7 +30,7 @@
       --block-space-half: 0.5em;
       --text-xx-large: 2em;
 
-      border: 1px solid var(--color-bg);
+      border: 1px solid var(--color-canvas);
     }
 
     .card__collection {
diff --git a/app/assets/stylesheets/syntax.css b/app/assets/stylesheets/syntax.css
index 0fb7e193b..0e518edff 100644
--- a/app/assets/stylesheets/syntax.css
+++ b/app/assets/stylesheets/syntax.css
@@ -83,7 +83,7 @@
     }
 
     .err {
-      color: var(--color-ink-reversed);
+      color: var(--color-ink-inverted);
       background-color: var(--markup-deleted);
     }
 
diff --git a/app/assets/stylesheets/trays.css b/app/assets/stylesheets/trays.css
index c37c6ae9c..806ea2d61 100644
--- a/app/assets/stylesheets/trays.css
+++ b/app/assets/stylesheets/trays.css
@@ -65,7 +65,7 @@
     --hover-size: 0;
 
     align-items: center;
-    color: var(--color-ink-reversed);
+    color: var(--color-ink-inverted);
     display: flex;
     gap: var(--inline-space-half);
     justify-content: space-between;
diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css
index 6ec13a630..3ddbfb2ee 100644
--- a/app/assets/stylesheets/utilities.css
+++ b/app/assets/stylesheets/utilities.css
@@ -14,7 +14,7 @@
   .txt-align-end { text-align: end; }
 
   .txt-ink { color: var(--color-ink); }
-  .txt-reversed { color: var(--color-ink-reversed); }
+  .txt-reversed { color: var(--color-ink-inverted); }
   .txt-negative { color: var(--color-negative); }
   .txt-subtle { color: var(--color-subtle-dark); }
   .txt-alert { color: var(--color-marker); }
@@ -146,9 +146,9 @@
   .position-sticky { position: sticky; inset: var(--inset, 0 auto auto auto); z-index: var(--z, 1); }
 
   /* Fills */
-  .fill { background-color: var(--color-bg); }
+  .fill { background-color: var(--color-canvas); }
   .fill-black { background-color: var(--color-ink); }
-  .fill-white { background-color: var(--color-ink-reversed); }
+  .fill-white { background-color: var(--color-ink-inverted); }
   .fill-shade { background-color: var(--color-subtle-light); }
   .fill-selected { background-color: var(--color-selected); }
   .fill-highlight { background-color: var(--color-highlight); }
diff --git a/app/assets/stylesheets/workflows.css b/app/assets/stylesheets/workflows.css
index d69dbfe3b..ce36985de 100644
--- a/app/assets/stylesheets/workflows.css
+++ b/app/assets/stylesheets/workflows.css
@@ -20,7 +20,7 @@
   .workflow-stage--current {
     --btn-background: var(--card-color);
 
-    color: var(--color-ink-reversed);
+    color: var(--color-ink-inverted);
 
     @media (hover: hover) {
       &:hover {
@@ -33,7 +33,7 @@
 
       background: var(--card-color);
       border-radius: 0.2em;
-      color: var(--color-ink-reversed);
+      color: var(--color-ink-inverted);
     }
   }
 }
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index 58f84eb8f..0f55d47be 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -3,7 +3,7 @@
 
 <%= link_to link,
       class: "event event--#{ event.action } panel center center-block flex-inline align-start justify-start gap position-relative",
-      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
+      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-canvas));
   color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));",
       data: { related_element_target: "related",
               related_element_group_value: card.id,
diff --git a/public/406-unsupported-browser.html b/public/406-unsupported-browser.html
index 4af2887d3..93c900dad 100644
--- a/public/406-unsupported-browser.html
+++ b/public/406-unsupported-browser.html
@@ -12,17 +12,17 @@
     }
 
     body {
-      --lch-black: 0% 0 0;
+      --lch-ink: 0% 0 0;
       --lch-gray: 75% 0.005 96;
-      --lch-white: 100% 0 0;
+      --lch-ink-inverted: 100% 0 0;
 
       --color-border: oklch(var(--lch-gray));
-      --color-bg: oklch(var(--lch-white));
-      --color-text: oklch(var(--lch-black));
+      --color-canvas: oklch(var(--lch-ink-inverted));
+      --color-text: oklch(var(--lch-ink));
 
       --btn-size: 2.65em;
 
-      background-color: var(--color-bg);
+      background-color: var(--color-canvas);
       block-size: 100dvh;
       color: var(--color-text);
       display: grid;
@@ -32,9 +32,9 @@
       font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
 
       @media (prefers-color-scheme: dark) {
-        --lch-black: 100% 0 0;
-        --lch-gray: 44.95% 0 0;
-        --lch-white: 0% 0 0;
+        --lch-ink: 100% 0 0;
+        --lch-gray: 45% 0 0;
+        --lch-ink-inverted: 0% 0 0;
       }
     }
 
@@ -65,12 +65,12 @@
       inline-size: 30dvh;
 
       svg {
-        fill: var(--color-bg);
+        fill: var(--color-canvas);
         grid-area: 1/1;
         max-inline-size: 66%;
 
         @media (prefers-color-scheme: dark) {
-          fill: var(--color-bg);
+          fill: var(--color-canvas);
         }
       }
     }
@@ -91,7 +91,7 @@
     .btn {
       align-items: center;
       aspect-ratio: 1;
-      background-color: var(--color-bg);
+      background-color: var(--color-canvas);
       block-size: var(--btn-size);
       border-radius: 50%;
       border: 1px solid var(--color-border);

From b28f34dec6684857ed90f3101aeaacc96129def2 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 15:22:01 -0500
Subject: [PATCH 089/413] Convert LCH var names

---
 app/assets/stylesheets/_global.css   | 121 ++++++++++++++-------------
 app/assets/stylesheets/cards.css     |   2 +-
 app/assets/stylesheets/dialog.css    |   2 +-
 app/assets/stylesheets/terminals.css |   6 +-
 app/assets/stylesheets/trays.css     |   2 +-
 public/406-unsupported-browser.html  |   6 +-
 6 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 5252d7c47..6537bb8c3 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -23,78 +23,87 @@
   --border: 1px solid var(--color-subtle);
 
   /* Shadows */
-  --shadow: 0 0 0 1px oklch(var(--lch-always-black) / 0.02),
-            0 .2em 1.6em -0.8em oklch(var(--lch-always-black) / 0.2),
-            0 .4em 2.4em -1em oklch(var(--lch-always-black) / 0.3),
-            0 .4em .8em -1.2em oklch(var(--lch-always-black) / 0.4),
-            0 .8em 1.2em -1.6em oklch(var(--lch-always-black) / 0.5),
-            0 1.2em 1.6em -2em oklch(var(--lch-always-black) / 0.6);
+  --shadow: 0 0 0 1px oklch(var(--lch-black) / 0.02),
+            0 .2em 1.6em -0.8em oklch(var(--lch-black) / 0.2),
+            0 .4em 2.4em -1em oklch(var(--lch-black) / 0.3),
+            0 .4em .8em -1.2em oklch(var(--lch-black) / 0.4),
+            0 .8em 1.2em -1.6em oklch(var(--lch-black) / 0.5),
+            0 1.2em 1.6em -2em oklch(var(--lch-black) / 0.6);
 
   /* Components */
   --btn-size: 2.65em;
 
   /* Color values */
-  --lch-ink: 27.13% 0.1035 284.77;
-  --lch-ink-inverted: 100% 0 0;
+  --lch-black: 0% 0 0;
+  --lch-white: 100% 0 0;
 
-  --lch-gray-light: 96% 0.005 96;
-  --lch-gray: 92% 0.005 96;
-  --lch-gray-dark: 75% 0.005 96;
-  --lch-blue: 54% 0.15 255;
-  --lch-blue-light: 95% 0.03 255;
-  --lch-blue-dark: 80% 0.08 255;
-  --lch-golden: 83% 0.1128 72.43;
-  --lch-orange: 70% 0.2 44;
-  --lch-red: 51% 0.2 31;
-  --lch-green: 65.59% 0.234 142.49;
-  --lch-green-light: 95% 0.03 142.49;
-  --lch-yellow: 92.62% 0.1 91.5;
-  --lch-always-black: 0% 0 0;
-  --lch-always-white: 100% 0 0;
-  --lch-light-blue: 84.94% 0.048 216.62;
+  --lch-ink: 27.13% 0.1035 284.77;
+  --lch-ink-lightest: 96% 0.005 96;
+  --lch-ink-lighter: 92% 0.005 96;
+  --lch-ink-medium: 75% 0.005 96;
+
+  --lch-ink-inverted: var(--lch-white);
+
+  --lch-red-dark: 51% 0.2 31;
+  --lch-red-medium: 70% 0.2 44;
+
+  --lch-yellow-light: 83% 0.1128 72.43;
+  --lch-yellow-lighter: 92.62% 0.1 91.5;
+
+  --lch-green-medium: 65.59% 0.234 142.49;
+  --lch-green-lightest: 95% 0.03 142.49;
+
+  --lch-aqua-light: 84.94% 0.048 216.62;
+
+  --lch-blue-dark: 54% 0.15 255;
+  --lch-blue-light: 80% 0.08 255;
+  --lch-blue-lighter: 95% 0.03 255;
 
   /* Color abstractions */
+  --color-black: oklch(var(--lch-black));
+  --color-white: oklch(var(--lch-white));
+
+  --color-canvas: oklch(var(--lch-white));
+
   --color-ink: oklch(var(--lch-ink));
+
   --color-ink-inverted: oklch(var(--lch-ink-inverted));
-  --color-canvas: oklch(var(--lch-ink-inverted));
 
+  --color-negative: oklch(var(--lch-red-dark));
+  --color-positive: oklch(var(--lch-green-medium));
+  --color-positive-light: oklch(var(--lch-green-lightest));
 
-  --color-negative: oklch(var(--lch-red));
-  --color-positive: oklch(var(--lch-green));
-  --color-positive-light: oklch(var(--lch-green-light));
-  --color-link: oklch(var(--lch-blue));
-  --color-subtle-light: oklch(var(--lch-gray-light));
-  --color-subtle: oklch(var(--lch-gray));
-  --color-subtle-dark: oklch(var(--lch-gray-dark));
-  --color-selected: oklch(var(--lch-blue-light));
-  --color-selected-dark: oklch(var(--lch-blue-dark));
-  --color-highlight: oklch(var(--lch-yellow));
-  --color-marker: oklch(var(--lch-orange));
-  --color-always-black: oklch(var(--lch-always-black));
-  --color-always-white: oklch(var(--lch-always-white));
-  --color-container: oklch(var(--lch-light-blue));
-  --color-golden: oklch(var(--lch-golden));
+  --color-link: oklch(var(--lch-blue-dark));
+  --color-subtle-light: oklch(var(--lch-ink-lightest));
+  --color-subtle: oklch(var(--lch-ink-lighter));
+  --color-subtle-dark: oklch(var(--lch-ink-medium));
+  --color-selected: oklch(var(--lch-blue-lighter));
+  --color-selected-dark: oklch(var(--lch-blue-light));
+  --color-highlight: oklch(var(--lch-yellow-lighter));
+  --color-marker: oklch(var(--lch-red-medium));
+  --color-container: oklch(var(--lch-aqua-light));
+  --color-golden: oklch(var(--lch-yellow-light));
 
   @media (prefers-color-scheme: dark) {
     --lch-ink: 100% 0 0;
     --lch-ink-inverted: 0% 0 0;
-    --lch-gray-light: 25.2% 0 0;
-    --lch-gray: 30.12% 0 0;
-    --lch-gray-dark: 44.95% 0 0;
-    --lch-blue: 72.25% 0.16 248;
-    --lch-blue-light: 28.11% 0.053 248;
-    --lch-blue-dark: 42.25% 0.07 248;
-    --lch-red: 73.8% 0.184 29.18;
-    --lch-green: 75% 0.21 141.89;
-    --lch-green-light: 28.11% 0.02 142.49;
-    --lch-yellow: 40.9% 0.06 88.9;
-    --lch-light-blue: 20.62% 0.048 216.62;
+    --lch-ink-lightest: 25.2% 0 0;
+    --lch-ink-lighter: 30.12% 0 0;
+    --lch-ink-medium: 44.95% 0 0;
+    --lch-blue-dark: 72.25% 0.16 248;
+    --lch-blue-lighter: 28.11% 0.053 248;
+    --lch-blue-light: 42.25% 0.07 248;
+    --lch-red-dark: 73.8% 0.184 29.18;
+    --lch-green-medium: 75% 0.21 141.89;
+    --lch-green-lightest: 28.11% 0.02 142.49;
+    --lch-yellow-lighter: 40.9% 0.06 88.9;
+    --lch-aqua-light: 20.62% 0.048 216.62;
 
-    --shadow: 0 0 0 1px oklch(var(--lch-always-black) / 0.42),
-              0 .2em 1.6em -0.8em oklch(var(--lch-always-black) / 0.6),
-              0 .4em 2.4em -1em oklch(var(--lch-always-black) / 0.7),
-              0 .4em .8em -1.2em oklch(var(--lch-always-black) / 0.8),
-              0 .8em 1.2em -1.6em oklch(var(--lch-always-black) / 0.9),
-              0 1.2em 1.6em -2em oklch(var(--lch-always-black) / 1);
+    --shadow: 0 0 0 1px oklch(var(--lch-black) / 0.42),
+              0 .2em 1.6em -0.8em oklch(var(--lch-black) / 0.6),
+              0 .4em 2.4em -1em oklch(var(--lch-black) / 0.7),
+              0 .4em .8em -1.2em oklch(var(--lch-black) / 0.8),
+              0 .8em 1.2em -1.6em oklch(var(--lch-black) / 0.9),
+              0 1.2em 1.6em -2em oklch(var(--lch-black) / 1);
   }
 }
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 304ac51c2..a39b8b5ef 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -32,7 +32,7 @@
     --border-color: var(--color-canvas) !important;
 
     background-color: var(--color-canvas);
-    background-image: linear-gradient(90deg, oklch(var(--lch-golden) / 0.5) 0%, oklch(var(--lch-golden) / 0.1) 50%, oklch(var(--lch-golden) / 0.75) 100%);
+    background-image: linear-gradient(90deg, oklch(var(--lch-yellow-light) / 0.5) 0%, oklch(var(--lch-yellow-light) / 0.1) 50%, oklch(var(--lch-yellow-light) / 0.75) 100%);
     box-shadow:
       0 0 0.5em 0.2em var(--color-golden),
       0 0 1em 0.4em var(--color-golden) !important;
diff --git a/app/assets/stylesheets/dialog.css b/app/assets/stylesheets/dialog.css
index ea7e10e15..93d40ee1d 100644
--- a/app/assets/stylesheets/dialog.css
+++ b/app/assets/stylesheets/dialog.css
@@ -15,7 +15,7 @@
         transform var(--speed);
 
     &::backdrop {
-      background-color: var(--color-always-black);
+      background-color: var(--color-black);
       opacity: 0;
       transform: scale(1);
       transition:
diff --git a/app/assets/stylesheets/terminals.css b/app/assets/stylesheets/terminals.css
index d431d3cfa..cf60ed210 100644
--- a/app/assets/stylesheets/terminals.css
+++ b/app/assets/stylesheets/terminals.css
@@ -12,7 +12,7 @@
     z-index: 1;
 
     @media (prefers-color-scheme: dark) {
-      background-color: var(--color-always-black);
+      background-color: var(--color-black);
       border-block-start: 1px solid var(--color-subtle-dark);
     }
 
@@ -29,12 +29,12 @@
       font-family: inherit;
 
       &::placeholder {
-        color: var(--color-always-white);
+        color: var(--color-white);
         opacity: 0.5;
       }
 
       .terminal__link & {
-        color: var(--color-always-white);
+        color: var(--color-white);
         opacity: 0.5;
       }
     }
diff --git a/app/assets/stylesheets/trays.css b/app/assets/stylesheets/trays.css
index 806ea2d61..ecd042d1c 100644
--- a/app/assets/stylesheets/trays.css
+++ b/app/assets/stylesheets/trays.css
@@ -61,7 +61,7 @@
 
   .tray__actions {
     --border-style: dashed;
-    --border-color: color-mix(in srgb, var(--color-always-white) 40%, var(--color-ink));
+    --border-color: color-mix(in srgb, var(--color-white) 40%, var(--color-ink));
     --hover-size: 0;
 
     align-items: center;
diff --git a/public/406-unsupported-browser.html b/public/406-unsupported-browser.html
index 93c900dad..f78ac9454 100644
--- a/public/406-unsupported-browser.html
+++ b/public/406-unsupported-browser.html
@@ -13,10 +13,10 @@
 
     body {
       --lch-ink: 0% 0 0;
-      --lch-gray: 75% 0.005 96;
+      --lch-ink-lighter: 75% 0.005 96;
       --lch-ink-inverted: 100% 0 0;
 
-      --color-border: oklch(var(--lch-gray));
+      --color-border: oklch(var(--lch-ink-lighter));
       --color-canvas: oklch(var(--lch-ink-inverted));
       --color-text: oklch(var(--lch-ink));
 
@@ -33,7 +33,7 @@
 
       @media (prefers-color-scheme: dark) {
         --lch-ink: 100% 0 0;
-        --lch-gray: 45% 0 0;
+        --lch-ink-lighter: 45% 0 0;
         --lch-ink-inverted: 0% 0 0;
       }
     }

From 82c2c4b5bd25f20f4ce131068c69bfa4f0aa5f60 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 15:33:35 -0500
Subject: [PATCH 090/413] Add new light mode lch values

---
 app/assets/stylesheets/_global.css | 101 ++++++++++++++++++++++++-----
 1 file changed, 86 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 6537bb8c3..3c3d90a37 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -37,27 +37,98 @@
   --lch-black: 0% 0 0;
   --lch-white: 100% 0 0;
 
-  --lch-ink: 27.13% 0.1035 284.77;
-  --lch-ink-lightest: 96% 0.005 96;
-  --lch-ink-lighter: 92% 0.005 96;
-  --lch-ink-medium: 75% 0.005 96;
-
   --lch-ink-inverted: var(--lch-white);
 
-  --lch-red-dark: 51% 0.2 31;
-  --lch-red-medium: 70% 0.2 44;
+  --lch-ink-darkest: 32% 0.008 260;
+  --lch-ink-darker: 42% 0.007 260;
+  --lch-ink-dark: 56.5% 0.006 260;
+  --lch-ink-medium: 70% 0.005 260;
+  --lch-ink-light: 84% 0.004 260;
+  --lch-ink-lighter: 92% 0.003 260;
+  --lch-ink-lightest: 96% 0.002 260;
 
-  --lch-yellow-light: 83% 0.1128 72.43;
-  --lch-yellow-lighter: 92.62% 0.1 91.5;
+  --lch-uncolor-darkest: 32% 0.018 40;
+  --lch-uncolor-darker: 42% 0.03 50;
+  --lch-uncolor-dark: 58% 0.04 60;
+  --lch-uncolor-medium: 70% 0.044 70;
+  --lch-uncolor-light: 84% 0.028 80;
+  --lch-uncolor-lighter: 92% 0.014 90;
+  --lch-uncolor-lightest: 96% 0.012 100;
+
+  --lch-red-darkest: 32% 0.105 34;
+  --lch-red-darker: 43.1% 0.166 36;
+  --lch-red-dark: 59% 0.19 38;
+  --lch-red-medium: 70.4% 0.19 40;
+  --lch-red-light: 84% 0.07 42;
+  --lch-red-lighter: 92% 0.03 44;
+  --lch-red-lightest: 96% 0.013 48;
+
+  --lch-yellow-darkest: 32% 0.0729 40;
+  --lch-yellow-darker: 42% 0.124 50;
+  --lch-yellow-dark: 58% 0.156 60;
+  --lch-yellow-medium: 76% 0.17 70;
+  --lch-yellow-light: 84% 0.12 80;
+  --lch-yellow-lighter: 92% 0.076 90;
+  --lch-yellow-lightest: 96% 0.034 100;
+
+  --lch-lime-darkest: 32% 0.066 109;
+  --lch-lime-darker: 42% 0.104 110;
+  --lch-lime-dark: 56.5% 0.142 111;
+  --lch-lime-medium: 71% 0.158 112;
+  --lch-lime-light: 84% 0.08 113;
+  --lch-lime-lighter: 92% 0.046 114;
+  --lch-lime-lightest: 96% 0.034 115;
+
+  --lch-green-darkest: 32% 0.0705 149;
+  --lch-green-darker: 42% 0.12 148;
+  --lch-green-dark: 55.5% 0.162 147;
+  --lch-green-medium: 70% 0.19 146;
+  --lch-green-light: 84% 0.07 145;
+  --lch-green-lighter: 92% 0.044 144;
+  --lch-green-lightest: 96% 0.022 143;
+
+  --lch-aqua-darkest: 32% 0.059 214;
+  --lch-aqua-darker: 42% 0.097 212;
+  --lch-aqua-dark: 55.5% 0.122 210;
+  --lch-aqua-medium: 70% 0.13 208;
+  --lch-aqua-light: 84% 0.04 206;
+  --lch-aqua-lighter: 92% 0.02 204;
+  --lch-aqua-lightest: 96% 0.012 202;
+
+  --lch-blue-darkest: 32% 0.106 264;
+  --lch-blue-darker: 42% 0.166 262;
+  --lch-blue-dark: 57% 0.19 260;
+  --lch-blue-medium: 70% 0.169 258;
+  --lch-blue-light: 84% 0.06 256;
+  --lch-blue-lighter: 92% 0.026 254;
+  --lch-blue-lightest: 96% 0.016 252;
+
+  --lch-violet-darkest: 32% 0.144 292;
+  --lch-violet-darker: 42% 0.2 290;
+  --lch-violet-dark: 58% 0.216 288;
+  --lch-violet-medium: 70% 0.178 286;
+  --lch-violet-light: 84% 0.07 284.3;
+  --lch-violet-lighter: 92% 0.03 282;
+  --lch-violet-lightest: 96% 0.015 280;
+
+  --lch-purple-darkest: 32% 0.127 314;
+  --lch-purple-darker: 42% 0.178 312;
+  --lch-purple-dark: 58% 0.21 310;
+  --lch-purple-medium: 70% 0.22 308;
+  --lch-purple-light: 84% 0.07 306;
+  --lch-purple-lighter: 92% 0.03 304;
+  --lch-purple-lightest: 96% 0.019 302;
+
+  --lch-pink-darkest: 32% 0.12 348;
+  --lch-pink-darker: 42% 0.16 346;
+  --lch-pink-dark: 59% 0.188 344;
+  --lch-pink-medium: 70% 0.198 342;
+  --lch-pink-light: 84% 0.07 340;
+  --lch-pink-lighter: 92% 0.03 338;
+  --lch-pink-lightest: 96% 0.02 336;
 
-  --lch-green-medium: 65.59% 0.234 142.49;
-  --lch-green-lightest: 95% 0.03 142.49;
 
-  --lch-aqua-light: 84.94% 0.048 216.62;
 
-  --lch-blue-dark: 54% 0.15 255;
-  --lch-blue-light: 80% 0.08 255;
-  --lch-blue-lighter: 95% 0.03 255;
 
   /* Color abstractions */
   --color-black: oklch(var(--lch-black));

From ec7161bde5834ba283205a9780004e274425836b Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 15:42:17 -0500
Subject: [PATCH 091/413] Clean up abstractions

---
 app/assets/stylesheets/_global.css            | 27 ++++++++++---------
 app/assets/stylesheets/base.css               |  2 +-
 app/assets/stylesheets/buttons.css            |  2 +-
 app/assets/stylesheets/card-columns.css       | 10 +++----
 app/assets/stylesheets/cards.css              |  2 +-
 app/assets/stylesheets/comment-content.css    |  8 +++---
 app/assets/stylesheets/comments.css           |  2 +-
 app/assets/stylesheets/expander.css           |  2 +-
 app/assets/stylesheets/filters.css            |  2 +-
 app/assets/stylesheets/house.css              |  8 +++---
 app/assets/stylesheets/inputs.css             |  6 ++---
 app/assets/stylesheets/layout.css             |  4 +--
 app/assets/stylesheets/lightbox.css           |  2 +-
 app/assets/stylesheets/notifications.css      |  8 +++---
 app/assets/stylesheets/panels.css             |  4 +--
 app/assets/stylesheets/popup.css              |  4 +--
 app/assets/stylesheets/reactions.css          |  6 ++---
 app/assets/stylesheets/syntax.css             |  2 +-
 app/assets/stylesheets/terminals.css          |  2 +-
 app/assets/stylesheets/utilities.css          | 12 ++++-----
 app/views/collections/_access_toggle.erb      |  2 +-
 app/views/collections/edit.html.erb           |  4 +--
 app/views/events/index.html.erb               |  4 +--
 app/views/filters/_dialog.html.erb            |  2 +-
 .../settings/_collection.html.erb             |  2 +-
 app/views/tags/index.html.erb                 |  2 +-
 app/views/users/_user.html.erb                |  2 +-
 app/views/workflows/_workflow.html.erb        |  2 +-
 28 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 3c3d90a37..03d309bac 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -20,7 +20,7 @@
   --text-xx-large: 2.5rem;
 
   /* Borders */
-  --border: 1px solid var(--color-subtle);
+  --border: 1px solid var(--color-ink-lighter);
 
   /* Shadows */
   --shadow: 0 0 0 1px oklch(var(--lch-black) / 0.02),
@@ -127,27 +127,28 @@
   --lch-pink-lighter: 92% 0.03 338;
   --lch-pink-lightest: 96% 0.02 336;
 
-
-
-
-  /* Color abstractions */
+  /* Named colors */
   --color-black: oklch(var(--lch-black));
   --color-white: oklch(var(--lch-white));
 
-  --color-canvas: oklch(var(--lch-white));
-
-  --color-ink: oklch(var(--lch-ink));
+  --color-ink: oklch(var(--lch-ink-darkest));
+  --color-ink-darkest: oklch(var(--lch-ink-darkest));
+  --color-ink-darker: oklch(var(--lch-ink-darker));
+  --color-ink-dark: oklch(var(--lch-ink-dark));
+  --color-ink-medium: oklch(var(--lch-ink-medium));
+  --color-ink-light: oklch(var(--lch-ink-light));
+  --color-ink-lighter: oklch(var(--lch-ink-lighter));
+  --color-ink-lightest: oklch(var(--lch-ink-lightest));
 
   --color-ink-inverted: oklch(var(--lch-ink-inverted));
 
+  /* Color abstractions */
+  --color-canvas: oklch(var(--lch-white));
+
   --color-negative: oklch(var(--lch-red-dark));
-  --color-positive: oklch(var(--lch-green-medium));
-  --color-positive-light: oklch(var(--lch-green-lightest));
+  --color-positive: oklch(var(--lch-green-dark));
 
   --color-link: oklch(var(--lch-blue-dark));
-  --color-subtle-light: oklch(var(--lch-ink-lightest));
-  --color-subtle: oklch(var(--lch-ink-lighter));
-  --color-subtle-dark: oklch(var(--lch-ink-medium));
   --color-selected: oklch(var(--lch-blue-lighter));
   --color-selected-dark: oklch(var(--lch-blue-light));
   --color-highlight: oklch(var(--lch-yellow-lighter));
diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css
index 08368757e..6bebd44d5 100644
--- a/app/assets/stylesheets/base.css
+++ b/app/assets/stylesheets/base.css
@@ -11,7 +11,7 @@
     --font-sans: system-ui;
     --font-serif: ui-serif, serif;
     --font-mono: ui-monospace, monospace;
-    --hover-color: var(--color-subtle-dark);
+    --hover-color: var(--color-ink-medium);
     --hover-size: 0.15rem;
     --hover-filter: brightness(1);
 
diff --git a/app/assets/stylesheets/buttons.css b/app/assets/stylesheets/buttons.css
index fea991bff..f96449aae 100644
--- a/app/assets/stylesheets/buttons.css
+++ b/app/assets/stylesheets/buttons.css
@@ -6,7 +6,7 @@
     align-items: center;
     background-color: var(--btn-background, var(--color-canvas));
     border-radius: var(--btn-border-radius);
-    border: var(--btn-border-size, 1px) solid var(--btn-border-color, var(--color-subtle-dark));
+    border: var(--btn-border-size, 1px) solid var(--btn-border-color, var(--color-ink-medium));
     color: var(--btn-color, var(--color-ink));
     cursor: pointer;
     display: inline-flex;
diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index 268d82463..a1fc317b9 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -10,7 +10,7 @@
   }
 
   .card-columns {
-    border-block-start: 1px solid var(--color-subtle);
+    border-block-start: 1px solid var(--color-ink-lighter);
     display: grid;
     grid-template-columns: repeat(2, 50%);
     margin: auto;
@@ -78,11 +78,11 @@
       --text-small: 1.1em;
 
       background-color: var(--color-canvas);
-      box-shadow: 0 0 0 1px var(--color-subtle);
+      box-shadow: 0 0 0 1px var(--color-ink-lighter);
       line-height: 1.2;
 
       @media (prefers-color-scheme: dark) {
-        box-shadow: 0 0 0 1px var(--color-subtle-dark);
+        box-shadow: 0 0 0 1px var(--color-ink-medium);
       }
 
       .avatar {
@@ -92,7 +92,7 @@
     }
 
     .card--drafted {
-      --card-color: var(--color-subtle-dark) !important;
+      --card-color: var(--color-ink-medium) !important;
 
       border-color: var(--card-color) !important;
       border-style: dashed !important;
@@ -124,7 +124,7 @@
   /* -------------------------------------------------------------------------- */
 
   .cards--closed {
-    border-block-start: 1px solid var(--color-subtle);
+    border-block-start: 1px solid var(--color-ink-lighter);
     justify-content: center;
     flex-direction: row;
     flex-wrap: wrap;
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index a39b8b5ef..226ddc59d 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -24,7 +24,7 @@
     }
 
     @media (prefers-color-scheme: dark) {
-      --border-color: var(--color-subtle-dark);
+      --border-color: var(--color-ink-medium);
     }
   }
 
diff --git a/app/assets/stylesheets/comment-content.css b/app/assets/stylesheets/comment-content.css
index 9944ed45f..a11b8dbf8 100644
--- a/app/assets/stylesheets/comment-content.css
+++ b/app/assets/stylesheets/comment-content.css
@@ -27,7 +27,7 @@
     }
 
     :where(hr) {
-      border-color: var(--color-subtle-dark);
+      border-color: var(--color-ink-medium);
       border-style: var(--border-style, solid) none none;
       margin: 2lh auto;
     }
@@ -37,8 +37,8 @@
     }
 
     :is(pre, code, .pre, .code) {
-      background-color: var(--color-subtle-light);
-      border: 1px solid var(--color-subtle);
+      background-color: var(--color-ink-lightest);
+      border: 1px solid var(--color-ink-lighter);
       border-radius: 0.3em;
       font-family: var(--font-mono);
       font-size: 0.85em;
@@ -80,7 +80,7 @@
     }
 
     :where(table, th, td) {
-      border: 1px solid var(--color-subtle-dark);
+      border: 1px solid var(--color-ink-medium);
     }
 
     :where(table) {
diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 2db3016db..a22069fc9 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -63,7 +63,7 @@
   }
 
   .comment__content {
-    background-color: var(--color-subtle-light);
+    background-color: var(--color-ink-lightest);
     border-radius: 0.2em;
     padding:
       var(--comment-padding-block)
diff --git a/app/assets/stylesheets/expander.css b/app/assets/stylesheets/expander.css
index a1f6da0dc..291851b34 100644
--- a/app/assets/stylesheets/expander.css
+++ b/app/assets/stylesheets/expander.css
@@ -107,6 +107,6 @@
 
   &:hover,
   &:focus-visible {
-    background-color: oklch(var(--lch-ink-inverted) / 15%);
+    background-color: oklch(var(--lch-canvas) / 15%);
   }
 }
diff --git a/app/assets/stylesheets/filters.css b/app/assets/stylesheets/filters.css
index cf7c894f0..612a1b4a1 100644
--- a/app/assets/stylesheets/filters.css
+++ b/app/assets/stylesheets/filters.css
@@ -67,7 +67,7 @@
       block-size: 100%;
       border-block: 0;
       border-inline-end: 0;
-      border-inline-start: 1px solid var(--color-subtle);
+      border-inline-start: 1px solid var(--color-ink-lighter);
       content: "";
       display: inline-flex;
       inline-size: 0;
diff --git a/app/assets/stylesheets/house.css b/app/assets/stylesheets/house.css
index 429c0de0b..810fc7b17 100644
--- a/app/assets/stylesheets/house.css
+++ b/app/assets/stylesheets/house.css
@@ -13,7 +13,7 @@
   /* Toolbar */
   house-md-toolbar {
     background-color: inherit;
-    border-block-end: 1px solid var(--color-subtle-dark);
+    border-block-end: 1px solid var(--color-ink-medium);
     border-radius: 0;
     color: currentColor;
     display: inline-flex;
@@ -47,7 +47,7 @@
       }
 
       &:is(:focus, :hover) {
-        background-color: var(--color-subtle);
+        background-color: var(--color-ink-lighter);
       }
 
       &:is(:active) {
@@ -139,7 +139,7 @@
   .md-progress-bar {
     -webkit-appearance: none;
     appearance: none;
-    background-color: var(--color-subtle);
+    background-color: var(--color-ink-lighter);
     border-radius: 0.5em;
     block-size: 1ex;
     display: block;
@@ -154,7 +154,7 @@
 
     &::-webkit-progress-bar {
       border-radius: 0.5em;
-      background-color: var(--color-subtle);
+      background-color: var(--color-ink-lighter);
     }
 
     &::-webkit-progress-inner-element {
diff --git a/app/assets/stylesheets/inputs.css b/app/assets/stylesheets/inputs.css
index 781649ce5..341d9a059 100644
--- a/app/assets/stylesheets/inputs.css
+++ b/app/assets/stylesheets/inputs.css
@@ -4,7 +4,7 @@
     accent-color: var(--input-accent-color, var(--color-ink));
     background-color: var(--input-background, transparent);
     border-radius: var(--input-border-radius, 0.5em);
-    border: var(--input-border-size, 1px) solid var(--input-border-color, var(--color-subtle-dark));
+    border: var(--input-border-size, 1px) solid var(--input-border-color, var(--color-ink-medium));
     color: var(--input-color, var(--color-ink));
     font-size: max(16px, 1em);
     inline-size: 100%;
@@ -148,7 +148,7 @@
   }
 
   .switch__btn {
-    background-color: var(--color-subtle-dark);
+    background-color: var(--color-ink-medium);
     border-radius: 2em;
     cursor: pointer;
     inset: 0;
@@ -168,7 +168,7 @@
     }
 
     .switch__input:disabled + & {
-      background-color: var(--color-subtle-dark) !important;
+      background-color: var(--color-ink-medium) !important;
       cursor: not-allowed;
     }
 
diff --git a/app/assets/stylesheets/layout.css b/app/assets/stylesheets/layout.css
index c38100393..adbccc90f 100644
--- a/app/assets/stylesheets/layout.css
+++ b/app/assets/stylesheets/layout.css
@@ -53,7 +53,7 @@
         }
 
         a:not([class]) {
-          background-color: var(--color-subtle-light);
+          background-color: var(--color-ink-lightest);
           border-radius: 2em;
           color: var(--color-ink);
           font-weight: 500;
@@ -62,7 +62,7 @@
 
           @media (hover: hover) {
             &:hover {
-              background-color: var(--color-subtle);
+              background-color: var(--color-ink-lighter);
               text-decoration: none;
             }
           }
diff --git a/app/assets/stylesheets/lightbox.css b/app/assets/stylesheets/lightbox.css
index a9cef43ad..a8e41db2b 100644
--- a/app/assets/stylesheets/lightbox.css
+++ b/app/assets/stylesheets/lightbox.css
@@ -2,7 +2,7 @@
   .lightbox {
     --backdrop-speed: 150ms;
 
-    background-color: oklch(var(--lch-ink-inverted) / 0.66);
+    background-color: oklch(var(--lch-canvas) / 0.66);
     block-size: 100dvh;
     border: 0;
     inline-size: 100dvw;
diff --git a/app/assets/stylesheets/notifications.css b/app/assets/stylesheets/notifications.css
index bf8575ed4..a1bb0f911 100644
--- a/app/assets/stylesheets/notifications.css
+++ b/app/assets/stylesheets/notifications.css
@@ -46,11 +46,11 @@
     padding: var(--padding);
 
     @media (prefers-color-scheme: dark) {
-      --border-color: var(--color-subtle-dark);
+      --border-color: var(--color-ink-medium);
     }
 
     .notificiations-list--read & {
-      --border-color: var(--color-subtle);
+      --border-color: var(--color-ink-lighter);
 
       box-shadow: none !important;
     }
@@ -78,8 +78,8 @@
 
     @media (hover: hover) {
       &:hover {
-        --btn-background: var(--color-subtle-dark);
-        --btn-border-color: var(--color-subtle-dark);
+        --btn-background: var(--color-ink-medium);
+        --btn-border-color: var(--color-ink-medium);
 
         scale: 1;
 
diff --git a/app/assets/stylesheets/panels.css b/app/assets/stylesheets/panels.css
index 8b3c23151..863445f5c 100644
--- a/app/assets/stylesheets/panels.css
+++ b/app/assets/stylesheets/panels.css
@@ -1,7 +1,7 @@
 @layer components {
   .panel {
     background-color: var(--color-canvas);
-    border: var(--panel-border-size, 1px) solid var(--panel-border-color, var(--color-subtle));
+    border: var(--panel-border-size, 1px) solid var(--panel-border-color, var(--color-ink-lighter));
     border-radius: var(--panel-border-radius, 1em);
     color: var(--color-ink);
     inline-size: var(--panel-size, 60ch);
@@ -9,7 +9,7 @@
     padding: var(--panel-padding, calc(var(--block-space) * 2));
 
     @media (prefers-color-scheme: dark) {
-      --panel-border-color: var(--color-subtle-dark);
+      --panel-border-color: var(--color-ink-medium);
     }
   }
 }
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 5c8ec1b95..a9bccdf4d 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -17,7 +17,7 @@
   }
 
   .popup__item {
-    --btn-background: var(--color-subtle-light);
+    --btn-background: var(--color-ink-lightest);
     --btn-border-radius: 0.3em;
     --btn-border-size: 0;
     --btn-font-weight: 500;
@@ -29,7 +29,7 @@
 
     &::after {
       border-radius: var(--btn-border-radius);
-      border: var(--btn-border-size) solid var(--btn-border-color, var(--color-subtle));
+      border: var(--btn-border-size) solid var(--btn-border-color, var(--color-ink-lighter));
       content: "";
       display: block;
       inline-size: calc(100% - var(--btn-padding) * 2);
diff --git a/app/assets/stylesheets/reactions.css b/app/assets/stylesheets/reactions.css
index 9c0a4e410..7414bbcd8 100644
--- a/app/assets/stylesheets/reactions.css
+++ b/app/assets/stylesheets/reactions.css
@@ -1,7 +1,7 @@
 @layer components {
   .reactions {
     --column-gap: 0.4ch;
-    --reaction-border-color: var(--color-subtle);
+    --reaction-border-color: var(--color-ink-lighter);
     --row-gap: 0;
 
     margin-block-start: calc(var(--block-space-half) / 2);
@@ -30,7 +30,7 @@
 
     @media (any-hover: hover) {
       &:where(:not(:active):hover) {
-        --reaction-border-color: var(--color-subtle-dark);
+        --reaction-border-color: var(--color-ink-medium);
 
         box-shadow: 0 0 0 var(--hover-size) var(--hover-color);
       }
@@ -52,7 +52,7 @@
 
     @media (any-hover: hover) {
       &:where(:not(:active):hover) {
-        --reaction-border-color: var(--color-subtle-dark);
+        --reaction-border-color: var(--color-ink-medium);
       }
     }
   }
diff --git a/app/assets/stylesheets/syntax.css b/app/assets/stylesheets/syntax.css
index 0e518edff..7ddc2cf42 100644
--- a/app/assets/stylesheets/syntax.css
+++ b/app/assets/stylesheets/syntax.css
@@ -39,7 +39,7 @@
     }
 
     .gr {
-      color: var(--color-subtle-light);
+      color: var(--color-ink-lightest);
     }
 
     .gd {
diff --git a/app/assets/stylesheets/terminals.css b/app/assets/stylesheets/terminals.css
index cf60ed210..9bae337d7 100644
--- a/app/assets/stylesheets/terminals.css
+++ b/app/assets/stylesheets/terminals.css
@@ -13,7 +13,7 @@
 
     @media (prefers-color-scheme: dark) {
       background-color: var(--color-black);
-      border-block-start: 1px solid var(--color-subtle-dark);
+      border-block-start: 1px solid var(--color-ink-medium);
     }
 
     .terminal__input {
diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css
index 3ddbfb2ee..94a2badd7 100644
--- a/app/assets/stylesheets/utilities.css
+++ b/app/assets/stylesheets/utilities.css
@@ -16,7 +16,7 @@
   .txt-ink { color: var(--color-ink); }
   .txt-reversed { color: var(--color-ink-inverted); }
   .txt-negative { color: var(--color-negative); }
-  .txt-subtle { color: var(--color-subtle-dark); }
+  .txt-subtle { color: var(--color-ink-medium); }
   .txt-alert { color: var(--color-marker); }
   .txt-undecorated { text-decoration: none; }
   .txt-tight-lines { line-height: 1.2; }
@@ -149,7 +149,7 @@
   .fill { background-color: var(--color-canvas); }
   .fill-black { background-color: var(--color-ink); }
   .fill-white { background-color: var(--color-ink-inverted); }
-  .fill-shade { background-color: var(--color-subtle-light); }
+  .fill-shade { background-color: var(--color-ink-lightest); }
   .fill-selected { background-color: var(--color-selected); }
   .fill-highlight { background-color: var(--color-highlight); }
   .fill-transparent { background-color: transparent; }
@@ -157,10 +157,10 @@
   .translucent { opacity: var(--opacity, 0.66); }
 
   /* Borders */
-  .border { border: var(--border-size, 1px) var(--border-style, solid) var(--border-color, var(--color-subtle)); }
-  .border-block { border-block: var(--border-size, 1px) var(--border-style, solid) var(--border-color, var(--color-subtle)); }
-  .border-bottom { border-block-end: var(--border-size, 1px) var(--border-style, solid) var(--border-color, var(--color-subtle)); }
-  .border-top { border-block-start: var(--border-size, 1px) var(--border-style, solid) var(--border-color, var(--color-subtle)); }
+  .border { border: var(--border-size, 1px) var(--border-style, solid) var(--border-color, var(--color-ink-lighter)); }
+  .border-block { border-block: var(--border-size, 1px) var(--border-style, solid) var(--border-color, var(--color-ink-lighter)); }
+  .border-bottom { border-block-end: var(--border-size, 1px) var(--border-style, solid) var(--border-color, var(--color-ink-lighter)); }
+  .border-top { border-block-start: var(--border-size, 1px) var(--border-style, solid) var(--border-color, var(--color-ink-lighter)); }
   .borderless { border: 0; }
 
   /* Border radius */
diff --git a/app/views/collections/_access_toggle.erb b/app/views/collections/_access_toggle.erb
index aee7bb248..4e7171e07 100644
--- a/app/views/collections/_access_toggle.erb
+++ b/app/views/collections/_access_toggle.erb
@@ -9,7 +9,7 @@
     </div>
   </div>
 
-  <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true">
+  <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-ink-medium); --border-style: dashed" aria-hidden="true">
 
   <%= icon_tag "check", class: "toggler__visible-when-on" %>
 
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index a31b65d2b..970d1d3f9 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -35,7 +35,7 @@
             <div class="overflow-ellipsis fill-shade"><strong>Everyone</strong></div>
           </div>
 
-          <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true" />
+          <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-ink-medium); --border-style: dashed" aria-hidden="true" />
 
           <label for="collection_all_access" class="switch">
             <%= form.check_box :all_access, class: "switch__input", checked: @collection.all_access?, data: { action: "change->toggle-class#toggle" } %>
@@ -44,7 +44,7 @@
           </label>
         </li>
 
-        <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
+        <hr class="separator--horizontal full-width" style="--border-color: var(--color-ink-medium);" aria-hidden="true" />
 
         <% if User.active.count > 20 %>
           <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter">
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 8bcd35e80..86ba20d61 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -19,7 +19,7 @@
 <div class="events__container align-start gap">
   <div class="txt-align-start">
     <h2 class="txt-normal txt-uppercase txt-nowrap">Custom views</h2>
-    <div style="border-block-start: 1px solid var(--color-subtle); padding-block-start: var(--block-space-half);">
+    <div style="border-block-start: 1px solid var(--color-ink-lighter); padding-block-start: var(--block-space-half);">
       <% @filters.each do |filter| %>
         <h3 class="txt-small margin-block-end-half txt-tight-lines">
           <%= link_to filter.summary, cards_path(**filter.as_params) %>
@@ -43,7 +43,7 @@
       <% end %>
     </div>
 
-    <div style="border-block-start: 1px solid var(--color-subtle); padding-block-start: var(--block-space-half);">
+    <div style="border-block-start: 1px solid var(--color-ink-lighter); padding-block-start: var(--block-space-half);">
       <% @collections.each do |collection| %>
         <h3 class="txt-small margin-block-end-half txt-tight-lines"><%= link_to collection.name, cards_path(collection_ids: [ collection ]) %></h3>
       <% end %>
diff --git a/app/views/filters/_dialog.html.erb b/app/views/filters/_dialog.html.erb
index e20219364..c81aaf436 100644
--- a/app/views/filters/_dialog.html.erb
+++ b/app/views/filters/_dialog.html.erb
@@ -31,7 +31,7 @@
       <% end %>
     </div>
 
-    <%= form_with url: cards_path, id: :filter_form, method: :get, class: "flex flex-column gap full-width", style: "--border-color: var(--color-subtle)" do %>
+    <%= form_with url: cards_path, id: :filter_form, method: :get, class: "flex flex-column gap full-width", style: "--border-color: var(--color-ink-lighter)" do %>
       <% Array(params[:terms]).each do |term| %>
         <%= hidden_field_tag "terms[]", term, id: nil %>
       <% end %>
diff --git a/app/views/notifications/settings/_collection.html.erb b/app/views/notifications/settings/_collection.html.erb
index ad680363a..eb28e7ce8 100644
--- a/app/views/notifications/settings/_collection.html.erb
+++ b/app/views/notifications/settings/_collection.html.erb
@@ -4,7 +4,7 @@
       <%= collection.name %>
     </h2>
 
-    <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true">
+    <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-ink-medium); --border-style: dashed" aria-hidden="true">
 
     <label class="switch flex-item-no-shrink">
       <%= access_involvement_advance_button(collection, user) %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 0ca56680c..a89e94c86 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -2,7 +2,7 @@
   <h1>All tags</h1>
   <ul class="txt-align-start">
     <% @tags.each do |tag| %>
-      <li class="flex align-start justify-space-between gap pad" style="border-block-end: 1px solid var(--color-subtle)">
+      <li class="flex align-start justify-space-between gap pad" style="border-block-end: 1px solid var(--color-ink-lighter)">
         <span>
           <strong class="txt-nowrap"><%= tag.title %></strong>
         </span>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 950df8ccc..09374b344 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -5,7 +5,7 @@
     <%= link_to user.name, user, class: "txt-ink btn btn--plain" %>
   </strong>
 
-  <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true">
+  <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-ink-medium); --border-style: dashed" aria-hidden="true">
 
   <%= form_with model: user, url: user_role_path(user), data: { controller: "form" }, method: :patch do | form | %>
     <label class="btn txt-small flex-item-no-shrink" for="<%= dom_id(user, :role) %>" arial-label="Role: <%= user.admin? ? "Administrator" : "Member" %>">
diff --git a/app/views/workflows/_workflow.html.erb b/app/views/workflows/_workflow.html.erb
index 6ec1e289f..5cbf7d3e3 100644
--- a/app/views/workflows/_workflow.html.erb
+++ b/app/views/workflows/_workflow.html.erb
@@ -8,7 +8,7 @@
       <% end %>
     </div>
 
-    <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark);" aria-hidden="true">
+    <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-ink-medium);" aria-hidden="true">
 
     <div class="flex flex-column gap margin-block-start">
       <%= turbo_frame_tag dom_id(workflow, :stages) do %>

From 744b1b402ab5f526df5331928212d7491ab9399e Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 16:36:57 -0500
Subject: [PATCH 092/413] Add dark mode OKLCH values

---
 app/assets/stylesheets/_global.css | 137 +++++++++++++++++++++++------
 1 file changed, 108 insertions(+), 29 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 03d309bac..73d9f57b4 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -33,11 +33,12 @@
   /* Components */
   --btn-size: 2.65em;
 
-  /* Color values */
+  /* OKLCH colors: Fixed */
   --lch-black: 0% 0 0;
   --lch-white: 100% 0 0;
 
-  --lch-ink-inverted: var(--lch-white);
+  /* OKLCH colors: Light mode */
+  --lch-canvas: var(--lch-white);
 
   --lch-ink-darkest: 32% 0.008 260;
   --lch-ink-darker: 42% 0.007 260;
@@ -47,6 +48,8 @@
   --lch-ink-lighter: 92% 0.003 260;
   --lch-ink-lightest: 96% 0.002 260;
 
+  --lch-ink-inverted: var(--lch-white);
+
   --lch-uncolor-darkest: 32% 0.018 40;
   --lch-uncolor-darker: 42% 0.03 50;
   --lch-uncolor-dark: 58% 0.04 60;
@@ -127,7 +130,106 @@
   --lch-pink-lighter: 92% 0.03 338;
   --lch-pink-lightest: 96% 0.02 336;
 
-  /* Named colors */
+  @media (prefers-color-scheme: dark) {
+    --lch-canvas: 20% 0.0195 232.58;
+
+    --lch-ink-darkest: 96.02% 0.0034 260;
+    --lch-ink-darker: 86% 0.0061 260;
+    --lch-ink-dark: 73.97% 0.009 260;
+    --lch-ink-medium: 62% 0.0122 260;
+    --lch-ink-light: 40% 0.0148 260;
+    --lch-ink-lighter: 30% 0.0178 260;
+    --lch-ink-lightest: 25% 0.0204 260;
+
+    --lch-uncolor-darkest: 96.09% 0.0076 100;
+    --lch-uncolor-darker: 86% 0.021 90;
+    --lch-uncolor-dark: 73.93% 0.041 80;
+    --lch-uncolor-medium: 62% 0.0552 70;
+    --lch-uncolor-light: 40% 0.0387 60;
+    --lch-uncolor-lighter: 30% 0.012 50;
+    --lch-uncolor-lightest: 25% 0.0017 40;
+
+    --lch-red-darkest: 95.85% 0.0218 46;
+    --lch-red-darker: 86% 0.086 44;
+    --lch-red-dark: 73.95% 0.139 42;
+    --lch-red-medium: 62% 0.154 40;
+    --lch-red-light: 40% 0.088 38;
+    --lch-red-lighter: 30% 0.032 36;
+    --lch-red-lightest: 25% 0.011 34;
+
+    --lch-yellow-darkest: 96% 0.056 100;
+    --lch-yellow-darker: 86% 0.103 90;
+    --lch-yellow-dark: 74.06% 0.136 80;
+    --lch-yellow-medium: 62.1% 0.146 70;
+    --lch-yellow-light: 40% 0.0736 60;
+    --lch-yellow-lighter: 30% 0.026 50;
+    --lch-yellow-lightest: 25% 0.01 40;
+
+    --lch-lime-darkest: 96.04% 0.066 115;
+    --lch-lime-darker: 86% 0.098 114;
+    --lch-lime-dark: 73.97% 0.121 113;
+    --lch-lime-medium: 62% 0.128 112;
+    --lch-lime-light: 40% 0.0637 111;
+    --lch-lime-lighter: 30% 0.024 110;
+    --lch-lime-lightest: 25% 0.012 109;
+
+    --lch-green-darkest: 96.12% 0.035 143;
+    --lch-green-darker: 86% 0.082 144;
+    --lch-green-dark: 73.99% 0.117 145;
+    --lch-green-medium: 62% 0.1261 146;
+    --lch-green-light: 40% 0.065 147;
+    --lch-green-lighter: 30% 0.03 148;
+    --lch-green-lightest: 25% 0.018 149;
+
+    --lch-aqua-darkest: 96.15% 0.0244 202;
+    --lch-aqua-darker: 86% 0.06 204;
+    --lch-aqua-dark: 73.92% 0.095 206;
+    --lch-aqua-medium: 62% 0.106 208;
+    --lch-aqua-light: 40% 0.0594 210;
+    --lch-aqua-lighter: 30% 0.028 212;
+    --lch-aqua-lightest: 25% 0.017 214;
+
+    --lch-blue-darkest: 95.93% 0.0217 252;
+    --lch-blue-darker: 86% 0.068 254;
+    --lch-blue-dark: 74% 0.1293 256;
+    --lch-blue-medium: 62% 0.159 258;
+    --lch-blue-light: 40% 0.094 260;
+    --lch-blue-lighter: 30% 0.0452 262;
+    --lch-blue-lightest: 25% 0.0318 264;
+
+    --lch-violet-darkest: 95.97% 0.019 280;
+    --lch-violet-darker: 86% 0.068 282;
+    --lch-violet-dark: 74.08% 0.142 284;
+    --lch-violet-medium: 62% 0.184 286;
+    --lch-violet-light: 40% 0.108 288;
+    --lch-violet-lighter: 30% 0.048 290;
+    --lch-violet-lightest: 25% 0.025 292;
+
+    --lch-purple-darkest: 95.99% 0.0217 302;
+    --lch-purple-darker: 86% 0.068 304;
+    --lch-purple-dark: 73.98% 0.141 306;
+    --lch-purple-medium: 62% 0.177 308;
+    --lch-purple-light: 40% 0.099 310;
+    --lch-purple-lighter: 30% 0.04 312;
+    --lch-purple-lightest: 25% 0.017 314;
+
+    --lch-pink-darkest: 95.84% 0.0308 336;
+    --lch-pink-darker: 86% 0.074 338;
+    --lch-pink-dark: 74.04% 0.1294 340;
+    --lch-pink-medium: 62% 0.166 342;
+    --lch-pink-light: 40% 0.085 344;
+    --lch-pink-lighter: 30% 0.03 346;
+    --lch-pink-lightest: 25% 0.011 348;
+
+    --shadow: 0 0 0 1px oklch(var(--lch-black) / 0.42),
+              0 .2em 1.6em -0.8em oklch(var(--lch-black) / 0.6),
+              0 .4em 2.4em -1em oklch(var(--lch-black) / 0.7),
+              0 .4em .8em -1.2em oklch(var(--lch-black) / 0.8),
+              0 .8em 1.2em -1.6em oklch(var(--lch-black) / 0.9),
+              0 1.2em 1.6em -2em oklch(var(--lch-black) / 1);
+  }
+
+  /* Colors: Named */
   --color-black: oklch(var(--lch-black));
   --color-white: oklch(var(--lch-white));
 
@@ -142,8 +244,8 @@
 
   --color-ink-inverted: oklch(var(--lch-ink-inverted));
 
-  /* Color abstractions */
-  --color-canvas: oklch(var(--lch-white));
+  /* Colors: Abstractions */
+  --color-canvas: oklch(var(--lch-canvas));
 
   --color-negative: oklch(var(--lch-red-dark));
   --color-positive: oklch(var(--lch-green-dark));
@@ -153,29 +255,6 @@
   --color-selected-dark: oklch(var(--lch-blue-light));
   --color-highlight: oklch(var(--lch-yellow-lighter));
   --color-marker: oklch(var(--lch-red-medium));
-  --color-container: oklch(var(--lch-aqua-light));
+  --color-container: oklch(var(--lch-aqua-lighter));
   --color-golden: oklch(var(--lch-yellow-light));
-
-  @media (prefers-color-scheme: dark) {
-    --lch-ink: 100% 0 0;
-    --lch-ink-inverted: 0% 0 0;
-    --lch-ink-lightest: 25.2% 0 0;
-    --lch-ink-lighter: 30.12% 0 0;
-    --lch-ink-medium: 44.95% 0 0;
-    --lch-blue-dark: 72.25% 0.16 248;
-    --lch-blue-lighter: 28.11% 0.053 248;
-    --lch-blue-light: 42.25% 0.07 248;
-    --lch-red-dark: 73.8% 0.184 29.18;
-    --lch-green-medium: 75% 0.21 141.89;
-    --lch-green-lightest: 28.11% 0.02 142.49;
-    --lch-yellow-lighter: 40.9% 0.06 88.9;
-    --lch-aqua-light: 20.62% 0.048 216.62;
-
-    --shadow: 0 0 0 1px oklch(var(--lch-black) / 0.42),
-              0 .2em 1.6em -0.8em oklch(var(--lch-black) / 0.6),
-              0 .4em 2.4em -1em oklch(var(--lch-black) / 0.7),
-              0 .4em .8em -1.2em oklch(var(--lch-black) / 0.8),
-              0 .8em 1.2em -1.6em oklch(var(--lch-black) / 0.9),
-              0 1.2em 1.6em -2em oklch(var(--lch-black) / 1);
-  }
 }

From 8a6ffda4cf9be5c0e65b0e8f1b7dd8ed26344c83 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 16:40:05 -0500
Subject: [PATCH 093/413] Subtler borders for cards in dark mode

---
 app/assets/stylesheets/card-columns.css | 4 ----
 app/assets/stylesheets/cards.css        | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index a1fc317b9..ad64cda2d 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -81,10 +81,6 @@
       box-shadow: 0 0 0 1px var(--color-ink-lighter);
       line-height: 1.2;
 
-      @media (prefers-color-scheme: dark) {
-        box-shadow: 0 0 0 1px var(--color-ink-medium);
-      }
-
       .avatar {
         block-size: 2.75em;
         inline-size: 2.75em;
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 226ddc59d..794733da3 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -22,10 +22,6 @@
     .avatar {
       --avatar-size: 2.75em;
     }
-
-    @media (prefers-color-scheme: dark) {
-      --border-color: var(--color-ink-medium);
-    }
   }
 
   .card--golden.card--doing {

From 58b8fee20194acb6bc7a6c82b3e492bc6b249e71 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 16:49:28 -0500
Subject: [PATCH 094/413] FIx terminal colors

---
 app/assets/stylesheets/_global.css   | 65 ++++++++++++++--------------
 app/assets/stylesheets/terminals.css | 12 ++---
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 73d9f57b4..7ab0bc913 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -39,91 +39,90 @@
 
   /* OKLCH colors: Light mode */
   --lch-canvas: var(--lch-white);
-
-  --lch-ink-darkest: 32% 0.008 260;
-  --lch-ink-darker: 42% 0.007 260;
-  --lch-ink-dark: 56.5% 0.006 260;
-  --lch-ink-medium: 70% 0.005 260;
-  --lch-ink-light: 84% 0.004 260;
-  --lch-ink-lighter: 92% 0.003 260;
-  --lch-ink-lightest: 96% 0.002 260;
-
   --lch-ink-inverted: var(--lch-white);
 
-  --lch-uncolor-darkest: 32% 0.018 40;
-  --lch-uncolor-darker: 42% 0.03 50;
+  --lch-ink-darkest: 28% 0.008 264;
+  --lch-ink-darker: 40% 0.007 262;
+  --lch-ink-dark: 56.5% 0.006 260;
+  --lch-ink-medium: 70% 0.005 258;
+  --lch-ink-light: 84% 0.004 256;
+  --lch-ink-lighter: 92% 0.003 254;
+  --lch-ink-lightest: 96% 0.002 252;
+
+  --lch-uncolor-darkest: 28% 0.018 40;
+  --lch-uncolor-darker: 40% 0.03 50;
   --lch-uncolor-dark: 58% 0.04 60;
   --lch-uncolor-medium: 70% 0.044 70;
   --lch-uncolor-light: 84% 0.028 80;
   --lch-uncolor-lighter: 92% 0.014 90;
   --lch-uncolor-lightest: 96% 0.012 100;
 
-  --lch-red-darkest: 32% 0.105 34;
-  --lch-red-darker: 43.1% 0.166 36;
+  --lch-red-darkest: 28% 0.105 34;
+  --lch-red-darker: 40% 0.154 36;
   --lch-red-dark: 59% 0.19 38;
   --lch-red-medium: 70.4% 0.19 40;
   --lch-red-light: 84% 0.07 42;
   --lch-red-lighter: 92% 0.03 44;
-  --lch-red-lightest: 96% 0.013 48;
+  --lch-red-lightest: 96% 0.013 46;
 
-  --lch-yellow-darkest: 32% 0.0729 40;
-  --lch-yellow-darker: 42% 0.124 50;
+  --lch-yellow-darkest: 28% 0.0729 40;
+  --lch-yellow-darker: 40% 0.12 50;
   --lch-yellow-dark: 58% 0.156 60;
   --lch-yellow-medium: 76% 0.17 70;
   --lch-yellow-light: 84% 0.12 80;
   --lch-yellow-lighter: 92% 0.076 90;
   --lch-yellow-lightest: 96% 0.034 100;
 
-  --lch-lime-darkest: 32% 0.066 109;
-  --lch-lime-darker: 42% 0.104 110;
+  --lch-lime-darkest: 28% 0.066 109;
+  --lch-lime-darker: 40% 0.101 110;
   --lch-lime-dark: 56.5% 0.142 111;
   --lch-lime-medium: 71% 0.158 112;
   --lch-lime-light: 84% 0.08 113;
   --lch-lime-lighter: 92% 0.046 114;
   --lch-lime-lightest: 96% 0.034 115;
 
-  --lch-green-darkest: 32% 0.0705 149;
-  --lch-green-darker: 42% 0.12 148;
+  --lch-green-darkest: 28% 0.071 149;
+  --lch-green-darker: 40% 0.12 148;
   --lch-green-dark: 55.5% 0.162 147;
   --lch-green-medium: 70% 0.19 146;
   --lch-green-light: 84% 0.07 145;
   --lch-green-lighter: 92% 0.044 144;
   --lch-green-lightest: 96% 0.022 143;
 
-  --lch-aqua-darkest: 32% 0.059 214;
-  --lch-aqua-darker: 42% 0.097 212;
+  --lch-aqua-darkest: 28% 0.059 214;
+  --lch-aqua-darker: 40% 0.093 212;
   --lch-aqua-dark: 55.5% 0.122 210;
   --lch-aqua-medium: 70% 0.13 208;
   --lch-aqua-light: 84% 0.04 206;
   --lch-aqua-lighter: 92% 0.02 204;
   --lch-aqua-lightest: 96% 0.012 202;
 
-  --lch-blue-darkest: 32% 0.106 264;
-  --lch-blue-darker: 42% 0.166 262;
+  --lch-blue-darkest: 28% 0.126 264;
+  --lch-blue-darker: 40% 0.166 262;
   --lch-blue-dark: 57% 0.19 260;
   --lch-blue-medium: 70% 0.169 258;
   --lch-blue-light: 84% 0.06 256;
   --lch-blue-lighter: 92% 0.026 254;
   --lch-blue-lightest: 96% 0.016 252;
 
-  --lch-violet-darkest: 32% 0.144 292;
-  --lch-violet-darker: 42% 0.2 290;
+  --lch-violet-darkest: 28% 0.148 292;
+  --lch-violet-darker: 40% 0.2 290;
   --lch-violet-dark: 58% 0.216 288;
   --lch-violet-medium: 70% 0.178 286;
-  --lch-violet-light: 84% 0.07 284.3;
+  --lch-violet-light: 84% 0.07 284;
   --lch-violet-lighter: 92% 0.03 282;
   --lch-violet-lightest: 96% 0.015 280;
 
-  --lch-purple-darkest: 32% 0.127 314;
-  --lch-purple-darker: 42% 0.178 312;
+  --lch-purple-darkest: 28% 0.131 314;
+  --lch-purple-darker: 40% 0.178 312;
   --lch-purple-dark: 58% 0.21 310;
   --lch-purple-medium: 70% 0.22 308;
   --lch-purple-light: 84% 0.07 306;
   --lch-purple-lighter: 92% 0.03 304;
   --lch-purple-lightest: 96% 0.019 302;
 
-  --lch-pink-darkest: 32% 0.12 348;
-  --lch-pink-darker: 42% 0.16 346;
+  --lch-pink-darkest: 28% 0.12 348;
+  --lch-pink-darker: 40% 0.16 346;
   --lch-pink-dark: 59% 0.188 344;
   --lch-pink-medium: 70% 0.198 342;
   --lch-pink-light: 84% 0.07 340;
@@ -246,10 +245,8 @@
 
   /* Colors: Abstractions */
   --color-canvas: oklch(var(--lch-canvas));
-
   --color-negative: oklch(var(--lch-red-dark));
   --color-positive: oklch(var(--lch-green-dark));
-
   --color-link: oklch(var(--lch-blue-dark));
   --color-selected: oklch(var(--lch-blue-lighter));
   --color-selected-dark: oklch(var(--lch-blue-light));
@@ -257,4 +254,6 @@
   --color-marker: oklch(var(--lch-red-medium));
   --color-container: oklch(var(--lch-aqua-lighter));
   --color-golden: oklch(var(--lch-yellow-light));
+  --color-terminal-bg: oklch(var(--lch-blue-darkest));
+  --color-terminal-text: oklch(var(--lch-green-medium));
 }
diff --git a/app/assets/stylesheets/terminals.css b/app/assets/stylesheets/terminals.css
index 9bae337d7..a8f4636bb 100644
--- a/app/assets/stylesheets/terminals.css
+++ b/app/assets/stylesheets/terminals.css
@@ -2,8 +2,8 @@
   .terminal {
     --row-gap: 0.2lh;
 
-    background-color: var(--color-ink);
-    color: var(--color-positive);
+    background-color: var(--color-terminal-bg);
+    color: var(--color-terminal-text);
     font-family: var(--font-mono);
     font-size: var(--text-normal);
     inset: auto 0 0 0;
@@ -20,12 +20,12 @@
       --input-border-color: transparent;
       --input-border-radius: 0.3em;
       --hover-color: transparent;
-      --input-color: var(--color-positive);
+      --input-color: var(--color-terminal-text);
       --outline-size: 0;
       --outline-color: transparent;
 
-      accent-color: var(--color-positive);
-      caret-color: var(--color-positive);
+      accent-color: var(--color-terminal-text);
+      caret-color: var(--color-terminal-text);
       font-family: inherit;
 
       &::placeholder {
@@ -43,7 +43,7 @@
   .terminal__link {
     --hover-size: 0;
 
-    color: var(--color-positive);
+    color: var(--color-terminal-text);
   }
 
   .terminal__menu {

From b37a8e3f33e7482d47e32f78ae273c0828672404 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Apr 2025 16:54:11 -0500
Subject: [PATCH 095/413] Hide Previously Seen section when empty with CSS

---
 app/assets/stylesheets/notifications.css | 8 ++++++++
 app/views/notifications/index.html.erb   | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/notifications.css b/app/assets/stylesheets/notifications.css
index d8779c2e6..989d04773 100644
--- a/app/assets/stylesheets/notifications.css
+++ b/app/assets/stylesheets/notifications.css
@@ -94,3 +94,11 @@
     }
   }
 }
+
+.notificiations-list--read {
+  display: none;
+
+  &:has(.notification) {
+    display: flex;
+  }
+}
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index bf83657ee..917d3b0b5 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -23,14 +23,13 @@
     <%= render partial: "notifications/notification", collection: @unread, cached: true %>
   <% else %>
     <%# FIXME: Need to reveal this section if there are unread notification records in it %>
-    <div class="pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink); --border-radius: 0.2em;">
+    <div class="notifications--empty pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink); --border-radius: 0.2em;">
       <strong>Nothing new for you.</strong>
     </div>
   <% end %>
 </section>
 
-<%# FIXME: Need to hide this section if there are no notification records in it, but then it needs to appear when any are added %>
-<section class="notificiations-list--read panel center borderless unpad flex flex-column gap-half margin-block-start">
+<section class="notificiations-list--read panel center borderless unpad flex-column gap-half margin-block-start">
   <h2 class="txt-medium margin-block-start-double margin-block-end-half txt-uppercase translucent">Previously seen</h2>
 
   <div id="notifications_list_read">

From e16dc859e305e5a5f9df3f90968d300c72c51cb4 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Apr 2025 16:57:24 -0500
Subject: [PATCH 096/413] Display the empty message via CSS when there are no
 unread notifications

---
 app/assets/stylesheets/notifications.css | 6 ++++++
 app/views/notifications/index.html.erb   | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/notifications.css b/app/assets/stylesheets/notifications.css
index 989d04773..bc95412d7 100644
--- a/app/assets/stylesheets/notifications.css
+++ b/app/assets/stylesheets/notifications.css
@@ -95,6 +95,12 @@
   }
 }
 
+.notifications__empty-message {
+  .notificiations-list:has(.notification) & {
+    display: none;
+  }
+}
+
 .notificiations-list--read {
   display: none;
 
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 917d3b0b5..4b76c0779 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -13,7 +13,7 @@
   </nav>
 <% end %>
 
-<section class="panel center borderless unpad flex flex-column gap-half">
+<section class="notificiations-list panel center borderless unpad flex flex-column gap-half">
   <% if @unread.any? %>
     <div class="flex align-center justify-space-between margin-block-start margin-block-end-half">
       <h2 class="txt-medium txt-uppercase txt-alert">New for you</h2>
@@ -22,8 +22,7 @@
 
     <%= render partial: "notifications/notification", collection: @unread, cached: true %>
   <% else %>
-    <%# FIXME: Need to reveal this section if there are unread notification records in it %>
-    <div class="notifications--empty pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink); --border-radius: 0.2em;">
+    <div class="notifications__empty-message pad border-radius border translucent" style="--border-style: dashed; --border-color: var(--color-ink); --border-radius: 0.2em;">
       <strong>Nothing new for you.</strong>
     </div>
   <% end %>

From ffa0e2b5d0e7e7489f00d7a298fa9d6efc3cd948 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 16:59:01 -0500
Subject: [PATCH 097/413] Balance colors

---
 app/assets/stylesheets/_global.css | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 7ab0bc913..a385c0afd 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -41,23 +41,23 @@
   --lch-canvas: var(--lch-white);
   --lch-ink-inverted: var(--lch-white);
 
-  --lch-ink-darkest: 28% 0.008 264;
-  --lch-ink-darker: 40% 0.007 262;
-  --lch-ink-dark: 56.5% 0.006 260;
-  --lch-ink-medium: 70% 0.005 258;
-  --lch-ink-light: 84% 0.004 256;
+  --lch-ink-darkest: 26% 0.05 264;
+  --lch-ink-darker: 40% 0.026 262;
+  --lch-ink-dark: 57% 0.014 260;
+  --lch-ink-medium: 70% 0.008 258;
+  --lch-ink-light: 84% 0.005 256;
   --lch-ink-lighter: 92% 0.003 254;
   --lch-ink-lightest: 96% 0.002 252;
 
-  --lch-uncolor-darkest: 28% 0.018 40;
+  --lch-uncolor-darkest: 26% 0.018 40;
   --lch-uncolor-darker: 40% 0.03 50;
-  --lch-uncolor-dark: 58% 0.04 60;
+  --lch-uncolor-dark: 57% 0.04 60;
   --lch-uncolor-medium: 70% 0.044 70;
   --lch-uncolor-light: 84% 0.028 80;
   --lch-uncolor-lighter: 92% 0.014 90;
   --lch-uncolor-lightest: 96% 0.012 100;
 
-  --lch-red-darkest: 28% 0.105 34;
+  --lch-red-darkest: 26% 0.105 34;
   --lch-red-darker: 40% 0.154 36;
   --lch-red-dark: 59% 0.19 38;
   --lch-red-medium: 70.4% 0.19 40;
@@ -65,7 +65,7 @@
   --lch-red-lighter: 92% 0.03 44;
   --lch-red-lightest: 96% 0.013 46;
 
-  --lch-yellow-darkest: 28% 0.0729 40;
+  --lch-yellow-darkest: 26% 0.0729 40;
   --lch-yellow-darker: 40% 0.12 50;
   --lch-yellow-dark: 58% 0.156 60;
   --lch-yellow-medium: 76% 0.17 70;
@@ -73,7 +73,7 @@
   --lch-yellow-lighter: 92% 0.076 90;
   --lch-yellow-lightest: 96% 0.034 100;
 
-  --lch-lime-darkest: 28% 0.066 109;
+  --lch-lime-darkest: 26% 0.064 109;
   --lch-lime-darker: 40% 0.101 110;
   --lch-lime-dark: 56.5% 0.142 111;
   --lch-lime-medium: 71% 0.158 112;
@@ -81,15 +81,15 @@
   --lch-lime-lighter: 92% 0.046 114;
   --lch-lime-lightest: 96% 0.034 115;
 
-  --lch-green-darkest: 28% 0.071 149;
+  --lch-green-darkest: 26% 0.071 149;
   --lch-green-darker: 40% 0.12 148;
-  --lch-green-dark: 55.5% 0.162 147;
+  --lch-green-dark: 55% 0.162 147;
   --lch-green-medium: 70% 0.19 146;
   --lch-green-light: 84% 0.07 145;
   --lch-green-lighter: 92% 0.044 144;
   --lch-green-lightest: 96% 0.022 143;
 
-  --lch-aqua-darkest: 28% 0.059 214;
+  --lch-aqua-darkest: 26% 0.059 214;
   --lch-aqua-darker: 40% 0.093 212;
   --lch-aqua-dark: 55.5% 0.122 210;
   --lch-aqua-medium: 70% 0.13 208;
@@ -97,7 +97,7 @@
   --lch-aqua-lighter: 92% 0.02 204;
   --lch-aqua-lightest: 96% 0.012 202;
 
-  --lch-blue-darkest: 28% 0.126 264;
+  --lch-blue-darkest: 26% 0.126 264;
   --lch-blue-darker: 40% 0.166 262;
   --lch-blue-dark: 57% 0.19 260;
   --lch-blue-medium: 70% 0.169 258;
@@ -105,7 +105,7 @@
   --lch-blue-lighter: 92% 0.026 254;
   --lch-blue-lightest: 96% 0.016 252;
 
-  --lch-violet-darkest: 28% 0.148 292;
+  --lch-violet-darkest: 26% 0.148 292;
   --lch-violet-darker: 40% 0.2 290;
   --lch-violet-dark: 58% 0.216 288;
   --lch-violet-medium: 70% 0.178 286;
@@ -113,7 +113,7 @@
   --lch-violet-lighter: 92% 0.03 282;
   --lch-violet-lightest: 96% 0.015 280;
 
-  --lch-purple-darkest: 28% 0.131 314;
+  --lch-purple-darkest: 26% 0.131 314;
   --lch-purple-darker: 40% 0.178 312;
   --lch-purple-dark: 58% 0.21 310;
   --lch-purple-medium: 70% 0.22 308;
@@ -121,7 +121,7 @@
   --lch-purple-lighter: 92% 0.03 304;
   --lch-purple-lightest: 96% 0.019 302;
 
-  --lch-pink-darkest: 28% 0.12 348;
+  --lch-pink-darkest: 26% 0.12 348;
   --lch-pink-darker: 40% 0.16 346;
   --lch-pink-dark: 59% 0.188 344;
   --lch-pink-medium: 70% 0.198 342;
@@ -252,7 +252,7 @@
   --color-selected-dark: oklch(var(--lch-blue-light));
   --color-highlight: oklch(var(--lch-yellow-lighter));
   --color-marker: oklch(var(--lch-red-medium));
-  --color-container: oklch(var(--lch-aqua-lighter));
+  --color-container: oklch(var(--lch-aqua-light));
   --color-golden: oklch(var(--lch-yellow-light));
   --color-terminal-bg: oklch(var(--lch-blue-darkest));
   --color-terminal-text: oklch(var(--lch-green-medium));

From 03592223722b2fbd0e994be114a14df2f7927cb5 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 17:01:55 -0500
Subject: [PATCH 098/413] Subtler panel borders

---
 app/assets/stylesheets/panels.css    | 4 ----
 app/assets/stylesheets/terminals.css | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/panels.css b/app/assets/stylesheets/panels.css
index 863445f5c..6ce5e10b6 100644
--- a/app/assets/stylesheets/panels.css
+++ b/app/assets/stylesheets/panels.css
@@ -7,9 +7,5 @@
     inline-size: var(--panel-size, 60ch);
     max-inline-size: 100%;
     padding: var(--panel-padding, calc(var(--block-space) * 2));
-
-    @media (prefers-color-scheme: dark) {
-      --panel-border-color: var(--color-ink-medium);
-    }
   }
 }
diff --git a/app/assets/stylesheets/terminals.css b/app/assets/stylesheets/terminals.css
index a8f4636bb..cd310c2c1 100644
--- a/app/assets/stylesheets/terminals.css
+++ b/app/assets/stylesheets/terminals.css
@@ -13,7 +13,7 @@
 
     @media (prefers-color-scheme: dark) {
       background-color: var(--color-black);
-      border-block-start: 1px solid var(--color-ink-medium);
+      border-block-start: 1px solid var(--color-ink-lighter);
     }
 
     .terminal__input {

From eb539fce97b396c8538c825a481b48e44a72e102 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 17 Apr 2025 17:03:00 -0500
Subject: [PATCH 099/413] Subtler button borders in dark mode

---
 app/assets/stylesheets/buttons.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/buttons.css b/app/assets/stylesheets/buttons.css
index f96449aae..6ec87c99a 100644
--- a/app/assets/stylesheets/buttons.css
+++ b/app/assets/stylesheets/buttons.css
@@ -6,7 +6,7 @@
     align-items: center;
     background-color: var(--btn-background, var(--color-canvas));
     border-radius: var(--btn-border-radius);
-    border: var(--btn-border-size, 1px) solid var(--btn-border-color, var(--color-ink-medium));
+    border: var(--btn-border-size, 1px) solid var(--btn-border-color, var(--color-ink-light));
     color: var(--btn-color, var(--color-ink));
     cursor: pointer;
     display: inline-flex;

From c61fa77d6bdf8839bc4070ea309e1c0d355ccd10 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Apr 2025 17:03:18 -0500
Subject: [PATCH 100/413] Fix failing test (we're no longer redirecting here

See: #411
---
 test/controllers/cards_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/controllers/cards_controller_test.rb b/test/controllers/cards_controller_test.rb
index e794e7898..5272dc182 100644
--- a/test/controllers/cards_controller_test.rb
+++ b/test/controllers/cards_controller_test.rb
@@ -40,7 +40,7 @@ class CardsControllerTest < ActionDispatch::IntegrationTest
         image: fixture_file_upload("moon.jpg", "image/jpeg"),
         draft_comment: "Something more in-depth",
         tag_ids: [ tags(:mobile).id ] } }
-    assert_redirected_to collection_card_path(collections(:writebook), cards(:logo))
+    assert_response :success
 
     card = cards(:logo).reload
     assert_equal "Logo needs to change", card.title

From 026020c06e157eb5920c67bcea67c87c58c0c154 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Apr 2025 18:07:39 -0500
Subject: [PATCH 101/413] Restore drafted card state

---
 app/helpers/cards_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
index 028a4e715..31c370479 100644
--- a/app/helpers/cards_helper.rb
+++ b/app/helpers/cards_helper.rb
@@ -19,7 +19,8 @@ module CardsHelper
     classes = [
       options.delete(:class),
       ("card--golden" if card.golden?),
-      ("card--doing" if card.doing?)
+      ("card--doing" if card.doing?),
+      ("card--drafted" if card.drafted?)
     ].compact.join(" ")
 
     tag.article \

From e51dc10dc5caa885db51706412b4058af4d9fc56 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Apr 2025 18:07:56 -0500
Subject: [PATCH 102/413] Remove draft comments

---
 .../_description_as_draft_comment.html.erb    | 29 -------------------
 app/views/cards/show.html.erb                 |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 app/views/cards/_description_as_draft_comment.html.erb

diff --git a/app/views/cards/_description_as_draft_comment.html.erb b/app/views/cards/_description_as_draft_comment.html.erb
deleted file mode 100644
index 5e7a1cd71..000000000
--- a/app/views/cards/_description_as_draft_comment.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="comments pad-block">
-  <div class="comment comment--new flex-inline align-start full-width">
-    <figure class="comment__avatar flex-item-no-shrink" aria-hidden="true">
-      <%= avatar_tag Current.user, hidden_for_screen_reader: true %>
-    </figure>
-
-    <div class="comment__content flex-inline flex-column full-width">
-      <div class="comment__body txt-align-start">
-        <form data-controller="outlet-auto-save paste"
-              class="flex flex-column gap full-width"
-              data-outlet-auto-save-auto-save-outlet="#card_form"
-              data-action="paste->paste#pasteFiles">
-              <%= tag.house_md card.draft_comment, name: "card[draft_comment]", class: "input comment__input",
-                form: "card_form",
-                placeholder: new_comment_placeholder(card),
-                data: { action: "house-md:change->outlet-auto-save#change focusout->outlet-auto-save#submit", uploads_url: uploads_url(format: "json") } %>
-        </form>
-
-        <% if card.creating? %>
-          <div class="margin-block-start flex align-center gap">
-            <%= button_to "Create card", card_publish_path(card), class: "btn btn--reversed" %>
-            <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn" %>
-          </div>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index df993c968..56ca920bb 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -34,7 +34,5 @@
 
   <% if @card.published? %>
     <%= render "cards/messages", card: @card %>
-  <% else %>
-    <%= render "cards/description_as_draft_comment", card: @card %>
   <% end %>
 </div>

From 3a823cae7dd323e388c3fed85d9d0b6210f16c20 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Apr 2025 18:08:12 -0500
Subject: [PATCH 103/413] No more yellow highlight

---
 app/views/cards/display/common/_assignees.html.erb | 2 +-
 app/views/cards/display/perma/_tags.html.erb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/cards/display/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb
index 7cfa48447..c89cdcc57 100644
--- a/app/views/cards/display/common/_assignees.html.erb
+++ b/app/views/cards/display/common/_assignees.html.erb
@@ -4,7 +4,7 @@
   <% end %>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
-    <button class="btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
+    <button class="btn card__hide-on-index fill-transparent" data-action="click->dialog#open:stop">
       <%= icon_tag "person-add" %>
       <span class="for-screen-reader">Assign</span>
     </button>
diff --git a/app/views/cards/display/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb
index cecde410e..46e66c56e 100644
--- a/app/views/cards/display/perma/_tags.html.erb
+++ b/app/views/cards/display/perma/_tags.html.erb
@@ -12,7 +12,7 @@
   </div>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
-    <button class="tag-picker__button btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
+    <button class="tag-picker__button btn card__hide-on-index fill-transparent" data-action="click->dialog#open:stop">
       <%= icon_tag "tag" %>
       <span class="for-screen-reader">Add a tag</span>
     </button>

From bc5035c8f33606c57d74c4fc28f1db75269d0394 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Apr 2025 18:08:28 -0500
Subject: [PATCH 104/413] Remove shadow on drafted cards

---
 app/assets/stylesheets/card-columns.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index 022201a26..0b193b0d5 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -96,6 +96,7 @@
 
       border-color: var(--card-color) !important;
       border-style: dashed !important;
+      box-shadow: none !important;
     }
 
     .card__background {

From 0f3cb03bc48c68bdd8abc20b60c2c11fa704a003 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Apr 2025 18:09:03 -0500
Subject: [PATCH 105/413] Restore description field design clobbered in merge

---
 app/assets/stylesheets/card-perma.css       | 32 ++++----------------
 app/assets/stylesheets/cards.css            | 10 +++++++
 app/assets/stylesheets/comments.css         |  1 +
 app/views/cards/_container.html.erb         | 13 +++++++-
 app/views/cards/container/_closure.html.erb |  2 +-
 app/views/cards/container/_title.html.erb   | 33 ++++++++++++++-------
 app/views/cards/edit.html.erb               | 11 +++----
 7 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index af825bb32..4f25c7810 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -100,7 +100,7 @@
       z-index: 1;
     }
 
-    .btn:not(.popup__item, .btn--plain) {
+    .btn:not(.popup__item, .btn--plain, .btn--reversed) {
       --btn-background: var(--card-color);
       --btn-color: var(--color-ink-reversed);
     }
@@ -110,6 +110,11 @@
 
       text-decoration: underline;
     }
+
+    .btn--reversed {
+      --btn-background: var(--color-bg);
+      --btn-color: var(--card-color);
+    }
   }
 
   .card-perma__closure-message {
@@ -119,29 +124,4 @@
       padding-left: 1ch;
     }
   }
-
-  /* Variants
-  /* ------------------------------------------------------------------------ */
-
-  .card-perma--pointing {
-    --arrow-size: 20em;
-    --aspect-ratio: 7;
-
-    position: relative;
-    margin-block-end: calc(var(--arrow-size) / var(--aspect-ratio));
-
-    &::after {
-      aspect-ratio: var(--aspect-ratio);
-      background-color: var(--color-container);
-      clip-path: polygon(50% 100%, 100% 0, 0 0);
-      inline-size: var(--arrow-size);
-      content: "";
-      display: block;
-      inset-block-start: 99%;
-      inset-inline-start: 50%;
-      position: absolute;
-      transform: translateX(-50%);
-      z-index: -1;
-    }
-  }
 }
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index d8a484ab0..4be6b06ed 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -104,6 +104,16 @@
     .house-md-content {
       color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
     }
+
+    .house-md-content {
+      min-block-size: 3lh;
+      padding: var(--block-space-half) var(--inline-space) 0 0;
+    }
+
+    & ~ .btn {
+      --btn-background: var(--card-color);
+      --btn-color: var(--color-ink-reversed);
+    }
   }
 
   .card__title {
diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 2db3016db..5ac91e94e 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -68,6 +68,7 @@
     padding:
       var(--comment-padding-block)
       var(--comment-padding-inline);
+    word-wrap: break-word;
   }
 
   .comment__edit {
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index a817a21af..3a1620036 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -1,8 +1,14 @@
 <section id="<%= dom_id(card, :card_container) %>"
-    class="card-perma <%= "card-perma--pointing" unless card.published? %>" style="--card-color: <%= card.color %>;">
+    class="card-perma" style="--card-color: <%= card.color %>;">
   <%= render "cards/container/engagement", card: card %>
 
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
+    <% if card.published? %>
+      <%= link_to edit_collection_card_path(card.collection, card), class: "btn", data: { turbo_frame: dom_id(card, :edit) } do %>
+        <%= icon_tag "pencil" %>
+        <span class="for-screen-reader">Edit</span>
+      <% end %>
+    <% end %>
     <%= render "cards/container/gild", card: card if card.doing? %>
     <%= render "cards/container/image", card: card %>
 
@@ -39,5 +45,10 @@
     </aside>
 
     <%= render "cards/container/closure", card: card %>
+  <% elsif card.creating? %>
+    <div class="card-perma__notch card-perma__notch--bottom">
+      <%= button_to "Create card", card_publish_path(card), class: "btn" %>
+      <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn btn--reversed" %>
+    </div>
   <% end %>
 </section>
diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb
index 661b8edea..e9006f3aa 100644
--- a/app/views/cards/container/_closure.html.erb
+++ b/app/views/cards/container/_closure.html.erb
@@ -1,4 +1,4 @@
-<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(@card, :card_closure_toggle) %>" style="--card-color: <%= @card.color %>">
+<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(card, :card_closure_toggle) %>" style="--card-color: <%= card.color %>">
   <% if card.closed? %>
     <div class="flex gap-half margin-block-start-double margin-block-end">
       <span class="card-perma__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index b62eb2fb4..a959e888f 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -1,14 +1,27 @@
-<h1 class="card__title">
-  <% if card.published? %>
-    <%= turbo_frame_tag card, :edit do %>
-      <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link overflow-line-clamp" %>
-    <% end %>
-  <% else %>
-    <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", data: { controller: "auto-save" } do |form| %>
+<% if card.published? %>
+  <%= turbo_frame_tag card, :edit do %>
+    <div class="full-width">
+      <h1 class="card__title flex align-start gap-half">
+        <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link" %>
+      </h1>
+      <p class="card__description margin-block-half">
+        <%= sanitize card.description_html %>
+      </p>
+    </div>
+  <% end %>
+<% else %>
+  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "full-width", data: { controller: "auto-save" } do |form| %>
+    <h1 class="card__title">
       <%= form.text_area :title, placeholder: "Name it…",
-            class: "input input--textarea full-width borderless txt-align-start #{ "fill-highlight" if card.creating? }",
+            class: "input input--textarea full-width borderless txt-align-start",
             autofocus: card.title.blank?,
             data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
-    <% end %>
+    </h1>
+    <div class="card__description margin-block-half">
+      <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
+            placeholder: "Add some notes, context, pictures, or video about this…",
+            data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
+    </div>
+    <%= form.button "Save changes", type: :submit, class: "btn"%>
   <% end %>
-</h1>
+<% end %>
\ No newline at end of file
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index 9ebf63e8e..ad509b0e0 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -1,22 +1,19 @@
 <%= turbo_frame_tag @card, :edit do %>
   <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "full-width", data: { controller: "form paste" } do |form| %>
-    <h1 class="card__title flex align-start gap-half">
+    <h1 class="card__title">
       <%= form.label :title, class: "flex flex-column align-center" do %>
-        <%= form.text_area :title, class: "input input--textarea full-width borderless fill-white txt-align-start card-field__title",
+        <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card-field__title",
               required: true, autofocus: true, placeholder: "Name it…",
               rows: 1,
               data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" } %>
       <% end %>
-      <%= form.button type: :submit, class: "btn txt-small margin-block-start-half" do %>
-        <%= icon_tag "check" %>
-        <span class="for-screen-reader">Save</span>
-      <% end %>
     </h1>
     <div class="card__description margin-block-half">
-      <%= form.markdown_area :description, class: "input input--textarea full-width fill-white borderless txt-align-start card-field__description",
+      <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
     </div>
+    <%= form.button "Save changes", type: :submit, class: "btn"%>
     <%= link_to "Close editor and discard changes", collection_card_path(@card.collection, @card), data: { form_target: "cancel" }, hidden: true %>
   <% end %>
 <% end %>

From de23b4a866e1097f67092367d30b0ecf2113e7c2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Thu, 17 Apr 2025 16:07:33 +0200
Subject: [PATCH 106/413] Not needed for a single dependency

---
 app/views/cards/display/_preview.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 7d673308c..e1ed5b946 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -1,4 +1,4 @@
-<% cache [ card ] do %>
+<% cache card do %>
   <%= card_article_tag card, class: "card" do %>
     <header class="card__header flex align-center gap min-width">
       <span class="card__collection txt-uppercase overflow-ellipsis txt-reversed"><%= card.collection.name %></span>

From 7395d4e034f5729e708f6b6842a21840473b5da0 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 15:14:36 +0200
Subject: [PATCH 107/413] Removing the image can also just be done as a card
 replacement

---
 app/controllers/cards/images_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/cards/images_controller.rb b/app/controllers/cards/images_controller.rb
index fad419c52..f5a3f02b6 100644
--- a/app/controllers/cards/images_controller.rb
+++ b/app/controllers/cards/images_controller.rb
@@ -3,6 +3,6 @@ class Cards::ImagesController < ApplicationController
 
   def destroy
     @card.image.purge_later
-    redirect_to @card
+    render_card_replacement
   end
 end

From f3000a02c5411bf2c9225a534ea8a0d4ac5ead46 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 15:20:38 +0200
Subject: [PATCH 108/413] Follow render_card_replacement pattern

And clean up the rest of the implementation a tad.
---
 app/controllers/cards/pins_controller.rb      | 24 ++++++++++++-------
 app/views/cards/pins/create.turbo_stream.erb  |  1 -
 app/views/cards/pins/destroy.turbo_stream.erb |  1 -
 3 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 app/views/cards/pins/create.turbo_stream.erb
 delete mode 100644 app/views/cards/pins/destroy.turbo_stream.erb

diff --git a/app/controllers/cards/pins_controller.rb b/app/controllers/cards/pins_controller.rb
index 235393178..a4b49433f 100644
--- a/app/controllers/cards/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -5,21 +5,29 @@ class Cards::PinsController < ApplicationController
   end
 
   def create
-    pin = @card.pin_by Current.user
-    broadcast_add_to_tray pin
+    @pin = @card.pin_by Current.user
+
+    broadcast_add_pin_to_tray
+    render_pin_button_replacement
   end
 
   def destroy
-    pin = @card.unpin_by Current.user
-    broadcast_remove_from_tray pin
+    @pin = @card.unpin_by Current.user
+
+    broadcast_remove_pin_from_tray
+    render_pin_button_replacement
   end
 
   private
-    def broadcast_add_to_tray(pin)
-      pin.broadcast_prepend_to [ Current.user, :pins_tray ], target: "pins", partial: "my/pins/pin"
+    def broadcast_add_pin_to_tray
+      @pin.broadcast_prepend_to [ Current.user, :pins_tray ], target: "pins", partial: "my/pins/pin"
     end
 
-    def broadcast_remove_from_tray(pin)
-      pin.broadcast_remove_to [ Current.user, :pins_tray ]
+    def broadcast_remove_pin_from_tray
+      @pin.broadcast_remove_to [ Current.user, :pins_tray ]
+    end
+
+    def render_pin_button_replacement
+      turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin_button", locals: { card: @card }
     end
 end
diff --git a/app/views/cards/pins/create.turbo_stream.erb b/app/views/cards/pins/create.turbo_stream.erb
deleted file mode 100644
index b1dd787e9..000000000
--- a/app/views/cards/pins/create.turbo_stream.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin_button", locals: { card: @card } %>
diff --git a/app/views/cards/pins/destroy.turbo_stream.erb b/app/views/cards/pins/destroy.turbo_stream.erb
deleted file mode 100644
index d54dea5f1..000000000
--- a/app/views/cards/pins/destroy.turbo_stream.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render template: "cards/pins/create" %>

From 1026408736dc14d701208e5ef17b13b96528475e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 15:22:59 +0200
Subject: [PATCH 109/413] Need this for the draft header to be visible

---
 app/controllers/cards_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb
index 25428545f..eacc517b6 100644
--- a/app/controllers/cards_controller.rb
+++ b/app/controllers/cards_controller.rb
@@ -27,7 +27,12 @@ class CardsController < ApplicationController
 
   def update
     @card.update! card_params
-    render_card_replacement
+
+    if @card.published?
+      render_card_replacement
+    else
+      redirect_to @card
+    end
   end
 
   def destroy

From fd21838f887883d85b1a29084883014182472a6f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:06:30 +0200
Subject: [PATCH 110/413] Add assert_in_body helper

Coming upstream
---
 test/controllers/users_controller_test.rb |  6 +++---
 test/test_helper.rb                       | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index ff7ec0f2c..fad78128f 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -5,8 +5,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     sign_in_as :kevin
 
     get users_path
-    assert_match /#{users(:david).name}/, @response.body
-    assert_match /#{users(:kevin).name}/, @response.body
+    assert_in_body users(:david).name
+    assert_in_body users(:kevin).name
   end
 
   test "new" do
@@ -32,7 +32,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     sign_in_as :kevin
 
     get user_path(users(:david))
-    assert_match /#{users(:david).name}/, @response.body
+    assert_in_body users(:david).name
   end
 
   test "update oneself" do
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1447430b1..dd27bd4ca 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -11,5 +11,15 @@ module ActiveSupport
     fixtures :all
 
     include CardTestHelper, ChangeTestHelper, SessionTestHelper
+
+    # FIXME: Remove when upstream in Rails has landed (https://github.com/rails/rails/pull/54938)
+    def assert_in_body(text)
+      assert_match /#{text}/, @response.body
+    end
+
+    # FIXME: Remove when upstream in Rails has landed (https://github.com/rails/rails/pull/54938)
+    def assert_not_in_body(text)
+      assert_no_match /#{text}/, @response.body
+    end
   end
 end

From f6cd21f7cb9dd506127ccbd28d49640853fc1c67 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:07:01 +0200
Subject: [PATCH 111/413] Extract default stages into something that will be
 created together with a new Workflow in the model

---
 app/controllers/workflows_controller.rb       |  2 --
 app/models/workflow.rb                        | 10 ++++++++++
 test/controllers/workflows_controller_test.rb | 19 +++++++++++++++++++
 test/models/workflow_test.rb                  |  8 ++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 test/controllers/workflows_controller_test.rb
 create mode 100644 test/models/workflow_test.rb

diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 49abcd26f..f8b54254d 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -11,8 +11,6 @@ class WorkflowsController < ApplicationController
 
   def create
     @workflow = Workflow.create! workflow_params
-    # FIXME: this should definitely change.
-    [ "Triage", "In progress", "On Hold", "Review" ].each { |name| @workflow.stages.create! name: name }
     redirect_to workflows_path
   end
 
diff --git a/app/models/workflow.rb b/app/models/workflow.rb
index df896cf09..1812d7225 100644
--- a/app/models/workflow.rb
+++ b/app/models/workflow.rb
@@ -1,3 +1,13 @@
 class Workflow < ApplicationRecord
+  DEFAULT_STAGES = [ "Triage", "In progress", "On Hold", "Review" ]
+
   has_many :stages, dependent: :delete_all
+
+  after_create_commit :create_default_stages
+
+  private
+    def create_default_stages
+      Workflow::Stage.insert_all \
+        DEFAULT_STAGES.collect { |default_stage_name| { workflow_id: id , name: default_stage_name } }
+    end
 end
diff --git a/test/controllers/workflows_controller_test.rb b/test/controllers/workflows_controller_test.rb
new file mode 100644
index 000000000..392f6514b
--- /dev/null
+++ b/test/controllers/workflows_controller_test.rb
@@ -0,0 +1,19 @@
+require "test_helper"
+
+class WorkflowsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "index" do
+    get workflows_path
+    assert_in_body workflows(:on_call).name
+  end
+
+  test "create" do
+    assert_difference -> { Workflow.count }, +1 do
+      post workflows_path, params: { workflow: { name: "My new workflow!" } }
+      assert_redirected_to workflows_path
+    end
+  end
+end
diff --git a/test/models/workflow_test.rb b/test/models/workflow_test.rb
new file mode 100644
index 000000000..23239b3b4
--- /dev/null
+++ b/test/models/workflow_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class WorkflowTest < ActiveSupport::TestCase
+  test "create with default stages" do
+    workflow = Workflow.create name: "My New Workflow"
+    assert_equal Workflow::DEFAULT_STAGES.sort, workflow.stages.collect(&:name).sort
+  end
+end

From 7b0d3d033f864bba001e9e579d7a84ca3866ca02 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:08:53 +0200
Subject: [PATCH 112/413] Fix extra space

---
 app/models/workflow.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/workflow.rb b/app/models/workflow.rb
index 1812d7225..b1e1fdb22 100644
--- a/app/models/workflow.rb
+++ b/app/models/workflow.rb
@@ -8,6 +8,6 @@ class Workflow < ApplicationRecord
   private
     def create_default_stages
       Workflow::Stage.insert_all \
-        DEFAULT_STAGES.collect { |default_stage_name| { workflow_id: id , name: default_stage_name } }
+        DEFAULT_STAGES.collect { |default_stage_name| { workflow_id: id, name: default_stage_name } }
     end
 end

From 3003105ac9b78bce8c74a30c5613a513c7da54a0 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:16:04 +0200
Subject: [PATCH 113/413] Flesh out the rest of the controller tests

---
 test/controllers/workflows_controller_test.rb | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/test/controllers/workflows_controller_test.rb b/test/controllers/workflows_controller_test.rb
index 392f6514b..8d3d64c69 100644
--- a/test/controllers/workflows_controller_test.rb
+++ b/test/controllers/workflows_controller_test.rb
@@ -11,9 +11,33 @@ class WorkflowsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "create" do
+    get new_workflow_path
+    assert_response :success
+
     assert_difference -> { Workflow.count }, +1 do
       post workflows_path, params: { workflow: { name: "My new workflow!" } }
       assert_redirected_to workflows_path
     end
   end
+
+  test "show" do
+    get workflow_path(workflows(:on_call))
+    assert_in_body workflows(:on_call).name
+  end
+
+  test "update" do
+    get edit_workflow_path(workflows(:on_call))
+    assert_response :success
+
+    put workflow_path(workflows(:on_call)), params: { workflow: { name: "Monkeyflow!" } }
+    follow_redirect!
+    assert_in_body "Monkeyflow!"
+  end
+
+  test "destroy" do
+    assert_difference -> { Workflow.count }, -1 do
+      delete workflow_path(workflows(:on_call))
+      assert_redirected_to workflows_path
+    end
+  end
 end

From f594bc09a0b8cc1397835deb927b4d8e9bd6188a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:24:54 +0200
Subject: [PATCH 114/413] Simplify

This is coming straight from the form, unlikely to blow up
---
 app/controllers/collections/workflows_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/collections/workflows_controller.rb b/app/controllers/collections/workflows_controller.rb
index ae50b90f9..28b691f11 100644
--- a/app/controllers/collections/workflows_controller.rb
+++ b/app/controllers/collections/workflows_controller.rb
@@ -10,6 +10,6 @@ class Collections::WorkflowsController < ApplicationController
 
   private
     def set_workflow
-      @workflow = Workflow.find(params.expect(collection: [ :workflow_id ]).require(:workflow_id))
+      @workflow = Workflow.find(params[:collection][:workflow_id])
     end
 end

From 70275c9f04a8bb1d8cc3fd4e47646dd0bb0eb048 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:30:30 +0200
Subject: [PATCH 115/413] Yank Solid Queue from development

It clogs up the test log and occasionally causes the puma to hang when
you want to quit.
---
 bin/dev                            | 2 +-
 config/environments/development.rb | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/bin/dev b/bin/dev
index 1b7f220b2..f8d3f3df9 100755
--- a/bin/dev
+++ b/bin/dev
@@ -2,4 +2,4 @@
 
 echo "Starting Fizzy on http://development-tenant.fizzy.localhost:3006"
 
-SOLID_QUEUE_IN_PUMA=true exec ./bin/rails server -p 3006
+exec ./bin/rails server -p 3006
diff --git a/config/environments/development.rb b/config/environments/development.rb
index ac555fd16..7eba115d0 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -62,10 +62,6 @@ Rails.application.configure do
   # Highlight code that enqueued background job in logs.
   config.active_job.verbose_enqueue_logs = true
 
-  # Use Solid Queue in Development.
-  config.active_job.queue_adapter = :solid_queue
-  config.solid_queue.connects_to = { database: { writing: :queue } }
-
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 

From 9cea403acd30526f5dda98afeb4c5381c118e8f4 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:32:27 +0200
Subject: [PATCH 116/413] Make sure that any card getting read does not empty
 out the notifications tray

Since we wont rehydrate it
---
 app/controllers/notifications/trays_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/notifications/trays_controller.rb b/app/controllers/notifications/trays_controller.rb
index 4a01a1ee9..7c7a52bb3 100644
--- a/app/controllers/notifications/trays_controller.rb
+++ b/app/controllers/notifications/trays_controller.rb
@@ -1,5 +1,5 @@
 class Notifications::TraysController < ApplicationController
   def show
-    @notifications = Current.user.notifications.unread.ordered.limit(20)
+    @notifications = Current.user.notifications.unread.ordered.limit(100)
   end
 end

From c6f363c2813376aaac4d43b881d03b166e09b7df Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:42:35 +0200
Subject: [PATCH 117/413] Style

---
 app/helpers/workflows_helper.rb           | 9 +++------
 app/views/cards/stagings/_stages.html.erb | 4 +---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index b78482c9f..90f839cc6 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -1,13 +1,10 @@
 module WorkflowsHelper
   def button_to_set_stage(card, stage)
-    button_to card_stagings_path(card, stage_id: stage),
+    button_to \
+        tag.span(stage.name, class: "overflow-ellipsis"), card_stagings_path(card, stage_id: stage),
         method: :post, class: [ "btn justify-start workflow-stage txt-uppercase workflow-stage", { "workflow-stage--current": stage == card.stage } ],
         form_class: "flex align-center gap-half",
-        data: { turbo_frame: "_top" } do
-      tag.span class: "overflow-ellipsis" do
-        stage.name
-      end
-    end
+        data: { turbo_frame: "_top" }
   end
 
   def stage_color(stage)
diff --git a/app/views/cards/stagings/_stages.html.erb b/app/views/cards/stagings/_stages.html.erb
index 71885bce9..4cecdf637 100644
--- a/app/views/cards/stagings/_stages.html.erb
+++ b/app/views/cards/stagings/_stages.html.erb
@@ -1,6 +1,4 @@
-<% workflow = card.collection.workflow %>
-
-<% if workflow  %>
+<% if workflow = card.collection.workflow %>
   <div id="<%= dom_id(card, "stages") %>" class="card__stages">
     <% workflow.stages.each do |stage| %>
       <%= button_to_set_stage card, stage %>

From 406c764253f01133f5b81268e3fb87c201c46d81 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:46:20 +0200
Subject: [PATCH 118/413] Style

---
 app/views/cards/stagings/_stages.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/stagings/_stages.html.erb b/app/views/cards/stagings/_stages.html.erb
index 4cecdf637..ce0bbda4a 100644
--- a/app/views/cards/stagings/_stages.html.erb
+++ b/app/views/cards/stagings/_stages.html.erb
@@ -1,5 +1,5 @@
 <% if workflow = card.collection.workflow %>
-  <div id="<%= dom_id(card, "stages") %>" class="card__stages">
+  <div id="<%= dom_id(card, :stages) %>" class="card__stages">
     <% workflow.stages.each do |stage| %>
       <%= button_to_set_stage card, stage %>
     <% end %>

From 247524da2960a9d1797134f34b3df2ff577f8c64 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:47:53 +0200
Subject: [PATCH 119/413] Stlye

---
 app/helpers/workflows_helper.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 90f839cc6..1bbed5c32 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -1,10 +1,12 @@
 module WorkflowsHelper
   def button_to_set_stage(card, stage)
     button_to \
-        tag.span(stage.name, class: "overflow-ellipsis"), card_stagings_path(card, stage_id: stage),
-        method: :post, class: [ "btn justify-start workflow-stage txt-uppercase workflow-stage", { "workflow-stage--current": stage == card.stage } ],
-        form_class: "flex align-center gap-half",
-        data: { turbo_frame: "_top" }
+      tag.span(stage.name, class: "overflow-ellipsis"),
+      card_stagings_path(card, stage_id: stage),
+      method: :post,
+      class: [ "btn justify-start workflow-stage txt-uppercase workflow-stage", { "workflow-stage--current": stage == card.stage } ],
+      form_class: "flex align-center gap-half",
+      data: { turbo_frame: "_top" }
   end
 
   def stage_color(stage)

From 9aef965db8ea4dbf9ba717e5cf89bb70360974b0 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:49:36 +0200
Subject: [PATCH 120/413] No longer used

I assume it was from the old bubble design
---
 .../controllers/animation_controller.js       | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 app/javascript/controllers/animation_controller.js

diff --git a/app/javascript/controllers/animation_controller.js b/app/javascript/controllers/animation_controller.js
deleted file mode 100644
index f63d36e97..000000000
--- a/app/javascript/controllers/animation_controller.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-import { nextFrame } from "helpers/timing_helpers"
-
-export default class extends Controller {
-  static classes = [ "play" ]
-  static values = { playOnLoad: { type: Boolean, default: false } }
-
-  connect() {
-    if (this.playOnLoadValue) {
-      this.play()
-    }
-  }
-
-  async play() {
-    await nextFrame()
-    this.element.classList.remove(this.playClass)
-    this.#forceReflow()
-    this.element.classList.add(this.playClass)
-  }
-
-  #forceReflow() {
-    this.element.offsetWidth
-  }
-}

From c65639a3ce7c5d0a63f2853bdd5f487dcc5124b2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 16:52:55 +0200
Subject: [PATCH 121/413] No longer used

Seemed to have been used for an old combobox design
---
 .../controllers/autofocus_controller.js          | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 app/javascript/controllers/autofocus_controller.js

diff --git a/app/javascript/controllers/autofocus_controller.js b/app/javascript/controllers/autofocus_controller.js
deleted file mode 100644
index 75e5c4de9..000000000
--- a/app/javascript/controllers/autofocus_controller.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = [ "element" ]
-
-  connect() {
-    this.observer = new IntersectionObserver(([entry]) => {
-      if (entry.isIntersecting) this.elementTarget.focus()
-    })
-    this.observer.observe(this.elementTarget)
-  }
-
-  disconnect() {
-    this.observer.disconnect()
-  }
-}

From 3eeb121ea1cd10e3ee13e90a23270bb8747b615f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 17:00:13 +0200
Subject: [PATCH 122/413] Cards are no longer resized on the basis of activity
 scores

---
 .../controllers/card_size_controller.js       | 43 -------------------
 .../cards/index/engagement/_doing.html.erb    |  2 +-
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 app/javascript/controllers/card_size_controller.js

diff --git a/app/javascript/controllers/card_size_controller.js b/app/javascript/controllers/card_size_controller.js
deleted file mode 100644
index e688358da..000000000
--- a/app/javascript/controllers/card_size_controller.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-const SIZES = [ "one", "two", "three", "four", "five" ]
-
-export default class extends Controller {
-  static targets = [ "card" ]
-
-  connect() {
-    this.resize()
-  }
-
-  resize() {
-    const [ min, max ] = this.#getScoreRange()
-
-    this.cardTargets.forEach(card => {
-      const score = this.#currentCardScore(card)
-      const idx = Math.round((score - min) / (max - min) * (SIZES.length - 1))
-
-      card.style.setProperty("--card-size", `var(--card-size-${SIZES[idx]})`)
-    })
-  }
-
-  #getScoreRange() {
-    var min = 0, max = 1;
-
-    this.cardTargets.forEach(card => {
-      const score = this.#currentCardScore(card)
-
-      min = Math.min(min, score)
-      max = Math.max(max, score)
-    })
-
-    return [ min, max ]
-  }
-
-  #currentCardScore(el) {
-    const score = el.dataset.activityScore
-    const scoreAt = el.dataset.activityScoreAt
-    const daysAgo = (Date.now() / 1000 - scoreAt) / (60 * 60 * 24)
-
-    return score / (2**daysAgo)
-  }
-}
diff --git a/app/views/cards/index/engagement/_doing.html.erb b/app/views/cards/index/engagement/_doing.html.erb
index e59c70700..216866e85 100644
--- a/app/views/cards/index/engagement/_doing.html.erb
+++ b/app/views/cards/index/engagement/_doing.html.erb
@@ -1,4 +1,4 @@
-<section id="doing-cards" class="cards cards--doing" style="view-transition-name: cards-container;" data-controller="card-size" data-action="turbo:morph@window->card-size#resize">
+<section id="doing-cards" class="cards cards--doing" style="view-transition-name: cards-container;">
   <% if workflow = filter.single_workflow %>
     <%= render "cards/index/workflow_filter", workflow: workflow, filter: filter %>
   <% else %>

From 1114679c2019f1d2908ab0b20b2fee8999b986ff Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 17:05:17 +0200
Subject: [PATCH 123/413] Remove activity score columns

---
 ...250418150259_remove_activity_from_cards.rb |   8 ++
 db/schema.rb                                  |   6 +-
 db/schema_cache.yml                           | 120 +++++-------------
 test/fixtures/cards.yml                       |   2 -
 4 files changed, 42 insertions(+), 94 deletions(-)
 create mode 100644 db/migrate/20250418150259_remove_activity_from_cards.rb

diff --git a/db/migrate/20250418150259_remove_activity_from_cards.rb b/db/migrate/20250418150259_remove_activity_from_cards.rb
new file mode 100644
index 000000000..f8910ea9b
--- /dev/null
+++ b/db/migrate/20250418150259_remove_activity_from_cards.rb
@@ -0,0 +1,8 @@
+class RemoveActivityFromCards < ActiveRecord::Migration[8.1]
+  def change
+    remove_index :cards, :activity_score_order
+    remove_column :cards, :activity_score_order
+    remove_column :cards, :activity_score_at
+    remove_column :cards, :activity_score
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 06a8eb245..3a56a34ae 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_15_131804) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -108,9 +108,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_15_131804) do
   end
 
   create_table "cards", force: :cascade do |t|
-    t.float "activity_score", default: 0.0, null: false
-    t.datetime "activity_score_at"
-    t.float "activity_score_order", default: 0.0, null: false
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
     t.integer "creator_id", null: false
@@ -120,7 +117,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_15_131804) do
     t.text "status", default: "creating", null: false
     t.string "title"
     t.datetime "updated_at", null: false
-    t.index ["activity_score_order"], name: "index_cards_on_activity_score_order"
     t.index ["collection_id"], name: "index_cards_on_collection_id"
     t.index ["last_active_at", "status"], name: "index_cards_on_last_active_at_and_status"
     t.index ["stage_id"], name: "index_cards_on_stage_id"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index f662880fe..8152c393d 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -21,7 +21,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &24 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &22 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: collection_id
     cast_type: *1
@@ -80,7 +80,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_id
     cast_type: *1
@@ -374,47 +374,9 @@ columns:
   - *9
   cards:
   - *5
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: activity_score
-    cast_type: &22 !ruby/object:ActiveModel::Type::Float
-      precision:
-      scale:
-      limit:
-    sql_type_metadata: &23 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
-      sql_type: float
-      type: :float
-      limit:
-      precision:
-      scale:
-    'null': false
-    default: 0.0
-    default_function:
-    collation:
-    comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: activity_score_at
-    cast_type: *3
-    sql_type_metadata: *4
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: activity_score_order
-    cast_type: *22
-    sql_type_metadata: *23
-    'null': false
-    default: 0.0
-    default_function:
-    collation:
-    comment:
-  - *24
+  - *22
   - *6
-  - &25 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &23 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: creator_id
     cast_type: *1
@@ -427,12 +389,12 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: due_on
-    cast_type: &26 !ruby/object:ActiveRecord::Type::Date
+    cast_type: &24 !ruby/object:ActiveRecord::Type::Date
       precision:
       scale:
       limit:
       timezone:
-    sql_type_metadata: &27 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &25 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: date
       type: :date
       limit:
@@ -473,7 +435,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &32 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: title
     cast_type: *7
@@ -528,11 +490,11 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: all_access
-    cast_type: &33 !ruby/object:ActiveModel::Type::Boolean
+    cast_type: &31 !ruby/object:ActiveModel::Type::Boolean
       precision:
       scale:
       limit:
-    sql_type_metadata: &34 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &32 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: boolean
       type: :boolean
       limit:
@@ -544,7 +506,7 @@ columns:
     collation:
     comment:
   - *6
-  - *25
+  - *23
   - *10
   - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -558,15 +520,15 @@ columns:
     collation:
     comment:
   collections_filters:
-  - *24
+  - *22
   - *18
   comments:
   - *5
   - *6
-  - *25
+  - *23
   - *9
   creators_filters:
-  - *25
+  - *23
   - *18
   event_summaries:
   - *5
@@ -586,12 +548,12 @@ columns:
     comment:
   - *21
   - *6
-  - *25
+  - *23
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: due_date
-    cast_type: *26
-    sql_type_metadata: *27
+    cast_type: *24
+    sql_type_metadata: *25
     'null': true
     default:
     default_function:
@@ -600,11 +562,11 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: particulars
-    cast_type: &28 !ruby/object:ActiveRecord::Type::Json
+    cast_type: &26 !ruby/object:ActiveRecord::Type::Json
       precision:
       scale:
       limit:
-    sql_type_metadata: &29 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &27 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: json
       type: :json
       limit:
@@ -629,12 +591,12 @@ columns:
   filters:
   - *5
   - *6
-  - *25
+  - *23
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: fields
-    cast_type: *28
-    sql_type_metadata: *29
+    cast_type: *26
+    sql_type_metadata: *27
     'null': false
     default: "{}"
     default_function:
@@ -665,7 +627,7 @@ columns:
     comment:
   filters_tags:
   - *18
-  - &31 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: tag_id
     cast_type: *1
@@ -745,13 +707,13 @@ columns:
     collation:
     comment:
   - *9
-  - *30
+  - *28
   pins:
   - *5
   - *21
   - *6
   - *9
-  - *30
+  - *28
   reactions:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -831,25 +793,25 @@ columns:
     default_function:
     collation:
     comment:
-  - *30
+  - *28
   taggings:
   - *5
   - *21
   - *6
-  - *31
+  - *29
   - *9
   tags:
   - *5
   - *6
-  - *32
+  - *30
   - *9
   users:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: active
-    cast_type: *33
-    sql_type_metadata: *34
+    cast_type: *31
+    sql_type_metadata: *32
     'null': false
     default: true
     default_function:
@@ -893,12 +855,12 @@ columns:
   - *21
   - *6
   - *9
-  - *30
+  - *28
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: watching
-    cast_type: *33
-    sql_type_metadata: *34
+    cast_type: *31
+    sql_type_metadata: *32
     'null': false
     default: true
     default_function:
@@ -1350,22 +1312,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: cards
-    name: index_cards_on_activity_score_order
-    unique: false
-    columns:
-    - activity_score_order
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   closure_reasons: []
   closures:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
@@ -1992,4 +1938,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250415131804
+version: 20250418150259
diff --git a/test/fixtures/cards.yml b/test/fixtures/cards.yml
index f49179eb3..c8dc163a3 100644
--- a/test/fixtures/cards.yml
+++ b/test/fixtures/cards.yml
@@ -4,7 +4,6 @@ logo:
   title: The logo isn't big enough
   due_on: <%= 3.days.from_now %>
   created_at: <%= 1.week.ago %>
-  activity_score: 7
   status: published
   last_active_at: <%= Time.current %>
 
@@ -13,7 +12,6 @@ layout:
   creator: david
   title: Layout is broken
   created_at: <%= 1.week.ago %>
-  activity_score: 1
   status: published
   last_active_at: <%= Time.current %>
 

From 7c76bdd96d425646acea57e8d1ec1c984a78356d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 17:07:36 +0200
Subject: [PATCH 124/413] Drop Scorable concern

---
 app/models/card.rb                | 13 +++----
 app/models/card/scorable.rb       | 64 -------------------------------
 test/models/card/scorable_test.rb | 12 ------
 3 files changed, 6 insertions(+), 83 deletions(-)
 delete mode 100644 app/models/card/scorable.rb
 delete mode 100644 test/models/card/scorable_test.rb

diff --git a/app/models/card.rb b/app/models/card.rb
index e2191aa41..4c17269c9 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,6 +1,6 @@
 class Card < ApplicationRecord
   include Assignable, Colored, DraftCommenting, Engageable, Eventable, Golden,
-    Messages, Notifiable, Pinnable, Closeable, Scorable, Searchable, Staged,
+    Messages, Notifiable, Pinnable, Closeable, Searchable, Staged,
     Statuses, Taggable, Watchable
 
   belongs_to :collection, touch: true
@@ -21,12 +21,11 @@ class Card < ApplicationRecord
 
   scope :indexed_by, ->(index) do
     case index
-    when "most_active"    then ordered_by_activity
-    when "newest"         then reverse_chronologically
-    when "oldest"         then chronologically
-    when "latest"         then latest
-    when "stalled"        then ordered_by_staleness
-    when "closed"         then closed
+    when "newest"  then reverse_chronologically
+    when "oldest"  then chronologically
+    when "latest"  then latest
+    when "stalled" then chronologically
+    when "closed"  then closed
     end
   end
 
diff --git a/app/models/card/scorable.rb b/app/models/card/scorable.rb
deleted file mode 100644
index 91b0856b5..000000000
--- a/app/models/card/scorable.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-module Card::Scorable
-  extend ActiveSupport::Concern
-
-  REFERENCE_DATE = Time.utc(2025, 1, 1)
-
-  included do
-    scope :ordered_by_activity, -> { order activity_score_order: :desc }
-
-    # Staleness is measured by the amount of activity_score lost since it was last updated.
-    # The factor 0.9 is chosen to make the decay curve closer to linear; an exponential
-    # curve would make recent items appear stale very quickly, due to the sharp dropoff.
-    scope :ordered_by_staleness, -> { order Arel.sql(
-      "coalesce(activity_score * (1 - power(0.9, julianday('now') - julianday(activity_score_at))), 0) desc"
-    ) }
-  end
-
-  def rescore
-    score = calculate_activity_score
-    score_at = last_scorable_activity_at
-
-    update! \
-      activity_score: score,
-      activity_score_at: score_at,
-      activity_score_order: event_score_reference(score, score_at)
-  end
-
-  private
-    def calculate_activity_score
-      scorable_events.sum { |event| event_score(event) }
-    end
-
-    def event_score(event)
-      days_ago = (last_scorable_activity_at - event.created_at) / 1.day
-      event_weight(event) / (2**days_ago)
-    end
-
-    def event_weight(event)
-      case
-      when event.comment&.first_by_author_on_card? then 20
-      when event.comment&.follows_comment_by_another_author? then 15
-      when event.commented? then 10
-      else 0
-      end
-    end
-
-    def event_score_reference(score, activity_at)
-      # The reference score is used to make the activity score comparable
-      # across different cards, since it represents the card's activity
-      # level at a consistent point in time.
-      #
-      # We store this as log2 to tame the huge/tiny numbers we'd otherwise get
-      # when activity is far from the reference date.
-      days_diff = (activity_at - REFERENCE_DATE) / 1.day
-      Math.log2(1.0 + score) + days_diff
-    end
-
-    def last_scorable_activity_at
-      scorable_events.maximum(:created_at) || created_at
-    end
-
-    def scorable_events
-      events.where(action: :commented)
-    end
-end
diff --git a/test/models/card/scorable_test.rb b/test/models/card/scorable_test.rb
deleted file mode 100644
index f24785e63..000000000
--- a/test/models/card/scorable_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require "test_helper"
-
-class Card::ScorableTest < ActiveSupport::TestCase
-  test "cards with no activity have a valid activity_score_order" do
-    card = Card.create! collection: collections(:writebook), creator: users(:kevin)
-
-    card.rescore
-
-    assert card.activity_score.zero?
-    assert_not card.activity_score_order.infinite?
-  end
-end

From aae6c7b1a2735da0e73802b854d7d11fb3a2fc7c Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 17:09:55 +0200
Subject: [PATCH 125/413] Indention

---
 app/models/card.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 4c17269c9..7e8a72da8 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -31,8 +31,8 @@ class Card < ApplicationRecord
 
   scope :by_engagement_status, ->(status) do
     case status.to_s
-    when "considering"    then considering
-    when "doing"          then doing.with_golden_first
+    when "considering" then considering
+    when "doing"       then doing.with_golden_first
     end
   end
 

From f368b9f9c9de6d84c519d2da0259953a19becf32 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 17:13:11 +0200
Subject: [PATCH 126/413] Inline anemic method

---
 app/models/card/eventable.rb | 4 ----
 app/models/event.rb          | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index c8098708b..7343258f9 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -6,10 +6,6 @@ module Card::Eventable
     before_create { self.last_active_at = Time.current }
   end
 
-  def touch_last_active_at
-    touch :last_active_at
-  end
-
   def track_event(action, creator: Current.user, **particulars)
     if published?
       event = find_or_capture_event_summary.events.create! action: action, creator: creator, card: self, particulars: particulars
diff --git a/app/models/event.rb b/app/models/event.rb
index ad17a5e8c..fe2a60c6d 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -10,7 +10,7 @@ class Event < ApplicationRecord
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
 
-  after_create -> { card.touch_last_active_at }
+  after_create -> { card.touch(:last_active_at) }
 
   def commented?
     action == "commented"

From cacee0febbbdc7aba513bded3020fbbec556391b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 17:18:13 +0200
Subject: [PATCH 127/413] Remove anemic scope

---
 app/models/card.rb       | 1 -
 app/models/filter.rb     | 2 +-
 test/models/card_test.rb | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 7e8a72da8..d2f3a4599 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -17,7 +17,6 @@ class Card < ApplicationRecord
   scope :reverse_chronologically, -> { order created_at: :desc, id: :desc }
   scope :chronologically, -> { order created_at: :asc, id: :asc }
   scope :latest, -> { order updated_at: :desc, id: :desc }
-  scope :in_collection, ->(collection) { where collection: collection }
 
   scope :indexed_by, ->(index) do
     case index
diff --git a/app/models/filter.rb b/app/models/filter.rb
index 1ec1a5e6c..b2957bfd5 100644
--- a/app/models/filter.rb
+++ b/app/models/filter.rb
@@ -24,7 +24,7 @@ class Filter < ApplicationRecord
       result = result.unassigned if assignment_status.unassigned?
       result = result.assigned_to(assignees.ids) if assignees.present?
       result = result.where(creator_id: creators.ids) if creators.present?
-      result = result.in_collection(collections.ids) if collections.present?
+      result = result.where(collection: collections.ids) if collections.present?
       result = result.in_stage(stages.ids) if stages.present?
       result = result.tagged_with(tags.ids) if tags.present?
       result = terms.reduce(result) do |result, term|
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
index fd0f26bfa..49678bd0c 100644
--- a/test/models/card_test.rb
+++ b/test/models/card_test.rb
@@ -88,8 +88,8 @@ class CardTest < ActiveSupport::TestCase
 
   test "in collection" do
     new_collection = Collection.create! name: "New Collection", creator: users(:david)
-    assert_equal cards(:logo, :shipping, :layout, :text), Card.in_collection(collections(:writebook))
-    assert_empty Card.in_collection(new_collection)
+    assert_equal cards(:logo, :shipping, :layout, :text), Card.where(collection: collections(:writebook))
+    assert_empty Card.where(collection: new_collection)
   end
 
   test "tagged with" do

From 78369725c42c1ec01630a17dd074ce442f3f0fed Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Fri, 18 Apr 2025 17:18:28 +0200
Subject: [PATCH 128/413] Move card concern logic into those concerns

---
 app/models/card.rb            | 41 -----------------------------------
 app/models/card/engageable.rb |  7 ++++++
 app/models/card/eventable.rb  | 22 +++++++++++++++++++
 app/models/card/staged.rb     | 11 ++++++++++
 4 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index d2f3a4599..9c8ce4908 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -10,10 +10,6 @@ class Card < ApplicationRecord
 
   has_one_attached :image, dependent: :purge_later
 
-  after_save :track_due_date_change, if: :saved_change_to_due_on?
-  after_save :track_title_change, if: :saved_change_to_title?
-  after_create :assign_initial_stage
-
   scope :reverse_chronologically, -> { order created_at: :desc, id: :desc }
   scope :chronologically, -> { order created_at: :asc, id: :asc }
   scope :latest, -> { order updated_at: :desc, id: :desc }
@@ -28,13 +24,6 @@ class Card < ApplicationRecord
     end
   end
 
-  scope :by_engagement_status, ->(status) do
-    case status.to_s
-    when "considering" then considering
-    when "doing"       then doing.with_golden_first
-    end
-  end
-
   def title=(new_title)
     self[:title] = new_title.presence || "Untitled"
   end
@@ -42,34 +31,4 @@ class Card < ApplicationRecord
   def cache_key
     [ super, collection&.name ].compact.join("/")
   end
-
-  private
-    def track_due_date_change
-      if due_on.present?
-        if due_on_before_last_save.nil?
-          track_event("due_date_added", particulars: { due_date: due_on })
-        else
-          track_event("due_date_changed", particulars: { due_date: due_on })
-        end
-      elsif due_on_before_last_save.present?
-        track_event("due_date_removed")
-      end
-    end
-
-    def track_title_change
-      if title_before_last_save.present?
-        track_event("title_changed", particulars: {
-          old_title: title_before_last_save,
-          new_title: title
-        })
-      end
-    end
-
-    def assign_initial_stage
-      if workflow_stage = collection.workflow&.stages&.first
-        self.stage = workflow_stage
-        save! touch: false
-        track_event :staged, stage_id: workflow_stage.id, stage_name: workflow_stage.name
-      end
-    end
 end
diff --git a/app/models/card/engageable.rb b/app/models/card/engageable.rb
index 800088f72..78dbe0ebe 100644
--- a/app/models/card/engageable.rb
+++ b/app/models/card/engageable.rb
@@ -9,6 +9,13 @@ module Card::Engageable
     scope :considering, -> { published_or_drafted_by(Current.user).active.where.missing(:engagement) }
     scope :doing,       -> { published.active.joins(:engagement) }
     scope :stagnated,   -> { doing.where(last_active_at: ..STAGNATED_AFTER.ago) }
+
+    scope :by_engagement_status, ->(status) do
+      case status.to_s
+      when "considering" then considering
+      when "doing"       then doing.with_golden_first
+      end
+    end
   end
 
   class_methods do
diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 7343258f9..1d3c4e13b 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -3,7 +3,11 @@ module Card::Eventable
 
   included do
     has_many :events, dependent: :destroy
+
     before_create { self.last_active_at = Time.current }
+
+    after_save :track_due_date_change, if: :saved_change_to_due_on?
+    after_save :track_title_change, if: :saved_change_to_title?
   end
 
   def track_event(action, creator: Current.user, **particulars)
@@ -14,6 +18,24 @@ module Card::Eventable
   end
 
   private
+    def track_due_date_change
+      if due_on.present?
+        if due_on_before_last_save.nil?
+          track_event("due_date_added", particulars: { due_date: due_on })
+        else
+          track_event("due_date_changed", particulars: { due_date: due_on })
+        end
+      elsif due_on_before_last_save.present?
+        track_event("due_date_removed")
+      end
+    end
+
+    def track_title_change
+      if title_before_last_save.present?
+        track_event "title_changed", particulars: { old_title: title_before_last_save, new_title: title }
+      end
+    end
+
     def find_or_capture_event_summary
       transaction do
         messages.last&.event_summary || capture(EventSummary.new).event_summary
diff --git a/app/models/card/staged.rb b/app/models/card/staged.rb
index b669aeddd..de853b818 100644
--- a/app/models/card/staged.rb
+++ b/app/models/card/staged.rb
@@ -4,6 +4,8 @@ module Card::Staged
   included do
     belongs_to :stage, class_name: "Workflow::Stage", optional: true
 
+    after_create :assign_initial_stage
+
     scope :in_stage, ->(stage) { where stage: stage }
   end
 
@@ -19,4 +21,13 @@ module Card::Staged
       track_event event, stage_id: stage.id, stage_name: stage.name
     end
   end
+
+  private
+    def assign_initial_stage
+      if workflow_stage = collection.workflow&.stages&.first
+        self.stage = workflow_stage
+        save! touch: false
+        track_event :staged, stage_id: workflow_stage.id, stage_name: workflow_stage.name
+      end
+    end
 end

From f3767f25849750d6ed1607c6f4db6e2fdc5f8b27 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Fri, 18 Apr 2025 11:26:13 -0500
Subject: [PATCH 129/413] Use variables for card colors

---
 app/assets/stylesheets/_global.css | 71 ++++++++++++++++++------------
 app/assets/stylesheets/cards.css   | 13 ++++--
 app/models/colorable.rb            | 17 ++++++-
 3 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index a385c0afd..5497c7aa5 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -129,8 +129,48 @@
   --lch-pink-lighter: 92% 0.03 338;
   --lch-pink-lightest: 96% 0.02 336;
 
+  /* Colors: Named */
+  --color-black: oklch(var(--lch-black));
+  --color-white: oklch(var(--lch-white));
+
+  --color-ink: oklch(var(--lch-ink-darkest));
+  --color-ink-darkest: oklch(var(--lch-ink-darkest));
+  --color-ink-darker: oklch(var(--lch-ink-darker));
+  --color-ink-dark: oklch(var(--lch-ink-dark));
+  --color-ink-medium: oklch(var(--lch-ink-medium));
+  --color-ink-light: oklch(var(--lch-ink-light));
+  --color-ink-lighter: oklch(var(--lch-ink-lighter));
+  --color-ink-lightest: oklch(var(--lch-ink-lightest));
+
+  --color-ink-inverted: oklch(var(--lch-ink-inverted));
+
+  /* Colors: Abstractions */
+  --color-canvas: oklch(var(--lch-canvas));
+  --color-negative: oklch(var(--lch-red-dark));
+  --color-positive: oklch(var(--lch-green-dark));
+  --color-link: oklch(var(--lch-blue-dark));
+  --color-selected: oklch(var(--lch-blue-lighter));
+  --color-selected-dark: oklch(var(--lch-blue-light));
+  --color-highlight: oklch(var(--lch-yellow-lighter));
+  --color-marker: oklch(var(--lch-red-medium));
+  --color-container: oklch(var(--lch-aqua-light));
+  --color-terminal-bg: oklch(var(--lch-blue-darkest));
+  --color-terminal-text: oklch(var(--lch-green-medium));
+
+  /* Colors: Cards */
+  --color-card-1: oklch(var(--lch-ink-dark));
+  --color-card-2: oklch(var(--lch-uncolor-dark));
+  --color-card-3: oklch(var(--lch-yellow-dark));
+  --color-card-4: oklch(var(--lch-lime-dark));
+  --color-card-5: oklch(var(--lch-aqua-dark));
+  --color-card-6: oklch(var(--lch-blue-dark));
+  --color-card-7: oklch(var(--lch-violet-dark));
+  --color-card-8: oklch(var(--lch-purple-dark));
+  --color-card-9: oklch(var(--lch-pink-dark));
+
   @media (prefers-color-scheme: dark) {
     --lch-canvas: 20% 0.0195 232.58;
+    --lch-ink-inverted: var(--lch-black);
 
     --lch-ink-darkest: 96.02% 0.0034 260;
     --lch-ink-darker: 86% 0.0061 260;
@@ -220,6 +260,8 @@
     --lch-pink-lighter: 30% 0.03 346;
     --lch-pink-lightest: 25% 0.011 348;
 
+    --color-container: oklch(var(--lch-aqua-lighter));
+
     --shadow: 0 0 0 1px oklch(var(--lch-black) / 0.42),
               0 .2em 1.6em -0.8em oklch(var(--lch-black) / 0.6),
               0 .4em 2.4em -1em oklch(var(--lch-black) / 0.7),
@@ -227,33 +269,4 @@
               0 .8em 1.2em -1.6em oklch(var(--lch-black) / 0.9),
               0 1.2em 1.6em -2em oklch(var(--lch-black) / 1);
   }
-
-  /* Colors: Named */
-  --color-black: oklch(var(--lch-black));
-  --color-white: oklch(var(--lch-white));
-
-  --color-ink: oklch(var(--lch-ink-darkest));
-  --color-ink-darkest: oklch(var(--lch-ink-darkest));
-  --color-ink-darker: oklch(var(--lch-ink-darker));
-  --color-ink-dark: oklch(var(--lch-ink-dark));
-  --color-ink-medium: oklch(var(--lch-ink-medium));
-  --color-ink-light: oklch(var(--lch-ink-light));
-  --color-ink-lighter: oklch(var(--lch-ink-lighter));
-  --color-ink-lightest: oklch(var(--lch-ink-lightest));
-
-  --color-ink-inverted: oklch(var(--lch-ink-inverted));
-
-  /* Colors: Abstractions */
-  --color-canvas: oklch(var(--lch-canvas));
-  --color-negative: oklch(var(--lch-red-dark));
-  --color-positive: oklch(var(--lch-green-dark));
-  --color-link: oklch(var(--lch-blue-dark));
-  --color-selected: oklch(var(--lch-blue-lighter));
-  --color-selected-dark: oklch(var(--lch-blue-light));
-  --color-highlight: oklch(var(--lch-yellow-lighter));
-  --color-marker: oklch(var(--lch-red-medium));
-  --color-container: oklch(var(--lch-aqua-light));
-  --color-golden: oklch(var(--lch-yellow-light));
-  --color-terminal-bg: oklch(var(--lch-blue-darkest));
-  --color-terminal-text: oklch(var(--lch-green-medium));
 }
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 794733da3..6a0f13225 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -28,11 +28,16 @@
     --border-color: var(--color-canvas) !important;
 
     background-color: var(--color-canvas);
-    background-image: linear-gradient(90deg, oklch(var(--lch-yellow-light) / 0.5) 0%, oklch(var(--lch-yellow-light) / 0.1) 50%, oklch(var(--lch-yellow-light) / 0.75) 100%);
+    background-image: linear-gradient(75deg,
+      oklch(var(--lch-yellow-lighter) / 0.5) 0%,
+      oklch(var(--lch-yellow-lighter) / 0.1) 40%,
+      oklch(var(--lch-yellow-lighter) / 0.1) 60%,
+      oklch(var(--lch-yellow-lighter) / 0.75) 100%
+    );
     box-shadow:
-      0 0 0.5em 0.2em var(--color-golden),
-      0 0 1em 0.4em var(--color-golden) !important;
-    outline: 1px solid var(--color-golden);
+      0 0 0.5em 0.2em oklch(var(--lch-yellow-light) / 0.5),
+      0 0 1em 0.4em oklch(var(--lch-yellow-light) / 0.5) !important;
+    outline: 1px solid oklch(var(--lch-yellow-light) / 0.5);
   }
 
   .card__background {
diff --git a/app/models/colorable.rb b/app/models/colorable.rb
index 4fba4556d..fed768a27 100644
--- a/app/models/colorable.rb
+++ b/app/models/colorable.rb
@@ -1,8 +1,21 @@
 module Colorable
   extend ActiveSupport::Concern
 
-  COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ]
-  DEFAULT_COLOR = "#2c6da8"
+  # COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ]
+  # DEFAULT_COLOR = "#2c6da8"
+
+  COLORS = [
+    "var(--color-card-1)",
+    "var(--color-card-2)",
+    "var(--color-card-3)",
+    "var(--color-card-4)",
+    "var(--color-card-5)",
+    "var(--color-card-6)",
+    "var(--color-card-7)",
+    "var(--color-card-8)",
+    "var(--color-card-9)",
+  ]
+  DEFAULT_COLOR = "var(--color-card-6)"
 
   included do
     attribute :color, default: DEFAULT_COLOR

From 46374adcf60095b56f552b05b04a7a502e61a1c4 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Fri, 18 Apr 2025 11:43:27 -0500
Subject: [PATCH 130/413] Tweak golden card color

---
 app/assets/stylesheets/cards.css | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 6a0f13225..f61b37ed0 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -26,18 +26,23 @@
 
   .card--golden.card--doing {
     --border-color: var(--color-canvas) !important;
+    --lch-golden: var(--lch-yellow-light);
 
     background-color: var(--color-canvas);
-    background-image: linear-gradient(75deg,
-      oklch(var(--lch-yellow-lighter) / 0.5) 0%,
-      oklch(var(--lch-yellow-lighter) / 0.1) 40%,
-      oklch(var(--lch-yellow-lighter) / 0.1) 60%,
-      oklch(var(--lch-yellow-lighter) / 0.75) 100%
+    background-image: linear-gradient(60deg,
+      oklch(var(--lch-golden) / 0.35) 0%,
+      oklch(var(--lch-golden) / 0.15) 20%,
+      oklch(var(--lch-golden) / 0) 60%,
+      oklch(var(--lch-golden) / 0.5) 100%
     );
     box-shadow:
-      0 0 0.5em 0.2em oklch(var(--lch-yellow-light) / 0.5),
-      0 0 1em 0.4em oklch(var(--lch-yellow-light) / 0.5) !important;
-    outline: 1px solid oklch(var(--lch-yellow-light) / 0.5);
+      0 0 0.5em 0.2em oklch(var(--lch-golden) / 0.35),
+      0 0 1em 0.4em oklch(var(--lch-golden) / 0.35) !important;
+    outline: 1px solid oklch(var(--lch-golden) / 0.35);
+
+    @media (prefers-color-scheme: dark) {
+      --lch-golden: var(--lch-blue-medium);
+    }
   }
 
   .card__background {

From 7b86c4f607524c88d2e5fc705405d85a39143325 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Fri, 18 Apr 2025 15:00:46 -0500
Subject: [PATCH 131/413] Align color picker

---
 app/assets/stylesheets/color-picker.css    |  3 ++-
 app/views/workflows/stages/_color.html.erb | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/color-picker.css b/app/assets/stylesheets/color-picker.css
index 7b6ff640f..a874e0b70 100644
--- a/app/assets/stylesheets/color-picker.css
+++ b/app/assets/stylesheets/color-picker.css
@@ -6,9 +6,10 @@
   --panel-size: auto;
 
   inline-size: auto !important;
-  inset: 0 auto auto 0;
+  inset: 50% auto auto calc(-1 * var(--block-space));
   max-inline-size: var(--panel-size) !important;
   position: absolute;
+  translate: 0 -50%;
   z-index: 2;
 
   &[open] {
diff --git a/app/views/workflows/stages/_color.html.erb b/app/views/workflows/stages/_color.html.erb
index 04a9e12a3..8b4eed76c 100644
--- a/app/views/workflows/stages/_color.html.erb
+++ b/app/views/workflows/stages/_color.html.erb
@@ -5,6 +5,13 @@
   </button>
 
   <dialog class="color-picker panel fill-white shadow gap-half" data-dialog-target="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
+    <form method="dialog">
+      <button class="btn txt-small" title="Close (esc)">
+        <%= icon_tag "remove" %>
+        <span class="for-screen-reader">Close</span>
+      </button>
+    </form>
+
     <%= form_with model: stage, url: workflow_stage_path(stage.workflow, stage), class: "flex gap-half", data: { controller: "form", action: "change->form#submit" } do |form| %>
       <% Colorable::COLORS.each do |color| %>
         <span class="color-picker__color">
@@ -16,12 +23,5 @@
         </span>
       <% end %>
     <% end %>
-
-    <form method="dialog">
-      <button class="btn txt-small" title="Close (esc)">
-        <%= icon_tag "remove" %>
-        <span class="for-screen-reader">Close</span>
-      </button>
-    </form>
   </dialog>
 </div>

From f82dd39305ef6b9d5c222a560bbb99b84402f55a Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Fri, 18 Apr 2025 15:10:43 -0500
Subject: [PATCH 132/413] Same sizes for swatches

---
 app/assets/stylesheets/color-picker.css    | 22 ++--------------------
 app/views/workflows/_workflow.html.erb     |  2 +-
 app/views/workflows/stages/_color.html.erb |  4 ++--
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/color-picker.css b/app/assets/stylesheets/color-picker.css
index a874e0b70..a0dd8e2af 100644
--- a/app/assets/stylesheets/color-picker.css
+++ b/app/assets/stylesheets/color-picker.css
@@ -2,11 +2,11 @@
   --panel-border-color: var(--card-color);
   --panel-border-radius: 2em;
   --panel-border-size: 2px;
-  --panel-padding: 0.5em 0.7em;
+  --panel-padding: 0.5em;
   --panel-size: auto;
 
   inline-size: auto !important;
-  inset: 50% auto auto calc(-1 * var(--block-space));
+  inset: 50% auto auto calc(-1 * var(--panel-padding));
   max-inline-size: var(--panel-size) !important;
   position: absolute;
   translate: 0 -50%;
@@ -15,22 +15,4 @@
   &[open] {
     display: flex;
   }
-
-  .color-picker__color {
-    --btn-size: 2em;
-  }
-}
-
-.color-picker__button {
-  font-size: 0.75em;
-
-  .cards & {
-    display: none;
-  }
-
-  + .panel {
-    --panel-size: auto;
-
-    inset: 0 0 auto auto;
-  }
 }
diff --git a/app/views/workflows/_workflow.html.erb b/app/views/workflows/_workflow.html.erb
index 5cbf7d3e3..f6972731d 100644
--- a/app/views/workflows/_workflow.html.erb
+++ b/app/views/workflows/_workflow.html.erb
@@ -10,7 +10,7 @@
 
     <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-ink-medium);" aria-hidden="true">
 
-    <div class="flex flex-column gap margin-block-start">
+    <div class="flex flex-column gap-half margin-block-start">
       <%= turbo_frame_tag dom_id(workflow, :stages) do %>
         <%= render partial: "workflows/stages/stage", collection: workflow.stages %>
 
diff --git a/app/views/workflows/stages/_color.html.erb b/app/views/workflows/stages/_color.html.erb
index 8b4eed76c..a5e1657b5 100644
--- a/app/views/workflows/stages/_color.html.erb
+++ b/app/views/workflows/stages/_color.html.erb
@@ -1,5 +1,5 @@
 <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close">
-  <button class="btn btn--reversed txt-x-small" data-action="dialog#open:stop" style="--btn-background: <%= stage_color(stage) %>">
+  <button class="btn btn--reversed txt-small borderless" data-action="dialog#open:stop" style="--btn-background: <%= stage_color(stage) %>">
     <%= icon_tag "art" %>
     <span class="for-screen-reader">Change color</span>
   </button>
@@ -15,7 +15,7 @@
     <%= form_with model: stage, url: workflow_stage_path(stage.workflow, stage), class: "flex gap-half", data: { controller: "form", action: "change->form#submit" } do |form| %>
       <% Colorable::COLORS.each do |color| %>
         <span class="color-picker__color">
-          <label class="btn btn--circle" style="--btn-background: <%= color %>" title="<%= color %>">
+          <label class="btn btn--circle txt-small borderless" style="--btn-background: <%= color %>" title="<%= color %>">
             <%= form.radio_button :color, color %>
             <%= icon_tag "check", class: "checked" %>
             <span class="for-screen-reader"><%= color %></span>

From 883a2259463e66e1377d1b5905cda5b1d1604b34 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Sat, 19 Apr 2025 10:08:08 +0200
Subject: [PATCH 133/413] Use upstreamed assert_in_body

---
 Gemfile.lock        |  6 +++---
 test/test_helper.rb | 10 ----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8fbd0f756..533616d7c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 32d96235810e268eb5335a7837b13cda3f8b653d
+  revision: 8b00d0985f88a3f151dd21e8dfdaf6d1c2f497b0
   branch: main
   specs:
     actioncable (8.1.0.alpha)
@@ -145,7 +145,7 @@ GEM
       xpath (~> 3.2)
     chunky_png (1.4.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.1)
     crass (1.0.6)
     date (3.4.1)
     debug (1.10.0)
@@ -264,7 +264,7 @@ GEM
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.12)
+    rack (3.1.13)
     rack-contrib (2.5.0)
       rack (< 4)
     rack-session (2.1.0)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index dd27bd4ca..1447430b1 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -11,15 +11,5 @@ module ActiveSupport
     fixtures :all
 
     include CardTestHelper, ChangeTestHelper, SessionTestHelper
-
-    # FIXME: Remove when upstream in Rails has landed (https://github.com/rails/rails/pull/54938)
-    def assert_in_body(text)
-      assert_match /#{text}/, @response.body
-    end
-
-    # FIXME: Remove when upstream in Rails has landed (https://github.com/rails/rails/pull/54938)
-    def assert_not_in_body(text)
-      assert_no_match /#{text}/, @response.body
-    end
   end
 end

From ccd98f6d98609d882e692c6106e1b014d81c8077 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 19 Apr 2025 20:01:41 +0200
Subject: [PATCH 134/413] Update card.rb

---
 app/models/card.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 5b2e17d42..20a957a50 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,5 +1,5 @@
 class Card < ApplicationRecord
-  include Assignable, Colored, DraftCommenting, Engageable, Eventable, Golden,
+  include Assignable, Colored, Engageable, Eventable, Golden,
     Messages, Notifiable, Pinnable, Closeable, Searchable, Staged,
     Statuses, Taggable, Watchable
 

From d3fa62d4c2cc7e82b46bca8c349c42a20745fc87 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Sun, 20 Apr 2025 16:21:08 +0200
Subject: [PATCH 135/413] Inline touch check thats only used once

Not worth loading an entire file for this.
---
 app/javascript/controllers/soft_keyboard_controller.js | 4 ++--
 app/javascript/helpers/navigator_helpers.js            | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 app/javascript/helpers/navigator_helpers.js

diff --git a/app/javascript/controllers/soft_keyboard_controller.js b/app/javascript/controllers/soft_keyboard_controller.js
index becc36c52..75fb4f2ee 100644
--- a/app/javascript/controllers/soft_keyboard_controller.js
+++ b/app/javascript/controllers/soft_keyboard_controller.js
@@ -1,10 +1,10 @@
 import { Controller } from "@hotwired/stimulus"
 import { nextEventNamed } from "helpers/timing_helpers"
-import { isTouchDevice } from "helpers/navigator_helpers"
 
 export default class extends Controller {
+  // Only load for touch devices
   static get shouldLoad() {
-    return isTouchDevice()
+    return "ontouchstart" in window && navigator.maxTouchPoints > 0
   }
 
   // Use a fake input to trigger the soft keyboard on actions that load async content
diff --git a/app/javascript/helpers/navigator_helpers.js b/app/javascript/helpers/navigator_helpers.js
deleted file mode 100644
index b75f62875..000000000
--- a/app/javascript/helpers/navigator_helpers.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function isTouchDevice() {
-  return "ontouchstart" in window && navigator.maxTouchPoints > 0
-}

From 48a6c052505ae4ab8d54357be0aa87e6d98f36e1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Sun, 20 Apr 2025 16:23:15 +0200
Subject: [PATCH 136/413] No longer used

---
 app/javascript/initializers/custom_stream_actions.js | 8 --------
 app/javascript/initializers/index.js                 | 1 -
 lib/rails_ext/turbo_streams_action_helper.rb         | 7 -------
 3 files changed, 16 deletions(-)
 delete mode 100644 app/javascript/initializers/custom_stream_actions.js
 delete mode 100644 lib/rails_ext/turbo_streams_action_helper.rb

diff --git a/app/javascript/initializers/custom_stream_actions.js b/app/javascript/initializers/custom_stream_actions.js
deleted file mode 100644
index fecb25ff5..000000000
--- a/app/javascript/initializers/custom_stream_actions.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Turbo } from "@hotwired/turbo-rails"
-
-Turbo.StreamActions.set_css_variable = function() {
-  const name = this.getAttribute("name")
-  const value = this.getAttribute("value")
-
-  this.targetElements.forEach(element => element.style.setProperty(name, value))
-}
diff --git a/app/javascript/initializers/index.js b/app/javascript/initializers/index.js
index 01fdd9220..10fb36975 100644
--- a/app/javascript/initializers/index.js
+++ b/app/javascript/initializers/index.js
@@ -1,2 +1 @@
 import "initializers/current"
-import "initializers/custom_stream_actions"
diff --git a/lib/rails_ext/turbo_streams_action_helper.rb b/lib/rails_ext/turbo_streams_action_helper.rb
deleted file mode 100644
index 001c9706e..000000000
--- a/lib/rails_ext/turbo_streams_action_helper.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module TurboStreamsActionsHelper
-  def set_css_variable(target, name:, value:)
-    tag.turbo_stream target: target, action: "set_css_variable", name:, value:
-  end
-end
-
-Turbo::Streams::TagBuilder.prepend(TurboStreamsActionsHelper)

From dc2205ee79d621b0820cf67c23cb229727c178a5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 09:18:42 +0200
Subject: [PATCH 137/413] Cards have a not-null schema and collections destroy
 all cards on deletion

This shouldnt be necessary. Maybe remnant of some previous design?
---
 app/models/card.rb       | 2 +-
 test/models/card_test.rb | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 9c8ce4908..7237e1f58 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -29,6 +29,6 @@ class Card < ApplicationRecord
   end
 
   def cache_key
-    [ super, collection&.name ].compact.join("/")
+    [ super, collection.name ].compact.join("/")
   end
 end
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
index 49678bd0c..93f13e565 100644
--- a/test/models/card_test.rb
+++ b/test/models/card_test.rb
@@ -120,11 +120,4 @@ class CardTest < ActiveSupport::TestCase
 
     assert_includes card.cache_key, ApplicationRecord.current_tenant, "cache key must always include the tenant"
   end
-
-  test "cache key gracefully handles a nil collection" do
-    card = cards(:logo)
-    card.update_column :collection_id, Collection.last.id + 1
-
-    assert_nothing_raised { card.reload.cache_key }
-  end
 end

From 89d1b316f083fb4da9a877df263567ea356c0574 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 09:21:55 +0200
Subject: [PATCH 138/413] Name is already schema and UI required

And we are not using these validations for display anywhere.
---
 app/models/collection.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/models/collection.rb b/app/models/collection.rb
index 319b2bb7d..5f4a75051 100644
--- a/app/models/collection.rb
+++ b/app/models/collection.rb
@@ -7,8 +7,6 @@ class Collection < ApplicationRecord
   has_many :cards, dependent: :destroy
   has_many :tags, -> { distinct }, through: :cards
 
-  validates_presence_of :name
-
   after_save :update_cards_workflow, if: :saved_change_to_workflow_id?
 
   scope :alphabetically, -> { order("lower(name)") }

From 3e1a2bcc7e468b6e731c6f7e8fb3fdd3e8794f76 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 09:24:57 +0200
Subject: [PATCH 139/413] Use morphing to replace the card and exclude turbo
 frames from being replaced

Reconnecting the frames result in a visible flickering.

This also prevents flickering in the avatars when replacing the card container.
---
 app/controllers/concerns/card_scoped.rb | 2 +-
 app/views/cards/_container.html.erb     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/concerns/card_scoped.rb b/app/controllers/concerns/card_scoped.rb
index 2ea4752c4..5438871c1 100644
--- a/app/controllers/concerns/card_scoped.rb
+++ b/app/controllers/concerns/card_scoped.rb
@@ -15,6 +15,6 @@ module CardScoped
     end
 
     def render_card_replacement
-      render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", locals: { card: @card.reload })
+      render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", method: :morph, locals: { card: @card.reload })
     end
 end
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index a817a21af..9c2d11aaf 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -32,10 +32,9 @@
   </div>
 
   <% if card.published? %>
-    <%# FIXME: Let's move this aside outside of the card container section so these frames don't reload/flicker when card is replaced %>
     <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
-      <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
-      <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>
+      <%= turbo_frame_tag card, :watch, src: card_watch_path(card), data: { turbo_permanent: true } %>
+      <%= turbo_frame_tag card, :pin, src: card_pin_path(card), data: { turbo_permanent: true } %>
     </aside>
 
     <%= render "cards/container/closure", card: card %>

From 4b294ccaa6cc3ac07d2a7cad84cb09c0bdbfb3b8 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 13:55:09 +0200
Subject: [PATCH 140/413] No need to run Solid Cache in development

---
 config/environments/development.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7eba115d0..6a7ef9df3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -23,7 +23,7 @@ Rails.application.configure do
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 
-    config.cache_store = :solid_cache_store
+    config.cache_store = :memory_store
     config.public_file_server.headers = {
       "Cache-Control" => "public, max-age=#{2.days.to_i}"
     }

From 167563d9f82720a6a70f3d7d6cddb29035afd370 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 14:01:53 +0200
Subject: [PATCH 141/413] Stlye

---
 config/environments/development.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6a7ef9df3..d2aae6589 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,9 +24,7 @@ Rails.application.configure do
     config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
-    config.public_file_server.headers = {
-      "Cache-Control" => "public, max-age=#{2.days.to_i}"
-    }
+    config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{2.days.to_i}" }
   else
     config.action_controller.perform_caching = true
 

From 491e743c27e37ee9f99d64e9b75d29b730eec490 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 14:48:07 +0200
Subject: [PATCH 142/413] Place below associations

---
 app/models/card.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 20a957a50..fab514df6 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -3,8 +3,6 @@ class Card < ApplicationRecord
     Messages, Notifiable, Pinnable, Closeable, Searchable, Staged,
     Statuses, Taggable, Watchable
 
-  has_markdown :description
-
   belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
@@ -12,6 +10,8 @@ class Card < ApplicationRecord
 
   has_one_attached :image, dependent: :purge_later
 
+  has_markdown :description
+
   scope :reverse_chronologically, -> { order created_at: :desc, id: :desc }
   scope :chronologically, -> { order created_at: :asc, id: :asc }
   scope :latest, -> { order updated_at: :desc, id: :desc }

From 7925cd7bf969059d6cf5e41baf77ffa44978fb14 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 14:52:21 +0200
Subject: [PATCH 143/413] Extract partials

---
 app/views/cards/_container.html.erb           | 20 +++----------------
 app/views/cards/container/_edit.html.erb      |  4 ++++
 .../cards/container/footer/_draft.html.erb    |  4 ++++
 .../container/footer/_published.html.erb      |  7 +++++++
 4 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 app/views/cards/container/_edit.html.erb
 create mode 100644 app/views/cards/container/footer/_draft.html.erb
 create mode 100644 app/views/cards/container/footer/_published.html.erb

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 3a1620036..034106e59 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -3,12 +3,7 @@
   <%= render "cards/container/engagement", card: card %>
 
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
-    <% if card.published? %>
-      <%= link_to edit_collection_card_path(card.collection, card), class: "btn", data: { turbo_frame: dom_id(card, :edit) } do %>
-        <%= icon_tag "pencil" %>
-        <span class="for-screen-reader">Edit</span>
-      <% end %>
-    <% end %>
+    <%= render "cards/container/edit", card: card if card.published? %>
     <%= render "cards/container/gild", card: card if card.doing? %>
     <%= render "cards/container/image", card: card %>
 
@@ -38,17 +33,8 @@
   </div>
 
   <% if card.published? %>
-    <%# FIXME: Let's move this aside outside of the card container section so these frames don't reload/flicker when card is replaced %>
-    <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
-      <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
-      <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>
-    </aside>
-
-    <%= render "cards/container/closure", card: card %>
+    <%= render "cards/container/footer/published", card: card %>
   <% elsif card.creating? %>
-    <div class="card-perma__notch card-perma__notch--bottom">
-      <%= button_to "Create card", card_publish_path(card), class: "btn" %>
-      <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn btn--reversed" %>
-    </div>
+    <%= render "cards/container/footer/draft", card: card %>
   <% end %>
 </section>
diff --git a/app/views/cards/container/_edit.html.erb b/app/views/cards/container/_edit.html.erb
new file mode 100644
index 000000000..23ea9f48d
--- /dev/null
+++ b/app/views/cards/container/_edit.html.erb
@@ -0,0 +1,4 @@
+<%= link_to edit_collection_card_path(card.collection, card), class: "btn", data: { turbo_frame: dom_id(card, :edit) } do %>
+  <%= icon_tag "pencil" %>
+  <span class="for-screen-reader">Edit</span>
+<% end %>
diff --git a/app/views/cards/container/footer/_draft.html.erb b/app/views/cards/container/footer/_draft.html.erb
new file mode 100644
index 000000000..f46e08b41
--- /dev/null
+++ b/app/views/cards/container/footer/_draft.html.erb
@@ -0,0 +1,4 @@
+<div class="card-perma__notch card-perma__notch--bottom">
+  <%= button_to "Create card", card_publish_path(card), class: "btn" %>
+  <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn btn--reversed" %>
+</div>
diff --git a/app/views/cards/container/footer/_published.html.erb b/app/views/cards/container/footer/_published.html.erb
new file mode 100644
index 000000000..c4e0a0cdf
--- /dev/null
+++ b/app/views/cards/container/footer/_published.html.erb
@@ -0,0 +1,7 @@
+<%# FIXME: Let's move this aside outside of the card container section so these frames don't reload/flicker when card is replaced %>
+<aside class="card-perma__actions card-perma__actions--right" role="toolbar">
+  <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
+  <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>
+</aside>
+
+<%= render "cards/container/closure", card: card %>

From b6584ed65540b01d61750a14c71caa40b94c800a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 15:12:57 +0200
Subject: [PATCH 144/413] Seed multiple seed accounts with basic DSL

---
 db/seeds.rb           |  6 ++++++
 db/seeds/37signals.rb | 21 +++++++++++++++++++++
 db/seeds/helpers.rb   | 33 +++++++++++++++++++++++++++++++++
 db/seeds/honcho.rb    | 22 ++++++++++++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 db/seeds.rb
 create mode 100644 db/seeds/37signals.rb
 create mode 100644 db/seeds/helpers.rb
 create mode 100644 db/seeds/honcho.rb

diff --git a/db/seeds.rb b/db/seeds.rb
new file mode 100644
index 000000000..065346716
--- /dev/null
+++ b/db/seeds.rb
@@ -0,0 +1,6 @@
+require_relative "seeds/helpers"
+raise "Seeding is just for development" unless Rails.env.development?
+
+# Seed accounts
+seed_account "37signals"
+seed_account "honcho"
diff --git a/db/seeds/37signals.rb b/db/seeds/37signals.rb
new file mode 100644
index 000000000..432030bbc
--- /dev/null
+++ b/db/seeds/37signals.rb
@@ -0,0 +1,21 @@
+create_tenant "37signals"
+
+david = create_first_run "David Heinemeier Hansson", "david@37signals.com"
+login_as david
+
+jz    = create_user "Jason Zimdars", "jz@37signals.com"
+kevin = create_user "Kevin Mcconnell", "kevin@37signals.com"
+
+create_collection("Fizzy", access_to: [ jz, kevin ]).tap do |fizzy|
+  create_card("Prepare sign-up page", description: "We need to do this before the launch.", collection: fizzy)
+
+  create_card("Prepare sign-up page", description: "We need to do this before the launch.", collection: fizzy).tap do |card|
+    card.toggle_assignment(kevin)
+    card.engage
+  end
+
+  create_card("Plain text mentions", description: "We'll support plain text mentions first.", collection: fizzy).tap do |card|
+    card.toggle_assignment(david)
+    card.close
+  end
+end
diff --git a/db/seeds/helpers.rb b/db/seeds/helpers.rb
new file mode 100644
index 000000000..ecd1184b3
--- /dev/null
+++ b/db/seeds/helpers.rb
@@ -0,0 +1,33 @@
+def seed_account(name)
+  print "  #{name}…"
+  elapsed = Benchmark.realtime { require_relative name }
+  puts " #{elapsed.round(2)} sec"
+end
+
+def create_tenant(name)
+  ApplicationRecord.destroy_tenant name
+  ApplicationRecord.create_tenant name
+  ApplicationRecord.current_tenant = name
+end
+
+def create_first_run(name, email_address, password: "secret123456")
+  FirstRun.create!(name:, email_address:, password:)
+end
+
+def login_as(user)
+  Current.session = user.sessions.create
+end
+
+def create_user(name, email_address, password: "secret123456")
+  User.create!(name:, email_address:, password:)
+end
+
+def create_collection(name, creator: Current.user, all_access: true, access_to: [])
+  Collection.create!(name:, creator:, all_access:).tap { it.accesses.grant_to(access_to) }
+end
+
+def create_card(title, collection:, description: nil, status: :published, creator: Current.user)
+  collection.cards.create!(title:, creator:, status:).tap do |card|
+    card.capture(Comment.new(body: description)) if description
+  end
+end
diff --git a/db/seeds/honcho.rb b/db/seeds/honcho.rb
new file mode 100644
index 000000000..5a4a3a2e3
--- /dev/null
+++ b/db/seeds/honcho.rb
@@ -0,0 +1,22 @@
+create_tenant "honcho"
+
+david = create_first_run "David Heinemeier Hansson", "david@37signals.com"
+login_as david
+
+jz    = create_user "Jason Zimdars", "jz@37signals.com"
+kevin = create_user "Kevin Mcconnell", "kevin@37signals.com"
+
+create_collection("Mucho", access_to: [ jz, kevin ]).tap do |fizzy|
+  create_card("Prepare MUCHO sign-up page", description: "We need to do this before the launch.", collection: fizzy)
+
+  create_card("Prepare MUCHO sign-up page", description: "We need to do this before the launch.", collection: fizzy).tap do |card|
+    card.toggle_assignment(kevin)
+    card.engage
+  end
+
+  create_card("Plain MUCHO text mentions", description: "We'll support plain text mentions first.", collection: fizzy).tap do |card|
+    card.toggle_assignment(david)
+    card.close
+  end
+end
+

From ffdec1cc3b015f0f40225c6f1f877b64bd023abb Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 15:18:11 +0200
Subject: [PATCH 145/413] Index description too

---
 app/models/card/searchable.rb | 40 ++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/models/card/searchable.rb b/app/models/card/searchable.rb
index 3627a555b..c61ee1017 100644
--- a/app/models/card/searchable.rb
+++ b/app/models/card/searchable.rb
@@ -4,7 +4,7 @@ module Card::Searchable
   included do
     include ::Searchable
 
-    searchable_by :title, using: :cards_search_index
+    searchable_by :title_and_description, using: :cards_search_index, as: :title
 
     scope :mentioning, ->(query) do
       if query = sanitize_query_syntax(query)
@@ -18,25 +18,31 @@ module Card::Searchable
     end
   end
 
-    class_methods do
-      def sanitize_query_syntax(terms)
-        terms = terms.to_s
-        terms = remove_invalid_search_characters(terms)
-        terms = remove_unbalanced_quotes(terms)
-        terms.presence
+  class_methods do
+    def sanitize_query_syntax(terms)
+      terms = terms.to_s
+      terms = remove_invalid_search_characters(terms)
+      terms = remove_unbalanced_quotes(terms)
+      terms.presence
+    end
+
+    private
+      def remove_invalid_search_characters(terms)
+        terms.gsub(/[^\w"]/, " ")
       end
 
-      private
-        def remove_invalid_search_characters(terms)
-          terms.gsub(/[^\w"]/, " ")
+      def remove_unbalanced_quotes(terms)
+        if terms.count("\"").even?
+          terms
+        else
+          terms.gsub("\"", " ")
         end
+      end
+  end
 
-        def remove_unbalanced_quotes(terms)
-          if terms.count("\"").even?
-            terms
-          else
-            terms.gsub("\"", " ")
-          end
-        end
+  private
+    # TODO: Temporary until we stabilize the search API
+    def title_and_description
+      [title, description.to_plain_text].join(" ")
     end
 end

From 99dbc04e2c9d16052d84e73351005b7a489f9a4c Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 15:20:03 +0200
Subject: [PATCH 146/413] Format

---
 app/models/card/searchable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/card/searchable.rb b/app/models/card/searchable.rb
index c61ee1017..2e01fef9b 100644
--- a/app/models/card/searchable.rb
+++ b/app/models/card/searchable.rb
@@ -43,6 +43,6 @@ module Card::Searchable
   private
     # TODO: Temporary until we stabilize the search API
     def title_and_description
-      [title, description.to_plain_text].join(" ")
+      [ title, description.to_plain_text ].join(" ")
     end
 end

From 2bfead03810d97d486847291507dd90df7167dc6 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 15:23:08 +0200
Subject: [PATCH 147/413] Convert to conventional Rails style

---
 bin/setup | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/bin/setup b/bin/setup
index e50c91ec6..ad27b6637 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,26 +1,31 @@
-#!/usr/bin/env bash
-set -eo pipefail
+#!/usr/bin/env ruby
+require "fileutils"
 
-# Use application binstubs
-export PATH="./bin:$PATH"
+APP_ROOT = File.expand_path("..", __dir__)
 
-announce() {
-  printf "\n--- $@\n"
-}
+def system!(*args)
+  system(*args, exception: true)
+end
 
-announce "Installing dependencies"
-gem install bundler --conservative
-bundle check || bundle install
+FileUtils.chdir APP_ROOT do
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
+  # Add necessary setup steps to this file.
 
-announce "Preparing database"
-if [[ $* == *--reset* ]]; then
-  rails db:reset
-else
-  rails db:prepare
-fi
+  puts "== Installing dependencies =="
+  system("gem install bundler --conservative")
+  system("bundle check") || system!("bundle install")
 
-announce "Removing old logs and tempfiles"
-rails log:clear tmp:clear
+  puts "\n== Preparing database =="
+  system! "bin/rails db:prepare"
+  system! "bin/rails db:reset" if ARGV.include?("--reset")
 
-echo
-echo "Start developing with bin/dev"
+  puts "\n== Removing old logs and tempfiles =="
+  system! "bin/rails log:clear tmp:clear"
+
+  unless ARGV.include?("--skip-server")
+    puts "\n== Starting development server =="
+    STDOUT.flush # flush the output before exec(2) so that it displays
+    exec "bin/dev"
+  end
+end

From dc127511925ad2db485694dfdef20cef91b6b793 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 15:23:18 +0200
Subject: [PATCH 148/413] Have an empty first-run tenant too

---
 db/seeds.rb           | 1 +
 db/seeds/first-run.rb | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 db/seeds/first-run.rb

diff --git a/db/seeds.rb b/db/seeds.rb
index 065346716..1f1b2322d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -4,3 +4,4 @@ raise "Seeding is just for development" unless Rails.env.development?
 # Seed accounts
 seed_account "37signals"
 seed_account "honcho"
+seed_account "first-run"
diff --git a/db/seeds/first-run.rb b/db/seeds/first-run.rb
new file mode 100644
index 000000000..e6df219d9
--- /dev/null
+++ b/db/seeds/first-run.rb
@@ -0,0 +1 @@
+create_tenant "first-run"

From 29948d8881184867eadb6ae2cd92ebd6ce753810 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 15:23:31 +0200
Subject: [PATCH 149/413] Enumerate all the options for logging in

---
 bin/dev | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/dev b/bin/dev
index f8d3f3df9..e58bc97c3 100755
--- a/bin/dev
+++ b/bin/dev
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 
-echo "Starting Fizzy on http://development-tenant.fizzy.localhost:3006"
+echo "Access with david@37signals.com / secret123456 on http://37signals.fizzy.localhost:3006"
+echo "Access with david@37signals.com / secret123456 on http://honcho.fizzy.localhost:3006"
+echo "Access first run on http://first-run.fizzy.localhost:3006"
 
 exec ./bin/rails server -p 3006

From e1b2b623e8869a307b4c4fea5d6c28cad11e7b3d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 15:26:19 +0200
Subject: [PATCH 150/413] --skip-server in ci setup

---
 config/ci.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/ci.rb b/config/ci.rb
index 1a22e3e33..c94990581 100644
--- a/config/ci.rb
+++ b/config/ci.rb
@@ -1,7 +1,7 @@
 # Run using bin/ci
 
 CI.run do
-  step "Setup", "bin/setup"
+  step "Setup", "bin/setup --skip-server"
 
   step "Style: Ruby", "bin/rubocop"
 

From 581070b22cb205c4b3f8c318456a4e760866740c Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 15:26:47 +0200
Subject: [PATCH 151/413] Fix trailing empty line

---
 db/seeds/honcho.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/seeds/honcho.rb b/db/seeds/honcho.rb
index 5a4a3a2e3..918b3a4d5 100644
--- a/db/seeds/honcho.rb
+++ b/db/seeds/honcho.rb
@@ -19,4 +19,3 @@ create_collection("Mucho", access_to: [ jz, kevin ]).tap do |fizzy|
     card.close
   end
 end
-

From 539b26c7df50c932d63870d036512891884bc474 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 16:01:01 +0200
Subject: [PATCH 152/413] Small enough DSL to inline it

---
 db/seeds.rb         | 36 +++++++++++++++++++++++++++++++++++-
 db/seeds/helpers.rb | 33 ---------------------------------
 2 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 db/seeds/helpers.rb

diff --git a/db/seeds.rb b/db/seeds.rb
index 1f1b2322d..65a417e5a 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,6 +1,40 @@
-require_relative "seeds/helpers"
 raise "Seeding is just for development" unless Rails.env.development?
 
+# Seed DSL
+def seed_account(name)
+  print "  #{name}…"
+  elapsed = Benchmark.realtime { require_relative name }
+  puts " #{elapsed.round(2)} sec"
+end
+
+def create_tenant(name)
+  ApplicationRecord.destroy_tenant name
+  ApplicationRecord.create_tenant name
+  ApplicationRecord.current_tenant = name
+end
+
+def create_first_run(name, email_address, password: "secret123456")
+  FirstRun.create!(name:, email_address:, password:)
+end
+
+def login_as(user)
+  Current.session = user.sessions.create
+end
+
+def create_user(name, email_address, password: "secret123456")
+  User.create!(name:, email_address:, password:)
+end
+
+def create_collection(name, creator: Current.user, all_access: true, access_to: [])
+  Collection.create!(name:, creator:, all_access:).tap { it.accesses.grant_to(access_to) }
+end
+
+def create_card(title, collection:, description: nil, status: :published, creator: Current.user)
+  collection.cards.create!(title:, creator:, status:).tap do |card|
+    card.capture(Comment.new(body: description)) if description
+  end
+end
+
 # Seed accounts
 seed_account "37signals"
 seed_account "honcho"
diff --git a/db/seeds/helpers.rb b/db/seeds/helpers.rb
deleted file mode 100644
index ecd1184b3..000000000
--- a/db/seeds/helpers.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-def seed_account(name)
-  print "  #{name}…"
-  elapsed = Benchmark.realtime { require_relative name }
-  puts " #{elapsed.round(2)} sec"
-end
-
-def create_tenant(name)
-  ApplicationRecord.destroy_tenant name
-  ApplicationRecord.create_tenant name
-  ApplicationRecord.current_tenant = name
-end
-
-def create_first_run(name, email_address, password: "secret123456")
-  FirstRun.create!(name:, email_address:, password:)
-end
-
-def login_as(user)
-  Current.session = user.sessions.create
-end
-
-def create_user(name, email_address, password: "secret123456")
-  User.create!(name:, email_address:, password:)
-end
-
-def create_collection(name, creator: Current.user, all_access: true, access_to: [])
-  Collection.create!(name:, creator:, all_access:).tap { it.accesses.grant_to(access_to) }
-end
-
-def create_card(title, collection:, description: nil, status: :published, creator: Current.user)
-  collection.cards.create!(title:, creator:, status:).tap do |card|
-    card.capture(Comment.new(body: description)) if description
-  end
-end

From 4d1a1382e1a427022dd49ca9a101b08547483782 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Mon, 21 Apr 2025 16:21:20 +0200
Subject: [PATCH 153/413] Fix seeds for new descriptions

---
 db/seeds.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index 65a417e5a..9af00fe66 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -3,7 +3,7 @@ raise "Seeding is just for development" unless Rails.env.development?
 # Seed DSL
 def seed_account(name)
   print "  #{name}…"
-  elapsed = Benchmark.realtime { require_relative name }
+  elapsed = Benchmark.realtime { require_relative "seeds/#{name}" }
   puts " #{elapsed.round(2)} sec"
 end
 
@@ -30,9 +30,7 @@ def create_collection(name, creator: Current.user, all_access: true, access_to:
 end
 
 def create_card(title, collection:, description: nil, status: :published, creator: Current.user)
-  collection.cards.create!(title:, creator:, status:).tap do |card|
-    card.capture(Comment.new(body: description)) if description
-  end
+  collection.cards.create!(title:, description:, creator:, status:)
 end
 
 # Seed accounts

From a4cc143b09a2c8426d500d051027e9162b6d6fd8 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge.manrubia@gmail.com>
Date: Mon, 21 Apr 2025 16:41:33 +0200
Subject: [PATCH 154/413] Revert "Add a description field for cards"

---
 app/assets/stylesheets/card-columns.css       |  1 -
 app/assets/stylesheets/card-perma.css         | 32 ++++++++++++---
 app/assets/stylesheets/cards.css              | 34 +++-------------
 app/assets/stylesheets/comments.css           |  1 -
 app/assets/stylesheets/house.css              |  3 +-
 app/controllers/cards_controller.rb           |  2 +-
 app/helpers/cards_helper.rb                   |  3 +-
 app/models/card.rb                            |  4 +-
 app/models/card/draft_commenting.rb           | 33 +++++++++++++++
 app/models/card/searchable.rb                 | 40 ++++++++-----------
 app/views/cards/_container.html.erb           | 12 +++---
 .../_description_as_draft_comment.html.erb    | 29 ++++++++++++++
 app/views/cards/container/_closure.html.erb   |  2 +-
 app/views/cards/container/_edit.html.erb      |  4 --
 app/views/cards/container/_title.html.erb     | 33 +++++----------
 .../cards/container/footer/_draft.html.erb    |  4 --
 .../container/footer/_published.html.erb      |  7 ----
 app/views/cards/display/_preview.html.erb     |  4 +-
 .../cards/display/common/_assignees.html.erb  |  2 +-
 app/views/cards/display/perma/_tags.html.erb  |  2 +-
 app/views/cards/edit.html.erb                 | 24 +++++------
 app/views/cards/show.html.erb                 |  2 +
 test/controllers/cards_controller_test.rb     |  6 ++-
 test/models/card/messages_test.rb             | 37 +++++++++++++++++
 24 files changed, 190 insertions(+), 131 deletions(-)
 create mode 100644 app/models/card/draft_commenting.rb
 create mode 100644 app/views/cards/_description_as_draft_comment.html.erb
 delete mode 100644 app/views/cards/container/_edit.html.erb
 delete mode 100644 app/views/cards/container/footer/_draft.html.erb
 delete mode 100644 app/views/cards/container/footer/_published.html.erb

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index 0b193b0d5..022201a26 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -96,7 +96,6 @@
 
       border-color: var(--card-color) !important;
       border-style: dashed !important;
-      box-shadow: none !important;
     }
 
     .card__background {
diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index 4f25c7810..af825bb32 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -100,7 +100,7 @@
       z-index: 1;
     }
 
-    .btn:not(.popup__item, .btn--plain, .btn--reversed) {
+    .btn:not(.popup__item, .btn--plain) {
       --btn-background: var(--card-color);
       --btn-color: var(--color-ink-reversed);
     }
@@ -110,11 +110,6 @@
 
       text-decoration: underline;
     }
-
-    .btn--reversed {
-      --btn-background: var(--color-bg);
-      --btn-color: var(--card-color);
-    }
   }
 
   .card-perma__closure-message {
@@ -124,4 +119,29 @@
       padding-left: 1ch;
     }
   }
+
+  /* Variants
+  /* ------------------------------------------------------------------------ */
+
+  .card-perma--pointing {
+    --arrow-size: 20em;
+    --aspect-ratio: 7;
+
+    position: relative;
+    margin-block-end: calc(var(--arrow-size) / var(--aspect-ratio));
+
+    &::after {
+      aspect-ratio: var(--aspect-ratio);
+      background-color: var(--color-container);
+      clip-path: polygon(50% 100%, 100% 0, 0 0);
+      inline-size: var(--arrow-size);
+      content: "";
+      display: block;
+      inset-block-start: 99%;
+      inset-inline-start: 50%;
+      position: absolute;
+      transform: translateX(-50%);
+      z-index: -1;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 4be6b06ed..6f869df5c 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -99,42 +99,18 @@
     padding-block: var(--card-padding-block);
   }
 
-  .card__description {
-    house-md-toolbar,
-    .house-md-content {
-      color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
-    }
-
-    .house-md-content {
-      min-block-size: 3lh;
-      padding: var(--block-space-half) var(--inline-space) 0 0;
-    }
-
-    & ~ .btn {
-      --btn-background: var(--card-color);
-      --btn-color: var(--color-ink-reversed);
-    }
-  }
-
   .card__title {
     --hover-size: 0;
     --input-border-radius: 0;
-    --input-color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
-    --lines: 3;
 
-    color: inherit;
     flex: 2 1 75%;
     font-size: var(--text-xx-large);
     font-weight: 900;
-    line-height: 1.2;
+    line-height: 1.1;
     min-block-size: 3lh;
     text-wrap: balance;
 
-    .card-perma__bg & {
-      min-block-size: unset;
-    }
-
-    .card-field__title {
+    .card__title-field {
       &:is(textarea)::placeholder {
         color: inherit;
         opacity: 0.5;
@@ -142,6 +118,8 @@
     }
 
     .card__title-link {
+      --lines: 3;
+
       color: inherit;
     }
   }
@@ -152,11 +130,11 @@
     flex-direction: column;
     max-width: 100%;
     min-width: 0;
-    padding-block: var(--block-space-half);
+    padding-block: var(--block-space);
   }
 
   .card__move-button {
-    --btn-background: color-mix(in srgb, inherit 40%, var(--color-ink));
+    --btn-background: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
 
     margin-block-start: calc(var(--block-space) * 1.2);
     margin-inline-end: calc(var(--inline-space) * -4);
diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 5ac91e94e..2db3016db 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -68,7 +68,6 @@
     padding:
       var(--comment-padding-block)
       var(--comment-padding-inline);
-    word-wrap: break-word;
   }
 
   .comment__edit {
diff --git a/app/assets/stylesheets/house.css b/app/assets/stylesheets/house.css
index e1ce84325..30982ad76 100644
--- a/app/assets/stylesheets/house.css
+++ b/app/assets/stylesheets/house.css
@@ -58,6 +58,7 @@
 
   /* Markdown Content */
   .house-md-content {
+    caret-color: var(--color-link);
     flex-grow: 1;
     font-family: var(--font-sans);
     text-align: left;
@@ -66,7 +67,7 @@
 
     &.house-md-content-empty::before {
       content: attr(placeholder);
-      color: currentColor;
+      color: var(--color-ink);
       opacity: 0.5;
       pointer-events: none;
       display: block;
diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb
index d535f26d9..eacc517b6 100644
--- a/app/controllers/cards_controller.rb
+++ b/app/controllers/cards_controller.rb
@@ -54,7 +54,7 @@ class CardsController < ApplicationController
     end
 
     def card_params
-      params.expect(card: [ :status, :title, :description, :image, tag_ids: [] ])
+      params.expect(card: [ :status, :title, :color, :due_on, :image, :draft_comment, tag_ids: [] ])
     end
 
     def render_card_replacement
diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
index 31c370479..028a4e715 100644
--- a/app/helpers/cards_helper.rb
+++ b/app/helpers/cards_helper.rb
@@ -19,8 +19,7 @@ module CardsHelper
     classes = [
       options.delete(:class),
       ("card--golden" if card.golden?),
-      ("card--doing" if card.doing?),
-      ("card--drafted" if card.drafted?)
+      ("card--doing" if card.doing?)
     ].compact.join(" ")
 
     tag.article \
diff --git a/app/models/card.rb b/app/models/card.rb
index 541d761a9..7237e1f58 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,5 +1,5 @@
 class Card < ApplicationRecord
-  include Assignable, Colored, Engageable, Eventable, Golden,
+  include Assignable, Colored, DraftCommenting, Engageable, Eventable, Golden,
     Messages, Notifiable, Pinnable, Closeable, Searchable, Staged,
     Statuses, Taggable, Watchable
 
@@ -10,8 +10,6 @@ class Card < ApplicationRecord
 
   has_one_attached :image, dependent: :purge_later
 
-  has_markdown :description
-
   scope :reverse_chronologically, -> { order created_at: :desc, id: :desc }
   scope :chronologically, -> { order created_at: :asc, id: :asc }
   scope :latest, -> { order updated_at: :desc, id: :desc }
diff --git a/app/models/card/draft_commenting.rb b/app/models/card/draft_commenting.rb
new file mode 100644
index 000000000..615d23916
--- /dev/null
+++ b/app/models/card/draft_commenting.rb
@@ -0,0 +1,33 @@
+module Card::DraftCommenting
+  extend ActiveSupport::Concern
+
+  included do
+    after_save :capture_draft_comment
+  end
+
+  def draft_comment
+    find_or_build_initial_comment.body.content
+  end
+
+  def draft_comment=(body)
+    if body.present?
+      @draft_comment = body
+    else
+      messages.comments.destroy_all
+    end
+  end
+
+  private
+    def find_or_build_initial_comment
+      message = messages.comments.first || messages.new(messageable: Comment.new)
+      message.comment
+    end
+
+    def capture_draft_comment
+      if @draft_comment.present?
+        find_or_build_initial_comment.update! body: @draft_comment, creator: creator
+      end
+
+      @draft_comment = nil
+    end
+end
diff --git a/app/models/card/searchable.rb b/app/models/card/searchable.rb
index 2e01fef9b..3627a555b 100644
--- a/app/models/card/searchable.rb
+++ b/app/models/card/searchable.rb
@@ -4,7 +4,7 @@ module Card::Searchable
   included do
     include ::Searchable
 
-    searchable_by :title_and_description, using: :cards_search_index, as: :title
+    searchable_by :title, using: :cards_search_index
 
     scope :mentioning, ->(query) do
       if query = sanitize_query_syntax(query)
@@ -18,31 +18,25 @@ module Card::Searchable
     end
   end
 
-  class_methods do
-    def sanitize_query_syntax(terms)
-      terms = terms.to_s
-      terms = remove_invalid_search_characters(terms)
-      terms = remove_unbalanced_quotes(terms)
-      terms.presence
-    end
-
-    private
-      def remove_invalid_search_characters(terms)
-        terms.gsub(/[^\w"]/, " ")
+    class_methods do
+      def sanitize_query_syntax(terms)
+        terms = terms.to_s
+        terms = remove_invalid_search_characters(terms)
+        terms = remove_unbalanced_quotes(terms)
+        terms.presence
       end
 
-      def remove_unbalanced_quotes(terms)
-        if terms.count("\"").even?
-          terms
-        else
-          terms.gsub("\"", " ")
+      private
+        def remove_invalid_search_characters(terms)
+          terms.gsub(/[^\w"]/, " ")
         end
-      end
-  end
 
-  private
-    # TODO: Temporary until we stabilize the search API
-    def title_and_description
-      [ title, description.to_plain_text ].join(" ")
+        def remove_unbalanced_quotes(terms)
+          if terms.count("\"").even?
+            terms
+          else
+            terms.gsub("\"", " ")
+          end
+        end
     end
 end
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 034106e59..9c2d11aaf 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -1,9 +1,8 @@
 <section id="<%= dom_id(card, :card_container) %>"
-    class="card-perma" style="--card-color: <%= card.color %>;">
+    class="card-perma <%= "card-perma--pointing" unless card.published? %>" style="--card-color: <%= card.color %>;">
   <%= render "cards/container/engagement", card: card %>
 
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
-    <%= render "cards/container/edit", card: card if card.published? %>
     <%= render "cards/container/gild", card: card if card.doing? %>
     <%= render "cards/container/image", card: card %>
 
@@ -33,8 +32,11 @@
   </div>
 
   <% if card.published? %>
-    <%= render "cards/container/footer/published", card: card %>
-  <% elsif card.creating? %>
-    <%= render "cards/container/footer/draft", card: card %>
+    <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
+      <%= turbo_frame_tag card, :watch, src: card_watch_path(card), data: { turbo_permanent: true } %>
+      <%= turbo_frame_tag card, :pin, src: card_pin_path(card), data: { turbo_permanent: true } %>
+    </aside>
+
+    <%= render "cards/container/closure", card: card %>
   <% end %>
 </section>
diff --git a/app/views/cards/_description_as_draft_comment.html.erb b/app/views/cards/_description_as_draft_comment.html.erb
new file mode 100644
index 000000000..5e7a1cd71
--- /dev/null
+++ b/app/views/cards/_description_as_draft_comment.html.erb
@@ -0,0 +1,29 @@
+<div class="comments pad-block">
+  <div class="comment comment--new flex-inline align-start full-width">
+    <figure class="comment__avatar flex-item-no-shrink" aria-hidden="true">
+      <%= avatar_tag Current.user, hidden_for_screen_reader: true %>
+    </figure>
+
+    <div class="comment__content flex-inline flex-column full-width">
+      <div class="comment__body txt-align-start">
+        <form data-controller="outlet-auto-save paste"
+              class="flex flex-column gap full-width"
+              data-outlet-auto-save-auto-save-outlet="#card_form"
+              data-action="paste->paste#pasteFiles">
+              <%= tag.house_md card.draft_comment, name: "card[draft_comment]", class: "input comment__input",
+                form: "card_form",
+                placeholder: new_comment_placeholder(card),
+                data: { action: "house-md:change->outlet-auto-save#change focusout->outlet-auto-save#submit", uploads_url: uploads_url(format: "json") } %>
+        </form>
+
+        <% if card.creating? %>
+          <div class="margin-block-start flex align-center gap">
+            <%= button_to "Create card", card_publish_path(card), class: "btn btn--reversed" %>
+            <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn" %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb
index e9006f3aa..661b8edea 100644
--- a/app/views/cards/container/_closure.html.erb
+++ b/app/views/cards/container/_closure.html.erb
@@ -1,4 +1,4 @@
-<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(card, :card_closure_toggle) %>" style="--card-color: <%= card.color %>">
+<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(@card, :card_closure_toggle) %>" style="--card-color: <%= @card.color %>">
   <% if card.closed? %>
     <div class="flex gap-half margin-block-start-double margin-block-end">
       <span class="card-perma__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
diff --git a/app/views/cards/container/_edit.html.erb b/app/views/cards/container/_edit.html.erb
deleted file mode 100644
index 23ea9f48d..000000000
--- a/app/views/cards/container/_edit.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= link_to edit_collection_card_path(card.collection, card), class: "btn", data: { turbo_frame: dom_id(card, :edit) } do %>
-  <%= icon_tag "pencil" %>
-  <span class="for-screen-reader">Edit</span>
-<% end %>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index a959e888f..b62eb2fb4 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -1,27 +1,14 @@
-<% if card.published? %>
-  <%= turbo_frame_tag card, :edit do %>
-    <div class="full-width">
-      <h1 class="card__title flex align-start gap-half">
-        <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link" %>
-      </h1>
-      <p class="card__description margin-block-half">
-        <%= sanitize card.description_html %>
-      </p>
-    </div>
-  <% end %>
-<% else %>
-  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "full-width", data: { controller: "auto-save" } do |form| %>
-    <h1 class="card__title">
+<h1 class="card__title">
+  <% if card.published? %>
+    <%= turbo_frame_tag card, :edit do %>
+      <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link overflow-line-clamp" %>
+    <% end %>
+  <% else %>
+    <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", data: { controller: "auto-save" } do |form| %>
       <%= form.text_area :title, placeholder: "Name it…",
-            class: "input input--textarea full-width borderless txt-align-start",
+            class: "input input--textarea full-width borderless txt-align-start #{ "fill-highlight" if card.creating? }",
             autofocus: card.title.blank?,
             data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
-    </h1>
-    <div class="card__description margin-block-half">
-      <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
-            placeholder: "Add some notes, context, pictures, or video about this…",
-            data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
-    </div>
-    <%= form.button "Save changes", type: :submit, class: "btn"%>
+    <% end %>
   <% end %>
-<% end %>
\ No newline at end of file
+</h1>
diff --git a/app/views/cards/container/footer/_draft.html.erb b/app/views/cards/container/footer/_draft.html.erb
deleted file mode 100644
index f46e08b41..000000000
--- a/app/views/cards/container/footer/_draft.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="card-perma__notch card-perma__notch--bottom">
-  <%= button_to "Create card", card_publish_path(card), class: "btn" %>
-  <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn btn--reversed" %>
-</div>
diff --git a/app/views/cards/container/footer/_published.html.erb b/app/views/cards/container/footer/_published.html.erb
deleted file mode 100644
index c4e0a0cdf..000000000
--- a/app/views/cards/container/footer/_published.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<%# FIXME: Let's move this aside outside of the card container section so these frames don't reload/flicker when card is replaced %>
-<aside class="card-perma__actions card-perma__actions--right" role="toolbar">
-  <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
-  <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>
-</aside>
-
-<%= render "cards/container/closure", card: card %>
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 43284b534..e1ed5b946 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -6,8 +6,8 @@
     </header>
 
     <div class="card__body flex gap full-width flex-item-grow">
-      <h1 class="card__title overflow-line-clamp">
-        <%= card.title %>
+      <h1 class="card__title">
+        <span class="card__title-link overflow-line-clamp"><%= card.title %></span>
       </h1>
 
       <%= link_to collection_card_path(card.collection, card), class: "card__link" do %>
diff --git a/app/views/cards/display/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb
index c89cdcc57..7cfa48447 100644
--- a/app/views/cards/display/common/_assignees.html.erb
+++ b/app/views/cards/display/common/_assignees.html.erb
@@ -4,7 +4,7 @@
   <% end %>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
-    <button class="btn card__hide-on-index fill-transparent" data-action="click->dialog#open:stop">
+    <button class="btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
       <%= icon_tag "person-add" %>
       <span class="for-screen-reader">Assign</span>
     </button>
diff --git a/app/views/cards/display/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb
index 46e66c56e..cecde410e 100644
--- a/app/views/cards/display/perma/_tags.html.erb
+++ b/app/views/cards/display/perma/_tags.html.erb
@@ -12,7 +12,7 @@
   </div>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
-    <button class="tag-picker__button btn card__hide-on-index fill-transparent" data-action="click->dialog#open:stop">
+    <button class="tag-picker__button btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
       <%= icon_tag "tag" %>
       <span class="for-screen-reader">Add a tag</span>
     </button>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index ad509b0e0..5e5e0d1d9 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -1,19 +1,13 @@
 <%= turbo_frame_tag @card, :edit do %>
-  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "full-width", data: { controller: "form paste" } do |form| %>
-    <h1 class="card__title">
-      <%= form.label :title, class: "flex flex-column align-center" do %>
-        <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card-field__title",
-              required: true, autofocus: true, placeholder: "Name it…",
-              rows: 1,
-              data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" } %>
-      <% end %>
-    </h1>
-    <div class="card__description margin-block-half">
-      <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
-            placeholder: "Add some notes, context, pictures, or video about this…",
-            data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
-    </div>
-    <%= form.button "Save changes", type: :submit, class: "btn"%>
+  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "flex flex-column gap full-width", data: { controller: "form" } do |form| %>
+    <%= form.label :title, class: "flex flex-column align-center" do %>
+      <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card__title-field",
+            required: true, autofocus: true, placeholder: "Name it…",
+            rows: 3,
+            data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" },
+            style: "color: var(--spat-color); --input-border-radius: 0" %>
+    <% end %>
+    <%= form.button "Save", type: :submit, hidden: true %>
     <%= link_to "Close editor and discard changes", collection_card_path(@card.collection, @card), data: { form_target: "cancel" }, hidden: true %>
   <% end %>
 <% end %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index 56ca920bb..df993c968 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -34,5 +34,7 @@
 
   <% if @card.published? %>
     <%= render "cards/messages", card: @card %>
+  <% else %>
+    <%= render "cards/description_as_draft_comment", card: @card %>
   <% end %>
 </div>
diff --git a/test/controllers/cards_controller_test.rb b/test/controllers/cards_controller_test.rb
index 5cb3a6582..5272dc182 100644
--- a/test/controllers/cards_controller_test.rb
+++ b/test/controllers/cards_controller_test.rb
@@ -36,17 +36,19 @@ class CardsControllerTest < ActionDispatch::IntegrationTest
     patch collection_card_path(collections(:writebook), cards(:logo)), params: {
       card: {
         title: "Logo needs to change",
+        due_on: 1.week.from_now,
         image: fixture_file_upload("moon.jpg", "image/jpeg"),
-        description: "Something more in-depth",
+        draft_comment: "Something more in-depth",
         tag_ids: [ tags(:mobile).id ] } }
     assert_response :success
 
     card = cards(:logo).reload
     assert_equal "Logo needs to change", card.title
+    assert_equal 1.week.from_now.to_date, card.due_on
     assert_equal "moon.jpg", card.image.filename.to_s
     assert_equal [ tags(:mobile) ], card.tags
 
-    assert_equal "Something more in-depth", card.description_plain_text.strip
+    assert_equal "Something more in-depth", card.messages.comments.first.comment.body_plain_text.strip
   end
 
   test "users can only see cards in collections they have access to" do
diff --git a/test/models/card/messages_test.rb b/test/models/card/messages_test.rb
index 31d730306..08ade7f0f 100644
--- a/test/models/card/messages_test.rb
+++ b/test/models/card/messages_test.rb
@@ -6,4 +6,41 @@ class Card::MessagesTest < ActiveSupport::TestCase
 
     assert_empty card.messages
   end
+
+  test "creating a card with an initial draft comment" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
+      draft_comment: "This is a comment"
+
+    assert_equal 1, card.messages.count
+    assert_equal "This is a comment", card.draft_comment.strip
+  end
+
+  test "updating the draft comment" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
+      draft_comment: "This is a comment"
+
+    card.update! draft_comment: "This is an updated comment"
+
+    assert_equal 1, card.messages.count
+    assert_equal "This is an updated comment", card.draft_comment.strip
+  end
+
+  test "setting the draft comment to be blank removes it" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
+      draft_comment: "This is a comment"
+
+    card.update! draft_comment: " "
+
+    assert card.messages.first.nil?
+  end
+
+  test "omitting the draft comment does not remove it" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
+      draft_comment: "This is a comment"
+
+    card.update! title: "Newer"
+
+    assert_equal 1, card.messages.count
+    assert_equal "This is a comment", card.draft_comment.strip
+  end
 end

From b0aae3ad9e182717b3aef33aaf89bfd583ad3159 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 16:45:24 +0200
Subject: [PATCH 155/413] Reapply "Add a description field for cards"

This reverts commit a4cc143b09a2c8426d500d051027e9162b6d6fd8.
---
 app/assets/stylesheets/card-columns.css       |  1 +
 app/assets/stylesheets/card-perma.css         | 32 +++------------
 app/assets/stylesheets/cards.css              | 34 +++++++++++++---
 app/assets/stylesheets/comments.css           |  1 +
 app/assets/stylesheets/house.css              |  3 +-
 app/controllers/cards_controller.rb           |  2 +-
 app/helpers/cards_helper.rb                   |  3 +-
 app/models/card.rb                            |  4 +-
 app/models/card/draft_commenting.rb           | 33 ---------------
 app/models/card/searchable.rb                 | 40 +++++++++++--------
 app/views/cards/_container.html.erb           | 12 +++---
 .../_description_as_draft_comment.html.erb    | 29 --------------
 app/views/cards/container/_closure.html.erb   |  2 +-
 app/views/cards/container/_edit.html.erb      |  4 ++
 app/views/cards/container/_title.html.erb     | 33 ++++++++++-----
 .../cards/container/footer/_draft.html.erb    |  4 ++
 .../container/footer/_published.html.erb      |  7 ++++
 app/views/cards/display/_preview.html.erb     |  4 +-
 .../cards/display/common/_assignees.html.erb  |  2 +-
 app/views/cards/display/perma/_tags.html.erb  |  2 +-
 app/views/cards/edit.html.erb                 | 24 ++++++-----
 app/views/cards/show.html.erb                 |  2 -
 test/controllers/cards_controller_test.rb     |  6 +--
 test/models/card/messages_test.rb             | 37 -----------------
 24 files changed, 131 insertions(+), 190 deletions(-)
 delete mode 100644 app/models/card/draft_commenting.rb
 delete mode 100644 app/views/cards/_description_as_draft_comment.html.erb
 create mode 100644 app/views/cards/container/_edit.html.erb
 create mode 100644 app/views/cards/container/footer/_draft.html.erb
 create mode 100644 app/views/cards/container/footer/_published.html.erb

diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index 022201a26..0b193b0d5 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -96,6 +96,7 @@
 
       border-color: var(--card-color) !important;
       border-style: dashed !important;
+      box-shadow: none !important;
     }
 
     .card__background {
diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index af825bb32..4f25c7810 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -100,7 +100,7 @@
       z-index: 1;
     }
 
-    .btn:not(.popup__item, .btn--plain) {
+    .btn:not(.popup__item, .btn--plain, .btn--reversed) {
       --btn-background: var(--card-color);
       --btn-color: var(--color-ink-reversed);
     }
@@ -110,6 +110,11 @@
 
       text-decoration: underline;
     }
+
+    .btn--reversed {
+      --btn-background: var(--color-bg);
+      --btn-color: var(--card-color);
+    }
   }
 
   .card-perma__closure-message {
@@ -119,29 +124,4 @@
       padding-left: 1ch;
     }
   }
-
-  /* Variants
-  /* ------------------------------------------------------------------------ */
-
-  .card-perma--pointing {
-    --arrow-size: 20em;
-    --aspect-ratio: 7;
-
-    position: relative;
-    margin-block-end: calc(var(--arrow-size) / var(--aspect-ratio));
-
-    &::after {
-      aspect-ratio: var(--aspect-ratio);
-      background-color: var(--color-container);
-      clip-path: polygon(50% 100%, 100% 0, 0 0);
-      inline-size: var(--arrow-size);
-      content: "";
-      display: block;
-      inset-block-start: 99%;
-      inset-inline-start: 50%;
-      position: absolute;
-      transform: translateX(-50%);
-      z-index: -1;
-    }
-  }
 }
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 6f869df5c..4be6b06ed 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -99,18 +99,42 @@
     padding-block: var(--card-padding-block);
   }
 
+  .card__description {
+    house-md-toolbar,
+    .house-md-content {
+      color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
+    }
+
+    .house-md-content {
+      min-block-size: 3lh;
+      padding: var(--block-space-half) var(--inline-space) 0 0;
+    }
+
+    & ~ .btn {
+      --btn-background: var(--card-color);
+      --btn-color: var(--color-ink-reversed);
+    }
+  }
+
   .card__title {
     --hover-size: 0;
     --input-border-radius: 0;
+    --input-color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
+    --lines: 3;
 
+    color: inherit;
     flex: 2 1 75%;
     font-size: var(--text-xx-large);
     font-weight: 900;
-    line-height: 1.1;
+    line-height: 1.2;
     min-block-size: 3lh;
     text-wrap: balance;
 
-    .card__title-field {
+    .card-perma__bg & {
+      min-block-size: unset;
+    }
+
+    .card-field__title {
       &:is(textarea)::placeholder {
         color: inherit;
         opacity: 0.5;
@@ -118,8 +142,6 @@
     }
 
     .card__title-link {
-      --lines: 3;
-
       color: inherit;
     }
   }
@@ -130,11 +152,11 @@
     flex-direction: column;
     max-width: 100%;
     min-width: 0;
-    padding-block: var(--block-space);
+    padding-block: var(--block-space-half);
   }
 
   .card__move-button {
-    --btn-background: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
+    --btn-background: color-mix(in srgb, inherit 40%, var(--color-ink));
 
     margin-block-start: calc(var(--block-space) * 1.2);
     margin-inline-end: calc(var(--inline-space) * -4);
diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 2db3016db..5ac91e94e 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -68,6 +68,7 @@
     padding:
       var(--comment-padding-block)
       var(--comment-padding-inline);
+    word-wrap: break-word;
   }
 
   .comment__edit {
diff --git a/app/assets/stylesheets/house.css b/app/assets/stylesheets/house.css
index 30982ad76..e1ce84325 100644
--- a/app/assets/stylesheets/house.css
+++ b/app/assets/stylesheets/house.css
@@ -58,7 +58,6 @@
 
   /* Markdown Content */
   .house-md-content {
-    caret-color: var(--color-link);
     flex-grow: 1;
     font-family: var(--font-sans);
     text-align: left;
@@ -67,7 +66,7 @@
 
     &.house-md-content-empty::before {
       content: attr(placeholder);
-      color: var(--color-ink);
+      color: currentColor;
       opacity: 0.5;
       pointer-events: none;
       display: block;
diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb
index eacc517b6..d535f26d9 100644
--- a/app/controllers/cards_controller.rb
+++ b/app/controllers/cards_controller.rb
@@ -54,7 +54,7 @@ class CardsController < ApplicationController
     end
 
     def card_params
-      params.expect(card: [ :status, :title, :color, :due_on, :image, :draft_comment, tag_ids: [] ])
+      params.expect(card: [ :status, :title, :description, :image, tag_ids: [] ])
     end
 
     def render_card_replacement
diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
index 028a4e715..31c370479 100644
--- a/app/helpers/cards_helper.rb
+++ b/app/helpers/cards_helper.rb
@@ -19,7 +19,8 @@ module CardsHelper
     classes = [
       options.delete(:class),
       ("card--golden" if card.golden?),
-      ("card--doing" if card.doing?)
+      ("card--doing" if card.doing?),
+      ("card--drafted" if card.drafted?)
     ].compact.join(" ")
 
     tag.article \
diff --git a/app/models/card.rb b/app/models/card.rb
index 7237e1f58..541d761a9 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,5 +1,5 @@
 class Card < ApplicationRecord
-  include Assignable, Colored, DraftCommenting, Engageable, Eventable, Golden,
+  include Assignable, Colored, Engageable, Eventable, Golden,
     Messages, Notifiable, Pinnable, Closeable, Searchable, Staged,
     Statuses, Taggable, Watchable
 
@@ -10,6 +10,8 @@ class Card < ApplicationRecord
 
   has_one_attached :image, dependent: :purge_later
 
+  has_markdown :description
+
   scope :reverse_chronologically, -> { order created_at: :desc, id: :desc }
   scope :chronologically, -> { order created_at: :asc, id: :asc }
   scope :latest, -> { order updated_at: :desc, id: :desc }
diff --git a/app/models/card/draft_commenting.rb b/app/models/card/draft_commenting.rb
deleted file mode 100644
index 615d23916..000000000
--- a/app/models/card/draft_commenting.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Card::DraftCommenting
-  extend ActiveSupport::Concern
-
-  included do
-    after_save :capture_draft_comment
-  end
-
-  def draft_comment
-    find_or_build_initial_comment.body.content
-  end
-
-  def draft_comment=(body)
-    if body.present?
-      @draft_comment = body
-    else
-      messages.comments.destroy_all
-    end
-  end
-
-  private
-    def find_or_build_initial_comment
-      message = messages.comments.first || messages.new(messageable: Comment.new)
-      message.comment
-    end
-
-    def capture_draft_comment
-      if @draft_comment.present?
-        find_or_build_initial_comment.update! body: @draft_comment, creator: creator
-      end
-
-      @draft_comment = nil
-    end
-end
diff --git a/app/models/card/searchable.rb b/app/models/card/searchable.rb
index 3627a555b..2e01fef9b 100644
--- a/app/models/card/searchable.rb
+++ b/app/models/card/searchable.rb
@@ -4,7 +4,7 @@ module Card::Searchable
   included do
     include ::Searchable
 
-    searchable_by :title, using: :cards_search_index
+    searchable_by :title_and_description, using: :cards_search_index, as: :title
 
     scope :mentioning, ->(query) do
       if query = sanitize_query_syntax(query)
@@ -18,25 +18,31 @@ module Card::Searchable
     end
   end
 
-    class_methods do
-      def sanitize_query_syntax(terms)
-        terms = terms.to_s
-        terms = remove_invalid_search_characters(terms)
-        terms = remove_unbalanced_quotes(terms)
-        terms.presence
+  class_methods do
+    def sanitize_query_syntax(terms)
+      terms = terms.to_s
+      terms = remove_invalid_search_characters(terms)
+      terms = remove_unbalanced_quotes(terms)
+      terms.presence
+    end
+
+    private
+      def remove_invalid_search_characters(terms)
+        terms.gsub(/[^\w"]/, " ")
       end
 
-      private
-        def remove_invalid_search_characters(terms)
-          terms.gsub(/[^\w"]/, " ")
+      def remove_unbalanced_quotes(terms)
+        if terms.count("\"").even?
+          terms
+        else
+          terms.gsub("\"", " ")
         end
+      end
+  end
 
-        def remove_unbalanced_quotes(terms)
-          if terms.count("\"").even?
-            terms
-          else
-            terms.gsub("\"", " ")
-          end
-        end
+  private
+    # TODO: Temporary until we stabilize the search API
+    def title_and_description
+      [ title, description.to_plain_text ].join(" ")
     end
 end
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 9c2d11aaf..034106e59 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -1,8 +1,9 @@
 <section id="<%= dom_id(card, :card_container) %>"
-    class="card-perma <%= "card-perma--pointing" unless card.published? %>" style="--card-color: <%= card.color %>;">
+    class="card-perma" style="--card-color: <%= card.color %>;">
   <%= render "cards/container/engagement", card: card %>
 
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
+    <%= render "cards/container/edit", card: card if card.published? %>
     <%= render "cards/container/gild", card: card if card.doing? %>
     <%= render "cards/container/image", card: card %>
 
@@ -32,11 +33,8 @@
   </div>
 
   <% if card.published? %>
-    <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
-      <%= turbo_frame_tag card, :watch, src: card_watch_path(card), data: { turbo_permanent: true } %>
-      <%= turbo_frame_tag card, :pin, src: card_pin_path(card), data: { turbo_permanent: true } %>
-    </aside>
-
-    <%= render "cards/container/closure", card: card %>
+    <%= render "cards/container/footer/published", card: card %>
+  <% elsif card.creating? %>
+    <%= render "cards/container/footer/draft", card: card %>
   <% end %>
 </section>
diff --git a/app/views/cards/_description_as_draft_comment.html.erb b/app/views/cards/_description_as_draft_comment.html.erb
deleted file mode 100644
index 5e7a1cd71..000000000
--- a/app/views/cards/_description_as_draft_comment.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="comments pad-block">
-  <div class="comment comment--new flex-inline align-start full-width">
-    <figure class="comment__avatar flex-item-no-shrink" aria-hidden="true">
-      <%= avatar_tag Current.user, hidden_for_screen_reader: true %>
-    </figure>
-
-    <div class="comment__content flex-inline flex-column full-width">
-      <div class="comment__body txt-align-start">
-        <form data-controller="outlet-auto-save paste"
-              class="flex flex-column gap full-width"
-              data-outlet-auto-save-auto-save-outlet="#card_form"
-              data-action="paste->paste#pasteFiles">
-              <%= tag.house_md card.draft_comment, name: "card[draft_comment]", class: "input comment__input",
-                form: "card_form",
-                placeholder: new_comment_placeholder(card),
-                data: { action: "house-md:change->outlet-auto-save#change focusout->outlet-auto-save#submit", uploads_url: uploads_url(format: "json") } %>
-        </form>
-
-        <% if card.creating? %>
-          <div class="margin-block-start flex align-center gap">
-            <%= button_to "Create card", card_publish_path(card), class: "btn btn--reversed" %>
-            <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn" %>
-          </div>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-
diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb
index 661b8edea..e9006f3aa 100644
--- a/app/views/cards/container/_closure.html.erb
+++ b/app/views/cards/container/_closure.html.erb
@@ -1,4 +1,4 @@
-<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(@card, :card_closure_toggle) %>" style="--card-color: <%= @card.color %>">
+<div class="card-perma__notch card-perma__notch--bottom flex-column" id="<%= dom_id(card, :card_closure_toggle) %>" style="--card-color: <%= card.color %>">
   <% if card.closed? %>
     <div class="flex gap-half margin-block-start-double margin-block-end">
       <span class="card-perma__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
diff --git a/app/views/cards/container/_edit.html.erb b/app/views/cards/container/_edit.html.erb
new file mode 100644
index 000000000..23ea9f48d
--- /dev/null
+++ b/app/views/cards/container/_edit.html.erb
@@ -0,0 +1,4 @@
+<%= link_to edit_collection_card_path(card.collection, card), class: "btn", data: { turbo_frame: dom_id(card, :edit) } do %>
+  <%= icon_tag "pencil" %>
+  <span class="for-screen-reader">Edit</span>
+<% end %>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index b62eb2fb4..a959e888f 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -1,14 +1,27 @@
-<h1 class="card__title">
-  <% if card.published? %>
-    <%= turbo_frame_tag card, :edit do %>
-      <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link overflow-line-clamp" %>
-    <% end %>
-  <% else %>
-    <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", data: { controller: "auto-save" } do |form| %>
+<% if card.published? %>
+  <%= turbo_frame_tag card, :edit do %>
+    <div class="full-width">
+      <h1 class="card__title flex align-start gap-half">
+        <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link" %>
+      </h1>
+      <p class="card__description margin-block-half">
+        <%= sanitize card.description_html %>
+      </p>
+    </div>
+  <% end %>
+<% else %>
+  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "full-width", data: { controller: "auto-save" } do |form| %>
+    <h1 class="card__title">
       <%= form.text_area :title, placeholder: "Name it…",
-            class: "input input--textarea full-width borderless txt-align-start #{ "fill-highlight" if card.creating? }",
+            class: "input input--textarea full-width borderless txt-align-start",
             autofocus: card.title.blank?,
             data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
-    <% end %>
+    </h1>
+    <div class="card__description margin-block-half">
+      <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
+            placeholder: "Add some notes, context, pictures, or video about this…",
+            data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
+    </div>
+    <%= form.button "Save changes", type: :submit, class: "btn"%>
   <% end %>
-</h1>
+<% end %>
\ No newline at end of file
diff --git a/app/views/cards/container/footer/_draft.html.erb b/app/views/cards/container/footer/_draft.html.erb
new file mode 100644
index 000000000..f46e08b41
--- /dev/null
+++ b/app/views/cards/container/footer/_draft.html.erb
@@ -0,0 +1,4 @@
+<div class="card-perma__notch card-perma__notch--bottom">
+  <%= button_to "Create card", card_publish_path(card), class: "btn" %>
+  <%= button_to "Save as draft", collection_card_path(card.collection, card), name: "card[status]", value: "drafted", method: :put, class: "btn btn--reversed" %>
+</div>
diff --git a/app/views/cards/container/footer/_published.html.erb b/app/views/cards/container/footer/_published.html.erb
new file mode 100644
index 000000000..c4e0a0cdf
--- /dev/null
+++ b/app/views/cards/container/footer/_published.html.erb
@@ -0,0 +1,7 @@
+<%# FIXME: Let's move this aside outside of the card container section so these frames don't reload/flicker when card is replaced %>
+<aside class="card-perma__actions card-perma__actions--right" role="toolbar">
+  <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
+  <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>
+</aside>
+
+<%= render "cards/container/closure", card: card %>
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index e1ed5b946..43284b534 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -6,8 +6,8 @@
     </header>
 
     <div class="card__body flex gap full-width flex-item-grow">
-      <h1 class="card__title">
-        <span class="card__title-link overflow-line-clamp"><%= card.title %></span>
+      <h1 class="card__title overflow-line-clamp">
+        <%= card.title %>
       </h1>
 
       <%= link_to collection_card_path(card.collection, card), class: "card__link" do %>
diff --git a/app/views/cards/display/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb
index 7cfa48447..c89cdcc57 100644
--- a/app/views/cards/display/common/_assignees.html.erb
+++ b/app/views/cards/display/common/_assignees.html.erb
@@ -4,7 +4,7 @@
   <% end %>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
-    <button class="btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
+    <button class="btn card__hide-on-index fill-transparent" data-action="click->dialog#open:stop">
       <%= icon_tag "person-add" %>
       <span class="for-screen-reader">Assign</span>
     </button>
diff --git a/app/views/cards/display/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb
index cecde410e..46e66c56e 100644
--- a/app/views/cards/display/perma/_tags.html.erb
+++ b/app/views/cards/display/perma/_tags.html.erb
@@ -12,7 +12,7 @@
   </div>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
-    <button class="tag-picker__button btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
+    <button class="tag-picker__button btn card__hide-on-index fill-transparent" data-action="click->dialog#open:stop">
       <%= icon_tag "tag" %>
       <span class="for-screen-reader">Add a tag</span>
     </button>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index 5e5e0d1d9..ad509b0e0 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -1,13 +1,19 @@
 <%= turbo_frame_tag @card, :edit do %>
-  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "flex flex-column gap full-width", data: { controller: "form" } do |form| %>
-    <%= form.label :title, class: "flex flex-column align-center" do %>
-      <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card__title-field",
-            required: true, autofocus: true, placeholder: "Name it…",
-            rows: 3,
-            data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" },
-            style: "color: var(--spat-color); --input-border-radius: 0" %>
-    <% end %>
-    <%= form.button "Save", type: :submit, hidden: true %>
+  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "full-width", data: { controller: "form paste" } do |form| %>
+    <h1 class="card__title">
+      <%= form.label :title, class: "flex flex-column align-center" do %>
+        <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card-field__title",
+              required: true, autofocus: true, placeholder: "Name it…",
+              rows: 1,
+              data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" } %>
+      <% end %>
+    </h1>
+    <div class="card__description margin-block-half">
+      <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
+            placeholder: "Add some notes, context, pictures, or video about this…",
+            data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
+    </div>
+    <%= form.button "Save changes", type: :submit, class: "btn"%>
     <%= link_to "Close editor and discard changes", collection_card_path(@card.collection, @card), data: { form_target: "cancel" }, hidden: true %>
   <% end %>
 <% end %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index df993c968..56ca920bb 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -34,7 +34,5 @@
 
   <% if @card.published? %>
     <%= render "cards/messages", card: @card %>
-  <% else %>
-    <%= render "cards/description_as_draft_comment", card: @card %>
   <% end %>
 </div>
diff --git a/test/controllers/cards_controller_test.rb b/test/controllers/cards_controller_test.rb
index 5272dc182..5cb3a6582 100644
--- a/test/controllers/cards_controller_test.rb
+++ b/test/controllers/cards_controller_test.rb
@@ -36,19 +36,17 @@ class CardsControllerTest < ActionDispatch::IntegrationTest
     patch collection_card_path(collections(:writebook), cards(:logo)), params: {
       card: {
         title: "Logo needs to change",
-        due_on: 1.week.from_now,
         image: fixture_file_upload("moon.jpg", "image/jpeg"),
-        draft_comment: "Something more in-depth",
+        description: "Something more in-depth",
         tag_ids: [ tags(:mobile).id ] } }
     assert_response :success
 
     card = cards(:logo).reload
     assert_equal "Logo needs to change", card.title
-    assert_equal 1.week.from_now.to_date, card.due_on
     assert_equal "moon.jpg", card.image.filename.to_s
     assert_equal [ tags(:mobile) ], card.tags
 
-    assert_equal "Something more in-depth", card.messages.comments.first.comment.body_plain_text.strip
+    assert_equal "Something more in-depth", card.description_plain_text.strip
   end
 
   test "users can only see cards in collections they have access to" do
diff --git a/test/models/card/messages_test.rb b/test/models/card/messages_test.rb
index 08ade7f0f..31d730306 100644
--- a/test/models/card/messages_test.rb
+++ b/test/models/card/messages_test.rb
@@ -6,41 +6,4 @@ class Card::MessagesTest < ActiveSupport::TestCase
 
     assert_empty card.messages
   end
-
-  test "creating a card with an initial draft comment" do
-    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    assert_equal 1, card.messages.count
-    assert_equal "This is a comment", card.draft_comment.strip
-  end
-
-  test "updating the draft comment" do
-    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    card.update! draft_comment: "This is an updated comment"
-
-    assert_equal 1, card.messages.count
-    assert_equal "This is an updated comment", card.draft_comment.strip
-  end
-
-  test "setting the draft comment to be blank removes it" do
-    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    card.update! draft_comment: " "
-
-    assert card.messages.first.nil?
-  end
-
-  test "omitting the draft comment does not remove it" do
-    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    card.update! title: "Newer"
-
-    assert_equal 1, card.messages.count
-    assert_equal "This is a comment", card.draft_comment.strip
-  end
 end

From 16800952662c6d7526afbc74b35278ffff4833bd Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 16:45:35 +0200
Subject: [PATCH 156/413] Remove invalid "

---
 app/views/cards/comments/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/comments/edit.html.erb b/app/views/cards/comments/edit.html.erb
index e3a2e783d..cfe22b4c0 100644
--- a/app/views/cards/comments/edit.html.erb
+++ b/app/views/cards/comments/edit.html.erb
@@ -9,7 +9,7 @@
             <span>Save changes</span>
           <% end %>
           <%= link_to card_comment_path(@card, @comment), class: "btn", data: { form_target: "cancel" } do %>
-            <span">Cancel</span>
+            <span>Cancel</span>
           <% end %>
 
           <%= tag.button type: :submit, class: "btn btn--negative flex-item-justify-end", form: dom_id(@comment, :delete_form),

From 2c3ec3e8062f7d485c835e55a2257f31cb643743 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 17:00:25 +0200
Subject: [PATCH 157/413] Fix: Create new cards wasn't working

---
 app/views/cards/container/_title.html.erb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index a959e888f..e180c4d56 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -20,8 +20,7 @@
     <div class="card__description margin-block-half">
       <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
-            data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
+            data: { action: "house-md:change->auto-save#change blur->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
     </div>
-    <%= form.button "Save changes", type: :submit, class: "btn"%>
   <% end %>
-<% end %>
\ No newline at end of file
+<% end %>

From 4f0cf0f5cb4293cb60e26d8ccdc6ccf1086f442c Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 21 Apr 2025 17:05:35 +0200
Subject: [PATCH 158/413] Fix autosave working with the new description field

---
 app/views/cards/container/_title.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index e180c4d56..f3ab76788 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -20,7 +20,7 @@
     <div class="card__description margin-block-half">
       <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
-            data: { action: "house-md:change->auto-save#change blur->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
+            data: { action: "house-md:change->auto-save#change focusout->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
     </div>
   <% end %>
 <% end %>

From 01d741b3f493ecec4e03a8fa03a32e868bf9bfab Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 21 Apr 2025 13:03:49 -0400
Subject: [PATCH 159/413] dep: update rails

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 533616d7c..37b14083c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 8b00d0985f88a3f151dd21e8dfdaf6d1c2f497b0
+  revision: e9ee790d694298b8a48d44cd089934e6c8bc7597
   branch: main
   specs:
     actioncable (8.1.0.alpha)
@@ -373,7 +373,7 @@ GEM
       ostruct
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.1.6)
+    stringio (3.1.7)
     thor (1.3.2)
     thruster (0.1.12)
     thruster (0.1.12-aarch64-linux)

From 682da733da03489410f4cef5759184111f26bf77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Apr 2025 04:58:30 +0000
Subject: [PATCH 160/413] Bump nokogiri from 1.18.7 to 1.18.8

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.7 to 1.18.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.18.7...v1.18.8)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-version: 1.18.8
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 37b14083c..a9c459db0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -223,24 +223,24 @@ GEM
       net-protocol
     net-ssh (7.3.0)
     nio4r (2.7.4)
-    nokogiri (1.18.7)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.7-aarch64-linux-gnu)
+    nokogiri (1.18.8-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.7-aarch64-linux-musl)
+    nokogiri (1.18.8-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.7-arm-linux-gnu)
+    nokogiri (1.18.8-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.7-arm-linux-musl)
+    nokogiri (1.18.8-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.7-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-darwin)
+    nokogiri (1.18.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-linux-musl)
+    nokogiri (1.18.8-x86_64-linux-musl)
       racc (~> 1.4)
     ostruct (0.6.1)
     parallel (1.26.3)

From 58c7eb41bb47bb1ad4cc130fe6fb53f2cc146fda Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 09:55:59 +0200
Subject: [PATCH 161/413] AI slop for the honcho seed data

---
 db/seeds/honcho.rb | 74 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 10 deletions(-)

diff --git a/db/seeds/honcho.rb b/db/seeds/honcho.rb
index 918b3a4d5..9132177ab 100644
--- a/db/seeds/honcho.rb
+++ b/db/seeds/honcho.rb
@@ -3,19 +3,73 @@ create_tenant "honcho"
 david = create_first_run "David Heinemeier Hansson", "david@37signals.com"
 login_as david
 
-jz    = create_user "Jason Zimdars", "jz@37signals.com"
+jason = create_user "Jason Zimdars", "jz@37signals.com"
 kevin = create_user "Kevin Mcconnell", "kevin@37signals.com"
+sarah = create_user "Sarah Johnson", "sarah@37signals.com"
+mike = create_user "Mike Peterson", "mike@37signals.com"
 
-create_collection("Mucho", access_to: [ jz, kevin ]).tap do |fizzy|
-  create_card("Prepare MUCHO sign-up page", description: "We need to do this before the launch.", collection: fizzy)
+# Array of authors for random assignment
+authors = [david, jason, kevin, sarah, mike]
 
-  create_card("Prepare MUCHO sign-up page", description: "We need to do this before the launch.", collection: fizzy).tap do |card|
-    card.toggle_assignment(kevin)
-    card.engage
-  end
+# Card titles for reuse across collections
+card_titles = [
+  "Implement authentication",
+  "Design landing page",
+  "Set up database",
+  "Create API endpoints",
+  "Write unit tests",
+  "Optimize performance",
+  "Add user profiles",
+  "Implement search",
+  "Create admin panel",
+  "Set up CI/CD",
+  "Design logo",
+  "Create documentation",
+  "Add payment system",
+  "Implement notifications",
+  "Set up analytics",
+  "Create mobile layout",
+  "Add social sharing",
+  "Implement caching",
+  "Set up monitoring",
+  "Create error handling"
+]
 
-  create_card("Plain MUCHO text mentions", description: "We'll support plain text mentions first.", collection: fizzy).tap do |card|
-    card.toggle_assignment(david)
-    card.close
+# Create 10 collections
+collections = [
+  "Project Launch",
+  "Frontend Dev",
+  "Backend Dev",
+  "Design System",
+  "Testing Suite",
+  "Performance",
+  "User Experience",
+  "API Development",
+  "DevOps",
+  "Documentation"
+]
+
+collections.each_with_index do |collection_name, index|
+  create_collection(collection_name, access_to: authors.sample(3)).tap do |collection|
+    # Create 20 unique cards for each collection
+    card_titles.each do |title|
+      create_card(title,
+        description: "#{title} for #{collection_name} phase #{index + 1}.",
+        collection: collection
+      ).tap do |card|
+        # Randomly assign to 1-2 authors
+        card.toggle_assignment(authors.sample)
+        card.toggle_assignment(authors.sample) if rand > 0.5
+ 
+        # Randomly set card state
+        case rand(3)
+        when 0
+          card.engage
+        when 1
+          card.close
+        # 2 remains open
+        end
+      end
+    end
   end
 end

From 9b9acf36ae22b357f0977ddeabb4f6e946640905 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 11:21:09 +0200
Subject: [PATCH 162/413] Events track due_date changes in particulars, not as
 a direct attribute

---
 ...50422091602_remove_due_date_from_events.rb |  5 ++
 db/schema.rb                                  |  3 +-
 db/schema_cache.yml                           | 54 ++++++++-----------
 3 files changed, 28 insertions(+), 34 deletions(-)
 create mode 100644 db/migrate/20250422091602_remove_due_date_from_events.rb

diff --git a/db/migrate/20250422091602_remove_due_date_from_events.rb b/db/migrate/20250422091602_remove_due_date_from_events.rb
new file mode 100644
index 000000000..5a636e3dd
--- /dev/null
+++ b/db/migrate/20250422091602_remove_due_date_from_events.rb
@@ -0,0 +1,5 @@
+class RemoveDueDateFromEvents < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :events, :due_date
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3a56a34ae..e1bea16a2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_22_091602) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -180,7 +180,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
     t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.integer "creator_id", null: false
-    t.date "due_date"
     t.json "particulars", default: {}
     t.integer "summary_id", null: false
     t.datetime "updated_at", null: false
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 8152c393d..5d78e6883 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -80,7 +80,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &26 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_id
     cast_type: *1
@@ -389,12 +389,12 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: due_on
-    cast_type: &24 !ruby/object:ActiveRecord::Type::Date
+    cast_type: !ruby/object:ActiveRecord::Type::Date
       precision:
       scale:
       limit:
       timezone:
-    sql_type_metadata: &25 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: date
       type: :date
       limit:
@@ -435,7 +435,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: title
     cast_type: *7
@@ -490,11 +490,11 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: all_access
-    cast_type: &31 !ruby/object:ActiveModel::Type::Boolean
+    cast_type: &29 !ruby/object:ActiveModel::Type::Boolean
       precision:
       scale:
       limit:
-    sql_type_metadata: &32 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &30 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: boolean
       type: :boolean
       limit:
@@ -549,24 +549,14 @@ columns:
   - *21
   - *6
   - *23
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: due_date
-    cast_type: *24
-    sql_type_metadata: *25
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: particulars
-    cast_type: &26 !ruby/object:ActiveRecord::Type::Json
+    cast_type: &24 !ruby/object:ActiveRecord::Type::Json
       precision:
       scale:
       limit:
-    sql_type_metadata: &27 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &25 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: json
       type: :json
       limit:
@@ -595,8 +585,8 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: fields
-    cast_type: *26
-    sql_type_metadata: *27
+    cast_type: *24
+    sql_type_metadata: *25
     'null': false
     default: "{}"
     default_function:
@@ -627,7 +617,7 @@ columns:
     comment:
   filters_tags:
   - *18
-  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &27 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: tag_id
     cast_type: *1
@@ -707,13 +697,13 @@ columns:
     collation:
     comment:
   - *9
-  - *28
+  - *26
   pins:
   - *5
   - *21
   - *6
   - *9
-  - *28
+  - *26
   reactions:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -793,25 +783,25 @@ columns:
     default_function:
     collation:
     comment:
-  - *28
+  - *26
   taggings:
   - *5
   - *21
   - *6
-  - *29
+  - *27
   - *9
   tags:
   - *5
   - *6
-  - *30
+  - *28
   - *9
   users:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: active
-    cast_type: *31
-    sql_type_metadata: *32
+    cast_type: *29
+    sql_type_metadata: *30
     'null': false
     default: true
     default_function:
@@ -855,12 +845,12 @@ columns:
   - *21
   - *6
   - *9
-  - *28
+  - *26
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: watching
-    cast_type: *31
-    sql_type_metadata: *32
+    cast_type: *29
+    sql_type_metadata: *30
     'null': false
     default: true
     default_function:
@@ -1938,4 +1928,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250418150259
+version: 20250422091602

From aa3acfeaa84158f192daf5e4969171e48055a2cf Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 11:21:30 +0200
Subject: [PATCH 163/413] Add plain text mentions

---
 app/controllers/cards/readings_controller.rb  |   2 +-
 app/helpers/notifications_helper.rb           |  45 ++---
 app/jobs/generate_notifications_job.rb        |   7 -
 app/jobs/mention/collect_job.rb               |   7 +
 app/jobs/notify_recipients_job.rb             |   7 +
 app/models/card.rb                            |   7 +-
 app/models/card/eventable.rb                  |   3 +-
 app/models/card/mentions.rb                   |  12 ++
 app/models/concerns/mentions.rb               |  33 ++++
 app/models/concerns/notifiable.rb             |  13 +-
 app/models/event.rb                           |  22 ++-
 app/models/mention.rb                         |   7 +
 app/models/message.rb                         |   4 +
 app/models/message/mentions.rb                |  12 ++
 app/models/notification.rb                    |   5 +-
 app/models/notifier.rb                        |  33 ++--
 app/models/notifier/assigned.rb               |   6 -
 app/models/notifier/closed.rb                 |   2 -
 app/models/notifier/commented.rb              |   6 -
 app/models/notifier/events/assigned.rb        |   6 +
 app/models/notifier/events/base.rb            |  12 ++
 app/models/notifier/events/closed.rb          |   2 +
 app/models/notifier/events/commented.rb       |   6 +
 app/models/notifier/{ => events}/published.rb |   2 +-
 app/models/user.rb                            |   8 +-
 app/models/user/mentionable.rb                |  20 ++
 app/models/user/named.rb                      |  19 ++
 .../notifications/_notification.html.erb      |  10 +-
 .../notification/_event.html.erb              |   7 +
 .../notification/_mention.html.erb            |  11 ++
 db/migrate/20250421120008_create_mentions.rb  |  11 ++
 ...50422054950_add_source_to_notifications.rb |  11 ++
 ...emove_unused_columns_from_notifications.rb |   6 +
 db/schema.rb                                  |  25 ++-
 db/schema_cache.yml                           | 178 +++++++++++++-----
 test/fixtures/notifications.yml               |   9 +-
 test/models/concerns/mentions_test.rb         |  23 +++
 test/models/notifier_test.rb                  |  16 +-
 test/models/user/mentionable_test.rb          |   7 +
 test/models/user/named_test.rb                |  38 ++++
 test/test_helper.rb                           |   1 +
 41 files changed, 493 insertions(+), 168 deletions(-)
 delete mode 100644 app/jobs/generate_notifications_job.rb
 create mode 100644 app/jobs/mention/collect_job.rb
 create mode 100644 app/jobs/notify_recipients_job.rb
 create mode 100644 app/models/card/mentions.rb
 create mode 100644 app/models/concerns/mentions.rb
 create mode 100644 app/models/mention.rb
 create mode 100644 app/models/message/mentions.rb
 delete mode 100644 app/models/notifier/assigned.rb
 delete mode 100644 app/models/notifier/closed.rb
 delete mode 100644 app/models/notifier/commented.rb
 create mode 100644 app/models/notifier/events/assigned.rb
 create mode 100644 app/models/notifier/events/base.rb
 create mode 100644 app/models/notifier/events/closed.rb
 create mode 100644 app/models/notifier/events/commented.rb
 rename app/models/notifier/{ => events}/published.rb (67%)
 create mode 100644 app/models/user/mentionable.rb
 create mode 100644 app/models/user/named.rb
 create mode 100644 app/views/notifications/notification/_event.html.erb
 create mode 100644 app/views/notifications/notification/_mention.html.erb
 create mode 100644 db/migrate/20250421120008_create_mentions.rb
 create mode 100644 db/migrate/20250422054950_add_source_to_notifications.rb
 create mode 100644 db/migrate/20250422062930_remove_unused_columns_from_notifications.rb
 create mode 100644 test/models/concerns/mentions_test.rb
 create mode 100644 test/models/user/mentionable_test.rb
 create mode 100644 test/models/user/named_test.rb

diff --git a/app/controllers/cards/readings_controller.rb b/app/controllers/cards/readings_controller.rb
index 2d8b51ac6..efd06e601 100644
--- a/app/controllers/cards/readings_controller.rb
+++ b/app/controllers/cards/readings_controller.rb
@@ -2,7 +2,7 @@ class Cards::ReadingsController < ApplicationController
   include CardScoped
 
   def create
-    @notifications = Current.user.notifications.where(card: @card)
+    @notifications = Current.user.notifications.where(source: @card.events)
     @notifications.each(&:read)
   end
 end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 656edad54..f1cd88a6c 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,21 +1,25 @@
 module NotificationsHelper
-  def notification_title(notification)
-    if notification.resource.is_a? Comment
-      "RE: " + notification.card.title
-    elsif notification_event_action(notification) == "assigned"
-      "Assigned to you: " + notification.card.title
+  def event_notification_title(event)
+    if event.commented?
+      "RE: " + event.card.title
+    elsif event.assignment?
+      "Assigned to you: " + event.card.title
     else
-      notification.card.title
+      event.card.title
     end
   end
 
-  def notification_body(notification)
-    name = notification.creator.name
+  def event_notification_body(event)
+    name = event.creator.name
 
-    case notification_event_action(notification)
-    when "closed" then "Closed by #{name}"
-    when "published" then "Added by #{name}"
-    else name
+    if event.closed?
+      "Closed by #{name}"
+    elsif event.published?
+      "Added by #{name}"
+    elsif event.commented?
+      "#{strip_tags(event.comment.body_html).blank? ? "#{name} replied" : "#{event.creator.name}:" } #{strip_tags(event.comment.body_html).truncate(200)}"
+    else
+      name
     end
   end
 
@@ -36,8 +40,8 @@ module NotificationsHelper
       class: "notification__unread_indicator btn borderless",
       title: "Mark as read",
       data: { turbo_frame: "_top" } do
-        concat(image_tag("remove-med.svg", class: "unread_icon", size: 12, aria: { hidden: true }))
-        concat(tag.span("Mark as read", class: "for-screen-reader"))
+      concat(image_tag("remove-med.svg", class: "unread_icon", size: 12, aria: { hidden: true }))
+      concat(tag.span("Mark as read", class: "for-screen-reader"))
     end
   end
 
@@ -46,17 +50,4 @@ module NotificationsHelper
       tag.div id: "next_page", data: { controller: "fetch-on-visible", fetch_on_visible_url_value: notifications_path(page: @page.next_param) }
     end
   end
-
-  private
-    def notification_event_action(notification)
-      if notification_is_for_initial_assignement?(notification)
-        "assigned"
-      else
-        notification.event.action
-      end
-    end
-
-    def notification_is_for_initial_assignement?(notification)
-      notification.event.action == "published" && notification.card.assigned_to?(notification.user)
-    end
 end
diff --git a/app/jobs/generate_notifications_job.rb b/app/jobs/generate_notifications_job.rb
deleted file mode 100644
index e386b7b37..000000000
--- a/app/jobs/generate_notifications_job.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class GenerateNotificationsJob < ApplicationJob
-  queue_as :default
-
-  def perform(event)
-    event.generate_notifications
-  end
-end
diff --git a/app/jobs/mention/collect_job.rb b/app/jobs/mention/collect_job.rb
new file mode 100644
index 000000000..088e240dd
--- /dev/null
+++ b/app/jobs/mention/collect_job.rb
@@ -0,0 +1,7 @@
+class Mention::CollectJob < ApplicationJob
+  queue_as :default
+
+  def perform(record, mentioner:)
+    record.collect_mentions(mentioner:)
+  end
+end
diff --git a/app/jobs/notify_recipients_job.rb b/app/jobs/notify_recipients_job.rb
new file mode 100644
index 000000000..2f14c2e96
--- /dev/null
+++ b/app/jobs/notify_recipients_job.rb
@@ -0,0 +1,7 @@
+class NotifyRecipientsJob < ApplicationJob
+  queue_as :default
+
+  def perform(notifiable)
+    notifiable.notify_recipients
+  end
+end
diff --git a/app/models/card.rb b/app/models/card.rb
index 541d761a9..57ff542da 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,13 +1,10 @@
 class Card < ApplicationRecord
-  include Assignable, Colored, Engageable, Eventable, Golden,
-    Messages, Notifiable, Pinnable, Closeable, Searchable, Staged,
-    Statuses, Taggable, Watchable
+  include Assignable, Colored, Engageable, Eventable, Golden, Mentions,
+    Messages, Pinnable, Closeable, Searchable, Staged, Statuses, Taggable, Watchable
 
   belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
-  has_many :notifications, dependent: :destroy
-
   has_one_attached :image, dependent: :purge_later
 
   has_markdown :description
diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 1d3c4e13b..55a0245ea 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -12,8 +12,7 @@ module Card::Eventable
 
   def track_event(action, creator: Current.user, **particulars)
     if published?
-      event = find_or_capture_event_summary.events.create! action: action, creator: creator, card: self, particulars: particulars
-      event.generate_notifications_later
+      find_or_capture_event_summary.events.create! action: action, creator: creator, card: self, particulars: particulars
     end
   end
 
diff --git a/app/models/card/mentions.rb b/app/models/card/mentions.rb
new file mode 100644
index 000000000..dd135f24c
--- /dev/null
+++ b/app/models/card/mentions.rb
@@ -0,0 +1,12 @@
+module Card::Mentions
+  extend ActiveSupport::Concern
+
+  included do
+    include ::Mentions
+  end
+
+  private
+    def mentionable_content
+      description.to_plain_text
+    end
+end
diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
new file mode 100644
index 000000000..8de010a98
--- /dev/null
+++ b/app/models/concerns/mentions.rb
@@ -0,0 +1,33 @@
+module Mentions
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :mentions, as: :container, dependent: :destroy
+    after_commit :collect_mentions_later, on: %i[ create update ]
+  end
+
+  def collect_mentions(mentioner: Current.user)
+    scan_mentionees.each do |mentionee|
+      mentionee.mentioned_by mentioner, at: self
+    end
+  end
+
+  private
+    def collect_mentions_later
+      Mention::CollectJob.perform_later(self, mentioner: Current.user)
+    end
+
+    def scan_mentionees
+      scan_mentioned_handles.filter_map do |mention|
+        mentionable_users.find { |user| user.mentionable_handles.include?(mention) }
+      end
+    end
+
+    def mentionable_users
+      collection.users
+    end
+
+    def scan_mentioned_handles
+      (mentionable_content || "").scan(/(?<!\w)@(\w+)/).flatten.uniq(&:downcase)
+    end
+end
diff --git a/app/models/concerns/notifiable.rb b/app/models/concerns/notifiable.rb
index 8cfc7b112..7c3531ed2 100644
--- a/app/models/concerns/notifiable.rb
+++ b/app/models/concerns/notifiable.rb
@@ -2,6 +2,17 @@ module Notifiable
   extend ActiveSupport::Concern
 
   included do
-    has_many :notifications, as: :resource, dependent: :destroy
+    has_many :notifications, as: :source, dependent: :destroy
+
+    after_create_commit :notify_recipients_later
   end
+
+  def notify_recipients
+    Notifier.for(self)&.notify
+  end
+
+  private
+    def notify_recipients_later
+      NotifyRecipientsJob.perform_later self
+    end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index fe2a60c6d..3fceff6d1 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,5 +1,5 @@
 class Event < ApplicationRecord
-  include Particulars
+  include Notifiable, Particulars
 
   belongs_to :creator, class_name: "User"
   belongs_to :summary, touch: true, class_name: "EventSummary"
@@ -12,15 +12,21 @@ class Event < ApplicationRecord
 
   after_create -> { card.touch(:last_active_at) }
 
-  def commented?
-    action == "commented"
+  def assignment?
+    action == "assigned" || initial_assignment?
   end
 
-  def generate_notifications
-    Notifier.for(self)&.generate
+  # E.g: completed? is true if action == "completed"
+  def method_missing(method_name, *args, &block)
+    if method_name.to_s.end_with?("?")
+      action == method_name.to_s.chomp("?")
+    else
+      super
+    end
   end
 
-  def generate_notifications_later
-    GenerateNotificationsJob.perform_later self
-  end
+  private
+    def initial_assignment?
+      action == "published" && card.assigned_to?(creator)
+    end
 end
diff --git a/app/models/mention.rb b/app/models/mention.rb
new file mode 100644
index 000000000..5f263d9be
--- /dev/null
+++ b/app/models/mention.rb
@@ -0,0 +1,7 @@
+class Mention < ApplicationRecord
+  include Notifiable
+
+  belongs_to :container, polymorphic: true
+  belongs_to :mentionee, class_name: "User", inverse_of: :mentions
+  belongs_to :mentioner, class_name: "User"
+end
diff --git a/app/models/message.rb b/app/models/message.rb
index 7d950b3b7..2947c99b5 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,7 +1,11 @@
 class Message < ApplicationRecord
+  include Mentions
+
   belongs_to :card, touch: true
 
   delegated_type :messageable, types: Messageable::TYPES, inverse_of: :message, dependent: :destroy
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
+
+  delegate :collection, to: :card
 end
diff --git a/app/models/message/mentions.rb b/app/models/message/mentions.rb
new file mode 100644
index 000000000..fc8282413
--- /dev/null
+++ b/app/models/message/mentions.rb
@@ -0,0 +1,12 @@
+module Message::Mentions
+  extend ActiveSupport::Concern
+
+  included do
+    include ::Mentions
+  end
+
+  private
+    def mentionable_content
+      messageable.try(:body_plain_text)
+    end
+end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 9fbb94a5b..b4b323a3d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,14 +1,13 @@
 class Notification < ApplicationRecord
   belongs_to :user
-  belongs_to :event
-  belongs_to :card
+  belongs_to :source, polymorphic: true
   belongs_to :resource, polymorphic: true
 
   scope :unread, -> { where(read_at: nil) }
   scope :read, -> { where.not(read_at: nil) }
   scope :ordered, -> { order(read_at: :desc, created_at: :desc) }
 
-  delegate :creator, to: :event
+  delegate :creator, to: :source
   after_create_commit :broadcast_unread
 
   def self.read_all
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 19626be5f..455a900e3 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,40 +1,37 @@
 class Notifier
-  attr_reader :event
+  attr_reader :source
 
-  delegate :creator, to: :event
+  delegate :creator, to: :source
 
   class << self
-    def for(event)
-      "Notifier::#{event.action.classify}".safe_constantize&.new(event)
+    def for(source)
+      case source
+        when Event
+          "Notifier::Events::#{source.action.classify}".safe_constantize&.new(source)
+        when Mention
+          Notifier::Mentions
+      end
     end
   end
 
-  def generate
+  def notify
     if should_notify?
       recipients.map do |recipient|
-        Notification.create! user: recipient, event: event, card: card, resource: resource
+        Notification.create! user: recipient, source: source, resource: resource
       end
     end
   end
 
   private
-    def initialize(event)
-      @event = event
+    def initialize(source)
+      @source = source
     end
 
     def should_notify?
-      !event.creator.system?
-    end
-
-    def recipients
-      card.watchers_and_subscribers.without(creator)
+      !creator.system?
     end
 
     def resource
-      card
-    end
-
-    def card
-      event.summary.message.card
+      source
     end
 end
diff --git a/app/models/notifier/assigned.rb b/app/models/notifier/assigned.rb
deleted file mode 100644
index 843376435..000000000
--- a/app/models/notifier/assigned.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Notifier::Assigned < Notifier
-  private
-    def recipients
-      event.assignees.excluding(card.collection.access_only_users)
-    end
-end
diff --git a/app/models/notifier/closed.rb b/app/models/notifier/closed.rb
deleted file mode 100644
index f090b0308..000000000
--- a/app/models/notifier/closed.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Notifier::Closed < Notifier
-end
diff --git a/app/models/notifier/commented.rb b/app/models/notifier/commented.rb
deleted file mode 100644
index 42ad4e5c8..000000000
--- a/app/models/notifier/commented.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Notifier::Commented < Notifier
-  private
-    def resource
-      event.comment
-    end
-end
diff --git a/app/models/notifier/events/assigned.rb b/app/models/notifier/events/assigned.rb
new file mode 100644
index 000000000..fb106c677
--- /dev/null
+++ b/app/models/notifier/events/assigned.rb
@@ -0,0 +1,6 @@
+class Notifier::Events::Assigned < Notifier::Events::Base
+  private
+    def recipients
+      source.assignees.excluding(card.collection.access_only_users)
+    end
+end
diff --git a/app/models/notifier/events/base.rb b/app/models/notifier/events/base.rb
new file mode 100644
index 000000000..b0e9d0489
--- /dev/null
+++ b/app/models/notifier/events/base.rb
@@ -0,0 +1,12 @@
+class Notifier::Events::Base < Notifier
+  delegate :card, to: :source
+
+  private
+    def resource
+      card
+    end
+
+    def recipients
+      card.watchers_and_subscribers.without(creator)
+    end
+end
diff --git a/app/models/notifier/events/closed.rb b/app/models/notifier/events/closed.rb
new file mode 100644
index 000000000..133ca75c8
--- /dev/null
+++ b/app/models/notifier/events/closed.rb
@@ -0,0 +1,2 @@
+class Notifier::Events::Closed < Notifier::Events::Base
+end
diff --git a/app/models/notifier/events/commented.rb b/app/models/notifier/events/commented.rb
new file mode 100644
index 000000000..55497a117
--- /dev/null
+++ b/app/models/notifier/events/commented.rb
@@ -0,0 +1,6 @@
+class Notifier::Events::Commented < Notifier::Events::Base
+  private
+    def resource
+      source.comment
+    end
+end
diff --git a/app/models/notifier/published.rb b/app/models/notifier/events/published.rb
similarity index 67%
rename from app/models/notifier/published.rb
rename to app/models/notifier/events/published.rb
index ce3917e8f..ff30d0219 100644
--- a/app/models/notifier/published.rb
+++ b/app/models/notifier/events/published.rb
@@ -1,4 +1,4 @@
-class Notifier::Published < Notifier
+class Notifier::Events::Published < Notifier::Events::Base
   private
     def recipients
       card.watchers_and_subscribers(include_only_watching: true).without(creator)
diff --git a/app/models/user.rb b/app/models/user.rb
index a22841c42..c09455bfb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
 class User < ApplicationRecord
-  include Accessor, Assignee, Avatar, Role, Transferable
+  include Accessor, Assignee, Avatar, Mentionable, Named, Role, Transferable
 
   has_many :sessions, dependent: :destroy
   has_secure_password validations: false
@@ -15,12 +15,6 @@ class User < ApplicationRecord
 
   normalizes :email_address, with: ->(value) { value.strip.downcase }
 
-  scope :alphabetically, -> { order("lower(name)") }
-
-  def initials
-    name.to_s.scan(/\b\p{L}/).join.upcase
-  end
-
   def deactivate
     transaction do
       sessions.delete_all
diff --git a/app/models/user/mentionable.rb b/app/models/user/mentionable.rb
new file mode 100644
index 000000000..0d1c9fe36
--- /dev/null
+++ b/app/models/user/mentionable.rb
@@ -0,0 +1,20 @@
+module User::Mentionable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :mentions, dependent: :destroy, inverse_of: :mentionee
+  end
+
+  def mentioned_by(mentioner, at:)
+    mentions.create! container: at, mentioner:
+  end
+
+  def mentionable_handles
+    [ initials, first_name, first_name_with_last_name_initial ].collect(&:downcase)
+  end
+
+  private
+    def first_name_with_last_name_initial
+      "#{first_name}#{last_name&.first}"
+    end
+end
diff --git a/app/models/user/named.rb b/app/models/user/named.rb
new file mode 100644
index 000000000..67420ec72
--- /dev/null
+++ b/app/models/user/named.rb
@@ -0,0 +1,19 @@
+module User::Named
+  extend ActiveSupport::Concern
+
+  included do
+    scope :alphabetically, -> { order("lower(name)") }
+  end
+
+  def first_name
+    name.split(/\s/).first
+  end
+
+  def last_name
+    name.split(/\s/, 2).last
+  end
+
+  def initials
+    name.scan(/\b\p{L}/).join.upcase
+  end
+end
diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb
index 8cb22eeb1..36ec74370 100644
--- a/app/views/notifications/_notification.html.erb
+++ b/app/views/notifications/_notification.html.erb
@@ -5,15 +5,7 @@
     </div>
 
     <div class="flex flex-column min-width flex-item-grow">
-      <strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= notification_title(notification) %></strong>
-        <div class="overflow-ellipsis txt-small txt-tight-lines">
-          <% if notification.event.action == "commented" %>
-            <%= "#{strip_tags(notification.event.comment.body_html).blank? ? "#{notification.event.creator.name} replied" : "#{notification.event.creator.name}:" } #{strip_tags(notification.event.comment.body_html).truncate(200)}" %>
-          <% else %>
-            <%= notification_body(notification) %>
-          <% end %>
-        </div>
-      <div class="tray__item-meta overflow-ellipsis translucent"><%= notification.card.collection.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
+      <%= render "notifications/notification/#{notification.source_type.underscore}", notification: notification %>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/notifications/notification/_event.html.erb b/app/views/notifications/notification/_event.html.erb
new file mode 100644
index 000000000..b7b1231db
--- /dev/null
+++ b/app/views/notifications/notification/_event.html.erb
@@ -0,0 +1,7 @@
+<%= event = notification.source %>
+
+<strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= event_notification_title(event) %></strong>
+<div class="overflow-ellipsis txt-small txt-tight-lines">
+  <%= event_notification_body(event) %>
+</div>
+<div class="tray__item-meta overflow-ellipsis translucent"><%= notification.source.card.collection.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
diff --git a/app/views/notifications/notification/_mention.html.erb b/app/views/notifications/notification/_mention.html.erb
new file mode 100644
index 000000000..996095e6d
--- /dev/null
+++ b/app/views/notifications/notification/_mention.html.erb
@@ -0,0 +1,11 @@
+<% event = notification.event %>
+
+<strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= event_notification_title(notification) %></strong>
+<div class="overflow-ellipsis txt-small txt-tight-lines">
+  <% if event.action == "commented" %>
+    <%= "#{strip_tags(event.comment.body_html).blank? ? "#{event.creator.name} replied" : "#{event.creator.name}:" } #{strip_tags(event.comment.body_html).truncate(200)}" %>
+  <% else %>
+    <%= event_notification_body(notification) %>
+  <% end %>
+</div>
+<div class="tray__item-meta overflow-ellipsis translucent"><%= event.card.collection.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
diff --git a/db/migrate/20250421120008_create_mentions.rb b/db/migrate/20250421120008_create_mentions.rb
new file mode 100644
index 000000000..da4923950
--- /dev/null
+++ b/db/migrate/20250421120008_create_mentions.rb
@@ -0,0 +1,11 @@
+class CreateMentions < ActiveRecord::Migration[8.1]
+  def change
+    create_table :mentions do |t|
+      t.references :container, polymorphic: true, null: false, index: true
+      t.references :mentionee, foreign_key: { to_table: :users }, null: false
+      t.references :mentioner, foreign_key: { to_table: :users }, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20250422054950_add_source_to_notifications.rb b/db/migrate/20250422054950_add_source_to_notifications.rb
new file mode 100644
index 000000000..7108d680b
--- /dev/null
+++ b/db/migrate/20250422054950_add_source_to_notifications.rb
@@ -0,0 +1,11 @@
+class AddSourceToNotifications < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :notifications, :source, polymorphic: true, index: true
+
+    execute <<~SQL
+      update notifications set source_type = 'Event'
+    SQL
+
+    change_column_null :notifications, :source_type, false
+  end
+end
diff --git a/db/migrate/20250422062930_remove_unused_columns_from_notifications.rb b/db/migrate/20250422062930_remove_unused_columns_from_notifications.rb
new file mode 100644
index 000000000..30f689c88
--- /dev/null
+++ b/db/migrate/20250422062930_remove_unused_columns_from_notifications.rb
@@ -0,0 +1,6 @@
+class RemoveUnusedColumnsFromNotifications < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :notifications, :event_id
+    remove_column :notifications, :card_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3a56a34ae..12c2edba1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_22_062930) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -212,6 +212,18 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
     t.index ["tag_id"], name: "index_filters_tags_on_tag_id"
   end
 
+  create_table "mentions", force: :cascade do |t|
+    t.integer "container_id", null: false
+    t.string "container_type", null: false
+    t.datetime "created_at", null: false
+    t.integer "mentionee_id", null: false
+    t.integer "mentioner_id", null: false
+    t.datetime "updated_at", null: false
+    t.index ["container_type", "container_id"], name: "index_mentions_on_container"
+    t.index ["mentionee_id"], name: "index_mentions_on_mentionee_id"
+    t.index ["mentioner_id"], name: "index_mentions_on_mentioner_id"
+  end
+
   create_table "messages", force: :cascade do |t|
     t.integer "card_id", null: false
     t.datetime "created_at", null: false
@@ -223,17 +235,16 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
   end
 
   create_table "notifications", force: :cascade do |t|
-    t.integer "card_id", null: false
     t.datetime "created_at", null: false
-    t.integer "event_id", null: false
     t.datetime "read_at"
     t.integer "resource_id", null: false
     t.string "resource_type", null: false
+    t.integer "source_id"
+    t.string "source_type", null: false
     t.datetime "updated_at", null: false
     t.integer "user_id", null: false
-    t.index ["card_id"], name: "index_notifications_on_card_id"
-    t.index ["event_id"], name: "index_notifications_on_event_id"
     t.index ["resource_type", "resource_id"], name: "index_notifications_on_resource"
+    t.index ["source_type", "source_id"], name: "index_notifications_on_source"
     t.index ["user_id", "read_at", "created_at"], name: "index_notifications_on_user_id_and_read_at_and_created_at", order: { read_at: :desc, created_at: :desc }
     t.index ["user_id"], name: "index_notifications_on_user_id"
   end
@@ -328,9 +339,9 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
   add_foreign_key "collections", "workflows"
   add_foreign_key "events", "cards"
   add_foreign_key "events", "event_summaries", column: "summary_id"
+  add_foreign_key "mentions", "users", column: "mentionee_id"
+  add_foreign_key "mentions", "users", column: "mentioner_id"
   add_foreign_key "messages", "cards"
-  add_foreign_key "notifications", "cards"
-  add_foreign_key "notifications", "events"
   add_foreign_key "notifications", "users"
   add_foreign_key "pins", "cards"
   add_foreign_key "pins", "users"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 8152c393d..bab7bb58f 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -637,6 +637,50 @@ columns:
     default_function:
     collation:
     comment:
+  mentions:
+  - *5
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: container_type
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: container_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: mentionee_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: mentioner_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *6
+  - *9
   messages:
   - *5
   - *21
@@ -664,18 +708,7 @@ columns:
   - *9
   notifications:
   - *5
-  - *21
   - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: event_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: read_at
@@ -708,6 +741,26 @@ columns:
     comment:
   - *9
   - *28
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: source_type
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: source_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   pins:
   - *5
   - *21
@@ -921,6 +974,7 @@ primary_keys:
   filters: id
   filters_stages:
   filters_tags:
+  mentions: id
   messages: id
   notifications: id
   pins: id
@@ -958,6 +1012,7 @@ data_sources:
   filters: true
   filters_stages: true
   filters_tags: true
+  mentions: true
   messages: true
   notifications: true
   pins: true
@@ -1598,6 +1653,56 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  mentions:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: mentions
+    name: index_mentions_on_mentioner_id
+    unique: false
+    columns:
+    - mentioner_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: mentions
+    name: index_mentions_on_mentionee_id
+    unique: false
+    columns:
+    - mentionee_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: mentions
+    name: index_mentions_on_container
+    unique: false
+    columns:
+    - container_type
+    - container_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   messages:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: messages
@@ -1633,6 +1738,23 @@ indexes:
     comment:
     valid: true
   notifications:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: notifications
+    name: index_notifications_on_source
+    unique: false
+    columns:
+    - source_type
+    - source_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
     name: index_notifications_on_user_id
@@ -1686,38 +1808,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: notifications
-    name: index_notifications_on_event_id
-    unique: false
-    columns:
-    - event_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: notifications
-    name: index_notifications_on_card_id
-    unique: false
-    columns:
-    - card_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   pins:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: pins
@@ -1938,4 +2028,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250418150259
+version: 20250422062930
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index 7579f8eb6..ef44452f7 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -1,20 +1,17 @@
 logo_published_kevin:
   user: kevin
-  event: logo_published
-  card: logo
+  source: logo_published (Event)
   resource: logo (Card)
   created_at: <%= 1.week.ago %>
 
 logo_assignment_kevin:
   user: kevin
-  event: logo_assignment_km
-  card: logo
+  source: logo_assignment_km (Event)
   resource: logo (Card)
   created_at: <%= 1.week.ago %>
 
 layout_commented_kevin:
   user: kevin
-  event: layout_commented
-  card: layout
+  source: layout_commented (Event)
   resource: layout_overflowing_david (Comment)
   created_at: <%= 1.week.ago %>
diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb
new file mode 100644
index 000000000..3ed1c4d49
--- /dev/null
+++ b/test/models/concerns/mentions_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class MentionsTest < ActiveSupport::TestCase
+  setup do
+    Current.session = sessions(:david)
+  end
+
+  test "collect mentions on create" do
+    assert_difference -> { Mention.count }, +1 do
+      perform_enqueued_jobs only: Mention::CollectJob do
+        collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?"
+      end
+    end
+  end
+
+  test "collect mentions on update" do
+    assert_difference -> { Mention.count }, +1 do
+      perform_enqueued_jobs only: Mention::CollectJob do
+        cards(:logo).update! description: "Did you finish up with the cleanup, @david?"
+      end
+    end
+  end
+end
diff --git a/test/models/notifier_test.rb b/test/models/notifier_test.rb
index 1e01e18e8..2e915bded 100644
--- a/test/models/notifier_test.rb
+++ b/test/models/notifier_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 class NotifierTest < ActiveSupport::TestCase
   test "for returns the matching notifier class for the event" do
-    assert_kind_of Notifier::Published, Notifier.for(events(:logo_published))
+    assert_kind_of Notifier::Events::Published, Notifier.for(events(:logo_published))
   end
 
   test "generate does not create notifications if the event was system-generated" do
@@ -10,12 +10,12 @@ class NotifierTest < ActiveSupport::TestCase
     events(:logo_published).update!(creator: User.system)
 
     assert_no_difference -> { Notification.count } do
-      Notifier.for(events(:logo_published)).generate
+      Notifier.for(events(:logo_published)).notify
     end
   end
 
   test "creates a notification for each watcher, other than the event creator" do
-    notifications = Notifier.for(events(:layout_commented)).generate
+    notifications = Notifier.for(events(:layout_commented)).notify
 
     assert_equal [ users(:kevin) ], notifications.map(&:user)
   end
@@ -23,19 +23,19 @@ class NotifierTest < ActiveSupport::TestCase
   test "does not create a notification for access-only users" do
     collections(:writebook).access_for(users(:kevin)).access_only!
 
-    notifications = Notifier.for(events(:layout_commented)).generate
+    notifications = Notifier.for(events(:layout_commented)).notify
 
     assert_equal [ users(:kevin) ], notifications.map(&:user)
   end
 
   test "the published event creates notifications for subscribers as well as watchers" do
-    notifications = Notifier.for(events(:logo_published)).generate
+    notifications = Notifier.for(events(:logo_published)).notify
 
     assert_equal users(:kevin, :jz).sort, notifications.map(&:user).sort
   end
 
   test "links to the card" do
-    Notifier.for(events(:logo_published)).generate
+    Notifier.for(events(:logo_published)).notify
 
     assert_equal cards(:logo), Notification.last.resource
   end
@@ -44,7 +44,7 @@ class NotifierTest < ActiveSupport::TestCase
     collections(:writebook).access_for(users(:jz)).watching!
     collections(:writebook).access_for(users(:kevin)).everything!
 
-    notifications = Notifier.for(events(:logo_assignment_jz)).generate
+    notifications = Notifier.for(events(:logo_assignment_jz)).notify
 
     assert_equal [ users(:jz) ], notifications.map(&:user)
   end
@@ -52,7 +52,7 @@ class NotifierTest < ActiveSupport::TestCase
   test "assignment events do not notify users who are access-only for the collection" do
     collections(:writebook).access_for(users(:jz)).access_only!
 
-    notifications = Notifier.for(events(:logo_assignment_jz)).generate
+    notifications = Notifier.for(events(:logo_assignment_jz)).notify
 
     assert_empty notifications
   end
diff --git a/test/models/user/mentionable_test.rb b/test/models/user/mentionable_test.rb
new file mode 100644
index 000000000..43e70792c
--- /dev/null
+++ b/test/models/user/mentionable_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class User::MentionableTest < ActiveSupport::TestCase
+  test "mentionable handles" do
+    assert_equal [ "dhh", "david", "davidh" ], User.new(name: "David Heinemeier-Hansson").mentionable_handles
+  end
+end
diff --git a/test/models/user/named_test.rb b/test/models/user/named_test.rb
new file mode 100644
index 000000000..8993dbbf8
--- /dev/null
+++ b/test/models/user/named_test.rb
@@ -0,0 +1,38 @@
+require "test_helper"
+
+class User::NamedTest < ActiveSupport::TestCase
+  test "initials" do
+    assert_initials "M", name: "Michael"
+    assert_initials "SD", name: "Salvador Dali"
+    assert_initials "LMM", name: "Lin-Manuel Miranda"
+    assert_initials "OCD", name: "O'Conor Díez"
+    assert_initials "ACG", name: "Anne Christine García"
+    assert_initials "ÁL", name: "Ángela López"
+  end
+
+  test "first name" do
+    assert_first_name "Michael", "Michael"
+    assert_first_name "Salvador", "Salvador Dali"
+    assert_first_name "Lin-Manuel", "Lin-Manuel Miranda"
+    assert_first_name "Anne", "Anne Christine García"
+  end
+
+  test "last name" do
+    assert_last_name "Dali", "Salvador Dali"
+    assert_last_name "Miranda", "Lin_Manuel Miranda"
+    assert_last_name "Christine García", "Anne Christine García"
+  end
+
+  private
+    def assert_initials(expected, **attributes)
+      assert_equal expected, User.new(attributes).initials
+    end
+
+    def assert_first_name(expected, name)
+      assert_equal expected, User.new(name: name).first_name
+    end
+
+    def assert_last_name(expected, name)
+      assert_equal expected, User.new(name: name).last_name
+    end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1447430b1..cb34fd812 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,6 +10,7 @@ module ActiveSupport
     # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
     fixtures :all
 
+    include ActiveJob::TestHelper
     include CardTestHelper, ChangeTestHelper, SessionTestHelper
   end
 end

From 2d5901fe1e44fdd4ad7f992490d23da927620b8b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 11:48:19 +0200
Subject: [PATCH 164/413] Fix pin turbo stream response rendering

---
 app/controllers/cards/pins_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/cards/pins_controller.rb b/app/controllers/cards/pins_controller.rb
index a4b49433f..6ac118543 100644
--- a/app/controllers/cards/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -28,6 +28,6 @@ class Cards::PinsController < ApplicationController
     end
 
     def render_pin_button_replacement
-      turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin_button", locals: { card: @card }
+      render turbo_stream: turbo_stream.replace([ @card, :pin_button ], partial: "cards/pins/pin_button", locals: { card: @card })
     end
 end

From 268e367c6f2ecf146b87f310e59ce0ba0acec367 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 11:53:16 +0200
Subject: [PATCH 165/413] Unused

---
 app/models/colorable.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/colorable.rb b/app/models/colorable.rb
index 4fba4556d..e774fd946 100644
--- a/app/models/colorable.rb
+++ b/app/models/colorable.rb
@@ -3,8 +3,4 @@ module Colorable
 
   COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ]
   DEFAULT_COLOR = "#2c6da8"
-
-  included do
-    attribute :color, default: DEFAULT_COLOR
-  end
 end

From 22abf0ba46c6b294258c3dacc6318a0651e0031d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 11:56:41 +0200
Subject: [PATCH 166/413] Remove anemic concern

Colors are a card concern.
---
 app/helpers/workflows_helper.rb            | 2 +-
 app/models/card/colored.rb                 | 5 ++++-
 app/models/colorable.rb                    | 6 ------
 app/views/workflows/stages/_color.html.erb | 2 +-
 test/models/card/colored_test.rb           | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 app/models/colorable.rb

diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 1bbed5c32..43d0d5973 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -10,6 +10,6 @@ module WorkflowsHelper
   end
 
   def stage_color(stage)
-    stage.color.presence || Colorable::DEFAULT_COLOR
+    stage.color.presence || Card::DEFAULT_COLOR
   end
 end
diff --git a/app/models/card/colored.rb b/app/models/card/colored.rb
index 99e934a94..9a16ee4a4 100644
--- a/app/models/card/colored.rb
+++ b/app/models/card/colored.rb
@@ -1,8 +1,11 @@
 module Card::Colored
   extend ActiveSupport::Concern
 
+  COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ]
+  DEFAULT_COLOR = "#2c6da8"
+
   def color
-    color_from_stage || Colorable::DEFAULT_COLOR
+    color_from_stage || DEFAULT_COLOR
   end
 
   private
diff --git a/app/models/colorable.rb b/app/models/colorable.rb
deleted file mode 100644
index e774fd946..000000000
--- a/app/models/colorable.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Colorable
-  extend ActiveSupport::Concern
-
-  COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ]
-  DEFAULT_COLOR = "#2c6da8"
-end
diff --git a/app/views/workflows/stages/_color.html.erb b/app/views/workflows/stages/_color.html.erb
index 04a9e12a3..f2b6e3160 100644
--- a/app/views/workflows/stages/_color.html.erb
+++ b/app/views/workflows/stages/_color.html.erb
@@ -6,7 +6,7 @@
 
   <dialog class="color-picker panel fill-white shadow gap-half" data-dialog-target="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
     <%= form_with model: stage, url: workflow_stage_path(stage.workflow, stage), class: "flex gap-half", data: { controller: "form", action: "change->form#submit" } do |form| %>
-      <% Colorable::COLORS.each do |color| %>
+      <% Card::COLORS.each do |color| %>
         <span class="color-picker__color">
           <label class="btn btn--circle" style="--btn-background: <%= color %>" title="<%= color %>">
             <%= form.radio_button :color, color %>
diff --git a/test/models/card/colored_test.rb b/test/models/card/colored_test.rb
index f4bd1bf36..5eebec25f 100644
--- a/test/models/card/colored_test.rb
+++ b/test/models/card/colored_test.rb
@@ -2,11 +2,11 @@ require "test_helper"
 
 class Card::ColoredTest < ActiveSupport::TestCase
   test "use default color no stage" do
-    assert_equal Colorable::DEFAULT_COLOR, cards(:logo).color
+    assert_equal Card::DEFAULT_COLOR, cards(:logo).color
   end
 
   test "use default color not in doing stage" do
-    assert_equal Colorable::DEFAULT_COLOR, cards(:text).color
+    assert_equal Card::DEFAULT_COLOR, cards(:text).color
   end
 
   test "infer color from stage when in doing stage" do

From 4f064734053d9d854666f6a0ed1fb93befa6aa21 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 12:02:48 +0200
Subject: [PATCH 167/413] Notifications for mentions showing up

---
 app/helpers/notifications_helper.rb           |   4 +-
 app/models/mention.rb                         |   2 +-
 app/models/notifier.rb                        |   6 +-
 app/models/notifier/events/base.rb            |   4 +
 app/models/notifier/mention.rb                |  10 +
 app/models/user/mentionable.rb                |   2 +-
 .../notification/_event.html.erb              |   2 +-
 .../notification/_mention.html.erb            |  12 +-
 db/migrate/20250421120008_create_mentions.rb  |   2 +-
 db/schema.rb                                  |   6 +-
 db/schema_cache.yml                           | 883 +++++++++---------
 test/models/notifier_test.rb                  |   8 +-
 12 files changed, 474 insertions(+), 467 deletions(-)
 create mode 100644 app/models/notifier/mention.rb

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index f1cd88a6c..23ba12b38 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -25,8 +25,10 @@ module NotificationsHelper
 
   def notification_tag(notification, &)
     tag.div id: dom_id(notification), class: "notification tray__item border-radius txt-normal" do
+      # TODO: Temporary, I'll remove this. Right now, we support linking comments, but we should be linking messages.
+      resource = notification.resource.is_a?(Message) ? notification.resource.comment : notification.resource
       concat(
-        link_to(notification.resource,
+        link_to(resource,
           class: "notification__content border-radius shadow fill-white flex align-start txt-align-start gap flex-item-grow max-width border txt-ink",
           data: { action: "click->dialog#close", turbo_frame: "_top" },
           &)
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 5f263d9be..dd3756fe1 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -2,6 +2,6 @@ class Mention < ApplicationRecord
   include Notifiable
 
   belongs_to :container, polymorphic: true
+  belongs_to :creator, class_name: "User"
   belongs_to :mentionee, class_name: "User", inverse_of: :mentions
-  belongs_to :mentioner, class_name: "User"
 end
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 455a900e3..aa45e4071 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -8,8 +8,8 @@ class Notifier
       case source
         when Event
           "Notifier::Events::#{source.action.classify}".safe_constantize&.new(source)
-        when Mention
-          Notifier::Mentions
+        when ::Mention
+          Notifier::Mention.new(source)
       end
     end
   end
@@ -28,7 +28,7 @@ class Notifier
     end
 
     def should_notify?
-      !creator.system?
+      true
     end
 
     def resource
diff --git a/app/models/notifier/events/base.rb b/app/models/notifier/events/base.rb
index b0e9d0489..84178e3f4 100644
--- a/app/models/notifier/events/base.rb
+++ b/app/models/notifier/events/base.rb
@@ -2,6 +2,10 @@ class Notifier::Events::Base < Notifier
   delegate :card, to: :source
 
   private
+    def should_notify?
+      !creator.system?
+    end
+
     def resource
       card
     end
diff --git a/app/models/notifier/mention.rb b/app/models/notifier/mention.rb
new file mode 100644
index 000000000..033d32f84
--- /dev/null
+++ b/app/models/notifier/mention.rb
@@ -0,0 +1,10 @@
+class Notifier::Mention < Notifier
+  private
+    def resource
+      source.container
+    end
+
+    def recipients
+      [ source.mentionee ]
+    end
+end
diff --git a/app/models/user/mentionable.rb b/app/models/user/mentionable.rb
index 0d1c9fe36..5d1df418e 100644
--- a/app/models/user/mentionable.rb
+++ b/app/models/user/mentionable.rb
@@ -6,7 +6,7 @@ module User::Mentionable
   end
 
   def mentioned_by(mentioner, at:)
-    mentions.create! container: at, mentioner:
+    mentions.create! container: at, creator: mentioner
   end
 
   def mentionable_handles
diff --git a/app/views/notifications/notification/_event.html.erb b/app/views/notifications/notification/_event.html.erb
index b7b1231db..9a02db061 100644
--- a/app/views/notifications/notification/_event.html.erb
+++ b/app/views/notifications/notification/_event.html.erb
@@ -1,4 +1,4 @@
-<%= event = notification.source %>
+<% event = notification.source %>
 
 <strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= event_notification_title(event) %></strong>
 <div class="overflow-ellipsis txt-small txt-tight-lines">
diff --git a/app/views/notifications/notification/_mention.html.erb b/app/views/notifications/notification/_mention.html.erb
index 996095e6d..5dc61b1af 100644
--- a/app/views/notifications/notification/_mention.html.erb
+++ b/app/views/notifications/notification/_mention.html.erb
@@ -1,11 +1,5 @@
-<% event = notification.event %>
-
-<strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= event_notification_title(notification) %></strong>
+<strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= "OMG" %></strong>
 <div class="overflow-ellipsis txt-small txt-tight-lines">
-  <% if event.action == "commented" %>
-    <%= "#{strip_tags(event.comment.body_html).blank? ? "#{event.creator.name} replied" : "#{event.creator.name}:" } #{strip_tags(event.comment.body_html).truncate(200)}" %>
-  <% else %>
-    <%= event_notification_body(notification) %>
-  <% end %>
+  YOU WERE MENTIONED!
 </div>
-<div class="tray__item-meta overflow-ellipsis translucent"><%= event.card.collection.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
+<div class="tray__item-meta overflow-ellipsis translucent"> <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
diff --git a/db/migrate/20250421120008_create_mentions.rb b/db/migrate/20250421120008_create_mentions.rb
index da4923950..9133e29a0 100644
--- a/db/migrate/20250421120008_create_mentions.rb
+++ b/db/migrate/20250421120008_create_mentions.rb
@@ -3,7 +3,7 @@ class CreateMentions < ActiveRecord::Migration[8.1]
     create_table :mentions do |t|
       t.references :container, polymorphic: true, null: false, index: true
       t.references :mentionee, foreign_key: { to_table: :users }, null: false
-      t.references :mentioner, foreign_key: { to_table: :users }, null: false
+      t.references :creator, foreign_key: { to_table: :users }, null: false
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
index 12c2edba1..a3f338ebc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -216,12 +216,12 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_062930) do
     t.integer "container_id", null: false
     t.string "container_type", null: false
     t.datetime "created_at", null: false
+    t.integer "creator_id", null: false
     t.integer "mentionee_id", null: false
-    t.integer "mentioner_id", null: false
     t.datetime "updated_at", null: false
     t.index ["container_type", "container_id"], name: "index_mentions_on_container"
+    t.index ["creator_id"], name: "index_mentions_on_creator_id"
     t.index ["mentionee_id"], name: "index_mentions_on_mentionee_id"
-    t.index ["mentioner_id"], name: "index_mentions_on_mentioner_id"
   end
 
   create_table "messages", force: :cascade do |t|
@@ -339,8 +339,8 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_062930) do
   add_foreign_key "collections", "workflows"
   add_foreign_key "events", "cards"
   add_foreign_key "events", "event_summaries", column: "summary_id"
+  add_foreign_key "mentions", "users", column: "creator_id"
   add_foreign_key "mentions", "users", column: "mentionee_id"
-  add_foreign_key "mentions", "users", column: "mentioner_id"
   add_foreign_key "messages", "cards"
   add_foreign_key "notifications", "users"
   add_foreign_key "pins", "cards"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index bab7bb58f..382719da8 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -31,7 +31,17 @@ columns:
     default_function:
     collation:
     comment:
-  - &6 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: user_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - &8 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: created_at
     cast_type: &3 !ruby/object:ActiveRecord::Type::DateTime
@@ -50,26 +60,6 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: involvement
-    cast_type: &7 !ruby/object:ActiveModel::Type::String
-      true: t
-      false: f
-      precision:
-      scale:
-      limit:
-    sql_type_metadata: &8 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
-      sql_type: varchar
-      type: :string
-      limit:
-      precision:
-      scale:
-    'null': false
-    default: watching
-    default_function:
-    collation:
-    comment:
   - &9 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: updated_at
@@ -80,9 +70,65 @@ columns:
     default_function:
     collation:
     comment:
-  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: user_id
+    name: involvement
+    cast_type: &6 !ruby/object:ActiveModel::Type::String
+      true: t
+      false: f
+      precision:
+      scale:
+      limit:
+    sql_type_metadata: &7 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+      sql_type: varchar
+      type: :string
+      limit:
+      precision:
+      scale:
+    'null': false
+    default: watching
+    default_function:
+    collation:
+    comment:
+  accounts:
+  - *5
+  - &10 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: name
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *8
+  - *9
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: join_code
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  action_text_markdowns:
+  - *5
+  - &11 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: record_type
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: record_id
     cast_type: *1
     sql_type_metadata: *2
     'null': false
@@ -90,32 +136,7 @@ columns:
     default_function:
     collation:
     comment:
-  accounts:
-  - *5
-  - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: join_code
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - &10 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: name
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - *9
-  action_text_markdowns:
-  - *5
+  - *10
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: content
@@ -136,41 +157,22 @@ columns:
     default_function:
     collation:
     comment:
-  - *6
-  - *10
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: record_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - &13 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: record_type
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
+  - *8
   - *9
   active_storage_attachments:
   - *5
-  - &16 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - *10
+  - *11
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: blob_id
-    cast_type: &11 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer
+    name: record_id
+    cast_type: &12 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer
       precision:
       scale:
       limit:
       max: 9223372036854775808
       min: -9223372036854775808
-    sql_type_metadata: &12 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &13 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: bigint
       type: :integer
       limit:
@@ -181,24 +183,22 @@ columns:
     default_function:
     collation:
     comment:
-  - *6
-  - *10
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &16 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: record_id
-    cast_type: *11
-    sql_type_metadata: *12
+    name: blob_id
+    cast_type: *12
+    sql_type_metadata: *13
     'null': false
     default:
     default_function:
     collation:
     comment:
-  - *13
+  - *8
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: slug
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': true
     default:
     default_function:
@@ -206,11 +206,11 @@ columns:
     comment:
   active_storage_blobs:
   - *5
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &17 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: byte_size
-    cast_type: *11
-    sql_type_metadata: *12
+    name: key
+    cast_type: *6
+    sql_type_metadata: *7
     'null': false
     default:
     default_function:
@@ -218,10 +218,10 @@ columns:
     comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: checksum
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
+    name: filename
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': false
     default:
     default_function:
     collation:
@@ -229,34 +229,13 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: content_type
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': true
     default:
     default_function:
     collation:
     comment:
-  - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: filename
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - &17 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: key
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: metadata
@@ -270,21 +249,42 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: service_name
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': false
     default:
     default_function:
     collation:
     comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: byte_size
+    cast_type: *12
+    sql_type_metadata: *13
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: checksum
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - *8
   active_storage_variant_records:
   - *5
   - *16
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: variation_digest
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': false
     default:
     default_function:
@@ -295,26 +295,16 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: value
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': true
     default:
     default_function:
     collation:
     comment:
-  - *6
+  - *8
   - *9
   assignees_filters:
-  - &19 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: assignee_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   - &18 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: filter_id
@@ -325,7 +315,18 @@ columns:
     default_function:
     collation:
     comment:
+  - &19 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: assignee_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   assigners_filters:
+  - *18
   - &20 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: assigner_id
@@ -336,11 +337,9 @@ columns:
     default_function:
     collation:
     comment:
-  - *18
   assignments:
   - *5
   - *19
-  - *20
   - &21 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: card_id
@@ -351,8 +350,9 @@ columns:
     default_function:
     collation:
     comment:
-  - *6
+  - *8
   - *9
+  - *20
   card_engagements:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -365,17 +365,27 @@ columns:
     default_function:
     collation:
     comment:
-  - *6
+  - *8
   - *9
   card_goldnesses:
   - *5
   - *21
-  - *6
+  - *8
   - *9
   cards:
   - *5
-  - *22
-  - *6
+  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: title
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - *8
+  - *9
   - &23 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: creator_id
@@ -405,16 +415,7 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: last_active_at
-    cast_type: *3
-    sql_type_metadata: *4
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
+  - *22
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: stage_id
@@ -435,46 +436,33 @@ columns:
     default_function:
     collation:
     comment:
-  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: title
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *9
-  closure_reasons:
-  - *5
-  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: label
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *9
-  closures:
-  - *5
-  - *21
-  - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: reason
-    cast_type: *7
-    sql_type_metadata: *8
+    name: last_active_at
+    cast_type: *3
+    sql_type_metadata: *4
     'null': false
     default:
     default_function:
     collation:
     comment:
+  closure_reasons:
+  - *5
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: label
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - *8
   - *9
+  closures:
+  - *5
+  - *21
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_id
@@ -485,8 +473,24 @@ columns:
     default_function:
     collation:
     comment:
+  - *8
+  - *9
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: reason
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   collections:
   - *5
+  - *23
+  - *10
+  - *8
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: all_access
@@ -505,10 +509,6 @@ columns:
     default_function:
     collation:
     comment:
-  - *6
-  - *23
-  - *10
-  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: workflow_id
@@ -520,45 +520,23 @@ columns:
     collation:
     comment:
   collections_filters:
-  - *22
   - *18
+  - *22
   comments:
   - *5
-  - *6
   - *23
+  - *8
   - *9
   creators_filters:
-  - *23
   - *18
+  - *23
   event_summaries:
   - *5
-  - *6
+  - *8
   - *9
   events:
   - *5
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: action
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - *21
-  - *6
   - *23
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: due_date
-    cast_type: *24
-    sql_type_metadata: *25
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: particulars
@@ -577,6 +555,18 @@ columns:
     default_function:
     collation:
     comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: action
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *8
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: summary_id
@@ -587,11 +577,32 @@ columns:
     default_function:
     collation:
     comment:
-  - *9
+  - *21
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: due_date
+    cast_type: *24
+    sql_type_metadata: *25
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   filters:
   - *5
-  - *6
   - *23
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: params_digest
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *8
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: fields
@@ -602,17 +613,6 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: params_digest
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - *9
   filters_stages:
   - *18
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -642,8 +642,8 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: container_type
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': false
     default:
     default_function:
@@ -669,22 +669,22 @@ columns:
     default_function:
     collation:
     comment:
+  - *23
+  - *8
+  - *9
+  messages:
+  - *5
+  - *21
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: mentioner_id
-    cast_type: *1
-    sql_type_metadata: *2
+    name: messageable_type
+    cast_type: *6
+    sql_type_metadata: *7
     'null': false
     default:
     default_function:
     collation:
     comment:
-  - *6
-  - *9
-  messages:
-  - *5
-  - *21
-  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: messageable_id
@@ -695,26 +695,17 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: messageable_type
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
+  - *8
   - *9
   notifications:
   - *5
-  - *6
+  - *28
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: read_at
-    cast_type: *3
-    sql_type_metadata: *4
-    'null': true
+    name: resource_type
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': false
     default:
     default_function:
     collation:
@@ -729,23 +720,23 @@ columns:
     default_function:
     collation:
     comment:
+  - *8
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: resource_type
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
+    name: read_at
+    cast_type: *3
+    sql_type_metadata: *4
+    'null': true
     default:
     default_function:
     collation:
     comment:
-  - *9
-  - *28
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: source_type
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': false
     default:
     default_function:
@@ -764,9 +755,9 @@ columns:
   pins:
   - *5
   - *21
-  - *6
-  - *9
   - *28
+  - *8
+  - *9
   reactions:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -779,6 +770,16 @@ columns:
     default_function:
     collation:
     comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: reacter_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: content
@@ -799,24 +800,14 @@ columns:
     default_function:
     collation:
     comment:
-  - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: reacter_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
+  - *8
   - *9
   schema_migrations:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: version
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': false
     default:
     default_function:
@@ -824,42 +815,63 @@ columns:
     comment:
   sessions:
   - *5
-  - *6
+  - *28
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: ip_address
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': true
     default:
     default_function:
     collation:
     comment:
-  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_agent
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': true
     default:
     default_function:
     collation:
     comment:
-  - *28
+  - *8
+  - *9
   taggings:
   - *5
   - *21
-  - *6
   - *29
+  - *8
   - *9
   tags:
   - *5
-  - *6
   - *30
+  - *8
   - *9
   users:
   - *5
+  - *10
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: email_address
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: password_digest
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: active
@@ -870,45 +882,22 @@ columns:
     default_function:
     collation:
     comment:
-  - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: email_address
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *10
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: password_digest
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
+  - *8
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: role
-    cast_type: *7
-    sql_type_metadata: *8
+    cast_type: *6
+    sql_type_metadata: *7
     'null': false
     default: member
     default_function:
     collation:
     comment:
-  - *9
   watches:
   - *5
-  - *21
-  - *6
-  - *9
   - *28
+  - *21
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: watching
@@ -919,21 +908,10 @@ columns:
     default_function:
     collation:
     comment:
+  - *8
+  - *9
   workflow_stages:
   - *5
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: color
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *6
-  - *10
-  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: workflow_id
@@ -944,10 +922,23 @@ columns:
     default_function:
     collation:
     comment:
+  - *10
+  - *8
+  - *9
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: color
+    cast_type: *6
+    sql_type_metadata: *7
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   workflows:
   - *5
-  - *6
   - *10
+  - *8
   - *9
 primary_keys:
   accesses: id
@@ -1029,9 +1020,10 @@ indexes:
   accesses:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_user_id
-    unique: false
+    name: index_accesses_on_collection_id_and_user_id
+    unique: true
     columns:
+    - collection_id
     - user_id
     lengths: {}
     orders: {}
@@ -1061,10 +1053,9 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_collection_id_and_user_id
-    unique: true
+    name: index_accesses_on_user_id
+    unique: false
     columns:
-    - collection_id
     - user_id
     lengths: {}
     orders: {}
@@ -1184,22 +1175,6 @@ indexes:
     valid: true
   ar_internal_metadata: []
   assignees_filters:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: assignees_filters
-    name: index_assignees_filters_on_filter_id
-    unique: false
-    columns:
-    - filter_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assignees_filters
     name: index_assignees_filters_on_assignee_id
@@ -1216,10 +1191,9 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  assigners_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: assigners_filters
-    name: index_assigners_filters_on_filter_id
+    table: assignees_filters
+    name: index_assignees_filters_on_filter_id
     unique: false
     columns:
     - filter_id
@@ -1233,6 +1207,7 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  assigners_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assigners_filters
     name: index_assigners_filters_on_assigner_id
@@ -1249,6 +1224,22 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: assigners_filters
+    name: index_assigners_filters_on_filter_id
+    unique: false
+    columns:
+    - filter_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   assignments:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assignments
@@ -1318,6 +1309,22 @@ indexes:
     comment:
     valid: true
   cards:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: cards
+    name: index_cards_on_collection_id
+    unique: false
+    columns:
+    - collection_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: cards
     name: index_cards_on_stage_id
@@ -1351,30 +1358,15 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: cards
-    name: index_cards_on_collection_id
-    unique: false
-    columns:
-    - collection_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   closure_reasons: []
   closures:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: closures
-    name: index_closures_on_user_id
+    name: index_closures_on_card_id_and_created_at
     unique: false
     columns:
-    - user_id
+    - card_id
+    - created_at
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1403,11 +1395,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: closures
-    name: index_closures_on_card_id_and_created_at
+    name: index_closures_on_user_id
     unique: false
     columns:
-    - card_id
-    - created_at
+    - user_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1419,22 +1410,6 @@ indexes:
     comment:
     valid: true
   collections:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: collections
-    name: index_collections_on_workflow_id
-    unique: false
-    columns:
-    - workflow_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: collections
     name: index_collections_on_creator_id
@@ -1451,13 +1426,12 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  collections_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: collections_filters
-    name: index_collections_filters_on_filter_id
+    table: collections
+    name: index_collections_on_workflow_id
     unique: false
     columns:
-    - filter_id
+    - workflow_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1468,6 +1442,7 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  collections_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: collections_filters
     name: index_collections_filters_on_collection_id
@@ -1484,11 +1459,9 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  comments: []
-  creators_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: creators_filters
-    name: index_creators_filters_on_filter_id
+    table: collections_filters
+    name: index_collections_filters_on_filter_id
     unique: false
     columns:
     - filter_id
@@ -1502,6 +1475,8 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  comments: []
+  creators_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: creators_filters
     name: index_creators_filters_on_creator_id
@@ -1518,8 +1493,40 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: creators_filters
+    name: index_creators_filters_on_filter_id
+    unique: false
+    columns:
+    - filter_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   event_summaries: []
   events:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: events
+    name: index_events_on_card_id
+    unique: false
+    columns:
+    - card_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: events
     name: index_events_on_summary_id_and_action
@@ -1553,22 +1560,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: events
-    name: index_events_on_card_id
-    unique: false
-    columns:
-    - card_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: filters
@@ -1656,10 +1647,10 @@ indexes:
   mentions:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: mentions
-    name: index_mentions_on_mentioner_id
+    name: index_mentions_on_creator_id
     unique: false
     columns:
-    - mentioner_id
+    - creator_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1706,11 +1697,10 @@ indexes:
   messages:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: messages
-    name: index_messages_on_messageable
-    unique: true
+    name: index_messages_on_card_id
+    unique: false
     columns:
-    - messageable_type
-    - messageable_id
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1723,10 +1713,11 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: messages
-    name: index_messages_on_card_id
-    unique: false
+    name: index_messages_on_messageable
+    unique: true
     columns:
-    - card_id
+    - messageable_type
+    - messageable_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1755,22 +1746,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: notifications
-    name: index_notifications_on_user_id
-    unique: false
-    columns:
-    - user_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
     name: index_notifications_on_user_id_and_read_at_and_created_at
@@ -1808,10 +1783,9 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  pins:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: pins
-    name: index_pins_on_user_id
+    table: notifications
+    name: index_notifications_on_user_id
     unique: false
     columns:
     - user_id
@@ -1825,6 +1799,7 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  pins:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: pins
     name: index_pins_on_card_id
@@ -1858,6 +1833,22 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: pins
+    name: index_pins_on_user_id
+    unique: false
+    columns:
+    - user_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   reactions:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: reactions
@@ -1912,9 +1903,10 @@ indexes:
   taggings:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: taggings
-    name: index_taggings_on_tag_id
-    unique: false
+    name: index_taggings_on_card_id_and_tag_id
+    unique: true
     columns:
+    - card_id
     - tag_id
     lengths: {}
     orders: {}
@@ -1928,10 +1920,9 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: taggings
-    name: index_taggings_on_card_id_and_tag_id
-    unique: true
+    name: index_taggings_on_tag_id
+    unique: false
     columns:
-    - card_id
     - tag_id
     lengths: {}
     orders: {}
@@ -1980,10 +1971,10 @@ indexes:
   watches:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: watches
-    name: index_watches_on_user_id
+    name: index_watches_on_card_id
     unique: false
     columns:
-    - user_id
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1996,10 +1987,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: watches
-    name: index_watches_on_card_id
+    name: index_watches_on_user_id
     unique: false
     columns:
-    - card_id
+    - user_id
     lengths: {}
     orders: {}
     opclasses: {}
diff --git a/test/models/notifier_test.rb b/test/models/notifier_test.rb
index 2e915bded..987ac84f2 100644
--- a/test/models/notifier_test.rb
+++ b/test/models/notifier_test.rb
@@ -14,7 +14,13 @@ class NotifierTest < ActiveSupport::TestCase
     end
   end
 
-  test "creates a notification for each watcher, other than the event creator" do
+  test "creates a notification for each watcher, other than the event creator (events)" do
+    notifications = Notifier.for(events(:layout_commented)).notify
+
+    assert_equal [ users(:kevin) ], notifications.map(&:user)
+  end
+
+  test "creates a notification for each watcher (mentions)" do
     notifications = Notifier.for(events(:layout_commented)).notify
 
     assert_equal [ users(:kevin) ], notifications.map(&:user)

From 7a46fd09483f2a1fe05f2d01c4be0d9b1461b678 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 12:08:56 +0200
Subject: [PATCH 168/413] Stick with open/close as a consistent pair instead of
 active/close

---
 app/models/card/closeable.rb       | 4 ++--
 app/models/card/engageable.rb      | 8 ++++----
 app/models/filter.rb               | 2 +-
 test/models/card/closeable_test.rb | 2 +-
 test/models/card_test.rb           | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
index ce0a63e33..64945af0c 100644
--- a/app/models/card/closeable.rb
+++ b/app/models/card/closeable.rb
@@ -7,7 +7,7 @@ module Card::Closeable
     has_one :closure, dependent: :destroy
 
     scope :closed, -> { joins(:closure) }
-    scope :active, -> { where.missing(:closure) }
+    scope :open, -> { where.missing(:closure) }
 
     scope :recently_closed_first, -> { closed.order("closures.created_at": :desc) }
     scope :due_to_be_closed, -> { considering.where(last_active_at: ..AUTO_CLOSE_AFTER.ago) }
@@ -29,7 +29,7 @@ module Card::Closeable
     closure.present?
   end
 
-  def active?
+  def open?
     !closed?
   end
 
diff --git a/app/models/card/engageable.rb b/app/models/card/engageable.rb
index 78dbe0ebe..6671bc5a1 100644
--- a/app/models/card/engageable.rb
+++ b/app/models/card/engageable.rb
@@ -6,8 +6,8 @@ module Card::Engageable
   included do
     has_one :engagement, dependent: :destroy, class_name: "Card::Engagement"
 
-    scope :considering, -> { published_or_drafted_by(Current.user).active.where.missing(:engagement) }
-    scope :doing,       -> { published.active.joins(:engagement) }
+    scope :considering, -> { published_or_drafted_by(Current.user).open.where.missing(:engagement) }
+    scope :doing,       -> { published.open.joins(:engagement) }
     scope :stagnated,   -> { doing.where(last_active_at: ..STAGNATED_AFTER.ago) }
 
     scope :by_engagement_status, ->(status) do
@@ -29,11 +29,11 @@ module Card::Engageable
   end
 
   def doing?
-    active? && published? && engagement.present?
+    open? && published? && engagement.present?
   end
 
   def considering?
-    active? && published? && engagement.blank?
+    open? && published? && engagement.blank?
   end
 
   def engage
diff --git a/app/models/filter.rb b/app/models/filter.rb
index b2957bfd5..e5ce39383 100644
--- a/app/models/filter.rb
+++ b/app/models/filter.rb
@@ -19,7 +19,7 @@ class Filter < ApplicationRecord
   def cards
     @cards ||= begin
       result = creator.accessible_cards.indexed_by(indexed_by)
-      result = result.active unless indexed_by.closed?
+      result = result.open unless indexed_by.closed?
       result = result.by_engagement_status(engagement_status) if engagement_status.present?
       result = result.unassigned if assignment_status.unassigned?
       result = result.assigned_to(assignees.ids) if assignees.present?
diff --git a/test/models/card/closeable_test.rb b/test/models/card/closeable_test.rb
index b8effec74..738eaca53 100644
--- a/test/models/card/closeable_test.rb
+++ b/test/models/card/closeable_test.rb
@@ -3,7 +3,7 @@ require "test_helper"
 class Card::CloseableTest < ActiveSupport::TestCase
   test "closed scope" do
     assert_equal [ cards(:shipping) ], Card.closed
-    assert_not_includes Card.active, cards(:shipping)
+    assert_not_includes Card.open, cards(:shipping)
   end
 
   test "popping" do
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
index 93f13e565..3d251e278 100644
--- a/test/models/card_test.rb
+++ b/test/models/card_test.rb
@@ -70,8 +70,8 @@ class CardTest < ActiveSupport::TestCase
     assert_equal [ cards(:shipping) ], Card.closed
   end
 
-  test "active" do
-    assert_equal cards(:logo, :layout, :text), Card.active
+  test "open" do
+    assert_equal cards(:logo, :layout, :text), Card.open
   end
 
   test "unassigned" do

From 20a29651813b7aa194dbdaf3a8a03e1fe3123dcc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 12:12:30 +0200
Subject: [PATCH 169/413] Keep scopes together

---
 app/models/card/golden.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/card/golden.rb b/app/models/card/golden.rb
index 759179415..4f2f52a60 100644
--- a/app/models/card/golden.rb
+++ b/app/models/card/golden.rb
@@ -2,10 +2,9 @@ module Card::Golden
   extend ActiveSupport::Concern
 
   included do
-    scope :golden, -> { joins(:goldness) }
-
     has_one :goldness, dependent: :destroy, class_name: "Card::Goldness"
 
+    scope :golden, -> { joins(:goldness) }
     scope :with_golden_first, -> { left_outer_joins(:goldness).prepend_order("card_goldnesses.id IS NULL") }
   end
 

From 827c00ce490420baa5d1a120fb234f4ef0cd83ac Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 12:32:34 +0200
Subject: [PATCH 170/413] Extract Workflowing concern

---
 app/models/card/staged.rb            |  8 ++------
 app/models/collection.rb             | 10 +---------
 app/models/collection/workflowing.rb | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 app/models/collection/workflowing.rb

diff --git a/app/models/card/staged.rb b/app/models/card/staged.rb
index de853b818..da3269ad7 100644
--- a/app/models/card/staged.rb
+++ b/app/models/card/staged.rb
@@ -4,7 +4,7 @@ module Card::Staged
   included do
     belongs_to :stage, class_name: "Workflow::Stage", optional: true
 
-    after_create :assign_initial_stage
+    before_create :assign_initial_stage
 
     scope :in_stage, ->(stage) { where stage: stage }
   end
@@ -24,10 +24,6 @@ module Card::Staged
 
   private
     def assign_initial_stage
-      if workflow_stage = collection.workflow&.stages&.first
-        self.stage = workflow_stage
-        save! touch: false
-        track_event :staged, stage_id: workflow_stage.id, stage_name: workflow_stage.name
-      end
+      self.stage = collection.initial_workflow_stage
     end
 end
diff --git a/app/models/collection.rb b/app/models/collection.rb
index 5f4a75051..236208c16 100644
--- a/app/models/collection.rb
+++ b/app/models/collection.rb
@@ -1,18 +1,10 @@
 class Collection < ApplicationRecord
-  include Accessible, Broadcastable, Filterable
+  include Accessible, Broadcastable, Filterable, Workflowing
 
   belongs_to :creator, class_name: "User", default: -> { Current.user }
-  belongs_to :workflow, optional: true
 
   has_many :cards, dependent: :destroy
   has_many :tags, -> { distinct }, through: :cards
 
-  after_save :update_cards_workflow, if: :saved_change_to_workflow_id?
-
   scope :alphabetically, -> { order("lower(name)") }
-
-  private
-    def update_cards_workflow
-      cards.update_all(stage_id: workflow&.stages&.first&.id)
-    end
 end
diff --git a/app/models/collection/workflowing.rb b/app/models/collection/workflowing.rb
new file mode 100644
index 000000000..658087fe2
--- /dev/null
+++ b/app/models/collection/workflowing.rb
@@ -0,0 +1,18 @@
+module Collection::Workflowing
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :workflow, optional: true
+
+    after_update_commit :set_all_cards_to_initial_workflow_stage, if: :saved_change_to_workflow_id?
+  end
+
+  def initial_workflow_stage
+    workflow&.stages&.first
+  end
+
+  private
+    def set_all_cards_to_initial_workflow_stage
+      cards.update_all(stage_id: initial_workflow_stage&.id)
+    end
+end

From a7d17b38aa41a8a32f95116d388af25b000bee2e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 12:44:49 +0200
Subject: [PATCH 171/413] Be confident

---
 app/models/collection/workflowing.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/collection/workflowing.rb b/app/models/collection/workflowing.rb
index 658087fe2..0793f804f 100644
--- a/app/models/collection/workflowing.rb
+++ b/app/models/collection/workflowing.rb
@@ -13,6 +13,6 @@ module Collection::Workflowing
 
   private
     def set_all_cards_to_initial_workflow_stage
-      cards.update_all(stage_id: initial_workflow_stage&.id)
+      cards.update_all(stage_id: initial_workflow_stage.id)
     end
 end

From 8e35a3de9c5a802e2e9985a51dd436410f38b1dd Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 13:03:31 +0200
Subject: [PATCH 172/413] Test workflowing updates card stages on change

---
 test/fixtures/cards.yml                    | 4 ++++
 test/models/collection/workflowing_test.rb | 8 ++++++++
 test/models/filter_test.rb                 | 6 +++---
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 test/models/collection/workflowing_test.rb

diff --git a/test/fixtures/cards.yml b/test/fixtures/cards.yml
index c8dc163a3..2ca8fbf8f 100644
--- a/test/fixtures/cards.yml
+++ b/test/fixtures/cards.yml
@@ -1,6 +1,7 @@
 logo:
   collection: writebook
   creator: david
+  stage: qa_triage
   title: The logo isn't big enough
   due_on: <%= 3.days.from_now %>
   created_at: <%= 1.week.ago %>
@@ -10,6 +11,7 @@ logo:
 layout:
   collection: writebook
   creator: david
+  stage: qa_triage
   title: Layout is broken
   created_at: <%= 1.week.ago %>
   status: published
@@ -18,6 +20,7 @@ layout:
 text:
   collection: writebook
   creator: kevin
+  stage: qa_triage
   title: The text is too small
   created_at: <%= 1.week.ago %>
   status: published
@@ -27,6 +30,7 @@ text:
 shipping:
   collection: writebook
   creator: kevin
+  stage: qa_triage
   title: We need to ship the app
   created_at: <%= 1.week.ago %>
   status: published
diff --git a/test/models/collection/workflowing_test.rb b/test/models/collection/workflowing_test.rb
new file mode 100644
index 000000000..ec12bbc9d
--- /dev/null
+++ b/test/models/collection/workflowing_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class Collection::WorkflowingTest < ActiveSupport::TestCase
+  test "change all card stages when changing workflow" do
+    collections(:writebook).update! workflow: workflows(:on_call)
+    assert_equal [ collections(:writebook).initial_workflow_stage ], collections(:writebook).cards.reload.collect(&:stage).uniq
+  end
+end
diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb
index 9b591bd76..cff0341d0 100644
--- a/test/models/filter_test.rb
+++ b/test/models/filter_test.rb
@@ -5,11 +5,11 @@ class FilterTest < ActiveSupport::TestCase
     Current.set session: sessions(:david) do
       @new_collection = Collection.create! name: "Inaccessible Collection"
       @new_card = @new_collection.cards.create!
-      @new_card.update!(stage: workflow_stages(:qa_triage))
+      @new_card.update!(stage: workflow_stages(:qa_on_hold))
 
       cards(:layout).capture Comment.new(body: "I hate haggis")
       cards(:logo).capture Comment.new(body: "I love haggis")
-      cards(:logo).update(stage: workflow_stages(:qa_triage))
+      cards(:logo).update(stage: workflow_stages(:qa_on_hold))
     end
 
     assert_not_includes users(:kevin).filters.new.cards, @new_card
@@ -17,7 +17,7 @@ class FilterTest < ActiveSupport::TestCase
     filter = users(:david).filters.new creator_ids: [ users(:david).id ], tag_ids: [ tags(:mobile).id ]
     assert_equal [ cards(:layout) ], filter.cards
 
-    filter = users(:david).filters.new stage_ids: [ workflow_stages(:qa_triage).id ]
+    filter = users(:david).filters.new stage_ids: [ workflow_stages(:qa_on_hold).id ]
     assert_equal [ cards(:logo), @new_card ], filter.cards
 
     filter = users(:david).filters.new assignment_status: "unassigned", collection_ids: [ @new_collection.id ]

From 5ea0ec8cb4f10ead1773e8e0e9af01f50253a246 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 13:05:39 +0200
Subject: [PATCH 173/413] Test and fix setting workflow to nothing

---
 app/models/collection/workflowing.rb       | 2 +-
 test/models/collection/workflowing_test.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/collection/workflowing.rb b/app/models/collection/workflowing.rb
index 0793f804f..658087fe2 100644
--- a/app/models/collection/workflowing.rb
+++ b/app/models/collection/workflowing.rb
@@ -13,6 +13,6 @@ module Collection::Workflowing
 
   private
     def set_all_cards_to_initial_workflow_stage
-      cards.update_all(stage_id: initial_workflow_stage.id)
+      cards.update_all(stage_id: initial_workflow_stage&.id)
     end
 end
diff --git a/test/models/collection/workflowing_test.rb b/test/models/collection/workflowing_test.rb
index ec12bbc9d..c43cda6ed 100644
--- a/test/models/collection/workflowing_test.rb
+++ b/test/models/collection/workflowing_test.rb
@@ -5,4 +5,9 @@ class Collection::WorkflowingTest < ActiveSupport::TestCase
     collections(:writebook).update! workflow: workflows(:on_call)
     assert_equal [ collections(:writebook).initial_workflow_stage ], collections(:writebook).cards.reload.collect(&:stage).uniq
   end
+
+  test "remove stage from cards if workflow is removed" do
+    collections(:writebook).update! workflow: nil
+    assert_equal [], collections(:writebook).cards.reload.collect(&:stage).compact
+  end
 end

From 8aa99e34b41cb3bddb6212e0a810decad6a2d300 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 13:48:43 +0200
Subject: [PATCH 174/413] Persist notification's creator

Instead of delegating. With a polymorphic relationship, relying on a certain
attribute implies doing things like aliasing "mentioner" to "creator" or similar.
---
 app/models/mention.rb                         |  2 +-
 app/models/notification.rb                    |  2 +-
 app/models/notifier.rb                        |  4 +--
 app/models/notifier/events/base.rb            |  2 +-
 app/models/notifier/mention.rb                |  4 +++
 app/models/user/mentionable.rb                |  2 +-
 db/migrate/20250421120008_create_mentions.rb  |  2 +-
 db/schema.rb                                  | 11 +++---
 db/schema_cache.yml                           | 34 ++++++++++++++++---
 .../cards/readings_controller_test.rb         |  6 ++--
 test/fixtures/notifications.yml               |  3 ++
 11 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/app/models/mention.rb b/app/models/mention.rb
index dd3756fe1..515c3071c 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -2,6 +2,6 @@ class Mention < ApplicationRecord
   include Notifiable
 
   belongs_to :container, polymorphic: true
-  belongs_to :creator, class_name: "User"
+  belongs_to :mentioner, class_name: "User"
   belongs_to :mentionee, class_name: "User", inverse_of: :mentions
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index b4b323a3d..301843987 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,5 +1,6 @@
 class Notification < ApplicationRecord
   belongs_to :user
+  belongs_to :creator, class_name: "User"
   belongs_to :source, polymorphic: true
   belongs_to :resource, polymorphic: true
 
@@ -7,7 +8,6 @@ class Notification < ApplicationRecord
   scope :read, -> { where.not(read_at: nil) }
   scope :ordered, -> { order(read_at: :desc, created_at: :desc) }
 
-  delegate :creator, to: :source
   after_create_commit :broadcast_unread
 
   def self.read_all
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index aa45e4071..f1a06a0ed 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,8 +1,6 @@
 class Notifier
   attr_reader :source
 
-  delegate :creator, to: :source
-
   class << self
     def for(source)
       case source
@@ -17,7 +15,7 @@ class Notifier
   def notify
     if should_notify?
       recipients.map do |recipient|
-        Notification.create! user: recipient, source: source, resource: resource
+        Notification.create! user: recipient, source: source, resource: resource, creator: creator
       end
     end
   end
diff --git a/app/models/notifier/events/base.rb b/app/models/notifier/events/base.rb
index 84178e3f4..13a915098 100644
--- a/app/models/notifier/events/base.rb
+++ b/app/models/notifier/events/base.rb
@@ -1,5 +1,5 @@
 class Notifier::Events::Base < Notifier
-  delegate :card, to: :source
+  delegate :card, :creator, to: :source
 
   private
     def should_notify?
diff --git a/app/models/notifier/mention.rb b/app/models/notifier/mention.rb
index 033d32f84..a35e0f4e4 100644
--- a/app/models/notifier/mention.rb
+++ b/app/models/notifier/mention.rb
@@ -7,4 +7,8 @@ class Notifier::Mention < Notifier
     def recipients
       [ source.mentionee ]
     end
+
+    def creator
+      source.mentioner
+    end
 end
diff --git a/app/models/user/mentionable.rb b/app/models/user/mentionable.rb
index 5d1df418e..e3e5a9dbf 100644
--- a/app/models/user/mentionable.rb
+++ b/app/models/user/mentionable.rb
@@ -6,7 +6,7 @@ module User::Mentionable
   end
 
   def mentioned_by(mentioner, at:)
-    mentions.create! container: at, creator: mentioner
+    mentions.create! container: at, mentioner: mentioner
   end
 
   def mentionable_handles
diff --git a/db/migrate/20250421120008_create_mentions.rb b/db/migrate/20250421120008_create_mentions.rb
index 9133e29a0..da4923950 100644
--- a/db/migrate/20250421120008_create_mentions.rb
+++ b/db/migrate/20250421120008_create_mentions.rb
@@ -3,7 +3,7 @@ class CreateMentions < ActiveRecord::Migration[8.1]
     create_table :mentions do |t|
       t.references :container, polymorphic: true, null: false, index: true
       t.references :mentionee, foreign_key: { to_table: :users }, null: false
-      t.references :creator, foreign_key: { to_table: :users }, null: false
+      t.references :mentioner, foreign_key: { to_table: :users }, null: false
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
index a3f338ebc..2da27d16f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_22_062930) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_22_112857) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -216,12 +216,12 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_062930) do
     t.integer "container_id", null: false
     t.string "container_type", null: false
     t.datetime "created_at", null: false
-    t.integer "creator_id", null: false
     t.integer "mentionee_id", null: false
+    t.integer "mentioner_id", null: false
     t.datetime "updated_at", null: false
     t.index ["container_type", "container_id"], name: "index_mentions_on_container"
-    t.index ["creator_id"], name: "index_mentions_on_creator_id"
     t.index ["mentionee_id"], name: "index_mentions_on_mentionee_id"
+    t.index ["mentioner_id"], name: "index_mentions_on_mentioner_id"
   end
 
   create_table "messages", force: :cascade do |t|
@@ -236,6 +236,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_062930) do
 
   create_table "notifications", force: :cascade do |t|
     t.datetime "created_at", null: false
+    t.integer "creator_id", null: false
     t.datetime "read_at"
     t.integer "resource_id", null: false
     t.string "resource_type", null: false
@@ -243,6 +244,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_062930) do
     t.string "source_type", null: false
     t.datetime "updated_at", null: false
     t.integer "user_id", null: false
+    t.index ["creator_id"], name: "index_notifications_on_creator_id"
     t.index ["resource_type", "resource_id"], name: "index_notifications_on_resource"
     t.index ["source_type", "source_id"], name: "index_notifications_on_source"
     t.index ["user_id", "read_at", "created_at"], name: "index_notifications_on_user_id_and_read_at_and_created_at", order: { read_at: :desc, created_at: :desc }
@@ -339,10 +341,11 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_062930) do
   add_foreign_key "collections", "workflows"
   add_foreign_key "events", "cards"
   add_foreign_key "events", "event_summaries", column: "summary_id"
-  add_foreign_key "mentions", "users", column: "creator_id"
   add_foreign_key "mentions", "users", column: "mentionee_id"
+  add_foreign_key "mentions", "users", column: "mentioner_id"
   add_foreign_key "messages", "cards"
   add_foreign_key "notifications", "users"
+  add_foreign_key "notifications", "users", column: "creator_id"
   add_foreign_key "pins", "cards"
   add_foreign_key "pins", "users"
   add_foreign_key "sessions", "users"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 382719da8..73d81743b 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -669,7 +669,16 @@ columns:
     default_function:
     collation:
     comment:
-  - *23
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: mentioner_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - *8
   - *9
   messages:
@@ -752,6 +761,7 @@ columns:
     default_function:
     collation:
     comment:
+  - *23
   pins:
   - *5
   - *21
@@ -1647,10 +1657,10 @@ indexes:
   mentions:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: mentions
-    name: index_mentions_on_creator_id
+    name: index_mentions_on_mentioner_id
     unique: false
     columns:
-    - creator_id
+    - mentioner_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1729,6 +1739,22 @@ indexes:
     comment:
     valid: true
   notifications:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: notifications
+    name: index_notifications_on_creator_id
+    unique: false
+    columns:
+    - creator_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
     name: index_notifications_on_source
@@ -2019,4 +2045,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250422062930
+version: 20250422112857
diff --git a/test/controllers/cards/readings_controller_test.rb b/test/controllers/cards/readings_controller_test.rb
index a880e46c7..b6fa6d040 100644
--- a/test/controllers/cards/readings_controller_test.rb
+++ b/test/controllers/cards/readings_controller_test.rb
@@ -15,9 +15,9 @@ class Cards::ReadingsControllerTest < ActionDispatch::IntegrationTest
 
   test "read multiple notifications on card visit" do
     assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
-    assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
-      post card_reading_path(cards(:logo)), as: :turbo_stream
-    end
+      assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
+        post card_reading_path(cards(:logo)), as: :turbo_stream
+      end
     end
 
     assert_response :success
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index ef44452f7..db6574038 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -3,15 +3,18 @@ logo_published_kevin:
   source: logo_published (Event)
   resource: logo (Card)
   created_at: <%= 1.week.ago %>
+  creator: david
 
 logo_assignment_kevin:
   user: kevin
   source: logo_assignment_km (Event)
   resource: logo (Card)
   created_at: <%= 1.week.ago %>
+  creator: david
 
 layout_commented_kevin:
   user: kevin
   source: layout_commented (Event)
   resource: layout_overflowing_david (Comment)
   created_at: <%= 1.week.ago %>
+  creator: david

From 22df208f9a97419bb8aeff16bf0e93d2220f3c44 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 14:11:21 +0200
Subject: [PATCH 175/413] Render proper content for mentions, don't send
 mentions to yourself

---
 app/models/card/mentions.rb                    |  7 +++----
 app/models/mention.rb                          |  4 ++++
 app/models/message/mentions.rb                 |  7 +++----
 app/models/notifier.rb                         |  6 +++---
 app/models/notifier/events/base.rb             |  4 ----
 app/models/notifier/mention.rb                 |  6 +++++-
 .../notification/_mention.html.erb             |  6 ++++--
 ...50422112857_add_creator_to_notifications.rb | 18 ++++++++++++++++++
 db/schema.rb                                   |  2 +-
 db/schema_cache.yml                            | 11 ++++++++++-
 test/models/user/mentionable_test.rb           |  2 +-
 11 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 db/migrate/20250422112857_add_creator_to_notifications.rb

diff --git a/app/models/card/mentions.rb b/app/models/card/mentions.rb
index dd135f24c..79334b240 100644
--- a/app/models/card/mentions.rb
+++ b/app/models/card/mentions.rb
@@ -5,8 +5,7 @@ module Card::Mentions
     include ::Mentions
   end
 
-  private
-    def mentionable_content
-      description.to_plain_text
-    end
+  def mentionable_content
+    description.to_plain_text
+  end
 end
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 515c3071c..fd70e075a 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -4,4 +4,8 @@ class Mention < ApplicationRecord
   belongs_to :container, polymorphic: true
   belongs_to :mentioner, class_name: "User"
   belongs_to :mentionee, class_name: "User", inverse_of: :mentions
+
+  def self_mention?
+    mentioner == mentionee
+  end
 end
diff --git a/app/models/message/mentions.rb b/app/models/message/mentions.rb
index fc8282413..f42ac5e1b 100644
--- a/app/models/message/mentions.rb
+++ b/app/models/message/mentions.rb
@@ -5,8 +5,7 @@ module Message::Mentions
     include ::Mentions
   end
 
-  private
-    def mentionable_content
-      messageable.try(:body_plain_text)
-    end
+  def mentionable_content
+    messageable.try(:body_plain_text)
+  end
 end
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index f1a06a0ed..72c16ff3d 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,9 +4,9 @@ class Notifier
   class << self
     def for(source)
       case source
-        when Event
+      when Event
           "Notifier::Events::#{source.action.classify}".safe_constantize&.new(source)
-        when ::Mention
+      when ::Mention
           Notifier::Mention.new(source)
       end
     end
@@ -26,7 +26,7 @@ class Notifier
     end
 
     def should_notify?
-      true
+      !creator.system?
     end
 
     def resource
diff --git a/app/models/notifier/events/base.rb b/app/models/notifier/events/base.rb
index 13a915098..6852ba2b2 100644
--- a/app/models/notifier/events/base.rb
+++ b/app/models/notifier/events/base.rb
@@ -2,10 +2,6 @@ class Notifier::Events::Base < Notifier
   delegate :card, :creator, to: :source
 
   private
-    def should_notify?
-      !creator.system?
-    end
-
     def resource
       card
     end
diff --git a/app/models/notifier/mention.rb b/app/models/notifier/mention.rb
index a35e0f4e4..2085c42ed 100644
--- a/app/models/notifier/mention.rb
+++ b/app/models/notifier/mention.rb
@@ -5,7 +5,11 @@ class Notifier::Mention < Notifier
     end
 
     def recipients
-      [ source.mentionee ]
+      if source.self_mention?
+        []
+      else
+        [ source.mentionee ]
+      end
     end
 
     def creator
diff --git a/app/views/notifications/notification/_mention.html.erb b/app/views/notifications/notification/_mention.html.erb
index 5dc61b1af..96abde715 100644
--- a/app/views/notifications/notification/_mention.html.erb
+++ b/app/views/notifications/notification/_mention.html.erb
@@ -1,5 +1,7 @@
-<strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= "OMG" %></strong>
+<% mention = notification.source %>
+
+<strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= mention.mentioner.first_name %> mentioned you</strong>
 <div class="overflow-ellipsis txt-small txt-tight-lines">
-  YOU WERE MENTIONED!
+  <%= mention.container.mentionable_content.truncate(200) %>
 </div>
 <div class="tray__item-meta overflow-ellipsis translucent"> <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
diff --git a/db/migrate/20250422112857_add_creator_to_notifications.rb b/db/migrate/20250422112857_add_creator_to_notifications.rb
new file mode 100644
index 000000000..63635565c
--- /dev/null
+++ b/db/migrate/20250422112857_add_creator_to_notifications.rb
@@ -0,0 +1,18 @@
+class AddCreatorToNotifications < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :notifications, :creator, null: true, foreign_key: { to_table: :users }
+
+    execute <<~SQL
+      UPDATE notifications
+        SET creator_id = (
+          SELECT events.creator_id
+          FROM events
+          WHERE events.id = notifications.source_id
+            AND notifications.source_type = 'Event'
+        )
+        WHERE source_type = 'Event';
+    SQL
+
+    change_column_null :notifications, :creator_id, true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2da27d16f..2dbc1c529 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -236,7 +236,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_112857) do
 
   create_table "notifications", force: :cascade do |t|
     t.datetime "created_at", null: false
-    t.integer "creator_id", null: false
+    t.integer "creator_id"
     t.datetime "read_at"
     t.integer "resource_id", null: false
     t.string "resource_type", null: false
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 73d81743b..eb67d0f45 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -761,7 +761,16 @@ columns:
     default_function:
     collation:
     comment:
-  - *23
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: creator_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   pins:
   - *5
   - *21
diff --git a/test/models/user/mentionable_test.rb b/test/models/user/mentionable_test.rb
index 43e70792c..48fb339a1 100644
--- a/test/models/user/mentionable_test.rb
+++ b/test/models/user/mentionable_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class User::MentionableTest < ActiveSupport::TestCase
   test "mentionable handles" do

From 9db675e589c06e89aa6b64b427cbaabb4ef41de4 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 14:15:40 +0200
Subject: [PATCH 176/413] Format

---
 app/models/notifier.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 72c16ff3d..ab63d62ff 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -5,9 +5,9 @@ class Notifier
     def for(source)
       case source
       when Event
-          "Notifier::Events::#{source.action.classify}".safe_constantize&.new(source)
+        "Notifier::Events::#{source.action.classify}".safe_constantize&.new(source)
       when ::Mention
-          Notifier::Mention.new(source)
+        Notifier::Mention.new(source)
       end
     end
   end

From d5f0359338421f9f35a203f330b708201191dcc2 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 14:19:45 +0200
Subject: [PATCH 177/413] Extract mentionable content using reflection to
 remove duplicated logic and the need for additional concerns

---
 app/models/card/mentions.rb     | 11 -----------
 app/models/concerns/mentions.rb |  6 ++++++
 app/models/message/mentions.rb  | 11 -----------
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 app/models/card/mentions.rb
 delete mode 100644 app/models/message/mentions.rb

diff --git a/app/models/card/mentions.rb b/app/models/card/mentions.rb
deleted file mode 100644
index 79334b240..000000000
--- a/app/models/card/mentions.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Card::Mentions
-  extend ActiveSupport::Concern
-
-  included do
-    include ::Mentions
-  end
-
-  def mentionable_content
-    description.to_plain_text
-  end
-end
diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 8de010a98..fb891ef75 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -12,6 +12,12 @@ module Mentions
     end
   end
 
+  def mentionable_content
+    self.class.reflect_on_all_associations(:has_one).filter { it.klass == ActionText::Markdown }.collect do |association|
+      send(association.name).to_plain_text
+    end.join(" ")
+  end
+
   private
     def collect_mentions_later
       Mention::CollectJob.perform_later(self, mentioner: Current.user)
diff --git a/app/models/message/mentions.rb b/app/models/message/mentions.rb
deleted file mode 100644
index f42ac5e1b..000000000
--- a/app/models/message/mentions.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Message::Mentions
-  extend ActiveSupport::Concern
-
-  included do
-    include ::Mentions
-  end
-
-  def mentionable_content
-    messageable.try(:body_plain_text)
-  end
-end

From beac61699c1ed11ff550fbdf1083246dffde89a3 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 14:21:26 +0200
Subject: [PATCH 178/413] Not needed

---
 app/models/concerns/mentions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index fb891ef75..4bcd458a6 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -34,6 +34,6 @@ module Mentions
     end
 
     def scan_mentioned_handles
-      (mentionable_content || "").scan(/(?<!\w)@(\w+)/).flatten.uniq(&:downcase)
+      mentionable_content.scan(/(?<!\w)@(\w+)/).flatten.uniq(&:downcase)
     end
 end

From 3bf73a0b71ff12612e7e4173b386f4b78c6461d8 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 14:22:23 +0200
Subject: [PATCH 179/413] Rename to match actual action

---
 app/helpers/notifications_helper.rb | 2 +-
 app/models/event.rb                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 23ba12b38..1bbd3b508 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -2,7 +2,7 @@ module NotificationsHelper
   def event_notification_title(event)
     if event.commented?
       "RE: " + event.card.title
-    elsif event.assignment?
+    elsif event.assigned?
       "Assigned to you: " + event.card.title
     else
       event.card.title
diff --git a/app/models/event.rb b/app/models/event.rb
index 3fceff6d1..1131bf5e0 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -12,7 +12,7 @@ class Event < ApplicationRecord
 
   after_create -> { card.touch(:last_active_at) }
 
-  def assignment?
+  def assigned?
     action == "assigned" || initial_assignment?
   end
 

From 3d28203224ed502ffbe387e35352b95c68d8aa7b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 14:44:55 +0200
Subject: [PATCH 180/413] Use singular staging resource and beef up testing

---
 app/controllers/cards/stagings_controller.rb     | 16 ++--------------
 app/helpers/workflows_helper.rb                  |  4 ++--
 app/models/card/staged.rb                        |  6 ++----
 config/routes.rb                                 |  4 ++--
 .../cards/stagings_controller_test.rb            | 12 ++++++++++++
 test/integration/card_messages.rb                | 14 --------------
 test/models/card/staged_test.rb                  | 12 ++++++++++++
 7 files changed, 32 insertions(+), 36 deletions(-)
 create mode 100644 test/controllers/cards/stagings_controller_test.rb
 create mode 100644 test/models/card/staged_test.rb

diff --git a/app/controllers/cards/stagings_controller.rb b/app/controllers/cards/stagings_controller.rb
index 102c17599..714427ecf 100644
--- a/app/controllers/cards/stagings_controller.rb
+++ b/app/controllers/cards/stagings_controller.rb
@@ -1,20 +1,8 @@
 class Cards::StagingsController < ApplicationController
   include CardScoped
 
-  before_action :set_stage
-
-  def create
-    if @stage
-      @card.toggle_stage @stage
-    else
-      @card.update!(stage: nil)
-    end
-
+  def update
+    @card.change_stage_to @collection.workflow.stages.find(params[:stage_id])
     render_card_replacement
   end
-
-  private
-    def set_stage
-      @stage = Workflow::Stage.find_by(id: params[:stage_id])
-    end
 end
diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 43d0d5973..560e1aebf 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -2,8 +2,8 @@ module WorkflowsHelper
   def button_to_set_stage(card, stage)
     button_to \
       tag.span(stage.name, class: "overflow-ellipsis"),
-      card_stagings_path(card, stage_id: stage),
-      method: :post,
+      card_staging_path(card, stage_id: stage),
+      method: :put,
       class: [ "btn justify-start workflow-stage txt-uppercase workflow-stage", { "workflow-stage--current": stage == card.stage } ],
       form_class: "flex align-center gap-half",
       data: { turbo_frame: "_top" }
diff --git a/app/models/card/staged.rb b/app/models/card/staged.rb
index da3269ad7..f8036d3e3 100644
--- a/app/models/card/staged.rb
+++ b/app/models/card/staged.rb
@@ -13,12 +13,10 @@ module Card::Staged
     stage&.workflow
   end
 
-  def toggle_stage(stage)
-    new_stage, event = self.stage_id == stage.id ? [ nil, :unstaged ] : [ stage, :staged ]
-
+  def change_stage_to(new_stage)
     transaction do
       update! stage: new_stage
-      track_event event, stage_id: stage.id, stage_name: stage.name
+      track_event :staged, stage_id: new_stage.id, stage_name: new_stage.name
     end
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index 61271338a..4e1d24f88 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,17 +26,17 @@ Rails.application.routes.draw do
   resources :cards do
     scope module: :cards do
       resource :engagement
+      resource :goldness
       resource :image
       resource :pin
       resource :closure
       resource :publish
       resource :reading
       resource :recover
+      resource :staging
       resource :watch
-      resource :goldness
 
       resources :assignments
-      resources :stagings
       resources :taggings
 
       resources :comments do
diff --git a/test/controllers/cards/stagings_controller_test.rb b/test/controllers/cards/stagings_controller_test.rb
new file mode 100644
index 000000000..5e49876f5
--- /dev/null
+++ b/test/controllers/cards/stagings_controller_test.rb
@@ -0,0 +1,12 @@
+require "test_helper"
+
+class Cards::StagingsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "update" do
+    put card_staging_path(cards(:logo)), params: { stage_id: workflow_stages(:qa_in_progress).id }, as: :turbo_stream
+    assert_card_container_rerendered(cards(:logo))
+  end
+end
diff --git a/test/integration/card_messages.rb b/test/integration/card_messages.rb
index 29eded2f0..0253e45f3 100644
--- a/test/integration/card_messages.rb
+++ b/test/integration/card_messages.rb
@@ -25,19 +25,5 @@ class CardMessagesTest < ActionDispatch::IntegrationTest
     assert_predicate card.messages.last, :event_summary?
     assert_equal 1, card.messages.last.event_summary.events.count
     assert_equal "assigned", card.messages.last.messageable.events.last.action
-
-    # Stage it
-    post card_stagings_path(card), params: { stage_id: workflow_stages(:qa_triage).id }
-    assert_equal 3, card.messages.count
-    assert_predicate card.messages.last, :event_summary?
-    assert_equal 2, card.messages.last.event_summary.events.count
-    assert_equal "staged", card.messages.last.messageable.events.last.action
-
-    # Unstage it
-    post card_stagings_path(card), params: { stage_id: workflow_stages(:qa_triage).id }
-    assert_equal 3, card.messages.count
-    assert_predicate card.messages.last, :event_summary?
-    assert_equal 3, card.messages.last.event_summary.events.count
-    assert_equal "unstaged", card.messages.last.messageable.events.last.action
   end
 end
diff --git a/test/models/card/staged_test.rb b/test/models/card/staged_test.rb
new file mode 100644
index 000000000..492374fb5
--- /dev/null
+++ b/test/models/card/staged_test.rb
@@ -0,0 +1,12 @@
+require "test_helper"
+
+class Card::StagedTest < ActiveSupport::TestCase
+  setup { Current.session = sessions(:david) }
+
+  test "change stage" do
+    assert_difference -> { Event.where(action: :staged).count }, +1 do
+      cards(:logo).change_stage_to(workflow_stages(:qa_in_progress))
+      assert_equal workflow_stages(:qa_in_progress), cards(:logo).reload.stage
+    end
+  end
+end

From dcf135c00343d32ef0010ea5fc194d472a9427da Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 14:45:22 +0200
Subject: [PATCH 181/413] Fix rubocop

---
 db/seeds/honcho.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/seeds/honcho.rb b/db/seeds/honcho.rb
index 9132177ab..34599c600 100644
--- a/db/seeds/honcho.rb
+++ b/db/seeds/honcho.rb
@@ -9,7 +9,7 @@ sarah = create_user "Sarah Johnson", "sarah@37signals.com"
 mike = create_user "Mike Peterson", "mike@37signals.com"
 
 # Array of authors for random assignment
-authors = [david, jason, kevin, sarah, mike]
+authors = [ david, jason, kevin, sarah, mike ]
 
 # Card titles for reuse across collections
 card_titles = [
@@ -60,14 +60,14 @@ collections.each_with_index do |collection_name, index|
         # Randomly assign to 1-2 authors
         card.toggle_assignment(authors.sample)
         card.toggle_assignment(authors.sample) if rand > 0.5
- 
+
         # Randomly set card state
         case rand(3)
         when 0
           card.engage
         when 1
           card.close
-        # 2 remains open
+          # 2 remains open
         end
       end
     end

From c75d4cb3294553001903673d83eb17a9ae0323fd Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 15:26:56 +0200
Subject: [PATCH 182/413] Fix broken permalinks

---
 app/views/cards/comments/_comment.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
index 427fae8ad..2881ee438 100644
--- a/app/views/cards/comments/_comment.html.erb
+++ b/app/views/cards/comments/_comment.html.erb
@@ -11,7 +11,7 @@
             <%= link_to comment.creator.name, comment.creator, class: "txt-ink btn btn--plain fill-transparent", data: { turbo_frame: "_top" } %>
           </strong>
 
-          <%= link_to card_path(comment.card, anchor: "comment_#{comment.id}"), class: "txt-undecorated txt-uppercase" do %>
+          <%= link_to collection_card_path(comment.card.collection, comment.card, anchor: "comment_#{comment.id}"), class: "txt-undecorated txt-uppercase" do %>
             <%= local_datetime_tag comment.created_at, style: :shortdate, class: "txt-ink translucent" %>
           <% end %>
 

From 81961a3523d2c1aaa30e1d817ccc98e4909f2514 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 15:30:03 +0200
Subject: [PATCH 183/413] Fix unclosed tag

---
 app/views/events/_day.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb
index 416d67e63..7426e1cc8 100644
--- a/app/views/events/_day.html.erb
+++ b/app/views/events/_day.html.erb
@@ -2,7 +2,7 @@
      data-related-element-highlight-class="event--related">
   <% if events.any? %>
     <h2 class="txt-medium events__day-header center">
-      <span class="events__day-header-content"><%= event_day_title(activity_day) %><span>
+      <span class="events__day-header-content"><%= event_day_title(activity_day) %></span>
     </h2>
 
     <div class="center events">

From 9b4fec936edba460230274926d303cda4e46ff33 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 16:17:37 +0200
Subject: [PATCH 184/413] Move mentions to comments

- It does not make sense to scan "event summaries" for notifications.
- Placing them at the message level prevents us from using the generic approach to extract the mentionable content
---
 app/helpers/notifications_helper.rb | 13 ++++++++++---
 app/models/comment.rb               |  2 +-
 app/models/concerns/messageable.rb  |  2 ++
 app/models/message.rb               |  4 ----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 1bbd3b508..b5c802ecf 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -25,10 +25,8 @@ module NotificationsHelper
 
   def notification_tag(notification, &)
     tag.div id: dom_id(notification), class: "notification tray__item border-radius txt-normal" do
-      # TODO: Temporary, I'll remove this. Right now, we support linking comments, but we should be linking messages.
-      resource = notification.resource.is_a?(Message) ? notification.resource.comment : notification.resource
       concat(
-        link_to(resource,
+        link_to(notification_resource_path(notification),
           class: "notification__content border-radius shadow fill-white flex align-start txt-align-start gap flex-item-grow max-width border txt-ink",
           data: { action: "click->dialog#close", turbo_frame: "_top" },
           &)
@@ -37,6 +35,15 @@ module NotificationsHelper
     end
   end
 
+  def notification_resource_path(notification)
+    if notification.resource.is_a?(Comment)
+      # TODO: Extract a direct path for these
+      collection_card_path(notification.resource.card.collection, notification.resource.card, anchor: "comment_#{notification.resource.id}")
+    else
+      notification.resource
+    end
+  end
+
   def notification_mark_read_button(notification)
     button_to read_notification_path(notification),
       class: "notification__unread_indicator btn borderless",
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 8922b30b7..630589e41 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
 class Comment < ApplicationRecord
-  include Messageable, Searchable
+  include Mentions, Messageable, Searchable
 
   belongs_to :creator, class_name: "User", default: -> { Current.user }
   has_many :reactions, dependent: :delete_all
diff --git a/app/models/concerns/messageable.rb b/app/models/concerns/messageable.rb
index 219ee1197..d4c4f83fe 100644
--- a/app/models/concerns/messageable.rb
+++ b/app/models/concerns/messageable.rb
@@ -6,5 +6,7 @@ module Messageable
   included do
     has_one :message, as: :messageable, touch: true, dependent: :destroy
     has_one :card, through: :message
+
+    delegate :collection, to: :message
   end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 2947c99b5..7d950b3b7 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,11 +1,7 @@
 class Message < ApplicationRecord
-  include Mentions
-
   belongs_to :card, touch: true
 
   delegated_type :messageable, types: Messageable::TYPES, inverse_of: :message, dependent: :destroy
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
-
-  delegate :collection, to: :card
 end

From a567e662e21751483dd9bb0595afca73ec505422 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 17:23:47 +0200
Subject: [PATCH 185/413] Fix: wrong delegation

---
 app/models/concerns/messageable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/messageable.rb b/app/models/concerns/messageable.rb
index d4c4f83fe..d3dbca06c 100644
--- a/app/models/concerns/messageable.rb
+++ b/app/models/concerns/messageable.rb
@@ -7,6 +7,6 @@ module Messageable
     has_one :message, as: :messageable, touch: true, dependent: :destroy
     has_one :card, through: :message
 
-    delegate :collection, to: :message
+    delegate :collection, to: :card
   end
 end

From cdadc0373a7d847ef0343ba6010906c027c21117 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 22 Apr 2025 18:10:27 +0200
Subject: [PATCH 186/413] Don't trigger unless the mentionable content changes

This is also needed to prevent incorrect triggering on cascade touches!
---
 app/models/concerns/mentions.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 4bcd458a6..82a9aa093 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -3,7 +3,8 @@ module Mentions
 
   included do
     has_many :mentions, as: :container, dependent: :destroy
-    after_commit :collect_mentions_later, on: %i[ create update ]
+    before_save :save_mentionable_content_before_save
+    after_commit :collect_mentions_later, on: %i[ create update ], if: :mentionable_content_changed?
   end
 
   def collect_mentions(mentioner: Current.user)
@@ -19,10 +20,18 @@ module Mentions
   end
 
   private
+    def save_mentionable_content_before_save
+      @mentionable_content_before_safe = self.class.find(id).mentionable_content unless new_record?
+    end
+
     def collect_mentions_later
       Mention::CollectJob.perform_later(self, mentioner: Current.user)
     end
 
+    def mentionable_content_changed?
+      @mentionable_content_before_safe != mentionable_content
+    end
+
     def scan_mentionees
       scan_mentioned_handles.filter_map do |mention|
         mentionable_users.find { |user| user.mentionable_handles.include?(mention) }

From 4f87472e5a5e82fde0a3fa5b38a2c8b2441a9fe9 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 12:00:49 -0500
Subject: [PATCH 187/413] Restore clicks on pinned cards

---
 app/assets/stylesheets/pins.css           | 4 ++++
 app/views/cards/display/_preview.html.erb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css
index e42f2d3e7..c191dea7b 100644
--- a/app/assets/stylesheets/pins.css
+++ b/app/assets/stylesheets/pins.css
@@ -42,6 +42,10 @@
       padding-block-end: 0;
     }
 
+    .card__link {
+      z-index: 1;
+    }
+
     .card__title {
       font-size: var(--text-small);
       font-weight: bold;
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 43284b534..60c416ba6 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -10,7 +10,7 @@
         <%= card.title %>
       </h1>
 
-      <%= link_to collection_card_path(card.collection, card), class: "card__link" do %>
+      <%= link_to collection_card_path(card.collection, card), class: "card__link", data: { turbo_frame: "_top" } do %>
         <span class="for-screen-reader"><%= card.title %></span>
       <% end %>
 

From 51ef76ff4bf492273a2a5221d7ee202004a8dee9 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 12:04:53 -0500
Subject: [PATCH 188/413] This was on the wrong element

 Caused some pinned cards to be an irregular height
---
 app/assets/stylesheets/pins.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css
index c191dea7b..1423b6285 100644
--- a/app/assets/stylesheets/pins.css
+++ b/app/assets/stylesheets/pins.css
@@ -47,15 +47,13 @@
     }
 
     .card__title {
+      --lines: 1;
+    
       font-size: var(--text-small);
       font-weight: bold;
       min-block-size: 0;
     }
 
-    .card__title-link {
-      --lines: 1;
-    }
-
     .card__stages {
       padding: 0;
     }

From cde8634bfecf31c0ba60315eb5f5223adc02179f Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 12:59:36 -0500
Subject: [PATCH 189/413] Adjust the stages column sizing

---
 app/assets/stylesheets/cards.css          | 12 ++++++++----
 app/views/cards/_container.html.erb       |  2 +-
 app/views/cards/container/_title.html.erb |  8 ++++----
 app/views/cards/display/_preview.html.erb | 16 +++++++++-------
 app/views/cards/edit.html.erb             |  2 +-
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 4be6b06ed..9e4d8dc11 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -116,6 +116,10 @@
     }
   }
 
+  .card__content {
+    flex: 2 1 auto;
+  }
+
   .card__title {
     --hover-size: 0;
     --input-border-radius: 0;
@@ -123,7 +127,6 @@
     --lines: 3;
 
     color: inherit;
-    flex: 2 1 75%;
     font-size: var(--text-xx-large);
     font-weight: 900;
     line-height: 1.2;
@@ -148,10 +151,11 @@
 
   .card__stages {
     display: flex;
-    flex: 1 1 25%;
+    flex: 0 1 auto;
     flex-direction: column;
-    max-width: 100%;
-    min-width: 0;
+    justify-self: end;
+    max-inline-size: 20ch;
+    min-inline-size: 15ch;
     padding-block: var(--block-space-half);
   }
 
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 034106e59..f64ff7e91 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -19,7 +19,7 @@
         <%= render "cards/display/perma/tags", card: card %>
       </header>
 
-      <div class="card__body flex gap full-width flex-item-grow">
+      <div class="card__body flex gap full-width flex-item-grow justify-space-between">
         <%= render "cards/container/title", card: card %>
         <%= render "cards/stagings/stages", card: card if card.doing? %>
       </div>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index f3ab76788..39c097d6c 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -1,16 +1,16 @@
 <% if card.published? %>
   <%= turbo_frame_tag card, :edit do %>
-    <div class="full-width">
+    <div class="card__content">
       <h1 class="card__title flex align-start gap-half">
         <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link" %>
       </h1>
-      <p class="card__description margin-block-half">
+      <div class="card__description margin-block-half">
         <%= sanitize card.description_html %>
-      </p>
+      </div>
     </div>
   <% end %>
 <% else %>
-  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "full-width", data: { controller: "auto-save" } do |form| %>
+  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "card__content", data: { controller: "auto-save" } do |form| %>
     <h1 class="card__title">
       <%= form.text_area :title, placeholder: "Name it…",
             class: "input input--textarea full-width borderless txt-align-start",
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 60c416ba6..a909089cb 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -5,14 +5,16 @@
       <%= render "cards/display/preview/tags", card: card %>
     </header>
 
-    <div class="card__body flex gap full-width flex-item-grow">
-      <h1 class="card__title overflow-line-clamp">
-        <%= card.title %>
-      </h1>
+    <div class="card__body flex gap full-width flex-item-grow justify-space-between">
+      <div class="card__content">
+        <h1 class="card__title overflow-line-clamp">
+          <%= card.title %>
+        </h1>
 
-      <%= link_to collection_card_path(card.collection, card), class: "card__link", data: { turbo_frame: "_top" } do %>
-        <span class="for-screen-reader"><%= card.title %></span>
-      <% end %>
+        <%= link_to collection_card_path(card.collection, card), class: "card__link", data: { turbo_frame: "_top" } do %>
+          <span class="for-screen-reader"><%= card.title %></span>
+        <% end %>
+      </div>
 
       <%= render "cards/stagings/stages", card: card if card.doing? %>
     </div>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index ad509b0e0..7770d82bd 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -1,5 +1,5 @@
 <%= turbo_frame_tag @card, :edit do %>
-  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "full-width", data: { controller: "form paste" } do |form| %>
+  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "card__content", data: { controller: "form paste" } do |form| %>
     <h1 class="card__title">
       <%= form.label :title, class: "flex flex-column align-center" do %>
         <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card-field__title",

From 3792966a23e0c077a7df8feed8187d01361d4b30 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:40:55 -0500
Subject: [PATCH 190/413] Blind attempt fix select options in browsers with
 non-native pickers

See: https://37s.fizzy.37signals.com/collections/693169850/cards/999008955
---
 app/assets/stylesheets/inputs.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/inputs.css b/app/assets/stylesheets/inputs.css
index 5e3ba772c..35854aac6 100644
--- a/app/assets/stylesheets/inputs.css
+++ b/app/assets/stylesheets/inputs.css
@@ -94,6 +94,11 @@
     @media (prefers-color-scheme: dark) {
       background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23fff'/%3E%3C/svg%3E");
     }
+
+    option {
+      background-color: var(--color-bg);
+      color: var(--color-ink);
+    }
   }
 
   .input--textarea {

From c4864752f464bb57984ea5bb1bba9bfa156dcb79 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:53:08 -0500
Subject: [PATCH 191/413] Card descriptions need styles shared with comments

---
 .../stylesheets/{comment-content.css => markdown-content.css} | 2 +-
 app/views/cards/comments/_comment.html.erb                    | 2 +-
 app/views/cards/comments/_new.html.erb                        | 2 +-
 app/views/cards/comments/edit.html.erb                        | 2 +-
 app/views/cards/container/_title.html.erb                     | 4 ++--
 app/views/cards/edit.html.erb                                 | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename app/assets/stylesheets/{comment-content.css => markdown-content.css} (98%)

diff --git a/app/assets/stylesheets/comment-content.css b/app/assets/stylesheets/markdown-content.css
similarity index 98%
rename from app/assets/stylesheets/comment-content.css
rename to app/assets/stylesheets/markdown-content.css
index 9944ed45f..9d094aade 100644
--- a/app/assets/stylesheets/comment-content.css
+++ b/app/assets/stylesheets/markdown-content.css
@@ -1,5 +1,5 @@
 @layer components {
-  .comments {
+  .markdown-content {
     :where(h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6) {
       font-weight: 800;
       hyphens: auto;
diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
index 427fae8ad..0594d6cd5 100644
--- a/app/views/cards/comments/_comment.html.erb
+++ b/app/views/cards/comments/_comment.html.erb
@@ -21,7 +21,7 @@
           <% end %>
         </div>
 
-        <div class="comment__body txt-align-start">
+        <div class="comment__body markdown-content txt-align-start">
           <%= sanitize comment.body_html %>
         </div>
 
diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb
index 2352d1797..c4645fe86 100644
--- a/app/views/cards/comments/_new.html.erb
+++ b/app/views/cards/comments/_new.html.erb
@@ -4,7 +4,7 @@
   </figure>
 
   <div class="comment__content flex-inline flex-column full-width">
-    <div class="comment__body txt-align-start">
+    <div class="comment__body markdown-content txt-align-start">
       <%= form_with model: Comment.new, url: card_comments_path(card), class: "flex flex-column gap full-width",
             data: { controller: "form paste local-save",
                     local_save_key_value: "comment-#{card.id}",
diff --git a/app/views/cards/comments/edit.html.erb b/app/views/cards/comments/edit.html.erb
index cfe22b4c0..d07b50334 100644
--- a/app/views/cards/comments/edit.html.erb
+++ b/app/views/cards/comments/edit.html.erb
@@ -1,6 +1,6 @@
 <%= turbo_frame_tag dom_id(@comment) do %>
   <div class="comment__content comment--edit flex-inline flex-column full-width">
-    <div class="comment__body txt-align-start">
+    <div class="comment__body markdown-content txt-align-start">
       <%= form_with model: [ @card, @comment ], class: "flex flex-column gap full-width",
             data: { controller: "form paste", action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } do |form| %>
         <%= form.markdown_area :body, class: "input comment__input", required: true, autofocus: true, placeholder: new_comment_placeholder(@card) %>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index 39c097d6c..d3c3baa33 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -4,7 +4,7 @@
       <h1 class="card__title flex align-start gap-half">
         <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link" %>
       </h1>
-      <div class="card__description margin-block-half">
+      <div class="card__description markdown-content margin-block-half">
         <%= sanitize card.description_html %>
       </div>
     </div>
@@ -17,7 +17,7 @@
             autofocus: card.title.blank?,
             data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
     </h1>
-    <div class="card__description margin-block-half">
+    <div class="card__description markdown-content margin-block-half">
       <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "house-md:change->auto-save#change focusout->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index 7770d82bd..e75a1d03c 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -8,7 +8,7 @@
               data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" } %>
       <% end %>
     </h1>
-    <div class="card__description margin-block-half">
+    <div class="card__description markdown-content margin-block-half">
       <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>

From 83a56e4ffedfe536ce35d458af763b4789e0e76c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:54:25 -0500
Subject: [PATCH 192/413] No longer used

---
 app/assets/stylesheets/workflows.css | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/assets/stylesheets/workflows.css b/app/assets/stylesheets/workflows.css
index d69dbfe3b..21e36b9c6 100644
--- a/app/assets/stylesheets/workflows.css
+++ b/app/assets/stylesheets/workflows.css
@@ -27,13 +27,5 @@
         background-color: color(from var(--card-color) srgb r g b / 0.65);
       }
     }
-
-    .ticket & {
-      --btn-background: var(--color-ink);
-
-      background: var(--card-color);
-      border-radius: 0.2em;
-      color: var(--color-ink-reversed);
-    }
   }
 }

From 9b57480b4089566129e273a0dd00fee0a8e0b7f3 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:55:46 -0500
Subject: [PATCH 193/413] `ticket` is a vestige of a previous design

---
 app/helpers/cards_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
index 31c370479..27bdd2595 100644
--- a/app/helpers/cards_helper.rb
+++ b/app/helpers/cards_helper.rb
@@ -15,7 +15,7 @@ module CardsHelper
       **options
   end
 
-  def card_article_tag(card, id: dom_id(card, :ticket), **options, &block)
+  def card_article_tag(card, id: dom_id(card, :article), **options, &block)
     classes = [
       options.delete(:class),
       ("card--golden" if card.golden?),

From d7de62a047f24f71e32a66a6826117e76795f56d Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:57:24 -0500
Subject: [PATCH 194/413] Pinned cards might be on the same screen which causes
 a name collision

---
 app/assets/stylesheets/pins.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css
index 1423b6285..50da7657e 100644
--- a/app/assets/stylesheets/pins.css
+++ b/app/assets/stylesheets/pins.css
@@ -31,6 +31,7 @@
       --text-xx-large: 2em;
 
       border: 1px solid var(--color-bg);
+      view-transition-name: unset !important;
     }
 
     .card__collection {

From 78d186bebd71e60cde484dafc61aaf7111524013 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 20:59:49 +0200
Subject: [PATCH 195/413] Really liking the new it-style yields in many places

---
 app/models/concerns/filterable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index b3cb07c46..75f98cdce 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -10,6 +10,6 @@ module Filterable
 
   private
     def remove_from_filters
-      filters.each { |filter| filter.resource_removed self }
+      filters.each { it.resource_removed self }
     end
 end

From 134333ae44b8c41f2fc63995f182c74c574b229a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:01:11 +0200
Subject: [PATCH 196/413] Dont do a lot of work inside a single transaction

Especially with sqlite3!
---
 app/models/concerns/filterable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 75f98cdce..e1a11abd8 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -5,7 +5,7 @@ module Filterable
     has_and_belongs_to_many :filters
 
     after_update { filters.touch_all }
-    before_destroy :remove_from_filters
+    before_destroy_commit :remove_from_filters
   end
 
   private

From d9481eb0217b7405dc8cff4f6db03a243d124e27 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:08:48 -0500
Subject: [PATCH 197/413] Whitespace

---
 app/views/cards/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index e75a1d03c..f6ca2c09a 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -13,7 +13,7 @@
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
     </div>
-    <%= form.button "Save changes", type: :submit, class: "btn"%>
+    <%= form.button "Save changes", type: :submit, class: "btn" %>
     <%= link_to "Close editor and discard changes", collection_card_path(@card.collection, @card), data: { form_target: "cancel" }, hidden: true %>
   <% end %>
 <% end %>

From 024b54a8a752c57e8e6fcc1e8ff80c98bcf9aa0f Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:15:48 -0500
Subject: [PATCH 198/413] Get this effect with `mix-blend-mode`

---
 app/assets/stylesheets/cards.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 9e4d8dc11..b913db6a9 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -218,10 +218,10 @@
     flex-direction: column;
     inset: auto var(--block-space) var(--block-space-double) auto;
     justify-content: space-between;
+    mix-blend-mode: multiply;
     padding: var(--block-space-half) calc(var(--inline-space) * 1.5);
     position: absolute;
     transform: rotate(-10deg);
-    z-index: -1;
   }
 
   .card__closed-by {

From 6cd8d54bf71ca141fa04b3fb94b38407a12d27eb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:20:18 +0200
Subject: [PATCH 199/413] We werent using any of the other avatar methods

---
 app/models/user.rb        |  3 ++-
 app/models/user/avatar.rb | 17 -----------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 app/models/user/avatar.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index a22841c42..f16a77b0c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,8 +1,9 @@
 class User < ApplicationRecord
-  include Accessor, Assignee, Avatar, Role, Transferable
+  include Accessor, Assignee, Role, Transferable
 
   has_many :sessions, dependent: :destroy
   has_secure_password validations: false
+  has_one_attached :avatar
 
   has_many :comments, inverse_of: :creator, dependent: :destroy
 
diff --git a/app/models/user/avatar.rb b/app/models/user/avatar.rb
deleted file mode 100644
index a9d2ad12e..000000000
--- a/app/models/user/avatar.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module User::Avatar
-  extend ActiveSupport::Concern
-
-  included do
-    has_one_attached :avatar
-  end
-
-  class_methods do
-    def from_avatar_token(sid)
-      find_signed!(sid, purpose: :avatar)
-    end
-  end
-
-  def avatar_token
-    signed_id(purpose: :avatar)
-  end
-end

From c4fbed315657be120e0bbfe1bce18afaee5087cf Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:20:55 +0200
Subject: [PATCH 200/413] Try a slimmer version

And I actually stopped liking that setup automatically starts the
server.
---
 bin/setup | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/bin/setup b/bin/setup
index ad27b6637..c7223d499 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,31 +1,14 @@
 #!/usr/bin/env ruby
-require "fileutils"
 
-APP_ROOT = File.expand_path("..", __dir__)
+def system!(*args) system(*args, exception: true) end
 
-def system!(*args)
-  system(*args, exception: true)
-end
+puts "== Installing dependencies =="
+system("gem install bundler --conservative")
+system("bundle check") || system!("bundle install")
 
-FileUtils.chdir APP_ROOT do
-  # This script is a way to set up or update your development environment automatically.
-  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
-  # Add necessary setup steps to this file.
+puts "\n== Preparing database =="
+system! "bin/rails db:prepare"
+system! "bin/rails db:reset" if ARGV.include?("--reset")
 
-  puts "== Installing dependencies =="
-  system("gem install bundler --conservative")
-  system("bundle check") || system!("bundle install")
-
-  puts "\n== Preparing database =="
-  system! "bin/rails db:prepare"
-  system! "bin/rails db:reset" if ARGV.include?("--reset")
-
-  puts "\n== Removing old logs and tempfiles =="
-  system! "bin/rails log:clear tmp:clear"
-
-  unless ARGV.include?("--skip-server")
-    puts "\n== Starting development server =="
-    STDOUT.flush # flush the output before exec(2) so that it displays
-    exec "bin/dev"
-  end
-end
+puts "\n== Removing old logs and tempfiles =="
+system! "bin/rails log:clear tmp:clear"

From b46461d7eddc490635af7d4d26c8b943cceb768c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:21:14 -0500
Subject: [PATCH 201/413] Errant `bubbles` => `cards` replacement

---
 app/javascript/controllers/local_save_controller.js | 2 +-
 app/javascript/controllers/paste_controller.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/controllers/local_save_controller.js b/app/javascript/controllers/local_save_controller.js
index c0c5892aa..5d9b89a72 100644
--- a/app/javascript/controllers/local_save_controller.js
+++ b/app/javascript/controllers/local_save_controller.js
@@ -47,7 +47,7 @@ export default class extends Controller {
   #triggerChangeEvent(newValue) {
     if (this.inputTarget.tagName === "HOUSE-MD") {
       this.inputTarget.dispatchEvent(new CustomEvent('house-md:change', {
-        cards: true,
+        bubbles: true,
         detail: {
           previousContent: '',
           newContent: newValue
diff --git a/app/javascript/controllers/paste_controller.js b/app/javascript/controllers/paste_controller.js
index 41fc77d2c..79db7d7db 100644
--- a/app/javascript/controllers/paste_controller.js
+++ b/app/javascript/controllers/paste_controller.js
@@ -12,7 +12,7 @@ export default class extends Controller {
 
     for (const file of files) {
       const uploadEvent = new CustomEvent("house-md:before-upload", { 
-        cards: true, 
+        bubbles: true, 
         detail: { file },
         cancelable: true 
       })

From ad1e97767d317570585d16e8098e60cf6e50ab38 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:22:42 +0200
Subject: [PATCH 202/413] Style

---
 app/models/workflow.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/workflow.rb b/app/models/workflow.rb
index b1e1fdb22..3174289dd 100644
--- a/app/models/workflow.rb
+++ b/app/models/workflow.rb
@@ -7,7 +7,6 @@ class Workflow < ApplicationRecord
 
   private
     def create_default_stages
-      Workflow::Stage.insert_all \
-        DEFAULT_STAGES.collect { |default_stage_name| { workflow_id: id, name: default_stage_name } }
+      Workflow::Stage.insert_all(DEFAULT_STAGES.map { { name: it, workflow_id: id } })
     end
 end

From 8c43615d7119b5093830857e0c747a81e8b3ab2b Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:23:44 -0500
Subject: [PATCH 203/413] Missing controller

---
 app/views/cards/container/_title.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index d3c3baa33..38970a04a 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -10,7 +10,7 @@
     </div>
   <% end %>
 <% else %>
-  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "card__content", data: { controller: "auto-save" } do |form| %>
+  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "card__content", data: { controller: "paste auto-save" } do |form| %>
     <h1 class="card__title">
       <%= form.text_area :title, placeholder: "Name it…",
             class: "input input--textarea full-width borderless txt-align-start",

From 72d1d0baee59e68a7534b9ecbe6441ad7edbbbfc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:24:51 +0200
Subject: [PATCH 204/413] Not related to the other two

---
 app/models/user.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index f16a77b0c..284de79cf 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,6 +3,7 @@ class User < ApplicationRecord
 
   has_many :sessions, dependent: :destroy
   has_secure_password validations: false
+
   has_one_attached :avatar
 
   has_many :comments, inverse_of: :creator, dependent: :destroy

From 90f05b731075ecf01901d13c938dbdb023c11074 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:25:30 +0200
Subject: [PATCH 205/413] But feels more essentially part of the User, so list
 first

---
 app/models/user.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 284de79cf..9e7fdffb8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,11 +1,11 @@
 class User < ApplicationRecord
   include Accessor, Assignee, Role, Transferable
 
+  has_one_attached :avatar
+
   has_many :sessions, dependent: :destroy
   has_secure_password validations: false
 
-  has_one_attached :avatar
-
   has_many :comments, inverse_of: :creator, dependent: :destroy
 
   has_many :notifications, dependent: :destroy

From 5de85fa6bff38c886a9cb2439178228912786f71 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:25:35 -0500
Subject: [PATCH 206/413] Don't display published event in threads

---
 app/models/event_summary.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/models/event_summary.rb b/app/models/event_summary.rb
index fcfaabd83..241d3cc3c 100644
--- a/app/models/event_summary.rb
+++ b/app/models/event_summary.rb
@@ -13,8 +13,6 @@ class EventSummary < ApplicationRecord
 
     def summarize(event)
       case event.action
-      when "published"
-        "Added by #{event.creator.name}."
       when "assigned"
         "Assigned to #{event.assignees.pluck(:name).to_sentence}."
       when "unassigned"

From 7124835e60589088114690e758feb139ee797498 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:29:03 +0200
Subject: [PATCH 207/413] No long transactions!

If you intend to deactivate someone, and the process fails mid process,
so you only delete some sessions, or some accesses, you are actually
fine. The system is never left in an incomplete state. And that's really
the only time we should be using transactions with sqlite3 -- to prevent
actual data integrity issues.

The rest of the time, we should optimize for each transaction to be as
quick as possible. The sqlite3 writer lock is the one bottleneck that we
cant afford to overload.
---
 app/models/user.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 9e7fdffb8..b79fbf606 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,11 +24,9 @@ class User < ApplicationRecord
   end
 
   def deactivate
-    transaction do
-      sessions.delete_all
-      accesses.destroy_all
-      update! active: false, email_address: deactived_email_address
-    end
+    sessions.delete_all
+    accesses.destroy_all
+    update! active: false, email_address: deactived_email_address
   end
 
   private

From 5048e9c9700c45ea85193c50843b6a1440ae8889 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:40:30 +0200
Subject: [PATCH 208/413] Duh, no before destroy commit, but this is still not
 right!

---
 app/models/concerns/filterable.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index e1a11abd8..85a33a015 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -5,10 +5,12 @@ module Filterable
     has_and_belongs_to_many :filters
 
     after_update { filters.touch_all }
-    before_destroy_commit :remove_from_filters
+    before_destroy :remove_from_filters
   end
 
   private
+    # FIXME: This is too inefficient to have part of a destroy transaction.
+    # Need to find a way to use a job or a single query.
     def remove_from_filters
       filters.each { it.resource_removed self }
     end

From 14129326663d357437b7e09b681d1e0815bac770 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:45:39 -0500
Subject: [PATCH 209/413] The placeholder attribute is on the `house-md`
 element

---
 app/assets/stylesheets/house.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/house.css b/app/assets/stylesheets/house.css
index e1ce84325..66dbdddf1 100644
--- a/app/assets/stylesheets/house.css
+++ b/app/assets/stylesheets/house.css
@@ -1,6 +1,8 @@
 @layer components {
   /* Editor */
   house-md {
+    --placeholder: attr(placeholder);
+
     display: flex;
     flex-direction: column;
     flex-grow: 1;
@@ -65,7 +67,7 @@
     padding: 1rem;
 
     &.house-md-content-empty::before {
-      content: attr(placeholder);
+      content: var(--placeholder);
       color: currentColor;
       opacity: 0.5;
       pointer-events: none;

From 647971f2052d8a9d75f121c9af85d02046337641 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:46:46 -0500
Subject: [PATCH 210/413] Remove check for _Added by..._ line

---
 test/models/event_summary_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/models/event_summary_test.rb b/test/models/event_summary_test.rb
index a438c492c..480529b0f 100644
--- a/test/models/event_summary_test.rb
+++ b/test/models/event_summary_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 class EventSummaryTest < ActiveSupport::TestCase
   test "body" do
-    assert_equal "Added by David. Assigned to JZ.", event_summaries(:logo_initial_activity).body
+    assert_equal "Assigned to JZ.", event_summaries(:logo_initial_activity).body
     assert_equal "Assigned to Kevin.", event_summaries(:logo_second_activity).body
     assert_equal "Added by Kevin.", event_summaries(:text_initial_activity).body
   end

From dff55d6cb6f235f379a4d39f52d1f30da7a2d1de Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:48:32 +0200
Subject: [PATCH 211/413] Style

---
 app/models/card.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 541d761a9..75f8c4807 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,7 +1,6 @@
 class Card < ApplicationRecord
-  include Assignable, Colored, Engageable, Eventable, Golden,
-    Messages, Notifiable, Pinnable, Closeable, Searchable, Staged,
-    Statuses, Taggable, Watchable
+  include Assignable, Colored, Engageable, Eventable, Golden, Messages, Notifiable,
+    Pinnable, Closeable, Searchable, Staged, Statuses, Taggable, Watchable
 
   belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }

From 93516f2e483e6d30f46a7c2b085eafd3265a3f7f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:51:38 +0200
Subject: [PATCH 212/413] @collection is always available when card scoped

---
 app/views/cards/assignments/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index 1be2c77a2..35412c9f3 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -2,7 +2,7 @@
   <strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Assign this to…</strong>
 
   <div class="flex flex-column full-width popup__list">
-    <% @card.collection.users.active.alphabetically.each do |user| %>
+    <% @collection.users.active.alphabetically.each do |user| %>
         <%= button_to card_assignments_path(@card, params: { assignee_id: user.id }), method: :post, class: "btn popup__item full-width" do %>
           <span class="overflow-ellipsis"><%= user.name %></span>
           <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @card.assignees.include?(user) %>

From cf3cbccf23bf1042f54cb1aee6faf9eda1ebd6eb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:56:23 +0200
Subject: [PATCH 213/413] Indention

---
 app/views/cards/comments/_comment.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
index 427fae8ad..bebe522e6 100644
--- a/app/views/cards/comments/_comment.html.erb
+++ b/app/views/cards/comments/_comment.html.erb
@@ -16,7 +16,7 @@
           <% end %>
 
           <%= link_to edit_card_comment_path(comment.card, comment),
-            class: "comment__edit btn btn--plain txt-xx-small fill-transparent translucent flex-item-justify-end" do %>
+                class: "comment__edit btn btn--plain txt-xx-small fill-transparent translucent flex-item-justify-end" do %>
             <%= icon_tag "menu-dots-horizontal" %> <span class="for-screen-reader">Edit this comment</span>
           <% end %>
         </div>

From 537903ba0b5d1bde826680145818a7baa022c268 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 15:06:05 -0500
Subject: [PATCH 214/413] Don't test for _Added by_ events

Note: The join method in `event_summary.rb` inserts a space that we need to account for
---
 test/models/event_summary_test.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/models/event_summary_test.rb b/test/models/event_summary_test.rb
index 480529b0f..84ba368ef 100644
--- a/test/models/event_summary_test.rb
+++ b/test/models/event_summary_test.rb
@@ -2,8 +2,7 @@ require "test_helper"
 
 class EventSummaryTest < ActiveSupport::TestCase
   test "body" do
-    assert_equal "Assigned to JZ.", event_summaries(:logo_initial_activity).body
+    assert_equal " Assigned to JZ.", event_summaries(:logo_initial_activity).body
     assert_equal "Assigned to Kevin.", event_summaries(:logo_second_activity).body
-    assert_equal "Added by Kevin.", event_summaries(:text_initial_activity).body
   end
 end

From 0a9d16bf2d11def175d844a2ff57bfed03446475 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 22:29:33 -0500
Subject: [PATCH 215/413] New menu filters and navigates

---
 app/assets/stylesheets/popup.css              | 67 ++++++++++++++++---
 .../cards/index/_collections_filter.html.erb  | 29 ++++----
 app/views/cards/index/_header.html.erb        |  9 ++-
 app/views/events/_filter.html.erb             |  2 +-
 4 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 5c8ec1b95..f674b25e2 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -5,10 +5,11 @@
     --panel-size: auto;
 
     inline-size: auto;
-    inset: 0 auto auto 0;
+    inset: 0 auto auto 50%;
     min-inline-size: 20ch;
     max-inline-size: 40ch;
     position: absolute;
+    transform: translateX(-50%);
     z-index: 2;
 
     &[open] {
@@ -16,8 +17,19 @@
     }
   }
 
+  .popup__group {
+    background: var(--color-subtle-light);
+    padding-inline-start: var(--inline-space-half);
+    
+    @media (any-hover: hover) {
+      &:hover {
+        background: var(--color-selected);
+      }
+    }
+  }
+
   .popup__item {
-    --btn-background: var(--color-subtle-light);
+    --btn-background: transparent;
     --btn-border-radius: 0.3em;
     --btn-border-size: 0;
     --btn-font-weight: 500;
@@ -37,12 +49,6 @@
 
     }
 
-    @media (any-hover: hover) {
-      &:where(:not(:active):hover) {
-        --btn-background: var(--color-selected);
-      }
-    }
-
     &:has(input:checked)  {
       --btn-background: var(--color-selected);
       --btn-color: var(--color-ink);
@@ -82,3 +88,48 @@
     font-weight: 800;
   }
 }
+
+.popup--animated {
+  --backdrop-speed: 150ms;
+  --panel-size: max-content;
+  --speed: 150ms;
+
+  opacity: 0;
+  transform: scale(0.2) translateX(-50%);
+  transform-origin: top left;
+  transition:
+      display var(--speed) allow-discrete,
+      opacity var(--speed),
+      overlay var(--speed) allow-discrete,
+      transform var(--speed);
+
+  &::backdrop {
+    background-color: var(--color-always-black);
+    opacity: 0;
+    transform: scale(1);
+    transition:
+      display var(--backdrop-speed) allow-discrete,
+      opacity var(--backdrop-speed),
+      overlay var(--backdrop-speed) allow-discrete;
+  }
+
+  &[open] {
+    opacity: 1;
+    transform: scale(1) translateX(-50%);
+
+    &::backdrop {
+      opacity: 0.5;
+    }
+  }
+
+  @starting-style {
+    &[open] {
+      opacity: 0;
+      transform: scale(0.2) translateX(-50%);
+    }
+
+    &[open]::backdrop {
+      opacity: 0;
+    }
+  }
+}
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index b81481ad7..80802f6f8 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -4,20 +4,25 @@
     <%= filter_hidden_field_tag key, value %>
   <% end %>
 
-  <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item" do %>
-    <span class="overflow-ellipsis">All collections</span>
-  <% end %>
-
   <% Current.user.collections.order(:name).each do |collection| %>
-    <div class="btn popup__item">
-      <%= form.check_box "collection_ids[]", {
-            checked: filter.collections.include?(collection),
-            data: { action: "change->form#submit" },
-            include_hidden: false,
-      }, collection.id %>
+    <div class="popup__group flex align-center full-width gap-half">
+      <div class="btn txt-xx-small">
+        <%= form.check_box "collection_ids[]", {
+              checked: filter.collections.include?(collection),
+              data: { action: "change->form#submit" },
+              include_hidden: false,
+        }, collection.id %>
 
-      <%= form.label "collection_ids[]", collection.name, for: dom_id(collection, :filter), class: "overflow-ellipsis" %>
-      <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+        <span class="for-screen-reader">
+          Toggle filter for <%= collection.name %>
+        </span>
+        <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+      </div>
+
+      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item flex-item-grow justify-space-between" do %>
+        <span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
+        <span class="translucent"> ›</span>
+      <% end %>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 0eef62cce..3946e1b2a 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -12,8 +12,13 @@
         </h1>
       </button>
 
-      <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-        <strong class="popup__title margin-block-start-half pad-inline-half">In Collection</strong>
+      <dialog class="events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+        <div class="flex align-center full-width gap-half">
+          <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.6em 0 0.3em;">
+            <%= icon_tag "filter" %>
+          </span>
+          <strong class="popup__title txt-medium">Collections</strong>
+        </div>
 
         <%= render "cards/index/collections_filter", filter: filter %>
       </dialog>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 94a9a756a..289c86e69 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -8,7 +8,7 @@
 	</button>
 
 	<dialog class="events__popup popup panel flex-column full-width align-start gap-half fill-white shadow"
-				style="z-index: 5; inset: 0 0 auto auto;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+				style="z-index: 5;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
 		<strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Filter by Collection…</strong>
 		<%= form_with url: events_path, method: :get, class: "flex flex-column full-width popup__list",
 					data: { controller: "form" } do |form| %>

From b29afcd518a2eb8503147171dc9316dd6cf9f888 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 22:57:48 -0500
Subject: [PATCH 216/413] Same treatment for the events index

---
 app/assets/stylesheets/events.css             |  7 ++--
 app/assets/stylesheets/popup.css              |  4 ++
 .../cards/index/_collections_filter.html.erb  |  4 +-
 app/views/events/_filter.html.erb             | 39 +++++++++++++------
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 0b19fe853..e4a74f0d4 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -61,9 +61,10 @@
   }
 
   .events__popup {
-    .panel:is(&) {
-      max-block-size: calc(100dvh - (2 * var(--block-space-double)));
-      max-inline-size: calc(100dvw - (2 * var(--block-space-double)));
+    margin-block-start: var(--block-space-double);
+
+    .events__index-header:has(&) {
+      position: relative;
     }
 
     #header:has(&) {
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index f674b25e2..0ffde9dc2 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -19,6 +19,7 @@
 
   .popup__group {
     background: var(--color-subtle-light);
+    max-inline-size: 100%;
     padding-inline-start: var(--inline-space-half);
     
     @media (any-hover: hover) {
@@ -37,7 +38,10 @@
     --hover-size: 0;
     --outline-color: transparent;
 
+    flex: 1 1 auto;
     justify-content: start;
+    max-inline-size: 100%;
+    text-align: start;
 
     &::after {
       border-radius: var(--btn-border-radius);
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index 80802f6f8..2370929c0 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -5,7 +5,7 @@
   <% end %>
 
   <% Current.user.collections.order(:name).each do |collection| %>
-    <div class="popup__group flex align-center full-width gap-half">
+    <div class="popup__group flex align-center gap-half overflow-ellipsis">
       <div class="btn txt-xx-small">
         <%= form.check_box "collection_ids[]", {
               checked: filter.collections.include?(collection),
@@ -19,7 +19,7 @@
         <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
       </div>
 
-      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item flex-item-grow justify-space-between" do %>
+      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item justify-space-between" do %>
         <span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
         <span class="translucent"> ›</span>
       <% end %>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 289c86e69..0b0a41550 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -1,5 +1,5 @@
 <% presenter = CollectionFilterPresenter.new(@collections, params, cookies) %>
-<div class="position-relative max-width margin-block-end-half"
+<div class="max-width margin-block-end-half"
 		data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
 	<button class="events__filter-btn input input--select flex-inline center min-width max-width txt-small" data-action="click->dialog#open:stop">
 		<span class="overflow-ellipsis center">
@@ -7,22 +7,37 @@
 		</span>
 	</button>
 
-	<dialog class="events__popup popup panel flex-column full-width align-start gap-half fill-white shadow"
+	<dialog class="events__popup popup popup--animated panel flex-column full-width align-start gap-half fill-white shadow"
 				style="z-index: 5;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-		<strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Filter by Collection…</strong>
+		<div class="flex align-center full-width gap-half">
+			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.6em 0 0.3em;">
+				<%= icon_tag "filter" %>
+			</span>
+			<strong class="popup__title txt-medium">Collections</strong>
+		</div>
+
 		<%= form_with url: events_path, method: :get, class: "flex flex-column full-width popup__list",
 					data: { controller: "form" } do |form| %>
-			<%= link_to "Show everything", events_path(clear_filter: true), class: "btn popup__item txt-nowrap" %>
+			<%#= link_to "Show everything", events_path(clear_filter: true), class: "btn popup__item txt-nowrap" %>
 			<% @collections.each do |collection| %>
-				<div class="btn popup__item">
-					<%= form.check_box "collection_ids[]", {
-						checked: (params[:collection_ids] || cookies[:collection_filter]&.split(","))&.include?(collection.id.to_s),
-						data: { action: "change->form#submit" },
-						include_hidden: false,
-					}, collection.id %>
+				<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+					<div class="btn txt-xx-small">
+						<%= form.check_box "collection_ids[]", {
+							checked: (params[:collection_ids] || cookies[:collection_filter]&.split(","))&.include?(collection.id.to_s),
+							data: { action: "change->form#submit" },
+							include_hidden: false,
+						}, collection.id %>
 
-					<%= form.label "collection_ids[]", collection.name, for: dom_id(collection, :filter), class: "overflow-ellipsis" %>
-					<%= icon_tag "check", class: "checked flex-item-justify-end" %>
+						<span class="for-screen-reader">
+							Toggle filter for <%= collection.name %>
+						</span>
+						<%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+					</div>
+
+					<%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item flex-item-grow justify-space-between" do %>
+						<span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
+						<span class="translucent"> ›</span>
+					<% end %>
 				</div>
 			<% end %>
 		<% end %>

From 8fec68c34c85f8d5d78c3d8b49754bc1118947cb Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 23:07:06 -0500
Subject: [PATCH 217/413] Remove index columns

---
 app/assets/stylesheets/events.css |  2 --
 app/assets/stylesheets/popup.css  | 10 ++++++++++
 app/views/events/_filter.html.erb |  8 ++++++++
 app/views/events/index.html.erb   | 26 --------------------------
 4 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index e4a74f0d4..845987fb5 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -11,8 +11,6 @@
     --column-gap: clamp(var(--inline-space), 3cqmin, calc(var(--inline-space) * 3));
     --grid-lines: 0.1rem;
 
-    display: grid;
-    grid-template-columns: 1fr 5fr 1fr;
     margin: auto;
   }
 
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 0ffde9dc2..9cf88b064 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -88,6 +88,16 @@
     row-gap: 2px;
   }
 
+  .popup__new {
+    --btn-icon-size: 1em;
+
+    .icon {
+      margin-inline-end: 0.5em;
+    }
+    
+    padding-inline-start: var(--inline-space-half);
+  }
+
   .popup__title {
     font-weight: 800;
   }
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 0b0a41550..5b8f3f253 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -19,6 +19,14 @@
 		<%= form_with url: events_path, method: :get, class: "flex flex-column full-width popup__list",
 					data: { controller: "form" } do |form| %>
 			<%#= link_to "Show everything", events_path(clear_filter: true), class: "btn popup__item txt-nowrap" %>
+			<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+				<%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+					<%= icon_tag "add" %>
+					<span>Add a new collection</span>
+				<% end %>
+			</div>
+			<hr class="full-width separator--horizontal" style="--border-color: transparent;">
+
 			<% @collections.each do |collection| %>
 				<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
 					<div class="btn txt-xx-small">
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 8bcd35e80..ff113b77b 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -17,36 +17,10 @@
 <% end %>
 
 <div class="events__container align-start gap">
-  <div class="txt-align-start">
-    <h2 class="txt-normal txt-uppercase txt-nowrap">Custom views</h2>
-    <div style="border-block-start: 1px solid var(--color-subtle); padding-block-start: var(--block-space-half);">
-      <% @filters.each do |filter| %>
-        <h3 class="txt-small margin-block-end-half txt-tight-lines">
-          <%= link_to filter.summary, cards_path(**filter.as_params) %>
-        </h3>
-      <% end %>
-    </div>
-  </div>
   <div class="flex flex-column">
     <div id="activity" class="events__index flex flex-column">
       <%= render "events/day", activity_day: @activity_day, next_day: @next_day, events: @events %>
     </div>
     <%= event_next_page_link(@next_day) %>
   </div>
-
-  <div class="txt-align-start">
-    <div class="flex align-start gap min-width" >
-      <h2 class="txt-normal txt-uppercase overflow-ellipsis">Collections</h2>
-      <%= link_to new_collection_path, class: "btn txt-xx-small flex-item-justify-end flex-item-no-shrink", style: "view-transition-name: new-collection" do %>
-        <%= icon_tag "add" %>
-        <span class="for-screen-reader">New</span>
-      <% end %>
-    </div>
-
-    <div style="border-block-start: 1px solid var(--color-subtle); padding-block-start: var(--block-space-half);">
-      <% @collections.each do |collection| %>
-        <h3 class="txt-small margin-block-end-half txt-tight-lines"><%= link_to collection.name, cards_path(collection_ids: [ collection ]) %></h3>
-      <% end %>
-    </div>
-  </div>
 </div>

From 14d0b995a8aaadf8afd6e2811ea9069d5ae65de3 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 23:09:29 -0500
Subject: [PATCH 218/413] Fix summary

---
 app/views/cards/display/common/_meta.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index 94c5f477a..9219e44df 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -20,7 +20,8 @@
       Reported by <strong><%= familiar_name_for(card.creator) %></strong>
     </span>
     <span class="card__meta-item card__meta-item--assigned overflow-ellipsis">
-      <%= card.assignees.any? ? card.assignees.map { |assignee| "Assigned to <strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe : "Not assigned" %>
+      <%= card.assignees.any? ? "Assigned to" : "Not assigned" %>
+      <%= card.assignees.map { |assignee| "<strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe %>
     </span>
   </div>
 

From c3cd873588845252775b7a1a0bd3d88a758d0d29 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 10:30:30 +0200
Subject: [PATCH 219/413] Rename collect => create

---
 app/jobs/mention/collect_job.rb       | 7 -------
 app/jobs/mention/create_job.rb        | 7 +++++++
 app/models/concerns/mentions.rb       | 8 ++++----
 test/models/concerns/mentions_test.rb | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 app/jobs/mention/collect_job.rb
 create mode 100644 app/jobs/mention/create_job.rb

diff --git a/app/jobs/mention/collect_job.rb b/app/jobs/mention/collect_job.rb
deleted file mode 100644
index 088e240dd..000000000
--- a/app/jobs/mention/collect_job.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Mention::CollectJob < ApplicationJob
-  queue_as :default
-
-  def perform(record, mentioner:)
-    record.collect_mentions(mentioner:)
-  end
-end
diff --git a/app/jobs/mention/create_job.rb b/app/jobs/mention/create_job.rb
new file mode 100644
index 000000000..364ea1272
--- /dev/null
+++ b/app/jobs/mention/create_job.rb
@@ -0,0 +1,7 @@
+class Mention::CreateJob < ApplicationJob
+  queue_as :default
+
+  def perform(record, mentioner:)
+    record.create_mentions(mentioner:)
+  end
+end
diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 82a9aa093..e7bc3972b 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -4,10 +4,10 @@ module Mentions
   included do
     has_many :mentions, as: :container, dependent: :destroy
     before_save :save_mentionable_content_before_save
-    after_commit :collect_mentions_later, on: %i[ create update ], if: :mentionable_content_changed?
+    after_save_commit :create_mentions_later, if: :mentionable_content_changed?
   end
 
-  def collect_mentions(mentioner: Current.user)
+  def create_mentions(mentioner: Current.user)
     scan_mentionees.each do |mentionee|
       mentionee.mentioned_by mentioner, at: self
     end
@@ -24,8 +24,8 @@ module Mentions
       @mentionable_content_before_safe = self.class.find(id).mentionable_content unless new_record?
     end
 
-    def collect_mentions_later
-      Mention::CollectJob.perform_later(self, mentioner: Current.user)
+    def create_mentions_later
+      Mention::CreateJob.perform_later(self, mentioner: Current.user)
     end
 
     def mentionable_content_changed?
diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb
index 3ed1c4d49..b9e5dc751 100644
--- a/test/models/concerns/mentions_test.rb
+++ b/test/models/concerns/mentions_test.rb
@@ -7,7 +7,7 @@ class MentionsTest < ActiveSupport::TestCase
 
   test "collect mentions on create" do
     assert_difference -> { Mention.count }, +1 do
-      perform_enqueued_jobs only: Mention::CollectJob do
+      perform_enqueued_jobs only: Mention::CreateJob do
         collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?"
       end
     end
@@ -15,7 +15,7 @@ class MentionsTest < ActiveSupport::TestCase
 
   test "collect mentions on update" do
     assert_difference -> { Mention.count }, +1 do
-      perform_enqueued_jobs only: Mention::CollectJob do
+      perform_enqueued_jobs only: Mention::CreateJob do
         cards(:logo).update! description: "Did you finish up with the cleanup, @david?"
       end
     end

From af8701567ab2d80ff7b1307fcf1f156ae0d7e80a Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 10:35:18 +0200
Subject: [PATCH 220/413] Extract method

---
 app/models/concerns/mentions.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index e7bc3972b..b24627672 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -14,12 +14,16 @@ module Mentions
   end
 
   def mentionable_content
-    self.class.reflect_on_all_associations(:has_one).filter { it.klass == ActionText::Markdown }.collect do |association|
+    markdown_associations.collect do |association|
       send(association.name).to_plain_text
     end.join(" ")
   end
 
   private
+    def markdown_associations
+      self.class.reflect_on_all_associations(:has_one).filter { it.klass == ActionText::Markdown }
+    end
+
     def save_mentionable_content_before_save
       @mentionable_content_before_safe = self.class.find(id).mentionable_content unless new_record?
     end

From 68e2e9607657bea5aeb7613bd80e3c5af4a95f0b Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 10:44:42 +0200
Subject: [PATCH 221/413] Fix indentation

---
 app/helpers/notifications_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index b5c802ecf..613776bac 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -46,9 +46,9 @@ module NotificationsHelper
 
   def notification_mark_read_button(notification)
     button_to read_notification_path(notification),
-      class: "notification__unread_indicator btn borderless",
-      title: "Mark as read",
-      data: { turbo_frame: "_top" } do
+        class: "notification__unread_indicator btn borderless",
+        title: "Mark as read",
+        data: { turbo_frame: "_top" } do
       concat(image_tag("remove-med.svg", class: "unread_icon", size: 12, aria: { hidden: true }))
       concat(tag.span("Mark as read", class: "for-screen-reader"))
     end

From b510ca031879dd5829338dbe67df3f4e32e283b6 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 10:56:00 +0200
Subject: [PATCH 222/413] Don't choke for nil values

---
 app/models/concerns/mentions.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index b24627672..35d1a42f8 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -15,8 +15,8 @@ module Mentions
 
   def mentionable_content
     markdown_associations.collect do |association|
-      send(association.name).to_plain_text
-    end.join(" ")
+      send(association.name)&.to_plain_text
+    end.compact.join(" ")
   end
 
   private

From ab54cafd84489cbaa449f7f660ecc63537964988 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 11:06:43 +0200
Subject: [PATCH 223/413] Inline event notifiers

---
 app/models/event.rb                     |  5 ++++-
 app/models/notifier.rb                  |  8 ++++----
 app/models/notifier/event.rb            | 23 +++++++++++++++++++++++
 app/models/notifier/events/assigned.rb  |  6 ------
 app/models/notifier/events/base.rb      | 12 ------------
 app/models/notifier/events/closed.rb    |  2 --
 app/models/notifier/events/commented.rb |  6 ------
 app/models/notifier/events/published.rb |  6 ------
 test/models/notifier_test.rb            |  2 +-
 9 files changed, 32 insertions(+), 38 deletions(-)
 create mode 100644 app/models/notifier/event.rb
 delete mode 100644 app/models/notifier/events/assigned.rb
 delete mode 100644 app/models/notifier/events/base.rb
 delete mode 100644 app/models/notifier/events/closed.rb
 delete mode 100644 app/models/notifier/events/commented.rb
 delete mode 100644 app/models/notifier/events/published.rb

diff --git a/app/models/event.rb b/app/models/event.rb
index 1131bf5e0..5eb095039 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -16,7 +16,10 @@ class Event < ApplicationRecord
     action == "assigned" || initial_assignment?
   end
 
-  # E.g: completed? is true if action == "completed"
+  def action
+    super.inquiry
+  end
+
   def method_missing(method_name, *args, &block)
     if method_name.to_s.end_with?("?")
       action == method_name.to_s.chomp("?")
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index ab63d62ff..651d6898f 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,10 +4,10 @@ class Notifier
   class << self
     def for(source)
       case source
-      when Event
-        "Notifier::Events::#{source.action.classify}".safe_constantize&.new(source)
-      when ::Mention
-        Notifier::Mention.new(source)
+        when ::Event
+          Notifier::Event.new(source)
+        when ::Mention
+          Notifier::Mention.new(source)
       end
     end
   end
diff --git a/app/models/notifier/event.rb b/app/models/notifier/event.rb
new file mode 100644
index 000000000..0893cb7e5
--- /dev/null
+++ b/app/models/notifier/event.rb
@@ -0,0 +1,23 @@
+class Notifier::Event < Notifier
+  delegate :card, :creator, to: :source
+
+  private
+    def resource
+      if source.action.commented?
+        source.comment
+      else
+        card
+      end
+    end
+
+    def recipients
+      case source.action
+        when "assigned"
+          source.assignees.excluding(card.collection.access_only_users)
+        when "published"
+          card.watchers_and_subscribers(include_only_watching: true).without(creator)
+        else
+          card.watchers_and_subscribers.without(creator)
+      end
+    end
+end
diff --git a/app/models/notifier/events/assigned.rb b/app/models/notifier/events/assigned.rb
deleted file mode 100644
index fb106c677..000000000
--- a/app/models/notifier/events/assigned.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Notifier::Events::Assigned < Notifier::Events::Base
-  private
-    def recipients
-      source.assignees.excluding(card.collection.access_only_users)
-    end
-end
diff --git a/app/models/notifier/events/base.rb b/app/models/notifier/events/base.rb
deleted file mode 100644
index 6852ba2b2..000000000
--- a/app/models/notifier/events/base.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class Notifier::Events::Base < Notifier
-  delegate :card, :creator, to: :source
-
-  private
-    def resource
-      card
-    end
-
-    def recipients
-      card.watchers_and_subscribers.without(creator)
-    end
-end
diff --git a/app/models/notifier/events/closed.rb b/app/models/notifier/events/closed.rb
deleted file mode 100644
index 133ca75c8..000000000
--- a/app/models/notifier/events/closed.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Notifier::Events::Closed < Notifier::Events::Base
-end
diff --git a/app/models/notifier/events/commented.rb b/app/models/notifier/events/commented.rb
deleted file mode 100644
index 55497a117..000000000
--- a/app/models/notifier/events/commented.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Notifier::Events::Commented < Notifier::Events::Base
-  private
-    def resource
-      source.comment
-    end
-end
diff --git a/app/models/notifier/events/published.rb b/app/models/notifier/events/published.rb
deleted file mode 100644
index ff30d0219..000000000
--- a/app/models/notifier/events/published.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Notifier::Events::Published < Notifier::Events::Base
-  private
-    def recipients
-      card.watchers_and_subscribers(include_only_watching: true).without(creator)
-    end
-end
diff --git a/test/models/notifier_test.rb b/test/models/notifier_test.rb
index 987ac84f2..e1245a19b 100644
--- a/test/models/notifier_test.rb
+++ b/test/models/notifier_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 class NotifierTest < ActiveSupport::TestCase
   test "for returns the matching notifier class for the event" do
-    assert_kind_of Notifier::Events::Published, Notifier.for(events(:logo_published))
+    assert_kind_of Notifier::Event, Notifier.for(events(:logo_published))
   end
 
   test "generate does not create notifications if the event was system-generated" do

From 8b6cfccdeda507a3269fdeb52e4fbc6ad542563b Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 11:20:33 +0200
Subject: [PATCH 224/413] Rename to clarify usage

---
 app/models/concerns/mentions.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 35d1a42f8..f8784332d 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -3,7 +3,8 @@ module Mentions
 
   included do
     has_many :mentions, as: :container, dependent: :destroy
-    before_save :save_mentionable_content_before_save
+    has_many :mentionees, through: :mentions
+    before_save :remember_mentionable_content_before_save
     after_save_commit :create_mentions_later, if: :mentionable_content_changed?
   end
 
@@ -24,7 +25,7 @@ module Mentions
       self.class.reflect_on_all_associations(:has_one).filter { it.klass == ActionText::Markdown }
     end
 
-    def save_mentionable_content_before_save
+    def remember_mentionable_content_before_save
       @mentionable_content_before_safe = self.class.find(id).mentionable_content unless new_record?
     end
 
@@ -33,7 +34,7 @@ module Mentions
     end
 
     def mentionable_content_changed?
-      @mentionable_content_before_safe != mentionable_content
+      @mentionable_content_before_safe.present? && @mentionable_content_before_safe != mentionable_content
     end
 
     def scan_mentionees

From 8ebb3f2fa9a3f4c1ee4377201ccb9828ec2b964b Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 11:38:34 +0200
Subject: [PATCH 225/413] We need to remember on after_touch so that the
 mechanism triggers when touch-cascading records automatically via
 associations

---
 app/models/concerns/mentions.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index f8784332d..5661c8eca 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -5,6 +5,7 @@ module Mentions
     has_many :mentions, as: :container, dependent: :destroy
     has_many :mentionees, through: :mentions
     before_save :remember_mentionable_content_before_save
+    after_touch :remember_mentionable_content_before_save
     after_save_commit :create_mentions_later, if: :mentionable_content_changed?
   end
 
@@ -26,7 +27,7 @@ module Mentions
     end
 
     def remember_mentionable_content_before_save
-      @mentionable_content_before_safe = self.class.find(id).mentionable_content unless new_record?
+      @mentionable_content_before_save ||= self.class.find(id).mentionable_content unless new_record?
     end
 
     def create_mentions_later
@@ -34,7 +35,7 @@ module Mentions
     end
 
     def mentionable_content_changed?
-      @mentionable_content_before_safe.present? && @mentionable_content_before_safe != mentionable_content
+      new_record? || @mentionable_content_before_save != mentionable_content
     end
 
     def scan_mentionees

From edcc9e32791f9bcffd3449c0461742db182225ea Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 12:38:06 +0200
Subject: [PATCH 226/413] Add mentionees as watchers

---
 app/models/card.rb                  |  6 ++++++
 app/models/card/watchable.rb        |  6 ++++--
 app/models/collection/accessible.rb |  4 ++++
 app/models/comment.rb               |  2 ++
 app/models/mention.rb               |  7 +++++++
 app/models/notifier/event.rb        | 18 ++++++++++++++++--
 app/models/user/accessor.rb         |  4 ++++
 7 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 57ff542da..93eec061c 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -23,6 +23,8 @@ class Card < ApplicationRecord
     end
   end
 
+  delegate :accessible_to?, to: :collection
+
   def title=(new_title)
     self[:title] = new_title.presence || "Untitled"
   end
@@ -30,4 +32,8 @@ class Card < ApplicationRecord
   def cache_key
     [ super, collection.name ].compact.join("/")
   end
+
+  def was_mentioned(mention)
+    watch_by(mention.mentionee)
+  end
 end
diff --git a/app/models/card/watchable.rb b/app/models/card/watchable.rb
index f511ddc7e..94e5e27d9 100644
--- a/app/models/card/watchable.rb
+++ b/app/models/card/watchable.rb
@@ -13,7 +13,9 @@ module Card::Watchable
   end
 
   def watch_by(user)
-    watches.where(user: user).first_or_create.update!(watching: true)
+    if accessible_to?(user)
+      watches.where(user: user).first_or_create.update!(watching: true)
+    end
   end
 
   def unwatch_by(user)
@@ -21,7 +23,7 @@ module Card::Watchable
   end
 
   def watchers_and_subscribers(include_only_watching: false)
-    involvements = include_only_watching ? [ :watching, :everything ] : :everything
+    involvements = include_only_watching ? [:watching, :everything] : :everything
     subscribers = collection.users.where(accesses: { involvement: involvements })
 
     User.where(id: subscribers.pluck(:id) +
diff --git a/app/models/collection/accessible.rb b/app/models/collection/accessible.rb
index fc99cc217..1436a4d1b 100644
--- a/app/models/collection/accessible.rb
+++ b/app/models/collection/accessible.rb
@@ -32,6 +32,10 @@ module Collection::Accessible
     accesses.find_by(user: user)
   end
 
+  def accessible_to?(user)
+    access_for(user).present?
+  end
+
   private
     def grant_access_to_everyone
       accesses.grant_to(User.all) if all_access_previously_changed?(to: true)
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 630589e41..9b3fd2704 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -13,6 +13,8 @@ class Comment < ApplicationRecord
   after_create_commit :watch_card_by_creator, :track_commented_card
   after_destroy_commit :cleanup_events
 
+  delegate :watch_by, to: :card
+
   def to_partial_path
     "cards/#{super}"
   end
diff --git a/app/models/mention.rb b/app/models/mention.rb
index fd70e075a..2534eb631 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -5,7 +5,14 @@ class Mention < ApplicationRecord
   belongs_to :mentioner, class_name: "User"
   belongs_to :mentionee, class_name: "User", inverse_of: :mentions
 
+  after_create :add_mentionee_as_watcher
+
   def self_mention?
     mentioner == mentionee
   end
+
+  private
+    def add_mentionee_as_watcher
+      container.watch_by(mentionee)
+    end
 end
diff --git a/app/models/notifier/event.rb b/app/models/notifier/event.rb
index 0893cb7e5..7374763e2 100644
--- a/app/models/notifier/event.rb
+++ b/app/models/notifier/event.rb
@@ -1,5 +1,6 @@
 class Notifier::Event < Notifier
   delegate :card, :creator, to: :source
+  delegate :watchers_and_subscribers, to: :card
 
   private
     def resource
@@ -15,9 +16,22 @@ class Notifier::Event < Notifier
         when "assigned"
           source.assignees.excluding(card.collection.access_only_users)
         when "published"
-          card.watchers_and_subscribers(include_only_watching: true).without(creator)
+          watchers_and_subscribers(include_only_watching: true).without(creator, *mentionees)
+        when "commented"
+          watchers_and_subscribers.without(creator, *mentionees)
         else
-          card.watchers_and_subscribers.without(creator)
+          watchers_and_subscribers.without(creator)
+      end
+    end
+
+    def mentionees
+      case source.action
+        when "published"
+          source.card.mentionees
+        when "commented"
+          source.comment.mentionees
+        else
+          []
       end
     end
 end
diff --git a/app/models/user/accessor.rb b/app/models/user/accessor.rb
index 89534b777..ebf5dde59 100644
--- a/app/models/user/accessor.rb
+++ b/app/models/user/accessor.rb
@@ -9,6 +9,10 @@ module User::Accessor
     after_create_commit :grant_access_to_collections
   end
 
+  def can_access_card?(card)
+    card.collection.accessible_to?(self)
+  end
+
   private
     def grant_access_to_collections
       Access.insert_all Collection.all_access.pluck(:id).collect { |collection_id| { collection_id: collection_id, user_id: id } }

From 755c9b45c7fa26cce2ab64b25076045c64550492 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 12:38:33 +0200
Subject: [PATCH 227/413] Rename and fix problem where after_touch was
 overriding the saved content

---
 app/models/concerns/mentions.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 5661c8eca..883ebc40a 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -4,8 +4,8 @@ module Mentions
   included do
     has_many :mentions, as: :container, dependent: :destroy
     has_many :mentionees, through: :mentions
-    before_save :remember_mentionable_content_before_save
-    after_touch :remember_mentionable_content_before_save
+    before_save :remember_mentionable_content
+    after_touch :remember_mentionable_content
     after_save_commit :create_mentions_later, if: :mentionable_content_changed?
   end
 
@@ -26,8 +26,8 @@ module Mentions
       self.class.reflect_on_all_associations(:has_one).filter { it.klass == ActionText::Markdown }
     end
 
-    def remember_mentionable_content_before_save
-      @mentionable_content_before_save ||= self.class.find(id).mentionable_content unless new_record?
+    def remember_mentionable_content
+      @mentionable_content_before_save ||= self.class.find(id).mentionable_content if id && !previously_new_record?
     end
 
     def create_mentions_later
@@ -35,7 +35,8 @@ module Mentions
     end
 
     def mentionable_content_changed?
-      new_record? || @mentionable_content_before_save != mentionable_content
+      puts "Was #{previously_new_record?}"
+      previously_new_record? || @mentionable_content_before_save != mentionable_content
     end
 
     def scan_mentionees

From 2e3ffcfb9dac08fbf9157d898b3aaef1e5f6d2d4 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 12:44:36 +0200
Subject: [PATCH 228/413] Remove identation

---
 app/models/notifier.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 651d6898f..00c5bbdda 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,10 +4,10 @@ class Notifier
   class << self
     def for(source)
       case source
-        when ::Event
-          Notifier::Event.new(source)
-        when ::Mention
-          Notifier::Mention.new(source)
+      when ::Event
+        Notifier::Event.new(source)
+      when ::Mention
+        Notifier::Mention.new(source)
       end
     end
   end

From 043230394eae9abec32ddba03039d1e2f6f8d15f Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 13:08:00 +0200
Subject: [PATCH 229/413] Tidy up event helper code

Also, revert to using a helper method to determine the event action, since this is purely a view concern. Keep method at the event model to identify initial assignments.
---
 app/helpers/notifications_helper.rb | 36 ++++++++++++++++++-----------
 app/models/concerns/mentions.rb     |  1 -
 app/models/event.rb                 | 19 +++------------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 613776bac..cc63fb5d5 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,25 +1,20 @@
 module NotificationsHelper
   def event_notification_title(event)
-    if event.commented?
-      "RE: " + event.card.title
-    elsif event.assigned?
-      "Assigned to you: " + event.card.title
-    else
-      event.card.title
+    case event_notification_action(event)
+      when "commented" then "RE: " + event.card.title
+      when "assigned" then "Assigned to you: " + event.card.title
+      else event.card.title
     end
   end
 
   def event_notification_body(event)
     name = event.creator.name
 
-    if event.closed?
-      "Closed by #{name}"
-    elsif event.published?
-      "Added by #{name}"
-    elsif event.commented?
-      "#{strip_tags(event.comment.body_html).blank? ? "#{name} replied" : "#{event.creator.name}:" } #{strip_tags(event.comment.body_html).truncate(200)}"
-    else
-      name
+    case event_notification_action(event)
+      when "closed" then "Closed by #{name}"
+      when "published" then "Added by #{name}"
+      when "commented" then comment_notification_body(event)
+      else name
     end
   end
 
@@ -59,4 +54,17 @@ module NotificationsHelper
       tag.div id: "next_page", data: { controller: "fetch-on-visible", fetch_on_visible_url_value: notifications_path(page: @page.next_param) }
     end
   end
+
+  private
+    def event_notification_action(event)
+      if event.initial_assignment?
+        "assigned"
+      else
+        event.action
+      end
+    end
+
+    def comment_notification_body(event)
+      "#{strip_tags(event.comment.body_html).blank? ? "#{name} replied" : "#{event.creator.name}:" } #{strip_tags(event.comment.body_html).truncate(200)}"
+    end
 end
diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 883ebc40a..41a818794 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -35,7 +35,6 @@ module Mentions
     end
 
     def mentionable_content_changed?
-      puts "Was #{previously_new_record?}"
       previously_new_record? || @mentionable_content_before_save != mentionable_content
     end
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 5eb095039..f95dc0785 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -12,24 +12,11 @@ class Event < ApplicationRecord
 
   after_create -> { card.touch(:last_active_at) }
 
-  def assigned?
-    action == "assigned" || initial_assignment?
-  end
-
   def action
-    super.inquiry
+    super&.inquiry
   end
 
-  def method_missing(method_name, *args, &block)
-    if method_name.to_s.end_with?("?")
-      action == method_name.to_s.chomp("?")
-    else
-      super
-    end
+  def initial_assignment?
+    action == "published" && card.assigned_to?(creator)
   end
-
-  private
-    def initial_assignment?
-      action == "published" && card.assigned_to?(creator)
-    end
 end

From 7c0aff06805f1bf668210fbb982d70efed1eafdb Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 13:36:39 +0200
Subject: [PATCH 230/413] Don't indent case

---
 app/helpers/notifications_helper.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index cc63fb5d5..7ed4813aa 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,9 +1,9 @@
 module NotificationsHelper
   def event_notification_title(event)
     case event_notification_action(event)
-      when "commented" then "RE: " + event.card.title
-      when "assigned" then "Assigned to you: " + event.card.title
-      else event.card.title
+    when "commented" then "RE: " + event.card.title
+    when "assigned" then "Assigned to you: " + event.card.title
+    else event.card.title
     end
   end
 
@@ -11,10 +11,10 @@ module NotificationsHelper
     name = event.creator.name
 
     case event_notification_action(event)
-      when "closed" then "Closed by #{name}"
-      when "published" then "Added by #{name}"
-      when "commented" then comment_notification_body(event)
-      else name
+    when "closed" then "Closed by #{name}"
+    when "published" then "Added by #{name}"
+    when "commented" then comment_notification_body(event)
+    else name
     end
   end
 

From 696732a90a63a716beba5a862f94bededd3dc3b7 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 13:41:34 +0200
Subject: [PATCH 231/413] Rename mentions' container => source

---
 app/models/concerns/mentions.rb               |  2 +-
 app/models/mention.rb                         |  4 +-
 app/models/notifier/mention.rb                | 10 +++--
 app/models/user/mentionable.rb                |  2 +-
 .../notification/_mention.html.erb            |  2 +-
 db/migrate/20250421120008_create_mentions.rb  |  2 +-
 db/schema.rb                                  |  6 +--
 db/schema_cache.yml                           | 43 ++++++++-----------
 8 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 41a818794..9e00ed3f7 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -2,7 +2,7 @@ module Mentions
   extend ActiveSupport::Concern
 
   included do
-    has_many :mentions, as: :container, dependent: :destroy
+    has_many :mentions, as: :source, dependent: :destroy
     has_many :mentionees, through: :mentions
     before_save :remember_mentionable_content
     after_touch :remember_mentionable_content
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 2534eb631..2c6c95750 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -1,7 +1,7 @@
 class Mention < ApplicationRecord
   include Notifiable
 
-  belongs_to :container, polymorphic: true
+  belongs_to :source, polymorphic: true
   belongs_to :mentioner, class_name: "User"
   belongs_to :mentionee, class_name: "User", inverse_of: :mentions
 
@@ -13,6 +13,6 @@ class Mention < ApplicationRecord
 
   private
     def add_mentionee_as_watcher
-      container.watch_by(mentionee)
+      source.watch_by(mentionee)
     end
 end
diff --git a/app/models/notifier/mention.rb b/app/models/notifier/mention.rb
index 2085c42ed..ac1a3d413 100644
--- a/app/models/notifier/mention.rb
+++ b/app/models/notifier/mention.rb
@@ -1,18 +1,20 @@
 class Notifier::Mention < Notifier
+  alias mention source
+
   private
     def resource
-      source.container
+      mention.source
     end
 
     def recipients
-      if source.self_mention?
+      if mention.self_mention?
         []
       else
-        [ source.mentionee ]
+        [ mention.mentionee ]
       end
     end
 
     def creator
-      source.mentioner
+      mention.mentioner
     end
 end
diff --git a/app/models/user/mentionable.rb b/app/models/user/mentionable.rb
index e3e5a9dbf..ab1906659 100644
--- a/app/models/user/mentionable.rb
+++ b/app/models/user/mentionable.rb
@@ -6,7 +6,7 @@ module User::Mentionable
   end
 
   def mentioned_by(mentioner, at:)
-    mentions.create! container: at, mentioner: mentioner
+    mentions.create! source: at, mentioner: mentioner
   end
 
   def mentionable_handles
diff --git a/app/views/notifications/notification/_mention.html.erb b/app/views/notifications/notification/_mention.html.erb
index 96abde715..7ed8ffdc5 100644
--- a/app/views/notifications/notification/_mention.html.erb
+++ b/app/views/notifications/notification/_mention.html.erb
@@ -2,6 +2,6 @@
 
 <strong class="overflow-ellipsis notification__title txt-small txt-tight-lines"><%= mention.mentioner.first_name %> mentioned you</strong>
 <div class="overflow-ellipsis txt-small txt-tight-lines">
-  <%= mention.container.mentionable_content.truncate(200) %>
+  <%= mention.source.mentionable_content.truncate(200) %>
 </div>
 <div class="tray__item-meta overflow-ellipsis translucent"> <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
diff --git a/db/migrate/20250421120008_create_mentions.rb b/db/migrate/20250421120008_create_mentions.rb
index da4923950..db27f7b2c 100644
--- a/db/migrate/20250421120008_create_mentions.rb
+++ b/db/migrate/20250421120008_create_mentions.rb
@@ -1,7 +1,7 @@
 class CreateMentions < ActiveRecord::Migration[8.1]
   def change
     create_table :mentions do |t|
-      t.references :container, polymorphic: true, null: false, index: true
+      t.references :source, polymorphic: true, null: false, index: true
       t.references :mentionee, foreign_key: { to_table: :users }, null: false
       t.references :mentioner, foreign_key: { to_table: :users }, null: false
 
diff --git a/db/schema.rb b/db/schema.rb
index 2dbc1c529..49b1827d2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -213,15 +213,15 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_112857) do
   end
 
   create_table "mentions", force: :cascade do |t|
-    t.integer "container_id", null: false
-    t.string "container_type", null: false
     t.datetime "created_at", null: false
     t.integer "mentionee_id", null: false
     t.integer "mentioner_id", null: false
+    t.integer "source_id", null: false
+    t.string "source_type", null: false
     t.datetime "updated_at", null: false
-    t.index ["container_type", "container_id"], name: "index_mentions_on_container"
     t.index ["mentionee_id"], name: "index_mentions_on_mentionee_id"
     t.index ["mentioner_id"], name: "index_mentions_on_mentioner_id"
+    t.index ["source_type", "source_id"], name: "index_mentions_on_source"
   end
 
   create_table "messages", force: :cascade do |t|
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index eb67d0f45..dc7cfae88 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -374,7 +374,7 @@ columns:
   - *9
   cards:
   - *5
-  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &31 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: title
     cast_type: *6
@@ -494,11 +494,11 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: all_access
-    cast_type: &31 !ruby/object:ActiveModel::Type::Boolean
+    cast_type: &32 !ruby/object:ActiveModel::Type::Boolean
       precision:
       scale:
       limit:
-    sql_type_metadata: &32 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &33 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: boolean
       type: :boolean
       limit:
@@ -627,7 +627,7 @@ columns:
     comment:
   filters_tags:
   - *18
-  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: tag_id
     cast_type: *1
@@ -639,9 +639,9 @@ columns:
     comment:
   mentions:
   - *5
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: container_type
+    name: source_type
     cast_type: *6
     sql_type_metadata: *7
     'null': false
@@ -651,7 +651,7 @@ columns:
     comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: container_id
+    name: source_id
     cast_type: *1
     sql_type_metadata: *2
     'null': false
@@ -741,16 +741,7 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: source_type
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
+  - *29
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: source_id
@@ -860,12 +851,12 @@ columns:
   taggings:
   - *5
   - *21
-  - *29
+  - *30
   - *8
   - *9
   tags:
   - *5
-  - *30
+  - *31
   - *8
   - *9
   users:
@@ -894,8 +885,8 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: active
-    cast_type: *31
-    sql_type_metadata: *32
+    cast_type: *32
+    sql_type_metadata: *33
     'null': false
     default: true
     default_function:
@@ -920,8 +911,8 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: watching
-    cast_type: *31
-    sql_type_metadata: *32
+    cast_type: *32
+    sql_type_metadata: *33
     'null': false
     default: true
     default_function:
@@ -1698,11 +1689,11 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: mentions
-    name: index_mentions_on_container
+    name: index_mentions_on_source
     unique: false
     columns:
-    - container_type
-    - container_id
+    - source_type
+    - source_id
     lengths: {}
     orders: {}
     opclasses: {}

From 2eae58725ad965849a6df8339a9a2cde26a19d04 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 13:52:47 +0200
Subject: [PATCH 232/413] Remove notifications' resource relationship

Is confusing since "source" already captures the origin of the notifications. It's
needed to interpret things at rendering time, so we can query things as needed there.
---
 app/helpers/notifications_helper.rb           |  8 ++--
 app/models/notification.rb                    |  1 -
 app/models/notifier.rb                        |  2 +-
 app/models/notifier/event.rb                  |  8 ----
 app/models/notifier/mention.rb                |  4 --
 ...423114737_remove_notification_resources.rb |  5 +++
 db/schema.rb                                  |  5 +--
 db/schema_cache.yml                           | 39 +------------------
 test/fixtures/notifications.yml               |  3 --
 test/models/notifier_test.rb                  |  2 +-
 10 files changed, 13 insertions(+), 64 deletions(-)
 create mode 100644 db/migrate/20250423114737_remove_notification_resources.rb

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 7ed4813aa..3e06682ef 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -31,11 +31,11 @@ module NotificationsHelper
   end
 
   def notification_resource_path(notification)
-    if notification.resource.is_a?(Comment)
-      # TODO: Extract a direct path for these
-      collection_card_path(notification.resource.card.collection, notification.resource.card, anchor: "comment_#{notification.resource.id}")
+    if notification.source.action.commented?
+      card  = notification.source.card
+      collection_card_path(card.collection, card, anchor: "comment_#{notification.source.comment.id}")
     else
-      notification.resource
+      notification.source.card
     end
   end
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 301843987..1b1c91b5c 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -2,7 +2,6 @@ class Notification < ApplicationRecord
   belongs_to :user
   belongs_to :creator, class_name: "User"
   belongs_to :source, polymorphic: true
-  belongs_to :resource, polymorphic: true
 
   scope :unread, -> { where(read_at: nil) }
   scope :read, -> { where.not(read_at: nil) }
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 00c5bbdda..8b0b9d2ce 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -15,7 +15,7 @@ class Notifier
   def notify
     if should_notify?
       recipients.map do |recipient|
-        Notification.create! user: recipient, source: source, resource: resource, creator: creator
+        Notification.create! user: recipient, source: source, creator: creator
       end
     end
   end
diff --git a/app/models/notifier/event.rb b/app/models/notifier/event.rb
index 7374763e2..f5db7c146 100644
--- a/app/models/notifier/event.rb
+++ b/app/models/notifier/event.rb
@@ -3,14 +3,6 @@ class Notifier::Event < Notifier
   delegate :watchers_and_subscribers, to: :card
 
   private
-    def resource
-      if source.action.commented?
-        source.comment
-      else
-        card
-      end
-    end
-
     def recipients
       case source.action
         when "assigned"
diff --git a/app/models/notifier/mention.rb b/app/models/notifier/mention.rb
index ac1a3d413..feea686f4 100644
--- a/app/models/notifier/mention.rb
+++ b/app/models/notifier/mention.rb
@@ -2,10 +2,6 @@ class Notifier::Mention < Notifier
   alias mention source
 
   private
-    def resource
-      mention.source
-    end
-
     def recipients
       if mention.self_mention?
         []
diff --git a/db/migrate/20250423114737_remove_notification_resources.rb b/db/migrate/20250423114737_remove_notification_resources.rb
new file mode 100644
index 000000000..6c19062f7
--- /dev/null
+++ b/db/migrate/20250423114737_remove_notification_resources.rb
@@ -0,0 +1,5 @@
+class RemoveNotificationResources < ActiveRecord::Migration[8.1]
+  def change
+    remove_reference :notifications, :resource, polymorphic: true, index: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 49b1827d2..595cf2346 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_22_112857) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_23_114737) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -238,14 +238,11 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_22_112857) do
     t.datetime "created_at", null: false
     t.integer "creator_id"
     t.datetime "read_at"
-    t.integer "resource_id", null: false
-    t.string "resource_type", null: false
     t.integer "source_id"
     t.string "source_type", null: false
     t.datetime "updated_at", null: false
     t.integer "user_id", null: false
     t.index ["creator_id"], name: "index_notifications_on_creator_id"
-    t.index ["resource_type", "resource_id"], name: "index_notifications_on_resource"
     t.index ["source_type", "source_id"], name: "index_notifications_on_source"
     t.index ["user_id", "read_at", "created_at"], name: "index_notifications_on_user_id_and_read_at_and_created_at", order: { read_at: :desc, created_at: :desc }
     t.index ["user_id"], name: "index_notifications_on_user_id"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index dc7cfae88..9e58a9422 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -709,26 +709,6 @@ columns:
   notifications:
   - *5
   - *28
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: resource_type
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: resource_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   - *8
   - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -1792,23 +1772,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: notifications
-    name: index_notifications_on_resource
-    unique: false
-    columns:
-    - resource_type
-    - resource_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
     name: index_notifications_on_user_id
@@ -2045,4 +2008,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250422112857
+version: 20250423114737
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index db6574038..bea0e4d33 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -1,20 +1,17 @@
 logo_published_kevin:
   user: kevin
   source: logo_published (Event)
-  resource: logo (Card)
   created_at: <%= 1.week.ago %>
   creator: david
 
 logo_assignment_kevin:
   user: kevin
   source: logo_assignment_km (Event)
-  resource: logo (Card)
   created_at: <%= 1.week.ago %>
   creator: david
 
 layout_commented_kevin:
   user: kevin
   source: layout_commented (Event)
-  resource: layout_overflowing_david (Comment)
   created_at: <%= 1.week.ago %>
   creator: david
diff --git a/test/models/notifier_test.rb b/test/models/notifier_test.rb
index e1245a19b..8dc9c8afe 100644
--- a/test/models/notifier_test.rb
+++ b/test/models/notifier_test.rb
@@ -43,7 +43,7 @@ class NotifierTest < ActiveSupport::TestCase
   test "links to the card" do
     Notifier.for(events(:logo_published)).notify
 
-    assert_equal cards(:logo), Notification.last.resource
+    assert_equal cards(:logo), Notification.last.source.card
   end
 
   test "assignment events only create a notification for the assignee" do

From 07d3447e7e62e3ddaecac4da1c2d60c50ea642d0 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 14:29:13 +0200
Subject: [PATCH 233/413] Resolve notifications URLs

---
 app/helpers/notifications_helper.rb | 11 +----------
 config/routes.rb                    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 3e06682ef..4568ad82a 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -21,7 +21,7 @@ module NotificationsHelper
   def notification_tag(notification, &)
     tag.div id: dom_id(notification), class: "notification tray__item border-radius txt-normal" do
       concat(
-        link_to(notification_resource_path(notification),
+        link_to(notification,
           class: "notification__content border-radius shadow fill-white flex align-start txt-align-start gap flex-item-grow max-width border txt-ink",
           data: { action: "click->dialog#close", turbo_frame: "_top" },
           &)
@@ -30,15 +30,6 @@ module NotificationsHelper
     end
   end
 
-  def notification_resource_path(notification)
-    if notification.source.action.commented?
-      card  = notification.source.card
-      collection_card_path(card.collection, card, anchor: "comment_#{notification.source.comment.id}")
-    else
-      notification.source.card
-    end
-  end
-
   def notification_mark_read_button(notification)
     button_to read_notification_path(notification),
         class: "notification__unread_indicator btn borderless",
diff --git a/config/routes.rb b/config/routes.rb
index 61271338a..5ff480121 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -103,6 +103,23 @@ Rails.application.routes.draw do
     route_for :collection_card, comment.card.collection, comment.card, options
   end
 
+  resolve "Mention" do |mention, options|
+    polymorphic_path(mention.source, options)
+  end
+
+  resolve "Notification" do |notification, options|
+    source = if notification.source.is_a?(Event)
+      if notification.source.action.commented?
+        notification.source.comment
+      else
+        notification.source.card
+      end
+    else
+      notification.source
+    end
+
+    polymorphic_path(source, options)
+  end
 
   get "up", to: "rails/health#show", as: :rails_health_check
   get "manifest" => "rails/pwa#manifest", as: :pwa_manifest

From ab73417e7393bbdcb06ff7a14c6f0f0788466e74 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 14:30:09 +0200
Subject: [PATCH 234/413] Leverage existing resolve route for comments

---
 app/views/cards/comments/_comment.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
index 2881ee438..55aa89459 100644
--- a/app/views/cards/comments/_comment.html.erb
+++ b/app/views/cards/comments/_comment.html.erb
@@ -11,7 +11,7 @@
             <%= link_to comment.creator.name, comment.creator, class: "txt-ink btn btn--plain fill-transparent", data: { turbo_frame: "_top" } %>
           </strong>
 
-          <%= link_to collection_card_path(comment.card.collection, comment.card, anchor: "comment_#{comment.id}"), class: "txt-undecorated txt-uppercase" do %>
+          <%= link_to comment, class: "txt-undecorated txt-uppercase" do %>
             <%= local_datetime_tag comment.created_at, style: :shortdate, class: "txt-ink translucent" %>
           <% end %>
 

From dc5f64ab30175ee431cbde21554125eef845b45f Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 14:37:09 +0200
Subject: [PATCH 235/413] Remove redundant default queue declaration

---
 app/jobs/card/auto_close_all_due_job.rb            | 2 --
 app/jobs/card/auto_reconsider_all_stagnated_job.rb | 2 --
 app/jobs/mention/create_job.rb                     | 2 --
 app/jobs/notify_recipients_job.rb                  | 2 --
 app/jobs/remove_abandoned_creations_job.rb         | 2 --
 5 files changed, 10 deletions(-)

diff --git a/app/jobs/card/auto_close_all_due_job.rb b/app/jobs/card/auto_close_all_due_job.rb
index 6cb4f646b..d964dae23 100644
--- a/app/jobs/card/auto_close_all_due_job.rb
+++ b/app/jobs/card/auto_close_all_due_job.rb
@@ -1,6 +1,4 @@
 class Card::AutoCloseAllDueJob < ApplicationJob
-  queue_as :default
-
   def perform
     ApplicationRecord.with_each_tenant do |tenant|
       Card.auto_close_all_due
diff --git a/app/jobs/card/auto_reconsider_all_stagnated_job.rb b/app/jobs/card/auto_reconsider_all_stagnated_job.rb
index 83f87a648..b7178f916 100644
--- a/app/jobs/card/auto_reconsider_all_stagnated_job.rb
+++ b/app/jobs/card/auto_reconsider_all_stagnated_job.rb
@@ -1,6 +1,4 @@
 class Card::AutoReconsiderAllStagnatedJob < ApplicationJob
-  queue_as :default
-
   def perform
     ApplicationRecord.with_each_tenant do |tenant|
       Card.auto_reconsider_all_stagnated
diff --git a/app/jobs/mention/create_job.rb b/app/jobs/mention/create_job.rb
index 364ea1272..816782754 100644
--- a/app/jobs/mention/create_job.rb
+++ b/app/jobs/mention/create_job.rb
@@ -1,6 +1,4 @@
 class Mention::CreateJob < ApplicationJob
-  queue_as :default
-
   def perform(record, mentioner:)
     record.create_mentions(mentioner:)
   end
diff --git a/app/jobs/notify_recipients_job.rb b/app/jobs/notify_recipients_job.rb
index 2f14c2e96..6083622fd 100644
--- a/app/jobs/notify_recipients_job.rb
+++ b/app/jobs/notify_recipients_job.rb
@@ -1,6 +1,4 @@
 class NotifyRecipientsJob < ApplicationJob
-  queue_as :default
-
   def perform(notifiable)
     notifiable.notify_recipients
   end
diff --git a/app/jobs/remove_abandoned_creations_job.rb b/app/jobs/remove_abandoned_creations_job.rb
index 1444313a2..6ca63169d 100644
--- a/app/jobs/remove_abandoned_creations_job.rb
+++ b/app/jobs/remove_abandoned_creations_job.rb
@@ -1,6 +1,4 @@
 class RemoveAbandonedCreationsJob < ApplicationJob
-  queue_as :default
-
   def perform
     ApplicationRecord.with_each_tenant do |tenant|
       Card.remove_abandoned_creations

From f43629f84926e67bbb323c8a5d5b841f49b1ff38 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 14:39:10 +0200
Subject: [PATCH 236/413] Format

---
 app/models/card/watchable.rb |  2 +-
 app/models/notifier/event.rb | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/card/watchable.rb b/app/models/card/watchable.rb
index 94e5e27d9..8e719f756 100644
--- a/app/models/card/watchable.rb
+++ b/app/models/card/watchable.rb
@@ -23,7 +23,7 @@ module Card::Watchable
   end
 
   def watchers_and_subscribers(include_only_watching: false)
-    involvements = include_only_watching ? [:watching, :everything] : :everything
+    involvements = include_only_watching ? [ :watching, :everything ] : :everything
     subscribers = collection.users.where(accesses: { involvement: involvements })
 
     User.where(id: subscribers.pluck(:id) +
diff --git a/app/models/notifier/event.rb b/app/models/notifier/event.rb
index f5db7c146..a98835f5b 100644
--- a/app/models/notifier/event.rb
+++ b/app/models/notifier/event.rb
@@ -5,24 +5,24 @@ class Notifier::Event < Notifier
   private
     def recipients
       case source.action
-        when "assigned"
+      when "assigned"
           source.assignees.excluding(card.collection.access_only_users)
-        when "published"
+      when "published"
           watchers_and_subscribers(include_only_watching: true).without(creator, *mentionees)
-        when "commented"
+      when "commented"
           watchers_and_subscribers.without(creator, *mentionees)
-        else
+      else
           watchers_and_subscribers.without(creator)
       end
     end
 
     def mentionees
       case source.action
-        when "published"
+      when "published"
           source.card.mentionees
-        when "commented"
+      when "commented"
           source.comment.mentionees
-        else
+      else
           []
       end
     end

From e446080367dc39684967ee3022c23cbc90110198 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 14:45:44 +0200
Subject: [PATCH 237/413] Don't create duplicated mentions

E.g: when editing a comment or description with a mention
---
 app/models/user/mentionable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user/mentionable.rb b/app/models/user/mentionable.rb
index ab1906659..7a930ab02 100644
--- a/app/models/user/mentionable.rb
+++ b/app/models/user/mentionable.rb
@@ -6,7 +6,7 @@ module User::Mentionable
   end
 
   def mentioned_by(mentioner, at:)
-    mentions.create! source: at, mentioner: mentioner
+    mentions.find_or_create_by! source: at, mentioner: mentioner
   end
 
   def mentionable_handles

From 469fb9f04979db6cb90a00cbea4d6e70cb733e17 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:02:31 +0200
Subject: [PATCH 238/413] Simplify the logic to determine action text changes

---
 app/models/concerns/mentions.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 9e00ed3f7..fde4e8ca1 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -4,8 +4,6 @@ module Mentions
   included do
     has_many :mentions, as: :source, dependent: :destroy
     has_many :mentionees, through: :mentions
-    before_save :remember_mentionable_content
-    after_touch :remember_mentionable_content
     after_save_commit :create_mentions_later, if: :mentionable_content_changed?
   end
 
@@ -26,18 +24,14 @@ module Mentions
       self.class.reflect_on_all_associations(:has_one).filter { it.klass == ActionText::Markdown }
     end
 
-    def remember_mentionable_content
-      @mentionable_content_before_save ||= self.class.find(id).mentionable_content if id && !previously_new_record?
+    def mentionable_content_changed?
+      markdown_associations.any? { send(it.name).content_previously_changed? }
     end
 
     def create_mentions_later
       Mention::CreateJob.perform_later(self, mentioner: Current.user)
     end
 
-    def mentionable_content_changed?
-      previously_new_record? || @mentionable_content_before_save != mentionable_content
-    end
-
     def scan_mentionees
       scan_mentioned_handles.filter_map do |mention|
         mentionable_users.find { |user| user.mentionable_handles.include?(mention) }

From 6ff9f7a154347df72493b84963452b846327259e Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:07:02 +0200
Subject: [PATCH 239/413] Fix identation

---
 app/models/notifier/event.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/notifier/event.rb b/app/models/notifier/event.rb
index a98835f5b..fb32d4178 100644
--- a/app/models/notifier/event.rb
+++ b/app/models/notifier/event.rb
@@ -6,24 +6,24 @@ class Notifier::Event < Notifier
     def recipients
       case source.action
       when "assigned"
-          source.assignees.excluding(card.collection.access_only_users)
+        source.assignees.excluding(card.collection.access_only_users)
       when "published"
-          watchers_and_subscribers(include_only_watching: true).without(creator, *mentionees)
+        watchers_and_subscribers(include_only_watching: true).without(creator, *mentionees)
       when "commented"
-          watchers_and_subscribers.without(creator, *mentionees)
+        watchers_and_subscribers.without(creator, *mentionees)
       else
-          watchers_and_subscribers.without(creator)
+        watchers_and_subscribers.without(creator)
       end
     end
 
     def mentionees
       case source.action
       when "published"
-          source.card.mentionees
+        source.card.mentionees
       when "commented"
-          source.comment.mentionees
+        source.comment.mentionees
       else
-          []
+        []
       end
     end
 end

From a9df2d48d11f028963504f2b3945e8e9a18d8388 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:17:51 +0200
Subject: [PATCH 240/413] Remove delegate

---
 app/models/card.rb           | 2 --
 app/models/card/watchable.rb | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 93eec061c..808ff9467 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -23,8 +23,6 @@ class Card < ApplicationRecord
     end
   end
 
-  delegate :accessible_to?, to: :collection
-
   def title=(new_title)
     self[:title] = new_title.presence || "Untitled"
   end
diff --git a/app/models/card/watchable.rb b/app/models/card/watchable.rb
index 8e719f756..8c5a3696b 100644
--- a/app/models/card/watchable.rb
+++ b/app/models/card/watchable.rb
@@ -13,7 +13,7 @@ module Card::Watchable
   end
 
   def watch_by(user)
-    if accessible_to?(user)
+    if collection.accessible_to?(user)
       watches.where(user: user).first_or_create.update!(watching: true)
     end
   end

From ad58de9e764dbcc6d4a185d9d384846540296a7c Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:22:18 +0200
Subject: [PATCH 241/413] Remove access checks when watching

https://github.com/basecamp/fizzy/pull/425#discussion_r2056039581
---
 app/models/card/watchable.rb        | 4 +---
 app/models/collection/accessible.rb | 4 ----
 app/models/user/accessor.rb         | 4 ----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/models/card/watchable.rb b/app/models/card/watchable.rb
index 8c5a3696b..f511ddc7e 100644
--- a/app/models/card/watchable.rb
+++ b/app/models/card/watchable.rb
@@ -13,9 +13,7 @@ module Card::Watchable
   end
 
   def watch_by(user)
-    if collection.accessible_to?(user)
-      watches.where(user: user).first_or_create.update!(watching: true)
-    end
+    watches.where(user: user).first_or_create.update!(watching: true)
   end
 
   def unwatch_by(user)
diff --git a/app/models/collection/accessible.rb b/app/models/collection/accessible.rb
index 1436a4d1b..fc99cc217 100644
--- a/app/models/collection/accessible.rb
+++ b/app/models/collection/accessible.rb
@@ -32,10 +32,6 @@ module Collection::Accessible
     accesses.find_by(user: user)
   end
 
-  def accessible_to?(user)
-    access_for(user).present?
-  end
-
   private
     def grant_access_to_everyone
       accesses.grant_to(User.all) if all_access_previously_changed?(to: true)
diff --git a/app/models/user/accessor.rb b/app/models/user/accessor.rb
index ebf5dde59..89534b777 100644
--- a/app/models/user/accessor.rb
+++ b/app/models/user/accessor.rb
@@ -9,10 +9,6 @@ module User::Accessor
     after_create_commit :grant_access_to_collections
   end
 
-  def can_access_card?(card)
-    card.collection.accessible_to?(self)
-  end
-
   private
     def grant_access_to_collections
       Access.insert_all Collection.all_access.pluck(:id).collect { |collection_id| { collection_id: collection_id, user_id: id } }

From 4bef466df2b0ead5ad5c5f16969ce16986f5765c Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:22:41 +0200
Subject: [PATCH 242/413] 1-line

---
 app/models/concerns/mentions.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index fde4e8ca1..665ab5be4 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -14,9 +14,7 @@ module Mentions
   end
 
   def mentionable_content
-    markdown_associations.collect do |association|
-      send(association.name)&.to_plain_text
-    end.compact.join(" ")
+    markdown_associations.collect { |association| send(association.name)&.to_plain_text }.compact.join(" ")
   end
 
   private

From e8e95bd5115bc7f8709098def1f114fdf3187087 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:27:25 +0200
Subject: [PATCH 243/413] Use it

---
 app/models/concerns/mentions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 665ab5be4..efcacac52 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -14,7 +14,7 @@ module Mentions
   end
 
   def mentionable_content
-    markdown_associations.collect { |association| send(association.name)&.to_plain_text }.compact.join(" ")
+    markdown_associations.collect { |it| send(it.name)&.to_plain_text }.compact.join(" ")
   end
 
   private

From ea66845e71bdbc8a77b17af34c487edb25cd9328 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:27:58 +0200
Subject: [PATCH 244/413] There is always an action

---
 app/models/event.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index f95dc0785..395f96971 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -13,7 +13,7 @@ class Event < ApplicationRecord
   after_create -> { card.touch(:last_active_at) }
 
   def action
-    super&.inquiry
+    super.inquiry
   end
 
   def initial_assignment?

From 53eba9bd0bfe2647ac40a914bf90761562d5d48e Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:28:28 +0200
Subject: [PATCH 245/413] Favor after_create_commit to keep transactions fast

---
 app/models/mention.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/mention.rb b/app/models/mention.rb
index 2c6c95750..cbf4ad1b3 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -5,7 +5,7 @@ class Mention < ApplicationRecord
   belongs_to :mentioner, class_name: "User"
   belongs_to :mentionee, class_name: "User", inverse_of: :mentions
 
-  after_create :add_mentionee_as_watcher
+  after_create_commit :add_mentionee_as_watcher
 
   def self_mention?
     mentioner == mentionee

From e964c5f9c9d129151f79a22faa1ff8e6e4edf5b8 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:31:26 +0200
Subject: [PATCH 246/413] Not used!

---
 app/models/notifier.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 8b0b9d2ce..08ea8c9ad 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -28,8 +28,4 @@ class Notifier
     def should_notify?
       !creator.system?
     end
-
-    def resource
-      source
-    end
 end

From 6f98f2f573f83163c0521e8e50a02a2d3e590518 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:32:22 +0200
Subject: [PATCH 247/413] Order methods

---
 app/models/concerns/mentions.rb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index efcacac52..f6decd635 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -18,6 +18,20 @@ module Mentions
   end
 
   private
+    def scan_mentionees
+      scan_mentioned_handles.filter_map do |mention|
+        mentionable_users.find { |user| user.mentionable_handles.include?(mention) }
+      end
+    end
+
+    def scan_mentioned_handles
+      mentionable_content.scan(/(?<!\w)@(\w+)/).flatten.uniq(&:downcase)
+    end
+
+    def mentionable_users
+      collection.users
+    end
+
     def markdown_associations
       self.class.reflect_on_all_associations(:has_one).filter { it.klass == ActionText::Markdown }
     end
@@ -29,18 +43,4 @@ module Mentions
     def create_mentions_later
       Mention::CreateJob.perform_later(self, mentioner: Current.user)
     end
-
-    def scan_mentionees
-      scan_mentioned_handles.filter_map do |mention|
-        mentionable_users.find { |user| user.mentionable_handles.include?(mention) }
-      end
-    end
-
-    def mentionable_users
-      collection.users
-    end
-
-    def scan_mentioned_handles
-      mentionable_content.scan(/(?<!\w)@(\w+)/).flatten.uniq(&:downcase)
-    end
 end

From b4cfd40a2fd1446b4c867bf291f840faa53585a1 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:37:28 +0200
Subject: [PATCH 248/413] Inline, no need to duplicate the conditional

---
 app/models/notifier/event.rb | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/models/notifier/event.rb b/app/models/notifier/event.rb
index fb32d4178..0fc31914a 100644
--- a/app/models/notifier/event.rb
+++ b/app/models/notifier/event.rb
@@ -8,22 +8,11 @@ class Notifier::Event < Notifier
       when "assigned"
         source.assignees.excluding(card.collection.access_only_users)
       when "published"
-        watchers_and_subscribers(include_only_watching: true).without(creator, *mentionees)
+        watchers_and_subscribers(include_only_watching: true).without(creator, *card.mentionees)
       when "commented"
-        watchers_and_subscribers.without(creator, *mentionees)
+        watchers_and_subscribers.without(creator, *source.comment.mentionees)
       else
         watchers_and_subscribers.without(creator)
       end
     end
-
-    def mentionees
-      case source.action
-      when "published"
-        source.card.mentionees
-      when "commented"
-        source.comment.mentionees
-      else
-        []
-      end
-    end
 end

From 970a51db28460fa0e0f924cca491fdc93198f9c0 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 15:49:22 +0200
Subject: [PATCH 249/413] No need for it!

---
 app/models/concerns/mentions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index f6decd635..08e0362cb 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -14,7 +14,7 @@ module Mentions
   end
 
   def mentionable_content
-    markdown_associations.collect { |it| send(it.name)&.to_plain_text }.compact.join(" ")
+    markdown_associations.collect { send(it.name)&.to_plain_text }.compact.join(" ")
   end
 
   private

From 23bd8a569e8870b18895d3d2bf561ead31553d6a Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 08:53:43 -0500
Subject: [PATCH 250/413] This is annoying

---
 app/views/cards/taggings/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb
index 6ff9f1306..193a1d339 100644
--- a/app/views/cards/taggings/new.html.erb
+++ b/app/views/cards/taggings/new.html.erb
@@ -3,7 +3,7 @@
     <strong class="popup__title margin-block-half pad-inline-half">Tag this…</strong>
 
     <%= form_with url: card_taggings_path(@card), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %>
-      <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %>
+      <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width", autocomplete: "off" %>
       <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %>
         <%= icon_tag "add" %>
         <span class="for-screen-reader">Add a tag</span>

From 5dac14ab50b4213a1f538adb93c4acf764116b3f Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 16:06:20 +0200
Subject: [PATCH 251/413] Move logic to the model

---
 app/models/event.rb        |  8 ++++++++
 app/models/notification.rb |  8 ++++++++
 config/routes.rb           | 12 +-----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 395f96971..7fa70bd77 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -16,6 +16,14 @@ class Event < ApplicationRecord
     super.inquiry
   end
 
+  def target
+    if action.commented?
+      comment
+    else
+      card
+    end
+  end
+
   def initial_assignment?
     action == "published" && card.assigned_to?(creator)
   end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 1b1c91b5c..35c2ac702 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -21,6 +21,14 @@ class Notification < ApplicationRecord
     read_at.present?
   end
 
+  def target
+    if source.is_a?(Event)
+      source.target
+    else
+      source
+    end
+  end
+
   private
     def broadcast_unread
       broadcast_prepend_later_to user, :notifications, target: "notifications"
diff --git a/config/routes.rb b/config/routes.rb
index 5ff480121..5ba46a8f8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -108,17 +108,7 @@ Rails.application.routes.draw do
   end
 
   resolve "Notification" do |notification, options|
-    source = if notification.source.is_a?(Event)
-      if notification.source.action.commented?
-        notification.source.comment
-      else
-        notification.source.card
-      end
-    else
-      notification.source
-    end
-
-    polymorphic_path(source, options)
+    polymorphic_path(notification.target, options)
   end
 
   get "up", to: "rails/health#show", as: :rails_health_check

From f258b05b239f8b8e095ca141c61dfb707e31b4b6 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 16:15:08 +0200
Subject: [PATCH 252/413] Delegate target to the notifiable objects

---
 app/models/concerns/notifiable.rb |  4 ++++
 app/models/event.rb               |  2 +-
 app/models/mention.rb             |  4 ++++
 app/models/notification.rb        | 10 ++--------
 app/models/notifier.rb            |  8 ++++----
 config/routes.rb                  |  2 +-
 test/models/notifier_test.rb      |  2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/models/concerns/notifiable.rb b/app/models/concerns/notifiable.rb
index 7c3531ed2..4723229d9 100644
--- a/app/models/concerns/notifiable.rb
+++ b/app/models/concerns/notifiable.rb
@@ -11,6 +11,10 @@ module Notifiable
     Notifier.for(self)&.notify
   end
 
+  def notifiable_target
+    self
+  end
+
   private
     def notify_recipients_later
       NotifyRecipientsJob.perform_later self
diff --git a/app/models/event.rb b/app/models/event.rb
index 7fa70bd77..0fe643bb5 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -16,7 +16,7 @@ class Event < ApplicationRecord
     super.inquiry
   end
 
-  def target
+  def notifiable_target
     if action.commented?
       comment
     else
diff --git a/app/models/mention.rb b/app/models/mention.rb
index cbf4ad1b3..c14237976 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -11,6 +11,10 @@ class Mention < ApplicationRecord
     mentioner == mentionee
   end
 
+  def notifiable_target
+    source
+  end
+
   private
     def add_mentionee_as_watcher
       source.watch_by(mentionee)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 35c2ac702..01444ce61 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -9,6 +9,8 @@ class Notification < ApplicationRecord
 
   after_create_commit :broadcast_unread
 
+  delegate :notifiable_target, to: :source
+
   def self.read_all
     update!(read_at: Time.current)
   end
@@ -21,14 +23,6 @@ class Notification < ApplicationRecord
     read_at.present?
   end
 
-  def target
-    if source.is_a?(Event)
-      source.target
-    else
-      source
-    end
-  end
-
   private
     def broadcast_unread
       broadcast_prepend_later_to user, :notifications, target: "notifications"
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 08ea8c9ad..548b3869c 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,10 +4,10 @@ class Notifier
   class << self
     def for(source)
       case source
-      when ::Event
-        Notifier::Event.new(source)
-      when ::Mention
-        Notifier::Mention.new(source)
+      when Event
+        EventNotifier.new(source)
+      when Mention
+        MentionNotifier.new(source)
       end
     end
   end
diff --git a/config/routes.rb b/config/routes.rb
index 5ba46a8f8..0acad2014 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -108,7 +108,7 @@ Rails.application.routes.draw do
   end
 
   resolve "Notification" do |notification, options|
-    polymorphic_path(notification.target, options)
+    polymorphic_path(notification.notifiable_target, options)
   end
 
   get "up", to: "rails/health#show", as: :rails_health_check
diff --git a/test/models/notifier_test.rb b/test/models/notifier_test.rb
index 8dc9c8afe..d27379464 100644
--- a/test/models/notifier_test.rb
+++ b/test/models/notifier_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 class NotifierTest < ActiveSupport::TestCase
   test "for returns the matching notifier class for the event" do
-    assert_kind_of Notifier::Event, Notifier.for(events(:logo_published))
+    assert_kind_of Notifier::EventNotifier, Notifier.for(events(:logo_published))
   end
 
   test "generate does not create notifications if the event was system-generated" do

From 5749ad77e5307699cd76f12405ee42ca28c3023a Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 16:19:41 +0200
Subject: [PATCH 253/413] Rename classes

---
 app/models/notifier/{event.rb => event_notifier.rb}     | 2 +-
 app/models/notifier/{mention.rb => mention_notifier.rb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/models/notifier/{event.rb => event_notifier.rb} (92%)
 rename app/models/notifier/{mention.rb => mention_notifier.rb} (82%)

diff --git a/app/models/notifier/event.rb b/app/models/notifier/event_notifier.rb
similarity index 92%
rename from app/models/notifier/event.rb
rename to app/models/notifier/event_notifier.rb
index 0fc31914a..ea771bc15 100644
--- a/app/models/notifier/event.rb
+++ b/app/models/notifier/event_notifier.rb
@@ -1,4 +1,4 @@
-class Notifier::Event < Notifier
+class Notifier::EventNotifier < Notifier
   delegate :card, :creator, to: :source
   delegate :watchers_and_subscribers, to: :card
 
diff --git a/app/models/notifier/mention.rb b/app/models/notifier/mention_notifier.rb
similarity index 82%
rename from app/models/notifier/mention.rb
rename to app/models/notifier/mention_notifier.rb
index feea686f4..c3920df8a 100644
--- a/app/models/notifier/mention.rb
+++ b/app/models/notifier/mention_notifier.rb
@@ -1,4 +1,4 @@
-class Notifier::Mention < Notifier
+class Notifier::MentionNotifier < Notifier
   alias mention source
 
   private

From b3a2c65527a6df61be85fdb4da6c2d05ea55040c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 09:24:31 -0500
Subject: [PATCH 254/413] Improve layout and truncation

---
 app/assets/stylesheets/events.css             |  6 ----
 app/assets/stylesheets/popup.css              | 32 +++++++++++--------
 app/views/cards/assignments/new.html.erb      |  2 +-
 .../cards/index/_collections_filter.html.erb  | 15 +++++----
 app/views/cards/index/_header.html.erb        |  8 +++--
 app/views/cards/taggings/new.html.erb         |  2 +-
 6 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 845987fb5..219e18292 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -64,12 +64,6 @@
     .events__index-header:has(&) {
       position: relative;
     }
-
-    #header:has(&) {
-      max-inline-size: 100%;
-      position: relative;
-      z-index: 5;
-    }
   }
 
   .event {
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 9cf88b064..b9987e12c 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -1,13 +1,13 @@
 @layer components {
   .popup {
     --panel-border-radius: 0.5em;
-    --panel-padding: 0.4em 0.5em 0.5em;
+    --panel-padding: var(--block-space);
     --panel-size: auto;
 
     inline-size: auto;
     inset: 0 auto auto 50%;
-    min-inline-size: 20ch;
-    max-inline-size: 40ch;
+    min-inline-size: min(20ch, 90vw);
+    max-inline-size: min(50ch, 90vw);
     position: absolute;
     transform: translateX(-50%);
     z-index: 2;
@@ -15,12 +15,22 @@
     &[open] {
       display: flex;
     }
+
+    #header:has(&) {
+      max-inline-size: 100%;
+      position: relative;
+      z-index: 5;
+    }
   }
 
   .popup__group {
     background: var(--color-subtle-light);
     max-inline-size: 100%;
-    padding-inline-start: var(--inline-space-half);
+    padding-inline: var(--inline-space);
+
+    .btn {
+      --btn-background: transparent;
+    }
     
     @media (any-hover: hover) {
       &:hover {
@@ -30,7 +40,7 @@
   }
 
   .popup__item {
-    --btn-background: transparent;
+    --btn-background: var(--color-subtle-light);
     --btn-border-radius: 0.3em;
     --btn-border-size: 0;
     --btn-font-weight: 500;
@@ -43,14 +53,10 @@
     max-inline-size: 100%;
     text-align: start;
 
-    &::after {
-      border-radius: var(--btn-border-radius);
-      border: var(--btn-border-size) solid var(--btn-border-color, var(--color-subtle));
-      content: "";
-      display: block;
-      inline-size: calc(100% - var(--btn-padding) * 2);
-      block-size: calc(100% - var(--btn-padding) * 2);
-
+    @media (any-hover: hover) {
+      &:where(:not(:active):hover) {
+        --btn-background: var(--color-selected);
+      }
     }
 
     &:has(input:checked)  {
diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index 35412c9f3..22c8f9c2d 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -1,5 +1,5 @@
 <%= turbo_frame_tag @card, :assignment do %>
-  <strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Assign this to…</strong>
+  <strong class="popup__title pad-inline-half txt-nowrap">Assign this to…</strong>
 
   <div class="flex flex-column full-width popup__list">
     <% @collection.users.active.alphabetically.each do |user| %>
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index 2370929c0..bd1c77548 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -1,12 +1,12 @@
-<%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
+<%= form_with url: cards_path, method: :get, class: "flex flex-column max-width popup__list",
       data: { controller: "form" } do |form| %>
   <% filter.as_params.except(:collection_ids).each do |key, value| %>
     <%= filter_hidden_field_tag key, value %>
   <% end %>
 
   <% Current.user.collections.order(:name).each do |collection| %>
-    <div class="popup__group flex align-center gap-half overflow-ellipsis">
-      <div class="btn txt-xx-small">
+    <div class="popup__group flex align-center">
+      <div class="btn txt-xx-small flex-item-no-shrink">
         <%= form.check_box "collection_ids[]", {
               checked: filter.collections.include?(collection),
               data: { action: "change->form#submit" },
@@ -16,13 +16,14 @@
         <span class="for-screen-reader">
           Toggle filter for <%= collection.name %>
         </span>
-        <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+        <%= icon_tag "check", size: 18, class: "checked" %>
       </div>
 
-      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item justify-space-between" do %>
-        <span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
-        <span class="translucent"> ›</span>
+      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width" do %>
+        <span class="overflow-ellipsis"><%= collection.name %></span>
       <% end %>
+  
+      <span class="translucent flex-item-no-shrink"> ›</span>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 3946e1b2a..46309383b 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -5,19 +5,23 @@
   <div class="btn btn--placeholder flex-item-justify-start"></div>
 
   <header class="flex flex-inline flex-column center flex-shrink">
-    <div class="card-filter--collection flex-inline center position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
+    <div class="card-filter--collection flex-inline center position-relative" data-controller="dialog" data-action="click@document->dialog#closeOnClickOutside">
       <button class="txt-align-center input input--select borderless center txt-medium" data-action="click->dialog#open:stop">
         <h1 class="txt-large overflow-ellipsis margin-none">
           <%= filter_title filter %>
         </h1>
       </button>
 
-      <dialog class="events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+      <dialog class="popup popup--animated panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="keydown.esc->dialog#close:stop turbo:before-cache@document->dialog#close">
         <div class="flex align-center full-width gap-half">
           <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.6em 0 0.3em;">
             <%= icon_tag "filter" %>
           </span>
           <strong class="popup__title txt-medium">Collections</strong>
+          <button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
+            <%= icon_tag "remove-med" %>
+            <span class="for-screen-reader">Close</span>
+          </button>
         </div>
 
         <%= render "cards/index/collections_filter", filter: filter %>
diff --git a/app/views/cards/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb
index 193a1d339..e41bcf69d 100644
--- a/app/views/cards/taggings/new.html.erb
+++ b/app/views/cards/taggings/new.html.erb
@@ -1,6 +1,6 @@
 <%= turbo_frame_tag @card, :tagging do %>
   <dialog class="popup panel flex-column align-start justify-start fill-white shadow" data-dialog-target="dialog">
-    <strong class="popup__title margin-block-half pad-inline-half">Tag this…</strong>
+    <strong class="popup__title margin-block-end-half pad-inline-half">Tag this…</strong>
 
     <%= form_with url: card_taggings_path(@card), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %>
       <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width", autocomplete: "off" %>

From 25456046597936748e999f6d569dcffea4d27fd3 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 16:49:42 +0200
Subject: [PATCH 255/413] Add tests

---
 test/fixtures/mentions.yml                    |  4 +++
 test/models/concerns/mentions_test.rb         | 10 +------
 .../event_notifier_test.rb}                   | 18 ++++++++++++-
 test/models/notifier/mention_notifier_test.rb | 27 +++++++++++++++++++
 test/models/user/mentionable_test.rb          | 11 ++++++++
 5 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 test/fixtures/mentions.yml
 rename test/models/{notifier_test.rb => notifier/event_notifier_test.rb} (78%)
 create mode 100644 test/models/notifier/mention_notifier_test.rb

diff --git a/test/fixtures/mentions.yml b/test/fixtures/mentions.yml
new file mode 100644
index 000000000..70373600f
--- /dev/null
+++ b/test/fixtures/mentions.yml
@@ -0,0 +1,4 @@
+logo_card_david_mention_by_jz:
+  source: logo (card)
+  mentioner: jz
+  mentionee: david
diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb
index b9e5dc751..3e856ab16 100644
--- a/test/models/concerns/mentions_test.rb
+++ b/test/models/concerns/mentions_test.rb
@@ -5,19 +5,11 @@ class MentionsTest < ActiveSupport::TestCase
     Current.session = sessions(:david)
   end
 
-  test "collect mentions on create" do
+  test "create mentions when creating messages" do
     assert_difference -> { Mention.count }, +1 do
       perform_enqueued_jobs only: Mention::CreateJob do
         collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?"
       end
     end
   end
-
-  test "collect mentions on update" do
-    assert_difference -> { Mention.count }, +1 do
-      perform_enqueued_jobs only: Mention::CreateJob do
-        cards(:logo).update! description: "Did you finish up with the cleanup, @david?"
-      end
-    end
-  end
 end
diff --git a/test/models/notifier_test.rb b/test/models/notifier/event_notifier_test.rb
similarity index 78%
rename from test/models/notifier_test.rb
rename to test/models/notifier/event_notifier_test.rb
index d27379464..ca4f0b4b5 100644
--- a/test/models/notifier_test.rb
+++ b/test/models/notifier/event_notifier_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class NotifierTest < ActiveSupport::TestCase
+class Notifier::EventNotifierTest < ActiveSupport::TestCase
   test "for returns the matching notifier class for the event" do
     assert_kind_of Notifier::EventNotifier, Notifier.for(events(:logo_published))
   end
@@ -62,4 +62,20 @@ class NotifierTest < ActiveSupport::TestCase
 
     assert_empty notifications
   end
+
+  test "don't create notifications on publish for mentionees" do
+    users(:kevin).mentioned_by(users(:david), at: cards(:logo))
+
+    assert_no_difference -> { users(:kevin).notifications.count } do
+      Notifier.for(events(:logo_published)).notify
+    end
+  end
+
+  test "don't create notifications on comment for mentionees" do
+    users(:david).mentioned_by(users(:kevin), at: cards(:layout))
+
+    assert_no_difference -> { users(:david).notifications.count } do
+      Notifier.for(events(:layout_commented)).notify
+    end
+  end
 end
diff --git a/test/models/notifier/mention_notifier_test.rb b/test/models/notifier/mention_notifier_test.rb
new file mode 100644
index 000000000..833f55ec8
--- /dev/null
+++ b/test/models/notifier/mention_notifier_test.rb
@@ -0,0 +1,27 @@
+require "test_helper"
+
+class Notifier::EventNotifierTest < ActiveSupport::TestCase
+  test "for returns the matching notifier class for the mention" do
+    assert_kind_of Notifier::MentionNotifier, Notifier.for(mentions(:logo_card_david_mention_by_jz))
+  end
+
+  test "notify the mentionee" do
+    users(:kevin).mentioned_by(users(:david), at: cards(:logo))
+
+    assert_no_difference -> { users(:kevin).notifications.count } do
+      Notifier.for(mentions(:logo_card_david_mention_by_jz)).notify
+    end
+  end
+
+  test "create notifications for mentionee" do
+    assert_no_difference -> { users(:david).notifications.count } do
+      Notifier.for(events(:layout_commented)).notify
+    end
+  end
+
+  test "don't create notifications for self-mentions" do
+    assert_no_difference -> { users(:jz).notifications.count } do
+      Notifier.for(events(:layout_commented)).notify
+    end
+  end
+end
diff --git a/test/models/user/mentionable_test.rb b/test/models/user/mentionable_test.rb
index 48fb339a1..7231553c0 100644
--- a/test/models/user/mentionable_test.rb
+++ b/test/models/user/mentionable_test.rb
@@ -4,4 +4,15 @@ class User::MentionableTest < ActiveSupport::TestCase
   test "mentionable handles" do
     assert_equal [ "dhh", "david", "davidh" ], User.new(name: "David Heinemeier-Hansson").mentionable_handles
   end
+
+  test "mentioned by" do
+    assert_difference -> { users(:david).mentions.count }, +1 do
+      users(:david).mentioned_by users(:jz), at: cards(:logo)
+    end
+
+    # No dups
+    assert_no_difference -> { users(:david).mentions.count }, +1 do
+      users(:david).mentioned_by users(:jz), at: cards(:logo)
+    end
+  end
 end

From bd5a41a0a1cd921f1c5dcf3e455ce56e4d16ef91 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 17:25:11 +0200
Subject: [PATCH 256/413] Refresh migrations

---
 db/schema.rb        |  1 -
 db/schema_cache.yml | 56 +++++++++++++++++++--------------------------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 595cf2346..3a747df7f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -180,7 +180,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_23_114737) do
     t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.integer "creator_id", null: false
-    t.date "due_date"
     t.json "particulars", default: {}
     t.integer "summary_id", null: false
     t.datetime "updated_at", null: false
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 9e58a9422..7859651e6 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -31,7 +31,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &26 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_id
     cast_type: *1
@@ -374,7 +374,7 @@ columns:
   - *9
   cards:
   - *5
-  - &31 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: title
     cast_type: *6
@@ -399,12 +399,12 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: due_on
-    cast_type: &24 !ruby/object:ActiveRecord::Type::Date
+    cast_type: !ruby/object:ActiveRecord::Type::Date
       precision:
       scale:
       limit:
       timezone:
-    sql_type_metadata: &25 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: date
       type: :date
       limit:
@@ -494,11 +494,11 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: all_access
-    cast_type: &32 !ruby/object:ActiveModel::Type::Boolean
+    cast_type: &30 !ruby/object:ActiveModel::Type::Boolean
       precision:
       scale:
       limit:
-    sql_type_metadata: &33 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &31 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: boolean
       type: :boolean
       limit:
@@ -540,11 +540,11 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: particulars
-    cast_type: &26 !ruby/object:ActiveRecord::Type::Json
+    cast_type: &24 !ruby/object:ActiveRecord::Type::Json
       precision:
       scale:
       limit:
-    sql_type_metadata: &27 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &25 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: json
       type: :json
       limit:
@@ -578,16 +578,6 @@ columns:
     collation:
     comment:
   - *21
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: due_date
-    cast_type: *24
-    sql_type_metadata: *25
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   filters:
   - *5
   - *23
@@ -606,8 +596,8 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: fields
-    cast_type: *26
-    sql_type_metadata: *27
+    cast_type: *24
+    sql_type_metadata: *25
     'null': false
     default: "{}"
     default_function:
@@ -627,7 +617,7 @@ columns:
     comment:
   filters_tags:
   - *18
-  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: tag_id
     cast_type: *1
@@ -639,7 +629,7 @@ columns:
     comment:
   mentions:
   - *5
-  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &27 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: source_type
     cast_type: *6
@@ -708,7 +698,7 @@ columns:
   - *9
   notifications:
   - *5
-  - *28
+  - *26
   - *8
   - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -721,7 +711,7 @@ columns:
     default_function:
     collation:
     comment:
-  - *29
+  - *27
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: source_id
@@ -745,7 +735,7 @@ columns:
   pins:
   - *5
   - *21
-  - *28
+  - *26
   - *8
   - *9
   reactions:
@@ -805,7 +795,7 @@ columns:
     comment:
   sessions:
   - *5
-  - *28
+  - *26
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: ip_address
@@ -831,12 +821,12 @@ columns:
   taggings:
   - *5
   - *21
-  - *30
+  - *28
   - *8
   - *9
   tags:
   - *5
-  - *31
+  - *29
   - *8
   - *9
   users:
@@ -865,8 +855,8 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: active
-    cast_type: *32
-    sql_type_metadata: *33
+    cast_type: *30
+    sql_type_metadata: *31
     'null': false
     default: true
     default_function:
@@ -886,13 +876,13 @@ columns:
     comment:
   watches:
   - *5
-  - *28
+  - *26
   - *21
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: watching
-    cast_type: *32
-    sql_type_metadata: *33
+    cast_type: *30
+    sql_type_metadata: *31
     'null': false
     default: true
     default_function:

From 3793718e72074caa6bf1a6b03b48eb0f51a56389 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 17:25:36 +0200
Subject: [PATCH 257/413] Fix concern I lost during merge

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 833c41580..90539679b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
 class User < ApplicationRecord
-  include Accessor, Assignee, Named, Role, Transferable
+  include Accessor, Assignee, Mentionable, Named, Role, Transferable
 
   has_one_attached :avatar
 

From 71c20f9685d0eae51845878f4b0a0534255e4b7d Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 18:45:45 +0200
Subject: [PATCH 258/413] FIx migration

---
 db/migrate/20250422054950_add_source_to_notifications.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20250422054950_add_source_to_notifications.rb b/db/migrate/20250422054950_add_source_to_notifications.rb
index 7108d680b..c64dd68e1 100644
--- a/db/migrate/20250422054950_add_source_to_notifications.rb
+++ b/db/migrate/20250422054950_add_source_to_notifications.rb
@@ -3,7 +3,7 @@ class AddSourceToNotifications < ActiveRecord::Migration[8.1]
     add_reference :notifications, :source, polymorphic: true, index: true
 
     execute <<~SQL
-      update notifications set source_type = 'Event'
+      update notifications set source_type = 'Event', source_id = event_id;
     SQL
 
     change_column_null :notifications, :source_type, false

From 646e4a59bc0eacbfae1b12c991f3e922f28156e8 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 18:45:55 +0200
Subject: [PATCH 259/413] Fix missing variable name

---
 app/helpers/notifications_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 4568ad82a..5f61f99e9 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -56,6 +56,6 @@ module NotificationsHelper
     end
 
     def comment_notification_body(event)
-      "#{strip_tags(event.comment.body_html).blank? ? "#{name} replied" : "#{event.creator.name}:" } #{strip_tags(event.comment.body_html).truncate(200)}"
+      "#{strip_tags(event.comment.body_html).blank? ? "#{event.creator.name} replied" : "#{event.creator.name}:" } #{strip_tags(event.comment.body_html).truncate(200)}"
     end
 end

From 28ce005e8a18214ff95c1301614bfb3c3304010f Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 23 Apr 2025 14:06:08 -0400
Subject: [PATCH 260/413] dep: update rails to 0ed3cd46

which includes the fix for a stable schema cache file.
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a9c459db0..159677b8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: e9ee790d694298b8a48d44cd089934e6c8bc7597
+  revision: 0ed3cd46d0038f8108ed92edb308c81fa6cc3730
   branch: main
   specs:
     actioncable (8.1.0.alpha)
@@ -145,7 +145,7 @@ GEM
       xpath (~> 3.2)
     chunky_png (1.4.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.1)
+    connection_pool (2.5.2)
     crass (1.0.6)
     date (3.4.1)
     debug (1.10.0)
@@ -208,7 +208,7 @@ GEM
     mini_portile2 (2.8.8)
     minitest (5.25.5)
     msgpack (1.8.0)
-    net-imap (0.5.6)
+    net-imap (0.5.7)
       date
       net-protocol
     net-pop (0.1.2)

From 54375e8ded6e3eeb5c805a2531ad5b737a989b0e Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 23 Apr 2025 14:09:40 -0400
Subject: [PATCH 261/413] Re-dump the schema cache file

using the latest Rails version, which means we should have less churn
in the file going forward.
---
 db/schema_cache.yml | 862 ++++++++++++++++++++++----------------------
 1 file changed, 431 insertions(+), 431 deletions(-)

diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 7859651e6..42cd125c0 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -1,9 +1,9 @@
 --- !ruby/object:ActiveRecord::ConnectionAdapters::SchemaCache
 columns:
   accesses:
-  - &5 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment: true
-    name: id
+  - &22 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: collection_id
     cast_type: &1 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer
       precision:
       scale:
@@ -21,27 +21,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &22 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: collection_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - &26 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: user_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - &8 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &5 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: created_at
     cast_type: &3 !ruby/object:ActiveRecord::Type::DateTime
@@ -60,11 +40,11 @@ columns:
     default_function:
     collation:
     comment:
-  - &9 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: updated_at
-    cast_type: *3
-    sql_type_metadata: *4
+  - &6 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment: true
+    name: id
+    cast_type: *1
+    sql_type_metadata: *2
     'null': false
     default:
     default_function:
@@ -73,13 +53,13 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: involvement
-    cast_type: &6 !ruby/object:ActiveModel::Type::String
+    cast_type: &7 !ruby/object:ActiveModel::Type::String
       true: t
       false: f
       precision:
       scale:
       limit:
-    sql_type_metadata: &7 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &8 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: varchar
       type: :string
       limit:
@@ -90,45 +70,19 @@ columns:
     default_function:
     collation:
     comment:
-  accounts:
-  - *5
-  - &10 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &9 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: name
-    cast_type: *6
-    sql_type_metadata: *7
+    name: updated_at
+    cast_type: *3
+    sql_type_metadata: *4
     'null': false
     default:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &27 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: join_code
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  action_text_markdowns:
-  - *5
-  - &11 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: record_type
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: record_id
+    name: user_id
     cast_type: *1
     sql_type_metadata: *2
     'null': false
@@ -136,7 +90,31 @@ columns:
     default_function:
     collation:
     comment:
-  - *10
+  accounts:
+  - *5
+  - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: join_code
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - &10 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: name
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *9
+  action_text_markdowns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: content
@@ -157,22 +135,41 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
-  active_storage_attachments:
   - *5
+  - *6
   - *10
-  - *11
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: record_id
-    cast_type: &12 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - &13 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: record_type
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *9
+  active_storage_attachments:
+  - &16 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: blob_id
+    cast_type: &11 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer
       precision:
       scale:
       limit:
       max: 9223372036854775808
       min: -9223372036854775808
-    sql_type_metadata: &13 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &12 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: bigint
       type: :integer
       limit:
@@ -183,34 +180,36 @@ columns:
     default_function:
     collation:
     comment:
-  - &16 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - *5
+  - *6
+  - *10
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: blob_id
-    cast_type: *12
-    sql_type_metadata: *13
+    name: record_id
+    cast_type: *11
+    sql_type_metadata: *12
     'null': false
     default:
     default_function:
     collation:
     comment:
-  - *8
+  - *13
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: slug
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': true
     default:
     default_function:
     collation:
     comment:
   active_storage_blobs:
-  - *5
-  - &17 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: key
-    cast_type: *6
-    sql_type_metadata: *7
+    name: byte_size
+    cast_type: *11
+    sql_type_metadata: *12
     'null': false
     default:
     default_function:
@@ -218,10 +217,10 @@ columns:
     comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: filename
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': false
+    name: checksum
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': true
     default:
     default_function:
     collation:
@@ -229,13 +228,35 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: content_type
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': true
     default:
     default_function:
     collation:
     comment:
+  - *5
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: filename
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *6
+  - &17 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: key
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: metadata
@@ -249,72 +270,41 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: service_name
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': false
     default:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: byte_size
-    cast_type: *12
-    sql_type_metadata: *13
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: checksum
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *8
   active_storage_variant_records:
-  - *5
   - *16
+  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: variation_digest
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': false
     default:
     default_function:
     collation:
     comment:
   ar_internal_metadata:
+  - *5
   - *17
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: value
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': true
     default:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
   assignees_filters:
-  - &18 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: filter_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   - &19 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: assignee_id
@@ -325,8 +315,17 @@ columns:
     default_function:
     collation:
     comment:
+  - &18 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: filter_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   assigners_filters:
-  - *18
   - &20 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: assigner_id
@@ -337,9 +336,10 @@ columns:
     default_function:
     collation:
     comment:
+  - *18
   assignments:
-  - *5
   - *19
+  - *20
   - &21 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: card_id
@@ -350,11 +350,10 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
-  - *20
-  card_engagements:
   - *5
+  - *6
+  - *9
+  card_engagements:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: card_id
@@ -365,27 +364,17 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
+  - *5
+  - *6
   - *9
   card_goldnesses:
-  - *5
   - *21
-  - *8
+  - *5
+  - *6
   - *9
   cards:
+  - *22
   - *5
-  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: title
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *8
-  - *9
   - &23 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: creator_id
@@ -415,7 +404,17 @@ columns:
     default_function:
     collation:
     comment:
-  - *22
+  - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: last_active_at
+    cast_type: *3
+    sql_type_metadata: *4
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: stage_id
@@ -436,33 +435,46 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: last_active_at
-    cast_type: *3
-    sql_type_metadata: *4
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  closure_reasons:
-  - *5
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: label
-    cast_type: *6
-    sql_type_metadata: *7
+    name: title
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - *9
+  closure_reasons:
+  - *5
+  - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: label
+    cast_type: *7
+    sql_type_metadata: *8
     'null': true
     default:
     default_function:
     collation:
     comment:
-  - *8
   - *9
   closures:
-  - *5
   - *21
+  - *5
+  - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: reason
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_id
@@ -473,24 +485,7 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: reason
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
   collections:
-  - *5
-  - *23
-  - *10
-  - *8
-  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: all_access
@@ -509,6 +504,11 @@ columns:
     default_function:
     collation:
     comment:
+  - *5
+  - *23
+  - *6
+  - *10
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: workflow_id
@@ -520,23 +520,35 @@ columns:
     collation:
     comment:
   collections_filters:
-  - *18
   - *22
+  - *18
   comments:
   - *5
   - *23
-  - *8
+  - *6
   - *9
   creators_filters:
-  - *18
   - *23
+  - *18
   event_summaries:
   - *5
-  - *8
+  - *6
   - *9
   events:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: action
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *21
   - *5
   - *23
+  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: particulars
@@ -555,18 +567,6 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: action
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - *8
-  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: summary_id
@@ -577,22 +577,10 @@ columns:
     default_function:
     collation:
     comment:
-  - *21
+  - *9
   filters:
   - *5
   - *23
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: params_digest
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - *8
-  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: fields
@@ -603,6 +591,18 @@ columns:
     default_function:
     collation:
     comment:
+  - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: params_digest
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *9
   filters_stages:
   - *18
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -629,26 +629,7 @@ columns:
     comment:
   mentions:
   - *5
-  - &27 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: source_type
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: source_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
+  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: mentionee_id
@@ -669,21 +650,31 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
-  messages:
-  - *5
-  - *21
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: messageable_type
-    cast_type: *6
-    sql_type_metadata: *7
+    name: source_id
+    cast_type: *1
+    sql_type_metadata: *2
     'null': false
     default:
     default_function:
     collation:
     comment:
+  - &26 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: source_type
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *9
+  messages:
+  - *21
+  - *5
+  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: messageable_id
@@ -694,34 +685,19 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: messageable_type
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - *9
   notifications:
   - *5
-  - *26
-  - *8
-  - *9
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: read_at
-    cast_type: *3
-    sql_type_metadata: *4
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *27
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: source_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: creator_id
@@ -732,27 +708,40 @@ columns:
     default_function:
     collation:
     comment:
-  pins:
-  - *5
-  - *21
-  - *26
-  - *8
-  - *9
-  reactions:
-  - *5
+  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: comment_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
+    name: read_at
+    cast_type: *3
+    sql_type_metadata: *4
+    'null': true
     default:
     default_function:
     collation:
     comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: reacter_id
+    name: source_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - *26
+  - *9
+  - *27
+  pins:
+  - *21
+  - *5
+  - *6
+  - *9
+  - *27
+  reactions:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: comment_id
     cast_type: *1
     sql_type_metadata: *2
     'null': false
@@ -780,14 +769,25 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
+  - *5
+  - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: reacter_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - *9
   schema_migrations:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: version
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': false
     default:
     default_function:
@@ -795,63 +795,41 @@ columns:
     comment:
   sessions:
   - *5
-  - *26
+  - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: ip_address
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': true
     default:
     default_function:
     collation:
     comment:
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_agent
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': true
     default:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
+  - *27
   taggings:
-  - *5
   - *21
+  - *5
+  - *6
   - *28
-  - *8
   - *9
   tags:
   - *5
+  - *6
   - *29
-  - *8
   - *9
   users:
-  - *5
-  - *10
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: email_address
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: password_digest
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: active
@@ -862,22 +840,46 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
+  - *5
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: email_address
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - *6
+  - *10
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: password_digest
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: role
-    cast_type: *6
-    sql_type_metadata: *7
+    cast_type: *7
+    sql_type_metadata: *8
     'null': false
     default: member
     default_function:
     collation:
     comment:
+  - *9
   watches:
-  - *5
-  - *26
   - *21
+  - *5
+  - *6
+  - *9
+  - *27
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: watching
@@ -888,10 +890,21 @@ columns:
     default_function:
     collation:
     comment:
-  - *8
-  - *9
   workflow_stages:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: color
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   - *5
+  - *6
+  - *10
+  - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: workflow_id
@@ -902,23 +915,10 @@ columns:
     default_function:
     collation:
     comment:
-  - *10
-  - *8
-  - *9
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: color
-    cast_type: *6
-    sql_type_metadata: *7
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   workflows:
   - *5
+  - *6
   - *10
-  - *8
   - *9
 primary_keys:
   accesses: id
@@ -1000,11 +1000,10 @@ indexes:
   accesses:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_collection_id_and_user_id
-    unique: true
+    name: index_accesses_on_collection_id
+    unique: false
     columns:
     - collection_id
-    - user_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1017,10 +1016,11 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_collection_id
-    unique: false
+    name: index_accesses_on_collection_id_and_user_id
+    unique: true
     columns:
     - collection_id
+    - user_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1067,6 +1067,22 @@ indexes:
     comment:
     valid: true
   active_storage_attachments:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: active_storage_attachments
+    name: index_active_storage_attachments_on_blob_id
+    unique: false
+    columns:
+    - blob_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: active_storage_attachments
     name: index_active_storage_attachments_on_slug
@@ -1102,22 +1118,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: active_storage_attachments
-    name: index_active_storage_attachments_on_blob_id
-    unique: false
-    columns:
-    - blob_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   active_storage_blobs:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: active_storage_blobs
@@ -1223,9 +1223,10 @@ indexes:
   assignments:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assignments
-    name: index_assignments_on_card_id
-    unique: false
+    name: index_assignments_on_assignee_id_and_card_id
+    unique: true
     columns:
+    - assignee_id
     - card_id
     lengths: {}
     orders: {}
@@ -1239,10 +1240,9 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assignments
-    name: index_assignments_on_assignee_id_and_card_id
-    unique: true
+    name: index_assignments_on_card_id
+    unique: false
     columns:
-    - assignee_id
     - card_id
     lengths: {}
     orders: {}
@@ -1305,22 +1305,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: cards
-    name: index_cards_on_stage_id
-    unique: false
-    columns:
-    - stage_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: cards
     name: index_cards_on_last_active_at_and_status
@@ -1338,15 +1322,30 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: cards
+    name: index_cards_on_stage_id
+    unique: false
+    columns:
+    - stage_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   closure_reasons: []
   closures:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: closures
-    name: index_closures_on_card_id_and_created_at
-    unique: false
+    name: index_closures_on_card_id
+    unique: true
     columns:
     - card_id
-    - created_at
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1359,10 +1358,11 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: closures
-    name: index_closures_on_card_id
-    unique: true
+    name: index_closures_on_card_id_and_created_at
+    unique: false
     columns:
     - card_id
+    - created_at
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1509,11 +1509,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: events
-    name: index_events_on_summary_id_and_action
+    name: index_events_on_creator_id
     unique: false
     columns:
-    - summary_id
-    - action
+    - creator_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1526,10 +1525,11 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: events
-    name: index_events_on_creator_id
+    name: index_events_on_summary_id_and_action
     unique: false
     columns:
-    - creator_id
+    - summary_id
+    - action
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1559,22 +1559,6 @@ indexes:
     comment:
     valid: true
   filters_stages:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: filters_stages
-    name: index_filters_stages_on_stage_id
-    unique: false
-    columns:
-    - stage_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: filters_stages
     name: index_filters_stages_on_filter_id
@@ -1591,13 +1575,12 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  filters_tags:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: filters_tags
-    name: index_filters_tags_on_tag_id
+    table: filters_stages
+    name: index_filters_stages_on_stage_id
     unique: false
     columns:
-    - tag_id
+    - stage_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1608,6 +1591,7 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  filters_tags:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: filters_tags
     name: index_filters_tags_on_filter_id
@@ -1624,13 +1608,29 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: filters_tags
+    name: index_filters_tags_on_tag_id
+    unique: false
+    columns:
+    - tag_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   mentions:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: mentions
-    name: index_mentions_on_mentioner_id
+    name: index_mentions_on_mentionee_id
     unique: false
     columns:
-    - mentioner_id
+    - mentionee_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1643,10 +1643,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: mentions
-    name: index_mentions_on_mentionee_id
+    name: index_mentions_on_mentioner_id
     unique: false
     columns:
-    - mentionee_id
+    - mentioner_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1744,16 +1744,12 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
-    name: index_notifications_on_user_id_and_read_at_and_created_at
+    name: index_notifications_on_user_id
     unique: false
     columns:
     - user_id
-    - read_at
-    - created_at
     lengths: {}
-    orders:
-      read_at: :desc
-      created_at: :desc
+    orders: {}
     opclasses: {}
     where:
     type:
@@ -1764,12 +1760,16 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
-    name: index_notifications_on_user_id
+    name: index_notifications_on_user_id_and_read_at_and_created_at
     unique: false
     columns:
     - user_id
+    - read_at
+    - created_at
     lengths: {}
-    orders: {}
+    orders:
+      read_at: :desc
+      created_at: :desc
     opclasses: {}
     where:
     type:
@@ -1831,10 +1831,10 @@ indexes:
   reactions:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: reactions
-    name: index_reactions_on_reacter_id
+    name: index_reactions_on_comment_id
     unique: false
     columns:
-    - reacter_id
+    - comment_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1847,10 +1847,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: reactions
-    name: index_reactions_on_comment_id
+    name: index_reactions_on_reacter_id
     unique: false
     columns:
-    - comment_id
+    - reacter_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1917,10 +1917,10 @@ indexes:
   users:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: users
-    name: index_users_on_role
-    unique: false
+    name: index_users_on_email_address
+    unique: true
     columns:
-    - role
+    - email_address
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1933,10 +1933,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: users
-    name: index_users_on_email_address
-    unique: true
+    name: index_users_on_role
+    unique: false
     columns:
-    - email_address
+    - role
     lengths: {}
     orders: {}
     opclasses: {}

From ea56968c05c24b72d40744d25a75bd389c27947b Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Tue, 22 Apr 2025 14:34:13 -0400
Subject: [PATCH 262/413] Remove "primary_original" database

which was created to perform the tenanting migration from 300dffd3,
and can now be cleaned up.
---
 config/database.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/database.yml b/config/database.yml
index 82c7475e1..1a0b9537d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -14,11 +14,6 @@ development:
     <<: *default
     database: storage/tenants/<%= Rails.env %>/%{tenant}/db/main.sqlite3
     tenanted: true
-  primary_original:
-    <<: *default
-    database: storage/storage-production-20250311-1725.sqlite3
-    replica: true
-    readonly: true
   cable:
     <<: *default
     database: storage/development_cable.sqlite3

From 93cec7beb903b741efeb82046301e523adba26f0 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 23 Apr 2025 15:47:46 -0400
Subject: [PATCH 263/413] Update to latest AR::Tenanted to pick up some db task
 improvements

Notably, `db:migrate` will run tenanted database migrations in
production now.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 159677b8d..103035221 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/basecamp/active_record-tenanted
-  revision: 8758240be33a6f6f7e7f56486a2e78008c193030
+  revision: 0bc0d9331b92bc16eb64ab0fe21ec115485bf86f
   specs:
     active_record-tenanted (0.1.0)
       activerecord (>= 8.1.alpha)

From 6ae00d12cdc8828aa157c69b1d0adfef04b691f9 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 23 Apr 2025 16:52:14 -0400
Subject: [PATCH 264/413] dep: update active_record-tenanted

to a version that preserves current tenant across console reloads in development
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 103035221..daef21875 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/basecamp/active_record-tenanted
-  revision: 0bc0d9331b92bc16eb64ab0fe21ec115485bf86f
+  revision: 31aefd06ee7263c82cd21954f0c61d53595a4f0b
   specs:
     active_record-tenanted (0.1.0)
       activerecord (>= 8.1.alpha)

From d2237c2a68fa2c4d3eda52bf233720623fc3a7ec Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 23 Apr 2025 23:19:33 +0200
Subject: [PATCH 265/413] Remove trace

---
 test/models/concerns/mentions_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb
index 3e856ab16..7cdb331a2 100644
--- a/test/models/concerns/mentions_test.rb
+++ b/test/models/concerns/mentions_test.rb
@@ -12,4 +12,11 @@ class MentionsTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test "jorge" do
+    card = Card.find(cards(:logo).id)
+    card.update(description: "jorge")
+    card = Card.find(cards(:logo).id)
+    card.update(title: "jorge")
+  end
 end

From c5957138430624a25a820d30b52553d03c84f211 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 13:06:21 -0500
Subject: [PATCH 266/413] Unnecessary

---
 app/assets/stylesheets/cards.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index b913db6a9..c06cf7df1 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -155,7 +155,6 @@
     flex-direction: column;
     justify-self: end;
     max-inline-size: 20ch;
-    min-inline-size: 15ch;
     padding-block: var(--block-space-half);
   }
 

From f9cd725c84b2f70bf69f716dfa06167ef6e3bcaf Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 13:22:22 -0500
Subject: [PATCH 267/413] Tighten spacing, improve allignment

---
 app/assets/stylesheets/tags.css              | 5 +++--
 app/views/cards/_container.html.erb          | 2 +-
 app/views/cards/display/perma/_tags.html.erb | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/tags.css b/app/assets/stylesheets/tags.css
index 2b667e771..197d9b41f 100644
--- a/app/assets/stylesheets/tags.css
+++ b/app/assets/stylesheets/tags.css
@@ -22,8 +22,9 @@
   }
 
   .tag-picker__button {
-    font-size: 0.7em;
-    margin-inline-start: 0.5em;
+    font-size: 0.6em;
+    margin-block-start: 0.2em;
+    margin-inline-start: 0.2em;
 
     + .panel {
       --panel-size: 18ch;
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index f64ff7e91..0b8198891 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -12,7 +12,7 @@
 
   <div class="card-perma__bg">
     <%= card_article_tag card, class: "card" do %>
-      <header class="card__header flex align-center gap min-width">
+      <header class="card__header flex align-center gap-half min-width">
         <%= link_to card.collection.name, cards_path(collection_ids: [ card.collection ]),
               class: "card__collection txt-uppercase overflow-ellipsis txt-reversed" %>
 
diff --git a/app/views/cards/display/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb
index 46e66c56e..ff6c97b8e 100644
--- a/app/views/cards/display/perma/_tags.html.erb
+++ b/app/views/cards/display/perma/_tags.html.erb
@@ -1,7 +1,7 @@
-<div id="<%= dom_id(card, :tags) %>" class="card__tags flex-item-grow min-width">
+<div id="<%= dom_id(card, :tags) %>" class="card__tags flex-item-grow min-width gap-half">
   <div class="overflow-ellipsis">
     <% if card.tags.any? || card.creating? %>
-      <span># </span>
+      <span class="margin-inline-start-half"># </span>
       <% card.tags.each_with_index do |tag, index| %>
         <%= link_to cards_path(collection_ids: [ card.collection ], tag_ids: [ tag.id ]),
               class: "card__tag btn btn--plain min-width txt-uppercase fill-transparent" do %>

From 435d89cbe1e81a0aa09765c78b5cd7cf58e9d763 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 13:24:03 -0500
Subject: [PATCH 268/413] Just click to edit directly

---
 app/views/cards/_container.html.erb      | 1 -
 app/views/cards/container/_edit.html.erb | 4 ----
 2 files changed, 5 deletions(-)
 delete mode 100644 app/views/cards/container/_edit.html.erb

diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 0b8198891..aa5b186d5 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -3,7 +3,6 @@
   <%= render "cards/container/engagement", card: card %>
 
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
-    <%= render "cards/container/edit", card: card if card.published? %>
     <%= render "cards/container/gild", card: card if card.doing? %>
     <%= render "cards/container/image", card: card %>
 
diff --git a/app/views/cards/container/_edit.html.erb b/app/views/cards/container/_edit.html.erb
deleted file mode 100644
index 23ea9f48d..000000000
--- a/app/views/cards/container/_edit.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= link_to edit_collection_card_path(card.collection, card), class: "btn", data: { turbo_frame: dom_id(card, :edit) } do %>
-  <%= icon_tag "pencil" %>
-  <span class="for-screen-reader">Edit</span>
-<% end %>

From e7f4aaeeaad0be60ada5b755363373e6fc92d3e2 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 13:26:07 -0500
Subject: [PATCH 269/413] More breathing room for button

---
 app/views/cards/container/_title.html.erb | 2 +-
 app/views/cards/edit.html.erb             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index 38970a04a..4e4c2c9f5 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -17,7 +17,7 @@
             autofocus: card.title.blank?,
             data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
     </h1>
-    <div class="card__description markdown-content margin-block-half">
+    <div class="card__description markdown-content margin-block-start-half margin-block-end">
       <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "house-md:change->auto-save#change focusout->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index f6ca2c09a..499563bb4 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -8,7 +8,7 @@
               data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" } %>
       <% end %>
     </h1>
-    <div class="card__description markdown-content margin-block-half">
+    <div class="card__description markdown-content margin-block-start-half margin-block-end">
       <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>

From b57f049ae0730d84527ec094ec8d7bdd0753fe79 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 13:26:38 -0500
Subject: [PATCH 270/413] Alignment

---
 app/assets/stylesheets/tags.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/tags.css b/app/assets/stylesheets/tags.css
index 197d9b41f..90d51e011 100644
--- a/app/assets/stylesheets/tags.css
+++ b/app/assets/stylesheets/tags.css
@@ -23,7 +23,7 @@
 
   .tag-picker__button {
     font-size: 0.6em;
-    margin-block-start: 0.2em;
+    margin-block-start: 0.1em;
     margin-inline-start: 0.2em;
 
     + .panel {

From 8c51ca391bf4e565cd8a311a2ec4cb80c4924683 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 13:40:10 -0500
Subject: [PATCH 271/413] Move card delete button to a far less prominent
 position

---
 app/helpers/cards_helper.rb         | 4 ++--
 app/views/cards/_container.html.erb | 2 --
 app/views/cards/_messages.html.erb  | 5 +++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
index 27bdd2595..79338d622 100644
--- a/app/helpers/cards_helper.rb
+++ b/app/helpers/cards_helper.rb
@@ -33,9 +33,9 @@ module CardsHelper
 
   def button_to_delete_card(card)
     button_to collection_card_path(card.collection, card),
-        method: :delete, class: "btn", data: { turbo_confirm: "Are you sure you want to delete this?" } do
+        method: :delete, class: "btn txt-negative borderless txt-small", data: { turbo_frame: "_top", turbo_confirm: "Are you sure you want to permanently delete this card?" } do
       concat(icon_tag("trash"))
-      concat(tag.span("Delete", class: "for-screen-reader"))
+      concat(tag.span("Delete this card"))
     end
   end
 end
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index aa5b186d5..ce7482d9c 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -5,8 +5,6 @@
   <aside class="card-perma__actions card-perma__actions--left" role="toolbar">
     <%= render "cards/container/gild", card: card if card.doing? %>
     <%= render "cards/container/image", card: card %>
-
-    <%= button_to_delete_card(card) %>
   </aside>
 
   <div class="card-perma__bg">
diff --git a/app/views/cards/_messages.html.erb b/app/views/cards/_messages.html.erb
index 4b4298759..35f0cd586 100644
--- a/app/views/cards/_messages.html.erb
+++ b/app/views/cards/_messages.html.erb
@@ -14,5 +14,10 @@
         <%= avatar_tag watcher %>
       <% end %>
     </div>
+
+    <div class="txt-align-center full-width flex flex-column margin-block-start-double">
+      <hr class="separator--horizontal full-width margin-block" style="--border-color: var(--color-subtle)">
+      <%= button_to_delete_card(@card) %>
+    </div>
   </div>
 <% end %>

From 4bce7f1b5c6b24ea1d70220871eb7ef4fed18382 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 13:53:46 -0500
Subject: [PATCH 272/413] Adjust spacing, bring back "All Collections" option

---
 app/assets/stylesheets/popup.css              |  2 +-
 .../cards/index/_collections_filter.html.erb  | 19 +++++++++++++++++--
 app/views/cards/index/_header.html.erb        |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index b9987e12c..63f55728e 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -6,7 +6,7 @@
 
     inline-size: auto;
     inset: 0 auto auto 50%;
-    min-inline-size: min(20ch, 90vw);
+    min-inline-size: min(25ch, 90vw);
     max-inline-size: min(50ch, 90vw);
     position: absolute;
     transform: translateX(-50%);
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index bd1c77548..3ac3d2605 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -1,9 +1,24 @@
-<%= form_with url: cards_path, method: :get, class: "flex flex-column max-width popup__list",
+<%= form_with url: cards_path, method: :get, class: "flex flex-column max-width popup__list full-width",
       data: { controller: "form" } do |form| %>
   <% filter.as_params.except(:collection_ids).each do |key, value| %>
     <%= filter_hidden_field_tag key, value %>
   <% end %>
 
+  <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", style: "--hover-size: 0" do %>
+    <div class="btn txt-xx-small flex-item-no-shrink">
+      <input type="checkbox" <%= "checked" if filter.collection_ids.empty? %>>
+
+      <span class="for-screen-reader">
+        See everything in all collections
+      </span>
+      <%= icon_tag "check", size: 18, class: "checked" %>
+    </div>
+    <%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
+      <span class="overflow-ellipsis">All collections</span>
+    <% end %>
+    <span class="translucent flex-item-no-shrink"> ›</span>
+  <% end %>
+
   <% Current.user.collections.order(:name).each do |collection| %>
     <div class="popup__group flex align-center">
       <div class="btn txt-xx-small flex-item-no-shrink">
@@ -19,7 +34,7 @@
         <%= icon_tag "check", size: 18, class: "checked" %>
       </div>
 
-      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width" do %>
+      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
         <span class="overflow-ellipsis"><%= collection.name %></span>
       <% end %>
   
diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 46309383b..2ac6fcc39 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -14,7 +14,7 @@
 
       <dialog class="popup popup--animated panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="keydown.esc->dialog#close:stop turbo:before-cache@document->dialog#close">
         <div class="flex align-center full-width gap-half">
-          <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.6em 0 0.3em;">
+          <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
             <%= icon_tag "filter" %>
           </span>
           <strong class="popup__title txt-medium">Collections</strong>

From db5df1a5964369f2ac8c496db0c4e1e8ba1417b7 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 14:16:41 -0500
Subject: [PATCH 273/413] Update filter on events screen

- Allow proper sizing
- Bring back All Collections option
---
 app/assets/stylesheets/events.css             |  4 --
 app/presenters/collection_filter_presenter.rb |  4 +-
 app/views/events/_filter.html.erb             | 47 +++++++++++++------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 219e18292..cc35fb77c 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -60,10 +60,6 @@
 
   .events__popup {
     margin-block-start: var(--block-space-double);
-
-    .events__index-header:has(&) {
-      position: relative;
-    }
   }
 
   .event {
diff --git a/app/presenters/collection_filter_presenter.rb b/app/presenters/collection_filter_presenter.rb
index 730e38e83..507069218 100644
--- a/app/presenters/collection_filter_presenter.rb
+++ b/app/presenters/collection_filter_presenter.rb
@@ -7,9 +7,9 @@ class CollectionFilterPresenter
 
   def filter_text
     if selected_collection_ids.present?
-      "Showing activity for #{selected_collection_names_bold}".html_safe
+      "Activity in #{selected_collection_names_bold}".html_safe
     else
-      "Showing everything"
+      "Activity in all collections"
     end
   end
 
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 5b8f3f253..74e25af7a 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -7,28 +7,46 @@
 		</span>
 	</button>
 
-	<dialog class="events__popup popup popup--animated panel flex-column full-width align-start gap-half fill-white shadow"
+	<dialog class="events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow"
 				style="z-index: 5;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
 		<div class="flex align-center full-width gap-half">
-			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.6em 0 0.3em;">
+			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
 				<%= icon_tag "filter" %>
 			</span>
 			<strong class="popup__title txt-medium">Collections</strong>
+			<button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
+				<%= icon_tag "remove-med" %>
+				<span class="for-screen-reader">Close</span>
+			</button>
 		</div>
 
-		<%= form_with url: events_path, method: :get, class: "flex flex-column full-width popup__list",
+		<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+			<%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+				<%= icon_tag "add" %>
+				<span>Add a new collection</span>
+			<% end %>
+		</div>
+		<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
+
+		<%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width",
 					data: { controller: "form" } do |form| %>
-			<%#= link_to "Show everything", events_path(clear_filter: true), class: "btn popup__item txt-nowrap" %>
-			<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
-				<%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
-					<%= icon_tag "add" %>
-					<span>Add a new collection</span>
+			<%= link_to events_path(clear_filter: true), class: "popup__group flex align-center", style: "--hover-size: 0" do %>
+				<div class="btn txt-xx-small flex-item-no-shrink">
+					<input type="checkbox" <%= "checked" unless params[:collection_ids] || cookies[:collection_filter] %>>
+
+					<span class="for-screen-reader">
+						See everything in all collections
+					</span>
+					<%= icon_tag "check", size: 18, class: "checked" %>
+				</div>
+				<%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
+					<span class="overflow-ellipsis">All collections</span>
 				<% end %>
-			</div>
-			<hr class="full-width separator--horizontal" style="--border-color: transparent;">
+				<span class="translucent flex-item-no-shrink"> ›</span>
+			<% end %>
 
 			<% @collections.each do |collection| %>
-				<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+				<div class="popup__group flex align-center">
 					<div class="btn txt-xx-small">
 						<%= form.check_box "collection_ids[]", {
 							checked: (params[:collection_ids] || cookies[:collection_filter]&.split(","))&.include?(collection.id.to_s),
@@ -42,10 +60,11 @@
 						<%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
 					</div>
 
-					<%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item flex-item-grow justify-space-between" do %>
-						<span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
-						<span class="translucent"> ›</span>
+					<%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
+						<span class="overflow-ellipsis"><%= collection.name %></span>
 					<% end %>
+			
+					<span class="translucent flex-item-no-shrink"> ›</span>
 				</div>
 			<% end %>
 		<% end %>

From 7e3bd75b158752dc3cf17ccf844ded3bd4d151ff Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 16:43:55 -0500
Subject: [PATCH 274/413] Overflow long menus

---
 app/assets/stylesheets/popup.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 63f55728e..21c8780de 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -91,6 +91,8 @@
   }
 
   .popup__list {
+    max-block-size: 60dvh;
+    overflow: auto;
     row-gap: 2px;
   }
 

From 344e79c06c4c77f9786e87f62f2d3033989534fb Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 23 Apr 2025 22:46:23 -0400
Subject: [PATCH 275/413] dep: update AR::Tenanted to fix production deploy
 migrations

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index daef21875..999e8dae8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/basecamp/active_record-tenanted
-  revision: 31aefd06ee7263c82cd21954f0c61d53595a4f0b
+  revision: 13b60769047226d5cb10d92eb1f2e1bc19773438
   specs:
     active_record-tenanted (0.1.0)
       activerecord (>= 8.1.alpha)

From 330ac169238f84a8afe733f98f2ef9f245ecdd21 Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Wed, 23 Apr 2025 11:00:20 +0100
Subject: [PATCH 276/413] Run Beamer primary on beta as well

Although we aren't currently replicating anywhere there, this allows us
to still capture transactions, and trim the old ones. It also keeps beta
a little closer in configuration to production.
---
 config/deploy.beta.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/config/deploy.beta.yml b/config/deploy.beta.yml
index cbf3e9ff4..52249bbcd 100644
--- a/config/deploy.beta.yml
+++ b/config/deploy.beta.yml
@@ -9,3 +9,25 @@ servers:
 proxy:
   hosts:
     - fizzy.37signals.works # the single tenant is named "fizzy"
+
+
+x-beamer-accessory: &beamer-accessory
+  image: basecamp/beamer
+  registry:
+    username: bcbot
+    password:
+      - BASECAMP_REGISTRY_PASSWORD
+  options:
+    user: 1000 # Match the UID of the Rails app, for volume permissions
+  volumes:
+    - fizzy:/storage
+
+
+accessories:
+  beamer-primary:
+    <<: *beamer-accessory
+    service: beamer-primary
+    cmd: beamer primary --remove-after=1h --dir=/storage
+    port: 5000:80
+    roles:
+      - web

From 1f8c6e35619ffc2db076def12fe85cbb2d465563 Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Thu, 24 Apr 2025 08:30:16 +0100
Subject: [PATCH 277/413] Default to `development-tenant` in development

---
 .mise.toml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .mise.toml

diff --git a/.mise.toml b/.mise.toml
new file mode 100644
index 000000000..78434a1e0
--- /dev/null
+++ b/.mise.toml
@@ -0,0 +1,2 @@
+[env]
+ARTENANT = "development-tenant"

From f166b30f2fb785ef03101ab5386cd7b34cf41ade Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 12:17:04 +0200
Subject: [PATCH 278/413] Fix: dismiss mention notifications in cards and
 comments when reading a card

---
 app/controllers/cards/readings_controller.rb |  3 +--
 app/models/card.rb                           |  3 ++-
 app/models/card/readable.rb                  | 26 ++++++++++++++++++++
 test/fixtures/mentions.yml                   |  7 +++++-
 test/fixtures/notifications.yml              | 12 +++++++++
 test/models/card/readable_test.rb            | 23 +++++++++++++++++
 test/models/user/mentionable_test.rb         |  2 ++
 7 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 app/models/card/readable.rb
 create mode 100644 test/models/card/readable_test.rb

diff --git a/app/controllers/cards/readings_controller.rb b/app/controllers/cards/readings_controller.rb
index efd06e601..2334cb8f5 100644
--- a/app/controllers/cards/readings_controller.rb
+++ b/app/controllers/cards/readings_controller.rb
@@ -2,7 +2,6 @@ class Cards::ReadingsController < ApplicationController
   include CardScoped
 
   def create
-    @notifications = Current.user.notifications.where(source: @card.events)
-    @notifications.each(&:read)
+    @notifications = @card.read_by(Current.user)
   end
 end
diff --git a/app/models/card.rb b/app/models/card.rb
index 808ff9467..a1d8e5115 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,6 +1,7 @@
 class Card < ApplicationRecord
   include Assignable, Colored, Engageable, Eventable, Golden, Mentions,
-    Messages, Pinnable, Closeable, Searchable, Staged, Statuses, Taggable, Watchable
+    Messages, Pinnable, Closeable, Readable, Searchable, Staged,
+    Statuses, Taggable, Watchable
 
   belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }
diff --git a/app/models/card/readable.rb b/app/models/card/readable.rb
new file mode 100644
index 000000000..2511a6b45
--- /dev/null
+++ b/app/models/card/readable.rb
@@ -0,0 +1,26 @@
+module Card::Readable
+  extend ActiveSupport::Concern
+
+  def read_by(user)
+    notifications_for(user).tap do |notifications|
+      notifications.each(&:read)
+    end
+  end
+
+  private
+    def notifications_for(user)
+      user.notifications.unread.where(source: notification_sources)
+    end
+
+    def notification_sources
+      events + mentions + comment_mentions
+    end
+
+    def comment_mentions
+      Mention.where(source: comments)
+    end
+
+    def comments
+      Comment.where(id: messages.comments.pluck(:messageable_id))
+    end
+end
diff --git a/test/fixtures/mentions.yml b/test/fixtures/mentions.yml
index 70373600f..77963954c 100644
--- a/test/fixtures/mentions.yml
+++ b/test/fixtures/mentions.yml
@@ -1,4 +1,9 @@
 logo_card_david_mention_by_jz:
-  source: logo (card)
+  source: logo (Card)
+  mentioner: jz
+  mentionee: david
+
+logo_comment_david_mention_by_jz:
+  source: logo_agreement_jz (Comment)
   mentioner: jz
   mentionee: david
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index bea0e4d33..8c88d23d0 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -15,3 +15,15 @@ layout_commented_kevin:
   source: layout_commented (Event)
   created_at: <%= 1.week.ago %>
   creator: david
+
+logo_card_david_mention_by_jz:
+  user: david
+  source: logo_card_david_mention_by_jz (Mention)
+  created_at: <%= 1.week.ago %>
+  creator: david
+
+logo_comment_david_mention_by_jz:
+  user: david
+  source: logo_comment_david_mention_by_jz (Mention)
+  created_at: <%= 1.week.ago %>
+  creator: david
diff --git a/test/models/card/readable_test.rb b/test/models/card/readable_test.rb
new file mode 100644
index 000000000..b60d98a09
--- /dev/null
+++ b/test/models/card/readable_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class Card::ReadableTest < ActiveSupport::TestCase
+  test "read clears events notifications" do
+    assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+      assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
+        cards(:logo).read_by(users(:kevin))
+      end
+    end
+  end
+
+  test "read clear mentions in the description" do
+    assert_changes -> { notifications(:logo_card_david_mention_by_jz).reload.read? }, from: false, to: true do
+      cards(:logo).read_by(users(:david))
+    end
+  end
+
+  test "read clear mentions in comments" do
+    assert_changes -> { notifications(:logo_comment_david_mention_by_jz).reload.read? }, from: false, to: true do
+      cards(:logo).read_by(users(:david))
+    end
+  end
+end
diff --git a/test/models/user/mentionable_test.rb b/test/models/user/mentionable_test.rb
index 7231553c0..9bc441fe5 100644
--- a/test/models/user/mentionable_test.rb
+++ b/test/models/user/mentionable_test.rb
@@ -6,6 +6,8 @@ class User::MentionableTest < ActiveSupport::TestCase
   end
 
   test "mentioned by" do
+    users(:david).mentions.destroy_all
+
     assert_difference -> { users(:david).mentions.count }, +1 do
       users(:david).mentioned_by users(:jz), at: cards(:logo)
     end

From 38e16ab9ee31c3991e437355de1cc97eb569a948 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 12:20:25 +0200
Subject: [PATCH 279/413] Remove dummy test I had created for debugging
 purposes

---
 test/models/concerns/mentions_test.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb
index 7cdb331a2..3e856ab16 100644
--- a/test/models/concerns/mentions_test.rb
+++ b/test/models/concerns/mentions_test.rb
@@ -12,11 +12,4 @@ class MentionsTest < ActiveSupport::TestCase
       end
     end
   end
-
-  test "jorge" do
-    card = Card.find(cards(:logo).id)
-    card.update(description: "jorge")
-    card = Card.find(cards(:logo).id)
-    card.update(title: "jorge")
-  end
 end

From e8e3bd16a6fd82c5218149430de1b77e961e8273 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 06:51:29 +0200
Subject: [PATCH 280/413] First step to make events more generic in nature

---
 app/models/event.rb              | 4 ----
 app/models/event_summary.rb      | 2 +-
 app/views/events/_event.html.erb | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 0fe643bb5..1fc2fc5b6 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -2,12 +2,8 @@ class Event < ApplicationRecord
   include Notifiable, Particulars
 
   belongs_to :creator, class_name: "User"
-  belongs_to :summary, touch: true, class_name: "EventSummary"
   belongs_to :card
 
-  has_one :message, through: :summary
-  has_one :comment, through: :message, source: :messageable, source_type: "Comment"
-
   scope :chronologically, -> { order created_at: :asc, id: :desc }
 
   after_create -> { card.touch(:last_active_at) }
diff --git a/app/models/event_summary.rb b/app/models/event_summary.rb
index 241d3cc3c..99af2d0e1 100644
--- a/app/models/event_summary.rb
+++ b/app/models/event_summary.rb
@@ -1,7 +1,7 @@
 class EventSummary < ApplicationRecord
   include Messageable
 
-  has_many :events, -> { chronologically }, dependent: :delete_all, inverse_of: :summary
+  has_many :events, -> { chronologically }, dependent: :delete_all, foreign_key: :summary_id
 
   # FIXME: Consider persisting the body and compute at write time.
   def body
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index 58f84eb8f..2d37c5665 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -1,4 +1,4 @@
-<% card = event.summary.card %>
+<% card = event.card %>
 <% link = event.action == "commented" ? collection_card_path(card.collection, card, anchor: dom_id(event.comment)) : collection_card_path(card.collection, card) %>
 
 <%= link_to link,

From 54f4bd5144ef29f3cfb86eb6b1f644c58420a7bf Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 07:44:16 +0200
Subject: [PATCH 281/413] Generalize event's cards as eventable,add collection

Lots to tidy up but this is working
---
 app/controllers/concerns/events_timeline.rb   |  3 +-
 app/controllers/terminals_controller.rb       |  2 +-
 app/helpers/events_helper.rb                  | 33 +++----
 app/helpers/notifications_helper.rb           |  6 +-
 app/models/card/eventable.rb                  |  6 +-
 app/models/event.rb                           | 12 ++-
 app/models/event_summary.rb                   |  2 +-
 app/models/notifier/event_notifier.rb         |  8 +-
 app/views/events/_event.html.erb              |  2 +-
 .../notification/_event.html.erb              |  2 +-
 app/views/terminals/_event.html.erb           |  6 +-
 db/schema.rb                                  | 13 +--
 db/schema_cache.yml                           | 90 ++++++++++++-------
 test/fixtures/events.yml                      | 27 ++++--
 test/models/notifier/event_notifier_test.rb   |  2 +-
 15 files changed, 132 insertions(+), 82 deletions(-)

diff --git a/app/controllers/concerns/events_timeline.rb b/app/controllers/concerns/events_timeline.rb
index 0d50d2093..c051c370d 100644
--- a/app/controllers/concerns/events_timeline.rb
+++ b/app/controllers/concerns/events_timeline.rb
@@ -29,12 +29,11 @@ module EventsTimeline
     end
 
     def user_events
-      Event.where(card: user_cards)
+      Event.where(collection: collection_filter).where(eventable: user_cards)
     end
 
     def user_cards
       Current.user.accessible_cards
         .published_or_drafted_by(Current.user)
-        .where(collection_id: collection_filter)
     end
 end
diff --git a/app/controllers/terminals_controller.rb b/app/controllers/terminals_controller.rb
index 728ff9983..e2840773a 100644
--- a/app/controllers/terminals_controller.rb
+++ b/app/controllers/terminals_controller.rb
@@ -1,6 +1,6 @@
 class TerminalsController < ApplicationController
   def show
-    @events = Event.where(card: Current.user.accessible_cards, creator: Current.user).chronologically.reverse_order.limit(20)
+    @events = Event.where(eventable: Current.user.accessible_cards, creator: Current.user).chronologically.reverse_order.limit(20)
   end
 
   def edit
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 53732b327..1bcacaff5 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -45,10 +45,13 @@ module EventsHelper
     start_time = day.beginning_of_day
     end_time = day.end_of_day
 
-    accessible_events = Event.joins(card: :collection)
-      .merge(Current.user.collections)
+    collections = Current.user.collections
+    collections = collections.where(id: params[:collection_ids]) if params[:collection_ids].present?
+
+    # TODO: this needs tidying up
+    accessible_events = Event.where(eventable_type: "Card")
       .where(created_at: start_time..end_time)
-      .where(cards: { collection_id: params[:collection_ids].presence || Current.user.collection_ids })
+      .where(collection: collections)
 
     headers = {
       "Added" => accessible_events.where(action: "published").count,
@@ -66,30 +69,30 @@ module EventsHelper
     case event.action
     when "assigned"
       if event.assignees.include?(Current.user)
-        "#{ event.creator == Current.user ? "You" : event.creator.name } will handle <span style='color: var(--card-color)'>#{ event.card.title }</span>".html_safe
+        "#{ event.creator == Current.user ? "You" : event.creator.name } will handle <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
       else
-        "#{ event.creator == Current.user ? "You" : event.creator.name } assigned #{ event.assignees.pluck(:name).to_sentence } to <span style='color: var(--card-color)'>#{ event.card.title }</span>".html_safe
+        "#{ event.creator == Current.user ? "You" : event.creator.name } assigned #{ event.assignees.pluck(:name).to_sentence } to <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
       end
     when "unassigned"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence } from <span style='color: var(--card-color)'>#{ event.card.title }</span>".html_safe
+      "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence } from <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
     when "commented"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } commented on <span style='color: var(--card-color)'>#{ event.card.title }</span>".html_safe
+      "#{ event.creator == Current.user ? "You" : event.creator.name } commented on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
     when "published"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } added <span style='color: var(--card-color)'>#{ event.card.title }</span>".html_safe
+      "#{ event.creator == Current.user ? "You" : event.creator.name } added <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
     when "closed"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } closed <span style='color: var(--card-color)'>#{ event.card.title }</span>".html_safe
+      "#{ event.creator == Current.user ? "You" : event.creator.name } closed <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
     when "staged"
-      "#{event.creator == Current.user ? "You" : event.creator.name} moved <span style='color: var(--card-color)'>#{ event.card.title }</span> to the #{event.stage_name} stage".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} moved <span style='color: var(--card-color)'>#{ event.eventable.title }</span> to the #{event.stage_name} stage".html_safe
     when "unstaged"
-      "#{event.creator == Current.user ? "You" : event.creator.name} moved <span style='color: var(--card-color)'>#{ event.card.title }</span> out ofthe #{event.stage_name} stage".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} moved <span style='color: var(--card-color)'>#{ event.eventable.title }</span> out ofthe #{event.stage_name} stage".html_safe
     when "due_date_added"
-      "#{event.creator == Current.user ? "You" : event.creator.name} set the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ event.card.title }</span>".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} set the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
     when "due_date_changed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ event.card.title }</span>".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
     when "due_date_removed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} removed the date on <span style='color: var(--card-color)'>#{ event.card.title }</span>"
+      "#{event.creator == Current.user ? "You" : event.creator.name} removed the date on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>"
     when "title_changed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} renamed <span style='color: var(--card-color)'>#{ event.card.title }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} renamed <span style='color: var(--card-color)'>#{ event.eventable.title }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
     end
   end
 
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 5f61f99e9..cbb1774a0 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,9 +1,9 @@
 module NotificationsHelper
   def event_notification_title(event)
     case event_notification_action(event)
-    when "commented" then "RE: " + event.card.title
-    when "assigned" then "Assigned to you: " + event.card.title
-    else event.card.title
+    when "commented" then "RE: " + event.eventable.title
+    when "assigned" then "Assigned to you: " + event.eventable.title
+    else event.eventable.title
     end
   end
 
diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 55a0245ea..eb06ead4a 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -2,7 +2,7 @@ module Card::Eventable
   extend ActiveSupport::Concern
 
   included do
-    has_many :events, dependent: :destroy
+    has_many :events, as: :eventable, dependent: :destroy
 
     before_create { self.last_active_at = Time.current }
 
@@ -10,9 +10,9 @@ module Card::Eventable
     after_save :track_title_change, if: :saved_change_to_title?
   end
 
-  def track_event(action, creator: Current.user, **particulars)
+  def track_event(action, creator: Current.user, collection: self.collection, **particulars)
     if published?
-      find_or_capture_event_summary.events.create! action: action, creator: creator, card: self, particulars: particulars
+      find_or_capture_event_summary.events.create! action:, creator:, collection:, eventable: self, particulars:
     end
   end
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 1fc2fc5b6..9659ace63 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,12 +1,15 @@
 class Event < ApplicationRecord
   include Notifiable, Particulars
 
+  belongs_to :collection
   belongs_to :creator, class_name: "User"
-  belongs_to :card
+  belongs_to :eventable, polymorphic: true
+  belongs_to :summary, touch: true, class_name: "EventSummary"
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
 
-  after_create -> { card.touch(:last_active_at) }
+  # TODO: Remove dependency with last_active_at via hook
+  after_create -> { eventable.touch(:last_active_at) }
 
   def action
     super.inquiry
@@ -16,11 +19,12 @@ class Event < ApplicationRecord
     if action.commented?
       comment
     else
-      card
+      eventable
     end
   end
 
+  # TODO: This doesn't belong here anymore
   def initial_assignment?
-    action == "published" && card.assigned_to?(creator)
+    action == "published" && eventable.assigned_to?(creator)
   end
 end
diff --git a/app/models/event_summary.rb b/app/models/event_summary.rb
index 99af2d0e1..241d3cc3c 100644
--- a/app/models/event_summary.rb
+++ b/app/models/event_summary.rb
@@ -1,7 +1,7 @@
 class EventSummary < ApplicationRecord
   include Messageable
 
-  has_many :events, -> { chronologically }, dependent: :delete_all, foreign_key: :summary_id
+  has_many :events, -> { chronologically }, dependent: :delete_all, inverse_of: :summary
 
   # FIXME: Consider persisting the body and compute at write time.
   def body
diff --git a/app/models/notifier/event_notifier.rb b/app/models/notifier/event_notifier.rb
index ea771bc15..e7b11b4d8 100644
--- a/app/models/notifier/event_notifier.rb
+++ b/app/models/notifier/event_notifier.rb
@@ -1,12 +1,12 @@
 class Notifier::EventNotifier < Notifier
-  delegate :card, :creator, to: :source
+  delegate :creator, to: :source
   delegate :watchers_and_subscribers, to: :card
 
   private
     def recipients
       case source.action
       when "assigned"
-        source.assignees.excluding(card.collection.access_only_users)
+        source.assignees.excluding(source.collection.access_only_users)
       when "published"
         watchers_and_subscribers(include_only_watching: true).without(creator, *card.mentionees)
       when "commented"
@@ -15,4 +15,8 @@ class Notifier::EventNotifier < Notifier
         watchers_and_subscribers.without(creator)
       end
     end
+
+    def card
+      source.eventable
+    end
 end
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index 2d37c5665..4bde70fbb 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -1,4 +1,4 @@
-<% card = event.card %>
+<% card = event.eventable %>
 <% link = event.action == "commented" ? collection_card_path(card.collection, card, anchor: dom_id(event.comment)) : collection_card_path(card.collection, card) %>
 
 <%= link_to link,
diff --git a/app/views/notifications/notification/_event.html.erb b/app/views/notifications/notification/_event.html.erb
index 9a02db061..2dd8d16ee 100644
--- a/app/views/notifications/notification/_event.html.erb
+++ b/app/views/notifications/notification/_event.html.erb
@@ -4,4 +4,4 @@
 <div class="overflow-ellipsis txt-small txt-tight-lines">
   <%= event_notification_body(event) %>
 </div>
-<div class="tray__item-meta overflow-ellipsis translucent"><%= notification.source.card.collection.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
+<div class="tray__item-meta overflow-ellipsis translucent"><%= notification.source.collection.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
diff --git a/app/views/terminals/_event.html.erb b/app/views/terminals/_event.html.erb
index fd67cd405..b82c37ba6 100644
--- a/app/views/terminals/_event.html.erb
+++ b/app/views/terminals/_event.html.erb
@@ -1,5 +1,5 @@
 <li class="min-width overflow-ellipsis">
-  <%= link_to event_action_sentence(event), collection_card_path(event.card.collection, event.card), 
-      class: "terminal__link", 
+  <%= link_to event_action_sentence(event), collection_card_path(event.collection, event.eventable),
+      class: "terminal__link",
       data: { turbo_frame: "_top" } %>
-</li>
\ No newline at end of file
+</li>
diff --git a/db/schema.rb b/db/schema.rb
index 3a747df7f..ae4f7e3e4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_23_114737) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_24_051059) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -177,14 +177,17 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_23_114737) do
 
   create_table "events", force: :cascade do |t|
     t.string "action", null: false
-    t.integer "card_id", null: false
+    t.integer "collection_id", null: false
     t.datetime "created_at", null: false
     t.integer "creator_id", null: false
+    t.integer "eventable_id", null: false
+    t.string "eventable_type", null: false
     t.json "particulars", default: {}
     t.integer "summary_id", null: false
     t.datetime "updated_at", null: false
-    t.index ["card_id"], name: "index_events_on_card_id"
+    t.index ["collection_id"], name: "index_events_on_collection_id"
     t.index ["creator_id"], name: "index_events_on_creator_id"
+    t.index ["eventable_type", "eventable_id"], name: "index_events_on_eventable"
     t.index ["summary_id", "action"], name: "index_events_on_summary_id_and_action"
   end
 
@@ -237,7 +240,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_23_114737) do
     t.datetime "created_at", null: false
     t.integer "creator_id"
     t.datetime "read_at"
-    t.integer "source_id"
+    t.integer "source_id", null: false
     t.string "source_type", null: false
     t.datetime "updated_at", null: false
     t.integer "user_id", null: false
@@ -335,7 +338,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_23_114737) do
   add_foreign_key "closures", "cards"
   add_foreign_key "closures", "users"
   add_foreign_key "collections", "workflows"
-  add_foreign_key "events", "cards"
+  add_foreign_key "events", "collections"
   add_foreign_key "events", "event_summaries", column: "summary_id"
   add_foreign_key "mentions", "users", column: "mentionee_id"
   add_foreign_key "mentions", "users", column: "mentioner_id"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 42cd125c0..918fa9373 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -80,7 +80,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &27 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_id
     cast_type: *1
@@ -435,7 +435,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: title
     cast_type: *7
@@ -489,11 +489,11 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: all_access
-    cast_type: &30 !ruby/object:ActiveModel::Type::Boolean
+    cast_type: &31 !ruby/object:ActiveModel::Type::Boolean
       precision:
       scale:
       limit:
-    sql_type_metadata: &31 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &32 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: boolean
       type: :boolean
       limit:
@@ -545,9 +545,29 @@ columns:
     default_function:
     collation:
     comment:
-  - *21
+  - *22
   - *5
   - *23
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: eventable_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: eventable_type
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
   - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
@@ -617,7 +637,7 @@ columns:
     comment:
   filters_tags:
   - *18
-  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: tag_id
     cast_type: *1
@@ -650,7 +670,7 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &26 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: source_id
     cast_type: *1
@@ -660,7 +680,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &26 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &27 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: source_type
     cast_type: *7
@@ -719,25 +739,16 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: source_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   - *26
-  - *9
   - *27
+  - *9
+  - *28
   pins:
   - *21
   - *5
   - *6
   - *9
-  - *27
+  - *28
   reactions:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
@@ -817,24 +828,24 @@ columns:
     default_function:
     collation:
     comment:
-  - *27
+  - *28
   taggings:
   - *21
   - *5
   - *6
-  - *28
+  - *29
   - *9
   tags:
   - *5
   - *6
-  - *29
+  - *30
   - *9
   users:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: active
-    cast_type: *30
-    sql_type_metadata: *31
+    cast_type: *31
+    sql_type_metadata: *32
     'null': false
     default: true
     default_function:
@@ -879,12 +890,12 @@ columns:
   - *5
   - *6
   - *9
-  - *27
+  - *28
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: watching
-    cast_type: *30
-    sql_type_metadata: *31
+    cast_type: *31
+    sql_type_metadata: *32
     'null': false
     default: true
     default_function:
@@ -1493,10 +1504,10 @@ indexes:
   events:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: events
-    name: index_events_on_card_id
+    name: index_events_on_collection_id
     unique: false
     columns:
-    - card_id
+    - collection_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1523,6 +1534,23 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: events
+    name: index_events_on_eventable
+    unique: false
+    columns:
+    - eventable_type
+    - eventable_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: events
     name: index_events_on_summary_id_and_action
@@ -1998,4 +2026,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250423114737
+version: 20250424051059
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
index 61746d7fd..11c8b46e9 100644
--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -1,13 +1,15 @@
 logo_published:
   creator: david
-  card: logo
+  collection: writebook
+  eventable: logo (Card)
   action: published
   summary: logo_initial_activity
   created_at: <%= 1.week.ago %>
 
 logo_assignment_jz:
   creator: david
-  card: logo
+  collection: writebook
+  eventable: logo (Card)
   action: assigned
   summary: logo_initial_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
@@ -15,7 +17,8 @@ logo_assignment_jz:
 
 logo_assignment_km:
   creator: david
-  card: logo
+  collection: writebook
+  eventable: logo (Card)
   action: assigned
   summary: logo_second_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:kevin) ] }.to_json %>
@@ -23,14 +26,16 @@ logo_assignment_km:
 
 layout_published:
   creator: david
-  card: layout
+  collection: writebook
+  eventable: layout (Card)
   action: published
   summary: layout_initial_activity
   created_at: <%= 1.week.ago %>
 
 layout_commented:
   creator: david
-  card: layout
+  collection: writebook
+  eventable: layout (Card)
   action: commented
   summary: layout_initial_activity
   particulars: <%= { comment_id: ActiveRecord::FixtureSet.identify(:layout_overflowing_david) }.to_json %>
@@ -38,7 +43,8 @@ layout_commented:
 
 layout_assignment_jz:
   creator: david
-  card: layout
+  collection: writebook
+  eventable: layout (Card)
   action: assigned
   summary: layout_initial_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
@@ -46,21 +52,24 @@ layout_assignment_jz:
 
 text_published:
   creator: kevin
-  card: text
+  collection: writebook
+  eventable: text (Card)
   action: published
   summary: text_initial_activity
   created_at: <%= 1.week.ago %>
 
 shipping_published:
   creator: kevin
-  card: shipping
+  collection: writebook
+  eventable: shipping (Card)
   action: published
   summary: shipping_initial_activity
   created_at: <%= 1.week.ago %>
 
 shipping_closed:
   creator: kevin
-  card: shipping
+  collection: writebook
+  eventable: shipping (Card)
   action: closed
   summary: shipping_initial_activity
   created_at: <%= 2.days.ago %>
diff --git a/test/models/notifier/event_notifier_test.rb b/test/models/notifier/event_notifier_test.rb
index ca4f0b4b5..97b7f5f68 100644
--- a/test/models/notifier/event_notifier_test.rb
+++ b/test/models/notifier/event_notifier_test.rb
@@ -43,7 +43,7 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase
   test "links to the card" do
     Notifier.for(events(:logo_published)).notify
 
-    assert_equal cards(:logo), Notification.last.source.card
+    assert_equal cards(:logo), Notification.last.source.eventable
   end
 
   test "assignment events only create a notification for the assignee" do

From 965100df5171d9ce2b5908aaca4b272c5d3e397f Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 08:48:43 +0200
Subject: [PATCH 282/413] Access events through collections

---
 app/controllers/concerns/events_timeline.rb     | 13 ++-----------
 app/controllers/terminals_controller.rb         |  2 +-
 app/models/collection.rb                        |  1 +
 app/models/user/accessor.rb                     |  1 +
 .../20250424045407_make_events_eventable.rb     | 14 ++++++++++++++
 ...make_notifications_source_id_not_nullable.rb |  5 +++++
 ...0250424051059_add_collection_id_to_events.rb | 17 +++++++++++++++++
 7 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 db/migrate/20250424045407_make_events_eventable.rb
 create mode 100644 db/migrate/20250424045639_make_notifications_source_id_not_nullable.rb
 create mode 100644 db/migrate/20250424051059_add_collection_id_to_events.rb

diff --git a/app/controllers/concerns/events_timeline.rb b/app/controllers/concerns/events_timeline.rb
index c051c370d..681a190ee 100644
--- a/app/controllers/concerns/events_timeline.rb
+++ b/app/controllers/concerns/events_timeline.rb
@@ -19,21 +19,12 @@ module EventsTimeline
     end
 
     def events_for_activity_day
-      user_events.where(created_at: @activity_day.all_day)
+      Current.user.accessible_events.where(created_at: @activity_day.all_day)
         .group_by { |event| [ event.created_at.hour, helpers.event_column(event) ] }
         .map { |hour_col, events| [ hour_col, events.uniq { |e| e.id } ] }
     end
 
     def latest_event_before_activity_day
-      user_events.where(created_at: ...@activity_day.beginning_of_day).chronologically.last
-    end
-
-    def user_events
-      Event.where(collection: collection_filter).where(eventable: user_cards)
-    end
-
-    def user_cards
-      Current.user.accessible_cards
-        .published_or_drafted_by(Current.user)
+      Current.user.accessible_events.where(created_at: ...@activity_day.beginning_of_day).chronologically.last
     end
 end
diff --git a/app/controllers/terminals_controller.rb b/app/controllers/terminals_controller.rb
index e2840773a..552d285cd 100644
--- a/app/controllers/terminals_controller.rb
+++ b/app/controllers/terminals_controller.rb
@@ -1,6 +1,6 @@
 class TerminalsController < ApplicationController
   def show
-    @events = Event.where(eventable: Current.user.accessible_cards, creator: Current.user).chronologically.reverse_order.limit(20)
+    @events = Current.user.accessible_events.chronologically.reverse_order.limit(20)
   end
 
   def edit
diff --git a/app/models/collection.rb b/app/models/collection.rb
index 236208c16..9cee579e6 100644
--- a/app/models/collection.rb
+++ b/app/models/collection.rb
@@ -5,6 +5,7 @@ class Collection < ApplicationRecord
 
   has_many :cards, dependent: :destroy
   has_many :tags, -> { distinct }, through: :cards
+  has_many :events
 
   scope :alphabetically, -> { order("lower(name)") }
 end
diff --git a/app/models/user/accessor.rb b/app/models/user/accessor.rb
index 89534b777..45b73dcc0 100644
--- a/app/models/user/accessor.rb
+++ b/app/models/user/accessor.rb
@@ -5,6 +5,7 @@ module User::Accessor
     has_many :accesses, dependent: :destroy
     has_many :collections, through: :accesses
     has_many :accessible_cards, through: :collections, source: :cards
+    has_many :accessible_events, through: :collections, source: :events
 
     after_create_commit :grant_access_to_collections
   end
diff --git a/db/migrate/20250424045407_make_events_eventable.rb b/db/migrate/20250424045407_make_events_eventable.rb
new file mode 100644
index 000000000..3094a77ae
--- /dev/null
+++ b/db/migrate/20250424045407_make_events_eventable.rb
@@ -0,0 +1,14 @@
+class MakeEventsEventable < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :events, :eventable, polymorphic: true, index: true
+
+    execute <<~SQL
+      update events set eventable_type = 'Card', eventable_id = card_id;
+    SQL
+
+    change_column_null :events, :eventable_id, false
+    change_column_null :events, :eventable_type, false
+
+    remove_reference :events, :card
+  end
+end
diff --git a/db/migrate/20250424045639_make_notifications_source_id_not_nullable.rb b/db/migrate/20250424045639_make_notifications_source_id_not_nullable.rb
new file mode 100644
index 000000000..512a9e34f
--- /dev/null
+++ b/db/migrate/20250424045639_make_notifications_source_id_not_nullable.rb
@@ -0,0 +1,5 @@
+class MakeNotificationsSourceIdNotNullable < ActiveRecord::Migration[8.1]
+  def change
+    change_column_null :notifications, :source_id, false
+  end
+end
diff --git a/db/migrate/20250424051059_add_collection_id_to_events.rb b/db/migrate/20250424051059_add_collection_id_to_events.rb
new file mode 100644
index 000000000..50f8e2432
--- /dev/null
+++ b/db/migrate/20250424051059_add_collection_id_to_events.rb
@@ -0,0 +1,17 @@
+class AddCollectionIdToEvents < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :events, :collection, foreign_key: true, index: true
+
+    execute <<~SQL
+      UPDATE events
+      SET collection_id = (
+        SELECT cards.collection_id
+        FROM cards
+        WHERE cards.id = events.eventable_id
+      )
+      WHERE eventable_type = 'Card' 
+    SQL
+
+    change_column_null :events, :collection_id, false
+  end
+end

From 13b0c0fc41c424706461833e6416e6b9a3997f73 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 10:39:17 +0200
Subject: [PATCH 283/413] First pass to tidy up activity time rendering

---
 .../concerns/collection_filterable.rb         | 24 ----------
 .../concerns/days_timeline_scoped.rb          | 44 +++++++++++++++++++
 app/controllers/concerns/events_timeline.rb   | 30 -------------
 app/controllers/events/days_controller.rb     |  4 +-
 app/controllers/events_controller.rb          |  9 +---
 app/helpers/events_helper.rb                  | 30 ++-----------
 app/helpers/filters_helper.rb                 | 14 +++++-
 app/models/user.rb                            |  1 +
 app/models/user/accessor.rb                   |  1 -
 app/models/user/day_timeline.rb               | 44 +++++++++++++++++++
 app/models/user/timelined.rb                  | 11 +++++
 app/presenters/collection_filter_presenter.rb | 29 ------------
 app/views/events/_day.html.erb                | 29 +++++++-----
 app/views/events/_empty_days.html.erb         |  2 +
 app/views/events/_event.html.erb              | 11 ++---
 app/views/events/_filter.html.erb             |  7 ++-
 app/views/events/days/index.turbo_stream.erb  |  4 +-
 app/views/events/index.html.erb               |  6 +--
 config/routes.rb                              |  4 ++
 ...50424051059_add_collection_id_to_events.rb |  2 +-
 20 files changed, 154 insertions(+), 152 deletions(-)
 delete mode 100644 app/controllers/concerns/collection_filterable.rb
 create mode 100644 app/controllers/concerns/days_timeline_scoped.rb
 delete mode 100644 app/controllers/concerns/events_timeline.rb
 create mode 100644 app/models/user/day_timeline.rb
 create mode 100644 app/models/user/timelined.rb
 delete mode 100644 app/presenters/collection_filter_presenter.rb

diff --git a/app/controllers/concerns/collection_filterable.rb b/app/controllers/concerns/collection_filterable.rb
deleted file mode 100644
index 4bd5ff9f1..000000000
--- a/app/controllers/concerns/collection_filterable.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module CollectionFilterable
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :set_collection_filter
-  end
-
-  private
-    def set_collection_filter
-      params[:collection_ids] ||= cookies[:collection_filter]&.split(",") unless params[:clear_filter]
-    end
-
-    def collection_filter
-      params[:collection_ids].presence || Current.user.collection_ids
-    end
-
-    def update_collection_filter
-      if params[:clear_filter]
-        cookies.delete(:collection_filter)
-      elsif params[:collection_ids].present?
-        cookies[:collection_filter] = params[:collection_ids].join(",")
-      end
-    end
-end
diff --git a/app/controllers/concerns/days_timeline_scoped.rb b/app/controllers/concerns/days_timeline_scoped.rb
new file mode 100644
index 000000000..67fab2d1c
--- /dev/null
+++ b/app/controllers/concerns/days_timeline_scoped.rb
@@ -0,0 +1,44 @@
+module DaysTimelineScoped
+  extend ActiveSupport::Concern
+
+  included do
+    include FilterScoped
+
+    before_action :clear_collection_filter, if: -> { params[:clear_filter] }
+    before_action :restore_filter_from_cookie
+    before_action :set_day_timeline
+
+    after_action :save_collection_filter
+  end
+
+  private
+    def clear_collection_filter
+      cookies.delete(:collection_filter)
+    end
+
+    def restore_filter_from_cookie
+      if cookies[:collection_filter].present?
+        @filter.collection_ids = cookies[:collection_filter].split(",")
+      end
+    end
+
+    def set_day_timeline
+      @day_timeline = Current.user.timeline_for(activity_day, filter: @filter)
+    end
+
+    def activity_day
+      if params[:day].present?
+        Time.zone.parse(params[:day])
+      else
+        Time.current
+      end
+    rescue ArgumentError
+      head :not_found
+    end
+
+    def save_collection_filter
+      if params[:collection_ids].present?
+        cookies[:collection_filter] = params[:collection_ids].join(",")
+      end
+    end
+end
diff --git a/app/controllers/concerns/events_timeline.rb b/app/controllers/concerns/events_timeline.rb
deleted file mode 100644
index 681a190ee..000000000
--- a/app/controllers/concerns/events_timeline.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-module EventsTimeline
-  extend ActiveSupport::Concern
-
-  include CollectionFilterable
-
-  included do
-    before_action :set_activity_day
-  end
-
-  private
-    def set_activity_day
-      @activity_day = if params[:day].present?
-        Time.zone.parse(params[:day])
-      else
-        Time.zone.now
-      end
-    rescue ArgumentError
-      raise ActionController::RoutingError
-    end
-
-    def events_for_activity_day
-      Current.user.accessible_events.where(created_at: @activity_day.all_day)
-        .group_by { |event| [ event.created_at.hour, helpers.event_column(event) ] }
-        .map { |hour_col, events| [ hour_col, events.uniq { |e| e.id } ] }
-    end
-
-    def latest_event_before_activity_day
-      Current.user.accessible_events.where(created_at: ...@activity_day.beginning_of_day).chronologically.last
-    end
-end
diff --git a/app/controllers/events/days_controller.rb b/app/controllers/events/days_controller.rb
index c2966357d..4f44522ed 100644
--- a/app/controllers/events/days_controller.rb
+++ b/app/controllers/events/days_controller.rb
@@ -1,8 +1,6 @@
 class Events::DaysController < ApplicationController
-  include EventsTimeline
+  include DaysTimelineScoped
 
   def index
-    @events = events_for_activity_day
-    @next_day = latest_event_before_activity_day&.created_at
   end
 end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index a3c8a9157..65a9a6e8a 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,13 +1,6 @@
 class EventsController < ApplicationController
-  include EventsTimeline
+  include DaysTimelineScoped
 
   def index
-    update_collection_filter
-
-    @collections = Current.user.collections.alphabetically
-    @filters = Current.user.filters.all
-
-    @events = events_for_activity_day
-    @next_day = latest_event_before_activity_day&.created_at
   end
 end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 1bcacaff5..825f81bfc 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -1,15 +1,4 @@
 module EventsHelper
-  def event_day_title(day)
-    case
-    when day.today?
-      "Today"
-    when day.yesterday?
-      "Yesterday"
-    else
-      day.strftime("%A, %B %e")
-    end
-  end
-
   def event_column(event)
     case event.action
     when "closed"
@@ -33,7 +22,7 @@ module EventsHelper
     end
   end
 
-  def render_event_grid_cells(day, columns: 4, rows: 24)
+  def render_event_grid_cells(columns: 4, rows: 24)
     safe_join((2..rows + 1).map do |row|
       (1..columns).map do |col|
         tag.div class: class_names("event__grid-item"), style: "grid-area: #{row}/#{col};"
@@ -41,22 +30,11 @@ module EventsHelper
     end.flatten)
   end
 
-  def render_column_headers(day = Date.current)
-    start_time = day.beginning_of_day
-    end_time = day.end_of_day
-
-    collections = Current.user.collections
-    collections = collections.where(id: params[:collection_ids]) if params[:collection_ids].present?
-
-    # TODO: this needs tidying up
-    accessible_events = Event.where(eventable_type: "Card")
-      .where(created_at: start_time..end_time)
-      .where(collection: collections)
-
+  def render_column_headers(day_timeline)
     headers = {
-      "Added" => accessible_events.where(action: "published").count,
+      "Added" => day_timeline.events.where(action: "published").count,
       "Updated" => nil,
-      "Closed" => accessible_events.where(action: "closed").count
+      "Closed" => day_timeline.events.where(action: "closed").count
     }
 
     headers.map do |header, count|
diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index c2c1d0dc5..aae65bf6b 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -21,9 +21,19 @@ module FiltersHelper
     hidden_field_tag name, value, id: nil
   end
 
+  def filter_selected_collections_label(filter)
+    selected_collections = if filter.collections.any?
+      filter.collections.collect { "<strong>#{it.name}</strong>" }.uniq.sort.to_sentence
+    else
+      "all collections"
+    end
+
+    "Activity in #{selected_collections}".html_safe
+  end
+
   def any_filters?(filter)
     filter.tags.any? || filter.assignees.any? || filter.creators.any? ||
-    filter.stages.any? || filter.terms.any? ||
-    filter.assignment_status.unassigned? || !filter.default_indexed_by?
+      filter.stages.any? || filter.terms.any? ||
+      filter.assignment_status.unassigned? || !filter.default_indexed_by?
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 90539679b..370aae05c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,6 @@
 class User < ApplicationRecord
   include Accessor, Assignee, Mentionable, Named, Role, Transferable
+  include Timelined # Depends on Accessor
 
   has_one_attached :avatar
 
diff --git a/app/models/user/accessor.rb b/app/models/user/accessor.rb
index 45b73dcc0..89534b777 100644
--- a/app/models/user/accessor.rb
+++ b/app/models/user/accessor.rb
@@ -5,7 +5,6 @@ module User::Accessor
     has_many :accesses, dependent: :destroy
     has_many :collections, through: :accesses
     has_many :accessible_cards, through: :collections, source: :cards
-    has_many :accessible_events, through: :collections, source: :events
 
     after_create_commit :grant_access_to_collections
   end
diff --git a/app/models/user/day_timeline.rb b/app/models/user/day_timeline.rb
new file mode 100644
index 000000000..01ec9e56b
--- /dev/null
+++ b/app/models/user/day_timeline.rb
@@ -0,0 +1,44 @@
+class User::DayTimeline
+  attr_reader :user, :day, :filter
+
+  def initialize(user, day, filter)
+    @user, @day, @filter = user, day, filter
+  end
+
+  def has_activity?
+    events.any?
+  end
+
+  def events
+    filtered_events.where(created_at: window).order(created_at: :desc)
+  end
+
+  def window
+    day.all_day
+  end
+
+  def next_day
+    latest_event_before&.created_at
+  end
+
+  def collections
+    filter.collections.presence || user.collections
+  end
+
+  def earliest_time
+    next_day&.tomorrow&.beginning_of_day
+  end
+
+  def latest_time
+    day.yesterday.beginning_of_day
+  end
+
+  private
+    def filtered_events
+      @filtered_events ||= Event.where(collection: collections)
+    end
+
+    def latest_event_before
+      filtered_events.where(created_at: ...day.beginning_of_day).chronologically.last
+    end
+end
diff --git a/app/models/user/timelined.rb b/app/models/user/timelined.rb
new file mode 100644
index 000000000..1f5f2c8fe
--- /dev/null
+++ b/app/models/user/timelined.rb
@@ -0,0 +1,11 @@
+module User::Timelined
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :accessible_events, through: :collections, source: :events
+  end
+
+  def timeline_for(day, filter:)
+    User::DayTimeline.new(self, day, filter)
+  end
+end
diff --git a/app/presenters/collection_filter_presenter.rb b/app/presenters/collection_filter_presenter.rb
deleted file mode 100644
index 507069218..000000000
--- a/app/presenters/collection_filter_presenter.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class CollectionFilterPresenter
-  def initialize(collections, params, cookies)
-    @collections = collections
-    @params = params
-    @cookies = cookies
-  end
-
-  def filter_text
-    if selected_collection_ids.present?
-      "Activity in #{selected_collection_names_bold}".html_safe
-    else
-      "Activity in all collections"
-    end
-  end
-
-  private
-    def selected_collection_ids
-      @params[:collection_ids].presence || @cookies[:collection_filter]&.split(",")
-    end
-
-    def selected_collection_names
-      @collections.where(id: selected_collection_ids).pluck(:name).to_sentence
-    end
-
-    def selected_collection_names_bold
-      names = @collections.where(id: selected_collection_ids).pluck(:name)
-      names.map { |name| "<strong>#{name}</strong>" }.to_sentence
-    end
-end
diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb
index 7426e1cc8..e8c95df09 100644
--- a/app/views/events/_day.html.erb
+++ b/app/views/events/_day.html.erb
@@ -1,25 +1,30 @@
 <div class="events--day" data-controller="related-element"
-     data-related-element-highlight-class="event--related">
-  <% if events.any? %>
+  data-related-element-highlight-class="event--related">
+  <% if day_timeline.has_activity? %>
     <h2 class="txt-medium events__day-header center">
-      <span class="events__day-header-content"><%= event_day_title(activity_day) %></span>
+      <span class="events__day-header-content">
+        <% # TODO: Create proper format to match desired behavior: Today, tomorrow or date %>
+        <%= local_datetime_tag day_timeline.day, style: :daysago, class: "txt-ink translucent" %>
+      </span>
     </h2>
 
     <div class="center events">
-      <%= render_column_headers(activity_day) %>
-      <%= render_event_grid_cells(activity_day) %>
+      <%= render_column_headers(day_timeline) %>
+      <%= render_event_grid_cells %>
 
-      <% events.each do | hour_column, cluster| %>
-        <%= event_cluster_tag(*hour_column) do %>
-          <%= render partial: "events/event", collection: cluster.sort_by(&:created_at).reverse %>
+      <% day_timeline.events.group_by { it.created_at.hour }.each do |hour, events| %>
+        <% events.group_by { event_column(it) }.each do |column, events| %>
+          <%= event_cluster_tag(hour, column) do %>
+            <%= render partial: "events/event", collection: events %>
 
-          <%= local_datetime_tag cluster.first.created_at, class: "event__timestamp txt-small translucent" %>
-        <% end %>
+            <%= local_datetime_tag events.first.created_at, class: "event__timestamp txt-small translucent" %>
+          <% end %>
+        <% end %> %>
       <% end %>
     </div>
 
-    <%= render "events/empty_days", earliest: next_day&.tomorrow&.beginning_of_day, latest: activity_day.yesterday.beginning_of_day %>
+    <%= render "events/empty_days", day_timeline: day_timeline %>
   <% else %>
-    <%= render "events/empty_days", earliest: next_day&.tomorrow&.beginning_of_day, latest: activity_day.beginning_of_day %>
+    <%= render "events/empty_days", day_timeline: day_timeline %>
   <% end %>
 </div>
diff --git a/app/views/events/_empty_days.html.erb b/app/views/events/_empty_days.html.erb
index d67dea429..4ba5687e3 100644
--- a/app/views/events/_empty_days.html.erb
+++ b/app/views/events/_empty_days.html.erb
@@ -1,3 +1,5 @@
+<% earliest, latest = day_timeline.earliest_time, day_timeline.latest_time %>
+
 <% if earliest.present? %>
   <% if earliest == latest %>
     <div class="events--none txt-align-center">
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index 4bde70fbb..a27058abe 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -1,12 +1,9 @@
-<% card = event.eventable %>
-<% link = event.action == "commented" ? collection_card_path(card.collection, card, anchor: dom_id(event.comment)) : collection_card_path(card.collection, card) %>
-
-<%= link_to link,
+<%= link_to event.eventable,
       class: "event event--#{ event.action } panel center center-block flex-inline align-start justify-start gap position-relative",
-      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
+      style: "--card-color: #{ event.eventable.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
   color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));",
       data: { related_element_target: "related",
-              related_element_group_value: card.id,
+              related_element_group_value: event.eventable.id,
               action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %>
   <div class="avatar txt-x-small flex-item-no-shrink">
     <%= avatar_image_tag(event.creator) %>
@@ -31,6 +28,6 @@
       </span>
     <% end %>
 
-    <span class="event__collection"><%= card.collection.name %></span>
+    <span class="event__collection"><%= event.collection.name %></span>
   </div>
 <% end %>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 74e25af7a..6abe2244d 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -1,9 +1,8 @@
-<% presenter = CollectionFilterPresenter.new(@collections, params, cookies) %>
 <div class="max-width margin-block-end-half"
 		data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
 	<button class="events__filter-btn input input--select flex-inline center min-width max-width txt-small" data-action="click->dialog#open:stop">
 		<span class="overflow-ellipsis center">
-			<%= presenter.filter_text %>
+			<%= filter_selected_collections_label(filter) %>
 		</span>
 	</button>
 
@@ -45,7 +44,7 @@
 				<span class="translucent flex-item-no-shrink"> ›</span>
 			<% end %>
 
-			<% @collections.each do |collection| %>
+			<% Current.user.collections.each do |collection| %>
 				<div class="popup__group flex align-center">
 					<div class="btn txt-xx-small">
 						<%= form.check_box "collection_ids[]", {
@@ -63,7 +62,7 @@
 					<%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
 						<span class="overflow-ellipsis"><%= collection.name %></span>
 					<% end %>
-			
+
 					<span class="translucent flex-item-no-shrink"> ›</span>
 				</div>
 			<% end %>
diff --git a/app/views/events/days/index.turbo_stream.erb b/app/views/events/days/index.turbo_stream.erb
index 984b01ea3..cceb2d352 100644
--- a/app/views/events/days/index.turbo_stream.erb
+++ b/app/views/events/days/index.turbo_stream.erb
@@ -1,7 +1,7 @@
 <%= turbo_stream.append :activity do %>
-  <%= render "events/day", activity_day: @activity_day, next_day: @next_day, events: @events %>
+  <%= render "events/day", day_timeline: @day_timeline %>
 <% end %>
 
 <%= turbo_stream.replace :next_page do %>
-  <%= event_next_page_link(@next_day) %>
+  <%= event_next_page_link(@day_timeline.next_day) %>
 <% end %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index ff113b77b..2c4678fde 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -6,7 +6,7 @@
 
     <div class="events__index-header flex-inline flex-column center gap-half margin-block-end-double txt-align-center">
       <h2 class="txt-large txt-nowrap center"><%= Account.sole.name %> / Latest activity</h2>
-      <%= render "events/filter" %>
+      <%= render "events/filter", filter: @filter %>
     </div>
 
     <%= link_to users_path, class: "btn flex-item-justify-end" do %>
@@ -19,8 +19,8 @@
 <div class="events__container align-start gap">
   <div class="flex flex-column">
     <div id="activity" class="events__index flex flex-column">
-      <%= render "events/day", activity_day: @activity_day, next_day: @next_day, events: @events %>
+      <%= render "events/day", day_timeline: @day_timeline %>
     </div>
-    <%= event_next_page_link(@next_day) %>
+    <%= event_next_page_link(@day_timeline.next_day) %>
   </div>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index 839bfe940..762985595 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,6 +111,10 @@ Rails.application.routes.draw do
     polymorphic_path(notification.notifiable_target, options)
   end
 
+  resolve "Event" do |event, options|
+    polymorphic_path(event.target, options)
+  end
+
   get "up", to: "rails/health#show", as: :rails_health_check
   get "manifest" => "rails/pwa#manifest", as: :pwa_manifest
 
diff --git a/db/migrate/20250424051059_add_collection_id_to_events.rb b/db/migrate/20250424051059_add_collection_id_to_events.rb
index 50f8e2432..6270d27c5 100644
--- a/db/migrate/20250424051059_add_collection_id_to_events.rb
+++ b/db/migrate/20250424051059_add_collection_id_to_events.rb
@@ -9,7 +9,7 @@ class AddCollectionIdToEvents < ActiveRecord::Migration[8.1]
         FROM cards
         WHERE cards.id = events.eventable_id
       )
-      WHERE eventable_type = 'Card' 
+      WHERE eventable_type = 'Card'#{' '}
     SQL
 
     change_column_null :events, :collection_id, false

From aee7f4f8866034e57b058cbf12367b9dc23e0926 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 12:34:33 +0200
Subject: [PATCH 284/413] Not used

---
 app/models/card.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index a1d8e5115..4344d89b1 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -31,8 +31,4 @@ class Card < ApplicationRecord
   def cache_key
     [ super, collection.name ].compact.join("/")
   end
-
-  def was_mentioned(mention)
-    watch_by(mention.mentionee)
-  end
 end

From e8cffd0717f5bb9aa77ee143278e1cdb8ff40ba9 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 12:37:25 +0200
Subject: [PATCH 285/413] Add missing test

---
 test/models/concerns/mentions_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb
index 3e856ab16..f7454a322 100644
--- a/test/models/concerns/mentions_test.rb
+++ b/test/models/concerns/mentions_test.rb
@@ -12,4 +12,11 @@ class MentionsTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test "mentionees are added as watchers of the card" do
+    perform_enqueued_jobs only: Mention::CreateJob do
+      card = collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup @kevin?"
+      assert card.watchers.include?(users(:kevin))
+    end
+  end
 end

From b7469877121bff1eaef5a3849b6e1726e685d9bf Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 13:04:43 +0200
Subject: [PATCH 286/413] Make eventable a generic concern and create a card's
 especialization for it

---
 app/models/card/eventable.rb                  | 27 +++++++++++--------
 app/models/event.rb                           |  5 ++--
 app/models/eventable.rb                       | 21 +++++++++++++++
 ...50424105223_make_event_summary_optional.rb |  5 ++++
 db/schema.rb                                  |  4 +--
 db/schema_cache.yml                           |  4 +--
 6 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 app/models/eventable.rb
 create mode 100644 db/migrate/20250424105223_make_event_summary_optional.rb

diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index eb06ead4a..7ac190f3d 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -1,22 +1,33 @@
 module Card::Eventable
   extend ActiveSupport::Concern
 
-  included do
-    has_many :events, as: :eventable, dependent: :destroy
+  include ::Eventable
 
+  included do
     before_create { self.last_active_at = Time.current }
 
     after_save :track_due_date_change, if: :saved_change_to_due_on?
     after_save :track_title_change, if: :saved_change_to_title?
   end
 
-  def track_event(action, creator: Current.user, collection: self.collection, **particulars)
-    if published?
-      find_or_capture_event_summary.events.create! action:, creator:, collection:, eventable: self, particulars:
+  def event_was_created(event)
+    transaction do
+      find_or_capture_event_summary.events << event
+      touch(:last_active_at)
     end
   end
 
   private
+    def should_track_event?
+      published?
+    end
+
+    def find_or_capture_event_summary
+      transaction do
+        messages.last&.event_summary || capture(EventSummary.new).event_summary
+      end
+    end
+
     def track_due_date_change
       if due_on.present?
         if due_on_before_last_save.nil?
@@ -34,10 +45,4 @@ module Card::Eventable
         track_event "title_changed", particulars: { old_title: title_before_last_save, new_title: title }
       end
     end
-
-    def find_or_capture_event_summary
-      transaction do
-        messages.last&.event_summary || capture(EventSummary.new).event_summary
-      end
-    end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index 9659ace63..3b2dca64c 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -4,12 +4,11 @@ class Event < ApplicationRecord
   belongs_to :collection
   belongs_to :creator, class_name: "User"
   belongs_to :eventable, polymorphic: true
-  belongs_to :summary, touch: true, class_name: "EventSummary"
+  belongs_to :summary, touch: true, class_name: "EventSummary", optional: true
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
 
-  # TODO: Remove dependency with last_active_at via hook
-  after_create -> { eventable.touch(:last_active_at) }
+  after_create -> { eventable.event_was_created(self) }
 
   def action
     super.inquiry
diff --git a/app/models/eventable.rb b/app/models/eventable.rb
new file mode 100644
index 000000000..183c638d5
--- /dev/null
+++ b/app/models/eventable.rb
@@ -0,0 +1,21 @@
+module Eventable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :events, as: :eventable, dependent: :destroy
+  end
+
+  def track_event(action, creator: Current.user, collection: self.collection, **particulars)
+    if should_track_event?
+      collection.events.create!(action:, creator:, collection:, eventable: self, particulars:)
+    end
+  end
+
+  def event_was_created(event)
+  end
+
+  private
+    def should_track_event?
+      true
+    end
+end
diff --git a/db/migrate/20250424105223_make_event_summary_optional.rb b/db/migrate/20250424105223_make_event_summary_optional.rb
new file mode 100644
index 000000000..f8701dc38
--- /dev/null
+++ b/db/migrate/20250424105223_make_event_summary_optional.rb
@@ -0,0 +1,5 @@
+class MakeEventSummaryOptional < ActiveRecord::Migration[8.1]
+  def change
+    change_column_null :events, :summary_id, true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ae4f7e3e4..c318b2ee1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_24_051059) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_24_105223) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -183,7 +183,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_24_051059) do
     t.integer "eventable_id", null: false
     t.string "eventable_type", null: false
     t.json "particulars", default: {}
-    t.integer "summary_id", null: false
+    t.integer "summary_id"
     t.datetime "updated_at", null: false
     t.index ["collection_id"], name: "index_events_on_collection_id"
     t.index ["creator_id"], name: "index_events_on_creator_id"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 918fa9373..208449c4b 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -592,7 +592,7 @@ columns:
     name: summary_id
     cast_type: *1
     sql_type_metadata: *2
-    'null': false
+    'null': true
     default:
     default_function:
     collation:
@@ -2026,4 +2026,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250424051059
+version: 20250424105223

From 18cc24e1d3ed11241e997974231df36b56ce96e5 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 13:20:09 +0200
Subject: [PATCH 287/413] Add an event prefix named after the model now that
 events are generic

---
 app/helpers/events_helper.rb          | 42 +++++++++++++--------------
 app/helpers/notifications_helper.rb   | 12 ++++----
 app/models/card/eventable.rb          |  8 ++---
 app/models/event.rb                   |  2 +-
 app/models/event_summary.rb           | 18 ++++++------
 app/models/eventable.rb               |  6 +++-
 app/models/notifier/event_notifier.rb |  6 ++--
 app/views/events/_event.html.erb      |  2 +-
 test/fixtures/events.yml              | 18 ++++++------
 test/integration/card_messages.rb     |  2 +-
 test/models/card/staged_test.rb       |  2 +-
 test/models/card_test.rb              |  6 ++--
 12 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 825f81bfc..6a8ebe03f 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -1,9 +1,9 @@
 module EventsHelper
   def event_column(event)
     case event.action
-    when "closed"
+    when "card_closed"
       3
-    when "published"
+    when "card_published"
       1
     else
       2
@@ -32,9 +32,9 @@ module EventsHelper
 
   def render_column_headers(day_timeline)
     headers = {
-      "Added" => day_timeline.events.where(action: "published").count,
+      "Added" => day_timeline.events.where(action: "card_published").count,
       "Updated" => nil,
-      "Closed" => day_timeline.events.where(action: "closed").count
+      "Closed" => day_timeline.events.where(action: "card_closed").count
     }
 
     headers.map do |header, count|
@@ -45,46 +45,46 @@ module EventsHelper
 
   def event_action_sentence(event)
     case event.action
-    when "assigned"
+    when "card_assigned"
       if event.assignees.include?(Current.user)
         "#{ event.creator == Current.user ? "You" : event.creator.name } will handle <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
       else
         "#{ event.creator == Current.user ? "You" : event.creator.name } assigned #{ event.assignees.pluck(:name).to_sentence } to <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
       end
-    when "unassigned"
+    when "card_unassigned"
       "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence } from <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
-    when "commented"
+    when "card_commented"
       "#{ event.creator == Current.user ? "You" : event.creator.name } commented on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
-    when "published"
+    when "card_published"
       "#{ event.creator == Current.user ? "You" : event.creator.name } added <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
-    when "closed"
+    when "card_closed"
       "#{ event.creator == Current.user ? "You" : event.creator.name } closed <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
-    when "staged"
+    when "card_staged"
       "#{event.creator == Current.user ? "You" : event.creator.name} moved <span style='color: var(--card-color)'>#{ event.eventable.title }</span> to the #{event.stage_name} stage".html_safe
-    when "unstaged"
+    when "card_unstaged"
       "#{event.creator == Current.user ? "You" : event.creator.name} moved <span style='color: var(--card-color)'>#{ event.eventable.title }</span> out ofthe #{event.stage_name} stage".html_safe
-    when "due_date_added"
+    when "card_due_date_added"
       "#{event.creator == Current.user ? "You" : event.creator.name} set the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
-    when "due_date_changed"
+    when "card_due_date_changed"
       "#{event.creator == Current.user ? "You" : event.creator.name} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
-    when "due_date_removed"
+    when "card_due_date_removed"
       "#{event.creator == Current.user ? "You" : event.creator.name} removed the date on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>"
-    when "title_changed"
+    when "card_title_changed"
       "#{event.creator == Current.user ? "You" : event.creator.name} renamed <span style='color: var(--card-color)'>#{ event.eventable.title }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
     end
   end
 
   def event_action_icon(event)
     case event.action
-    when "assigned"
-      "assigned"
-    when "staged"
+    when "card_assigned"
+      "card_assigned"
+    when "card_staged"
       "bolt"
-    when "unstaged"
+    when "card_unstaged"
       "bolt"
-    when "commented"
+    when "card_commented"
       "comment"
-    when "title_changed"
+    when "card_title_changed"
       "rename"
     else
       "person"
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index cbb1774a0..344e5c0f4 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,8 +1,8 @@
 module NotificationsHelper
   def event_notification_title(event)
     case event_notification_action(event)
-    when "commented" then "RE: " + event.eventable.title
-    when "assigned" then "Assigned to you: " + event.eventable.title
+    when "card_commented" then "RE: " + event.eventable.title
+    when "card_assigned" then "Assigned to you: " + event.eventable.title
     else event.eventable.title
     end
   end
@@ -11,9 +11,9 @@ module NotificationsHelper
     name = event.creator.name
 
     case event_notification_action(event)
-    when "closed" then "Closed by #{name}"
-    when "published" then "Added by #{name}"
-    when "commented" then comment_notification_body(event)
+    when "card_closed" then "Closed by #{name}"
+    when "card_published" then "Added by #{name}"
+    when "card_commented" then comment_notification_body(event)
     else name
     end
   end
@@ -49,7 +49,7 @@ module NotificationsHelper
   private
     def event_notification_action(event)
       if event.initial_assignment?
-        "assigned"
+        "card_assigned"
       else
         event.action
       end
diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 7ac190f3d..51c760fde 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -31,18 +31,18 @@ module Card::Eventable
     def track_due_date_change
       if due_on.present?
         if due_on_before_last_save.nil?
-          track_event("due_date_added", particulars: { due_date: due_on })
+          track_event("card_due_date_added", particulars: { due_date: due_on })
         else
-          track_event("due_date_changed", particulars: { due_date: due_on })
+          track_event("card_due_date_changed", particulars: { due_date: due_on })
         end
       elsif due_on_before_last_save.present?
-        track_event("due_date_removed")
+        track_event("card_due_date_removed")
       end
     end
 
     def track_title_change
       if title_before_last_save.present?
-        track_event "title_changed", particulars: { old_title: title_before_last_save, new_title: title }
+        track_event "card_title_changed", particulars: { old_title: title_before_last_save, new_title: title }
       end
     end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index 3b2dca64c..1cf31aa13 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -24,6 +24,6 @@ class Event < ApplicationRecord
 
   # TODO: This doesn't belong here anymore
   def initial_assignment?
-    action == "published" && eventable.assigned_to?(creator)
+    action == "card_published" && eventable.assigned_to?(creator)
   end
 end
diff --git a/app/models/event_summary.rb b/app/models/event_summary.rb
index 241d3cc3c..f04841e66 100644
--- a/app/models/event_summary.rb
+++ b/app/models/event_summary.rb
@@ -13,23 +13,23 @@ class EventSummary < ApplicationRecord
 
     def summarize(event)
       case event.action
-      when "assigned"
+      when "card_assigned"
         "Assigned to #{event.assignees.pluck(:name).to_sentence}."
-      when "unassigned"
+      when "card_unassigned"
         "Unassigned from #{event.assignees.pluck(:name).to_sentence}."
-      when "staged"
+      when "card_staged"
         "#{event.creator.name} moved this to '#{event.stage_name}'."
-      when "closed"
+      when "card_closed"
         "Closed by #{ event.creator.name }"
-      when "unstaged"
+      when "card_unstaged"
         "#{event.creator.name} removed this from '#{event.stage_name}'."
-      when "due_date_added"
+      when "card_due_date_added"
         "#{event.creator.name} set due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
-      when "due_date_changed"
+      when "card_due_date_changed"
         "#{event.creator.name} changed due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
-      when "due_date_removed"
+      when "card_due_date_removed"
         "#{event.creator.name} removed the date."
-      when "title_changed"
+      when "card_title_changed"
         "#{event.creator.name} changed title from '#{event.particulars.dig('particulars', 'old_title')}' to '#{event.particulars.dig('particulars', 'new_title')}'."
       end
     end
diff --git a/app/models/eventable.rb b/app/models/eventable.rb
index 183c638d5..e14803f09 100644
--- a/app/models/eventable.rb
+++ b/app/models/eventable.rb
@@ -7,7 +7,7 @@ module Eventable
 
   def track_event(action, creator: Current.user, collection: self.collection, **particulars)
     if should_track_event?
-      collection.events.create!(action:, creator:, collection:, eventable: self, particulars:)
+      collection.events.create!(action: "#{eventable_prefix}_#{action}", creator:, collection:, eventable: self, particulars:)
     end
   end
 
@@ -18,4 +18,8 @@ module Eventable
     def should_track_event?
       true
     end
+
+    def eventable_prefix
+      self.class.name.demodulize.underscore
+    end
 end
diff --git a/app/models/notifier/event_notifier.rb b/app/models/notifier/event_notifier.rb
index e7b11b4d8..eb7e77cb5 100644
--- a/app/models/notifier/event_notifier.rb
+++ b/app/models/notifier/event_notifier.rb
@@ -5,11 +5,11 @@ class Notifier::EventNotifier < Notifier
   private
     def recipients
       case source.action
-      when "assigned"
+      when "card_assigned"
         source.assignees.excluding(source.collection.access_only_users)
-      when "published"
+      when "card_published"
         watchers_and_subscribers(include_only_watching: true).without(creator, *card.mentionees)
-      when "commented"
+      when "card_commented"
         watchers_and_subscribers.without(creator, *source.comment.mentionees)
       else
         watchers_and_subscribers.without(creator)
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index a27058abe..867324c66 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -22,7 +22,7 @@
       <% end %>
     </div>
 
-    <% if event.action == "commented" && !strip_tags(event&.comment&.body_html).blank? %>
+    <% if event.action == "card_commented" && !strip_tags(event&.comment&.body_html).blank? %>
       <span class="txt-break overflow-line-clamp txt-tight-lines">
         <%= strip_tags(event.comment.body_html).truncate(200) -%>
       </span>
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
index 11c8b46e9..bf65e5486 100644
--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -2,7 +2,7 @@ logo_published:
   creator: david
   collection: writebook
   eventable: logo (Card)
-  action: published
+  action: card_published
   summary: logo_initial_activity
   created_at: <%= 1.week.ago %>
 
@@ -10,7 +10,7 @@ logo_assignment_jz:
   creator: david
   collection: writebook
   eventable: logo (Card)
-  action: assigned
+  action: card_assigned
   summary: logo_initial_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
   created_at: <%= 1.week.ago + 1.hour %>
@@ -19,7 +19,7 @@ logo_assignment_km:
   creator: david
   collection: writebook
   eventable: logo (Card)
-  action: assigned
+  action: card_assigned
   summary: logo_second_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:kevin) ] }.to_json %>
   created_at: <%= 1.day.ago %>
@@ -28,7 +28,7 @@ layout_published:
   creator: david
   collection: writebook
   eventable: layout (Card)
-  action: published
+  action: card_published
   summary: layout_initial_activity
   created_at: <%= 1.week.ago %>
 
@@ -36,7 +36,7 @@ layout_commented:
   creator: david
   collection: writebook
   eventable: layout (Card)
-  action: commented
+  action: card_commented
   summary: layout_initial_activity
   particulars: <%= { comment_id: ActiveRecord::FixtureSet.identify(:layout_overflowing_david) }.to_json %>
   created_at: <%= 1.week.ago %>
@@ -45,7 +45,7 @@ layout_assignment_jz:
   creator: david
   collection: writebook
   eventable: layout (Card)
-  action: assigned
+  action: card_assigned
   summary: layout_initial_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
   created_at: <%= 1.hour.ago %>
@@ -54,7 +54,7 @@ text_published:
   creator: kevin
   collection: writebook
   eventable: text (Card)
-  action: published
+  action: card_published
   summary: text_initial_activity
   created_at: <%= 1.week.ago %>
 
@@ -62,7 +62,7 @@ shipping_published:
   creator: kevin
   collection: writebook
   eventable: shipping (Card)
-  action: published
+  action: card_published
   summary: shipping_initial_activity
   created_at: <%= 1.week.ago %>
 
@@ -70,6 +70,6 @@ shipping_closed:
   creator: kevin
   collection: writebook
   eventable: shipping (Card)
-  action: closed
+  action: card_closed
   summary: shipping_initial_activity
   created_at: <%= 2.days.ago %>
diff --git a/test/integration/card_messages.rb b/test/integration/card_messages.rb
index 0253e45f3..257619ede 100644
--- a/test/integration/card_messages.rb
+++ b/test/integration/card_messages.rb
@@ -24,6 +24,6 @@ class CardMessagesTest < ActionDispatch::IntegrationTest
     assert_equal 3, card.messages.count
     assert_predicate card.messages.last, :event_summary?
     assert_equal 1, card.messages.last.event_summary.events.count
-    assert_equal "assigned", card.messages.last.messageable.events.last.action
+    assert_equal "card_assigned", card.messages.last.messageable.events.last.action
   end
 end
diff --git a/test/models/card/staged_test.rb b/test/models/card/staged_test.rb
index 492374fb5..ce12a75f3 100644
--- a/test/models/card/staged_test.rb
+++ b/test/models/card/staged_test.rb
@@ -4,7 +4,7 @@ class Card::StagedTest < ActiveSupport::TestCase
   setup { Current.session = sessions(:david) }
 
   test "change stage" do
-    assert_difference -> { Event.where(action: :staged).count }, +1 do
+    assert_difference -> { Event.where(action: :card_staged).count }, +1 do
       cards(:logo).change_stage_to(workflow_stages(:qa_in_progress))
       assert_equal workflow_stages(:qa_in_progress), cards(:logo).reload.stage
     end
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
index 3d251e278..39add0d99 100644
--- a/test/models/card_test.rb
+++ b/test/models/card_test.rb
@@ -25,14 +25,14 @@ class CardTest < ActiveSupport::TestCase
       cards(:logo).toggle_assignment users(:kevin)
     end
     assert_not cards(:logo).assigned_to?(users(:kevin))
-    assert_equal "unassigned", Event.last.action
+    assert_equal "card_unassigned", Event.last.action
     assert_equal [ users(:kevin) ], Event.last.assignees
 
     assert_difference %w[ cards(:logo).assignees.count Event.count ], +1 do
       cards(:logo).toggle_assignment users(:kevin)
     end
     assert cards(:logo).assigned_to?(users(:kevin))
-    assert_equal "assigned", Event.last.action
+    assert_equal "card_assigned", Event.last.action
     assert_equal [ users(:kevin) ], Event.last.assignees
   end
 
@@ -74,7 +74,7 @@ class CardTest < ActiveSupport::TestCase
     assert_equal cards(:logo, :layout, :text), Card.open
   end
 
-  test "unassigned" do
+  test "card_unassigned" do
     assert_equal cards(:shipping, :text), Card.unassigned
   end
 

From 905ccb9b4bbcad103f98b5d0fed3ea40e090ab65 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 13:41:47 +0200
Subject: [PATCH 288/413] Make comments the event's host

---
 app/helpers/events_helper.rb          |  6 +++---
 app/helpers/notifications_helper.rb   |  7 ++++---
 app/models/comment.rb                 |  8 ++------
 app/models/comment/eventable.rb       | 18 ++++++++++++++++++
 app/models/event.rb                   |  6 +-----
 app/models/event/particulars.rb       |  6 +-----
 app/models/notifier/event_notifier.rb | 10 +++++++---
 app/views/events/_event.html.erb      | 10 ++++++----
 test/fixtures/events.yml              |  5 ++---
 9 files changed, 44 insertions(+), 32 deletions(-)
 create mode 100644 app/models/comment/eventable.rb

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 6a8ebe03f..772665f79 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -53,8 +53,8 @@ module EventsHelper
       end
     when "card_unassigned"
       "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence } from <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
-    when "card_commented"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } commented on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
+    when "comment_created"
+      "#{ event.creator == Current.user ? "You" : event.creator.name } commented on <span style='color: var(--card-color)'>#{ event.eventable.card.title }</span>".html_safe
     when "card_published"
       "#{ event.creator == Current.user ? "You" : event.creator.name } added <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
     when "card_closed"
@@ -82,7 +82,7 @@ module EventsHelper
       "bolt"
     when "card_unstaged"
       "bolt"
-    when "card_commented"
+    when "comment_created"
       "comment"
     when "card_title_changed"
       "rename"
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 344e5c0f4..3e7044376 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,7 +1,7 @@
 module NotificationsHelper
   def event_notification_title(event)
     case event_notification_action(event)
-    when "card_commented" then "RE: " + event.eventable.title
+    when "comment_created" then "RE: " + event.eventable.card.title
     when "card_assigned" then "Assigned to you: " + event.eventable.title
     else event.eventable.title
     end
@@ -13,7 +13,7 @@ module NotificationsHelper
     case event_notification_action(event)
     when "card_closed" then "Closed by #{name}"
     when "card_published" then "Added by #{name}"
-    when "card_commented" then comment_notification_body(event)
+    when "comment_created" then comment_notification_body(event)
     else name
     end
   end
@@ -56,6 +56,7 @@ module NotificationsHelper
     end
 
     def comment_notification_body(event)
-      "#{strip_tags(event.comment.body_html).blank? ? "#{event.creator.name} replied" : "#{event.creator.name}:" } #{strip_tags(event.comment.body_html).truncate(200)}"
+      comment = event.eventable
+      "#{strip_tags(comment.body_html).blank? ? "#{event.creator.name} replied" : "#{event.creator.name}:" } #{strip_tags(comment.body_html).truncate(200)}"
     end
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 9b3fd2704..bdc674a9c 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
 class Comment < ApplicationRecord
-  include Mentions, Messageable, Searchable
+  include Eventable, Mentions, Messageable, Searchable
 
   belongs_to :creator, class_name: "User", default: -> { Current.user }
   has_many :reactions, dependent: :delete_all
@@ -10,7 +10,7 @@ class Comment < ApplicationRecord
   # FIXME: Not a fan of this. Think all references to comment should come directly from the message.
   scope :belonging_to_card, ->(card) { joins(:message).where(messages: { card_id: card.id }) }
 
-  after_create_commit :watch_card_by_creator, :track_commented_card
+  after_create_commit :watch_card_by_creator
   after_destroy_commit :cleanup_events
 
   delegate :watch_by, to: :card
@@ -24,10 +24,6 @@ class Comment < ApplicationRecord
       card.watch_by creator
     end
 
-    def track_commented_card
-      card.track_event :commented, comment_id: id
-    end
-
     # FIXME: This isn't right. We need to introduce an eventable polymorphic association for this.
     def cleanup_events
       # Delete events that reference directly in particulars
diff --git a/app/models/comment/eventable.rb b/app/models/comment/eventable.rb
new file mode 100644
index 000000000..4e90777e0
--- /dev/null
+++ b/app/models/comment/eventable.rb
@@ -0,0 +1,18 @@
+module Comment::Eventable
+  extend ActiveSupport::Concern
+
+  include ::Eventable
+
+  included do
+    after_create_commit :track_creation
+  end
+
+  def event_was_created(event)
+    card.touch(:last_active_at)
+  end
+
+  private
+    def track_creation
+      track_event("created", collection: card.collection)
+    end
+end
diff --git a/app/models/event.rb b/app/models/event.rb
index 1cf31aa13..17f9006c4 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -15,11 +15,7 @@ class Event < ApplicationRecord
   end
 
   def notifiable_target
-    if action.commented?
-      comment
-    else
-      eventable
-    end
+    eventable
   end
 
   # TODO: This doesn't belong here anymore
diff --git a/app/models/event/particulars.rb b/app/models/event/particulars.rb
index 389eda8ea..dd92fa4da 100644
--- a/app/models/event/particulars.rb
+++ b/app/models/event/particulars.rb
@@ -2,14 +2,10 @@ module Event::Particulars
   extend ActiveSupport::Concern
 
   included do
-    store_accessor :particulars, :assignee_ids, :comment_id, :stage_id, :stage_name
+    store_accessor :particulars, :assignee_ids, :stage_id, :stage_name
   end
 
   def assignees
     @assignees ||= User.where id: assignee_ids
   end
-
-  def comment
-    @comment ||= Comment.find_by id: comment_id
-  end
 end
diff --git a/app/models/notifier/event_notifier.rb b/app/models/notifier/event_notifier.rb
index eb7e77cb5..9a42af611 100644
--- a/app/models/notifier/event_notifier.rb
+++ b/app/models/notifier/event_notifier.rb
@@ -9,14 +9,18 @@ class Notifier::EventNotifier < Notifier
         source.assignees.excluding(source.collection.access_only_users)
       when "card_published"
         watchers_and_subscribers(include_only_watching: true).without(creator, *card.mentionees)
-      when "card_commented"
-        watchers_and_subscribers.without(creator, *source.comment.mentionees)
+      when "comment_created"
+        watchers_and_subscribers.without(creator, *source.eventable.mentionees)
       else
         watchers_and_subscribers.without(creator)
       end
     end
 
     def card
-      source.eventable
+      if source.eventable.is_a?(Card)
+        source.eventable
+      else
+        source.eventable.card
+      end
     end
 end
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index 867324c66..7e176b9c9 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -1,9 +1,11 @@
+<% card = event.eventable.is_a?(Card) ? event.eventable : event.eventable.card %>
+
 <%= link_to event.eventable,
       class: "event event--#{ event.action } panel center center-block flex-inline align-start justify-start gap position-relative",
-      style: "--card-color: #{ event.eventable.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
+      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
   color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));",
       data: { related_element_target: "related",
-              related_element_group_value: event.eventable.id,
+              related_element_group_value: card.id,
               action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %>
   <div class="avatar txt-x-small flex-item-no-shrink">
     <%= avatar_image_tag(event.creator) %>
@@ -22,9 +24,9 @@
       <% end %>
     </div>
 
-    <% if event.action == "card_commented" && !strip_tags(event&.comment&.body_html).blank? %>
+    <% if event.action == "comment_created" && !strip_tags(event&.eventable&.body_html).blank? %>
       <span class="txt-break overflow-line-clamp txt-tight-lines">
-        <%= strip_tags(event.comment.body_html).truncate(200) -%>
+        <%= strip_tags(event&.eventable.body_html).truncate(200) -%>
       </span>
     <% end %>
 
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
index bf65e5486..4bc273ca3 100644
--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -35,10 +35,9 @@ layout_published:
 layout_commented:
   creator: david
   collection: writebook
-  eventable: layout (Card)
-  action: card_commented
+  eventable: layout_overflowing_david (Comment)
+  action: comment_created
   summary: layout_initial_activity
-  particulars: <%= { comment_id: ActiveRecord::FixtureSet.identify(:layout_overflowing_david) }.to_json %>
   created_at: <%= 1.week.ago %>
 
 layout_assignment_jz:

From 27f6006b5822c2bc1fbc400ab4eee693f6aefe1e Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 13:48:53 +0200
Subject: [PATCH 289/413] Does not belong here anymore

---
 app/helpers/notifications_helper.rb | 2 +-
 app/models/event.rb                 | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 3e7044376..3c36cc51a 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -48,7 +48,7 @@ module NotificationsHelper
 
   private
     def event_notification_action(event)
-      if event.initial_assignment?
+      if event.action.card_published? && event.eventable.assigned_to?(event.creator)
         "card_assigned"
       else
         event.action
diff --git a/app/models/event.rb b/app/models/event.rb
index 17f9006c4..1775e640a 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -17,9 +17,4 @@ class Event < ApplicationRecord
   def notifiable_target
     eventable
   end
-
-  # TODO: This doesn't belong here anymore
-  def initial_assignment?
-    action == "card_published" && eventable.assigned_to?(creator)
-  end
 end

From 1196266deb0f6c452794033d14f5f56c8498e4bf Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 14:08:20 +0200
Subject: [PATCH 290/413] Split event rendering in two templates to remove
 conditional

---
 app/views/events/_event.html.erb         | 36 +-----------------------
 app/views/events/event/_card.html.erb    |  1 +
 app/views/events/event/_comment.html.erb |  5 ++++
 app/views/events/event/_layout.html.erb  | 29 +++++++++++++++++++
 4 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 app/views/events/event/_card.html.erb
 create mode 100644 app/views/events/event/_comment.html.erb
 create mode 100644 app/views/events/event/_layout.html.erb

diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index 7e176b9c9..8554ea400 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -1,35 +1 @@
-<% card = event.eventable.is_a?(Card) ? event.eventable : event.eventable.card %>
-
-<%= link_to event.eventable,
-      class: "event event--#{ event.action } panel center center-block flex-inline align-start justify-start gap position-relative",
-      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
-  color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));",
-      data: { related_element_target: "related",
-              related_element_group_value: card.id,
-              action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %>
-  <div class="avatar txt-x-small flex-item-no-shrink">
-    <%= avatar_image_tag(event.creator) %>
-  </div>
-
-  <div class="flex flex-column min-width txt-small align-start txt-align-start" style="color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));">
-    <div class="flex align-start gap full-width">
-      <strong class="event__title txt-break overflow-line-clamp txt-tight-lines">
-        <%= event_action_sentence(event) %>
-      </strong>
-
-      <% if event_column(event) == 2 %>
-        <span class="event__icon flex-item-justify-end txt-reversed">
-          <%= icon_tag event_action_icon(event) %>
-        </span>
-      <% end %>
-    </div>
-
-    <% if event.action == "comment_created" && !strip_tags(event&.eventable&.body_html).blank? %>
-      <span class="txt-break overflow-line-clamp txt-tight-lines">
-        <%= strip_tags(event&.eventable.body_html).truncate(200) -%>
-      </span>
-    <% end %>
-
-    <span class="event__collection"><%= event.collection.name %></span>
-  </div>
-<% end %>
+<%= render "events/event/#{event.eventable_type.demodulize.underscore}", event: event %>
diff --git a/app/views/events/event/_card.html.erb b/app/views/events/event/_card.html.erb
new file mode 100644
index 000000000..74864434f
--- /dev/null
+++ b/app/views/events/event/_card.html.erb
@@ -0,0 +1 @@
+<%= render "events/event/layout", card: event.eventable, event: event %>
diff --git a/app/views/events/event/_comment.html.erb b/app/views/events/event/_comment.html.erb
new file mode 100644
index 000000000..22f4596e8
--- /dev/null
+++ b/app/views/events/event/_comment.html.erb
@@ -0,0 +1,5 @@
+<%= render "events/event/layout", card: event.eventable.card, event: event do %>
+  <span class="txt-break overflow-line-clamp txt-tight-lines">
+    <%= strip_tags(event&.eventable.body_html).truncate(200) -%>
+  </span>
+<% end %>
diff --git a/app/views/events/event/_layout.html.erb b/app/views/events/event/_layout.html.erb
new file mode 100644
index 000000000..acfbf7494
--- /dev/null
+++ b/app/views/events/event/_layout.html.erb
@@ -0,0 +1,29 @@
+<%= link_to event.notifiable_target,
+      class: "event event--#{ event.action } panel center center-block flex-inline align-start justify-start gap position-relative",
+      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
+  color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));",
+      data: { related_element_target: "related",
+            related_element_group_value: card.id,
+            action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %>
+  <div class="avatar txt-x-small flex-item-no-shrink">
+    <%= avatar_image_tag(event.creator) %>
+  </div>
+
+  <div class="flex flex-column min-width txt-small align-start txt-align-start" style="color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));">
+    <div class="flex align-start gap full-width">
+      <strong class="event__title txt-break overflow-line-clamp txt-tight-lines">
+        <%= event_action_sentence(event) %>
+      </strong>
+
+      <% if event_column(event) == 2 %>
+        <span class="event__icon flex-item-justify-end txt-reversed">
+          <%= icon_tag event_action_icon(event) %>
+        </span>
+      <% end %>
+    </div>
+
+    <%= yield %>
+
+    <span class="event__collection"><%= event.collection.name %></span>
+  </div>
+<% end %>

From 92e913d0d5015ebf58497fe1607a32c1763108c4 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 14:30:16 +0200
Subject: [PATCH 291/413] Rename

---
 .../{days_timeline_scoped.rb => day_timelines_scoped.rb}        | 2 +-
 app/controllers/events/days_controller.rb                       | 2 +-
 app/controllers/events_controller.rb                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename app/controllers/concerns/{days_timeline_scoped.rb => day_timelines_scoped.rb} (97%)

diff --git a/app/controllers/concerns/days_timeline_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
similarity index 97%
rename from app/controllers/concerns/days_timeline_scoped.rb
rename to app/controllers/concerns/day_timelines_scoped.rb
index 67fab2d1c..616f5563e 100644
--- a/app/controllers/concerns/days_timeline_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -1,4 +1,4 @@
-module DaysTimelineScoped
+module DayTimelinesScoped
   extend ActiveSupport::Concern
 
   included do
diff --git a/app/controllers/events/days_controller.rb b/app/controllers/events/days_controller.rb
index 4f44522ed..31ec80d39 100644
--- a/app/controllers/events/days_controller.rb
+++ b/app/controllers/events/days_controller.rb
@@ -1,5 +1,5 @@
 class Events::DaysController < ApplicationController
-  include DaysTimelineScoped
+  include DayTimelinesScoped
 
   def index
   end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 65a9a6e8a..1340def1d 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,5 +1,5 @@
 class EventsController < ApplicationController
-  include DaysTimelineScoped
+  include DayTimelinesScoped
 
   def index
   end

From b29d66296a4869640b630425cbe090f1770c4169 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 14:46:59 +0200
Subject: [PATCH 292/413] Rename

---
 app/controllers/concerns/day_timelines_scoped.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index 616f5563e..a6a6af9ee 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -23,10 +23,10 @@ module DayTimelinesScoped
     end
 
     def set_day_timeline
-      @day_timeline = Current.user.timeline_for(activity_day, filter: @filter)
+      @day_timeline = Current.user.timeline_for(day, filter: @filter)
     end
 
-    def activity_day
+    def day
       if params[:day].present?
         Time.zone.parse(params[:day])
       else

From 4183a5a32c365b90f5aace21760a3a575b4d4cea Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 14:49:48 +0200
Subject: [PATCH 293/413] Remove unneeded transaction

---
 app/models/card/eventable.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 51c760fde..67c8fcff9 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -23,9 +23,7 @@ module Card::Eventable
     end
 
     def find_or_capture_event_summary
-      transaction do
-        messages.last&.event_summary || capture(EventSummary.new).event_summary
-      end
+      messages.last&.event_summary || capture(EventSummary.new).event_summary
     end
 
     def track_due_date_change

From ccb72ad229fe3b2e161ae3923074cefbc8806a78 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 14:51:25 +0200
Subject: [PATCH 294/413] Rename for consistency with what we had for comments

---
 app/models/mention.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/mention.rb b/app/models/mention.rb
index c14237976..ac5cb336c 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -5,7 +5,7 @@ class Mention < ApplicationRecord
   belongs_to :mentioner, class_name: "User"
   belongs_to :mentionee, class_name: "User", inverse_of: :mentions
 
-  after_create_commit :add_mentionee_as_watcher
+  after_create_commit :watch_source_by_mentionee
 
   def self_mention?
     mentioner == mentionee
@@ -16,7 +16,7 @@ class Mention < ApplicationRecord
   end
 
   private
-    def add_mentionee_as_watcher
+    def watch_source_by_mentionee
       source.watch_by(mentionee)
     end
 end

From 40368032f2f99d4ce88beaa6ab9b7424e5cb3073 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 15:19:42 +0200
Subject: [PATCH 295/413] Split notifiers for comments and cards

This lets us remove the annoying if to check the card
---
 app/models/notifier.rb                               |  8 ++++----
 .../{event_notifier.rb => card_event_notifier.rb}    |  8 ++------
 app/models/notifier/comment_event_notifier.rb        | 12 ++++++++++++
 test/models/notifier/event_notifier_test.rb          |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)
 rename app/models/notifier/{event_notifier.rb => card_event_notifier.rb} (78%)
 create mode 100644 app/models/notifier/comment_event_notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 548b3869c..b856c4073 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,10 +4,10 @@ class Notifier
   class << self
     def for(source)
       case source
-      when Event
-        EventNotifier.new(source)
-      when Mention
-        MentionNotifier.new(source)
+        when Event
+          "Notifier::#{source.eventable.class}EventNotifier".safe_constantize&.new(source)
+        when Mention
+          MentionNotifier.new(source)
       end
     end
   end
diff --git a/app/models/notifier/event_notifier.rb b/app/models/notifier/card_event_notifier.rb
similarity index 78%
rename from app/models/notifier/event_notifier.rb
rename to app/models/notifier/card_event_notifier.rb
index 9a42af611..899ee53fb 100644
--- a/app/models/notifier/event_notifier.rb
+++ b/app/models/notifier/card_event_notifier.rb
@@ -1,4 +1,4 @@
-class Notifier::EventNotifier < Notifier
+class Notifier::CardEventNotifier < Notifier
   delegate :creator, to: :source
   delegate :watchers_and_subscribers, to: :card
 
@@ -17,10 +17,6 @@ class Notifier::EventNotifier < Notifier
     end
 
     def card
-      if source.eventable.is_a?(Card)
-        source.eventable
-      else
-        source.eventable.card
-      end
+      source.eventable
     end
 end
diff --git a/app/models/notifier/comment_event_notifier.rb b/app/models/notifier/comment_event_notifier.rb
new file mode 100644
index 000000000..40a40f4e5
--- /dev/null
+++ b/app/models/notifier/comment_event_notifier.rb
@@ -0,0 +1,12 @@
+class Notifier::CommentEventNotifier < Notifier
+  delegate :creator, to: :source
+
+  private
+    def recipients
+      card.watchers_and_subscribers.without(creator, *source.eventable.mentionees)
+    end
+
+    def card
+      source.eventable.card
+    end
+end
diff --git a/test/models/notifier/event_notifier_test.rb b/test/models/notifier/event_notifier_test.rb
index 97b7f5f68..aafc2fcc1 100644
--- a/test/models/notifier/event_notifier_test.rb
+++ b/test/models/notifier/event_notifier_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 class Notifier::EventNotifierTest < ActiveSupport::TestCase
   test "for returns the matching notifier class for the event" do
-    assert_kind_of Notifier::EventNotifier, Notifier.for(events(:logo_published))
+    assert_kind_of Notifier::CardEventNotifier, Notifier.for(events(:logo_published))
   end
 
   test "generate does not create notifications if the event was system-generated" do

From 331fdc05f632e95c7b4472c4a686203736f0c3c2 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 15:20:08 +0200
Subject: [PATCH 296/413] Format

---
 app/models/notifier.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index b856c4073..81e69ce07 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,10 +4,10 @@ class Notifier
   class << self
     def for(source)
       case source
-        when Event
-          "Notifier::#{source.eventable.class}EventNotifier".safe_constantize&.new(source)
-        when Mention
-          MentionNotifier.new(source)
+      when Event
+        "Notifier::#{source.eventable.class}EventNotifier".safe_constantize&.new(source)
+      when Mention
+        MentionNotifier.new(source)
       end
     end
   end

From a9ad52e390a332c97e82de7f854edeea8831e309 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 16:02:32 +0200
Subject: [PATCH 297/413] Rename for consistency

---
 app/controllers/concerns/day_timelines_scoped.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index a6a6af9ee..8ae3d97d2 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -4,19 +4,19 @@ module DayTimelinesScoped
   included do
     include FilterScoped
 
-    before_action :clear_collection_filter, if: -> { params[:clear_filter] }
-    before_action :restore_filter_from_cookie
+    before_action :clear_collections_filter, if: -> { params[:clear_filter] }
+    before_action :restore_collections_filter_from_cookie
     before_action :set_day_timeline
 
     after_action :save_collection_filter
   end
 
   private
-    def clear_collection_filter
+    def clear_collections_filter
       cookies.delete(:collection_filter)
     end
 
-    def restore_filter_from_cookie
+    def restore_collections_filter_from_cookie
       if cookies[:collection_filter].present?
         @filter.collection_ids = cookies[:collection_filter].split(",")
       end

From b5737ee9ed3322437e8b980a82fd077251d3fd29 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 16:06:28 +0200
Subject: [PATCH 298/413] Rename

---
 app/controllers/concerns/day_timelines_scoped.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index 8ae3d97d2..6355fdad7 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -5,7 +5,7 @@ module DayTimelinesScoped
     include FilterScoped
 
     before_action :clear_collections_filter, if: -> { params[:clear_filter] }
-    before_action :restore_collections_filter_from_cookie
+    before_action :restore_collections_filter
     before_action :set_day_timeline
 
     after_action :save_collection_filter
@@ -16,7 +16,7 @@ module DayTimelinesScoped
       cookies.delete(:collection_filter)
     end
 
-    def restore_collections_filter_from_cookie
+    def restore_collections_filter
       if cookies[:collection_filter].present?
         @filter.collection_ids = cookies[:collection_filter].split(",")
       end

From 4aedb70e7047ac0f05ce3349fd45d6840cd3b7a8 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 16:27:19 +0200
Subject: [PATCH 299/413] Move to method

---
 app/controllers/concerns/day_timelines_scoped.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index 6355fdad7..16cb445d0 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -4,7 +4,7 @@ module DayTimelinesScoped
   included do
     include FilterScoped
 
-    before_action :clear_collections_filter, if: -> { params[:clear_filter] }
+    before_action :clear_collections_filter, if: :clear_collections_filter?
     before_action :restore_collections_filter
     before_action :set_day_timeline
 
@@ -16,6 +16,10 @@ module DayTimelinesScoped
       cookies.delete(:collection_filter)
     end
 
+    def clear_collections_filter?
+      params[:clear_filter]
+    end
+
     def restore_collections_filter
       if cookies[:collection_filter].present?
         @filter.collection_ids = cookies[:collection_filter].split(",")

From 5277086611bdf4be8d40c6309679056db5bf6151 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 16:27:41 +0200
Subject: [PATCH 300/413] Use plural for consistency

---
 app/controllers/concerns/day_timelines_scoped.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index 16cb445d0..d98f6f617 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -8,7 +8,7 @@ module DayTimelinesScoped
     before_action :restore_collections_filter
     before_action :set_day_timeline
 
-    after_action :save_collection_filter
+    after_action :save_collections_filter
   end
 
   private
@@ -40,7 +40,7 @@ module DayTimelinesScoped
       head :not_found
     end
 
-    def save_collection_filter
+    def save_collections_filter
       if params[:collection_ids].present?
         cookies[:collection_filter] = params[:collection_ids].join(",")
       end

From 2652e210557e28d6415e03c477bbd9a75100faaa Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 16:41:40 +0200
Subject: [PATCH 301/413] Remove noisy filter actions

---
 app/controllers/concerns/day_timelines_scoped.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index d98f6f617..c09c9c36a 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -4,26 +4,22 @@ module DayTimelinesScoped
   included do
     include FilterScoped
 
-    before_action :clear_collections_filter, if: :clear_collections_filter?
-    before_action :restore_collections_filter
-    before_action :set_day_timeline
-
+    before_action :restore_collections_filter, :set_day_timeline
     after_action :save_collections_filter
   end
 
   private
-    def clear_collections_filter
-      cookies.delete(:collection_filter)
+    def restore_collections_filter
+      clear_collections_filter if clear_collections_filter?
+      @filter.collection_ids = cookies[:collection_filter].split(",") if cookies[:collection_filter].present?
     end
 
     def clear_collections_filter?
       params[:clear_filter]
     end
 
-    def restore_collections_filter
-      if cookies[:collection_filter].present?
-        @filter.collection_ids = cookies[:collection_filter].split(",")
-      end
+    def clear_collections_filter
+      cookies.delete(:collection_filter)
     end
 
     def set_day_timeline

From 8e136875ade76a5d59ce9a10a7d90c757e0aa000 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 16:53:00 +0200
Subject: [PATCH 302/413] Inline method

---
 app/controllers/concerns/day_timelines_scoped.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index c09c9c36a..80c2beed2 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -10,14 +10,10 @@ module DayTimelinesScoped
 
   private
     def restore_collections_filter
-      clear_collections_filter if clear_collections_filter?
+      clear_collections_filter if params[:clear_filter]
       @filter.collection_ids = cookies[:collection_filter].split(",") if cookies[:collection_filter].present?
     end
 
-    def clear_collections_filter?
-      params[:clear_filter]
-    end
-
     def clear_collections_filter
       cookies.delete(:collection_filter)
     end

From 79df3bcb2abd8cfe278827f90ffbd7800ea18742 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 17:13:43 +0200
Subject: [PATCH 303/413] Compact things a bit

---
 app/controllers/concerns/day_timelines_scoped.rb | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index 80c2beed2..d0d45e155 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -5,17 +5,17 @@ module DayTimelinesScoped
     include FilterScoped
 
     before_action :restore_collections_filter, :set_day_timeline
-    after_action :save_collections_filter
   end
 
   private
     def restore_collections_filter
-      clear_collections_filter if params[:clear_filter]
-      @filter.collection_ids = cookies[:collection_filter].split(",") if cookies[:collection_filter].present?
+      cookies.delete(:collection_filter) if params[:clear_filter]
+      set_collections_filter if cookies[:collection_filter].present?
     end
 
-    def clear_collections_filter
-      cookies.delete(:collection_filter)
+    def set_collections_filter
+      @filter.collection_ids = cookies[:collection_filter].split(",")
+      cookies[:collection_filter] = @filter.collection_ids.join(",")
     end
 
     def set_day_timeline
@@ -31,10 +31,4 @@ module DayTimelinesScoped
     rescue ArgumentError
       head :not_found
     end
-
-    def save_collections_filter
-      if params[:collection_ids].present?
-        cookies[:collection_filter] = params[:collection_ids].join(",")
-      end
-    end
 end

From 5239a2c62852c4c99eb5ecfe064532e2296226b8 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 10:47:59 -0500
Subject: [PATCH 304/413] Remove extra close bracket

---
 app/views/events/_day.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb
index e8c95df09..3a67fc9a9 100644
--- a/app/views/events/_day.html.erb
+++ b/app/views/events/_day.html.erb
@@ -19,7 +19,7 @@
 
             <%= local_datetime_tag events.first.created_at, class: "event__timestamp txt-small translucent" %>
           <% end %>
-        <% end %> %>
+        <% end %> 
       <% end %>
     </div>
 

From a898e93c256c619acfd594c5a80e9e4110cc005f Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 11:00:12 -0500
Subject: [PATCH 305/413] Update icon classes to match output from
 `event_action_icon(event)`

---
 app/assets/stylesheets/icons.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/icons.css b/app/assets/stylesheets/icons.css
index bc6f9e77f..d930033d2 100644
--- a/app/assets/stylesheets/icons.css
+++ b/app/assets/stylesheets/icons.css
@@ -21,17 +21,20 @@
   .icon--arrow-left { --svg: url("arrow-left.svg "); }
   .icon--arrow-right { --svg: url("arrow-right.svg "); }
   .icon--art { --svg: url("art.svg "); }
-  .icon--assigned { --svg: url("assigned.svg "); }
   .icon--bell-off { --svg: url("bell-off.svg "); }
   .icon--bell { --svg: url("bell.svg "); }
   .icon--bolt { --svg: url("bolt.svg "); }
   .icon--bookmark-outline { --svg: url("bookmark-outline.svg "); }
   .icon--bookmark { --svg: url("bookmark.svg "); }
   .icon--camera { --svg: url("camera.svg "); }
+  .icon--card_assigned { --svg: url("assigned.svg "); }
+  .icon--card_comment { --svg: url("comment.svg "); }
+  .icon--card_staged { --svg: url("bolt.svg "); }
+  .icon--card_title_changed { --svg: url("rename.svg "); }
+  .icon--card_unstaged { --svg: url("bolt.svg "); }
   .icon--caret-down { --svg: url("caret-down.svg "); }
   .icon--check { --svg: url("check.svg "); }
   .icon--close { --svg: url("close.svg "); }
-  .icon--comment { --svg: url("comment.svg "); }
   .icon--copy-paste { --svg: url("copy-paste.svg "); }
   .icon--crown { --svg: url("crown.svg "); }
   .icon--email { --svg: url("email.svg "); }
@@ -60,7 +63,6 @@
   .icon--refresh { --svg: url("refresh.svg "); }
   .icon--remove-med { --svg: url("remove-med.svg "); }
   .icon--remove { --svg: url("remove.svg "); }
-  .icon--rename { --svg: url("rename.svg "); }
   .icon--settings { --svg: url("settings.svg "); }
   .icon--share { --svg: url("share.svg "); }
   .icon--tag { --svg: url("tag.svg "); }

From 25dbd77acda6c1b5e54fca0c8103a0a776871709 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 18:01:41 +0200
Subject: [PATCH 306/413] Tidy up things a bit removing dups and splitting
 methods

---
 app/helpers/events_helper.rb | 43 +++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 772665f79..193a965a6 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -44,33 +44,50 @@ module EventsHelper
   end
 
   def event_action_sentence(event)
+    if event.action.comment_created?
+      comment_event_action_sentence(event)
+    else
+      card_event_action_sentence(event)
+    end
+  end
+
+  def comment_event_action_sentence(event)
+    "#{ event_creator_name(event) } commented on <span style='color: var(--card-color)'>#{ event.eventable.card.title }</span>".html_safe
+  end
+
+  def event_creator_name(event)
+    event.creator == Current.user ? "You" : event.creator.name
+  end
+
+  def card_event_action_sentence(event)
+    card = event.eventable
+    title = card.title
+
     case event.action
     when "card_assigned"
       if event.assignees.include?(Current.user)
-        "#{ event.creator == Current.user ? "You" : event.creator.name } will handle <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
+        "#{ event_creator_name(event) } will handle <span style='color: var(--card-color)'>#{ title }</span>".html_safe
       else
-        "#{ event.creator == Current.user ? "You" : event.creator.name } assigned #{ event.assignees.pluck(:name).to_sentence } to <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
+        "#{ event_creator_name(event) } assigned #{ event.assignees.pluck(:name).to_sentence } to <span style='color: var(--card-color)'>#{ title }</span>".html_safe
       end
     when "card_unassigned"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence } from <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
-    when "comment_created"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } commented on <span style='color: var(--card-color)'>#{ event.eventable.card.title }</span>".html_safe
+      "#{ event_creator_name(event) } unassigned #{ event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence } from <span style='color: var(--card-color)'>#{ title }</span>".html_safe
     when "card_published"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } added <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
+      "#{ event_creator_name(event) } added <span style='color: var(--card-color)'>#{ title }</span>".html_safe
     when "card_closed"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } closed <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
+      "#{ event_creator_name(event) } closed <span style='color: var(--card-color)'>#{ title }</span>".html_safe
     when "card_staged"
-      "#{event.creator == Current.user ? "You" : event.creator.name} moved <span style='color: var(--card-color)'>#{ event.eventable.title }</span> to the #{event.stage_name} stage".html_safe
+      "#{event_creator_name(event)} moved <span style='color: var(--card-color)'>#{ title }</span> to the #{event.stage_name} stage".html_safe
     when "card_unstaged"
-      "#{event.creator == Current.user ? "You" : event.creator.name} moved <span style='color: var(--card-color)'>#{ event.eventable.title }</span> out ofthe #{event.stage_name} stage".html_safe
+      "#{event_creator_name(event)} moved <span style='color: var(--card-color)'>#{ title }</span> out ofthe #{event.stage_name} stage".html_safe
     when "card_due_date_added"
-      "#{event.creator == Current.user ? "You" : event.creator.name} set the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
+      "#{event_creator_name(event)} set the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ title }</span>".html_safe
     when "card_due_date_changed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>".html_safe
+      "#{event_creator_name(event)} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ title }</span>".html_safe
     when "card_due_date_removed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} removed the date on <span style='color: var(--card-color)'>#{ event.eventable.title }</span>"
+      "#{event_creator_name(event)} removed the date on <span style='color: var(--card-color)'>#{ title }</span>"
     when "card_title_changed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} renamed <span style='color: var(--card-color)'>#{ event.eventable.title }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
+      "#{event_creator_name(event)} renamed <span style='color: var(--card-color)'>#{ title }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
     end
   end
 

From 00bcc2183e66b262fc2e6a254b9d0824950cb662 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 11:14:02 -0500
Subject: [PATCH 307/413] Should be full opacity

---
 app/views/events/_day.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb
index 3a67fc9a9..387f42a1c 100644
--- a/app/views/events/_day.html.erb
+++ b/app/views/events/_day.html.erb
@@ -4,7 +4,7 @@
     <h2 class="txt-medium events__day-header center">
       <span class="events__day-header-content">
         <% # TODO: Create proper format to match desired behavior: Today, tomorrow or date %>
-        <%= local_datetime_tag day_timeline.day, style: :daysago, class: "txt-ink translucent" %>
+        <%= local_datetime_tag day_timeline.day, style: :daysago, class: "txt-ink" %>
       </span>
     </h2>
 

From 3f9198d543ef0c07dce91e9a23a02afa84b1feb9 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 11:31:51 -0500
Subject: [PATCH 308/413] Give the timeline a little space on each side

---
 app/assets/stylesheets/events.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index cc35fb77c..cbb3bcf0f 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -12,6 +12,7 @@
     --grid-lines: 0.1rem;
 
     margin: auto;
+    max-inline-size: min(105ch, 100%);
   }
 
   .events__day-header {

From a4ce130c1c5ca9cdd2e98deb0cf51571c2d552c1 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 11:51:27 -0500
Subject: [PATCH 309/413] Adjust perma layout for larger cards

---
 app/assets/stylesheets/card-perma.css | 2 +-
 app/assets/stylesheets/comments.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index 4f25c7810..634022ad6 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -15,7 +15,7 @@
       "qw notch-top we"
       "actions-left card actions-right"
       "er notch-bottom rt";
-    grid-template-columns: 48px minmax(0, 960px) 48px;
+    grid-template-columns: 48px minmax(0, 1120px) 48px;
     inline-size: fit-content;
     max-inline-size: 100%;
     margin-inline: auto;
diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 5ac91e94e..32043d88a 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -12,7 +12,7 @@
     text-align: center;
 
     @media (min-width: 160ch) {
-      padding-inline: calc(var(--tray-size) + var(--inline-space) * 1.5);
+      padding-inline: var(--tray-size);
     }
   }
 

From 0be58f50a544aa0b63bee656b7724035e146b189 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 24 Apr 2025 18:53:35 +0200
Subject: [PATCH 310/413] Add comment about something that is pending

---
 app/controllers/concerns/day_timelines_scoped.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index d0d45e155..f44a70344 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -10,12 +10,13 @@ module DayTimelinesScoped
   private
     def restore_collections_filter
       cookies.delete(:collection_filter) if params[:clear_filter]
-      set_collections_filter if cookies[:collection_filter].present?
+      # TODO: This is not working as intended yet, I'll fix
+      set_collections_filter_from_cookie
+      cookies[:collection_filter] = @filter.collection_ids.join(",")
     end
 
-    def set_collections_filter
-      @filter.collection_ids = cookies[:collection_filter].split(",")
-      cookies[:collection_filter] = @filter.collection_ids.join(",")
+    def set_collections_filter_from_cookie
+      @filter.collection_ids = cookies[:collection_filter].split(",") if cookies[:collection_filter].present?
     end
 
     def set_day_timeline

From adf3d520953fef2a3f0f7de765567994a430fed5 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 12:02:46 -0500
Subject: [PATCH 311/413] Adjust collection line to contrast with comment
 excerpts

---
 app/assets/stylesheets/events.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index cbb3bcf0f..ac3fc2a9b 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -83,6 +83,12 @@
     z-index: 2;
   }
 
+  .event__collection {
+    font-size: var(--text-x-small);
+    font-weight: 500;
+    opacity: 0.66;
+  }
+
   .event__grid-item {
     background-color: var(--color-container);
     block-size: 100%;

From dca5e3b942c98fd3d571cfe62947e1911732ff75 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 12:56:14 -0500
Subject: [PATCH 312/413] New layout for collections settings, stub entropy
 setting

---
 app/assets/stylesheets/avatars.css  |   3 +-
 app/assets/stylesheets/panels.css   |  15 +++
 app/models/card/closeable.rb        |   9 ++
 app/views/collections/edit.html.erb | 146 ++++++++++++++++------------
 4 files changed, 108 insertions(+), 65 deletions(-)

diff --git a/app/assets/stylesheets/avatars.css b/app/assets/stylesheets/avatars.css
index a55112b8c..d30bb984f 100644
--- a/app/assets/stylesheets/avatars.css
+++ b/app/assets/stylesheets/avatars.css
@@ -10,7 +10,8 @@
     margin: 0;
     place-items: center;
 
-    img {
+    img,
+    .icon {
       aspect-ratio: 1;
       block-size: auto;
       border-radius: var(--avatar-border-radius);
diff --git a/app/assets/stylesheets/panels.css b/app/assets/stylesheets/panels.css
index 108d7c42a..f5a9919ac 100644
--- a/app/assets/stylesheets/panels.css
+++ b/app/assets/stylesheets/panels.css
@@ -12,4 +12,19 @@
       --panel-border-color: var(--color-subtle-dark);
     }
   }
+
+  .panels--two-up {
+    --panel-size: auto;
+
+    display: flex;
+    flex-wrap: wrap;
+    gap: var(--block-space-double);
+    align-content: start;
+    max-inline-size: min(100ch, 100%);
+    margin: auto;
+
+    .panel {
+      flex: 1 1 25%;
+    }
+  }
 }
diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
index 64945af0c..1040c27dd 100644
--- a/app/models/card/closeable.rb
+++ b/app/models/card/closeable.rb
@@ -1,6 +1,15 @@
 module Card::Closeable
   extend ActiveSupport::Concern
 
+  AUTO_CLOSE_OPTIONS = [
+    [ "30 days", 30.days ],
+    [ "60 days", 60.days ],
+    [ "90 days", 90.days ],
+    [ "6 months", 180.days ],
+    [ "1 year", 365.days ],
+    [ "Never", nil ]
+  ].freeze
+
   AUTO_CLOSE_AFTER = 30.days
 
   included do
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index a31b65d2b..299a3a555 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -1,81 +1,99 @@
-<% @page_title = "Edit #{@collection.name}" %>
+<% @page_title = "Collection Settings" %>
 
 <% content_for :header do %>
   <nav>
     <%= link_to_back fallback_path: cards_path(collection_ids: [ @bbucket ]) %>
 
-    <%= form_with model: @collection, class: "flex-item-justify-end", method: :delete do |form| %>
-      <%= form.button class: "btn btn--negative", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
-        <%= icon_tag "minus" %>
-        <span class="for-screen-reader">Delete <%= @collection.name %></span>
-      <% end %>
-    <% end %>
+    <header class="center">
+      <h1 class="txt-large margin-none"><%= @page_title %></h1>
+    </header>
+
+    <div class="btn btn--placeholder flex-item-justify-end"></div>
   </nav>
 <% end %>
 
-<div class="panel shadow center" style="--panel-size: 55ch;">
-  <%= form_with model: @collection, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
-    <div class="flex align-center gap">
-      <label class="flex-item-grow txt-large">
-        <strong><%= form.text_field :name, name: "collection[name]", class: "input full-width",
-              required: true, autofocus: true, placeholder: "Give it a name…",
-              data: { action: "keydown.enter->form#submit:prevent, keydown.esc->form#cancel" } %></strong>
-      </label>
-    </div>
+<section class="panels--two-up margin-block">
+  <div class="panel shadow center flex flex-column">
+    <strong class="txt-large">Name and access</strong>
+    <p class="margin-none-block-start">Choose who can access this Collection.</p>
+    <%= form_with model: @collection, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
+      <div class="flex align-center gap">
+        <label class="flex-item-grow">
+          <strong><%= form.text_field :name, name: "collection[name]", class: "input full-width",
+                required: true, autofocus: true, placeholder: "Give it a name…",
+                data: { action: "keydown.enter->form#submit:prevent, keydown.esc->form#cancel" } %></strong>
+        </label>
+      </div>
 
-    <section class="margin-block pad-inline fill-shade border-radius">
-      <%= access_menu_tag @collection do %>
-        <li class="flex align-center gap margin-none">
-          <figure class="avatar flex-item-no-shrink" style="--avatar-border-radius: 0; --avatar-size: 4ch;">
-            <%= icon_tag "everyone" %>
-            <span class="for-screen-reader">Everyone</span>
-          </figure>
+      <section class="margin-block pad-inline fill-shade border-radius">
+        <%= access_menu_tag @collection do %>
+          <li class="flex align-center gap margin-none">
+            <figure class="avatar flex-item-no-shrink" style="--avatar-border-radius: 0; --avatar-size: 3.5ch; margin-inline: 0.3em;">
+              <%= icon_tag "everyone" %>
+              <span class="for-screen-reader">Everyone</span>
+            </figure>
 
-          <div class="min-width">
-            <div class="overflow-ellipsis fill-shade"><strong>Everyone</strong></div>
-          </div>
+            <div class="min-width">
+              <div class="overflow-ellipsis fill-shade"><strong>Everyone</strong></div>
+            </div>
 
-          <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true" />
+            <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true" />
 
-          <label for="collection_all_access" class="switch">
-            <%= form.check_box :all_access, class: "switch__input", checked: @collection.all_access?, data: { action: "change->toggle-class#toggle" } %>
-            <span class="switch__btn round"></span>
-            <span class="for-screen-reader">Give everyone access to this project</span>
-          </label>
-        </li>
+            <label for="collection_all_access" class="switch">
+              <%= form.check_box :all_access, class: "switch__input", checked: @collection.all_access?, data: { action: "change->toggle-class#toggle" } %>
+              <span class="switch__btn round"></span>
+              <span class="for-screen-reader">Give everyone access to this project</span>
+            </label>
+          </li>
 
-        <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
+          <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
 
-        <% if User.active.count > 20 %>
-          <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter">
-        <% end %>
-
-        <div data-filter-target="list">
-          <%= access_toggles_for @selected_users, selected: true %>
-
-          <% if @selected_users.any? && @unselected_users.any? %>
-            <hr class="separator full-width" style="--border-style: solid">
+          <% if User.active.count > 20 %>
+            <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter">
           <% end %>
 
-          <%= access_toggles_for @unselected_users, selected: false %>
-        </div>
+          <div data-filter-target="list">
+            <%= access_toggles_for @selected_users, selected: true %>
+
+            <% if @selected_users.any? && @unselected_users.any? %>
+              <hr class="separator full-width" style="--border-style: solid">
+            <% end %>
+
+            <%= access_toggles_for @unselected_users, selected: false %>
+          </div>
+        <% end %>
+      </section>
+
+      <button type="submit" id="log_in" class="btn btn--reversed center txt-normal">
+        <%= icon_tag "check" %>
+        <span>Save changes</span>
+      </button>
+
+      <%= link_to "Cancel and go back", cards_path(collection_ids: [ @collection ]), data: { form_target: "cancel", turbo_frame: "_top" }, hidden: true %>
+    <% end %>
+  </div>
+
+  <div class="panel shadow center flex flex-column">
+    <strong class="txt-large">Workflows</strong>
+    <p class="margin-none-block-start">Use a Workflow to track progress in this Collection.</p>
+    <%= form_with model: @collection, url: collection_workflow_path(@collection), local: true, method: :patch, data: { controller: "form" } do |form| %>
+      <%= form.select :workflow_id, Workflow.all.map { |w| [w.name, w.id] }, { include_blank: "Choose…" }, class: "input input--select full-width", data: { action: "change->form#submit" } %>
+    <% end %>
+    <p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
+
+    <hr class="separator--horizontal full-width margin-block-double" style="--border-color: var(--color-subtle);" aria-hidden="true" />
+
+    <strong class="txt-large">Auto-close Cards</strong>
+    <p class="margin-none-block-start">Cards Fizzle Out when there is no activity for…</p>
+    <%= select_tag :auto_close_after, options_for_select(Card::Closeable::AUTO_CLOSE_OPTIONS, Card::Closeable::AUTO_CLOSE_AFTER), { class: "input input--select full-width margin-block-end", data: { action: "change->form#submit" } } %>
+
+    <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle); margin-block-start: auto;" aria-hidden="true" />
+
+    <%= form_with model: @collection, class: "txt-align-center", method: :delete do |form| %>
+      <%= form.button class: "btn txt-negative borderless txt-small", data: { turbo_confirm: "Are you sure you want to permanently delete this Collection?" } do %>
+        <%= icon_tag "trash" %>
+        <span>Delete this Collection</span>
       <% end %>
-    </section>
-
-    <button type="submit" id="log_in" class="btn btn--reversed center txt-medium">
-      <%= icon_tag "check" %>
-      <span class="for-screen-reader">Save</span>
-    </button>
-
-    <%= link_to "Cancel and go back", cards_path(collection_ids: [ @collection ]), data: { form_target: "cancel", turbo_frame: "_top" }, hidden: true %>
-  <% end %>
-</div>
-
-<div class="panel shadow center flex flex-column gap-half margin-block-double" style="--panel-size: 55ch;">
-  <strong class="txt-large">Choose a workflow</strong>
-  <p class="margin-none">Use a workflow to track progress in this collection.</p>
-  <%= form_with model: @collection, url: collection_workflow_path(@collection), local: true, method: :patch, data: { controller: "form" } do |form| %>
-    <%= form.select :workflow_id, Workflow.all.map { |w| [w.name, w.id] }, { include_blank: "Choose…" }, class: "input input--select full-width", data: { action: "change->form#submit" } %>
-  <% end %>
-  <p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
-</div>
+    <% end %>
+  </div>
+</section>

From 579c76f58a9d8cfe6dc735c353ac3f34f36a6e29 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Thu, 24 Apr 2025 15:07:08 -0400
Subject: [PATCH 313/413] dep: AR::Tenanted: no implicit db migrations

ref: https://github.com/basecamp/active_record-tenanted/pull/86
ref: https://37s.fizzy.37signals.com/collections/693169862/cards/999008694
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 999e8dae8..44c91583d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/basecamp/active_record-tenanted
-  revision: 13b60769047226d5cb10d92eb1f2e1bc19773438
+  revision: f04f4f0a153ae5da65b400021aa97fdb28ac86b5
   specs:
     active_record-tenanted (0.1.0)
       activerecord (>= 8.1.alpha)

From 5c2d12177a95b498630ec70fc522c327ebbba23d Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 16:00:12 -0500
Subject: [PATCH 314/413] Type polish and sizing constraints

---
 app/assets/stylesheets/panels.css        |  3 ++-
 app/views/collections/_access_toggle.erb |  2 +-
 app/views/collections/edit.html.erb      | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/panels.css b/app/assets/stylesheets/panels.css
index f5a9919ac..3d4620288 100644
--- a/app/assets/stylesheets/panels.css
+++ b/app/assets/stylesheets/panels.css
@@ -24,7 +24,8 @@
     margin: auto;
 
     .panel {
-      flex: 1 1 25%;
+      flex: 1 1 33%;
+      min-inline-size: 36ch;
     }
   }
 }
diff --git a/app/views/collections/_access_toggle.erb b/app/views/collections/_access_toggle.erb
index aee7bb248..318415703 100644
--- a/app/views/collections/_access_toggle.erb
+++ b/app/views/collections/_access_toggle.erb
@@ -1,4 +1,4 @@
-<li class="flex align-center gap-half margin-none unpad" data-value="<%= user.name.downcase %>">
+<li class="flex align-center gap-half margin-none unpad txt-normal" data-value="<%= user.name.downcase %>">
   <figure class="avatar flex-item-no-shrink">
     <%= avatar_tag user %>
   </figure>
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index 299a3a555..3df4c91ab 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -13,8 +13,8 @@
 <% end %>
 
 <section class="panels--two-up margin-block">
-  <div class="panel shadow center flex flex-column">
-    <strong class="txt-large">Name and access</strong>
+  <div class="panel shadow center flex flex-column txt-normal">
+    <strong class="txt-large">Name and Access</strong>
     <p class="margin-none-block-start">Choose who can access this Collection.</p>
     <%= form_with model: @collection, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
       <div class="flex align-center gap">
@@ -27,7 +27,7 @@
 
       <section class="margin-block pad-inline fill-shade border-radius">
         <%= access_menu_tag @collection do %>
-          <li class="flex align-center gap margin-none">
+          <li class="flex align-center gap margin-none txt-normal">
             <figure class="avatar flex-item-no-shrink" style="--avatar-border-radius: 0; --avatar-size: 3.5ch; margin-inline: 0.3em;">
               <%= icon_tag "everyone" %>
               <span class="for-screen-reader">Everyone</span>
@@ -75,17 +75,17 @@
 
   <div class="panel shadow center flex flex-column">
     <strong class="txt-large">Workflows</strong>
-    <p class="margin-none-block-start">Use a Workflow to track progress in this Collection.</p>
     <%= form_with model: @collection, url: collection_workflow_path(@collection), local: true, method: :patch, data: { controller: "form" } do |form| %>
+      <%= form.label :workflow_id, "Use a Workflow to track progress in this Collection.", class: "flex justify-center margin-block-end" %>
       <%= form.select :workflow_id, Workflow.all.map { |w| [w.name, w.id] }, { include_blank: "Choose…" }, class: "input input--select full-width", data: { action: "change->form#submit" } %>
     <% end %>
     <p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
 
     <hr class="separator--horizontal full-width margin-block-double" style="--border-color: var(--color-subtle);" aria-hidden="true" />
 
-    <strong class="txt-large">Auto-close Cards</strong>
-    <p class="margin-none-block-start">Cards Fizzle Out when there is no activity for…</p>
-    <%= select_tag :auto_close_after, options_for_select(Card::Closeable::AUTO_CLOSE_OPTIONS, Card::Closeable::AUTO_CLOSE_AFTER), { class: "input input--select full-width margin-block-end", data: { action: "change->form#submit" } } %>
+    <strong class="txt-large">Auto-Close Cards</strong>
+    <label for="closure" class="margin-block-end">Cards automatically close when there is no activity for…</label>
+    <%= select_tag :closure, options_for_select(Card::Closeable::AUTO_CLOSE_OPTIONS, Card::Closeable::AUTO_CLOSE_AFTER), { class: "input input--select full-width margin-block-end", data: { action: "change->form#submit" } } %>
 
     <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle); margin-block-start: auto;" aria-hidden="true" />
 

From ed8cc29e59e9b7e25f71391eecf91532c4fc6324 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 16:36:26 -0500
Subject: [PATCH 315/413] Workflows and card perma polish

---
 app/assets/stylesheets/_global.css         | 4 ++--
 app/assets/stylesheets/card-perma.css      | 9 +++++++++
 app/views/workflows/stages/_stage.html.erb | 6 +++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 3dbe697a3..f5f164164 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -11,8 +11,8 @@
 
   /* Text */
   --text-xx-small: 0.55rem;
-  --text-x-small: 0.7rem;
-  --text-small: 0.8rem;
+  --text-x-small: 0.75rem;
+  --text-small: 0.85rem;
   --text-normal: 1rem;
   --text-medium: 1.1rem;
   --text-large: 1.5rem;
diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index 634022ad6..e9db1f020 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -31,6 +31,15 @@
 
       border: none;
     }
+
+    .card__meta,
+    .card__stages {
+      font-size: var(--text-small);
+    }
+
+    .card__stages {
+      max-inline-size: 32ch;
+    }
   }
 
   /* Children
diff --git a/app/views/workflows/stages/_stage.html.erb b/app/views/workflows/stages/_stage.html.erb
index 9d68de0b3..238c2b645 100644
--- a/app/views/workflows/stages/_stage.html.erb
+++ b/app/views/workflows/stages/_stage.html.erb
@@ -1,9 +1,9 @@
-<div class="flex gap-half align-center">
+<div class="flex gap-half align-center min-width max-width">
   <%= render "workflows/stages/color", stage: stage %>
 
   <%= turbo_frame_tag stage do %>
-    <%= link_to edit_workflow_stage_path(stage.workflow, stage) do %>
-      <strong class="txt-nowrap overflow-ellipsis"><%= stage.name %></strong>
+    <%= link_to edit_workflow_stage_path(stage.workflow, stage), class: "txt-link overflow-ellipsis" do %>
+      <strong><%= stage.name %></strong>
     <% end %>
   <% end %>
 </div>
\ No newline at end of file

From 783e7d12a13f772a256ec556dcd4bb770674a1a8 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 16:59:48 -0500
Subject: [PATCH 316/413] Scroll users list, adjust layout

---
 app/assets/stylesheets/users.css         |  4 ++++
 app/assets/stylesheets/utilities.css     |  1 +
 app/helpers/accesses_helper.rb           |  2 +-
 app/views/collections/_access_toggle.erb |  2 +-
 app/views/collections/edit.html.erb      | 12 +++++++-----
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/stylesheets/users.css

diff --git a/app/assets/stylesheets/users.css b/app/assets/stylesheets/users.css
new file mode 100644
index 000000000..e3e427779
--- /dev/null
+++ b/app/assets/stylesheets/users.css
@@ -0,0 +1,4 @@
+.users-list {
+  max-block-size: 40dvh;
+  overflow: auto;
+}
diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css
index 6ec13a630..f80bbd988 100644
--- a/app/assets/stylesheets/utilities.css
+++ b/app/assets/stylesheets/utilities.css
@@ -107,6 +107,7 @@
   .pad-inline-double { padding-inline: var(--inline-space-double); }
 
   .unpad { padding: 0; }
+  .unpad-block-end { padding-block-end: 0; }
   .unpad-inline { padding-inline: 0; }
 
   /* Margins */
diff --git a/app/helpers/accesses_helper.rb b/app/helpers/accesses_helper.rb
index a139ac3d4..8715b8165 100644
--- a/app/helpers/accesses_helper.rb
+++ b/app/helpers/accesses_helper.rb
@@ -1,6 +1,6 @@
 module AccessesHelper
   def access_menu_tag(collection, &)
-    tag.menu class: [ "flex flex-column gap margin-none pad txt-medium", { "toggler--toggled": collection.all_access? } ], data: {
+    tag.menu class: [ "flex flex-column gap-half unpad margin-none txt-medium", { "toggler--toggled": collection.all_access? } ], data: {
       controller: "filter toggle-class",
       filter_active_class: "filter--active", filter_selected_class: "selected",
       toggle_class_toggle_class: "toggler--toggled" }, &
diff --git a/app/views/collections/_access_toggle.erb b/app/views/collections/_access_toggle.erb
index 318415703..e08f1dc85 100644
--- a/app/views/collections/_access_toggle.erb
+++ b/app/views/collections/_access_toggle.erb
@@ -11,7 +11,7 @@
 
   <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true">
 
-  <%= icon_tag "check", class: "toggler__visible-when-on" %>
+  <%= icon_tag "check", class: "toggler__visible-when-on margin-inline-end" %>
 
   <label class="switch toggler__visible-when-off flex-item-no-shrink">
     <%= check_box_tag "user_ids[]", user.id, selected, class: "switch__input", id: nil %>
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index 3df4c91ab..af2df9798 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -25,9 +25,9 @@
         </label>
       </div>
 
-      <section class="margin-block pad-inline fill-shade border-radius">
+      <section class="margin-block fill-shade border-radius">
         <%= access_menu_tag @collection do %>
-          <li class="flex align-center gap margin-none txt-normal">
+          <li class="flex align-center gap pad unpad-block-end txt-normal">
             <figure class="avatar flex-item-no-shrink" style="--avatar-border-radius: 0; --avatar-size: 3.5ch; margin-inline: 0.3em;">
               <%= icon_tag "everyone" %>
               <span class="for-screen-reader">Everyone</span>
@@ -46,14 +46,16 @@
             </label>
           </li>
 
-          <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
+          <hr class="separator--horizontal margin-inline" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
 
           <% if User.active.count > 20 %>
             <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter">
           <% end %>
 
-          <div data-filter-target="list">
-            <%= access_toggles_for @selected_users, selected: true %>
+          <div data-filter-target="list" class="users-list pad-inline">
+            <% 20.times do %>
+              <%= access_toggles_for @selected_users, selected: true %>
+            <% end %>
 
             <% if @selected_users.any? && @unselected_users.any? %>
               <hr class="separator full-width" style="--border-style: solid">

From 77b79de02f533048fa790993048cc21610ec08a7 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 17:03:50 -0500
Subject: [PATCH 317/413] Add missing filter display classes, style input

---
 app/assets/stylesheets/filters.css  | 8 ++++++++
 app/views/collections/edit.html.erb | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/filters.css b/app/assets/stylesheets/filters.css
index cf7c894f0..e374ca3d0 100644
--- a/app/assets/stylesheets/filters.css
+++ b/app/assets/stylesheets/filters.css
@@ -107,3 +107,11 @@
     }
   }
 }
+
+.filter--active li {
+  display: none;
+
+  &.selected {
+    display: flex;
+  }
+}
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index af2df9798..2cd90e5c3 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -49,7 +49,9 @@
           <hr class="separator--horizontal margin-inline" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
 
           <% if User.active.count > 20 %>
-            <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter">
+            <div class="pad-inline">
+              <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter">
+            </div>
           <% end %>
 
           <div data-filter-target="list" class="users-list pad-inline">

From 2cecbcd77c77d70b07424cb52371905b2a3ef235 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 17:36:48 -0500
Subject: [PATCH 318/413] Choose workflows from a small preview

---
 app/assets/stylesheets/workflows.css | 36 ++++++++++++++++++++++++++++
 app/views/collections/edit.html.erb  | 33 ++++++++++++++++++-------
 2 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/workflows.css b/app/assets/stylesheets/workflows.css
index 21e36b9c6..a2b852b43 100644
--- a/app/assets/stylesheets/workflows.css
+++ b/app/assets/stylesheets/workflows.css
@@ -28,4 +28,40 @@
       }
     }
   }
+
+  .workflow-preview {
+    --border-size: 3px;
+
+    flex: 1 1 30%;
+    max-inline-size: 33%;
+    padding: 0.5em 1em;
+
+    button {
+      --hover-size: 0;
+
+      appearance: none;
+      background: transparent;
+      border: none;
+      cursor: pointer;
+      inline-size: auto;
+      margin: 0;
+      max-inline-size: 100%;
+      outline: 0;
+      padding: 0;
+      text-align: left;
+    }
+  }
+
+  .workflow-preview--selected {
+    --border-color: var(--color-link);
+  }
+
+  .workflow-preview__swatch {
+    --btn-size: 1em;
+    --btn-border-radius: 50%;
+    --btn-border-size: 0;
+    --hover-size: 0;
+
+    cursor: auto;
+  }
 }
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index 2cd90e5c3..bfaf7c6fd 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -78,19 +78,34 @@
   </div>
 
   <div class="panel shadow center flex flex-column">
-    <strong class="txt-large">Workflows</strong>
-    <%= form_with model: @collection, url: collection_workflow_path(@collection), local: true, method: :patch, data: { controller: "form" } do |form| %>
-      <%= form.label :workflow_id, "Use a Workflow to track progress in this Collection.", class: "flex justify-center margin-block-end" %>
-      <%= form.select :workflow_id, Workflow.all.map { |w| [w.name, w.id] }, { include_blank: "Choose…" }, class: "input input--select full-width", data: { action: "change->form#submit" } %>
-    <% end %>
-    <p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
-
-    <hr class="separator--horizontal full-width margin-block-double" style="--border-color: var(--color-subtle);" aria-hidden="true" />
-
     <strong class="txt-large">Auto-Close Cards</strong>
     <label for="closure" class="margin-block-end">Cards automatically close when there is no activity for…</label>
     <%= select_tag :closure, options_for_select(Card::Closeable::AUTO_CLOSE_OPTIONS, Card::Closeable::AUTO_CLOSE_AFTER), { class: "input input--select full-width margin-block-end", data: { action: "change->form#submit" } } %>
 
+    <hr class="separator--horizontal full-width margin-block" style="--border-color: var(--color-subtle);" aria-hidden="true" />
+
+    <strong class="txt-large">Workflows</strong>
+    <div class="flex justify-center margin-block-end">Use a Workflow to track progress in this Collection.</div>
+    <div class="flex flex-wrap gap">
+      <% Workflow.all.each do |workflow| %>
+        <div class="workflow-preview txt-align-start border border-radius <%= 'workflow-preview--selected' if workflow == @collection.workflow %>">
+          <%= button_to collection_workflow_path(@collection), method: :patch do %>
+            <%= hidden_field_tag "collection[workflow_id]", workflow.id %>
+            <strong class="txt-small overflow-ellipsis"><%= workflow.name %></strong>
+            <ul class="list-style-none txt-xx-small ">
+              <% workflow.stages.each do |stage| %>
+                <li class="overflow-ellipsis flex align-center gap-half min-width">
+                  <span class="workflow-preview__swatch btn btn--circle" style="--btn-background: <%= stage.color %>;"></span>
+                  <span class="overflow-ellipsis"><%= stage.name %></span>
+                </li>
+              <% end %>
+            </ul>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+    <p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
+
     <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle); margin-block-start: auto;" aria-hidden="true" />
 
     <%= form_with model: @collection, class: "txt-align-center", method: :delete do |form| %>

From ae90ddac074ec291c1fa5c9d41e0fadade5af366 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 24 Apr 2025 17:46:56 -0500
Subject: [PATCH 319/413] Account for stages where the color isn't set

---
 app/views/collections/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index bfaf7c6fd..43b022e57 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -95,7 +95,7 @@
             <ul class="list-style-none txt-xx-small ">
               <% workflow.stages.each do |stage| %>
                 <li class="overflow-ellipsis flex align-center gap-half min-width">
-                  <span class="workflow-preview__swatch btn btn--circle" style="--btn-background: <%= stage.color %>;"></span>
+                  <span class="workflow-preview__swatch btn btn--circle" style="--btn-background: <%= stage.color.present? ? stage.color : Card::Colored::DEFAULT_COLOR %>;"></span>
                   <span class="overflow-ellipsis"><%= stage.name %></span>
                 </li>
               <% end %>

From 55059e968b89f63535edf6ea5c7597f932000b39 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 07:22:54 +0200
Subject: [PATCH 320/413] Fix collection filtering persistence via cookies

---
 .../concerns/day_timelines_scoped.rb          | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index f44a70344..abb92b0d2 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -9,14 +9,28 @@ module DayTimelinesScoped
 
   private
     def restore_collections_filter
-      cookies.delete(:collection_filter) if params[:clear_filter]
-      # TODO: This is not working as intended yet, I'll fix
-      set_collections_filter_from_cookie
-      cookies[:collection_filter] = @filter.collection_ids.join(",")
+      if params[:clear_filter]
+        delete_collections_filter_cookie
+      else
+        set_collections_filter_from_cookie if should_restore_collections_filter_from_cookie?
+        save_collections_filter_to_cookie
+      end
+    end
+
+    def delete_collections_filter_cookie
+      cookies.delete(:collection_filter)
     end
 
     def set_collections_filter_from_cookie
-      @filter.collection_ids = cookies[:collection_filter].split(",") if cookies[:collection_filter].present?
+      @filter.collection_ids = cookies[:collection_filter].split(",")
+    end
+
+    def should_restore_collections_filter_from_cookie?
+      cookies[:collection_filter].present? && @filter.collections.blank?
+    end
+
+    def save_collections_filter_to_cookie
+      cookies[:collection_filter] = @filter.collection_ids.join(",")
     end
 
     def set_day_timeline

From 501a3b2b4458d548463b50968a2083cf6ed42aff Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 07:23:11 +0200
Subject: [PATCH 321/413] Add test to make sure you can't access innaccessible
 collections via filtering either

---
 test/models/filter_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb
index cff0341d0..bdbc919ab 100644
--- a/test/models/filter_test.rb
+++ b/test/models/filter_test.rb
@@ -40,6 +40,13 @@ class FilterTest < ActiveSupport::TestCase
     assert_empty users(:david).filters.new(collection_ids: [ collections(:writebook).id ]).cards
   end
 
+  test "can't see collections that aren't accessible" do
+    collections(:writebook).update! all_access: false
+    collections(:writebook).accesses.revoke_from users(:david)
+
+    assert_empty users(:david).filters.new(collection_ids: [ collections(:writebook).id ]).collections
+  end
+
   test "remembering equivalent filters" do
     assert_difference "Filter.count", +1 do
       filter = users(:david).filters.remember(indexed_by: "latest", assignment_status: "unassigned", tag_ids: [ tags(:mobile).id ])

From 6fb0d880792f9a39eb5dfc9c9b9cc4f8bbc43c2c Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 07:54:32 +0200
Subject: [PATCH 322/413] Tidy up

---
 .../concerns/day_timelines_scoped.rb            | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index abb92b0d2..d7bf80a5a 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -4,16 +4,17 @@ module DayTimelinesScoped
   included do
     include FilterScoped
 
-    before_action :restore_collections_filter, :set_day_timeline
+    before_action :restore_collections_filter_from_cookie
+    before_action :set_day_timeline
+    after_action :save_collections_filter_to_cookie
   end
 
   private
-    def restore_collections_filter
+    def restore_collections_filter_from_cookie
       if params[:clear_filter]
         delete_collections_filter_cookie
       else
-        set_collections_filter_from_cookie if should_restore_collections_filter_from_cookie?
-        save_collections_filter_to_cookie
+        set_collections_filter_from_cookie
       end
     end
 
@@ -22,11 +23,9 @@ module DayTimelinesScoped
     end
 
     def set_collections_filter_from_cookie
-      @filter.collection_ids = cookies[:collection_filter].split(",")
-    end
-
-    def should_restore_collections_filter_from_cookie?
-      cookies[:collection_filter].present? && @filter.collections.blank?
+      if cookies[:collection_filter].present? && @filter.collections.blank?
+        @filter.collection_ids = cookies[:collection_filter].split(",")
+      end
     end
 
     def save_collections_filter_to_cookie

From 4657663e351e4f4e15e3fff9d4300f0f181e66e5 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 08:55:36 +0200
Subject: [PATCH 323/413] Create local time formatter to match the previous
 format we were generating server-side

---
 app/assets/stylesheets/utilities.css          |  1 +
 .../controllers/local_time_controller.js      | 23 ++++++++++++++++++-
 app/views/events/_day.html.erb                |  4 ++--
 app/views/events/_empty_days.html.erb         |  4 ++--
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css
index 6ec13a630..4fbcd0425 100644
--- a/app/assets/stylesheets/utilities.css
+++ b/app/assets/stylesheets/utilities.css
@@ -23,6 +23,7 @@
   .txt-nowrap { white-space: nowrap; }
   .txt-break { word-break: break-word; }
   .txt-uppercase { text-transform: uppercase; }
+  .txt-capitalize { text-transform: capitalize; }
   .txt-link { color: var(--color-link); text-decoration: underline; }
 
   /* Flexbox and Grid */
diff --git a/app/javascript/controllers/local_time_controller.js b/app/javascript/controllers/local_time_controller.js
index 3bc77b769..7fe903c85 100644
--- a/app/javascript/controllers/local_time_controller.js
+++ b/app/javascript/controllers/local_time_controller.js
@@ -2,7 +2,9 @@ import { Controller } from "@hotwired/stimulus"
 import { differenceInDays } from "helpers/date_helpers"
 
 export default class extends Controller {
-  static targets = [ "time", "date", "datetime", "shortdate", "ago", "indays", "daysago" ]
+  static targets = [ "time", "date", "datetime", "shortdate", "ago", "indays", "daysago", "agoorweekday" ]
+  static values = { refreshInterval: Number }
+  static classes = [ "local-time-value"]
 
   #timer
 
@@ -13,7 +15,10 @@ export default class extends Controller {
     this.dateTimeFormatter = new Intl.DateTimeFormat(undefined, { timeStyle: "short", dateStyle: "short" })
     this.agoFormatter = new AgoFormatter()
     this.daysagoFormatter = new DaysAgoFormatter()
+    this.datewithweekdayFormatter = new Intl.DateTimeFormat(undefined, { weekday: "long", month: "long", day: "numeric" })
+    this.datewithweekdayFormatter = new Intl.DateTimeFormat(undefined, { weekday: "long", month: "long", day: "numeric" })
     this.indaysFormatter = new InDaysFormatter()
+    this.agoorweekdayFormatter = new DaysAgoOrWeekdayFormatter()
   }
 
   connect() {
@@ -60,6 +65,10 @@ export default class extends Controller {
     this.#formatTime(this.daysagoFormatter, target)
   }
 
+  agoorweekdayTargetConnected(target) {
+    this.#formatTime(this.agoorweekdayFormatter, target)
+  }
+
   #refreshRelativeTimes() {
     this.agoTargets.forEach(target => {
       this.#formatTime(this.agoFormatter, target)
@@ -111,6 +120,18 @@ class DaysAgoFormatter {
   }
 }
 
+class DaysAgoOrWeekdayFormatter {
+  format(date) {
+    const days = differenceInDays(date, new Date())
+
+    if (days <= 1) {
+      return new DaysAgoFormatter().format(date)
+    } else {
+      return new Intl.DateTimeFormat(undefined, { weekday: "long", month: "long", day: "numeric" }).format(date)
+    }
+  }
+}
+
 class InDaysFormatter {
   format(date) {
     const days = differenceInDays(new Date(), date)
diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb
index 387f42a1c..e4eaf5f3d 100644
--- a/app/views/events/_day.html.erb
+++ b/app/views/events/_day.html.erb
@@ -4,7 +4,7 @@
     <h2 class="txt-medium events__day-header center">
       <span class="events__day-header-content">
         <% # TODO: Create proper format to match desired behavior: Today, tomorrow or date %>
-        <%= local_datetime_tag day_timeline.day, style: :daysago, class: "txt-ink" %>
+        <%= local_datetime_tag day_timeline.day, style: :agoorweekday, class: "txt-ink" %>
       </span>
     </h2>
 
@@ -19,7 +19,7 @@
 
             <%= local_datetime_tag events.first.created_at, class: "event__timestamp txt-small translucent" %>
           <% end %>
-        <% end %> 
+        <% end %>
       <% end %>
     </div>
 
diff --git a/app/views/events/_empty_days.html.erb b/app/views/events/_empty_days.html.erb
index 4ba5687e3..93be21058 100644
--- a/app/views/events/_empty_days.html.erb
+++ b/app/views/events/_empty_days.html.erb
@@ -3,12 +3,12 @@
 <% if earliest.present? %>
   <% if earliest == latest %>
     <div class="events--none txt-align-center">
-      <h2 class="txt-medium margin-none"><%= event_day_title(earliest) %></h2>
+      <h2 class="txt-medium margin-none"><%= local_datetime_tag earliest, style: :agoorweekday, class: "txt-ink txt-capitalize" %></h2>
       <p class="margin-none">No activity</p>
     </div>
   <% elsif earliest < latest %>
     <div class="events--none txt-align-center">
-      <h2 class="txt-medium margin-none"><%= event_day_title(earliest) %> – <%= event_day_title(latest) %></h2>
+      <h2 class="txt-medium margin-none"><%= local_datetime_tag earliest, style: :agoorweekday, class: "txt-ink txt-capitalize" %> – <%= local_datetime_tag latest, style: :agoorweekday, class: "txt-ink txt-capitalize" %></h2>
       <p class="margin-none">No activity for <%= (latest - earliest).seconds.in_days.round + 1 %> days</p>
     </div>
   <% end %>

From 6a1dcef6ef8bde6e0e62267bd024e175042acdc3 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 09:26:47 +0200
Subject: [PATCH 324/413] Add script to migrate existing events to the new
 format

---
 ...070025_migrate_existing_events_prefixes.rb | 20 +++++++++++++++++++
 db/schema.rb                                  |  3 ++-
 db/schema_cache.yml                           | 20 +++++++++++++++++--
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20250425070025_migrate_existing_events_prefixes.rb

diff --git a/db/migrate/20250425070025_migrate_existing_events_prefixes.rb b/db/migrate/20250425070025_migrate_existing_events_prefixes.rb
new file mode 100644
index 000000000..0b3840be9
--- /dev/null
+++ b/db/migrate/20250425070025_migrate_existing_events_prefixes.rb
@@ -0,0 +1,20 @@
+class MigrateExistingEventsPrefixes < ActiveRecord::Migration[8.1]
+  def change
+    execute <<-SQL
+      UPDATE events
+      SET
+        action = CASE
+          WHEN action = 'commented' THEN 'comment_created'
+          ELSE 'card_' || action
+        END,
+        eventable_id = CASE
+          WHEN action = 'commented' THEN json_extract(particulars, '$.comment_id')
+          ELSE eventable_id
+        END,
+        eventable_type = CASE
+          WHEN action = 'commented' THEN 'Comment'
+          ELSE eventable_type
+        END;
+    SQL
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c318b2ee1..39f007f59 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_24_105223) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_25_070025) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -292,6 +292,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_24_105223) do
     t.datetime "created_at", null: false
     t.string "title"
     t.datetime "updated_at", null: false
+    t.index ["title"], name: "index_tags_on_account_id_and_title", unique: true
   end
 
   create_table "users", force: :cascade do |t|
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 208449c4b..00b890f15 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -1941,7 +1941,23 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  tags: []
+  tags:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: tags
+    name: index_tags_on_account_id_and_title
+    unique: true
+    columns:
+    - title
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   users:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: users
@@ -2026,4 +2042,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250424105223
+version: 20250425070025

From a445b5c0683e40ff32f2c6714739a64bbeafbe74 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 09:48:15 +0200
Subject: [PATCH 325/413] Extract partial

---
 app/views/events/_day.html.erb          | 11 +----------
 app/views/events/_day_timeline.html.erb |  9 +++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 app/views/events/_day_timeline.html.erb

diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb
index e4eaf5f3d..36f33417a 100644
--- a/app/views/events/_day.html.erb
+++ b/app/views/events/_day.html.erb
@@ -11,16 +11,7 @@
     <div class="center events">
       <%= render_column_headers(day_timeline) %>
       <%= render_event_grid_cells %>
-
-      <% day_timeline.events.group_by { it.created_at.hour }.each do |hour, events| %>
-        <% events.group_by { event_column(it) }.each do |column, events| %>
-          <%= event_cluster_tag(hour, column) do %>
-            <%= render partial: "events/event", collection: events %>
-
-            <%= local_datetime_tag events.first.created_at, class: "event__timestamp txt-small translucent" %>
-          <% end %>
-        <% end %>
-      <% end %>
+      <%= render "events/day_timeline", day_timeline: day_timeline  %>
     </div>
 
     <%= render "events/empty_days", day_timeline: day_timeline %>
diff --git a/app/views/events/_day_timeline.html.erb b/app/views/events/_day_timeline.html.erb
new file mode 100644
index 000000000..8961a15d0
--- /dev/null
+++ b/app/views/events/_day_timeline.html.erb
@@ -0,0 +1,9 @@
+<% day_timeline.events.group_by { it.created_at.hour }.each do |hour, events| %>
+  <% events.group_by { event_column(it) }.each do |column, events| %>
+    <%= event_cluster_tag(hour, column) do %>
+      <%= render partial: "events/event", collection: events %>
+
+      <%= local_datetime_tag events.first.created_at, class: "event__timestamp txt-small translucent" %>
+    <% end %>
+  <% end %>
+<% end %>

From 6da814520dd0c389ad31f079491a15f3c992f236 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 09:48:33 +0200
Subject: [PATCH 326/413] Remove todo I already tackled

---
 app/views/events/_day.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb
index 36f33417a..91058f79f 100644
--- a/app/views/events/_day.html.erb
+++ b/app/views/events/_day.html.erb
@@ -3,7 +3,6 @@
   <% if day_timeline.has_activity? %>
     <h2 class="txt-medium events__day-header center">
       <span class="events__day-header-content">
-        <% # TODO: Create proper format to match desired behavior: Today, tomorrow or date %>
         <%= local_datetime_tag day_timeline.day, style: :agoorweekday, class: "txt-ink" %>
       </span>
     </h2>

From 32c9cdbba8c2b64a3d9e7639c6c19935b2e9708f Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 10:00:21 +0200
Subject: [PATCH 327/413] Extract filter partials and rely on filter as the
 source of truth for the selected collections

---
 app/views/events/_filter.html.erb             | 39 +------------------
 .../filter/_all_collections_option.html.erb   | 15 +++++++
 .../events/filter/_collection_option.html.erb | 20 ++++++++++
 3 files changed, 37 insertions(+), 37 deletions(-)
 create mode 100644 app/views/events/filter/_all_collections_option.html.erb
 create mode 100644 app/views/events/filter/_collection_option.html.erb

diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 6abe2244d..ab5488fd4 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -29,43 +29,8 @@
 
 		<%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width",
 					data: { controller: "form" } do |form| %>
-			<%= link_to events_path(clear_filter: true), class: "popup__group flex align-center", style: "--hover-size: 0" do %>
-				<div class="btn txt-xx-small flex-item-no-shrink">
-					<input type="checkbox" <%= "checked" unless params[:collection_ids] || cookies[:collection_filter] %>>
-
-					<span class="for-screen-reader">
-						See everything in all collections
-					</span>
-					<%= icon_tag "check", size: 18, class: "checked" %>
-				</div>
-				<%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
-					<span class="overflow-ellipsis">All collections</span>
-				<% end %>
-				<span class="translucent flex-item-no-shrink"> ›</span>
-			<% end %>
-
-			<% Current.user.collections.each do |collection| %>
-				<div class="popup__group flex align-center">
-					<div class="btn txt-xx-small">
-						<%= form.check_box "collection_ids[]", {
-							checked: (params[:collection_ids] || cookies[:collection_filter]&.split(","))&.include?(collection.id.to_s),
-							data: { action: "change->form#submit" },
-							include_hidden: false,
-						}, collection.id %>
-
-						<span class="for-screen-reader">
-							Toggle filter for <%= collection.name %>
-						</span>
-						<%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
-					</div>
-
-					<%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
-						<span class="overflow-ellipsis"><%= collection.name %></span>
-					<% end %>
-
-					<span class="translucent flex-item-no-shrink"> ›</span>
-				</div>
-			<% end %>
+			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
+			<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
 		<% end %>
 	</dialog>
 </div>
diff --git a/app/views/events/filter/_all_collections_option.html.erb b/app/views/events/filter/_all_collections_option.html.erb
new file mode 100644
index 000000000..0e4b567dd
--- /dev/null
+++ b/app/views/events/filter/_all_collections_option.html.erb
@@ -0,0 +1,15 @@
+<%= link_to events_path(clear_filter: true), class: "popup__group flex align-center", style: "--hover-size: 0" do %>
+  <div class="btn txt-xx-small flex-item-no-shrink">
+    <%= check_box_tag "filter_collections", nil, filter.collections.blank?, class: "form-checkbox" %>
+
+    <span class="for-screen-reader">
+			See everything in all collections
+		</span>
+    <%= icon_tag "check", size: 18, class: "checked" %>
+  </div>
+
+	<%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
+    <span class="overflow-ellipsis">All collections</span>
+  <% end %>
+  <span class="translucent flex-item-no-shrink"> ›</span>
+<% end %>
diff --git a/app/views/events/filter/_collection_option.html.erb b/app/views/events/filter/_collection_option.html.erb
new file mode 100644
index 000000000..c0953abc6
--- /dev/null
+++ b/app/views/events/filter/_collection_option.html.erb
@@ -0,0 +1,20 @@
+<div class="popup__group flex align-center">
+  <div class="btn txt-xx-small">
+    <%= form.check_box "collection_ids[]", {
+          checked: filter.collections.include?(collection),
+          data: { action: "change->form#submit" },
+          include_hidden: false,
+    }, collection.id %>
+
+    <span class="for-screen-reader">
+      Toggle filter for <%= collection.name %>
+    </span>
+    <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+  </div>
+
+  <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
+    <span class="overflow-ellipsis"><%= collection.name %></span>
+  <% end %>
+
+  <span class="translucent flex-item-no-shrink"> ›</span>
+</div>

From 74a8a6431e58b0bcf489bbb2c251e0894b2fd6af Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 10:21:38 +0200
Subject: [PATCH 328/413] Extract more templates

---
 app/views/events/_filter.html.erb             | 20 ++-----------------
 app/views/events/filter/_header.html.erb      | 10 ++++++++++
 .../filter/_new_collection_option.html.erb    |  7 +++++++
 3 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 app/views/events/filter/_header.html.erb
 create mode 100644 app/views/events/filter/_new_collection_option.html.erb

diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index ab5488fd4..104a707d5 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -8,24 +8,8 @@
 
 	<dialog class="events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow"
 				style="z-index: 5;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-		<div class="flex align-center full-width gap-half">
-			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
-				<%= icon_tag "filter" %>
-			</span>
-			<strong class="popup__title txt-medium">Collections</strong>
-			<button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
-				<%= icon_tag "remove-med" %>
-				<span class="for-screen-reader">Close</span>
-			</button>
-		</div>
-
-		<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
-			<%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
-				<%= icon_tag "add" %>
-				<span>Add a new collection</span>
-			<% end %>
-		</div>
-		<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
+		<%= render "events/filter/header" %>
+		<%= render "events/filter/new_collection_option" %>
 
 		<%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width",
 					data: { controller: "form" } do |form| %>
diff --git a/app/views/events/filter/_header.html.erb b/app/views/events/filter/_header.html.erb
new file mode 100644
index 000000000..27b5ccc6e
--- /dev/null
+++ b/app/views/events/filter/_header.html.erb
@@ -0,0 +1,10 @@
+<div class="flex align-center full-width gap-half">
+			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
+        <%= icon_tag "filter" %>
+      </span>
+  <strong class="popup__title txt-medium">Collections</strong>
+  <button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
+    <%= icon_tag "remove-med" %>
+    <span class="for-screen-reader">Close</span>
+  </button>
+</div>
diff --git a/app/views/events/filter/_new_collection_option.html.erb b/app/views/events/filter/_new_collection_option.html.erb
new file mode 100644
index 000000000..3064516cd
--- /dev/null
+++ b/app/views/events/filter/_new_collection_option.html.erb
@@ -0,0 +1,7 @@
+<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+  <%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+    <%= icon_tag "add" %>
+    <span>Add a new collection</span>
+  <% end %>
+</div>
+<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">

From b866267192a3147d6b546abe06c7581809e27105 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 10:28:26 +0200
Subject: [PATCH 329/413] Not used outside the class anymore

---
 app/models/user/day_timeline.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/user/day_timeline.rb b/app/models/user/day_timeline.rb
index 01ec9e56b..92ae835ac 100644
--- a/app/models/user/day_timeline.rb
+++ b/app/models/user/day_timeline.rb
@@ -13,10 +13,6 @@ class User::DayTimeline
     filtered_events.where(created_at: window).order(created_at: :desc)
   end
 
-  def window
-    day.all_day
-  end
-
   def next_day
     latest_event_before&.created_at
   end
@@ -41,4 +37,8 @@ class User::DayTimeline
     def latest_event_before
       filtered_events.where(created_at: ...day.beginning_of_day).chronologically.last
     end
+
+    def window
+      day.all_day
+    end
 end

From 5a431ba6bb52ee74782d6b36163070a8a7a4d762 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 10:31:41 +0200
Subject: [PATCH 330/413] Collections can be private now too

---
 app/models/user/day_timeline.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/user/day_timeline.rb b/app/models/user/day_timeline.rb
index 92ae835ac..32aad0814 100644
--- a/app/models/user/day_timeline.rb
+++ b/app/models/user/day_timeline.rb
@@ -17,10 +17,6 @@ class User::DayTimeline
     latest_event_before&.created_at
   end
 
-  def collections
-    filter.collections.presence || user.collections
-  end
-
   def earliest_time
     next_day&.tomorrow&.beginning_of_day
   end
@@ -34,6 +30,10 @@ class User::DayTimeline
       @filtered_events ||= Event.where(collection: collections)
     end
 
+    def collections
+      filter.collections.presence || user.collections
+    end
+
     def latest_event_before
       filtered_events.where(created_at: ...day.beginning_of_day).chronologically.last
     end

From 88fceb312301febd056548c4a69803787e7921ff Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 10:40:26 +0200
Subject: [PATCH 331/413] Add brakeman rule

---
 config/brakeman.ignore | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index def63fdfe..2b01354c6 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -46,7 +46,30 @@
         95
       ],
       "note": ""
+    },
+    {
+      "warning_type": "Remote Code Execution",
+      "warning_code": 24,
+      "fingerprint": "b00571393e95a8c7d77b1ed963cfc5cc89333bc82f447cf8783549d817990305",
+      "check_name": "UnsafeReflection",
+      "message": "Unsafe reflection method `safe_constantize` called on model attribute",
+      "file": "app/models/notifier.rb",
+      "line": 8,
+      "link": "https://brakemanscanner.org/docs/warning_types/remote_code_execution/",
+      "code": "\"Notifier::#{Event.eventable.class}EventNotifier\".safe_constantize",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Notifier",
+        "method": "s(:self).for"
+      },
+      "user_input": "Event.eventable.class",
+      "confidence": "Medium",
+      "cwe_id": [
+        470
+      ],
+      "note": ""
     }
   ],
-  "brakeman_version": "7.0.0"
+  "brakeman_version": "7.0.2"
 }

From 90576998a49e2bdef2c39b6354cef4d6ba500d20 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 10:52:51 +0200
Subject: [PATCH 332/413] Rename to avoid using the same name

---
 app/views/events/_day_timeline.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/events/_day_timeline.html.erb b/app/views/events/_day_timeline.html.erb
index 8961a15d0..91933a709 100644
--- a/app/views/events/_day_timeline.html.erb
+++ b/app/views/events/_day_timeline.html.erb
@@ -1,5 +1,5 @@
-<% day_timeline.events.group_by { it.created_at.hour }.each do |hour, events| %>
-  <% events.group_by { event_column(it) }.each do |column, events| %>
+<% day_timeline.events.group_by { it.created_at.hour }.each do |hour, events_grouped_by_hour| %>
+  <% events_grouped_by_hour.group_by { event_column(it) }.each do |column, events| %>
     <%= event_cluster_tag(hour, column) do %>
       <%= render partial: "events/event", collection: events %>
 

From e90b0624409a292509b38ccfee0dd22d439d7020 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 12:37:17 +0200
Subject: [PATCH 333/413] Configure the autoclose period at the collection
 level

---
 app/controllers/collections_controller.rb     |  6 +-
 app/helpers/collections_helper.rb             | 12 +++
 app/models/card/closeable.rb                  | 18 ++---
 app/models/collection.rb                      |  2 +-
 app/models/collection/auto_closing.rb         | 19 +++++
 app/views/cards/container/_closure.html.erb   |  2 +-
 app/views/collections/edit.html.erb           | 78 +------------------
 .../collections/edit/_auto_close.html.erb     |  6 ++
 app/views/collections/edit/_name.html.erb     |  7 ++
 app/views/collections/edit/_users.html.erb    | 42 ++++++++++
 .../collections/edit/_workflows.html.erb      | 21 +++++
 ...27_add_auto_close_period_to_collections.rb | 11 +++
 db/schema.rb                                  |  5 +-
 db/schema_cache.yml                           | 46 ++++++-----
 .../collections_controller_test.rb            |  4 +-
 test/fixtures/collections.yml                 |  1 +
 test/models/card/closeable_test.rb            | 26 ++++++-
 17 files changed, 189 insertions(+), 117 deletions(-)
 create mode 100644 app/helpers/collections_helper.rb
 create mode 100644 app/models/collection/auto_closing.rb
 create mode 100644 app/views/collections/edit/_auto_close.html.erb
 create mode 100644 app/views/collections/edit/_name.html.erb
 create mode 100644 app/views/collections/edit/_users.html.erb
 create mode 100644 app/views/collections/edit/_workflows.html.erb
 create mode 100644 db/migrate/20250425092727_add_auto_close_period_to_collections.rb

diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 36698afdf..f5eb8c9fc 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -6,7 +6,7 @@ class CollectionsController < ApplicationController
   end
 
   def create
-    @collection = Collection.create! collection_params
+    @collection = Collection.create! collection_params.with_defaults(all_access: true)
     redirect_to cards_path(collection_ids: [ @collection ])
   end
 
@@ -19,7 +19,7 @@ class CollectionsController < ApplicationController
     @collection.update! collection_params
     @collection.accesses.revise granted: grantees, revoked: revokees
 
-    redirect_to cards_path(collection_ids: [ @collection ])
+    redirect_to edit_collection_path(@collection), notice: "Collection updated"
   end
 
   def destroy
@@ -33,7 +33,7 @@ class CollectionsController < ApplicationController
     end
 
     def collection_params
-      params.expect(collection: [ :name, :all_access ]).with_defaults(all_access: true)
+      params.expect(collection: [ :name, :all_access, :auto_close_period ])
     end
 
     def grantees
diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb
new file mode 100644
index 000000000..5f872079c
--- /dev/null
+++ b/app/helpers/collections_helper.rb
@@ -0,0 +1,12 @@
+module CollectionsHelper
+  def collection_auto_close_options
+    [
+      [ "30 days", 30.days ],
+      [ "60 days", 60.days ],
+      [ "90 days", 90.days ],
+      [ "6 months", 180.days ],
+      [ "1 year", 365.days ],
+      [ "Never", nil ]
+    ]
+  end
+end
diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
index 1040c27dd..b599b6a03 100644
--- a/app/models/card/closeable.rb
+++ b/app/models/card/closeable.rb
@@ -1,17 +1,6 @@
 module Card::Closeable
   extend ActiveSupport::Concern
 
-  AUTO_CLOSE_OPTIONS = [
-    [ "30 days", 30.days ],
-    [ "60 days", 60.days ],
-    [ "90 days", 90.days ],
-    [ "6 months", 180.days ],
-    [ "1 year", 365.days ],
-    [ "Never", nil ]
-  ].freeze
-
-  AUTO_CLOSE_AFTER = 30.days
-
   included do
     has_one :closure, dependent: :destroy
 
@@ -19,7 +8,10 @@ module Card::Closeable
     scope :open, -> { where.missing(:closure) }
 
     scope :recently_closed_first, -> { closed.order("closures.created_at": :desc) }
-    scope :due_to_be_closed, -> { considering.where(last_active_at: ..AUTO_CLOSE_AFTER.ago) }
+    scope :in_auto_closing_collection, -> { joins(:collection).merge(Collection.auto_closing) }
+    scope :due_to_be_closed, -> { considering.in_auto_closing_collection.where("last_active_at <= DATETIME('now', '-' || auto_close_period || ' seconds')") }
+
+    delegate :auto_closing?, :auto_close_period, to: :collection
   end
 
   class_methods do
@@ -31,7 +23,7 @@ module Card::Closeable
   end
 
   def auto_close_at
-    last_active_at + AUTO_CLOSE_AFTER if last_active_at
+    last_active_at + auto_close_period if auto_closing? && last_active_at
   end
 
   def closed?
diff --git a/app/models/collection.rb b/app/models/collection.rb
index 9cee579e6..29e07a98b 100644
--- a/app/models/collection.rb
+++ b/app/models/collection.rb
@@ -1,5 +1,5 @@
 class Collection < ApplicationRecord
-  include Accessible, Broadcastable, Filterable, Workflowing
+  include AutoClosing, Accessible, Broadcastable, Filterable, Workflowing
 
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
diff --git a/app/models/collection/auto_closing.rb b/app/models/collection/auto_closing.rb
new file mode 100644
index 000000000..e3a9c8990
--- /dev/null
+++ b/app/models/collection/auto_closing.rb
@@ -0,0 +1,19 @@
+module Collection::AutoClosing
+  extend ActiveSupport::Concern
+
+  included do
+    scope :auto_closing, -> { where.not(auto_close_period: nil) }
+    before_create :set_default_auto_close_period
+  end
+
+  def auto_closing?
+    auto_close_period.present?
+  end
+
+  private
+    DEFAULT_AUTO_CLOSE_PERIOD = 30.days
+
+    def set_default_auto_close_period
+      self.auto_close_period ||= DEFAULT_AUTO_CLOSE_PERIOD unless attribute_present?(:auto_close_period)
+    end
+end
diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb
index e9006f3aa..f69cab694 100644
--- a/app/views/cards/container/_closure.html.erb
+++ b/app/views/cards/container/_closure.html.erb
@@ -24,7 +24,7 @@
     <span class="card-perma__closure-message">
       <% if card.doing? %>
         Returns to <em>Considering</em> if no activity <%= local_datetime_tag(card.auto_reconsider_at, style: :indays) -%>.
-      <% else %>
+      <% elsif card.auto_closing? %>
         Auto-closes if no activity <%= local_datetime_tag(card.auto_close_at, style: :indays) -%>.
       <% end %>
     </span>
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index 43b022e57..62d50298e 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -17,56 +17,9 @@
     <strong class="txt-large">Name and Access</strong>
     <p class="margin-none-block-start">Choose who can access this Collection.</p>
     <%= form_with model: @collection, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
-      <div class="flex align-center gap">
-        <label class="flex-item-grow">
-          <strong><%= form.text_field :name, name: "collection[name]", class: "input full-width",
-                required: true, autofocus: true, placeholder: "Give it a name…",
-                data: { action: "keydown.enter->form#submit:prevent, keydown.esc->form#cancel" } %></strong>
-        </label>
-      </div>
 
-      <section class="margin-block fill-shade border-radius">
-        <%= access_menu_tag @collection do %>
-          <li class="flex align-center gap pad unpad-block-end txt-normal">
-            <figure class="avatar flex-item-no-shrink" style="--avatar-border-radius: 0; --avatar-size: 3.5ch; margin-inline: 0.3em;">
-              <%= icon_tag "everyone" %>
-              <span class="for-screen-reader">Everyone</span>
-            </figure>
-
-            <div class="min-width">
-              <div class="overflow-ellipsis fill-shade"><strong>Everyone</strong></div>
-            </div>
-
-            <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true" />
-
-            <label for="collection_all_access" class="switch">
-              <%= form.check_box :all_access, class: "switch__input", checked: @collection.all_access?, data: { action: "change->toggle-class#toggle" } %>
-              <span class="switch__btn round"></span>
-              <span class="for-screen-reader">Give everyone access to this project</span>
-            </label>
-          </li>
-
-          <hr class="separator--horizontal margin-inline" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
-
-          <% if User.active.count > 20 %>
-            <div class="pad-inline">
-              <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter">
-            </div>
-          <% end %>
-
-          <div data-filter-target="list" class="users-list pad-inline">
-            <% 20.times do %>
-              <%= access_toggles_for @selected_users, selected: true %>
-            <% end %>
-
-            <% if @selected_users.any? && @unselected_users.any? %>
-              <hr class="separator full-width" style="--border-style: solid">
-            <% end %>
-
-            <%= access_toggles_for @unselected_users, selected: false %>
-          </div>
-        <% end %>
-      </section>
+      <%= render "collections/edit/name", form: form %>
+      <%= render "collections/edit/users", collection: @collection, selected_users: @selected_users, unselected_users: @unselected_users, form: form %>
 
       <button type="submit" id="log_in" class="btn btn--reversed center txt-normal">
         <%= icon_tag "check" %>
@@ -78,33 +31,10 @@
   </div>
 
   <div class="panel shadow center flex flex-column">
-    <strong class="txt-large">Auto-Close Cards</strong>
-    <label for="closure" class="margin-block-end">Cards automatically close when there is no activity for…</label>
-    <%= select_tag :closure, options_for_select(Card::Closeable::AUTO_CLOSE_OPTIONS, Card::Closeable::AUTO_CLOSE_AFTER), { class: "input input--select full-width margin-block-end", data: { action: "change->form#submit" } } %>
+    <%= render "collections/edit/auto_close", collection: @collection %>
 
     <hr class="separator--horizontal full-width margin-block" style="--border-color: var(--color-subtle);" aria-hidden="true" />
-
-    <strong class="txt-large">Workflows</strong>
-    <div class="flex justify-center margin-block-end">Use a Workflow to track progress in this Collection.</div>
-    <div class="flex flex-wrap gap">
-      <% Workflow.all.each do |workflow| %>
-        <div class="workflow-preview txt-align-start border border-radius <%= 'workflow-preview--selected' if workflow == @collection.workflow %>">
-          <%= button_to collection_workflow_path(@collection), method: :patch do %>
-            <%= hidden_field_tag "collection[workflow_id]", workflow.id %>
-            <strong class="txt-small overflow-ellipsis"><%= workflow.name %></strong>
-            <ul class="list-style-none txt-xx-small ">
-              <% workflow.stages.each do |stage| %>
-                <li class="overflow-ellipsis flex align-center gap-half min-width">
-                  <span class="workflow-preview__swatch btn btn--circle" style="--btn-background: <%= stage.color.present? ? stage.color : Card::Colored::DEFAULT_COLOR %>;"></span>
-                  <span class="overflow-ellipsis"><%= stage.name %></span>
-                </li>
-              <% end %>
-            </ul>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-    <p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
+    <%= render "collections/edit/workflows", collection: @collection %>
 
     <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle); margin-block-start: auto;" aria-hidden="true" />
 
diff --git a/app/views/collections/edit/_auto_close.html.erb b/app/views/collections/edit/_auto_close.html.erb
new file mode 100644
index 000000000..84be06644
--- /dev/null
+++ b/app/views/collections/edit/_auto_close.html.erb
@@ -0,0 +1,6 @@
+<strong class="txt-large">Auto-Close Cards</strong>
+<label for="closure" class="margin-block-end">Cards automatically close when there is no activity for…</label>
+
+<%= form_with model: collection, data: { controller: "form" } do |form| %>
+  <%= form.select :auto_close_period, collection_auto_close_options, {}, { class: "input input--select full-width margin-block-end", data: { action: "change->form#submit" } } %>
+<% end %>
diff --git a/app/views/collections/edit/_name.html.erb b/app/views/collections/edit/_name.html.erb
new file mode 100644
index 000000000..e08e885ce
--- /dev/null
+++ b/app/views/collections/edit/_name.html.erb
@@ -0,0 +1,7 @@
+<div class="flex align-center gap">
+  <label class="flex-item-grow">
+    <strong><%= form.text_field :name, name: "collection[name]", class: "input full-width",
+          required: true, autofocus: true, placeholder: "Give it a name…",
+          data: { action: "keydown.enter->form#submit:prevent, keydown.esc->form#cancel" } %></strong>
+  </label>
+</div>
diff --git a/app/views/collections/edit/_users.html.erb b/app/views/collections/edit/_users.html.erb
new file mode 100644
index 000000000..bc3530419
--- /dev/null
+++ b/app/views/collections/edit/_users.html.erb
@@ -0,0 +1,42 @@
+<section class="margin-block fill-shade border-radius">
+  <%= access_menu_tag collection do %>
+    <li class="flex align-center gap pad unpad-block-end txt-normal">
+      <figure class="avatar flex-item-no-shrink" style="--avatar-border-radius: 0; --avatar-size: 3.5ch; margin-inline: 0.3em;">
+        <%= icon_tag "everyone" %>
+        <span class="for-screen-reader">Everyone</span>
+      </figure>
+
+      <div class="min-width">
+        <div class="overflow-ellipsis fill-shade"><strong>Everyone</strong></div>
+      </div>
+
+      <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true" />
+
+      <label for="collection_all_access" class="switch">
+        <%= form.check_box :all_access, class: "switch__input", checked: collection.all_access?, data: { action: "change->toggle-class#toggle" } %>
+        <span class="switch__btn round"></span>
+        <span class="for-screen-reader">Give everyone access to this project</span>
+      </label>
+    </li>
+
+    <hr class="separator--horizontal margin-inline" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
+
+    <% if User.active.count > 20 %>
+      <div class="pad-inline">
+        <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter">
+      </div>
+    <% end %>
+
+    <div data-filter-target="list" class="users-list pad-inline">
+      <% 20.times do %>
+        <%= access_toggles_for selected_users, selected: true %>
+      <% end %>
+
+      <% if selected_users.any? && unselected_users.any? %>
+        <hr class="separator full-width" style="--border-style: solid">
+      <% end %>
+
+      <%= access_toggles_for unselected_users, selected: false %>
+    </div>
+  <% end %>
+</section>
diff --git a/app/views/collections/edit/_workflows.html.erb b/app/views/collections/edit/_workflows.html.erb
new file mode 100644
index 000000000..1d44f014e
--- /dev/null
+++ b/app/views/collections/edit/_workflows.html.erb
@@ -0,0 +1,21 @@
+<strong class="txt-large">Workflows</strong>
+<div class="flex justify-center margin-block-end">Use a Workflow to track progress in this Collection.</div>
+<div class="flex flex-wrap gap">
+  <% Workflow.all.each do |workflow| %>
+    <div class="workflow-preview txt-align-start border border-radius <%= 'workflow-preview--selected' if workflow == collection.workflow %>">
+      <%= button_to collection_workflow_path(collection), method: :patch do %>
+        <%= hidden_field_tag "collection[workflow_id]", workflow.id %>
+        <strong class="txt-small overflow-ellipsis"><%= workflow.name %></strong>
+        <ul class="list-style-none txt-xx-small ">
+          <% workflow.stages.each do |stage| %>
+            <li class="overflow-ellipsis flex align-center gap-half min-width">
+              <span class="workflow-preview__swatch btn btn--circle" style="--btn-background: <%= stage.color.present? ? stage.color : Card::Colored::DEFAULT_COLOR %>;"></span>
+              <span class="overflow-ellipsis"><%= stage.name %></span>
+            </li>
+          <% end %>
+        </ul>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+<p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
diff --git a/db/migrate/20250425092727_add_auto_close_period_to_collections.rb b/db/migrate/20250425092727_add_auto_close_period_to_collections.rb
new file mode 100644
index 000000000..5a96c9a60
--- /dev/null
+++ b/db/migrate/20250425092727_add_auto_close_period_to_collections.rb
@@ -0,0 +1,11 @@
+class AddAutoClosePeriodToCollections < ActiveRecord::Migration[8.1]
+  def change
+    add_column :collections, :auto_close_period, :bigint
+
+    add_index :collections, :auto_close_period
+
+    execute <<~SQL
+      UPDATE collections SET auto_close_period = #{30.days.to_i} WHERE auto_close_period IS NULL;
+    SQL
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 39f007f59..fcdb52c28 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_25_070025) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_25_092727) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -141,11 +141,13 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_25_070025) do
 
   create_table "collections", force: :cascade do |t|
     t.boolean "all_access", default: false, null: false
+    t.bigint "auto_close_period"
     t.datetime "created_at", null: false
     t.integer "creator_id", null: false
     t.string "name", null: false
     t.datetime "updated_at", null: false
     t.integer "workflow_id"
+    t.index ["auto_close_period"], name: "index_collections_on_auto_close_period"
     t.index ["creator_id"], name: "index_collections_on_creator_id"
     t.index ["workflow_id"], name: "index_collections_on_workflow_id"
   end
@@ -292,7 +294,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_25_070025) do
     t.datetime "created_at", null: false
     t.string "title"
     t.datetime "updated_at", null: false
-    t.index ["title"], name: "index_tags_on_account_id_and_title", unique: true
   end
 
   create_table "users", force: :cascade do |t|
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 00b890f15..3df7f5fe6 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -504,6 +504,16 @@ columns:
     default_function:
     collation:
     comment:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: auto_close_period
+    cast_type: *11
+    sql_type_metadata: *12
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
   - *5
   - *23
   - *6
@@ -1401,6 +1411,22 @@ indexes:
     comment:
     valid: true
   collections:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: collections
+    name: index_collections_on_auto_close_period
+    unique: false
+    columns:
+    - auto_close_period
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: collections
     name: index_collections_on_creator_id
@@ -1941,23 +1967,7 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  tags:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: tags
-    name: index_tags_on_account_id_and_title
-    unique: true
-    columns:
-    - title
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
+  tags: []
   users:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: users
@@ -2042,4 +2052,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250425070025
+version: 20250425092727
diff --git a/test/controllers/collections_controller_test.rb b/test/controllers/collections_controller_test.rb
index 20111c4bf..f816332b8 100644
--- a/test/controllers/collections_controller_test.rb
+++ b/test/controllers/collections_controller_test.rb
@@ -35,7 +35,7 @@ class CollectionsControllerTest < ActionDispatch::IntegrationTest
       user_ids: users(:david, :jz).pluck(:id)
     }
 
-    assert_redirected_to cards_path(collection_ids: [ collections(:writebook) ])
+    assert_redirected_to edit_collection_path(collections(:writebook))
     assert_equal "Writebook bugs", collections(:writebook).reload.name
     assert_equal users(:david, :jz).sort, collections(:writebook).users.sort
     assert_not collections(:writebook).all_access?
@@ -49,7 +49,7 @@ class CollectionsControllerTest < ActionDispatch::IntegrationTest
 
     patch collection_path(collection), params: { collection: { name: "Bugs", all_access: true } }
 
-    assert_redirected_to cards_path(collection_ids: [ collection ])
+    assert_redirected_to edit_collection_path(collection)
     assert collection.reload.all_access?
     assert_equal User.all, collection.users
   end
diff --git a/test/fixtures/collections.yml b/test/fixtures/collections.yml
index 9e1e8d484..1487aaa5e 100644
--- a/test/fixtures/collections.yml
+++ b/test/fixtures/collections.yml
@@ -2,4 +2,5 @@ writebook:
   name: Writebook
   creator: david
   all_access: true
+  auto_close_period: 30
   workflow: qa
diff --git a/test/models/card/closeable_test.rb b/test/models/card/closeable_test.rb
index 738eaca53..008058866 100644
--- a/test/models/card/closeable_test.rb
+++ b/test/models/card/closeable_test.rb
@@ -15,11 +15,19 @@ class Card::CloseableTest < ActiveSupport::TestCase
     assert_equal users(:kevin), cards(:logo).closed_by
   end
 
-  test "auto_close_all_due" do
+  test "autoclose_at infers the period from the collection" do
+    freeze_time
+
+    collections(:writebook).update! auto_close_period: 123.days
+    cards(:logo).update! last_active_at: 2.day.ago
+    assert_equal (123-2).days.from_now, cards(:logo).auto_close_at
+  end
+
+  test "auto close all due" do
     cards(:logo, :shipping).each(&:reconsider)
 
-    cards(:logo).update!(last_active_at: 1.day.ago - Card::Closeable::AUTO_CLOSE_AFTER)
-    cards(:shipping).update!(last_active_at: 1.day.from_now - Card::Closeable::AUTO_CLOSE_AFTER)
+    cards(:logo).update!(last_active_at: 1.day.ago - collections(:writebook).auto_close_period)
+    cards(:shipping).update!(last_active_at: 1.day.from_now - collections(:writebook).auto_close_period)
 
     assert_difference -> { Card.closed.count }, +1 do
       Card.auto_close_all_due
@@ -28,4 +36,16 @@ class Card::CloseableTest < ActiveSupport::TestCase
     assert cards(:logo).reload.closed?
     assert_not cards(:shipping).reload.closed?
   end
+
+  test "don't auto close those cards where the collection has no auto close period" do
+    cards(:logo, :shipping).each(&:reconsider)
+
+    collections(:writebook).update auto_close_period: nil
+
+    assert_no_difference -> { Card.closed.count } do
+      Card.auto_close_all_due
+    end
+
+    assert_not cards(:logo).reload.closed?
+  end
 end

From d96db6773479dc735e803eec09603332f5161643 Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Fri, 25 Apr 2025 12:27:04 +0100
Subject: [PATCH 334/413] Configure deployment for load balancing

- Adds a load balancer accessory
- Disables SSL from the app's proxy (since the LB will handle it)
---
 config/deploy.production.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/config/deploy.production.yml b/config/deploy.production.yml
index cc05d75b5..01f5fbfc8 100644
--- a/config/deploy.production.yml
+++ b/config/deploy.production.yml
@@ -8,13 +8,10 @@ servers:
   web-replica:
     hosts:
       - fizzy-app-102
+    proxy: true
 
 proxy:
-  hosts:
-    - fizzy.37signals.com # will return a 404 for now
-    - 37s.fizzy.37signals.com
-    - dev.fizzy.37signals.com
-    - qa.fizzy.37signals.com
+  ssl: false
 
 ssh:
   user: app
@@ -47,3 +44,12 @@ accessories:
     cmd: beamer replica --primary=http://fizzy-app-101:5000/ --dir=/storage
     roles:
       - web-replica
+
+  load-balancer:
+    image: basecamp/kamal-proxy:lb
+    roles:
+      - web
+    options:
+      publish:
+        - 80:80
+        - 443:443

From ba446c27b4d8e70758bacb0004508b9caa22f9f4 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 10:35:16 -0500
Subject: [PATCH 335/413] Consistent sizing

---
 app/assets/stylesheets/workflows.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/workflows.css b/app/assets/stylesheets/workflows.css
index a2b852b43..d1f525da6 100644
--- a/app/assets/stylesheets/workflows.css
+++ b/app/assets/stylesheets/workflows.css
@@ -32,6 +32,7 @@
   .workflow-preview {
     --border-size: 3px;
 
+    aspect-ratio: 1;
     flex: 1 1 30%;
     max-inline-size: 33%;
     padding: 0.5em 1em;

From f4e30a6f6ef136f365df3c86ebe6cdf883a5eacc Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 10:36:08 -0500
Subject: [PATCH 336/413] Remove debug

---
 app/views/collections/edit.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index 43b022e57..64a5d4b2d 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -55,9 +55,7 @@
           <% end %>
 
           <div data-filter-target="list" class="users-list pad-inline">
-            <% 20.times do %>
-              <%= access_toggles_for @selected_users, selected: true %>
-            <% end %>
+            <%= access_toggles_for @selected_users, selected: true %>
 
             <% if @selected_users.any? && @unselected_users.any? %>
               <hr class="separator full-width" style="--border-style: solid">

From 8dceb23e68b0899be15852a0f46c32238e14811a Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 10:37:42 -0500
Subject: [PATCH 337/413] Space between

---
 app/views/collections/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index 64a5d4b2d..31097648d 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -102,7 +102,7 @@
         </div>
       <% end %>
     </div>
-    <p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
+    <p class="margin-block-end-double"><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
 
     <hr class="separator--horizontal full-width" style="--border-color: var(--color-subtle); margin-block-start: auto;" aria-hidden="true" />
 

From ffff8b72f1a086622e6d8eb4519bed2855b2f1f7 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 10:39:03 -0500
Subject: [PATCH 338/413] Style

---
 app/views/events/filter/_header.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/events/filter/_header.html.erb b/app/views/events/filter/_header.html.erb
index 27b5ccc6e..48039a51a 100644
--- a/app/views/events/filter/_header.html.erb
+++ b/app/views/events/filter/_header.html.erb
@@ -1,7 +1,7 @@
 <div class="flex align-center full-width gap-half">
-			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
-        <%= icon_tag "filter" %>
-      </span>
+  <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
+    <%= icon_tag "filter" %>
+  </span>
   <strong class="popup__title txt-medium">Collections</strong>
   <button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
     <%= icon_tag "remove-med" %>

From c085266ceb00a07393ad39c1f851c6319b71e79c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 12:42:22 -0500
Subject: [PATCH 339/413] Filter collections menus, add keyboard shortcuts

---
 app/assets/stylesheets/base.css               | 13 +++++++
 .../cards/index/_collections_filter.html.erb  |  4 +--
 app/views/cards/index/_header.html.erb        | 35 ++++++++++++++-----
 app/views/events/_filter.html.erb             | 31 ++++++++++++----
 .../events/filter/_collection_option.html.erb |  4 +--
 app/views/terminals/show.html.erb             |  2 +-
 6 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css
index 9301bbc61..001fd58dd 100644
--- a/app/assets/stylesheets/base.css
+++ b/app/assets/stylesheets/base.css
@@ -85,6 +85,19 @@
     list-style: none;
   }
 
+  kbd {
+    border: 1px solid;
+    border-radius: .3em;
+    box-shadow: 0 0.1em 0 currentColor;
+    font-family: var(--font-mono);
+    font-size: var(--text-x-small);
+    font-weight: 600;
+    opacity: 0.7;
+    padding: 0em 0.4em;
+    text-transform: uppercase;
+    white-space: nowrap;
+  }
+
   video {
     max-inline-size: 100%;
   }
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index 3ac3d2605..5279d6807 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -20,7 +20,7 @@
   <% end %>
 
   <% Current.user.collections.order(:name).each do |collection| %>
-    <div class="popup__group flex align-center">
+    <li class="popup__group flex align-center" data-value="<%= collection.name.downcase %>">
       <div class="btn txt-xx-small flex-item-no-shrink">
         <%= form.check_box "collection_ids[]", {
               checked: filter.collections.include?(collection),
@@ -39,6 +39,6 @@
       <% end %>
   
       <span class="translucent flex-item-no-shrink"> ›</span>
-    </div>
+    </li>
   <% end %>
 <% end %>
diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 2ac6fcc39..0e53d3b80 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -5,14 +5,24 @@
   <div class="btn btn--placeholder flex-item-justify-start"></div>
 
   <header class="flex flex-inline flex-column center flex-shrink">
-    <div class="card-filter--collection flex-inline center position-relative" data-controller="dialog" data-action="click@document->dialog#closeOnClickOutside">
-      <button class="txt-align-center input input--select borderless center txt-medium" data-action="click->dialog#open:stop">
-        <h1 class="txt-large overflow-ellipsis margin-none">
-          <%= filter_title filter %>
+    <div class="card-filter--collection flex-inline align-center center position-relative" data-controller="dialog" data-action="click@document->dialog#closeOnClickOutside">
+      <%= tag.button class: "txt-align-center input input--select borderless txt-medium",
+          data: {
+            action: "click->dialog#open:stop keydown.meta+j@document->hotkey#click",
+            controller: "hotkey" } do %>
+        <h1 class="txt-large overflow-ellipsis margin-none flex align-center gap-half">
+          <span><%= filter_title filter %></span>
+          <kbd class="kbd">⌘j</kbd>
         </h1>
-      </button>
+      <% end %>
 
-      <dialog class="popup popup--animated panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="keydown.esc->dialog#close:stop turbo:before-cache@document->dialog#close">
+      <%= tag.dialog class:"popup popup--animated panel flex-column align-start gap-half fill-white shadow",
+          data: { 
+            action:"keydown.esc->dialog#close:stop turbo:before-cache@document->dialog#close",
+            controller: "filter", 
+            dialog_target: "dialog",
+            filter_active_class: "filter--active", 
+            filter_selected_class: "selected" } do %>
         <div class="flex align-center full-width gap-half">
           <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
             <%= icon_tag "filter" %>
@@ -23,9 +33,16 @@
             <span class="for-screen-reader">Close</span>
           </button>
         </div>
-
-        <%= render "cards/index/collections_filter", filter: filter %>
-      </dialog>
+        <% if Current.user.collections.count > 15 %>
+          <input placeholder="Find a collection…" class="input input--transparent txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter" autofocus=>
+        <% end %>
+        <menu data-filter-target="list" contents>
+          <%= render "cards/index/collections_filter", filter: filter %>
+        </menu>
+        <p class="txt-small txt-nowrap txt-align-center margin-block-half full-width">
+          Press <kbd class="kbd">⌘j</kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close.
+        </p>
+      <% end %>
     </div>
   </header>
 
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 104a707d5..ee19a3112 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -1,20 +1,37 @@
 <div class="max-width margin-block-end-half"
 		data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-	<button class="events__filter-btn input input--select flex-inline center min-width max-width txt-small" data-action="click->dialog#open:stop">
+	<%= tag.button class:"events__filter-btn input input--select flex-inline center min-width max-width txt-small",
+			data: {
+				action: "click->dialog#open:stop keydown.meta+j@document->hotkey#click",
+				controller: "hotkey" } do %>
 		<span class="overflow-ellipsis center">
 			<%= filter_selected_collections_label(filter) %>
 		</span>
-	</button>
+		<% end %>
 
-	<dialog class="events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow"
-				style="z-index: 5;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+	<%= tag.dialog class: "events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow", 
+			style: "z-index: 5;", 
+			data: { 
+				action: "turbo:before-cache@document->dialog#close",
+				controller: "filter", 
+				dialog_target: "dialog",
+				filter_active_class: "filter--active", 
+				filter_selected_class: "selected" } do %>
 		<%= render "events/filter/header" %>
 		<%= render "events/filter/new_collection_option" %>
-
+		<% if Current.user.collections.count > 15 %>
+			<input placeholder="Find a collection…" class="input input--transparent txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter" autofocus>
+		<% end %>
 		<%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width",
 					data: { controller: "form" } do |form| %>
 			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
-			<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
+			<menu data-filter-target="list" contents>
+				<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
+			</menu>
 		<% end %>
-	</dialog>
+
+		<p class="txt-small txt-nowrap txt-align-center margin-block-half full-width">
+			Press <kbd class="kbd">⌘j</kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close.
+		</p>
+	<% end %>
 </div>
diff --git a/app/views/events/filter/_collection_option.html.erb b/app/views/events/filter/_collection_option.html.erb
index c0953abc6..6661dc5c2 100644
--- a/app/views/events/filter/_collection_option.html.erb
+++ b/app/views/events/filter/_collection_option.html.erb
@@ -1,4 +1,4 @@
-<div class="popup__group flex align-center">
+<li class="popup__group flex align-center" data-value="<%= collection.name.downcase %>">
   <div class="btn txt-xx-small">
     <%= form.check_box "collection_ids[]", {
           checked: filter.collections.include?(collection),
@@ -17,4 +17,4 @@
   <% end %>
 
   <span class="translucent flex-item-no-shrink"> ›</span>
-</div>
+</li>
diff --git a/app/views/terminals/show.html.erb b/app/views/terminals/show.html.erb
index 58a7f663d..843d79039 100644
--- a/app/views/terminals/show.html.erb
+++ b/app/views/terminals/show.html.erb
@@ -5,7 +5,7 @@
     </menu>
     
     <%= turbo_frame_tag "terminal_form" do %>
-      <%= link_to edit_terminal_path, class: "terminal__link flex align-center gap-half min-width", data: { action: "keydown.meta+j@document->hotkey#click", controller: "hotkey" } do %>
+      <%= link_to edit_terminal_path, class: "terminal__link flex align-center gap-half min-width", data: { action: "keydown.meta+shift+p@document->hotkey#click", controller: "hotkey" } do %>
         <span class="terminal__label txt-nowrap">Fizzy do &gt;</span>
         <span class="terminal__input input fill-transparent unpad txt-nowrap overflow-ellipsis">Search or type commands…</span>
       <% end %>

From e82241669f7b5626342b48b0fec97bbe4285d34f Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 12:45:15 -0500
Subject: [PATCH 340/413] Fix card icons

---
 app/assets/stylesheets/icons.css | 8 +++-----
 app/helpers/events_helper.rb     | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/icons.css b/app/assets/stylesheets/icons.css
index d930033d2..bc6f9e77f 100644
--- a/app/assets/stylesheets/icons.css
+++ b/app/assets/stylesheets/icons.css
@@ -21,20 +21,17 @@
   .icon--arrow-left { --svg: url("arrow-left.svg "); }
   .icon--arrow-right { --svg: url("arrow-right.svg "); }
   .icon--art { --svg: url("art.svg "); }
+  .icon--assigned { --svg: url("assigned.svg "); }
   .icon--bell-off { --svg: url("bell-off.svg "); }
   .icon--bell { --svg: url("bell.svg "); }
   .icon--bolt { --svg: url("bolt.svg "); }
   .icon--bookmark-outline { --svg: url("bookmark-outline.svg "); }
   .icon--bookmark { --svg: url("bookmark.svg "); }
   .icon--camera { --svg: url("camera.svg "); }
-  .icon--card_assigned { --svg: url("assigned.svg "); }
-  .icon--card_comment { --svg: url("comment.svg "); }
-  .icon--card_staged { --svg: url("bolt.svg "); }
-  .icon--card_title_changed { --svg: url("rename.svg "); }
-  .icon--card_unstaged { --svg: url("bolt.svg "); }
   .icon--caret-down { --svg: url("caret-down.svg "); }
   .icon--check { --svg: url("check.svg "); }
   .icon--close { --svg: url("close.svg "); }
+  .icon--comment { --svg: url("comment.svg "); }
   .icon--copy-paste { --svg: url("copy-paste.svg "); }
   .icon--crown { --svg: url("crown.svg "); }
   .icon--email { --svg: url("email.svg "); }
@@ -63,6 +60,7 @@
   .icon--refresh { --svg: url("refresh.svg "); }
   .icon--remove-med { --svg: url("remove-med.svg "); }
   .icon--remove { --svg: url("remove.svg "); }
+  .icon--rename { --svg: url("rename.svg "); }
   .icon--settings { --svg: url("settings.svg "); }
   .icon--share { --svg: url("share.svg "); }
   .icon--tag { --svg: url("tag.svg "); }
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 193a965a6..b00408cc3 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -94,7 +94,7 @@ module EventsHelper
   def event_action_icon(event)
     case event.action
     when "card_assigned"
-      "card_assigned"
+      "assigned"
     when "card_staged"
       "bolt"
     when "card_unstaged"

From 5e279ab2e1cb915d8dc7101d3ede5b9952b1773d Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 19:52:09 +0200
Subject: [PATCH 341/413] Fix: dismiss notifications from comments

---
 app/models/card/readable.rb       | 16 ++++++++++++++--
 test/models/card/readable_test.rb |  6 ++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/models/card/readable.rb b/app/models/card/readable.rb
index 2511a6b45..652bb2fce 100644
--- a/app/models/card/readable.rb
+++ b/app/models/card/readable.rb
@@ -13,7 +13,19 @@ module Card::Readable
     end
 
     def notification_sources
-      events + mentions + comment_mentions
+      event_notification_sources + mention_notification_sources
+    end
+
+    def event_notification_sources
+      events + comment_creation_events
+    end
+
+    def mention_notification_sources
+      mentions + comment_mentions
+    end
+
+    def comment_creation_events
+      Event.where(eventable: comments)
     end
 
     def comment_mentions
@@ -21,6 +33,6 @@ module Card::Readable
     end
 
     def comments
-      Comment.where(id: messages.comments.pluck(:messageable_id))
+      @comments ||= Comment.where(id: messages.comments.pluck(:messageable_id))
     end
 end
diff --git a/test/models/card/readable_test.rb b/test/models/card/readable_test.rb
index b60d98a09..c53d3f44d 100644
--- a/test/models/card/readable_test.rb
+++ b/test/models/card/readable_test.rb
@@ -20,4 +20,10 @@ class Card::ReadableTest < ActiveSupport::TestCase
       cards(:logo).read_by(users(:david))
     end
   end
+
+  test "read clears notifications from the comments" do
+    assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do
+      cards(:layout).read_by(users(:kevin))
+    end
+  end
 end

From 685c1f4acade07ed2aad8f6482ac442eb09a7638 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 20:04:04 +0200
Subject: [PATCH 342/413] Reorder methods

---
 app/models/card/readable.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/card/readable.rb b/app/models/card/readable.rb
index 652bb2fce..b37538b9b 100644
--- a/app/models/card/readable.rb
+++ b/app/models/card/readable.rb
@@ -20,14 +20,14 @@ module Card::Readable
       events + comment_creation_events
     end
 
-    def mention_notification_sources
-      mentions + comment_mentions
-    end
-
     def comment_creation_events
       Event.where(eventable: comments)
     end
 
+    def mention_notification_sources
+      mentions + comment_mentions
+    end
+
     def comment_mentions
       Mention.where(source: comments)
     end

From 67040ad492574d01f92e07effd841e4207bcc76f Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 13:16:26 -0500
Subject: [PATCH 343/413] Add a navigation hint, make "All collections" link
 navigate like the others

---
 app/views/cards/index/_collections_filter.html.erb   |  2 +-
 .../events/filter/_all_collections_option.html.erb   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index 5279d6807..c61ef98d0 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -16,7 +16,7 @@
     <%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
       <span class="overflow-ellipsis">All collections</span>
     <% end %>
-    <span class="translucent flex-item-no-shrink"> ›</span>
+    <span class="txt-ink translucent flex-item-no-shrink"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
   <% end %>
 
   <% Current.user.collections.order(:name).each do |collection| %>
diff --git a/app/views/events/filter/_all_collections_option.html.erb b/app/views/events/filter/_all_collections_option.html.erb
index 0e4b567dd..71f94c20e 100644
--- a/app/views/events/filter/_all_collections_option.html.erb
+++ b/app/views/events/filter/_all_collections_option.html.erb
@@ -1,6 +1,8 @@
-<%= link_to events_path(clear_filter: true), class: "popup__group flex align-center", style: "--hover-size: 0" do %>
+<div class="popup__group flex align-center" style="--hover-size: 0">
   <div class="btn txt-xx-small flex-item-no-shrink">
-    <%= check_box_tag "filter_collections", nil, filter.collections.blank?, class: "form-checkbox" %>
+    <%= link_to events_path(clear_filter: true), style: "--hover-size: 0" do %>
+      <%= check_box_tag "filter_collections", nil, filter.collections.blank?, class: "form-checkbox" %>
+    <% end %>
 
     <span class="for-screen-reader">
 			See everything in all collections
@@ -8,8 +10,8 @@
     <%= icon_tag "check", size: 18, class: "checked" %>
   </div>
 
-	<%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
+	<%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item min-width flex-item-grow" do %>
     <span class="overflow-ellipsis">All collections</span>
   <% end %>
-  <span class="translucent flex-item-no-shrink"> ›</span>
-<% end %>
+  <span class="txt-ink translucent flex-item-no-shrink"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
+</div>
\ No newline at end of file

From 8201d1f7f7b9b34d90856ff03a59286a7deade13 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 13:51:15 -0500
Subject: [PATCH 344/413] More space between

---
 app/views/collections/edit/_workflows.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/collections/edit/_workflows.html.erb b/app/views/collections/edit/_workflows.html.erb
index 1d44f014e..5e958cd19 100644
--- a/app/views/collections/edit/_workflows.html.erb
+++ b/app/views/collections/edit/_workflows.html.erb
@@ -18,4 +18,4 @@
     </div>
   <% end %>
 </div>
-<p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
+<p class="margin-block-end-double"><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>

From 3468ccd41d96524cac40bf5adc46e91ddab7de2c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 13:58:41 -0500
Subject: [PATCH 345/413] Improve terminal history behavior

---
 app/javascript/controllers/toggle_class_controller.js | 8 ++++++++
 app/views/terminals/_event.html.erb                   | 2 +-
 app/views/terminals/edit.html.erb                     | 3 +--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/javascript/controllers/toggle_class_controller.js b/app/javascript/controllers/toggle_class_controller.js
index 694106ea2..ca29ad771 100644
--- a/app/javascript/controllers/toggle_class_controller.js
+++ b/app/javascript/controllers/toggle_class_controller.js
@@ -6,4 +6,12 @@ export default class extends Controller {
   toggle() {
     this.element.classList.toggle(this.toggleClass)
   }
+
+  add() {
+    this.element.classList.add(this.toggleClass)
+  }
+
+  remove() {
+    this.element.classList.remove(this.toggleClass)
+  }
 }
diff --git a/app/views/terminals/_event.html.erb b/app/views/terminals/_event.html.erb
index b82c37ba6..041ca94c4 100644
--- a/app/views/terminals/_event.html.erb
+++ b/app/views/terminals/_event.html.erb
@@ -1,5 +1,5 @@
 <li class="min-width overflow-ellipsis">
   <%= link_to event_action_sentence(event), collection_card_path(event.collection, event.eventable),
       class: "terminal__link",
-      data: { turbo_frame: "_top" } %>
+      data: { action: "toggle-class#remove", turbo_frame: "_top" } %>
 </li>
diff --git a/app/views/terminals/edit.html.erb b/app/views/terminals/edit.html.erb
index 38496e662..735162d56 100644
--- a/app/views/terminals/edit.html.erb
+++ b/app/views/terminals/edit.html.erb
@@ -12,8 +12,7 @@
         autocapitalize: "off",
         class: "terminal__input input fill-transparent unpad",
         data: { 
-          controller: "filter", 
-          action: "keydown.up->toggle-class#toggle:prevent input->filter#filter keydown.esc->form#cancel:prevent"
+          action: "keydown.up->toggle-class#add:prevent keydown.down->toggle-class#remove:prevent keydown.esc->form#cancel:prevent"
         },
         id: "fizzy_do",
         placeholder: "Search or type commands…" %>

From 129173a8761219bd2f281c37f631d47553d6ad8a Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 13:59:56 -0500
Subject: [PATCH 346/413] Let's leave inside the menu for now

---
 app/views/cards/index/_header.html.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 0e53d3b80..260746108 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -10,9 +10,8 @@
           data: {
             action: "click->dialog#open:stop keydown.meta+j@document->hotkey#click",
             controller: "hotkey" } do %>
-        <h1 class="txt-large overflow-ellipsis margin-none flex align-center gap-half">
+        <h1 class="txt-large overflow-ellipsis margin-none">
           <span><%= filter_title filter %></span>
-          <kbd class="kbd">⌘j</kbd>
         </h1>
       <% end %>
 

From 50998d2e1835fbd1d04d386976fe89216c81c1ab Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 14:43:58 -0500
Subject: [PATCH 347/413] Add new card button to considering column

---
 app/assets/stylesheets/cards.css                    | 13 +++++++++++++
 app/views/cards/index/_header.html.erb              |  6 ------
 .../cards/index/engagement/_considering.html.erb    |  9 +++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index c06cf7df1..8a478159f 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -158,6 +158,19 @@
     padding-block: var(--block-space-half);
   }
 
+  .card--new-card-button:is(.btn) {
+    --btn-padding: var(--block-space) var(--inline-space-double);
+    --btn-border-size: 0;
+    --btn-color: var(--color-link);
+    --btn-icon-size: 1em;
+    --card-padding-block: calc(var(--block-space) * 1.25);
+
+    box-shadow: 0 0 0 1px color-mix(in srgb, var(--color-link) 20%, var(--color-bg));
+    color: var(--btn-color);
+    font-weight: 700;
+    
+  }
+
   .card__move-button {
     --btn-background: color-mix(in srgb, inherit 40%, var(--color-ink));
 
diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 260746108..b5b9fb59d 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -1,7 +1,6 @@
 <nav class="align-start">
   <%= link_to_home %>
 
-  <div class="btn btn--placeholder"></div>
   <div class="btn btn--placeholder flex-item-justify-start"></div>
 
   <header class="flex flex-inline flex-column center flex-shrink">
@@ -54,11 +53,6 @@
       <%= icon_tag "settings" %>
       <span class="for-screen-reader">Settings for <%= collection.name %></span>
     <% end %>
-
-    <%= button_to collection_cards_path(collection), method: :post, class: "btn" do %>
-      <%= icon_tag "add" %>
-      <span class="for-screen-reader">Create a new card</span>
-    <% end %>
   <% else %>
     <div class="btn btn--placeholder flex-item-justify-end"></div>
     <div class="btn btn--placeholder"></div>
diff --git a/app/views/cards/index/engagement/_considering.html.erb b/app/views/cards/index/engagement/_considering.html.erb
index 60da186c5..58285832a 100644
--- a/app/views/cards/index/engagement/_considering.html.erb
+++ b/app/views/cards/index/engagement/_considering.html.erb
@@ -3,6 +3,15 @@
     Considering
   </h2>
 
+  <% if collection = filter.single_collection %>
+    <%= button_to collection_cards_path(collection), method: :post, class: "card card--new-card-button btn", form_class: "full-width" do %>
+      <div class="card__body flex align-center gap-half txt-xx-large margin-block-half">
+        <%= icon_tag "add" %>
+        <span>Add a new card</span>
+      </div>
+    <% end %>
+  <% end %>
+
   <% if page.used? %>
     <%= render partial: "cards/display/preview", collection: page.records, as: :card, cached: true %>
 

From 03dbcf3b54003906a4485866c602d36d4e759d40 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 15:13:16 -0500
Subject: [PATCH 348/413] Polish closed stamp

---
 app/assets/stylesheets/cards.css                  | 15 +++++++++++++--
 .../cards/display/common/_background.html.erb     |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 8a478159f..adc0dca20 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -224,16 +224,25 @@
 
   .card__closed {
     align-items: center;
-    aspect-ratio: 7/4;
+    aspect-ratio: 8/5;
+    background-color: var(--color-bg);
     border: var(--block-space-half) solid var(--card-color);
+    border-radius: 0.2em;
+    color: var(--card-color);
     display: flex;
     flex-direction: column;
     inset: auto var(--block-space) var(--block-space-double) auto;
     justify-content: space-between;
+    max-inline-size: 25ch;
+    min-inline-size: 18ch;
     mix-blend-mode: multiply;
     padding: var(--block-space-half) calc(var(--inline-space) * 1.5);
     position: absolute;
     transform: rotate(-10deg);
+
+    @media (prefers-color-scheme: dark) {
+      mix-blend-mode: screen;
+    }
   }
 
   .card__closed-by {
@@ -242,8 +251,10 @@
 
   .card__closed-title {
     color: var(--color-ink-reversed);
-    font-size: var(--text-rel-large);
+    font-size: 1.5em;
     font-weight: 900;
+    line-height: 1.2;
+    text-align: center;
     text-shadow:
      -2px -2px 0 var(--card-color),
       2px -2px 0 var(--card-color),
diff --git a/app/views/cards/display/common/_background.html.erb b/app/views/cards/display/common/_background.html.erb
index 08a3c557a..8852fb765 100644
--- a/app/views/cards/display/common/_background.html.erb
+++ b/app/views/cards/display/common/_background.html.erb
@@ -5,7 +5,7 @@
 <% if card.closed? %>
   <div class="card__closed">
     <span class="card__closed-title txt-uppercase"><%= card.closure.reason %></span>
-    <strong><%= card.closed_at.strftime("%b %d, %Y") %></strong>
-    <span>by <span class="card__closed-by"><%= card.closed_by.name %></span></span>
+    <strong class="txt-uppercase"><%= card.closed_at.strftime("%b %d, %Y") %></strong>
+    <span>by <span class="card__closed-by"><%= familiar_name_for(card.closed_by) %></span></span>
   </div>
 <% end %>

From f12970c6975e47cac1569bb1357205b08d2adae8 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Fri, 25 Apr 2025 22:55:32 +0200
Subject: [PATCH 349/413] We're using seconds now

---
 test/fixtures/collections.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/collections.yml b/test/fixtures/collections.yml
index 1487aaa5e..b7919cf36 100644
--- a/test/fixtures/collections.yml
+++ b/test/fixtures/collections.yml
@@ -2,5 +2,5 @@ writebook:
   name: Writebook
   creator: david
   all_access: true
-  auto_close_period: 30
+  auto_close_period: <%= 30.days.to_i %>
   workflow: qa

From 0fa0622b06d2c802c0bee5fa811eee9087462cab Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 16:18:46 -0500
Subject: [PATCH 350/413] Post-merge misc

---
 app/assets/stylesheets/card-perma.css      | 2 +-
 app/assets/stylesheets/cards.css           | 4 ++--
 app/assets/stylesheets/inputs.css          | 2 +-
 app/assets/stylesheets/popup.css           | 2 +-
 app/views/cards/_messages.html.erb         | 2 +-
 app/views/collections/edit/_users.html.erb | 4 ++--
 app/views/events/event/_layout.html.erb    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index cd4973c7f..28dd20768 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -121,7 +121,7 @@
     }
 
     .btn--reversed {
-      --btn-background: var(--color-bg);
+      --btn-background: var(--color-canvas);
       --btn-color: var(--card-color);
     }
   }
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index fb8465e31..e47603142 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -171,7 +171,7 @@
     --btn-icon-size: 1em;
     --card-padding-block: calc(var(--block-space) * 1.25);
 
-    box-shadow: 0 0 0 1px color-mix(in srgb, var(--color-link) 20%, var(--color-bg));
+    box-shadow: 0 0 0 1px color-mix(in srgb, var(--color-link) 20%, var(--color-canvas));
     color: var(--btn-color);
     font-weight: 700;
     
@@ -231,7 +231,7 @@
   .card__closed {
     align-items: center;
     aspect-ratio: 8/5;
-    background-color: var(--color-bg);
+    background-color: var(--color-canvas);
     border: var(--block-space-half) solid var(--card-color);
     border-radius: 0.2em;
     color: var(--card-color);
diff --git a/app/assets/stylesheets/inputs.css b/app/assets/stylesheets/inputs.css
index e8d396a59..6b412707b 100644
--- a/app/assets/stylesheets/inputs.css
+++ b/app/assets/stylesheets/inputs.css
@@ -96,7 +96,7 @@
     }
 
     option {
-      background-color: var(--color-bg);
+      background-color: var(--color-canvas);
       color: var(--color-ink);
     }
   }
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 3013ac534..99615c0e7 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -24,7 +24,7 @@
   }
 
   .popup__group {
-    background: var(--color-subtle-light);
+    background: var(--color-ink-lightest);
     max-inline-size: 100%;
     padding-inline: var(--inline-space);
 
diff --git a/app/views/cards/_messages.html.erb b/app/views/cards/_messages.html.erb
index 35f0cd586..fa554e2fb 100644
--- a/app/views/cards/_messages.html.erb
+++ b/app/views/cards/_messages.html.erb
@@ -16,7 +16,7 @@
     </div>
 
     <div class="txt-align-center full-width flex flex-column margin-block-start-double">
-      <hr class="separator--horizontal full-width margin-block" style="--border-color: var(--color-subtle)">
+      <hr class="separator--horizontal full-width margin-block" style="--border-color: var(--color-ink-lighter)">
       <%= button_to_delete_card(@card) %>
     </div>
   </div>
diff --git a/app/views/collections/edit/_users.html.erb b/app/views/collections/edit/_users.html.erb
index bc3530419..dd03f506d 100644
--- a/app/views/collections/edit/_users.html.erb
+++ b/app/views/collections/edit/_users.html.erb
@@ -10,7 +10,7 @@
         <div class="overflow-ellipsis fill-shade"><strong>Everyone</strong></div>
       </div>
 
-      <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true" />
+      <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-ink-medium); --border-style: dashed" aria-hidden="true" />
 
       <label for="collection_all_access" class="switch">
         <%= form.check_box :all_access, class: "switch__input", checked: collection.all_access?, data: { action: "change->toggle-class#toggle" } %>
@@ -19,7 +19,7 @@
       </label>
     </li>
 
-    <hr class="separator--horizontal margin-inline" style="--border-color: var(--color-subtle-dark);" aria-hidden="true" />
+    <hr class="separator--horizontal margin-inline" style="--border-color: var(--color-ink-medium);" aria-hidden="true" />
 
     <% if User.active.count > 20 %>
       <div class="pad-inline">
diff --git a/app/views/events/event/_layout.html.erb b/app/views/events/event/_layout.html.erb
index acfbf7494..44e9e526a 100644
--- a/app/views/events/event/_layout.html.erb
+++ b/app/views/events/event/_layout.html.erb
@@ -1,6 +1,6 @@
 <%= link_to event.notifiable_target,
       class: "event event--#{ event.action } panel center center-block flex-inline align-start justify-start gap position-relative",
-      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
+      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-canvas));
   color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));",
       data: { related_element_target: "related",
             related_element_group_value: card.id,

From 5f00cb7e2cbea7ce4a9c450429d82c050b45f456 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 25 Apr 2025 16:33:55 -0500
Subject: [PATCH 351/413] Remove debug

---
 app/views/collections/edit/_users.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/collections/edit/_users.html.erb b/app/views/collections/edit/_users.html.erb
index dd03f506d..f38d2924c 100644
--- a/app/views/collections/edit/_users.html.erb
+++ b/app/views/collections/edit/_users.html.erb
@@ -28,9 +28,7 @@
     <% end %>
 
     <div data-filter-target="list" class="users-list pad-inline">
-      <% 20.times do %>
-        <%= access_toggles_for selected_users, selected: true %>
-      <% end %>
+      <%= access_toggles_for selected_users, selected: true %>
 
       <% if selected_users.any? && unselected_users.any? %>
         <hr class="separator full-width" style="--border-style: solid">

From 76fc4aeb0e2aa45b87bf10f9516f4cc7dba0dcb8 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Sat, 26 Apr 2025 09:10:58 +0200
Subject: [PATCH 352/413] Order method

---
 app/controllers/concerns/day_timelines_scoped.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index d7bf80a5a..597e35f7d 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -28,14 +28,14 @@ module DayTimelinesScoped
       end
     end
 
-    def save_collections_filter_to_cookie
-      cookies[:collection_filter] = @filter.collection_ids.join(",")
-    end
-
     def set_day_timeline
       @day_timeline = Current.user.timeline_for(day, filter: @filter)
     end
 
+    def save_collections_filter_to_cookie
+      cookies[:collection_filter] = @filter.collection_ids.join(",")
+    end
+
     def day
       if params[:day].present?
         Time.zone.parse(params[:day])

From 82885e453d207422d4ae383ec7f9d057f16858b9 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Sat, 26 Apr 2025 09:13:24 +0200
Subject: [PATCH 353/413] Not needed anymore

---
 app/models/comment.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/models/comment.rb b/app/models/comment.rb
index bdc674a9c..a8cdf6bdc 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -11,7 +11,6 @@ class Comment < ApplicationRecord
   scope :belonging_to_card, ->(card) { joins(:message).where(messages: { card_id: card.id }) }
 
   after_create_commit :watch_card_by_creator
-  after_destroy_commit :cleanup_events
 
   delegate :watch_by, to: :card
 
@@ -23,10 +22,4 @@ class Comment < ApplicationRecord
     def watch_card_by_creator
       card.watch_by creator
     end
-
-    # FIXME: This isn't right. We need to introduce an eventable polymorphic association for this.
-    def cleanup_events
-      # Delete events that reference directly in particulars
-      Event.where(particulars: { comment_id: id }).destroy_all
-    end
 end

From 8eec5cde9f91761ca11fa200a538ece5f7a9be7b Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Sat, 26 Apr 2025 23:28:44 +0200
Subject: [PATCH 354/413] Update house to make placeholders show up

https://github.com/basecamp/house/commit/a59396cfb7326530e5836601ffee1fe2c197a7cc
---
 vendor/javascript/house.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/javascript/house.min.js b/vendor/javascript/house.min.js
index fff156f32..c81e324e5 100644
--- a/vendor/javascript/house.min.js
+++ b/vendor/javascript/house.min.js
@@ -1 +1 @@
-function t(t){return"string"==typeof t}function e(t,e,n=null,s=!1){return t.dispatchEvent(new CustomEvent(e,{bubbles:!0,detail:n,cancelable:s}))}class n extends HTMLElement{constructor(){super()}connectedCallback(){this.#t(),this.addEventListener("click",this.#e),this.#n?.addEventListener("change",this.#s)}disconnectedCallback(){this.#n?.removeEventListener("change",this.#s),this.removeEventListener("click",this.#e)}get#n(){return this.querySelector("[data-house-md-toolbar-file-picker]")}#t(){this.#r()&&(this.innerHTML=this.#i())}#e=t=>{const n=t.target.closest("[data-house-md-action]")?.dataset?.houseMdAction;n&&(t.preventDefault(),e(this,"house-md:toolbar-action",{houseMdAction:n}))};#s=t=>{for(const n of t.target.files)e(this,"house-md:toolbar-action",{houseMdAction:"uploadFile",file:n})};#r(){return 0===this.children.length}#i(){return'\n        <button data-house-md-action="bold" title="Bold">\n          <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m4.1 23c-.5 0-.7-.4-.7-.7v-20.6c0-.4.4-.7.7-.7h8.9c2 0 3.8.6 4.9 1.5 1.2 1 1.8 2.4 1.8 4.1s-.9 3.2-2.3 4.1c-.2 0-.3.3-.3.5s0 .4.3.5c1.9.8 3.2 2.7 3.2 5s-.7 3.6-2.1 4.7-3.3 1.7-5.6 1.7h-8.8zm4.2-18.1v5.1h3c1.2 0 2-.3 2.7-.7.6-.5.9-1.1.9-1.9s-.3-1.4-.8-1.8-1.3-.6-2.3-.6-2.4 0-3.5 0zm0 8.5v5.8h3.7c1.3 0 2.2-.3 2.8-.7s.9-1.2.9-2.2-.4-1.7-1-2.1-1.7-.7-2.9-.7-2.4 0-3.5 0z" fill-rule="evenodd"/></svg>\n        </button>\n        <button data-house-md-action="italic" title="Italic">\n          <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9.3 1h10.2v3.1h-3.5l-3.7 15.7h3.2v3.2h-11v-3.1h3.8l3.7-15.7h-2.8v-3.2z" fill-rule="evenodd"/></svg>\n        </button>\n        <button data-house-md-action="quote" title="Quote">\n          <svg viewBox="0 0 24 22" xmlns="http://www.w3.org/2000/svg"><path d="m1.1 5.2c.6-.7 1.4-1.3 2.4-1.4 2.6-.4 4.2.4 5.3 1.9 2 2.3 1.9 5.1.6 7.6-1.3 2.4-4 4.6-7.2 5.1-.4 0-.7-.1-1-.4-.1-.3-.1-.7.3-1.1l1.1-1.1c.3-.4.6-.7.7-1.1s.3-.9 0-1.3c0-.4-.6-.7-1-1-1.2-.8-2.3-2.2-2.3-4.1.1-1.4.4-2.4 1.1-3.1z"/><path d="m14.6 5.2c.6-.7 1.6-1.1 2.6-1.4 2.4-.4 4.2.4 5.3 1.9 2 2.3 1.9 5.1.6 7.6-1.3 2.4-4 4.6-7.2 5.1-.4 0-.7-.1-1-.4-.1-.3-.1-.7.3-1.1l1.1-1.1c.3-.4.6-.7.7-1.1s.3-.9 0-1.3c-.1-.4-.6-.7-1-1-1.3-.6-2.4-2-2.4-3.9s.4-2.6 1-3.3z"/></svg>\n        </button>\n        <button data-house-md-action="code" title="Code">\n          <svg viewBox="0 0 24 22" xmlns="http://www.w3.org/2000/svg"><path d="m.4 10.1c-.5.5-.5 1.4 0 1.9l5.3 5.3c.5.5 1.4.5 1.9 0s.5-1.4 0-1.9l-4.4-4.4 4.4-4.4c.5-.5.5-1.4 0-1.9s-1.3-.5-1.9 0c0 0-5.3 5.4-5.3 5.4zm17.9 7.2 5.3-5.3c.5-.5.5-1.4 0-1.9l-5.3-5.3c-.5-.5-1.4-.5-1.9 0s-.5 1.4 0 1.9l4.4 4.4-4.4 4.4c-.5.5-.5 1.4 0 1.9.5.4 1.4.4 1.9-.1z" fill-rule="evenodd"/></svg>\n        </button>\n        <button data-house-md-action="link" title="Link">\n          <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9.4 14.5c-2.3-2.3-2.3-5.9 0-8.2l4.6-4.6c1.1-1 2.6-1.7 4.2-1.7s3 .5 4.1 1.7c2.3 2.3 2.3 5.9 0 8.2l-2.7 2.3c-.5.5-1.2.5-1.8 0-.5-.5-.5-1.2 0-1.7l2.7-2.3c1.4-1.3 1.4-3.4 0-4.7-.7-.7-1.5-.9-2.3-.9s-1.8.4-2.5.9l-4.7 4.5c-1.4 1.3-1.4 3.4 0 4.7.5.5.5 1.2 0 1.7-.1.3-.4.4-.8.4s-.5-.1-.8-.3z"/><path d="m1.7 22.3c-2.3-2.3-2.3-5.9 0-8.2l2.6-2.5c.5-.5 1.2-.5 1.8 0 .5.5.5 1.2 0 1.7l-2.6 2.5c-1.4 1.3-1.4 3.4 0 4.7.7.7 1.5.9 2.3.9s1.8-.4 2.3-.9l4.6-4.6c1.4-1.3 1.4-3.4 0-4.7-.5-.4-.5-1.2 0-1.7s1.2-.5 1.8 0c2.3 2.3 2.3 5.9 0 8.2l-4.6 4.6c-1 1-2.5 1.7-4.1 1.7s-3-.7-4.1-1.7z"/></svg>\n        </button>\n        <button data-house-md-action="bulletList" title="Bullet list">\n          <svg viewBox="0 0 24 22" xmlns="http://www.w3.org/2000/svg"><path d="m2.1 4.8c1.1 0 2.1-.9 2.1-2.1s-1-2-2.1-2-2.1.9-2.1 2.1.9 2 2.1 2zm4.1-2c0-.8.6-1.4 1.4-1.4h15.1c.7 0 1.3.6 1.3 1.4s-.6 1.4-1.4 1.4h-15.1c-.7 0-1.3-.7-1.3-1.4zm1.3 6.8c-.8 0-1.4.6-1.4 1.4s.6 1.4 1.4 1.4h15.1c.8 0 1.4-.6 1.4-1.4s-.6-1.4-1.4-1.4zm0 8.3c-.8 0-1.4.6-1.4 1.4s.6 1.4 1.4 1.4h15.1c.8 0 1.4-.6 1.4-1.4s-.6-1.4-1.4-1.4zm-3.4-6.9c0 1.1-.9 2.1-2.1 2.1s-2-1-2-2.1.9-2.1 2.1-2.1 2 1 2 2.1zm-2 10.3c1.1 0 2.1-.9 2.1-2.1s-.9-2.1-2.1-2.1-2.1 1-2.1 2.1.9 2.1 2.1 2.1z" fill-rule="evenodd"/></svg>\n        </button>\n        <button data-house-md-action="numberList" title="Numbered list">\n          <svg viewBox="0 0 24 22" xmlns="http://www.w3.org/2000/svg"><path d="m0 .3h2.7v5.3h-1.4v-4h-1.3zm6.7 2.7c0-.7.6-1.3 1.3-1.3h14.7c.7 0 1.3.6 1.3 1.3s-.6 1.3-1.3 1.3h-14.7c-.7 0-1.3-.6-1.3-1.3zm1.3 6.7c-.7 0-1.3.6-1.3 1.3s.6 1.3 1.3 1.3h14.7c.7 0 1.3-.6 1.3-1.3s-.6-1.3-1.3-1.3zm0 8c-.7 0-1.3.6-1.3 1.3s.6 1.3 1.3 1.3h14.7c.7 0 1.3-.6 1.3-1.3s-.6-1.3-1.3-1.3zm-4.7-9.4h.7v1.3l-2 2.7h2v1.3h-4v-1.3l2.2-2.7h-2.2v-1.3zm-3.3 9.4v-1.3h4v5.3h-4v-1.3h2.7v-.7h-1.4v-1.3h1.3v-.7z" fill-rule="evenodd"/></svg>\n        </button>\n        <label title="Add Image">\n          <svg viewBox="0 0 24 20" xmlns="http://www.w3.org/2000/svg"><path d="m22 20h-20c-1.1 0-2-.9-2-2.1v-15.8c0-1.2.9-2.1 2-2.1h20c1.1 0 2 .9 2 2.1v15.8c0 1.1-.9 2.1-2 2.1zm0-2.9v-14.5c0-.3-.2-.5-.5-.5h-19c-.3 0-.5.2-.5.5v14.5c0 .1.1.2.2.2s.2 0 .2-.1l2.2-3.3c.1-.2.3-.3.5-.3h.7l2.6-4c.1-.2.3-.3.5-.3h.7c.2 0 .4.1.5.3l5.3 8c0 .1.2.2.3.2h.3c.2 0 .4-.2.4-.4s0-.2 0-.2l-1.3-1.9c-.2-.2-.2-.6 0-.8l1.2-1.6c.1-.2.3-.3.5-.3h1.1c.2 0 .4 0 .5.3l3.2 4.4c0 .1.3.2.4 0 .2 0 .2 0 .2-.2zm-5.5-7.6c-1.4 0-2.5-1.2-2.5-2.6s1.1-2.6 2.5-2.6 2.5 1.2 2.5 2.6-1.1 2.6-2.5 2.6z" fill-rule="evenodd"/></svg>\n          <input type="file" data-house-md-toolbar-file-picker multiple style="display: none;">\n        </label>'}}customElements.define("house-md-toolbar",n);class s{start=0;end=0;static fromDOMRange(t,e){const{startOffset:n,startContainer:i,endOffset:o,endContainer:l}=t,a=r(e,i,n);if(t.collapsed)return new s(e,a,a);const c=r(e,l,o);return new s(e,a,c)}constructor(t,e,n){this.container=t,this.start=e,this.end=n}toDOMRange(){const t=document.createRange();t.setStart(this.container,1),t.setEnd(this.container,this.container.childNodes.length);const e=document.createTreeWalker(this.container,NodeFilter.SHOW_TEXT);let n=0,s=!1,r=!1;for(;e.nextNode()&&(!s||!r);){const i=e.currentNode.textContent.length;n+i>=this.start&&!s&&(s=!0,t.setStart(e.currentNode,this.start-n)),n+i>=this.end&&!r&&(r=!0,t.setEnd(e.currentNode,this.end-n)),n+=i}return t}isEqual(t){return this.container===t.container&&this.start===t.start&&this.end===t.end}}function r(t,e,n){return e.nodeType===Node.ELEMENT_NODE?function(t,e,n){const s=e.childNodes[n];let r=0;const i=document.createTreeWalker(t);for(;i.nextNode();){if(i.currentNode===s)return r;i.currentNode.nodeType===Node.TEXT_NODE&&(r+=i.currentNode.textContent.length)}return r}(t,e,n):function(t,e,n){const s=document.createTreeWalker(t,NodeFilter.SHOW_TEXT);for(;s.nextNode();){if(s.currentNode===e)return n;n+=s.currentNode.textContent.length}return n}(t,e,n)}class i{#o;#l;#a;constructor(t){this.#o=t,this.#l=new s(this.contentElement,0,0),this.#a=""}current(){return{start:this.start,end:this.end,selection:this.#a}}currentLine(){return this.lineAt(this.end)}previousLine(){const{content:t}=this.#o,e=Math.max(t.lastIndexOf("\n",this.start-1),0);return this.lineAt(e)}lineAt(t){const{content:e}=this.#o,n=Math.max(e.lastIndexOf("\n",t-1)+1,0),s=e.indexOf("\n",t),r=-1===s?e.length:s+1;return{start:n,end:r,content:e.slice(n,r)}}select({start:t,end:e}){this.documentRange=new s(this.contentElement,t,e);const n=this.documentRange.toDOMRange();if(n){const t=window.getSelection();t.removeAllRanges(),t.addRange(n),this.update()}else console.error("Failed to create range",{start:t,end:e})}update=()=>{const t=document.getSelection()?.getRangeAt(0),n=this.#l;t.intersectsNode(this.contentElement)&&(this.#l=s.fromDOMRange(t,this.contentElement),this.#a=this.#o.content.slice(this.start,this.end)),this.#l.isEqual(n)||e(this.element,"house-md:selectionchange",{start:this.start,end:this.end})};get start(){return this.#l.start}get end(){return this.#l.end}get element(){return this.#o.element}get contentElement(){return this.#o.contentElement}get isEmpty(){return this.start===this.end}get isMultiline(){return this.current().selection.includes("\n")}get isBold(){return this.#c("strong")}get isItalic(){return this.#c("em")}get isStrikethrough(){return this.#c("s")}get isLink(){return this.#c(".link")}get isCode(){return this.#c(".code")}get isQuote(){return this.#c(".quote")}get isBulletList(){return this.#c(".ul-li")}get isNumberList(){return this.#c(".ol-li")}#c(t){let e=window.getSelection().getRangeAt(0).endContainer;if(e.nodeType===Node.TEXT_NODE&&(e=e.parentElement),this.contentElement.contains(e))return!!e.closest(t)}}class o{static saveInterval=1e3;constructor(t=500){this.maxSize=t,this.undoStack=[],this.redoStack=[]}undo(t){const e=this.undoStack.pop();return e?(this.redoStack.push(t),e):{}}redo(t){const e=this.redoStack.pop();return e?(this.undoStack.push(t),e):{}}add=function(t){let e;return(...n)=>{e||(t(...n),e=setTimeout((()=>{e=null}),o.saveInterval))}}((t=>{this.undoStack.push(t),this.redoStack=[],this.undoStack.length>this.maxSize&&this.undoStack.shift()}))}function l(t){let e=t;return e=function(t){return t=t.replaceAll(/&/g,"&amp;"),t=t.replaceAll(/</g,"&lt;"),t=t.replaceAll(/>/g,"&gt;"),t=t.replaceAll(/"/g,"&quot;"),t=t.replaceAll(/'/g,"&#039;"),t}(e),e=function(t){return t=function(t){return t=t.replaceAll(/(?<!\*)\*\*\*([^*]+)\*\*\*(?!\*)/gm,"<strong><em>***$1***</em></strong>"),t=t.replaceAll(/(?<!_)___([^_]+)___(?!_)/gm,"<strong><em>___$1___</em></strong>"),t}(t),t=function(t){return t=t.replaceAll(/(?<!\*)\*\*([^*]+)\*\*(?!\*)/gm,"<strong>**$1**</strong>"),t=t.replaceAll(/(?<!_)__([^_]+)__(?!_)/gm,"<strong>__$1__</strong>"),t}(t),t=function(t){return t=t.replaceAll(/(?<!\*)\*([^*]+)\*(?!\*)/gm,"<em>*$1*</em>"),t=t.replaceAll(/(?<!_)_([^_]+)_(?!_)/gm,"<em>_$1_</em>"),t}(t),t=function(t){return t.replaceAll(/~~(.*)?~~/gm,"<s>~~$1~~</s>")}(t),t=function(t){return t.replaceAll(/==(.*?)==/gm,"<mark>==$1==</mark>")}(t),t}(e),e=function(t){return t=function(t){return t=t.replaceAll(/^# (.*)$/gm,'<span class="h1"># $1</span>'),t=t.replaceAll(/^## (.*)$/gm,'<span class="h2">## $1</span>'),t=t.replaceAll(/^### (.*)$/gm,'<span class="h3">### $1</span>'),t=t.replaceAll(/^#### (.*)$/gm,'<span class="h4">#### $1</span>'),t=t.replaceAll(/^##### (.*)$/gm,'<span class="h5">##### $1</span>'),t=t.replaceAll(/^###### (.*)$/gm,'<span class="h6">###### $1</span>'),t}(t),t=function(t){return t.replaceAll(/^(\d+\.\s.*)$/gm,'<span class="ol-li">$1</span>')}(t),t=function(t){return t.replaceAll(/^(-\s.*)$/gm,'<span class="ul-li">$1</span>')}(t),t=function(t){return t.replaceAll(/^&gt;(.*)$/gm,'<span class="quote">>$1</span>')}(t),t}(e),e=function(t){return function(t){return t.replaceAll(/\n---\n/gm,'\n<span class="hr">---</span>\n')}(t)}(e),e=function(t){return t.replaceAll(/(?<!!)\[(.*?)\]\((.*?)\)/gm,'<span class="link">[$1]($2)</span>')}(e),e=function(t){return t.replaceAll(/!\[(.*?)\]\((.*?)\)/gm,'<span class="img">$&</span>')}(e),e=function(t){return t=t.replaceAll(/^```(.*?)```$/gms,'<span class="code">```$1```</span>'),t=t.replaceAll(/([^`])`([^`]+)`([^`])/gm,'$1<span class="code">`$2`</span>$3'),t}(e),e=function(t){return t.replaceAll(/&lt;!--(.*?)--&gt;/gm,'<span class="comment">&lt;!--$1--&gt;</span>')}(e),e}class a{constructor(t,e){this.content=t,this.element=e,this.selection=new i(this),this.history=new o}select(t,e){this.selection.select({start:t,end:e})}insertText(t){this.replaceText(t,this.currentSelection.start,this.currentSelection.end)}replaceText(t,e,n){const s=this.content.slice(0,e),r=`${s}${t}${this.content.slice(n)}`,i={start:s.length+t.length,end:s.length+t.length};this.#h(),this.#d(r,i)}insertParagraph(t,e){this.select(t,e),this.selection.isBulletList?this.#u():this.selection.isNumberList?this.#m():this.replaceText("\n",t,e)}insertLink(t,e,n=""){const{start:s,end:r}=this.currentSelection,i=` ${n}[${t}](${e}) `;this.replaceText(i,s,r),this.selection.select({start:s+i.length,end:s+i.length})}insertFile(t,e,n){n.startsWith("image/")?this.insertImage(t,e):this.insertLink(t,e)}insertImage(t,e){this.insertLink(t,e,"!")}deleteText(t,e){this.replaceText("",Math.max(t,0),e)}deleteCurrentLine(){const{start:t,end:e}=this.currentLine;this.deleteText(t,e)}toggleBold(){this.#p(this.selection.isBold,"**")}toggleItalic(){this.#p(this.selection.isItalic,"_")}toggleStrikethrough(){this.#p(this.selection.isStrikethrough,"~~")}toggleCode(){const[t,e]=this.selection.isMultiline?["```\n","\n```"]:["`","`"];this.#p(this.selection.isCode,t,e)}toggleLink(){this.selection.isLink?this.#g():this.#v()}toggleQuote(){this.selection.isQuote?this.#f("> "):this.#b("> ")}toggleBulletList(){this.selection.isBulletList?this.#f("- "):this.#b("- ")}toggleNumberList(){this.selection.isNumberList?this.#f(/\d+\. /):this.#b(`${this.#L+1}. `)}undo(){const{content:e,start:n,end:s}=this.history.undo(this.#x);t(e)&&this.#d(e,{start:n,end:s})}redo(){const{content:e,start:n,end:s}=this.history.redo(this.#x);t(e)&&this.#d(e,{start:n,end:s})}render(){this.contentElement.innerHTML=l(this.content)+"<wbr/>"}get isEmpty(){return!this.content.trim()}get contentElement(){return this.element.contentWrapper}get currentSelection(){return this.selection.current()}get currentLine(){return this.selection.currentLine()}#p(t,e,n=e){t?this.#w(e,n):this.#T(e,n)}#T(t,e=t){const{start:n,end:s,selection:r}=this.currentSelection,i=`${t}${r}${e}`;this.replaceText(i,n,s),this.selection.select({start:n,end:n+r.length+t.length+e.length})}#w(t,e=t){const{start:n,end:s,selection:r}=this.currentSelection;r.startsWith(t)&&r.endsWith(e)&&(this.replaceText("",s-e.length,s),this.replaceText("",n,n+t.length),this.selection.select({start:n,end:s-t.length-e.length}))}#v(){const{start:t,end:e,selection:n}=this.currentSelection,s=this.selection.isEmpty,r=s?"title":n;this.replaceText(`[${r}](url)`,t,e),s?this.selection.select({start:t+1,end:t+r.length+1}):this.selection.select({start:t+n.length+3,end:t+n.length+6})}#g(){const{start:t,end:e,selection:n}=this.currentSelection,s=n.replace(/\[(.*)\]\(.*\)/,"$1");this.replaceText(s,t,e)}#u(){this.#E.match(/^-\s+$/)?this.deleteCurrentLine():(this.replaceText("\n",this.currentSelection.end,this.currentSelection.end),this.replaceText("- ",this.currentSelection.end+1,this.currentSelection.end+1))}#m(){this.#E.match(/^\d+\.\s+$/)?this.deleteCurrentLine():(this.replaceText("\n",this.currentSelection.end,this.currentSelection.end),this.replaceText(`${this.#L+1}. `,this.currentSelection.end+1,this.currentSelection.end+1))}#b(t){const{start:e,end:n}=this.currentSelection,s=this.currentLine;this.replaceText(t,s.start,s.start),this.selection.select({start:e+t.length,end:n+t.length})}#f(t){const{start:e,end:n}=this.currentSelection,s=this.currentLine;if(t instanceof RegExp){const e=s.content.match(t);if(!e)return;t=e[0]}s.content.startsWith(t)&&(this.deleteText(s.start,s.start+t.length),this.selection.select({start:e-t.length,end:n-t.length}))}#h(){this.history.add(this.#x)}#d(t,n){const s=this.content;this.content=t,this.element.value=t,this.selection.select(n),e(this.element,"house-md:change",{previousContent:s,newContent:t})}get#x(){const{start:t,end:e}=this.currentSelection;return{content:this.content,start:t,end:e}}get#E(){return this.currentLine.content}get#L(){const t=this.selection.previousLine().content.match(/^(\d+). /);return t?parseInt(t[1]):0}}class c{#A;constructor(t){this.#A=t}asPlainText(){const t=(new window.DOMParser).parseFromString(this.#A,"text/html");return this.#S(t.body).trim()}#S(t){return t.nodeType===Node.TEXT_NODE?t.nodeValue:Array.from(t.childNodes).map(((e,n)=>{const s=this.#k(e),r=n>0&&this.#k(t.childNodes[n-1]);return(s&&r?"\n\n":"")+this.#S(e)})).join("")}#k(t){return["BR","DIV","H1","H2","H3","H4","H5","H6","LI","P","TR"].includes(t.tagName)}}class h{constructor(t){this.document=t}handleInput(t,e){t.preventDefault();const n=this[`${t.inputType}Handler`];if(n){const r=t.getTargetRanges()[0],{start:i,end:o}=s.fromDOMRange(r,e);n.call(this,t,i,o)}else console.error("Not handling:",t.inputType)}insertTextHandler(t,e,n){this.#C(t,e,n)}insertCompositionTextHandler(t,e,n){this.#C(t,e,n)}insertParagraphHandler(t,e,n){this.document.insertParagraph(e,n)}insertLineBreakHandler(t,e,n){this.document.insertParagraph(e,n)}insertLinkHandler(t,e,n){this.#C(t,e,n)}insertFromYankHandler(t,e,n){this.#C(t,e,n)}insertFromDropHandler(t,e,n){this.#C(t,e,n)}insertFromPasteAsQuotationHandler(t,e,n){const s=t.dataTransfer.getData("text/plain");this.document.replaceText(`> ${s}`,e,n)}insertTransposeHandler(t,e,n){this.#C(t,e,n)}insertReplacementTextHandler(t,e,n){this.#C(t,e,n)}insertFromPasteHandler(t,e,n){this.#C(t,e,n)}deleteContentBackwardHandler(t,e,n){this.document.deleteText(e,n)}deleteByCutHandler(t,e,n){this.document.deleteText(e,n)}deleteWordBackwardHandler(t,e,n){this.document.deleteText(e,n)}deleteWordForwardHandler(t,e,n){this.document.deleteText(e,n)}deleteSoftLineBackwardHandler(t,e,n){this.document.deleteText(e,n)}deleteSoftLineForwardHandler(t,e,n){this.document.deleteText(e,n)}deleteEntireSoftLineHandler(t,e,n){this.document.deleteText(e,n)}deleteHardLineBackwardHandler(t,e,n){this.document.deleteText(e,n)}deleteHardLineForwardHandler(t,e,n){this.document.deleteText(e,n)}deleteByDragHandler(t,e,n){this.document.deleteText(e,n)}deleteContentHandler(t,e,n){this.document.deleteText(e,n)}deleteContentForwardHandler(t,e,n){this.document.deleteText(e,n)}#C(t,e,n){let s;if(t.data)s=t.data;else{const e=t.dataTransfer.getData("text/html");s=e?new c(e).asPlainText():t.dataTransfer.getData("text/plain")}this.document.replaceText(s,e,n)}}class d{constructor(t,e){this.element=t.closest("house-md"),this.file=e}upload(){if(e(this.element,"house-md:before-upload",{file:this.file})){const t=document.createElement("house-md-upload");t.file=this.file,t.uploadsURL=this.#$,this.element.appendChild(t)}}get#$(){return this.element.dataset.uploadsUrl||document.head.querySelector("meta[name=house-uploads-url]")?.content||"/uploads"}}class u{constructor(t){this.document=t}handleAction(t,e){const n=this[t];n?n.call(this,e):console.error("Not handling:",t)}bold(){this.document.toggleBold()}italic(){this.document.toggleItalic()}strikethrough(){this.document.toggleStrikethrough()}quote(){this.document.toggleQuote()}code(){this.document.toggleCode()}link(){this.document.toggleLink()}bulletList(){this.document.toggleBulletList()}numberList(){this.document.toggleNumberList()}undo(){this.document.undo()}redo(){this.document.redo()}uploadFile({file:t}){new d(this.document.element,t).upload()}}class m{constructor(t){this.element=t.closest("house-md")}handleDragOver(t){t.preventDefault()}async handleDrop(t){t.preventDefault();for(const e of t.dataTransfer.items)"file"===e.kind&&new d(this.element,e.getAsFile()).upload()}}const p={"Ctrl+B":"bold","Ctrl+I":"italic","Ctrl+S":"strikethrough","Ctrl+Z":"undo","Ctrl+Shift+Z":"redo"};class g extends HTMLElement{static formAssociated=!0;static observedAttributes=["initialized"];constructor(){super(),this.internals=this.attachInternals(),this.internals.ariaRole="textbox"}attributeChangedCallback(t,e,n){"initialized"===t&&this.isConnected&&null!=e&&e!==n&&requestAnimationFrame((()=>this.#H()))}connectedCallback(){const t=this.querySelector(".house-md-content")?.textContent??this.textContent;this.document=new a(t,this),this.#y(),this.#N(),this.inputHandler=new h(this.document),this.actionHandler=new u(this.document),this.dropAndDropHandler=new m(this),this.autofocus&&this.focus(),this.setAttribute("initialized",""),this.value=t}disconnectedCallback(){this.#_()}validate=t=>{this.required&&this.document.isEmpty?(t.preventDefault(),this.internals.setValidity({valueMissing:!0},"This field is required.",this.element),this.focus()):this.internals.setValidity({})};render(){this.document.render()}focus(){this.contentWrapper.focus()}get required(){return this.hasAttribute("required")}set required(t){t?this.setAttribute("required",""):this.removeAttribute("required")}get autofocus(){return this.hasAttribute("autofocus")}set autofocus(t){t?this.setAttribute("autofocus",""):this.removeAttribute("autofocus")}get value(){return this.document.content}set value(t){this.document.content=t,this.internals.setFormValue(t),this.internals.setValidity({}),this.render()}get form(){return this.internals.form}#y(){this.textContent="",this.toolbar=this.#D(),this.contentWrapper=document.createElement("div"),this.contentWrapper.classList.add("house-md-content"),this.contentWrapper.setAttribute("contenteditable",!0),this.contentWrapper.setAttribute("role","textbox"),this.contentWrapper.setAttribute("aria-multiline",!0),this.append(this.contentWrapper),this.getAttribute("tabindex")?(this.contentWrapper.setAttribute("tabindex",this.getAttribute("tabindex")),this.removeAttribute("tabindex")):this.contentWrapper.setAttribute("tabindex",0)}#D(){if(this.getAttribute("toolbar"))return document.getElementById(this.getAttribute("toolbar"));{const t=document.createElement("house-md-toolbar");return this.prepend(t),t}}#H(){this.disconnectedCallback(),this.getAttribute("toolbar")||this.toolbar.remove(),this.contentWrapper.remove(),this.connectedCallback()}#N(){this.addEventListener("beforeinput",this.#I),this.addEventListener("keydown",this.#B),this.addEventListener("dragover",this.#F),this.addEventListener("drop",this.#R),this.toolbar.addEventListener("house-md:toolbar-action",this.#M),document.addEventListener("selectionchange",this.#z),this.internals.form.addEventListener("submit",this.validate)}#_(){this.removeEventListener("beforeinput",this.#I),this.removeEventListener("keydown",this.#B),this.removeEventListener("dragover",this.#F),this.removeEventListener("drop",this.#R),this.toolbar.removeEventListener("house-md:toolbar-action",this.#M),document.removeEventListener("selectionchange",this.#z),this.internals.form.removeEventListener("submit",this.validate)}#I=t=>{this.inputHandler.handleInput(t,this.contentWrapper)};#B(t){const e=function(t){return p[function(t){const e=[];return(t.metaKey||t.ctrlKey)&&e.push("Ctrl"),t.altKey&&e.push("Alt"),t.shiftKey&&e.push("Shift"),e.push(t.key.toUpperCase()),e.join("+")}(t)]}(t);e&&(t.preventDefault(),this.actionHandler.handleAction(e))}#F=t=>{this.dropAndDropHandler.handleDragOver(t)};#R=t=>{this.dropAndDropHandler.handleDrop(t)};#M=({detail:t})=>{this.actionHandler.handleAction(t.houseMdAction,t)};#z=()=>{this.document.selection.update()}}customElements.define("house-md",g);class v extends HTMLElement{#W;#$;#O;constructor(){super(),this.percentComplete=0,this.status="pending"}connectedCallback(){this.#t(),this.#q(),this.addEventListener("click",this.#e)}disconnectedCallback(){this.removeEventListener("click",this.#e)}async#q(){const t=new FormData;t.append("file",this.file),this.csrfParamName&&t.append(this.csrfParamName,this.csrfToken),this.xhr=new XMLHttpRequest,this.xhr.open("POST",this.uploadsURL,!0),this.xhr.upload.onprogress=this.#P,this.xhr.onload=this.#U,this.xhr.onerror=this.#K,this.xhr.onabort=this.#Q,this.xhr.send(t),this.status="uploading",this.#t()}#t(){this.setAttribute("status",this.status),this.innerHTML=`\n      ${this.#V()}\n      ${this.#X()}\n      ${this.#j()}\n      ${this.#Z()}\n    `}#V(){return"failed"===this.status?"<button data-md-action='close' class='md-close' aria-label='Close'></button>":""}#X(){return`<div class="md-file">${this.file.name}</div>`}#j(){return`<progress aria-label="Uploading file…" class="md-progress-bar" max="100" value="${this.percentComplete}">${this.percentComplete}%</progress>`}#Z(){return this.#O?`<div class="md-error">${this.#O}</div>`:""}#P=t=>{t.lengthComputable&&(this.percentComplete=t.loaded/t.total*100),this.#t()};#U=async()=>{if(this.xhr.status>=400)this.status="failed",this.#O=this.xhr.responseText||"Upload failed";else{const t=JSON.parse(this.xhr.responseText);await this.document.insertFile(t.fileName,t.fileUrl,t.mimetype),this.status="complete",this.#J()}this.#t()};#K=()=>{this.status="failed",this.#t()};#Q=()=>{this.status="aborted",this.#t()};#e=t=>{t.target.matches("[data-md-action=close]")&&this.remove()};async#J(t=500){await function(t){return new Promise((e=>setTimeout(e,t)))}(t),this.remove()}get document(){return this.closest("house-md").document}get file(){return this.#W}set file(t){this.#W=t}get uploadsURL(){return this.#$}set uploadsURL(t){this.#$=t}get csrfParamName(){return document.head.querySelector("meta[name=csrf-param]")?.content}get csrfToken(){return document.head.querySelector("meta[name=csrf-token]")?.content}}customElements.define("house-md-upload",v);export{a as Document,g as Editor,o as History,i as Selection,n as Toolbar,v as Upload};
+function t(t){return"string"==typeof t}function e(t,e,n=null,s=!1){return t.dispatchEvent(new CustomEvent(e,{bubbles:!0,detail:n,cancelable:s}))}class n extends HTMLElement{constructor(){super()}connectedCallback(){this.#t(),this.addEventListener("click",this.#e),this.#n?.addEventListener("change",this.#s)}disconnectedCallback(){this.#n?.removeEventListener("change",this.#s),this.removeEventListener("click",this.#e)}get#n(){return this.querySelector("[data-house-md-toolbar-file-picker]")}#t(){this.#i()&&(this.innerHTML=this.#r())}#e=t=>{const n=t.target.closest("[data-house-md-action]")?.dataset?.houseMdAction;n&&(t.preventDefault(),e(this,"house-md:toolbar-action",{houseMdAction:n}))};#s=t=>{for(const n of t.target.files)e(this,"house-md:toolbar-action",{houseMdAction:"uploadFile",file:n})};#i(){return 0===this.children.length}#r(){return'\n        <button data-house-md-action="bold" title="Bold">\n          <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m4.1 23c-.5 0-.7-.4-.7-.7v-20.6c0-.4.4-.7.7-.7h8.9c2 0 3.8.6 4.9 1.5 1.2 1 1.8 2.4 1.8 4.1s-.9 3.2-2.3 4.1c-.2 0-.3.3-.3.5s0 .4.3.5c1.9.8 3.2 2.7 3.2 5s-.7 3.6-2.1 4.7-3.3 1.7-5.6 1.7h-8.8zm4.2-18.1v5.1h3c1.2 0 2-.3 2.7-.7.6-.5.9-1.1.9-1.9s-.3-1.4-.8-1.8-1.3-.6-2.3-.6-2.4 0-3.5 0zm0 8.5v5.8h3.7c1.3 0 2.2-.3 2.8-.7s.9-1.2.9-2.2-.4-1.7-1-2.1-1.7-.7-2.9-.7-2.4 0-3.5 0z" fill-rule="evenodd"/></svg>\n        </button>\n        <button data-house-md-action="italic" title="Italic">\n          <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9.3 1h10.2v3.1h-3.5l-3.7 15.7h3.2v3.2h-11v-3.1h3.8l3.7-15.7h-2.8v-3.2z" fill-rule="evenodd"/></svg>\n        </button>\n        <button data-house-md-action="quote" title="Quote">\n          <svg viewBox="0 0 24 22" xmlns="http://www.w3.org/2000/svg"><path d="m1.1 5.2c.6-.7 1.4-1.3 2.4-1.4 2.6-.4 4.2.4 5.3 1.9 2 2.3 1.9 5.1.6 7.6-1.3 2.4-4 4.6-7.2 5.1-.4 0-.7-.1-1-.4-.1-.3-.1-.7.3-1.1l1.1-1.1c.3-.4.6-.7.7-1.1s.3-.9 0-1.3c0-.4-.6-.7-1-1-1.2-.8-2.3-2.2-2.3-4.1.1-1.4.4-2.4 1.1-3.1z"/><path d="m14.6 5.2c.6-.7 1.6-1.1 2.6-1.4 2.4-.4 4.2.4 5.3 1.9 2 2.3 1.9 5.1.6 7.6-1.3 2.4-4 4.6-7.2 5.1-.4 0-.7-.1-1-.4-.1-.3-.1-.7.3-1.1l1.1-1.1c.3-.4.6-.7.7-1.1s.3-.9 0-1.3c-.1-.4-.6-.7-1-1-1.3-.6-2.4-2-2.4-3.9s.4-2.6 1-3.3z"/></svg>\n        </button>\n        <button data-house-md-action="code" title="Code">\n          <svg viewBox="0 0 24 22" xmlns="http://www.w3.org/2000/svg"><path d="m.4 10.1c-.5.5-.5 1.4 0 1.9l5.3 5.3c.5.5 1.4.5 1.9 0s.5-1.4 0-1.9l-4.4-4.4 4.4-4.4c.5-.5.5-1.4 0-1.9s-1.3-.5-1.9 0c0 0-5.3 5.4-5.3 5.4zm17.9 7.2 5.3-5.3c.5-.5.5-1.4 0-1.9l-5.3-5.3c-.5-.5-1.4-.5-1.9 0s-.5 1.4 0 1.9l4.4 4.4-4.4 4.4c-.5.5-.5 1.4 0 1.9.5.4 1.4.4 1.9-.1z" fill-rule="evenodd"/></svg>\n        </button>\n        <button data-house-md-action="link" title="Link">\n          <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9.4 14.5c-2.3-2.3-2.3-5.9 0-8.2l4.6-4.6c1.1-1 2.6-1.7 4.2-1.7s3 .5 4.1 1.7c2.3 2.3 2.3 5.9 0 8.2l-2.7 2.3c-.5.5-1.2.5-1.8 0-.5-.5-.5-1.2 0-1.7l2.7-2.3c1.4-1.3 1.4-3.4 0-4.7-.7-.7-1.5-.9-2.3-.9s-1.8.4-2.5.9l-4.7 4.5c-1.4 1.3-1.4 3.4 0 4.7.5.5.5 1.2 0 1.7-.1.3-.4.4-.8.4s-.5-.1-.8-.3z"/><path d="m1.7 22.3c-2.3-2.3-2.3-5.9 0-8.2l2.6-2.5c.5-.5 1.2-.5 1.8 0 .5.5.5 1.2 0 1.7l-2.6 2.5c-1.4 1.3-1.4 3.4 0 4.7.7.7 1.5.9 2.3.9s1.8-.4 2.3-.9l4.6-4.6c1.4-1.3 1.4-3.4 0-4.7-.5-.4-.5-1.2 0-1.7s1.2-.5 1.8 0c2.3 2.3 2.3 5.9 0 8.2l-4.6 4.6c-1 1-2.5 1.7-4.1 1.7s-3-.7-4.1-1.7z"/></svg>\n        </button>\n        <button data-house-md-action="bulletList" title="Bullet list">\n          <svg viewBox="0 0 24 22" xmlns="http://www.w3.org/2000/svg"><path d="m2.1 4.8c1.1 0 2.1-.9 2.1-2.1s-1-2-2.1-2-2.1.9-2.1 2.1.9 2 2.1 2zm4.1-2c0-.8.6-1.4 1.4-1.4h15.1c.7 0 1.3.6 1.3 1.4s-.6 1.4-1.4 1.4h-15.1c-.7 0-1.3-.7-1.3-1.4zm1.3 6.8c-.8 0-1.4.6-1.4 1.4s.6 1.4 1.4 1.4h15.1c.8 0 1.4-.6 1.4-1.4s-.6-1.4-1.4-1.4zm0 8.3c-.8 0-1.4.6-1.4 1.4s.6 1.4 1.4 1.4h15.1c.8 0 1.4-.6 1.4-1.4s-.6-1.4-1.4-1.4zm-3.4-6.9c0 1.1-.9 2.1-2.1 2.1s-2-1-2-2.1.9-2.1 2.1-2.1 2 1 2 2.1zm-2 10.3c1.1 0 2.1-.9 2.1-2.1s-.9-2.1-2.1-2.1-2.1 1-2.1 2.1.9 2.1 2.1 2.1z" fill-rule="evenodd"/></svg>\n        </button>\n        <button data-house-md-action="numberList" title="Numbered list">\n          <svg viewBox="0 0 24 22" xmlns="http://www.w3.org/2000/svg"><path d="m0 .3h2.7v5.3h-1.4v-4h-1.3zm6.7 2.7c0-.7.6-1.3 1.3-1.3h14.7c.7 0 1.3.6 1.3 1.3s-.6 1.3-1.3 1.3h-14.7c-.7 0-1.3-.6-1.3-1.3zm1.3 6.7c-.7 0-1.3.6-1.3 1.3s.6 1.3 1.3 1.3h14.7c.7 0 1.3-.6 1.3-1.3s-.6-1.3-1.3-1.3zm0 8c-.7 0-1.3.6-1.3 1.3s.6 1.3 1.3 1.3h14.7c.7 0 1.3-.6 1.3-1.3s-.6-1.3-1.3-1.3zm-4.7-9.4h.7v1.3l-2 2.7h2v1.3h-4v-1.3l2.2-2.7h-2.2v-1.3zm-3.3 9.4v-1.3h4v5.3h-4v-1.3h2.7v-.7h-1.4v-1.3h1.3v-.7z" fill-rule="evenodd"/></svg>\n        </button>\n        <label title="Add Image">\n          <svg viewBox="0 0 24 20" xmlns="http://www.w3.org/2000/svg"><path d="m22 20h-20c-1.1 0-2-.9-2-2.1v-15.8c0-1.2.9-2.1 2-2.1h20c1.1 0 2 .9 2 2.1v15.8c0 1.1-.9 2.1-2 2.1zm0-2.9v-14.5c0-.3-.2-.5-.5-.5h-19c-.3 0-.5.2-.5.5v14.5c0 .1.1.2.2.2s.2 0 .2-.1l2.2-3.3c.1-.2.3-.3.5-.3h.7l2.6-4c.1-.2.3-.3.5-.3h.7c.2 0 .4.1.5.3l5.3 8c0 .1.2.2.3.2h.3c.2 0 .4-.2.4-.4s0-.2 0-.2l-1.3-1.9c-.2-.2-.2-.6 0-.8l1.2-1.6c.1-.2.3-.3.5-.3h1.1c.2 0 .4 0 .5.3l3.2 4.4c0 .1.3.2.4 0 .2 0 .2 0 .2-.2zm-5.5-7.6c-1.4 0-2.5-1.2-2.5-2.6s1.1-2.6 2.5-2.6 2.5 1.2 2.5 2.6-1.1 2.6-2.5 2.6z" fill-rule="evenodd"/></svg>\n          <input type="file" data-house-md-toolbar-file-picker multiple style="display: none;">\n        </label>'}}customElements.define("house-md-toolbar",n);class s{start=0;end=0;static fromDOMRange(t,e){const{startOffset:n,startContainer:r,endOffset:o,endContainer:l}=t,a=i(e,r,n);if(t.collapsed)return new s(e,a,a);const c=i(e,l,o);return new s(e,a,c)}constructor(t,e,n){this.container=t,this.start=e,this.end=n}toDOMRange(){const t=document.createRange();t.setStart(this.container,1),t.setEnd(this.container,this.container.childNodes.length);const e=document.createTreeWalker(this.container,NodeFilter.SHOW_TEXT);let n=0,s=!1,i=!1;for(;e.nextNode()&&(!s||!i);){const r=e.currentNode.textContent.length;n+r>=this.start&&!s&&(s=!0,t.setStart(e.currentNode,this.start-n)),n+r>=this.end&&!i&&(i=!0,t.setEnd(e.currentNode,this.end-n)),n+=r}return t}isEqual(t){return this.container===t.container&&this.start===t.start&&this.end===t.end}}function i(t,e,n){return e.nodeType===Node.ELEMENT_NODE?function(t,e,n){const s=e.childNodes[n];let i=0;const r=document.createTreeWalker(t);for(;r.nextNode();){if(r.currentNode===s)return i;r.currentNode.nodeType===Node.TEXT_NODE&&(i+=r.currentNode.textContent.length)}return i}(t,e,n):function(t,e,n){const s=document.createTreeWalker(t,NodeFilter.SHOW_TEXT);for(;s.nextNode();){if(s.currentNode===e)return n;n+=s.currentNode.textContent.length}return n}(t,e,n)}class r{#o;#l;#a;constructor(t){this.#o=t,this.#l=new s(this.contentElement,0,0),this.#a=""}current(){return{start:this.start,end:this.end,selection:this.#a}}currentLine(){return this.lineAt(this.end)}previousLine(){const{content:t}=this.#o,e=Math.max(t.lastIndexOf("\n",this.start-1),0);return this.lineAt(e)}lineAt(t){const{content:e}=this.#o,n=Math.max(e.lastIndexOf("\n",t-1)+1,0),s=e.indexOf("\n",t),i=-1===s?e.length:s+1;return{start:n,end:i,content:e.slice(n,i)}}select({start:t,end:e}){this.documentRange=new s(this.contentElement,t,e);const n=this.documentRange.toDOMRange();if(n){const t=window.getSelection();t.removeAllRanges(),t.addRange(n),this.update()}else console.error("Failed to create range",{start:t,end:e})}update=()=>{const t=document.getSelection()?.getRangeAt(0),n=this.#l;t.intersectsNode(this.contentElement)&&(this.#l=s.fromDOMRange(t,this.contentElement),this.#a=this.#o.content.slice(this.start,this.end)),this.#l.isEqual(n)||e(this.element,"house-md:selectionchange",{start:this.start,end:this.end})};get start(){return this.#l.start}get end(){return this.#l.end}get element(){return this.#o.element}get contentElement(){return this.#o.contentElement}get isEmpty(){return this.start===this.end}get isMultiline(){return this.current().selection.includes("\n")}get isBold(){return this.#c("strong")}get isItalic(){return this.#c("em")}get isStrikethrough(){return this.#c("s")}get isLink(){return this.#c(".link")}get isCode(){return this.#c(".code")}get isQuote(){return this.#c(".quote")}get isBulletList(){return this.#c(".ul-li")}get isNumberList(){return this.#c(".ol-li")}#c(t){let e=window.getSelection().getRangeAt(0).endContainer;if(e.nodeType===Node.TEXT_NODE&&(e=e.parentElement),this.contentElement.contains(e))return!!e.closest(t)}}class o{static saveInterval=1e3;constructor(t=500){this.maxSize=t,this.undoStack=[],this.redoStack=[]}undo(t){const e=this.undoStack.pop();return e?(this.redoStack.push(t),e):{}}redo(t){const e=this.redoStack.pop();return e?(this.undoStack.push(t),e):{}}add=function(t){let e;return(...n)=>{e||(t(...n),e=setTimeout((()=>{e=null}),o.saveInterval))}}((t=>{this.undoStack.push(t),this.redoStack=[],this.undoStack.length>this.maxSize&&this.undoStack.shift()}))}function l(t){let e=t;return e=function(t){return t=t.replaceAll(/&/g,"&amp;"),t=t.replaceAll(/</g,"&lt;"),t=t.replaceAll(/>/g,"&gt;"),t=t.replaceAll(/"/g,"&quot;"),t=t.replaceAll(/'/g,"&#039;"),t}(e),e=function(t){return t=function(t){return t=t.replaceAll(/(?<!\*)\*\*\*([^*]+)\*\*\*(?!\*)/gm,"<strong><em>***$1***</em></strong>"),t=t.replaceAll(/(?<!_)___([^_]+)___(?!_)/gm,"<strong><em>___$1___</em></strong>"),t}(t),t=function(t){return t=t.replaceAll(/(?<!\*)\*\*([^*]+)\*\*(?!\*)/gm,"<strong>**$1**</strong>"),t=t.replaceAll(/(?<!_)__([^_]+)__(?!_)/gm,"<strong>__$1__</strong>"),t}(t),t=function(t){return t=t.replaceAll(/(?<!\*)\*([^*]+)\*(?!\*)/gm,"<em>*$1*</em>"),t=t.replaceAll(/(?<!_)_([^_]+)_(?!_)/gm,"<em>_$1_</em>"),t}(t),t=function(t){return t.replaceAll(/~~(.*)?~~/gm,"<s>~~$1~~</s>")}(t),t=function(t){return t.replaceAll(/==(.*?)==/gm,"<mark>==$1==</mark>")}(t),t}(e),e=function(t){return t=function(t){return t=t.replaceAll(/^# (.*)$/gm,'<span class="h1"># $1</span>'),t=t.replaceAll(/^## (.*)$/gm,'<span class="h2">## $1</span>'),t=t.replaceAll(/^### (.*)$/gm,'<span class="h3">### $1</span>'),t=t.replaceAll(/^#### (.*)$/gm,'<span class="h4">#### $1</span>'),t=t.replaceAll(/^##### (.*)$/gm,'<span class="h5">##### $1</span>'),t=t.replaceAll(/^###### (.*)$/gm,'<span class="h6">###### $1</span>'),t}(t),t=function(t){return t.replaceAll(/^(\d+\.\s.*)$/gm,'<span class="ol-li">$1</span>')}(t),t=function(t){return t.replaceAll(/^(-\s.*)$/gm,'<span class="ul-li">$1</span>')}(t),t=function(t){return t.replaceAll(/^&gt;(.*)$/gm,'<span class="quote">>$1</span>')}(t),t}(e),e=function(t){return function(t){return t.replaceAll(/\n---\n/gm,'\n<span class="hr">---</span>\n')}(t)}(e),e=function(t){return t.replaceAll(/(?<!!)\[(.*?)\]\((.*?)\)/gm,'<span class="link">[$1]($2)</span>')}(e),e=function(t){return t.replaceAll(/!\[(.*?)\]\((.*?)\)/gm,'<span class="img">$&</span>')}(e),e=function(t){return t=t.replaceAll(/^```(.*?)```$/gms,'<span class="code">```$1```</span>'),t=t.replaceAll(/([^`])`([^`]+)`([^`])/gm,'$1<span class="code">`$2`</span>$3'),t}(e),e=function(t){return t.replaceAll(/&lt;!--(.*?)--&gt;/gm,'<span class="comment">&lt;!--$1--&gt;</span>')}(e),e}class a{constructor(t,e){this.content=t,this.element=e,this.selection=new r(this),this.history=new o}select(t,e){this.selection.select({start:t,end:e})}insertText(t){this.replaceText(t,this.currentSelection.start,this.currentSelection.end)}replaceText(t,e,n){const s=this.content.slice(0,e),i=`${s}${t}${this.content.slice(n)}`,r={start:s.length+t.length,end:s.length+t.length};this.#h(),this.#d(i,r)}insertParagraph(t,e){this.select(t,e),this.selection.isBulletList?this.#u():this.selection.isNumberList?this.#m():this.replaceText("\n",t,e)}insertLink(t,e,n=""){const{start:s,end:i}=this.currentSelection,r=` ${n}[${t}](${e}) `;this.replaceText(r,s,i),this.selection.select({start:s+r.length,end:s+r.length})}insertFile(t,e,n){n.startsWith("image/")?this.insertImage(t,e):this.insertLink(t,e)}insertImage(t,e){this.insertLink(t,e,"!")}deleteText(t,e){this.replaceText("",Math.max(t,0),e)}deleteCurrentLine(){const{start:t,end:e}=this.currentLine;this.deleteText(t,e)}toggleBold(){this.#p(this.selection.isBold,"**")}toggleItalic(){this.#p(this.selection.isItalic,"_")}toggleStrikethrough(){this.#p(this.selection.isStrikethrough,"~~")}toggleCode(){const[t,e]=this.selection.isMultiline?["```\n","\n```"]:["`","`"];this.#p(this.selection.isCode,t,e)}toggleLink(){this.selection.isLink?this.#g():this.#v()}toggleQuote(){this.selection.isQuote?this.#f("> "):this.#b("> ")}toggleBulletList(){this.selection.isBulletList?this.#f("- "):this.#b("- ")}toggleNumberList(){this.selection.isNumberList?this.#f(/\d+\. /):this.#b(`${this.#L+1}. `)}undo(){const{content:e,start:n,end:s}=this.history.undo(this.#x);t(e)&&this.#d(e,{start:n,end:s})}redo(){const{content:e,start:n,end:s}=this.history.redo(this.#x);t(e)&&this.#d(e,{start:n,end:s})}render(){this.contentElement.innerHTML=l(this.content)+"<wbr/>",this.contentElement.classList.toggle("house-md-content-empty",this.isEmpty)}get isEmpty(){return!this.content.trim()}get contentElement(){return this.element.contentWrapper}get currentSelection(){return this.selection.current()}get currentLine(){return this.selection.currentLine()}#p(t,e,n=e){t?this.#w(e,n):this.#E(e,n)}#E(t,e=t){const{start:n,end:s,selection:i}=this.currentSelection,r=`${t}${i}${e}`;this.replaceText(r,n,s),this.selection.select({start:n,end:n+i.length+t.length+e.length})}#w(t,e=t){const{start:n,end:s,selection:i}=this.currentSelection;i.startsWith(t)&&i.endsWith(e)&&(this.replaceText("",s-e.length,s),this.replaceText("",n,n+t.length),this.selection.select({start:n,end:s-t.length-e.length}))}#v(){const{start:t,end:e,selection:n}=this.currentSelection,s=this.selection.isEmpty,i=s?"title":n;this.replaceText(`[${i}](url)`,t,e),s?this.selection.select({start:t+1,end:t+i.length+1}):this.selection.select({start:t+n.length+3,end:t+n.length+6})}#g(){const{start:t,end:e,selection:n}=this.currentSelection,s=n.replace(/\[(.*)\]\(.*\)/,"$1");this.replaceText(s,t,e)}#u(){this.#T.match(/^-\s+$/)?this.deleteCurrentLine():(this.replaceText("\n",this.currentSelection.end,this.currentSelection.end),this.replaceText("- ",this.currentSelection.end+1,this.currentSelection.end+1))}#m(){this.#T.match(/^\d+\.\s+$/)?this.deleteCurrentLine():(this.replaceText("\n",this.currentSelection.end,this.currentSelection.end),this.replaceText(`${this.#L+1}. `,this.currentSelection.end+1,this.currentSelection.end+1))}#b(t){const{start:e,end:n}=this.currentSelection,s=this.currentLine;this.replaceText(t,s.start,s.start),this.selection.select({start:e+t.length,end:n+t.length})}#f(t){const{start:e,end:n}=this.currentSelection,s=this.currentLine;if(t instanceof RegExp){const e=s.content.match(t);if(!e)return;t=e[0]}s.content.startsWith(t)&&(this.deleteText(s.start,s.start+t.length),this.selection.select({start:e-t.length,end:n-t.length}))}#h(){this.history.add(this.#x)}#d(t,n){const s=this.content;this.content=t,this.element.value=t,this.selection.select(n),e(this.element,"house-md:change",{previousContent:s,newContent:t})}get#x(){const{start:t,end:e}=this.currentSelection;return{content:this.content,start:t,end:e}}get#T(){return this.currentLine.content}get#L(){const t=this.selection.previousLine().content.match(/^(\d+). /);return t?parseInt(t[1]):0}}class c{#A;constructor(t){this.#A=t}asPlainText(){const t=(new window.DOMParser).parseFromString(this.#A,"text/html");return this.#S(t.body).trim()}#S(t){return t.nodeType===Node.TEXT_NODE?t.nodeValue:Array.from(t.childNodes).map(((e,n)=>{const s=this.#k(e),i=n>0&&this.#k(t.childNodes[n-1]);return(s&&i?"\n\n":"")+this.#S(e)})).join("")}#k(t){return["BR","DIV","H1","H2","H3","H4","H5","H6","LI","P","TR"].includes(t.tagName)}}class h{constructor(t){this.document=t}handleInput(t,e){t.preventDefault();const n=this[`${t.inputType}Handler`];if(n){const i=t.getTargetRanges()[0],{start:r,end:o}=s.fromDOMRange(i,e);n.call(this,t,r,o)}else console.error("Not handling:",t.inputType)}insertTextHandler(t,e,n){this.#C(t,e,n)}insertCompositionTextHandler(t,e,n){this.#C(t,e,n)}insertParagraphHandler(t,e,n){this.document.insertParagraph(e,n)}insertLineBreakHandler(t,e,n){this.document.insertParagraph(e,n)}insertLinkHandler(t,e,n){this.#C(t,e,n)}insertFromYankHandler(t,e,n){this.#C(t,e,n)}insertFromDropHandler(t,e,n){this.#C(t,e,n)}insertFromPasteAsQuotationHandler(t,e,n){const s=t.dataTransfer.getData("text/plain");this.document.replaceText(`> ${s}`,e,n)}insertTransposeHandler(t,e,n){this.#C(t,e,n)}insertReplacementTextHandler(t,e,n){this.#C(t,e,n)}insertFromPasteHandler(t,e,n){this.#C(t,e,n)}deleteContentBackwardHandler(t,e,n){this.document.deleteText(e,n)}deleteByCutHandler(t,e,n){this.document.deleteText(e,n)}deleteWordBackwardHandler(t,e,n){this.document.deleteText(e,n)}deleteWordForwardHandler(t,e,n){this.document.deleteText(e,n)}deleteSoftLineBackwardHandler(t,e,n){this.document.deleteText(e,n)}deleteSoftLineForwardHandler(t,e,n){this.document.deleteText(e,n)}deleteEntireSoftLineHandler(t,e,n){this.document.deleteText(e,n)}deleteHardLineBackwardHandler(t,e,n){this.document.deleteText(e,n)}deleteHardLineForwardHandler(t,e,n){this.document.deleteText(e,n)}deleteByDragHandler(t,e,n){this.document.deleteText(e,n)}deleteContentHandler(t,e,n){this.document.deleteText(e,n)}deleteContentForwardHandler(t,e,n){this.document.deleteText(e,n)}#C(t,e,n){let s;if(t.data)s=t.data;else{const e=t.dataTransfer.getData("text/html");s=e?new c(e).asPlainText():t.dataTransfer.getData("text/plain")}this.document.replaceText(s,e,n)}}class d{constructor(t,e){this.element=t.closest("house-md"),this.file=e}upload(){if(e(this.element,"house-md:before-upload",{file:this.file})){const t=document.createElement("house-md-upload");t.file=this.file,t.uploadsURL=this.#$,this.element.appendChild(t)}}get#$(){return this.element.dataset.uploadsUrl||document.head.querySelector("meta[name=house-uploads-url]")?.content||"/uploads"}}class u{constructor(t){this.document=t}handleAction(t,e){const n=this[t];n?n.call(this,e):console.error("Not handling:",t)}bold(){this.document.toggleBold()}italic(){this.document.toggleItalic()}strikethrough(){this.document.toggleStrikethrough()}quote(){this.document.toggleQuote()}code(){this.document.toggleCode()}link(){this.document.toggleLink()}bulletList(){this.document.toggleBulletList()}numberList(){this.document.toggleNumberList()}undo(){this.document.undo()}redo(){this.document.redo()}uploadFile({file:t}){new d(this.document.element,t).upload()}}class m{constructor(t){this.element=t.closest("house-md")}handleDragOver(t){t.preventDefault()}async handleDrop(t){t.preventDefault();for(const e of t.dataTransfer.items)"file"===e.kind&&new d(this.element,e.getAsFile()).upload()}}const p={"Ctrl+B":"bold","Ctrl+I":"italic","Ctrl+S":"strikethrough","Ctrl+Z":"undo","Ctrl+Shift+Z":"redo"};class g extends HTMLElement{static formAssociated=!0;static observedAttributes=["initialized"];constructor(){super(),this.internals=this.attachInternals(),this.internals.ariaRole="textbox"}attributeChangedCallback(t,e,n){"initialized"===t&&this.isConnected&&null!=e&&e!==n&&requestAnimationFrame((()=>this.#H()))}connectedCallback(){const t=this.querySelector(".house-md-content")?.textContent??this.textContent;this.document=new a(t,this),this.#y(),this.#N(),this.inputHandler=new h(this.document),this.actionHandler=new u(this.document),this.dropAndDropHandler=new m(this),this.autofocus&&this.focus(),this.setAttribute("initialized",""),this.value=t}disconnectedCallback(){this.#_()}validate=t=>{this.required&&this.document.isEmpty?(t.preventDefault(),this.internals.setValidity({valueMissing:!0},"This field is required.",this.element),this.focus()):this.internals.setValidity({})};render(){this.document.render()}focus(){this.contentWrapper.focus()}get required(){return this.hasAttribute("required")}set required(t){t?this.setAttribute("required",""):this.removeAttribute("required")}get autofocus(){return this.hasAttribute("autofocus")}set autofocus(t){t?this.setAttribute("autofocus",""):this.removeAttribute("autofocus")}get value(){return this.document.content}set value(t){this.document.content=t,this.internals.setFormValue(t),this.internals.setValidity({}),this.render()}get form(){return this.internals.form}#y(){this.textContent="",this.toolbar=this.#D(),this.contentWrapper=document.createElement("div"),this.contentWrapper.classList.add("house-md-content"),this.contentWrapper.setAttribute("contenteditable",!0),this.contentWrapper.setAttribute("role","textbox"),this.contentWrapper.setAttribute("aria-multiline",!0),this.append(this.contentWrapper),this.getAttribute("tabindex")?(this.contentWrapper.setAttribute("tabindex",this.getAttribute("tabindex")),this.removeAttribute("tabindex")):this.contentWrapper.setAttribute("tabindex",0)}#D(){if(this.getAttribute("toolbar"))return document.getElementById(this.getAttribute("toolbar"));{const t=document.createElement("house-md-toolbar");return this.prepend(t),t}}#H(){this.disconnectedCallback(),this.getAttribute("toolbar")||this.toolbar.remove(),this.contentWrapper.remove(),this.connectedCallback()}#N(){this.addEventListener("beforeinput",this.#I),this.addEventListener("keydown",this.#B),this.addEventListener("dragover",this.#F),this.addEventListener("drop",this.#R),this.toolbar.addEventListener("house-md:toolbar-action",this.#M),document.addEventListener("selectionchange",this.#z),this.internals.form.addEventListener("submit",this.validate)}#_(){this.removeEventListener("beforeinput",this.#I),this.removeEventListener("keydown",this.#B),this.removeEventListener("dragover",this.#F),this.removeEventListener("drop",this.#R),this.toolbar.removeEventListener("house-md:toolbar-action",this.#M),document.removeEventListener("selectionchange",this.#z),this.internals.form.removeEventListener("submit",this.validate)}#I=t=>{this.inputHandler.handleInput(t,this.contentWrapper)};#B(t){const e=function(t){return p[function(t){const e=[];return(t.metaKey||t.ctrlKey)&&e.push("Ctrl"),t.altKey&&e.push("Alt"),t.shiftKey&&e.push("Shift"),e.push(t.key.toUpperCase()),e.join("+")}(t)]}(t);e&&(t.preventDefault(),this.actionHandler.handleAction(e))}#F=t=>{this.dropAndDropHandler.handleDragOver(t)};#R=t=>{this.dropAndDropHandler.handleDrop(t)};#M=({detail:t})=>{this.actionHandler.handleAction(t.houseMdAction,t)};#z=()=>{this.document.selection.update()}}customElements.define("house-md",g);class v extends HTMLElement{#W;#$;#O;constructor(){super(),this.percentComplete=0,this.status="pending"}connectedCallback(){this.#t(),this.#q(),this.addEventListener("click",this.#e)}disconnectedCallback(){this.removeEventListener("click",this.#e)}async#q(){const t=new FormData;t.append("file",this.file),this.csrfParamName&&t.append(this.csrfParamName,this.csrfToken),this.xhr=new XMLHttpRequest,this.xhr.open("POST",this.uploadsURL,!0),this.xhr.upload.onprogress=this.#P,this.xhr.onload=this.#U,this.xhr.onerror=this.#K,this.xhr.onabort=this.#Q,this.xhr.send(t),this.status="uploading",this.#t()}#t(){this.setAttribute("status",this.status),this.innerHTML=`\n      ${this.#V()}\n      ${this.#X()}\n      ${this.#j()}\n      ${this.#Z()}\n    `}#V(){return"failed"===this.status?"<button data-md-action='close' class='md-close' aria-label='Close'></button>":""}#X(){return`<div class="md-file">${this.file.name}</div>`}#j(){return`<progress aria-label="Uploading file…" class="md-progress-bar" max="100" value="${this.percentComplete}">${this.percentComplete}%</progress>`}#Z(){return this.#O?`<div class="md-error">${this.#O}</div>`:""}#P=t=>{t.lengthComputable&&(this.percentComplete=t.loaded/t.total*100),this.#t()};#U=async()=>{if(this.xhr.status>=400)this.status="failed",this.#O=this.xhr.responseText||"Upload failed";else{const t=JSON.parse(this.xhr.responseText);await this.document.insertFile(t.fileName,t.fileUrl,t.mimetype),this.status="complete",this.#J()}this.#t()};#K=()=>{this.status="failed",this.#t()};#Q=()=>{this.status="aborted",this.#t()};#e=t=>{t.target.matches("[data-md-action=close]")&&this.remove()};async#J(t=500){await function(t){return new Promise((e=>setTimeout(e,t)))}(t),this.remove()}get document(){return this.closest("house-md").document}get file(){return this.#W}set file(t){this.#W=t}get uploadsURL(){return this.#$}set uploadsURL(t){this.#$=t}get csrfParamName(){return document.head.querySelector("meta[name=csrf-param]")?.content}get csrfToken(){return document.head.querySelector("meta[name=csrf-token]")?.content}}customElements.define("house-md-upload",v);export{a as Document,g as Editor,o as History,r as Selection,n as Toolbar,v as Upload};

From ab2e446c0ee160ce670238611b45a19798cf5720 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 18:50:03 -0500
Subject: [PATCH 355/413] Adjust this again (with note)

---
 app/assets/stylesheets/trays.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/trays.css b/app/assets/stylesheets/trays.css
index ecd042d1c..6c21ab0b5 100644
--- a/app/assets/stylesheets/trays.css
+++ b/app/assets/stylesheets/trays.css
@@ -4,7 +4,8 @@
 
 @layer components {
   .tray {
-    --height: calc(2.48lh + var(--block-space));
+    /* FIXME: Magic number */
+    --height: calc(2.625lh + var(--block-space));
 
     background-color: transparent;
     border: 0;

From d25ebe803068bc850296556fb06282c7baa231f4 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 18:52:02 -0500
Subject: [PATCH 356/413] Extra element affected flex layout

---
 app/views/notifications/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 4b76c0779..43db397d9 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -31,7 +31,7 @@
 <section class="notificiations-list--read panel center borderless unpad flex-column gap-half margin-block-start">
   <h2 class="txt-medium margin-block-start-double margin-block-end-half txt-uppercase translucent">Previously seen</h2>
 
-  <div id="notifications_list_read">
+  <div id="notifications_list_read" contents>
     <%= render partial: "notifications/notification", collection: @page.records, cached: true %>
   </div>
 </section>

From 4e9bd45e5e5616ecfb20c3f3a68f17ad3240b234 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 18:57:37 -0500
Subject: [PATCH 357/413] Autocomplete + autofocus is annoying

---
 app/views/collections/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/collections/new.html.erb b/app/views/collections/new.html.erb
index f2c4b9e3d..0b391b4e2 100644
--- a/app/views/collections/new.html.erb
+++ b/app/views/collections/new.html.erb
@@ -10,7 +10,7 @@
   <%= form_with model: @collection, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
     <h2 class="txt-x-large">Create a new collection</h2>
     <label class="flex align-center gap">
-      <%= form.text_field :name, required: true, class: "input full-width", autofocus: true, placeholder: "Give it a name…", data: { action: "keydown.esc@document->form#cancel" } %>
+      <%= form.text_field :name, required: true, class: "input full-width", autofocus: true, autocomplete: "off",placeholder: "Give it a name…", data: { action: "keydown.esc@document->form#cancel" } %>
     </label>
 
     <button type="submit" id="log_in" class="btn btn--reversed center">

From 91cca616ba1591921c698e2b8ff7d6a0a4496bbc Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 18:57:47 -0500
Subject: [PATCH 358/413] Fix broken spacing

---
 app/views/notifications/settings/_collection.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/notifications/settings/_collection.html.erb b/app/views/notifications/settings/_collection.html.erb
index eb28e7ce8..a9d421e05 100644
--- a/app/views/notifications/settings/_collection.html.erb
+++ b/app/views/notifications/settings/_collection.html.erb
@@ -1,12 +1,12 @@
 <%= turbo_frame_tag dom_id(collection, :involvement) do %>
-  <div class="flex align-center gap-half pad-inline">
+  <div class="flex align-center gap pad-inline">
     <h2 class="txt-medium overflow-ellipsis">
       <%= collection.name %>
     </h2>
 
     <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-ink-medium); --border-style: dashed" aria-hidden="true">
 
-    <label class="switch flex-item-no-shrink">
+    <label class="flex-item-no-shrink txt-small">
       <%= access_involvement_advance_button(collection, user) %>
     </label>
   </div>

From da147bd7b436ef1906f4895da5928b49541f90ab Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 19:01:41 -0500
Subject: [PATCH 359/413] Proper circle button

---
 app/views/users/_user.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 09374b344..2964451b5 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -10,6 +10,7 @@
   <%= form_with model: user, url: user_role_path(user), data: { controller: "form" }, method: :patch do | form | %>
     <label class="btn txt-small flex-item-no-shrink" for="<%= dom_id(user, :role) %>" arial-label="Role: <%= user.admin? ? "Administrator" : "Member" %>">
       <%= icon_tag "crown" %>
+      <span class="for-screen-reader">Role: <%= user.admin? ? "Administrator" : "Member" %></span>
       <%= form.check_box :role, { data: { action: "form#submit" }, disabled: !Current.user.can_administer?(user), hidden: true, id: dom_id(user, :role) }, "admin", "member" %>
     </label>
   <% end %>

From cc9863572b0d7d016e8255f70dd6655953c03b36 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 19:03:05 -0500
Subject: [PATCH 360/413] First name is enough

---
 app/views/users/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index f18dc58be..e7bd1e5ff 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -32,8 +32,8 @@
       </div>
 
       <div class="flex flex-column gap">
-        <%= link_to "Everything assigned to #{@user.name}", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
-        <%= link_to "Everything added by #{@user.name}", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "Everything assigned to #{@user.first_name}", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "Everything added by #{@user.first_name}", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
       </div>
     </div>
   </div>

From 52e6992fcf057ade54b5a5b56f88f0d312a37e99 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 19:03:38 -0500
Subject: [PATCH 361/413] Use the same language as the view

---
 app/views/users/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e7bd1e5ff..e48da7b94 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -33,7 +33,7 @@
 
       <div class="flex flex-column gap">
         <%= link_to "Everything assigned to #{@user.first_name}", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
-        <%= link_to "Everything added by #{@user.first_name}", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "Everything reported by #{@user.first_name}", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
       </div>
     </div>
   </div>

From aff5abb92de36244a78e796db2fc541124bd2a01 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 19:06:51 -0500
Subject: [PATCH 362/413] Adjust copy and alignment

---
 app/views/users/show.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e48da7b94..314b1492d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -31,9 +31,9 @@
         </div>
       </div>
 
-      <div class="flex flex-column gap">
-        <%= link_to "Everything assigned to #{@user.first_name}", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
-        <%= link_to "Everything reported by #{@user.first_name}", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+      <div class="flex-inline center justify-center flex-wrap gap">
+        <%= link_to "See cards assigned to #{ Current.user == @user ? "you" : @user.first_name }", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "See cards reported by #{ Current.user == @user ? "you" : @user.first_name }", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
       </div>
     </div>
   </div>

From 9e553e0a328126c260b648d99fa5f464473ed420 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 19:13:39 -0500
Subject: [PATCH 363/413] Show button labels, make sign-out less prominent

---
 app/views/users/edit.html.erb | 2 +-
 app/views/users/new.html.erb  | 2 +-
 app/views/users/show.html.erb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index c0cd4af5d..055baab38 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -48,7 +48,7 @@
         </div>
         <button type="submit" id="log_in" class="btn btn--reversed center">
           <%= icon_tag "check" %>
-          <span class="for-screen-reader">Sign in</span>
+          <span>Save changes</span>
         </button>
 
         <%= link_to "Cancel and go back", user_path(@user), data: { form_target: "cancel", turbo_frame: "_top" }, hidden: true %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 40f078bdc..847782db8 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -32,7 +32,7 @@
     </div>
     <button type="submit" id="log_in" class="btn btn--reversed center">
       <%= icon_tag "arrow-right" %>
-      <span class="for-screen-reader">Sign in</span>
+      <span>Create account</span>
     </button>
   <% end %>
 </div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 314b1492d..9472926f4 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -44,10 +44,10 @@
     <%= render "users/transfer", user: @user %>
   </div>
 
-  <div class="panel shadow center margin-block-double">
+  <div class="panel borderless center margin-block-double">
     <%= button_to session_path, method: :delete, class: "btn center txt-medium" do %>
       <%= icon_tag "logout" %>
-      <span class="for-screen-reader">Sign out</span>
+      <span>Sign out</span>
     <% end %>
   </div>
 <% end %>

From 137a16a810bdfa34b6a6883733b7e9b62ab3f352 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 19:26:34 -0500
Subject: [PATCH 364/413] Move to concern

---
 app/helpers/users_helper.rb                         | 6 ------
 app/models/user/named.rb                            | 6 ++++++
 app/views/cards/display/common/_background.html.erb | 2 +-
 app/views/cards/display/common/_meta.html.erb       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index e0a2c4422..58b3e12d6 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -2,10 +2,4 @@ module UsersHelper
   def prepend_current_user_to(users_scope)
     users_scope.to_a.prepend(Current.user).uniq
   end
-
-  def familiar_name_for(user)
-    names = user.name.split
-    return user.name if names.length == 1
-    "#{names.first} #{names[1..].map { |n| "#{n[0]}." }.join}"
-  end
 end
diff --git a/app/models/user/named.rb b/app/models/user/named.rb
index 67420ec72..aa4f9b585 100644
--- a/app/models/user/named.rb
+++ b/app/models/user/named.rb
@@ -16,4 +16,10 @@ module User::Named
   def initials
     name.scan(/\b\p{L}/).join.upcase
   end
+
+  def familiar_name
+    names = name.split
+    return name if names.length == 1
+    "#{names.first} #{names[1..].map { |n| "#{n[0]}." }.join}"
+  end
 end
diff --git a/app/views/cards/display/common/_background.html.erb b/app/views/cards/display/common/_background.html.erb
index 8852fb765..4db6a088a 100644
--- a/app/views/cards/display/common/_background.html.erb
+++ b/app/views/cards/display/common/_background.html.erb
@@ -6,6 +6,6 @@
   <div class="card__closed">
     <span class="card__closed-title txt-uppercase"><%= card.closure.reason %></span>
     <strong class="txt-uppercase"><%= card.closed_at.strftime("%b %d, %Y") %></strong>
-    <span>by <span class="card__closed-by"><%= familiar_name_for(card.closed_by) %></span></span>
+    <span>by <span class="card__closed-by"><%= card.closed_by.familiar_name %></span></span>
   </div>
 <% end %>
diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index 9219e44df..559504d6b 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -17,11 +17,11 @@
       <% end %>
     </span>
     <span class="card__meta-item card__meta-item--reported overflow-ellipsis">
-      Reported by <strong><%= familiar_name_for(card.creator) %></strong>
+      Reported by <strong><%= card.creator.familiar_name %></strong>
     </span>
     <span class="card__meta-item card__meta-item--assigned overflow-ellipsis">
       <%= card.assignees.any? ? "Assigned to" : "Not assigned" %>
-      <%= card.assignees.map { |assignee| "<strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe %>
+      <%= card.assignees.map { |assignee| "<strong>#{assignee.familiar_name}</strong>" }.to_sentence.html_safe %>
     </span>
   </div>
 

From 9172d68d469c4526d9fc443345d611d91e456b34 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 19:29:31 -0500
Subject: [PATCH 365/413] Reporter avatar should be clickable

---
 app/views/cards/display/common/_meta.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index 559504d6b..8cc20f2e5 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -1,7 +1,7 @@
 <div class="card__meta" id="<%= dom_id(card, :meta) %>">
-  <%= avatar_image_tag card.creator, class: "avatar margin-inline-end" %>
+  <%= avatar_tag card.creator %>
 
-  <div class="card__meta-grid">
+  <div class="card__meta-grid margin-inline-start">
     <span class="card__meta-item card__meta-item--added overflow-ellipsis">
       Added <%= local_datetime_tag(card.created_at, style: :daysago) %>
       <% if card.drafted? %>

From 80a43454a893d47d7524acf0b0d0704e38188816 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 19:48:51 -0500
Subject: [PATCH 366/413] Bring back chips to indicate custom collections

---
 app/views/cards/index/_header.html.erb  |  4 ++-
 app/views/filters/_assignees.html.erb   |  4 +--
 app/views/filters/_collections.html.erb | 34 -------------------------
 app/views/filters/_creators.html.erb    |  6 ++---
 app/views/filters/_dialog.html.erb      |  1 +
 app/views/filters/_settings.html.erb    | 12 ++-------
 app/views/filters/_tags.html.erb        |  2 +-
 7 files changed, 12 insertions(+), 51 deletions(-)
 delete mode 100644 app/views/filters/_collections.html.erb

diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index b5b9fb59d..218554519 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -4,7 +4,7 @@
   <div class="btn btn--placeholder flex-item-justify-start"></div>
 
   <header class="flex flex-inline flex-column center flex-shrink">
-    <div class="card-filter--collection flex-inline align-center center position-relative" data-controller="dialog" data-action="click@document->dialog#closeOnClickOutside">
+    <div class="card-filter--collection flex-inline flex-column align-center center position-relative" data-controller="dialog" data-action="click@document->dialog#closeOnClickOutside">
       <%= tag.button class: "txt-align-center input input--select borderless txt-medium",
           data: {
             action: "click->dialog#open:stop keydown.meta+j@document->hotkey#click",
@@ -14,6 +14,8 @@
         </h1>
       <% end %>
 
+      <%= render "filters/settings", filter: filter %>
+
       <%= tag.dialog class:"popup popup--animated panel flex-column align-start gap-half fill-white shadow",
           data: { 
             action:"keydown.esc->dialog#close:stop turbo:before-cache@document->dialog#close",
diff --git a/app/views/filters/_assignees.html.erb b/app/views/filters/_assignees.html.erb
index cb219d9c9..eb2eca270 100644
--- a/app/views/filters/_assignees.html.erb
+++ b/app/views/filters/_assignees.html.erb
@@ -1,11 +1,11 @@
 <% if filter.assignees.any? %>
   <div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
+    <button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
       <span class="overflow-ellipsis">
         <% if filter.assignment_status.unassigned? %>
           No one
         <% elsif filter.assignees.any? %>
-          <%= filter.assignees.map(&:name).to_sentence %>
+          Assigned to <%= filter.assignees.map(&:familiar_name).to_sentence %>
         <% else %>
           Assigned to…
         <% end %>
diff --git a/app/views/filters/_collections.html.erb b/app/views/filters/_collections.html.erb
deleted file mode 100644
index 8b3fb6e1f..000000000
--- a/app/views/filters/_collections.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-  <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
-    <span class="overflow-ellipsis">
-      <% if filter.collections.any? %>
-        <%= filter.collections.map(&:name).to_sentence %>
-      <% else %>
-        In Collection…
-      <% end %>
-    </span>
-  </button>
-
-  <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-    <strong class="popup__title margin-block-start-half pad-inline-half">In Collection</strong>
-    <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
-          data: { controller: "form" } do |form| %>
-      <% filter.as_params.except(:collection_ids).each do |key, value| %>
-        <%= filter_hidden_field_tag key, value %>
-      <% end %>
-
-      <% Current.user.collections.order(:name).each do |collection| %>
-        <div class="btn popup__item">
-          <%= form.check_box "collection_ids[]", {
-            checked: filter.collections.include?(collection),
-            data: { action: "change->form#submit" },
-            include_hidden: false,
-          }, collection.id %>
-
-          <%= form.label "collection_ids[]", collection.name, for: dom_id(collection, :filter), class: "overflow-ellipsis" %>
-          <%= icon_tag "check", class: "checked flex-item-justify-end" %>
-        </div>
-      <% end %>
-    <% end %>
-  </dialog>
-</div>
diff --git a/app/views/filters/_creators.html.erb b/app/views/filters/_creators.html.erb
index e46931110..ab203d063 100644
--- a/app/views/filters/_creators.html.erb
+++ b/app/views/filters/_creators.html.erb
@@ -1,12 +1,12 @@
 <% if filter.creators.any? %>
   <div class="quick-filter position-relative" data-controller="dialog"
         data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
+    <button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
       <span class="overflow-ellipsis">
         <% if filter.creators.any? %>
-          <%= "Added by #{filter.creators.map(&:name).to_sentence}" %>
+          <%= "Reported by #{filter.creators.map(&:familiar_name).to_sentence}" %>
         <% else %>
-          Added by…
+          Reported by…
         <% end %>
       </span>
     </button>
diff --git a/app/views/filters/_dialog.html.erb b/app/views/filters/_dialog.html.erb
index c81aaf436..6c67335d5 100644
--- a/app/views/filters/_dialog.html.erb
+++ b/app/views/filters/_dialog.html.erb
@@ -1,3 +1,4 @@
+<%# Don't delete this file just yet, it's coming back soon. %>
 <dialog class="filter__popup dialog panel fill-white shadow" aria-label="Filter" aria-description="Filter" data-dialog-target="dialog">
   <div class="flex flex-column gap-half">
     <div class="flex align-center gap-half justify-space-between">
diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index 1f9631587..591c7c47d 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -1,13 +1,5 @@
-<div class="filters flex-inline align-center gap-half margin-block-end margin-block-start-half">
-  <button class="btn btn--plain txt-small" data-action="click->dialog#toggle">
-    <%= icon_tag "filter" %>
-    <span class="for-screen-reader">Filter</span>
-  </button>
-
+<div class="filters flex align-center gap-half margin-block-end-half margin-none-block-start justify-center center">
   <div class="flex-inline center align-center gap-half">
-    <%= render "filters/collections", filter: filter %>
-    <%= render "filters/indexed_by", filter: filter %>
-    <%= render "filters/stages", filter: filter %>
     <%= render "filters/tags", filter: filter %>
     <%= render "filters/assignees", filter: filter %>
     <%= render "filters/creators", filter: filter %>
@@ -17,7 +9,7 @@
     <% end %>
 
     <% if any_filters?(filter) %>
-      <%= link_to cards_path, class: "btn btn--remove txt-small" do %>
+      <%= link_to cards_path, class: "btn btn--remove txt-x-small" do %>
         <%= icon_tag "close" %>
         <span class="for-screen-reader">Clear all</span>
       <% end %>
diff --git a/app/views/filters/_tags.html.erb b/app/views/filters/_tags.html.erb
index f6a58225d..3a9b35e6e 100644
--- a/app/views/filters/_tags.html.erb
+++ b/app/views/filters/_tags.html.erb
@@ -1,6 +1,6 @@
 <% if filter.tags.any? %>
   <div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
+    <button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
       <span class="overflow-ellipsis">
         <% if filter.tags.any? %>
           <%= filter.tags.map(&:hashtag).to_sentence %>

From b6658d3081bc554eba9f9a4144b5d38980b55942 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 20:49:35 -0500
Subject: [PATCH 367/413] Bring back custom collections

WIP, still needs UI for creating new custom collections but there are two hard-coded collections and any previously created ones on production should now be available again
---
 app/controllers/events_controller.rb          |  1 +
 app/views/events/_filter.html.erb             |  1 +
 .../filter/_custom_collections.html.erb       | 30 +++++++++++++++++++
 app/views/events/filter/_header.html.erb      |  3 --
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 app/views/events/filter/_custom_collections.html.erb

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 1340def1d..ee040c720 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -2,5 +2,6 @@ class EventsController < ApplicationController
   include DayTimelinesScoped
 
   def index
+    @filters = Current.user.filters.all
   end
 end
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index ee19a3112..13fa5b0a2 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -19,6 +19,7 @@
 				filter_selected_class: "selected" } do %>
 		<%= render "events/filter/header" %>
 		<%= render "events/filter/new_collection_option" %>
+		<%= render "events/filter/custom_collections" %>
 		<% if Current.user.collections.count > 15 %>
 			<input placeholder="Find a collection…" class="input input--transparent txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter" autofocus>
 		<% end %>
diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
new file mode 100644
index 000000000..9262543c6
--- /dev/null
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -0,0 +1,30 @@
+<div class="flex flex-column max-width popup__list full-width">
+  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+    <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+      <%= icon_tag "filter" %>
+      <span>Assigned to me</span>
+    <% end %>
+
+    <span class="translucent flex-item-no-shrink"> ›</span>
+  </div>
+
+  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+    <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+      <%= icon_tag "filter" %>
+      <span>Reported by me</span>
+    <% end %>
+
+    <span class="translucent flex-item-no-shrink"> ›</span>
+  </div>
+
+  <% @filters.each do |filter| %>
+    <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+      <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+        <%= icon_tag "filter" %>
+        <span><%= filter.summary %></span>
+      <% end %>
+      <span class="translucent flex-item-no-shrink"> ›</span>
+    </div>
+  <% end %>
+</div>
+<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
\ No newline at end of file
diff --git a/app/views/events/filter/_header.html.erb b/app/views/events/filter/_header.html.erb
index 48039a51a..a10a4ab23 100644
--- a/app/views/events/filter/_header.html.erb
+++ b/app/views/events/filter/_header.html.erb
@@ -1,7 +1,4 @@
 <div class="flex align-center full-width gap-half">
-  <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
-    <%= icon_tag "filter" %>
-  </span>
   <strong class="popup__title txt-medium">Collections</strong>
   <button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
     <%= icon_tag "remove-med" %>

From 1d230adf1ad31da44a1ea85d5abdc204f26d4465 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sat, 26 Apr 2025 21:04:15 -0500
Subject: [PATCH 368/413] Ensure button fills the container so you can click
 anywhere

---
 app/assets/stylesheets/workflows.css           | 12 ++++++++----
 app/views/collections/edit/_workflows.html.erb |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/workflows.css b/app/assets/stylesheets/workflows.css
index f69b7ff7c..b9eeccc6b 100644
--- a/app/assets/stylesheets/workflows.css
+++ b/app/assets/stylesheets/workflows.css
@@ -35,21 +35,25 @@
     aspect-ratio: 1;
     flex: 1 1 30%;
     max-inline-size: 33%;
-    padding: 0.5em 1em;
 
     button {
       --hover-size: 0;
 
       appearance: none;
+      aspect-ratio: 1;
       background: transparent;
+      block-size: 100%;
       border: none;
       cursor: pointer;
-      inline-size: auto;
+      display: flex;
+      flex-direction: column;
+      gap: 0.5em;
+      inline-size: 100%;
       margin: 0;
       max-inline-size: 100%;
       outline: 0;
-      padding: 0;
-      text-align: left;
+      padding: 1em;
+      text-align: start;
     }
   }
 
diff --git a/app/views/collections/edit/_workflows.html.erb b/app/views/collections/edit/_workflows.html.erb
index 5e958cd19..092b6195f 100644
--- a/app/views/collections/edit/_workflows.html.erb
+++ b/app/views/collections/edit/_workflows.html.erb
@@ -6,7 +6,7 @@
       <%= button_to collection_workflow_path(collection), method: :patch do %>
         <%= hidden_field_tag "collection[workflow_id]", workflow.id %>
         <strong class="txt-small overflow-ellipsis"><%= workflow.name %></strong>
-        <ul class="list-style-none txt-xx-small ">
+        <ul class="list-style-none txt-xx-small margin-none flex flex-column gap-half">
           <% workflow.stages.each do |stage| %>
             <li class="overflow-ellipsis flex align-center gap-half min-width">
               <span class="workflow-preview__swatch btn btn--circle" style="--btn-background: <%= stage.color.present? ? stage.color : Card::Colored::DEFAULT_COLOR %>;"></span>

From 92f0d078b82c312c519b8368c5148820fea1b505 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 15:55:40 +0200
Subject: [PATCH 369/413] Update filter, we're not setting `indexed_by`

---
 app/helpers/filters_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index aae65bf6b..6fd5554f8 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -34,6 +34,6 @@ module FiltersHelper
   def any_filters?(filter)
     filter.tags.any? || filter.assignees.any? || filter.creators.any? ||
       filter.stages.any? || filter.terms.any? ||
-      filter.assignment_status.unassigned? || !filter.default_indexed_by?
+      filter.assignment_status.unassigned?
   end
 end

From ec0fcf74203625bdcaba84948656585c7a4d7a9d Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 16:12:19 +0200
Subject: [PATCH 370/413] Ensure entire row is clickable

---
 app/assets/stylesheets/popup.css                         | 2 +-
 app/views/cards/index/_collections_filter.html.erb       | 5 ++---
 app/views/events/filter/_all_collections_option.html.erb | 2 +-
 app/views/events/filter/_collection_option.html.erb      | 3 +--
 app/views/events/filter/_custom_collections.html.erb     | 8 +++-----
 app/views/events/filter/_new_collection_option.html.erb  | 2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 99615c0e7..eda286eea 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -44,7 +44,7 @@
     --btn-border-radius: 0.3em;
     --btn-border-size: 0;
     --btn-font-weight: 500;
-    --btn-padding: var(--inline-space-half) var(--inline-space-half) var(--inline-space-half) var(--inline-space);
+    --btn-padding: var(--inline-space-half) 0 var(--inline-space-half) var(--inline-space);
     --hover-size: 0;
     --outline-color: transparent;
 
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index c61ef98d0..8b07eab87 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -15,8 +15,8 @@
     </div>
     <%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
       <span class="overflow-ellipsis">All collections</span>
+      <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
     <% end %>
-    <span class="txt-ink translucent flex-item-no-shrink"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
   <% end %>
 
   <% Current.user.collections.order(:name).each do |collection| %>
@@ -36,9 +36,8 @@
 
       <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
         <span class="overflow-ellipsis"><%= collection.name %></span>
+        <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
       <% end %>
-  
-      <span class="translucent flex-item-no-shrink"> ›</span>
     </li>
   <% end %>
 <% end %>
diff --git a/app/views/events/filter/_all_collections_option.html.erb b/app/views/events/filter/_all_collections_option.html.erb
index 71f94c20e..27857fb1f 100644
--- a/app/views/events/filter/_all_collections_option.html.erb
+++ b/app/views/events/filter/_all_collections_option.html.erb
@@ -12,6 +12,6 @@
 
 	<%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item min-width flex-item-grow" do %>
     <span class="overflow-ellipsis">All collections</span>
+    <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
   <% end %>
-  <span class="txt-ink translucent flex-item-no-shrink"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
 </div>
\ No newline at end of file
diff --git a/app/views/events/filter/_collection_option.html.erb b/app/views/events/filter/_collection_option.html.erb
index 6661dc5c2..bdc2877b6 100644
--- a/app/views/events/filter/_collection_option.html.erb
+++ b/app/views/events/filter/_collection_option.html.erb
@@ -14,7 +14,6 @@
 
   <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
     <span class="overflow-ellipsis"><%= collection.name %></span>
+    <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
   <% end %>
-
-  <span class="translucent flex-item-no-shrink"> ›</span>
 </li>
diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
index 9262543c6..6de04fede 100644
--- a/app/views/events/filter/_custom_collections.html.erb
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -3,18 +3,16 @@
     <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
       <span>Assigned to me</span>
+      <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
-
-    <span class="translucent flex-item-no-shrink"> ›</span>
   </div>
 
   <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
     <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
       <span>Reported by me</span>
+      <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
-
-    <span class="translucent flex-item-no-shrink"> ›</span>
   </div>
 
   <% @filters.each do |filter| %>
@@ -22,8 +20,8 @@
       <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
         <%= icon_tag "filter" %>
         <span><%= filter.summary %></span>
+        <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
       <% end %>
-      <span class="translucent flex-item-no-shrink"> ›</span>
     </div>
   <% end %>
 </div>
diff --git a/app/views/events/filter/_new_collection_option.html.erb b/app/views/events/filter/_new_collection_option.html.erb
index 3064516cd..71914e7df 100644
--- a/app/views/events/filter/_new_collection_option.html.erb
+++ b/app/views/events/filter/_new_collection_option.html.erb
@@ -2,6 +2,6 @@
   <%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
     <%= icon_tag "add" %>
     <span>Add a new collection</span>
+    <hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
   <% end %>
 </div>
-<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">

From dfdb4eee6b19b3dc2cf2d5cb900c9d4e6cdc0eba Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 16:30:42 +0200
Subject: [PATCH 371/413] Constrain width for filtering

---
 app/assets/stylesheets/popup.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index eda286eea..a1482b905 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -20,6 +20,11 @@
       max-inline-size: 100%;
       position: relative;
       z-index: 5;
+
+      .popup {
+        min-inline-size: 40ch;
+        max-inline-size: 40ch;
+      }
     }
   }
 

From d93419581f96b1516f1a9b5935eba2b32e3ec574 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 16:47:01 +0200
Subject: [PATCH 372/413] Add truncation to custom collections, add them to the
 filterable list

---
 app/views/events/_filter.html.erb              |  3 ++-
 .../events/filter/_custom_collections.html.erb | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 13fa5b0a2..a392973c9 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -19,7 +19,6 @@
 				filter_selected_class: "selected" } do %>
 		<%= render "events/filter/header" %>
 		<%= render "events/filter/new_collection_option" %>
-		<%= render "events/filter/custom_collections" %>
 		<% if Current.user.collections.count > 15 %>
 			<input placeholder="Find a collection…" class="input input--transparent txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter" autofocus>
 		<% end %>
@@ -27,6 +26,8 @@
 					data: { controller: "form" } do |form| %>
 			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
 			<menu data-filter-target="list" contents>
+				<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
+				<%= render "events/filter/custom_collections" %>
 				<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
 			</menu>
 		<% end %>
diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
index 6de04fede..bea8bea91 100644
--- a/app/views/events/filter/_custom_collections.html.erb
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -1,28 +1,28 @@
 <div class="flex flex-column max-width popup__list full-width">
-  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="assigned to me">
     <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
-      <span>Assigned to me</span>
+      <span class="overflow-ellipsis">Assigned to me</span>
       <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
-  </div>
+  </li>
 
-  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="reported by me">
     <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
-      <span>Reported by me</span>
+      <span class="overflow-ellipsis">Reported by me</span>
       <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
-  </div>
+  </li>
 
   <% @filters.each do |filter| %>
-    <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+    <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="<%= filter.summary.downcase %>">
       <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
         <%= icon_tag "filter" %>
-        <span><%= filter.summary %></span>
+        <span class="overflow-ellipsis"><%= filter.summary %></span>
         <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
       <% end %>
-    </div>
+    </li>
   <% end %>
 </div>
 <hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
\ No newline at end of file

From 57aa58352de02526a6bd6e5e1da49a98fdd8c36d Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 17:07:56 +0200
Subject: [PATCH 373/413] Keyboard focus effect

---
 app/assets/stylesheets/popup.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index a1482b905..f82183b3c 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -42,6 +42,14 @@
         background: var(--color-selected);
       }
     }
+
+    &:has(:focus-visible) {
+      background: var(--color-selected-dark);
+
+      .popup__item {
+        --outline-size: 0;
+      }
+    }
   }
 
   .popup__item {

From b8fe50113bed104aa2d09e157264126065f54693 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 17:13:36 +0200
Subject: [PATCH 374/413] Shouldn't be nested, we already have a `popup__list`

---
 .../filter/_custom_collections.html.erb       | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
index bea8bea91..e15562684 100644
--- a/app/views/events/filter/_custom_collections.html.erb
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -1,28 +1,26 @@
-<div class="flex flex-column max-width popup__list full-width">
-  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="assigned to me">
-    <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
-      <%= icon_tag "filter" %>
-      <span class="overflow-ellipsis">Assigned to me</span>
-      <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
-    <% end %>
-  </li>
-
-  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="reported by me">
-    <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
-      <%= icon_tag "filter" %>
-      <span class="overflow-ellipsis">Reported by me</span>
-      <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
-    <% end %>
-  </li>
-
-  <% @filters.each do |filter| %>
-    <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="<%= filter.summary.downcase %>">
-      <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
-        <%= icon_tag "filter" %>
-        <span class="overflow-ellipsis"><%= filter.summary %></span>
-        <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
-      <% end %>
-    </li>
+<li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="assigned to me">
+  <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+    <%= icon_tag "filter" %>
+    <span class="overflow-ellipsis">Assigned to me</span>
+    <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
   <% end %>
-</div>
+</li>
+
+<li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="reported by me">
+  <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+    <%= icon_tag "filter" %>
+    <span class="overflow-ellipsis">Reported by me</span>
+    <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
+  <% end %>
+</li>
+
+<% @filters.each do |filter| %>
+  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="<%= filter.summary.downcase %>">
+    <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+      <%= icon_tag "filter" %>
+      <span class="overflow-ellipsis"><%= filter.summary %></span>
+      <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
+    <% end %>
+  </li>
+<% end %>
 <hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
\ No newline at end of file

From dfbdd3da4d6dba347c26815efab47748ae3d9b52 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 17:19:22 +0200
Subject: [PATCH 375/413] We can't filter these right now

---
 app/views/events/_filter.html.erb             |  6 +--
 .../filter/_custom_collections.html.erb       | 44 ++++++++++---------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index a392973c9..a6c0e219e 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -19,15 +19,15 @@
 				filter_selected_class: "selected" } do %>
 		<%= render "events/filter/header" %>
 		<%= render "events/filter/new_collection_option" %>
-		<% if Current.user.collections.count > 15 %>
+		<% if Current.user.collections.count > 1 %>
 			<input placeholder="Find a collection…" class="input input--transparent txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter" autofocus>
 		<% end %>
 		<%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width",
 					data: { controller: "form" } do |form| %>
 			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
+			<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
+			<%= render "events/filter/custom_collections" %>
 			<menu data-filter-target="list" contents>
-				<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
-				<%= render "events/filter/custom_collections" %>
 				<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
 			</menu>
 		<% end %>
diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
index e15562684..bea8bea91 100644
--- a/app/views/events/filter/_custom_collections.html.erb
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -1,26 +1,28 @@
-<li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="assigned to me">
-  <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
-    <%= icon_tag "filter" %>
-    <span class="overflow-ellipsis">Assigned to me</span>
-    <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
-  <% end %>
-</li>
-
-<li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="reported by me">
-  <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
-    <%= icon_tag "filter" %>
-    <span class="overflow-ellipsis">Reported by me</span>
-    <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
-  <% end %>
-</li>
-
-<% @filters.each do |filter| %>
-  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="<%= filter.summary.downcase %>">
-    <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+<div class="flex flex-column max-width popup__list full-width">
+  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="assigned to me">
+    <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
-      <span class="overflow-ellipsis"><%= filter.summary %></span>
+      <span class="overflow-ellipsis">Assigned to me</span>
       <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
   </li>
-<% end %>
+
+  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="reported by me">
+    <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+      <%= icon_tag "filter" %>
+      <span class="overflow-ellipsis">Reported by me</span>
+      <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
+    <% end %>
+  </li>
+
+  <% @filters.each do |filter| %>
+    <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="<%= filter.summary.downcase %>">
+      <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+        <%= icon_tag "filter" %>
+        <span class="overflow-ellipsis"><%= filter.summary %></span>
+        <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
+      <% end %>
+    </li>
+  <% end %>
+</div>
 <hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
\ No newline at end of file

From 81ea8f2a1d1ecbea7606a30e8d762805853bbd45 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 17:26:00 +0200
Subject: [PATCH 376/413] Completely revert that

---
 app/views/events/_filter.html.erb                 |  5 ++---
 .../events/filter/_custom_collections.html.erb    | 15 +++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index a6c0e219e..80c6ab48d 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -19,14 +19,13 @@
 				filter_selected_class: "selected" } do %>
 		<%= render "events/filter/header" %>
 		<%= render "events/filter/new_collection_option" %>
-		<% if Current.user.collections.count > 1 %>
+		<% if Current.user.collections.count > 15 %>
 			<input placeholder="Find a collection…" class="input input--transparent txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter" autofocus>
 		<% end %>
+		<%= render "events/filter/custom_collections" %>
 		<%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width",
 					data: { controller: "form" } do |form| %>
 			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
-			<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
-			<%= render "events/filter/custom_collections" %>
 			<menu data-filter-target="list" contents>
 				<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
 			</menu>
diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
index bea8bea91..f3a07e15e 100644
--- a/app/views/events/filter/_custom_collections.html.erb
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -1,28 +1,27 @@
 <div class="flex flex-column max-width popup__list full-width">
-  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="assigned to me">
+  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
     <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
       <span class="overflow-ellipsis">Assigned to me</span>
       <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
-  </li>
+  </div>
 
-  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="reported by me">
+  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
     <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
       <span class="overflow-ellipsis">Reported by me</span>
       <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
-  </li>
+  </div>
 
   <% @filters.each do |filter| %>
-    <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="<%= filter.summary.downcase %>">
+    <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
       <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
         <%= icon_tag "filter" %>
         <span class="overflow-ellipsis"><%= filter.summary %></span>
         <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
       <% end %>
-    </li>
+    </div>
   <% end %>
-</div>
-<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
\ No newline at end of file
+</div>
\ No newline at end of file

From 9d6e40904f982446914f051272a8d6b92080a310 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Sun, 27 Apr 2025 21:26:06 +0200
Subject: [PATCH 377/413] Adjust size for demo

---
 app/assets/stylesheets/popup.css  | 2 +-
 app/views/events/_filter.html.erb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index f82183b3c..a217b9965 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -104,7 +104,7 @@
   }
 
   .popup__list {
-    max-block-size: 60dvh;
+    max-block-size: 40dvh;
     overflow: auto;
     row-gap: 2px;
   }
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 80c6ab48d..eaa67d5f4 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -27,7 +27,9 @@
 					data: { controller: "form" } do |form| %>
 			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
 			<menu data-filter-target="list" contents>
-				<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
+				<% 20.times do %>
+					<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
+				<% end %>
 			</menu>
 		<% end %>
 

From 44169ac5ba4dc5380cc5d908cf2167592c846329 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 28 Apr 2025 14:21:59 +0200
Subject: [PATCH 378/413] Test PVE deployment

---
 config/deploy.dhh.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 config/deploy.dhh.yml

diff --git a/config/deploy.dhh.yml b/config/deploy.dhh.yml
new file mode 100644
index 000000000..1289891ab
--- /dev/null
+++ b/config/deploy.dhh.yml
@@ -0,0 +1,7 @@
+servers:
+  web:
+    hosts:
+      - test-1
+  jobs:
+    hosts:
+      - test-1

From 4531e7f9d9ac423c5b8c278107d3fc32d7749cd4 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 28 Apr 2025 14:25:35 +0200
Subject: [PATCH 379/413] Dont need proxy

---
 config/deploy.dhh.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/deploy.dhh.yml b/config/deploy.dhh.yml
index 1289891ab..fc912fd7f 100644
--- a/config/deploy.dhh.yml
+++ b/config/deploy.dhh.yml
@@ -5,3 +5,5 @@ servers:
   jobs:
     hosts:
       - test-1
+
+proxy: false

From c5bce10d23b725bd7bf9f112e098574eea99c607 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 28 Apr 2025 14:44:04 +0200
Subject: [PATCH 380/413] Set ARTENANT until we can fix AR::Tenanted for clean
 boot

---
 config/deploy.dhh.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/deploy.dhh.yml b/config/deploy.dhh.yml
index fc912fd7f..05bf874d4 100644
--- a/config/deploy.dhh.yml
+++ b/config/deploy.dhh.yml
@@ -5,5 +5,8 @@ servers:
   jobs:
     hosts:
       - test-1
+env:
+  clear:
+    ARTENANT: test
 
 proxy: false

From a3e5323066078655b79d13afce26d08eb020d5e0 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 28 Apr 2025 14:44:11 +0200
Subject: [PATCH 381/413] Same as production

---
 .kamal/secrets.dhh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .kamal/secrets.dhh

diff --git a/.kamal/secrets.dhh b/.kamal/secrets.dhh
new file mode 100644
index 000000000..b427fe0c2
--- /dev/null
+++ b/.kamal/secrets.dhh
@@ -0,0 +1,5 @@
+SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Production/SECRET_KEY_BASE)
+
+GITHUB_TOKEN=$(gh config get -h github.com oauth_token)
+BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS)
+SECRET_KEY_BASE=$(kamal secrets extract SECRET_KEY_BASE $SECRETS)

From f5b5a5d9d482f3d4568f433641be382823a04ef5 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 28 Apr 2025 15:00:53 -0400
Subject: [PATCH 382/413] Drop default ARTENANT

The gem has this default already
---
 .mise.toml | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .mise.toml

diff --git a/.mise.toml b/.mise.toml
deleted file mode 100644
index 78434a1e0..000000000
--- a/.mise.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[env]
-ARTENANT = "development-tenant"

From 94b1082091d9342645b6cd389b5dc7af69fc290d Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 28 Apr 2025 15:01:56 -0400
Subject: [PATCH 383/413] dep: bump AR::Tenanted to avoid errors on a fresh
 deploy

ref: https://37s.fizzy.37signals.com/collections/693169862/cards/999008994
ref: https://github.com/basecamp/active_record-tenanted/pull/88
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 44c91583d..a1548a9ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/basecamp/active_record-tenanted
-  revision: f04f4f0a153ae5da65b400021aa97fdb28ac86b5
+  revision: 30c2d35fb1b8e01ac3e40088fde8c19ef10eb1a6
   specs:
     active_record-tenanted (0.1.0)
       activerecord (>= 8.1.alpha)

From de13f85949261e1c2b6fdc3665a8ec19d2da4826 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Mon, 28 Apr 2025 22:45:54 +0200
Subject: [PATCH 384/413] Remove debug

---
 app/views/events/_filter.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index eaa67d5f4..80c6ab48d 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -27,9 +27,7 @@
 					data: { controller: "form" } do |form| %>
 			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
 			<menu data-filter-target="list" contents>
-				<% 20.times do %>
-					<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
-				<% end %>
+				<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
 			</menu>
 		<% end %>
 

From e3a7eae3a0a6f07660b95b187ce2c285d196c6dc Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Tue, 29 Apr 2025 05:31:28 -0400
Subject: [PATCH 385/413] dep: bump dependencies

---
 Gemfile.lock | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a1548a9ba..c9039a159 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 0ed3cd46d0038f8108ed92edb308c81fa6cc3730
+  revision: bc7f77b32d7f3f26db654cae506c26a959852506
   branch: main
   specs:
     actioncable (8.1.0.alpha)
@@ -145,13 +145,13 @@ GEM
       xpath (~> 3.2)
     chunky_png (1.4.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.2)
+    connection_pool (2.5.3)
     crass (1.0.6)
     date (3.4.1)
     debug (1.10.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    dotenv (3.1.7)
+    dotenv (3.1.8)
     drb (2.2.1)
     ed25519 (1.3.0)
     erubi (1.13.1)
@@ -179,7 +179,7 @@ GEM
     jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.10.2)
+    json (2.11.3)
     kamal (2.5.3)
       activesupport (>= 7.0)
       base64 (~> 0.2)
@@ -243,8 +243,8 @@ GEM
     nokogiri (1.18.8-x86_64-linux-musl)
       racc (~> 1.4)
     ostruct (0.6.1)
-    parallel (1.26.3)
-    parser (3.3.7.4)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     pp (0.6.2)
@@ -290,12 +290,12 @@ GEM
     reline (0.6.1)
       io-console (~> 0.5)
     rexml (3.4.1)
-    rouge (4.5.1)
-    rqrcode (2.2.0)
+    rouge (4.5.2)
+    rqrcode (3.1.0)
       chunky_png (~> 1.0)
-      rqrcode_core (~> 1.0)
-    rqrcode_core (1.2.0)
-    rubocop (1.75.2)
+      rqrcode_core (~> 2.0)
+    rqrcode_core (2.0.0)
+    rubocop (1.75.4)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -306,7 +306,7 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.0)
+    rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.25.0)
@@ -347,7 +347,7 @@ GEM
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
-    solid_queue (1.1.4)
+    solid_queue (1.1.5)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
@@ -375,11 +375,11 @@ GEM
       railties (>= 6.0.0)
     stringio (3.1.7)
     thor (1.3.2)
-    thruster (0.1.12)
-    thruster (0.1.12-aarch64-linux)
-    thruster (0.1.12-arm64-darwin)
-    thruster (0.1.12-x86_64-darwin)
-    thruster (0.1.12-x86_64-linux)
+    thruster (0.1.13)
+    thruster (0.1.13-aarch64-linux)
+    thruster (0.1.13-arm64-darwin)
+    thruster (0.1.13-x86_64-darwin)
+    thruster (0.1.13-x86_64-linux)
     timeout (0.4.3)
     turbo-rails (2.0.13)
       actionpack (>= 7.1.0)

From 2b98db9e66f3f1e0a5bb9e566d3981234d4b2a94 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 29 Apr 2025 19:21:18 +0200
Subject: [PATCH 386/413] Flatten out comments and messages

https://37s.fizzy.37signals.com/collections/693169850/cards/999008989#comment_994777841
---
 .../cards/comments/reactions_controller.rb    |   2 +-
 app/controllers/cards/comments_controller.rb  |   4 +-
 app/models/card.rb                            |   5 +-
 app/models/card/eventable.rb                  |   2 +-
 app/models/card/messages.rb                   |  11 --
 app/models/card/readable.rb                   |   4 -
 app/models/card/searchable.rb                 |   2 +-
 app/models/comment.rb                         |   8 +-
 app/models/concerns/messageable.rb            |  12 ---
 app/models/event.rb                           |   1 -
 app/models/event_summary.rb                   |  36 -------
 app/models/message.rb                         |   7 --
 app/views/cards/_messages.html.erb            |   2 +-
 app/views/cards/messages/_message.html.erb    |   5 -
 ...429162506_flatten_messages_and_comments.rb |  19 ++++
 db/schema.rb                                  |  17 +--
 db/schema_cache.yml                           | 100 +++++++-----------
 .../cards/comments_controller_test.rb         |   2 +-
 test/fixtures/comments.yml                    |  30 ++++++
 test/fixtures/event_summaries.yml             |  17 ---
 test/fixtures/events.yml                      |   9 --
 test/fixtures/messages.yml                    |  40 -------
 test/fixtures/users.yml                       |   4 +
 test/models/card/commentable_test.rb          |   2 +-
 test/models/card/messages_test.rb             |   2 +-
 test/models/card_test.rb                      |  12 +--
 test/models/comment_test.rb                   |   4 +-
 test/models/event_summary_test.rb             |   8 --
 test/models/filter_test.rb                    |   4 +-
 29 files changed, 120 insertions(+), 251 deletions(-)
 delete mode 100644 app/models/card/messages.rb
 delete mode 100644 app/models/concerns/messageable.rb
 delete mode 100644 app/models/event_summary.rb
 delete mode 100644 app/models/message.rb
 delete mode 100644 app/views/cards/messages/_message.html.erb
 create mode 100644 db/migrate/20250429162506_flatten_messages_and_comments.rb
 delete mode 100644 test/fixtures/event_summaries.yml
 delete mode 100644 test/fixtures/messages.yml
 delete mode 100644 test/models/event_summary_test.rb

diff --git a/app/controllers/cards/comments/reactions_controller.rb b/app/controllers/cards/comments/reactions_controller.rb
index fb0c4fa55..0a728fbb2 100644
--- a/app/controllers/cards/comments/reactions_controller.rb
+++ b/app/controllers/cards/comments/reactions_controller.rb
@@ -25,7 +25,7 @@ class Cards::Comments::ReactionsController < ApplicationController
 
   private
     def set_comment
-      @comment = Comment.belonging_to_card(@card).find(params[:comment_id])
+      @comment = @card.comments.find(params[:comment_id])
     end
 
     def broadcast_create(reaction)
diff --git a/app/controllers/cards/comments_controller.rb b/app/controllers/cards/comments_controller.rb
index 33437eb24..d437c53fa 100644
--- a/app/controllers/cards/comments_controller.rb
+++ b/app/controllers/cards/comments_controller.rb
@@ -5,7 +5,7 @@ class Cards::CommentsController < ApplicationController
   before_action :ensure_creatorship, only: %i[ edit update destroy ]
 
   def create
-    @card.capture Comment.new(comment_params)
+    @card.comments.create!(comment_params)
   end
 
   def show
@@ -25,7 +25,7 @@ class Cards::CommentsController < ApplicationController
 
   private
     def set_comment
-      @comment = Comment.belonging_to_card(@card).find(params[:id])
+      @comment = @card.comments.find(params[:id])
     end
 
     def ensure_creatorship
diff --git a/app/models/card.rb b/app/models/card.rb
index 4344d89b1..ed97a9e53 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,11 +1,12 @@
 class Card < ApplicationRecord
-  include Assignable, Colored, Engageable, Eventable, Golden, Mentions,
-    Messages, Pinnable, Closeable, Readable, Searchable, Staged,
+  include Assignable, Colored, Engageable, Eventable, Golden,
+    Mentions, Pinnable, Closeable, Readable, Searchable, Staged,
     Statuses, Taggable, Watchable
 
   belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
+  has_many :comments, -> { chronologically }, dependent: :destroy
   has_one_attached :image, dependent: :purge_later
 
   has_markdown :description
diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 67c8fcff9..5fd0759fb 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -12,7 +12,7 @@ module Card::Eventable
 
   def event_was_created(event)
     transaction do
-      find_or_capture_event_summary.events << event
+      # find_or_capture_event_summary.events << event
       touch(:last_active_at)
     end
   end
diff --git a/app/models/card/messages.rb b/app/models/card/messages.rb
deleted file mode 100644
index 89579b78f..000000000
--- a/app/models/card/messages.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Card::Messages
-  extend ActiveSupport::Concern
-
-  included do
-    has_many :messages, -> { chronologically }, dependent: :destroy
-  end
-
-  def capture(messageable)
-    messages.create! messageable: messageable
-  end
-end
diff --git a/app/models/card/readable.rb b/app/models/card/readable.rb
index b37538b9b..84db015ed 100644
--- a/app/models/card/readable.rb
+++ b/app/models/card/readable.rb
@@ -31,8 +31,4 @@ module Card::Readable
     def comment_mentions
       Mention.where(source: comments)
     end
-
-    def comments
-      @comments ||= Comment.where(id: messages.comments.pluck(:messageable_id))
-    end
 end
diff --git a/app/models/card/searchable.rb b/app/models/card/searchable.rb
index 2e01fef9b..f28e964cf 100644
--- a/app/models/card/searchable.rb
+++ b/app/models/card/searchable.rb
@@ -11,7 +11,7 @@ module Card::Searchable
         cards = Card.search(query).select(:id).to_sql
         comments = Comment.search(query).select(:id).to_sql
 
-        left_joins(:messages).where("cards.id in (#{cards}) or messages.messageable_id in (#{comments})").distinct
+        left_joins(:comments).where("cards.id in (#{cards}) or comments.id in (#{comments})").distinct
       else
         none
       end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index a8cdf6bdc..f22d95b3e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,6 @@
 class Comment < ApplicationRecord
-  include Eventable, Mentions, Messageable, Searchable
+  include Eventable, Mentions, Searchable
+  belongs_to :card, touch: true
 
   belongs_to :creator, class_name: "User", default: -> { Current.user }
   has_many :reactions, dependent: :delete_all
@@ -7,12 +8,11 @@ class Comment < ApplicationRecord
   has_markdown :body
   searchable_by :body_plain_text, using: :comments_search_index, as: :body
 
-  # FIXME: Not a fan of this. Think all references to comment should come directly from the message.
-  scope :belonging_to_card, ->(card) { joins(:message).where(messages: { card_id: card.id }) }
+  scope :chronologically, -> { order created_at: :asc, id: :desc }
 
   after_create_commit :watch_card_by_creator
 
-  delegate :watch_by, to: :card
+  delegate :collection, :watch_by, to: :card
 
   def to_partial_path
     "cards/#{super}"
diff --git a/app/models/concerns/messageable.rb b/app/models/concerns/messageable.rb
deleted file mode 100644
index d3dbca06c..000000000
--- a/app/models/concerns/messageable.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Messageable
-  extend ActiveSupport::Concern
-
-  TYPES = %w[ Comment EventSummary ]
-
-  included do
-    has_one :message, as: :messageable, touch: true, dependent: :destroy
-    has_one :card, through: :message
-
-    delegate :collection, to: :card
-  end
-end
diff --git a/app/models/event.rb b/app/models/event.rb
index 1775e640a..443e9170b 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -4,7 +4,6 @@ class Event < ApplicationRecord
   belongs_to :collection
   belongs_to :creator, class_name: "User"
   belongs_to :eventable, polymorphic: true
-  belongs_to :summary, touch: true, class_name: "EventSummary", optional: true
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
 
diff --git a/app/models/event_summary.rb b/app/models/event_summary.rb
deleted file mode 100644
index f04841e66..000000000
--- a/app/models/event_summary.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class EventSummary < ApplicationRecord
-  include Messageable
-
-  has_many :events, -> { chronologically }, dependent: :delete_all, inverse_of: :summary
-
-  # FIXME: Consider persisting the body and compute at write time.
-  def body
-    events.map { |event| summarize(event) }.join(" ")
-  end
-
-  private
-    delegate :time_ago_in_words, to: "ApplicationController.helpers"
-
-    def summarize(event)
-      case event.action
-      when "card_assigned"
-        "Assigned to #{event.assignees.pluck(:name).to_sentence}."
-      when "card_unassigned"
-        "Unassigned from #{event.assignees.pluck(:name).to_sentence}."
-      when "card_staged"
-        "#{event.creator.name} moved this to '#{event.stage_name}'."
-      when "card_closed"
-        "Closed by #{ event.creator.name }"
-      when "card_unstaged"
-        "#{event.creator.name} removed this from '#{event.stage_name}'."
-      when "card_due_date_added"
-        "#{event.creator.name} set due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
-      when "card_due_date_changed"
-        "#{event.creator.name} changed due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
-      when "card_due_date_removed"
-        "#{event.creator.name} removed the date."
-      when "card_title_changed"
-        "#{event.creator.name} changed title from '#{event.particulars.dig('particulars', 'old_title')}' to '#{event.particulars.dig('particulars', 'new_title')}'."
-      end
-    end
-end
diff --git a/app/models/message.rb b/app/models/message.rb
deleted file mode 100644
index 7d950b3b7..000000000
--- a/app/models/message.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Message < ApplicationRecord
-  belongs_to :card, touch: true
-
-  delegated_type :messageable, types: Messageable::TYPES, inverse_of: :message, dependent: :destroy
-
-  scope :chronologically, -> { order created_at: :asc, id: :desc }
-end
diff --git a/app/views/cards/_messages.html.erb b/app/views/cards/_messages.html.erb
index fa554e2fb..0b68c6d55 100644
--- a/app/views/cards/_messages.html.erb
+++ b/app/views/cards/_messages.html.erb
@@ -1,5 +1,5 @@
 <%= messages_tag(card) do %>
-  <%= render partial: "cards/messages/message", collection: card.messages, cached: true %>
+  <%= render partial: "cards/comments/comment", collection: card.comments, cached: true %>
   <%= render "cards/comments/new", card: card %>
 
   <div class="comments__subscribers flex flex-column margin-block txt-align-start full-width">
diff --git a/app/views/cards/messages/_message.html.erb b/app/views/cards/messages/_message.html.erb
deleted file mode 100644
index 54fa127cc..000000000
--- a/app/views/cards/messages/_message.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% cache message do %>
-  <%# Template Dependency: cards/comments/comment %>
-  <%# Template Dependency: event_summaries/event_summary %>
-  <%= render partial: message.messageable.to_partial_path, object: message.messageable %>
-<% end %>
diff --git a/db/migrate/20250429162506_flatten_messages_and_comments.rb b/db/migrate/20250429162506_flatten_messages_and_comments.rb
new file mode 100644
index 000000000..0f2b0dcdf
--- /dev/null
+++ b/db/migrate/20250429162506_flatten_messages_and_comments.rb
@@ -0,0 +1,19 @@
+class FlattenMessagesAndComments < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :comments, :card, null: true, foreign_key: true
+
+    execute <<~SQL
+      UPDATE comments
+      SET card_id = (
+        SELECT messages.card_id
+        FROM messages
+        WHERE messages.messageable_type = 'Comment'
+          AND messages.messageable_id = comments.id
+        LIMIT 1
+      )   
+    SQL
+
+    change_column_null :comments, :card_id, false
+    drop_table :messages
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fcdb52c28..fd0b0d793 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_25_092727) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -160,9 +160,11 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_25_092727) do
   end
 
   create_table "comments", force: :cascade do |t|
+    t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.integer "creator_id", null: false
     t.datetime "updated_at", null: false
+    t.index ["card_id"], name: "index_comments_on_card_id"
   end
 
   create_table "creators_filters", id: false, force: :cascade do |t|
@@ -228,16 +230,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_25_092727) do
     t.index ["source_type", "source_id"], name: "index_mentions_on_source"
   end
 
-  create_table "messages", force: :cascade do |t|
-    t.integer "card_id", null: false
-    t.datetime "created_at", null: false
-    t.integer "messageable_id", null: false
-    t.string "messageable_type", null: false
-    t.datetime "updated_at", null: false
-    t.index ["card_id"], name: "index_messages_on_card_id"
-    t.index ["messageable_type", "messageable_id"], name: "index_messages_on_messageable", unique: true
-  end
-
   create_table "notifications", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.integer "creator_id"
@@ -294,6 +286,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_25_092727) do
     t.datetime "created_at", null: false
     t.string "title"
     t.datetime "updated_at", null: false
+    t.index ["title"], name: "index_tags_on_account_id_and_title", unique: true
   end
 
   create_table "users", force: :cascade do |t|
@@ -340,11 +333,11 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_25_092727) do
   add_foreign_key "closures", "cards"
   add_foreign_key "closures", "users"
   add_foreign_key "collections", "workflows"
+  add_foreign_key "comments", "cards"
   add_foreign_key "events", "collections"
   add_foreign_key "events", "event_summaries", column: "summary_id"
   add_foreign_key "mentions", "users", column: "mentionee_id"
   add_foreign_key "mentions", "users", column: "mentioner_id"
-  add_foreign_key "messages", "cards"
   add_foreign_key "notifications", "users"
   add_foreign_key "notifications", "users", column: "creator_id"
   add_foreign_key "pins", "cards"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 3df7f5fe6..970285953 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -533,6 +533,7 @@ columns:
   - *22
   - *18
   comments:
+  - *21
   - *5
   - *23
   - *6
@@ -701,31 +702,6 @@ columns:
     collation:
     comment:
   - *9
-  messages:
-  - *21
-  - *5
-  - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: messageable_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: messageable_type
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - *9
   notifications:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -967,7 +943,6 @@ primary_keys:
   filters_stages:
   filters_tags:
   mentions: id
-  messages: id
   notifications: id
   pins: id
   reactions: id
@@ -1005,7 +980,6 @@ data_sources:
   filters_stages: true
   filters_tags: true
   mentions: true
-  messages: true
   notifications: true
   pins: true
   reactions: true
@@ -1492,7 +1466,23 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  comments: []
+  comments:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: comments
+    name: index_comments_on_card_id
+    unique: false
+    columns:
+    - card_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   creators_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: creators_filters
@@ -1728,40 +1718,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  messages:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: messages
-    name: index_messages_on_card_id
-    unique: false
-    columns:
-    - card_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: messages
-    name: index_messages_on_messageable
-    unique: true
-    columns:
-    - messageable_type
-    - messageable_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   notifications:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
@@ -1967,7 +1923,23 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  tags: []
+  tags:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: tags
+    name: index_tags_on_account_id_and_title
+    unique: true
+    columns:
+    - title
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   users:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: users
@@ -2052,4 +2024,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250425092727
+version: 20250429162506
diff --git a/test/controllers/cards/comments_controller_test.rb b/test/controllers/cards/comments_controller_test.rb
index ab9c3822a..690cf0656 100644
--- a/test/controllers/cards/comments_controller_test.rb
+++ b/test/controllers/cards/comments_controller_test.rb
@@ -6,7 +6,7 @@ class Cards::CommentsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "create" do
-    assert_difference "cards(:logo).messages.comments.count", +1 do
+    assert_difference -> { cards(:logo).comments.count }, +1 do
       post card_comments_path(cards(:logo), params: { comment: { body: "Agreed." } })
     end
 
diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
index 0f17c9760..ede5f327e 100644
--- a/test/fixtures/comments.yml
+++ b/test/fixtures/comments.yml
@@ -1,10 +1,40 @@
+logo_1:
+  card: logo
+  creator: system
+  created_at: <%= 1.week.ago %>
+
 logo_agreement_jz:
+  card: logo
   creator: jz
   created_at: <%= 2.days.ago %>
 
+logo_3:
+  card: logo
+  creator: system
+  created_at: <%= 1.day.ago %>
+
 logo_agreement_kevin:
+  card: logo
   creator: kevin
   created_at: <%= 2.hours.ago %>
 
+logo_5:
+  card: logo
+  creator: system
+  created_at: <%= 1.hour.ago %>
+
+layout_1:
+  card: layout
+  creator: system
+
 layout_overflowing_david:
+  card: layout
   creator: david
+
+text_1:
+  card: text
+  creator: system
+
+shipping_1:
+  card: shipping
+  creator: system
diff --git a/test/fixtures/event_summaries.yml b/test/fixtures/event_summaries.yml
deleted file mode 100644
index dfe42afcb..000000000
--- a/test/fixtures/event_summaries.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-logo_initial_activity:
-  created_at: <%= 1.week.ago %>
-
-logo_second_activity:
-  created_at: <%= 1.day.ago %>
-
-logo_third_activity:
-  created_at: <%= 1.hour.ago %>
-
-layout_initial_activity:
-  created_at: <%= 1.week.ago %>
-
-text_initial_activity:
-  created_at: <%= 1.week.ago %>
-
-shipping_initial_activity:
-  created_at: <%= 1.week.ago %>
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
index 4bc273ca3..be738ef67 100644
--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -3,7 +3,6 @@ logo_published:
   collection: writebook
   eventable: logo (Card)
   action: card_published
-  summary: logo_initial_activity
   created_at: <%= 1.week.ago %>
 
 logo_assignment_jz:
@@ -11,7 +10,6 @@ logo_assignment_jz:
   collection: writebook
   eventable: logo (Card)
   action: card_assigned
-  summary: logo_initial_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
   created_at: <%= 1.week.ago + 1.hour %>
 
@@ -20,7 +18,6 @@ logo_assignment_km:
   collection: writebook
   eventable: logo (Card)
   action: card_assigned
-  summary: logo_second_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:kevin) ] }.to_json %>
   created_at: <%= 1.day.ago %>
 
@@ -29,7 +26,6 @@ layout_published:
   collection: writebook
   eventable: layout (Card)
   action: card_published
-  summary: layout_initial_activity
   created_at: <%= 1.week.ago %>
 
 layout_commented:
@@ -37,7 +33,6 @@ layout_commented:
   collection: writebook
   eventable: layout_overflowing_david (Comment)
   action: comment_created
-  summary: layout_initial_activity
   created_at: <%= 1.week.ago %>
 
 layout_assignment_jz:
@@ -45,7 +40,6 @@ layout_assignment_jz:
   collection: writebook
   eventable: layout (Card)
   action: card_assigned
-  summary: layout_initial_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
   created_at: <%= 1.hour.ago %>
 
@@ -54,7 +48,6 @@ text_published:
   collection: writebook
   eventable: text (Card)
   action: card_published
-  summary: text_initial_activity
   created_at: <%= 1.week.ago %>
 
 shipping_published:
@@ -62,7 +55,6 @@ shipping_published:
   collection: writebook
   eventable: shipping (Card)
   action: card_published
-  summary: shipping_initial_activity
   created_at: <%= 1.week.ago %>
 
 shipping_closed:
@@ -70,5 +62,4 @@ shipping_closed:
   collection: writebook
   eventable: shipping (Card)
   action: card_closed
-  summary: shipping_initial_activity
   created_at: <%= 2.days.ago %>
diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
deleted file mode 100644
index 443cc85a4..000000000
--- a/test/fixtures/messages.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-logo_1:
-  card: logo
-  messageable: logo_initial_activity (EventSummary)
-  created_at: <%= 1.week.ago %>
-
-logo_2:
-  card: logo
-  messageable: logo_agreement_jz (Comment)
-  created_at: <%= 2.days.ago %>
-
-logo_3:
-  card: logo
-  messageable: logo_second_activity (EventSummary)
-  created_at: <%= 1.day.ago %>
-
-logo_4:
-  card: logo
-  messageable: logo_agreement_kevin (Comment)
-  created_at: <%= 2.hours.ago %>
-
-logo_5:
-  card: logo
-  messageable: logo_third_activity (EventSummary)
-  created_at: <%= 1.hour.ago %>
-
-layout_1:
-  card: layout
-  messageable: layout_initial_activity (EventSummary)
-
-layout_2:
-  card: layout
-  messageable: layout_overflowing_david (Comment)
-
-text_1:
-  card: text
-  messageable: text_initial_activity (EventSummary)
-
-shipping_1:
-  card: shipping
-  messageable: shipping_initial_activity (EventSummary)
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 7bcf86de4..d12c1a4b3 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -17,3 +17,7 @@ kevin:
   email_address: kevin@37signals.com
   password_digest: <%= digest %>
   role: admin
+
+system:
+  name: System
+  role: system
diff --git a/test/models/card/commentable_test.rb b/test/models/card/commentable_test.rb
index 5af8d6f37..1f82f4ccc 100644
--- a/test/models/card/commentable_test.rb
+++ b/test/models/card/commentable_test.rb
@@ -6,7 +6,7 @@ class Card::CommentableTest < ActiveSupport::TestCase
     assert_not cards(:text).watched_by?(users(:kevin))
 
     with_current_user(:kevin) do
-      cards(:text).capture Comment.new(body: "This sounds interesting!")
+      cards(:text).comments.create!(body: "This sounds interesting!")
     end
 
     assert cards(:text).watched_by?(users(:kevin))
diff --git a/test/models/card/messages_test.rb b/test/models/card/messages_test.rb
index 31d730306..fc8bc3509 100644
--- a/test/models/card/messages_test.rb
+++ b/test/models/card/messages_test.rb
@@ -4,6 +4,6 @@ class Card::MessagesTest < ActiveSupport::TestCase
   test "creating a card does not create a message by default" do
     card = collections(:writebook).cards.create! creator: users(:kevin), title: "New"
 
-    assert_empty card.messages
+    assert_empty card.comments
   end
 end
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
index 39add0d99..dac35aa3d 100644
--- a/test/models/card_test.rb
+++ b/test/models/card_test.rb
@@ -6,11 +6,11 @@ class CardTest < ActiveSupport::TestCase
   end
 
   test "capturing messages" do
-    assert_difference "cards(:logo).messages.comments.count", +1 do
-      cards(:logo).capture Comment.new(body: "Agreed.")
+    assert_difference -> { cards(:logo).comments.count }, +1 do
+      cards(:logo).comments.create!(body: "Agreed.")
     end
 
-    assert_equal "Agreed.", cards(:logo).messages.comments.last.messageable.body.to_plain_text.chomp
+    assert_equal "Agreed.", cards(:logo).comments.last.body.to_plain_text.chomp
   end
 
   test "assignment states" do
@@ -21,7 +21,7 @@ class CardTest < ActiveSupport::TestCase
   test "assignment toggling" do
     assert cards(:logo).assigned_to?(users(:kevin))
 
-    assert_difference({ "cards(:logo).assignees.count" => -1, "Event.count" => +1 }) do
+    assert_difference({ -> { cards(:logo).assignees.count } => -1, -> { Event.count } => +1 }) do
       cards(:logo).toggle_assignment users(:kevin)
     end
     assert_not cards(:logo).assigned_to?(users(:kevin))
@@ -98,8 +98,8 @@ class CardTest < ActiveSupport::TestCase
 
   test "mentioning" do
     card = collections(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin)
-    cards(:logo).capture Comment.new(body: "I hate haggis")
-    cards(:text).capture Comment.new(body: "I love haggis")
+    cards(:logo).comments.create!(body: "I hate haggis")
+    cards(:text).comments.create!(body: "I love haggis")
 
     assert_equal [ card, cards(:logo), cards(:text) ].sort, Card.mentioning("haggis").sort
   end
diff --git a/test/models/comment_test.rb b/test/models/comment_test.rb
index ae7b505a2..7af13ed36 100644
--- a/test/models/comment_test.rb
+++ b/test/models/comment_test.rb
@@ -6,8 +6,8 @@ class CommentTest < ActiveSupport::TestCase
   end
 
   test "searchable by body" do
-    message = cards(:logo).capture Comment.new(body: "I'd prefer something more rustic")
+    comment = cards(:logo).comments.create!(body: "I'd prefer something more rustic")
 
-    assert_includes Comment.search("something rustic"), message.comment
+    assert_includes Comment.search("something rustic"), comment
   end
 end
diff --git a/test/models/event_summary_test.rb b/test/models/event_summary_test.rb
deleted file mode 100644
index 84ba368ef..000000000
--- a/test/models/event_summary_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "test_helper"
-
-class EventSummaryTest < ActiveSupport::TestCase
-  test "body" do
-    assert_equal " Assigned to JZ.", event_summaries(:logo_initial_activity).body
-    assert_equal "Assigned to Kevin.", event_summaries(:logo_second_activity).body
-  end
-end
diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb
index bdbc919ab..3605c28a1 100644
--- a/test/models/filter_test.rb
+++ b/test/models/filter_test.rb
@@ -7,8 +7,8 @@ class FilterTest < ActiveSupport::TestCase
       @new_card = @new_collection.cards.create!
       @new_card.update!(stage: workflow_stages(:qa_on_hold))
 
-      cards(:layout).capture Comment.new(body: "I hate haggis")
-      cards(:logo).capture Comment.new(body: "I love haggis")
+      cards(:layout).comments.create!(body: "I hate haggis")
+      cards(:logo).comments.create!(body: "I love haggis")
       cards(:logo).update(stage: workflow_stages(:qa_on_hold))
     end
 

From e03f1f7f9b56aedcea0e56f8f53ce9efc2e39b99 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 29 Apr 2025 19:23:56 +0200
Subject: [PATCH 387/413] Rename test that was being skipped

---
 test/integration/card_messages.rb      | 29 --------------------------
 test/integration/card_messages_test.rb | 29 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 test/integration/card_messages.rb
 create mode 100644 test/integration/card_messages_test.rb

diff --git a/test/integration/card_messages.rb b/test/integration/card_messages.rb
deleted file mode 100644
index 257619ede..000000000
--- a/test/integration/card_messages.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require "test_helper"
-
-class CardMessagesTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "messages system" do
-    # Create a card
-    post collection_cards_path(collections(:writebook))
-    card = Card.last
-    assert_equal 1, card.messages.count
-    assert_predicate card.messages.last, :event_summary?
-    assert_equal "created", card.messages.last.messageable.events.sole.action
-
-    # Comment on it
-    post collection_card_comments_path(collections(:writebook), card), params: { comment: { body: "Agreed." } }
-    assert_equal 2, card.messages.count
-    assert_predicate card.messages.last, :comment?
-    assert_equal "Agreed.", card.messages.last.messageable.body
-
-    # Assign it
-    post collection_card_assignments_path(collections(:writebook), card), params: { assignee_id: users(:kevin).id }
-    assert_equal 3, card.messages.count
-    assert_predicate card.messages.last, :event_summary?
-    assert_equal 1, card.messages.last.event_summary.events.count
-    assert_equal "card_assigned", card.messages.last.messageable.events.last.action
-  end
-end
diff --git a/test/integration/card_messages_test.rb b/test/integration/card_messages_test.rb
new file mode 100644
index 000000000..3945f1841
--- /dev/null
+++ b/test/integration/card_messages_test.rb
@@ -0,0 +1,29 @@
+require "test_helper"
+
+class CardMessagesTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "messages system" do
+    # Create a card
+    post collection_cards_path(collections(:writebook))
+    card = Card.last
+    assert_equal 1, card.comments.count
+    assert_predicate card.comments.last, :event_summary?
+    assert_equal "created", card.comments.last.events.sole.action
+
+    # Comment on it
+    post collection_card_comments_path(collections(:writebook), card), params: { comment: { body: "Agreed." } }
+    assert_equal 2, card.comments.count
+    assert_predicate card.comments.last, :comment?
+    assert_equal "Agreed.", card.comments.last.body
+
+    # Assign it
+    post collection_card_assignments_path(collections(:writebook), card), params: { assignee_id: users(:kevin).id }
+    assert_equal 3, card.comments.count
+    assert_predicate card.comments.last, :event_summary?
+    assert_equal 1, card.comments.last.event_summary.events.count
+    assert_equal "card_assigned", card.comments.last.events.last.action
+  end
+end

From 4ff55df2e0a4e7d7d8a490c082cb4c81d53dcdaf Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 29 Apr 2025 20:30:05 +0200
Subject: [PATCH 388/413] Create system comments on events

---
 app/helpers/comments_helper.rb                |  2 +-
 app/models/card/eventable.rb                  |  6 +-
 app/models/card/eventable/system_commenter.rb | 63 +++++++++++++++++++
 app/models/comment/eventable.rb               |  4 ++
 app/views/cards/_comments.html.erb            |  4 +-
 test/models/card/closeable_test.rb            |  4 ++
 6 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 app/models/card/eventable/system_commenter.rb

diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 122e8d551..cda77af9c 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -1,6 +1,6 @@
 module CommentsHelper
   def new_comment_placeholder(card)
-    if card.creator == Current.user && card.messages.comments.empty?
+    if card.creator == Current.user && card.comments.empty?
       "Next, add some notes, context, pictures, or video about this…"
     else
       "Type your comment…"
diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 5fd0759fb..ec5059eaa 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -12,7 +12,7 @@ module Card::Eventable
 
   def event_was_created(event)
     transaction do
-      # find_or_capture_event_summary.events << event
+      create_system_comment_for(event)
       touch(:last_active_at)
     end
   end
@@ -43,4 +43,8 @@ module Card::Eventable
         track_event "card_title_changed", particulars: { old_title: title_before_last_save, new_title: title }
       end
     end
+
+    def create_system_comment_for(event)
+      SystemCommenter.new(self, event).comment
+    end
 end
diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb
new file mode 100644
index 000000000..6eec7089f
--- /dev/null
+++ b/app/models/card/eventable/system_commenter.rb
@@ -0,0 +1,63 @@
+class Card::Eventable::SystemCommenter
+  attr_reader :card, :event
+
+  def initialize(card, event)
+    @card, @event = card, event
+  end
+
+  def comment
+    return unless comment_body.present?
+
+    if comment = find_replaceable_system_comment
+      comment.update! body: comment_body
+    else
+      card.comments.create! creator: User.system, body: comment_body
+    end
+  end
+
+  private
+    REPLACEABLE_EVENTS = [
+      %w(card_assigned card_unassigned),
+      %w(card_staged card_unstaged),
+      %w(card_due_date_added card_due_date_changed card_due_date_removed)
+    ]
+
+    def comment_body
+      case event.action
+        when "card_assigned"
+          "Assigned to #{card.assignees.pluck(:name).to_sentence}."
+        when "card_unassigned"
+          if card.assignees.empty?
+            "Unassigned from #{event.assignees.pluck(:name).to_sentence}."
+          else
+            "Assigned to #{card.assignees.pluck(:name).to_sentence}."
+          end
+        when "card_staged"
+          "#{event.creator.name} moved this to '#{event.stage_name}'."
+        when "card_closed"
+          "Closed by #{ event.creator.name }"
+        when "card_unstaged"
+          "#{event.creator.name} removed this from '#{event.stage_name}'."
+        when "card_due_date_added"
+          "#{event.creator.name} set due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
+        when "card_due_date_changed"
+          "#{event.creator.name} changed due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
+        when "card_due_date_removed"
+          "#{event.creator.name} removed the date."
+        when "card_title_changed"
+          "#{event.creator.name} changed title from '#{event.particulars.dig('particulars', 'old_title')}' to '#{event.particulars.dig('particulars', 'new_title')}'."
+      end
+    end
+
+    def find_replaceable_system_comment
+      previous_comment, previous_event = card.comments.last, card.events[-2]
+      if previous_comment&.creator&.system? && replaceable_event?(previous_event, event)
+        previous_comment
+      end
+    end
+
+    def replaceable_event?(candidate_event, replacement_event)
+      candidate_event && replacement_event &&
+        (candidate_event.action == replacement_event.action || REPLACEABLE_EVENTS.find { |related_actions| related_actions.include?(candidate_event.action) && related_actions.include?(replacement_event.action) })
+    end
+end
diff --git a/app/models/comment/eventable.rb b/app/models/comment/eventable.rb
index 4e90777e0..f3a108505 100644
--- a/app/models/comment/eventable.rb
+++ b/app/models/comment/eventable.rb
@@ -12,6 +12,10 @@ module Comment::Eventable
   end
 
   private
+    def should_track_event?
+      !creator.system?
+    end
+
     def track_creation
       track_event("created", collection: card.collection)
     end
diff --git a/app/views/cards/_comments.html.erb b/app/views/cards/_comments.html.erb
index fd4829974..7fc6a977a 100644
--- a/app/views/cards/_comments.html.erb
+++ b/app/views/cards/_comments.html.erb
@@ -1,6 +1,6 @@
 <% if card.messages.comments.any? %>
   <div class="card__detail card__comments">
-    <span aria-hidden="true"><%= card.messages.comments.count %></span>
-    <span class="for-screen-reader"><%= pluralize(card.messages.comments.count, "comment") %></span>
+    <span aria-hidden="true"><%= card.comments.count %></span>
+    <span class="for-screen-reader"><%= pluralize(card.comments.count, "comment") %></span>
   </div>
 <% end %>
diff --git a/test/models/card/closeable_test.rb b/test/models/card/closeable_test.rb
index 008058866..7f8b4f209 100644
--- a/test/models/card/closeable_test.rb
+++ b/test/models/card/closeable_test.rb
@@ -1,6 +1,10 @@
 require "test_helper"
 
 class Card::CloseableTest < ActiveSupport::TestCase
+  setup do
+    Current.session = sessions(:david)
+  end
+
   test "closed scope" do
     assert_equal [ cards(:shipping) ], Card.closed
     assert_not_includes Card.open, cards(:shipping)

From 9edffe217069fd90067b707bf2295af132047a65 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 29 Apr 2025 20:36:49 +0200
Subject: [PATCH 389/413] Format

---
 app/models/card/eventable/system_commenter.rb | 48 +++++++++----------
 ...429162506_flatten_messages_and_comments.rb |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb
index 6eec7089f..5fb6739fd 100644
--- a/app/models/card/eventable/system_commenter.rb
+++ b/app/models/card/eventable/system_commenter.rb
@@ -17,35 +17,35 @@ class Card::Eventable::SystemCommenter
 
   private
     REPLACEABLE_EVENTS = [
-      %w(card_assigned card_unassigned),
-      %w(card_staged card_unstaged),
-      %w(card_due_date_added card_due_date_changed card_due_date_removed)
+      %w[card_assigned card_unassigned],
+      %w[card_staged card_unstaged],
+      %w[card_due_date_added card_due_date_changed card_due_date_removed]
     ]
 
     def comment_body
       case event.action
-        when "card_assigned"
+      when "card_assigned"
+        "Assigned to #{card.assignees.pluck(:name).to_sentence}."
+      when "card_unassigned"
+        if card.assignees.empty?
+          "Unassigned from #{event.assignees.pluck(:name).to_sentence}."
+        else
           "Assigned to #{card.assignees.pluck(:name).to_sentence}."
-        when "card_unassigned"
-          if card.assignees.empty?
-            "Unassigned from #{event.assignees.pluck(:name).to_sentence}."
-          else
-            "Assigned to #{card.assignees.pluck(:name).to_sentence}."
-          end
-        when "card_staged"
-          "#{event.creator.name} moved this to '#{event.stage_name}'."
-        when "card_closed"
-          "Closed by #{ event.creator.name }"
-        when "card_unstaged"
-          "#{event.creator.name} removed this from '#{event.stage_name}'."
-        when "card_due_date_added"
-          "#{event.creator.name} set due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
-        when "card_due_date_changed"
-          "#{event.creator.name} changed due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
-        when "card_due_date_removed"
-          "#{event.creator.name} removed the date."
-        when "card_title_changed"
-          "#{event.creator.name} changed title from '#{event.particulars.dig('particulars', 'old_title')}' to '#{event.particulars.dig('particulars', 'new_title')}'."
+        end
+      when "card_staged"
+        "#{event.creator.name} moved this to '#{event.stage_name}'."
+      when "card_closed"
+        "Closed by #{ event.creator.name }"
+      when "card_unstaged"
+        "#{event.creator.name} removed this from '#{event.stage_name}'."
+      when "card_due_date_added"
+        "#{event.creator.name} set due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
+      when "card_due_date_changed"
+        "#{event.creator.name} changed due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
+      when "card_due_date_removed"
+        "#{event.creator.name} removed the date."
+      when "card_title_changed"
+        "#{event.creator.name} changed title from '#{event.particulars.dig('particulars', 'old_title')}' to '#{event.particulars.dig('particulars', 'new_title')}'."
       end
     end
 
diff --git a/db/migrate/20250429162506_flatten_messages_and_comments.rb b/db/migrate/20250429162506_flatten_messages_and_comments.rb
index 0f2b0dcdf..5c998fb02 100644
--- a/db/migrate/20250429162506_flatten_messages_and_comments.rb
+++ b/db/migrate/20250429162506_flatten_messages_and_comments.rb
@@ -10,7 +10,7 @@ class FlattenMessagesAndComments < ActiveRecord::Migration[8.1]
         WHERE messages.messageable_type = 'Comment'
           AND messages.messageable_id = comments.id
         LIMIT 1
-      )   
+      )
     SQL
 
     change_column_null :comments, :card_id, false

From c7893aa24d8e6dc6e976a5af00bb8e25fa2a38db Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 08:24:22 +0200
Subject: [PATCH 390/413] Remove default chronological order

---
 app/models/card.rb                 | 2 +-
 app/views/cards/_messages.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index ed97a9e53..00a6312a2 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -6,7 +6,7 @@ class Card < ApplicationRecord
   belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
-  has_many :comments, -> { chronologically }, dependent: :destroy
+  has_many :comments, dependent: :destroy
   has_one_attached :image, dependent: :purge_later
 
   has_markdown :description
diff --git a/app/views/cards/_messages.html.erb b/app/views/cards/_messages.html.erb
index 0b68c6d55..7fd12e1c2 100644
--- a/app/views/cards/_messages.html.erb
+++ b/app/views/cards/_messages.html.erb
@@ -1,5 +1,5 @@
 <%= messages_tag(card) do %>
-  <%= render partial: "cards/comments/comment", collection: card.comments, cached: true %>
+  <%= render partial: "cards/comments/comment", collection: card.comments.chronologically, cached: true %>
   <%= render "cards/comments/new", card: card %>
 
   <div class="comments__subscribers flex flex-column margin-block txt-align-start full-width">

From 6f06fb22770a1f2b3fe58d98a801ce33853a8d15 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 08:25:06 +0200
Subject: [PATCH 391/413] Format

---
 app/models/card/eventable/system_commenter.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb
index 5fb6739fd..75842756c 100644
--- a/app/models/card/eventable/system_commenter.rb
+++ b/app/models/card/eventable/system_commenter.rb
@@ -17,9 +17,9 @@ class Card::Eventable::SystemCommenter
 
   private
     REPLACEABLE_EVENTS = [
-      %w[card_assigned card_unassigned],
-      %w[card_staged card_unstaged],
-      %w[card_due_date_added card_due_date_changed card_due_date_removed]
+      %w[ card_assigned card_unassigned ],
+      %w[ card_staged card_unstaged ],
+      %w[ card_due_date_added card_due_date_changed card_due_date_removed ]
     ]
 
     def comment_body

From b6c3e5c0902b01739a8f1104198fe922427e81f3 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 09:39:16 +0200
Subject: [PATCH 392/413] Add tests and clean unused events

---
 app/models/card/eventable.rb                  | 15 +---
 app/models/card/eventable/system_commenter.rb | 13 +---
 test/integration/card_messages_test.rb        | 29 --------
 .../card/eventable/system_commenter_test.rb   | 68 +++++++++++++++++++
 4 files changed, 70 insertions(+), 55 deletions(-)
 delete mode 100644 test/integration/card_messages_test.rb
 create mode 100644 test/models/card/eventable/system_commenter_test.rb

diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index ec5059eaa..030aad9e0 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -6,7 +6,6 @@ module Card::Eventable
   included do
     before_create { self.last_active_at = Time.current }
 
-    after_save :track_due_date_change, if: :saved_change_to_due_on?
     after_save :track_title_change, if: :saved_change_to_title?
   end
 
@@ -26,21 +25,9 @@ module Card::Eventable
       messages.last&.event_summary || capture(EventSummary.new).event_summary
     end
 
-    def track_due_date_change
-      if due_on.present?
-        if due_on_before_last_save.nil?
-          track_event("card_due_date_added", particulars: { due_date: due_on })
-        else
-          track_event("card_due_date_changed", particulars: { due_date: due_on })
-        end
-      elsif due_on_before_last_save.present?
-        track_event("card_due_date_removed")
-      end
-    end
-
     def track_title_change
       if title_before_last_save.present?
-        track_event "card_title_changed", particulars: { old_title: title_before_last_save, new_title: title }
+        track_event "title_changed", particulars: { old_title: title_before_last_save, new_title: title }
       end
     end
 
diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb
index 75842756c..cfe5a2c83 100644
--- a/app/models/card/eventable/system_commenter.rb
+++ b/app/models/card/eventable/system_commenter.rb
@@ -7,7 +7,6 @@ class Card::Eventable::SystemCommenter
 
   def comment
     return unless comment_body.present?
-
     if comment = find_replaceable_system_comment
       comment.update! body: comment_body
     else
@@ -17,9 +16,7 @@ class Card::Eventable::SystemCommenter
 
   private
     REPLACEABLE_EVENTS = [
-      %w[ card_assigned card_unassigned ],
-      %w[ card_staged card_unstaged ],
-      %w[ card_due_date_added card_due_date_changed card_due_date_removed ]
+      %w[ card_assigned card_unassigned ]
     ]
 
     def comment_body
@@ -36,14 +33,6 @@ class Card::Eventable::SystemCommenter
         "#{event.creator.name} moved this to '#{event.stage_name}'."
       when "card_closed"
         "Closed by #{ event.creator.name }"
-      when "card_unstaged"
-        "#{event.creator.name} removed this from '#{event.stage_name}'."
-      when "card_due_date_added"
-        "#{event.creator.name} set due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
-      when "card_due_date_changed"
-        "#{event.creator.name} changed due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
-      when "card_due_date_removed"
-        "#{event.creator.name} removed the date."
       when "card_title_changed"
         "#{event.creator.name} changed title from '#{event.particulars.dig('particulars', 'old_title')}' to '#{event.particulars.dig('particulars', 'new_title')}'."
       end
diff --git a/test/integration/card_messages_test.rb b/test/integration/card_messages_test.rb
deleted file mode 100644
index 3945f1841..000000000
--- a/test/integration/card_messages_test.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require "test_helper"
-
-class CardMessagesTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "messages system" do
-    # Create a card
-    post collection_cards_path(collections(:writebook))
-    card = Card.last
-    assert_equal 1, card.comments.count
-    assert_predicate card.comments.last, :event_summary?
-    assert_equal "created", card.comments.last.events.sole.action
-
-    # Comment on it
-    post collection_card_comments_path(collections(:writebook), card), params: { comment: { body: "Agreed." } }
-    assert_equal 2, card.comments.count
-    assert_predicate card.comments.last, :comment?
-    assert_equal "Agreed.", card.comments.last.body
-
-    # Assign it
-    post collection_card_assignments_path(collections(:writebook), card), params: { assignee_id: users(:kevin).id }
-    assert_equal 3, card.comments.count
-    assert_predicate card.comments.last, :event_summary?
-    assert_equal 1, card.comments.last.event_summary.events.count
-    assert_equal "card_assigned", card.comments.last.events.last.action
-  end
-end
diff --git a/test/models/card/eventable/system_commenter_test.rb b/test/models/card/eventable/system_commenter_test.rb
new file mode 100644
index 000000000..23366097c
--- /dev/null
+++ b/test/models/card/eventable/system_commenter_test.rb
@@ -0,0 +1,68 @@
+require "test_helper"
+
+class Card::Eventable::SystemCommenterTest < ActiveSupport::TestCase
+  setup do
+    Current.session = sessions(:david)
+    @card = cards(:text)
+  end
+
+  test "card_assigned" do
+    assert_system_comment "Assigned to Kevin" do
+      @card.toggle_assignment users(:kevin)
+    end
+  end
+
+  test "card_unassigned" do
+    @card.toggle_assignment users(:kevin)
+    @card.comments.destroy_all # To skip deduplication logic
+
+    assert_system_comment "Unassigned from Kevin" do
+      @card.toggle_assignment users(:kevin)
+    end
+  end
+
+  test "card_staged" do
+    assert_system_comment "David moved this to 'In progress'" do
+      @card.change_stage_to workflow_stages(:qa_in_progress)
+    end
+  end
+
+  test "card_closed" do
+    assert_system_comment "Closed by David" do
+      @card.close
+    end
+  end
+
+  test "card_title_changed" do
+    assert_system_comment "David changed title from 'The text is too small' to 'Make text larger'" do
+      @card.update! title: "Make text larger"
+    end
+  end
+
+  test "don't duplicate comments for the same kind of events" do
+    @card.change_stage_to workflow_stages(:qa_in_progress)
+
+    assert_no_difference -> { @card.comments.count } do
+      @card.reload.change_stage_to workflow_stages(:qa_on_hold)
+      assert_match /David moved this to 'On hold'/i, @card.comments.last.body.to_plain_text
+    end
+  end
+
+  test "don't duplicate comments for related events" do
+    @card.toggle_assignment users(:kevin)
+
+    assert_no_difference -> { @card.comments.count } do
+      @card.reload.toggle_assignment users(:kevin)
+      assert_match /Unassigned from Kevin/i, @card.comments.last.body.to_plain_text
+    end
+  end
+
+  private
+    def assert_system_comment(expected_comment)
+      assert_difference -> { @card.comments.count }, 1 do
+        yield
+        assert @card.comments.last.creator.system?
+        assert_match Regexp.new(expected_comment.strip, Regexp::IGNORECASE), @card.comments.last.body.to_plain_text.strip
+      end
+    end
+end

From e1347bec3f2502408baf29aef942f7714e7a0484 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 09:47:05 +0200
Subject: [PATCH 393/413] Extract method

---
 app/models/card/eventable/system_commenter.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb
index cfe5a2c83..6e5d0ca2f 100644
--- a/app/models/card/eventable/system_commenter.rb
+++ b/app/models/card/eventable/system_commenter.rb
@@ -15,7 +15,7 @@ class Card::Eventable::SystemCommenter
   end
 
   private
-    REPLACEABLE_EVENTS = [
+    RELATED_EVENTS = [
       %w[ card_assigned card_unassigned ]
     ]
 
@@ -47,6 +47,10 @@ class Card::Eventable::SystemCommenter
 
     def replaceable_event?(candidate_event, replacement_event)
       candidate_event && replacement_event &&
-        (candidate_event.action == replacement_event.action || REPLACEABLE_EVENTS.find { |related_actions| related_actions.include?(candidate_event.action) && related_actions.include?(replacement_event.action) })
+        (candidate_event.action == replacement_event.action || related_events?(candidate_event, replacement_event))
+    end
+
+    def related_events?(candidate_event, replacement_event)
+      RELATED_EVENTS.find { |related_actions| related_actions.include?(candidate_event.action) && related_actions.include?(replacement_event.action) }
     end
 end

From efac1752517d163164494eeed0e39dab2fb0dff5 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 09:51:17 +0200
Subject: [PATCH 394/413] Incorrect event action

---
 app/helpers/events_helper.rb | 4 ++--
 app/models/card/eventable.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index b00408cc3..1509849a0 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -86,7 +86,7 @@ module EventsHelper
       "#{event_creator_name(event)} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ title }</span>".html_safe
     when "card_due_date_removed"
       "#{event_creator_name(event)} removed the date on <span style='color: var(--card-color)'>#{ title }</span>"
-    when "card_title_changed"
+    when "card_card_title_changed"
       "#{event_creator_name(event)} renamed <span style='color: var(--card-color)'>#{ title }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
     end
   end
@@ -101,7 +101,7 @@ module EventsHelper
       "bolt"
     when "comment_created"
       "comment"
-    when "card_title_changed"
+    when "card_card_title_changed"
       "rename"
     else
       "person"
diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 67c8fcff9..43f55f46b 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -40,7 +40,7 @@ module Card::Eventable
 
     def track_title_change
       if title_before_last_save.present?
-        track_event "card_title_changed", particulars: { old_title: title_before_last_save, new_title: title }
+        track_event "card_card_title_changed", particulars: { old_title: title_before_last_save, new_title: title }
       end
     end
 end

From f01155b79dfb7cac5828dde24ae3d742a3f5dfec Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 09:52:23 +0200
Subject: [PATCH 395/413] Missed one

---
 app/models/event_summary.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/event_summary.rb b/app/models/event_summary.rb
index f04841e66..8bd4a64df 100644
--- a/app/models/event_summary.rb
+++ b/app/models/event_summary.rb
@@ -29,7 +29,7 @@ class EventSummary < ApplicationRecord
         "#{event.creator.name} changed due date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')}."
       when "card_due_date_removed"
         "#{event.creator.name} removed the date."
-      when "card_title_changed"
+      when "card_card_title_changed"
         "#{event.creator.name} changed title from '#{event.particulars.dig('particulars', 'old_title')}' to '#{event.particulars.dig('particulars', 'new_title')}'."
       end
     end

From 174bb21b8a4768f68c8581be1fd5aa092a74e918 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 09:55:29 +0200
Subject: [PATCH 396/413] Drop event summaries too

We'll regenerate with a script
---
 app/models/card/eventable/system_commenter.rb |  2 +-
 ...429162506_flatten_messages_and_comments.rb |  1 +
 db/schema.rb                                  |  6 -----
 db/schema_cache.yml                           | 25 +------------------
 4 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb
index 6e5d0ca2f..6d9155f15 100644
--- a/app/models/card/eventable/system_commenter.rb
+++ b/app/models/card/eventable/system_commenter.rb
@@ -10,7 +10,7 @@ class Card::Eventable::SystemCommenter
     if comment = find_replaceable_system_comment
       comment.update! body: comment_body
     else
-      card.comments.create! creator: User.system, body: comment_body
+      card.comments.create! creator: User.system, body: comment_body, created_at: event.created_at
     end
   end
 
diff --git a/db/migrate/20250429162506_flatten_messages_and_comments.rb b/db/migrate/20250429162506_flatten_messages_and_comments.rb
index 5c998fb02..f2a777ae8 100644
--- a/db/migrate/20250429162506_flatten_messages_and_comments.rb
+++ b/db/migrate/20250429162506_flatten_messages_and_comments.rb
@@ -15,5 +15,6 @@ class FlattenMessagesAndComments < ActiveRecord::Migration[8.1]
 
     change_column_null :comments, :card_id, false
     drop_table :messages
+    drop_table :event_summaries
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index fd0b0d793..e12769463 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -174,11 +174,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do
     t.index ["filter_id"], name: "index_creators_filters_on_filter_id"
   end
 
-  create_table "event_summaries", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "events", force: :cascade do |t|
     t.string "action", null: false
     t.integer "collection_id", null: false
@@ -286,7 +281,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do
     t.datetime "created_at", null: false
     t.string "title"
     t.datetime "updated_at", null: false
-    t.index ["title"], name: "index_tags_on_account_id_and_title", unique: true
   end
 
   create_table "users", force: :cascade do |t|
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 970285953..ce6fc968a 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -541,10 +541,6 @@ columns:
   creators_filters:
   - *23
   - *18
-  event_summaries:
-  - *5
-  - *6
-  - *9
   events:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
@@ -937,7 +933,6 @@ primary_keys:
   collections_filters:
   comments: id
   creators_filters:
-  event_summaries: id
   events: id
   filters: id
   filters_stages:
@@ -974,7 +969,6 @@ data_sources:
   collections_filters: true
   comments: true
   creators_filters: true
-  event_summaries: true
   events: true
   filters: true
   filters_stages: true
@@ -1516,7 +1510,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  event_summaries: []
   events:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: events
@@ -1923,23 +1916,7 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  tags:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: tags
-    name: index_tags_on_account_id_and_title
-    unique: true
-    columns:
-    - title
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
+  tags: []
   users:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: users

From d3ba47c2fab36eb3fc0599ab66c0da801dfbcee7 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 09:56:13 +0200
Subject: [PATCH 397/413] Sort alphabetically

---
 app/views/events/_filter.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 80c6ab48d..d4b0fad0e 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -27,7 +27,7 @@
 					data: { controller: "form" } do |form| %>
 			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
 			<menu data-filter-target="list" contents>
-				<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
+				<%= render partial: "events/filter/collection_option", collection: Current.user.collections.alphabetically, as: :collection, locals: { form: form, filter: filter } %>
 			</menu>
 		<% end %>
 

From e7400fe129547de2ac4654abea83a27ef0d2ac2d Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 09:57:00 +0200
Subject: [PATCH 398/413] Script to re-create system comments

---
 script/generate_comments_from_events.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100755 script/generate_comments_from_events.rb

diff --git a/script/generate_comments_from_events.rb b/script/generate_comments_from_events.rb
new file mode 100755
index 000000000..5081fdf19
--- /dev/null
+++ b/script/generate_comments_from_events.rb
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require_relative "../config/environment"
+
+ApplicationRecord.with_each_tenant do |tenant|
+  Card.find_each do |card|
+    card.events.find_each do |event|
+      Card::Eventable::SystemCommenter.new(card, event).comment
+    end
+  end
+end

From dabec3e1241d0b56791cb2dff1c650ba6a36e96e Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 10:09:31 +0200
Subject: [PATCH 399/413] More verbose time stamps

---
 app/views/cards/comments/_comment.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
index 7b30887d2..695b8588a 100644
--- a/app/views/cards/comments/_comment.html.erb
+++ b/app/views/cards/comments/_comment.html.erb
@@ -11,8 +11,9 @@
             <%= link_to comment.creator.name, comment.creator, class: "txt-ink btn btn--plain fill-transparent", data: { turbo_frame: "_top" } %>
           </strong>
 
-          <%= link_to comment, class: "txt-undecorated txt-uppercase" do %>
-            <%= local_datetime_tag comment.created_at, style: :shortdate, class: "txt-ink translucent" %>
+          <%= link_to comment, class: "txt-undecorated txt-ink translucent txt-normal txt-capitalize" do %>
+            <%= local_datetime_tag comment.created_at, style: :agoorweekday %>, 
+            <%= local_datetime_tag comment.created_at, style: :time %>
           <% end %>
 
           <%= link_to edit_card_comment_path(comment.card, comment),

From 2d2cd702caa7b7b1be76b9a8f57cc3d181a1762c Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 10:18:02 +0200
Subject: [PATCH 400/413] Remove summary id column too

---
 ...429162506_flatten_messages_and_comments.rb |  1 +
 db/schema.rb                                  |  5 ++--
 db/schema_cache.yml                           | 29 +++++++++++--------
 script/generate_comments_from_events.rb       |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/db/migrate/20250429162506_flatten_messages_and_comments.rb b/db/migrate/20250429162506_flatten_messages_and_comments.rb
index f2a777ae8..090a0201e 100644
--- a/db/migrate/20250429162506_flatten_messages_and_comments.rb
+++ b/db/migrate/20250429162506_flatten_messages_and_comments.rb
@@ -13,6 +13,7 @@ class FlattenMessagesAndComments < ActiveRecord::Migration[8.1]
       )
     SQL
 
+    remove_column :events, :summary_id
     change_column_null :comments, :card_id, false
     drop_table :messages
     drop_table :event_summaries
diff --git a/db/schema.rb b/db/schema.rb
index e12769463..fd3176781 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -182,12 +182,11 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do
     t.integer "eventable_id", null: false
     t.string "eventable_type", null: false
     t.json "particulars", default: {}
-    t.integer "summary_id"
     t.datetime "updated_at", null: false
+    t.index ["action"], name: "index_events_on_summary_id_and_action"
     t.index ["collection_id"], name: "index_events_on_collection_id"
     t.index ["creator_id"], name: "index_events_on_creator_id"
     t.index ["eventable_type", "eventable_id"], name: "index_events_on_eventable"
-    t.index ["summary_id", "action"], name: "index_events_on_summary_id_and_action"
   end
 
   create_table "filters", force: :cascade do |t|
@@ -281,6 +280,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do
     t.datetime "created_at", null: false
     t.string "title"
     t.datetime "updated_at", null: false
+    t.index ["title"], name: "index_tags_on_account_id_and_title", unique: true
   end
 
   create_table "users", force: :cascade do |t|
@@ -329,7 +329,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do
   add_foreign_key "collections", "workflows"
   add_foreign_key "comments", "cards"
   add_foreign_key "events", "collections"
-  add_foreign_key "events", "event_summaries", column: "summary_id"
   add_foreign_key "mentions", "users", column: "mentionee_id"
   add_foreign_key "mentions", "users", column: "mentioner_id"
   add_foreign_key "notifications", "users"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index ce6fc968a..c196953f7 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -594,16 +594,6 @@ columns:
     default_function:
     collation:
     comment:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: summary_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   - *9
   filters:
   - *5
@@ -1565,7 +1555,6 @@ indexes:
     name: index_events_on_summary_id_and_action
     unique: false
     columns:
-    - summary_id
     - action
     lengths: {}
     orders: {}
@@ -1916,7 +1905,23 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  tags: []
+  tags:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: tags
+    name: index_tags_on_account_id_and_title
+    unique: true
+    columns:
+    - title
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   users:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: users
diff --git a/script/generate_comments_from_events.rb b/script/generate_comments_from_events.rb
index 5081fdf19..d1b5aecb9 100755
--- a/script/generate_comments_from_events.rb
+++ b/script/generate_comments_from_events.rb
@@ -5,7 +5,7 @@ require_relative "../config/environment"
 ApplicationRecord.with_each_tenant do |tenant|
   Card.find_each do |card|
     card.events.find_each do |event|
-      Card::Eventable::SystemCommenter.new(card, event).comment
+      Card::Eventable::SystemCommenter.new(card.reload, event).comment
     end
   end
 end

From 7d20e8e8cd7fcd2bea5883b86c2b2225c5d0876c Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 10:19:40 +0200
Subject: [PATCH 401/413] Remove another reference to message

---
 app/views/cards/_comments.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/_comments.html.erb b/app/views/cards/_comments.html.erb
index 7fc6a977a..9ed43c777 100644
--- a/app/views/cards/_comments.html.erb
+++ b/app/views/cards/_comments.html.erb
@@ -1,4 +1,4 @@
-<% if card.messages.comments.any? %>
+<% if card.comments.any? %>
   <div class="card__detail card__comments">
     <span aria-hidden="true"><%= card.comments.count %></span>
     <span class="for-screen-reader"><%= pluralize(card.comments.count, "comment") %></span>

From c349f52aec683a4aa33067601281aa7615dafc2c Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 10:22:23 +0200
Subject: [PATCH 402/413] Not used

---
 app/models/card/eventable.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/card/eventable.rb b/app/models/card/eventable.rb
index 030aad9e0..b9815fd93 100644
--- a/app/models/card/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -21,10 +21,6 @@ module Card::Eventable
       published?
     end
 
-    def find_or_capture_event_summary
-      messages.last&.event_summary || capture(EventSummary.new).event_summary
-    end
-
     def track_title_change
       if title_before_last_save.present?
         track_event "title_changed", particulars: { old_title: title_before_last_save, new_title: title }

From 6ed5549c1b20b92dddf629861d83be222bdd5dbc Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 10:29:16 +0200
Subject: [PATCH 403/413] 'Reported' -> 'Added'

---
 app/helpers/cards_helper.rb                          | 10 ++++++++++
 app/views/cards/display/_preview.html.erb            |  2 +-
 app/views/cards/display/common/_meta.html.erb        |  2 +-
 app/views/events/filter/_custom_collections.html.erb |  2 +-
 app/views/filters/_creators.html.erb                 |  4 ++--
 app/views/users/show.html.erb                        |  2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
index 79338d622..08edb27d9 100644
--- a/app/helpers/cards_helper.rb
+++ b/app/helpers/cards_helper.rb
@@ -38,4 +38,14 @@ module CardsHelper
       concat(tag.span("Delete this card"))
     end
   end
+
+  def card_title_tag(card)
+    title = [
+      card.title,
+      "added by #{card.creator.name}",
+      "in #{card.collection.name}"
+    ]
+    title << "assigned to #{card.assignees.map(&:name).to_sentence}" if card.assignees.any?
+    title.join(" ")
+  end
 end
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index a909089cb..aa4e14dcf 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -11,7 +11,7 @@
           <%= card.title %>
         </h1>
 
-        <%= link_to collection_card_path(card.collection, card), class: "card__link", data: { turbo_frame: "_top" } do %>
+        <%= link_to collection_card_path(card.collection, card), class: "card__link", title: card_title_tag(card), data: { turbo_frame: "_top" } do %>
           <span class="for-screen-reader"><%= card.title %></span>
         <% end %>
       </div>
diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index 8cc20f2e5..86640f3cc 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -17,7 +17,7 @@
       <% end %>
     </span>
     <span class="card__meta-item card__meta-item--reported overflow-ellipsis">
-      Reported by <strong><%= card.creator.familiar_name %></strong>
+      Added by <strong><%= card.creator.familiar_name %></strong>
     </span>
     <span class="card__meta-item card__meta-item--assigned overflow-ellipsis">
       <%= card.assignees.any? ? "Assigned to" : "Not assigned" %>
diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
index f3a07e15e..0c1f056e5 100644
--- a/app/views/events/filter/_custom_collections.html.erb
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -10,7 +10,7 @@
   <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
     <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
-      <span class="overflow-ellipsis">Reported by me</span>
+      <span class="overflow-ellipsis">Added by me</span>
       <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
   </div>
diff --git a/app/views/filters/_creators.html.erb b/app/views/filters/_creators.html.erb
index ab203d063..d6dbd31fa 100644
--- a/app/views/filters/_creators.html.erb
+++ b/app/views/filters/_creators.html.erb
@@ -4,9 +4,9 @@
     <button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
       <span class="overflow-ellipsis">
         <% if filter.creators.any? %>
-          <%= "Reported by #{filter.creators.map(&:familiar_name).to_sentence}" %>
+          <%= "Added by #{filter.creators.map(&:familiar_name).to_sentence}" %>
         <% else %>
-          Reported by…
+          Added by…
         <% end %>
       </span>
     </button>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9472926f4..d061814d2 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -33,7 +33,7 @@
 
       <div class="flex-inline center justify-center flex-wrap gap">
         <%= link_to "See cards assigned to #{ Current.user == @user ? "you" : @user.first_name }", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
-        <%= link_to "See cards reported by #{ Current.user == @user ? "you" : @user.first_name }", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "See cards added by #{ Current.user == @user ? "you" : @user.first_name }", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
       </div>
     </div>
   </div>

From c964c87d5b299cf21489b89d3b684e8c17aef418 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 10:52:47 +0200
Subject: [PATCH 404/413] Don't strip lightbox attributes

---
 config/initializers/sanitization.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/sanitization.rb b/config/initializers/sanitization.rb
index 5362f0100..93323bc4a 100644
--- a/config/initializers/sanitization.rb
+++ b/config/initializers/sanitization.rb
@@ -1,4 +1,4 @@
 Rails.application.config.after_initialize do
   Rails::HTML5::SafeListSanitizer.allowed_tags.merge(%w[ s table tr td th thead tbody details summary video source])
-  Rails::HTML5::SafeListSanitizer.allowed_attributes.merge(%w[ data-turbo-frame controls type width ])
+  Rails::HTML5::SafeListSanitizer.allowed_attributes.merge(%w[ data-turbo-frame controls type width data-action data-lightbox-target data-lightbox-url-value ])
 end

From 14825e4daf8c782eb8d72cfafae5bf3a2d813ff0 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 10:53:08 +0200
Subject: [PATCH 405/413] Don't trigger other hotkeys when dismissing

---
 app/views/layouts/_lightbox.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_lightbox.html.erb b/app/views/layouts/_lightbox.html.erb
index 1f5ad9105..91f3af7bc 100644
--- a/app/views/layouts/_lightbox.html.erb
+++ b/app/views/layouts/_lightbox.html.erb
@@ -1,10 +1,10 @@
 <dialog class="lightbox" aria-label="Image Viewer (Press escape to close)" data-lightbox-target="dialog" data-action="close->lightbox#reset">
   <img src="" class="lightbox__image" data-lightbox-target="zoomedImage" />
 
-  <form method="dialog" class="lightbox__btn">
-    <button class="btn fill-white" title="Close (esc)">
+  <div class="lightbox__btn">
+    <button class="btn fill-white" title="Close (esc)" data-action="keydown.esc->lightbox#close:stop" data-controller="hotkey">
       <%= icon_tag "remove" %>
       <span class="for-screen-reader">Close image viewer (esc)</span>
     </button>
-  </form>
+  </div>
 </dialog>

From d9acafcb64ed2906520e61c0e5c1b81e268f0a14 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 11:05:58 +0200
Subject: [PATCH 406/413] New line

---
 app/models/card/eventable/system_commenter.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb
index 6d9155f15..5c06c272a 100644
--- a/app/models/card/eventable/system_commenter.rb
+++ b/app/models/card/eventable/system_commenter.rb
@@ -7,6 +7,7 @@ class Card::Eventable::SystemCommenter
 
   def comment
     return unless comment_body.present?
+
     if comment = find_replaceable_system_comment
       comment.update! body: comment_body
     else

From f45554bfc33a6892bf408d9b3e09523840e186f0 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 11:27:09 +0200
Subject: [PATCH 407/413] Use dialog controller actions, re-enable default
 action

---
 app/views/layouts/_lightbox.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_lightbox.html.erb b/app/views/layouts/_lightbox.html.erb
index 91f3af7bc..ac30fc601 100644
--- a/app/views/layouts/_lightbox.html.erb
+++ b/app/views/layouts/_lightbox.html.erb
@@ -1,10 +1,11 @@
-<dialog class="lightbox" aria-label="Image Viewer (Press escape to close)" data-lightbox-target="dialog" data-action="close->lightbox#reset">
+<%= tag.dialog class:"lightbox", aria: { label: "Image Viewer (Press escape to close)" },
+    data: { controller: "dialog", dialog_target: "dialog", lightbox_target: "dialog", action: "close->lightbox#reset" } do %>
   <img src="" class="lightbox__image" data-lightbox-target="zoomedImage" />
 
   <div class="lightbox__btn">
-    <button class="btn fill-white" title="Close (esc)" data-action="keydown.esc->lightbox#close:stop" data-controller="hotkey">
+    <button class="btn fill-white" title="Close (esc)" data-action="dialog#close keydown.esc->dialog#close:stop" data-controller="hotkey">
       <%= icon_tag "remove" %>
       <span class="for-screen-reader">Close image viewer (esc)</span>
     </button>
   </div>
-</dialog>
+<% end %>

From c6542e3d8583c4681254ccbabedc3e8203739086 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 11:27:42 +0200
Subject: [PATCH 408/413] Filter assignees

---
 app/assets/stylesheets/popup.css         |  5 ++++
 app/views/cards/assignments/new.html.erb | 30 +++++++++++++++++-------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index a217b9965..45db824ae 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -26,6 +26,11 @@
         max-inline-size: 40ch;
       }
     }
+
+    .card & {
+      min-inline-size: 25ch;
+      max-inline-size: 25ch;
+    }
   }
 
   .popup__group {
diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index 22c8f9c2d..83fbeea7e 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -1,12 +1,26 @@
 <%= turbo_frame_tag @card, :assignment do %>
-  <strong class="popup__title pad-inline-half txt-nowrap">Assign this to…</strong>
+  <%= tag.div class: "max-width",data: {
+        controller: "filter", 
+				dialog_target: "dialog",
+				filter_active_class: "filter--active", 
+				filter_selected_class: "selected"} do %>
+    <strong class="popup__title pad-inline-half txt-nowrap">Assign this to…</strong>
 
-  <div class="flex flex-column full-width popup__list">
-    <% @collection.users.active.alphabetically.each do |user| %>
-        <%= button_to card_assignments_path(@card, params: { assignee_id: user.id }), method: :post, class: "btn popup__item full-width" do %>
-          <span class="overflow-ellipsis"><%= user.name %></span>
-          <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @card.assignees.include?(user) %>
-        <% end %>
+    <% if @collection.users.active.count > 1 %>
+      <input placeholder="Find someone…" class="input input--transparent txt-small margin-block-half" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter" autofocus>
     <% end %>
-  </div>
+
+    <menu class="flex flex-column full-width popup__list margin-none unpad max-width" data-filter-target="list">
+      <% @collection.users.active.alphabetically.each do |user| %>
+        <li class="popup__group flex align-center full-width" data-value="<%= user.name.downcase %>">
+          <%= button_to card_assignments_path(@card, params: { assignee_id: user.id }), method: :post, 
+              class: "btn popup__item min-width flex-item-grow full-width unpad-inline", 
+              form_class: "max-width flex-item-grow" do %>
+            <span class="overflow-ellipsis flex-item-grow"><%= user.name %></span>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-no-shrink flex-item-justify-end", style: "--icon-size: 1em" if @card.assignees.include?(user) %>
+          <% end %>
+        </li>
+      <% end %>
+    </menu>
+  <% end %>
 <% end %>

From d5fe842d9a12d9b6d4b5f0075e372125d6f78111 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 11:38:51 +0200
Subject: [PATCH 409/413] Remove double prefix

---
 app/helpers/events_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 1509849a0..b00408cc3 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -86,7 +86,7 @@ module EventsHelper
       "#{event_creator_name(event)} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ title }</span>".html_safe
     when "card_due_date_removed"
       "#{event_creator_name(event)} removed the date on <span style='color: var(--card-color)'>#{ title }</span>"
-    when "card_card_title_changed"
+    when "card_title_changed"
       "#{event_creator_name(event)} renamed <span style='color: var(--card-color)'>#{ title }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
     end
   end
@@ -101,7 +101,7 @@ module EventsHelper
       "bolt"
     when "comment_created"
       "comment"
-    when "card_card_title_changed"
+    when "card_title_changed"
       "rename"
     else
       "person"

From 79e29da020c64a785b99e78dd6d75afa2978fd39 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 30 Apr 2025 11:44:49 +0200
Subject: [PATCH 410/413] Should be "inverted"

---
 app/assets/stylesheets/cards.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index e47603142..3d5bc251a 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -118,7 +118,7 @@
 
     & ~ .btn {
       --btn-background: var(--card-color);
-      --btn-color: var(--color-ink-reversed);
+      --btn-color: var(--color-ink-inverted);
     }
   }
 

From 9d8d38873eab1dd1817569e0fb1941cbabe71a45 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 30 Apr 2025 06:04:06 -0400
Subject: [PATCH 411/413] Backup the tenant databases nightly.

This is probably not a permanent solution, but should provide some
disaster recovery capability while we're building up Fizzy operationally.
---
 app/jobs/sqlite_backups_job.rb     | 101 +++++++++++++++++++++++++++++
 config/environments/development.rb |   3 +
 config/initializers/inflections.rb |   6 +-
 config/recurring.yml               |   3 +
 4 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 app/jobs/sqlite_backups_job.rb

diff --git a/app/jobs/sqlite_backups_job.rb b/app/jobs/sqlite_backups_job.rb
new file mode 100644
index 000000000..6e7559d80
--- /dev/null
+++ b/app/jobs/sqlite_backups_job.rb
@@ -0,0 +1,101 @@
+#
+#  This job backs up all the tenant databases using the SQLite Backup API, which should allow the
+#  application to continue running against the database while it is backed up.
+#
+#  ref: https://www.sqlite.org/c3ref/backup_finish.html
+#
+#  It will keep N files around, like this:
+#
+#    storage/tenants/development/honcho/db/
+#    ├─ main.sqlite3
+#    ├─ main.sqlite3.1
+#    ├─ main.sqlite3.2
+#    ├─ main.sqlite3.3
+#    ├─ main.sqlite3.4
+#    └─ main.sqlite3.5
+#
+class SQLiteBackupsJob < ApplicationJob
+  DEFAULT_NUMBER_OF_BACKUPS = 5
+  DEFAULT_STEP_PAGES = 1024
+
+  def perform(keep: DEFAULT_NUMBER_OF_BACKUPS, step: DEFAULT_STEP_PAGES)
+    @failures = []
+
+    ApplicationRecord.with_each_tenant do |tenant|
+      perform_file_rollover tenant, keep: keep
+      perform_backup tenant, step: step
+    end
+
+    if @failures.present?
+      raise "SQLiteBackupsJob: failed to backup tenants: #{@failures.join(", ")}"
+    end
+  end
+
+  private
+    def perform_file_rollover(tenant, keep:)
+      keep.downto(2) do |j|
+        fresher = backup_path(tenant, j - 1)
+        staler = backup_path(tenant, j)
+
+        if j == keep && File.exist?(staler)
+          FileUtils.rm(staler)
+        end
+
+        if File.exist?(fresher)
+          # TODO: It may be worth benchmarking whether backing up into the previous backup is faster
+          # than backing up into an empty file.
+          FileUtils.mv(fresher, staler)
+        end
+      end
+    end
+
+    def perform_backup(tenant, step:)
+      ApplicationRecord.with_connection do |conn|
+        current_adapter = conn.raw_connection
+        backup_db = backup_path(tenant, 1)
+        backup_adapter = SQLite3::Database.new(backup_db)
+        backup = SQLite3::Backup.new(backup_adapter, "main", current_adapter, "main")
+
+        pages = 0
+        elapsed = ActiveSupport::Benchmark.realtime(:float_millisecond) do
+          loop do
+            status = backup.step(step)
+            case status
+            when SQLite3::Constants::ErrorCode::DONE
+              break
+            when SQLite3::Constants::ErrorCode::OK
+              total = backup.pagecount
+              progress = total - backup.remaining
+              Rails.logger.debug { "SQLiteBackupsJob: #{tenant.inspect}: Wrote #{progress} of #{total} pages." }
+            when SQLite3::Constants::ErrorCode::BUSY, SQLite3::Constants::ErrorCode::LOCKED
+              Rails.logger.debug { "SQLiteBackupsJob: #{tenant.inspect}: Busy, retrying." }
+            else
+              Rails.logger.error "SQLiteBackupsJob: #{tenant.inspect}: Failed with status #{status}."
+              @failures << tenant
+            end
+          end
+
+          pages = backup.pagecount
+          backup.finish
+        end
+
+        message = sprintf(
+          "SQLiteBackupsJob: %{tenant}: Backup complete in %<elapsed>.1f ms. Wrote %{pages} pages to %{path}",
+          tenant: tenant.inspect, path: backup_db.inspect, pages: pages, elapsed: elapsed
+        )
+        Rails.logger.info message
+      end
+    end
+
+    def backup_path(tenant, index)
+      db_path(tenant) + ".#{index}"
+    end
+
+    def db_path(tenant)
+      db_config.database
+    end
+
+    def db_config
+      ApplicationRecord.connection_pool.db_config
+    end
+end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d2aae6589..b929be5c4 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -74,4 +74,7 @@ Rails.application.configure do
 
   # Allow all hosts in development
   config.hosts = nil
+
+  config.active_job.queue_adapter = :solid_queue
+  config.solid_queue.connects_to = { database: { writing: :queue } }
 end
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 3860f659e..3d2359e52 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -11,6 +11,6 @@
 # end
 
 # These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym "RESTful"
-# end
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym "SQLite"
+end
diff --git a/config/recurring.yml b/config/recurring.yml
index 492e20247..9aff145ac 100644
--- a/config/recurring.yml
+++ b/config/recurring.yml
@@ -8,3 +8,6 @@ production:
   remove_abandoned_creations:
     class: RemoveAbandonedCreationsJob
     schedule: every hour
+  sqlite_backups:
+    class: SQLiteBackupsJob
+    schedule: every day at 05:00

From 4f5e8bfc0717f8745305106af97ff80b5470f171 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 30 Apr 2025 12:27:32 +0200
Subject: [PATCH 412/413] Test that system comments won't result in
 notifications

---
 test/models/card/eventable/system_commenter_test.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/models/card/eventable/system_commenter_test.rb b/test/models/card/eventable/system_commenter_test.rb
index 23366097c..64eb05f0d 100644
--- a/test/models/card/eventable/system_commenter_test.rb
+++ b/test/models/card/eventable/system_commenter_test.rb
@@ -57,6 +57,14 @@ class Card::Eventable::SystemCommenterTest < ActiveSupport::TestCase
     end
   end
 
+  test "don't notify on system comments" do
+    @card.watch_by(users(:david))
+
+    assert_no_difference -> { Notification.count } do
+      @card.toggle_assignment users(:kevin)
+    end
+  end
+
   private
     def assert_system_comment(expected_comment)
       assert_difference -> { @card.comments.count }, 1 do

From 8f66a481d28631a73d0483b42b3632609342a37d Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 30 Apr 2025 07:43:43 -0400
Subject: [PATCH 413/413] dep: update active_record-tenanted to fix tenant
 migration in test

ref: https://37s.fizzy.37signals.com/collections/693169862/cards/999009012
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c9039a159..a88385fa5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/basecamp/active_record-tenanted
-  revision: 30c2d35fb1b8e01ac3e40088fde8c19ef10eb1a6
+  revision: 612f5e8b7f77b7076a7eb21521920630161461aa
   specs:
     active_record-tenanted (0.1.0)
       activerecord (>= 8.1.alpha)