openclacky 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '038138bc72f3f740ed3ccee6da3f6464f80fd0cf1d0466788879a4472ac127b1'
-  data.tar.gz: dfb75e0b2e832e923c34a1f5e61b4a005bd29435f3724763128b0fadc0b6ec1b
+  metadata.gz: 1cef597eb5d6c066192ba6c2c587e0dcd62fdf2dd9ed422161f71718acbb7f25
+  data.tar.gz: 03bcd29f23eacd7b49a37db0494f7964757391ac52e8f3ef9787c49a6b2f8efb
 SHA512:
-  metadata.gz: c72531566a2b744a279e54907f750ff67e518963c9d42216dde3cb05048e4c86688dbb2ebfe908b31b7f7df8d2332df0ab0b11e0977ab5c486ca5c83b565eafc
-  data.tar.gz: 584975067a26ebfc123e9f9a7f168ef45aab93f783e91da576510f416554c0ba4598e88064db7f71c0f6a30dfda949a4f36cc35d69aa35973489be800422a6b2
+  metadata.gz: 7543c4f518bf5a2e20778472e60909b5eda8f727015b66aad37c69b2d256b53ba3cd5126d2b385a06456a45a6531fe4fdaad7c6d7f8b247aeb2a76bf1446a9f1
+  data.tar.gz: d6ceb974a12d29096ae65bcbed3d6c6467880005101664919357572201846792faf4f89956ff5ca568519d74960674e214a39c61333e527741a9eb38083fcbf1

data/CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
+## [1.5.11] - 2026-08-23
+
+### Added
+- Creator Studio: separate Marketplace and Brand sections for published extensions
+- Advisor extension for next-job suggestions
+- ask_user tool with multi-question support (replaces feedback_user)
+- Sidebar states for awaiting-feedback and just-finished sessions
+- Auto-purge file-trash entries older than 8 days
+- DeepSeek V4 flash vision exp model preset
+- IM channel toggle to mute tool-call narration and previews
+
+### Improved
+- Unified internal thread management with graceful shutdown
+
+### Fixed
+- Skill decrypt retry now picks up a renewed license key
+- DeepSeek weekends billed entirely at off-peak rates
+- Skill and extension zip downloads fall back to a secondary CDN host
+- Session status dot aligned with name and channel badge
+- Project session tag top margin
+- Unified modal close button and ext-studio modal semantics
+- Unified checkbox accent and distinct verified badge
+- Edit-model modal overflow on small screens
+- Subagent UI fixes
+- Star History charts migrated to star-history.dera.page (#491 - @CrustyMozarella)
+
 ## [1.5.10] - 2026-08-19
 
 ### Added

data/README.md

@@ -209,11 +209,11 @@ $ openclacky
 
 ## Star History
 
-<a href="https://www.star-history.com/?repos=clacky-ai%2Fopenclacky&type=date&legend=top-left">
+<a href="https://star-history.dera.page/#clacky-ai/openclacky&type=date&legend=top-left">
  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&theme=dark&legend=top-left" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&legend=top-left" />
-   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&legend=top-left" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&legend=top-left" />
  </picture>
 </a>
 

data/README_CN.md

@@ -204,11 +204,11 @@ $ openclacky
 
 ## Star 历史
 
-<a href="https://www.star-history.com/?repos=clacky-ai%2Fopenclacky&type=date&legend=top-left">
+<a href="https://star-history.dera.page/#clacky-ai/openclacky&type=date&legend=top-left">
  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&theme=dark&legend=top-left" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&legend=top-left" />
-   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&legend=top-left" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&legend=top-left" />
  </picture>
 </a>
 

data/README_JA.md

@@ -209,11 +209,11 @@ $ openclacky
 
 ## Star History
 
-<a href="https://www.star-history.com/?repos=clacky-ai%2Fopenclacky&type=date&legend=top-left">
+<a href="https://star-history.dera.page/#clacky-ai/openclacky&type=date&legend=top-left">
  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&theme=dark&legend=top-left" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&legend=top-left" />
-   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=clacky-ai/openclacky&type=date&legend=top-left" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://star-history.dera.page/svg?repos=clacky-ai/openclacky&type=date&legend=top-left" />
  </picture>
 </a>
 

data/lib/clacky/agent/llm_caller.rb

@@ -95,6 +95,7 @@ module Clacky
 
         begin
           begin
+          Clacky::Shutdown.checkpoint!
           # Use active_messages (Time Machine) when undone, otherwise send full history.
           # to_api strips internal fields and handles orphaned tool_calls.
           messages_to_send = if respond_to?(:active_messages)
@@ -167,6 +168,7 @@ module Clacky
           end
 
         rescue Faraday::TimeoutError => e
+          Clacky::Shutdown.checkpoint!
           # Faraday::TimeoutError on our non-streaming POST almost always means
           # the *response* took longer than the 300s read-timeout to come back —
           # i.e. the model is trying to produce a huge output in one shot
@@ -198,7 +200,7 @@ module Clacky
               metadata: { attempt: retries, total: max_retries }
             )
             retrying_progress_opened = true
