openclacky 0.9.35 → 0.9.37

data/lib/clacky/tools/terminal.rb

@@ -147,6 +147,71 @@ module Clacky
         Clacky::Tools::Security.command_safe_for_auto_execution?(command)
       end
 
+      # ---------------------------------------------------------------------
+      # Internal Ruby API — synchronous capture
+      # ---------------------------------------------------------------------
+      #
+      # Run a shell command and BLOCK until it terminates, returning
+      # [output, exit_code]. Drop-in replacement for Open3.capture2e that
+      # goes through the same PTY + login-shell + Security pipeline used by
+      # the AI-facing tool (so rbenv/mise shims and gem mirrors work).
+      #
+      # Why this exists separately from #execute:
+      #
+      #   `execute` may return early with a :session_id the moment output
+      #   goes idle for DEFAULT_IDLE_MS (3s) — this is intentional for AI
+      #   agents (they can inspect progress, inject input, decide to kill).
+      #   Ruby callers like the HTTP server's upgrade flow only care about
+      #   "did it finish, with what output, what exit code" — they need
+      #   synchronous semantics. Previously each caller re-implemented the
+      #   poll loop (and 0.9.36's run_shell forgot to, causing the upgrade
+      #   failure bug).
+      #
+      # NOT exposed in tool_parameters — AI agents cannot invoke this.
+      #
+      # @param command [String]   the shell command to run
+      # @param timeout [Integer]  per-poll timeout AND the basis for the
+      #                           overall deadline (deadline = timeout + 60s)
+      # @param cwd     [String]   optional working directory
+      # @param env     [Hash]     optional env overrides
+      # @return [Array(String, Integer|nil)] [output, exit_code].
+      #         exit_code is nil only if the overall deadline was hit and
+      #         the session had to be force-killed.
+      def self.run_sync(command, timeout: 120, cwd: nil, env: nil)
+        terminal = new
+        result   = terminal.execute(
+          command: command,
+          timeout: timeout,
+          cwd:     cwd,
+          env:     env,
+        )
+        output   = result[:output].to_s
+
+        # Hard deadline in wall-clock terms — a genuinely stuck command
+        # must terminate. Each individual poll still carries `timeout`.
+        deadline = Time.now + timeout.to_i + 60
+
+        while result[:exit_code].nil? && result[:session_id] && Time.now < deadline
+          result = terminal.execute(
+            session_id: result[:session_id],
+            input:      "",
+            timeout:    timeout,
+          )
+          output += result[:output].to_s
+        end
+
+        # Deadline exceeded — best-effort cleanup so the session doesn't leak.
+        if result[:exit_code].nil? && result[:session_id]
+          begin
+            terminal.execute(session_id: result[:session_id], kill: true)
+          rescue StandardError
+            # swallow — cleanup is best-effort
+          end
+        end
+
+        [output, result[:exit_code]]
+      end
+
       # ---------------------------------------------------------------------
       # 1) Start a new command
       # ---------------------------------------------------------------------
@@ -274,7 +339,7 @@ module Clacky
         raw = read_log_slice(session.log_file, start_offset, new_offset)
         cleaned = OutputCleaner.clean(raw)
         cleaned = cleaned.sub(session.marker_regex, "").rstrip if session.marker_regex
-        cleaned = strip_command_echo(cleaned)
+        cleaned = strip_command_echo(cleaned, marker_token: session.marker_token)
         truncated = false
         if cleaned.bytesize > MAX_LLM_OUTPUT_CHARS
           cleaned = cleaned.byteslice(0, MAX_LLM_OUTPUT_CHARS) + "\n...[output truncated]"
@@ -336,23 +401,97 @@ module Clacky
       # The shell may echo the wrapper line we injected (`{ USER_CMD; }; ...;
       # printf "__CLACKY_DONE_..."`) before running it. When stty -echo is
       # honoured (bash/fresh pty) this is a no-op; when it isn't (zsh ZLE
