openclacky 1.2.5 → 1.2.7

data/lib/clacky/tools/browser.rb

@@ -35,7 +35,7 @@ module Clacky
         Workflow: open → snapshot(interactive:true) → act(ref=...). New tab from `open` is auto-selected; only use `focus` to switch back to a previously-opened tab.
         snapshot: returns hierarchical a11y tree truncated to ~8KB. Use query="text" to seek, or offset=N to page.
         act kinds: click | dblclick | type | fill | press | hover | scroll | drag | select | wait | evaluate | click_at
-        evaluate: `js` is a function body, e.g. `return document.title` or `const x=...; return x;` — result is JSON-encoded.
+        evaluate: `js` is a JS expression, e.g. "document.title". For multi-line / async logic use an IIFE: "(async () => { const r = await fetch(...); return r.status })()". Result is JSON-encoded.
         screenshot: expensive — pass `ref` to capture one element instead of the whole page.
       DESC
       self.tool_category = "web"
@@ -58,7 +58,7 @@ module Clacky
           amount:      { type: "integer", description: "act scroll pixels (default 300)" },
           ms:          { type: "integer", description: "act wait ms" },
           selector:    { type: "string",  description: "act wait: text or CSS selector" },
-          js:          { type: "string",  description: "act evaluate: JS function body (use return)" },
+          js:          { type: "string",  description: "act evaluate: JS expression (use IIFE for multi-line/async)" },
           target_ref:  { type: "string",  description: "act drag destination ref" },
           values:      { type: "array",   items: { type: "string" }, description: "act select options" },
           x:           { type: "number",  description: "click_at x px" },
@@ -264,7 +264,7 @@ module Clacky
           url = require_url(opts)
           return url if url.is_a?(Hash)
           invalidate_page_cache!
-          mcp_call("navigate_page", { type: "url", url: url })
+          mcp_call("navigate_page", with_page({ type: "url", url: url }))
           wait_for_page_ready
           { action: "navigate", success: true, profile: "user", url: url, output: "Navigated to: #{url}" }
 
@@ -385,19 +385,10 @@ module Clacky
         pid ? args.merge(pageId: pid) : args
       end
 
-      # Wrap user-supplied JS as a Chrome-DevTools-MCP `function` argument.
-      # We treat `js` as a function body so users can write `const x = ...; return x;`
-      # naturally. For pure expressions ("document.title"), we auto-prepend `return`
-      # so the result still flows back. Detection is conservative — the presence of
-      # `return` or any top-level statement keyword skips the auto-return.
       private def build_evaluate_function(js)
         body = js.to_s.strip
         return "() => {}" if body.empty?
-
-        looks_like_statement = body.match?(/(^|[\s;{])(return|const|let|var|if|for|while|throw|try|switch|function|class|do|await|async)\b/) ||
-                               body.include?(";")
-        body = "return (#{body})" unless looks_like_statement
-        "() => { #{body} }"
+        "() => (#{body})"
       end
 
       SCREENSHOT_MAX_WIDTH        = 800

data/lib/clacky/tools/terminal.rb

@@ -340,12 +340,6 @@ module Clacky
           project_root: cwd || Dir.pwd
         )
 
-        # WSL interop fix: Windows .exe processes inherit the PTY's stdin fd
-        # and attempt to use it as a Windows Console, causing them to hang
-        # indefinitely. Redirect stdin from /dev/null for any .exe invocation
-        # that doesn't already have an explicit stdin redirect.
-        safe_command = redirect_exe_stdin(safe_command)
-
         # PowerShell 5 on Chinese Windows emits CP936/GBK by default; force
         # UTF-8 so our PTY (which decodes as UTF-8) doesn't see ??? bytes.
         safe_command = force_powershell_utf8(safe_command)
@@ -988,10 +982,31 @@ module Clacky
         # exit codes are also swallowed so the *user* command's $? is what
         # lands in `__clacky_ec`.
         hooks_line = with_hooks ? hooks_prefix_for(session) : ""
-        line   = %Q|#{hooks_line}{ #{command}\n}; __clacky_ec=$?; printf "\n__CLACKY_DONE_#{token}_%s__\n" "$__clacky_ec"\n|
+        # WSL interop fix: Windows .exe processes inherit the PTY slave fd
+        # as their stdin and treat it like a Windows Console — they sit
+        # there waiting for input nobody will ever send, hanging the whole
+        # session. Wrapping the user command's group with `</dev/null` gives
+        # every process inside it (including .exe interop children) an
+        # immediate EOF on stdin, so they exit cleanly.
+        #
+        # We only do this on WSL when the command actually mentions `.exe`,
+        # so Linux interactive commands like `read -p` / `python` REPL on
+        # non-WSL hosts (and on WSL when not invoking Windows binaries)
+        # keep their PTY stdin and continue to behave as before.
+        stdin_redirect = exe_needs_stdin_isolation?(command) ? " </dev/null" : ""
+        line   = %Q|#{hooks_line}{ #{command}\n}#{stdin_redirect}; __clacky_ec=$?; printf "\n__CLACKY_DONE_#{token}_%s__\n" "$__clacky_ec"\n|
         session.mutex.synchronize { session.writer.write(line) }
       end
 
