openclacky 1.4.0 → 1.4.1

data/lib/clacky/extension/packager.rb

@@ -195,7 +195,9 @@ module Clacky
         dirs = children.select { |c| File.directory?(File.join(root, c)) }
 
         if File.file?(File.join(root, MANIFEST))
-          return [File.basename(File.expand_path(root)), root]
+          id = manifest_id(File.join(root, MANIFEST))
+          raise Error, "archive has no top-level container and #{MANIFEST} declares no id" if id.empty?
+          return [id, root]
         end
 
         if dirs.size == 1 && File.file?(File.join(root, dirs.first, MANIFEST))
@@ -205,6 +207,13 @@ module Clacky
         raise Error, "archive does not contain a single container with #{MANIFEST}"
       end
 
+      private def manifest_id(manifest_path)
+        data = YAMLCompat.load_file(manifest_path)
+        data.is_a?(Hash) ? data["id"].to_s.strip : ""
+      rescue StandardError
+        ""
+      end
+
       private def verify_installed(ext_id, installed_dir)
         layers =
           if installed_dir == Clacky::ExtensionLoader::INSTALLED_DIR

data/lib/clacky/platform_http_client.rb

@@ -24,17 +24,19 @@ module Clacky
   #   # result => { success: true, data: {...} }
   #   #        or { success: false, error: "...", data: {} }
   class PlatformHttpClient
-    # Primary CDN-accelerated endpoint
-    PRIMARY_HOST  = "https://www.openclacky.com"
+    # Primary endpoint
+    PRIMARY_HOST   = "https://www.openclacky.com"
+    # Secondary CDN-accelerated endpoint (China mainland)
+    SECONDARY_HOST = "https://api.1024code.com"
     # Direct fallback — bypasses EdgeOne, used when the primary times out
-    FALLBACK_HOST = "https://openclacky.up.railway.app"
+    FALLBACK_HOST  = "https://openclacky.up.railway.app"
 
     # Number of attempts per domain (1 = no retry within the same domain)
-    ATTEMPTS_PER_HOST = 2
+    ATTEMPTS_PER_HOST = 1
     # Initial back-off between retries within the same domain (seconds)
     INITIAL_BACKOFF   = 0.5
     # Connection / read timeouts (seconds) for API calls
-    OPEN_TIMEOUT  = 8
+    OPEN_TIMEOUT  = 5
     READ_TIMEOUT  = 15
     # Read timeout for streaming large file downloads (seconds)
     DOWNLOAD_READ_TIMEOUT = 120
@@ -53,12 +55,12 @@ module Clacky
 
     # Auto-detects the target host(s):
     #   - When CLACKY_LICENSE_SERVER is set → single host (dev override, no failover)
-    #   - Otherwise                   → [PRIMARY_HOST, FALLBACK_HOST]
+    #   - Otherwise                   → [PRIMARY_HOST, SECONDARY_HOST, FALLBACK_HOST]
     def initialize
       if (override = ENV["CLACKY_LICENSE_SERVER"]) && !override.empty?
         @hosts = [override]
       else
-        @hosts = [PRIMARY_HOST, FALLBACK_HOST]
+        @hosts = [PRIMARY_HOST, SECONDARY_HOST, FALLBACK_HOST]
       end
     end
 

data/lib/clacky/providers.rb

@@ -260,8 +260,8 @@ module Clacky
         "name" => "Kimi (Moonshot)",
         "base_url" => "https://api.moonshot.cn/v1",
         "api" => "openai-completions",
-        "default_model" => "kimi-k2.6",
-        "models" => ["kimi-k2.6", "kimi-k2.5"],
+        "default_model" => "kimi-k3",
+        "models" => ["kimi-k3", "kimi-k2.7-code", "kimi-k2.7-code-highspeed", "kimi-k2.6", "kimi-k2.5"],
         # Moonshot operates two regional endpoints with identical APIs & model
         # lineup — mainland China (.cn) and international (.ai). These are the
         # pay-as-you-go Open Platform endpoints; the subscription-billed
