openclacky 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c045233115364b3165e5ca43d7b45b898250996f952c2db8baacb4435404cc0
-  data.tar.gz: 3617f770edb88eaf6361bb0e6398f2ab6519f950ce234c89d0e9bce4fed4d486
+  metadata.gz: efbdc6d887e5beea867023b733d023f236b0e0a0a813201cce3767deebe43fd2
+  data.tar.gz: 1abf4430324ddd28b1d1d6a6b82390eaa8c76dc026f31cc1c10ff7fdac6c7207
 SHA512:
-  metadata.gz: 6e5943dfb3599650349c8e09359e3fc1467e7fa6126f78ccf4840d2d9eaa02e5c06b088dc02bbeb789d53e8ae5fc128656a6e193dd385951a627f2349222262d
-  data.tar.gz: 8565520e6fef3cf12bc8580c537b04499a0f3b6068b2ff88d495dbec51f2feb70ef2e45713d0c1d1a06af0b1e4fffbdf4e3d4a2f414649943515b83d7a7f2946
+  metadata.gz: 6df9bcdd91aa229039baad046a06d471ae11367e78a594f655abffd808c3f9b14507f9fca32d99c4f3fbd13a3ab2743451826238bc8e55e9ddc0161546276bae
+  data.tar.gz: 53b8fd83915c5ee898237dc113099a7ea0e339961dac83b11d4b16285a1f2fb3b4581d1876f70c2a78608556b22760da3ba8fff7146af0b66c701d12e963005b

data/CHANGELOG.md

