Theme
-
+<%= render "voice" %>
+
<%= render "notifications" %>
<%= render "coplan/settings/tokens/tokens", api_tokens: @api_tokens %>
diff --git a/engine/config/routes.rb b/engine/config/routes.rb
index 3c955e61..237a8218 100644
--- a/engine/config/routes.rb
+++ b/engine/config/routes.rb
@@ -33,6 +33,7 @@
root "settings#index"
resources :tokens, only: [:index, :create, :destroy]
patch "theme", to: "settings#update_theme"
+ patch "voice_hotkey", to: "settings#update_voice_hotkey"
end
# Web folder creation (sidebar "New folder" input) and reparenting (drag
diff --git a/engine/db/migrate/20260820000000_backfill_voice_hotkey_preference.rb b/engine/db/migrate/20260820000000_backfill_voice_hotkey_preference.rb
new file mode 100644
index 00000000..e8bf8870
--- /dev/null
+++ b/engine/db/migrate/20260820000000_backfill_voice_hotkey_preference.rb
@@ -0,0 +1,31 @@
+class BackfillVoiceHotkeyPreference < ActiveRecord::Migration[8.1]
+ # Push-to-talk used to be Shift, for everyone, with no way to change it.
+ # It is now a setting, and the default for anyone new is Ctrl+Space —
+ # a deliberate chord that can open the microphone the instant it's
+ # pressed, where a bare Shift has to wait out a hold delay to tell
+ # talking from typing a capital.
+ #
+ # Nobody's hands should have to relearn that on a deploy, so everyone
+ # who already exists is written down as a Shift user explicitly. From
+ # here on, "no preference recorded" means "arrived after the setting
+ # existed" and reads as Ctrl+Space.
+ #
+ # Idempotent: only users with no voice_hotkey recorded are touched.
+ def up
+ CoPlan::User.find_each do |user|
+ metadata = user.metadata || {}
+ next if metadata.key?("voice_hotkey")
+
+ user.update_column(:metadata, metadata.merge("voice_hotkey" => "shift")) # rubocop:disable Rails/SkipsModelValidations
+ end
+ end
+
+ def down
+ CoPlan::User.find_each do |user|
+ metadata = user.metadata
+ next unless metadata.is_a?(Hash) && metadata["voice_hotkey"] == "shift"
+
+ user.update_column(:metadata, metadata.except("voice_hotkey")) # rubocop:disable Rails/SkipsModelValidations
+ end
+ end
+end
diff --git a/spec/requests/settings_spec.rb b/spec/requests/settings_spec.rb
index ccf50df0..0bd759e6 100644
--- a/spec/requests/settings_spec.rb
+++ b/spec/requests/settings_spec.rb
@@ -18,4 +18,32 @@
expect(alice.reload.theme_preference).not_to eq("hotdog-stand")
end
end
+
+ describe "PATCH /settings/voice_hotkey" do
+ it "persists an allowed push-to-talk key" do
+ patch settings_voice_hotkey_path, params: { voice_hotkey: "shift" }
+ expect(response).to have_http_status(:ok)
+ expect(alice.reload.voice_hotkey).to eq("shift")
+ end
+
+ # Nobody has a key, which is a real answer: the mic button stays and
+ # the keyboard is left alone.
+ it "persists turning the hotkey off" do
+ patch settings_voice_hotkey_path, params: { voice_hotkey: "off" }
+ expect(alice.reload.voice_hotkey).to eq("off")
+ end
+
+ it "silently ignores keys that aren't on the list" do
+ patch settings_voice_hotkey_path, params: { voice_hotkey: "F13" }
+ expect(response).to have_http_status(:ok)
+ expect(alice.reload.voice_hotkey).to eq(CoPlan::User::DEFAULT_VOICE_HOTKEY)
+ end
+
+ # A preference nobody has set means "arrived after the setting did",
+ # which reads as Ctrl+Space — the backfill gave everyone who came
+ # before an explicit Shift.
+ it "defaults to Ctrl+Space" do
+ expect(create(:coplan_user).voice_hotkey).to eq("ctrl_space")
+ end
+ end
end
diff --git a/spec/system/nav_stimulus_spec.rb b/spec/system/nav_stimulus_spec.rb
index 0f189e35..f2edb2ea 100644
--- a/spec/system/nav_stimulus_spec.rb
+++ b/spec/system/nav_stimulus_spec.rb
@@ -57,7 +57,7 @@ def sign_in(u)
describe "theme switcher" do
it "applies the chosen theme immediately and persists it across reload" do
visit settings_root_path
- find(".theme-switcher__option", text: "Dark").click
+ find(".segmented__option", text: "Dark").click
expect(page.evaluate_script("document.documentElement.getAttribute('data-theme')")).to eq("dark")
expect(user.reload.theme_preference).to eq("dark")
diff --git a/spec/system/voice_commenting_spec.rb b/spec/system/voice_commenting_spec.rb
index 3734a317..382daea3 100644
--- a/spec/system/voice_commenting_spec.rb
+++ b/spec/system/voice_commenting_spec.rb
@@ -140,10 +140,108 @@ def stub_speech_recognition(transcript, emit_on_stop: false)
expect(body).to include("too vague")
end
+ # The default key, and the reason it's the default: a chord is nobody's
+ # accident, so it needs none of the hold-delay hedging a bare modifier
+ # does — the press means talk.
+ describe "hold Ctrl+Space to talk" do
+ before do
+ allow(CoPlan::Ai).to receive(:call)
+ .and_return({ "text" => "Held to talk.", "span" => nil }.to_json)
+ end
+
+ after { page.driver.browser.action.release_actions }
+
+ def hold_ctrl_space
+ page.driver.browser.action.key_down(:control).key_down(:space).perform
+ yield if block_given?
+ ensure
+ page.driver.browser.action.key_up(:space).key_up(:control).perform
+ end
+
+ it "records while Ctrl+Space is held and posts on release" do
+ stub_speech_recognition("held to talk", emit_on_stop: true)
+ visit plan_path(plan)
+
+ hold_ctrl_space { expect(page).to have_css(".voice-btn--listening") }
+
+ expect(page).to have_css(".voice-status", text: /Comment added/, wait: 10)
+ thread = CoPlan::CommentThread.where(plan_id: plan.id).sole
+ expect(thread.comments.first.body_markdown).to eq("🎙️ Held to talk.")
+ end
+
+ # No hold delay on a chord: waiting 350ms to decide would clip the
+ # first word off every short remark for no gain, because there is
+ # nothing to decide.
+ it "starts on the press rather than waiting out a hold" do
+ stub_speech_recognition("held to talk", emit_on_stop: true)
+ visit plan_path(plan)
+
+ page.driver.browser.action.key_down(:control).key_down(:space).perform
+ expect(page).to have_css(".voice-btn--listening", wait: 0.3)
+ ensure
+ page.driver.browser.action.release_actions
+ end
+
+ # Space alone scrolls the page and Ctrl alone is half a shortcut;
+ # neither is somebody asking to talk.
+ it "ignores either half of the chord on its own" do
+ stub_speech_recognition("should never be sent", emit_on_stop: true)
+ visit plan_path(plan)
+
+ page.driver.browser.action.key_down(:control).key_up(:control).perform
+ page.driver.browser.action.send_keys(:space).perform
+
+ expect(page).to have_no_css(".voice-btn--listening", wait: 2)
+ expect(CoPlan::CommentThread.where(plan_id: plan.id).count).to eq(0)
+ end
+ end
+
+ # The key is a per-user setting, so the mic is the only thing on the
+ # page that can say which one yours is. Hovering has to answer it, or
+ # push-to-talk is a feature you have to remember you configured.
+ describe "the mic naming its own key" do
+ it "shows the chosen shortcut on hover" do
+ stub_speech_recognition("never sent")
+ visit plan_path(plan)
+
+ expect(page).to have_css(".voice-btn[data-tooltip*='Ctrl+Space']")
+
+ author.update!(voice_hotkey: "shift")
+ visit plan_path(plan)
+ expect(page).to have_css(".voice-btn[data-tooltip*='Shift']")
+
+ # Nothing to hold, nothing to promise.
+ author.update!(voice_hotkey: "off")
+ visit plan_path(plan)
+ expect(page).to have_css(".voice-btn[data-tooltip='Comment by voice']")
+ end
+ end
+
+ # "Off" is a supported answer, not a broken state: the mic button is
+ # still there, and the keyboard belongs to the page again.
+ describe "with the hotkey turned off" do
+ before { author.update!(voice_hotkey: "off") }
+
+ it "leaves the keyboard alone but keeps the button" do
+ stub_speech_recognition("should never be sent", emit_on_stop: true)
+ visit plan_path(plan)
+
+ page.driver.browser.action.key_down(:control).key_down(:space).perform
+ expect(page).to have_no_css(".voice-btn--listening", wait: 2)
+ page.driver.browser.action.release_actions
+
+ expect(CoPlan::CommentThread.where(plan_id: plan.id).count).to eq(0)
+ expect(page).to have_css(".voice-btn")
+ end
+ end
+
+ # What everyone who was here before the setting existed still has,
+ # because the backfill wrote it down for them.
describe "hold Shift to talk" do
HOLD = 0.7 # comfortably past the controller's 350ms hold delay
before do
+ author.update!(voice_hotkey: "shift")
allow(CoPlan::Ai).to receive(:call)
.and_return({ "text" => "Held to talk.", "span" => nil }.to_json)
end
@@ -404,6 +502,7 @@ def stub_recorder(peak: 30, context_state: "running")
# ear now opens at the keydown itself, and confirming the hold adopts
# a capture already in progress.
it "captures from the press when talking with Shift held" do
+ author.update!(voice_hotkey: "shift")
allow(CoPlan::Ai).to receive(:transcribe).and_return("oh I meant both of them")
allow(CoPlan::Ai).to receive(:call)
.and_return({ "text" => "Oh — I meant both of them.", "span" => nil }.to_json)
diff --git a/spec/system/voice_hotkey_setting_spec.rb b/spec/system/voice_hotkey_setting_spec.rb
new file mode 100644
index 00000000..5e24eec0
--- /dev/null
+++ b/spec/system/voice_hotkey_setting_spec.rb
@@ -0,0 +1,69 @@
+require "rails_helper"
+
+# Picking a push-to-talk key has no save button: the click is the save.
+# That only works if what's lit is what the server has — a settings page
+# showing a preference that never persisted is a lie you don't discover
+# until the key silently doesn't work.
+RSpec.describe "Push-to-talk key setting", type: :system do
+ let(:user) { create(:coplan_user, email: "picker@example.com") }
+
+ def sign_in(user)
+ visit sign_in_path
+ fill_in "Email address", with: user.email
+ click_button "Sign In"
+ expect(page).to have_current_path(root_path)
+ end
+
+ before { sign_in(user) }
+
+ it "saves the choice as it's clicked" do
+ visit settings_root_path
+
+ find(".segmented__option", text: "Shift").click
+
+ Timeout.timeout(5) { sleep 0.1 until user.reload.voice_hotkey == "shift" }
+
+ # And the page agrees with the server on the next visit.
+ visit settings_root_path
+ expect(page).to have_css(".segmented__option:has(input:checked)", text: "Shift")
+ end
+
+ # The macOS caveat only applies to one of the keys, so it appears the
+ # moment that key is picked rather than on the next page load.
+ it "explains the Ctrl+Space caveat as soon as it's picked" do
+ user.update!(voice_hotkey: "shift")
+ visit settings_root_path
+ expect(page).to have_no_content(/switch input sources/i)
+
+ find(".segmented__option", text: "Ctrl+Space").click
+
+ expect(page).to have_content(/switch input sources/i)
+ end
+
+ # When the save doesn't land, the lit segment goes back to the key that
+ # will actually work, and says why.
+ context "when the server refuses the save" do
+ before do
+ page.driver.browser.execute_cdp("Page.addScriptToEvaluateOnNewDocument", source: <<~JS)
+ const realFetch = window.fetch
+ window.fetch = (url, options) =>
+ String(url).includes("voice_hotkey")
+ ? Promise.resolve(new Response("", { status: 500 }))
+ : realFetch(url, options)
+ JS
+ end
+
+ it "puts the previous key back and says it didn't save" do
+ user.update!(voice_hotkey: "shift")
+ visit settings_root_path
+
+ find(".segmented__option", text: "Ctrl+Space").click
+
+ expect(page).to have_content("Couldn't save that")
+ expect(page).to have_css(".segmented__option:has(input:checked)", text: "Shift")
+ # The caveat belongs to a key that isn't in force, so it goes too.
+ expect(page).to have_no_content(/switch input sources/i)
+ expect(user.reload.voice_hotkey).to eq("shift")
+ end
+ end
+end