kward 0.76.0 → 0.78.0

data/lib/kward/tools/search/web_fetch.rb

@@ -1,6 +1,7 @@
 require "nokogiri"
 require "uri"
 require_relative "web"
+require_relative "../../http"
 
 # Namespace for the Kward CLI agent runtime.
 module Kward
@@ -9,7 +10,9 @@ module Kward
     DEFAULT_MAX_BYTES = 16 * 1024
     MAX_MAX_BYTES = 128 * 1024
     MAX_REDIRECTS = 5
+    MAX_DOWNLOAD_BYTES = 2 * 1024 * 1024
     HTTP_TIMEOUT_SECONDS = 10
+    MAX_DISCOVERED_LINKS = 50
 
     # Creates a fetcher for web content and raw resources.
     def initialize(http_client: WebSearch::NetHttpClient.new)
@@ -17,7 +20,9 @@ module Kward
     end
 
     # Fetches a URL and extracts readable text for human-facing pages.
-    def fetch_content(args)
+    def fetch_content(args = nil, cancellation: nil, **keyword_args)
+      args ||= keyword_args
+      cancellation&.raise_if_cancelled!
       url = args_value(args, "url").to_s.strip
       return "Error: url is required" if url.empty?
 
@@ -25,58 +30,70 @@ module Kward
       extract = normalize_extract(args_value(args, "extract") || "auto")
       return "Error: extract must be one of: auto, text, markdown" unless extract
 
-      response = fetch_url(url, max_bytes: max_bytes)
+      response = fetch_url(url, max_bytes: MAX_DOWNLOAD_BYTES, cancellation: cancellation)
       return response if response.is_a?(String)
+      return "Error: response exceeds #{MAX_DOWNLOAD_BYTES} byte download limit" if response[:truncated]
 
       body = response[:body].to_s
       content_type = header_value(response[:headers], "content-type")
-      text = extract_readable_text(body, content_type: content_type, mode: extract)
-      text = truncate_bytes(text, max_bytes)
+      text = extract_readable_text(body, content_type: content_type, mode: extract, base_url: response[:url])
+      text, truncated = truncate_bytes(text, max_bytes)
 
       [
         "# Fetched content",
         "- URL: #{response[:url]}",
         "- Content type: #{content_type.empty? ? "unknown" : content_type}",
+        "- Downloaded bytes: #{body.bytesize}",
         "- Bytes returned: #{text.bytesize}",
+        "- Truncated: #{truncated ? "yes" : "no"}",
         "",
         text.empty? ? "(No readable text extracted.)" : text
       ].join("\n")
+    rescue Cancellation::CancelledError
+      raise
     rescue StandardError => e
       "Error: fetch_content failed: #{e.message}"
     end
 
     # Fetches a URL and returns bounded raw response content.
-    def fetch_raw(args)
+    def fetch_raw(args = nil, cancellation: nil, **keyword_args)
+      args ||= keyword_args
+      cancellation&.raise_if_cancelled!
       url = args_value(args, "url").to_s.strip
       return "Error: url is required" if url.empty?
 
       max_bytes = bounded_max_bytes(args_value(args, "max_bytes") || args_value(args, "maxBytes"))
       accept = args_value(args, "accept").to_s.strip
-      response = fetch_url(url, max_bytes: max_bytes, accept: accept.empty? ? "*/*" : accept)
+      response = fetch_url(url, max_bytes: max_bytes, accept: accept.empty? ? "*/*" : accept, cancellation: cancellation)
       return response if response.is_a?(String)
 
-      body = truncate_bytes(response[:body].to_s, max_bytes)
+      body = response[:body].to_s
       content_type = header_value(response[:headers], "content-type")
