From 653e68aae168bd51917815e6188297d3e3a7005d Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sat, 7 Mar 2026 06:13:45 -0500
Subject: [PATCH 1/7] Add Stimulus and Tailwind preferences to AI instruction
 files

AI agents should always use Stimulus over raw JS and Tailwind over
custom CSS. Added to CLAUDE.md, AGENTS.md, and copilot-instructions.md
so all AI tools follow the same frontend conventions.
---
 .github/copilot-instructions.md | 7 +++++++
 AGENTS.md                       | 6 ++++++
 CLAUDE.md                       | 5 +++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 33a2a88fd..21bf48894 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,5 +1,12 @@
 # This project is a Ruby on Rails application.
 
+# Frontend requirements:
+- Always use Stimulus for JavaScript behavior — do not write raw/inline JS or jQuery
+- Always use Tailwind CSS utility classes for styling — do not write custom CSS unless absolutely necessary
+- Prefer Turbo for navigation and form submissions before reaching for Stimulus
+- ES6+ syntax, ESM imports/exports
+- Stimulus controller naming: `[name]_controller.js`
+
 # Code style requirements:
 - Use modern Ruby syntax
 - Prefer early returns and guard clauses
diff --git a/AGENTS.md b/AGENTS.md
index e3cd2a1fd..0e1908d1c 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -208,6 +208,12 @@ end
 
 ## Frontend
 
+### Preferences
+
+- **Always use Stimulus** for JavaScript behavior — do not write raw/inline JS or jQuery
+- **Always use Tailwind CSS** utility classes for styling — do not write custom CSS unless absolutely necessary
+- Prefer Turbo for navigation and form submissions before reaching for Stimulus
+
 ### Stimulus Controllers (32)
 
 Key controllers:
diff --git a/CLAUDE.md b/CLAUDE.md
index f3ac1e1c6..66f7fc076 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -149,10 +149,11 @@ bundle exec bundle-audit check --update
 ## JavaScript
 
 - ES6+ syntax, ESM imports/exports
-- Prefer Stimulus + Turbo for new interactive features
+- **Always use Stimulus** for JavaScript behavior — do not write raw/inline JS or jQuery
+- **Always use Tailwind CSS** utility classes for styling — do not write custom CSS unless absolutely necessary
+- Prefer Turbo for navigation and form submissions before reaching for Stimulus
 - Controller naming: `[name]_controller.js`
 - Keep controllers focused and small
-- Use Tailwind CSS v4 utility classes
 - **Use Stimulus targets and data attributes** to reference DOM elements — avoid `this.element.querySelector` and direct DOM queries. Declare `static targets = [...]` and use `data-[controller]-target` attributes in views.
 - **Use Stimulus shorthand action descriptors and shorthand pairs** — omit the event when it's the default for that element (e.g., `input` for `<input>`/`<textarea>`, `click` for `<button>`/`<a>`, `submit` for `<form>`). Write `controller#action` not `input->controller#action` on an input element. Only specify the event when using a non-default (e.g., `change->controller#action` on an input). See [Stimulus Actions](https://stimulus.hotwired.dev/reference/actions#event-shorthand).
 

From d3169cd3b8728298022b8afb4c6e3bfd8e7b430e Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sat, 7 Mar 2026 06:16:09 -0500
Subject: [PATCH 2/7] Add rebase review guidance to AI instruction files

When rebasing onto main, AI agents should review incoming changes
and flag oversights like missing tests, incomplete migrations, or
broken assumptions.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/copilot-instructions.md | 3 +++
 AGENTS.md                       | 4 ++++
 CLAUDE.md                       | 1 +
 3 files changed, 8 insertions(+)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 21bf48894..e81761366 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -57,3 +57,6 @@ This project uses rubocop-rails-omakase. All code MUST follow these rules:
 - Use `Foo.method` not `Foo::method` for method calls
 - No parentheses around conditions: `if foo` not `if (foo)`
 - No semicolons to separate statements
+
+# Git
+- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes
diff --git a/AGENTS.md b/AGENTS.md
index 0e1908d1c..239b89732 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -319,6 +319,10 @@ RuboCop linting on PRs and pushes to main.
 | Positioning | Positioning gem for ordered records |
 | API | JWT tokens, Apipie docs, Rack CORS |
 
+## Git
+
+- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes
+
 ## Rake Tasks
 
 Located in `lib/tasks/` (~17 files). Notable:
diff --git a/CLAUDE.md b/CLAUDE.md
index 66f7fc076..7afbead28 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -167,6 +167,7 @@ bundle exec bundle-audit check --update
 - Default branch is `main`
 - Commit messages should explain why, not what
 - CI runs via GitHub Actions (`.github/workflows/`)
+- **When rebasing onto main**, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes
 
 ## PRs
 

