kward 0.83.0 → 0.84.0

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

@@ -15,6 +15,8 @@ require_relative "terminal_sequences"
 require_relative "terminal_keys"
 require_relative "editor_mode"
 require_relative "diff_view_mode"
+require_relative "scratchpad_languages"
+require_relative "markdown_code_block"
 require_relative "prompt_interface/banner"
 require_relative "prompt_interface/composer_state"
 require_relative "prompt_interface/editor/state"
@@ -32,6 +34,7 @@ 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 +67,15 @@ 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
     COMPOSER_MAX_INPUT_ROWS = 6
     IMAGE_VIEWER_MAX_ROWS = 8
     TRANSCRIPT_BUFFER_LIMIT = 200_000
@@ -89,6 +95,7 @@ module Kward
     include EditorEndwise
     include EditorWordCompletion
     include EditorAutoIndent
+    include EditorRunner
     include ComposerRenderer
     include ComposerController
     include ModernEditorMode
@@ -133,7 +140,7 @@ 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)
+    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.
@@ -145,12 +152,14 @@ module Kward
       @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 +178,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 +195,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 +252,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 +460,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 +551,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 +695,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,7 +715,8 @@ 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
         restore_editor_cursor_shape_locked
         set_cursor_visible_locked(true, force: true)
         flush_output_locked
@@ -709,6 +738,7 @@ module Kward
         enter_raw_mode_locked
         print_output_locked(KEYBOARD_PROTOCOL_ENABLE)
         print_output_locked(BRACKETED_PASTE_ENABLE)
+        @handoff_input_buffer.clear
         disable_editor_mouse_reporting(force: true)
         restore_editor_cursor_shape_locked(force: true)
         @cursor_visible = nil
@@ -802,8 +832,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 +843,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 +872,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 +895,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 +925,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 +944,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 +985,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 +1176,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

@@ -29,7 +29,7 @@ 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]" },

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/pty_output_sink.rb

@@ -1,5 +1,52 @@
+require "thread"
+
 # Namespace for the Kward CLI agent runtime.
 module Kward
+  # Retains output while a detached PTY command runs without terminal ownership.
+  class BufferedPtyOutputSink
+    attr_reader :captured_output
+
+    def initialize(max_capture_bytes:)
+      @max_capture_bytes = max_capture_bytes
+      @captured_output = +"".b
+      @truncated = false
+      @mutex = Mutex.new
+    end
+
+    def write(chunk)
+      value = chunk.to_s.b
+      @mutex.synchronize do
+        remaining = @max_capture_bytes - @captured_output.bytesize
+        if value.bytesize > remaining
+          @captured_output << value.byteslice(0, remaining) if remaining.positive?
+          @truncated = true
+        else
+          @captured_output << value
+        end
+      end
+    end
+
+    def flush
+      nil
+    end
+
+    def finish
+      nil
+    end
+
+    def transcript_safe?
+      true
+    end
+
+    def pre_input_capture_only?
+      true
+    end
+
+    def truncated?
+      @mutex.synchronize { @truncated }
+    end
+  end
+
   # Forwards PTY output immediately and optionally keeps a bounded byte copy.
   #
   # The runner only depends on the sink's `write` method and optional `flush`

data/lib/kward/rpc/transcript_normalizer.rb

@@ -173,10 +173,14 @@ module Kward
           when "reasoning"
             reasoning_item_blocks(item).map { |thinking| { type: "thinking", thinking: thinking } }
           when "message"
-            next [] if ToolCall.value(item, :phase).to_s == "commentary"
-
             text = response_message_item_text(item)
-            text.empty? ? [] : [{ type: "text", text: text }]
+            next [] if text.empty?
+
+            if ToolCall.value(item, :phase).to_s == "commentary"
+              [{ type: "thinking", thinking: text }]
+            else
+              [{ type: "text", text: text }]
+            end
           else
             []
           end

data/lib/kward/scratchpad_languages.rb

