diff --git a/.env.example b/.env.example
index 938f023b12f..19dff7dc1cd 100644
--- a/.env.example
+++ b/.env.example
@@ -16,7 +16,7 @@
 # HERMES_WEBUI_PORT=8787
 
 # Where to store sessions, workspaces, and other state (default: ~/.hermes/webui-mvp)
-# HERMES_WEBUI_STATE_DIR=~/.hermes/webui-mvp
+# HERMES_WEBUI_STATE_DIR=~/.hermes/webui
 
 # Default workspace directory shown on first launch
 # HERMES_WEBUI_DEFAULT_WORKSPACE=~/workspace
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d40ac1c250..5ff8b6e4c9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,19 @@
 
 ## [Unreleased]
 
-### Fixed
+## [v0.50.245] — 2026-04-30
+
+### Fixed
+- **Cron `Run Now` no longer crashes with `NameError: run_job is not defined`** — `_run_cron_tracked()` runs in a worker thread but referenced `run_job` only via a local import inside `_handle_cron_run()` (a different scope). Manual cron execution now imports `run_job` inside the worker function itself, and the redundant import is removed from the route handler. Adds AST-based regression tests so future refactors can't silently re-break the worker-thread scope. (`api/routes.py`, `tests/test_cron_run_job_import.py`) @fxd-jason — PR #1317, fixes #1310 (also addressed by #1312/#1329, closed as duplicates)
+- **Context auto-compressed banner no longer repeats every turn after first compression** — the fallback compression detector compared cumulative `compression_count > 0`, which stays true forever after the first compression event, so the banner re-fired on every subsequent turn. Now snapshots `compression_count` before `run_conversation()` and compares against the snapshot, so the banner only fires when compression actually happens during the current turn. (`api/streaming.py`) @qxxaa — PR #1316
+- **Mobile workspace panel sliver and composer footer overlap (#1300)** — saved desktop workspace-panel widths leaked into compact/mobile layouts, leaving a thin right-edge workspace sliver and a stale shadow on closed panels. Composer footer controls also showed icon/text overlap at intermediate widths when sidebars constrained the chat column. The fix clears/reapplies the rightpanel inline width only when the viewport is outside the compact/mobile breakpoint, hides the closed off-canvas shadow, and adds staged composer-footer container queries so workspace/model labels collapse before they overlap. (`static/boot.js`, `static/style.css`, `tests/test_mobile_layout.py`) @franksong2702 — PR #1328, fixes #1300
+- **Streaming sessions stay visible in the sidebar during their first turn** — the `Untitled + 0-messages` filter (#1171) hid sessions during the initial streaming turn because PR #1184 deferred the first `save()` until the first message landed. Navigating away during a long first turn made the active conversation disappear from the sidebar (looked like data loss to users). The filter now exempts sessions with `active_stream_id` (index path) or with `active_stream_id` plus `pending_user_message` (full-scan path), so in-progress conversations remain visible while truly empty scratch sessions are still hidden. 7 new regression tests cover both filter paths and edge cases. (`api/models.py`, `tests/test_streaming_session_sidebar.py`) @franksong2702 — PR #1330, fixes #1327
+- **Default model rehydration when providers share slash-qualified IDs (#1313)** — `_deduplicate_model_ids()` only de-duplicated bare IDs and skipped slash-qualified IDs entirely, so when two providers exposed the same `vendor/model` (e.g. two custom providers both listing `google/gemma-4-27b`), the dropdown contained duplicate `<option value>` entries and reopening Preferences could snap the saved default model back to the first provider that shared the ID. The dedupe now covers slash IDs as well, the configured-model badge lookup respects the matching provider, and the frontend matcher prefers the configured `active_provider` when rehydrating a saved default model. (`api/config.py`, `static/panels.js`, `static/ui.js`, `tests/test_issue1228_model_picker_duplicate_ids.py`, `tests/test_model_picker_badges.py`) @hacker2005 — PR #1326, fixes #1313
+- **Configured fallback models always appear in the dropdown** — the model picker only rendered configured models that already existed in the loaded `<select>` options, so when `/api/models` exposed a fallback chain in `configured_model_badges` but the underlying provider's catalog (especially `local-ollama`) was empty or partial, the **Configured** section showed an incomplete chain. The dropdown now synthesizes entries from `configured_model_badges` for any configured model missing from the catalog, sorts them as primary → fallback 1 → fallback N, and renders them under a single "Configured" header above the per-provider groups. (`static/ui.js`, `tests/test_model_picker_badges.py`) @renatomott — PR #1322
+- **Duplicate header copy buttons on language-fenced code blocks** — for code blocks with a language header, the copy button is appended to the sibling `.pre-header`, not inside `<pre>`, but the existing duplicate guard only checked inside `<pre>`. Repeated post-render passes (cache replays, streaming updates) could append duplicate copy buttons in the header. The guard now also checks the header before creating a new button. (`static/ui.js`, `tests/test_issue1096_copy_buttons.py`) @dso2ng — PR #1324, fixes #1096
+- **zh-Hant locale labels — restore Traditional Chinese in tree/raw view and MCP server settings** — a recent locale-merge accidentally left Russian strings in the zh-Hant block for tree-toggle labels, the parse-failed note, and Settings → System → MCP Servers. zh-TW users saw mixed Russian/Chinese UI text in those areas. The labels are now restored to Traditional Chinese, plus a regression test that asserts no Cyrillic characters can slip back into the zh-Hant block. (`static/i18n.js`, `tests/test_chinese_locale.py`) @dso2ng — PR #1323
+- **Docker `HEALTHCHECK` instruction added** — the Dockerfile was missing a `HEALTHCHECK`, so `docker ps` couldn't show health, Docker Compose `depends_on: condition: service_healthy` didn't work, and orchestration tools (K8s, Swarm) couldn't use native health probes. Added a 30s-interval HEALTHCHECK that hits the existing `/health` endpoint. (`Dockerfile`) @zichen0116 — PR #1332
+- **`.env.example` state-dir default aligned with `bootstrap.py`** — `HERMES_WEBUI_STATE_DIR` in `.env.example` referenced the obsolete `~/.hermes/webui-mvp` path while `bootstrap.py` and `docker-compose.yml` already use `~/.hermes/webui`. Updated the example file so users following it land in the same state dir as the rest of the codebase. (`.env.example`) @zichen0116 — PR #1331
 
 ## [v0.50.244] — 2026-04-30
 
diff --git a/Dockerfile b/Dockerfile
index 61462fd0128..26d980228e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -92,5 +92,8 @@ ENV HERMES_WEBUI_PORT=8787
 
 EXPOSE 8787
 
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
+  CMD curl -f http://localhost:8787/health || exit 1
+
 CMD ["/hermeswebui_init.bash"]
 
diff --git a/api/config.py b/api/config.py
index 406261e2d7c..e49ba23a024 100644
--- a/api/config.py
+++ b/api/config.py
@@ -880,23 +880,23 @@ def _apply_provider_prefix(
 def _deduplicate_model_ids(groups: list[dict]) -> None:
     """Ensure every model ID across groups is globally unique.
 
-    When multiple providers expose the same bare model ID (e.g. two
-    custom providers both listing ``gpt-5.4``), the dropdown cannot
-    distinguish them.  This post-process detects such collisions and
-    prefixes colliding entries with ``@provider_id:`` so the frontend
-    can treat them as distinct options.
-
-    The first occurrence (in group order) is left bare for backward
-    compatibility with sessions that already store the bare model name.
-    If that provider is later removed from the config, the next cache
-    rebuild re-runs dedup — the remaining provider becomes the sole
-    occurrence and is left bare, so the session still matches.
+    When multiple providers expose the same model ID (either bare names like
+    ``gpt-5.4`` or slash-qualified IDs like ``google/gemma-4-27b``), the
+    dropdown cannot distinguish them. This post-process detects such
+    collisions and prefixes colliding entries with ``@provider_id:`` so the
+    frontend can treat them as distinct options.
+
+    The first occurrence (in provider-id order) is left unchanged for backward
+    compatibility with sessions that already store the original bare/slash
+    model name. If that provider is later removed from the config, the next
+    cache rebuild re-runs dedup — the remaining provider becomes the sole
+    occurrence and is left unchanged, so the session still matches.
 
     .. note::
-       The "first occurrence wins" rule means the bare ID is not stable
+       The "first occurrence wins" rule means the unchanged ID is not stable
        across config changes (adding, removing, or reordering providers).
        This is acceptable because the dedup runs on every cache rebuild,
-       so sessions always resolve to the current canonical bare ID.
+       so sessions always resolve to the current canonical unchanged ID.
 
     The ``@provider_id:model`` format is consistent with the existing
     ``_apply_provider_prefix()`` function and is handled by
@@ -908,8 +908,8 @@ def _deduplicate_model_ids(groups: list[dict]) -> None:
     if not groups:
         return
 
-    # Collect {bare_id: [(group_idx, model_idx), ...]} in alphabetical
-    # provider_id order so that the "first occurrence stays bare" rule is
+    # Collect {model_id: [(group_idx, model_idx), ...]} in alphabetical
+    # provider_id order so that the "first occurrence stays unchanged" rule is
     # deterministic across config edits (adding/removing/reordering providers).
     sorted_group_indices = sorted(
         range(len(groups)),
@@ -918,34 +918,29 @@ def _deduplicate_model_ids(groups: list[dict]) -> None:
     id_map: dict[str, list[tuple[int, int]]] = {}
     for gi in sorted_group_indices:
         group = groups[gi]
-        pid = group.get("provider_id", "")
         for mi, model in enumerate(group.get("models", [])):
-            mid = model.get("id", "")
-            # Skip IDs that are already provider-qualified
-            if mid.startswith("@") or "/" in mid:
+            mid = str(model.get("id", "") or "").strip()
+            # Skip IDs that are already provider-qualified.
+            if not mid or mid.startswith("@"):
                 continue
             id_map.setdefault(mid, []).append((gi, mi))
 
-    # For any bare ID appearing in 2+ groups, prefix all but the first
-    # occurrence.  The first stays bare for backward compat; the rest
-    # get ``@provider_id:id`` and a disambiguated label.
+    # For any ID appearing in 2+ groups, prefix all but the first occurrence.
     # This handles N>2 providers correctly: the loop iterates over all
     # occurrences after the first, prefixing each with its own provider_id.
-    for bare_id, locations in id_map.items():
+    for original_id, locations in id_map.items():
         if len(locations) < 2:
             continue
-        # Prefix all occurrences after the first
         for gi, mi in locations[1:]:
             group = groups[gi]
             model = group["models"][mi]
             pid = group.get("provider_id", "")
-            model["id"] = f"@{pid}:{bare_id}"
+            model["id"] = f"@{pid}:{original_id}"
             provider_name = group.get("provider", pid)
-            # Update label to show provider for clarity
-            if model.get("label") != bare_id:
+            if model.get("label") != original_id:
                 model["label"] = f"{model['label']} ({provider_name})"
             else:
-                model["label"] = f"{bare_id} ({provider_name})"
+                model["label"] = f"{original_id} ({provider_name})"
 
 
 def resolve_model_provider(model_id: str) -> tuple:
@@ -1475,6 +1470,12 @@ def _build_configured_model_badges() -> dict[str, dict[str, str]]:
 
             option_ids = [m.get("id", "") for g in groups for m in g.get("models", []) if m.get("id")]
             option_lookup = {str(opt_id): str(opt_id) for opt_id in option_ids}
+            option_provider_lookup = {
+                str(m.get("id")): str(g.get("provider_id") or "")
+                for g in groups
+                for m in g.get("models", [])
+                if m.get("id")
+            }
             norm_lookup: dict[str, list[str]] = {}
             for opt_id in option_ids:
                 norm_lookup.setdefault(_norm_model_id(opt_id), []).append(opt_id)
@@ -1493,8 +1494,9 @@ def _build_configured_model_badges() -> dict[str, dict[str, str]]:
                         raw_candidates.append(candidate)
 
                 match_id = None
+                exact_match = next((option_lookup[c] for c in raw_candidates if c in option_lookup), None)
                 for candidate in raw_candidates:
-                    if candidate in option_lookup:
+                    if candidate in option_lookup and option_provider_lookup.get(candidate) == provider:
                         match_id = option_lookup[candidate]
                         break
                 if match_id is None:
@@ -1504,15 +1506,18 @@ def _build_configured_model_badges() -> dict[str, dict[str, str]]:
                         if not matches:
                             continue
                         provider_match = next(
-                            (m for m in matches if m.startswith(f"@{provider}:") or m.startswith(f"{provider}/")),
+                            (m for m in matches if option_provider_lookup.get(m) == provider),
                             None,
                         )
-                        match_id = provider_match or matches[0]
+                        match_id = provider_match or exact_match or matches[0]
                         if match_id:
                             break
 
                 badge_payload = {"role": entry["role"], "label": entry["label"], "provider": provider}
                 for candidate in raw_candidates:
+                    candidate_provider = option_provider_lookup.get(candidate)
+                    if candidate_provider and candidate_provider != provider:
+                        continue
                     badges[candidate] = badge_payload
                 if match_id:
                     badges[match_id] = badge_payload
diff --git a/api/models.py b/api/models.py
index 091895af3fe..981d0ccff35 100644
--- a/api/models.py
+++ b/api/models.py
@@ -769,9 +769,16 @@ def all_sessions():
             # No grace window: a 0-message Untitled session is never shown in the list
             # regardless of age. This means page refreshes and accidental New Conversation
             # clicks never leave orphan entries in the sidebar.
+            #
+            # Exception: sessions with active_stream_id set are actively streaming (#1327).
+            # #1184 deferred the first save() until the first message, so during the
+            # initial streaming turn the session still looks like Untitled+0-messages.
+            # Without this exemption, navigating away during a long first turn causes
+            # the session to vanish from the sidebar.
             result = [s for s in result if not (
                 s.get('title', 'Untitled') == 'Untitled'
                 and s.get('message_count', 0) == 0
+                and not s.get('active_stream_id')
             )]
             result = [s for s in result if not _hide_from_default_sidebar(s)]
             # Backfill: sessions created before Sprint 22 have no profile tag.
@@ -796,10 +803,12 @@ def all_sessions():
     out.sort(key=lambda s: (getattr(s, 'pinned', False), _session_sort_timestamp(s)), reverse=True)
     # Hide empty Untitled sessions from the UI entirely — kept consistent with the
     # index-path filter above. No grace window: a 0-message Untitled session is
-    # never shown regardless of age (#1171).
+    # never shown regardless of age (#1171).  Same streaming exemption as above (#1327).
     result = [s.compact(include_runtime=True, active_stream_ids=active_stream_ids) for s in out if not (
         s.title == 'Untitled'
         and len(s.messages) == 0
+        and not s.active_stream_id
+        and not s.pending_user_message
     )]
     result = [s for s in result if not _hide_from_default_sidebar(s)]
     for s in result:
diff --git a/api/routes.py b/api/routes.py
index 8524c3e2125..7ec990f5008 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -94,6 +94,7 @@ def _cron_output_content_window(text: str, limit: int = _CRON_OUTPUT_CONTENT_LIM
 
 def _run_cron_tracked(job):
     """Wrapper that tracks running state around cron.scheduler.run_job."""
+    from cron.scheduler import run_job  # import here — runs inside a worker thread
     try:
         run_job(job)
     finally:
@@ -3500,7 +3501,6 @@ def _handle_cron_run(handler, body):
     if not job_id:
         return bad(handler, "job_id required")
     from cron.jobs import get_job
-    from cron.scheduler import run_job
 
     job = get_job(job_id)
     if not job:
diff --git a/api/streaming.py b/api/streaming.py
index c7cdcc5217a..3d3b778a3c1 100644
--- a/api/streaming.py
+++ b/api/streaming.py
@@ -1883,6 +1883,10 @@ def on_tool(*cb_args, **cb_kwargs):
                 agent.ephemeral_system_prompt = _personality_prompt
             _previous_messages = list(s.messages or [])
             _previous_context_messages = list(_session_context_messages(s))
+            _pre_compression_count = getattr(
+                getattr(agent, 'context_compressor', None),
+                'compression_count', 0,
+            )
 
             # ── Periodic checkpoint during streaming (Issue #765) ──
             # The agent works on an internal copy of s.messages during run_conversation()
@@ -2107,7 +2111,7 @@ def _periodic_checkpoint():
                 # Also detect compression via the result dict or compressor state
                 if not _compressed:
                     _compressor = getattr(agent, 'context_compressor', None)
-                    if _compressor and getattr(_compressor, 'compression_count', 0) > 0:
+                    if _compressor and getattr(_compressor, 'compression_count', 0) > _pre_compression_count:
                         _compressed = True
                 # Notify the frontend that compression happened
                 if _compressed:
diff --git a/static/boot.js b/static/boot.js
index 5ef002925b1..f3cf8ea6e74 100644
--- a/static/boot.js
+++ b/static/boot.js
@@ -20,6 +20,23 @@ function _isCompactWorkspaceViewport(){
   return window.matchMedia('(max-width: 900px)').matches;
 }
 
+function _syncWorkspacePanelInlineWidth(){
+  const {panel}= _workspacePanelEls();
+  if(!panel) return;
+
+  const isCompact = _isCompactWorkspaceViewport();
+  if(isCompact){
+    if(panel.style.width) panel.style.removeProperty('width');
+    return;
+  }
+
+  const saved = localStorage.getItem('hermes-panel-w');
+  if(!saved) return;
+  const parsed = parseInt(saved, 10);
+  if(Number.isNaN(parsed) || parsed <= 0) return;
+  panel.style.width = `${parsed}px`;
+}
+
 function _workspacePanelEls(){
   return {
     layout: document.querySelector('.layout'),
@@ -578,6 +595,7 @@ document.querySelectorAll('.suggestion').forEach(btn=>{
 });
 
 window.addEventListener('resize',()=>{
+  _syncWorkspacePanelInlineWidth();
   syncWorkspacePanelState();
 });
 
@@ -592,8 +610,12 @@ window.addEventListener('resize',()=>{
     if(!handle || !targetEl) return;
 
     // Restore saved width
-    const saved = localStorage.getItem(storageKey);
-    if(saved) targetEl.style.width = saved + 'px';
+    if(storageKey === 'hermes-panel-w'){
+      _syncWorkspacePanelInlineWidth();
+    }else{
+      const saved = localStorage.getItem(storageKey);
+      if(saved) targetEl.style.width = saved + 'px';
+    }
 
     let startX=0, startW=0;
 
diff --git a/static/i18n.js b/static/i18n.js
index 9ad3f2edbc8..9b29b26e242 100644
--- a/static/i18n.js
+++ b/static/i18n.js
@@ -3028,7 +3028,7 @@ const LOCALES = {
     diff_too_large: 'Patch 文件过大，无法内联显示',
     tree_view: '树形',
     raw_view: '原始',
-    parse_failed_note: '\u89e3\u6790\u5931\u8d25',
+    parse_failed_note: '解析失败',
     you: '\u4f60',
     mcp_servers_title: 'MCP 服务器',
     mcp_servers_desc: '管理 config.yaml 中配置的 MCP 服务器。',
@@ -3756,32 +3756,32 @@ const LOCALES = {
     diff_loading: '載入 diff',
     diff_error: '無法載入 patch 檔案',
     diff_too_large: 'Patch 檔案過大，無法內聯顯示',
-    tree_view: 'Дерево',
-    raw_view: 'Исходный',
-    parse_failed_note: '\u89e3\u6790\u5931\u8d25',
+    tree_view: '樹狀',
+    raw_view: '原始',
+    parse_failed_note: '解析失敗',
     you: '\u4f60',
-    mcp_servers_title: 'MCP Серверы',
-    mcp_servers_desc: 'Управление серверами Model Context Protocol в config.yaml.',
-    mcp_no_servers: 'MCP серверы не настроены.',
-    mcp_add_server: '+ Добавить сервер',
-    mcp_field_name: 'Имя сервера',
-    mcp_transport_label: 'Тип транспорта',
-    mcp_field_command: 'Команда',
-    mcp_field_args: 'Аргументы (через запятую)',
+    mcp_servers_title: 'MCP 伺服器',
+    mcp_servers_desc: '管理 config.yaml 中設定的 MCP 伺服器。',
+    mcp_no_servers: '未設定 MCP 伺服器。',
+    mcp_add_server: '+ 新增伺服器',
+    mcp_field_name: '伺服器名稱',
+    mcp_transport_label: '傳輸類型',
+    mcp_field_command: '命令',
+    mcp_field_args: '參數（以逗號分隔）',
     mcp_field_url: 'URL',
-    mcp_field_timeout: 'Таймаут (секунды)',
-    mcp_save: 'Сохранить',
-    mcp_cancel: 'Отмена',
-    mcp_name_required: 'Требуется имя сервера.',
-    mcp_url_required: 'URL обязателен для HTTP.',
-    mcp_command_required: 'Команда обязательна для stdio.',
-    mcp_saved: 'MCP сервер сохранён.',
-    mcp_save_failed: 'Не удалось сохранить.',
-    mcp_delete_confirm_title: 'Удалить MCP сервер',
-    mcp_delete_confirm_message: 'Удалить MCP сервер «{0}»? Это необратимо.',
-    mcp_deleted: 'MCP сервер удалён.',
-    mcp_delete_failed: 'Не удалось удалить.',
-    mcp_load_failed: 'Не удалось загрузить MCP серверы.',
+    mcp_field_timeout: '逾時（秒）',
+    mcp_save: '儲存',
+    mcp_cancel: '取消',
+    mcp_name_required: '伺服器名稱為必填。',
+    mcp_url_required: 'HTTP 傳輸需要 URL。',
+    mcp_command_required: 'stdio 傳輸需要命令。',
+    mcp_saved: 'MCP 伺服器已儲存。',
+    mcp_save_failed: '儲存 MCP 伺服器失敗。',
+    mcp_delete_confirm_title: '刪除 MCP 伺服器',
+    mcp_delete_confirm_message: '刪除 MCP 伺服器「{0}」？此操作無法復原。',
+    mcp_deleted: 'MCP 伺服器已刪除。',
+    mcp_delete_failed: '刪除 MCP 伺服器失敗。',
+    mcp_load_failed: '載入 MCP 伺服器失敗。',
     thinking: '\u601d\u8003\u904e\u7a0b',
     expand_all: '\u5168\u90e8\u5c55\u958b',
     collapse_all: '\u5168\u90e8\u6298\u758a',
diff --git a/static/panels.js b/static/panels.js
index aee02104738..67865b3c730 100644
--- a/static/panels.js
+++ b/static/panels.js
@@ -2244,7 +2244,7 @@ async function switchToProfile(name) {
     // ── Apply model ────────────────────────────────────────────────────────
     if (data.default_model) {
       const sel = $('modelSelect');
-      const resolved = _applyModelToDropdown(data.default_model, sel);
+      const resolved = _applyModelToDropdown(data.default_model, sel, window._activeProvider||null);
       const modelToUse = resolved || data.default_model;
       S._pendingProfileModel = modelToUse;
       // Only patch the in-memory session model if we're NOT about to replace the session
@@ -2753,7 +2753,7 @@ async function loadSettingsPanel(){
       // picker renders blank for any user whose default was persisted without the
       // @-prefix — CLI-first users, legacy installs, etc.
       if(typeof _applyModelToDropdown==='function'){
-        _applyModelToDropdown(_settingsHermesDefaultModelOnOpen, modelSel);
+        _applyModelToDropdown(_settingsHermesDefaultModelOnOpen, modelSel, (models&&models.active_provider)||window._activeProvider||null);
       }else{
         modelSel.value=_settingsHermesDefaultModelOnOpen;
       }
diff --git a/static/style.css b/static/style.css
index 450a47c372e..e9a19cd76c6 100644
--- a/static/style.css
+++ b/static/style.css
@@ -840,7 +840,7 @@
   .attach-thumb{width:56px;height:56px;object-fit:cover;border-radius:4px;display:block;cursor:default;}
   textarea#msg{width:100%;background:transparent;border:none;outline:none;color:var(--text);font-size:16px;line-height:1.65;padding:12px 16px 6px;resize:none;min-height:44px;max-height:200px;font-family:inherit;}
   textarea#msg::placeholder{color:var(--muted);}
-  .composer-footer{display:flex;align-items:center;justify-content:space-between;gap:10px;padding:6px 10px 10px;position:relative;}
+  .composer-footer{display:flex;align-items:center;justify-content:space-between;gap:10px;padding:6px 10px 10px;position:relative;container-type:inline-size;container-name:composer-footer;}
   .composer-left{display:flex;align-items:center;gap:4px;min-width:0;flex:1;overflow-x:auto;overflow-y:hidden;scrollbar-width:none;}
   .composer-left::-webkit-scrollbar{display:none;}
   .composer-divider{width:1px;height:16px;background:var(--border);margin:0 3px;flex-shrink:0;}
@@ -1074,6 +1074,50 @@
     #btnCollapseWorkspacePanel{display:none;}
   }
 
+  @container composer-footer (max-width: 700px){
+    /* Stage 1: remove long workspace/model text first to avoid clipping.
+       The left sidebar + panel layout can consume width before right panel opens, so this
+       must be container-driven and independent of panel state. */
+    .composer-workspace-label,
+    .composer-workspace-chevron,
+    #composerWorkspaceLabel,
+    .composer-model-label,
+    .composer-model-chevron,
+    #composerModelLabel{display:none;}
+
+    .composer-workspace-chip,
+    .composer-model-chip{max-width:52px;min-width:44px;min-height:44px;padding:6px;justify-content:center;gap:0;font-size:11px;}
+    .composer-workspace-group{min-height:44px;}
+    .composer-workspace-files-btn{min-width:44px;padding:6px 8px;}
+    .composer-divider{display:none;}
+  }
+
+  @container composer-footer (max-width: 520px){
+    /* Stage 2: full icon-only for tighter widths. */
+    .composer-profile-label,
+    .composer-workspace-label,
+    .composer-model-label,
+    .composer-reasoning-label,
+    .composer-profile-chevron,
+    .composer-workspace-chevron,
+    .composer-model-chevron,
+    .composer-reasoning-chevron,
+    #composerProfileLabel,
+    #composerWorkspaceLabel,
+    #composerModelLabel,
+    #composerReasoningLabel{display:none;}
+
+    .composer-profile-chip,
+    .composer-model-chip,
+    .composer-reasoning-chip,
+    .composer-workspace-chip{max-width:44px;min-width:44px;min-height:44px;padding:6px;justify-content:center;gap:0;font-size:11px;}
+
+    .composer-workspace-group{min-height:44px;}
+    .composer-workspace-files-btn{min-width:44px;padding:6px 8px;}
+    .composer-workspace-chip{min-width:44px;max-width:44px;padding:6px 8px;gap:0;}
+    .composer-divider{display:none;}
+  }
+
   @media(max-width:640px){
     /* ── Sidebar: slide-in overlay instead of hidden ── */
     .sidebar{position:fixed;left:-300px;top:0;bottom:0;width:280px;z-index:200;
@@ -1091,10 +1135,12 @@
     /* Files button in topbar */
     .workspace-toggle-btn,.mobile-files-btn{display:inline-flex!important;}
     /* Right panel: slide-over from right */
-    .rightpanel{display:flex!important;position:fixed;right:-320px;top:0;bottom:0;
-      width:300px;z-index:200;transition:right .25s ease;
-      box-shadow:-4px 0 24px rgba(0,0,0,.4);}
-    .rightpanel.mobile-open{right:0;}
+    .rightpanel{display:flex!important;position:fixed;
+      --mobile-rightpanel-width:min(300px, 100vw);
+      right:calc(-1 * var(--mobile-rightpanel-width))!important;
+      top:0;bottom:0;width:var(--mobile-rightpanel-width)!important;max-width:100vw!important;z-index:200;transition:right .25s ease;
+      box-shadow:none!important;}
+    .rightpanel.mobile-open{right:0!important;box-shadow:-4px 0 24px rgba(0,0,0,.4)!important;}
     .rightpanel .resize-handle{display:none;}
     /* Topbar adjustments */
     .topbar{padding:8px 12px;gap:8px;}
@@ -1111,21 +1157,25 @@
     .composer-box{border-radius:12px;}
     .composer-box textarea{min-height:40px;}
     .composer-footer{padding:6px 8px 8px!important;gap:8px;}
-    /* icon-only composer chips below 768px */
     .composer-profile-label,
     .composer-workspace-label,
     .composer-model-label,
     .composer-reasoning-label,
     .composer-profile-chevron,
+    .composer-workspace-chevron,
     .composer-model-chevron,
-    .composer-reasoning-chevron{display:none;}
+    .composer-reasoning-chevron,
+    #composerProfileLabel,
+    #composerWorkspaceLabel,
+    #composerModelLabel,
+    #composerReasoningLabel{display:none;}
     .composer-profile-chip,
     .composer-model-chip,
     .composer-reasoning-chip{max-width:44px;min-width:44px;min-height:44px;padding:6px;justify-content:center;gap:0;font-size:11px;}
-    /* Workspace group: keep split layout on mobile — files icon + chevron-only picker */
     .composer-workspace-group{min-height:44px;}
     .composer-workspace-files-btn{min-width:44px;padding:6px 8px;}
-    .composer-workspace-chip{min-width:32px;padding:6px 8px;gap:0;}
+    .composer-workspace-chip{min-width:44px;max-width:44px;padding:6px 8px;gap:0;}
+    /* icon-only composer chips continue below mobile widths */
     .composer-divider{display:none;}
     .composer-status{max-width:96px;font-size:10px;}
     .send-btn{width:32px;height:32px;}
diff --git a/static/ui.js b/static/ui.js
index c2acc61de64..cffc8a3145c 100644
--- a/static/ui.js
+++ b/static/ui.js
@@ -192,16 +192,34 @@ window._configuredModelBadges=window._configuredModelBadges||{};
 // ── Smart model resolver ────────────────────────────────────────────────────
 // Finds the best matching option value in a <select> for a given model ID.
 // Handles mismatches like 'claude-sonnet-4-6' vs 'anthropic/claude-sonnet-4.6'.
-// Returns the matched option's value (already in the list), or null if no match.
-function _findModelInDropdown(modelId, sel){
+// When a preferred provider is supplied, duplicate normalized IDs prefer that
+// provider's option so Settings/profile rehydration doesn't snap back to the
+// first colliding entry.
+function _getOptionProviderId(opt){
+  if(!opt) return '';
+  const group=opt.parentElement;
+  if(group && group.tagName==='OPTGROUP' && group.dataset && group.dataset.provider){
+    return group.dataset.provider;
+  }
+  const value=String(opt.value||'');
+  if(value.startsWith('@') && value.includes(':')) return value.slice(1,value.indexOf(':'));
+  return '';
+}
+function _findModelInDropdown(modelId, sel, preferredProviderId){
   if(!modelId||!sel) return null;
-  const opts=Array.from(sel.options).map(o=>o.value);
-  // 1. Exact match
-  if(opts.includes(modelId)) return modelId;
-  // 2. Normalize: lowercase, strip namespace prefix, replace hyphens→dots
-  // Also strip @provider: prefix from deduplicated model IDs (#1228).
+  const options=Array.from(sel.options);
+  const opts=options.map(o=>o.value);
+  // 1. Normalize: lowercase, strip namespace prefix, replace hyphens→dots.
+  // Also strip @provider: prefix from deduplicated model IDs (#1228, #1313).
   const norm=s=>s.toLowerCase().replace(/^[^/]+\//,'').replace(/^@([^:]+:)+/,'').replace(/-/g,'.');
   const target=norm(modelId);
+  const preferred=String(preferredProviderId||'').toLowerCase();
+  if(preferred){
+    const providerMatch=options.find(o=>norm(o.value)===target && _getOptionProviderId(o).toLowerCase()===preferred);
+    if(providerMatch) return providerMatch.value;
+  }
+  // 2. Exact match
+  if(opts.includes(modelId)) return modelId;
   const exact=opts.find(o=>norm(o)===target);
   if(exact) return exact;
   // 3. Prefix/substring: require the candidate to start with the FULL normalized target
@@ -217,9 +235,9 @@ function _findModelInDropdown(modelId, sel){
 
 // Set the model picker to the best match for modelId.
 // Returns the resolved value that was actually set, or null if nothing matched.
-function _applyModelToDropdown(modelId, sel){
+function _applyModelToDropdown(modelId, sel, preferredProviderId){
   if(!modelId||!sel) return null;
-  const resolved=_findModelInDropdown(modelId,sel);
+  const resolved=_findModelInDropdown(modelId,sel,preferredProviderId);
   if(resolved){
     sel.value=resolved;
     if(sel.id==='modelSelect' && typeof syncModelChip==='function') syncModelChip();
@@ -260,7 +278,7 @@ async function populateModelDropdown(){
     }
     // Set default model from server if no localStorage preference
     if(data.default_model && !localStorage.getItem('hermes-webui-model')){
-      _applyModelToDropdown(data.default_model, sel);
+      _applyModelToDropdown(data.default_model, sel, data.active_provider||null);
     }
     if(typeof syncModelChip==='function') syncModelChip();
     // Kick off a background live-model fetch for the active provider.
@@ -410,15 +428,24 @@ function _normalizeConfiguredModelKey(modelId){
   return s.replace(/-/g,'.');
 }
 
-function _getConfiguredModelBadge(modelId,badgeMap){
+function _getConfiguredModelBadge(modelId,badgeMap,providerId){
   const map=badgeMap||window._configuredModelBadges||{};
   if(!modelId||!map) return null;
-  if(map[modelId]) return map[modelId];
+  const provider=String(providerId||'').toLowerCase();
+  const exact=map[modelId];
+  if(exact && (!provider || !exact.provider || String(exact.provider).toLowerCase()===provider)) return exact;
   const targetNorm=_normalizeConfiguredModelKey(modelId);
+  const matches=[];
   for(const [candidate,badge] of Object.entries(map)){
-    if(_normalizeConfiguredModelKey(candidate)===targetNorm) return badge;
+    if(_normalizeConfiguredModelKey(candidate)===targetNorm) matches.push(badge);
   }
-  return null;
+  if(!matches.length) return null;
+  if(provider){
+    const providerMatch=matches.find(badge=>String(badge&&badge.provider||'').toLowerCase()===provider);
+    if(providerMatch) return providerMatch;
+    return matches.length===1 ? matches[0] : null;
+  }
+  return matches[0];
 }
 
 function syncModelChip(){
@@ -461,14 +488,27 @@ function renderModelDropdown(){
   const _badgeMap=window._configuredModelBadges||{};
   for(const child of Array.from(sel.children)){
     if(child.tagName==='OPTGROUP'){
+      const providerId=child.dataset&&child.dataset.provider?child.dataset.provider:'';
       for(const opt of Array.from(child.children)){
-        _modelData.push({value:opt.value,name:esc(opt.textContent||getModelLabel(opt.value)),id:esc(opt.value),group:child.label||'',badge:_getConfiguredModelBadge(opt.value,_badgeMap)});
+        _modelData.push({value:opt.value,name:esc(opt.textContent||getModelLabel(opt.value)),id:esc(opt.value),group:child.label||'',badge:_getConfiguredModelBadge(opt.value,_badgeMap,providerId)});
       }
     }
     if(child.tagName==='OPTION'){
       _modelData.push({value:child.value,name:esc(child.textContent||getModelLabel(child.value)),id:esc(child.value),group:'',badge:_getConfiguredModelBadge(child.value,_badgeMap)});
     }
   }
+  const _existingConfiguredKeys=new Set(_modelData.map(existing=>_normalizeConfiguredModelKey(existing.value)));
+  for(const [modelId,badge] of Object.entries(_badgeMap)){
+    if(_existingConfiguredKeys.has(_normalizeConfiguredModelKey(modelId))) continue;
+    _modelData.push({
+      value:modelId,
+      name:esc(getModelLabel(modelId)),
+      id:esc(modelId),
+      group:'',
+      badge,
+    });
+    _existingConfiguredKeys.add(_normalizeConfiguredModelKey(modelId));
+  }
   // Create search input FIRST before filterModels definition
   const _scopeNote=document.createElement('div');
   _scopeNote.className='model-scope-note';
@@ -487,6 +527,15 @@ function renderModelDropdown(){
   _custRow.innerHTML=`<input class="model-custom-input" type="text" placeholder="${esc(t('model_custom_placeholder')||'e.g. openai/gpt-5.4')}" spellcheck="false" autocomplete="off"><button class="model-custom-btn" title="Use this model">${li('plus',12)}</button>`;
   const _ci=_custRow.querySelector('.model-custom-input');
   const _cb=_custRow.querySelector('.model-custom-btn');
+  const _configuredRank=(badge)=>{
+    if(!badge) return Number.POSITIVE_INFINITY;
+    if(badge.role==='primary') return 0;
+    if(badge.role==='fallback'){
+      const m=String(badge.label||'').match(/fallback\s+(\d+)/i);
+      return m?Number(m[1]):999;
+    }
+    return 500;
+  };
   // Filter function (defined AFTER _searchRow and _cust* are created)
   const _filterModels=(term)=>{
     term=term.trim().toLowerCase();
@@ -498,6 +547,16 @@ function renderModelDropdown(){
         found.add(m.value);
       }
     }
+    const matches=(m)=>!term||found.has(m.value);
+    const configuredModels=_modelData
+      .filter(m=>m.badge&&matches(m))
+      .sort((a,b)=>{
+        const configuredRankA=_configuredRank(a.badge);
+        const configuredRankB=_configuredRank(b.badge);
+        if(configuredRankA!==configuredRankB) return configuredRankA-configuredRankB;
+        return a.name.localeCompare(b.name);
+      });
+    const configuredIds=new Set(configuredModels.map(m=>m.value));
     // Clear and rebuild
     dd.innerHTML='';
     // Add search and custom elements first (CRITICAL: must be before models)
@@ -505,17 +564,12 @@ function renderModelDropdown(){
     dd.appendChild(_searchRow);
     dd.appendChild(_custSep);
     dd.appendChild(_custRow);
-    // Add models matching filter
-    let _lastGroup=null;
-    for(const m of _modelData){
-      if(!term||found.has(m.value)){
-        if(m.group&&m.group!==_lastGroup){
-          const heading=document.createElement('div');
-          heading.className='model-group';
-          heading.textContent=m.group;
-          dd.appendChild(heading);
-          _lastGroup=m.group;
-        }
+    if(configuredModels.length){
+      const configuredHeading=document.createElement('div');
+      configuredHeading.className='model-group';
+      configuredHeading.textContent=t('model_group_configured')||'Configured';
+      dd.appendChild(configuredHeading);
+      for(const m of configuredModels){
         const row=document.createElement('div');
         row.className='model-opt'+(m.value===sel.value?' active':'');
         const badgeHtml=m.badge?`<span class="model-opt-badge model-opt-badge--${esc(m.badge.role||'configured')}">${esc(m.badge.label||'Configured')}</span>`:'';
@@ -524,6 +578,24 @@ function renderModelDropdown(){
         dd.appendChild(row);
       }
     }
+    // Add remaining models matching filter
+    let _lastGroup=null;
+    for(const m of _modelData){
+      if(configuredIds.has(m.value)||!matches(m)) continue;
+      if(m.group&&m.group!==_lastGroup){
+        const heading=document.createElement('div');
+        heading.className='model-group';
+        heading.textContent=m.group;
+        dd.appendChild(heading);
+        _lastGroup=m.group;
+      }
+      const row=document.createElement('div');
+      row.className='model-opt'+(m.value===sel.value?' active':'');
+      const badgeHtml=m.badge?`<span class="model-opt-badge model-opt-badge--${esc(m.badge.role||'configured')}">${esc(m.badge.label||'Configured')}</span>`:'';
+      row.innerHTML=`<div class="model-opt-top"><span class="model-opt-name">${m.name}</span>${badgeHtml}</div><span class="model-opt-id">${m.id}</span>`;
+      row.onclick=()=>selectModelFromDropdown(m.value);
+      dd.appendChild(row);
+    }
     // Show "No results" if filtered and nothing matched
     if(term&&found.size===0){
       const noResult=document.createElement('div');
@@ -3712,7 +3784,8 @@ function addCopyButtons(container){
   if(!el) return;
   el.querySelectorAll('pre > code').forEach(codeEl=>{
     const pre=codeEl.parentElement;
-    if(pre.querySelector('.code-copy-btn')) return;
+    const header=pre.previousElementSibling;
+    if(pre.querySelector('.code-copy-btn')||(header&&header.classList.contains('pre-header')&&header.querySelector('.code-copy-btn'))) return;
     const btn=document.createElement('button');
     btn.className='code-copy-btn';
     btn.textContent=t('copy');
@@ -3723,7 +3796,6 @@ function addCopyButtons(container){
         setTimeout(()=>{btn.textContent=t('copy');},1500);
       }).catch(()=>{btn.textContent=t('copy_failed');setTimeout(()=>{btn.textContent=t('copy');},1500);});
     };
-    const header=pre.previousElementSibling;
     if(header&&header.classList.contains('pre-header')){
       header.style.display='flex';
       header.style.justifyContent='space-between';
diff --git a/tests/test_chinese_locale.py b/tests/test_chinese_locale.py
index e27561d2ac1..cac4217873a 100644
--- a/tests/test_chinese_locale.py
+++ b/tests/test_chinese_locale.py
@@ -109,3 +109,29 @@ def test_chinese_locale_has_no_duplicate_keys():
     keys = key_pattern.findall(extract_locale_block(src, "zh"))
     duplicates = sorted(k for k, count in Counter(keys).items() if count > 1)
     assert not duplicates, f"Chinese locale has duplicate keys: {duplicates}"
+
+
+def test_traditional_chinese_mcp_and_tree_labels_are_not_cyrillic():
+    """Regression for PR #1254/#1274 locale cross-paste fallout.
+
+    zh-Hant inherited Russian MCP/tree-view labels such as "MCP Серверы",
+    "Дерево", and "Исходный".  Those labels show up under JSON/YAML code
+    block tree toggles and Settings → System → MCP Servers for zh-TW users.
+    """
+    src = read(REPO / "static" / "i18n.js")
+    start = src.index("  'zh-Hant': {")
+    end = src.index("\n  pt:", start)
+    block = src[start:end]
+
+    expected = [
+        "tree_view: '樹狀'",
+        "raw_view: '原始'",
+        "parse_failed_note: '解析失敗'",
+        "mcp_servers_title: 'MCP 伺服器'",
+        "mcp_no_servers: '未設定 MCP 伺服器。'",
+        "mcp_add_server: '+ 新增伺服器'",
+    ]
+    for entry in expected:
+        assert entry in block
+
+    assert not re.search(r"[\u0400-\u04FF]", block), "zh-Hant locale contains Cyrillic text"
diff --git a/tests/test_cron_run_job_import.py b/tests/test_cron_run_job_import.py
new file mode 100644
index 00000000000..d0533fa376b
--- /dev/null
+++ b/tests/test_cron_run_job_import.py
@@ -0,0 +1,92 @@
+"""Regression test for #1312 / #1310 — _run_cron_tracked must import run_job.
+
+The function runs inside a worker thread (threading.Thread), so any
+names it references must be resolvable from that thread's scope.
+Before the fix, run_job was only imported inside _handle_cron_run
+(a local scope invisible to _run_cron_tracked), causing NameError.
+"""
+import ast
+import inspect
+from pathlib import Path
+
+import pytest
+
+ROUTES_PY = Path(__file__).resolve().parent.parent / "api" / "routes.py"
+
+
+def _get_function_source(func_name: str) -> str:
+    """Extract a top-level function's source via AST for stability."""
+    tree = ast.parse(ROUTES_PY.read_text(encoding="utf-8"))
+    for node in ast.iter_child_nodes(tree):
+        if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)) and node.name == func_name:
+            lines = ROUTES_PY.read_text(encoding="utf-8").splitlines()
+            return "\n".join(lines[node.lineno - 1 : node.end_lineno])
+    pytest.fail(f"Function {func_name} not found in {ROUTES_PY}")
+
+
+class TestRunCronTrackedImport:
+    """_run_cron_tracked must be self-contained — it runs in a worker thread."""
+
+    def test_run_job_imported_inside_function(self):
+        """run_job must be imported inside _run_cron_tracked, not relied on
+        from a caller's local scope."""
+        src = _get_function_source("_run_cron_tracked")
+        tree = ast.parse(src)
+        names_used = set()
+
+        class NameCollector(ast.NodeVisitor):
+            def visit_Name(self, node):
+                names_used.add(node.id)
+
+        ImportCollector = type(
+            "ImportCollector",
+            (ast.NodeVisitor,),
+            {
+                "imports": set(),
+                "visit_ImportFrom": lambda self, node: (
+                    self.imports.add(a.name for a in node.names),
+                ),
+            },
+        )
+
+        # Collect all names referenced in the function body
+        for node in ast.walk(tree):
+            if isinstance(node, ast.Name) and isinstance(node.ctx, ast.Load):
+                names_used.add(node.id)
+
+        # Collect imports inside the function
+        func_imports = set()
+        for node in ast.walk(tree):
+            if isinstance(node, ast.ImportFrom):
+                for alias in node.names:
+                    func_imports.add(alias.name if alias.asname is None else alias.asname)
+            elif isinstance(node, ast.Import):
+                for alias in node.names:
+                    func_imports.add(alias.name if alias.asname is None else alias.asname)
+
+        # run_job is referenced → must be imported inside the function
+        if "run_job" in names_used:
+            assert "run_job" in func_imports, (
+                "_run_cron_tracked references run_job but does not import it locally. "
+                "It runs in a worker thread and cannot rely on caller's local imports."
+            )
+
+    def test_handle_cron_run_does_not_import_run_job(self):
+        """After the fix, _handle_cron_run should NOT need to import run_job
+        itself — it's now _run_cron_tracked's responsibility."""
+        src = _get_function_source("_handle_cron_run")
+        tree = ast.parse(src)
+        imported_names = set()
+        for node in ast.walk(tree):
+            if isinstance(node, ast.ImportFrom):
+                for alias in node.names:
+                    imported_names.add(alias.name if alias.asname is None else alias.asname)
+        assert "run_job" not in imported_names, (
+            "_handle_cron_run still imports run_job — it should be moved to "
+            "_run_cron_tracked to avoid the NameError in worker threads."
+        )
+
+    def test_run_cron_tracked_calls_run_job(self):
+        """Sanity: the function still actually calls run_job."""
+        src = _get_function_source("_run_cron_tracked")
+        assert "run_job" in src, "_run_cron_tracked should call run_job"
diff --git a/tests/test_issue1096_copy_buttons.py b/tests/test_issue1096_copy_buttons.py
index 9e029ced79a..a504ef8999f 100644
--- a/tests/test_issue1096_copy_buttons.py
+++ b/tests/test_issue1096_copy_buttons.py
@@ -88,12 +88,28 @@ def test_code_copy_uses_copyText(self):
         # Find addCopyButtons function
         m = re.search(r"function addCopyButtons", src)
         assert m, "addCopyButtons must exist"
-        fn = src[m.start():m.start() + 800]
+        fn = src[m.start():m.start() + 1000]
         assert "_copyText" in fn, \
             "Code copy button must use _copyText function"
         assert "codeEl.textContent" in fn, \
             "Code copy must copy the code element's textContent"
 
+    def test_code_copy_button_is_idempotent_for_header_blocks(self):
+        """Repeated post-render passes must not append duplicate header buttons.
+
+        addCopyButtons() can be called multiple times after render/cache/streaming
+        updates.  For fenced blocks with a language header, the copy button is
+        appended to the sibling .pre-header, not inside <pre>, so the duplicate
+        guard must check the header as well as the <pre>.
+        """
+        src = _src("ui.js")
+        m = re.search(r"function addCopyButtons", src)
+        assert m, "addCopyButtons must exist"
+        fn = src[m.start():m.start() + 1200]
+        assert "const header=pre.previousElementSibling;" in fn
+        assert "header.querySelector('.code-copy-btn')" in fn
+        assert fn.index("header.querySelector('.code-copy-btn')") < fn.index("document.createElement('button')")
+
 class TestCopyFailedI18n:
 
     def test_copy_failed_in_all_locales(self):
diff --git a/tests/test_issue1228_model_picker_duplicate_ids.py b/tests/test_issue1228_model_picker_duplicate_ids.py
index 05d425097c5..bc999962922 100644
--- a/tests/test_issue1228_model_picker_duplicate_ids.py
+++ b/tests/test_issue1228_model_picker_duplicate_ids.py
@@ -93,11 +93,10 @@ def test_three_providers_same_model(self):
         assert result[1]["models"][0]["id"] == "@beta:gpt-5.4"
         assert result[2]["models"][0]["id"] == "@gamma:gpt-5.4"
 
-    # ── Already-prefixed IDs are skipped ───────────────────────────
+    # ── Already-prefixed IDs / slash IDs ───────────────────────────
 
-    def test_already_prefixed_ids_skipped(self):
-        """Model IDs already starting with @ or containing / are not
-        considered for deduplication."""
+    def test_already_prefixed_ids_and_unique_slash_ids_unchanged(self):
+        """Already-qualified IDs stay untouched; unique slash IDs are still allowed."""
         groups = [
             {"provider": "Anthropic", "provider_id": "anthropic", "models": [
                 {"id": "@anthropic:claude-sonnet-4.6", "label": "Claude Sonnet 4.6"},
@@ -107,10 +106,24 @@ def test_already_prefixed_ids_skipped(self):
             ]},
         ]
         result = self._call(groups)
-        # Neither should be modified
         assert result[0]["models"][0]["id"] == "@anthropic:claude-sonnet-4.6"
         assert result[1]["models"][0]["id"] == "anthropic/claude-sonnet-4.6"
 
+    def test_two_providers_same_slash_qualified_model_prefixes_second(self):
+        """Slash-qualified duplicates must also be made unique (#1313)."""
+        groups = [
+            {"provider": "Alpha", "provider_id": "custom:alpha", "models": [
+                {"id": "google/gemma-4-27b", "label": "Gemma 4 27B"},
+            ]},
+            {"provider": "Beta", "provider_id": "custom:beta", "models": [
+                {"id": "google/gemma-4-27b", "label": "Gemma 4 27B"},
+            ]},
+        ]
+        result = self._call(groups)
+        assert result[0]["models"][0]["id"] == "google/gemma-4-27b"
+        assert result[1]["models"][0]["id"] == "@custom:beta:google/gemma-4-27b"
+        assert result[1]["models"][0]["label"] == "Gemma 4 27B (Beta)"
+
     # ── Mixed: some unique, some colliding ─────────────────────────
 
     def test_mixed_unique_and_colliding(self):
@@ -217,6 +230,39 @@ def test_norm_preserves_minimax_prefix(self):
         assert r1.stdout.strip() == r2.stdout.strip(), f"{r1.stdout.strip()} != {r2.stdout.strip()}"
 
 
+class TestFrontendPreferredProviderMatch(unittest.TestCase):
+    """Frontend: provider-aware rehydration should prefer the saved provider."""
+
+    @staticmethod
+    def _read_js():
+        import pathlib
+        return (pathlib.Path(__file__).parent.parent / "static" / "ui.js").read_text()
+
+    def test_find_model_prefers_matching_provider_for_slash_collision(self):
+        import re
+        import subprocess
+
+        src = self._read_js()
+        helper = re.search(r"function _getOptionProviderId\(opt\)\{.*?\n\}", src, re.S)
+        finder = re.search(r"function _findModelInDropdown\(modelId, sel, preferredProviderId\)\{.*?\n\}", src, re.S)
+        assert helper, "_getOptionProviderId() not found in ui.js"
+        assert finder, "_findModelInDropdown() not found in ui.js"
+
+        script = f"""
+{helper.group(0)}
+{finder.group(0)}
+const sel = {{
+  options: [
+    {{ value: 'google/gemma-4-27b', parentElement: {{ tagName: 'OPTGROUP', dataset: {{ provider: 'custom:alpha' }} }} }},
+    {{ value: '@custom:beta:google/gemma-4-27b', parentElement: {{ tagName: 'OPTGROUP', dataset: {{ provider: 'custom:beta' }} }} }},
+  ]
+}};
+console.log(_findModelInDropdown('google/gemma-4-27b', sel, 'custom:beta') || '');
+"""
+        resolved = subprocess.run(["node", "-e", script], capture_output=True, text=True, check=True)
+        assert resolved.stdout.strip() == "@custom:beta:google/gemma-4-27b"
+
+
 class TestResolveModelProviderColonInProviderId(unittest.TestCase):
     """resolve_model_provider() must handle provider_ids containing ':'.
 
diff --git a/tests/test_mobile_layout.py b/tests/test_mobile_layout.py
index b46c6f14637..db4ee43e30c 100644
--- a/tests/test_mobile_layout.py
+++ b/tests/test_mobile_layout.py
@@ -49,9 +49,181 @@ def test_rightpanel_mobile_slide_over_css():
         "style.css must have position:fixed for rightpanel mobile slide-over"
     assert ".rightpanel.mobile-open{right:0" in CSS or ".rightpanel.mobile-open {right:0" in CSS, \
         ".rightpanel.mobile-open must set right:0 to slide panel in from right"
-    assert "right:-320px" in CSS or "right: -320px" in CSS, \
-        "rightpanel must start off-screen (right:-320px) on mobile"
+    assert "min(300px, 100vw)" in CSS or "min(300px,100vw)" in CSS, \
+        "rightpanel mobile width should be capped defensively with 100vw"
+    assert "var(--mobile-rightpanel-width)" in CSS, \
+        "mobile rightpanel width variable should be used in compact mode rules"
+    assert "calc(-1 * var(--mobile-rightpanel-width))" in CSS, \
+        "closed mobile rightpanel should be off-canvas using a width-based negative offset"
+    mobile_640 = re.search(r'@media\(max-width:640px\)\{([^{}]*(?:\{[^{}]*\}[^{}]*)*)\}', CSS, re.DOTALL)
+    assert mobile_640, "@media(max-width:640px) block missing from style.css"
+    rightpanel_block = mobile_640.group(1)
+    assert re.search(r'\.rightpanel\{[^}]*width:\s*var\(--mobile-rightpanel-width\)\s*!important',
+                     rightpanel_block, re.DOTALL), \
+        ".rightpanel width must use var(--mobile-rightpanel-width) with !important in mobile block"
+    assert re.search(r'\.rightpanel\.mobile-open\{[^}]*right:\s*0\s*!important',
+                     rightpanel_block, re.DOTALL), \
+        "mobile-open mobile rightpanel must force right:0 with !important"
+    assert re.search(r'\.rightpanel\{[^}]*box-shadow:\s*none\s*!important',
+                     rightpanel_block, re.DOTALL), \
+        "closed mobile rightpanel should have no shadow to avoid right-edge bleed"
+    assert re.search(r'\.rightpanel\.mobile-open\{[^}]*box-shadow:\s*-4px 0 24px rgba\(0,\s*0,\s*0,\s*\.?4\)',
+                     rightpanel_block, re.DOTALL), \
+        "open mobile rightpanel should keep the edge shadow"
+
+
+def test_workspace_panel_inline_width_is_desktop_only():
+    """Persisted rightpanel width must only be restored above compact/mobile breakpoints."""
+    boot_js = (REPO / "static" / "boot.js").read_text(encoding="utf-8")
+    assert "function _syncWorkspacePanelInlineWidth()" in boot_js, \
+        "_syncWorkspacePanelInlineWidth() must exist to keep panel width mobile-safe"
+    assert "_syncWorkspacePanelInlineWidth();" in boot_js, \
+        "_syncWorkspacePanelInlineWidth() must be called when viewport changes"
+    assert "localStorage.getItem('hermes-panel-w')" in boot_js, \
+        "Panel width helper must source hermes-panel-w from localStorage"
+    assert "_workspacePanelEls();" in boot_js and "style.removeProperty('width')" in boot_js, \
+        "Panel helper must clear inline width while in compact/mobile viewport"
+
+
+def _container_query_block(css: str, container_query: str):
+    query_pattern = re.compile(
+        rf'@container\s+{re.escape(container_query)}\s*\{{',
+        re.DOTALL,
+    )
+    for match in query_pattern.finditer(css):
+        start = match.end() - 1
+        end = css.find("@container", start + 1)
+        if end == -1:
+            end = css.find("@media", start + 1)
+        if end == -1:
+            end = len(css)
+        block = css[start + 1:end]
+        return block
+    return ""
+
+
+def _container_media_block(css: str, media_query: str):
+    query_pattern = re.compile(
+        rf'@media\s*\(\s*max-width:\s*{re.escape(media_query)}\s*\)\s*\{{',
+        re.DOTALL,
+    )
 
+    def _media_block_end(css_text: str, open_brace_idx: int) -> int:
+        depth = 0
+        for idx in range(open_brace_idx, len(css_text)):
+            if css_text[idx] == "{":
+                depth += 1
+            elif css_text[idx] == "}":
+                depth -= 1
+                if depth == 0:
+                    return idx
+        return -1
+
+    def _strip_nested_media(block: str) -> str:
+        parts = []
+        cursor = 0
+        while True:
+            nested = block.find("@media", cursor)
+            if nested == -1:
+                parts.append(block[cursor:])
+                break
+            parts.append(block[cursor:nested])
+            nested_open = block.find("{", nested)
+            if nested_open == -1:
+                break
+            nested_close = _media_block_end(block, nested_open)
+            if nested_close == -1:
+                break
+            cursor = nested_close + 1
+        return "".join(parts)
+
+    for match in query_pattern.finditer(css):
+        start = match.end() - 1
+        end = _media_block_end(css, start)
+        if end == -1:
+            continue
+        block = css[start + 1:end]
+        block = _strip_nested_media(block)
+        if ".composer-profile-label" in block or ".composer-profile-chip" in block:
+            return block
+    return ""
+
+
+def test_composer_controls_switch_to_icon_only_by_container_width():
+    """Composer controls should progressively compact based on footer width."""
+    assert re.search(r'\.composer-footer\s*\{[^}]*container-type:inline-size[^}]*container-name:composer-footer[^}]*\}', CSS), \
+        ".composer-footer should define container-type:inline-size and container-name:composer-footer"
+    compact_700 = _container_query_block(CSS, "composer-footer (max-width: 700px)")
+    assert compact_700, "Expected composer mid-width compact rules at @container composer-footer (max-width: 700px)"
+    for selector in (
+        ".composer-workspace-label",
+        ".composer-model-label",
+        ".composer-workspace-chevron",
+        ".composer-model-chevron",
+        "#composerWorkspaceLabel",
+        "#composerModelLabel",
+        ".composer-workspace-chip",
+        ".composer-model-chip",
+        ".composer-divider",
+    ):
+        assert selector in compact_700, f"{selector} should be present in the 700px composer compact block"
+    assert "display:none" in compact_700
+    assert "max-width:52px" in compact_700
+    # Ensure this first stage does not prematurely remove profile/reasoning labels.
+    assert ".composer-profile-label" not in compact_700
+    assert ".composer-reasoning-label" not in compact_700
+    assert ".composer-profile-chevron" not in compact_700
+    assert ".composer-reasoning-chevron" not in compact_700
+
+    compact_520 = _container_query_block(CSS, "composer-footer (max-width: 520px)")
+    assert compact_520, "Expected full composer icon-only rules at @container composer-footer (max-width: 520px)"
+    for selector in (
+        ".composer-profile-label",
+        ".composer-workspace-label",
+        ".composer-model-label",
+        ".composer-reasoning-label",
+        ".composer-profile-chevron",
+        ".composer-workspace-chevron",
+        ".composer-model-chevron",
+        ".composer-reasoning-chevron",
+        "#composerProfileLabel",
+        "#composerWorkspaceLabel",
+        "#composerModelLabel",
+        "#composerReasoningLabel",
+        ".composer-workspace-chip",
+        ".composer-model-chip",
+        ".composer-profile-chip",
+        ".composer-reasoning-chip",
+    ):
+        assert selector in compact_520, f"{selector} should be present in the 520px composer compact block"
+    assert "max-width:44px" in compact_520
+    assert "display:none" in compact_520
+
+    # Regression intent:
+    # - this container rule should not depend on right-panel open/closed state.
+    # - left-sidebar-only constriction must still collapse composer controls together.
+    assert ".layout:not(.workspace-panel-collapsed)" not in compact_700, \
+        "composer-footer compact rule should be state-agnostic (left sidebar + closed right panel case included)"
+    assert ".layout:not(.workspace-panel-collapsed)" not in compact_520, \
+        "composer-footer compact rule should be state-agnostic (left sidebar + closed right panel case included)"
+
+
+def test_composer_compact_switch_is_not_viewport_only():
+    """Compact controls should be container-triggered, not bound to viewport width alone."""
+    assert "composer-footer (max-width: 700px)" in CSS, \
+        "Container-query breakpoint should track composer footer width"
+    assert "composer-footer (max-width: 520px)" in CSS, \
+        "Container-query second-stage breakpoint should track composer footer width"
+    assert re.search(r'@container\s+composer-footer\s*\(max-width:\s*860px\)', CSS) is None, \
+        "Full icon-only should not be tied to a 860px threshold any more"
+    assert re.search(r'@container\s+composer-footer\s*\(max-width:\s*1000px\)', CSS) is None, \
+        "Full icon-only/first-stage container gate should not be tied to 1000px"
+    media_860 = _container_media_block(CSS, "860px")
+    assert media_860 == "", \
+        "Composer compact breakpoint should not be a dedicated 860px viewport media query"
+    media_900 = _container_media_block(CSS, "900px")
+    assert media_900 == "", \
+        "Composer compact breakpoint should use container queries, not viewport media at 900px"
 
 def test_mobile_overlay_present():
     """Mobile overlay element must exist for tap-to-close sidebar behavior."""
diff --git a/tests/test_model_picker_badges.py b/tests/test_model_picker_badges.py
index aea3eeabdd6..3b2ffa735f6 100644
--- a/tests/test_model_picker_badges.py
+++ b/tests/test_model_picker_badges.py
@@ -15,8 +15,10 @@ def _models_with_cfg(model_cfg=None, fallback_providers=None, custom_providers=N
         config.cfg = {
             "model": model_cfg or {"provider": "openai-codex", "default": "gpt-5.4"},
             "fallback_providers": fallback_providers or [],
-            "providers": custom_providers or {},
+            "providers": {},
         }
+        if custom_providers is not None:
+            config.cfg["custom_providers"] = custom_providers
         if active_provider:
             config.cfg["model"]["provider"] = active_provider
         return config.get_available_models()
@@ -49,6 +51,52 @@ def test_available_models_exposes_primary_and_fallback_badges():
     assert badges.get("anthropic/claude-haiku-4.5", {}).get("label") == "Fallback 2"
 
 
+def test_duplicate_slash_id_primary_badge_sticks_to_matching_provider_only():
+    import textwrap
+
+    root = Path(__file__).resolve().parent.parent
+    src = (root / "api" / "config.py").read_text(encoding="utf-8")
+    start = src.index("def _build_configured_model_badges() -> dict[str, dict[str, str]]:")
+    end = src.index("            return badges", start) + len("            return badges")
+    fn_src = textwrap.dedent(src[start:end])
+
+    scope = {
+        "active_provider": "custom:beta",
+        "default_model": "google/gemma-4-27b",
+        "cfg": {"fallback_providers": []},
+        "groups": [
+            {"provider": "Alpha", "provider_id": "custom:alpha", "models": [{"id": "google/gemma-4-27b"}]},
+            {"provider": "Beta", "provider_id": "custom:beta", "models": [{"id": "@custom:beta:google/gemma-4-27b"}]},
+        ],
+        "_resolve_provider_alias": lambda provider: provider,
+    }
+    exec(
+        "def _norm_model_id(model_id):\n"
+        "    s=str(model_id or '').strip().lower()\n"
+        "    if s.startswith('@') and ':' in s: s=s.split(':',1)[1]\n"
+        "    if '/' in s: s=s.split('/',1)[1]\n"
+        "    return s.replace('-', '.')\n",
+        scope,
+    )
+    exec(fn_src, scope)
+
+    badges = scope["_build_configured_model_badges"]()
+    assert badges.get("@custom:beta:google/gemma-4-27b", {}).get("role") == "primary"
+    assert "google/gemma-4-27b" not in badges, (
+        "When duplicate slash-qualified IDs are deduplicated across providers, "
+        "the shared raw ID must not keep the PRIMARY badge for the wrong provider."
+    )
+
+
+def test_ui_badge_lookup_prefers_row_provider_for_duplicate_model_ids():
+    root = Path(__file__).resolve().parent.parent
+    js = (root / "static" / "ui.js").read_text(encoding="utf-8")
+
+    assert "function _getConfiguredModelBadge(modelId,badgeMap,providerId){" in js
+    assert "child.dataset&&child.dataset.provider?child.dataset.provider:''" in js
+    assert "const providerMatch=matches.find(badge=>String(badge&&badge.provider||'').toLowerCase()===provider);" in js
+
+
 def test_get_available_models_cache_preserves_configured_model_badges(tmp_path, monkeypatch):
     cache_path = tmp_path / "models_cache.json"
     old_cfg = config.cfg
@@ -106,6 +154,18 @@ def test_ui_renders_model_badges_from_api_payload():
         "A UI precisa de um helper de matching resiliente para religar badges mesmo quando "
         "o update do catálogo mudar prefixos/formas do model ID."
     )
+    assert "model_group_configured" in js, (
+        "renderModelDropdown() deve expor uma seção Configured no topo para destacar a "
+        "cadeia primária + fallback antes dos providers completos."
+    )
+    assert "configuredRank" in js, (
+        "A UI deve calcular uma prioridade estável (primary -> fallback 1 -> fallback N) "
+        "para renderizar os modelos configurados no topo do dropdown."
+    )
+    assert "Object.entries(_badgeMap)" in js and "_normalizeConfiguredModelKey(existing.value)" in js, (
+        "renderModelDropdown() deve sintetizar entradas para modelos configurados ausentes "
+        "do catálogo atual, senão fallbacks locais/Ollama desaparecem da seção Configured."
+    )
     # Chip-projected badge was removed in v0.50.243 (added too much width to the
     # composer chip; signal value low since the model name is right next to it).
     # Badges remain in the dropdown rows (model-opt-badge) for picker rows.
diff --git a/tests/test_streaming_session_sidebar.py b/tests/test_streaming_session_sidebar.py
new file mode 100644
index 00000000000..6692628bbd8
--- /dev/null
+++ b/tests/test_streaming_session_sidebar.py
@@ -0,0 +1,167 @@
+"""
+Regression tests for #1327: streaming sessions must not vanish from sidebar.
+
+PR #1184 deferred the first save() until the session has real state. During the
+initial streaming turn, the session still looks like Untitled + 0-messages
+(title is derived later, user text is in pending_user_message not messages).
+The sidebar filter must exempt actively-streaming sessions from the empty-
+Untitled rule so they remain visible while the user navigates away.
+"""
+import pytest
+
+import api.models as models
+from api.models import (
+    SESSIONS,
+    STREAMS,
+    Session,
+    all_sessions,
+    new_session,
+)
+
+
+@pytest.fixture(autouse=True)
+def _isolate(tmp_path, monkeypatch):
+    """Redirect SESSION_DIR and SESSION_INDEX_FILE to a fresh tmp dir."""
+    session_dir = tmp_path / "sessions"
+    session_dir.mkdir()
+    index_file = session_dir / "_index.json"
+    monkeypatch.setattr(models, "SESSION_DIR", session_dir)
+    monkeypatch.setattr(models, "SESSION_INDEX_FILE", index_file)
+    SESSIONS.clear()
+    STREAMS.clear()
+    yield session_dir
+    SESSIONS.clear()
+    STREAMS.clear()
+
+
+# ── Helpers ────────────────────────────────────────────────────────────────
+
+
+def _simulate_first_turn_streaming(session):
+    """Simulate the state of a session during its first streaming turn.
+
+    After _handle_chat/start sets pending_user_message and calls save(),
+    but before the first assistant turn completes:
+    - title is still 'Untitled'
+    - messages is still empty (user text is in pending_user_message)
+    - active_stream_id is set
+    """
+    session.pending_user_message = "Hello, this is a long prompt"
+    session.active_stream_id = f"stream-{session.session_id}"
+    session.save()
+    # Register stream so _active_stream_ids() finds it
+    STREAMS[session.active_stream_id] = session.session_id
+
+
+# ── Index path (sidebar via index file) ────────────────────────────────────
+
+
+def test_streaming_session_visible_in_sidebar_index_path(_isolate):
+    """A session that is actively streaming its first turn must appear in
+    all_sessions() even though it is Untitled + 0-messages (#1327)."""
+    s = new_session()
+    _simulate_first_turn_streaming(s)
+
+    ids = {row["session_id"] for row in all_sessions()}
+    assert s.session_id in ids, (
+        "Actively streaming session disappeared from sidebar (index path). "
+        "The Untitled+0-message filter must exempt sessions with active_stream_id."
+    )
+
+
+def test_empty_session_still_hidden_when_not_streaming(_isolate):
+    """A plain empty Untitled session (no stream, no pending message) must
+    still be hidden — the #1171 filter must not be weakened."""
+    s = new_session()
+    # No streaming state set — just a bare empty session
+
+    ids = {row["session_id"] for row in all_sessions()}
+    assert s.session_id not in ids, (
+        "Empty Untitled session should still be hidden from sidebar. "
+        "Only actively streaming sessions are exempt (#1327)."
+    )
+
+
+# ── Full-scan fallback path ────────────────────────────────────────────────
+
+
+def test_streaming_session_visible_in_sidebar_fullscan(_isolate):
+    """Same as above but forces the full-scan fallback path by corrupting
+    the index file."""
+    s = new_session()
+    _simulate_first_turn_streaming(s)
+
+    # Corrupt the index to force the full-scan fallback
+    models.SESSION_INDEX_FILE.write_text("INVALID JSON")
+
+    ids = {row["session_id"] for row in all_sessions()}
+    assert s.session_id in ids, (
+        "Actively streaming session disappeared from sidebar (full-scan path). "
+        "The Untitled+0-message filter must exempt sessions with "
+        "active_stream_id and pending_user_message."
+    )
+
+
+def test_empty_session_still_hidden_fullscan(_isolate):
+    """Empty Untitled session must still be hidden on the full-scan path."""
+    s = new_session()
+
+    models.SESSION_INDEX_FILE.write_text("INVALID JSON")
+
+    ids = {row["session_id"] for row in all_sessions()}
+    assert s.session_id not in ids, (
+        "Empty Untitled session should still be hidden from sidebar (full-scan)."
+    )
+
+
+# ── Edge cases ────────────────────────────────────────────────────────────
+
+
+def test_session_visible_after_stream_completes(_isolate):
+    """After streaming completes and messages are populated, the session
+    must remain visible (message_count > 0)."""
+    s = new_session()
+    _simulate_first_turn_streaming(s)
+
+    # Simulate stream completion: clear pending, add messages
+    s.active_stream_id = None
+    s.pending_user_message = None
+    s.messages.append({"role": "user", "content": "Hello"})
+    s.messages.append({"role": "assistant", "content": "Hi there"})
+    s.title = "Greeting"
+    s.save()
+    STREAMS.pop(f"stream-{s.session_id}", None)
+
+    ids = {row["session_id"] for row in all_sessions()}
+    assert s.session_id in ids, (
+        "Session with messages should be visible after stream completes."
+    )
+
+
+def test_pending_message_without_stream_still_visible(_isolate):
+    """A session with pending_user_message but no active_stream_id (edge case:
+    stream crashed after setting pending but before setting stream id) should
+    still be visible on the full-scan path."""
+    s = new_session()
+    s.pending_user_message = "Hello"
+    # No active_stream_id set
+    s.save()
+
+    models.SESSION_INDEX_FILE.write_text("INVALID JSON")
+
+    ids = {row["session_id"] for row in all_sessions()}
+    assert s.session_id in ids, (
+        "Session with pending_user_message should be visible even without "
+        "active_stream_id (full-scan path)."
+    )
+
+
+def test_compact_output_contains_active_stream_id(_isolate):
+    """Verify that compact() output includes active_stream_id so the index
+    path filter can check it."""
+    s = new_session()
+    s.active_stream_id = "test-stream-123"
+    compact = s.compact()
+    assert compact.get("active_stream_id") == "test-stream-123", (
+        "compact() must include active_stream_id for the sidebar filter."
+    )