openclacky 1.5.6 → 1.5.8

data/lib/clacky/agent.rb

@@ -3,7 +3,6 @@
 require "securerandom"
 require "json"
 require "cgi"
-require "tty-prompt"
 require "set"
 require_relative "null_ui_controller"
 require_relative "utils/arguments_parser"
@@ -51,7 +50,6 @@ module Clacky
                 :latest_latency,  # Hash of latency metrics from the most recent LLM call (see Client#send_messages_with_tools)
                 :reasoning_effort
     attr_accessor :pinned
-    attr_accessor :hidden
     attr_accessor :channel_info
     attr_accessor :project_id
 
@@ -82,15 +80,15 @@ module Clacky
       @source = source.to_sym  # :manual | :cron | :channel
       @channel_info = nil  # { platform:, user_id:, user_name:, chat_id: } set by ChannelManager
       @tool_registry = ToolRegistry.new
-      @hooks = HookManager.new
+      @hooks = HookManager.new(agent: self)
       @session_id = session_id
       @name = ""
       @pinned = false
-      @hidden = false
       @history = MessageHistory.new
       @todos = []  # Store todos in memory
       @iterations = 0
       @total_cost = 0.0
+      @cost_mutex = Mutex.new
       @cache_stats = {
         cache_creation_input_tokens: 0,
         cache_read_input_tokens: 0,
@@ -110,7 +108,7 @@ 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_transcript = nil # Subagent trail to attach to the next tool result (observe)
+      @pending_subagent_transcripts = {} # tool_call_id => subagent trail, attached by observe()
       @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)
@@ -287,6 +285,27 @@ module Clacky
       @goal_manager&.active? || false
     end
 
+    # Emit a custom extension event to the UI.
+    #
+    # `type` must be namespaced "ext.<extension>.<event>" so custom events can
+    # never collide with the built-in protocol.
+    #
+    # Transient by default: progress ticks and other high-frequency chatter are
+    # pushed live and forgotten, so extensions cannot bloat session.json without
+    # opting in. Pass `persist: true` for milestone events that must reappear in
+    # the chat stream after a reload; those are anchored to the current message,
+    # survive compression via the chunk MD, and are replayed in place.
+    def emit_event(type, persist: false, **data)
+      name = type.to_s
+      unless name.start_with?("ext.")
+        raise ArgumentError, "custom event type must be namespaced as 'ext.<extension>.<event>', got #{name.inspect}"
+      end
+
+      @ui&.emit(name, **data)
+      @history.append_ext_event({ type: name, data: data }) if persist
+      self
+    end
+
     # Resolve the model name the goal judge should use. Prefer the provider's
     # lite model (cheap/fast for a one-line verdict); fall back to the primary
     # model when no lite is resolvable.
@@ -1139,6 +1158,13 @@ module Clacky
           next
         end
 
+        # A hook fulfilled the call itself (e.g. an extension that runs the
+        # skill on its own subagents). Its result stands in for the tool's.
+        if hook_result[:action] == :handled
+          results << build_success_result(call, hook_result[:result])
+          next
+        end
+
         # Show preview for edit and write tools even in auto-approve mode
         if should_auto_execute?(call[:name], call[:arguments])
           # In auto-approve mode, show preview for edit and write tools
@@ -1196,10 +1222,13 @@ module Clacky
             args[:todos_storage] = @todos
           end
 
-          # Special handling for InvokeSkill: inject agent and skill_loader
+          # Special handling for InvokeSkill: inject agent and skill_loader.
+          # tool_call_id lets the subagent transcript be keyed to *this* call, so
+          # multiple invoke_skill calls in one turn don't cross-attach trails.
           if call[:name] == "invoke_skill"
             args[:agent] = self
             args[:skill_loader] = @skill_loader
+            args[:tool_call_id] = call[:id]
           end
 
           # Inject working_dir so tools don't rely on Dir.chdir global state
@@ -1351,7 +1380,7 @@ module Clacky
         @history.append(truncated.merge(task_id: @current_task_id))
       end
 
-      attach_pending_subagent_transcript(response)
+      attach_pending_subagent_transcripts(response)
 
       # Append a follow-up `role:"user"` message for any image payloads that
       # could not be delivered inside the tool message.
