openclacky 1.5.13 → 1.5.15

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

@@ -272,7 +272,7 @@ module Clacky
         end
 
         # Handle built-in commands
-        if text&.match?(KNOWN_COMMAND) || text&.match?(/\A([\?h]|help)\z/i)
+        if text&.match?(KNOWN_COMMAND)
           handle_command(adapter, event, text)
           return
         end
@@ -294,6 +294,18 @@ module Clacky
         sub_count = web_ui_for_session_diag(session_id)
         Clacky::Logger.info("[ChannelManager] Routing to session #{session_id[0, 8]} (status=#{session[:status]}, text=#{text.inspect}, channel_subs=#{sub_count})")
 
+        if session[:status] == :running && %w[queue steer].include?(@registry.agent_config_input_behavior)
+          queued = false
+          @registry.with_session(session_id) do |s|
+            if s[:status] == :running
+              s[:agent].enqueue_input(build_prompt_with_context(event, text), delivery: @registry.agent_config_input_behavior.to_sym, files: files,
+                                      display_text: text, source: :channel, created_at: Time.now.to_f)
+              queued = true
+            end
+          end
+          return if queued
+        end
+
         # If session is running, interrupt it AND wait for the old thread to
         # actually unwind before starting a new task. Without the join, two
         # threads briefly race on the same agent/history and the old thread
@@ -301,7 +313,7 @@ module Clacky
         # ships to the LLM with no matching tool result — DeepSeek (strict
         # OpenAI-compat) rejects this with HTTP 400 "insufficient tool
         # messages following tool_calls message". CLI already waits via
-        # join(2); we do the same here so all entrypoints behave alike.
+        # join(2); if shutdown is slow, retain the input instead of overlapping work.
         if session[:status] == :running
           Clacky::Logger.info("[ChannelManager] Session busy, interrupting previous task")
           old_thread = nil
@@ -310,7 +322,10 @@ module Clacky
           if old_thread&.alive?
             old_thread.join(2)
             if old_thread.alive?
-              Clacky::Logger.warn("[ChannelManager] previous task did not finish within 2s; continuing anyway (watchdog will escalate)")
+              session[:agent].enqueue_input(build_prompt_with_context(event, text), files: files,
+                                             display_text: text, source: :channel, created_at: Time.now.to_f)
+              adapter.send_text(event[:chat_id], "The current task is still stopping. Your message remains queued.")
+              return
             end
           end
         end
@@ -366,7 +381,7 @@ module Clacky
         key     = channel_key(event)
 
         case text
-        when /\A([\?h]|help)\z/i
+        when %r{\A/([?？]|h|help)\z}i
           adapter.send_text(chat_id, COMMAND_HELP)
 
         when "/new", "/clear"
@@ -506,15 +521,18 @@ module Clacky
           list_sessions(adapter, chat_id)
 
         else
-          adapter.send_text(chat_id, "Unknown command. Type ? for help.")
+          adapter.send_text(chat_id, "Unknown command. Type /? for help.")
         end
       end
 
-      KNOWN_COMMAND = %r{\A/(new|clear|model|skills|bind|stop|unbind|status|list)\b}i
+      # "/?" is anchored with \z instead of \b because \b never matches after
+      # "?" (not a word character), which would let "/?extra" through.
+      # "？" is accepted too since Chinese IMEs produce the full-width form.
+      KNOWN_COMMAND = %r{\A/(?:[?？]\z|(?:h|help|new|clear|model|skills|bind|stop|unbind|status|list)\b)}i
 
       COMMAND_HELP = <<~HELP.strip
         Commands:
-          ? / h / help - show this help
+          /? / /h / /help - show this help
           /new / /clear - start a new session
           /model - show current model, cards & quick-switch list
           /model <n> - switch card by number

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

@@ -111,7 +111,7 @@ module Clacky
         end
       end
 
-      def show_tool_result(result)
+      def show_tool_result(result, ui: nil)
         # Suppress — too noisy for IM
       end
 

data/lib/clacky/server/dir_picker.rb

@@ -12,15 +12,18 @@ module Clacky
       # Translated client-side via `id`. On WSL every favorite targets the
       # Windows profile (/mnt/<drive>/Users/<name>/...) so they match where a
       # Windows browser actually saves files; elsewhere they stay under Dir.home.
+      # The Windows shell folders win over the guessed profile when available —
+      # they are the folders the user actually sees in Explorer.
       private def dir_picker_places
         home = Dir.home