@@ -4,6 +4,39 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
+## [1.5.8] - 2026-08-12
+
+### Added
+- Inline SVG icons (edit, clear sessions, delete) in project action menu (#474)
+- New project button in project selector popover
+- Verified badge for officially reviewed extensions in marketplace
+
+### Improved
+- Skip full session/file scan when count is under cap (#470 - @shipinliang)
+- Token estimation uses count() instead of scan().length (#471 - @shipinliang)
+- Faster server startup
+- Brand user extension UI (non-admin publish button grayed out, unverified banner hidden)
+- Sidebar my-data section icons refreshed
+- Section chevron icon size increased from 11px to 13px
+- Project sidebar hover effects, folder default hints, project icon sizing
+- Billing UI cleanup and global theme color adjustment
+- Section header font and project group spacing tweaks
+- Project menu labels updated
+- Billing disclaimer about provider billing
+
+### Fixed
+- Extension pack max zip size increased from 50 MB to 80 MB
+- New session button in project area now correctly preselects the project
+- Chat navigation popup no longer overlaps sidebar collapse button
+- Sub-model config preserved when switching modes (auto/off/custom)
+- minimax-m2.7 vision detection fixed
+- Project icon no longer reverts to default after page refresh
+- Load constant warning fixed
+
+### More
+- README cost table formatting normalized
+- Ambiguous cost phrasing clarified across READMEs (#475 - @chengoak)
+
 ## [1.5.7] - 2026-08-10
 
 ### Added

data/README.md

@@ -14,7 +14,7 @@
 
 **The most Token-efficient open-source AI Agent.**
 
-OpenClacky matches Claude Code on capability at comparable cost, and saves significantly against other open-source agents (~50% vs OpenClaw, ~3× cheaper than Hermes). 100% open source (MIT), BYOK with any OpenAI-compatible model, built on two years of Agentic R&D and harness engineering.
+OpenClacky matches Claude Code on capability at comparable cost, and saves significantly against other open-source agents (~50% vs OpenClaw, costs only ~1/3 of Hermes). 100% open source (MIT), BYOK with any OpenAI-compatible model, built on two years of Agentic R&D and harness engineering.
 
 > Website: https://www.openclacky.com/ · Backed by **MiraclePlus · ZhenFund · Sequoia China · Hillhouse Capital**
 
@@ -24,7 +24,7 @@ Same task, how much do you pay? Under comparable agent workloads, OpenClacky sav
 
 | Agent | Relative cost | Notes |
 |---|---|---|
-| **OpenClacky** | **~0.8** | 16 tools · ~100% cache hit · subagent routing |
+| **OpenClacky** | **~0.8×** | 16 tools · ~100% cache hit · subagent routing |
 | Claude Code | 1.0× (baseline) | World-class harness, closed-source subscription |
 | OpenClaw | ~1.5× | Comparable harness agent |
 | Hermes | ~3× | 52 built-in tools — schema bloat ~3–4× |

data/README_CN.md

@@ -10,7 +10,7 @@
 
 **最省 Token 的开源 AI Agent。**
 
-OpenClacky 在任务能力上对齐 Claude Code，成本相当，同时相比其他开源 Agent 有显著优势（约节省 50% vs OpenClaw，约便宜 3× vs Hermes）。100% 开源（MIT），支持 BYOK 接入任意 OpenAI 兼容模型，背后是两年 Agentic 研发与 Harness 工程积累。
+OpenClacky 在任务能力上对齐 Claude Code，成本相当，同时相比其他开源 Agent 有显著优势（约节省 50% vs OpenClaw，成本约为 Hermes 的 1/3）。100% 开源（MIT），支持 BYOK 接入任意 OpenAI 兼容模型，背后是两年 Agentic 研发与 Harness 工程积累。
 
 > 官网：https://www.openclacky.com/ · 投资方：**奇绩创坛 · 真格基金 · 红杉中国 · 高瓴资本**
 

data/README_JA.md

@@ -24,7 +24,7 @@ OpenClacky は Claude Code と同等の性能を同等のコストで実現し
 
 | エージェント | 相対コスト | 備考 |
 |---|---|---|
-| **OpenClacky** | **約 0.8** | 16 ツール · キャッシュヒット率約 100% · サブエージェントルーティング |
+| **OpenClacky** | **約 0.8×** | 16 ツール · キャッシュヒット率約 100% · サブエージェントルーティング |
 | Claude Code | 1.0×（基準） | 世界クラスのハーネス、クローズドソースのサブスクリプション |
 | OpenClaw | 約 1.5× | 同等のハーネスエージェント |
 | Hermes | 約 3× | 52 個の組み込みツール — スキーマの肥大化が約 3〜4 倍 |

data/lib/clacky/agent.rb

@@ -3,7 +3,6 @@
 require "securerandom"
 require "json"
 require "cgi"
-require "tty-prompt"
 require "set"
 require_relative "null_ui_controller"
 require_relative "utils/arguments_parser"
@@ -1392,7 +1391,7 @@ module Clacky
       # plain text, inflating token counts by 20-40x.  The tool result carries a
       # plain-text description for the LLM; the actual image is delivered here.
       vision_supported = @config.current_model_supports?(:vision)
-      ocr_entry = vision_supported ? nil : @config.find_model_by_type("ocr")
+      ocr_entry = vision_supported ? nil : @config.effective_ocr_entry
 
       tool_results.each do |tr|
         inject = tr[:image_inject]
@@ -1959,7 +1958,7 @@ module Clacky
       # OCR sidecar — only consulted when the primary doesn't see images.
       # When the sidecar entry has "primary"=>true, the primary itself can see,
       # so vision_supported was already true and we never enter the OCR branch.
-      ocr_entry = vision_supported ? nil : @config.find_model_by_type("ocr")
+      ocr_entry = vision_supported ? nil : @config.effective_ocr_entry
 
       vision_images = []  # Array of { url:, name:, size_bytes:, path: }
       downgraded    = []

data/lib/clacky/agent_config.rb

@@ -633,16 +633,10 @@ module Clacky
       }.compact
     end
 
-    # Find model by type (default or lite or media kind or ocr sidecar)
-    # Returns the model hash or nil if not found.
-    # For media kinds (image/video/audio): explicit user-configured (custom)
-    # entries win; otherwise an auto-derived virtual entry is returned
-    # based on the default model's provider — mirroring how lite is
-    # virtually derived via #lite_model_config_for_current.
-    # For "ocr": same custom→auto→nil pattern. Auto path first checks
-    # whether the default model itself supports vision (zero-overhead path,
-    # no sidecar needed); if not, derives from the provider's
-    # default_ocr_model.
+    # Raw accessor - returns the stored model entry without mode-aware filtering.
+    # For media/ocr: does NOT check mode field, only legacy disabled flag.
+    # Mode-aware callers should use #effective_media_entry / #effective_ocr_entry.
+    # HTTP server uses this to read raw entries for saved_custom / api_key masking.
     def find_model_by_type(type)
       kind = type.to_s
       if Clacky::Providers::MEDIA_KINDS.include?(kind)
@@ -701,6 +695,38 @@ module Clacky
       @models.reject! { |m| m["auto_injected"] && Clacky::Providers::MEDIA_KINDS.include?(m["type"].to_s) }
     end
 
+    private def sidecar_off?(entry)
+      entry && (entry["disabled"] || entry["mode"] == "off")
+    end
+
+    private def sidecar_custom?(entry)
+      entry &&
+        entry["base_url"].to_s.strip != "" &&
+        entry["api_key"].to_s.strip != "" &&
+        entry["mode"] != "auto"
+    end
+
+    def effective_media_entry(kind)
+      kind = kind.to_s
+      raw_entry = @models.find { |m| m["type"] == kind }
+      return nil if sidecar_off?(raw_entry)
+
+      is_custom = sidecar_custom?(raw_entry)
+      override_model = raw_entry && !is_custom ? raw_entry["model"] : nil
+
+      is_custom ? raw_entry : derive_media_model(kind, model_override: override_model)
+    end
+
+    def effective_ocr_entry
+      raw_entry = @models.find { |m| m["type"] == "ocr" }
+      return nil if sidecar_off?(raw_entry)
+
+      is_custom = sidecar_custom?(raw_entry)
+      override_model = raw_entry && !is_custom ? raw_entry["model"] : nil
+
+      is_custom ? raw_entry : derive_ocr_model(model_override: override_model)
+    end
+
     # Derive an OCR sidecar model entry from the default model's provider.
     # Resolution order:
     #   1. If the default model itself supports vision → return the default
@@ -763,7 +789,7 @@ module Clacky
       kind = kind.to_s
       raw_entry = @models.find { |m| m["type"] == kind }
 
-      if raw_entry && raw_entry["disabled"]
+      if sidecar_off?(raw_entry)
         default = find_model_by_type("default")
         default_provider = default && Clacky::Providers.resolve_provider(
           base_url: default["base_url"], api_key: default["api_key"]
@@ -782,9 +808,7 @@ module Clacky
         }
       end
 
-      is_custom = raw_entry &&
-                  raw_entry["base_url"].to_s.strip != "" &&
-                  raw_entry["api_key"].to_s.strip != ""
+      is_custom = sidecar_custom?(raw_entry)
       override_model = raw_entry && !is_custom ? raw_entry["model"] : nil
 
       entry = if is_custom
@@ -842,7 +866,7 @@ module Clacky
       )
       available = default_provider ? Clacky::Providers.ocr_models(default_provider) : []
 
-      if raw_entry && raw_entry["disabled"]
+      if sidecar_off?(raw_entry)
         # A disabled OCR sidecar only means "no separate vision model"; it must
         # not override the fact that the chat model may handle images itself.
         anchor = current_model || default
@@ -872,9 +896,7 @@ module Clacky
         }
       end
 
-      is_custom = raw_entry &&
-                  raw_entry["base_url"].to_s.strip != "" &&
-                  raw_entry["api_key"].to_s.strip != ""
+      is_custom = sidecar_custom?(raw_entry)
       override_model = raw_entry && !is_custom ? raw_entry["model"] : nil
 
       entry = if is_custom

data/lib/clacky/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "thor"
-require "tty-prompt"
 require "fileutils"
 require_relative "ui2"
 require_relative "json_ui_controller"

data/lib/clacky/default_extensions/ext-studio/panels/studio/view.js

@@ -148,6 +148,7 @@
       "extlist.unpublish.confirm": "Unpublish {{id}} from the marketplace?",
       "extlist.publishing": "Publishing…",
       "extlist.needLicense": "Publishing requires an activated user license.",
+      "extlist.brandLocked": "Publishing to the marketplace requires a creator license.",
       "extlist.newExt.label": "Create a new extension",
       "extlist.newExt.hint": "Opens an AI session that scaffolds and builds it for you.",
       "extlist.newExt.btn": "Create New Extension",
@@ -338,6 +339,7 @@
       "extlist.unpublish.confirm": "确定要从市场下架 {{id}} 吗？",
       "extlist.publishing": "发布中…",
       "extlist.needLicense": "发布需要已激活的用户授权。",
+      "extlist.brandLocked": "发布到市场需要创作者权限。",
       "extlist.newExt.label": "创建新扩展",
       "extlist.newExt.hint": "打开一个 AI 会话，帮你生成并开发它。",
       "extlist.newExt.btn": "创建新扩展",
@@ -1406,11 +1408,16 @@
       ));
 
       const bar = el("div", { class: "studio-actions" });