@@ -1362,7 +1391,7 @@ module Clacky
       # plain text, inflating token counts by 20-40x.  The tool result carries a
       # plain-text description for the LLM; the actual image is delivered here.
       vision_supported = @config.current_model_supports?(:vision)
-      ocr_entry = vision_supported ? nil : @config.find_model_by_type("ocr")
+      ocr_entry = vision_supported ? nil : @config.effective_ocr_entry
 
       tool_results.each do |tr|
         inject = tr[:image_inject]
@@ -1396,22 +1425,24 @@ module Clacky
       end
     end
 
-    # Attach the captured subagent transcript (set by execute_skill_with_subagent)
-    # to the invoke_skill tool result message just appended by observe(). The
-    # transcript rides on the tool message as :subagent_transcript — an internal
-    # field stripped before the LLM call but persisted to session.json and
-    # replayed to the WebUI. Cleared after attaching so it fires exactly once.
-    private def attach_pending_subagent_transcript(response)
-      transcript = @pending_subagent_transcript
-      return unless transcript
+    # 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.
+    private def attach_pending_subagent_transcripts(response)
+      return if @pending_subagent_transcripts.empty?
 
-      @pending_subagent_transcript = nil
+      Array(response[:tool_calls]).each do |tc|
+        next unless (tc[:name] || tc.dig(:function, :name)) == "invoke_skill"
 
-      skill_call = Array(response[:tool_calls]).find { |tc| (tc[:name] || tc.dig(:function, :name)) == "invoke_skill" }
-      target_id = skill_call && skill_call[:id]
-      return unless target_id
+        transcript = @pending_subagent_transcripts.delete(tc[:id])
+        next unless transcript
 
-      @history.attach_to_tool_result(target_id, :subagent_transcript, transcript)
+        @history.attach_to_tool_result(tc[:id], :subagent_transcript, transcript)
+      end
     end
 
     # Cap oversized tool result content to keep a single tool message from
@@ -1587,8 +1618,67 @@ module Clacky
       parent_count = subagent.instance_variable_get(:@parent_message_count) || 0
       result = subagent.run(task)
 
-      @total_cost += result[:total_cost_usd] || 0.0
+      # A detached run stays invisible, so its cost is merged silently — the
+      # sessionbar refresh would be the one thing that gives it away.
+      absorb_subagent_cost(result, notify_ui: false)
+
+      final_assistant_text(subagent, parent_count)
+    end
+
+    # Run several independent tasks on forked subagents at the same time.
+    #
+    # Each subagent is forked on the calling thread (forking deep-copies parent
+    # config + history, which must not race) and only the blocking run is moved
+    # onto the pool. Results keep the order of `tasks`; a task that raises or
+    # overruns the budget yields a failed slot instead of aborting its siblings.
+    #
+    # Subagents run silently by default: they share the parent's session, so a
+    # live UI would interleave several raw transcripts into one chat.
+    #
+    # @param tasks [Array<String>] one prompt per subagent
+    # @param model [String, nil] model for every subagent (nil = current)
+    # @param forbidden_tools [Array<String>] tool names blocked at runtime
+    # @param max_concurrency [Integer] subagents allowed to run at once
+    # @param timeout [Numeric, nil] wall-clock budget for the whole batch
+    # @return [Array<Fanout::Result>] value is the subagent's final reply text
+    def fan_out_subagents(tasks, model: nil, forbidden_tools: [], max_concurrency: Fanout::DEFAULT_MAX_CONCURRENCY,
+                          timeout: nil)
+      return [] if tasks.empty?
+
+      jobs = tasks.each_with_index.map do |task, index|
+        subagent = fork_subagent(
+          model: model,
+          forbidden_tools: forbidden_tools,
+          system_prompt_suffix: "You are one of several subagents running in parallel on independent tasks. " \
+                                "Do your task and return only the requested output. Do not ask follow-up questions."
+        )
+        parent_count = subagent.instance_variable_get(:@parent_message_count) || 0
+        label = "Subagent #{index + 1}/#{tasks.size}"
+        # Fanout workers are fresh threads, so the epoch that lets the web
+        # broadcaster drop events from superseded tasks has to be carried over
+        # by hand — otherwise interrupted subagents keep writing to the new task.
+        epoch = Thread.current[:task_epoch]
+
+        lambda do
+          Thread.current[:task_epoch] = epoch
+          within_phase(label, kind: "fanout_subagent", concurrent: true) do
+            result = subagent.run(task)
+            absorb_subagent_cost(result, notify_ui: false)
+            final_assistant_text(subagent, parent_count)
+          end
+        end
+      end
+
+      Fanout.new(max_concurrency: max_concurrency, timeout: timeout).run(jobs)
+    end
+
+    private def within_phase(label, kind:, concurrent:, &block)
+      return yield unless @ui.respond_to?(:with_phase)
+
+      @ui.with_phase(kind: kind, label: label, concurrent: concurrent, &block)
+    end
 
