openclacky 1.5.20 → 1.5.21

data/lib/clacky/message_history.rb

@@ -15,7 +15,7 @@ module Clacky
       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
-      display_files display_references
+      display_files display_references feedback_requests
     ].freeze
 
     INTERNAL_CONTENT_BLOCK_FIELDS = %i[image_path image_name].freeze
@@ -37,7 +37,8 @@ module Clacky
     # Write operations
     # ─────────────────────────────────────────────
 
-    # Append a single message hash to the history.
+    # Append a single message hash to the history. An optional block receives
+    # the stored, sanitized message so callers can retain its identity.
     #
     # When appending a user message, automatically drop any trailing assistant
     # message that has unanswered tool_calls (no tool_result follows it).
@@ -48,7 +49,9 @@ module Clacky
       if message[:role] == "user"
         drop_dangling_tool_calls!
       end
-      @messages << deep_sanitize_utf8(message)
+      stored_message = deep_sanitize_utf8(message)
+      @messages << stored_message
+      yield stored_message if block_given?
       self
     end
 
@@ -111,6 +114,16 @@ module Clacky
       self
     end
 
+    # Save the effective request before waiting, including while no tool result
+    # exists yet. The original model-authored call remains unchanged.
+    def attach_feedback_request(message:, tool_call_id:, request:)
+      return false unless message
+
+      message[:feedback_requests] ||= {}
+      message[:feedback_requests][tool_call_id.to_s] = deep_sanitize_utf8(request)
+      true
+    end
+
     # Settle an interrupted fan-out whose assistant.tool_calls turn is dangling
     # because the batch was cancelled before any tool result was written. Mirrors
     # repair_tool_call_pairing (same helpers, same scan) but PERSISTS the result:
@@ -315,6 +328,11 @@ module Clacky
         @messages
       end
       msgs = source.map { |m| strip_for_api(m) }
+      # A tool message with a blank id answers no announced call, and one of
+      # them makes every later request fail (422 "invalid type: null"). Drop
+      # these before pairing: a blank id is not recognized as a tool result,
+      # so pairing would otherwise insert a placeholder and orphan the real one.
+      msgs.reject! { |m| m[:role] == "tool" && m[:tool_call_id].to_s.strip.empty? }
       msgs = repair_tool_call_pairing(msgs)
       ensure_reasoning_content_consistency(msgs, force: force_reasoning_content_pad)
     end

data/lib/clacky/platform_http_client.rb

@@ -50,9 +50,13 @@ module Clacky
     # Auto-detects the platform endpoint:
     #   - When CLACKY_LICENSE_SERVER is set → that URL (dev override)
     #   - Otherwise                        → PRIMARY_HOST
+    def self.base_url
+      override = ENV["CLACKY_LICENSE_SERVER"]
+      override && !override.empty? ? override.chomp("/") : PRIMARY_HOST
+    end
+
     def initialize
-      override  = ENV["CLACKY_LICENSE_SERVER"]
-      @base_url = override && !override.empty? ? override : PRIMARY_HOST
+      @base_url = self.class.base_url
     end
 
     # Send a POST request with a JSON body and return a normalised result hash.

data/lib/clacky/providers.rb

@@ -60,8 +60,7 @@ module Clacky
           "abs-gpt-5.6-luna",
           "or-gemini-4-argon",
           "or-gemini-3-1-pro",
-          "or-gemini-3-8-flash",
-          "oc-grok-4.7"
+          "or-gemini-3-8-flash"
         ],
         # Image generation models served by the openclacky platform
         # gateway. The gateway exposes a standard OpenAI-compatible
@@ -146,7 +145,8 @@ module Clacky
         # 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-kimi-k3 and oc-grok-4.7 are natively multimodal and keep
