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
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
require_relative "../shell/kwsh"
|
|
2
|
+
|
|
3
|
+
module Kward
|
|
4
|
+
class PromptInterface
|
|
5
|
+
# Generated previews share the /files renderer but are not project files.
|
|
6
|
+
module GeneratedImagePreview
|
|
7
|
+
def offer_generated_images(offers)
|
|
8
|
+
# Rendering can probe terminal capabilities, so let the input loop open it.
|
|
9
|
+
@mutex.synchronize { (@generated_image_offers ||= []).concat(offers) }
|
|
10
|
+
end
|
|
11
|
+
|
|
12
|
+
# Tab switches suspend the overlay; they do not discard the image.
|
|
13
|
+
def take_generated_image_offers
|
|
14
|
+
@mutex.synchronize do
|
|
15
|
+
offers = @generated_image_offers || []
|
|
16
|
+
if (image = @image_viewer_state&.fetch(:generated, nil))
|
|
17
|
+
offers.unshift(image)
|
|
18
|
+
close_image_viewer
|
|
19
|
+
end
|
|
20
|
+
@generated_image_offers = []
|
|
21
|
+
offers
|
|
22
|
+
end
|
|
23
|
+
end
|
|
24
|
+
|
|
25
|
+
private
|
|
26
|
+
|
|
27
|
+
def open_pending_generated_image_locked
|
|
28
|
+
return false if @generated_image_offers.nil? || @generated_image_offers.empty?
|
|
29
|
+
return false if image_viewer_active? || editor_active? || project_browser_visible? || modal_active_locked? || interactive_active_locked?
|
|
30
|
+
|
|
31
|
+
while (offer = @generated_image_offers.shift)
|
|
32
|
+
begin
|
|
33
|
+
path = offer[:store].path(offer[:owner], offer[:image].id)
|
|
34
|
+
@image_viewer_state = image_viewer_state_for(path, offer[:image].filename).merge(generated: offer)
|
|
35
|
+
return true
|
|
36
|
+
rescue GeneratedImages::Error
|
|
37
|
+
next
|
|
38
|
+
end
|
|
39
|
+
end
|
|
40
|
+
false
|
|
41
|
+
end
|
|
42
|
+
|
|
43
|
+
def handle_generated_image_key(key)
|
|
44
|
+
state = @image_viewer_state
|
|
45
|
+
if (picker = state[:directory_picker])
|
|
46
|
+
return handle_generated_image_directory_key(key, state, picker)
|
|
47
|
+
end
|
|
48
|
+
|
|
49
|
+
case key
|
|
50
|
+
when "d", "D" then save_generated_preview(:downloads)
|
|
51
|
+
when "p", "P"
|
|
52
|
+
clear_image_viewer_output_locked
|
|
53
|
+
state.delete(:status)
|
|
54
|
+
state[:directory_picker] = { text: +"", cursor: 0 }
|
|
55
|
+
true
|
|
56
|
+
when "\e", "q", "Q" then discard_generated_preview
|
|
57
|
+
else false
|
|
58
|
+
end
|
|
59
|
+
end
|
|
60
|
+
|
|
61
|
+
def handle_generated_image_directory_key(key, state, picker)
|
|
62
|
+
case key
|
|
63
|
+
when "\e"
|
|
64
|
+
state.delete(:directory_picker)
|
|
65
|
+
state.delete(:status)
|
|
66
|
+
when "\r", "\n"
|
|
67
|
+
save_generated_preview(:project, picker[:text].empty? ? "." : picker[:text])
|
|
68
|
+
when "\t" then complete_generated_image_directory(state, picker)
|
|
69
|
+
when "\x7f", "\b"
|
|
70
|
+
if picker[:cursor].positive?
|
|
71
|
+
picker[:cursor] -= 1
|
|
72
|
+
picker[:text].slice!(picker[:cursor])
|
|
73
|
+
end
|
|
74
|
+
picker.delete(:cycle)
|
|
75
|
+
state.delete(:status)
|
|
76
|
+
else
|
|
77
|
+
case key_name_for(key)
|
|
78
|
+
when :left then picker[:cursor] = [picker[:cursor] - 1, 0].max
|
|
79
|
+
when :right then picker[:cursor] = [picker[:cursor] + 1, picker[:text].length].min
|
|
80
|
+
else
|
|
81
|
+
if printable_key?(key) && picker[:text].bytesize + key.bytesize <= 4096
|
|
82
|
+
picker[:text].insert(picker[:cursor], key)
|
|
83
|
+
picker[:cursor] += key.length
|
|
84
|
+
state.delete(:status)
|
|
85
|
+
end
|
|
86
|
+
end
|
|
87
|
+
picker.delete(:cycle)
|
|
88
|
+
end
|
|
89
|
+
true
|
|
90
|
+
end
|
|
91
|
+
|
|
92
|
+
def complete_generated_image_directory(state, picker)
|
|
93
|
+
if (cycle = picker[:cycle])
|
|
94
|
+
cycle[:index] = (cycle[:index] + 1) % cycle[:candidates].length
|
|
95
|
+
text = cycle[:candidates][cycle[:index]]
|
|
96
|
+
else
|
|
97
|
+
root = state[:generated][:image].root
|
|
98
|
+
result = Kwsh.new(cwd: root).complete_directory(picker[:text], picker[:cursor], root: root)
|
|
99
|
+
return unless result
|
|
100
|
+
|
|
101
|
+
text = result.replacement
|
|
102
|
+
picker[:cycle] = { candidates: result.candidates, index: result.candidates.index(text) || -1 } if result.candidates.size > 1
|
|
103
|
+
end
|
|
104
|
+
picker[:text] = text.dup
|
|
105
|
+
picker[:cursor] = text.length
|
|
106
|
+
state.delete(:status)
|
|
107
|
+
end
|
|
108
|
+
|
|
109
|
+
def save_generated_preview(destination, directory = nil)
|
|
110
|
+
state = @image_viewer_state
|
|
111
|
+
offer = state[:generated]
|
|
112
|
+
store, owner, image = offer.values_at(:store, :owner, :image)
|
|
113
|
+
path = if destination == :downloads
|
|
114
|
+
store.save_to_downloads(owner, image.id)
|
|
115
|
+
else
|
|
116
|
+
store.save_to_project(owner, image.id, directory)
|
|
117
|
+
end
|
|
118
|
+
offer[:saved] = true
|
|
119
|
+
state.delete(:directory_picker)
|
|
120
|
+
state[:status] = "Saved to #{path.gsub(/[[:cntrl:]]/, "?")}"
|
|
121
|
+
record_generated_image_status(state[:status])
|
|
122
|
+
true
|
|
123
|
+
rescue GeneratedImages::Error => e
|
|
124
|
+
state[:status] = e.message
|
|
125
|
+
true
|
|
126
|
+
end
|
|
127
|
+
|
|
128
|
+
def discard_generated_preview
|
|
129
|
+
offer = @image_viewer_state[:generated]
|
|
130
|
+
offer[:store].discard(offer[:owner], offer[:image].id)
|
|
131
|
+
record_generated_image_status("Image discarded") unless offer[:saved]
|
|
132
|
+
close_image_viewer
|
|
133
|
+
open_pending_generated_image_locked
|
|
134
|
+
true
|
|
135
|
+
rescue GeneratedImages::Error => e
|
|
136
|
+
@image_viewer_state[:status] = e.message
|
|
137
|
+
true
|
|
138
|
+
end
|
|
139
|
+
|
|
140
|
+
def record_generated_image_status(text)
|
|
141
|
+
append_transcript_buffer("\n#{text.gsub(/[[:cntrl:]]/, "?")}\n")
|
|
142
|
+
remember_transcript_viewport_locked
|
|
143
|
+
with_synchronized_output_locked { redraw_screen_locked } if @started
|
|
144
|
+
end
|
|
145
|
+
|
|
146
|
+
def generated_image_footer_rows(content_width)
|
|
147
|
+
state = @image_viewer_state
|
|
148
|
+
picker = state[:directory_picker]
|
|
149
|
+
rows = if picker
|
|
150
|
+
text = picker[:text].dup.insert(picker[:cursor], "│")
|
|
151
|
+
[footer_row(content_width, "Project directory: #{text}"), footer_row(content_width, "Tab completes · Enter saves · Esc back")]
|
|
152
|
+
else
|
|
153
|
+
actions = ["D Save to Downloads · P Save to Project…", "Esc Discard"]
|
|
154
|
+
actions = [actions.join(" · ")] if content_width >= 53
|
|
155
|
+
actions.map { |text| footer_row(content_width, text) }
|
|
156
|
+
end
|
|
157
|
+
rows << footer_row(content_width, state[:status]) if state[:status]
|
|
158
|
+
rows
|
|
159
|
+
end
|
|
160
|
+
end
|
|
161
|
+
end
|
|
162
|
+
end
|
|
@@ -18,8 +18,8 @@ module Kward
|
|
|
18
18
|
@mutex.synchronize do
|
|
19
19
|
if key.nil?
|
|
20
20
|
resized = handle_resize_locked
|
|
21
|
-
|
|
22
|
-
render_prompt_locked if resized ||
|
|
21
|
+
chrome_changed = tick_composer_chrome_locked
|
|
22
|
+
render_prompt_locked if resized || chrome_changed
|
|
23
23
|
else
|
|
24
24
|
result = handle_git_key(key)
|
|
25
25
|
render_prompt_locked unless result.is_a?(String) || result == SELECT_CANCEL || git_action?(result)
|
|
@@ -210,8 +210,8 @@ module Kward
|
|
|
210
210
|
@mutex.synchronize do
|
|
211
211
|
if key.nil?
|
|
212
212
|
resized = handle_resize_locked
|
|
213
|
-
|
|
214
|
-
render_prompt_locked if resized ||
|
|
213
|
+
chrome_changed = tick_composer_chrome_locked
|
|
214
|
+
render_prompt_locked if resized || chrome_changed
|
|
215
215
|
else
|
|
216
216
|
handle_editor_key(key)
|
|
217
217
|
render_prompt_locked if editor_active?
|
|
@@ -270,22 +270,29 @@ module Kward
|
|
|
270
270
|
return [] unless @git_state
|
|
271
271
|
|
|
272
272
|
help = git_composing? ? "Type commit message · Enter commit · Tab overlay · Esc cancel" : "↑/↓/j/k select · Enter diff · s stage/unstage · Tab message · Esc cancel"
|
|
273
|
-
lines = [overlay_text_line(help, :muted), overlay_blank_line]
|
|
274
273
|
status_lines = @git_state[:status_lines]
|
|
275
274
|
status_lines = ["No uncommitted changes."] if status_lines.empty?
|
|
276
|
-
|
|
275
|
+
content_budget = [composer_overlay_row_budget(height) - 2, 1].max
|
|
276
|
+
max_status_rows = [max_overlay_list_rows(height), status_lines.length, content_budget].min
|
|
277
|
+
show_overflow = max_status_rows < status_lines.length && content_budget >= 3
|
|
278
|
+
indicator_rows = show_overflow ? 2 : 0
|
|
279
|
+
max_status_rows = [max_status_rows, content_budget - indicator_rows].min
|
|
280
|
+
lines = if max_status_rows + indicator_rows + 2 <= content_budget
|
|
281
|
+
[overlay_text_line(help, :muted), overlay_blank_line]
|
|
282
|
+
else
|
|
283
|
+
[]
|
|
284
|
+
end
|
|
277
285
|
selected_index = @git_state[:selected_index].to_i
|
|
278
286
|
start_index = centered_list_window_start(selected_index, status_lines.length, max_status_rows)
|
|
279
287
|
visible_status_lines = status_lines[start_index, max_status_rows] || []
|
|
280
|
-
lines << overlay_text_line("… #{start_index} above", :muted) if start_index.positive?
|
|
288
|
+
lines << overlay_text_line("… #{start_index} above", :muted) if show_overflow && start_index.positive?
|
|
281
289
|
visible_status_lines.each_with_index do |line, offset|
|
|
282
290
|
index = start_index + offset
|
|
283
|
-
|
|
284
|
-
lines << overlay_text_line("#{marker}#{line}")
|
|
291
|
+
lines << overlay_choice_line(line, selected: index == selected_index)
|
|
285
292
|
end
|
|
286
293
|
hidden_below = status_lines.length - start_index - visible_status_lines.length
|
|
287
|
-
lines << overlay_text_line("… #{hidden_below} more", :muted) if hidden_below.positive?
|
|
288
|
-
overlay_card_rows("Git", lines, width)
|
|
294
|
+
lines << overlay_text_line("… #{hidden_below} more", :muted) if show_overflow && hidden_below.positive?
|
|
295
|
+
overlay_card_rows("Git", lines, width, height: height)
|
|
289
296
|
end
|
|
290
297
|
end
|
|
291
298
|
end
|
|
@@ -14,38 +14,36 @@ module Kward
|
|
|
14
14
|
def route_interactive_key(key)
|
|
15
15
|
return false unless interactive_active_locked?
|
|
16
16
|
|
|
17
|
-
interactive_key =
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
17
|
+
interactive_key = if (sequence = parse_csi_u_key(key))
|
|
18
|
+
interactive_csi_u_key(sequence)
|
|
19
|
+
elsif key == TerminalKeys::ESCAPE
|
|
20
|
+
:force_exit
|
|
21
|
+
elsif key == TerminalKeys::CTRL_C
|
|
22
|
+
:ctrl_c
|
|
23
|
+
else
|
|
24
|
+
key_name_for(key) || key
|
|
23
25
|
end
|
|
26
|
+
return force_interactive_exit if interactive_key == :force_exit
|
|
24
27
|
|
|
25
|
-
|
|
26
|
-
return force_interactive_exit if key == "\x03" || name == :escape
|
|
27
|
-
|
|
28
|
-
@interactive_state[:controller].push_key(name || key)
|
|
28
|
+
@interactive_state[:controller].push_key(interactive_key) if interactive_key
|
|
29
29
|
true
|
|
30
30
|
end
|
|
31
31
|
|
|
32
|
-
def interactive_csi_u_key(
|
|
33
|
-
sequence = parse_csi_u_key(key)
|
|
34
|
-
return false unless sequence
|
|
35
|
-
|
|
32
|
+
def interactive_csi_u_key(sequence)
|
|
36
33
|
code = sequence[:code]
|
|
37
34
|
modifier = sequence[:modifier]
|
|
38
|
-
queue_pending_keys(sequence[:remaining])
|
|
35
|
+
queue_pending_keys(sequence[:remaining]) unless sequence[:remaining].to_s.empty?
|
|
36
|
+
return if sequence[:event_type] == 3 || TerminalKeys::CSI_U_MODIFIER_KEY_CODES.cover?(code)
|
|
39
37
|
|
|
40
|
-
|
|
38
|
+
# Ignore Caps Lock and Num Lock when matching a key binding.
|
|
39
|
+
held_modifiers = (modifier - 1) & 0b111111
|
|
40
|
+
return :force_exit if code == 27 && held_modifiers.zero?
|
|
41
|
+
return :ctrl_c if [67, 99].include?(code) && held_modifiers == 4
|
|
41
42
|
return :return if code == 13
|
|
42
43
|
return :backspace if [8, 127].include?(code)
|
|
43
44
|
return :space if code == 32 && !ctrl_modifier?(modifier) && !alt_modifier?(modifier) && !super_modifier?(modifier)
|
|
44
45
|
|
|
45
|
-
|
|
46
|
-
return text if text
|
|
47
|
-
|
|
48
|
-
false
|
|
46
|
+
csi_u_printable_text(sequence) || sequence[:sequence]
|
|
49
47
|
end
|
|
50
48
|
|
|
51
49
|
def force_interactive_exit
|
|
@@ -7,11 +7,24 @@ module Kward
|
|
|
7
7
|
private
|
|
8
8
|
|
|
9
9
|
def filter_terminal_handoff_input_locked(chunk)
|
|
10
|
+
@handoff_escape_deadline = nil
|
|
10
11
|
@handoff_input_buffer << chunk.to_s.b
|
|
11
12
|
forwarded = +"".b
|
|
12
13
|
tab_action = nil
|
|
13
14
|
|
|
14
15
|
until @handoff_input_buffer.empty?
|
|
16
|
+
if @handoff_bracketed_paste
|
|
17
|
+
if @handoff_input_buffer.start_with?(BRACKETED_PASTE_END)
|
|
18
|
+
forwarded << @handoff_input_buffer.slice!(0, BRACKETED_PASTE_END.bytesize)
|
|
19
|
+
@handoff_bracketed_paste = false
|
|
20
|
+
elsif BRACKETED_PASTE_END.start_with?(@handoff_input_buffer)
|
|
21
|
+
break
|
|
22
|
+
else
|
|
23
|
+
forwarded << @handoff_input_buffer.slice!(0)
|
|
24
|
+
end
|
|
25
|
+
next
|
|
26
|
+
end
|
|
27
|
+
|
|
15
28
|
if @handoff_input_buffer.start_with?(TerminalKeys::CTRL_T)
|
|
16
29
|
action = handle_tab_key_binding(TerminalKeys::CTRL_T)
|
|
17
30
|
if action != false
|
|
@@ -26,11 +39,14 @@ module Kward
|
|
|
26
39
|
end
|
|
27
40
|
|
|
28
41
|
if @handoff_input_buffer.start_with?("\e")
|
|
29
|
-
complete = TerminalKeys::
|
|
30
|
-
|
|
31
|
-
|
|
42
|
+
complete = @handoff_input_buffer[TerminalKeys::CSI_SEQUENCE_PATTERN] ||
|
|
43
|
+
TerminalKeys::TAB_ACTION_SEQUENCES.find { |sequence| @handoff_input_buffer.start_with?(sequence) }
|
|
44
|
+
partial = TerminalKeys::TAB_ACTION_SEQUENCES.any? { |sequence| sequence.start_with?(@handoff_input_buffer) } ||
|
|
45
|
+
@handoff_input_buffer.match?(TerminalKeys::CSI_PREFIX_PATTERN)
|
|
46
|
+
break if partial && !complete && @handoff_input_buffer.bytesize < TerminalKeys::MAX_HANDOFF_SEQUENCE_BYTES
|
|
32
47
|
|
|
33
48
|
if complete
|
|
49
|
+
@handoff_bracketed_paste = true if complete == BRACKETED_PASTE_START
|
|
34
50
|
action = handle_tab_key_binding(complete)
|
|
35
51
|
if action != false
|
|
36
52
|
remainder = @handoff_input_buffer.byteslice(complete.bytesize..).to_s
|
|
@@ -39,38 +55,61 @@ module Kward
|
|
|
39
55
|
tab_action = action
|
|
40
56
|
break
|
|
41
57
|
end
|
|
42
|
-
|
|
58
|
+
sequence = parse_csi_u_key(complete)
|
|
59
|
+
forwarded << (sequence ? legacy_handoff_key(sequence) || complete : complete)
|
|
43
60
|
@handoff_input_buffer = @handoff_input_buffer.byteslice(complete.bytesize..).to_s.b
|
|
44
61
|
next
|
|
45
62
|
end
|
|
46
|
-
|
|
47
|
-
if (sequence = parse_csi_u_key(@handoff_input_buffer)) && @handoff_input_buffer.start_with?(sequence[:sequence])
|
|
48
|
-
legacy_key = legacy_handoff_key(sequence)
|
|
49
|
-
unless legacy_key.nil?
|
|
50
|
-
forwarded << legacy_key
|
|
51
|
-
@handoff_input_buffer = @handoff_input_buffer.byteslice(sequence[:sequence].bytesize..).to_s.b
|
|
52
|
-
next
|
|
53
|
-
end
|
|
54
|
-
end
|
|
55
63
|
end
|
|
56
64
|
|
|
57
65
|
forwarded << @handoff_input_buffer.slice!(0)
|
|
58
66
|
end
|
|
59
67
|
|
|
68
|
+
if !@handoff_bracketed_paste && @handoff_input_buffer == TerminalKeys::ESCAPE
|
|
69
|
+
@handoff_escape_deadline = monotonic_now + TerminalKeys::HANDOFF_ESCAPE_DELAY
|
|
70
|
+
end
|
|
60
71
|
{ input: forwarded, tab_action: tab_action }
|
|
61
72
|
end
|
|
62
73
|
|
|
74
|
+
def flush_terminal_handoff_escape_locked
|
|
75
|
+
return unless @handoff_escape_deadline && monotonic_now >= @handoff_escape_deadline
|
|
76
|
+
|
|
77
|
+
@handoff_escape_deadline = nil
|
|
78
|
+
@handoff_input_buffer.clear
|
|
79
|
+
TerminalKeys::ESCAPE
|
|
80
|
+
end
|
|
81
|
+
|
|
63
82
|
def legacy_handoff_key(sequence)
|
|
83
|
+
return "" if sequence[:event_type] == 3
|
|
84
|
+
return "" if TerminalKeys::CSI_U_MODIFIER_KEY_CODES.cover?(sequence[:code])
|
|
85
|
+
|
|
86
|
+
modifier = sequence[:modifier]
|
|
87
|
+
alt = alt_modifier?(modifier)
|
|
88
|
+
ctrl = ctrl_modifier?(modifier)
|
|
89
|
+
# Preserve chords without a safe legacy equivalent. An ESC prefix does
|
|
90
|
+
# not stop a cooked PTY from treating a following Ctrl+C as SIGINT.
|
|
91
|
+
return if (alt && ctrl) || ((modifier - 1) & 0b111000).positive?
|
|
92
|
+
|
|
64
93
|
event = csi_u_key_event(sequence)
|
|
65
94
|
return event[:text] if event[:type] == :printable
|
|
66
|
-
return "\r" if event[:type] == :enter
|
|
67
|
-
return "\b" if event[:type] == :backspace
|
|
68
|
-
return "\t" if event[:type] == :tab
|
|
95
|
+
return "\r" if event[:type] == :enter && !alt
|
|
96
|
+
return "\b" if event[:type] == :backspace && !alt
|
|
97
|
+
return "\t" if event[:type] == :tab && !alt
|
|
98
|
+
return "\e" if event[:type] == :escape && !alt
|
|
99
|
+
return unless event[:type] == :modified && event[:code].between?(32, 126)
|
|
100
|
+
|
|
101
|
+
code = event[:code]
|
|
102
|
+
if ctrl
|
|
103
|
+
return (code & 0x1f).chr if (65..90).cover?(code) || (97..122).cover?(code)
|
|
69
104
|
|
|
70
|
-
|
|
71
|
-
|
|
105
|
+
return TerminalKeys::LEGACY_CTRL_CODES[code]&.chr
|
|
106
|
+
end
|
|
107
|
+
return unless alt
|
|
72
108
|
|
|
73
|
-
|
|
109
|
+
shifted = sequence[:shifted_code] || ((97..122).cover?(code) ? code - 32 : code)
|
|
110
|
+
code = shifted if shift_modifier?(modifier)
|
|
111
|
+
text = csi_u_codepoint_character(code) if code >= 32 && !(127..159).cover?(code)
|
|
112
|
+
"\e#{text}" if text
|
|
74
113
|
end
|
|
75
114
|
|
|
76
115
|
def read_key(nonblock: false)
|
|
@@ -105,15 +144,25 @@ module Kward
|
|
|
105
144
|
def handle_image_viewer_key(key)
|
|
106
145
|
return true if handle_bundled_key(key) { |token| handle_image_viewer_key(token) }
|
|
107
146
|
|
|
147
|
+
if @image_viewer_state[:generated]
|
|
148
|
+
tab_result = handle_tab_key_binding(key)
|
|
149
|
+
return tab_result unless tab_result == false
|
|
150
|
+
end
|
|
108
151
|
sequence = parse_csi_u_key(key)
|
|
109
152
|
if sequence
|
|
110
153
|
queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
154
|
+
key = case sequence[:code]
|
|
155
|
+
when 27 then "\e"
|
|
156
|
+
when 9 then "\t"
|
|
157
|
+
when 13 then "\r"
|
|
158
|
+
when 127 then "\x7f"
|
|
159
|
+
else csi_u_printable_text(sequence)
|
|
160
|
+
end
|
|
161
|
+
end
|
|
162
|
+
return true if key.nil?
|
|
163
|
+
if @image_viewer_state[:generated]
|
|
164
|
+
return CANCEL_INPUT if key == TerminalKeys::CTRL_C && @busy
|
|
165
|
+
return true if handle_generated_image_key(key)
|
|
117
166
|
end
|
|
118
167
|
|
|
119
168
|
return zoom_image_viewer(:in) if key == "+"
|
|
@@ -411,6 +460,10 @@ module Kward
|
|
|
411
460
|
code = sequence[:code]
|
|
412
461
|
modifier = sequence[:modifier]
|
|
413
462
|
queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
|
|
463
|
+
return true if sequence[:event_type] == 3
|
|
464
|
+
|
|
465
|
+
tab_result = handle_tab_key_binding(sequence[:sequence])
|
|
466
|
+
return tab_result unless tab_result == false
|
|
414
467
|
|
|
415
468
|
case code
|
|
416
469
|
when 9
|
|
@@ -452,8 +505,10 @@ module Kward
|
|
|
452
505
|
{
|
|
453
506
|
sequence: match[0],
|
|
454
507
|
code: match[1].to_i,
|
|
508
|
+
shifted_code: match[0][/\A\e\[\d+:(\d+)/, 1]&.to_i,
|
|
455
509
|
modifiers: modifiers,
|
|
456
510
|
modifier: modifier,
|
|
511
|
+
event_type: (modifiers.split(":", 2)[1] || "1").to_i,
|
|
457
512
|
text: fields[1].to_s,
|
|
458
513
|
remaining: key.to_s[match[0].length..]
|
|
459
514
|
}
|
|
@@ -542,6 +597,8 @@ module Kward
|
|
|
542
597
|
kill_line_after_cursor
|
|
543
598
|
when 108
|
|
544
599
|
request_transcript_redraw
|
|
600
|
+
when 110
|
|
601
|
+
((modifier - 1) & ~192) == 4 && submit_new_session_shortcut
|
|
545
602
|
when 114
|
|
546
603
|
start_history_search
|
|
547
604
|
when 117
|
|
@@ -772,6 +829,20 @@ module Kward
|
|
|
772
829
|
def handle_tab_key_binding(key)
|
|
773
830
|
return false if @select_state || @question_state || @tabs.empty?
|
|
774
831
|
|
|
832
|
+
if (sequence = parse_csi_u_key(key)) && sequence[:remaining].to_s.empty?
|
|
833
|
+
return false if sequence[:event_type] == 3
|
|
834
|
+
|
|
835
|
+
# Lock modifiers and optional event/text fields do not change shortcuts.
|
|
836
|
+
modifier = ((sequence[:modifier] - 1) & ~192) + 1
|
|
837
|
+
key = if modifier == 3 && sequence[:code].between?(32, 126)
|
|
838
|
+
"\e#{sequence[:code].chr}"
|
|
839
|
+
else
|
|
840
|
+
"\e[#{sequence[:code]};#{modifier}u"
|
|
841
|
+
end
|
|
842
|
+
elsif (match = key.to_s.match(TerminalKeys::MODIFY_OTHER_KEYS_PATTERN))
|
|
843
|
+
key = "\e[#{match[2]};#{match[1]}u"
|
|
844
|
+
end
|
|
845
|
+
|
|
775
846
|
navigation_result = handle_ctrl_tab_navigation_key_binding(key)
|
|
776
847
|
return navigation_result unless navigation_result == false
|
|
777
848
|
|
|
@@ -793,6 +864,8 @@ module Kward
|
|
|
793
864
|
case key
|
|
794
865
|
when TerminalKeys::CTRL_T, TerminalKeys::CTRL_T_CSI_U
|
|
795
866
|
{ tab_action: :new }
|
|
867
|
+
when *TerminalKeys::CTRL_SHIFT_T_CSI_U
|
|
868
|
+
{ tab_action: :new_after_current }
|
|
796
869
|
when TerminalKeys::CTRL_W_CSI_U
|
|
797
870
|
{ tab_action: :close }
|
|
798
871
|
else
|
|
@@ -843,6 +916,8 @@ module Kward
|
|
|
843
916
|
kill_line_after_cursor
|
|
844
917
|
when TerminalKeys::CTRL_L
|
|
845
918
|
request_transcript_redraw
|
|
919
|
+
when TerminalKeys::CTRL_N, TerminalKeys::CTRL_N_MODIFY_OTHER_KEYS
|
|
920
|
+
submit_new_session_shortcut
|
|
846
921
|
when TerminalKeys::CTRL_U
|
|
847
922
|
kill_line_before_cursor
|
|
848
923
|
when TerminalKeys::CTRL_W
|
|
@@ -872,6 +947,14 @@ module Kward
|
|
|
872
947
|
end
|
|
873
948
|
end
|
|
874
949
|
|
|
950
|
+
def submit_new_session_shortcut
|
|
951
|
+
return false unless @prompt_label == "You>" && !@slash_overlay_disabled
|
|
952
|
+
|
|
953
|
+
@composer.clear_attachments
|
|
954
|
+
replace_input("/new")
|
|
955
|
+
submit_input
|
|
956
|
+
end
|
|
957
|
+
|
|
875
958
|
def parse_modified_ansi_key(key)
|
|
876
959
|
if (match = key.to_s.match(TerminalKeys::MODIFIED_CURSOR_PATTERN))
|
|
877
960
|
{ type: :cursor, modifier: match[2].to_i, final: match[3] }
|
|
@@ -18,8 +18,18 @@ module Kward
|
|
|
18
18
|
[height - @reserved_rows + 1, 1].max
|
|
19
19
|
end
|
|
20
20
|
|
|
21
|
+
def composer_row_budget(height)
|
|
22
|
+
[height - 2, 1].max
|
|
23
|
+
end
|
|
24
|
+
|
|
25
|
+
def transcript_region_hidden?(height = screen_height)
|
|
26
|
+
@reserved_rows >= height
|
|
27
|
+
end
|
|
28
|
+
|
|
21
29
|
def transcript_bottom_row(height = screen_height)
|
|
22
|
-
|
|
30
|
+
available = height - @reserved_rows
|
|
31
|
+
# A scroll region needs two rows; give up the gap before the second row.
|
|
32
|
+
[available - TRANSCRIPT_COMPOSER_GAP_ROWS, [available, 2].min, 1].max
|
|
23
33
|
end
|
|
24
34
|
|
|
25
35
|
end
|
|
@@ -9,7 +9,7 @@ module Kward
|
|
|
9
9
|
private
|
|
10
10
|
|
|
11
11
|
def active_overlay_rows(width, height: screen_height)
|
|
12
|
-
return question_overlay_rows(width) if @question_state
|
|
12
|
+
return question_overlay_rows(width, height: height) if @question_state
|
|
13
13
|
return selection_overlay_rows(width, height: height) if @select_state
|
|
14
14
|
return git_overlay_rows(width, height: height) if @git_state
|
|
15
15
|
return image_viewer_rows(width, height: height) if image_viewer_active?
|
|
@@ -29,13 +29,13 @@ module Kward
|
|
|
29
29
|
rows = (candidates[start, max_rows] || []).each_with_index.map do |candidate, offset|
|
|
30
30
|
overlay_choice_line(candidate, selected: start + offset == selected)
|
|
31
31
|
end
|
|
32
|
-
overlay_card_rows("Completions", rows, width)
|
|
32
|
+
overlay_card_rows("Completions", rows, width, height: height)
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
def history_search_overlay_rows(width, height: screen_height)
|
|
36
36
|
matches = history_search_matches
|
|
37
37
|
if matches.empty?
|
|
38
|
-
return overlay_card_rows("History", [overlay_text_line("No matching history", :muted)], width)
|
|
38
|
+
return overlay_card_rows("History", [overlay_text_line("No matching history", :muted)], width, height: height)
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
max_rows = max_overlay_list_rows(height)
|
|
@@ -44,18 +44,35 @@ module Kward
|
|
|
44
44
|
rows = (matches[start, max_rows] || []).each_with_index.map do |value, offset|
|
|
45
45
|
overlay_choice_line(value, selected: start + offset == selected)
|
|
46
46
|
end
|
|
47
|
-
overlay_card_rows("History", rows, width)
|
|
47
|
+
overlay_card_rows("History", rows, width, height: height)
|
|
48
48
|
end
|
|
49
49
|
|
|
50
|
-
def overlay_card_rows(title, content_rows, width)
|
|
50
|
+
def overlay_card_rows(title, content_rows, width, height: screen_height)
|
|
51
|
+
max_rows = composer_overlay_row_budget(height)
|
|
52
|
+
return [] if max_rows.zero?
|
|
53
|
+
|
|
51
54
|
card_width = overlay_card_width(width)
|
|
52
55
|
inner_width = [card_width - 4, 1].max
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
+
top = overlay_top_border(title, card_width)
|
|
57
|
+
bottom = overlay_bottom_border(card_width)
|
|
58
|
+
content_budget = [max_rows - 2, 1].max
|
|
59
|
+
if content_rows.length > content_budget
|
|
60
|
+
focus = content_rows.index { |row| row[:selected] } || 0
|
|
61
|
+
start = centered_list_window_start(focus, content_rows.length, content_budget)
|
|
62
|
+
content_rows = content_rows.slice(start, content_budget)
|
|
63
|
+
end
|
|
64
|
+
rows = content_rows.map { |row| overlay_content_row(row, inner_width) }
|
|
65
|
+
rows.unshift(top) if rows.empty? || max_rows >= 2
|
|
66
|
+
rows << bottom if rows.length < max_rows
|
|
56
67
|
rows.map { |row| align_overlay_row(row, width) }
|
|
57
68
|
end
|
|
58
69
|
|
|
70
|
+
def composer_overlay_row_budget(height)
|
|
71
|
+
budget = composer_row_budget(height)
|
|
72
|
+
# Keep an overlay choice visible even if the draft must use a compact row.
|
|
73
|
+
[[budget - 3, 2].max, budget - 1].min
|
|
74
|
+
end
|
|
75
|
+
|
|
59
76
|
def overlay_card_width(width)
|
|
60
77
|
return width if width < 32
|
|
61
78
|
return width if @overlay_settings["width"] == "maximum"
|