Skip to content

The agent that grows with you

feat: /model reset — clear a session's model pin without losing history (NS-563)

Shannon Sands5bb7bdc7c4e1
diff --git a/gateway/slash_commands_model.py b/gateway/slash_commands_model.py
index 72cb51dcd64..3e5c2cde742 100644
--- a/gateway/slash_commands_model.py
+++ b/gateway/slash_commands_model.py
@@ -526,6 +526,7 @@ class GatewayModelCommandsMixin:
lines.append(t("gateway.model.usage_switch_model"))
lines.append(t("gateway.model.usage_switch_provider"))
lines.append(t("gateway.model.usage_persist"))
+ lines.append(t("gateway.model.usage_reset"))
return "\n".join(lines)
async def _model_selection_guard_reply(
@@ -613,6 +614,8 @@ class GatewayModelCommandsMixin:
restore_snapshot=self._snapshot_session_model_override(session_key) if request.is_once else None,
)
ctx.read_config()
+ if request.is_reset:
+ return await self._handle_model_reset(event, ctx)
ctx.apply_override(self._session_model_overrides.get(session_key, {}))
if not request.target and not request.explicit_provider:
return await self._model_listing_reply(event, ctx, profile_home)
@@ -624,6 +627,64 @@ class GatewayModelCommandsMixin:
return guard_reply
return await self._commit_model_switch_locked(result, ctx, source=source, picker=False)
+ def _channel_default_route(self, source, config_path) -> tuple[str, str]:
+ """``(model, provider)`` this chat runs with no session override: channel_overrides, else the
+ owning profile's config.yaml (read from *config_path*: slash dispatch runs outside the routed
+ profile's scope on a multiplexed runner)."""
+ from gateway.run import _load_gateway_config, _resolve_gateway_model
+ cfg = _load_gateway_config(config_path=config_path) or {}
+ model_cfg = cfg.get("model")
+ provider = str(model_cfg.get("provider") or "") if isinstance(model_cfg, dict) else ""
+ channel = self._channel_override_for(source)
+ if channel is not None and channel.model:
+ return channel.model, channel.provider or ""
+ return _resolve_gateway_model(cfg), "" if provider.lower() == "auto" else provider
+
+ async def _handle_model_reset(self, event: MessageEvent, ctx: _ModelSwitchContext) -> Optional[str]:
+ """``/model reset``: drop this session's /model override (memory, store and any armed
+ ``--once`` restore) so the next turn resolves channel_overrides > config.yaml again. The
+ transcript is kept; before this the only way off a persisted override was ``/new``."""
+ source, session_key = ctx.source, ctx.session_key
+ default_model, default_provider = await asyncio.to_thread(
+ self._channel_default_route, source, ctx.config_path)
+ from gateway.session_setting_commands import local_authority_live
+ if local_authority_live(self, source)[1] is not None:
+ # A local session runs a frozen policy with no override tier: reset is a session-scoped
+ # pick of the configured default, committed by the owner like any typed /model.
+ ctx.persist_global = False
+ result, error = await self._perform_model_switch(ctx, default_model, default_provider, source)
+ if error is not None:
+ return error
+ return await self._commit_model_switch_locked(result, ctx, source=source, picker=False)
+ # A restart leaves the persisted override unloaded until first use: load it, or the reply
+ # says "none active" while the store resurrects it on the next message.
+ await asyncio.to_thread(self._rehydrate_session_model_override, session_key)
+ previous = self._session_model_overrides.pop(session_key, None)
+ self._pending_one_turn_model_restores.pop(session_key, None)
+ try:
+ await self.async_session_store.set_model_override(session_key, None)
+ except Exception:
+ logger.warning("Failed to clear persisted session model override", exc_info=True)
+ shown = default_model or t("gateway.shared.unknown_value")
+ if previous is None:
+ return t("gateway.model.reset_none", model=shown)
+ from hermes_cli.model_switch import format_model_for_display
+ _sess_db = getattr(self, "_session_db", None)
+ if _sess_db is not None: # the dashboard's session-model column (#34850)
+ try:
+ entry = await self.async_session_store.get_or_create_session(source)
+ await _sess_db.update_session_model(entry.session_id, default_model, provider=default_provider or None)
+ except Exception:
+ logger.debug("Failed to persist model reset to DB", exc_info=True)
+ if not hasattr(self, "_pending_model_notes"):
+ self._pending_model_notes = {}
+ self._pending_model_notes[session_key] = (
+ f"[Note: the session model override was cleared; model changed from "
+ f"{format_model_for_display(previous.get('model') or '')} back to the default "
+ f"{format_model_for_display(default_model)}. Adjust your self-identification accordingly.]")
+ self._evict_cached_agent(session_key) # next turn builds from the default route
+ return t("gateway.model.reset_done", model=format_model_for_display(shown))
+
# -------------------------------------------------- usage-window limit: one-tap switch
def _schedule_usage_limit_offer(self, event: MessageEvent, limit: dict, *, session_key: str = "",
diff --git a/hermes_cli/model_switch.py b/hermes_cli/model_switch.py
index 3a8d5c36808..48cf8e5a46d 100644
--- a/hermes_cli/model_switch.py
+++ b/hermes_cli/model_switch.py
@@ -563,13 +563,23 @@ def resolve_persist_behavior(
MODEL_SWITCH_ERR_ONCE_WITH_GLOBAL = "once_with_global"
MODEL_SWITCH_ERR_ONCE_REQUIRES_TARGET = "once_requires_target"
MODEL_SWITCH_ERR_BAD_REASONING = "bad_reasoning"
+MODEL_SWITCH_ERR_RESET_WITH_FLAGS = "reset_with_flags"
# Canonical (surface-neutral) error copy. Surfaces prepend their own decoration (" ✗ " in the
# CLI, "❌ " in the gateway) but MUST NOT change the core sentence — it is shared user-visible copy.
MODEL_SWITCH_ERROR_TEXT = {
MODEL_SWITCH_ERR_ONCE_WITH_GLOBAL: "/model --once cannot be combined with --global",
MODEL_SWITCH_ERR_ONCE_REQUIRES_TARGET: "/model --once requires a model or provider.",
- MODEL_SWITCH_ERR_BAD_REASONING: "/model --reasoning takes none, minimal, low, medium, high, xhigh, max or ultra."}
+ MODEL_SWITCH_ERR_BAD_REASONING: "/model --reasoning takes none, minimal, low, medium, high, xhigh, max or ultra.",
+ MODEL_SWITCH_ERR_RESET_WITH_FLAGS: (
+ "/model reset takes no flags — it clears this session's model override so the "
+ "configured default applies again.")}
+
+# ``/model reset`` clears the session's /model override instead of switching to a model named
+# "reset". Deliberately NOT aliased to "default": MoA's default preset is literally named
+# "default", so ``/model default`` keeps resolving through exact_moa_preset_name(). A model whose
+# bare id is "reset" stays reachable by its qualified slug (``vendor/reset``, ``vendor:reset``).
+MODEL_SWITCH_RESET_TOKEN = "reset"
@dataclass(frozen=True)
@@ -600,13 +610,19 @@ class ModelSwitchRequest:
"""Canonical (undercorated) error strings for this request."""
return [MODEL_SWITCH_ERROR_TEXT[code] for code in self.errors]
+ @property
+ def is_reset(self) -> bool:
+ """``/model reset`` with no flags: clear the session override, keep the conversation."""
+ return self.target.strip().lower() == MODEL_SWITCH_RESET_TOKEN and not self.errors
+
def parse_model_switch_args(raw: str) -> ModelSwitchRequest:
"""The ONE parser for every /model surface: tokenization plus flag-conflict validation.
``--once`` + ``--global`` -> ``MODEL_SWITCH_ERR_ONCE_WITH_GLOBAL``; ``--once`` with neither
a model nor ``--provider`` -> ``MODEL_SWITCH_ERR_ONCE_REQUIRES_TARGET``; an unknown
- ``--reasoning`` level -> ``MODEL_SWITCH_ERR_BAD_REASONING``. Targets pass through
+ ``--reasoning`` level -> ``MODEL_SWITCH_ERR_BAD_REASONING``; ``reset`` with any flag ->
+ ``MODEL_SWITCH_ERR_RESET_WITH_FLAGS`` (see :attr:`ModelSwitchRequest.is_reset`). Targets pass through
untouched (bare names, ``vendor/model``, ``vendor:model``) for :func:`switch_model`."""
raw = str(raw or "")
parsed = parse_model_flags_detailed(raw)
@@ -620,6 +636,10 @@ def parse_model_switch_args(raw: str) -> ModelSwitchRequest:
from hermes_constants import parse_reasoning_effort
if parse_reasoning_effort(parsed.reasoning_effort) is None:
errors.append(MODEL_SWITCH_ERR_BAD_REASONING)
+ if parsed.model_input.strip().lower() == MODEL_SWITCH_RESET_TOKEN and (
+ parsed.explicit_provider or parsed.reasoning_effort or parsed.is_global
+ or parsed.is_session or parsed.is_once):
+ errors.append(MODEL_SWITCH_ERR_RESET_WITH_FLAGS)
# First matching flag wins: once > session > global > default.
scope = next((name for name, on in (("once", parsed.is_once), ("session", parsed.is_session),
("global", parsed.is_global)) if on), "default")
diff --git a/locales/af.yaml b/locales/af.yaml
index a11e3292757..9f919d62ae5 100644
--- a/locales/af.yaml
+++ b/locales/af.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — verander model"
usage_switch_provider: "`/model <name> --provider <slug>` — verander verskaffer"
usage_persist: "`/model <name> --global` — stoor permanent"
+ usage_reset: "`/model reset` — verwyder hierdie sessie se oorheersing"
+ reset_done: "Sessie-modeloorheersing verwyder — gebruik nou `{model}` (die kanaal-/globale verstek). Gespreksgeskiedenis behou."
+ reset_none: "Geen sessie-modeloorheersing is aktief nie — gebruik reeds `{model}` (die kanaal-/globale verstek)."
err_skew: "Hierdie gateway loop kode van {boot_rev}, maar die uitcheck op skyf is nou {disk_rev}. Om modelle te wissel kan 'n verouderde-module-omval veroorsaak — herbegin die gateway om die nuwe kode te laai: hermes gateway restart"
err_switch_failed: "Modelwisseling na {model} het misluk ({error}); bly op {current}."
err_config_not_updated: "config.yaml nie opgedateer nie ({error})"
diff --git a/locales/ar.yaml b/locales/ar.yaml
index 7e1aaf6ab39..63346f84915 100644
--- a/locales/ar.yaml
+++ b/locales/ar.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — تبديل النموذج"
usage_switch_provider: "`/model <name> --provider <slug>` — تبديل المزوّد"
usage_persist: "`/model <name> --global` — حفظ دائم"
+ usage_reset: "`/model reset` — مسح تجاوز هذه الجلسة"
+ reset_done: "تم مسح تجاوز نموذج الجلسة — يُستخدم الآن `{model}` (الافتراضي للقناة/العام). تم الاحتفاظ بسجل المحادثة."
+ reset_none: "لا يوجد تجاوز نموذج نشط لهذه الجلسة — يُستخدم بالفعل `{model}` (الافتراضي للقناة/العام)."
err_skew: "هذه البوّابة تعمل بكود من {boot_rev} بينما أصبحت النسخة على القرص {disk_rev}. تبديل النموذج الآن قد يسبّب انهيارًا بسبب وحدات قديمة — أعد تشغيل البوّابة لتحميل الكود الجديد: hermes gateway restart"
err_switch_failed: "فشل التبديل إلى النموذج {model} ({error})؛ سنبقى على {current}."
err_config_not_updated: "لم يُحدَّث config.yaml ({error})"
diff --git a/locales/de.yaml b/locales/de.yaml
index 9057ad5d4f3..d81c2772e87 100644
--- a/locales/de.yaml
+++ b/locales/de.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — Modell wechseln"
usage_switch_provider: "`/model <name> --provider <slug>` — Anbieter wechseln"
usage_persist: "`/model <name> --global` — dauerhaft speichern"
+ usage_reset: "`/model reset` — Sitzungs-Override zurücksetzen"
+ reset_done: "Modell-Override der Sitzung entfernt — jetzt wird `{model}` verwendet (Kanal-/globaler Standard). Gesprächsverlauf bleibt erhalten."
+ reset_none: "Kein Modell-Override für diese Sitzung aktiv — es wird bereits `{model}` verwendet (Kanal-/globaler Standard)."
err_skew: "Dieses Gateway führt Code aus {boot_rev} aus, der Checkout auf der Festplatte ist inzwischen aber {disk_rev}. Ein Modellwechsel könnte durch veraltete Module abstürzen — starten Sie das Gateway neu, um den neuen Code zu laden: hermes gateway restart"
err_switch_failed: "Modellwechsel zu {model} fehlgeschlagen ({error}); {current} bleibt aktiv."
err_config_not_updated: "config.yaml nicht aktualisiert ({error})"
diff --git a/locales/en.yaml b/locales/en.yaml
index fa2e0273948..a876e1e298d 100644
--- a/locales/en.yaml
+++ b/locales/en.yaml
@@ -69,6 +69,9 @@ gateway:
usage_switch_model: "`/model <name>` — switch model"
usage_switch_provider: "`/model <name> --provider <slug>` — switch provider"
usage_persist: "`/model <name> --global` — persist"
+ usage_reset: "`/model reset` — clear this session's override"
+ reset_done: "Session model override cleared — now using `{model}` (the channel/global default). Conversation history kept."
+ reset_none: "No session model override is active — already using `{model}` (the channel/global default)."
err_skew: "This gateway is running code from {boot_rev} but the checkout on disk is now {disk_rev}. Switching models would risk a stale-module crash — restart the gateway to load the new code: hermes gateway restart"
err_switch_failed: "Model switch to {model} failed ({error}); staying on {current}."
err_config_not_updated: "config.yaml not updated ({error})"
diff --git a/locales/es.yaml b/locales/es.yaml
index 032ef25e7d8..4dd59165ad2 100644
--- a/locales/es.yaml
+++ b/locales/es.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — cambiar modelo"
usage_switch_provider: "`/model <name> --provider <slug>` — cambiar proveedor"
usage_persist: "`/model <name> --global` — guardar de forma permanente"
+ usage_reset: "`/model reset` — borrar el override de esta sesión"
+ reset_done: "Override de modelo de la sesión eliminado — ahora se usa `{model}` (el predeterminado del canal/global). Se conserva el historial de la conversación."
+ reset_none: "No hay override de modelo activo en esta sesión — ya se usa `{model}` (el predeterminado del canal/global)."
err_skew: "Este gateway ejecuta código de {boot_rev}, pero el checkout en disco ahora es {disk_rev}. Cambiar de modelo podría provocar un fallo por módulos obsoletos: reinicia el gateway para cargar el código nuevo: hermes gateway restart"
err_switch_failed: "El cambio al modelo {model} falló ({error}); se mantiene {current}."
err_config_not_updated: "config.yaml no se actualizó ({error})"
diff --git a/locales/fr.yaml b/locales/fr.yaml
index 227955715e8..21ba569f2c7 100644
--- a/locales/fr.yaml
+++ b/locales/fr.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — changer de modèle"
usage_switch_provider: "`/model <name> --provider <slug>` — changer de fournisseur"
usage_persist: "`/model <name> --global` — conserver"
+ usage_reset: "`/model reset` — effacer l'override de cette session"
+ reset_done: "Override de modèle de session effacé — utilisation de `{model}` (valeur par défaut du canal/globale). Historique de conversation conservé."
+ reset_none: "Aucun override de modèle actif pour cette session — `{model}` (valeur par défaut du canal/globale) est déjà utilisé."
err_skew: "Ce gateway exécute le code de {boot_rev}, mais le checkout sur disque est maintenant à {disk_rev}. Changer de modèle risquerait un plantage dû à des modules obsolètes — redémarrez le gateway pour charger le nouveau code : hermes gateway restart"
err_switch_failed: "Le passage au modèle {model} a échoué ({error}) ; le modèle {current} est conservé."
err_config_not_updated: "config.yaml non mis à jour ({error})"
diff --git a/locales/ga.yaml b/locales/ga.yaml
index 1b9153cb06e..beb1da3c3fb 100644
--- a/locales/ga.yaml
+++ b/locales/ga.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — athraigh an tsamhail"
usage_switch_provider: "`/model <name> --provider <slug>` — athraigh an soláthraí"
usage_persist: "`/model <name> --global` — coinnigh"
+ usage_reset: "`/model reset` — glan sárú an tseisiúin seo"
+ reset_done: "Glanadh sárú mhúnla an tseisiúin — `{model}` (réamhshocrú an chainéil/domhanda) in úsáid anois. Coinníodh stair an chomhrá."
+ reset_none: "Níl aon sárú múnla gníomhach sa seisiún seo — tá `{model}` (réamhshocrú an chainéil/domhanda) in úsáid cheana."
err_skew: "Tá an gateway seo ag rith cód ó {boot_rev} ach is {disk_rev} atá sa seiceáil amach ar an diosca anois. D'fhéadfadh athrú samhla tuairt modúil sheanchaite a tharraingt — atosaigh an gateway chun an cód nua a lódáil: hermes gateway restart"
err_switch_failed: "Theip ar athrú go dtí an tsamhail {model} ({error}); ag fanacht ar {current}."
err_config_not_updated: "níor nuashonraíodh config.yaml ({error})"
diff --git a/locales/hu.yaml b/locales/hu.yaml
index f6cb5dfadb1..11967d73a04 100644
--- a/locales/hu.yaml
+++ b/locales/hu.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — modell váltása"
usage_switch_provider: "`/model <name> --provider <slug>` — szolgáltató váltása"
usage_persist: "`/model <name> --global` — megőrzés"
+ usage_reset: "`/model reset` — a munkamenet felülbírálásának törlése"
+ reset_done: "A munkamenet modell-felülbírálása törölve — mostantól a `{model}` (csatorna/globális alapértelmezés) van használatban. A beszélgetés előzményei megmaradnak."
+ reset_none: "Nincs aktív modell-felülbírálás ebben a munkamenetben — már a `{model}` (csatorna/globális alapértelmezés) van használatban."
err_skew: "Ez az átjáró a(z) {boot_rev} revízió kódját futtatja, de a lemezen már a(z) {disk_rev} van kicsekkolva. A modellváltás elavult modul miatti összeomlást kockáztatna — indítsd újra az átjárót az új kód betöltéséhez: hermes gateway restart"
err_switch_failed: "A(z) {model} modellre váltás nem sikerült ({error}); marad: {current}."
err_config_not_updated: "a config.yaml nem frissült ({error})"
diff --git a/locales/it.yaml b/locales/it.yaml
index f52ba94fe0f..6f4c85dd1d8 100644
--- a/locales/it.yaml
+++ b/locales/it.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — cambia modello"
usage_switch_provider: "`/model <name> --provider <slug>` — cambia provider"
usage_persist: "`/model <name> --global` — rendi permanente"
+ usage_reset: "`/model reset` — rimuovi l'override di questa sessione"
+ reset_done: "Override del modello di sessione rimosso — ora in uso `{model}` (predefinito del canale/globale). Cronologia della conversazione conservata."
+ reset_none: "Nessun override del modello attivo in questa sessione — già in uso `{model}` (predefinito del canale/globale)."
err_skew: "Questo gateway esegue il codice di {boot_rev}, ma il checkout su disco è ora {disk_rev}. Cambiare modello rischierebbe un crash per moduli obsoleti — riavvia il gateway per caricare il nuovo codice: hermes gateway restart"
err_switch_failed: "Passaggio al modello {model} non riuscito ({error}); resto su {current}."
err_config_not_updated: "config.yaml non aggiornato ({error})"
diff --git a/locales/ja.yaml b/locales/ja.yaml
index 306ba338ba1..6309dfd9222 100644
--- a/locales/ja.yaml
+++ b/locales/ja.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — モデルを切り替え"
usage_switch_provider: "`/model <name> --provider <slug>` — プロバイダーを切り替え"
usage_persist: "`/model <name> --global` — 永続化"
+ usage_reset: "`/model reset` — このセッションのオーバーライドを解除"
+ reset_done: "セッションのモデルオーバーライドを解除しました — 現在 `{model}`(チャンネル/グローバルのデフォルト)を使用中。会話履歴は保持されます。"
+ reset_none: "このセッションにアクティブなモデルオーバーライドはありません — すでに `{model}`(チャンネル/グローバルのデフォルト)を使用しています。"
err_skew: "このゲートウェイは {boot_rev} のコードで動作していますが、ディスク上のチェックアウトは現在 {disk_rev} です。このままモデルを切り替えると古いモジュールによるクラッシュの恐れがあります。新しいコードを読み込むにはゲートウェイを再起動してください: hermes gateway restart"
err_switch_failed: "モデルを {model} に切り替えられませんでした ({error})。{current} を継続します。"
err_config_not_updated: "config.yaml を更新できませんでした ({error})"
diff --git a/locales/ko.yaml b/locales/ko.yaml
index b500b684b4b..a5aa14f74ee 100644
--- a/locales/ko.yaml
+++ b/locales/ko.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — 모델 전환"
usage_switch_provider: "`/model <name> --provider <slug>` — 제공자 전환"
usage_persist: "`/model <name> --global` — 영구 저장"
+ usage_reset: "`/model reset` — 이 세션의 오버라이드 해제"
+ reset_done: "세션 모델 오버라이드가 해제되었습니다 — 이제 `{model}`(채널/전역 기본값)을 사용합니다. 대화 기록은 유지됩니다."
+ reset_none: "이 세션에 활성화된 모델 오버라이드가 없습니다 — 이미 `{model}`(채널/전역 기본값)을 사용 중입니다."
err_skew: "이 게이트웨이는 {boot_rev} 코드로 실행 중인데 디스크의 체크아웃은 현재 {disk_rev}이에요. 지금 모델을 전환하면 오래된 모듈 때문에 충돌할 수 있어요. 새 코드를 불러오려면 게이트웨이를 재시작하세요: hermes gateway restart"
err_switch_failed: "{model}(으)로 모델 전환에 실패했어요({error}). {current}을(를) 계속 사용해요."
err_config_not_updated: "config.yaml이 업데이트되지 않았어요({error})"
diff --git a/locales/pt.yaml b/locales/pt.yaml
index 70bde64c00b..5fb301b9fb4 100644
--- a/locales/pt.yaml
+++ b/locales/pt.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — mudar de modelo"
usage_switch_provider: "`/model <name> --provider <slug>` — mudar de fornecedor"
usage_persist: "`/model <name> --global` — guardar permanentemente"
+ usage_reset: "`/model reset` — limpar o override desta sessão"
+ reset_done: "Override de modelo da sessão removido — agora usando `{model}` (o padrão do canal/global). Histórico da conversa mantido."
+ reset_none: "Nenhum override de modelo ativo nesta sessão — já está usando `{model}` (o padrão do canal/global)."
err_skew: "Este gateway está executando código de {boot_rev}, mas o checkout em disco agora está em {disk_rev}. Trocar de modelo poderia causar uma falha por módulo obsoleto — reinicie o gateway para carregar o novo código: hermes gateway restart"
err_switch_failed: "Falha ao trocar para o modelo {model} ({error}); permanecendo em {current}."
err_config_not_updated: "config.yaml não foi atualizado ({error})"
diff --git a/locales/ru.yaml b/locales/ru.yaml
index 256adbaa4db..bc4d74e6943 100644
--- a/locales/ru.yaml
+++ b/locales/ru.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — сменить модель"
usage_switch_provider: "`/model <name> --provider <slug>` — сменить провайдера"
usage_persist: "`/model <name> --global` — сохранить навсегда"
+ usage_reset: "`/model reset` — сбросить переопределение этой сессии"
+ reset_done: "Переопределение модели сессии сброшено — теперь используется `{model}` (значение по умолчанию канала/глобальное). История беседы сохранена."
+ reset_none: "В этой сессии нет активного переопределения модели — уже используется `{model}` (значение по умолчанию канала/глобальное)."
err_skew: "Этот шлюз выполняет код ревизии {boot_rev}, но чекаут на диске уже {disk_rev}. Смена модели может привести к сбою из-за устаревших модулей — перезапустите шлюз, чтобы загрузить новый код: hermes gateway restart"
err_switch_failed: "Не удалось переключиться на модель {model} ({error}); остаёмся на {current}."
err_config_not_updated: "config.yaml не обновлён ({error})"
diff --git a/locales/tr.yaml b/locales/tr.yaml
index 1f7d9999516..bfaf4abe090 100644
--- a/locales/tr.yaml
+++ b/locales/tr.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — modeli değiştir"
usage_switch_provider: "`/model <name> --provider <slug>` — sağlayıcıyı değiştir"
usage_persist: "`/model <name> --global` — kalıcı kaydet"
+ usage_reset: "`/model reset` — bu oturumun geçersiz kılmasını temizle"
+ reset_done: "Oturum model geçersiz kılması temizlendi — artık `{model}` kullanılıyor (kanal/genel varsayılan). Konuşma geçmişi korundu."
+ reset_none: "Bu oturumda etkin bir model geçersiz kılması yok — zaten `{model}` kullanılıyor (kanal/genel varsayılan)."
err_skew: "Bu gateway {boot_rev} sürümünün kodunu çalıştırıyor ancak diskteki checkout artık {disk_rev}. Model değiştirmek eski modül çökmesi riski taşır — yeni kodu yüklemek için gateway'i yeniden başlatın: hermes gateway restart"
err_switch_failed: "{model} modeline geçiş başarısız oldu ({error}); {current} modelinde kalınıyor."
err_config_not_updated: "config.yaml güncellenmedi ({error})"
diff --git a/locales/uk.yaml b/locales/uk.yaml
index 21464de0d54..a0379941610 100644
--- a/locales/uk.yaml
+++ b/locales/uk.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — змінити модель"
usage_switch_provider: "`/model <name> --provider <slug>` — змінити провайдера"
usage_persist: "`/model <name> --global` — зберегти назавжди"
+ usage_reset: "`/model reset` — скинути перевизначення цієї сесії"
+ reset_done: "Перевизначення моделі сесії скинуто — тепер використовується `{model}` (типове значення каналу/глобальне). Історію розмови збережено."
+ reset_none: "У цій сесії немає активного перевизначення моделі — вже використовується `{model}` (типове значення каналу/глобальне)."
err_skew: "Цей шлюз виконує код із {boot_rev}, але робоча копія на диску вже {disk_rev}. Перемикання моделі може призвести до збою через застарілі модулі — перезапустіть шлюз, щоб завантажити новий код: hermes gateway restart"
err_switch_failed: "Не вдалося перемкнути модель на {model} ({error}); залишаємось на {current}."
err_config_not_updated: "config.yaml не оновлено ({error})"
diff --git a/locales/zh-hant.yaml b/locales/zh-hant.yaml
index b3419bb3351..1f7e08e6978 100644
--- a/locales/zh-hant.yaml
+++ b/locales/zh-hant.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — 切換模型"
usage_switch_provider: "`/model <name> --provider <slug>` — 切換提供方"
usage_persist: "`/model <name> --global` — 永久儲存"
+ usage_reset: "`/model reset` — 清除本工作階段的模型覆寫"
+ reset_done: "已清除本工作階段的模型覆寫 — 現在使用 `{model}`(頻道/全域預設)。對話歷史已保留。"
+ reset_none: "本工作階段沒有啟用的模型覆寫 — 已在使用 `{model}`(頻道/全域預設)。"
err_skew: "此閘道執行的程式碼版本為 {boot_rev},但磁碟上的檢出版本已是 {disk_rev}。此時切換模型可能因模組過時而崩潰 — 請重新啟動閘道以載入新程式碼:hermes gateway restart"
err_switch_failed: "切換模型至 {model} 失敗({error});維持使用 {current}。"
err_config_not_updated: "config.yaml 未更新({error})"
diff --git a/locales/zh.yaml b/locales/zh.yaml
index f23a45d61be..0e874cdb6b2 100644
--- a/locales/zh.yaml
+++ b/locales/zh.yaml
@@ -66,6 +66,9 @@ gateway:
usage_switch_model: "`/model <name>` — 切换模型"
usage_switch_provider: "`/model <name> --provider <slug>` — 切换提供方"
usage_persist: "`/model <name> --global` — 永久保存"
+ usage_reset: "`/model reset` — 清除本会话的模型覆盖"
+ reset_done: "已清除本会话的模型覆盖 — 现在使用 `{model}`(频道/全局默认)。会话历史已保留。"
+ reset_none: "本会话没有激活的模型覆盖 — 已在使用 `{model}`(频道/全局默认)。"
err_skew: "此网关运行的是 {boot_rev} 的代码,但磁盘上的检出版本已是 {disk_rev}。此时切换模型可能因模块过期而崩溃——请重启网关以加载新代码:hermes gateway restart"
err_switch_failed: "切换到模型 {model} 失败({error});继续使用 {current}。"
err_config_not_updated: "config.yaml 未更新({error})"
diff --git a/tui_gateway/model_switch.py b/tui_gateway/model_switch.py
index f6f6412868f..249c586dae1 100644
--- a/tui_gateway/model_switch.py
+++ b/tui_gateway/model_switch.py
@@ -314,7 +314,11 @@ def _apply_model_switch(
persist_override: bool | None = None, count_switch: bool = True) -> dict:
"""``count_switch=False``: an internal swap (config adoption, MoA one-shot and its restore), not a
user's /model pick, so it stays out of the shared-metrics switch count."""
- from hermes_cli.model_switch import switch_model
+ from hermes_cli.model_switch import parse_model_switch_args, switch_model
+ if parsed_flags is None:
+ parsed_flags = parse_model_switch_args(raw_input)
+ if getattr(parsed_flags, "is_reset", False):
+ return _reset_session_model_override(sid, session)
model_input, explicit_provider, one_turn, persist_global, reasoning_effort = _switch_request(
raw_input, parsed_flags, persist_override)
agent = session.get("agent")
@@ -395,6 +399,34 @@ def _apply_model_switch(
"scope": "once" if one_turn else ("global" if persist_global else "session")}
+def _reset_session_model_override(sid: str, session: dict) -> dict:
+ """``/model reset`` (typed, ``config.set model``, Desktop's slash mirror, or a pick queued
+ mid-turn): drop this session's pin and any armed ``--once`` restore, adopt config.yaml's model
+ through the config-sync switch (no new pin, never written back), and persist the row so
+ ``session.resume`` cannot restore the old pin. History is kept."""
+ from agent.i18n import t
+ had_override = bool(session.get("model_override"))
+ session.pop("model_override", None)
+ session.pop("one_turn_model_restore", None)
+ session.pop("config_model_seen", None) # the pinned sync recorded the target without adopting it
+ if "composer_override_profile" in session:
+ session["composer_override_profile"] = None # persisted as a removal
+ model, provider = _config_model_target()
+ agent = session.get("agent")
+ if model and agent is not None and (
+ model != getattr(agent, "model", "") or (provider and provider != getattr(agent, "provider", ""))):
+ _apply_model_switch(
+ sid, session, f"{model} --provider {provider}" if provider else model,
+ confirm_expensive_model=True, pin_session_override=False, persist_override=False,
+ count_switch=False)
+ _persist_live_session_runtime(session)
+ _emit_session_info(sid, session)
+ shown = model or getattr(agent, "model", "") or t("gateway.shared.unknown_value")
+ return {"value": shown, "warning": t("gateway.model.reset_done" if had_override else "gateway.model.reset_none",
+ model=shown),
+ "confirm_required": False, "scope": "session"}
+
+
def _apply_switch_reasoning(sid: str, session, agent, effort: str, *, persist_global: bool, one_turn: bool) -> None:
"""``/model X --reasoning <level>``: the effort rides with the pick and shares its scope. Runs
AFTER ``agent.switch_model`` (which re-resolves ``reasoning_config`` from config.yaml, so an