openclacky 1.2.16 → 1.2.18

data/lib/clacky/server/channel/channel_manager.rb

@@ -442,8 +442,10 @@ module Clacky
         Commands:
           ? / h / help - show this help
           /new / /clear - start a new session
-          /model - show current model & available models
-          /model <n> - switch to model n
+          /model - show current model, cards & quick-switch list
+          /model <n> - switch card by number
+          /model s<n> - quick-switch model under current card
+          /model off - reset to card default
           /skills - list available skills
           /<skill> <args> - invoke a skill directly
           /bind <n|session_id> - switch to a session (use /list to see numbers)
@@ -472,46 +474,128 @@ module Clacky
         arg = text.sub(/\A\/model\s*/i, "").strip
 
         if arg.empty?
-          # Show current model and available list
-          info = agent.current_model_info
-          current = info&.dig(:model) || "unknown"
-          sub     = info&.dig(:sub_model)
-          card    = info&.dig(:card_model)
-          header  = "Current model: #{current}"
-          header += " (#{card} · #{sub})" if card && sub && sub != current
-          header += " (#{card})" if card && !sub
-
-          models = agent.available_models
-          if models.empty?
-            adapter.send_text(chat_id, "#{header}\nNo other models available.")
-            return
-          end
+          show_model_list(adapter, chat_id, agent)
+        elsif arg =~ /\A\d+\z/
+          switch_model_by_index(adapter, chat_id, agent, arg.to_i - 1)
+        elsif arg =~ /\As(\d+)\z/i
+          switch_quick_by_index(adapter, chat_id, agent, $1.to_i - 1)
+        else
+          switch_model_by_name(adapter, chat_id, agent, arg)
+        end
+      end
 
+      def show_model_list(adapter, chat_id, agent)
+        info = agent.current_model_info
+        current = info&.dig(:model) || "unknown"
+        sub     = info&.dig(:sub_model)
+        card    = info&.dig(:card_model)
+
+        header  = "Current: #{current}"
+        header += " (#{card})" if card && sub && sub != current
+        header += " (#{card})" if card && !sub
+
+        result = header
+
+        # Card list
+        models = agent.available_models
+        unless models.empty?
           lines = models.each_with_index.map do |name, i|
             marker = name == current ? " *" : ""
             "#{i + 1}. #{name}#{marker}"
           end
-          adapter.send_text(chat_id, "#{header}\n\nSwitch with /model <n>:\n#{lines.join("\n")}")
-        elsif arg =~ /\A\d+\z/
-          idx = arg.to_i - 1
-          models = agent.config.models
-          if idx < 0 || idx >= models.length
-            adapter.send_text(chat_id, "Invalid model number. Use /model to see available models.")
-            return
+          result += "\n\nCards (/model <n>):\n#{lines.join("\n")}"
+        end
+
+        # Quick-switch models under current provider
+        info = agent.current_model_info
+        provider_id = Clacky::Providers.find_by_base_url(info&.dig(:base_url))
+        if provider_id
+          quick = Clacky::Providers.models(provider_id)
+          unless quick.empty?
+            current_for_quick = sub || current
+            quick_lines = quick.each_with_index.map do |name, i|
+              marker = name == current_for_quick ? " *" : ""
+              "  s#{i + 1}. #{name}#{marker}"
+            end
+            result += "\n\nQuick switch (/model s<n>):\n#{quick_lines.join("\n")}"
+            unless quick.include?(current_for_quick)
+              result += "\n(#{current_for_quick} not in this provider; switch card first)"
+            end
           end
+        end
 
-          model_id = models[idx]["id"]
-          if agent.switch_model_by_id(model_id)
-            new_info = agent.current_model_info
-            adapter.send_text(chat_id, "Switched to #{new_info&.dig(:model) || model_id}.")
-          else
-            adapter.send_text(chat_id, "Failed to switch model.")
-          end
+        adapter.send_text(chat_id, result)
+      end
+
+      def switch_model_by_index(adapter, chat_id, agent, idx)
+        models = agent.config.models
+        if idx < 0 || idx >= models.length
+          adapter.send_text(chat_id, "Invalid number. Use /model to see available cards.")
+          return
+        end
+
+        model_id = models[idx]["id"]
+        if agent.switch_model_by_id(model_id)
+          new_info = agent.current_model_info
+          adapter.send_text(chat_id, "Switched to #{new_info&.dig(:model) || model_id}.")
         else