@@ -277,9 +277,9 @@ module Clacky
           { "label" => "Mainland China", "label_key" => "settings.models.baseurl.variant.mainland_cn",   "base_url" => "https://api.moonshot.cn/v1", "region" => "cn"   }.freeze,
           { "label" => "International",  "label_key" => "settings.models.baseurl.variant.international", "base_url" => "https://api.moonshot.ai/v1", "region" => "intl" }.freeze
         ].freeze,
-        # k2.5 / k2.6 are multimodal; legacy k2 text-only models need model_capabilities override if added.
+        # k3 / k2.7-code / k2.5 / k2.6 are multimodal; legacy k2 text-only models need model_capabilities override if added.
         "capabilities" => { "vision" => true }.freeze,
-        "default_ocr_model" => "kimi-k2.5",
+        "default_ocr_model" => "kimi-k3",
         "website_url" => "https://platform.moonshot.cn/console/api-keys"
       }.freeze,
 

data/lib/clacky/server/http_server.rb

@@ -36,9 +36,10 @@ module Clacky
         @events     = events
       end
 
-      def show_user_message(content, created_at: nil, files: [])
+      def show_user_message(content, created_at: nil, files: [], editable: true)
         ev = { type: "history_user_message", session_id: @session_id, content: content }
         ev[:created_at] = created_at if created_at
+        ev[:editable] = false unless editable
         rendered = Array(files).filter_map do |f|
           url  = f[:data_url] || f["data_url"]
           name = f[:name]     || f["name"]
@@ -964,11 +965,13 @@ module Clacky
       # Phase "key_setup"  → no API key configured yet
       # Phase "soul_setup" → key configured, but ~/.clacky/agents/SOUL.md missing
       # needs_onboard: false → fully set up
+      # branded: true → running under a brand; hide the OpenClacky AI Keys block
       def api_onboard_status(res)
+        branded = Clacky::BrandConfig.load.branded?
         if !@agent_config.models_configured?
-          json_response(res, 200, { needs_onboard: true, phase: "key_setup" })
+          json_response(res, 200, { needs_onboard: true, phase: "key_setup", branded: branded })
         else
-          json_response(res, 200, { needs_onboard: false })
+          json_response(res, 200, { needs_onboard: false, branded: branded })
         end
       end
 