+      # True when the command should run with stdin redirected from
+      # /dev/null. Currently only triggers on WSL when the command string
+      # mentions a Windows `.exe` binary — see write_user_command for the
+      # full rationale.
+      private def exe_needs_stdin_isolation?(command)
+        return false unless Clacky::Utils::EnvironmentDetector.wsl?
+        command.to_s =~ /\.exe\b/i ? true : false
+      end
+
       # Build the "run hooks" prefix line. Empty string for shells where
       # we don't know how to introspect hook registries.
       private def hooks_prefix_for(session)
@@ -1508,31 +1523,12 @@ module Clacky
         lines.last(DISPLAY_TAIL_LINES).join("\n")
       end
 
-      # WSL interop fix: Windows .exe processes inherit the PTY stdin fd
-      # and try to use it as a Windows Console, which hangs indefinitely.
-      # Detect .exe invocations and redirect stdin from /dev/null unless
-      # the command already has an explicit stdin redirect.
-      private def redirect_exe_stdin(command)
-        return command unless command =~ /\.exe\b/i
-        return command if command =~ /<\s*[^\s|&;]/
-
-        # If the command has a shell-level pipe, insert </dev/null before
-        # the first pipe so only the .exe segment gets its stdin redirected,
-        # rather than starving a downstream pipe reader (e.g. `tr`, `grep`).
-        if command =~ /\|/
-          command.sub(/\s*\|/, ' </dev/null |')
-        else
-          "#{command} </dev/null"
-        end
-      end
-
       # PowerShell 5 on Chinese Windows defaults [Console]::OutputEncoding
       # to CP936/GBK; our PTY decodes as UTF-8 so non-ASCII output becomes
       # `???`. Inject UTF-8 setup into the user's PowerShell command so the
       # shell emits UTF-8 bytes regardless of host locale.
       POWERSHELL_PREAMBLE =
-        "[Console]::OutputEncoding=[Text.Encoding]::UTF8;" \
-        "$OutputEncoding=[Text.Encoding]::UTF8;"
+        "[Console]::OutputEncoding=[Text.Encoding]::UTF8;"
 
       # Only rewrites simple `powershell[.exe]` / `pwsh[.exe]` invocations.
       # Skips -File / -EncodedCommand / commands already handling encoding /

data/lib/clacky/ui2/ui_controller.rb

@@ -861,7 +861,7 @@ module Clacky
 
       # Show error message
       # @param message [String] Error message
-      def show_error(message)
+      def show_error(message, code: nil, top_up_url: nil)
         output = @renderer.render_error(message)
         append_output(output)
       end

data/lib/clacky/ui_interface.rb

@@ -26,7 +26,7 @@ module Clacky
     # === Status messages ===
     def show_info(message, prefix_newline: true); end
     def show_warning(message); end
-    def show_error(message); end
+    def show_error(message, code: nil, top_up_url: nil); end
     def show_success(message); end
     def log(message, level: :info); end
 

data/lib/clacky/utils/file_processor.rb

@@ -43,10 +43,12 @@ module Clacky
       .mp3 .mp4 .avi .mov .mkv .wav .flac
       .ttf .otf .woff .woff2
       .db .sqlite .bin .dat
+      .wps .et .dps
     ].freeze
 
     GLOB_ALLOWED_BINARY_EXTENSIONS = %w[
       .pdf .doc .docx .ppt .pptx .xls .xlsx .odt .odp .ods
+      .wps .et .dps
     ].freeze
 
     LLM_BINARY_EXTENSIONS = %w[.png .jpg .jpeg .gif .webp .pdf].freeze
@@ -64,6 +66,7 @@ module Clacky
       ".docx" => :document,  ".doc"  => :document,
       ".xlsx" => :spreadsheet, ".xls" => :spreadsheet,
       ".pptx" => :presentation, ".ppt" => :presentation,
+      ".wps"  => :document, ".et"  => :spreadsheet, ".dps" => :presentation,
       ".pdf"  => :pdf,
       ".zip"  => :zip, ".gz" => :zip, ".tgz" => :zip, ".tar" => :zip, ".rar" => :zip, ".7z" => :zip,
       ".png"  => :image, ".jpg" => :image, ".jpeg" => :image,

data/lib/clacky/utils/parser_manager.rb

@@ -30,6 +30,9 @@ module Clacky
         ".xls"  => "xlsx_parser.rb",
         ".pptx" => "pptx_parser.rb",
         ".ppt"  => "pptx_parser.rb",
+        ".wps"  => "wps_parser.rb",
+        ".et"   => "wps_parser.rb",
+        ".dps"  => "wps_parser.rb",
       }.freeze
 
       # Ensure ~/.clacky/parsers/ exists and all default parsers are present.

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "1.2.5"
+  VERSION = "1.2.7"
 end