+      body = "#{body.to_s.scrub}\n... truncated to #{max_bytes} bytes" if response[:truncated]
       [
         "# Fetched raw content",
         "- URL: #{response[:url]}",
         "- Content type: #{content_type.empty? ? "unknown" : content_type}",
-        "- Bytes returned: #{body.bytesize}",
+        "- Bytes returned: #{response[:body].to_s.bytesize}",
+        "- Truncated: #{response[:truncated] ? "yes" : "no"}",
         "",
         body
       ].join("\n")
+    rescue Cancellation::CancelledError
+      raise
     rescue StandardError => e
       "Error: fetch_raw failed: #{e.message}"
     end
 
     private
 
-    def fetch_url(url, max_bytes:, accept: "text/html,application/xhtml+xml,text/plain;q=0.9,*/*;q=0.8")
+    def fetch_url(url, max_bytes:, accept: "text/html,application/xhtml+xml,text/plain;q=0.9,*/*;q=0.8", cancellation: nil)
       current_url = normalize_url(url)
       redirects = 0
 
       loop do
-        response = @http_client.get(current_url, headers: browser_headers(accept))
+        cancellation&.raise_if_cancelled!
+        response = @http_client.get(current_url, headers: browser_headers(accept), max_bytes: max_bytes)
         code = response.code.to_i
         headers = response_headers(response)
 
@@ -93,9 +110,7 @@ module Kward
 
         return "Error: fetch failed with HTTP #{response.code}" unless code.between?(200, 299)
 
-        body = response.body.to_s
-        body = truncate_bytes(body, max_bytes)
-        return { url: current_url, headers: headers, body: body }
+        return { url: current_url, headers: headers, body: response.body.to_s, truncated: response.respond_to?(:truncated) && response.truncated }
       end
     end
 
@@ -134,42 +149,121 @@ module Kward
       %w[auto text markdown].include?(normalized) ? normalized : nil
     end
 
-    def extract_readable_text(body, content_type:, mode:)
-      return clean_text(body) if mode == "text" || !html_content?(content_type, body)
+    def extract_readable_text(body, content_type:, mode:, base_url:)
+      return clean_text(body) unless html_content?(content_type, body)
 
       document = Nokogiri::HTML(body)
-      document.css("script, style, noscript, svg, nav, footer, form").remove
-      title = document.at_css("title")&.text.to_s.strip
-      root = document.at_css("article") || document.at_css("main") || document.at_css("body") || document
+      links = discovered_links(document, base_url)
+      document.css("script, style, noscript, template, svg, canvas, nav, footer, #footer, [role='contentinfo'], form, iframe, [hidden], [aria-hidden='true']").remove
+      title = clean_text(document.at_css("title")&.text)
+      root = document.at_css("main") || document.at_css("[role='main']") || document.at_css("article") || document.at_css("body") || document
       parts = []
-      parts << "# #{clean_text(title)}" unless title.empty?
-      root.css("h1, h2, h3, h4, h5, h6, p, li, pre, code, blockquote").each do |node|
-        text = clean_text(node.text)
-        next if text.empty?
-
-        parts << format_html_node(node, text, mode: mode)
-      end
-      parts.uniq.join("\n\n")
+      parts << (mode == "text" ? title : "# #{title}") unless title.empty?
+      parts.concat(readable_blocks(root, mode: mode, base_url: base_url))
+      parts << format_discovered_links(links, mode: mode) unless links.empty?
+      parts.reject(&:empty?).uniq.join("\n\n")
     end
 
     def html_content?(content_type, body)
       content_type.to_s.include?("html") || body.to_s.lstrip.start_with?("<!DOCTYPE html", "<html", "<HTML")
     end
 
-    def format_html_node(node, text, mode:)
-      return text if mode == "text"
+    def readable_blocks(root, mode:, base_url:)
+      selector = "h1, h2, h3, h4, h5, h6, p, ul, ol, pre, blockquote, table, a[href]"
+      root.css(selector).filter_map do |node|
+        next if nested_readable_block?(node)
+
+        format_html_node(node, mode: mode, base_url: base_url)
+      end
+    end
+
+    def nested_readable_block?(node)
+      block_names = %w[p ul ol pre blockquote table]
+      return true if node.ancestors.any? { |ancestor| block_names.include?(ancestor.name) }
+      return false unless node.name == "a"
+
+      node.ancestors.any? { |ancestor| ancestor.name.match?(/\Ah[1-6]\z/) }
+    end
 