@@ -2408,6 +2411,8 @@ module Clacky
           {
             "id"                => ext_id,
             "name"              => market ? (market["name"] || ext_id) : ext_id,
+            "display_name"      => market&.dig("display_name"),
+            "display_name_zh"   => market&.dig("display_name_zh"),
             "name_zh"           => market&.dig("name_zh"),
             "name_en"           => market&.dig("name_en"),
             "slug"              => ext_id,
@@ -3691,13 +3696,11 @@ module Clacky
 
         return json_response(res, 400, { error: "path is required" }) unless path && !path.empty?
 
-        # Expand ~ to the user's home directory (e.g. "~/Desktop/file.pdf").
-        # Ruby's File.exist? does NOT automatically expand ~ — that's a shell feature.
-        path = File.expand_path(path)
-
-        # On WSL the file may be specified as a Windows path (e.g. "C:/Users/…").
-        # Convert it to the Linux-side path so File.exist? works.
+        # Path arrives already percent-decoded by the click handler; normalize
+        # Windows drive letters (WSL) BEFORE expand_path or the drive is treated
+        # as relative and corrupted. No-op on macOS/Linux.
         linux_path = Utils::EnvironmentDetector.win_to_linux_path(path)
+        linux_path = File.expand_path(linux_path)
 
         return json_response(res, 404, { error: "file not found" }) unless File.exist?(linux_path)
 
@@ -3711,8 +3714,11 @@ module Clacky
           json_response(res, 200, { ok: true })
         when "download"
           serve_file_download(res, linux_path)
+        when "display-path"
+          display = Utils::EnvironmentDetector.linux_to_win_path(linux_path)
+          json_response(res, 200, { ok: true, path: display })
         else
-          json_response(res, 400, { error: "invalid action. Must be 'open', 'reveal' or 'download'" })
+          json_response(res, 400, { error: "invalid action. Must be 'open', 'reveal', 'download' or 'display-path'" })
         end
       rescue => e
         json_response(res, 500, { ok: false, error: e.message })
@@ -3742,14 +3748,9 @@ module Clacky
         raw_path = URI.decode_www_form(req.query_string.to_s).to_h["path"].to_s
         return json_response(res, 400, { error: "path is required" }) if raw_path.empty?
 
-        # Strip file:// prefix if present
-        path = raw_path.sub(%r{\Afile://}, "")
-        path = CGI.unescape(path)
-        path = File.expand_path(path)
-
-        # On WSL the file may be specified as a Windows path (e.g. "C:/Users/…").
-        # Convert it to the Linux-side path so File.exist? works.
-        path = Utils::EnvironmentDetector.win_to_linux_path(path)
+        # Strip file://, decode, WSL drive-letter normalize, then expand — in
+        # this order (normalize must precede expand_path). No-op on macOS/Linux.
+        path = Utils::EnvironmentDetector.resolve_local_path(raw_path)
 
         # Security: only serve media files (images + videos)
         ext = File.extname(path).downcase

data/lib/clacky/tools/grep.rb

@@ -121,12 +121,17 @@ module Clacky
           files = if File.file?(expanded_path)
                     [expanded_path]
                   else
+                    # Auto-expand bare extension patterns (e.g. "*.ts") to recursive
+                    # (e.g. "**/*.ts"), matching ripgrep's default behaviour.
+                    # Patterns already containing "/" are left as-is — the user is
+                    # intentionally scoping to a specific directory.
+                    effective_pattern = file_pattern.include?("/") ? file_pattern : "**/#{file_pattern}"
                     fnmatch_flags = File::FNM_PATHNAME | File::FNM_DOTMATCH
                     collected = []
                     walk_status = {}
                     Clacky::Utils::FileIgnoreHelper.walk_files(expanded_path, skipped: skipped, status: walk_status) do |f|
                       relative = f[(expanded_path.length + 1)..]
-                      collected << f if File.fnmatch(file_pattern, relative, fnmatch_flags)
+                      collected << f if File.fnmatch(effective_pattern, relative, fnmatch_flags)
                     end
                     if walk_status[:truncated]
                       truncation_reason ||= "walk #{walk_status[:truncation_reason]}"

data/lib/clacky/utils/environment_detector.rb

@@ -52,17 +52,24 @@ module Clacky
         end
       end
 
-      # Convert a Windows-style path to a WSL/Linux-side path.
-      # e.g. "C:/Users/foo/file.txt" → "/mnt/c/Users/foo/file.txt"
-      # Returns the original path unchanged on non-WSL or if already a Linux path.
-      # @param path [String]
-      # @return [String]
+      # Convert a Windows-style path (incl. the "/C:/" three-slash-URL form) to
+      # a WSL /mnt path. No-op on non-WSL or non-drive-letter paths.
       def self.win_to_linux_path(path)
-        return path unless os_type == :wsl && path.match?(/\A[A-Za-z]:[\/\\]/)
+        return path unless os_type == :wsl
+
+        m = path.match(%r{\A/?([A-Za-z]):[/\\](.*)}m)
+        return path unless m
+
+        "/mnt/#{m[1].downcase}/#{m[2].gsub("\\", "/")}"
+      end
 
-        drive = path[0].downcase
-        rest  = path[2..].gsub("\\", "/")
-        "/mnt/#{drive}#{rest}"
+      # Resolve a "file://" URL or bare path into a real local path:
+      # strip "file://", percent-decode, WSL drive-letter normalize, then expand.
+      def self.resolve_local_path(href)
+        path = href.to_s.sub(%r{\Afile://}, "")
+        path = CGI.unescape(path)
+        path = win_to_linux_path(path)
+        File.expand_path(path)
       end
 
       # Convert a Linux-side path to a Windows-style path via wslpath.

data/lib/clacky/utils/file_processor.rb

@@ -6,6 +6,7 @@ require "securerandom"
 require "stringio"
 
 require_relative "parser_manager"
+require_relative "environment_detector"
 require "zip"
 
 module Clacky
@@ -595,67 +596,63 @@ module Clacky
       return content if content.nil? || content.empty?
 
       # Rewrite markdown image syntax ![alt](file:///path) → proxy URL
-      content = content.gsub(/!\[([^\]]*)\]\(((?:file:\/\/)?\/[^)]+)\)/) do |_match|
+      content = content.gsub(/!\[([^\]]*)\]\(((?:file:\/\/)?(?:~\/|\/)[^)]+)\)/) do |_match|
         alt  = Regexp.last_match(1)
         href = Regexp.last_match(2)
 
-        path = href.sub(%r{\Afile://}, "")
-        path = CGI.unescape(path)
+        real = Clacky::Utils::EnvironmentDetector.resolve_local_path(href)
 
-        ext = File.extname(path).downcase
-        if LOCAL_MEDIA_EXTENSIONS.include?(ext) && File.exist?(path)
-          "![#{alt}](#{local_image_proxy_url(href, path)})"
+        ext = File.extname(real).downcase
+        if LOCAL_MEDIA_EXTENSIONS.include?(ext) && File.exist?(real)
+          "![#{alt}](#{local_image_proxy_url(href, real)})"
         else
           _match
         end
       end
 
       # Rewrite <video src="file:///path/vid.mp4" ...> → proxy URL
-      content = content.gsub(/<video\b([^>]*)\bsrc="((?:file:\/\/)?\/[^"]+)"([^>]*)>/) do |_match|
+      content = content.gsub(/<video\b([^>]*)\bsrc="((?:file:\/\/)?(?:~\/|\/)[^"]+)"([^>]*)>/) do |_match|
         pre  = Regexp.last_match(1) || ""
         href = Regexp.last_match(2)
         post = Regexp.last_match(3) || ""
 
-        path = href.sub(%r{\Afile://}, "")
-        path = CGI.unescape(path)
+        real = Clacky::Utils::EnvironmentDetector.resolve_local_path(href)
 
-        ext = File.extname(path).downcase
-        if LOCAL_VIDEO_EXTENSIONS.include?(ext) && File.exist?(path)
-          "<video#{pre} src=\"#{local_image_proxy_url(href, path)}\"#{post}>"
+        ext = File.extname(real).downcase
+        if LOCAL_VIDEO_EXTENSIONS.include?(ext) && File.exist?(real)
+          "<video#{pre} src=\"#{local_image_proxy_url(href, real)}\"#{post}>"
         else
           _match
         end
       end
 
       # Rewrite <audio src="file:///path/audio.wav" ...> → proxy URL
-      content = content.gsub(/<audio\b([^>]*)\bsrc="((?:file:\/\/)?\/[^"]+)"([^>]*)>/) do |_match|
+      content = content.gsub(/<audio\b([^>]*)\bsrc="((?:file:\/\/)?(?:~\/|\/)[^"]+)"([^>]*)>/) do |_match|
         pre  = Regexp.last_match(1) || ""
         href = Regexp.last_match(2)
         post = Regexp.last_match(3) || ""
 
-        path = href.sub(%r{\Afile://}, "")
-        path = CGI.unescape(path)
+        real = Clacky::Utils::EnvironmentDetector.resolve_local_path(href)
 
-        ext = File.extname(path).downcase
-        if LOCAL_AUDIO_EXTENSIONS.include?(ext) && File.exist?(path)
-          "<audio#{pre} src=\"#{local_image_proxy_url(href, path)}\"#{post}>"
+        ext = File.extname(real).downcase
+        if LOCAL_AUDIO_EXTENSIONS.include?(ext) && File.exist?(real)
+          "<audio#{pre} src=\"#{local_image_proxy_url(href, real)}\"#{post}>"
         else
           _match
         end
       end
 
       # Rewrite video/audio markdown links [text](file:///path) → proxy URL
-      content = content.gsub(/(?<!!)\[([^\]]*)\]\(((?:file:\/\/)?\/[^)]+)\)/) do |_match|
+      content = content.gsub(/(?<!!)\[([^\]]*)\]\(((?:file:\/\/)?(?:~\/|\/)[^)]+)\)/) do |_match|
         text = Regexp.last_match(1)
         href = Regexp.last_match(2)
 