-      # sometimes re-enables echo on reuse) we strip the wrapper echo.
+      # sometimes re-enables echo on reuse, or the user sent input to a
+      # running session) we strip the wrapper echo wherever it appears.
+      #
+      # Observed variants of the echoed wrapper:
+      #
+      #   1) Multi-line, starting the buffer (PTY in cooked mode, expanded
+      #      \n escapes inside printf's double-quoted format string):
+      #        { USER_CMD
+      #        }; __clacky_ec=$?; printf "
+      #        __CLACKY_DONE_<token>_%s__
+      #        " "$__clacky_ec"
+      #
+      #   2) Single-line / partially-truncated (PTY width wrap or partial
+      #      char drop ate the leading `{` or first chars of the command):
+      #        ails runner foo.rb ... }; __clacky_ec=$?; printf " __CLACKY_DONE_<token>_%s__ " "$__clacky_ec"
       #
-      # Note: when the PTY is in cooked mode and echoes the wrapper, the
-      # terminal *interprets* the backslash-n escape pairs inside the
-      # double-quoted printf format, so the wrapper echo spans multiple
-      # real \n lines — not just two. We match lazily up to the closing
-      # `"$__clacky_ec"` quote so we catch the entire echoed wrapper.
-      private def strip_command_echo(text)
+      #   3) Embedded mid-stream when re-echoed (e.g. after session re-use
+      #      or after a user input: call landed in a shell that re-enabled
+      #      echo). Same shape as (1) or (2) but not anchored to the start.
+      #
+      # We handle all three by running two passes:
+      #   * an anchored multi-line strip (keeps the legacy behaviour and is
+      #     cheapest when stty -echo silently failed);
+      #   * a token-aware global strip that removes any remaining echoed
+      #     wrapper fragment anywhere in the buffer. The token makes this
+      #     safe: the real completion marker was already removed via
+      #     session.marker_regex above, so any surviving occurrence of
+      #     __CLACKY_DONE_<token>_ is by definition an echoed wrapper.
+      private def strip_command_echo(text, marker_token: nil)
         return text if text.nil? || text.empty?
-        # Match the whole echoed wrapper, however many lines the terminal
-        # expanded its \n escapes into:
-        #   { USER_CMD
-        #   }; __clacky_ec=$?; printf "
-        #   __CLACKY_DONE_<token>_%s__
-        #   " "$__clacky_ec"
-        # Anchored at the start; non-greedy across newlines via /m.
+
+        # Pass 1: anchored strip — the full wrapper echoed at the start,
+        # possibly spanning multiple real newlines.
         text = text.sub(/\A\{.*?"\$__clacky_ec"\s*\n?/m, "")
+
+        # Pass 2: token-aware global strip — remove any leftover wrapper
+        # echo fragment, wherever it sits. Requires the session token so
+        # we never touch unrelated user output that happens to mention
+        # `__clacky_ec`.
+        if marker_token && !marker_token.empty?
+          token_re = Regexp.escape(marker_token)
+
+          # 2a. Multi-line shape: walk back from __CLACKY_DONE_<token> to
+          # the opening `{` of the wrapper (start of line or start of
+          # buffer) and forward to the closing `"$__clacky_ec"`.
+          text = text.gsub(
+            /(?:^|(?<=\n))\{[^\n]*\n(?:[^\n]*\n)*?[^\n]*__CLACKY_DONE_#{token_re}_[^\n]*\n[^\n]*"\$__clacky_ec"[^\n]*\n?/,
+            ""
+          )
+
+          # 2b. Single-line shape: everything collapsed onto one line.
+          # Strip from the wrapper's `}; __clacky_ec=$?` pivot (or the
+          # opening `{` if still present on that line) through the end of
+          # the printf invocation (`"$__clacky_ec"`).
+          text = text.gsub(
+            /[^\n]*\}; *__clacky_ec=\$\?; *printf[^\n]*__CLACKY_DONE_#{token_re}_[^\n]*"\$__clacky_ec"[^\n]*\n?/,
+            ""
+          )
+
+          # 2c. Last-resort: a bare marker-format fragment on its own,
+          # without the `}; printf ...` prefix (e.g. terminal wrapped the
+          # echo such that only the tail survived). Drop lines that
+          # contain the literal `__CLACKY_DONE_<token>_%s__` format —
+          # the real marker has `\d+` in place of `%s` so this only hits
+          # echoed wrappers.
+          text = text.gsub(/^.*__CLACKY_DONE_#{token_re}_%s__.*\n?/, "")
+        end
+
+        # Pass 3: token-INDEPENDENT fingerprint strip — PTY width-wrap
+        # can chop the `__CLACKY_DONE_<token>_%s__` format string out of
+        # printf entirely, leaving e.g. `}; __clacky_ec=$?; printf " " "$__clacky_ec"`.
+        # None of the token-aware patterns above catch that. The pair
+        # `}; __clacky_ec=$?` (opening pivot) and `"$__clacky_ec"` (printf
+        # tail) are our wrapper's unique fingerprints — `__clacky_ec` is a
+        # private double-underscore var name that user code effectively
+        # never emits — so we strip anything between them (non-greedy,
+        # multiline-aware) to also handle width-wrap that inserted
+        # real \n breaks inside the echo.
+        text = text.gsub(
+          /[^\n]*\}; *__clacky_ec=\$\?.*?"\$__clacky_ec"[^\n]*\n?/m,
+          ""
+        )
+
+        # Pass 4: bare pivot with no printf tail at all (extreme
+        # truncation cut off everything after `__clacky_ec=$?`). Still a
+        # reliable fingerprint thanks to the `__clacky_ec` var name.
+        text = text.gsub(
+          /[^\n]*\}; *__clacky_ec=\$\?;?[^\n]*\n?/,
+          ""
+        )
+
         text
       end
 