-        win_home = wsl_windows_home
+        folders = wsl_shell_folders
+        win_home = folders["profile"] || wsl_windows_home
         places = []
 
         [["home", win_home || home],
-         ["desktop",   File.join(win_home || home, "Desktop")],
-         ["downloads", File.join(win_home || home, "Downloads")],
-         ["documents", File.join(win_home || home, "Documents")]].each do |id, path|
+         ["desktop",   folders["desktop"]   || File.join(win_home || home, "Desktop")],
+         ["downloads", folders["downloads"] || File.join(win_home || home, "Downloads")],
+         ["documents", folders["documents"] || File.join(win_home || home, "Documents")]].each do |id, path|
           places << { id: id, path: path, kind: "favorite" } if Dir.exist?(path)
         end
 
@@ -28,6 +31,66 @@ module Clacky
         places
       end
 
+      # Windows "shell folders" — the profile plus Desktop/Documents/Downloads —
+      # are routinely redirected away from C:\Users\<name>: OneDrive's "back up
+      # folders", Huawei PC Manager's file migration (which moves a profile to
+      # D:\HuaweiMoveData\Users\<name>), group-policy folder redirection. Guessing
+      # "<profile>/Desktop" then lands on the empty leftover shell, so the picker
+      # shows an empty directory while Explorer is full of files. Ask Windows for
+      # the real paths; the profile guess stays as the fallback for every entry.
+      # Cached — the spawn costs 0.5–1.5s and these paths never change while the
+      # process runs.
+      private def wsl_shell_folders
+        return @wsl_shell_folders if defined?(@wsl_shell_folders)
+
+        @wsl_shell_folders = wsl? ? (wsl_shell_folders_from_powershell || {}) : {}
+      end
+
+      # One PowerShell run for all four paths so the picker pays the process
+      # spawn once. Returns nil when interop is unavailable or nothing resolved,
+      # so callers fall back to guessing from the profile.
+      private def wsl_shell_folders_from_powershell
+        script = '$f=[Environment];' \
+                 '$f::GetFolderPath("UserProfile");' \
+                 '$f::GetFolderPath("Desktop");' \
+                 '$f::GetFolderPath("MyDocuments");' \
+                 'try { (New-Object -ComObject Shell.Application).NameSpace("shell:Downloads").Self.Path } catch { "" }'
+        require "open3"
+        out, _err, status = Open3.capture3(
+          "powershell.exe", "-NoProfile", "-NonInteractive", "-Command", script, binmode: true
+        )
+        return nil unless status.success?
+
+        lines = Utils::Encoding.pty_to_utf8(out).split(/\r?\n/)
+        folders = {}
+        %w[profile desktop documents downloads].each_with_index do |key, index|
+          path = wsl_path_of(lines[index])
+          folders[key] = path if path
+        end
+        folders.empty? ? nil : folders
+      rescue StandardError
+        nil
+      end
+
+      # "D:\Users\leo\Desktop" → "/mnt/d/Users/leo/Desktop". wslpath does the
+      # conversion so custom mount roots are honoured. Nil for blank values, UNC
+      # shares (WSL can't reach them) and paths not mounted in this distro.
+      private def wsl_path_of(win_path)
+        value = win_path.to_s.strip
+        return nil unless value.match?(%r{\A[A-Za-z]:[\\/]})
+
+        require "open3"
+        out, _err, status = Open3.capture3("wslpath", "-a", "-u", value, binmode: true)
+        return nil unless status.success?
+
+        linux = Utils::Encoding.pty_to_utf8(out).strip
+        return nil unless linux.start_with?("/") && Dir.exist?(linux)
+
+        linux
+      rescue StandardError
+        nil
+      end
+
       # Drive letters exposed to the picker so Windows users can reach D:/E:/…
       # directly. Under WSL these are the /mnt/<drive> mounts; on native
       # Windows the actual drive letters. Empty on macOS/Linux.

data/lib/clacky/server/git_panel.rb

@@ -2,6 +2,8 @@
 
 require "open3"
 
+require_relative "../utils/encoding"
+
 module Clacky
   module Server
     # Read-mostly git operations scoped to a session's working directory, backing
@@ -14,9 +16,15 @@ module Clacky
 
       # Run a git subcommand in `dir` with argv-style args (no shell). Returns
       # [stdout, stderr, success_bool]. Never raises on git failure.
+      #
+      # `core.quotePath=false` keeps git from octal-escaping non-ASCII paths, so
+      # the parsers below (and the path comparisons in `restore`) see the same
+      # bytes the caller passed in. Output is then normalised to UTF-8 because
+      # git inherits the locale, and under a non-UTF-8 locale the raw bytes come
+      # back tagged US-ASCII, where String#split would raise on multibyte paths.
       def git(dir, *args)
-        out, err, status = Open3.capture3("git", "-C", dir.to_s, *args)
-        [out, err, status.success?]
+        out, err, status = Open3.capture3("git", "-C", dir.to_s, "-c", "core.quotePath=false", *args)
+        [Utils::Encoding.to_utf8(out), Utils::Encoding.to_utf8(err), status.success?]
       rescue StandardError => e
         ["", e.message, false]
       end