kward 0.83.0 → 0.85.0

data/lib/kward/prompt_interface/slash_overlay.rb

@@ -19,13 +19,17 @@ module Kward
       end
 
       def normalize_slash_commands(commands)
-        commands.map do |command|
+        commands.filter_map do |command|
+          name = slash_command_value(command, :name).to_s
+          next if name.empty?
+
           {
-            name: slash_command_value(command, :name).to_s,
+            name: name,
+            normalized_name: name.downcase,
             description: slash_command_value(command, :description).to_s,
             argument_hint: slash_command_value(command, :argument_hint).to_s
           }
-        end.reject { |command| command[:name].empty? }.sort_by { |command| command[:name] }
+        end.sort_by { |command| command[:name] }
       end
 
       def slash_command_value(command, key)
@@ -44,7 +48,18 @@ module Kward
 
       def slash_overlay_matches
         prefix = composer_input.delete_prefix("/").downcase
-        @slash_commands.select { |command| command[:name].downcase.start_with?(prefix) }.first(8)
+        cache = @slash_overlay_match_cache
+        return cache[:matches] if cache && cache[:prefix] == prefix && cache[:commands].equal?(@slash_commands)
+
+        matches = []
+        @slash_commands.each do |command|
+          next unless command[:normalized_name].start_with?(prefix)
+
+          matches << command
+          break if matches.length == 8
+        end
+        @slash_overlay_match_cache = { prefix: prefix, commands: @slash_commands, matches: matches }
+        matches
       end
 
       def selected_slash_command

data/lib/kward/prompt_interface/transcript_renderer.rb

@@ -11,7 +11,7 @@ module Kward
           prepare_transcript_output_locked unless @restoring_transcript
           if label && @stream_state.block != label
             ensure_transcript_block_separator_locked
-            write_transcript_text_locked("#{colored("#{transcript_label(label)}>", *label_styles(label))} ")
+            write_transcript_text_locked("#{colored(transcript_marker(label), *label_styles(label))} ")
             @stream_state.start_block(label)
           end
           write_transcript_text_locked(delta) unless delta.empty?
@@ -117,20 +117,25 @@ module Kward
         end
       end
 
+      def transcript_marker(label)
+        marker = "#{transcript_label(label)}>"
+        label == "Assistant" ? "✦ #{marker}" : marker
+      end
+
       def label_styles(label)
         case label
         when "Reasoning", "Compaction summary"
-          [:gray, :bold]
+          [:metadata, :bold]
         when "Assistant", "Kward"
-          [:green, :bold]
+          [:activity, :bold]
         when "Tool", "Tool output"
-          [:cyan, :bold]
+          [:tool, :bold]
         when "Tool failed"
-          [:red, :bold]
+          [:failure, :bold]
         when "Retry"
-          [:yellow, :bold]
+          [:caution, :bold]
         else
-          [:gray, :bold]
+          [:metadata, :bold]
         end
       end
 

data/lib/kward/prompt_interface.rb

@@ -3,18 +3,20 @@ require "io/console"
 require "pathname"
 require "rbconfig"
 require "thread"
-require_relative "project_files"
+require_relative "workspace/files"
 require_relative "image_attachments"
-require_relative "terminal_image_support"
+require_relative "terminal/image_support"
 require_relative "prompt_history"
 require "tty-cursor"
 require "tty-reader"
 require "tty-screen"
-require_relative "ansi"
-require_relative "terminal_sequences"
-require_relative "terminal_keys"
-require_relative "editor_mode"
-require_relative "diff_view_mode"
+require_relative "terminal/ansi"
+require_relative "terminal/sequences"
+require_relative "terminal/keys"
+require_relative "prompt_interface/editor/editor_mode"
+require_relative "prompt_interface/editor/diff_view_mode"
+require_relative "prompt_interface/editor/scratchpad_languages"
+require_relative "prompt_interface/editor/markdown_code_block"
 require_relative "prompt_interface/banner"
 require_relative "prompt_interface/composer_state"
 require_relative "prompt_interface/editor/state"
@@ -27,11 +29,13 @@ require_relative "prompt_interface/file_overlay"
 require_relative "prompt_interface/project_browser"
 require_relative "prompt_interface/selection_prompt"
 require_relative "prompt_interface/question_prompt"
+require_relative "prompt_interface/plugin_ui_requests"
 require_relative "prompt_interface/approval_prompt"
 require_relative "prompt_interface/git_prompt"
 require_relative "prompt_interface/overlay_renderer"
 require_relative "prompt_interface/editor/renderer"
 require_relative "prompt_interface/editor/syntax_highlighter"
+require_relative "prompt_interface/editor/runner"
 require_relative "prompt_interface/editor/auto_close_pairs"
 require_relative "prompt_interface/editor/endwise"
 require_relative "prompt_interface/editor/word_completion"
@@ -64,12 +68,16 @@ module Kward
   # `prompt_interface/` to keep rendering, layout, keyboard handling, and runtime
   # state readable while sharing one terminal state object.
   class PromptInterface
-    HELP_TEXT = "Enter sends • Shift+Enter inserts newline • ↑/↓ history • Ctrl+D exits empty prompt".freeze
+    HELP_TEXT = "Enter sends • Shift+Enter newline • / commands • @ files • ↑/↓ history • Ctrl+D exits".freeze
     BUSY_HELP_TEXT = "Ctrl+C cancels".freeze
-    SPINNER_FRAMES = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].freeze
-    SPINNER_INTERVAL = 0.1
+    SPINNER_FRAMES = %w[· • ● •].freeze
+    SPINNER_INTERVAL = 0.16
     FOOTER_REFRESH_INTERVAL = 1.0
     COMPOSER_STATUS_REFRESH_INTERVAL = 1.0