+    def format_html_node(node, mode:, base_url:)
       case node.name
       when /^h([1-6])$/
-        "#{"#" * Regexp.last_match(1).to_i} #{text}"
-      when "li"
-        "- #{text}"
-      when "pre", "code"
-        "```\n#{text}\n```"
+        level = Regexp.last_match(1).to_i
+        text = render_inline(node, mode: mode, base_url: base_url)
+        return "" if text.empty?
+
+        mode == "text" ? text : "#{"#" * level} #{text}"
+      when "p"
+        render_inline(node, mode: mode, base_url: base_url)
+      when "a"
+        format_link(node, mode: mode, base_url: base_url)
+      when "ul", "ol"
+        format_list(node, mode: mode, base_url: base_url)
+      when "pre"
+        text = node.text.to_s.strip
+        mode == "text" ? text : "```\n#{text}\n```"
       when "blockquote"
-        "> #{text}"
+        text = render_inline(node, mode: mode, base_url: base_url)
+        mode == "text" ? text : text.lines.map { |line| "> #{line}" }.join
+      when "table"
+        format_table(node, mode: mode, base_url: base_url)
+      end
+    end
+
+    def render_inline(node, mode:, base_url:)
+      text = node.children.map do |child|
+        if child.text?
+          child.text
+        elsif child.name == "a"
+          format_link(child, mode: mode, base_url: base_url)
+        elsif child.name == "code" && mode != "text"
+          "`#{clean_text(child.text)}`"
+        elsif child.name == "br"
+          "\n"
+        else
+          render_inline(child, mode: mode, base_url: base_url)
+        end
+      end.join
+      clean_text(text)
+    end
+
+    def format_link(node, mode:, base_url:)
+      label = clean_text(node.text)
+      href = resolved_link(node["href"], base_url)
+      return label unless href
+
+      label = href if label.empty?
+      mode == "text" ? "#{label} (#{href})" : "[#{label}](#{href})"
+    end
+
+    def format_list(list, mode:, base_url:, depth: 0)
+      ordered = list.name == "ol"
+      list.element_children.select { |child| child.name == "li" }.each_with_index.map do |item, index|
+        nested_lists = item.element_children.select { |child| %w[ul ol].include?(child.name) }
+        copy = item.dup
+        copy.css("ul, ol").remove
+        text = render_inline(copy, mode: mode, base_url: base_url)
+        marker = ordered ? "#{index + 1}." : "-"
+        line = "#{"  " * depth}#{marker} #{text}".rstrip
+        nested = nested_lists.map { |nested_list| format_list(nested_list, mode: mode, base_url: base_url, depth: depth + 1) }
+        ([line] + nested).reject(&:empty?).join("\n")
+      end.join("\n")
+    end
+
+    def format_table(table, mode:, base_url:)
+      rows = table.css("tr").map do |row|
+        row.css("th, td").map { |cell| render_inline(cell, mode: mode, base_url: base_url) }
+      end.reject(&:empty?)
+      return "" if rows.empty?
+
+      width = rows.map(&:length).max
+      rows.each { |row| row.fill("", row.length...width) }
+      if mode == "text"
+        rows.map { |row| row.join(" | ") }.join("\n")
       else
-        text
+        header = rows.first
+        body = rows.drop(1)
+        (["| #{header.join(" | ")} |", "| #{Array.new(width, "---").join(" | ")} |"] + body.map { |row| "| #{row.join(" | ")} |" }).join("\n")
       end
     end
 
@@ -177,17 +271,91 @@ module Kward
       text.to_s.gsub(/\s+/, " ").strip
     end
 
