openclacky 1.5.20 → 1.5.22

data/lib/clacky/providers.rb

@@ -36,7 +36,7 @@ module Clacky
         "default_model" => "auto",
         "models" => [
           "auto",
-          "dsk-deepseek-flash",
+          "dsk-deepseek-v4.1-flash",
           "dsk-deepseek-v4-pro",
           "oc-glm-5.3",
           "oc-kimi-k3",
@@ -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,11 +145,14 @@ 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,
-          "oc-glm-5.3"          => { "vision" => false }.freeze
+          "dsk-deepseek-v4.1-flash" => { "vision" => true }.freeze,
+          # Legacy alias still sent by sessions created before the rename.
+          "dsk-deepseek-flash"      => { "vision" => true }.freeze,
+          "dsk-deepseek-v4-pro"     => { "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
@@ -166,7 +168,7 @@ module Clacky
         # themselves, so they're intentionally not listed here as keys —
         # no injection happens when the default model is already lite-class.
         "lite_models" => {
-          "auto"                 => "dsk-deepseek-flash",
+          "auto"                 => "dsk-deepseek-v4.1-flash",
           "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",
@@ -180,7 +182,7 @@ module Clacky
           "abs-gpt-6-sol"         => "abs-gpt-6-luna",
           "abs-gpt-5.6-sol"       => "abs-gpt-5.6-luna",
           "abs-gpt-5.6-terra"     => "abs-gpt-5.6-luna",
-          "dsk-deepseek-v4-pro"   => "dsk-deepseek-flash",
+          "dsk-deepseek-v4-pro"   => "dsk-deepseek-v4.1-flash",
           "or-gemini-3-1-pro"     => "or-gemini-3-8-flash"
         },
         # Fallback chain: if a model is unavailable, try the next one in order.
@@ -199,6 +201,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,
 
@@ -212,7 +215,7 @@ module Clacky
         "base_url" => "https://api.deepseek.com",
         "api" => "openai-completions",
         "default_model" => "deepseek-v4-pro",
-        "lite_model" => "deepseek-flash",
+        "lite_model" => "deepseek-v4.1-flash",
         # Note: deepseek-chat and deepseek-reasoner are legacy aliases being
         # deprecated on 2026-07-24; they map to V4.1 Flash's non-thinking and
         # thinking modes respectively.
@@ -220,15 +223,23 @@ module Clacky
         # longer offered upstream, so they are out of this list: only their
         # pricing entries remain, to let already-billed history resolve.
         "models" => [
-          "deepseek-flash",
+          "deepseek-v4.1-flash",
           "deepseek-v4-pro",
         ],
         # DeepSeek V4 API is text-only across all models, except V4.1 Flash
-        # (deepseek-flash), which is natively multimodal.
+        # (deepseek-v4.1-flash), which is natively multimodal.
         "capabilities" => { "vision" => false }.freeze,
         "model_capabilities" => {
-          "deepseek-flash" => { "vision" => true }.freeze
+          "deepseek-v4.1-flash" => { "vision" => true }.freeze,
+          # Legacy id kept for configs saved before the rename.
+          "deepseek-flash"     => { "vision" => true }.freeze
+        }.freeze,
+        # The upstream API still exposes V4.1 Flash as "deepseek-flash"; the
+        # picker shows the generation name.
+        "api_model_aliases" => {
+          "deepseek-v4.1-flash" => "deepseek-flash"
         }.freeze,
+        "deepseek_web_tools" => true,
         "website_url" => "https://platform.deepseek.com/api_keys"
       }.freeze,
 
@@ -269,8 +280,8 @@ module Clacky
         "name" => "Kimi (Moonshot)",
         "base_url" => "https://api.moonshot.cn/v1",
         "api" => "openai-completions",
-        "default_model" => "kimi-k3",
-        "models" => ["kimi-k3", "kimi-k2.7-code", "kimi-k2.7-code-highspeed", "kimi-k2.6"],
+        "default_model" => "kimi-k3.1-pro",
+        "models" => ["kimi-k3.1-pro", "kimi-k3.1-pro-highspeed", "kimi-k3", "kimi-k2.7-code", "kimi-k2.7-code-highspeed", "kimi-k2.6"],
         # Moonshot operates two regional endpoints with identical APIs & model
         # lineup — mainland China (.cn) and international (.ai). These are the
         # pay-as-you-go Open Platform endpoints; the subscription-billed
@@ -286,7 +297,7 @@ module Clacky
           { "label" => "Mainland China", "label_key" => "settings.models.baseurl.variant.mainland_cn",   "base_url" => "https://api.moonshot.cn/v1", "region" => "cn"   }.freeze,
           { "label" => "International",  "label_key" => "settings.models.baseurl.variant.international", "base_url" => "https://api.moonshot.ai/v1", "region" => "intl" }.freeze
         ].freeze,
-        # k3 / k2.7-code / k2.6 are multimodal; legacy k2 text-only models need model_capabilities override if added.
+        # k3.1-pro / k3 / k2.7-code / k2.6 are multimodal; legacy k2 text-only models need model_capabilities override if added.
         "capabilities" => { "vision" => true }.freeze,
         "default_ocr_model" => "kimi-k3",
         "website_url" => "https://platform.moonshot.cn/console/api-keys"
@@ -334,8 +345,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 +356,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,
 
@@ -573,17 +583,20 @@ module Clacky
           "doubao-seed-evolving",
           "doubao-seed-2.1-pro",
           "doubao-seed-2.1-turbo",
+          "doubao-seed-2.1-lite",
           "doubao-seed-2.0-mini",
-          "doubao-seed-2.0-lite",
           "minimax-m3",