-            sleep retry_delay
+            Clacky::Shutdown.sleep(retry_delay)
             retry
           else
             # All retries exhausted for a timeout. Try the secondary gateway URL if available.
@@ -219,6 +221,7 @@ module Clacky
           end
 
         rescue Faraday::ConnectionFailed, Faraday::SSLError, Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::EPIPE => e
+          Clacky::Shutdown.checkpoint!
           retries += 1
 
           # Errno::EPIPE means the underlying TCP socket is dead (server closed the
@@ -245,7 +248,7 @@ module Clacky
               metadata: { attempt: retries, total: max_retries }
             )
             retrying_progress_opened = true
-            sleep retry_delay
+            Clacky::Shutdown.sleep(retry_delay)
             retry
           else
             # All retries on the primary endpoint exhausted for a network-level
@@ -269,6 +272,7 @@ module Clacky
           end
 
         rescue RetryableError => e
+          Clacky::Shutdown.checkpoint!
           retries += 1
 
           # Probing failure: primary still down — renew cooling-off and retry with fallback.
@@ -298,7 +302,7 @@ module Clacky
             metadata: { attempt: retries, total: current_max }
           )
           retrying_progress_opened = true
-          sleep retry_delay
+          Clacky::Shutdown.sleep(retry_delay)
           retry
         else
           # All retries on the current endpoint exhausted.

data/lib/clacky/agent/session_serializer.rb

@@ -742,16 +742,17 @@ module Clacky
             args_raw = tc[:arguments] || tc.dig(:function, :arguments) || {}
             args     = args_raw.is_a?(String) ? (JSON.parse(args_raw) rescue args_raw) : args_raw
 
-            # Special handling: request_user_feedback question is shown as an
-            # assistant message (matching real-time behavior), not as a tool call.
-            # Reconstruct the full formatted message including options (mirrors RequestUserFeedback#execute).
-            if name == "request_user_feedback"
-              question = args.is_a?(Hash) ? (args[:question] || args["question"]).to_s : ""
-              context  = args.is_a?(Hash) ? (args[:context]  || args["context"]).to_s  : ""
-              options  = args.is_a?(Hash) ? (args[:options]  || args["options"])        : nil
-              options  = Array(options) if options && !options.is_a?(Array)
-
-              ui.show_feedback_request(question, context, options || []) unless question.empty?
+            # Special handling: the ask_user question is shown as an assistant
+            # message (matching real-time behavior), not as a tool call.
+            if Clacky::Tools::AskUser.feedback_tool?(name)
+              questions = Clacky::Tools::AskUser.normalize_questions(args)
+              context   = Clacky::Tools::AskUser.fetch_key(args, :context).to_s
+              first     = questions.first
+
+              unless first.nil?
+                ui.show_feedback_request(first[:question], context, first[:options],
+                                         questions: questions)
+              end
             else
               ui.show_tool_call(name, args)
             end
@@ -796,14 +797,23 @@ module Clacky
         end
       end
 
-      # Replay a subagent transcript stored on a tool result message. Emits a
+      # Replay subagent transcripts stored on a tool result message. Emits a
       # bracketed sequence of UI events the frontend can render as a collapsible
       # sub-process block: subagent_start → (assistant_message / tool_call /
