openclacky 1.3.9 → 1.3.11

data/lib/clacky/extension/packager.rb

@@ -66,9 +66,8 @@ module Clacky
             raise Error, "extension #{ext_id.inspect} already installed at #{target} (pass force: true to overwrite)"
           end
 
-          FileUtils.mkdir_p(installed_dir)
-          FileUtils.rm_rf(target) if Dir.exist?(target)
-          FileUtils.cp_r(container_src, target)
+          FileUtils.mkdir_p(target)
+          FileUtils.cp_r(Dir.glob("#{container_src}/*"), target)
 
           Clacky::ExtensionLoader.invalidate_cache!
           units = verify_installed(ext_id, installed_dir)

data/lib/clacky/locales/en.rb

@@ -5,7 +5,7 @@ module Clacky
     EN = {
       "llm.error.insufficient_credit"   => "Insufficient credit, please top up your account to continue",
       "llm.error.rate_limit_400"        => "Rate limit or service issue, retrying...",
-      "llm.error.invalid_api_key"       => "Invalid API key, please check your configuration",
+      "llm.error.invalid_api_key"       => "API key is invalid or expired, please update it in Settings",
       "llm.error.403.model_not_allowed" => "This model is not available on your current plan",
       "llm.error.403.api_key_revoked"   => "API key has been revoked, please generate a new one",
       "llm.error.403.api_key_expired"   => "API key has expired, please generate a new one",

data/lib/clacky/locales/zh.rb

@@ -5,7 +5,7 @@ module Clacky
     ZH = {
       "llm.error.insufficient_credit"   => "账户余额不足，请前往控制台充值后继续使用",
       "llm.error.rate_limit_400"        => "请求频率过高或服务暂时不可用，正在重试...",
-      "llm.error.invalid_api_key"       => "API 密钥无效，请检查配置",
+      "llm.error.invalid_api_key"       => "API Key 无效或已过期，请到设置中重新配置",
       "llm.error.403.model_not_allowed" => "当前模型不支持免费试用，请升级套餐或切换其他模型",
       "llm.error.403.api_key_revoked"   => "API 密钥已被撤销，请前往控制台重新生成",
       "llm.error.403.api_key_expired"   => "API 密钥已过期，请前往控制台重新生成",

data/lib/clacky/prompts/base.md

@@ -3,7 +3,7 @@
 - Ask clarifying questions if requirements are unclear.
 - Break down complex tasks into manageable steps.
 - **USE TOOLS to create/modify files** — don't just return content.
-- When the user asks to send/download a file or you generate one for them, append `[filename](file://~/path/to/file)` at the end of your reply.
+- When the user asks to send/download a file or you generate one for them, append `[filename](file://~/path/to/file)` at the end of your reply. Use the raw file path as-is (keep non-ASCII characters and spaces literal); never URL-encode it.
 
 ## Tool Usage Rules
 

data/lib/clacky/server/http_server.rb

@@ -117,6 +117,7 @@ module Clacky
       WEB_ROOT = File.expand_path("../web", __dir__)
       EXCHANGE_RATE_PRIMARY_BASE_URL = "https://open.er-api.com/v6/latest"
       EXCHANGE_RATE_FALLBACK_URL = "https://api.frankfurter.app/latest"
+      OSS_CDN_BASE = "https://oss.1024code.com/openclacky"
 
       # Default SOUL.md written when the user skips the onboard conversation.
       # A richer version is created by the Agent during the soul_setup phase.
@@ -476,8 +477,10 @@ module Clacky
         elsif path.start_with?("/api/backup/download") || path == "/api/backup/run" || path == "/api/backup/restore"
           # Building/extracting a tar.gz of ~/.clacky can take a while.
           120
+        elsif path == "/api/store/extension/install"
+          300
         else
-          10
+          30
         end
         Timeout.timeout(timeout_sec) do
           _dispatch_rest(req, res)
@@ -538,7 +541,8 @@ module Clacky
         when ["POST",   "/api/onboard/complete"]  then api_onboard_complete(req, res)
         when ["POST",   "/api/onboard/skip-soul"] then api_onboard_skip_soul(req, res)
         when ["GET",    "/api/store/skills"]          then api_store_skills(res)
-        when ["GET",    "/api/store/extensions"]      then api_store_extensions(req, res)
+        when ["GET",    "/api/store/extensions"]          then api_store_extensions(req, res)
+        when ["GET",    "/api/store/extensions/installed"] then api_store_extensions_installed(res)
         when ["GET",    "/api/store/extension"]       then api_store_extension_detail(req, res)
         when ["POST",   "/api/store/extension/install"]  then api_store_extension_install(req, res)
         when ["POST",   "/api/store/extension/disable"] then api_store_extension_disable(req, res)
@@ -2332,10 +2336,14 @@ module Clacky
         result = brand.search_extensions!(query: req.query["q"], sort: req.query["sort"])
 
         if result[:success]
-          installed = installed_extension_slugs
+          installed = installed_extension_containers
           extensions = Array(result[:extensions]).map do |ext|
             slug = ext["name"] || ext[:name] || ext["slug"] || ext[:slug]
-            ext.merge("installed" => installed.include?(slug))
+            container = installed[slug]
+            ext.merge(
+              "installed"         => !container.nil?,
+              "installed_version" => container&.dig(:version)
+            )
           end
           json_response(res, 200, { ok: true, extensions: extensions })
         else
@@ -2347,6 +2355,68 @@ module Clacky
         end
       end
 
+      # GET /api/store/extensions/installed
+      #
+      # Returns all locally installed extensions (all layers: builtin, installed,
+      # local) regardless of whether they are still listed on the marketplace.
+      def api_store_extensions_installed(res)
+        result   = Clacky::ExtensionLoader.load_all
+        disabled = Clacky::ExtensionLoader.disabled_ids
+
+        local_entries = Array(result&.containers).filter_map do |ext_id, container|
+          next unless container[:layer] == :installed
+
+          [ext_id, container]
+        end.to_h
+
+        market_by_slug = fetch_batch_market_data(local_entries.keys)
+
+        extensions = local_entries.map do |ext_id, container|
+          market = market_by_slug[ext_id]
+          {
+            "id"                => ext_id,
+            "name"              => market ? (market["name"] || ext_id) : ext_id,
+            "name_zh"           => market&.dig("name_zh"),
+            "name_en"           => market&.dig("name_en"),
+            "slug"              => ext_id,
+            "version"           => market ? (market["version"] || container[:version]) : container[:version],
+            "installed_version" => container[:version],
+            "description"       => market&.dig("description"),
+            "author"            => market&.dig("author"),
+            "icon_url"          => market&.dig("icon_url"),
+            "units"             => market&.dig("units"),
+            "homepage"          => market ? (market["homepage"] || "") : "",
+            "origin"            => market ? (market["origin"] || container[:origin]) : container[:origin],
+            "hub_active"        => market&.dig("hub_active"),
+            "download_count"    => market&.dig("download_count").to_i,
+            "unlisted"          => market.nil?,
+            "layer"             => container[:layer].to_s,
+            "installed"         => true,
+            "removable"         => true,
+            "disabled"          => disabled.include?(ext_id),
+          }
+        end
+
+        json_response(res, 200, { ok: true, extensions: extensions })
+      rescue StandardError => e
+        json_response(res, 500, { ok: false, error: e.message })
+      end
+
+      private def fetch_batch_market_data(slugs)
+        return {} if slugs.empty?
+
+        client = Clacky::PlatformHttpClient.new
+        slugs.each_slice(50).each_with_object({}) do |batch, result|
+          ids_param = batch.join(",")
+          response  = client.get("/api/v1/extensions/batch?ids=#{ids_param}")
+          next unless response[:success]
+
+          Array(response.dig(:data, "extensions")).each { |ext| result[ext["name"]] = ext }
+        end
+      rescue StandardError
+        {}
+      end
+
       # Slugs of every extension container currently loaded (any layer), used to
       # flag "installed" on the public marketplace catalog.
       def installed_extension_slugs
@@ -2356,6 +2426,13 @@ module Clacky
         Set.new
       end
 
+      def installed_extension_containers
+        result = Clacky::ExtensionLoader.load_all
+        Array(result&.containers).filter_map { |id, c| [id, c] if c[:layer] == :installed }.to_h
+      rescue StandardError
+        {}
+      end
+
       # GET /api/store/extension?id=<slug-or-id>
       #
       # Public detail for a single marketplace extension (contributes + version
@@ -2375,13 +2452,40 @@ module Clacky
           slug = ext["name"] || ext[:name] || ext["slug"] || ext[:slug]
           container = extension_container(slug)
           ext  = ext.merge(
-            "installed" => !container.nil?,
-            "removable" => container && container[:layer] == :installed,
-            "disabled"  => container ? container[:disabled] == true : false
+            "installed"         => !container.nil?,
+            "installed_version" => container&.dig(:version),
+            "removable"         => container && container[:layer] == :installed,
+            "disabled"          => container ? container[:disabled] == true : false
           )
           json_response(res, 200, { ok: true, extension: ext })
         else
-          json_response(res, 404, { ok: false, error: result[:error] || "Not found" })
+          container = extension_container(id)
+          if container && container[:layer] == :installed
+            market = fetch_batch_market_data([id])[id]
+            ext = {
+              "id"                => id,
+              "name"              => market ? (market["name"] || id) : id,
+              "name_zh"           => market&.dig("name_zh"),
+              "name_en"           => market&.dig("name_en"),
+              "slug"              => id,
+              "version"           => market ? (market["version"] || container[:version]) : container[:version],
+              "installed_version" => container[:version],
+              "description"       => market&.dig("description"),
+              "author"            => market&.dig("author"),
+              "icon_url"          => market&.dig("icon_url"),
+              "units"             => market&.dig("units"),
+              "homepage"          => market ? (market["homepage"] || "") : "",
+              "origin"            => market ? (market["origin"] || container[:origin]) : container[:origin],
+              "hub_active"        => market&.dig("hub_active"),
+              "unlisted"          => market.nil?,
+              "installed"         => true,
+              "removable"         => true,
+              "disabled"          => container[:disabled] == true,
+            }
+            json_response(res, 200, { ok: true, extension: ext })
+          else
+            json_response(res, 404, { ok: false, error: result[:error] || "Not found" })
+          end
         end
       end
 
@@ -2432,6 +2536,7 @@ module Clacky
 
         Clacky::ExtensionPackager.install(download_url, force: true)
         Clacky::ExtensionLoader.invalidate_cache!
+        Clacky::Telemetry.extension_install!(name) unless name.empty?
         json_response(res, 200, { ok: true, name: name })
       rescue Clacky::ExtensionPackager::Error => e
         json_response(res, 422, { ok: false, error: e.message })
@@ -2899,7 +3004,7 @@ module Clacky
         require "net/http"
         require "uri"
 
-        oss_base   = "https://oss.1024code.com/openclacky"
+        oss_base   = OSS_CDN_BASE
         latest_url = "#{oss_base}/latest.txt"
 
         Clacky::Logger.info("[Upgrade] Non-official source — fetching latest version from OSS CDN")
@@ -3071,11 +3176,12 @@ module Clacky
       end
 
       # Query the latest openclacky version.
-      # Strategy: try RubyGems official REST API first (most accurate, not affected by mirror lag),
-      # then fall back to `gem list -r` (respects user's configured gem source).
-      # Uses Terminal (PTY + login shell) so rbenv/mise shims and gem mirrors work correctly.
+      # Strategy: OSS CDN latest.txt first (fast, CDN-accelerated), then RubyGems API,
+      # then fall back to `gem list -r` as a last resort.
       private def fetch_latest_version_from_gem
-        fetch_latest_version_from_rubygems_api || fetch_latest_version_from_gem_command
+        fetch_oss_latest_version("#{OSS_CDN_BASE}/latest.txt") ||
+          fetch_latest_version_from_rubygems_api ||
+          fetch_latest_version_from_gem_command
       end
 
       # Try RubyGems official REST API — fast and always up-to-date.

data/lib/clacky/telemetry.rb

@@ -91,6 +91,15 @@ module Clacky
         fire_and_forget("/api/v1/telemetry/share", payload.compact)
       end
 
+      # Called after a marketplace extension is successfully installed.
+      # Increments the extension's download_count on the platform.
+      def extension_install!(slug)
+        return unless enabled?
+        return if slug.to_s.strip.empty?
+
+        fire_and_forget("/api/v1/telemetry/extension_install", { slug: slug })
+      end
+
       # ── private helpers ────────────────────────────────────────────────
 
       private def enabled?

data/lib/clacky/version.rb

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

data/lib/clacky/web/app.css

@@ -1874,9 +1874,7 @@ body {
   flex-direction: column;
   gap: 1.25rem;
   width: 100%;
-  max-width: 60rem;
-  margin: 0 auto;
-  padding: 5.5rem 1.5rem 1rem;
+  padding: 6rem max(1.5rem, calc(50% - 30rem)) 1rem;
 }
 .new-session-composer {
   position: relative;
@@ -2007,6 +2005,11 @@ body {
   font-size: 0.78125rem;
   color: var(--color-text-tertiary);
   line-height: 1.4;
+  flex: 1;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
 }
 .agent-card-badge {
   position: absolute;
@@ -2026,7 +2029,6 @@ body {
   color: var(--color-accent-primary);
 }
 .agent-card-author {
-  margin-top: 0.25rem;
   font-size: 0.72rem;
   color: var(--color-text-tertiary);
   opacity: 0.8;
@@ -7070,6 +7072,12 @@ body {
 }
 
 /* ── Extension Market ─────────────────────────────────────────────────── */
+#extensions-panel {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
 #extensions-body {
   flex: 1;
   overflow-y: auto;
@@ -7169,7 +7177,7 @@ body {
 .extension-card:hover { border-color: var(--color-text-muted); }
 .extension-card-main {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
   gap: 0.75rem;
 }
 .extension-emoji {
@@ -7181,7 +7189,7 @@ body {
 .extension-title {
   display: flex;
   align-items: center;
-  gap: 0.375rem;
+  gap: 0.5rem;
   margin-bottom: 0.25rem;
   flex-wrap: wrap;
 }
@@ -7195,17 +7203,31 @@ body {
   color: var(--color-text-secondary);
   background: var(--color-bg-tertiary, rgba(255,255,255,0.05));
   border-radius: 4px;
-  padding: 0.0625rem 0rem;
+  padding: 0.0625rem 0.375rem;
 }
 .extension-units {
   font-size: 0.6875rem;
   color: var(--color-text-muted);
 }
 .extension-installed {
-  font-size: 0.6875rem;
+  font-size: 0.625rem;
   color: var(--color-success, #16a34a);
   background: var(--color-success-bg, rgba(22,163,74,0.12));
   border-radius: 4px;
+  padding: 0.2rem 0.375rem;
+}
+.extension-updatable {
+  font-size: 0.625rem;
+  color: var(--color-button-primary);
+  background: color-mix(in srgb, var(--color-button-primary) 12%, transparent);
+  border-radius: 4px;
+  padding: 0.2rem 0.375rem;
+}
+.extension-unlisted {
+  font-size: 0.6875rem;
+  color: var(--color-text-secondary);
+  background: var(--color-surface-2, rgba(0,0,0,0.06));
+  border-radius: 4px;
   padding: 0.0625rem 0.375rem;
 }
 .extension-desc {
@@ -7222,6 +7244,16 @@ body {
   font-size: 0.6875rem;
   color: var(--color-text-muted);
 }
+.extension-author {
+  font-size: 0.75rem;
+  color: var(--color-text-muted);
+  font-weight: 400;
+}
+.extension-installs {
+  font-size: 0.75rem;
+  color: var(--color-text-muted);
+  font-weight: 400;
+}
 .extension-meta {
   display: flex;
   align-items: center;
@@ -7324,26 +7356,67 @@ body {
   margin-top: 0.125rem;
 }
 .extension-version-item {
-  padding: 0.625rem 0.875rem;
+  padding: 0.75rem 1rem;
   border-bottom: 1px solid var(--color-border-primary);
 }
 .extension-version-item:last-child { border-bottom: none; }
 .extension-version-row {
   display: flex;
-  align-items: center;
+  align-items: baseline;
   gap: 0.5rem;
 }
+.extension-version-item:has(.extension-version-notes) .extension-version-row {
+  padding-bottom: 0.5rem;
+  margin-bottom: 0.5rem;
+  border-bottom: 1px solid var(--color-border-primary);
+}
+.extension-version-row .extension-version {
+  font-size: 0.9375rem;
+  font-weight: 700;
+  color: var(--color-text-primary);
+  background: none;
+  padding: 0;
+  border-radius: 0;
+}
 .extension-version-date {
   font-size: 0.6875rem;
   color: var(--color-text-muted);
 }
 .extension-version-notes {
-  font-size: 0.75rem;
+  font-size: 0.8125rem;
   color: var(--color-text-secondary);
-  line-height: 1.5;
-  margin-top: 0.25rem;
-  white-space: pre-wrap;
+  line-height: 1.6;
+  margin-top: 0.5rem;
 }
+.extension-version-notes h1,
+.extension-version-notes h2,
+.extension-version-notes h3 {
+  font-size: 0.8125rem;
+  font-weight: 600;
+  color: var(--color-text-primary);
+  margin: 0.75rem 0 0.25rem;
+}
+.extension-version-notes h1 {
+  font-size: 0.9375rem;
+}
+.extension-version-notes h1:first-child,
+.extension-version-notes h2:first-child,
+.extension-version-notes h3:first-child {
+  margin-top: 0;
+}
+.extension-version-notes ul,
+.extension-version-notes ol {
+  margin: 0.25rem 0;
+  padding-left: 1.25rem;
+}
+.extension-version-notes li {
+  margin: 0.1rem 0;
+}
+.extension-version-notes p {
+  margin: 0.25rem 0;
+}
+.extension-version-notes p:first-child { margin-top: 0; }
+.extension-version-notes p:last-child { margin-bottom: 0; }
 .extension-detail-loading { display: flex; flex-direction: column; gap: 0.5rem; }
 
 .extension-detail-actions {
@@ -7385,6 +7458,18 @@ body {
   opacity: 0.5;
   cursor: not-allowed;
 }
+.extension-action-update {
+  background: var(--color-button-primary);
+  color: var(--color-button-primary-text);
+  border-color: transparent;
+}
+.extension-action-update:hover {
+  background: var(--color-button-primary-hover);
+}
+.extension-action-update:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
 .extension-action-disable,
 .extension-action-enable {
   color: var(--color-text-tertiary);

data/lib/clacky/web/features/extensions/store.js

@@ -66,6 +66,7 @@ const ExtensionsStore = (() => {
 
     /** Fetch the catalog from the server for the current query + sort. */
     async load() {
+      if (_filterInstalled) return;
       _loading = true;
       _error   = null;
       _emit("extensions:loading");
@@ -77,9 +78,9 @@ const ExtensionsStore = (() => {
         const res  = await fetch("/api/store/extensions" + (qs ? "?" + qs : ""));
         const data = await res.json();
         _allExtensions = data.extensions || [];
-        _extensions    = _filterInstalled ? _allExtensions.filter(e => e.installed) : _allExtensions;
         _error      = data.warning || null;
         _loading    = false;
+        _extensions = _allExtensions;
         _emit("extensions:changed", { extensions: _extensions, warning: _error });
       } catch (e) {
         console.error("[Extensions] load failed", e);
@@ -95,6 +96,7 @@ const ExtensionsStore = (() => {
     /** Set the search text and reload. */
     setQuery(query) {
       _query = (query || "").trim();
+      if (_filterInstalled) return Extensions.setFilterInstalled(true);
       return Extensions.load();
     },
 
@@ -104,11 +106,30 @@ const ExtensionsStore = (() => {
       return Extensions.load();
     },
 
-    /** Toggle the "installed only" filter (client-side, no new network request). */
-    setFilterInstalled(onlyInstalled) {
+    /** Toggle the "installed only" filter — fetches from local store when enabled. */
+    async setFilterInstalled(onlyInstalled) {
       _filterInstalled = !!onlyInstalled;
-      _extensions = _filterInstalled ? _allExtensions.filter(e => e.installed) : _allExtensions;
-      _emit("extensions:changed", { extensions: _extensions, warning: _error });
+      if (_filterInstalled) {
+        _loading = true;
+        _emit("extensions:loading");
+        try {
+          const res  = await fetch("/api/store/extensions/installed");
+          const data = await res.json();
+          const all  = data.extensions || [];
+          _extensions = _query
+            ? all.filter(e => [e.name, e.name_zh, e.description].some(
+                f => f && f.toLowerCase().includes(_query.toLowerCase())))
+            : all;
+        } catch (e) {
+          console.error("[Extensions] load installed failed", e);
+          _extensions = [];
+        } finally {
+          _loading = false;
+        }
+        _emit("extensions:changed", { extensions: _extensions, warning: _error });
+      } else {
+        return Extensions.load();
+      }
     },
 
     /** Open the detail view for one extension (fetches contributes + versions). */
@@ -158,8 +179,7 @@ const ExtensionsStore = (() => {
         });
         const data = await res.json();
         if (!res.ok || !data.ok) throw new Error(data.error || "toggle failed");
-        await Extensions.loadDetail(id);
-        Extensions.load();
+        location.reload();
       } catch (e) {
         console.error("[Extensions] setEnabled failed", e);
         _detailError = e.message;
@@ -184,7 +204,7 @@ const ExtensionsStore = (() => {
         });
         const data = await res.json();
         if (!res.ok || !data.ok) throw new Error(data.error || "install failed");
-        await Extensions.loadDetail(id);
+        location.reload();
       } catch (e) {
         console.error("[Extensions] install failed", e);
         _detailError = e.message;
@@ -192,6 +212,11 @@ const ExtensionsStore = (() => {
       }
     },
 
+    /** Update an installed extension to the latest marketplace version. */
+    async update(id) {
+      return Extensions.install(id);
+    },
+
     /** Remove an installed extension, then return to the list. */
     async uninstall(id) {
       if (!id) return;
@@ -203,7 +228,7 @@ const ExtensionsStore = (() => {
         });
         const data = await res.json();
         if (!res.ok || !data.ok) throw new Error(data.error || "uninstall failed");
-        await Extensions.loadDetail(id);
+        location.reload();
       } catch (e) {
         console.error("[Extensions] uninstall failed", e);
         _detailError = e.message;