+    private def final_assistant_text(subagent, parent_count)
       new_messages = subagent.history.to_a[parent_count..] || []
       new_messages
         .reverse
@@ -1868,7 +1958,7 @@ module Clacky
       # OCR sidecar — only consulted when the primary doesn't see images.
       # When the sidecar entry has "primary"=>true, the primary itself can see,
       # so vision_supported was already true and we never enter the OCR branch.
-      ocr_entry = vision_supported ? nil : @config.find_model_by_type("ocr")
+      ocr_entry = vision_supported ? nil : @config.effective_ocr_entry
 
       vision_images = []  # Array of { url:, name:, size_bytes:, path: }
       downgraded    = []

data/lib/clacky/agent_config.rb

@@ -633,16 +633,10 @@ module Clacky
       }.compact
     end
 
-    # Find model by type (default or lite or media kind or ocr sidecar)
-    # Returns the model hash or nil if not found.
-    # For media kinds (image/video/audio): explicit user-configured (custom)
-    # entries win; otherwise an auto-derived virtual entry is returned
-    # based on the default model's provider — mirroring how lite is
-    # virtually derived via #lite_model_config_for_current.
-    # For "ocr": same custom→auto→nil pattern. Auto path first checks
-    # whether the default model itself supports vision (zero-overhead path,
-    # no sidecar needed); if not, derives from the provider's
-    # default_ocr_model.
+    # Raw accessor - returns the stored model entry without mode-aware filtering.
+    # For media/ocr: does NOT check mode field, only legacy disabled flag.
+    # Mode-aware callers should use #effective_media_entry / #effective_ocr_entry.
+    # HTTP server uses this to read raw entries for saved_custom / api_key masking.
     def find_model_by_type(type)
       kind = type.to_s
       if Clacky::Providers::MEDIA_KINDS.include?(kind)
@@ -701,6 +695,38 @@ module Clacky
       @models.reject! { |m| m["auto_injected"] && Clacky::Providers::MEDIA_KINDS.include?(m["type"].to_s) }
     end
 
+    private def sidecar_off?(entry)
+      entry && (entry["disabled"] || entry["mode"] == "off")
+    end
+
+    private def sidecar_custom?(entry)
+      entry &&
+        entry["base_url"].to_s.strip != "" &&
+        entry["api_key"].to_s.strip != "" &&
+        entry["mode"] != "auto"
+    end
+
+    def effective_media_entry(kind)
+      kind = kind.to_s
+      raw_entry = @models.find { |m| m["type"] == kind }
+      return nil if sidecar_off?(raw_entry)
+
+      is_custom = sidecar_custom?(raw_entry)
+      override_model = raw_entry && !is_custom ? raw_entry["model"] : nil
+
+      is_custom ? raw_entry : derive_media_model(kind, model_override: override_model)
+    end
+
+    def effective_ocr_entry
+      raw_entry = @models.find { |m| m["type"] == "ocr" }
+      return nil if sidecar_off?(raw_entry)
+
+      is_custom = sidecar_custom?(raw_entry)
+      override_model = raw_entry && !is_custom ? raw_entry["model"] : nil
+
+      is_custom ? raw_entry : derive_ocr_model(model_override: override_model)
+    end
+
     # Derive an OCR sidecar model entry from the default model's provider.
     # Resolution order:
     #   1. If the default model itself supports vision → return the default
@@ -763,7 +789,7 @@ module Clacky
       kind = kind.to_s
       raw_entry = @models.find { |m| m["type"] == kind }
 
-      if raw_entry && raw_entry["disabled"]
+      if sidecar_off?(raw_entry)
         default = find_model_by_type("default")
         default_provider = default && Clacky::Providers.resolve_provider(
           base_url: default["base_url"], api_key: default["api_key"]
@@ -782,9 +808,7 @@ module Clacky
         }
       end
 