+    COMPLETION_DISPLAY_SECONDS = 0.8
+    RESPONSE_ARRIVAL_SECONDS = 0.4
+    BUSY_ELAPSED_DELAY_SECONDS = 2.0
+    TRANSCRIPT_COMPOSER_GAP_ROWS = 1
     COMPOSER_MAX_INPUT_ROWS = 6
     IMAGE_VIEWER_MAX_ROWS = 8
     TRANSCRIPT_BUFFER_LIMIT = 200_000
@@ -80,6 +88,7 @@ module Kward
     include ProjectBrowser
     include SelectionPrompt
     include QuestionPrompt
+    include PluginUIRequests
     include ApprovalPrompt
     include GitPrompt
     include OverlayRenderer
@@ -89,6 +98,7 @@ module Kward
     include EditorEndwise
     include EditorWordCompletion
     include EditorAutoIndent
+    include EditorRunner
     include ComposerRenderer
     include ComposerController
     include ModernEditorMode
@@ -133,24 +143,62 @@ module Kward
       end
     end
 
-    def initialize(input: $stdin, output: $stdout, slash_commands: [], overlay_settings: nil, project_browser_icon_theme: "off", footer: nil, composer_status: nil, busy_help: true, attachment_badges: nil, attachment_parser: nil, banner_message: nil, tab_keybindings: nil, prompt_history: nil, workspace_root: Dir.pwd, editor_mode: nil, editor_mode_source: nil, editor_auto_indent: true, editor_auto_indent_source: nil, editor_auto_close_pairs: true, editor_auto_close_pairs_source: nil, editor_soft_wrap: true, editor_soft_wrap_source: nil, editor_bar_cursor: true, editor_bar_cursor_source: nil, editor_line_numbers: "absolute", editor_line_numbers_source: nil, diff_view: "auto", diff_view_source: nil, redraw_handler: nil)
+    # Forwards child output while tracking keyboard-protocol resets across chunks.
+    class TerminalHandoffOutput
+      def initialize(output, on_keyboard_protocol_restore:)
+        @output = output
+        @on_keyboard_protocol_restore = on_keyboard_protocol_restore
+        @pending = +"".b
+      end
+
+      def write(value)
+        value = value.to_s.b
+        detect_keyboard_protocol_restore(value)
+        @output.write(value)
+      end
+
+      def print(*values)
+        values.each { |value| write(value) }
+        nil
+      end
+
+      def flush
+        @output.flush if @output.respond_to?(:flush)
+      end
+
+      private
+
+      def detect_keyboard_protocol_restore(value)
+        @pending << value
+        return unless @pending.include?(TerminalSequences::KEYBOARD_PROTOCOL_RESTORE)
+
+        @on_keyboard_protocol_restore.call
+        keep = [TerminalSequences::KEYBOARD_PROTOCOL_RESTORE.bytesize - 1, @pending.bytesize].min
+        @pending = keep.positive? ? @pending.byteslice(-keep, keep) : +"".b
+      end
+    end
+
+    def initialize(input: $stdin, output: $stdout, slash_commands: [], overlay_settings: nil, project_browser_icon_theme: "off", footer: nil, composer_status: nil, busy_help: true, attachment_badges: nil, attachment_parser: nil, banner_message: nil, tab_keybindings: nil, prompt_history: nil, workspace_root: Dir.pwd, editor_mode: nil, editor_mode_source: nil, editor_auto_indent: true, editor_auto_indent_source: nil, editor_auto_close_pairs: true, editor_auto_close_pairs_source: nil, editor_soft_wrap: true, editor_soft_wrap_source: nil, editor_bar_cursor: true, editor_bar_cursor_source: nil, editor_line_numbers: "absolute", editor_line_numbers_source: nil, diff_view: "auto", diff_view_source: nil, editor_runners_source: nil, redraw_handler: nil)
       @input_io = input
       @output_io = output
       # Logical state may change during a child handoff, but only the owner may render.
       @terminal_owner = :kward
       @terminal_handoff_mode = nil