-      bar.appendChild(el("button", { class: "studio-btn studio-btn-primary studio-publish-btn", text: t("btn.publish"), onclick: doPublish }));
+      const brandNonAdmin = typeof Brand !== "undefined" && Brand.branded && !Brand.userLicensed;
+      const pubBtn = el("button", { class: "studio-btn studio-btn-primary studio-publish-btn", text: t("btn.publish"), onclick: doPublish });
+      pubBtn.disabled = brandNonAdmin;
+      if (brandNonAdmin) pubBtn.setAttribute("data-tooltip", t("extlist.brandLocked"));
+      bar.appendChild(pubBtn);
       if (typeof Brand !== "undefined" && Brand.userLicensed) {
         bar.appendChild(el("button", { class: "studio-btn studio-publish-brand-btn", text: t("btn.publishBrand"), onclick: doPublishBrand }));
       }
-      bar.appendChild(el("button", { class: "studio-btn studio-btn-ghost studio-pack-btn", text: t("btn.pack"), onclick: doPack }));
+      const packBtn = el("button", { class: "studio-btn studio-btn-ghost studio-pack-btn", text: t("btn.pack"), onclick: doPack });
+      bar.appendChild(packBtn);
       container.appendChild(bar);
 
       container.appendChild(el("div", { class: "studio-feedback" }));