-      is_custom = raw_entry &&
-                  raw_entry["base_url"].to_s.strip != "" &&
-                  raw_entry["api_key"].to_s.strip != ""
+      is_custom = sidecar_custom?(raw_entry)
       override_model = raw_entry && !is_custom ? raw_entry["model"] : nil
 
       entry = if is_custom
@@ -842,7 +866,7 @@ module Clacky
       )
       available = default_provider ? Clacky::Providers.ocr_models(default_provider) : []
 
-      if raw_entry && raw_entry["disabled"]
+      if sidecar_off?(raw_entry)
         # A disabled OCR sidecar only means "no separate vision model"; it must
         # not override the fact that the chat model may handle images itself.
         anchor = current_model || default
@@ -872,9 +896,7 @@ module Clacky
         }
       end
 
-      is_custom = raw_entry &&
-                  raw_entry["base_url"].to_s.strip != "" &&
-                  raw_entry["api_key"].to_s.strip != ""
+      is_custom = sidecar_custom?(raw_entry)
       override_model = raw_entry && !is_custom ? raw_entry["model"] : nil
 
       entry = if is_custom

data/lib/clacky/anthropic_stream_aggregator.rb

@@ -121,7 +121,12 @@ module Clacky
 
     private def emit_usage_progress
       return unless @on_chunk
-      input  = @usage["input_tokens"].to_i + @usage["cache_read_input_tokens"].to_i
+      raw_input      = @usage["input_tokens"].to_i
+      cache_read     = @usage["cache_read_input_tokens"].to_i
+      cache_creation = @usage["cache_creation_input_tokens"].to_i
+      # Mirrors MessageFormat::Anthropic.parse_response so the live readout and
+      # the final billed numbers agree.
+      input = MessageFormat::Anthropic.normalise_prompt_tokens(raw_input, cache_read, cache_creation)
       output = @usage["output_tokens"].to_i
       return if input == @last_input_tokens && output == @last_output_tokens
       @last_input_tokens = input

data/lib/clacky/cli.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require "thor"
-require "tty-prompt"
 require "fileutils"
 require_relative "ui2"
 require_relative "json_ui_controller"
 require_relative "plain_ui_controller"
 require_relative "brand_config"
 require_relative "extension/cli_commands"
+require_relative "mcp/cli_commands"
 
 module Clacky
   class CLI < Thor
@@ -1217,6 +1217,9 @@ module Clacky
     desc "ext SUBCOMMAND", "Manage extension containers (new, verify, list, pack, install, publish, search)"
     subcommand "ext", Clacky::CliExtensionCommands
 
+    desc "mcp SUBCOMMAND", "Manage MCP server connections and OAuth authorization"
+    subcommand "mcp", Clacky::Mcp::CliCommands
+
     desc "billing", "Show billing summary and usage statistics"
     long_desc <<-LONGDESC
       Display billing summary with token usage and cost breakdown.

data/lib/clacky/client.rb

@@ -415,7 +415,7 @@ module Clacky
         if defined?(Clacky::Logger)
           Clacky::Logger.warn("[parse_simple_openai_response] no content. status=#{response.status} body=#{snippet}")
         end
-        raise Clacky::Error,
+        raise RetryableError,
           "Upstream OpenAI-compatible response missing choices[0].message.content. " \
           "Body snippet: #{snippet}"
       end

data/lib/clacky/default_extensions/ext-studio/panels/studio/view.js

@@ -148,6 +148,7 @@
       "extlist.unpublish.confirm": "Unpublish {{id}} from the marketplace?",
       "extlist.publishing": "Publishing…",
       "extlist.needLicense": "Publishing requires an activated user license.",
+      "extlist.brandLocked": "Publishing to the marketplace requires a creator license.",
       "extlist.newExt.label": "Create a new extension",
       "extlist.newExt.hint": "Opens an AI session that scaffolds and builds it for you.",
       "extlist.newExt.btn": "Create New Extension",
@@ -338,6 +339,7 @@
       "extlist.unpublish.confirm": "确定要从市场下架 {{id}} 吗？",
       "extlist.publishing": "发布中…",
       "extlist.needLicense": "发布需要已激活的用户授权。",
+      "extlist.brandLocked": "发布到市场需要创作者权限。",
       "extlist.newExt.label": "创建新扩展",
       "extlist.newExt.hint": "打开一个 AI 会话，帮你生成并开发它。",
       "extlist.newExt.btn": "创建新扩展",