-      # tool_result)* → subagent_end. No-op when the message carries no transcript.
+      # tool_result)* → subagent_end. A fan-out batch renders one block per job,
+      # in the caller's original job order.
+      #
+      # Sessions saved before fan-out support stored a bare Hash here.
       def replay_subagent_transcript(msg, ui)
-        transcript = msg[:subagent_transcript]
-        return unless transcript.is_a?(Hash)
+        stored = msg[:subagent_transcript]
+        Array(stored.is_a?(Hash) ? [stored] : stored).each do |transcript|
+          next unless transcript.is_a?(Hash)
+
+          replay_one_subagent_transcript(transcript, ui)
+        end
+      end
 
+      def replay_one_subagent_transcript(transcript, ui)
         events = transcript[:events] || transcript["events"] || []
         return if events.empty?
 

data/lib/clacky/agent/skill_manager.rb

@@ -651,8 +651,7 @@ module Clacky
         # observe() attaches each trail to its own tool result message.
         # Kept out of the LLM payload via INTERNAL_FIELDS.
         if tool_call_id
-          @pending_subagent_transcripts[tool_call_id] =
-            extract_subagent_transcript(subagent, skill.identifier)
+          record_subagent_transcript(tool_call_id, subagent, skill.identifier)
         end
 
         # Mutate the subagent_instructions message in-place to become the result summary

data/lib/clacky/agent/tool_executor.rb

@@ -13,7 +13,7 @@ module Clacky
         case @config.permission_mode
         when :auto_approve, :confirm_all
           # Both modes auto-execute all file/shell tools without confirmation.
-          # The difference is only in request_user_feedback handling:
+          # The difference is only in ask_user handling:
           #   auto_approve → no human present, inject auto_reply
           #   confirm_all  → human present, truly wait for user input
           true

data/lib/clacky/agent/tool_registry.rb

@@ -55,10 +55,12 @@ module Clacky
       # todo_manager aliases
       "todo" => "todo_manager",
       "task_manager" => "todo_manager",
-      # request_user_feedback aliases
-      "ask_user" => "request_user_feedback",
-      "user_feedback" => "request_user_feedback",
-      "ask" => "request_user_feedback",
+      # ask_user aliases
+      "request_user_feedback" => "ask_user",
+      "user_feedback" => "ask_user",
+      "ask" => "ask_user",
+      "ask_question" => "ask_user",
+      "clarify" => "ask_user",
       # trash_manager aliases
       "trash" => "trash_manager",
       "delete" => "trash_manager",

data/lib/clacky/agent.rb

@@ -108,7 +108,8 @@ module Clacky
       @ui = ui  # UIController for direct UI interaction
       @debug_logs = []  # Debug logs for troubleshooting
       @pending_injections = []     # Pending inline skill injections to flush after observe()
-      @pending_subagent_transcripts = {} # tool_call_id => subagent trail, attached by observe()
+      @pending_subagent_transcripts = {} # tool_call_id => [subagent trails], attached by observe()
+      @subagent_transcripts_mutex = Mutex.new # fan-out collects from worker threads
       @pending_script_tmpdirs = [] # Decrypted-script tmpdirs that live for the agent's lifetime
       @pending_error_rollback = false  # Deferred rollback flag set by restore_session on error
       @last_run_interrupted = false    # Set when run() exits via AgentInterrupted; tells the next run() to keep the task-start snapshot (continuation of the same task across a relay, not a brand-new task)
@@ -688,12 +689,13 @@ module Clacky
 
       result = nil
       begin
-        # Track if request_user_feedback was called
+        # Track if ask_user was called
         awaiting_user_feedback = false
         # Track if task was interrupted by user (denied tool execution)
         task_interrupted = false
 
         loop do
+          Clacky::Shutdown.checkpoint!
           @iterations += 1
           @hooks.trigger(:on_iteration, @iterations)
 
@@ -819,7 +821,7 @@ module Clacky
 
           # Show assistant message if there's content before tool calls
           if response[:content] && !response[:content].empty?