@@ -1548,9 +1555,11 @@
       card.appendChild(meta);
 
       const actions = el("div", { class: "studio-actions" });
+      const brandNonAdmin = typeof Brand !== "undefined" && Brand.branded && !Brand.userLicensed;
       const pub = el("button", { class: "studio-btn studio-btn-primary", text: published ? t("extlist.btn.update") : t("extlist.btn.publish") });
-      pub.disabled = !!ext.error_count;
-      pub.title = ext.error_count ? t("extlist.verify.errors", { n: ext.error_count }) : "";
+      pub.disabled = !!ext.error_count || brandNonAdmin;
+      const pubTip = ext.error_count ? t("extlist.verify.errors", { n: ext.error_count }) : (brandNonAdmin ? t("extlist.brandLocked") : "");
+      if (pubTip) pub.setAttribute("data-tooltip", pubTip);
       pub.addEventListener("click", () => doPublish(ext, cloudEntry ? cloudEntry.version : null));
       actions.appendChild(pub);
 
@@ -1558,7 +1567,7 @@
         const brandEntry = brandCloud.find((c) => c.id === ext.id);
         const brandPub = el("button", { class: "studio-btn", text: t("extlist.btn.publishBrand") });
         brandPub.disabled = !!ext.error_count;
-        brandPub.title = ext.error_count ? t("extlist.verify.errors", { n: ext.error_count }) : "";
+        if (ext.error_count) brandPub.setAttribute("data-tooltip", t("extlist.verify.errors", { n: ext.error_count }));
         brandPub.addEventListener("click", () => doPublish(ext, brandEntry ? brandEntry.version : null, "self"));
         actions.appendChild(brandPub);
       }
@@ -1635,11 +1644,15 @@
 
       if (headerActions) {
         headerActions.innerHTML = "";
-        headerActions.appendChild(el("button", {
+        const brandNonAdmin = typeof Brand !== "undefined" && Brand.branded && !Brand.userLicensed;
+        const newBtn = el("button", {
           class: "studio-btn studio-btn-primary",
           text: t("extlist.newExt.btn"),
           onclick: () => createExtension(t("extlist.newExt.seed")),
-        }));
+        });
+        newBtn.disabled = brandNonAdmin;
+        if (brandNonAdmin) newBtn.setAttribute("data-tooltip", t("extlist.brandLocked"));
+        headerActions.appendChild(newBtn);
       }
 
       container.appendChild(section("extlist.section.cloud", "extlist.section.cloudHint", cloud, cloudCard, "extlist.cloud.empty"));
@@ -1711,7 +1724,7 @@
       if (skill.local_present && skill.has_local_changes) {
         const btn = el("button", { class: "studio-btn studio-btn-primary", text: t("skills.btn.update") });
         btn.disabled = locked;
-        btn.title = locked ? t("skills.locked") : "";
+        if (locked) btn.setAttribute("data-tooltip", t("skills.locked"));
         btn.addEventListener("click", () => doPublish(skill.name, btn, true));
         actions.appendChild(btn);
       } else if (skill.local_present) {
@@ -1738,7 +1751,7 @@
       const actions = el("div", { class: "studio-actions" });
       const btn = el("button", { class: "studio-btn studio-btn-primary", text: t("skills.btn.publish") });
       btn.disabled = locked;
-      btn.title = locked ? t("skills.locked") : "";
+      if (locked) btn.setAttribute("data-tooltip", t("skills.locked"));
       btn.addEventListener("click", () => doPublish(skill.name, btn, false));
       actions.appendChild(btn);
       card.appendChild(actions);
@@ -1798,7 +1811,7 @@
           onclick: () => createSkill(null),
         });
         newBtn.disabled = locked;