-          adapter.send_text(chat_id, "Usage: /model to list, /model <n> to switch.")
+          adapter.send_text(chat_id, "Failed to switch model.")
         end
       end
 
+      def switch_quick_by_index(adapter, chat_id, agent, idx)
+        info = agent.current_model_info
+        provider_id = Clacky::Providers.find_by_base_url(info&.dig(:base_url))
+
+        unless provider_id
+          adapter.send_text(chat_id, "No quick-switch models. Use /model <n> to switch card.")
+          return
+        end
+
+        quick = Clacky::Providers.models(provider_id)
+        if idx < 0 || idx >= quick.length
+          adapter.send_text(chat_id, "Invalid s#{idx + 1}. Use /model to see quick-switch list.")
+          return
+        end
+
+        agent.set_session_sub_model(quick[idx])
+        new_info = agent.current_model_info
+        adapter.send_text(chat_id, "Switched to #{new_info&.dig(:sub_model) || new_info&.dig(:model)}.")
+      end
+
+      def switch_model_by_name(adapter, chat_id, agent, name)
+        info = agent.current_model_info
+        provider_id = Clacky::Providers.find_by_base_url(info&.dig(:base_url))
+
+        unless provider_id
+          adapter.send_text(chat_id, "Current card has no quick-switch models. Use /model <n> to switch card.")
+          return
+        end
+
+        allowed = Clacky::Providers.models(provider_id)
+        if allowed.empty?
+          adapter.send_text(chat_id, "No quick-switch models available. Use /model <n> to switch card.")
+          return
+        end
+
+        # Clear override
+        if name =~ /\A(off|clear|none)\z/i
+          agent.set_session_sub_model(nil)
+          new_info = agent.current_model_info
+          adapter.send_text(chat_id, "Back to card default (#{new_info&.dig(:model)}).")
+          return
+        end
+
+        unless allowed.include?(name)
+          adapter.send_text(chat_id, "'#{name}' not available. Use /model to see quick-switch list.")
+          return
+        end
+
+        agent.set_session_sub_model(name)
+        new_info = agent.current_model_info
+        adapter.send_text(chat_id, "Switched to #{new_info&.dig(:sub_model) || new_info&.dig(:model)}.")
+      end
+
       def handle_skills_command(adapter, event)
         chat_id    = event[:chat_id]
         session_id = resolve_session(event)

data/lib/clacky/server/http_server.rb

@@ -45,7 +45,12 @@ module Clacky
           if url
             url
           elsif type.to_s == "image" && path && File.exist?(path.to_s)
-            Utils::FileProcessor.image_path_to_data_url(path) rescue "expired:#{name}"
+            # Serve via the /api/local-image proxy instead of inlining a base64
+            # data URL. Inlining forced a synchronous disk-read + full base64
+            # encode + downscale on every history replay (2-3s lag for sessions
+            # with downgraded text-model images). The proxy lets the browser
+            # lazy-load + cache the image, keeping the replay response tiny.
+            "/api/local-image?path=#{CGI.escape(path.to_s)}"
           elsif name
             type.to_s == "image" ? "expired:#{name}" : "pdf:#{name}"
           end
@@ -448,6 +453,7 @@ module Clacky
         when ["POST",   "/api/browser/configure"]  then api_browser_configure(req, res)
         when ["POST",   "/api/browser/reload"]    then api_browser_reload(res)
         when ["POST",   "/api/browser/toggle"]    then api_browser_toggle(res)
+        when ["POST",   "/api/telemetry"]        then api_telemetry(req, res)
         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)
@@ -854,6 +860,17 @@ module Clacky
         json_response(res, 500, { ok: false, error: e.message })
       end
 
+      # POST /api/telemetry
+      # Body: { "event": "share_open" | "share_download", ... }
+      # Fire-and-forget telemetry from the WebUI frontend.
+      def api_telemetry(req, res)
+        body = parse_json_body(req) || {}
+        Clacky::Telemetry.share!(event: body["event"], extra: body["extra"])
+        json_response(res, 200, { ok: true })
+      rescue StandardError => e
+        json_response(res, 500, { ok: false, error: e.message })
+      end
+
       # POST /api/media/image
       # Body: { "prompt": "...", "aspect_ratio": "landscape|square|portrait",
       #         "output_dir": "<absolute path, optional>" }
