kward 0.80.1 → 0.82.0

data/lib/kward/prompt_interface/screen.rb

@@ -6,6 +6,28 @@ module Kward
     module Screen
       private
 
+      def terminal_owned_by_child_locked?
+        @terminal_owner == :child
+      end
+
+      def print_output_locked(*values)
+        return if terminal_owned_by_child_locked?
+
+        values.each { |value| @output_io.print(value) }
+      end
+
+      def puts_output_locked(*values)
+        return if terminal_owned_by_child_locked?
+
+        @output_io.puts(*values)
+      end
+
+      def flush_output_locked
+        return if terminal_owned_by_child_locked?
+
+        @output_io.flush
+      end
+
       def enter_raw_mode_locked
         return unless @input_io.respond_to?(:tty?) && @input_io.tty?
         return unless @input_io.respond_to?(:console_mode) && @input_io.respond_to?(:console_mode=)
@@ -31,19 +53,19 @@ module Kward
       end
 
       def with_synchronized_output_locked
-        if @restoring_transcript || @synchronized_output_depth.positive?
+        if @restoring_transcript || @synchronized_output_depth.positive? || terminal_owned_by_child_locked?
           yield
           return
         end
 
         synchronized = true
         @synchronized_output_depth += 1
-        @output_io.print(SYNCHRONIZED_OUTPUT_ENABLE)
+        print_output_locked(SYNCHRONIZED_OUTPUT_ENABLE)
         yield
       ensure
         if synchronized
           @synchronized_output_depth -= 1
-          @output_io.print(SYNCHRONIZED_OUTPUT_DISABLE) if @synchronized_output_depth.zero?
+          print_output_locked(SYNCHRONIZED_OUTPUT_DISABLE) if @synchronized_output_depth.zero?
         end
       end
 
@@ -58,27 +80,28 @@ module Kward
         visible = select_editing_active? if @select_state
         visible = git_composing? if @git_state
         visible = project_browser_search_active? if project_browser_visible?
+        visible = false if image_viewer_active?
         set_cursor_visible_locked(visible)
       end
 
       def set_cursor_visible_locked(visible, force: false)
         return if !force && @cursor_visible == visible
 
-        @output_io.print(visible ? CURSOR_SHOW : CURSOR_HIDE)
+        print_output_locked(visible ? CURSOR_SHOW : CURSOR_HIDE)
         @cursor_visible = visible
       end
 
       def set_editor_bar_cursor_locked
         return if @editor_bar_cursor_active
 
-        @output_io.print(CURSOR_SHAPE_BAR)
+        print_output_locked(CURSOR_SHAPE_BAR)
         @editor_bar_cursor_active = true
       end
 
-      def restore_editor_cursor_shape_locked
-        return unless @editor_bar_cursor_active
+      def restore_editor_cursor_shape_locked(force: false)
+        return unless force || @editor_bar_cursor_active
 
-        @output_io.print(CURSOR_SHAPE_DEFAULT)
+        print_output_locked(CURSOR_SHAPE_DEFAULT)
         @editor_bar_cursor_active = false
       end
 
@@ -95,13 +118,15 @@ module Kward
         old_top = [height - old_reserved_rows + 1, 1].max
         @reserved_rows = new_reserved_rows
         new_top = composer_top_row(height)
-        @output_io.print(TerminalSequences.scroll_region(1, transcript_bottom_row(height)))
+        print_output_locked(TerminalSequences.scroll_region(1, transcript_bottom_row(height)))
         clear_screen_rows_locked(old_top, new_top - 1) if new_top > old_top
         @last_composer_rows = []
         redraw_transcript_locked(width: width, height: height) if redraw_transcript && new_reserved_rows < old_reserved_rows
       end
 
       def handle_resize_locked
+        return false if terminal_owned_by_child_locked?
+
         current_width, current_height = screen_size
         return false if current_width == @last_width && current_height == @last_height
 
@@ -122,7 +147,7 @@ module Kward
       end
 
       def restore_scroll_region_locked
-        @output_io.print(TerminalSequences.restore_scroll_region)
+        print_output_locked(TerminalSequences.restore_scroll_region)
         @reserved_rows = 0
       end
 
@@ -138,15 +163,15 @@ module Kward
 
           move_to_screen(top + index, 1)
           if row
-            @output_io.print(row)
+            print_output_locked(row)
           else