+      @terminal_handoff_keyboard_protocol_reset = false
       @reader = TTY::Reader.new(input: input, output: output, interrupt: :error)
       @mutex = Mutex.new
       @prompt_history = prompt_history
       @workspace_root = File.expand_path(workspace_root.to_s.empty? ? Dir.pwd : workspace_root)
       @composer = ComposerState.new
       load_history(@prompt_history.values) if @prompt_history
-      self.composer_input = @composer.input
-      self.composer_cursor = @composer.cursor
       @started = false
       @asking = false
       @busy = false
-      @busy_activity = "streaming"
+      @busy_activity = "thinking"
+      @busy_started_at = nil
+      @last_busy_elapsed = nil
+      @completion_status = nil
+      @response_arrival_until = nil
       @queued_count = 0
       @steered_count = 0
       @spinner_frame_index = 0
@@ -169,6 +217,7 @@ module Kward
       @transcript_viewport_rows = 0
       @restoring_transcript = false
       @pending_keys = []
+      @handoff_input_buffer = +"".b
       @completion_provider = nil
       @completion_cycle = nil
       @completion_overlay = nil
@@ -185,12 +234,22 @@ module Kward
       @file_open_dismissed_token = nil
       @file_editor_open_status = nil
       @file_mention_paths = nil
+      @file_mention_discovery_thread = nil
+      @file_mention_discovery_root = nil
+      @file_mention_discovery_token = nil
       @project_browser_file_paths = nil
       @project_browser_state = nil
       @image_viewer_state = nil
       @terminal_image_protocol = nil
       @project_browser_restore_after_editor = false
       @editor_state = nil
+      @editor_runner_state = nil
+      @editor_runner_completion = nil
+      @editor_runner_output_visible = false
+      @editor_runner_selection_anchor = nil
+      @editor_runner_selection_cursor = nil
+      @editor_runner_mouse_dragging = false
+      @editor_runner_last_click = nil
       @editor_agent_suspended = false
       @editor_prompt_active = false
       @editor_prompt_input = ""
@@ -232,6 +291,7 @@ module Kward
       @editor_line_numbers_source = editor_line_numbers_source
       @diff_view = DiffViewMode.normalize(diff_view)
       @diff_view_source = diff_view_source
+      @editor_runners_source = editor_runners_source
     end
 
     def update_slash_commands(commands)
@@ -439,6 +499,12 @@ module Kward
       return false unless opened
 
       run_editor
