openclacky 1.5.19 → 1.5.20

data/lib/clacky/default_extensions/time_machine/panels/time_machine/view.js

@@ -392,6 +392,7 @@
       });
       if (res.ok) {
         state.footEl.textContent = res.message || t("tm.restored", "已恢复");
+        if (Clacky.Workspace) Clacky.Workspace.notifyTaskCompleted(state.sessionId);
         state.expanded = null;
         closeDetail(state);
         await loadHistory(state);

data/lib/clacky/default_skills/onboard/SKILL.md

@@ -562,7 +562,7 @@ Confirm once more:
 ```
 
 On confirmation, use the `trash` tool (NOT raw `rm`) so the file lands in
-Recently Deleted and can be recovered via File Recall. Report what you did.
+the Recycle Bin and can be recovered from there. Report what you did.
 
 ### C.7. Close
 

data/lib/clacky/locales/en.rb

@@ -22,7 +22,7 @@ module Clacky
       "llm.error.html_response"         => "Service temporarily unavailable (received HTML error page), retrying...",
       "llm.error.bad_request"           => "Model request failed. Please switch to another model and retry",
       "llm.error.request_timeout"       => "Request timed out after %<retries>d retries",
-      "llm.error.network_failed"        => "Network connection failed after %<retries>d retries",
+      "llm.error.network_failed"        => "Network connection failed after %<retries>d retries. If the problem persists, check your account balance or API Key",
       "llm.error.service_unavailable"   => "Service unavailable after %<retries>d retries",
       "platform.error.invalid_proof"        => "Invalid license key — please check and try again.",
       "platform.error.invalid_signature"    => "Invalid request signature.",

data/lib/clacky/locales/zh.rb

@@ -22,7 +22,7 @@ module Clacky
       "llm.error.html_response"         => "服务暂时不可用（收到 HTML 错误页），正在重试...",
       "llm.error.bad_request"           => "请求模型出错，请暂时切换其他模型重试",
       "llm.error.request_timeout"       => "请求超时（已重试 %<retries>d 次）",
-      "llm.error.network_failed"        => "网络连接失败（已重试 %<retries>d 次）",
+      "llm.error.network_failed"        => "网络连接失败（已重试 %<retries>d 次），若持续失败，请检查账户余额或 API Key",
       "llm.error.service_unavailable"   => "服务暂时不可用（已重试 %<retries>d 次）",
       "platform.error.invalid_proof"        => "许可证密钥无效，请检查后重试。",
       "platform.error.invalid_signature"    => "请求签名无效。",

data/lib/clacky/message_history.rb

@@ -11,7 +11,7 @@ module Clacky
   class MessageHistory
     # Fields that are internal to the agent and must not be sent to the API.
     INTERNAL_FIELDS = %i[
-      task_id created_at system_injected session_context memory_update
+      message_id task_id created_at system_injected session_context memory_update
       subagent_instructions subagent_result subagent_transcript token_usage
       compressed_summary chunk_path truncated transient
       chunk_index chunk_count ext_events skill_command skill_command_display
@@ -65,6 +65,18 @@ module Clacky
       self
     end
 
+    # Replace one real user turn after its attachments have been resolved.
+    # message_id is the stable identity; created_at remains presentation data.
+    def replace_user_message(message_id:, message:)
+      idx = @messages.index do |m|
+        m[:role] == "user" && !m[:system_injected] && m[:message_id] == message_id
+      end
+      return false unless idx
+
+      @messages[idx] = deep_sanitize_utf8(message)
+      true
+    end
+
     # Replace the entire message list (used by compression rebuild).
     def replace_all(new_messages)
       @messages = new_messages.map { |m| deep_sanitize_utf8(m) }
@@ -179,6 +191,17 @@ module Clacky
       truncate_from(idx)
     end
 
+    # Truncate history starting from the message with the given stable ID.
+    # Used to roll back an attachment turn that failed before resolution.
+    def truncate_from_message(message_id)
+      idx = @messages.index do |m|
+        m[:role] == "user" && !m[:system_injected] && m[:message_id] == message_id
+      end
+      return self unless idx
+
+      truncate_from(idx)
+    end
+
     # Roll back the history to just before the given message object.
     # Removes the message and anything appended after it.
     # Used to undo a failed speculative append (e.g. compression message that errored).

data/lib/clacky/providers.rb

@@ -40,7 +40,6 @@ module Clacky
           "dsk-deepseek-v4-pro",
           "oc-glm-5.3",
           "oc-kimi-k3",
-          "oc-minimax-m2.7",
           "abs-claude-fable-5-1",
           "abs-claude-fable-5",
           "abs-claude-opus-5-5",
@@ -50,17 +49,19 @@ module Clacky
           "abs-claude-sonnet-5-5",
           "abs-claude-sonnet-5",
           "abs-claude-sonnet-4-6",
+          "abs-claude-haiku-5-5",
           "abs-claude-haiku-4-5",
-          "abs-gpt-6-astra",
           "abs-gpt-6.1-sol",
+          "abs-gpt-6-astra",
           "abs-gpt-6-sol",
           "abs-gpt-6-luna",
           "abs-gpt-5.6-sol",
           "abs-gpt-5.6-terra",
           "abs-gpt-5.6-luna",
+          "or-gemini-4-argon",
           "or-gemini-3-1-pro",
           "or-gemini-3-8-flash",
-          "or-gemini-3-7-flash"
+          "oc-grok-4.7"
         ],
         # Image generation models served by the openclacky platform
         # gateway. The gateway exposes a standard OpenAI-compatible
@@ -112,12 +113,10 @@ module Clacky
         # audio parts). The gateway returns transcription text.
         "stt_models" => [
           "or-stt-gemini-3-8-flash",
-          "or-stt-gemini-3-7-flash",
           "or-stt-gemini-1-5-pro"
         ],
         "stt_model_aliases" => {
           "or-stt-gemini-3-8-flash" => "Gemini 3.8 Flash STT",
-          "or-stt-gemini-3-7-flash" => "Gemini 3.7 Flash STT",
           "or-stt-gemini-1-5-pro"   => "Gemini 1.5 Pro STT"
         },
         "default_stt_model" => "or-stt-gemini-3-8-flash",
@@ -126,12 +125,10 @@ module Clacky
         # parts). The gateway returns analysis text.
         "video_understanding_models" => [
           "or-gemini-3-8-flash",
-          "or-gemini-3-7-flash",
           "or-gemini-3-1-pro"
         ],
         "video_understanding_model_aliases" => {
           "or-gemini-3-8-flash" => "Gemini 3.8 Flash",
-          "or-gemini-3-7-flash" => "Gemini 3.7 Flash",
           "or-gemini-3-1-pro"   => "Gemini 3.1 Pro"
         },
         "default_video_understanding_model" => "or-gemini-3-8-flash",
@@ -148,15 +145,12 @@ module Clacky
         # (it accepts image/audio/video input natively via OpenRouter).
         # oc-glm-5.3 is likewise text-only: its upstream rejects any content
         # block other than `type: "text"`, so images must never be sent
-        # inline. oc-minimax-m2.7 is also text-only, but its upstream accepts
-        # the image block and silently ignores it — a worse failure mode,
-        # since the model then answers as if no image had been attached.
-        # oc-kimi-k3 is natively multimodal and keeps vision=true.
+        # inline. oc-kimi-k3 and oc-grok-4.7 are natively multimodal and keep
+        # vision=true.
         "model_capabilities" => {
           "dsk-deepseek-flash"  => { "vision" => true }.freeze,
           "dsk-deepseek-v4-pro" => { "vision" => false }.freeze,
-          "oc-glm-5.3"          => { "vision" => false }.freeze,
-          "oc-minimax-m2.7"      => { "vision" => false }.freeze
+          "oc-glm-5.3"          => { "vision" => false }.freeze
         }.freeze,
         # Bedrock GPT models (abs-gpt-*) are served through the OpenAI
         # Responses API — their Chat Completions endpoint rejects function
@@ -173,15 +167,15 @@ module Clacky
         # no injection happens when the default model is already lite-class.
         "lite_models" => {
           "auto"                 => "dsk-deepseek-flash",
-          "abs-claude-fable-5-1"  => "abs-claude-haiku-4-5",
-          "abs-claude-fable-5"    => "abs-claude-haiku-4-5",
-          "abs-claude-opus-5-5"   => "abs-claude-haiku-4-5",
-          "abs-claude-opus-5"     => "abs-claude-haiku-4-5",
-          "abs-claude-opus-4-8"   => "abs-claude-haiku-4-5",
-          "abs-claude-opus-4-7"   => "abs-claude-haiku-4-5",
-          "abs-claude-sonnet-5-5" => "abs-claude-haiku-4-5",
-          "abs-claude-sonnet-5"   => "abs-claude-haiku-4-5",
-          "abs-claude-sonnet-4-6" => "abs-claude-haiku-4-5",
+          "abs-claude-fable-5-1"  => "abs-claude-haiku-5-5",
+          "abs-claude-fable-5"    => "abs-claude-haiku-5-5",
+          "abs-claude-opus-5-5"   => "abs-claude-haiku-5-5",
+          "abs-claude-opus-5"     => "abs-claude-haiku-5-5",
+          "abs-claude-opus-4-8"   => "abs-claude-haiku-5-5",
+          "abs-claude-opus-4-7"   => "abs-claude-haiku-5-5",
+          "abs-claude-sonnet-5-5" => "abs-claude-haiku-5-5",
+          "abs-claude-sonnet-5"   => "abs-claude-haiku-5-5",
+          "abs-claude-sonnet-4-6" => "abs-claude-haiku-5-5",
           "abs-gpt-6-astra"       => "abs-gpt-6-luna",
           "abs-gpt-6-sol"         => "abs-gpt-6-luna",
           "abs-gpt-5.6-sol"       => "abs-gpt-5.6-luna",
@@ -205,7 +199,7 @@ module Clacky
         "endpoint_variants" => [
           { "label" => "Primary (Global)",  "label_key" => "settings.models.baseurl.variant.openclacky_primary",   "base_url" => "https://api.openclacky.com" }.freeze
         ].freeze,
-        "website_url" => "https://www.openclacky.com/ai-keys"
+        "website_url" => "https://www.openclacky.com/llm_keys"
       }.freeze,
 
 
@@ -677,107 +671,6 @@ module Clacky
         },
         "default_ocr_model" => "kimi-k2.7-code",
         "website_url" => "https://ollama.com/settings/keys"
-      }.freeze,
-
-      "orcarouter" => {
-        "name" => "OrcaRouter",
-        "base_url" => "https://api.orcarouter.ai/v1",
-        "api" => "openai-completions",
-        "default_model" => "openai/gpt-5.5",
-        # Curated default lineup. OrcaRouter exposes 190+ models from OpenAI,
-        # Anthropic, Google, DeepSeek, Qwen, MiniMax, Zhipu and others behind a
-        # single OpenAI-compatible endpoint. Shipping a small list of the
-        # mainstream Claude + GPT entries gives users a working dropdown out
-        # of the box; users can still type any other OrcaRouter model id manually.
-        "models" => [
-          "anthropic/claude-sonnet-5",
-          "anthropic/claude-opus-4.8",
-          "anthropic/claude-haiku-4.5",
-          "openai/gpt-5.5",
-          "openai/gpt-5.4",
-          "openai/gpt-5.4-mini",
-          "google/gemini-3.5-flash",
-          "deepseek/deepseek-v4-flash",
-          "z-ai/glm-5.2"
-        ],
-        # Per-primary lite pairing — Claude family pairs with Haiku, GPT
-        # family pairs with the mini variant. Mirrors the openrouter preset
-        # so subagents on OrcaRouter get a sensible cheap/fast sidekick.
-        "lite_models" => {
-          "anthropic/claude-sonnet-5" => "anthropic/claude-haiku-4.5",
-          "anthropic/claude-opus-4.8" => "anthropic/claude-haiku-4.5",
-          "openai/gpt-5.5"            => "openai/gpt-5.4-mini",
-          "openai/gpt-5.4"            => "openai/gpt-5.4-mini"
-        },
-        # Per-model API type overrides. OrcaRouter proxies Claude through a
-        # native Anthropic /v1/messages endpoint (https://api.orcarouter.ai/v1/messages)
-        # in addition to its OpenAI-compatible /chat/completions endpoint.
-        # Routing "anthropic/*" via the native endpoint preserves cache_control
-        # fidelity, matching what Claude Code CLI does internally (same rationale
-        # as the openrouter preset). Non-Claude models keep the OpenAI shim.
-        "model_api_overrides" => {
-          /\Aanthropic\// => "anthropic-messages"
-        }.freeze,
-        # Most models on OrcaRouter are vision-capable; DeepSeek and GLM-5.2
-        # are text-only.
-        "capabilities" => { "vision" => true }.freeze,
-        "model_capabilities" => {
-          "deepseek/deepseek-v4-flash" => { "vision" => false }.freeze,
-          "z-ai/glm-5.2"               => { "vision" => false }.freeze
-        }.freeze,
-        "default_ocr_model" => "google/gemini-3.5-flash",
-        "website_url" => "https://www.orcarouter.ai"
-      }.freeze,
-
-      "requesty" => {
-        "name" => "Requesty",
-        "base_url" => "https://router.requesty.ai/v1",
-        "api" => "openai-completions",
-        "default_model" => "claude-sonnet-4-6",
-        # Curated default lineup of Requesty managed policies (GET /v1/models/managed).
-        # A managed policy is a short model id that Requesty routes across several
-        # upstream providers. Users can still type any other id manually, including
-        # the full "vendor/model" catalogue ids (e.g. "openai/gpt-4o-mini").
-        "models" => [
-          "claude-sonnet-4-6",
-          "claude-opus-4-8",
-          "claude-opus-4-7",
-          "claude-opus-4-6",
-          "claude-haiku-4-5",
-          "gpt-5.6-sol",
-          "gpt-5.6-terra",
-          "gpt-5.6-luna",
-          "gpt-5.5",
-          "gpt-5.4",
-          "gpt-5.4-mini",
-          "gemini-3.8-flash"
-        ],
-        # Per-primary lite pairing, same shape as the openrouter preset.
-        "lite_models" => {
-          "claude-sonnet-4-6" => "claude-haiku-4-5",
-          "claude-opus-4-8"   => "claude-haiku-4-5",
-          "claude-opus-4-7"   => "claude-haiku-4-5",
-          "claude-opus-4-6"   => "claude-haiku-4-5",
-          "gpt-5.6-sol"       => "gpt-5.6-luna",
-          "gpt-5.6-terra"     => "gpt-5.6-luna",
-          "gpt-5.5"           => "gpt-5.4-mini",
-          "gpt-5.4"           => "gpt-5.4-mini"
-        },
-        # Requesty also serves the native Anthropic /v1/messages endpoint, so
-        # Claude models route there to preserve cache_control fidelity (same
-        # rationale as the openrouter preset). Other models keep the OpenAI shim.
-        "model_api_overrides" => {
-          /\Aanthropic\// => "anthropic-messages",
-          /\Aclaude[-.]/  => "anthropic-messages"
-        }.freeze,
-        # Same API key works on every regional endpoint; the EU one keeps
-        # traffic inside the EU (Frankfurt).
-        "endpoint_variants" => [
-          { "label" => "Global", "base_url" => "https://router.requesty.ai/v1" }.freeze,
-          { "label" => "EU",     "base_url" => "https://router.eu.requesty.ai/v1", "region" => "eu" }.freeze
-        ].freeze,
-        "default_ocr_model" => "gemini-3.8-flash",
-        "website_url" => "https://app.requesty.ai/api-keys"
       }.freeze
 
     }.freeze
@@ -797,8 +690,6 @@ module Clacky
     MIMO_ID           = "mimo"
     VOLCENGINE_ARK_ID = "volcengine-ark"
     OLLAMA_ID         = "ollama"
-    ORCAROUTER_ID     = "orcarouter"
-    REQUESTY_ID       = "requesty"
 
     MEDIA_KINDS = %w[image video audio stt video_understanding].freeze
 

data/lib/clacky/server/http_server.rb

@@ -733,6 +733,7 @@ module Clacky
         when ["GET",    "/api/trash/sessions"]     then api_trash_sessions(req, res)
         when ["POST",   "/api/trash/sessions/restore"] then api_trash_session_restore(req, res)
         when ["DELETE", "/api/trash/sessions"]     then api_trash_sessions_delete(req, res)
+        when ["DELETE", "/api/archive/sessions"]   then api_archive_sessions_empty(res)
         when ["GET",    "/api/profile"]   then api_profile_get(res)
         when ["PUT",    "/api/profile"]   then api_profile_put(req, res)
         when ["GET",    "/api/memories"]  then api_memories_list(res)
@@ -972,6 +973,7 @@ module Clacky
         date         = query["date"].to_s.strip.then    { |v| v.empty? ? nil : v }
         type         = query["type"].to_s.strip.then    { |v| v.empty? ? nil : v }
         exclude_type = query["exclude_type"].to_s.split(",").map(&:strip).reject(&:empty?).then { |v| v.empty? ? nil : v }
+        archived     = %w[1 true yes].include?(query["archived"].to_s.strip.downcase)
         # Backward-compat: ?source=<x> and ?profile=coding → type
         type ||= query["profile"].to_s.strip.then { |v| v.empty? ? nil : v }
         type ||= query["source"].to_s.strip.then  { |v| v.empty? ? nil : v }
@@ -981,16 +983,23 @@ module Clacky
         # in the project section, so they must not eat into this page's quota.
         # Search (no before) keeps the original semantics: without a type filter
         # it may still match project sessions.
-        exclude_project = before ? true : !!type
-        sessions = @registry.list(limit: limit + 1, before: before, q: q, q_scope: q_scope, date: date, type: type, exclude_type: exclude_type, exclude_project: exclude_project)
+        #
+        # The archive view is the exception: it groups archived sessions by
+        # project by hand, so project membership must survive both filters.
+        exclude_project = archived ? false : (before ? true : !!type)
+        sessions = @registry.list(limit: limit + 1, before: before, q: q, q_scope: q_scope, date: date, type: type, exclude_type: exclude_type, exclude_project: exclude_project, archived: archived)
 
         pinned_part, non_pinned_part = sessions.partition { |s| s[:pinned] }
         has_more = non_pinned_part.size > limit
         non_pinned_part = non_pinned_part.first(limit)
         sessions = pinned_part + non_pinned_part
 
-        json_response(res, 200, { sessions: sessions, has_more: has_more,
-                                  groups: @registry.group_stats_all })
+        payload = { sessions: sessions, has_more: has_more, groups: @registry.group_stats_all }
+        # The archive page offers "delete all", so it needs the size of the whole
+        # archive — the paged `sessions` array only ever shows one page of it.
+        payload[:archived_count] = @registry.archived_count if archived
+
+        json_response(res, 200, payload)
       end
 
       # GET /api/sessions/:id — fetch a single session by id (memory + disk merged).
@@ -4679,19 +4688,39 @@ module Clacky
           return
         end
 
-        # Support HTTP Range requests for video seeking
+        # Support a single HTTP byte range for media seeking. Browsers normally
+        # send an explicit or open-ended start, while other clients may use the
+        # standard suffix form ("bytes=-N").
         range_header = req["Range"]
         if range_header && range_header =~ /\Abytes=(\d*)-(\d*)\z/
-          start_byte = ($1.empty? ? 0 : $1.to_i)
-          end_byte   = ($2.empty? ? file_size - 1 : $2.to_i)
-          end_byte   = [end_byte, file_size - 1].min
+          first, last = $1, $2
+          unsatisfiable = file_size.zero?
+
+          if first.empty?
+            suffix_length = last.to_i
+            unsatisfiable ||= suffix_length.zero?
+            start_byte = [file_size - suffix_length, 0].max
+            end_byte = file_size - 1
+          else
+            start_byte = first.to_i
+            end_byte = last.empty? ? file_size - 1 : [last.to_i, file_size - 1].min
+            unsatisfiable ||= start_byte >= file_size || end_byte < start_byte
+          end
 
-          res.status = 206
-          res["Content-Type"]  = mime
-          res["Content-Range"] = "bytes #{start_byte}-#{end_byte}/#{file_size}"
+          res["Content-Type"] = mime
           res["Accept-Ranges"] = "bytes"
-          res["Content-Length"] = (end_byte - start_byte + 1).to_s
-          IO.binread(path, end_byte - start_byte + 1, start_byte).then { |data| res.body = data }
+          if unsatisfiable
+            res.status = 416
+            res["Content-Range"] = "bytes */#{file_size}"
+            res["Content-Length"] = "0"
+            res.body = ""
+          else
+            length = end_byte - start_byte + 1
+            res.status = 206
+            res["Content-Range"] = "bytes #{start_byte}-#{end_byte}/#{file_size}"
+            res["Content-Length"] = length.to_s
+            res.body = IO.binread(path, length, start_byte)
+          end
         else
           res.status         = 200
           res["Content-Type"] = mime
@@ -6468,9 +6497,17 @@ module Clacky
             provider_id:       m["provider_id"],
             provider_name:     provider && provider["name"],
             provider_name_key: provider && provider["name_key"],
+            # Where the row's provider manages keys / billing — the picker
+            # links to it from the per-row top-up shortcut.
+            website_url:       provider && provider["website_url"],
             capabilities:      m["capabilities"],
             remark:            m["remark"],
-            type:              m["type"]
+            type:              m["type"],
+            # Sub-model list for this row: the models of the provider its
+            # endpoint belongs to (same rule the session status bar uses), so
+            # the picker can offer the switcher on every row and not only on
+            # the session's current one.
+            sub_models:        provider_id ? Clacky::Providers.models(provider_id) : []
           }
         end
         # Sidecar capability configs (media/ocr) and auto-injected entries are
@@ -7264,6 +7301,11 @@ module Clacky
         body = parse_json_body(req)
         new_name = body["name"]&.to_s&.strip
         pinned = body["pinned"]
+        archived = body["archived"]
+
+        if !archived.nil? && archived != true && archived != false
+          return json_response(res, 400, { error: "archived must be true or false" })
+        end
 
         return json_response(res, 404, { error: "Session not found" }) unless @registry.ensure(session_id)
 
@@ -7279,6 +7321,11 @@ module Clacky
         if !pinned.nil?
           agent.pinned = pinned
         end
+
+        # Update archived status if provided
+        if !archived.nil?
+          agent.archived_at = archived ? Time.now.iso8601 : nil
+        end
         
         # Save session data
         @session_manager.save(agent.to_session_data(updated_at: Time.now))
@@ -7287,11 +7334,13 @@ module Clacky
         update_data = { type: "session_updated", session_id: session_id }
         update_data[:name] = new_name if new_name && !new_name.empty?
         update_data[:pinned] = pinned unless pinned.nil?
+        update_data[:archived_at] = agent.archived_at unless archived.nil?
         broadcast(session_id, update_data)
         
         response_data = { ok: true }
         response_data[:name] = new_name if new_name && !new_name.empty?
         response_data[:pinned] = pinned unless pinned.nil?
+        response_data[:archived_at] = agent.archived_at unless archived.nil?
         json_response(res, 200, response_data)
       rescue => e
         json_response(res, 500, { error: e.message })
@@ -7540,6 +7589,23 @@ module Clacky
         json_response(res, 201, { session: @registry.snapshot(fork_id) })
       end
 
+      # DELETE /api/archive/sessions
+      # Empties the archive: every archived chat is soft-deleted and lands in
+      # the recycle bin, never destroyed for good. Archiving keeps a chat out of
+      # the sidebar, so clearing the archive means the user is done with all of
+      # them. The toolbar's search and filters deliberately do not narrow this —
+      # the button says "delete all", and the confirmation counts what this
+      # call is about to take out.
+      def api_archive_sessions_empty(res)
+        ids = @registry.list(archived: true).map { |s| s[:id] }
+
+        # `list` just read these ids off disk, so skip the per-id existence
+        # probe — `load` re-parses every session file for each call.
+        ids.each { |session_id| soft_delete_session!(session_id, on_disk: true) }
+
+        json_response(res, 200, { ok: true, deleted_count: ids.size })
+      end
+
       def api_delete_session(session_id, res)
         # A session exists if it's either in the runtime registry OR on disk.
         # Old sessions that were never restored into memory this server run
@@ -7547,28 +7613,36 @@ module Clacky
         # must still be able to delete them. Previously this endpoint only
         # consulted @registry and returned 404 for disk-only sessions,
         # causing the "can't delete old sessions" bug.
-        in_registry = @registry.exist?(session_id)
-        on_disk     = !@session_manager.load(session_id).nil?
+        return json_response(res, 404, { error: "Session not found" }) unless soft_delete_session!(session_id)
 
-        unless in_registry || on_disk
-          return json_response(res, 404, { error: "Session not found" })
-        end
+        json_response(res, 200, { ok: true })
+      end
+
+      # Move one session to the recycle bin and tell everyone who can see it.
+      # Returns false when the session is unknown — neither live nor on disk.
+      #
+      # `on_disk` skips the existence probe for callers that already scanned the
+      # disk themselves: `SessionManager#load` re-parses every session file until
+      # it finds a match, which is far too expensive to run per id in a bulk path.
+      private def soft_delete_session!(session_id, on_disk: nil)
+        in_registry = @registry.exist?(session_id)
+        on_disk     = !@session_manager.load(session_id).nil? if on_disk.nil?
+        return false unless in_registry || on_disk
 
-        # Registry delete is best-effort — only meaningful when the session
-        # is actually live (cancels idle timer, interrupts the agent thread).
-        # For disk-only sessions this is a no-op and returns false, which is
-        # fine and no longer blocks the disk cleanup below.
+        # Registry delete is best-effort — only meaningful when the session is
+        # actually live (cancels idle timer, interrupts the agent thread). For
+        # disk-only sessions this is a no-op and returns false, which is fine and
+        # no longer blocks the disk cleanup below.
         @registry.delete(session_id) if in_registry
 
         # Soft-delete: move session to trash instead of permanently destroying it.
         @session_manager.soft_delete(session_id) if on_disk
 
-        # Notify any still-connected clients (mainly matters when the
-        # session was live, but harmless otherwise).
+        # Notify any still-connected clients (mainly matters when the session was
+        # live, but harmless otherwise) so other tabs drop the row too.
         broadcast(session_id, { type: "session_deleted", session_id: session_id })
         unsubscribe_all(session_id)
-
-        json_response(res, 200, { ok: true })
+        true
       end
 
       # Export a session bundle as a .zip download containing:
@@ -7767,7 +7841,14 @@ module Clacky
           raw_images = (msg["images"] || []).map do |data_url|
             { "data_url" => data_url, "name" => "image.jpg", "mime_type" => "image/jpeg" }
           end
-          handle_user_message(session_id, msg["content"].to_s, (msg["files"] || []) + raw_images, references: msg["references"] || [])
+          handle_user_message(session_id, msg["content"].to_s, (msg["files"] || []) + raw_images, references: msg["references"] || [], feedback: msg["feedback"]&.transform_keys(&:to_sym))
+
+        when "feedback_response"
+          session_id = msg["session_id"] || conn.session_id
+          @registry.get(session_id)&.dig(:ui)&.deliver_feedback(
+            msg["content"].to_s, files: msg["files"] || [], display_text: msg["display_text"],
+            references_display: msg["references"] || [],
+            reference_contexts: build_reference_contexts(msg["references"] || []))
 
         when "confirmation"
           session_id = msg["session_id"] || conn.session_id
@@ -7867,11 +7948,12 @@ module Clacky
         end
       end
 
-      def handle_user_message(session_id, content, files = [], references: [])
+      def handle_user_message(session_id, content, files = [], references: [], feedback: nil)
         return unless @registry.exist?(session_id)
 
         session = @registry.get(session_id)
-        
+        feedback_options = feedback ? { feedback: feedback } : {}
+
         mode = @agent_config.input_behavior
         queued = false
         queued_created_at = nil
@@ -7879,7 +7961,7 @@ module Clacky
           if s[:status] == :running && %w[queue steer].include?(mode)
             queued_created_at = Time.now.to_f
             s[:agent].enqueue_input(content, delivery: mode.to_sym, files: files, references_display: references,
-                                    reference_contexts: build_reference_contexts(references), created_at: queued_created_at)
+                                    reference_contexts: build_reference_contexts(references), created_at: queued_created_at, **feedback_options)
             queued = true
           end
         end