+    def discovered_links(document, base_url)
+      candidates = document.css("a[href]").each_with_index.filter_map do |link, index|
+        href = resolved_link(link["href"], base_url)
+        label = clean_text(link.text)
+        label = clean_text(link["aria-label"] || link["title"]) if label.empty?
+        next if href.nil? || label.empty? || skip_link?(link, label)
+
+        [link_group(link), label, href, index]
+      end
+      priorities = { "Main content" => 0, "Primary navigation" => 1, "Page links" => 2, "Footer" => 3 }
+      candidates.sort_by! { |group, _label, _href, index| [priorities.fetch(group, 4), index] }
+
+      groups = Hash.new { |hash, key| hash[key] = [] }
+      seen = {}
+      candidates.each do |group, label, href, _index|
+        next if seen[href]
+
+        seen[href] = true
+        groups[group] << [label, href]
+      end
+      omitted = [seen.length - MAX_DISCOVERED_LINKS, 0].max
+      allowed = MAX_DISCOVERED_LINKS
+      groups.each_value do |links|
+        links.replace(links.shift(allowed))
+        allowed -= links.length
+      end
+      groups.delete_if { |_group, links| links.empty? }
+      groups["Omitted"] << [omitted.to_s, nil] if omitted.positive?
+      groups
+    end
+
+    def link_group(link)
+      return "Primary navigation" unless link.ancestors("nav").empty?
+      return "Footer" unless link.ancestors("footer, #footer, [role='contentinfo']").empty?
+      return "Main content" unless link.ancestors("main, [role='main']").empty?
+
+      "Page links"
+    end
+
+    def skip_link?(link, label)
+      link["class"].to_s.split.include?("kward-skip-link") || label.match?(/\Askip to (?:content|main)/i)
+    end
+
+    def resolved_link(href, base_url)
+      value = href.to_s.strip
+      return nil if value.empty? || value.start_with?("javascript:", "data:")
+
+      uri = URI.join(base_url, value)
+      return nil unless %w[http https].include?(uri.scheme)
+
+      uri.to_s
+    rescue URI::InvalidURIError
+      nil
+    end
+
+    def format_discovered_links(groups, mode:)
+      omitted = groups.delete("Omitted")&.first&.first.to_i
+      heading = mode == "text" ? "Links" : "## Links"
+      sections = groups.filter_map do |group, links|
+        next if links.empty?
+
+        group_heading = mode == "text" ? group : "### #{group}"
+        entries = links.map do |label, href|
+          mode == "text" ? "- #{label}: #{href}" : "- [#{label}](#{href})"
+        end
+        ([group_heading] + entries).join("\n")
+      end
+      sections << "#{omitted} additional links omitted." if omitted.positive?
+      ([heading] + sections).join("\n\n")
+    end
+
     def truncate_bytes(text, max_bytes)
-      return text if text.bytesize <= max_bytes
+      return [text, false] if text.bytesize <= max_bytes
 
-      "#{text.byteslice(0, max_bytes).to_s.scrub}\n... truncated to #{max_bytes} bytes"
+      marker = "\n... extracted content truncated ..."
+      available = [max_bytes - marker.bytesize, 0].max
+      truncated = text.byteslice(0, available).to_s.scrub.sub(/\n?[^\n]*\z/, "")
+      ["#{truncated}#{marker}", true]
     end
 
     def browser_headers(accept)
       {
         "Accept" => accept,
         "Accept-Language" => "en-US,en;q=0.9",
-        "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"
+        "User-Agent" => Http.user_agent
       }
     end
 

data/lib/kward/tools/tool_call.rb

@@ -67,10 +67,6 @@ module Kward
       TOOL_NAME_MAP[name.to_s]
     end
 
-    def write_lock_required?(name)
-      %w[edit_file write_file run_shell_command edit write bash].include?(name.to_s)
-    end
-
     def file_change_tool?(name)
       %w[edit_file write_file edit write].include?(name.to_s)
     end