+    rescue StandardError
+      @mutex.synchronize do
+        close_editor if editor_active?
+        render_prompt_locked if @started
+      end
+      raise
     end
 
     def scratchpad(language = :text)
@@ -524,7 +590,8 @@ module Kward
           if key.nil?
             resized = handle_resize_locked
             footer_refreshed = tick_footer_locked
-            render_prompt_locked if resized || footer_refreshed
+            completion_changed = tick_completion_locked
+            render_prompt_locked if resized || footer_refreshed || completion_changed
           else
             result = handle_key(key)
             render_prompt_locked unless result.is_a?(String) || result == EXIT_INPUT || prompt_action_result?(result)
@@ -667,11 +734,11 @@ module Kward
       end
     end
 
-    def with_inline_terminal_handoff(&block)
-      with_terminal_handoff(inline: true, &block)
+    def with_inline_terminal_handoff(preserve_tab_keybindings: false, &block)
+      with_terminal_handoff(inline: true, preserve_tab_keybindings: preserve_tab_keybindings, &block)
     end
 
-    def with_terminal_handoff(inline: false)
+    def with_terminal_handoff(inline: false, preserve_tab_keybindings: false)
       start
       input = nil
       output = nil
@@ -687,13 +754,21 @@ module Kward
         end
         disable_editor_mouse_reporting(force: true)
         print_output_locked(BRACKETED_PASTE_RESTORE)
-        print_output_locked(KEYBOARD_PROTOCOL_RESTORE)
+        print_output_locked(KEYBOARD_PROTOCOL_RESTORE) unless preserve_tab_keybindings
+        @handoff_input_buffer.clear
+        @terminal_handoff_keyboard_protocol_reset = false
         restore_editor_cursor_shape_locked
         set_cursor_visible_locked(true, force: true)
         flush_output_locked
         restore_console_mode_locked
         input = @input_io
-        output = @output_io
+        output = if preserve_tab_keybindings
+          TerminalHandoffOutput.new(@output_io, on_keyboard_protocol_restore: -> {
+            @terminal_handoff_keyboard_protocol_reset = true
+          })
+        else
+          @output_io
+        end
         transition = method(:switch_terminal_handoff_to_exclusive)
         @terminal_handoff_mode = inline ? :inline : :exclusive
         @terminal_owner = :child
@@ -707,8 +782,12 @@ module Kward
         restore_scroll_region_locked
         print_output_locked(TerminalSequences::SGR_RESET)
         enter_raw_mode_locked
-        print_output_locked(KEYBOARD_PROTOCOL_ENABLE)
+        if !preserve_tab_keybindings || @terminal_handoff_keyboard_protocol_reset
+          print_output_locked(KEYBOARD_PROTOCOL_ENABLE)
+        end
         print_output_locked(BRACKETED_PASTE_ENABLE)
+        @handoff_input_buffer.clear
+        @terminal_handoff_keyboard_protocol_reset = false
         disable_editor_mouse_reporting(force: true)
         restore_editor_cursor_shape_locked(force: true)
         @cursor_visible = nil
@@ -802,8 +881,6 @@ module Kward
       @completion_cycle = nil
       @completion_overlay = nil
       @prompt_label = snapshot[:prompt_label].to_s.empty? ? "You>" : snapshot[:prompt_label].to_s
-      self.composer_input = @composer.input
-      self.composer_cursor = @composer.cursor
       @last_composer_rows = []
     end
 
@@ -815,6 +892,11 @@ module Kward
 
     def restore_editor_snapshot_locked(snapshot)
       editor_was_active = editor_active?
+      cancel_editor_runner
+      @editor_runner_state = nil
+      @editor_runner_completion = nil
+      @editor_runner_output_visible = false
+      clear_editor_runner_selection
       @editor_state = snapshot[:editor_state]&.dup
       editor_is_active = editor_active?
 
@@ -839,17 +921,21 @@ module Kward
       end
     end
 