@@ -7902,7 +7984,7 @@ module Clacky
           if old_thread && !old_thread.join(2)
             retained_created_at = Time.now.to_f
             session[:agent].enqueue_input(content, files: files, references_display: references,
-                                          reference_contexts: build_reference_contexts(references), created_at: retained_created_at)
+                                          reference_contexts: build_reference_contexts(references), created_at: retained_created_at, **feedback_options)
             broadcast(session_id, { type: "input_enqueued", session_id: session_id, created_at: retained_created_at })
             broadcast(session_id, { type: "input_queue_notice", session_id: session_id, key: "chat.input.stoppingDelayed" })
             return
@@ -7916,8 +7998,8 @@ module Clacky
         # Auto-name the session from the first user message (before agent starts running).
         # Skip if the name looks like it was set by the user (not a system-generated "Session N").
         if agent.history.empty? && agent.name.match?(/\ASession \d+\z/)
-          auto_name = content.gsub(/\s+/, " ").strip[0, 30]
-          auto_name += "…" if content.strip.length > 30
+          auto_name = content.gsub(/\s+/, " ").strip[0, 80]
+          auto_name += "…" if content.strip.length > 80
           agent.rename(auto_name)
           broadcast(session_id, { type: "session_renamed", session_id: session_id, name: auto_name })
         end