@@ -1442,6 +1459,8 @@ module Clacky
             branded:                       true,
             needs_activation:              true,
             product_name:                  brand.product_name,
+            homepage_url:                  brand.homepage_url,
+            logo_url:                      brand.logo_url,
             test_mode:                     @brand_test,
             distribution_refresh_pending:  refresh_pending
           })
@@ -1481,6 +1500,8 @@ module Clacky
           branded:          true,
           needs_activation: false,
           product_name:     brand.product_name,
+          homepage_url:     brand.homepage_url,
+          logo_url:         brand.logo_url,
           warning:          warning,
           test_mode:        @brand_test,
           user_licensed:    brand.user_licensed?,
@@ -3011,6 +3032,7 @@ module Clacky
             description:       skill.context_description,
             description_zh:    skill.description_zh,
             source:            source,
+            always_show:       skill.always_show,
             enabled:           !skill.disabled?,
             invalid:           skill.invalid?,
             warnings:          skill.warnings,
@@ -3063,7 +3085,8 @@ module Clacky
             description:    skill.description || skill.context_description,
             description_zh: skill.description_zh,
             encrypted:      skill.encrypted?,
-            source_type:    source_type
+            source_type:    source_type,
+            always_show:    skill.always_show
           }
         end
 

data/lib/clacky/skill.rb

@@ -26,7 +26,7 @@ module Clacky
       model
       forbidden_tools
       auto_summarize
-
+      always-show
     ].freeze
 
     attr_reader :directory, :frontmatter, :source_path
@@ -35,6 +35,7 @@ module Clacky
     attr_reader :allowed_tools, :context, :agent_type, :argument_hint, :hooks
     attr_reader :fork_agent, :model, :forbidden_tools, :auto_summarize
     attr_reader :brand_skill, :brand_config
+    attr_reader :always_show
 
     # Source location of this skill — set by SkillLoader after registration.
     # One of: :default, :global_claude, :global_clacky, :project_claude, :project_clacky, :brand
@@ -515,6 +516,7 @@ module Clacky
       @model           = @frontmatter["model"]
       @forbidden_tools = @frontmatter["forbidden_tools"]
       @auto_summarize  = @frontmatter["auto_summarize"]
+      @always_show     = @frontmatter["always-show"]
     end
 
     # Sanitize and auto-correct frontmatter fields instead of raising on bad data.

data/lib/clacky/telemetry.rb

@@ -71,6 +71,26 @@ module Clacky
         fire_and_forget("/api/v1/telemetry/task", payload.compact)
       end
 
+      # Called from the WebUI when user opens the share modal or completes
+      # a share action (e.g. downloads poster). Tracks share engagement.
+      #
+      # @param event [String] "share_open" or "share_download"
+      # @param extra [Hash] optional context (platform, scorecard mode, etc.)
+      def share!(event:, extra: {})
+        return unless enabled?
+
+        brand = Clacky::BrandConfig.load
+        payload = {
+          device_id: resolve_device_id(brand),
+          version:   Clacky::VERSION,
+          brand:     brand.branded? ? brand.package_name : nil,
+          event:     event
+        }
+        payload.merge!(extra) if extra.is_a?(Hash)
+
+        fire_and_forget("/api/v1/telemetry/share", payload.compact)
+      end
+
       # ── private helpers ────────────────────────────────────────────────
 
       private def enabled?

data/lib/clacky/version.rb

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

data/lib/clacky/web/app.css

@@ -9150,6 +9150,22 @@ body.setup-mode[data-theme="dark"] {
   color: var(--color-text-primary);
   border-color: var(--color-error);
 }