-    def begin_busy_input(message = "You>", activity: "streaming")
+    def begin_busy_input(message = "You>", activity: "thinking")
       start
       @mutex.synchronize do
         @prompt_label = message.to_s
         @busy_activity = normalize_busy_activity(activity)
+        @completion_status = nil
+        @response_arrival_until = nil
         self.composer_input = ""
         self.composer_cursor = 0
         @composer.clear_attachments
                   @pending_keys.clear
         @asking = true
         @busy = true
+        @busy_started_at = monotonic_now
+        @last_busy_elapsed = nil
         @queued_count = 0
         @steered_count = 0
         reset_spinner_locked
@@ -858,6 +944,17 @@ module Kward
       end
     end
 
+    def update_busy_activity(activity)
+      @mutex.synchronize do
+        value = normalize_busy_activity(activity)
+        return false if value == @busy_activity
+
+        @busy_activity = value
+        render_prompt_locked if @started && @asking && @busy
+        true
+      end
+    end
+
     def set_queued_count(count)
       @mutex.synchronize do
         @queued_count = count.to_i
@@ -877,15 +974,18 @@ module Kward
     def clear_steered_count
       @mutex.synchronize do
         @steered_count = 0
-        @busy_activity = "streaming"
+        @busy_activity = "thinking"
         render_prompt_locked if @asking
       end
     end
 
     def finish_busy_input
       @mutex.synchronize do
+        @last_busy_elapsed = monotonic_now - @busy_started_at if @busy_started_at
+        @busy_started_at = nil
         @busy = false
-        @busy_activity = "streaming"
+        @busy_activity = "thinking"
+        @response_arrival_until = nil
         @queued_count = 0
         @steered_count = 0
         @asking = true
@@ -893,6 +993,24 @@ module Kward
       end
     end
 
+    def show_response_arrival
+      @mutex.synchronize do
+        @response_arrival_until = monotonic_now + RESPONSE_ARRIVAL_SECONDS
+        render_prompt_locked if @started && @asking && @busy
+      end
+    end
+
+    def show_completion(status)
+      @mutex.synchronize do
+        @completion_status = completion_status(status)
+        render_prompt_locked if @started && @asking
+      end
+    end
+
+    def filter_terminal_handoff_input(chunk)
+      @mutex.synchronize { filter_terminal_handoff_input_locked(chunk) }
+    end
+
     def poll_input
       key = read_key(nonblock: true)
       @mutex.synchronize do
@@ -916,7 +1034,8 @@ module Kward
           resized = handle_resize_locked
           spun = tick_spinner_locked
           footer_refreshed = tick_footer_locked
-          render_prompt_locked if resized || spun || footer_refreshed
+          completion_changed = tick_completion_locked
+          render_prompt_locked if resized || spun || footer_refreshed || completion_changed
           return nil
         end
 
@@ -1106,6 +1225,11 @@ module Kward
 
     def reset_workspace_file_state_locked
       @file_mention_paths = nil
+      @file_mention_discovery_thread = nil
+      @file_mention_discovery_root = nil
+      @file_mention_discovery_token = nil
+      @file_overlay_match_cache = nil
+      @project_browser_search_cache = nil
       @project_browser_file_paths = nil
       @file_mention_path_entries_paths = nil
       @file_mention_path_entries = nil

data/lib/kward/prompts/commands.rb

@@ -11,6 +11,7 @@ module Kward
       { name: "session", description: "Open saved sessions or name the current session.", argument_hint: "[path]|name [name]" },
       { name: "resume", description: "Alias for /session.", argument_hint: "[path]" },
       { name: "rename", description: "Rename the current session.", argument_hint: "<name>" },
+      { name: "name", description: "Rename the current session and tab.", argument_hint: "<name>" },
       { name: "clone", description: "Clone the current session.", argument_hint: "" },
       { name: "fork", description: "Fork from an earlier prompt into a new session.", argument_hint: "" },
       { name: "rewind", description: "Revisit an earlier prompt and try a different direction.", argument_hint: "" },
@@ -29,10 +30,10 @@ module Kward
       { name: "files", description: "Browse project files.", argument_hint: "" },
       { name: "shell", description: "Open the embedded Kward shell.", argument_hint: "" },
       { name: "capture", description: "Run a command with bounded transcript capture.", argument_hint: "<command>" },