-            emit_assistant_message(response[:content], reasoning_content: response[:reasoning_content])
+            emit_assistant_message(response[:content], reasoning_content: response[:reasoning_content], interim: true)
           end
 
           # Show token usage after assistant message (or immediately if no message).
@@ -829,7 +831,7 @@ module Clacky
           # Act: Execute tool calls
           action_result = act(response[:tool_calls])
 
-          # Check if request_user_feedback was called
+          # Check if ask_user was called
           if action_result[:awaiting_feedback]
             awaiting_user_feedback = true
             observe(response, action_result[:tool_results])
@@ -866,7 +868,7 @@ module Clacky
           end
         end
 
-      result = build_result
+      result = build_result(awaiting_user_feedback: awaiting_user_feedback)
 
         # Run skill evolution hooks after main loop completes
         # Skip if task was interrupted by user (denied tool) or awaiting user feedback
@@ -1226,10 +1228,10 @@ module Clacky
           end
         end
 
-        # Special handling for request_user_feedback
+        # Special handling for the ask_user family
         # The interactive countdown (auto_approve) is handled after the tool
         # executes, once the question itself has been rendered to the user.
-        unless call[:name] == "request_user_feedback"
+        unless Tools::AskUser.feedback_tool?(call[:name])
           @ui&.show_tool_call(call[:name], redact_tool_args(call[:arguments]))
         end
 
@@ -1254,6 +1256,11 @@ module Clacky
             args[:tool_call_id] = call[:id]
           end
 
+          # Same anchor for extension tools that fan out to their own subagents.
+          if tool && tool.class.respond_to?(:receives_tool_call_id) && tool.class.receives_tool_call_id
+            args[:tool_call_id] = call[:id]
+          end
+
           # Inject working_dir so tools don't rely on Dir.chdir global state
           args[:working_dir] = @working_dir if @working_dir
 
@@ -1319,10 +1326,13 @@ module Clacky
             @ui&.update_todos(@todos.dup) unless action == "list"
           end
 
-          # Special handling for request_user_feedback: emit as interactive feedback card
-          if call[:name] == "request_user_feedback"
+          # Special handling for ask_user: emit as interactive feedback card.
+          # A rejected call (no usable question) falls through to the normal
+          # result path so the model sees the error and can retry.
+          if Tools::AskUser.feedback_tool?(call[:name]) &&
+             result.is_a?(Hash) && result[:awaiting_feedback]
             # Pass the raw call arguments to show_tool_call so the WebUI controller
-            # can extract question/context/options and emit a "request_feedback" event
+            # can extract the questions and emit a "request_feedback" event
             # (renders as a clickable card in the browser).
             # Fallback UIs (terminal, IM channels) receive the formatted text message.
             @ui&.show_tool_call(call[:name], call[:arguments])
@@ -1456,23 +1466,25 @@ module Clacky
       end
     end
 
-    # Attach captured subagent transcripts (set by execute_skill_with_subagent)
-    # to their own invoke_skill tool result messages just appended by observe().
-    # Each transcript rides on its tool message as :subagent_transcript — an
-    # internal field stripped before the LLM call but persisted to session.json
-    # and replayed to the WebUI. Keyed by tool_call_id so a turn with several
-    # invoke_skill calls attaches each subagent's trail to the call that spawned
-    # it. Consumed entries are deleted so each fires exactly once.
+    # Attach captured subagent transcripts (set by execute_skill_with_subagent
+    # and fan_out_labeled) to the tool result messages just appended by
+    # observe(). Each transcript rides on its tool message as an internal field
+    # stripped before the LLM call but persisted to session.json and replayed to
+    # the WebUI. Keyed by tool_call_id so a turn with several such calls attaches
+    # each trail to the call that spawned it. Consumed entries are deleted so
+    # each fires exactly once.
+    # A single subagent is just a batch of one, so both invoke_skill and
+    # fan-out land in the same buffer and the same message field.
     private def attach_pending_subagent_transcripts(response)
       return if @pending_subagent_transcripts.empty?
 
+      # Not filtered by tool name: any tool may spawn subagents, and the
+      # tool_call_id it recorded under is already the anchor.
       Array(response[:tool_calls]).each do |tc|