-          "kimi-k2.7-code",
+          "kimi-k3.1-pro",
           "kimi-k3",
+          "kimi-k2.7-code",
           # GLM-5.2 is delisted from Ark on 2026-08-31, so new setups only
           # offer GLM-5.3. It is available on the Coding/Agent Plan endpoints;
           # the pay-as-you-go endpoint does not carry it yet (no versioned id),
           # so no payg alias is registered for it.
           "glm-5.3",
           "glm-5.3-flash",
+          "deepseek-v4.1-flash",
+          "deepseek-v4.1-flash-economy",
           "deepseek-v4-pro",
           "deepseek-v4-flash"
         ],
@@ -604,14 +617,21 @@ module Clacky
             "glm-5.2"            => "glm-5-2-260617",
             "deepseek-v4-pro"    => "deepseek-v4-pro-260425",
             "deepseek-v4-flash"  => "deepseek-v4-flash-260425",
+            "deepseek-v4.1-flash"         => "deepseek-v4-1-flash-261017",
+            "deepseek-v4.1-flash-economy" => "deepseek-v4-1-flash-economy-261017",
+            "kimi-k3.1-pro"         => "kimi-k3-1-pro-261024",
             "doubao-seed-2.1-pro"   => "doubao-seed-2-1-pro-260628",
             "doubao-seed-2.1-turbo" => "doubao-seed-2-1-turbo-260628",
+            "doubao-seed-2.1-lite"  => "doubao-seed-2-1-lite-260915",
             "doubao-seed-2.0-mini"  => "doubao-seed-2-0-mini-260428",
+            # doubao-seed-2.0-lite is delisted in favor of 2.1-lite; the alias
+            # stays so existing configs keep working.
             "doubao-seed-2.0-lite"  => "doubao-seed-2-0-lite-260428"
           }.freeze
         }.freeze,
         # Most Doubao/multimodal models accept image input; GLM-5.2/5.3 and
-        # DeepSeek-V4 on Ark are text-only. GLM-5.3-Flash inherits vision=true.
+        # DeepSeek-V4 on Ark are text-only. GLM-5.3-Flash and DeepSeek-V4.1
+        # (incl. economy) inherit vision=true.
         "capabilities" => { "vision" => true }.freeze,
         "model_capabilities" => {
           "glm-5.3"           => { "vision" => false }.freeze,
@@ -620,7 +640,7 @@ module Clacky
           "deepseek-v4-flash" => { "vision" => false }.freeze,
           "minimax-m2.7"      => { "vision" => false }.freeze
         }.freeze,
-        "default_ocr_model" => "doubao-seed-2.0-lite",
+        "default_ocr_model" => "doubao-seed-2.1-lite",
         "website_url" => "https://console.volcengine.com/ark/region:cn-beijing/overview"
       }.freeze,
 
@@ -642,7 +662,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 +683,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"
@@ -1084,6 +1102,10 @@ module Clacky
       # Plan endpoints accept the short "doubao-seed-2.1-pro"). Users always see
       # and pick the short name; this swaps it just before the request goes out.
       #
+      # The map comes in two shapes:
+      #   - grouped by endpoint variant: { "payg" => { short => real } }
+      #   - flat, endpoint-independent:  { short => real }   (e.g. DeepSeek)
+      #
       # Returns the original model unchanged when no alias applies (unknown
       # provider, endpoint without an alias group, or model not in the map).
       #
@@ -1101,6 +1123,9 @@ module Clacky
         aliases = preset && preset["api_model_aliases"]
         return model unless aliases.is_a?(Hash)
 
+        flat = aliases[model.to_s]
+        return flat if flat.is_a?(String)
+
         group = alias_group_for_base_url(preset, base_url)
         return model unless group
 
@@ -1173,6 +1198,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,26 @@
 
 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/
+  #   keys:                — credentials per provider, so switching providers never
+  #     tavily: tvly-xxx       hands one provider's key to another (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 +29,65 @@ 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 }
+      # @return [Hash] { "provider" => String, "keys" => { provider => 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
+        keys = {}
+        (raw["keys"].is_a?(Hash) ? raw["keys"] : {}).each do |name, value|
+          value = value.to_s.strip
+          keys[name.to_s] = value unless value.empty?
+        end
+        # Files written before keys were split hold one key for the provider then selected.
+        legacy = raw["key"].to_s.strip
+        keys[provider] ||= legacy unless provider.empty? || legacy.empty?
 
-        { "provider" => raw["provider"].to_s.strip, "key" => raw["key"].to_s.strip }
+        { "provider" => provider, "keys" => keys }
       rescue StandardError
-        { "provider" => "", "key" => "" }
+        default_config
       end
 
-      def save(provider:, key:)
+      # The key is stored under the resulting provider; a blank key removes it.
+      def save(provider: nil, key: nil)
+        current = load
+        new_provider = provider.nil? ? current["provider"] : provider.to_s.strip
+        keys = current["keys"]
+        unless key.nil? || new_provider.empty?
+          key = key.to_s.strip
+          if key.empty?
+            keys.delete(new_provider)
+          else
+            keys[new_provider] = key
+          end
+        end
+
+        payload = {
+          "provider" => new_provider,
+          "keys" => keys
+        }
+
         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" => "", "keys" => {} }
       end
 
       # Absolute path of the configured searcher, or nil when unset/missing.
@@ -44,13 +95,18 @@ 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
 
       def key
-        load["key"]
+        config = load
+        config["keys"][config["provider"]].to_s
+      end
+
+      def key_for(provider)
+        load["keys"][provider.to_s].to_s
       end
     end
   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