data/lib/kward/tools/web_search.rb

@@ -47,7 +47,9 @@ module Kward
 
       # Executes the tool and returns model-facing output text.
       def call(args, _conversation, cancellation: nil)
-        @web_search.search(args)
+        return @web_search.search(args) unless cancellation
+
+        @web_search.search(args, cancellation: cancellation)
       end
     end
   end

data/lib/kward/transcript_export.rb

@@ -1,4 +1,4 @@
-require "cgi"
+require "cgi/escape"
 require_relative "markdown_transcript"
 
 # Namespace for the Kward CLI agent runtime.

data/lib/kward/update_check.rb

@@ -3,6 +3,7 @@ require "json"
 require "net/http"
 require "time"
 require "uri"
+require_relative "http"
 
 # Namespace for the Kward CLI agent runtime.
 module Kward
@@ -102,7 +103,7 @@ module Kward
 
     def fetch_latest_version
       request = Net::HTTP::Get.new(LATEST_VERSION_URL)
-      request["User-Agent"] = "kward/#{Kward::VERSION}"
+      Http.apply_user_agent(request)
       response = Net::HTTP.start(LATEST_VERSION_URL.hostname, LATEST_VERSION_URL.port, use_ssl: true, open_timeout: 2, read_timeout: 2) do |http|
         http.request(request)
       end

data/lib/kward/version.rb

@@ -1,5 +1,5 @@
 # Namespace for the Kward CLI agent runtime.
 module Kward
   # Current gem version.
-  VERSION = "0.76.0"
+  VERSION = "0.78.0"
 end

data/templates/default/kward_navigation.rb

@@ -9,6 +9,7 @@ module KwardDocsNavigationData
         ["Usage", "file.usage.html"],
         ["Configuration", "file.configuration.html"],
         ["Authentication", "file.authentication.html"],
+        ["Security and trust", "file.security.html"],
         ["Troubleshooting", "file.troubleshooting.html"]
       ]
     ],