data/lib/clacky/ui2/ui_controller.rb

@@ -1188,7 +1188,7 @@ module Clacky
             display_name = "#{type_badge}#{model_name} (#{masked_key})"
             choices << {
               name: display_name,
-              value: { action: :switch, index: idx }
+              value: { action: :switch, model_id: model["id"] }
             }
           end
           
@@ -1210,8 +1210,15 @@ module Clacky
           
           case result[:action]
           when :switch
-            current_config.switch_model(result[:index])
-            # Auto-save after switching
+            # CLI is a single-session context: when the user picks a model
+            # we treat it as "make this my default from now on". So:
+            #   1. switch this session's current model
+            #   2. move the global `type: "default"` marker to it
+            #   3. persist to config.yml so next CLI launch uses it
+            # (Web UI's per-session switch is different — it must NOT do
+            # steps 2 and 3, and uses switch_model_by_id directly.)
+            current_config.switch_model_by_id(result[:model_id])
+            current_config.set_default_model_by_id(result[:model_id])
             current_config.save
             # Return to indicate config changed (need to update client)
             return { action: :switch }
@@ -1228,10 +1235,12 @@ module Clacky
                 base_url: new_model[:base_url],
                 anthropic_format: anthropic_format
               )
-              # Auto-save after adding
-              current_config.save
-              # Set newly added model as default
-              current_config.switch_model(current_config.models.length - 1)
+              # CLI: adding a model implies the user wants to use it now and
+              # next launch. Switch this session to it AND set it as the
+              # global default, then persist.
+              new_id = current_config.models.last["id"]
+              current_config.switch_model_by_id(new_id)
+              current_config.set_default_model_by_id(new_id)
               current_config.save
               # Return to exit the menu
               return { action: :switch }

data/lib/clacky/utils/model_pricing.rb

@@ -105,6 +105,42 @@ module Clacky
         }
       },
 