From 59e29c0dc9befef3b5f5b012fa6c76ee1ae29872 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sat, 7 Mar 2026 06:20:01 -0500
Subject: [PATCH 3/7] Clarify rebase guidance to catch schema vs. view
 mismatches

Explicitly call out new fields, renamed columns, and removed
associations as things that may affect views, partials, or CSS
layouts in the current branch.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/copilot-instructions.md | 2 +-
 AGENTS.md                       | 2 +-
 CLAUDE.md                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index e81761366..26bef499f 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -59,4 +59,4 @@ This project uses rubocop-rails-omakase. All code MUST follow these rules:
 - No semicolons to separate statements
 
 # Git
-- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes
+- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes. Pay special attention to schema or model changes (new fields, renamed columns, removed associations) that may affect views, partials, or CSS layouts in your branch
diff --git a/AGENTS.md b/AGENTS.md
index 239b89732..05d6cf946 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -321,7 +321,7 @@ RuboCop linting on PRs and pushes to main.
 
 ## Git
 
-- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes
+- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes. Pay special attention to schema or model changes (new fields, renamed columns, removed associations) that may affect views, partials, or CSS layouts in your branch
 
 ## Rake Tasks
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 7afbead28..6b9b00026 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -167,7 +167,7 @@ bundle exec bundle-audit check --update
 - Default branch is `main`
 - Commit messages should explain why, not what
 - CI runs via GitHub Actions (`.github/workflows/`)
-- **When rebasing onto main**, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes
+- **When rebasing onto main**, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes. Pay special attention to schema or model changes (new fields, renamed columns, removed associations) that may affect views, partials, or CSS layouts in your branch
 
 ## PRs
 

From b3b07c298b6f8d88e094285811b79910cfa4dd2a Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sat, 7 Mar 2026 06:21:16 -0500
Subject: [PATCH 4/7] Broaden rebase guidance to check both directions

The previous wording only caught schema changes affecting your
branch's views. Now it also catches the reverse: main's view/layout
changes that affect schema additions in your branch.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/copilot-instructions.md | 2 +-
 AGENTS.md                       | 2 +-
 CLAUDE.md                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 26bef499f..1e29ef90d 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -59,4 +59,4 @@ This project uses rubocop-rails-omakase. All code MUST follow these rules:
 - No semicolons to separate statements
 
 # Git
-- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes. Pay special attention to schema or model changes (new fields, renamed columns, removed associations) that may affect views, partials, or CSS layouts in your branch
+- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts between the two branches. Check both directions: schema/model changes on either branch that affect views, partials, or layouts on the other (e.g., main redesigned a table's CSS but your branch adds new columns to it, or vice versa)
diff --git a/AGENTS.md b/AGENTS.md
index 05d6cf946..61a0db399 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -321,7 +321,7 @@ RuboCop linting on PRs and pushes to main.
 
 ## Git
 
-- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes. Pay special attention to schema or model changes (new fields, renamed columns, removed associations) that may affect views, partials, or CSS layouts in your branch
+- When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts between the two branches. Check both directions: schema/model changes on either branch that affect views, partials, or layouts on the other (e.g., main redesigned a table's CSS but your branch adds new columns to it, or vice versa)
 
 ## Rake Tasks
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 6b9b00026..f6b0437b0 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -167,7 +167,7 @@ bundle exec bundle-audit check --update
 - Default branch is `main`
 - Commit messages should explain why, not what
 - CI runs via GitHub Actions (`.github/workflows/`)
-- **When rebasing onto main**, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts with your branch's changes. Pay special attention to schema or model changes (new fields, renamed columns, removed associations) that may affect views, partials, or CSS layouts in your branch
+- **When rebasing onto main**, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts between the two branches. Check both directions: schema/model changes on either branch that affect views, partials, or layouts on the other (e.g., main redesigned a table's CSS but your branch adds new columns to it, or vice versa)
 
 ## PRs
 

From cc9d31d1ed74b18f8726ee0ea2fb293649889bcb Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Sat, 7 Mar 2026 06:22:42 -0500
Subject: [PATCH 5/7] Add guidance to keep PR title and description current on
 every push

Ensures the PR always reflects the actual diff, not just the
initial version.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/copilot-instructions.md | 3 +++
 AGENTS.md                       | 4 ++++
 CLAUDE.md                       | 1 +
 3 files changed, 8 insertions(+)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 1e29ef90d..e889312c2 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -58,5 +58,8 @@ This project uses rubocop-rails-omakase. All code MUST follow these rules:
 - No parentheses around conditions: `if foo` not `if (foo)`
 - No semicolons to separate statements
 
+# PRs
+- On every push, update the PR title and description to reflect the current diff
+
 # Git
 - When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts between the two branches. Check both directions: schema/model changes on either branch that affect views, partials, or layouts on the other (e.g., main redesigned a table's CSS but your branch adds new columns to it, or vice versa)
diff --git a/AGENTS.md b/AGENTS.md
index 61a0db399..daf487412 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -319,6 +319,10 @@ RuboCop linting on PRs and pushes to main.
 | Positioning | Positioning gem for ordered records |
 | API | JWT tokens, Apipie docs, Rack CORS |
 
+## PRs
+
+- On every push, update the PR title and description to reflect the current diff
+
 ## Git
 
 - When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts between the two branches. Check both directions: schema/model changes on either branch that affect views, partials, or layouts on the other (e.g., main redesigned a table's CSS but your branch adds new columns to it, or vice versa)
diff --git a/CLAUDE.md b/CLAUDE.md
index f6b0437b0..ba6627170 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -175,6 +175,7 @@ bundle exec bundle-audit check --update
 - Use bullet points, not paragraphs, when filling out each section
 - Description must explain why the change was made, not just what
 - Include screenshots for UI changes
+- **On every push**, update the PR title and description to reflect the current diff
 
 ## Quick Commands
 

From 588b4124d91d26a54f9c5723465f1447ee018fab Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Mon, 9 Mar 2026 09:56:23 -0400
Subject: [PATCH 6/7] Soften Stimulus preference from "Always" to "Strongly
 prefer"

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/copilot-instructions.md | 2 +-
 AGENTS.md                       | 2 +-
 CLAUDE.md                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index e889312c2..49f1cf698 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,7 +1,7 @@
 # This project is a Ruby on Rails application.
 
 # Frontend requirements:
-- Always use Stimulus for JavaScript behavior — do not write raw/inline JS or jQuery
+- Strongly prefer Stimulus for JavaScript behavior — do not write raw/inline JS or jQuery
 - Always use Tailwind CSS utility classes for styling — do not write custom CSS unless absolutely necessary
 - Prefer Turbo for navigation and form submissions before reaching for Stimulus
 - ES6+ syntax, ESM imports/exports
diff --git a/AGENTS.md b/AGENTS.md
index daf487412..5be71ab97 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -210,7 +210,7 @@ end
 
 ### Preferences
 
-- **Always use Stimulus** for JavaScript behavior — do not write raw/inline JS or jQuery
+- **Strongly prefer Stimulus** for JavaScript behavior — do not write raw/inline JS or jQuery
 - **Always use Tailwind CSS** utility classes for styling — do not write custom CSS unless absolutely necessary
 - Prefer Turbo for navigation and form submissions before reaching for Stimulus
 
diff --git a/CLAUDE.md b/CLAUDE.md
index ba6627170..30c8e3ba4 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -149,7 +149,7 @@ bundle exec bundle-audit check --update
 ## JavaScript
 
 - ES6+ syntax, ESM imports/exports
-- **Always use Stimulus** for JavaScript behavior — do not write raw/inline JS or jQuery
+- **Strongly prefer Stimulus** for JavaScript behavior — do not write raw/inline JS or jQuery
 - **Always use Tailwind CSS** utility classes for styling — do not write custom CSS unless absolutely necessary
 - Prefer Turbo for navigation and form submissions before reaching for Stimulus
 - Controller naming: `[name]_controller.js`

From 529597025d31435003319601c785a176cd973897 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Mon, 9 Mar 2026 10:59:09 -0400
Subject: [PATCH 7/7] Fix workshop spec expecting uppercase windows type names

The windows_type :adult factory produces "Adult" (titlecase) but
the tests expected "ADULT" (uppercase).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 spec/models/workshop_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/models/workshop_spec.rb b/spec/models/workshop_spec.rb
index 76d803582..14d46c3b4 100644
--- a/spec/models/workshop_spec.rb
+++ b/spec/models/workshop_spec.rb
@@ -142,8 +142,8 @@
       labels = Workshop.resolve_duplicate_labels([ w1, w2 ].map(&:remote_search_label))
 
       expect(labels).to contain_exactly(
-        { id: w1.id, label: "Art Therapy (ADULT) ##{w1.id}" },
-        { id: w2.id, label: "art therapy (ADULT) ##{w2.id}" }
+        { id: w1.id, label: "Art Therapy (Adult) ##{w1.id}" },
+        { id: w2.id, label: "art therapy (Adult) ##{w2.id}" }
       )
     end
 
@@ -155,8 +155,8 @@
       labels = Workshop.resolve_duplicate_labels([ w1, w2 ].map(&:remote_search_label))
 
       expect(labels).to contain_exactly(
-        { id: w1.id, label: "Art Therapy (ADULT) ##{w1.id}" },
-        { id: w2.id, label: "Art  Therapy (ADULT) ##{w2.id}" }
+        { id: w1.id, label: "Art Therapy (Adult) ##{w1.id}" },
+        { id: w2.id, label: "Art  Therapy (Adult) ##{w2.id}" }
       )
     end
   end