@@ -7960,7 +8042,7 @@ module Clacky
           # "Thinking..." forever. A web-originated turn bound to an IM channel gets a
           # card too, so tools/narration render like a native IM turn (#603).
           @channel_manager.channel_ui_for_session(session_id)&.start_task(reply_to: nil)
-          agent.run(content, files: files, reference_contexts: reference_contexts, created_at: msg_created_at, references_display: references)
+          agent.run(content, files: files, reference_contexts: reference_contexts, created_at: msg_created_at, references_display: references, **feedback_options)
         end
       end
 
@@ -8227,11 +8309,14 @@ module Clacky
           if e.is_a?(Clacky::InsufficientCreditError) && e.provider_id
             preset = Clacky::Providers::PRESETS[e.provider_id]
             top_up_url = preset && preset["website_url"]
+          elsif e.respond_to?(:action_url) && e.action_url
+            top_up_url = e.action_url
           end
           user_message = e.respond_to?(:display_message) && e.display_message ? e.display_message : e.message
           raw_message  = e.respond_to?(:raw_message) ? e.raw_message : nil
           next unless @registry.update_if_epoch(session_id, epoch, status: :error, error: user_message, error_code: code, top_up_url: top_up_url, raw_message: raw_message)
           broadcast_session_update(session_id)