-            @output_io.print(TTY::Cursor.clear_line)
+            print_output_locked(TTY::Cursor.clear_line)
           end
         end
 
         rows.length.upto(rows.length + rows_to_clear - 1) do |index|
           move_to_screen(top + index, 1)
-          @output_io.print(TTY::Cursor.clear_line)
+          print_output_locked(TTY::Cursor.clear_line)
         end
 
         @last_composer_rows = rows.dup
@@ -186,12 +211,12 @@ module Kward
       def clear_screen_rows_locked(top, bottom)
         top.upto(bottom) do |row|
           move_to_screen(row, 1)
-          @output_io.print(TTY::Cursor.clear_line)
+          print_output_locked(TTY::Cursor.clear_line)
         end
       end
 
       def move_to_screen(row, col)
-        @output_io.print(TerminalSequences.move_to(row, col))
+        print_output_locked(TerminalSequences.move_to(row, col))
       end
 
       def screen_size

data/lib/kward/prompt_interface/selection_prompt.rb

@@ -324,7 +324,7 @@ module Kward
             @select_state[:selection_index] = result[:selection_index].to_i if result.key?(:selection_index)
           end
           render_prompt_locked
-          @output_io.flush
+          flush_output_locked
         end
         SELECT_CONTINUE
       end
@@ -342,7 +342,7 @@ module Kward
           @asking = true
           reset_spinner_locked
           render_prompt_locked
-          @output_io.flush
+          flush_output_locked
         end
       end
 
@@ -352,7 +352,7 @@ module Kward
           @busy_activity = "streaming"
           @select_state&.delete(:busy_activity)
           render_prompt_locked if @asking
-          @output_io.flush
+          flush_output_locked
         end
       end
 
@@ -362,7 +362,7 @@ module Kward
           spun = tick_spinner_locked
           footer_refreshed = tick_footer_locked
           render_prompt_locked if resized || spun || footer_refreshed
-          @output_io.flush if resized || spun || footer_refreshed
+          flush_output_locked if resized || spun || footer_refreshed
         end
       end
 
@@ -656,7 +656,7 @@ module Kward
           self.composer_cursor = 0
           @asking = true
           render_prompt_locked if render
-          @output_io.flush
+          flush_output_locked
         end
       end
 

data/lib/kward/prompt_interface/transcript_renderer.rb

@@ -19,7 +19,7 @@ module Kward
           @stream_state.finish_block if finish
           restore_composer_cursor_locked unless @restoring_transcript
         end
-        @output_io.flush unless @restoring_transcript
+        flush_output_locked unless @restoring_transcript
       end
 
       def write_transcript_text_locked(text)
@@ -32,7 +32,7 @@ module Kward
         width, height = screen_size
         output_text = terminal_newlines(text.to_s)
         advance_pending_stream_wrap_locked(output_text, width: width, height: height)
-        @output_io.print(output_text)
+        print_output_locked(output_text)
         update_stream_position(output_text, width: width)
       end
 
@@ -58,7 +58,7 @@ module Kward
         return if rows.empty?
 
         move_to_screen(1, 1)
-        @output_io.print(terminal_newlines(rows.join("\n")))
+        print_output_locked(terminal_newlines(rows.join("\n")))
       end
 
       def transcript_viewport_rows(row_count, width)
@@ -98,7 +98,7 @@ module Kward
         return if output_text.empty? || output_text.start_with?("\r", "\n")
 
         move_to_screen(transcript_bottom_row(height), width)
-        @output_io.print("\r\n")
+        print_output_locked("\r\n")
         @stream_state.clear_pending_wrap
       end
 

data/lib/kward/prompt_interface.rb

@@ -4,6 +4,8 @@ require "pathname"
 require "rbconfig"
 require "thread"
 require_relative "project_files"
+require_relative "image_attachments"
+require_relative "terminal_image_support"
 require_relative "prompt_history"
 require "tty-cursor"
 require "tty-reader"
@@ -68,6 +70,7 @@ module Kward
     FOOTER_REFRESH_INTERVAL = 1.0
     COMPOSER_STATUS_REFRESH_INTERVAL = 1.0
     COMPOSER_MAX_INPUT_ROWS = 6
+    IMAGE_VIEWER_MAX_ROWS = 8
     TRANSCRIPT_BUFFER_LIMIT = 200_000
     BANNER_MESSAGE = Banner::MESSAGE
 
@@ -128,9 +131,12 @@ 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)
+    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)
       @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
       @reader = TTY::Reader.new(input: input, output: output, interrupt: :error)
       @mutex = Mutex.new
       @prompt_history = prompt_history