+      # DeepSeek V4 models
+      # Source: https://api-docs.deepseek.com/quick_start/pricing (USD / 1M tokens)
+      # DeepSeek billing model:
+      #   - "cache miss input" = regular prompt_tokens rate
+      #   - "cache hit input"  = cache_read rate (DeepSeek has no separate cache-write charge)
+      #   - No tiered pricing (single rate regardless of context length)
+      "deepseek-v4-flash" => {
+        input: {
+          default: 0.14,                  # $0.14/MTok cache miss
+          over_200k: 0.14                 # no tiered pricing
+        },
+        output: {
+          default: 0.28,                  # $0.28/MTok
+          over_200k: 0.28
+        },
+        cache: {
+          write: 0.14,                    # DeepSeek doesn't charge extra for writes; bill at miss rate
+          read: 0.028                     # $0.028/MTok cache hit
+        }
+      },
+
+      "deepseek-v4-pro" => {
+        input: {
+          default: 1.74,                  # $1.74/MTok cache miss
+          over_200k: 1.74
+        },
+        output: {
+          default: 3.48,                  # $3.48/MTok
+          over_200k: 3.48
+        },
+        cache: {
+          write: 1.74,                    # no separate write charge; bill at miss rate
+          read: 0.145                     # $0.145/MTok cache hit
+        }
+      },
+
       # Default fallback pricing (conservative estimates)
       "default" => {
         input: {
@@ -238,6 +274,15 @@ module Clacky
           "claude-3-5-sonnet-20240620"
         when /claude-3-5-haiku-20241022/i
           "claude-3-5-haiku-20241022"
+        when /deepseek-v4-pro/i, /deepseek.*v4.*pro/i
+          "deepseek-v4-pro"
+        when /deepseek-v4-flash/i, /deepseek.*v4.*flash/i
+          "deepseek-v4-flash"
+        # Legacy aliases: deepseek-chat and deepseek-reasoner are being
+        # deprecated on 2026-07-24 and map to deepseek-v4-flash's
+        # non-thinking / thinking modes respectively. Bill at flash rates.
+        when /^deepseek-chat$/i, /^deepseek-reasoner$/i
+          "deepseek-v4-flash"
         else
           "default"
         end

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "0.9.35"
+  VERSION = "0.9.37"
 end

data/lib/clacky/web/app.css

@@ -1359,144 +1359,36 @@ body {
 
 /* ── Chat panel ──────────────────────────────────────────────────────────── */
 #chat-panel { flex: 1; display: flex; flex-direction: column; overflow: hidden; position: relative; }
-#chat-header {
-  padding: 10px 20px;
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  min-height: 44px;
-}
-/* Title block — stacks the name + subtitle vertically so the header has
-   two lines of information (like Linear / Arc) without growing wider. */
-#chat-title-block {
-  display: flex;
-  flex-direction: column;
-  min-width: 0;           /* allow ellipsis inside */
-  flex: 1;
-  line-height: 1.25;
-  gap: 2px;
-}
-#chat-title {
-  font-weight: 600;
-  font-size: 15px;
-  color: var(--color-text-primary);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-#chat-subtitle {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  font-size: 11px;
-  color: var(--color-text-secondary);
-  opacity: 0.75;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  min-width: 0;
-}
-#chat-subtitle .chat-sub-source {
-  font-weight: 500;
-  color: var(--color-text-secondary);
-  flex-shrink: 0;
-}
-#chat-subtitle .chat-sub-dir {
-  font-family: var(--font-mono, monospace);
-  overflow: hidden;
-  text-overflow: ellipsis;
-  min-width: 0;
-  opacity: 0.85;
-}
-#chat-subtitle .chat-sub-sep {
-  opacity: 0.35;
-  flex-shrink: 0;
-}
-
-/* Status badge styles - softed design */
-.status-idle,
-.status-running,
-.status-error {
-  display: inline-flex;
-  align-items: center;
-  padding: 2px 8px;
-  border-radius: 4px;
-  font-size: 11px;
-  font-weight: 500;
-  text-transform: lowercase;
-}
 
-.status-idle {
-  background: var(--color-bg-secondary);
-  color: var(--color-text-secondary);
-  border: 1px solid var(--color-border-secondary);
-}
-
-[data-theme="light"] .status-idle {
-  background: rgba(0, 0, 0, 0.04);
-  color: var(--color-text-secondary);
-  border: 1px solid rgba(0, 0, 0, 0.08);
-}
-
-.status-running {
-  background: rgba(34, 197, 94, 0.1);
-  color: var(--color-success);
-  border: 1px solid rgba(34, 197, 94, 0.2);
-}
-
-[data-theme="light"] .status-running {
-  background: rgba(34, 197, 94, 0.08);
-  color: #16a34a;
-  border: 1px solid rgba(34, 197, 94, 0.15);
-}
-
-.status-error {
-  background: rgba(239, 68, 68, 0.1);
-  color: var(--color-error);
-  border: 1px solid rgba(239, 68, 68, 0.2);
-}
-
-[data-theme="light"] .status-error {
-  background: rgba(239, 68, 68, 0.08);
-  color: #dc2626;
-  border: 1px solid rgba(239, 68, 68, 0.15);
-}
-
-/* Delete session button in chat header */
-/* Back button in chat header — hidden on desktop, shown on mobile via media query */
+/* Mobile-only floating back button — replaces the old in-header back button.
+   Hidden on desktop; mobile media query enables it. Positioned absolutely so
+   it doesn't take layout space or add visual chrome on desktop. */
 .chat-back-btn {
   display: none;
+}
+.chat-back-floating {
+  position: absolute;
+  top: 8px;
+  left: 8px;
+  z-index: 5;
   align-items: center;
   justify-content: center;
   width: 32px;
   height: 32px;
-  background: transparent;
-  border: none;
+  background: var(--color-bg-primary);
+  border: 1px solid var(--color-border-secondary);
   border-radius: 6px;
   color: var(--color-text-secondary);
   cursor: pointer;
   padding: 0;
-  flex-shrink: 0;
   transition: background .15s, color .15s;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
 }
