kward 0.85.0 → 0.86.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +130 -0
- data/CONTRIBUTING.md +1 -1
- data/Gemfile.lock +6 -2
- data/README.md +3 -3
- data/Rakefile +3 -0
- data/doc/agent-tools.md +11 -0
- data/doc/api.md +4 -1
- data/doc/composer.md +4 -3
- data/doc/configuration.md +60 -11
- data/doc/extensibility.md +2 -0
- data/doc/getting-started.md +3 -3
- data/doc/git.md +1 -1
- data/doc/memory.md +1 -1
- data/doc/plugins.md +40 -5
- data/doc/providers.md +10 -4
- data/doc/rpc.md +125 -7
- data/doc/session-management.md +36 -1
- data/doc/shell.md +643 -27
- data/doc/tabs.md +2 -1
- data/doc/troubleshooting.md +1 -1
- data/doc/usage.md +21 -11
- data/examples/plugins/openrouter_proxy/README.md +103 -0
- data/examples/plugins/openrouter_proxy/fake_embeddings.rb +85 -0
- data/examples/plugins/openrouter_proxy/plugin.rb +7 -0
- data/examples/plugins/openrouter_proxy/protocol.rb +202 -0
- data/examples/plugins/openrouter_proxy/server.rb +186 -0
- data/examples/plugins/space_invaders.rb +0 -1
- data/exe/kward +2 -2
- data/exe/kwsh +7 -0
- data/kward.gemspec +3 -1
- data/lib/kward/agent.rb +43 -9
- data/lib/kward/cli/commands.rb +41 -11
- data/lib/kward/cli/interactive_turn.rb +10 -0
- data/lib/kward/cli/plugins.rb +5 -1
- data/lib/kward/cli/prompt_interface.rb +4 -1
- data/lib/kward/cli/rendering.rb +21 -28
- data/lib/kward/cli/runtime_helpers.rb +52 -34
- data/lib/kward/cli/settings/model.rb +1 -12
- data/lib/kward/cli/tabs.rb +91 -18
- data/lib/kward/cli/tool_summaries.rb +2 -0
- data/lib/kward/cli/transcript_formatter.rb +3 -10
- data/lib/kward/cli/worktrees.rb +1 -0
- data/lib/kward/cli.rb +56 -7
- data/lib/kward/config/core.rb +16 -5
- data/lib/kward/config/extensions.rb +3 -0
- data/lib/kward/config/paths.rb +11 -0
- data/lib/kward/config/settings.rb +7 -0
- data/lib/kward/conversation.rb +11 -1
- data/lib/kward/entrypoint.rb +14 -0
- data/lib/kward/events.rb +2 -0
- data/lib/kward/generated_images.rb +237 -0
- data/lib/kward/model/catalog.rb +6 -3
- data/lib/kward/model/client.rb +105 -36
- data/lib/kward/model/codex_images.rb +83 -0
- data/lib/kward/model/copilot_models.rb +8 -4
- data/lib/kward/model/model_info.rb +27 -9
- data/lib/kward/model/openrouter_model_cache.rb +4 -2
- data/lib/kward/model/payloads.rb +6 -5
- data/lib/kward/model/sources.rb +3 -1
- data/lib/kward/model/stream_parser.rb +4 -7
- data/lib/kward/pan/index.html.erb +8 -1
- data/lib/kward/pan/server.rb +13 -1
- data/lib/kward/plugins/codex_responses.rb +73 -0
- data/lib/kward/plugins/host.rb +16 -0
- data/lib/kward/plugins/http_server.rb +83 -0
- data/lib/kward/plugins/registry.rb +39 -0
- data/lib/kward/prompt_interface/composer_controller.rb +0 -1
- data/lib/kward/prompt_interface/composer_renderer.rb +159 -72
- data/lib/kward/prompt_interface/editor/controller.rb +1 -1
- data/lib/kward/prompt_interface/editor/renderer.rb +10 -7
- data/lib/kward/prompt_interface/file_overlay.rb +3 -3
- data/lib/kward/prompt_interface/generated_image_preview.rb +162 -0
- data/lib/kward/prompt_interface/git_prompt.rb +18 -11
- data/lib/kward/prompt_interface/interactive/renderer.rb +1 -1
- data/lib/kward/prompt_interface/interactive/state.rb +18 -20
- data/lib/kward/prompt_interface/key_handler.rb +108 -25
- data/lib/kward/prompt_interface/layout.rb +11 -1
- data/lib/kward/prompt_interface/overlay_renderer.rb +25 -8
- data/lib/kward/prompt_interface/project_browser.rb +27 -54
- data/lib/kward/prompt_interface/prompt_renderer.rb +27 -35
- data/lib/kward/prompt_interface/question_prompt.rb +19 -28
- data/lib/kward/prompt_interface/runtime_state.rb +31 -9
- data/lib/kward/prompt_interface/screen.rb +24 -21
- data/lib/kward/prompt_interface/selection_prompt.rb +8 -8
- data/lib/kward/prompt_interface/slash_overlay.rb +1 -1
- data/lib/kward/prompt_interface/transcript_renderer.rb +7 -6
- data/lib/kward/prompt_interface.rb +109 -39
- data/lib/kward/prompts.rb +7 -1
- data/lib/kward/pty/adaptive_output_sink.rb +38 -4
- data/lib/kward/pty/interactive_runner.rb +20 -28
- data/lib/kward/pty/transcript_normalizer.rb +65 -21
- data/lib/kward/rpc/config_manager.rb +3 -0
- data/lib/kward/rpc/server.rb +27 -5
- data/lib/kward/rpc/session_manager.rb +62 -17
- data/lib/kward/rpc/transcript_normalizer.rb +11 -7
- data/lib/kward/sessions/store.rb +30 -3
- data/lib/kward/shell/kwsh.rb +27 -7
- data/lib/kward/shell/kwshrc.rb +11 -2
- data/lib/kward/shell/native_arithmetic.rb +255 -0
- data/lib/kward/shell/native_arrays.rb +102 -0
- data/lib/kward/shell/native_braces.rb +96 -0
- data/lib/kward/shell/native_builtins.rb +476 -0
- data/lib/kward/shell/native_completion.rb +169 -0
- data/lib/kward/shell/native_condition.rb +75 -0
- data/lib/kward/shell/native_directory.rb +116 -0
- data/lib/kward/shell/native_exec_state.rb +73 -0
- data/lib/kward/shell/native_expansion.rb +252 -0
- data/lib/kward/shell/native_fields.rb +62 -0
- data/lib/kward/shell/native_glob.rb +96 -0
- data/lib/kward/shell/native_history.rb +242 -0
- data/lib/kward/shell/native_interactive.rb +164 -0
- data/lib/kward/shell/native_invocation.rb +42 -0
- data/lib/kward/shell/native_jobs.rb +250 -0
- data/lib/kward/shell/native_line_editor.rb +382 -0
- data/lib/kward/shell/native_line_terminal.rb +286 -0
- data/lib/kward/shell/native_locale.rb +109 -0
- data/lib/kward/shell/native_locals.rb +57 -0
- data/lib/kward/shell/native_pattern.rb +200 -0
- data/lib/kward/shell/native_process.rb +279 -0
- data/lib/kward/shell/native_program.rb +40 -0
- data/lib/kward/shell/native_programmable_completion.rb +115 -0
- data/lib/kward/shell/native_prompt_format.rb +89 -0
- data/lib/kward/shell/native_runtime.rb +964 -0
- data/lib/kward/shell/native_substitution.rb +110 -0
- data/lib/kward/shell/native_syntax.rb +946 -0
- data/lib/kward/shell/native_traps.rb +196 -0
- data/lib/kward/shell/native_vi.rb +407 -0
- data/lib/kward/shell/native_vi_terminal.rb +19 -0
- data/lib/kward/shell/native_worker.rb +82 -0
- data/lib/kward/shell/persistent_session.rb +184 -190
- data/lib/kward/shell/prompt.rb +14 -0
- data/lib/kward/shell/prompt_agent.rb +17 -0
- data/lib/kward/shell/script_runner.rb +244 -0
- data/lib/kward/shell/standalone_agent.rb +31 -0
- data/lib/kward/shell/standalone_link.rb +78 -0
- data/lib/kward/shell/standalone_terminal.rb +287 -0
- data/lib/kward/terminal/keys.rb +22 -1
- data/lib/kward/terminal/locale_text.rb +29 -0
- data/lib/kward/terminal/sequences.rb +45 -4
- data/lib/kward/tools/datetime.rb +85 -0
- data/lib/kward/tools/generate_image.rb +36 -0
- data/lib/kward/tools/registry.rb +35 -9
- data/lib/kward/tools/tool_call.rb +3 -1
- data/lib/kward/transcripts/markdown_transcript.rb +8 -0
- data/lib/kward/transcripts/turn_summary_formatter.rb +93 -0
- data/lib/kward/transport/gateway.rb +2 -1
- data/lib/kward/turn_summary.rb +68 -0
- data/lib/kward/version.rb +1 -1
- data/lib/main.rb +6 -3
- metadata +84 -1
|
@@ -54,6 +54,7 @@ require_relative "prompt_interface/layout"
|
|
|
54
54
|
require_relative "prompt_interface/screen"
|
|
55
55
|
require_relative "prompt_interface/key_handler"
|
|
56
56
|
require_relative "prompt_interface/runtime_state"
|
|
57
|
+
require_relative "prompt_interface/generated_image_preview"
|
|
57
58
|
|
|
58
59
|
# Namespace for the Kward CLI agent runtime.
|
|
59
60
|
module Kward
|
|
@@ -70,8 +71,8 @@ module Kward
|
|
|
70
71
|
class PromptInterface
|
|
71
72
|
HELP_TEXT = "Enter sends • Shift+Enter newline • / commands • @ files • ↑/↓ history • Ctrl+D exits".freeze
|
|
72
73
|
BUSY_HELP_TEXT = "Ctrl+C cancels".freeze
|
|
73
|
-
SPINNER_FRAMES = %w[
|
|
74
|
-
SPINNER_INTERVAL = 0.
|
|
74
|
+
SPINNER_FRAMES = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].freeze
|
|
75
|
+
SPINNER_INTERVAL = 0.1
|
|
75
76
|
FOOTER_REFRESH_INTERVAL = 1.0
|
|
76
77
|
COMPOSER_STATUS_REFRESH_INTERVAL = 1.0
|
|
77
78
|
COMPLETION_DISPLAY_SECONDS = 0.8
|
|
@@ -86,6 +87,7 @@ module Kward
|
|
|
86
87
|
include SlashOverlay
|
|
87
88
|
include FileOverlay
|
|
88
89
|
include ProjectBrowser
|
|
90
|
+
include GeneratedImagePreview
|
|
89
91
|
include SelectionPrompt
|
|
90
92
|
include QuestionPrompt
|
|
91
93
|
include PluginUIRequests
|
|
@@ -143,18 +145,45 @@ module Kward
|
|
|
143
145
|
end
|
|
144
146
|
end
|
|
145
147
|
|
|
146
|
-
#
|
|
148
|
+
# Kward owns keyboard encoding while its tab shortcuts are reserved. Child
|
|
149
|
+
# keyboard-mode mutations must not pop our stack entry or change that encoding.
|
|
150
|
+
# Other controls remain terminal-owned, including streamed OSC/DCS payloads.
|
|
147
151
|
class TerminalHandoffOutput
|
|
148
|
-
|
|
152
|
+
MAX_SEQUENCE_BYTES = 4096
|
|
153
|
+
|
|
154
|
+
def initialize(output)
|
|
149
155
|
@output = output
|
|
150
|
-
@on_keyboard_protocol_restore = on_keyboard_protocol_restore
|
|
151
156
|
@pending = +"".b
|
|
157
|
+
@string = false
|
|
158
|
+
@string_escape = false
|
|
152
159
|
end
|
|
153
160
|
|
|
154
161
|
def write(value)
|
|
155
162
|
value = value.to_s.b
|
|
156
|
-
|
|
157
|
-
|
|
163
|
+
forwarded = +"".b
|
|
164
|
+
value.each_byte do |byte|
|
|
165
|
+
if @string
|
|
166
|
+
forwarded << byte
|
|
167
|
+
@string = false if byte == 0x18 || byte == 0x1a || (@string == 0x5d && byte == 0x07) || (@string_escape && byte == 0x5c)
|
|
168
|
+
@string_escape = byte == 0x1b
|
|
169
|
+
elsif @pending.empty?
|
|
170
|
+
byte == 0x1b ? @pending << byte : forwarded << byte
|
|
171
|
+
elsif byte == 0x1b
|
|
172
|
+
forwarded << @pending << TerminalSequences::CONTROL_SEQUENCE_CANCEL
|
|
173
|
+
@pending = +"\e".b
|
|
174
|
+
elsif byte == 0x18 || byte == 0x1a
|
|
175
|
+
forwarded << @pending << byte
|
|
176
|
+
@pending.clear
|
|
177
|
+
elsif byte < 0x20 || byte == 0x7f
|
|
178
|
+
# C0 controls can execute inside CSI without ending its parameters.
|
|
179
|
+
forwarded << byte
|
|
180
|
+
else
|
|
181
|
+
@pending << byte
|
|
182
|
+
consume_sequence(forwarded)
|
|
183
|
+
end
|
|
184
|
+
end
|
|
185
|
+
@output.write(forwarded) unless forwarded.empty?
|
|
186
|
+
value.bytesize
|
|
158
187
|
end
|
|
159
188
|
|
|
160
189
|
def print(*values)
|
|
@@ -168,13 +197,25 @@ module Kward
|
|
|
168
197
|
|
|
169
198
|
private
|
|
170
199
|
|
|
171
|
-
def
|
|
172
|
-
@pending
|
|
173
|
-
|
|
200
|
+
def consume_sequence(forwarded)
|
|
201
|
+
if @pending.bytesize == 2 && [0x5d, 0x50, 0x5e, 0x5f, 0x58].include?(@pending.getbyte(1))
|
|
202
|
+
@string = @pending.getbyte(1)
|
|
203
|
+
@string_escape = false
|
|
204
|
+
elsif @pending.start_with?("\e[")
|
|
205
|
+
return if @pending.bytesize == 2
|
|
206
|
+
byte = @pending.getbyte(-1)
|
|
207
|
+
return if byte.between?(0x20, 0x3f) && @pending.bytesize < MAX_SEQUENCE_BYTES
|
|
208
|
+
elsif @pending.getbyte(-1).between?(0x20, 0x2f) && @pending.bytesize < MAX_SEQUENCE_BYTES
|
|
209
|
+
return
|
|
210
|
+
end
|
|
174
211
|
|
|
175
|
-
@
|
|
176
|
-
|
|
177
|
-
|
|
212
|
+
unless TerminalSequences.keyboard_mode_mutation?(@pending)
|
|
213
|
+
forwarded << @pending
|
|
214
|
+
forwarded << TerminalSequences::CONTROL_SEQUENCE_CANCEL if @pending.bytesize >= MAX_SEQUENCE_BYTES
|
|
215
|
+
# Main and alternate screens have independent keyboard mode stacks.
|
|
216
|
+
forwarded << TerminalSequences::KEYBOARD_PROTOCOL_SET if TerminalSequences.keyboard_mode_reset?(@pending)
|
|
217
|
+
end
|
|
218
|
+
@pending.clear
|
|
178
219
|
end
|
|
179
220
|
end
|
|
180
221
|
|
|
@@ -184,7 +225,6 @@ module Kward
|
|
|
184
225
|
# Logical state may change during a child handoff, but only the owner may render.
|
|
185
226
|
@terminal_owner = :kward
|
|
186
227
|
@terminal_handoff_mode = nil
|
|
187
|
-
@terminal_handoff_keyboard_protocol_reset = false
|
|
188
228
|
@reader = TTY::Reader.new(input: input, output: output, interrupt: :error)
|
|
189
229
|
@mutex = Mutex.new
|
|
190
230
|
@prompt_history = prompt_history
|
|
@@ -195,6 +235,7 @@ module Kward
|
|
|
195
235
|
@asking = false
|
|
196
236
|
@busy = false
|
|
197
237
|
@busy_activity = "thinking"
|
|
238
|
+
@busy_activity_visible = true
|
|
198
239
|
@busy_started_at = nil
|
|
199
240
|
@last_busy_elapsed = nil
|
|
200
241
|
@completion_status = nil
|
|
@@ -205,14 +246,14 @@ module Kward
|
|
|
205
246
|
@last_spinner_tick = monotonic_now
|
|
206
247
|
@last_footer_refresh = nil
|
|
207
248
|
@cached_footer_text = nil
|
|
208
|
-
@last_composer_status_refresh =
|
|
249
|
+
@last_composer_status_refresh = nil
|
|
209
250
|
@cached_composer_status_text = nil
|
|
210
251
|
@prompt_label = "You>"
|
|
211
252
|
@assistant_label = "Assistant"
|
|
212
253
|
@stream_state = StreamState.new
|
|
213
254
|
@rendered_rows = 0
|
|
214
255
|
@last_composer_rows = []
|
|
215
|
-
@
|
|
256
|
+
@rendered_composer_cursor = nil
|
|
216
257
|
@transcript_buffer = TranscriptBuffer.new(limit: TRANSCRIPT_BUFFER_LIMIT)
|
|
217
258
|
@transcript_viewport_rows = 0
|
|
218
259
|
@restoring_transcript = false
|
|
@@ -323,7 +364,10 @@ module Kward
|
|
|
323
364
|
|
|
324
365
|
clear_image_viewer_output_locked if image_viewer_active?
|
|
325
366
|
clear_prompt_for_output_locked
|
|
367
|
+
last_transcript_row = transcript_bottom_row
|
|
326
368
|
restore_scroll_region_locked
|
|
369
|
+
# Resetting the scroll region homes the cursor on VT terminals.
|
|
370
|
+
move_to_screen(last_transcript_row, 1)
|
|
327
371
|
disable_editor_mouse_reporting(force: true)
|
|
328
372
|
print_output_locked(BRACKETED_PASTE_RESTORE)
|
|
329
373
|
print_output_locked(KEYBOARD_PROTOCOL_RESTORE)
|
|
@@ -544,8 +588,8 @@ module Kward
|
|
|
544
588
|
editor_open = @mutex.synchronize do
|
|
545
589
|
if key.nil?
|
|
546
590
|
resized = handle_resize_locked
|
|
547
|
-
|
|
548
|
-
render_prompt_locked if resized ||
|
|
591
|
+
chrome_changed = tick_composer_chrome_locked
|
|
592
|
+
render_prompt_locked if resized || chrome_changed
|
|
549
593
|
else
|
|
550
594
|
result = handle_key(key)
|
|
551
595
|
action = result if prompt_action_result?(result)
|
|
@@ -589,9 +633,10 @@ module Kward
|
|
|
589
633
|
@mutex.synchronize do
|
|
590
634
|
if key.nil?
|
|
591
635
|
resized = handle_resize_locked
|
|
592
|
-
|
|
636
|
+
chrome_changed = tick_composer_chrome_locked
|
|
593
637
|
completion_changed = tick_completion_locked
|
|
594
|
-
|
|
638
|
+
preview_opened = open_pending_generated_image_locked
|
|
639
|
+
render_prompt_locked if resized || chrome_changed || completion_changed || preview_opened
|
|
595
640
|
else
|
|
596
641
|
result = handle_key(key)
|
|
597
642
|
render_prompt_locked unless result.is_a?(String) || result == EXIT_INPUT || prompt_action_result?(result)
|
|
@@ -654,8 +699,8 @@ module Kward
|
|
|
654
699
|
@mutex.synchronize do
|
|
655
700
|
if key.nil?
|
|
656
701
|
resized = handle_resize_locked
|
|
657
|
-
|
|
658
|
-
render_prompt_locked if resized ||
|
|
702
|
+
chrome_changed = tick_composer_chrome_locked
|
|
703
|
+
render_prompt_locked if resized || chrome_changed
|
|
659
704
|
else
|
|
660
705
|
result = handle_select_key(key)
|
|
661
706
|
result = drain_pending_select_keys_locked(result)
|
|
@@ -743,6 +788,7 @@ module Kward
|
|
|
743
788
|
input = nil
|
|
744
789
|
output = nil
|
|
745
790
|
transition = nil
|
|
791
|
+
keep_view = false
|
|
746
792
|
@mutex.synchronize do
|
|
747
793
|
if inline
|
|
748
794
|
handle_resize_locked
|
|
@@ -756,16 +802,15 @@ module Kward
|
|
|
756
802
|
print_output_locked(BRACKETED_PASTE_RESTORE)
|
|
757
803
|
print_output_locked(KEYBOARD_PROTOCOL_RESTORE) unless preserve_tab_keybindings
|
|
758
804
|
@handoff_input_buffer.clear
|
|
759
|
-
@
|
|
805
|
+
@handoff_escape_deadline = nil
|
|
806
|
+
@handoff_bracketed_paste = false
|
|
760
807
|
restore_editor_cursor_shape_locked
|
|
761
808
|
set_cursor_visible_locked(true, force: true)
|
|
762
809
|
flush_output_locked
|
|
763
810
|
restore_console_mode_locked
|
|
764
811
|
input = @input_io
|
|
765
812
|
output = if preserve_tab_keybindings
|
|
766
|
-
TerminalHandoffOutput.new(@output_io
|
|
767
|
-
@terminal_handoff_keyboard_protocol_reset = true
|
|
768
|
-
})
|
|
813
|
+
TerminalHandoffOutput.new(@output_io)
|
|
769
814
|
else
|
|
770
815
|
@output_io
|
|
771
816
|
end
|
|
@@ -774,26 +819,34 @@ module Kward
|
|
|
774
819
|
@terminal_owner = :child
|
|
775
820
|
end
|
|
776
821
|
|
|
777
|
-
yield(input, output, transition)
|
|
822
|
+
yield(input, output, transition, -> { keep_view = true })
|
|
778
823
|
ensure
|
|
779
824
|
@mutex.synchronize do
|
|
825
|
+
width, height = screen_size
|
|
826
|
+
keep_view &&= @terminal_handoff_mode == :inline && width == @last_width && height == @last_height
|
|
780
827
|
@terminal_owner = :kward
|
|
781
828
|
@terminal_handoff_mode = nil
|
|
782
|
-
|
|
829
|
+
print_output_locked(TerminalSequences::CONTROL_SEQUENCE_CANCEL)
|
|
830
|
+
print_output_locked(TerminalSequences::COMPOSER_MODES_RESTORE)
|
|
831
|
+
restore_scroll_region_locked unless keep_view
|
|
783
832
|
print_output_locked(TerminalSequences::SGR_RESET)
|
|
784
833
|
enter_raw_mode_locked
|
|
785
|
-
|
|
786
|
-
print_output_locked(KEYBOARD_PROTOCOL_ENABLE)
|
|
787
|
-
end
|
|
834
|
+
print_output_locked(preserve_tab_keybindings ? TerminalSequences::KEYBOARD_PROTOCOL_SET : KEYBOARD_PROTOCOL_ENABLE)
|
|
788
835
|
print_output_locked(BRACKETED_PASTE_ENABLE)
|
|
789
836
|
@handoff_input_buffer.clear
|
|
790
|
-
@
|
|
837
|
+
@handoff_escape_deadline = nil
|
|
838
|
+
@handoff_bracketed_paste = false
|
|
791
839
|
disable_editor_mouse_reporting(force: true)
|
|
792
840
|
restore_editor_cursor_shape_locked(force: true)
|
|
793
841
|
@cursor_visible = nil
|
|
794
842
|
@last_composer_rows = []
|
|
795
|
-
|
|
796
|
-
|
|
843
|
+
with_synchronized_output_locked do
|
|
844
|
+
if keep_view
|
|
845
|
+
resume_inline_terminal_view_locked(height)
|
|
846
|
+
else
|
|
847
|
+
redraw_screen_locked(width: width, height: height)
|
|
848
|
+
end
|
|
849
|
+
end
|
|
797
850
|
flush_output_locked
|
|
798
851
|
end
|
|
799
852
|
end
|
|
@@ -921,11 +974,12 @@ module Kward
|
|
|
921
974
|
end
|
|
922
975
|
end
|
|
923
976
|
|
|
924
|
-
def begin_busy_input(message = "You>", activity: "thinking")
|
|
977
|
+
def begin_busy_input(message = "You>", activity: "thinking", show_activity: true)
|
|
925
978
|
start
|
|
926
979
|
@mutex.synchronize do
|
|
927
980
|
@prompt_label = message.to_s
|
|
928
981
|
@busy_activity = normalize_busy_activity(activity)
|
|
982
|
+
@busy_activity_visible = show_activity
|
|
929
983
|
@completion_status = nil
|
|
930
984
|
@response_arrival_until = nil
|
|
931
985
|
self.composer_input = ""
|
|
@@ -950,6 +1004,7 @@ module Kward
|
|
|
950
1004
|
return false if value == @busy_activity
|
|
951
1005
|
|
|
952
1006
|
@busy_activity = value
|
|
1007
|
+
@image_generation_started_at = value == "Generating image…" ? monotonic_now : nil
|
|
953
1008
|
render_prompt_locked if @started && @asking && @busy
|
|
954
1009
|
true
|
|
955
1010
|
end
|
|
@@ -985,6 +1040,7 @@ module Kward
|
|
|
985
1040
|
@busy_started_at = nil
|
|
986
1041
|
@busy = false
|
|
987
1042
|
@busy_activity = "thinking"
|
|
1043
|
+
@busy_activity_visible = true
|
|
988
1044
|
@response_arrival_until = nil
|
|
989
1045
|
@queued_count = 0
|
|
990
1046
|
@steered_count = 0
|
|
@@ -1011,6 +1067,10 @@ module Kward
|
|
|
1011
1067
|
@mutex.synchronize { filter_terminal_handoff_input_locked(chunk) }
|
|
1012
1068
|
end
|
|
1013
1069
|
|
|
1070
|
+
def flush_terminal_handoff_escape
|
|
1071
|
+
@mutex.synchronize { flush_terminal_handoff_escape_locked }
|
|
1072
|
+
end
|
|
1073
|
+
|
|
1014
1074
|
def poll_input
|
|
1015
1075
|
key = read_key(nonblock: true)
|
|
1016
1076
|
@mutex.synchronize do
|
|
@@ -1033,9 +1093,10 @@ module Kward
|
|
|
1033
1093
|
if key.nil?
|
|
1034
1094
|
resized = handle_resize_locked
|
|
1035
1095
|
spun = tick_spinner_locked
|
|
1036
|
-
|
|
1096
|
+
chrome_changed = tick_composer_chrome_locked
|
|
1037
1097
|
completion_changed = tick_completion_locked
|
|
1038
|
-
|
|
1098
|
+
preview_opened = open_pending_generated_image_locked
|
|
1099
|
+
render_prompt_locked if resized || spun || chrome_changed || completion_changed || preview_opened
|
|
1039
1100
|
return nil
|
|
1040
1101
|
end
|
|
1041
1102
|
|
|
@@ -1046,7 +1107,7 @@ module Kward
|
|
|
1046
1107
|
|
|
1047
1108
|
result = handle_key(key)
|
|
1048
1109
|
render_prompt_locked unless [EXIT_INPUT, CANCEL_INPUT].include?(result) || prompt_action_result?(result)
|
|
1049
|
-
|
|
1110
|
+
result
|
|
1050
1111
|
end
|
|
1051
1112
|
ensure
|
|
1052
1113
|
perform_pending_transcript_redraw
|
|
@@ -1141,7 +1202,7 @@ module Kward
|
|
|
1141
1202
|
@cached_footer_text = nil
|
|
1142
1203
|
@last_footer_refresh = nil
|
|
1143
1204
|
@cached_composer_status_text = nil
|
|
1144
|
-
@last_composer_status_refresh =
|
|
1205
|
+
@last_composer_status_refresh = nil
|
|
1145
1206
|
render_prompt_locked if @started && @asking
|
|
1146
1207
|
end
|
|
1147
1208
|
end
|
|
@@ -1160,6 +1221,15 @@ module Kward
|
|
|
1160
1221
|
|
|
1161
1222
|
private
|
|
1162
1223
|
|
|
1224
|
+
def resume_inline_terminal_view_locked(height)
|
|
1225
|
+
# Start later transcript output on a blank live row without clearing image placements.
|
|
1226
|
+
move_to_screen(transcript_bottom_row(height), 1)
|
|
1227
|
+
print_output_locked("\r\n")
|
|
1228
|
+
@stream_state.reset
|
|
1229
|
+
render_prompt_locked
|
|
1230
|
+
render_cursor_visibility_locked unless @asking
|
|
1231
|
+
end
|
|
1232
|
+
|
|
1163
1233
|
def switch_terminal_handoff_to_exclusive
|
|
1164
1234
|
@mutex.synchronize do
|
|
1165
1235
|
return unless @terminal_owner == :child && @terminal_handoff_mode == :inline
|
data/lib/kward/prompts.rb
CHANGED
|
@@ -50,7 +50,9 @@ module Kward
|
|
|
50
50
|
end
|
|
51
51
|
skills = ConfigFiles.skills(workspace_root: workspace_root, project_skill_paths: project_skill_paths)
|
|
52
52
|
sections << prompt_section("Configured skills", skills_prompt(skills), source: skills.empty? ? nil : File.join(ConfigFiles.config_dir, "skills"))
|
|
53
|
-
|
|
53
|
+
unless ConfigFiles.ignore_local_instructions?
|
|
54
|
+
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)
|
|
55
|
+
end
|
|
54
56
|
sections.compact
|
|
55
57
|
end
|
|
56
58
|
|
|
@@ -88,6 +90,8 @@ module Kward
|
|
|
88
90
|
end
|
|
89
91
|
|
|
90
92
|
def workspace_agents_context(workspace_root = Dir.pwd)
|
|
93
|
+
return nil if ConfigFiles.ignore_local_instructions?
|
|
94
|
+
|
|
91
95
|
if ConfigFiles.enforce_workspace_agents_file?
|
|
92
96
|
ConfigFiles.workspace_agents_prompt(workspace_root)
|
|
93
97
|
else
|
|
@@ -96,6 +100,8 @@ module Kward
|
|
|
96
100
|
end
|
|
97
101
|
|
|
98
102
|
def workspace_agents_prompt(workspace_root = Dir.pwd)
|
|
103
|
+
return nil if ConfigFiles.ignore_local_instructions?
|
|
104
|
+
|
|
99
105
|
ConfigFiles.workspace_agents_prompt(workspace_root)
|
|
100
106
|
end
|
|
101
107
|
|
|
@@ -7,6 +7,7 @@ module Kward
|
|
|
7
7
|
# screen-oriented or unknown terminal controls.
|
|
8
8
|
class AdaptivePtyOutputSink
|
|
9
9
|
MAX_SEQUENCE_BYTES = 4096
|
|
10
|
+
MAX_KITTY_SEQUENCE_BYTES = 4096 + 512
|
|
10
11
|
SAFE_CONTROLS = [0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d].freeze
|
|
11
12
|
TERMINAL_STRING_INTRODUCERS = [0x5d, 0x50, 0x5e, 0x5f, 0x58].freeze
|
|
12
13
|
|
|
@@ -22,14 +23,18 @@ module Kward
|
|
|
22
23
|
@mode = :inline
|
|
23
24
|
@sequence = +"".b
|
|
24
25
|
@synchronized_output = false
|
|
26
|
+
@kitty_graphics = false
|
|
25
27
|
end
|
|
26
28
|
|
|
27
29
|
def write(chunk)
|
|
28
30
|
value = chunk.to_s.b
|
|
29
|
-
|
|
30
|
-
|
|
31
|
+
if exclusive?
|
|
32
|
+
capture(value)
|
|
33
|
+
return @output.write(value)
|
|
34
|
+
end
|
|
31
35
|
|
|
32
36
|
write_inline(value)
|
|
37
|
+
value.bytesize
|
|
33
38
|
end
|
|
34
39
|
|
|
35
40
|
def flush
|
|
@@ -54,6 +59,11 @@ module Kward
|
|
|
54
59
|
inline? && @sequence.empty?
|
|
55
60
|
end
|
|
56
61
|
|
|
62
|
+
# Images and capability probes belong to the live terminal, not transcript replay.
|
|
63
|
+
def preserve_terminal_view?
|
|
64
|
+
inline? && @kitty_graphics
|
|
65
|
+
end
|
|
66
|
+
|
|
57
67
|
def pre_input_capture_only?
|
|
58
68
|
true
|
|
59
69
|
end
|
|
@@ -90,6 +100,11 @@ module Kward
|
|
|
90
100
|
track_safe_sequence(@sequence)
|
|
91
101
|
safe_output << @sequence
|
|
92
102
|
@sequence.clear
|
|
103
|
+
elsif status == :kitty
|
|
104
|
+
flush_safe_output(safe_output)
|
|
105
|
+
@output.write(@sequence)
|
|
106
|
+
@sequence.clear
|
|
107
|
+
@kitty_graphics = true
|
|
93
108
|
elsif status == :exclusive
|
|
94
109
|
flush_safe_output(safe_output)
|
|
95
110
|
remainder = value.byteslice((index + 1)..).to_s.b
|
|
@@ -104,10 +119,11 @@ module Kward
|
|
|
104
119
|
end
|
|
105
120
|
|
|
106
121
|
def sequence_status
|
|
107
|
-
return :exclusive if @sequence.bytesize > MAX_SEQUENCE_BYTES
|
|
108
122
|
return :pending if @sequence.bytesize == 1
|
|
109
123
|
|
|
110
124
|
second = @sequence.getbyte(1)
|
|
125
|
+
return kitty_sequence_status if second == 0x5f # APC
|
|
126
|
+
return :exclusive if @sequence.bytesize > MAX_SEQUENCE_BYTES
|
|
111
127
|
return csi_status if second == "[".ord
|
|
112
128
|
return :exclusive if TERMINAL_STRING_INTRODUCERS.include?(second)
|
|
113
129
|
return escape_intermediate_status if second.between?(0x20, 0x2f)
|
|
@@ -115,6 +131,22 @@ module Kward
|
|
|
115
131
|
:exclusive
|
|
116
132
|
end
|
|
117
133
|
|
|
134
|
+
def kitty_sequence_status
|
|
135
|
+
return :pending if @sequence.bytesize == 2
|
|
136
|
+
return :exclusive unless @sequence.start_with?(TerminalSequences::KITTY_GRAPHICS_PREFIX)
|
|
137
|
+
return :exclusive if @sequence.bytesize > MAX_KITTY_SEQUENCE_BYTES
|
|
138
|
+
|
|
139
|
+
if @sequence.end_with?("\e\\")
|
|
140
|
+
return TerminalSequences::KITTY_GRAPHICS_COMMAND.match?(@sequence) ? :kitty : :exclusive
|
|
141
|
+
end
|
|
142
|
+
|
|
143
|
+
# A Kitty payload is base64; no other control can run inside it.
|
|
144
|
+
last = @sequence.getbyte(-1)
|
|
145
|
+
return :exclusive if @sequence.getbyte(-2) == 0x1b || (last < 0x20 && last != 0x1b)
|
|
146
|
+
|
|
147
|
+
:pending
|
|
148
|
+
end
|
|
149
|
+
|
|
118
150
|
def csi_status
|
|
119
151
|
return :pending if @sequence.bytesize == 2
|
|
120
152
|
|
|
@@ -139,7 +171,7 @@ module Kward
|
|
|
139
171
|
value.match?(/\A\e\[[0-9;]*[CDG`]\z/) ||
|
|
140
172
|
value.match?(/\A\e\[\?25[hl]\z/) ||
|
|
141
173
|
value.match?(/\A\e\[\?(?:2004|2026)[hl]\z/) ||
|
|
142
|
-
value.match?(/\A\e\[[0-9;]* q\z/)
|
|
174
|
+
value.match?(/\A\e\[[0-9;]* q\z/) || TerminalSequences::DEVICE_QUERY.match?(value)
|
|
143
175
|
end
|
|
144
176
|
|
|
145
177
|
def track_safe_sequence(sequence)
|
|
@@ -157,6 +189,7 @@ module Kward
|
|
|
157
189
|
def flush_safe_output(value)
|
|
158
190
|
return if value.empty?
|
|
159
191
|
|
|
192
|
+
capture(value)
|
|
160
193
|
@output.write(value)
|
|
161
194
|
value.clear
|
|
162
195
|
end
|
|
@@ -165,6 +198,7 @@ module Kward
|
|
|
165
198
|
end_synchronized_output
|
|
166
199
|
@on_exclusive.call
|
|
167
200
|
@mode = :exclusive
|
|
201
|
+
capture(value)
|
|
168
202
|
@output.write(value) unless value.empty?
|
|
169
203
|
end
|
|
170
204
|
|
|
@@ -17,7 +17,6 @@ module Kward
|
|
|
17
17
|
|
|
18
18
|
def initialize(window_size_provider: nil)
|
|
19
19
|
@window_size_provider = window_size_provider
|
|
20
|
-
@window_size = nil
|
|
21
20
|
end
|
|
22
21
|
|
|
23
22
|
def run(*command, env: {}, cwd: Dir.pwd, input: $stdin, sink:, tab_action_handler: nil, on_detach: nil)
|
|
@@ -28,6 +27,7 @@ module Kward
|
|
|
28
27
|
forwarded = false
|
|
29
28
|
detached = nil
|
|
30
29
|
|
|
30
|
+
@window_size = nil
|
|
31
31
|
update_window_size(reader, pid)
|
|
32
32
|
with_raw_input(input) do
|
|
33
33
|
input_forwarded, tab_action = drain_initial_input(input, writer, sink, tab_action_handler: tab_action_handler)
|
|
@@ -117,12 +117,12 @@ module Kward
|
|
|
117
117
|
readers << input if input_open
|
|
118
118
|
readable = IO.select(readers, nil, nil, 0.02)&.first || []
|
|
119
119
|
forward_pty_output(reader, sink) if readable.include?(reader)
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
120
|
+
input_open, forwarded, tab_action = forward_input(
|
|
121
|
+
input, writer, sink, input_open: input_open, readable: readable.include?(input), tab_action_handler: tab_action_handler
|
|
122
|
+
)
|
|
123
|
+
input_forwarded ||= forwarded
|
|
124
|
+
return [nil, input_forwarded, tab_action] if tab_action && on_detach
|
|
125
|
+
return [terminate_and_reap(pid), input_forwarded, tab_action] if tab_action
|
|
126
126
|
|
|
127
127
|
status = finished_status(pid)
|
|
128
128
|
next unless status
|
|
@@ -183,31 +183,23 @@ module Kward
|
|
|
183
183
|
nil
|
|
184
184
|
end
|
|
185
185
|
|
|
186
|
-
def forward_input(input, writer, sink, tab_action_handler:
|
|
187
|
-
chunk = input.read_nonblock(READ_SIZE, exception: false)
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
chunk = filtered[:input].to_s
|
|
195
|
-
if tab_action
|
|
196
|
-
unless chunk.empty?
|
|
197
|
-
sink.input_forwarded if sink.respond_to?(:input_forwarded)
|
|
198
|
-
writer.write(chunk)
|
|
199
|
-
writer.flush
|
|
200
|
-
return [true, true, tab_action]
|
|
201
|
-
end
|
|
202
|
-
return [true, false, tab_action]
|
|
203
|
-
end
|
|
186
|
+
def forward_input(input, writer, sink, input_open:, readable:, tab_action_handler:)
|
|
187
|
+
chunk = readable ? input.read_nonblock(READ_SIZE, exception: false) : :wait_readable
|
|
188
|
+
input_open = false if chunk.nil?
|
|
189
|
+
if chunk.nil? || chunk == :wait_readable
|
|
190
|
+
chunk = tab_action_handler.flush_pending_escape if tab_action_handler.respond_to?(:flush_pending_escape)
|
|
191
|
+
return [input_open, false, nil] unless chunk.is_a?(String)
|
|
192
|
+
else
|
|
193
|
+
filtered = tab_action_handler&.call(chunk)
|
|
194
|
+
chunk = filtered[:input].to_s if filtered
|
|
204
195
|
end
|
|
205
|
-
|
|
196
|
+
tab_action = filtered&.fetch(:tab_action, nil)
|
|
197
|
+
return [input_open, false, tab_action] if chunk.empty?
|
|
206
198
|
|
|
207
199
|
sink.input_forwarded if sink.respond_to?(:input_forwarded)
|
|
208
200
|
writer.write(chunk)
|
|
209
201
|
writer.flush
|
|
210
|
-
[
|
|
202
|
+
[input_open, true, tab_action]
|
|
211
203
|
rescue Errno::EIO, Errno::EPIPE, IOError
|
|
212
204
|
[false, false, nil]
|
|
213
205
|
end
|
|
@@ -216,8 +208,8 @@ module Kward
|
|
|
216
208
|
window_size = terminal_window_size
|
|
217
209
|
return if window_size == @window_size
|
|
218
210
|
|
|
219
|
-
@window_size = window_size
|
|
220
211
|
reader.winsize = window_size
|
|
212
|
+
@window_size = window_size
|
|
221
213
|
signal_process("WINCH", -pid) || signal_process("WINCH", pid)
|
|
222
214
|
rescue StandardError
|
|
223
215
|
nil
|