-      { name: "scratchpad", description: "Open an unsaved editor buffer.", argument_hint: "[text|markdown|ruby]" },
+      { name: "scratchpad", description: "Open an unsaved editor buffer.", argument_hint: "[language|help]" },
       { name: "pty", description: "Run a command in an interactive PTY passthrough session.", argument_hint: "<command>" },
       { name: "tab", description: "Manage tabs.", argument_hint: "[1-n|move|close|new|name|worktree]" },
-      { name: "worktree", description: "Manage the active tab's linked Git worktree.", argument_hint: "[activate|detach|status|merge|merge abort|remove]" },
+      { name: "worktree", description: "Manage the active tab's linked Git worktree.", argument_hint: "[activate|detach|status|merge [resolve|continue|abort]|remove]" },
       { name: "status", description: "Show the current status message.", argument_hint: "" },
       { name: "stats", description: "Show telemetry logging stats.", argument_hint: "[range]" },
       { name: "sandbox", description: "Inspect or configure model command sandboxing.", argument_hint: "[status|off|read_only|workspace_write|network allow|network deny]" },

data/lib/kward/prompts.rb

@@ -60,7 +60,7 @@ module Kward
 
         When web tools are available, use web_search to discover sources, fetch_content for important human-readable pages, and fetch_raw for machine-readable resources such as JSON, YAML, XML, RSS, OpenAPI specs, and plain text. Prefer official or primary sources and cite or mention the URLs you relied on. Use code_search for package, GitHub repository, and source-code research.
 
-        Manage code context deliberately. Prefer context_for_task, summarize_file_structure, and read_file mode="outline"/"preview" before broad reads. Escalate to read_file mode="range" for exact lines, and use mode="full" only when focused context is insufficient. If output is compacted or replaced with a duplicate reference, use retrieve_tool_output to inspect the needed original detail. Use context_budget_stats when asked about context savings. When a material requirement is ambiguous, use ask_user_question when it is available; otherwise state the assumption.
+        Manage code context deliberately. Prefer context_for_task, summarize_file_structure, and read_file mode="outline"/"preview" before broad reads. Escalate to read_file mode="range" for exact lines, and use mode="full" only when focused context is insufficient. If output is compacted or replaced with a duplicate reference, use retrieve_tool_output to inspect the needed original detail. Use context_budget_stats when asked about context savings. When the user asks to open a file in the built-in editor and open_editor is advertised, use open_editor rather than read_file; use read_file when they ask you to inspect or display contents. Opening the editor is a user-facing action and does not itself modify or save the file. When a material requirement is ambiguous, use ask_user_question when it is available; otherwise state the assumption.
       PROMPT
     end
 

data/lib/kward/{adaptive_pty_output_sink.rb → pty/adaptive_output_sink.rb}

@@ -1,4 +1,4 @@
-require_relative "terminal_sequences"
+require_relative "../terminal/sequences"
 
 # Namespace for the Kward CLI agent runtime.
 module Kward

data/lib/kward/pty/detached_run.rb

@@ -0,0 +1,44 @@
+require "thread"
+
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  # Owns a command that continues after its terminal has been returned to Kward.
+  class DetachedRun
+    attr_reader :sink
+
+    def initialize(sink:, canceler: nil, &work)
+      @sink = sink
+      @canceler = canceler
+      @mutex = Mutex.new
+      @result = nil
+      @thread = Thread.new do
+        begin
+          result = work.call
+          @mutex.synchronize { @result = result }
+        rescue StandardError => e
+          @mutex.synchronize { @result = e }
+        end
+      end
+      @thread.report_on_exception = false
+    end
+
+    def complete?
+      !@thread.alive?
+    end
+
+    def result
+      return unless complete?
+
+      @thread.join
+      @mutex.synchronize { @result }
+    end
+
+    def join(timeout = nil)
+      @thread.join(timeout)
+    end
+
+    def cancel!
+      @canceler&.call
+    end
+  end
+end