-        newBtn.title = locked ? t("skills.locked") : "";
+        if (locked) newBtn.setAttribute("data-tooltip", t("skills.locked"));
         headerActions.appendChild(newBtn);
       }
 

data/lib/clacky/default_extensions/ext-studio/skills/ext-develop/SKILL.md

@@ -423,8 +423,9 @@ smallest change, re-run verify, repeat until clean — fix ONE issue at a time.
 - **`schema.unknown_contributes`** → a top-level key under `contributes:` is misspelled.
   **Do:** fix the spelling to one of `panels api skills agents channels patches hooks`.
 - **`schema.unknown_key`** → an unknown **top-level** key in `ext.yml`. **Do:** fix the
-  spelling. Allowed top-level keys: `id name title description version origin author
-  homepage license public license_required keywords contributes`.
+  spelling. Allowed top-level keys: `id name name_zh display_name display_name_zh title
+  description description_zh emoji version origin author homepage license public
+  license_required keywords contributes`.
 - **`schema.unknown_field`** → a unit has a field not allowed for its type. **Do:** delete
   or rename that field. Allowed fields per type (this is the authoritative list — do not
   invent others):

data/lib/clacky/default_extensions/general/ext.yml

@@ -15,4 +15,4 @@ contributes:
       order: 1
       prompt: agents/general/system_prompt.md
       avatar: agents/general/avatar.png
-      panels: [meeting/meeting]
+      panels: []

data/lib/clacky/extension/api_loader.rb

@@ -65,17 +65,10 @@ module Clacky
         existing = reload ? Clacky::ApiExtension.registry[ext_id] : nil
         existing&.reset_routes!
 
-        if reload
-          old_verbose = $VERBOSE
-          $VERBOSE = nil
-          begin
-            load(handler_path)
-          ensure
-            $VERBOSE = old_verbose
-          end
-        else
-          require(handler_path)
-        end
+        # Wrapped load: each handler gets a fresh anonymous module, so two exts
+        # defining the same top-level class/constant names cannot clobber each
+        # other (and the `inherited` hook fires even on repeat loads).
+        load(handler_path, true)
 
         new_subclasses = Clacky::ApiExtension.pending_subclasses[before..] || []
         klass = new_subclasses.last || existing

data/lib/clacky/extension/packager.rb

@@ -16,7 +16,7 @@ module Clacky
   # optional URL fetch in `install`.
   module ExtensionPackager
     MANIFEST     = "ext.yml"
-    MAX_ZIP_SIZE = 50 * 1024 * 1024
+    MAX_ZIP_SIZE = 80 * 1024 * 1024
 
     # Network timeouts for the download step. `read_timeout` is an *idle*
     # timeout (resets on every chunk received), so a stalled connection with

data/lib/clacky/extension/verifier.rb

@@ -16,7 +16,7 @@ module Clacky
   module ExtensionVerifier
     Issue = Struct.new(:ext, :unit, :level, :code, :message, :file, :hint, keyword_init: true)
 
-    KNOWN_TOP_KEYS    = %w[id name title description version origin author homepage license public license_required keywords contributes].freeze
+    KNOWN_TOP_KEYS    = %w[id name name_zh display_name display_name_zh title description description_zh emoji version origin author homepage license public license_required keywords contributes].freeze
     KNOWN_CONTRIBUTES = %w[panels api skills agents channels patches hooks].freeze
 
     PANEL_KEYS   = %w[id title title_zh description description_zh view order attach entry_points].freeze

data/lib/clacky/media/generator.rb

@@ -49,17 +49,17 @@ module Clacky
 
       # @return [Hash, nil] the type=image model entry, or nil if not configured
       def image_model_entry
-        @agent_config.find_model_by_type("image")
+        @agent_config.effective_media_entry("image")
       end
 
       # @return [Hash, nil] the type=video model entry, or nil if not configured
       def video_model_entry