@@ -0,0 +1,74 @@
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  # Names, aliases, and display paths accepted by the scratchpad command.
+  module ScratchpadLanguages
+    LANGUAGES = {
+      text: { aliases: %w[text txt], display_path: "scratchpad.txt" },
+      ruby: { aliases: %w[ruby rb], display_path: "scratchpad.rb", runner: :ruby },
+      erb: { aliases: %w[erb], display_path: "scratchpad.erb" },
+      crystal: { aliases: %w[crystal cr], display_path: "scratchpad.cr", runner: :crystal },
+      elixir: { aliases: %w[elixir ex exs], display_path: "scratchpad.ex", runner: :elixir },
+      julia: { aliases: %w[julia jl], display_path: "scratchpad.jl", runner: :julia },
+      javascript: { aliases: %w[javascript js jsx mjs cjs], display_path: "scratchpad.js", runner: :node },
+      typescript: { aliases: %w[typescript ts tsx], display_path: "scratchpad.ts", runner: :node },
+      json: { aliases: %w[json], display_path: "scratchpad.json" },
+      markdown: { aliases: %w[markdown md], display_path: "scratchpad.md" },
+      yaml: { aliases: %w[yaml yml], display_path: "scratchpad.yml" },
+      shell: { aliases: %w[shell sh bash zsh fish], display_path: "scratchpad.sh", runner: :shell },
+      makefile: { aliases: %w[makefile make mk], display_path: "scratchpad.mk" },
+      html: { aliases: %w[html htm], display_path: "scratchpad.html" },
+      css: { aliases: %w[css], display_path: "scratchpad.css" },
+      scss: { aliases: %w[scss], display_path: "scratchpad.scss" },
+      python: { aliases: %w[python py pyw], display_path: "scratchpad.py", runner: :python },
+      go: { aliases: %w[go], display_path: "scratchpad.go", runner: :go },
+      rust: { aliases: %w[rust rs], display_path: "scratchpad.rs" },
+      java: { aliases: %w[java], display_path: "scratchpad.java" },
+      csharp: { aliases: %w[csharp cs c#], display_path: "scratchpad.cs" },
+      c: { aliases: %w[c], display_path: "scratchpad.c" },
+      cpp: { aliases: %w[cpp cc cxx hpp hh hxx c++], display_path: "scratchpad.cpp" },
+      swift: { aliases: %w[swift], display_path: "scratchpad.swift", runner: :swift },
+      kotlin: { aliases: %w[kotlin kt kts], display_path: "scratchpad.kt" },
+      lua: { aliases: %w[lua], display_path: "scratchpad.lua", runner: :lua },
+      sql: { aliases: %w[sql], display_path: "scratchpad.sql" }
+    }.freeze
+
+    ALIASES = LANGUAGES.each_with_object({}) do |(language, definition), aliases|
+      ([language.to_s] + definition.fetch(:aliases)).each do |name|
+        aliases[name] = language
+      end
+    end.freeze
+
+    module_function
+
+    def normalize(language)
+      value = language.to_s.strip.downcase
+      return :text if value.empty?
+
+      ALIASES.fetch(value) do
+        raise ArgumentError, "Unknown scratchpad language #{language.inspect}. Use /scratchpad help for supported languages."
+      end
+    end
+
+    def display_path(language)
+      LANGUAGES.fetch(normalize(language)).fetch(:display_path)
+    end
+
+    def runner(language)
+      LANGUAGES.fetch(normalize(language))[:runner]
+    end
+
+    def runnable?(language)
+      !runner(language).nil?
+    end
+
+    def help_text
+      lines = ["Supported scratchpad languages:"]
+      LANGUAGES.each do |language, definition|
+        aliases = definition.fetch(:aliases).reject { |name| name == language.to_s }
+        suffix = aliases.empty? ? "" : " (#{aliases.join(", ")})"
+        lines << "  #{language}#{suffix}"
+      end
+      lines.join("\n")
+    end
+  end
+end