@@ -1406,11 +1408,16 @@
       ));
 
       const bar = el("div", { class: "studio-actions" });
-      bar.appendChild(el("button", { class: "studio-btn studio-btn-primary studio-publish-btn", text: t("btn.publish"), onclick: doPublish }));
+      const brandNonAdmin = typeof Brand !== "undefined" && Brand.branded && !Brand.userLicensed;
+      const pubBtn = el("button", { class: "studio-btn studio-btn-primary studio-publish-btn", text: t("btn.publish"), onclick: doPublish });
+      pubBtn.disabled = brandNonAdmin;
+      if (brandNonAdmin) pubBtn.setAttribute("data-tooltip", t("extlist.brandLocked"));
+      bar.appendChild(pubBtn);
       if (typeof Brand !== "undefined" && Brand.userLicensed) {
         bar.appendChild(el("button", { class: "studio-btn studio-publish-brand-btn", text: t("btn.publishBrand"), onclick: doPublishBrand }));
       }
-      bar.appendChild(el("button", { class: "studio-btn studio-btn-ghost studio-pack-btn", text: t("btn.pack"), onclick: doPack }));
+      const packBtn = el("button", { class: "studio-btn studio-btn-ghost studio-pack-btn", text: t("btn.pack"), onclick: doPack });
+      bar.appendChild(packBtn);
       container.appendChild(bar);
 
       container.appendChild(el("div", { class: "studio-feedback" }));
@@ -1548,9 +1555,11 @@
       card.appendChild(meta);
 
       const actions = el("div", { class: "studio-actions" });
+      const brandNonAdmin = typeof Brand !== "undefined" && Brand.branded && !Brand.userLicensed;
       const pub = el("button", { class: "studio-btn studio-btn-primary", text: published ? t("extlist.btn.update") : t("extlist.btn.publish") });
-      pub.disabled = !!ext.error_count;
-      pub.title = ext.error_count ? t("extlist.verify.errors", { n: ext.error_count }) : "";
+      pub.disabled = !!ext.error_count || brandNonAdmin;
+      const pubTip = ext.error_count ? t("extlist.verify.errors", { n: ext.error_count }) : (brandNonAdmin ? t("extlist.brandLocked") : "");
+      if (pubTip) pub.setAttribute("data-tooltip", pubTip);
       pub.addEventListener("click", () => doPublish(ext, cloudEntry ? cloudEntry.version : null));
       actions.appendChild(pub);
 
@@ -1558,7 +1567,7 @@
         const brandEntry = brandCloud.find((c) => c.id === ext.id);
         const brandPub = el("button", { class: "studio-btn", text: t("extlist.btn.publishBrand") });
         brandPub.disabled = !!ext.error_count;
-        brandPub.title = ext.error_count ? t("extlist.verify.errors", { n: ext.error_count }) : "";
+        if (ext.error_count) brandPub.setAttribute("data-tooltip", t("extlist.verify.errors", { n: ext.error_count }));
         brandPub.addEventListener("click", () => doPublish(ext, brandEntry ? brandEntry.version : null, "self"));
         actions.appendChild(brandPub);
       }
@@ -1635,11 +1644,15 @@
 
       if (headerActions) {
         headerActions.innerHTML = "";
-        headerActions.appendChild(el("button", {
+        const brandNonAdmin = typeof Brand !== "undefined" && Brand.branded && !Brand.userLicensed;
+        const newBtn = el("button", {
           class: "studio-btn studio-btn-primary",
           text: t("extlist.newExt.btn"),
           onclick: () => createExtension(t("extlist.newExt.seed")),
-        }));
+        });
+        newBtn.disabled = brandNonAdmin;
+        if (brandNonAdmin) newBtn.setAttribute("data-tooltip", t("extlist.brandLocked"));
+        headerActions.appendChild(newBtn);
       }
 
       container.appendChild(section("extlist.section.cloud", "extlist.section.cloudHint", cloud, cloudCard, "extlist.cloud.empty"));