@@ -162,6 +168,10 @@ module Kward
       @restoring_transcript = false
       @pending_keys = []
       @completion_provider = nil
+      @completion_cycle = nil
+      @completion_overlay = nil
+      @redraw_handler = redraw_handler
+      @transcript_redraw_requested = false
       @original_console_mode = nil
       @raw_mode_active = false
       @slash_commands = normalize_slash_commands(slash_commands)
@@ -174,6 +184,8 @@ module Kward
       @file_editor_open_status = nil
       @file_mention_paths = nil
       @project_browser_state = nil
+      @image_viewer_state = nil
+      @terminal_image_protocol = nil
       @project_browser_restore_after_editor = false
       @editor_state = nil
       @interactive_state = nil
@@ -233,8 +245,8 @@ module Kward
         @started = true
         @asking = true
         disable_editor_mouse_reporting(force: true) unless editor_active?
-        @output_io.print(KEYBOARD_PROTOCOL_ENABLE)
-        @output_io.print(BRACKETED_PASTE_ENABLE)
+        print_output_locked(KEYBOARD_PROTOCOL_ENABLE)
+        print_output_locked(BRACKETED_PASTE_ENABLE)
         render_prompt_locked if render
       end
     end
@@ -243,39 +255,27 @@ module Kward
       @mutex.synchronize do
         return unless @started
 
+        clear_image_viewer_output_locked if image_viewer_active?
         clear_prompt_for_output_locked
         restore_scroll_region_locked
         disable_editor_mouse_reporting(force: true)
-        @output_io.print(BRACKETED_PASTE_RESTORE)
-        @output_io.print(KEYBOARD_PROTOCOL_RESTORE)
+        print_output_locked(BRACKETED_PASTE_RESTORE)
+        print_output_locked(KEYBOARD_PROTOCOL_RESTORE)
         restore_editor_cursor_shape_locked
         set_cursor_visible_locked(true, force: true)
-        @output_io.puts
-        @output_io.flush
+        puts_output_locked
+        flush_output_locked
         @started = false
         restore_console_mode_locked
       end
     end
 
     def say(message)
-      @mutex.synchronize do
-        text = message.to_s
-        if @restoring_transcript
-          write_transcript_text_locked(text)
-          write_transcript_text_locked("\n") unless text.end_with?("\n")
-          @stream_state.finish_block
-          next
-        end
+      write_transcript_message(message, preserve_composer: false)
+    end
 
-        with_synchronized_output_locked do
-          clear_prompt_for_output_locked
-          write_transcript_text_locked(text)
-          write_transcript_text_locked("\n") unless text.end_with?("\n")
-          @stream_state.finish_block
-          render_prompt_after_output_locked
-        end
-        @output_io.flush
-      end
+    def write_transcript(message)
+      write_transcript_message(message, preserve_composer: true)
     end
 
     def say_visual(message)
@@ -290,14 +290,14 @@ module Kward
           @stream_state.finish_block
           render_prompt_after_output_locked
         end
-        @output_io.flush
+        flush_output_locked
       end
     end
 
     def restore_transcript
       start(render: false) unless @started
       @mutex.synchronize do
-        @output_io.print(SYNCHRONIZED_OUTPUT_ENABLE)
+        print_output_locked(SYNCHRONIZED_OUTPUT_ENABLE)
         clear_prompt_for_output_locked unless @rendered_rows.zero? && @last_composer_rows.empty?
         @transcript_buffer.clear
         @transcript_viewport_rows = 0
@@ -312,8 +312,8 @@ module Kward
         @restoring_transcript = false
         width, height = screen_size
         redraw_screen_locked(width: width, height: height)
-        @output_io.print(SYNCHRONIZED_OUTPUT_DISABLE)
-        @output_io.flush
+        print_output_locked(SYNCHRONIZED_OUTPUT_DISABLE)
+        flush_output_locked
       end
     end
 
@@ -328,6 +328,16 @@ module Kward
       @slash_overlay_disabled = previous_slash_overlay_disabled
     end
 
+    def update_completion_provider(provider, slash_overlay: true)
+      @mutex.synchronize do
+        @completion_provider = provider
+        @completion_cycle = nil
+        @completion_overlay = nil
+        @slash_overlay_disabled = !slash_overlay
+        render_prompt_locked if @started
+      end
+    end
+
     def with_prompt_history(history)
       previous_history = @prompt_history
       @prompt_history = history