-.chat-back-btn:hover { background: var(--color-bg-hover); }
+.chat-back-floating:hover { background: var(--color-bg-hover); }
 
-.btn-delete-session {
-  margin-left: auto;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 28px;
-  height: 28px;
-  background: transparent;
-  border: none;
-  border-radius: 6px;
-  color: var(--color-text-tertiary);
-  cursor: pointer;
-  padding: 0;
-  transition: background .15s, color .15s;
-}
-.btn-delete-session:hover { background: var(--color-error-bg); color: var(--color-error); }
+/* Status badges (.status-idle/running/error) used to live in #chat-header.
+   That header has been removed; the bottom #session-info-bar uses its own
+   .sib-status-* classes instead. Legacy .status-* styles removed. */
 
 /* ── Messages ────────────────────────────────────────────────────────────── */
 #messages {
@@ -1508,6 +1400,61 @@ body {
   gap: 12px;
 }
 
+/* Empty-state hint: shown inside #messages when a session has no messages yet.
+   Designed to be quiet and low-contrast so it guides without distracting. */
+.chat-empty-hint {
+  margin: auto;                /* vertical + horizontal centering inside flex column */
+  max-width: 420px;
+  padding: 24px 16px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  color: var(--color-text-secondary);
+  user-select: none;
+  pointer-events: none;        /* purely decorative — don't block clicks/scroll */
+  opacity: 0.85;
+}
+.chat-empty-hint .chat-empty-icon {
+  color: var(--color-text-tertiary);
+  margin-bottom: 14px;
+  opacity: 0.55;
+}
+.chat-empty-hint .chat-empty-title {
+  color: var(--color-text-primary);
+  font-size: 15px;
+  font-weight: 600;
+  margin-bottom: 4px;
+}
+.chat-empty-hint .chat-empty-subtitle {
+  color: var(--color-text-secondary);
+  font-size: 13px;
+  margin-bottom: 18px;
+  opacity: 0.85;
+}
+.chat-empty-hint .chat-empty-tips {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  font-size: 12px;
+  color: var(--color-text-tertiary);
+}
+.chat-empty-hint .chat-empty-tips li {
+  position: relative;
+  padding-left: 14px;
+  line-height: 1.5;
+}
+.chat-empty-hint .chat-empty-tips li::before {
+  content: "·";
+  position: absolute;
+  left: 4px;
+  top: -1px;
+  opacity: 0.6;
+}
+
 /* New message notification banner */
 .new-message-banner {
   position: absolute;
@@ -5970,31 +5917,6 @@ body.setup-mode[data-theme="dark"] {
     padding: 0 12px;
   }
 
-  /* Chat sub-header: tighten padding */
-  #chat-header {
-    padding: 8px 12px;
-    gap: 8px;
-  }
-
-  /* Truncate long session titles */
-  #chat-title {
-    font-size: 14px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    min-width: 0;
-    flex: 1;
-  }
-
-  /* Status badge: smaller on mobile */
-  .status-idle,
-  .status-running,
-  .status-error {
-    font-size: 10px;
-    padding: 1px 6px;
-    flex-shrink: 0;
-  }
-
   /* Session info bar: single-line, no hover-expand, font smaller */
   #session-info-bar {
     padding: 3px 12px;
@@ -6050,6 +5972,10 @@ body.setup-mode[data-theme="dark"] {
   .chat-back-btn {
     display: flex;
   }
+  /* Reserve top space in messages so floating back button doesn't overlap content */
+  #chat-panel #messages {
+    padding-top: 52px;
+  }
 
   /* Welcome page: vertically centered but shifted up, add horizontal padding */
   #welcome {