+          agent.record_error_event(user_message, code: code, top_up_url: top_up_url, raw_message: raw_message)
           web_ui&.show_error(user_message, code: code, top_up_url: top_up_url, raw_message: raw_message)
           @session_manager.save(agent.to_session_data(status: :error, error_message: user_message, raw_message: raw_message, updated_at: Time.now))
         end

data/lib/clacky/server/model_prices.rb

@@ -6,7 +6,9 @@ module Clacky
     # Resolves each model's input/output price (USD per 1M tokens) from
     # Clacky::ModelPricing plus a cost ratio vs the baseline model, so the
     # web UI never hardcodes prices - updating PRICING_TABLE is enough.
-    # Prices are post-promotion; `discount` is present when a rule applied.
+    # Prices are post-promotion; `discount` is present when a rule applied,
+    # carrying both the rate and its reason ("channel" or "promo") so the UI
+    # can pick the right explanation.
     module ModelPrices
       BASELINE_MODEL = "claude-sonnet-5"
 
@@ -21,7 +23,8 @@ module Clacky
           pricing = Clacky::ModelPricing.get_pricing(name)
           pricing = Clacky::ModelPricing.resolve_deepseek_tier(pricing, now) if pricing && pricing[:deepseek]
           next unless pricing
-          rate = Clacky::ModelPricing.discount_rate(name)
+          info = Clacky::ModelPricing.discount_info(name)
+          rate = info ? info[:rate] : 1.0
           # Rates are not powers of two, so the discounted product carries float
           # noise (3.0 * 0.95 == 2.8499999999999996) that would surface verbatim
           # in the picker tooltips. Four decimals is already finer than any
@@ -29,7 +32,7 @@ module Clacky
           pin  = (pricing[:input][:default] * rate).round(4)
           pout = (pricing[:output][:default] * rate).round(4)
           entry = { in: pin, out: pout, ratio: (pin + pout) / base_total }
-          entry[:discount] = { rate: rate } if rate < 1.0
+          entry[:discount] = { rate: rate, reason: info[:reason] } if rate < 1.0
           prices[name] = entry
         end