kward 0.84.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 +164 -0
- data/CONTRIBUTING.md +1 -1
- data/Gemfile.lock +6 -2
- data/README.md +5 -5
- data/Rakefile +3 -0
- data/doc/agent-tools.md +24 -1
- data/doc/api.md +20 -2
- data/doc/composer.md +5 -4
- data/doc/configuration.md +86 -14
- data/doc/extensibility.md +4 -1
- data/doc/getting-started.md +3 -3
- data/doc/git.md +4 -2
- data/doc/memory.md +1 -1
- data/doc/pan.md +6 -0
- data/doc/permissions.md +4 -4
- data/doc/plugins.md +504 -20
- data/doc/providers.md +10 -4
- data/doc/rpc.md +279 -23
- data/doc/sandboxing.md +11 -5
- data/doc/security.md +7 -1
- data/doc/session-management.md +41 -5
- data/doc/shell.md +643 -27
- data/doc/tabs.md +8 -3
- data/doc/transports.md +15 -0
- data/doc/troubleshooting.md +1 -1
- data/doc/usage.md +25 -12
- data/doc/workspace-tools.md +9 -0
- 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 +1 -2
- data/examples/plugins/stardate_footer.rb +2 -2
- data/examples/plugins/telegram/plugin.rb +1 -1
- data/exe/kward +2 -2
- data/exe/kwsh +7 -0
- data/kward.gemspec +3 -1
- data/lib/kward/agent.rb +66 -19
- data/lib/kward/cli/commands.rb +41 -11
- data/lib/kward/cli/compaction.rb +9 -3
- data/lib/kward/cli/interactive_turn.rb +10 -0
- data/lib/kward/cli/plugins.rb +85 -12
- data/lib/kward/cli/prompt_interface.rb +29 -6
- data/lib/kward/cli/rendering.rb +24 -28
- data/lib/kward/cli/runtime_helpers.rb +168 -56
- data/lib/kward/cli/sessions.rb +9 -5
- data/lib/kward/cli/settings/menus.rb +745 -0
- data/lib/kward/cli/settings/model.rb +316 -0
- data/lib/kward/cli/settings.rb +6 -1055
- data/lib/kward/cli/slash_commands.rb +45 -4
- data/lib/kward/cli/tabs.rb +257 -44
- data/lib/kward/cli/tool_summaries.rb +2 -0
- data/lib/kward/{cli_transcript_formatter.rb → cli/transcript_formatter.rb} +6 -13
- data/lib/kward/cli/worktrees.rb +66 -2
- data/lib/kward/cli.rb +82 -31
- data/lib/kward/compactor.rb +18 -7
- data/lib/kward/config/core.rb +400 -0
- data/lib/kward/config/extensions.rb +99 -0
- data/lib/kward/config/paths.rb +11 -0
- data/lib/kward/config/prompts.rb +313 -0
- data/lib/kward/config/settings.rb +257 -0
- data/lib/kward/config_files.rb +14 -1008
- data/lib/kward/conversation.rb +41 -2
- 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/image_attachments.rb +1 -1
- data/lib/kward/model/catalog.rb +6 -3
- data/lib/kward/model/client.rb +107 -38
- data/lib/kward/model/codex_images.rb +83 -0
- data/lib/kward/model/copilot_models.rb +10 -6
- data/lib/kward/model/model_info.rb +42 -7
- data/lib/kward/{openrouter_model_cache.rb → model/openrouter_model_cache.rb} +7 -5
- data/lib/kward/model/payloads.rb +18 -8
- data/lib/kward/model/sources.rb +3 -1
- data/lib/kward/model/stream_parser.rb +4 -7
- data/lib/kward/model/typesafe_client.rb +78 -0
- data/lib/kward/pan/index.html.erb +8 -1
- data/lib/kward/pan/server.rb +23 -8
- data/lib/kward/permissions/policy.rb +6 -2
- data/lib/kward/plugin_registry.rb +2 -659
- data/lib/kward/plugins/actions.rb +453 -0
- data/lib/kward/plugins/chat_contract.rb +121 -0
- data/lib/kward/{plugin_chat_runtime.rb → plugins/chat_runtime.rb} +62 -18
- data/lib/kward/plugins/codex_responses.rb +73 -0
- data/lib/kward/plugins/host.rb +248 -0
- data/lib/kward/plugins/http_server.rb +83 -0
- data/lib/kward/plugins/registry.rb +1229 -0
- data/lib/kward/plugins/resources.rb +206 -0
- data/lib/kward/plugins/turn_request.rb +36 -0
- data/lib/kward/plugins/ui.rb +219 -0
- data/lib/kward/prompt_interface/composer_controller.rb +0 -1
- data/lib/kward/prompt_interface/composer_renderer.rb +160 -73
- data/lib/kward/prompt_interface/composer_state.rb +1 -1
- data/lib/kward/prompt_interface/editor/controller.rb +2 -2
- data/lib/kward/prompt_interface/editor/renderer.rb +10 -7
- data/lib/kward/prompt_interface/editor/runner.rb +1 -1
- data/lib/kward/prompt_interface/editor/state.rb +1 -1
- 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 +26 -9
- data/lib/kward/prompt_interface/plugin_ui_requests.rb +82 -0
- 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 +37 -10
- data/lib/kward/prompt_interface/screen.rb +30 -20
- 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 +149 -30
- data/lib/kward/prompts/commands.rb +2 -1
- data/lib/kward/prompts.rb +7 -1
- data/lib/kward/{adaptive_pty_output_sink.rb → pty/adaptive_output_sink.rb} +39 -5
- data/lib/kward/{interactive_pty_runner.rb → pty/interactive_runner.rb} +22 -30
- data/lib/kward/{local_command_runner.rb → pty/local_command_runner.rb} +1 -1
- data/lib/kward/{local_pty_command_runner.rb → pty/local_pty_runner.rb} +3 -9
- data/lib/kward/{pty_output_sink.rb → pty/output_sink.rb} +9 -4
- data/lib/kward/pty/transcript_normalizer.rb +137 -0
- data/lib/kward/rpc/config_manager.rb +3 -0
- data/lib/kward/rpc/plugin_chat_manager.rb +30 -10
- data/lib/kward/rpc/prompt_bridge.rb +25 -0
- data/lib/kward/rpc/server.rb +118 -17
- data/lib/kward/rpc/session_manager.rb +208 -60
- data/lib/kward/rpc/session_tree_rows.rb +2 -2
- data/lib/kward/rpc/tool_metadata.rb +1 -1
- data/lib/kward/rpc/transcript_normalizer.rb +11 -7
- data/lib/kward/sandbox/command_runner.rb +1 -1
- data/lib/kward/{session_catalog.rb → sessions/catalog.rb} +1 -1
- data/lib/kward/{session_store.rb → sessions/store.rb} +39 -12
- data/lib/kward/{session_tree_nodes.rb → sessions/tree_nodes.rb} +3 -3
- data/lib/kward/{session_tree_renderer.rb → sessions/tree_renderer.rb} +4 -4
- data/lib/kward/{session_tree_tool_display.rb → sessions/tree_tool_display.rb} +1 -1
- data/lib/kward/{kwsh.rb → shell/kwsh.rb} +30 -10
- data/lib/kward/{kwshrc.rb → 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/{persistent_shell_session.rb → shell/persistent_session.rb} +187 -193
- data/lib/kward/shell/prompt.rb +66 -0
- data/lib/kward/shell/prompt_agent.rb +17 -0
- data/lib/kward/{shell_prompt_session.rb → shell/prompt_session.rb} +1 -1
- 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/skills/trust_store.rb +1 -1
- data/lib/kward/tabs/driver.rb +194 -0
- data/lib/kward/{tab_store.rb → tabs/store.rb} +2 -2
- data/lib/kward/{clipboard.rb → terminal/clipboard.rb} +1 -1
- data/lib/kward/{terminal_image_support.rb → terminal/image_support.rb} +1 -1
- data/lib/kward/{terminal_keys.rb → terminal/keys.rb} +22 -1
- data/lib/kward/terminal/locale_text.rb +29 -0
- data/lib/kward/{terminal_sequences.rb → terminal/sequences.rb} +45 -4
- data/lib/kward/tools/base.rb +18 -0
- data/lib/kward/tools/context_for_task.rb +15 -6
- data/lib/kward/tools/datetime.rb +85 -0
- data/lib/kward/tools/edit_file.rb +9 -6
- data/lib/kward/tools/generate_image.rb +36 -0
- data/lib/kward/tools/git_commit.rb +13 -7
- data/lib/kward/tools/list_directory.rb +4 -4
- data/lib/kward/tools/plugin_tool.rb +41 -0
- data/lib/kward/tools/prepare_shell_command.rb +1 -1
- data/lib/kward/tools/read_file.rb +7 -6
- data/lib/kward/tools/registry.rb +130 -21
- data/lib/kward/tools/run_shell_command.rb +10 -8
- data/lib/kward/tools/search/code.rb +1 -1
- data/lib/kward/tools/summarize_file_structure.rb +5 -5
- data/lib/kward/tools/tool_call.rb +4 -1
- data/lib/kward/tools/typesafe_evaluate.rb +81 -0
- data/lib/kward/tools/workspace_targets.rb +58 -0
- data/lib/kward/tools/write_file.rb +9 -6
- data/lib/kward/{export_path.rb → transcripts/export_path.rb} +1 -1
- data/lib/kward/{markdown_transcript.rb → transcripts/markdown_transcript.rb} +10 -2
- data/lib/kward/transcripts/turn_summary_formatter.rb +93 -0
- data/lib/kward/transport/contracts.rb +200 -0
- data/lib/kward/transport/gateway.rb +81 -36
- data/lib/kward/transport/plugin_chat_gateway.rb +3 -2
- data/lib/kward/transport.rb +1 -200
- data/lib/kward/turn_summary.rb +68 -0
- data/lib/kward/version.rb +1 -1
- data/lib/kward/{workspace_factory.rb → workspace/factory.rb} +2 -2
- data/lib/kward/{git_worktree_manager.rb → workspace/git_worktree_manager.rb} +28 -0
- data/lib/kward/{workspace.rb → workspace/workspace.rb} +3 -3
- data/lib/main.rb +6 -3
- data/templates/default/fulldoc/html/css/kward.css +125 -0
- data/templates/default/fulldoc/html/images/kward_screen_1.png +0 -0
- data/templates/default/fulldoc/html/setup.rb +1 -1
- data/templates/default/layout/html/layout.erb +16 -4
- metadata +150 -48
- data/lib/kward/pty_transcript_normalizer.rb +0 -93
- data/lib/kward/shell_prompt.rb +0 -52
- data/lib/kward/tab_driver.rb +0 -90
- data/templates/default/fulldoc/html/images/kward_workflow.svg +0 -52
- /data/lib/kward/{editor_prompt.rb → cli/editor_prompt.rb} +0 -0
- /data/lib/kward/{editor_prompt_session.rb → cli/editor_prompt_session.rb} +0 -0
- /data/lib/kward/{diff_view_mode.rb → prompt_interface/editor/diff_view_mode.rb} +0 -0
- /data/lib/kward/{editor_mode.rb → prompt_interface/editor/editor_mode.rb} +0 -0
- /data/lib/kward/{markdown_code_block.rb → prompt_interface/editor/markdown_code_block.rb} +0 -0
- /data/lib/kward/{scratchpad_languages.rb → prompt_interface/editor/scratchpad_languages.rb} +0 -0
- /data/lib/kward/{scratchpad_runner.rb → prompt_interface/editor/scratchpad_runner.rb} +0 -0
- /data/lib/kward/{detached_run.rb → pty/detached_run.rb} +0 -0
- /data/lib/kward/{session_diff.rb → sessions/diff.rb} +0 -0
- /data/lib/kward/{session_naming.rb → sessions/naming.rb} +0 -0
- /data/lib/kward/{session_trash.rb → sessions/trash.rb} +0 -0
- /data/lib/kward/{ansi.rb → terminal/ansi.rb} +0 -0
- /data/lib/kward/{terminal_text.rb → terminal/text.rb} +0 -0
- /data/lib/kward/{transcript_export.rb → transcripts/transcript_export.rb} +0 -0
- /data/lib/kward/{project_files.rb → workspace/files.rb} +0 -0
- /data/lib/kward/{path_guard.rb → workspace/path_guard.rb} +0 -0
|
@@ -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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
require_relative "../
|
|
1
|
+
require_relative "../terminal/text"
|
|
2
2
|
|
|
3
3
|
# Namespace for the Kward CLI agent runtime.
|
|
4
4
|
module Kward
|
|
@@ -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"
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
# Namespace for the Kward CLI agent runtime.
|
|
2
|
+
module Kward
|
|
3
|
+
class PromptInterface
|
|
4
|
+
# Terminal implementations of the frontend-neutral plugin UI requests.
|
|
5
|
+
module PluginUIRequests
|
|
6
|
+
def request_plugin_ui(kind, payload, cancellation: nil)
|
|
7
|
+
cancellation&.raise_if_cancelled!
|
|
8
|
+
result = case kind.to_sym
|
|
9
|
+
when :question then ask_user_question(payload.fetch(:questions))
|
|
10
|
+
when :select then request_plugin_select(payload)
|
|
11
|
+
when :confirm then request_plugin_confirmation(payload)
|
|
12
|
+
when :input then request_plugin_input(payload)
|
|
13
|
+
else raise ArgumentError, "unsupported plugin UI request: #{kind}"
|
|
14
|
+
end
|
|
15
|
+
cancellation&.raise_if_cancelled!
|
|
16
|
+
result
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
private
|
|
20
|
+
|
|
21
|
+
def request_plugin_select(payload)
|
|
22
|
+
options = payload.fetch(:options)
|
|
23
|
+
labels = options.map { |option| plugin_option_text(option) }
|
|
24
|
+
selected = with_plugin_ui_modal_state do
|
|
25
|
+
select(payload[:message] || "Choose an option", labels, title: payload.fetch(:title))
|
|
26
|
+
end
|
|
27
|
+
return nil if selected.nil?
|
|
28
|
+
|
|
29
|
+
option = options[labels.index(selected)]
|
|
30
|
+
option && option.fetch(:value)
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
def request_plugin_confirmation(payload)
|
|
34
|
+
yes = { label: "Yes", description: "Continue." }
|
|
35
|
+
no = { label: "No", description: "Cancel." }
|
|
36
|
+
answers = ask_user_question([
|
|
37
|
+
{
|
|
38
|
+
header: payload.fetch(:title),
|
|
39
|
+
question: payload.fetch(:message),
|
|
40
|
+
options: payload[:default] ? [yes, no] : [no, yes]
|
|
41
|
+
}
|
|
42
|
+
])
|
|
43
|
+
return false unless answers
|
|
44
|
+
|
|
45
|
+
answers.first[:answer].to_s.casecmp?("yes")
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def request_plugin_input(payload)
|
|
49
|
+
with_plugin_ui_modal_state do
|
|
50
|
+
@mutex.synchronize do
|
|
51
|
+
self.composer_input = payload[:default].to_s
|
|
52
|
+
self.composer_cursor = composer_input.length
|
|
53
|
+
@composer.prefill_input = nil
|
|
54
|
+
@composer.clear_attachments
|
|
55
|
+
@pending_keys.clear
|
|
56
|
+
@busy = false
|
|
57
|
+
@asking = true
|
|
58
|
+
end
|
|
59
|
+
label = payload[:placeholder].to_s.empty? ? payload.fetch(:title) : "#{payload.fetch(:title)} · #{payload[:placeholder]}"
|
|
60
|
+
answer = ask("#{label}>")
|
|
61
|
+
answer.is_a?(String) ? answer : nil
|
|
62
|
+
end
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
def with_plugin_ui_modal_state
|
|
66
|
+
saved_state = @mutex.synchronize do
|
|
67
|
+
state = begin_question_prompt_state
|
|
68
|
+
@question_prompt_active = true
|
|
69
|
+
state
|
|
70
|
+
end
|
|
71
|
+
yield
|
|
72
|
+
ensure
|
|
73
|
+
finish_question_prompt(saved_state) if saved_state
|
|
74
|
+
end
|
|
75
|
+
|
|
76
|
+
def plugin_option_text(option)
|
|
77
|
+
description = option[:description].to_s
|
|
78
|
+
description.empty? ? option.fetch(:label) : "#{option.fetch(:label)} — #{description}"
|
|
79
|
+
end
|
|
80
|
+
end
|
|
81
|
+
end
|
|
82
|
+
end
|
|
@@ -292,7 +292,7 @@ module Kward
|
|
|
292
292
|
true
|
|
293
293
|
end
|
|
294
294
|
|
|
295
|
-
def project_browser_delete_confirmation_rows(width)
|
|
295
|
+
def project_browser_delete_confirmation_rows(width, height:)
|
|
296
296
|
confirmation = @project_browser_state[:delete_confirmation]
|
|
297
297
|
path = confirmation[:path]
|
|
298
298
|
lines = [overlay_text_line("Delete #{confirmation[:directory] ? "directory" : "file"}?"), overlay_blank_line]
|
|
@@ -303,7 +303,7 @@ module Kward
|
|
|
303
303
|
lines << overlay_text_line(path)
|
|
304
304
|
lines << overlay_text_line("Press Backspace again to confirm • Esc to cancel", :muted)
|
|
305
305
|
end
|
|
306
|
-
overlay_card_rows("Confirm deletion", lines, width)
|
|
306
|
+
overlay_card_rows("Confirm deletion", lines, width, height: height)
|
|
307
307
|
end
|
|
308
308
|
|
|
309
309
|
def project_browser_name_entry_active?
|
|
@@ -656,65 +656,38 @@ module Kward
|
|
|
656
656
|
end
|
|
657
657
|
|
|
658
658
|
def open_project_browser_image(path)
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
@project_browser_state[:status] = "Cannot preview #{path}: unreadable or larger than 20 MB"
|
|
659
|
+
state = image_viewer_state_for(File.expand_path(path.to_s, prompt_workspace_root), path.to_s)
|
|
660
|
+
if state[:preview_error]
|
|
661
|
+
@project_browser_state[:status] = "Cannot preview #{path}: #{state[:preview_error]}"
|
|
663
662
|
return false
|
|
664
663
|
end
|
|
665
664
|
|
|
666
|
-
|
|
667
|
-
unless protocol
|
|
668
|
-
@project_browser_state[:status] = "Cannot preview #{path}: terminal does not support inline images"
|
|
669
|
-
return false
|
|
670
|
-
end
|
|
671
|
-
|
|
672
|
-
part = Kward::ImageAttachments.terminal_image_part(part, protocol)
|
|
673
|
-
unless part
|
|
674
|
-
@project_browser_state[:status] = "Cannot preview #{path}: terminal cannot render this image format"
|
|
675
|
-
return false
|
|
676
|
-
end
|
|
677
|
-
|
|
678
|
-
image_id = next_terminal_image_id
|
|
679
|
-
columns = image_viewer_columns(screen_width)
|
|
680
|
-
rows = image_viewer_preview_rows(screen_height, width: screen_width)
|
|
681
|
-
terminal_columns, terminal_rows = image_viewer_terminal_size(part, protocol, columns, rows)
|
|
682
|
-
sequence = Kward::ImageAttachments.terminal_image_sequence(
|
|
683
|
-
part,
|
|
684
|
-
width: terminal_columns,
|
|
685
|
-
height: terminal_rows,
|
|
686
|
-
protocol: protocol,
|
|
687
|
-
image_id: image_id,
|
|
688
|
-
move_cursor: false,
|
|
689
|
-
env: ENV
|
|
690
|
-
)
|
|
691
|
-
unless sequence
|
|
692
|
-
@project_browser_state[:status] = "Cannot preview #{path}: terminal cannot render this image format"
|
|
693
|
-
return false
|
|
694
|
-
end
|
|
695
|
-
|
|
696
|
-
@image_viewer_state = {
|
|
697
|
-
path: full_path,
|
|
698
|
-
display_path: path.to_s,
|
|
699
|
-
protocol: protocol,
|
|
700
|
-
image_id: image_id,
|
|
701
|
-
part: part,
|
|
702
|
-
zoom: 1.0,
|
|
703
|
-
columns: columns,
|
|
704
|
-
rows: rows,
|
|
705
|
-
sequence: sequence
|
|
706
|
-
}
|
|
665
|
+
@image_viewer_state = state
|
|
707
666
|
@pending_keys.clear
|
|
708
667
|
@asking = true
|
|
709
668
|
true
|
|
710
669
|
end
|
|
711
670
|
|
|
671
|
+
def image_viewer_state_for(path, display_path)
|
|
672
|
+
state = { path: path, display_path: display_path, zoom: 1.0 }
|
|
673
|
+
part = ImageAttachments.image_part_from_path(path)
|
|
674
|
+
return state.merge(preview_error: "unreadable or larger than 20 MB") unless part
|
|
675
|
+
|
|
676
|
+
protocol = terminal_image_protocol
|
|
677
|
+
return state.merge(preview_error: "terminal does not support inline images") unless protocol
|
|
678
|
+
|
|
679
|
+
part = ImageAttachments.terminal_image_part(part, protocol)
|
|
680
|
+
return state.merge(preview_error: "terminal cannot render this image format") unless part
|
|
681
|
+
|
|
682
|
+
state.merge(protocol: protocol, part: part, image_id: next_terminal_image_id)
|
|
683
|
+
end
|
|
684
|
+
|
|
712
685
|
def close_image_viewer
|
|
713
686
|
return false unless image_viewer_active?
|
|
714
687
|
|
|
715
688
|
clear_image_viewer_output_locked
|
|
689
|
+
sync_project_browser_query_input unless @image_viewer_state[:generated]
|
|
716
690
|
@image_viewer_state = nil
|
|
717
|
-
sync_project_browser_query_input
|
|
718
691
|
@asking = true
|
|
719
692
|
true
|
|
720
693
|
end
|
|
@@ -739,7 +712,7 @@ module Kward
|
|
|
739
712
|
end
|
|
740
713
|
|
|
741
714
|
def zoom_image_viewer(direction)
|
|
742
|
-
return false unless image_viewer_active?
|
|
715
|
+
return false unless image_viewer_active? && !@image_viewer_state[:preview_error]
|
|
743
716
|
|
|
744
717
|
delta = direction == :in ? IMAGE_VIEWER_ZOOM_STEP : -IMAGE_VIEWER_ZOOM_STEP
|
|
745
718
|
zoom = [[image_viewer_zoom + delta, IMAGE_VIEWER_MIN_ZOOM].max, IMAGE_VIEWER_MAX_ZOOM].min
|
|
@@ -754,9 +727,8 @@ module Kward
|
|
|
754
727
|
[desired_columns, available_columns].min
|
|
755
728
|
end
|
|
756
729
|
|
|
757
|
-
def image_viewer_sequence(width,
|
|
730
|
+
def image_viewer_sequence(width, rows)
|
|
758
731
|
columns = image_viewer_columns(width)
|
|
759
|
-
rows = image_viewer_preview_rows(height, width: width)
|
|
760
732
|
state = @image_viewer_state
|
|
761
733
|
return state[:sequence] if state[:columns] == columns && state[:rows] == rows
|
|
762
734
|
|
|
@@ -883,7 +855,7 @@ module Kward
|
|
|
883
855
|
|
|
884
856
|
def project_browser_rows(width, height: screen_height)
|
|
885
857
|
return [] unless project_browser_visible?
|
|
886
|
-
return project_browser_delete_confirmation_rows(width) if project_browser_delete_confirmation_active?
|
|
858
|
+
return project_browser_delete_confirmation_rows(width, height: height) if project_browser_delete_confirmation_active?
|
|
887
859
|
|
|
888
860
|
rows = project_browser_visible_rows
|
|
889
861
|
lines = []
|
|
@@ -900,7 +872,7 @@ module Kward
|
|
|
900
872
|
lines << overlay_text_line(@project_browser_state[:status], :muted) if @project_browser_state[:status]
|
|
901
873
|
lines << overlay_blank_line
|
|
902
874
|
lines << overlay_text_line(project_browser_help_text, :muted)
|
|
903
|
-
overlay_card_rows(title, lines, width)
|
|
875
|
+
overlay_card_rows(title, lines, width, height: height)
|
|
904
876
|
end
|
|
905
877
|
|
|
906
878
|
def project_browser_title
|
|
@@ -1147,7 +1119,8 @@ module Kward
|
|
|
1147
1119
|
composer_bottom_rows = @tabs.empty? ? 1 : tab_border_rows(width).length
|
|
1148
1120
|
footer_rows = footer_text.empty? ? 0 : 1
|
|
1149
1121
|
attachment_rows = attachment_badge_texts.length
|
|
1150
|
-
|
|
1122
|
+
status_rows = @project_browser_state&.[](:status) ? 1 : 0
|
|
1123
|
+
[composer_row_budget(height) - 6 - composer_bottom_rows - footer_rows - attachment_rows - status_rows, 4].max
|
|
1151
1124
|
end
|
|
1152
1125
|
|
|
1153
1126
|
def default_project_browser_expanded_paths(paths)
|