From b67d2676e470db60d4c17c8f6e6c80d7752679b7 Mon Sep 17 00:00:00 2001
From: Frank Song <franksong2702@gmail.com>
Date: Sun, 10 May 2026 14:40:46 +0800
Subject: [PATCH 1/3] fix(kanban): show original status hint in edit modal

---
 static/i18n.js                 |  1 +
 static/index.html              |  1 +
 static/panels.js               | 17 +++++++++++++++++
 static/style.css               |  6 ++++++
 tests/test_kanban_ui_static.py |  8 ++++++++
 5 files changed, 33 insertions(+)

diff --git a/static/i18n.js b/static/i18n.js
index e1b2c986fec..e44f427e621 100644
--- a/static/i18n.js
+++ b/static/i18n.js
@@ -543,6 +543,7 @@ const LOCALES = {
     kanban_title_required: 'Title is required.',
     kanban_new_task: 'New task',
     kanban_edit_task: 'Edit task',
+    kanban_status_original_hint: 'Actual status: {0}. This dialog only supports Triage/Todo/Ready edits.',
     kanban_run_dispatcher: 'Run dispatcher',
     kanban_run_dispatcher_confirm: 'This will claim Ready tasks on this board and spawn worker subprocesses (one per task, up to 8 per click). Continue?',
     kanban_assignee_profiles_label: 'Hermes profiles',
diff --git a/static/index.html b/static/index.html
index 343d76bcf82..f558b406554 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1279,6 +1279,7 @@ <h3 id="kanbanTaskModalTitle" data-i18n="kanban_new_task">New task</h3>
     <div class="kanban-modal-row-inline">
       <div class="kanban-modal-row">
         <label for="kanbanTaskModalStatus" data-i18n="kanban_status">Status</label>
+        <span id="kanbanTaskModalStatusOriginalHint" class="kanban-status-original-hint" hidden></span>
         <select id="kanbanTaskModalStatus">
           <option value="triage" data-i18n="kanban_status_triage">Triage</option>
           <option value="todo" data-i18n="kanban_status_todo">Todo</option>
diff --git a/static/panels.js b/static/panels.js
index 8bdc815ac5a..ebb79f924d1 100644
--- a/static/panels.js
+++ b/static/panels.js
@@ -1771,6 +1771,7 @@ function openKanbanCreate(){
   // tasks that need human review before being marked actionable; users who
   // want it can still pick it from the status dropdown.
   _kanbanResetTaskModalFields({status: 'ready'});
+  _kanbanSetTaskModalStatusHint(null);
   _kanbanSetTaskModalLabels('create');
   _kanbanPopulateAssigneeSelect('').then(() => {
     // After the dropdown is populated, default-select the first profile (not
@@ -1817,6 +1818,7 @@ async function openKanbanEdit(taskId){
   // (the mapped 'triage' would land in the PATCH payload, and _patch_task
   // would call _set_status_direct → reclaim worker → move to triage).
   const initialDisplayedStatus = _kanbanEditableStatusFor(task.status);
+  const originalStatus = task.status || initialDisplayedStatus;
   _kanbanTaskModalInitialDisplayedStatus = initialDisplayedStatus;
   _kanbanResetTaskModalFields({
     title: task.title || '',
@@ -1828,6 +1830,7 @@ async function openKanbanEdit(taskId){
   // Populate the assignee select AFTER reset so the option exists when we
   // call sel.value = currentAssignee.
   await _kanbanPopulateAssigneeSelect(task.assignee || '');
+  _kanbanSetTaskModalStatusHint(originalStatus, initialDisplayedStatus);
   _kanbanSetTaskModalLabels('edit');
   _kanbanPopulateTenantDatalist();
   modal.hidden = false;
@@ -1879,6 +1882,19 @@ function _kanbanSetTaskModalLabels(mode){
   }
 }
 
+function _kanbanSetTaskModalStatusHint(realStatus, editableStatus){
+  const hintEl = document.getElementById('kanbanTaskModalStatusOriginalHint');
+  if (!hintEl) return;
+  if (!realStatus || realStatus === editableStatus) {
+    hintEl.hidden = true;
+    hintEl.textContent = '';
+    return;
+  }
+  const statusLabel = t(`kanban_status_${realStatus}`) || realStatus;
+  hintEl.textContent = String(t('kanban_status_original_hint')).replace('{0}', statusLabel);
+  hintEl.hidden = false;
+}
+
 function _kanbanPopulateTenantDatalist(){
   const tenants = (_kanbanBoard && Array.isArray(_kanbanBoard.tenants)) ? _kanbanBoard.tenants : [];
   const tList = document.getElementById('kanbanTaskModalTenantList');
@@ -1891,6 +1907,7 @@ function closeKanbanTaskModal(){
   _kanbanTaskModalMode = 'create';
   _kanbanTaskModalEditingId = null;
   _kanbanTaskModalInitialDisplayedStatus = null;
+  _kanbanSetTaskModalStatusHint(null, null);
   document.removeEventListener('keydown', _kanbanTaskModalKey);
 }
 
diff --git a/static/style.css b/static/style.css
index 220bf473439..b89b0da41d1 100644
--- a/static/style.css
+++ b/static/style.css
@@ -3521,6 +3521,12 @@ main.main.showing-insights > #mainInsights{display:flex;overflow-y:auto;}
 .kanban-modal-row-inline{display:flex;gap:10px;}
 .kanban-modal-row-inline > *{flex:1;min-width:0;}
 .kanban-modal-hint{font-size:11px;color:var(--muted);line-height:1.5;margin-top:6px;}
+.kanban-status-original-hint{
+  display:block;
+  margin-top:4px;
+  font-size:11px;
+  color:var(--muted);
+}
 .kanban-modal-hint code{background:var(--input-bg);padding:1px 5px;border-radius:4px;font-family:'SF Mono',ui-monospace,Menlo,monospace;font-size:11px;color:var(--text);}
 .kanban-modal-hint em{color:var(--text);font-style:normal;font-weight:600;}
 .kanban-modal-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:14px;}
diff --git a/tests/test_kanban_ui_static.py b/tests/test_kanban_ui_static.py
index 5171ac31ce0..1e1f7e3c721 100644
--- a/tests/test_kanban_ui_static.py
+++ b/tests/test_kanban_ui_static.py
@@ -257,6 +257,10 @@ def test_kanban_edit_mode_preserves_status_when_dropdown_untouched():
         "Edit-mode status preservation requires tracking the initial displayed "
         "status so submit can detect whether the user actually changed it."
     )
+    assert 'id="kanbanTaskModalStatusOriginalHint"' in INDEX
+    assert "_kanbanSetTaskModalStatusHint" in PANELS
+    assert "kanban_status_original_hint" in I18N
+    assert ".kanban-status-original-hint" in STYLE
 
     # 2. openKanbanEdit captures the initial displayed status from the task.
     open_edit_match = re.search(
@@ -268,6 +272,8 @@ def test_kanban_edit_mode_preserves_status_when_dropdown_untouched():
         "openKanbanEdit must record the initial displayed status."
     )
     assert "_kanbanEditableStatusFor(task.status)" in open_edit_body
+    assert "_kanbanSetTaskModalStatusHint(originalStatus, initialDisplayedStatus)" in open_edit_body
+    assert "const originalStatus = task.status || initialDisplayedStatus" in open_edit_body
 
     # 3. Submit's edit branch only sends status when it differs from the
     #    initial displayed value.
@@ -292,6 +298,7 @@ def test_kanban_edit_mode_preserves_status_when_dropdown_untouched():
         "openKanbanCreate must reset the tracker to null so create-mode "
         "submits always include status in the POST payload."
     )
+    assert "_kanbanSetTaskModalStatusHint(null);" in create_body
 
     # 5. closeKanbanTaskModal clears the tracker so a stale value can't leak
     #    into the next open.
@@ -301,6 +308,7 @@ def test_kanban_edit_mode_preserves_status_when_dropdown_untouched():
     assert close_match
     close_body = close_match.group(1)
     assert "_kanbanTaskModalInitialDisplayedStatus = null" in close_body
+    assert "_kanbanSetTaskModalStatusHint(null, null);" in close_body
 
 
 def test_kanban_assignee_dropdown_uses_select_not_freetext():

From 45a525329238724d1929a452cb8e1abbc50d3cdb Mon Sep 17 00:00:00 2001
From: Frank Song <franksong2702@gmail.com>
Date: Sun, 10 May 2026 14:49:30 +0800
Subject: [PATCH 2/3] fix(i18n): add kanban status hint key to all locales for
 #1994

---
 static/i18n.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/static/i18n.js b/static/i18n.js
index e44f427e621..0a884032116 100644
--- a/static/i18n.js
+++ b/static/i18n.js
@@ -1590,6 +1590,7 @@ const LOCALES = {
     kanban_status_running: '実行中',
     kanban_status_blocked: 'ブロック中',
     kanban_status_done: '完了',
+    kanban_status_original_hint: 'Actual status: {0}. This dialog only supports Triage/Todo/Ready edits.',
     kanban_comments_count: 'コメント ({0})',
     kanban_events_count: 'イベント ({0})',
     kanban_links: 'リンク',
@@ -2491,6 +2492,7 @@ const LOCALES = {
     kanban_status_running: 'Running',
     kanban_status_blocked: 'Blocked',
     kanban_status_done: 'Done',
+    kanban_status_original_hint: 'Actual status: {0}. This dialog only supports Triage/Todo/Ready edits.',
     kanban_comments_count: 'Comments ({0})',
     kanban_events_count: 'Events ({0})',
     kanban_links: 'Links',
@@ -3493,6 +3495,7 @@ const LOCALES = {
     kanban_status_running: 'Running',
     kanban_status_blocked: 'Blocked',
     kanban_status_done: 'Done',
+    kanban_status_original_hint: 'Actual status: {0}. This dialog only supports Triage/Todo/Ready edits.',
     kanban_comments_count: 'Comments ({0})',
     kanban_events_count: 'Events ({0})',
     kanban_links: 'Links',
@@ -4483,6 +4486,7 @@ const LOCALES = {
     kanban_status_running: 'Running',
     kanban_status_blocked: 'Blocked',
     kanban_status_done: 'Done',
+    kanban_status_original_hint: 'Actual status: {0}. This dialog only supports Triage/Todo/Ready edits.',
     kanban_comments_count: 'Comments ({0})',
     kanban_events_count: 'Events ({0})',
     kanban_links: 'Links',
@@ -5494,6 +5498,7 @@ const LOCALES = {
     kanban_status_running: 'Running',
     kanban_status_blocked: 'Blocked',
     kanban_status_done: 'Done',
+    kanban_status_original_hint: 'Actual status: {0}. This dialog only supports Triage/Todo/Ready edits.',
     kanban_comments_count: 'Comments ({0})',
     kanban_events_count: 'Events ({0})',
     kanban_links: 'Links',
@@ -7649,6 +7654,7 @@ const LOCALES = {
     kanban_status_running: 'Running',
     kanban_status_blocked: 'Blocked',
     kanban_status_done: 'Done',
+    kanban_status_original_hint: 'Actual status: {0}. This dialog only supports Triage/Todo/Ready edits.',
     kanban_comments_count: 'Comments ({0})',
     kanban_events_count: 'Events ({0})',
     kanban_links: 'Links',
@@ -8615,6 +8621,7 @@ const LOCALES = {
     kanban_status_running: 'Running',
     kanban_status_blocked: 'Blocked',
     kanban_status_done: 'Done',
+    kanban_status_original_hint: 'Actual status: {0}. This dialog only supports Triage/Todo/Ready edits.',
     kanban_comments_count: 'Comments ({0})',
     kanban_events_count: 'Events ({0})',
     kanban_links: 'Links',

From 42a23818b3f2c8b2b068a204a14eff5f36108d12 Mon Sep 17 00:00:00 2001
From: Frank Song <franksong2702@gmail.com>
Date: Sun, 10 May 2026 14:57:51 +0800
Subject: [PATCH 3/3] Fix 1974: trap focus in kanban modals

---
 static/panels.js               | 68 ++++++++++++++++++++++++++++++++++
 tests/test_kanban_ui_static.py | 53 ++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/static/panels.js b/static/panels.js
index ebb79f924d1..33008cad894 100644
--- a/static/panels.js
+++ b/static/panels.js
@@ -1679,6 +1679,7 @@ async function createKanbanTask(){
 let _kanbanTaskModalMode = 'create';   // 'create' | 'edit'
 let _kanbanTaskModalEditingId = null;  // task id when mode === 'edit'
 let _kanbanProfileNamesCache = null;   // populated lazily on first modal open
+let _kanbanTaskModalFocusCleanup = null;
 // Status the modal *displayed* on edit-mode open.  If the user doesn't touch
 // the dropdown, we must NOT send `status` in the PATCH payload — otherwise
 // editing a task whose real status is non-editable in this dropdown
@@ -1687,6 +1688,7 @@ let _kanbanProfileNamesCache = null;   // populated lazily on first modal open
 // review: editing a 'running' task without touching status was reclaiming
 // the worker and moving the task back to triage.
 let _kanbanTaskModalInitialDisplayedStatus = null;
+let _kanbanBoardModalFocusCleanup = null;
 
 async function _kanbanLoadProfileNames(){
   // Hit /api/profiles once per session and cache; refresh is cheap if needed.
@@ -1785,6 +1787,11 @@ function openKanbanCreate(){
   });
   _kanbanPopulateTenantDatalist();
   modal.hidden = false;
+  if (_kanbanTaskModalFocusCleanup) {
+    _kanbanTaskModalFocusCleanup();
+    _kanbanTaskModalFocusCleanup = null;
+  }
+  _kanbanTaskModalFocusCleanup = _trapModalFocus(modal);
   setTimeout(() => {
     const titleEl = document.getElementById('kanbanTaskModalTitleInput');
     if (titleEl) titleEl.focus();
@@ -1834,6 +1841,11 @@ async function openKanbanEdit(taskId){
   _kanbanSetTaskModalLabels('edit');
   _kanbanPopulateTenantDatalist();
   modal.hidden = false;
+  if (_kanbanTaskModalFocusCleanup) {
+    _kanbanTaskModalFocusCleanup();
+    _kanbanTaskModalFocusCleanup = null;
+  }
+  _kanbanTaskModalFocusCleanup = _trapModalFocus(modal);
   setTimeout(() => {
     const titleEl = document.getElementById('kanbanTaskModalTitleInput');
     if (titleEl) { titleEl.focus(); titleEl.select(); }
@@ -1901,6 +1913,44 @@ function _kanbanPopulateTenantDatalist(){
   if (tList) tList.innerHTML = tenants.map(v => `<option value="${esc(v)}"></option>`).join('');
 }
 
+function _trapModalFocus(modalEl){
+  if (!modalEl) return () => {};
+  const selector = 'a[href], button, textarea, input, select, summary, [tabindex]:not([tabindex="-1"])';
+  const collect = () => {
+    const candidates = Array.from(modalEl.querySelectorAll(selector));
+    return candidates.filter((el) => {
+      if (el.disabled || el.hidden) return false;
+      const style = getComputedStyle(el);
+      if (style.display === 'none' || style.visibility === 'hidden') return false;
+      return el.tabIndex >= 0;
+    });
+  };
+  let focusableEls = collect();
+  const onKeyDown = (ev) => {
+    if (ev.key !== 'Tab') return;
+    if (!focusableEls.length) {
+      ev.preventDefault();
+      return;
+    }
+    const current = document.activeElement;
+    let idx = focusableEls.indexOf(current);
+    if (idx === -1) {
+      ev.preventDefault();
+      focusableEls[0].focus();
+      return;
+    }
+    if (ev.shiftKey) idx -= 1;
+    else idx += 1;
+    idx = (idx + focusableEls.length) % focusableEls.length;
+    ev.preventDefault();
+    focusableEls[idx].focus();
+  };
+  modalEl.addEventListener('keydown', onKeyDown);
+  return () => {
+    modalEl.removeEventListener('keydown', onKeyDown);
+  };
+}
+
 function closeKanbanTaskModal(){
   const modal = document.getElementById('kanbanTaskModal');
   if (modal) modal.hidden = true;
@@ -1908,6 +1958,10 @@ function closeKanbanTaskModal(){
   _kanbanTaskModalEditingId = null;
   _kanbanTaskModalInitialDisplayedStatus = null;
   _kanbanSetTaskModalStatusHint(null, null);
+  if (_kanbanTaskModalFocusCleanup) {
+    _kanbanTaskModalFocusCleanup();
+    _kanbanTaskModalFocusCleanup = null;
+  }
   document.removeEventListener('keydown', _kanbanTaskModalKey);
 }
 
@@ -2346,6 +2400,11 @@ function openKanbanCreateBoard(){
   document.getElementById('kanbanBoardModalColor').value = '#7aa2ff';
   document.getElementById('kanbanBoardModalError').textContent = '';
   modal.hidden = false;
+  if (_kanbanBoardModalFocusCleanup) {
+    _kanbanBoardModalFocusCleanup();
+    _kanbanBoardModalFocusCleanup = null;
+  }
+  _kanbanBoardModalFocusCleanup = _trapModalFocus(modal);
   // Auto-focus name field
   setTimeout(() => document.getElementById('kanbanBoardModalName').focus(), 50);
   // Auto-suggest slug from name as user types
@@ -2385,6 +2444,11 @@ function openKanbanRenameBoard(){
   document.getElementById('kanbanBoardModalColor').value = meta.color || '#7aa2ff';
   document.getElementById('kanbanBoardModalError').textContent = '';
   modal.hidden = false;
+  if (_kanbanBoardModalFocusCleanup) {
+    _kanbanBoardModalFocusCleanup();
+    _kanbanBoardModalFocusCleanup = null;
+  }
+  _kanbanBoardModalFocusCleanup = _trapModalFocus(modal);
   setTimeout(() => document.getElementById('kanbanBoardModalName').focus(), 50);
   document.addEventListener('keydown', _kanbanBoardModalEsc);
 }
@@ -2396,6 +2460,10 @@ function _kanbanBoardModalEsc(ev){
 function closeKanbanBoardModal(){
   const modal = document.getElementById('kanbanBoardModal');
   if (modal) modal.hidden = true;
+  if (_kanbanBoardModalFocusCleanup) {
+    _kanbanBoardModalFocusCleanup();
+    _kanbanBoardModalFocusCleanup = null;
+  }
   document.removeEventListener('keydown', _kanbanBoardModalEsc);
 }
 
diff --git a/tests/test_kanban_ui_static.py b/tests/test_kanban_ui_static.py
index 1e1f7e3c721..e12ec73218a 100644
--- a/tests/test_kanban_ui_static.py
+++ b/tests/test_kanban_ui_static.py
@@ -311,6 +311,59 @@ def test_kanban_edit_mode_preserves_status_when_dropdown_untouched():
     assert "_kanbanSetTaskModalStatusHint(null, null);" in close_body
 
 
+def test_kanban_modal_focus_trap_helper_exists():
+    """Shared focus-trap helper should exist and attach/remove Tab key handling."""
+    assert "function _trapModalFocus" in PANELS
+    fn = re.search(r"function _trapModalFocus\([^)]*\)\{(.*?)\n\}", PANELS, re.DOTALL)
+    assert fn, "_trapModalFocus() not found"
+    fn_body = fn.group(1)
+    assert "addEventListener('keydown'" in fn_body
+    assert "removeEventListener('keydown'" in fn_body
+    assert "ev.key !== 'Tab'" in fn_body or "ev.key === 'Tab'" in fn_body
+
+
+def test_kanban_task_modal_focus_trap_is_installed_and_removed():
+    """Task modal open calls should install focus trap and close should tear it down."""
+    create_match = re.search(r"function openKanbanCreate\(\)\{(.*?)\n\}", PANELS, re.DOTALL)
+    assert create_match, "openKanbanCreate() not found"
+    create_body = create_match.group(1)
+    assert "_kanbanTaskModalFocusCleanup = _trapModalFocus(modal);" in create_body
+    assert "if (_kanbanTaskModalFocusCleanup) {" in create_body
+
+    edit_match = re.search(r"async function openKanbanEdit\([^)]*\)\{(.*?)\n\}", PANELS, re.DOTALL)
+    assert edit_match, "openKanbanEdit() not found"
+    edit_body = edit_match.group(1)
+    assert "_kanbanTaskModalFocusCleanup = _trapModalFocus(modal);" in edit_body
+    assert "if (_kanbanTaskModalFocusCleanup) {" in edit_body
+
+    close_match = re.search(r"function closeKanbanTaskModal\(\)\{(.*?)\n\}", PANELS, re.DOTALL)
+    assert close_match, "closeKanbanTaskModal() not found"
+    close_body = close_match.group(1)
+    assert "if (_kanbanTaskModalFocusCleanup) {" in close_body
+    assert "_kanbanTaskModalFocusCleanup = null;" in close_body
+
+
+def test_kanban_board_modal_focus_trap_is_installed_and_removed():
+    """Board modal open calls should install focus trap and close should tear it down."""
+    create_board_match = re.search(r"function openKanbanCreateBoard\(\)\{(.*?)\n\}", PANELS, re.DOTALL)
+    assert create_board_match, "openKanbanCreateBoard() not found"
+    create_board_body = create_board_match.group(1)
+    assert "_kanbanBoardModalFocusCleanup = _trapModalFocus(modal);" in create_board_body
+    assert "if (_kanbanBoardModalFocusCleanup) {" in create_board_body
+
+    rename_board_match = re.search(r"function openKanbanRenameBoard\(\)\{(.*?)\n\}", PANELS, re.DOTALL)
+    assert rename_board_match, "openKanbanRenameBoard() not found"
+    rename_board_body = rename_board_match.group(1)
+    assert "_kanbanBoardModalFocusCleanup = _trapModalFocus(modal);" in rename_board_body
+    assert "if (_kanbanBoardModalFocusCleanup) {" in rename_board_body
+
+    close_board_match = re.search(r"function closeKanbanBoardModal\(\)\{(.*?)\n\}", PANELS, re.DOTALL)
+    assert close_board_match, "closeKanbanBoardModal() not found"
+    close_board_body = close_board_match.group(1)
+    assert "if (_kanbanBoardModalFocusCleanup) {" in close_board_body
+    assert "_kanbanBoardModalFocusCleanup = null;" in close_board_body
+
+
 def test_kanban_assignee_dropdown_uses_select_not_freetext():
     """Assignee must be a <select> populated from /api/profiles + board history,
     not a free-text input. Free-text invites typos that the dispatcher silently