-        @agent_config.find_model_by_type("video")
+        @agent_config.effective_media_entry("video")
       end
 
       # @return [Hash, nil] the type=audio model entry, or nil if not configured
       def audio_model_entry
-        @agent_config.find_model_by_type("audio")
+        @agent_config.effective_media_entry("audio")
       end
 
       def generate_image(prompt:, aspect_ratio: "landscape", output_dir: nil, **kwargs)

data/lib/clacky/message_history.rb

@@ -286,7 +286,7 @@ module Clacky
     private def estimate_content_tokens(content)
       case content
       when String
-        ascii_chars = content.scan(/[ -~]/).length
+        ascii_chars = content.count(" -~")
         multibyte_chars = content.length - ascii_chars
         ((ascii_chars / 4.0) + (multibyte_chars / 1.5)).ceil
       when Array

data/lib/clacky/providers.rb

@@ -472,7 +472,8 @@ module Clacky
         "model_capabilities" => {
           "glm-5.2"           => { "vision" => false }.freeze,
           "deepseek-v4-pro"   => { "vision" => false }.freeze,
-          "deepseek-v4-flash" => { "vision" => false }.freeze
+          "deepseek-v4-flash" => { "vision" => false }.freeze,
+          "minimax-m2.7"      => { "vision" => false }.freeze
         }.freeze,
         "default_ocr_model" => "doubao-seed-2.0-lite",
         "website_url" => "https://console.volcengine.com/ark/region:cn-beijing/overview"

data/lib/clacky/server/http_server.rb

@@ -184,7 +184,7 @@ module Clacky
         - 将大目标拆解为可执行的小步骤
       MD
 
-      def initialize(host: "127.0.0.1", port: 7070, agent_config:, client_factory:, brand_test: false, sessions_dir: nil, socket: nil, master_pid: nil)
+      def initialize(host: "127.0.0.1", port: 7070, agent_config:, client_factory:, brand_test: false, sessions_dir: nil, projects_file: nil, socket: nil, master_pid: nil)
         @host           = host
         @port           = port
         @agent_config   = agent_config
@@ -197,7 +197,7 @@ module Clacky
         @restart_script = File.expand_path($0)
         @restart_argv   = ARGV.dup
         @session_manager = Clacky::SessionManager.new(sessions_dir: sessions_dir)
-        @project_manager = Clacky::Server::ProjectManager.new
+        @project_manager = Clacky::Server::ProjectManager.new(projects_file: projects_file)
         @registry        = SessionRegistry.new(
           session_manager:  @session_manager,
           session_restorer: method(:build_session_from_data),
@@ -1840,6 +1840,9 @@ module Clacky
             requested_model: state["requested_model"],
             configured: state["configured"]
           }
+          if entry && entry["base_url"] && state["source"] != "custom"
+            out[t][:saved_custom] = { model: entry["model"], base_url: entry["base_url"] }
+          end
         end
 
         # Surface what the current default model can offer, even when the
@@ -1949,50 +1952,78 @@ module Clacky
       end
 
       def api_update_media_config(kind, req, res)
-        body = parse_json_body(req) || {}
+        update_sidecar_config(res, kind, parse_json_body(req) || {})
+      end
+
+      private def update_sidecar_config(res, kind, body)
         source = body["source"].to_s
         unless %w[off auto custom].include?(source)
           return json_response(res, 422, { error: "invalid source" })
         end
 
-        @agent_config.models.reject! { |m| m["type"] == kind }
+        existing = @agent_config.models.find { |m| m["type"] == kind }
 
         case source
         when "off"
-          @agent_config.models << {
-            "id"       => SecureRandom.uuid,
-            "type"     => kind,
-            "disabled" => true
-          }
-        when "auto"
-          override = body["model"].to_s.strip
-          unless override.empty?
+          if existing
+            existing["mode"] = "off"
+          else
             @agent_config.models << {
-              "id"    => SecureRandom.uuid,
-              "type"  => kind,
-              "model" => override
+              "id"   => SecureRandom.uuid,
+              "type" => kind,
+              "mode" => "off"
             }
           end
+        when "auto"
+          override = body["model"].to_s.strip
+          if existing
+            existing.delete("disabled")
+            existing["mode"] = "auto"
+            existing["model"] = override unless override.empty?
+          else
+            unless override.empty?
+              @agent_config.models << {
+                "id"    => SecureRandom.uuid,
+                "type"  => kind,
+                "mode"  => "auto",
+                "model" => override
+              }
+            end
+          end
         when "custom"
           model    = body["model"].to_s.strip
           base_url = body["base_url"].to_s.strip
           api_key  = body["api_key"].to_s