-        path = href.sub(%r{\Afile://}, "")
-        path = CGI.unescape(path)
+        real = Clacky::Utils::EnvironmentDetector.resolve_local_path(href)
 
-        ext = File.extname(path).downcase
+        ext = File.extname(real).downcase
         if LOCAL_VIDEO_EXTENSIONS.include?(ext) || LOCAL_AUDIO_EXTENSIONS.include?(ext)
-          if File.exist?(path)
-            "[#{text}](#{local_image_proxy_url(href, path)})"
+          if File.exist?(real)
+            "[#{text}](#{local_image_proxy_url(href, real)})"
           else
             _match
           end

data/lib/clacky/utils/model_pricing.rb

@@ -237,6 +237,55 @@ module Clacky
         }
       },
 
+      # Kimi K3 flagship model (1M context, native vision, tool calling).
+      # Source: https://platform.moonshot.ai (USD / 1M tokens)
+      "kimi-k3" => {
+        input: {
+          default: 3.00,                   # $3.00/MTok cache miss
+          over_200k: 3.00
+        },
+        output: {
+          default: 15.00,                  # $15.00/MTok
+          over_200k: 15.00
+        },
+        cache: {
+          write: 3.00,                     # no separate write charge; bill at miss rate
+          read: 0.30                       # $0.30/MTok cache hit
+        }
+      },
+
+      # Kimi K2.7 Code (256K context, multimodal coding model).
+      # Source: https://platform.moonshot.ai (USD / 1M tokens)
+      "kimi-k2.7-code" => {
+        input: {
+          default: 0.95,                   # $0.95/MTok cache miss
+          over_200k: 0.95
+        },
+        output: {
+          default: 4.00,                   # $4.00/MTok
+          over_200k: 4.00
+        },
+        cache: {
+          write: 0.95,                     # no separate write charge; bill at miss rate
+          read: 0.19                       # $0.19/MTok cache hit
+        }
+      },
+
+      "kimi-k2.7-code-highspeed" => {
+        input: {
+          default: 1.90,                   # $1.90/MTok cache miss
+          over_200k: 1.90
+        },
+        output: {
+          default: 8.00,                   # $8.00/MTok
+          over_200k: 8.00
+        },
+        cache: {
+          write: 1.90,                     # no separate write charge; bill at miss rate
+          read: 0.38                       # $0.38/MTok cache hit
+        }
+      },
+
       # Google Gemini 3 series (via Vertex AI). Tiered at 200K input tokens
       # for Pro; Flash has flat pricing.
       "gemini-3.1-pro" => {

data/lib/clacky/version.rb

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

data/lib/clacky/web/app.css

@@ -662,11 +662,15 @@ body {
 }
 
 /* ── New Session button ──────────────────────────────────────────────────── */
+.btn-split-wrap {
+  display: flex;
+  align-items: stretch;
+}
 .btn-split-main {
   height: 1.5rem;
-  padding: 0 0.625rem;
+  padding: 0 0.6rem;
   border: none;
-  border-radius: 6px;
+  border-radius: 6px 0 0 6px;
   background: var(--color-accent-primary);
   color: #fff;
   font-size: 0.75rem;
@@ -674,12 +678,85 @@ body {
   white-space: nowrap;
   line-height: 1;
   cursor: pointer;
+  display: flex;
+  align-items: center;
+  gap: 0.3rem;
   transition: background 0.15s, box-shadow 0.15s;
 }
 .btn-split-main:hover {
   background: var(--color-button-primary-hover);
   box-shadow: 0 2px 6px rgba(0,0,0,0.15);
 }
+.btn-split-arrow {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 1.5rem;
+  width: 1.375rem;
+  padding: 0;
+  border: none;
+  border-left: 1px solid rgba(255,255,255,0.2);
+  border-radius: 0 6px 6px 0;
+  background: var(--color-accent-primary);
+  color: #fff;
+  cursor: pointer;
+  transition: background 0.15s, box-shadow 0.15s;
+  flex-shrink: 0;
+}
+.btn-split-arrow:hover {
+  background: var(--color-button-primary-hover);
+  box-shadow: 0 2px 6px rgba(0,0,0,0.15);
+}
+.btn-split-dropdown {
+  position: relative;
+  display: flex;
+}
+.btn-split-menu {
+  display: none;
+  position: absolute;
+  top: calc(100% + 4px);
+  right: 0;
+  min-width: 9rem;
+  background: var(--color-bg-elevated, var(--color-bg-secondary));
+  border: 1px solid var(--color-border-secondary);
+  border-radius: 8px;
+  box-shadow: 0 4px 16px rgba(0,0,0,0.12);
+  padding: 0.25rem;
+  z-index: 200;
+  white-space: nowrap;
+}
+/* Bridge the 4px gap so hover doesn't break when moving to the menu */
+.btn-split-menu::before {
+  content: "";
+  position: absolute;
+  top: -8px;
+  left: 0;
+  right: 0;
+  height: 8px;
+}
+.btn-split-dropdown:hover .btn-split-menu {
+  display: block;
+}
+.btn-split-menu-item {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  width: 100%;
+  padding: 0.375rem 0.75rem;
+  border: none;
+  border-radius: 5px;
+  background: transparent;
+  color: var(--color-text-secondary);
+  font-size: 0.8125rem;
+  font-family: var(--font-sans);
+  text-align: left;
+  cursor: pointer;
+  transition: background 0.12s, color 0.12s;
+}
+.btn-split-menu-item:hover {
+  background: var(--color-bg-tertiary);
+  color: var(--color-text-primary);
+}
 
 /* ── Session source badge ────────────────────────────────────────────────── */
 /* Design: compact neutral chips — the visual weight is carried by the
@@ -7199,7 +7276,7 @@ body {
 .extension-card:hover { border-color: var(--color-text-muted); }
 .extension-card-main {
   display: flex;
-  align-items: stretch;
+  align-items: center;
   gap: 0.75rem;
 }
 .extension-emoji {
@@ -7348,6 +7425,38 @@ body {
   letter-spacing: 0.04em;
   margin: 0 0 0.75rem;
 }
+/* Readme rendered Markdown */
+.extension-readme-body {
+  font-size: 0.875rem;
+  line-height: 1.7;
+  color: var(--color-text-primary);
+  overflow-wrap: break-word;
+}
+.extension-readme-body h1,
+.extension-readme-body h2,
+.extension-readme-body h3 { margin: 1em 0 0.4em; font-weight: 600; }
+.extension-readme-body h1 { font-size: 1.2em; }
+.extension-readme-body h2 { font-size: 1.05em; }
+.extension-readme-body h3 { font-size: 0.95em; }
+.extension-readme-body p  { margin: 0 0 0.75em; }
+.extension-readme-body ul,
+.extension-readme-body ol { padding-left: 1.4em; margin: 0 0 0.75em; }
+.extension-readme-body pre {
+  background: var(--color-bg-secondary);
+  border-radius: 6px;
+  padding: 0.75em 1em;
+  overflow-x: auto;
+  font-size: 0.8em;
+}
+.extension-readme-body code {
+  background: var(--color-bg-secondary);
+  padding: 0.1em 0.3em;
+  border-radius: 3px;
+  font-size: 0.85em;
+}
+.extension-readme-body pre code { background: none; padding: 0; }
+.extension-readme-body a { color: var(--color-accent); }
+.extension-readme-body img { max-width: 100%; height: auto; border-radius: 6px; display: block; margin: 8px 0; }
 .extension-detail-section { margin-bottom: 0.875rem; }
 .extension-detail-section-title {
   font-size: 0.6875rem;
@@ -11432,12 +11541,11 @@ body.setup-mode[data-theme="dark"] {
   color: var(--color-danger, #c33);
 }
 .mcp-tools-header {
-  font-size: 0.6875rem;
+  font-size: 0.8125rem;
   font-weight: 600;
   color: var(--color-text-secondary);
   margin-bottom: 0.5rem;
-  text-transform: uppercase;
-  letter-spacing: 0.05em;
+  letter-spacing: 0.01em;
 }
 .mcp-tool-list {
   list-style: none;
@@ -11449,10 +11557,9 @@ body.setup-mode[data-theme="dark"] {
 }
 .mcp-tool-item {
   display: flex;
-  align-items: baseline;
-  gap: 0.625rem;
-  font-size: 0.8125rem;
-  padding: 0.4375rem 0;
+  flex-direction: column;
+  gap: 0.3rem;
+  padding: 0.625rem 0;
   border-bottom: 1px solid var(--color-border-primary, var(--color-border));
 }
 .mcp-tool-item:last-child {
@@ -11460,18 +11567,15 @@ body.setup-mode[data-theme="dark"] {
 }
 .mcp-tool-name {
   font-family: var(--font-mono);
-  background: var(--color-bg-elevated, var(--color-bg-secondary));
-  padding: 0.125rem 0.4375rem;
-  border-radius: 4px;
-  font-size: 0.75rem;
+  font-size: 0.8125rem;
+  font-weight: 600;
   color: var(--color-text-primary, var(--color-text));
-  flex-shrink: 0;
-  border: 1px solid var(--color-border-primary, var(--color-border));
 }
 .mcp-tool-desc {
   color: var(--color-text-secondary);
-  flex: 1;
   line-height: 1.5;
+  font-size: 0.8125rem;
+  opacity: 0.6;
 }
 
 /* ── MCP CTA banner & action buttons ─────────────────────────────────── */

data/lib/clacky/web/components/onboard.js

@@ -17,6 +17,7 @@
 const Onboard = (() => {
   let _providers   = [];
   let _selectedLang = I18n.lang();  // language chosen during setup
+  let _branded      = false;        // true when running under a brand license
 
   // ── Public API ──────────────────────────────────────────────────────────────
 
@@ -27,6 +28,7 @@ const Onboard = (() => {
       if (!data.needs_onboard) return { needsOnboard: false, phase: null };
 
       const phase = data.phase;
+      _branded = !!data.branded;
 
       if (phase === "key_setup") {
         // Mandatory: show full-screen setup panel, block boot.
@@ -111,9 +113,16 @@ const Onboard = (() => {
     $("setup-dot-1").className = "setup-step" + (step === "lang" ? " active" : " done");
     $("setup-dot-2").className = "setup-step" + (step === "key"  ? " active" : "");
     if (step === "key") {
-      $("setup-device-block").style.display   = "";
-      $("setup-manual-toggle").style.display  = "";
-      $("setup-manual-section").style.display = "none";
+      if (_branded) {
+        // Brand mode: skip the OpenClacky AI Keys card, go straight to manual config
+        $("setup-device-block").style.display   = "none";
+        $("setup-manual-toggle").style.display  = "none";
+        $("setup-manual-section").style.display = "";
+      } else {
+        $("setup-device-block").style.display   = "";
+        $("setup-manual-toggle").style.display  = "";
+        $("setup-manual-section").style.display = "none";
+      }
     }
   }
 
@@ -379,7 +388,8 @@ const Onboard = (() => {
     });
 
     $("setup-btn-back").addEventListener("click", () => {
-      if ($("setup-manual-section").style.display !== "none") {
+      if (!_branded && $("setup-manual-section").style.display !== "none") {
+        // Non-brand: collapse manual section back to device card
         $("setup-device-block").style.display  = "";
         $("setup-manual-toggle").style.display = "";
         $("setup-manual-section").style.display = "none";

data/lib/clacky/web/features/backup/view.js

@@ -58,7 +58,8 @@ const BackupView = (() => {
       a.click();
       a.remove();
       URL.revokeObjectURL(url);
-      if (statusEl) { statusEl.textContent = I18n.t("settings.backup.downloaded"); statusEl.className = "model-test-result success"; }
+      if (statusEl) { statusEl.textContent = ""; statusEl.className = "model-test-result"; }
+      Modal.toast(I18n.t("settings.backup.downloaded"), "success");
     } else if (statusEl) {
       statusEl.textContent = I18n.t("settings.backup.lastError", { msg: res.error });
       statusEl.className = "model-test-result error";
@@ -108,8 +109,8 @@ const BackupView = (() => {
       if (ev.type !== "_ws_connected" || !_restoreStatusEl) return;
       const el = _restoreStatusEl;
       _restoreStatusEl = null;
-      el.textContent = I18n.t("settings.backup.restartOk");
-      el.className = "model-test-result success";
+      if (el) { el.textContent = ""; el.className = "model-test-result"; }
+      Modal.toast(I18n.t("settings.backup.restartOk"), "success");
       if (typeof Settings !== "undefined") Settings.open();
     });
   }