@@ -1711,7 +1724,7 @@
       if (skill.local_present && skill.has_local_changes) {
         const btn = el("button", { class: "studio-btn studio-btn-primary", text: t("skills.btn.update") });
         btn.disabled = locked;
-        btn.title = locked ? t("skills.locked") : "";
+        if (locked) btn.setAttribute("data-tooltip", t("skills.locked"));
         btn.addEventListener("click", () => doPublish(skill.name, btn, true));
         actions.appendChild(btn);
       } else if (skill.local_present) {
@@ -1738,7 +1751,7 @@
       const actions = el("div", { class: "studio-actions" });
       const btn = el("button", { class: "studio-btn studio-btn-primary", text: t("skills.btn.publish") });
       btn.disabled = locked;
-      btn.title = locked ? t("skills.locked") : "";
+      if (locked) btn.setAttribute("data-tooltip", t("skills.locked"));
       btn.addEventListener("click", () => doPublish(skill.name, btn, false));
       actions.appendChild(btn);
       card.appendChild(actions);
@@ -1798,7 +1811,7 @@
           onclick: () => createSkill(null),
         });
         newBtn.disabled = locked;
-        newBtn.title = locked ? t("skills.locked") : "";
+        if (locked) newBtn.setAttribute("data-tooltip", t("skills.locked"));
         headerActions.appendChild(newBtn);
       }
 

data/lib/clacky/default_extensions/ext-studio/skills/ext-develop/SKILL.md

@@ -206,16 +206,21 @@ Response helpers: `json` / `text(str)` / `send_data(bytes, content_type:, filena
 - Drive sessions from the backend: `create_session(prompt:, profile:, …)`,
   `submit_task(session_id, prompt)`, `dispatch_to_session(session_id, prompt)` (runs a
   side task on a fork and returns its reply without touching the conversation).
-- `create_session(hidden: true)` creates a session the openclacky session list hides
-  and the 200-session cleanup skips - use it for dedicated extension sessions you
-  manage yourself. Still reachable by `session_id` via `submit_task` /
-  `dispatch_to_session` / `registry.with_session`; forking resets `hidden` to false.
 - **Projects**: `project_manager.all` lists projects, `find(id)` returns one (or
   `nil`), `create(name:, working_dir:, …)` / `update(id, …)` / `delete(id)` mutate.
   Pass `project_id:` to `create_session` to bind a session to a project - its
   `working_dir` is inherited (unless overridden) and `agent.project_id` is persisted.
   A panel can also `fetch("/api/projects")` directly (same-origin, no-auth; see
   [Host API](/docs/extend-host-api)).
+- **Session source grouping** (⚠️ opt-in only): `create_session` accepts `source: "manual"`
+  (default) or `source: "ext"`; anything else is rejected with 400. Use `"ext"` **only**
+  when the extension creates sessions the user did not individually ask for (bookkeeping,
+  background workers, one per webhook) and would otherwise flood the list — they collapse
+  under a single "Extensions" sidebar entry with their own 200-session cleanup pool.
+  **Default to `"manual"`**: a session the user asked for is one they should be able to
+  find, and folded sessions are easy to overlook while the separate pool silently consumes
+  storage until evicted. Sessions bound to a project always show in that project's area
+  regardless of `source`, and count toward the regular pool rather than the ext one.
 - Public (no-auth) endpoints: call `public_endpoint("/path")` in the class **and** set
   `public: true` at ext.yml top level — both are required.
 
@@ -230,7 +235,10 @@ Response helpers: `json` / `text(str)` / `send_data(bytes, content_type:, filena
   `event` values (exactly these): `before_tool_use after_tool_use on_tool_error on_start
   on_complete on_iteration session_rollback`. A `before_tool_use` hook returning
   `{ action: :deny, reason: "…" }` **blocks** the tool call — this is how you audit or
-  gate dangerous commands.
+  gate dangerous commands. Every event passes the **agent as its last block arg**
+  (`|call, result, agent|` for `after_tool_use`); call `agent.emit_event("ext.<id>.<event>",
+  persist: true, **data)` to push structured events to the frontend. `persist: false`
+  (default) vanishes on refresh — emit a `persist: true` terminal event at the end.
 
 ## Scaffold
 
@@ -415,8 +423,9 @@ smallest change, re-run verify, repeat until clean — fix ONE issue at a time.
 - **`schema.unknown_contributes`** → a top-level key under `contributes:` is misspelled.
   **Do:** fix the spelling to one of `panels api skills agents channels patches hooks`.
 - **`schema.unknown_key`** → an unknown **top-level** key in `ext.yml`. **Do:** fix the
-  spelling. Allowed top-level keys: `id name title description version origin author
-  homepage license public license_required keywords contributes`.
+  spelling. Allowed top-level keys: `id name name_zh display_name display_name_zh title
+  description description_zh emoji version origin author homepage license public
+  license_required keywords contributes`.
 - **`schema.unknown_field`** → a unit has a field not allowed for its type. **Do:** delete
   or rename that field. Allowed fields per type (this is the authoritative list — do not
   invent others):

data/lib/clacky/default_extensions/general/ext.yml

@@ -15,4 +15,4 @@ contributes:
       order: 1
       prompt: agents/general/system_prompt.md
       avatar: agents/general/avatar.png
-      panels: [meeting/meeting]
+      panels: []

data/lib/clacky/extension/api_extension.rb

@@ -27,6 +27,10 @@ module Clacky
     MAX_TIMEOUT  = 600
     DEFAULT_TIMEOUT = 10
 
+    # "ext" groups the session under the sidebar's folded extension entry and
+    # gives it a dedicated cleanup pool; extensions cannot claim other sources.
+    ALLOWED_SESSION_SOURCES = %w[manual ext].freeze
+
     Route = Struct.new(:method, :pattern, :regex, :param_names, :block, :options, keyword_init: true)
 
     class Halt < StandardError
@@ -270,9 +274,14 @@ module Clacky
     # (unless an explicit working_dir overrides it) and the session is
     # associated with the project.
     def create_session(name: nil, prompt: nil, working_dir: nil, profile: "general",
-                       source: :manual, display_message: nil, hidden: false, project_id: nil)
+                       source: :manual, display_message: nil, project_id: nil)
       error!("server not ready", status: 503) unless @http_server
 