@@ -16,10 +17,12 @@ module KwardDocsNavigationData
       "Feature guides",
       [
         ["Sessions", "file.session-management.html"],
+        ["Interactive composer", "file.composer.html"],
         ["Tabs", "file.tabs.html"],
         ["Memory", "file.memory.html"],
         ["Personas", "file.personas.html"],
-        ["Skills", "file.skills.html"]
+        ["Skills", "file.skills.html"],
+        ["Pan mode", "file.pan.html"]
       ]
     ],
     [
@@ -39,12 +42,14 @@ module KwardDocsNavigationData
       [
         ["Extensibility", "file.extensibility.html"],
         ["Plugins", "file.plugins.html"],
-        ["Lifecycle hooks", "file.lifecycle-hooks.html"]
+        ["Lifecycle hooks", "file.lifecycle-hooks.html"],
+        ["Permissions", "file.permissions.html"]
       ]
     ],
     [
       "Integrate",
       [
+        ["MCP servers", "file.mcp.html"],
         ["RPC protocol", "file.rpc.html"],
         ["Releasing", "file.releasing.html"]
       ]

data/templates/default/layout/html/layout.erb

@@ -110,7 +110,7 @@
           <article><strong>⌘</strong><h2>Project-aware agent loop</h2><p>Inspect, reason, patch, verify.</p></article>
           <article><strong>▤</strong><h2>Unix filter mode</h2><p>Pipe diffs, logs, and code through Kward.</p></article>
           <article><strong>▰</strong><h2>Branchable sessions</h2><p>Resume, rewind, fork, compact, export.</p></article>
-          <article><strong>›_</strong><h2>Worker pipelines</h2><p>Queue focused agent tasks from the TUI.</p></article>
+          <article><strong>◈</strong><h2>Human-in-the-loop permissions</h2><p>Optionally approve edits, commands, web, and MCP calls.</p></article>
           <article><strong>◎</strong><h2>Live source intelligence</h2><p>Search the web and read public repos.</p></article>
           <article><strong>✣</strong><h2>Ruby-native extensions</h2><p>Shape Kward with plugins, skills, and prompts.</p></article>
         </section>
@@ -137,7 +137,7 @@
             <li>Review diffs, stage files, and commit changes from the integrated Git workflow.</li>
             <li>Pipe diffs, logs, code, and generated text through Kward as a Unix filter.</li>
             <li>Organize long-running work with tabs, sessions, rewind, forks, compaction, and exports.</li>
-            <li>Dispatch worker tasks, leave them running, review the results later.</li>
+            <li>Use permission policies to approve or deny model-requested edits, commands, web, and MCP calls.</li>
             <li>Ground answers with live web search and public source repositories before guessing.</li>
             <li>Shape Kward with memory, skills, prompts, personas, and trusted Ruby plugins.</li>
             <li>Build custom UIs on top of Kward’s JSON-RPC backend.</li>

data/templates/default/layout/html/setup.rb

@@ -29,6 +29,7 @@ module KwardDocsNavigation
     "doc/usage.md" => "file.usage.html",
     "doc/configuration.md" => "file.configuration.html",
     "doc/authentication.md" => "file.authentication.html",
+    "doc/permissions.md" => "file.permissions.html",
     "doc/troubleshooting.md" => "file.troubleshooting.html",
     "doc/session-management.md" => "file.session-management.html",
     "doc/tabs.md" => "file.tabs.html",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kward
 version: !ruby/object:Gem::Version
-  version: 0.76.0
+  version: 0.78.0
 platform: ruby
 authors:
 - Kai Wood
@@ -129,6 +129,7 @@ files:
 - doc/api.md
 - doc/authentication.md
 - doc/code-search.md
+- doc/composer.md
 - doc/configuration.md
 - doc/context-budgeting.md
 - doc/context-tools.md
@@ -140,10 +141,13 @@ files:
 - doc/lifecycle-hooks.md
 - doc/mcp.md
 - doc/memory.md
+- doc/pan.md
+- doc/permissions.md
 - doc/personas.md
 - doc/plugins.md
 - doc/releasing.md
 - doc/rpc.md
+- doc/security.md
 - doc/session-management.md
 - doc/shell.md
 - doc/skills.md
@@ -211,6 +215,7 @@ files:
 - lib/kward/hooks/http_handler.rb
 - lib/kward/hooks/manager.rb
 - lib/kward/hooks/matcher.rb
+- lib/kward/http.rb
 - lib/kward/image_attachments.rb
 - lib/kward/interactive_pty_runner.rb
 - lib/kward/local_command_runner.rb
@@ -234,13 +239,16 @@ files:
 - lib/kward/model/stream_parser.rb
 - lib/kward/openrouter_model_cache.rb
 - lib/kward/pan/index.html.erb
+- lib/kward/pan/kward_logo.png
 - lib/kward/pan/server.rb
 - lib/kward/path_guard.rb
+- lib/kward/permissions/policy.rb
 - lib/kward/plugin_registry.rb
 - lib/kward/private_file.rb
 - lib/kward/project_files.rb
 - lib/kward/prompt_history.rb
 - lib/kward/prompt_interface.rb
+- lib/kward/prompt_interface/approval_prompt.rb
 - lib/kward/prompt_interface/banner.rb
 - lib/kward/prompt_interface/composer_controller.rb
 - lib/kward/prompt_interface/composer_renderer.rb
@@ -292,6 +300,7 @@ files:
 - lib/kward/rpc/config_manager.rb
 - lib/kward/rpc/mcp_status.rb
 - lib/kward/rpc/memory_methods.rb
+- lib/kward/rpc/plugin_chat_manager.rb
 - lib/kward/rpc/prompt_bridge.rb
 - lib/kward/rpc/redactor.rb
 - lib/kward/rpc/runtime_payloads.rb
@@ -316,6 +325,7 @@ files:
 - lib/kward/skills/registry.rb
 - lib/kward/starter_pack_installer.rb
 - lib/kward/steering.rb
+- lib/kward/tab_driver.rb
 - lib/kward/tab_store.rb
 - lib/kward/telemetry/logger.rb
 - lib/kward/telemetry/stats.rb
@@ -348,17 +358,6 @@ files:
 - lib/kward/transcript_export.rb
 - lib/kward/update_check.rb
 - lib/kward/version.rb
-- lib/kward/workers.rb
-- lib/kward/workers/git_guard.rb
-- lib/kward/workers/job.rb
-- lib/kward/workers/live_view.rb
-- lib/kward/workers/manager.rb
-- lib/kward/workers/queue_runner.rb
-- lib/kward/workers/queue_store.rb
-- lib/kward/workers/store.rb
-- lib/kward/workers/tool_policy.rb
-- lib/kward/workers/worker.rb
-- lib/kward/workers/write_lock.rb
 - lib/kward/workspace.rb
 - lib/main.rb
 - templates/default/fulldoc/html/css/kward.css

data/lib/kward/workers/git_guard.rb

@@ -1,93 +0,0 @@
-require "open3"
-
-module Kward
-  module Workers
-    # Small git boundary used by write-lane workers to keep implementation work isolated.
-    class GitGuard
-      def initialize(root: Dir.pwd)
-        @root = root.to_s
-      end
-
-      def repository?
-        success?("rev-parse", "--is-inside-work-tree")
-      end
-
-      def clean?
-        return true unless repository?
-
-        status.empty?
-      end
-
-      def dirty?
-        !clean?
-      end
-
-      def status
-        run("status", "--porcelain").stdout
-      end
-
-      def head
-        result = run("rev-parse", "--verify", "HEAD")
-        result.success? ? result.stdout.strip : nil
-      end
-
-      def commit_all(message)
-        add = run("add", "-A")
-        return Result.new(success: false, stdout: add.stdout, stderr: add.stderr) unless add.success?
-
-        commit = run("commit", "-m", message)
-        return Result.new(success: false, stdout: commit.stdout, stderr: commit.stderr) unless commit.success?
-
-        Result.new(success: true, stdout: commit.stdout, stderr: commit.stderr, commit: head)
-      end
-
-      def stash(message)
-        before = stash_refs
-        result = run("stash", "push", "--include-untracked", "-m", message)
-        return Result.new(success: false, stdout: result.stdout, stderr: result.stderr) unless result.success?
-        return Result.new(success: true, stdout: result.stdout, stderr: result.stderr) if result.stdout.include?("No local changes")
-
-        ref = (stash_refs - before).first || stash_refs.first
-        Result.new(success: true, stdout: result.stdout, stderr: result.stderr, commit: ref)
-      end
-
-      def apply_stash(ref)
-        run("stash", "apply", ref.to_s)
-      end
-
-      def drop_stash(ref)
-        run("stash", "drop", ref.to_s)
-      end
-
-      private
-
-      Result = Struct.new(:success, :stdout, :stderr, :commit, keyword_init: true) do
-        def success?
-          success
-        end
-
-        def output
-          [stdout, stderr].compact.reject(&:empty?).join("\n")
-        end
-      end
-
-      def success?(*args)
-        run(*args).success?
-      end
-
-      def stash_refs
-        result = run("stash", "list", "--format=%gd")
-        return [] unless result.success?
-
-        result.stdout.lines.map(&:strip).reject(&:empty?)
-      end
-
-      def run(*args)
-        stdout, stderr, status = Open3.capture3("git", "-C", @root, *args)
-        Result.new(success: status.success?, stdout: stdout.to_s, stderr: stderr.to_s)
-      rescue Errno::ENOENT
-        Result.new(success: false, stdout: "", stderr: "git executable not found")
-      end
-    end
-  end
-end