-        next unless (tc[:name] || tc.dig(:function, :name)) == "invoke_skill"
+        batch = @subagent_transcripts_mutex.synchronize { @pending_subagent_transcripts.delete(tc[:id]) }
+        next if batch.nil? || batch.empty?
 
-        transcript = @pending_subagent_transcripts.delete(tc[:id])
-        next unless transcript
-
-        @history.attach_to_tool_result(tc[:id], :subagent_transcript, transcript)
+        @history.attach_to_tool_result(tc[:id], :subagent_transcript, batch.sort_by { |t| t[:index] || 0 })
       end
     end
 
@@ -1491,6 +1503,12 @@ module Clacky
     TERMINAL_HEAD_CHARS = 40_000
     TERMINAL_TAIL_CHARS = 40_000
 
+    # Per-subagent transcript budget. Mirrors the intent of
+    # MessageHistory::MAX_EXT_EVENTS_PER_MESSAGE: milestones are worth keeping,
+    # runaway trails are not. A fan-out stores one of these per job.
+    MAX_TRANSCRIPT_EVENTS = 200
+    MAX_TRANSCRIPT_BYTES  = 64 * 1024
+
     private def truncate_oversized_tool_content(msg, tool_name: nil)
       content = msg[:content]
       return msg unless content.is_a?(String) && content.length > MAX_TOOL_RESULT_CHARS
@@ -1586,7 +1604,7 @@ module Clacky
       !@start_time.nil?
     end
 
-    private def build_result(status = :success, error: nil)
+    private def build_result(status = :success, error: nil, awaiting_user_feedback: false)
       task_iterations = @iterations - (@task_start_iterations || 0)
       task_cost = @total_cost - (@task_start_cost || 0)
 
@@ -1601,7 +1619,8 @@ module Clacky
         cost_source: @task_cost_source,
         cache_stats: @task_cache_stats || @cache_stats,
         history: @history,
-        error: error
+        error: error,
+        awaiting_user_feedback: awaiting_user_feedback
       }
     end
 
@@ -1640,7 +1659,7 @@ module Clacky
       @tool_registry.register(Tools::WebSearch.new)
       @tool_registry.register(Tools::WebFetch.new)
       @tool_registry.register(Tools::TodoManager.new)
-      @tool_registry.register(Tools::RequestUserFeedback.new)
+      @tool_registry.register(Tools::AskUser.new)
       @tool_registry.register(Tools::InvokeSkill.new)
       @tool_registry.register(Tools::Browser.new)
     end
@@ -1719,11 +1738,16 @@ module Clacky
     # the jobs over — forking deep-copies parent config + history, which must
     # not race. Only the blocking run belongs in the lambda.
     #
-    # @param jobs [Array<Hash>] each { label: String, run: #call }
+    # Pass :subagent alongside :run (and a tool_call_id) to have each job's
+    # message trail persisted onto the tool result, so the WebUI can replay the
+    # whole batch after a reload instead of just the collapsed return values.
+    #
+    # @param jobs [Array<Hash>] each { label: String, run: #call, subagent: Agent (optional) }
     # @param max_concurrency [Integer] jobs allowed to run at once
     # @param timeout [Numeric, nil] wall-clock budget for the whole batch
+    # @param tool_call_id [String, nil] anchors persisted transcripts to this tool call
     # @return [Array<Fanout::Result>] aligned to the input order
-    def fan_out_labeled(jobs, max_concurrency: Fanout::DEFAULT_MAX_CONCURRENCY, timeout: nil)
+    def fan_out_labeled(jobs, max_concurrency: Fanout::DEFAULT_MAX_CONCURRENCY, timeout: nil, tool_call_id: nil)
       return [] if jobs.empty?
 
       # Fanout workers are fresh threads, so the epoch that lets the web
@@ -1734,11 +1758,18 @@ module Clacky
       wrapped = jobs.each_with_index.map do |job, index|
         label = job[:label] || job["label"] || "Subagent #{index + 1}/#{jobs.size}"
         run = job[:run] || job["run"]
+        subagent = job[:subagent] || job["subagent"]
         raise ArgumentError, "job #{index} must provide a callable :run" unless run.respond_to?(:call)
 
         lambda do
           Thread.current[:task_epoch] = epoch