@@ -342,6 +352,10 @@ module Kward
       @mutex.synchronize { editor_active? }
     end
 
+    def inline_image_protocol
+      @mutex.synchronize { terminal_image_protocol }
+    end
+
     def update_workspace_root(root, prompt_history: nil)
       @mutex.synchronize do
         expanded_root = File.expand_path(root.to_s.empty? ? Dir.pwd : root)
@@ -435,6 +449,8 @@ module Kward
           reset_history_navigation
         end
         @pending_keys.clear
+        @completion_cycle = nil
+        @completion_overlay = nil
         @asking = true
         @busy = false
         @queued_count = 0
@@ -454,11 +470,14 @@ module Kward
             render_prompt_locked unless result.is_a?(String) || result == EXIT_INPUT || prompt_action_result?(result)
           end
         end
+        perform_pending_transcript_redraw
         return result if result.is_a?(String) || prompt_action_result?(result)
         return nil if result == EXIT_INPUT
 
         sleep 0.02 if key.nil?
       end
+    ensure
+      perform_pending_transcript_redraw
     end
 
     def yes?(message, default: false)
@@ -569,37 +588,59 @@ module Kward
         @interactive_state = nil
         restore_composer_snapshot_locked(snapshot)
         redraw_screen_locked if @started
-        @output_io.flush
+        flush_output_locked
       end
     end
 
-    def with_terminal_handoff
+    def with_inline_terminal_handoff(&block)
+      with_terminal_handoff(inline: true, &block)
+    end
+
+    def with_terminal_handoff(inline: false)
       start
       input = nil
       output = nil
+      transition = nil
       @mutex.synchronize do
-        clear_prompt_for_output_locked
-        restore_scroll_region_locked
+        if inline
+          handle_resize_locked
+          reserve_composer_region_locked
+          move_to_transcript_cursor_locked
+        else
+          clear_prompt_for_output_locked
+          restore_scroll_region_locked
+        end
         disable_editor_mouse_reporting(force: true)
-        @output_io.print(BRACKETED_PASTE_RESTORE)
-        @output_io.print(KEYBOARD_PROTOCOL_RESTORE)
+        print_output_locked(BRACKETED_PASTE_RESTORE)
+        print_output_locked(KEYBOARD_PROTOCOL_RESTORE)
         restore_editor_cursor_shape_locked
         set_cursor_visible_locked(true, force: true)
-        @output_io.flush
+        flush_output_locked
         restore_console_mode_locked
         input = @input_io
         output = @output_io
+        transition = method(:switch_terminal_handoff_to_exclusive)
+        @terminal_handoff_mode = inline ? :inline : :exclusive
+        @terminal_owner = :child
       end
 
-      yield(input, output)
+      yield(input, output, transition)
     ensure
       @mutex.synchronize do
+        @terminal_owner = :kward
+        @terminal_handoff_mode = nil
+        restore_scroll_region_locked
+        print_output_locked(TerminalSequences::SGR_RESET)
         enter_raw_mode_locked
-        @output_io.print(KEYBOARD_PROTOCOL_ENABLE)
-        @output_io.print(BRACKETED_PASTE_ENABLE)
+        print_output_locked(KEYBOARD_PROTOCOL_ENABLE)
+        print_output_locked(BRACKETED_PASTE_ENABLE)
+        disable_editor_mouse_reporting(force: true)
+        restore_editor_cursor_shape_locked(force: true)
+        @cursor_visible = nil
         @last_composer_rows = []
-        render_prompt_locked if @started && @asking
-        @output_io.flush
+        width, height = screen_size
+        with_synchronized_output_locked { redraw_screen_locked(width: width, height: height) }
+        flush_output_locked
       end
     end
 
@@ -683,6 +724,8 @@ module Kward
 
     def restore_composer_snapshot_locked(snapshot)
       @composer = snapshot[:composer] || new_composer_state_with_history
+      @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
@@ -811,6 +854,8 @@ module Kward
         render_prompt_locked unless [EXIT_INPUT, CANCEL_INPUT].include?(result) || prompt_action_result?(result)
         [EXIT_INPUT, CANCEL_INPUT].include?(result) ? result : result
       end
+    ensure
+      perform_pending_transcript_redraw
     end
 
     def update_assistant_label(label)
@@ -833,7 +878,7 @@ module Kward
           @stream_state.finish_block
           restore_composer_cursor_locked
         end