data/lib/clacky/web/app.js

@@ -437,9 +437,7 @@ WS.onEvent(ev => {
     case "session_renamed": {
       Sessions.patch(ev.session_id, { name: ev.name });
       Sessions.renderList();
-      if (ev.session_id === Sessions.activeId) {
-        $("chat-title").textContent = ev.name;
-      }
+      // Title is now shown only in the sidebar; chat-header element was removed.
       break;
     }
 
@@ -847,7 +845,7 @@ $("sidebar-overlay").addEventListener("click", _closeSidebar);
 // On mobile: start with sidebar hidden
 if (_isMobile()) _closeSidebar();
 
-// Mobile back button in chat-header: tap to go back to welcome
+// Mobile floating back button (visible only on mobile via CSS): tap to go back to welcome.
 const _btnBack = document.querySelector(".chat-back-btn");
 if (_btnBack) _btnBack.addEventListener("click", () => Router.navigate("welcome"));
 
@@ -985,9 +983,14 @@ document.addEventListener("change", e => {
 if ($("theme-toggle-header")) {
   $("theme-toggle-header").addEventListener("click", () => Theme.toggle());
 }
-$("btn-delete-session").addEventListener("click", () => {
-  if (Sessions.activeId) Sessions.deleteSession(Sessions.activeId);
-});
+// btn-delete-session was removed with chat-header; deletion is now triggered from
+// the bottom session-info-bar actions dropdown (see Sessions._showActionsMenu).
+const _btnDeleteSession = $("btn-delete-session");
+if (_btnDeleteSession) {
+  _btnDeleteSession.addEventListener("click", () => {
+    if (Sessions.activeId) Sessions.deleteSession(Sessions.activeId);
+  });
+}
 
 // Load older history when the user scrolls to the top of the message list
 $("messages").addEventListener("scroll", () => {
@@ -1617,7 +1620,7 @@ window.bootAfterBrand = async function() {
       dropdown.innerHTML = "";
 
       models.forEach(m => {
-        console.log("[Model Switcher] Adding model:", m.model, "current:", currentModel);
+        console.log("[Model Switcher] Adding model:", m.model, "id:", m.id, "current:", currentModel);
         const opt = document.createElement("div");
         opt.className = "sib-model-option";
         if (m.model === currentModel) opt.classList.add("current");
@@ -1633,7 +1636,8 @@ window.bootAfterBrand = async function() {
           opt.appendChild(badge);
         }
 
-        opt.addEventListener("click", () => _switchModel(sessionId, m.model));
+        // Switch by id (stable across reorders/edits). Keep model name for UI update.
+        opt.addEventListener("click", () => _switchModel(sessionId, m.id, m.model));
         dropdown.appendChild(opt);
       });
       console.log("[Model Switcher] Dropdown populated, children count:", dropdown.children.length);
@@ -1644,7 +1648,9 @@ window.bootAfterBrand = async function() {
   }
 
   // Switch session model via API
-  async function _switchModel(sessionId, newModel) {
+  // modelId — stable runtime id (required by backend)
+  // modelName — display name, used for optimistic UI update
+  async function _switchModel(sessionId, modelId, modelName) {
     const dropdown = $("sib-model-dropdown");
     if (dropdown) {
       dropdown.style.display = "none";
@@ -1655,20 +1661,20 @@ window.bootAfterBrand = async function() {
       const res = await fetch(`/api/sessions/${sessionId}/model`, {
         method: "PATCH",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ model: newModel })
+        body: JSON.stringify({ model_id: modelId })
       });
-      
+
       const data = await res.json();
-      
+
       if (!res.ok) {
         throw new Error(data.error || "Unknown error");
       }
-      
+
       // Update UI optimistically (will be confirmed by session_update broadcast)
       const sibModel = $("sib-model");
-      if (sibModel) sibModel.textContent = newModel;
-      
-      console.log(`Switched session ${sessionId} to model ${newModel}`);
+      if (sibModel) sibModel.textContent = modelName;
+
+      console.log(`Switched session ${sessionId} to model ${modelName} (${modelId})`);
     } catch (e) {
       console.error("Failed to switch model:", e);
       alert("Failed to switch model: " + e.message);