+.billing-share-btn {
+  padding: 0.5rem 0.75rem;
+  border: 1px solid var(--color-accent, #38bdf8);
+  border-radius: 8px;
+  background: var(--color-bg-secondary);
+  color: var(--color-accent, #38bdf8);
+  font-size: 0.8125rem;
+  font-weight: 600;
+  white-space: nowrap;
+  cursor: pointer;
+  transition: all 0.2s ease;
+}
+.billing-share-btn:hover {
+  background: var(--color-accent, #38bdf8);
+  color: #fff;
+}
 .billing-clear-popup {
   position: absolute;
   top: 100%;
@@ -9238,6 +9254,51 @@ body.setup-mode[data-theme="dark"] {
 }
 
 /* ── Chart Row (Single Line) ─────────────────────────────────────────── */
+.billing-heatmap-row { width: 100%; }
+.billing-heat-dow-row {
+  display: grid;
+  grid-template-columns: repeat(7, 32px);
+  gap: 6px;
+  margin: 0.75rem 0 6px;
+  justify-content: start;
+}
+.billing-heat-dow {
+  text-align: center;
+  font-size: 11px;
+  color: var(--color-text-tertiary, var(--color-text-secondary));
+}
+.billing-heat-grid {
+  display: grid;
+  grid-template-columns: repeat(7, 32px);
+  gap: 6px;
+  justify-content: start;
+}
+.billing-heat-cell {
+  width: 32px;
+  height: 32px;
+  border-radius: 6px;
+  background: var(--color-bg-primary);
+}
+.billing-heat-cell.is-empty { background: transparent; }
+.billing-heat-cell[data-level="0"] { background: var(--color-bg-primary); border: 1px solid var(--color-border-primary); }
+.billing-heat-cell[data-level="1"] { background: #9be9a8; }
+.billing-heat-cell[data-level="2"] { background: #40c463; }
+.billing-heat-cell[data-level="3"] { background: #30a14e; }
+.billing-heat-cell[data-level="4"] { background: #216e39; }
+.billing-heat-cell[data-level="5"] { background: #0a4020; }
+.billing-heat-legend {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  font-size: 11px;
+  color: var(--color-text-secondary);
+}
+.billing-heat-legend .billing-heat-cell {
+  width: 13px;
+  height: 13px;
+  aspect-ratio: auto;
+}
+
 .billing-chart-row {
   width: 100%;
 }
@@ -10363,3 +10424,247 @@ body.setup-mode[data-theme="dark"] {
 .msg-phase-empty .msg-phase-summary { cursor: default; }
 .msg-phase-empty .msg-phase-summary::before { visibility: hidden; }
 .msg-phase-empty .msg-phase-body { display: none; }
+
+/* ── Share modal ──────────────────────────────────────────────────────── */
+.share-overlay {
+  position: fixed;
+  inset: 0;
+  z-index: 1200;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: var(--color-bg-overlay);
+  opacity: 0;
+  transition: opacity .18s ease;
+  padding: 20px;
+}
+.share-overlay.open { opacity: 1; }
+
+.share-modal {
+  position: relative;
+  width: 100%;
+  max-width: 660px;
+  max-height: 90vh;
+  overflow-y: auto;
+  background: var(--color-bg-card);
+  border: 1px solid var(--color-border-primary);
+  border-radius: var(--radius-lg, 14px);
+  box-shadow: 0 18px 48px rgba(15, 18, 28, 0.22);
+  padding: 24px;
+  transform: translateY(8px) scale(.98);
+  transition: transform .18s ease;
+}
+.share-overlay.open .share-modal { transform: translateY(0) scale(1); }
+
+.share-close {
+  position: absolute;
+  top: 12px;
+  right: 14px;
+  border: none;
+  background: none;
+  font-size: 22px;
+  line-height: 1;
+  color: var(--color-text-muted);
+  cursor: pointer;
+}
+.share-close:hover { color: var(--color-text-primary); }
+
+.share-title {
+  margin: 0 0 4px;
+  font-size: 17px;
+  font-weight: 700;
+  color: var(--color-text-primary);
+}
+.share-subtitle {
+  margin: 0 0 16px;
+  font-size: 13px;
+  color: var(--color-text-tertiary);
+}
+
+.share-body {
+  display: flex;
+  gap: 20px;
+  align-items: flex-start;
+}
+.share-controls {
+  flex: 1;
+  min-width: 0;
+}
+
+.share-poster-wrap {
+  display: flex;
+  justify-content: center;
+  flex-shrink: 0;
+}
+.share-poster-img {
+  width: 220px;
+  border-radius: var(--radius-md, 10px);
+  box-shadow: 0 6px 18px rgba(15, 18, 28, 0.16);
+}
+
+@media (max-width: 560px) {
+  .share-body { flex-direction: column; align-items: stretch; }
+  .share-poster-wrap { margin-bottom: 4px; }
+  .share-poster-img { width: 180px; }
+}
+
+.share-row-label {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--color-text-tertiary);
+}
+
+.share-theme-row {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  margin-bottom: 14px;
+}
+.share-theme-chips {
+  display: flex;
+  gap: 8px;
+}
+.share-theme-chip {
+  flex: 1;
+  height: 34px;
+  border: 2px solid transparent;
+  border-radius: var(--radius-sm, 6px);
+  cursor: pointer;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: border-color .12s ease, transform .12s ease;
+}
+.share-theme-chip:hover { transform: translateY(-1px); }
+.share-theme-chip.is-active { border-color: var(--color-button-primary); }
+.share-theme-name {
+  font-size: 11px;
+  font-weight: 700;
+  color: rgba(0,0,0,.55);
+  text-shadow: 0 1px 0 rgba(255,255,255,.4);
+  pointer-events: none;
+}
+.share-theme-chip[data-theme="geek"] .share-theme-name {
+  color: rgba(255,255,255,.92);
+  text-shadow: 0 1px 2px rgba(0,0,0,.4);
+}
+
+.share-periods {
+  display: inline-flex;
+  gap: 4px;
+  padding: 3px;
+  margin-bottom: 12px;
+  border: 1px solid var(--color-border-primary);
+  border-radius: var(--radius-sm, 6px);
+  background: var(--color-bg-primary);
+}
+.share-period {
+  padding: 6px 16px;
+  border: none;
+  border-radius: var(--radius-sm, 5px);
+  background: transparent;
+  color: var(--color-text-secondary);
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background .12s ease, color .12s ease;
+}
+.share-period:hover { color: var(--color-text-primary); }
+.share-period.is-active {
+  background: var(--color-button-primary);
+  color: var(--color-button-primary-text);
+}
+
+.share-platforms {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 8px;
+  margin-bottom: 14px;
+}
+.share-platform {
+  padding: 9px 4px;
+  border: 1px solid var(--color-border-primary);
+  border-radius: var(--radius-sm, 6px);
+  background: var(--color-bg-primary);
+  color: var(--color-text-secondary);
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background .12s ease, border-color .12s ease, color .12s ease;
+}
+.share-platform:hover {
+  background: var(--color-bg-hover);
+  border-color: var(--color-border-strong);
+}
+.share-platform.is-active {
+  background: var(--color-button-primary);
+  color: var(--color-button-primary-text);
+  border-color: var(--color-button-primary);
+}
+
+.share-editor { margin-bottom: 14px; }
+.share-editor-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 6px;
+}
+.share-shuffle {
+  border: none;
+  background: none;
+  color: var(--color-button-primary);
+  font-size: 12px;
+  font-weight: 600;
+  cursor: pointer;
+  padding: 2px 4px;
+}
+.share-shuffle:hover { text-decoration: underline; }
+.share-text {
+  width: 100%;
+  box-sizing: border-box;
+  resize: vertical;
+  min-height: 72px;
+  padding: 10px 12px;
+  border: 1px solid var(--color-border-primary);
+  border-radius: var(--radius-sm, 6px);
+  background: var(--color-bg-primary);
+  color: var(--color-text-primary);
+  font-size: 13px;
+  line-height: 1.5;
+  font-family: inherit;
+}
+.share-text:focus {
+  outline: none;
+  border-color: var(--color-button-primary);
+}
+
+.share-actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+.share-btn-primary, .share-btn-secondary {
+  padding: 10px;
+  border-radius: var(--radius-sm, 6px);
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  border: 1px solid var(--color-border-primary);
+}
+.share-btn-primary {
+  flex: 1 1 100%;
+  background: var(--color-button-primary);
+  color: var(--color-button-primary-text);
+  border-color: var(--color-button-primary);
+}
+.share-btn-primary:hover { background: var(--color-button-primary-hover); }
+.share-btn-secondary {
+  flex: 1 1 calc(50% - 4px);
+  min-width: 90px;
+  background: var(--color-bg-primary);
+  color: var(--color-text-secondary);
+}
+.share-btn-secondary:hover { background: var(--color-bg-hover); }
+
+#share-toggle-header svg { display: block; }