-        @output_io.flush
+        flush_output_locked
       end
     end
 
@@ -855,6 +900,23 @@ module Kward
       end
     end
 
+    def record_transient_terminal_output(text, render: true)
+      value = text.to_s
+      return if value.empty?
+
+      @mutex.synchronize do
+        append_transcript_buffer(value)
+        append_transcript_buffer("\n") unless value.end_with?("\n")
+        @stream_state.finish_block
+        width, height = screen_size
+        remember_transcript_viewport_locked(height)
+        next unless render
+
+        with_synchronized_output_locked { redraw_screen_locked(width: width, height: height) }
+        flush_output_locked
+      end
+    end
+
     def write_transcript_delta(delta)
       @mutex.synchronize do
         with_synchronized_output_locked do
@@ -862,7 +924,7 @@ module Kward
           write_transcript_text_locked(delta.to_s)
           restore_composer_cursor_locked unless @restoring_transcript
         end
-        @output_io.flush unless @restoring_transcript
+        flush_output_locked unless @restoring_transcript
       end
     end
 
@@ -876,7 +938,7 @@ module Kward
       @mutex.synchronize do
         width, height = screen_size
         with_synchronized_output_locked { redraw_screen_locked(width: width, height: height) }
-        @output_io.flush
+        flush_output_locked
       end
     end
 
@@ -898,12 +960,71 @@ module Kward
         @stream_state.reset
         width, height = screen_size
         with_synchronized_output_locked { redraw_screen_locked(width: width, height: height) }
-        @output_io.flush
+        flush_output_locked
       end
     end
 
     private
 
+    def switch_terminal_handoff_to_exclusive
+      @mutex.synchronize do
+        return unless @terminal_owner == :child && @terminal_handoff_mode == :inline
+
+        @terminal_owner = :kward
+        with_synchronized_output_locked do
+          clear_prompt_for_output_locked
+          restore_scroll_region_locked
+        end
+        flush_output_locked
+        @terminal_handoff_mode = :exclusive
+        @terminal_owner = :child
+      end
+    end
+
+    def write_transcript_message(message, preserve_composer:)
+      @mutex.synchronize do
+        text = message.to_s
+        if @restoring_transcript
+          write_transcript_text_locked(text)
+          write_transcript_text_locked("\n") unless text.end_with?("\n")
+          @stream_state.finish_block
+          next
+        end
+
+        with_synchronized_output_locked do
+          if preserve_composer
+            prepare_transcript_output_locked
+          else
+            clear_prompt_for_output_locked
+          end
+          write_transcript_text_locked(text)
+          write_transcript_text_locked("\n") unless text.end_with?("\n")
+          @stream_state.finish_block
+          preserve_composer ? restore_composer_cursor_locked : render_prompt_after_output_locked
+        end
+        flush_output_locked
+      end
+    end
+
+    def request_transcript_redraw
+      @transcript_redraw_requested = true
+    end
+
+    def perform_pending_transcript_redraw
+      requested = @mutex.synchronize do
+        pending = @transcript_redraw_requested
+        @transcript_redraw_requested = false
+        pending
+      end
+      return unless requested
+
+      if @redraw_handler
+        @redraw_handler.call
+      else
+        redraw
+      end
+    end
+
     def prompt_workspace_root
       @workspace_root
     end
@@ -913,6 +1034,8 @@ module Kward
       @file_mention_path_entries_paths = nil
       @file_mention_path_entries = nil
       @project_browser_state = nil
+      @image_viewer_state = nil
+      @terminal_image_protocol = nil
       @project_browser_tree_paths = nil
       @project_browser_tree = nil
       @file_overlay_dismissed_token = nil

data/lib/kward/prompts/commands.rb

@@ -28,6 +28,7 @@ module Kward
       { name: "diff", description: "Open the file changes recorded in this session.", argument_hint: "" },
       { 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: "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]" },
@@ -36,6 +37,7 @@ module Kward
       { name: "sandbox", description: "Inspect or configure model command sandboxing.", argument_hint: "[status|off|read_only|workspace_write|network allow|network deny]" },
       { name: "hooks", description: "Inspect lifecycle hooks.", argument_hint: "[list|events|logs|doctor|trust|untrust]" },
       { name: "skill", description: "Activate a skill or capture one from a saved session.", argument_hint: "<name>|capture" },