-          within_phase(label, kind: "fanout_subagent", concurrent: true) { run.call }
+          begin
+            within_phase(label, kind: "fanout_subagent", concurrent: true) { run.call }
+          ensure
+            # Runs in ensure so a job that raised still leaves a trail — a failed
+            # subagent is exactly the one worth inspecting afterwards.
+            record_subagent_transcript(tool_call_id, subagent, label, index: index) if subagent
+          end
         end
       end
 
@@ -1751,6 +1782,21 @@ module Clacky
       @ui.with_phase(kind: kind, label: label, concurrent: concurrent, &block)
     end
 
+    # Called from fan-out worker threads, hence the mutex. Slots are keyed by
+    # job index so the persisted order matches the caller's job order rather
+    # than completion order.
+    def record_subagent_transcript(tool_call_id, subagent, label, index: 0)
+      return unless tool_call_id
+
+      transcript = extract_subagent_transcript(subagent, label)
+      transcript[:index] = index
+      @subagent_transcripts_mutex.synchronize do
+        (@pending_subagent_transcripts[tool_call_id] ||= []) << transcript
+      end
+    rescue StandardError => e
+      Clacky::Logger.warn("agent.subagent_transcript_failed", error: e.message, label: label)
+    end
+
     # The subagent's last non-empty assistant message — its actual answer.
     #
     # A subagent's `run` result carries cost and iteration counts but no reply
@@ -1986,10 +2032,34 @@ module Clacky
         skill: skill_identifier,
         iterations: subagent.iterations,
         cost_usd: subagent.total_cost.round(4),
-        events: events
+        events: cap_transcript_events(events)
       }
     end
 
+    # session.json is rewritten in full on every save, so a transcript has to
+    # stay bounded — a fan-out of chatty subagents would otherwise multiply an
+    # unbounded trail by the batch size. Oldest events are dropped first: the
+    # tail is what explains how the subagent ended up where it did.
+    private def cap_transcript_events(events)
+      kept = events.last(MAX_TRANSCRIPT_EVENTS)
+      dropped = events.size - kept.size
+
+      budget = MAX_TRANSCRIPT_BYTES
+      kept = kept.reverse.take_while do |entry|
+        budget -= transcript_entry_bytes(entry)
+        budget.positive?
+      end.reverse
+      dropped = events.size - kept.size
+
+      return kept if dropped.zero?
+
+      [{ role: "system", content: "[#{dropped} earlier event(s) omitted]" }] + kept
+    end
+
+    private def transcript_entry_bytes(entry)
+      entry[:content].to_s.bytesize + Array(entry[:tool_calls]).sum { |tc| tc[:arguments].to_s.bytesize }
+    end
+
     # Deep clone helper for messages using Marshal
     # @param obj [Object] Object to clone
     # @return [Object] Deep cloned object
@@ -2119,7 +2189,10 @@ module Clacky
       begin
         Clacky::Vision::Resolver.new(ocr_entry).describe(image)
       ensure
-        @ui&.show_progress(phase: "done")
+        # Must pass progress_type: "vision" — the UI's legacy shim pairs
+        # active/done by type, so a bare done would leave the OCR spinner
+        # frozen forever (same trap as the old retrying-slot bug).
+        @ui&.show_progress(progress_type: "vision", phase: "done")
       end
     end
 
@@ -2327,7 +2400,7 @@ module Clacky
     # and cannot load file:// directly) and must stay scoped to the Web UI
     # controller. IM channel subscribers need the original file:// markdown so
     # parse_file_links can extract paths and deliver images as native attachments.
-    private def emit_assistant_message(content, reasoning_content: nil)
+    private def emit_assistant_message(content, reasoning_content: nil, interim: false)
       # Prepend reasoning/thinking content (from thinking-mode providers like
       # DeepSeek V4, Kimi K2) wrapped in <think> tags so the Web UI renders it
       # as a collapsible thinking block (see sessions.js _renderMarkdown).
@@ -2340,7 +2413,7 @@ module Clacky
       return if full_content.nil? || full_content.to_s.strip.empty?
 
       parsed = parse_file_links(content)