-          if model.empty? || base_url.empty? || api_key.empty? || api_key.include?("****")
+          if api_key.empty? || api_key.include?("****")
+            api_key = existing ? existing["api_key"].to_s : ""
+          end
+          if model.empty? || base_url.empty? || api_key.empty?
             return json_response(res, 422, { error: "model, base_url, api_key are required" })
           end
 
-          @agent_config.models << {
-            "id"               => SecureRandom.uuid,
-            "model"            => model,
-            "base_url"         => base_url,
-            "api_key"          => api_key,
-            "anthropic_format" => body["anthropic_format"] || false,
-            "type"             => kind
-          }
+          if existing
+            existing["model"]            = model
+            existing["base_url"]         = base_url
+            existing["api_key"]          = api_key
+            existing["anthropic_format"] = body["anthropic_format"] || false
+            existing["mode"]             = "custom"
+            existing.delete("disabled")
+          else
+            @agent_config.models << {
+              "id"               => SecureRandom.uuid,
+              "model"            => model,
+              "base_url"         => base_url,
+              "api_key"          => api_key,
+              "anthropic_format" => body["anthropic_format"] || false,
+              "type"             => kind,
+              "mode"             => "custom"
+            }
+          end
         end
 
         @agent_config.save
-        json_response(res, 200, { ok: true, state: @agent_config.media_state(kind) })
+        state = kind == "ocr" ? @agent_config.ocr_state : @agent_config.media_state(kind)
+        json_response(res, 200, { ok: true, state: state })
       rescue => e
         json_response(res, 422, { error: e.message })
       end
@@ -2016,6 +2047,9 @@ module Clacky
           configured:     state["configured"],
           primary:        state["primary"] || false
         }
+        if entry && entry["base_url"] && state["source"] != "custom"
+          out[:saved_custom] = { model: entry["model"], base_url: entry["base_url"] }
+        end
 
         # Auto-mode preview: surface what the OCR sidecar *would* be if the
         # user flipped to "auto" — derived from the same provider as the
@@ -2037,58 +2071,8 @@ module Clacky
       # PATCH /api/config/ocr
       # Body: { source: "off"|"auto"|"custom", model?, base_url?, api_key?,
       #         anthropic_format? }
-      # Mirrors api_update_media_config but for the single "ocr" type.
       def api_update_ocr_config(req, res)
-        body = parse_json_body(req) || {}
-        source = body["source"].to_s
-        unless %w[off auto custom].include?(source)
-          return json_response(res, 422, { error: "invalid source" })
-        end
-
-        @agent_config.models.reject! { |m| m["type"] == "ocr" }
-
-        case source
-        when "off"
-          @agent_config.models << {
-            "id"       => SecureRandom.uuid,
-            "type"     => "ocr",
-            "disabled" => true
-          }
-        when "auto"
-          override = body["model"].to_s.strip
-          unless override.empty?
-            @agent_config.models << {
-              "id"    => SecureRandom.uuid,
-              "type"  => "ocr",
-              "model" => override
-            }
-          end
-        when "custom"
-          model    = body["model"].to_s.strip
-          base_url = body["base_url"].to_s.strip
-          api_key  = body["api_key"].to_s
-          if api_key.include?("****")
-            existing = @agent_config.models.find { |m| m["type"] == "ocr" && m["api_key"] }
-            api_key = existing ? existing["api_key"].to_s : ""
-          end
-          if model.empty? || base_url.empty? || api_key.empty?
-            return json_response(res, 422, { error: "model, base_url, api_key are required" })
-          end
-
-          @agent_config.models << {
-            "id"               => SecureRandom.uuid,
-            "model"            => model,
-            "base_url"         => base_url,
-            "api_key"          => api_key,
-            "anthropic_format" => body["anthropic_format"] || false,
-            "type"             => "ocr"
-          }
-        end
-
-        @agent_config.save
-        json_response(res, 200, { ok: true, state: @agent_config.ocr_state })
-      rescue => e
-        json_response(res, 422, { error: e.message })
+        update_sidecar_config(res, "ocr", parse_json_body(req) || {})
       end
 
       # POST /api/config/ocr/test