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
|
@@ -6,44 +6,36 @@ module Kward
|
|
|
6
6
|
module PromptRenderer
|
|
7
7
|
private
|
|
8
8
|
|
|
9
|
-
def render_prompt_locked
|
|
9
|
+
def render_prompt_locked
|
|
10
10
|
return unless @started && @asking && !terminal_owned_by_child_locked?
|
|
11
11
|
|
|
12
12
|
width, height = screen_size
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
unless handle_resize_locked(width: width, height: height)
|
|
14
|
+
rows, cursor_row, cursor_col = composer_layout(width, height)
|
|
15
|
+
if composer_frame_needs_sync?(rows, cursor_row)
|
|
16
|
+
with_synchronized_output_locked { render_prompt_layout_locked(rows, cursor_row, cursor_col, width, height) }
|
|
17
|
+
else
|
|
18
|
+
render_prompt_layout_locked(rows, cursor_row, cursor_col, width, height)
|
|
19
|
+
end
|
|
17
20
|
end
|
|
18
|
-
|
|
19
|
-
rows, cursor_row, cursor_col = composer_layout(width, height)
|
|
20
|
-
synchronized ||= rows.length != @reserved_rows
|
|
21
|
-
if synchronized
|
|
22
|
-
with_synchronized_output_locked { render_prompt_layout_locked(rows, cursor_row, cursor_col, width, height) }
|
|
23
|
-
else
|
|
24
|
-
render_prompt_layout_locked(rows, cursor_row, cursor_col, width, height)
|
|
25
|
-
end
|
|
26
|
-
flush_output_locked
|
|
21
|
+
flush_output_locked unless @restoring_transcript || @synchronized_output_depth.positive?
|
|
27
22
|
end
|
|
28
23
|
|
|
29
|
-
def
|
|
30
|
-
return if
|
|
24
|
+
def composer_frame_needs_sync?(rows, cursor_row)
|
|
25
|
+
return true if rows.length != @reserved_rows
|
|
31
26
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
rows, cursor_row, cursor_col = composer_layout(width, height)
|
|
35
|
-
render_prompt_layout_locked(rows, cursor_row, cursor_col, width, height)
|
|
27
|
+
# Keep ordinary typing fast, but don't expose cursor travel to other rows.
|
|
28
|
+
rows.each_index.any? { |index| index != cursor_row && rows[index] != @last_composer_rows[index] }
|
|
36
29
|
end
|
|
37
30
|
|
|
38
31
|
def render_prompt_layout_locked(rows, cursor_row, cursor_col, width, height)
|
|
39
32
|
ensure_scroll_region_locked(rows.length, width: width, height: height)
|
|
40
33
|
@rendered_rows = rows.length
|
|
41
34
|
render_composer_rows_locked(rows, height: height)
|
|
42
|
-
@cursor_rendered_row = cursor_row
|
|
43
35
|
@last_width = width
|
|
44
36
|
@last_height = height
|
|
45
|
-
|
|
46
|
-
|
|
37
|
+
@rendered_composer_cursor = [composer_top_row(height) + cursor_row, cursor_col + 1]
|
|
38
|
+
restore_composer_cursor_locked
|
|
47
39
|
end
|
|
48
40
|
|
|
49
41
|
def render_prompt_after_output_locked
|
|
@@ -57,7 +49,6 @@ module Kward
|
|
|
57
49
|
width, height = screen_size
|
|
58
50
|
clear_composer_region_locked(height: height)
|
|
59
51
|
@rendered_rows = 0
|
|
60
|
-
@cursor_rendered_row = 0
|
|
61
52
|
redraw_transcript_locked(width: width, height: height)
|
|
62
53
|
end
|
|
63
54
|
|
|
@@ -69,7 +60,6 @@ module Kward
|
|
|
69
60
|
reserve_composer_region_locked(width: width, height: height) if @started && @asking
|
|
70
61
|
clear_composer_region_locked(height: height)
|
|
71
62
|
@rendered_rows = 0
|
|
72
|
-
@cursor_rendered_row = 0
|
|
73
63
|
move_to_transcript_cursor_locked(width: width, height: height) if @started
|
|
74
64
|
end
|
|
75
65
|
|
|
@@ -78,17 +68,22 @@ module Kward
|
|
|
78
68
|
|
|
79
69
|
handle_resize_locked
|
|
80
70
|
width, height = screen_size
|
|
71
|
+
# Stream against the painted frame, not a layout that may have unpainted status changes.
|
|
72
|
+
if @started && @asking
|
|
73
|
+
render_prompt_locked if @last_composer_rows.empty?
|
|
74
|
+
elsif @reserved_rows.zero?
|
|
75
|
+
reserve_composer_region_locked(width: width, height: height)
|
|
76
|
+
end
|
|
77
|
+
return if transcript_region_hidden?(height)
|
|
78
|
+
|
|
81
79
|
hide_cursor_for_transcript_output_locked
|
|
82
|
-
reserve_composer_region_locked(width: width, height: height)
|
|
83
80
|
move_to_transcript_cursor_locked(width: width, height: height)
|
|
84
81
|
end
|
|
85
82
|
|
|
86
83
|
def restore_composer_cursor_locked
|
|
87
|
-
return unless @started && @asking && !terminal_owned_by_child_locked?
|
|
84
|
+
return unless @started && @asking && @rendered_composer_cursor && !terminal_owned_by_child_locked?
|
|
88
85
|
|
|
89
|
-
|
|
90
|
-
_rows, cursor_row, cursor_col = composer_layout(width, height)
|
|
91
|
-
move_to_screen(composer_top_row(height) + cursor_row, cursor_col + 1)
|
|
86
|
+
move_to_screen(*@rendered_composer_cursor)
|
|
92
87
|
render_cursor_visibility_locked
|
|
93
88
|
end
|
|
94
89
|
|
|
@@ -106,14 +101,11 @@ module Kward
|
|
|
106
101
|
redraw_transcript_locked(width: width, height: height)
|
|
107
102
|
@rendered_rows = @asking ? rows.length : 0
|
|
108
103
|
render_composer_rows_locked(rows, height: height) if @asking
|
|
109
|
-
@cursor_rendered_row = @asking ? cursor_row : 0
|
|
110
104
|
@last_width = width
|
|
111
105
|
@last_height = height
|
|
112
106
|
reset_stream_position_from_transcript_locked(width)
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
render_cursor_visibility_locked
|
|
116
|
-
end
|
|
107
|
+
@rendered_composer_cursor = @asking ? [composer_top_row(height) + cursor_row, cursor_col + 1] : nil
|
|
108
|
+
restore_composer_cursor_locked
|
|
117
109
|
end
|
|
118
110
|
|
|
119
111
|
end
|
|
@@ -26,8 +26,8 @@ module Kward
|
|
|
26
26
|
@mutex.synchronize do
|
|
27
27
|
if key.nil?
|
|
28
28
|
resized = handle_resize_locked
|
|
29
|
-
|
|
30
|
-
render_prompt_locked if resized ||
|
|
29
|
+
chrome_changed = tick_composer_chrome_locked
|
|
30
|
+
render_prompt_locked if resized || chrome_changed
|
|
31
31
|
else
|
|
32
32
|
result = handle_question_key(key)
|
|
33
33
|
result = drain_pending_question_keys_locked(result)
|
|
@@ -309,33 +309,24 @@ module Kward
|
|
|
309
309
|
end
|
|
310
310
|
|
|
311
311
|
def question_composer_layout(width, height = screen_height)
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
return
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
rows
|
|
327
|
-
rows.concat(visible_rows.map { |row| box_content_row(row, content_width) })
|
|
328
|
-
rows.concat(question_bottom_border_rows(width))
|
|
329
|
-
cursor_row = overlay_rows.length + 1 + input_cursor_row - visible_start
|
|
330
|
-
cursor_col = 2 + [input_cursor_col, content_width - 1].min
|
|
331
|
-
[rows, cursor_row, cursor_col]
|
|
332
|
-
end
|
|
333
|
-
|
|
334
|
-
def question_bottom_border_rows(width)
|
|
335
|
-
@tabs.empty? ? [bottom_border(width)] : tab_border_rows(width)
|
|
312
|
+
overlay_rows = question_overlay_rows(width, height: height)
|
|
313
|
+
available_rows = composer_row_budget(height) - overlay_rows.length
|
|
314
|
+
return compact_composer_layout(width, overlay_rows) if available_rows < 3
|
|
315
|
+
|
|
316
|
+
content_width = width - 4
|
|
317
|
+
bottom_rows = composer_bottom_rows(width, available_rows - 2)
|
|
318
|
+
if selected_question_choice&.fetch(:custom, false)
|
|
319
|
+
max_input_rows = [COMPOSER_MAX_INPUT_ROWS, available_rows - 1 - bottom_rows.length].min
|
|
320
|
+
input_rows, cursor_row, cursor_col = visible_composer_input(content_width, max_input_rows)
|
|
321
|
+
else
|
|
322
|
+
input_rows = [box_content_row("", content_width)]
|
|
323
|
+
cursor_row, cursor_col = 0, 2
|
|
324
|
+
end
|
|
325
|
+
rows = overlay_rows + [top_border(width)] + input_rows + bottom_rows
|
|
326
|
+
[rows, overlay_rows.length + 1 + cursor_row, cursor_col]
|
|
336
327
|
end
|
|
337
328
|
|
|
338
|
-
def question_overlay_rows(width)
|
|
329
|
+
def question_overlay_rows(width, height: screen_height)
|
|
339
330
|
title = "Question #{@question_state[:index]}/#{@question_state[:total]} · #{@question_state[:header]}"
|
|
340
331
|
content_width = [overlay_card_width(width) - 4, 1].max
|
|
341
332
|
lines = question_text_rows(@question_state[:question], content_width, :bold)
|
|
@@ -347,7 +338,7 @@ module Kward
|
|
|
347
338
|
selected = index == question_selection_index
|
|
348
339
|
lines << overlay_choice_line(choice_text(choice, selected: selected), selected: selected)
|
|
349
340
|
end
|
|
350
|
-
overlay_card_rows(title, lines, width)
|
|
341
|
+
overlay_card_rows(title, lines, width, height: height)
|
|
351
342
|
end
|
|
352
343
|
|
|
353
344
|
def question_text_rows(text, width, style)
|
|
@@ -35,7 +35,7 @@ module Kward
|
|
|
35
35
|
|
|
36
36
|
def spinner_active?
|
|
37
37
|
busy = @busy || (@select_state && @select_state[:busy_activity])
|
|
38
|
-
busy && @queued_count.zero? && @started && @asking
|
|
38
|
+
busy && (@queued_count.zero? || @busy_activity == "Generating image…") && @started && @asking
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
def completion_status(status)
|
|
@@ -87,8 +87,16 @@ module Kward
|
|
|
87
87
|
true
|
|
88
88
|
end
|
|
89
89
|
|
|
90
|
+
def tick_composer_chrome_locked
|
|
91
|
+
return false unless @started && @asking && !terminal_owned_by_child_locked?
|
|
92
|
+
|
|
93
|
+
footer_changed = tick_footer_locked
|
|
94
|
+
status_changed = tick_composer_status_locked
|
|
95
|
+
footer_changed || status_changed
|
|
96
|
+
end
|
|
97
|
+
|
|
90
98
|
def tick_footer_locked
|
|
91
|
-
return false unless @footer
|
|
99
|
+
return false unless @footer
|
|
92
100
|
return false unless footer_refresh_due?
|
|
93
101
|
|
|
94
102
|
previous_text = @cached_footer_text
|
|
@@ -108,26 +116,45 @@ module Kward
|
|
|
108
116
|
end
|
|
109
117
|
|
|
110
118
|
def refresh_footer_text_locked
|
|
111
|
-
@cached_footer_text =
|
|
119
|
+
@cached_footer_text = call_footer([screen_width - 4, 1].max).to_s.gsub(/\s+/, " ").strip
|
|
112
120
|
rescue StandardError
|
|
113
121
|
@cached_footer_text = ""
|
|
114
122
|
ensure
|
|
115
123
|
@last_footer_refresh = monotonic_now
|
|
116
124
|
end
|
|
117
125
|
|
|
126
|
+
def call_footer(max_width)
|
|
127
|
+
arity = @footer.respond_to?(:arity) ? @footer.arity : @footer.method(:call).arity
|
|
128
|
+
arity.zero? ? @footer.call : @footer.call(max_width)
|
|
129
|
+
end
|
|
130
|
+
|
|
131
|
+
def tick_composer_status_locked
|
|
132
|
+
return false unless @composer_status && composer_status_refresh_due?
|
|
133
|
+
return false if editor_visible? || screen_height < 4
|
|
134
|
+
|
|
135
|
+
previous_text = @cached_composer_status_text
|
|
136
|
+
refresh_composer_status_text_locked
|
|
137
|
+
previous_text != @cached_composer_status_text
|
|
138
|
+
end
|
|
139
|
+
|
|
118
140
|
def cached_composer_status_text
|
|
119
141
|
return nil unless @composer_status
|
|
120
142
|
|
|
121
|
-
|
|
122
|
-
elapsed = now - @last_composer_status_refresh.to_f
|
|
123
|
-
if @cached_composer_status_text.nil? || elapsed >= COMPOSER_STATUS_REFRESH_INTERVAL
|
|
124
|
-
text = @composer_status.call.to_s
|
|
125
|
-
@cached_composer_status_text = text.empty? ? nil : status_composer_text(text)
|
|
126
|
-
@last_composer_status_refresh = now
|
|
127
|
-
end
|
|
143
|
+
refresh_composer_status_text_locked if composer_status_refresh_due?
|
|
128
144
|
@cached_composer_status_text
|
|
145
|
+
end
|
|
146
|
+
|
|
147
|
+
def composer_status_refresh_due?
|
|
148
|
+
@last_composer_status_refresh.nil? || monotonic_now - @last_composer_status_refresh >= COMPOSER_STATUS_REFRESH_INTERVAL
|
|
149
|
+
end
|
|
150
|
+
|
|
151
|
+
def refresh_composer_status_text_locked
|
|
152
|
+
text = @composer_status.call.to_s
|
|
153
|
+
@cached_composer_status_text = text.empty? ? nil : status_composer_text(text)
|
|
129
154
|
rescue StandardError
|
|
130
155
|
@cached_composer_status_text = nil
|
|
156
|
+
ensure
|
|
157
|
+
@last_composer_status_refresh = monotonic_now
|
|
131
158
|
end
|
|
132
159
|
|
|
133
160
|
def monotonic_now
|
|
@@ -111,38 +111,47 @@ module Kward
|
|
|
111
111
|
end
|
|
112
112
|
|
|
113
113
|
def ensure_scroll_region_locked(row_count, redraw_transcript: true, width: screen_width, height: screen_height)
|
|
114
|
-
|
|
114
|
+
row_limit = editor_visible? ? height : height - 1
|
|
115
|
+
new_reserved_rows = row_count.clamp(1, row_limit)
|
|
115
116
|
return if @reserved_rows == new_reserved_rows && @last_height == height
|
|
116
117
|
|
|
117
118
|
old_reserved_rows = @reserved_rows
|
|
118
119
|
old_top = [height - old_reserved_rows + 1, 1].max
|
|
119
120
|
@reserved_rows = new_reserved_rows
|
|
120
121
|
new_top = composer_top_row(height)
|
|
121
|
-
|
|
122
|
+
new_bottom = transcript_bottom_row(height)
|
|
123
|
+
if transcript_region_hidden?(height)
|
|
124
|
+
@transcript_viewport_rows = 0
|
|
125
|
+
print_output_locked(TerminalSequences.restore_scroll_region)
|
|
126
|
+
else
|
|
127
|
+
print_output_locked(TerminalSequences.scroll_region(1, new_bottom))
|
|
128
|
+
end
|
|
122
129
|
clear_screen_rows_locked(old_top, new_top - 1) if new_top > old_top
|
|
130
|
+
clear_screen_rows_locked(new_bottom + 1, new_top - 1) if old_reserved_rows.positive? && new_bottom < new_top - 1
|
|
123
131
|
@last_composer_rows = []
|
|
124
|
-
|
|
132
|
+
if redraw_transcript && @stream_state.block && new_reserved_rows > old_reserved_rows && !transcript_region_hidden?(height)
|
|
133
|
+
@transcript_viewport_rows = [@transcript_viewport_rows, new_bottom].min
|
|
134
|
+
end
|
|
135
|
+
should_redraw_transcript = redraw_transcript && (new_reserved_rows < old_reserved_rows || @stream_state.block)
|
|
136
|
+
redraw_transcript_locked(width: width, height: height) if should_redraw_transcript && new_reserved_rows != old_reserved_rows
|
|
125
137
|
end
|
|
126
138
|
|
|
127
|
-
def handle_resize_locked
|
|
139
|
+
def handle_resize_locked(width: screen_width, height: screen_height)
|
|
128
140
|
return false if terminal_owned_by_child_locked?
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
if interactive_active_locked?
|
|
143
|
-
@interactive_state[:controller].resize(width: interactive_canvas_width(current_width))
|
|
141
|
+
return false if width == @last_width && height == @last_height
|
|
142
|
+
|
|
143
|
+
with_synchronized_output_locked do
|
|
144
|
+
rows_to_clear = resize_prompt_clear_rows(@last_width, width, @reserved_rows)
|
|
145
|
+
restore_scroll_region_locked
|
|
146
|
+
clear_resized_composer_region_locked(@last_height, height, rows_to_clear)
|
|
147
|
+
@last_footer_refresh = nil if width != @last_width
|
|
148
|
+
@last_width = width
|
|
149
|
+
@last_height = height
|
|
150
|
+
if interactive_active_locked?
|
|
151
|
+
@interactive_state[:controller].resize(width: interactive_canvas_width(width))
|
|
152
|
+
end
|
|
153
|
+
redraw_screen_locked(width: width, height: height)
|
|
144
154
|
end
|
|
145
|
-
redraw_screen_locked(width: current_width, height: current_height)
|
|
146
155
|
true
|
|
147
156
|
end
|
|
148
157
|
|
|
@@ -181,6 +190,7 @@ module Kward
|
|
|
181
190
|
rows_to_clear ||= [@reserved_rows, @rendered_rows].max
|
|
182
191
|
clear_bottom_rows_locked(height, rows_to_clear)
|
|
183
192
|
@last_composer_rows = []
|
|
193
|
+
@rendered_composer_cursor = nil
|
|
184
194
|
end
|
|
185
195
|
|
|
186
196
|
def resize_prompt_clear_rows(old_width, current_width, old_reserved_rows)
|
|
@@ -362,9 +362,9 @@ module Kward
|
|
|
362
362
|
@mutex.synchronize do
|
|
363
363
|
resized = handle_resize_locked
|
|
364
364
|
spun = tick_spinner_locked
|
|
365
|
-
|
|
366
|
-
render_prompt_locked if resized || spun ||
|
|
367
|
-
flush_output_locked if resized || spun ||
|
|
365
|
+
chrome_changed = tick_composer_chrome_locked
|
|
366
|
+
render_prompt_locked if resized || spun || chrome_changed
|
|
367
|
+
flush_output_locked if resized || spun || chrome_changed
|
|
368
368
|
end
|
|
369
369
|
end
|
|
370
370
|
|
|
@@ -667,7 +667,7 @@ module Kward
|
|
|
667
667
|
end
|
|
668
668
|
|
|
669
669
|
def selection_overlay_rows(width, height: screen_height)
|
|
670
|
-
return selection_confirmation_rows(width) if select_confirmation_active?
|
|
670
|
+
return selection_confirmation_rows(width, height: height) if select_confirmation_active?
|
|
671
671
|
|
|
672
672
|
matches = selection_matches
|
|
673
673
|
lines = [overlay_text_line(selection_overlay_help_text, :muted), overlay_blank_line]
|
|
@@ -677,7 +677,7 @@ module Kward
|
|
|
677
677
|
else
|
|
678
678
|
lines << overlay_text_line("No matches", :muted)
|
|
679
679
|
end
|
|
680
|
-
return overlay_card_rows(selection_overlay_title, lines, width)
|
|
680
|
+
return overlay_card_rows(selection_overlay_title, lines, width, height: height)
|
|
681
681
|
end
|
|
682
682
|
|
|
683
683
|
visible = visible_selection_matches(matches, height: height)
|
|
@@ -686,7 +686,7 @@ module Kward
|
|
|
686
686
|
index = start_index + offset
|
|
687
687
|
lines << overlay_choice_line(choice, selected: index == selection_index)
|
|
688
688
|
end
|
|
689
|
-
overlay_card_rows(selection_overlay_title, lines, width)
|
|
689
|
+
overlay_card_rows(selection_overlay_title, lines, width, height: height)
|
|
690
690
|
end
|
|
691
691
|
|
|
692
692
|
def selection_overlay_help_text
|
|
@@ -706,13 +706,13 @@ module Kward
|
|
|
706
706
|
title && !title.empty? ? title : "Sessions"
|
|
707
707
|
end
|
|
708
708
|
|
|
709
|
-
def selection_confirmation_rows(width)
|
|
709
|
+
def selection_confirmation_rows(width, height:)
|
|
710
710
|
title = @select_state[:confirm_title].to_s
|
|
711
711
|
title = "Confirm" if title.empty?
|
|
712
712
|
text = @select_state[:confirm_text].to_s
|
|
713
713
|
text = "Press #{@select_state[:confirm_key]} again to confirm, Esc to cancel." if text.empty?
|
|
714
714
|
lines = [overlay_text_line(text, :muted)]
|
|
715
|
-
overlay_card_rows(title, lines, width)
|
|
715
|
+
overlay_card_rows(title, lines, width, height: height)
|
|
716
716
|
end
|
|
717
717
|
|
|
718
718
|
def visible_selection_matches(matches, height: screen_height)
|
|
@@ -105,7 +105,7 @@ module Kward
|
|
|
105
105
|
description = command[:description].empty? ? "" : " — #{command[:description]}"
|
|
106
106
|
overlay_choice_line("/#{command[:name]}#{hint}#{description}", selected: index == @slash_selection_index)
|
|
107
107
|
end
|
|
108
|
-
overlay_card_rows("Slash commands", lines, width)
|
|
108
|
+
overlay_card_rows("Slash commands", lines, width, height: height)
|
|
109
109
|
end
|
|
110
110
|
|
|
111
111
|
def visible_slash_overlay_matches(matches, height: screen_height)
|
|
@@ -31,8 +31,10 @@ module Kward
|
|
|
31
31
|
def write_visual_transcript_text_locked(text)
|
|
32
32
|
width, height = screen_size
|
|
33
33
|
output_text = terminal_newlines(text.to_s)
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
unless transcript_region_hidden?(height)
|
|
35
|
+
advance_pending_stream_wrap_locked(output_text, width: width, height: height)
|
|
36
|
+
print_output_locked(output_text)
|
|
37
|
+
end
|
|
36
38
|
update_stream_position(output_text, width: width)
|
|
37
39
|
end
|
|
38
40
|
|
|
@@ -51,7 +53,7 @@ module Kward
|
|
|
51
53
|
end
|
|
52
54
|
|
|
53
55
|
def redraw_transcript_locked(width: screen_width, height: screen_height)
|
|
54
|
-
return
|
|
56
|
+
return if transcript_region_hidden?(height) || !transcript_renderable?
|
|
55
57
|
|
|
56
58
|
rows = transcript_viewport_rows(transcript_redraw_row_count(height), width)
|
|
57
59
|
clear_screen_rows_locked(1, rows.length)
|
|
@@ -70,7 +72,7 @@ module Kward
|
|
|
70
72
|
end
|
|
71
73
|
|
|
72
74
|
def remember_transcript_viewport_locked(height = screen_height)
|
|
73
|
-
@transcript_viewport_rows = transcript_bottom_row(height)
|
|
75
|
+
@transcript_viewport_rows = transcript_bottom_row(height) unless transcript_region_hidden?(height)
|
|
74
76
|
end
|
|
75
77
|
|
|
76
78
|
def transcript_renderable?
|
|
@@ -118,8 +120,7 @@ module Kward
|
|
|
118
120
|
end
|
|
119
121
|
|
|
120
122
|
def transcript_marker(label)
|
|
121
|
-
|
|
122
|
-
label == "Assistant" ? "✦ #{marker}" : marker
|
|
123
|
+
"#{transcript_label(label)}>"
|
|
123
124
|
end
|
|
124
125
|
|
|
125
126
|
def label_styles(label)
|