-        # vision=true.
+        # vision=true; oc-gpt-6.1-sol, oc-gpt-6-astra, oc-gpt-6-sol and
+        # oc-gpt-6-luna do too.
         "model_capabilities" => {
           "dsk-deepseek-flash"  => { "vision" => true }.freeze,
           "dsk-deepseek-v4-pro" => { "vision" => false }.freeze,
@@ -199,6 +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,
+        "deepseek_web_tools" => true,
         "website_url" => "https://www.openclacky.com/llm_keys"
       }.freeze,
 
@@ -229,6 +230,7 @@ module Clacky
         "model_capabilities" => {
           "deepseek-flash" => { "vision" => true }.freeze
         }.freeze,
+        "deepseek_web_tools" => true,
         "website_url" => "https://platform.deepseek.com/api_keys"
       }.freeze,
 
@@ -334,8 +336,8 @@ module Clacky
         "name" => "Minimax",
         "base_url" => "https://api.minimaxi.com/v1",
         "api" => "openai-completions",
-        "default_model" => "MiniMax-M3",
-        "models" => ["MiniMax-M3", "MiniMax-M2.7", "MiniMax-M2.5"],
+        "default_model" => "MiniMax-M3.1-Flash",
+        "models" => ["MiniMax-M3.1-Flash", "MiniMax-M3"],
         # MiniMax operates two regional endpoints with identical APIs & model
         # lineup — mainland China (.com) and international (.io). Listing both
         # lets find_by_base_url identify either one as provider "minimax",
@@ -345,16 +347,15 @@ module Clacky
           { "label" => "Mainland China", "label_key" => "settings.models.baseurl.variant.mainland_cn",   "base_url" => "https://api.minimaxi.com/v1", "region" => "cn"   }.freeze,
           { "label" => "International",  "label_key" => "settings.models.baseurl.variant.international", "base_url" => "https://api.minimax.io/v1",   "region" => "intl" }.freeze
         ].freeze,
-        # MiniMax M2.5/M2.7 are text-only on this endpoint. M3 (released 2026-06-01)
-        # is natively multimodal — it accepts image input via OpenAI-style
-        # image_url content parts — so it overrides the provider-level
-        # vision=false below. M3 exposes a 1,000,000-token context window
-        # (M2.7: 204,800; M2.5: 40,960).
+        # M3.1-Flash and M3 are natively multimodal (image_url content parts,
+        # 1M context) and override the provider-level vision=false, which
+        # stays as the safe default for retired text-only ids (M2.x).
         "capabilities" => { "vision" => false }.freeze,
         "model_capabilities" => {
-          "MiniMax-M3" => { "vision" => true }.freeze
+          "MiniMax-M3.1-Flash" => { "vision" => true }.freeze,
+          "MiniMax-M3"         => { "vision" => true }.freeze
         }.freeze,
-        "default_ocr_model" => "MiniMax-M3",
+        "default_ocr_model" => "MiniMax-M3.1-Flash",
         "website_url" => "https://platform.minimax.io/"
       }.freeze,
 
@@ -642,7 +643,6 @@ module Clacky
           "glm-5.2",
           "kimi-k3",
           "glm-5.1",
-          "minimax-m2.7",
           "minimax-m3",
           "kimi-k2.7-code",
           "kimi-k2.6",