+      { name: "skills", description: "Review project skill trust.", argument_hint: "[status|trust|untrust]" },
       { name: "memory", description: "Inspect and manage Kward memory.", argument_hint: "[enable|disable|auto-summary|core|add|list|forget|promote|relax|inspect|why|summarize]" }
     ].freeze
     BUILTIN_RESERVED_COMMAND_NAMES = BUILTIN_COMMANDS.map { |command| command[:name] }.freeze

data/lib/kward/prompts.rb

@@ -22,22 +22,22 @@ module Kward
     # @param plugin_context [String, nil] trusted plugin-provided instructions
     # @return [Hash] role/content system message
     # @api public
-    def system_message(workspace_root: Dir.pwd, include_workspace_personality: true, model: nil, reasoning_effort: nil, now: Time.now, memory_context: nil, plugin_context: nil, execution_profile_context: nil)
+    def system_message(workspace_root: Dir.pwd, include_workspace_personality: true, model: nil, reasoning_effort: nil, now: Time.now, memory_context: nil, plugin_context: nil, execution_profile_context: nil, project_skill_paths: nil)
       {
         role: "system",
-        content: prompt_parts(workspace_root: workspace_root, include_workspace_personality: include_workspace_personality, model: model, reasoning_effort: reasoning_effort, now: now, memory_context: memory_context, plugin_context: plugin_context, execution_profile_context: execution_profile_context).compact.join("\n\n")
+        content: prompt_parts(workspace_root: workspace_root, include_workspace_personality: include_workspace_personality, model: model, reasoning_effort: reasoning_effort, now: now, memory_context: memory_context, plugin_context: plugin_context, execution_profile_context: execution_profile_context, project_skill_paths: project_skill_paths).compact.join("\n\n")
       }
     end
 
-    def prompt_parts(workspace_root: Dir.pwd, include_workspace_personality: true, model: nil, reasoning_effort: nil, now: Time.now, memory_context: nil, plugin_context: nil, execution_profile_context: nil)
-      prompt_sections(workspace_root: workspace_root, include_workspace_personality: include_workspace_personality, model: model, reasoning_effort: reasoning_effort, now: now, memory_context: memory_context, plugin_context: plugin_context, execution_profile_context: execution_profile_context).map { |section| section[:content] }
+    def prompt_parts(workspace_root: Dir.pwd, include_workspace_personality: true, model: nil, reasoning_effort: nil, now: Time.now, memory_context: nil, plugin_context: nil, execution_profile_context: nil, project_skill_paths: nil)
+      prompt_sections(workspace_root: workspace_root, include_workspace_personality: include_workspace_personality, model: model, reasoning_effort: reasoning_effort, now: now, memory_context: memory_context, plugin_context: plugin_context, execution_profile_context: execution_profile_context, project_skill_paths: project_skill_paths).map { |section| section[:content] }
     end
 
     # Returns labeled prompt sections for inspection by CLI and RPC frontends.
     #
     # @return [Array<Hash>] section hashes with label, content, and optional source
     # @api public
-    def prompt_sections(workspace_root: Dir.pwd, include_workspace_personality: true, model: nil, reasoning_effort: nil, now: Time.now, memory_context: nil, plugin_context: nil, execution_profile_context: nil)
+    def prompt_sections(workspace_root: Dir.pwd, include_workspace_personality: true, model: nil, reasoning_effort: nil, now: Time.now, memory_context: nil, plugin_context: nil, execution_profile_context: nil, project_skill_paths: nil)
       return replacement_prompt_sections if ConfigFiles.replacement_system_prompt?
 
       sections = [prompt_section("Built-in system prompt", base_prompt)]
@@ -48,7 +48,7 @@ module Kward
         sections << prompt_section("Persona", persona_prompt(workspace_root, model: model, reasoning_effort: reasoning_effort, now: now))
         sections << prompt_section("Plugin context", plugin_context) unless plugin_context.to_s.empty?
       end
-      skills = ConfigFiles.skills(workspace_root: workspace_root)
+      skills = ConfigFiles.skills(workspace_root: workspace_root, project_skill_paths: project_skill_paths)
       sections << prompt_section("Configured skills", skills_prompt(skills), source: skills.empty? ? nil : File.join(ConfigFiles.config_dir, "skills"))
       sections << prompt_section(workspace_agents_context_label(workspace_root), workspace_agents_context(workspace_root), source: ConfigFiles.workspace_agents_file?(workspace_root) ? ConfigFiles.workspace_agents_path(workspace_root) : nil)
       sections.compact