+      src = source.to_s
+      unless ALLOWED_SESSION_SOURCES.include?(src)
+        error!("invalid source '#{src}': allowed values are #{ALLOWED_SESSION_SOURCES.join(", ")}", status: 400)
+      end
+
       if project_id
         project_id = project_id.to_s.strip
         project_id = nil if project_id.empty?
@@ -288,8 +297,7 @@ module Clacky
         name: name,
         working_dir: working_dir,
         profile: profile,
-        source: source,
-        hidden: hidden
+        source: source
       )
 
       if project_id

data/lib/clacky/extension/api_loader.rb

@@ -65,17 +65,10 @@ module Clacky
         existing = reload ? Clacky::ApiExtension.registry[ext_id] : nil
         existing&.reset_routes!
 
-        if reload
-          old_verbose = $VERBOSE
-          $VERBOSE = nil
-          begin
-            load(handler_path)
-          ensure
-            $VERBOSE = old_verbose
-          end
-        else
-          require(handler_path)
-        end
+        # Wrapped load: each handler gets a fresh anonymous module, so two exts
+        # defining the same top-level class/constant names cannot clobber each
+        # other (and the `inherited` hook fires even on repeat loads).
+        load(handler_path, true)
 
         new_subclasses = Clacky::ApiExtension.pending_subclasses[before..] || []
         klass = new_subclasses.last || existing

data/lib/clacky/extension/packager.rb

@@ -16,7 +16,7 @@ module Clacky
   # optional URL fetch in `install`.
   module ExtensionPackager
     MANIFEST     = "ext.yml"
-    MAX_ZIP_SIZE = 50 * 1024 * 1024
+    MAX_ZIP_SIZE = 80 * 1024 * 1024
 
     # Network timeouts for the download step. `read_timeout` is an *idle*
     # timeout (resets on every chunk received), so a stalled connection with

data/lib/clacky/extension/verifier.rb

@@ -16,7 +16,7 @@ module Clacky
   module ExtensionVerifier
     Issue = Struct.new(:ext, :unit, :level, :code, :message, :file, :hint, keyword_init: true)
 
-    KNOWN_TOP_KEYS    = %w[id name title description version origin author homepage license public license_required keywords contributes].freeze
+    KNOWN_TOP_KEYS    = %w[id name name_zh display_name display_name_zh title description description_zh emoji version origin author homepage license public license_required keywords contributes].freeze
     KNOWN_CONTRIBUTES = %w[panels api skills agents channels patches hooks].freeze
 
     PANEL_KEYS   = %w[id title title_zh description description_zh view order attach entry_points].freeze