@@ -664,7 +664,6 @@ module Clacky
         "lite_models" => {
           "glm-5.2"                => "glm-5.1",
           "kimi-k3"                => "kimi-k2.6",
-          "minimax-m3"             => "minimax-m2.7",
           "kimi-k2.7-code"         => "kimi-k2.6",
           "deepseek-v4-pro"        => "deepseek-v4-flash",
           "gemini-3-flash-preview" => "deepseek-v4-flash"
@@ -1173,6 +1172,16 @@ module Clacky
         return true unless caps.key?(key)
         caps[key] != false
       end
+
+      # True when the preset declares native DeepSeek web tools (search + fetch).
+      # Currently DeepSeek direct ("deepseekv4") and the OpenClacky platform
+      # gateway ("openclacky").
+      def deepseek_web_tools?(provider_id)
+        preset = PRESETS[provider_id]
+        return false unless preset
+
+        preset["deepseek_web_tools"] == true
+      end
     end
   end
 end

data/lib/clacky/search_config.rb

@@ -2,19 +2,25 @@
 
 require "yaml"
 require "fileutils"
+require_relative "deepseek_web_tools"
 
 module Clacky
   # Search provider selection, backed by ~/.clacky/search.yml.
   #
-  # The built-in Parallel/DuckDuckGo/Bing providers need no configuration and
-  # stay the default. Pointing `provider` at a script in ~/.clacky/searchers/ routes
-  # web_search through an API-backed engine instead, which is what users who
-  # want a provider-specific API or policy controls reach for.
+  # The built-in Parallel/DuckDuckGo/Bing chain is the default: it needs no key
+  # and no configuration, so a fresh install searches the web out of the box.
+  # DeepSeek's hosted web tools are opt-in — they render JS-heavy pages to
+  # Markdown but bill per call, so they only run once the user picks them.
   #
   # search.yml schema:
-  #   provider: tavily     — basename of a script in ~/.clacky/searchers/;
-  #                          blank or missing means built-in engines only
-  #   key: tvly-xxx        — credential handed to that script via env
+  #   provider: tavily     — "deepseek_web" for DeepSeek's hosted
+  #                          search/fetch, blank for built-in engines only,
+  #                          otherwise the basename of a script in ~/.clacky/searchers/
+  #   key: tvly-xxx        — credential for the selected provider (optional for
+  #                          deepseek_web, which can reuse a configured model key)
+  #
+  # A missing file, or one without a `provider` key, means "never chosen" and
+  # resolves to the free chain.
   #
   # The directory is the registry: dropping my_engine.rb into
   # ~/.clacky/searchers/ and setting `provider: my_engine` is all it takes,
@@ -22,21 +28,49 @@ module Clacky
   module SearchConfig
     CONFIG_PATH = File.expand_path("~/.clacky/search.yml").freeze
 
+    # Hosted DeepSeek search + page fetch, billed per successful call upstream.
+    # It behaves like a provider but ships with the gem, so it has no script.
+    DEEPSEEK_WEB = "deepseek_web"
+
     class << self
       # @return [Hash] { "provider" => String, "key" => String }
       def load
         raw = File.exist?(CONFIG_PATH) ? YAML.load_file(CONFIG_PATH) : nil
-        return { "provider" => "", "key" => "" } unless raw.is_a?(Hash)
+        return default_config unless raw.is_a?(Hash)
 
-        { "provider" => raw["provider"].to_s.strip, "key" => raw["key"].to_s.strip }
+        {
+          "provider" => raw["provider"].to_s.strip,
+          "key" => raw["key"].to_s.strip
+        }
       rescue StandardError
-        { "provider" => "", "key" => "" }
+        default_config
       end
 
-      def save(provider:, key:)
+      def save(provider: nil, key: nil)
+        current = load
+        new_provider = provider.nil? ? current["provider"] : provider.to_s.strip
+        new_key = key.nil? ? current["key"] : key.to_s.strip
+
+        payload = {
+          "provider" => new_provider,
+          "key" => new_key
+        }
+
         FileUtils.mkdir_p(File.dirname(CONFIG_PATH))
-        File.write(CONFIG_PATH, { "provider" => provider.to_s.strip, "key" => key.to_s.strip }.to_yaml)
+        File.write(CONFIG_PATH, payload.to_yaml)
         File.chmod(0o600, CONFIG_PATH)
+
+        # A new provider or key invalidates an earlier failure, so the next
+        # search retries DeepSeek instead of sitting out the cooldown.
+        Clacky::DeepSeekWebTools.reset_cooldown!
+      end
+
+      def deepseek_web?
+        load["provider"] == DEEPSEEK_WEB
+      end
+
+      private def default_config
+        { "provider" => "", "key" => "" }
       end
 
       # Absolute path of the configured searcher, or nil when unset/missing.
@@ -44,7 +78,7 @@ module Clacky
       # web_search silently falls back instead of erroring on every search.
       def script_path
         name = load["provider"]
-        return nil if name.empty?
+        return nil if name.empty? || name == DEEPSEEK_WEB
 
         Clacky::Utils::SearcherManager.path_for(name)
       end

data/lib/clacky/server/browser_manager.rb

@@ -19,6 +19,7 @@ module Clacky
   #   enabled: true/false   — whether the browser tool is active
   #   chrome_version: "146" — detected Chrome version (set by browser-setup skill)
   #   configured_at: date   — when setup was last run
+  #   screenshot_max_base64_bytes: Integer — screenshot size ceiling (settings UI)
   #
   # Liveness check strategy:
   #   process_alive? sends an MCP `ping` (standard in MCP spec 2024-11-05) and
@@ -116,27 +117,49 @@ module Clacky
       enabled = cfg["enabled"] == true
       running = @process && @process[:wait_thr]&.alive?
       {
-        enabled:        enabled,
-        daemon_running: !!running,
-        chrome_version: cfg["chrome_version"]
+        enabled:                     enabled,
+        daemon_running:              !!running,
+        chrome_version:              cfg["chrome_version"],
+        screenshot_max_base64_bytes: effective_screenshot_limit(cfg)
       }
     end
 
     # Write browser.yml with the given config and reload the daemon.
     # Called by HttpServer POST /api/browser/configure.
+    # Existing keys are preserved so re-running browser-setup does not wipe
+    # user preferences such as the screenshot limits.
     # @param chrome_version [String] detected Chrome major version
     def configure(chrome_version:)
-      cfg = {
+      cfg = load_config.merge(
         "enabled"        => true,
         "browser"        => "chrome",
         "chrome_version" => chrome_version.to_s,
         "configured_at"  => Date.today.to_s
-      }
+      )
       FileUtils.mkdir_p(File.dirname(BROWSER_CONFIG_PATH))
       File.write(BROWSER_CONFIG_PATH, cfg.to_yaml)
       reload
     end
 
+    # Persist the screenshot preferences written by the settings UI.
+    # No daemon reload: the browser tool re-reads browser.yml on every screenshot.
+    # @param max_base64_bytes [Integer, nil] screenshot size ceiling in bytes
+    # @return [Hash] the effective settings after the update
+    def update_screenshot_settings(max_base64_bytes: nil)
+      raise "Browser not configured. Run /browser-setup first." unless File.exist?(BROWSER_CONFIG_PATH)
+
+      if !max_base64_bytes.nil? && !(max_base64_bytes.is_a?(Integer) && max_base64_bytes.positive?)
+        raise ArgumentError, "screenshot_max_base64_bytes must be a positive integer"
+      end
+
+      cfg = load_config
+      cfg["screenshot_max_base64_bytes"] = max_base64_bytes unless max_base64_bytes.nil?
+
+      File.write(BROWSER_CONFIG_PATH, cfg.to_yaml)
+      @config = cfg
+      { screenshot_max_base64_bytes: effective_screenshot_limit(cfg) }
+    end
+
     # Toggle the browser tool on/off by flipping `enabled` in browser.yml.
     # Raises if browser.yml doesn't exist (not yet set up).
     # @return [Boolean] new enabled state
@@ -224,6 +247,13 @@ module Clacky
       {}
     end
 
+    private def effective_screenshot_limit(cfg)
+      limit = cfg["screenshot_max_base64_bytes"]
+      return limit if limit.is_a?(Integer) && limit.positive?
+
+      Clacky::Tools::Browser::SCREENSHOT_MAX_BASE64_BYTES
+    end
+
     # Must be called inside @mutex
     def ensure_process!
       return if process_alive?

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

@@ -152,7 +152,7 @@ module Clacky
         # receive_id for outbound messages), so we extract the chat portion.
         prefix = "#{platform}:"
         ids = []
-        @registry.list.each do |summary|
+        @registry.list(archived: nil).each do |summary|
           @registry.with_session(summary[:id]) do |s|
             (s[:channel_keys] || []).each do |key|
               next unless key.start_with?(prefix)
@@ -463,7 +463,7 @@ module Clacky
         when "/unbind"
           unbound = false
           cleared_agents = []
-          @registry.list.each do |summary|
+          @registry.list(archived: nil).each do |summary|
             @registry.with_session(summary[:id]) do |s|
               # Set#delete always returns self — use delete? so an unknown key
               # reports "No binding found." instead of a false "Unbound.".
@@ -726,7 +726,7 @@ module Clacky
         # /bind and /unbind keep agent.channel_info strictly in sync with channel_keys
         # (see handle_bind / handle_unbind), so the two sources never disagree on the
         # same key for two different sessions — a single pass is sufficient.
-        @registry.list.each do |summary|
+        @registry.list(archived: nil).each do |summary|
           found = nil
           @registry.with_session(summary[:id]) { |s| found = s[:channel_keys]&.include?(key) }
           return summary[:id] if found
@@ -814,7 +814,7 @@ module Clacky
       # The on-disk summary is authoritative here, so sessions evicted from
       # memory are cleaned too — which is exactly the case /bind used to miss.
       def clear_channel_info_for_key(key, keep_session_id: nil)
-        @registry.list(limit: nil).each do |summary|
+        @registry.list(limit: nil, archived: nil).each do |summary|
           next if summary[:id] == keep_session_id
 
           info = summary[:channel_info]
@@ -839,7 +839,7 @@ module Clacky
       end
 
       def bind_key_to_session(key, session_id)
-        @registry.list.each do |summary|
+        @registry.list(archived: nil).each do |summary|
           @registry.with_session(summary[:id]) { |s| s[:channel_keys]&.delete(key) }
         end
         @registry.with_session(session_id) do |s|
@@ -932,7 +932,7 @@ module Clacky
       def restore_channel_bindings
         bound_keys = Set.new
         restored_count = 0
-        @registry.list(limit: nil).each do |summary|
+        @registry.list(limit: nil, archived: nil).each do |summary|
           info = summary[:channel_info]
           next unless info.is_a?(Hash) && info[:platform] && info[:user_id] && info[:chat_id]
 

data/lib/clacky/server/discover.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require "tmpdir"
+require_relative "pid_files"
 require "socket"
 
 module Clacky
   module Server
     # Discover locally-running Clacky server(s) by scanning PID files
-    # written by Master at /tmp/clacky-master-<port>.pid.
+    # written by Master in the configured PID directory.
     #
     # Used by the CLI (bare `clacky agent` mode) to auto-detect a sibling
     # server process, so skills that call back into the server (channels,
@@ -17,7 +17,6 @@ module Clacky
     # Does NOT probe the TCP port (avoids false positives from stale files
     # but also avoids noisy connection attempts).
     module Discover
-      PID_FILE_GLOB = File.join(Dir.tmpdir, "clacky-master-*.pid").freeze
       PID_FILE_REGEX = /clacky-master-(\d+)\.pid\z/.freeze
 
       module_function
@@ -41,7 +40,9 @@ module Clacky
       #
       # @return [Array<Hash>] sorted by port ascending
       def find_all_local
-        Dir.glob(PID_FILE_GLOB).filter_map do |path|
+        directory = PidFiles.directory
+        Dir.glob("clacky-master-*.pid", base: directory).filter_map do |filename|
+          path = File.join(directory, filename)
           m = path.match(PID_FILE_REGEX)
           next nil unless m