-      @ui&.show_assistant_message(full_content, files: parsed[:files])
+      @ui&.show_assistant_message(full_content, files: parsed[:files], interim: interim)
     end
 
     # Record BEFORE-change snapshots for any file a tool is about to mutate,

data/lib/clacky/brand_config.rb

@@ -519,7 +519,7 @@ module Clacky
       return nil if activated?
       return nil if ENV["CLACKY_TEST"] == "1"
 
-      Thread.new do
+      Clacky::ThreadRegistry.spawn(name: "brand-fetch-free-skills") do
         Thread.current.abort_on_exception = false
 
         begin
@@ -922,7 +922,7 @@ module Clacky
       return nil unless activated?
       return nil if ENV["CLACKY_TEST"] == "1"
 
-      Thread.new do
+      Clacky::ThreadRegistry.spawn(name: "brand-fetch-extensions") do
         Thread.current.abort_on_exception = false
 
         begin
@@ -1305,7 +1305,7 @@ module Clacky
       return nil unless activated?
       return nil if ENV["CLACKY_TEST"] == "1"
 
-      Thread.new do
+      Clacky::ThreadRegistry.spawn(name: "brand-fetch-skills") do
         Thread.current.abort_on_exception = false
 
         begin
@@ -1890,26 +1890,24 @@ module Clacky
         return cached[:key] if key_valid && within_grace
       end
 
-      # Guard: @device_id must match the value recorded in activated_devices on the
-      # server.  If it is nil (e.g. loaded from a brand.yml that predates the
-      # device_id field), reload from disk as a last-chance recovery — the file
-      # may have been written by a concurrent process or a newer gem version.
-      # If still nil after reload, raise an actionable error rather than sending
-      # an empty device_id that will always be rejected by the server.
-      if @device_id.nil? || @device_id.strip.empty?
-        reloaded = BrandConfig.load
-        @device_id = reloaded.device_id if reloaded.device_id && !reloaded.device_id.strip.empty?
-      end
+      # Single disk read so device_id and license_key share one snapshot.
+      # Reading license_key live (not the instance snapshot) is what lets a
+      # license renewed mid-session be picked up on retry — a live agent still
+      # holds the expired key and the server would otherwise reject the
+      # signature as "license expired".
+      reloaded   = BrandConfig.load
+      @device_id = reloaded.device_id if @device_id.nil? || @device_id.strip.empty?
       raise "Device ID is missing. Please re-activate your license with `clacky license activate`." \
         if @device_id.nil? || @device_id.strip.empty?
 
-      # Build signed request payload
-      user_id   = parse_user_id_from_key(@license_key)
-      key_hash  = Digest::SHA256.hexdigest(@license_key)
+      license_key = reloaded.license_key
+      license_key = @license_key if license_key.nil? || license_key.strip.empty?
+      user_id   = parse_user_id_from_key(license_key)
+      key_hash  = Digest::SHA256.hexdigest(license_key)
       ts        = Time.now.utc.to_i.to_s
       nonce     = SecureRandom.hex(16)
       message   = "#{user_id}:#{@device_id}:#{ts}:#{nonce}"
-      signature = OpenSSL::HMAC.hexdigest("SHA256", @license_key, message)
+      signature = OpenSSL::HMAC.hexdigest("SHA256", license_key, message)
 
       payload = {
         key_hash:         key_hash,

data/lib/clacky/cli.rb

@@ -419,7 +419,7 @@ module Clacky
 
         if brand.heartbeat_due?
           Clacky::Logger.info("[Brand] check_brand_license_cli: heartbeat due, dispatching async...")
-          Thread.new do
+          Clacky::ThreadRegistry.spawn(name: "cli-brand-heartbeat") do
             begin
               result = brand.heartbeat!
               if result[:success]
@@ -1053,7 +1053,7 @@ module Clacky
           auto_name_session(agent, input)
 
           # Run agent in background thread
-          current_task_thread = Thread.new do
+          current_task_thread = Clacky::ThreadRegistry.spawn(name: "cli-agent-task") do
             begin
               # Set status to working when agent starts
               ui_controller.set_working_status