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
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
require "io/console"
|
|
2
|
+
|
|
3
|
+
module Kward
|
|
4
|
+
module NativeShell
|
|
5
|
+
# Each job has an owned process group. Only its interpreter leader is reaped
|
|
6
|
+
# here; that interpreter owns the pipeline and substitution children.
|
|
7
|
+
module Jobs
|
|
8
|
+
Job = Struct.new(:id, :pid, :group, :state, :status, :command, :terminal_mode, :notified, keyword_init: true)
|
|
9
|
+
MAX_JOBS = 1_024
|
|
10
|
+
TCSETPGRP = Fiddle::Function.new(Fiddle::Handle::DEFAULT["tcsetpgrp"], [Fiddle::TYPE_INT, Fiddle::TYPE_INT], Fiddle::TYPE_INT)
|
|
11
|
+
|
|
12
|
+
def notify_jobs(error:, force: false)
|
|
13
|
+
return unless interactive_scope? && (force || @options.include?("notify"))
|
|
14
|
+
reap_jobs
|
|
15
|
+
@jobs.each_value do |job|
|
|
16
|
+
next if job.state == :running || job.notified == job.state
|
|
17
|
+
error&.puts("[#{job.id}] #{job.state.to_s.capitalize} #{job.command}")
|
|
18
|
+
job.notified = job.state
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def close
|
|
23
|
+
active = @jobs.values.reject { |job| job.state == :done }
|
|
24
|
+
active.each do |job|
|
|
25
|
+
signal_job(job, "HUP")
|
|
26
|
+
signal_job(job, "CONT")
|
|
27
|
+
signal_job(job, "KILL")
|
|
28
|
+
end
|
|
29
|
+
active.each do |job|
|
|
30
|
+
begin
|
|
31
|
+
Process.waitpid(job.pid)
|
|
32
|
+
rescue Errno::ECHILD
|
|
33
|
+
# A completed job may already have been collected by its waiter.
|
|
34
|
+
end
|
|
35
|
+
end
|
|
36
|
+
@jobs.clear
|
|
37
|
+
ensure
|
|
38
|
+
close_resources
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
private
|
|
42
|
+
|
|
43
|
+
def foreground_process?(node)
|
|
44
|
+
commands = node.values.first
|
|
45
|
+
commands.length > 1 || commands.first.kind == :subshell
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def job_description(tree)
|
|
49
|
+
return tree.source if tree.source
|
|
50
|
+
return job_description(tree.values.first) if tree.kind == :and_or
|
|
51
|
+
tree.kind.to_s
|
|
52
|
+
end
|
|
53
|
+
|
|
54
|
+
def start_job(tree, streams, background:)
|
|
55
|
+
reap_jobs
|
|
56
|
+
raise ExecutionError, "too many jobs (maximum #{MAX_JOBS}); use wait" if @jobs.size >= MAX_JOBS
|
|
57
|
+
reader, writer = IO.pipe
|
|
58
|
+
null = File.open(File::NULL) if background && !@options.include?("monitor")
|
|
59
|
+
selected = null ? streams.merge(0 => null) : streams
|
|
60
|
+
group = !@job_child
|
|
61
|
+
pid = fork_program(tree, selected, close: [writer], group: group, gate: reader,
|
|
62
|
+
asynchronous: background && !@options.include?("monitor"))
|
|
63
|
+
reader.close
|
|
64
|
+
Process.setpgid(pid, pid) if group
|
|
65
|
+
id = (@jobs.keys.max || 0) + 1
|
|
66
|
+
job = Job.new(id: id, pid: pid, group: group, state: :running, command: job_description(tree))
|
|
67
|
+
@jobs[job.id] = job
|
|
68
|
+
if background
|
|
69
|
+
@last_background_pid = pid
|
|
70
|
+
writer.close
|
|
71
|
+
0
|
|
72
|
+
else
|
|
73
|
+
foreground_job(job, streams, gate: writer)
|
|
74
|
+
end
|
|
75
|
+
ensure
|
|
76
|
+
reader&.close unless reader&.closed?
|
|
77
|
+
writer&.close unless writer&.closed?
|
|
78
|
+
null&.close
|
|
79
|
+
terminate(pid) if pid && !job
|
|
80
|
+
end
|
|
81
|
+
|
|
82
|
+
def signal_job(job, signal)
|
|
83
|
+
Process.kill(signal == "EXIT" ? 0 : signal, job.group ? -job.pid : job.pid)
|
|
84
|
+
job.state = :running if signal == "CONT"
|
|
85
|
+
rescue Errno::ESRCH
|
|
86
|
+
nil
|
|
87
|
+
end
|
|
88
|
+
|
|
89
|
+
def update_job(job, status)
|
|
90
|
+
if status.stopped?
|
|
91
|
+
job.state = :stopped
|
|
92
|
+
job.status = 128 + status.stopsig
|
|
93
|
+
else
|
|
94
|
+
job.state = :done
|
|
95
|
+
job.status = status.exitstatus || 128 + status.termsig
|
|
96
|
+
end
|
|
97
|
+
end
|
|
98
|
+
|
|
99
|
+
def reap_jobs
|
|
100
|
+
@jobs.each_value do |job|
|
|
101
|
+
next if job.state == :done
|
|
102
|
+
result = Process.waitpid2(job.pid, Process::WNOHANG | Process::WUNTRACED)
|
|
103
|
+
update_job(job, result.last) if result
|
|
104
|
+
end
|
|
105
|
+
end
|
|
106
|
+
|
|
107
|
+
def find_job(value)
|
|
108
|
+
reap_jobs
|
|
109
|
+
if %w[% %% %+].include?(value)
|
|
110
|
+
@jobs.values.last
|
|
111
|
+
elsif value == "%-"
|
|
112
|
+
@jobs.values[-2]
|
|
113
|
+
elsif value.match?(/\A%[0-9]+\z/)
|
|
114
|
+
@jobs[value[1..].to_i]
|
|
115
|
+
elsif value.match?(/\A[0-9]+\z/)
|
|
116
|
+
@jobs.values.find { |job| job.pid == value.to_i }
|
|
117
|
+
elsif value.start_with?("%")
|
|
118
|
+
matches = @jobs.values.select do |job|
|
|
119
|
+
value.start_with?("%?") ? job.command.include?(value[2..]) : job.command.start_with?(value[1..])
|
|
120
|
+
end
|
|
121
|
+
raise ExecutionError, "ambiguous job: #{value}" if matches.length > 1
|
|
122
|
+
matches.first
|
|
123
|
+
end
|
|
124
|
+
end
|
|
125
|
+
|
|
126
|
+
def wait_job(job, streams, stopped: false, interruptible: false)
|
|
127
|
+
until job.state == :done || stopped && job.state == :stopped
|
|
128
|
+
if interruptible && !@pending_signals.empty?
|
|
129
|
+
# Evaluation records wait's interrupted status before running the
|
|
130
|
+
# deferred action, so the trap observes the status of wait itself.
|
|
131
|
+
return 128 + Signal.list.fetch(@pending_signals.first)
|
|
132
|
+
end
|
|
133
|
+
result = Process.waitpid2(job.pid, Process::WNOHANG | Process::WUNTRACED)
|
|
134
|
+
result ? update_job(job, result.last) : sleep(0.01)
|
|
135
|
+
end
|
|
136
|
+
@jobs.delete(job.id) if job.state == :done
|
|
137
|
+
job.status
|
|
138
|
+
end
|
|
139
|
+
|
|
140
|
+
def foreground_job(job, streams, gate: nil)
|
|
141
|
+
# A command may redirect stdin and still open /dev/tty (for example less).
|
|
142
|
+
terminal = [streams[0], $stdin].compact.find(&:tty?) if job.group && !@shell_agent_command
|
|
143
|
+
previous_ttou = Signal.trap("TTOU", "IGNORE") if terminal
|
|
144
|
+
shell_mode = terminal.console_mode if terminal
|
|
145
|
+
if terminal && TCSETPGRP.call(terminal.fileno, job.pid) < 0
|
|
146
|
+
raise SystemCallError.new("tcsetpgrp", Fiddle.last_error)
|
|
147
|
+
end
|
|
148
|
+
terminal.console_mode = job.terminal_mode if terminal && job.terminal_mode
|
|
149
|
+
gate&.close
|
|
150
|
+
if job.state == :stopped
|
|
151
|
+
job.state = :running
|
|
152
|
+
signal_job(job, "CONT")
|
|
153
|
+
end
|
|
154
|
+
result = wait_job(job, streams, stopped: true)
|
|
155
|
+
job.terminal_mode = terminal.console_mode if terminal && job.state == :stopped
|
|
156
|
+
@pending_signals << "INT" if result == 130 && @traps.key?("INT")
|
|
157
|
+
result
|
|
158
|
+
rescue Interrupt, Interactive::AgentCommandTimeout
|
|
159
|
+
if @shell_agent_command
|
|
160
|
+
signal_job(job, "KILL")
|
|
161
|
+
Process.waitpid(job.pid) rescue nil
|
|
162
|
+
@jobs.delete(job.id)
|
|
163
|
+
else
|
|
164
|
+
signal_job(job, "INT")
|
|
165
|
+
end
|
|
166
|
+
raise
|
|
167
|
+
ensure
|
|
168
|
+
if terminal
|
|
169
|
+
begin
|
|
170
|
+
TCSETPGRP.call(terminal.fileno, Process.getpgrp)
|
|
171
|
+
terminal.console_mode = shell_mode if shell_mode && (job.state == :stopped || !result || result >= 128)
|
|
172
|
+
ensure
|
|
173
|
+
Signal.trap("TTOU", previous_ttou)
|
|
174
|
+
end
|
|
175
|
+
end
|
|
176
|
+
end
|
|
177
|
+
|
|
178
|
+
def jobs_builtin(args, streams)
|
|
179
|
+
flags = builtin_flags(args, "lprs", "jobs")
|
|
180
|
+
mode = flags.reverse.find { |flag| %w[l p].include?(flag) }
|
|
181
|
+
states = flags & %w[r s]
|
|
182
|
+
reap_jobs
|
|
183
|
+
jobs = args.empty? ? @jobs.values : args.map { |arg| find_job(arg) || raise(ExecutionError, "jobs: no such job: #{arg}") }
|
|
184
|
+
jobs.each do |job|
|
|
185
|
+
next if states == ["r"] && job.state != :running || states == ["s"] && job.state != :stopped
|
|
186
|
+
text = mode == "p" ? job.pid.to_s : "[#{job.id}] #{mode == 'l' ? "#{job.pid} " : ''}#{job.state.to_s.capitalize} #{job.command}"
|
|
187
|
+
write_line(streams, text)
|
|
188
|
+
end
|
|
189
|
+
0
|
|
190
|
+
end
|
|
191
|
+
|
|
192
|
+
def wait_builtin(args, streams)
|
|
193
|
+
args.shift if args.first == "--"
|
|
194
|
+
raise ExecutionError, "wait: unsupported option" if args.any? { |arg| arg.start_with?("-") }
|
|
195
|
+
all = args.empty?
|
|
196
|
+
targets = all ? @jobs.values.dup : args.map { |arg| find_job(arg) }
|
|
197
|
+
result = 0
|
|
198
|
+
targets.each do |job|
|
|
199
|
+
result = job ? wait_job(job, streams, interruptible: true) : 127
|
|
200
|
+
return result if job && @jobs.key?(job.id)
|
|
201
|
+
end
|
|
202
|
+
all ? 0 : result
|
|
203
|
+
end
|
|
204
|
+
|
|
205
|
+
def resume_job(args, streams, foreground:)
|
|
206
|
+
raise ExecutionError, "fg: needs a user-driven terminal" if foreground && @shell_agent_command
|
|
207
|
+
|
|
208
|
+
args.shift if args.first == "--"
|
|
209
|
+
raise ExecutionError, "job control is disabled; use set -m" unless @options.include?("monitor")
|
|
210
|
+
raise ExecutionError, "expected at most one job ID" if args.length > 1
|
|
211
|
+
job = find_job(args.first || "%+")
|
|
212
|
+
raise ExecutionError, "no such active job" unless job && job.state != :done
|
|
213
|
+
return foreground_job(job, streams) if foreground
|
|
214
|
+
signal_job(job, "CONT")
|
|
215
|
+
job.state = :running
|
|
216
|
+
0
|
|
217
|
+
end
|
|
218
|
+
|
|
219
|
+
def kill_builtin(args, streams)
|
|
220
|
+
signal = "TERM"
|
|
221
|
+
if args.first == "-l"
|
|
222
|
+
args.shift
|
|
223
|
+
text = args.empty? ? Signal.list.keys.reject { |name| name == "EXIT" }.join(" ") : args.map { |arg| arg.match?(/\A[0-9]+\z/) ? signal_name(arg.to_i > 128 ? (arg.to_i - 128).to_s : arg) : Signal.list.fetch(signal_name(arg)).to_s }.join(" ")
|
|
224
|
+
write_line(streams, text)
|
|
225
|
+
return 0
|
|
226
|
+
elsif %w[-s -n].include?(args.first)
|
|
227
|
+
args.shift
|
|
228
|
+
signal = signal_name(args.shift&.upcase)
|
|
229
|
+
elsif args.first&.start_with?("-") && args.first != "--"
|
|
230
|
+
signal = signal_name(args.shift[1..].upcase)
|
|
231
|
+
end
|
|
232
|
+
args.shift if args.first == "--"
|
|
233
|
+
raise ExecutionError, "kill: expected a pid or job ID" if args.empty?
|
|
234
|
+
args.each do |target|
|
|
235
|
+
if target.start_with?("%")
|
|
236
|
+
job = find_job(target)
|
|
237
|
+
raise ExecutionError, "kill: no such active job: #{target}" unless job && job.state != :done
|
|
238
|
+
signal_job(job, signal)
|
|
239
|
+
else
|
|
240
|
+
unless target.match?(/\A-?[0-9]{1,10}\z/) && target.to_i.abs <= 2_147_483_647
|
|
241
|
+
raise ExecutionError, "kill: invalid pid: #{target}"
|
|
242
|
+
end
|
|
243
|
+
Process.kill(signal == "EXIT" ? 0 : signal, target.to_i)
|
|
244
|
+
end
|
|
245
|
+
end
|
|
246
|
+
0
|
|
247
|
+
end
|
|
248
|
+
end
|
|
249
|
+
end
|
|
250
|
+
end
|
|
@@ -0,0 +1,382 @@
|
|
|
1
|
+
require_relative "../terminal/keys"
|
|
2
|
+
require_relative "../terminal/sequences"
|
|
3
|
+
require_relative "native_locale"
|
|
4
|
+
require_relative "native_syntax"
|
|
5
|
+
|
|
6
|
+
module Kward
|
|
7
|
+
module NativeShell
|
|
8
|
+
# Non-modal edit state. The terminal adapter owns byte reads and redraws.
|
|
9
|
+
class LineEditor
|
|
10
|
+
# Keep path and flag punctuation in words, like the default Zsh Emacs keymap.
|
|
11
|
+
WORD_CHARACTERS = "[:alnum:]#{Regexp.escape('*?_-.[]~=/&;!#$%^(){}<>')}".freeze
|
|
12
|
+
WORD_START = /\G[#{WORD_CHARACTERS}]*[^#{WORD_CHARACTERS}]*/
|
|
13
|
+
WORD_END = /\G[^#{WORD_CHARACTERS}]*[#{WORD_CHARACTERS}]*/
|
|
14
|
+
|
|
15
|
+
HISTORY_SEARCH_KEYS = [TerminalKeys::CTRL_R, TerminalKeys::CTRL_S].freeze
|
|
16
|
+
CUT_LIMIT = 8
|
|
17
|
+
UNDO_LIMIT = 100
|
|
18
|
+
|
|
19
|
+
def initialize(runtime)
|
|
20
|
+
@runtime = runtime
|
|
21
|
+
@cuts = []
|
|
22
|
+
end
|
|
23
|
+
|
|
24
|
+
def encoding
|
|
25
|
+
@locale.encoding
|
|
26
|
+
end
|
|
27
|
+
|
|
28
|
+
def read(get:, paste:, changed:, alert:, clear:, erase:, kill:, eof:, interrupt:, suggestions: false, draft: nil, completion_cancel: nil)
|
|
29
|
+
Locale.with(@runtime.variables) do |locale|
|
|
30
|
+
@locale = locale
|
|
31
|
+
@line = draft.to_s.b.force_encoding(encoding).scrub
|
|
32
|
+
@position = @line.length
|
|
33
|
+
@history = @runtime.history
|
|
34
|
+
@cuts.clear if @private_edit != @history.paused?
|
|
35
|
+
@private_edit = @history.paused?
|
|
36
|
+
suggestions &&= !@private_edit
|
|
37
|
+
@history.refresh
|
|
38
|
+
@entries = @history.entries
|
|
39
|
+
@index = @entries.length
|
|
40
|
+
@history_prefix = nil
|
|
41
|
+
@vertical_column = nil
|
|
42
|
+
@menu = nil
|
|
43
|
+
@last_tab = false
|
|
44
|
+
@continued_cut = false
|
|
45
|
+
@undo = []
|
|
46
|
+
@last_yank = nil
|
|
47
|
+
loop do
|
|
48
|
+
suggestion = suggestion_for_draft if suggestions
|
|
49
|
+
draw(changed, suggestion)
|
|
50
|
+
key = get.call
|
|
51
|
+
return nil unless key
|
|
52
|
+
raise Interrupt if key == interrupt
|
|
53
|
+
next if @menu && handle_menu(key)
|
|
54
|
+
if HISTORY_SEARCH_KEYS.include?(key) && ![erase, kill, eof].include?(key)
|
|
55
|
+
@last_tab = @continued_cut = false
|
|
56
|
+
@last_yank = nil
|
|
57
|
+
refresh_history if @index == @entries.length
|
|
58
|
+
@history_prefix = nil
|
|
59
|
+
key = search_history(key, get: get, changed: changed, alert: alert, clear: clear, erase: erase, interrupt: interrupt)
|
|
60
|
+
return nil unless key
|
|
61
|
+
next if key == :cancel_search
|
|
62
|
+
end
|
|
63
|
+
if TerminalKeys::RETURN.include?(key)
|
|
64
|
+
draw(changed, nil) if suggestion
|
|
65
|
+
return @line + "\n"
|
|
66
|
+
end
|
|
67
|
+
return nil if key == eof && @line.empty?
|
|
68
|
+
|
|
69
|
+
@vertical_column = nil unless (TerminalKeys::UP + TerminalKeys::DOWN).include?(key)
|
|
70
|
+
@last_tab = false unless TerminalKeys::TAB.include?(key)
|
|
71
|
+
@last_yank = nil unless TerminalKeys::ALT_Y.include?(key)
|
|
72
|
+
consecutive_cut = @continued_cut
|
|
73
|
+
@continued_cut = false
|
|
74
|
+
case key
|
|
75
|
+
when *TerminalKeys::TAB then complete(alert, completion_cancel)
|
|
76
|
+
when *TerminalKeys::UP then move_vertical(-1)
|
|
77
|
+
when *TerminalKeys::DOWN then move_vertical(1)
|
|
78
|
+
when TerminalKeys::CTRL_P then recall(-1)
|
|
79
|
+
when TerminalKeys::CTRL_N then recall(1)
|
|
80
|
+
when *TerminalKeys::LEFT, TerminalKeys::CTRL_B then @position = [@position - 1, 0].max
|
|
81
|
+
when *TerminalKeys::RIGHT
|
|
82
|
+
suggestion ? insert(suggestion) : move_right
|
|
83
|
+
when TerminalKeys::CTRL_F then move_right
|
|
84
|
+
when *TerminalKeys::HOME, TerminalKeys::CTRL_A then @position = line_start
|
|
85
|
+
when *TerminalKeys::END_KEY, TerminalKeys::CTRL_E then @position = line_end
|
|
86
|
+
when erase, *TerminalKeys::BACKSPACE
|
|
87
|
+
replace(@position - 1, 1) if @position.positive?
|
|
88
|
+
when kill then cut(0, @line.length)
|
|
89
|
+
when eof, *TerminalKeys::DELETE then replace(@position, 1) if @position < @line.length
|
|
90
|
+
when *TerminalKeys::ALT_LEFT, *TerminalKeys::ALT_B then @position = previous_word
|
|
91
|
+
when *TerminalKeys::ALT_RIGHT, *TerminalKeys::ALT_F then @position = @line.match(WORD_START, @position).end(0)
|
|
92
|
+
when TerminalKeys::CTRL_K then cut(@position, kill_line_end, consecutive_cut)
|
|
93
|
+
when TerminalKeys::CTRL_W, *TerminalKeys::ALT_BACKSPACE then cut(previous_word, @position, consecutive_cut)
|
|
94
|
+
when *TerminalKeys::ALT_D then cut(@position, @line.match(WORD_END, @position).end(0), consecutive_cut)
|
|
95
|
+
when TerminalKeys::CTRL_Y then yank(0)
|
|
96
|
+
when *TerminalKeys::ALT_Y then yank_pop
|
|
97
|
+
when *TerminalKeys::ALT_LAST_WORD then insert_last_word(alert)
|
|
98
|
+
when TerminalKeys::CTRL_L then clear.call
|
|
99
|
+
when TerminalKeys::CTRL_T, TerminalKeys::CTRL_T_CSI_U then transpose
|
|
100
|
+
when TerminalKeys::CTRL_UNDERSCORE then undo
|
|
101
|
+
when *TerminalKeys::SHIFT_ENTER then insert("\n")
|
|
102
|
+
when TerminalSequences::BRACKETED_PASTE_START
|
|
103
|
+
text = paste.call
|
|
104
|
+
return nil unless text
|
|
105
|
+
insert(text)
|
|
106
|
+
else
|
|
107
|
+
insert(key) if printable_key?(key)
|
|
108
|
+
end
|
|
109
|
+
rescue EncodingError, ExpansionError
|
|
110
|
+
alert.call
|
|
111
|
+
end
|
|
112
|
+
end
|
|
113
|
+
ensure
|
|
114
|
+
@locale = @line = @draft = @entries = @undo = @last_yank = @history_prefix = @menu = nil
|
|
115
|
+
end
|
|
116
|
+
|
|
117
|
+
private
|
|
118
|
+
|
|
119
|
+
def complete(alert, cancel)
|
|
120
|
+
completion = @runtime.complete_line(@line, @position, cancel: cancel)
|
|
121
|
+
return alert.call unless completion
|
|
122
|
+
|
|
123
|
+
if @line[completion.range] != completion.replacement
|
|
124
|
+
replace(completion.range.begin, completion.range.size, @locale.text(completion.replacement))
|
|
125
|
+
elsif @last_tab && completion.candidates.length > 1
|
|
126
|
+
@menu = completion
|
|
127
|
+
@menu_index = 0
|
|
128
|
+
else
|
|
129
|
+
alert.call
|
|
130
|
+
end
|
|
131
|
+
@last_tab = true
|
|
132
|
+
end
|
|
133
|
+
|
|
134
|
+
def draw(changed, suggestion)
|
|
135
|
+
return changed.call(@line, @position, suggestion: suggestion) unless @menu
|
|
136
|
+
|
|
137
|
+
text = @line.dup
|
|
138
|
+
choice = @locale.text(@menu.choices.fetch(@menu_index))
|
|
139
|
+
text[@menu.choice_range] = choice
|
|
140
|
+
changed.call(text, @menu.choice_range.begin + choice.length, menu: [@menu.candidates, @menu_index])
|
|
141
|
+
end
|
|
142
|
+
|
|
143
|
+
def suggestion_for_draft
|
|
144
|
+
return if @menu || @line.empty? || @line.include?("\n") || @position != @line.length || @index != @entries.length
|
|
145
|
+
|
|
146
|
+
@entries.reverse_each do |_, entry|
|
|
147
|
+
next unless entry.b.start_with?(@line.b)
|
|
148
|
+
|
|
149
|
+
text = @locale.text(entry)
|
|
150
|
+
next unless text.valid_encoding? && text.length > @position && !text.match?(/[[:cntrl:]]/)
|
|
151
|
+
|
|
152
|
+
return text[@position..]
|
|
153
|
+
end
|
|
154
|
+
nil
|
|
155
|
+
end
|
|
156
|
+
|
|
157
|
+
def move_right
|
|
158
|
+
@position += 1 if @position < @line.length
|
|
159
|
+
end
|
|
160
|
+
|
|
161
|
+
def handle_menu(key)
|
|
162
|
+
case key
|
|
163
|
+
when *TerminalKeys::TAB, *TerminalKeys::SHIFT_TAB
|
|
164
|
+
direction = TerminalKeys::TAB.include?(key) ? 1 : -1
|
|
165
|
+
@menu_index = (@menu_index + direction) % @menu.choices.length
|
|
166
|
+
return true
|
|
167
|
+
when TerminalKeys::ESCAPE
|
|
168
|
+
@menu = nil
|
|
169
|
+
@last_tab = false
|
|
170
|
+
return true
|
|
171
|
+
end
|
|
172
|
+
|
|
173
|
+
replace(@menu.choice_range.begin, @menu.choice_range.size, @locale.text(@menu.choices.fetch(@menu_index)))
|
|
174
|
+
@menu = nil
|
|
175
|
+
@last_tab = false
|
|
176
|
+
TerminalKeys::RETURN.include?(key)
|
|
177
|
+
end
|
|
178
|
+
|
|
179
|
+
def previous_word
|
|
180
|
+
@position - @line[0, @position].reverse.match(WORD_END).end(0)
|
|
181
|
+
end
|
|
182
|
+
|
|
183
|
+
def line_start(position = @position)
|
|
184
|
+
(@line[0...position].rindex("\n") || -1) + 1
|
|
185
|
+
end
|
|
186
|
+
|
|
187
|
+
def line_end(position = @position)
|
|
188
|
+
@line.index("\n", position) || @line.length
|
|
189
|
+
end
|
|
190
|
+
|
|
191
|
+
def kill_line_end
|
|
192
|
+
finish = line_end
|
|
193
|
+
finish == @position && finish < @line.length ? finish + 1 : finish
|
|
194
|
+
end
|
|
195
|
+
|
|
196
|
+
def move_vertical(direction)
|
|
197
|
+
start = line_start
|
|
198
|
+
finish = line_end
|
|
199
|
+
return recall(direction, prefix: true) unless @line.include?("\n")
|
|
200
|
+
return if direction.negative? ? start.zero? : finish == @line.length
|
|
201
|
+
|
|
202
|
+
@vertical_column ||= @position - start
|
|
203
|
+
target = direction.negative? ? line_start(start - 1) : finish + 1
|
|
204
|
+
@position = [target + @vertical_column, line_end(target)].min
|
|
205
|
+
end
|
|
206
|
+
|
|
207
|
+
def cut(start, finish, consecutive = false)
|
|
208
|
+
return if start == finish
|
|
209
|
+
|
|
210
|
+
text = @line[start...finish]
|
|
211
|
+
if consecutive
|
|
212
|
+
@cuts[0] = start < @position ? text + @cuts.first : @cuts.first + text
|
|
213
|
+
else
|
|
214
|
+
@cuts.unshift(text)
|
|
215
|
+
@cuts.pop if @cuts.length > CUT_LIMIT
|
|
216
|
+
end
|
|
217
|
+
replace(start, finish - start)
|
|
218
|
+
@continued_cut = true
|
|
219
|
+
end
|
|
220
|
+
|
|
221
|
+
def yank(index, start = @position, length = 0)
|
|
222
|
+
return if @cuts.empty?
|
|
223
|
+
|
|
224
|
+
text = @locale.text(@cuts.fetch(index)).scrub
|
|
225
|
+
replace(start, length, text)
|
|
226
|
+
@last_yank = [index, start, text.length]
|
|
227
|
+
end
|
|
228
|
+
|
|
229
|
+
def yank_pop
|
|
230
|
+
return unless @last_yank && @cuts.length > 1
|
|
231
|
+
|
|
232
|
+
index, start, length = @last_yank
|
|
233
|
+
yank((index + 1) % @cuts.length, start, length)
|
|
234
|
+
end
|
|
235
|
+
|
|
236
|
+
def insert_last_word(alert)
|
|
237
|
+
return alert.call unless @index.positive?
|
|
238
|
+
|
|
239
|
+
word = Lexer.new(history_text(@index - 1)).tokens.reverse_each.find { |token| token.value.is_a?(Word) }
|
|
240
|
+
word ? insert(word.source) : alert.call
|
|
241
|
+
rescue SyntaxError
|
|
242
|
+
alert.call
|
|
243
|
+
end
|
|
244
|
+
|
|
245
|
+
def transpose
|
|
246
|
+
right = @position
|
|
247
|
+
right -= 1 if right == @line.length || @line[right] == "\n"
|
|
248
|
+
return unless right.positive?
|
|
249
|
+
|
|
250
|
+
pair = @line[right - 1, 2]
|
|
251
|
+
replace(right - 1, 2, pair.reverse) unless pair.include?("\n")
|
|
252
|
+
end
|
|
253
|
+
|
|
254
|
+
def insert(text)
|
|
255
|
+
replace(@position, 0, @locale.text(text))
|
|
256
|
+
end
|
|
257
|
+
|
|
258
|
+
def replace(start, length, text = "")
|
|
259
|
+
removed = @line[start, length]
|
|
260
|
+
if removed != text
|
|
261
|
+
@history_prefix = nil
|
|
262
|
+
@undo << [start, text.length, removed, @position]
|
|
263
|
+
@undo.shift if @undo.length > UNDO_LIMIT
|
|
264
|
+
@line[start, length] = text
|
|
265
|
+
end
|
|
266
|
+
@position = start + text.length
|
|
267
|
+
end
|
|
268
|
+
|
|
269
|
+
def undo
|
|
270
|
+
change = @undo.pop
|
|
271
|
+
return unless change
|
|
272
|
+
|
|
273
|
+
start, length, text, cursor = change
|
|
274
|
+
@history_prefix = nil
|
|
275
|
+
@line[start, length] = text
|
|
276
|
+
@position = cursor
|
|
277
|
+
end
|
|
278
|
+
|
|
279
|
+
def printable_key?(key)
|
|
280
|
+
key.length == 1 && key.ord >= 32 && key.ord != 127
|
|
281
|
+
end
|
|
282
|
+
|
|
283
|
+
def refresh_history
|
|
284
|
+
@history.refresh
|
|
285
|
+
@entries = @history.entries
|
|
286
|
+
@index = @entries.length
|
|
287
|
+
end
|
|
288
|
+
|
|
289
|
+
def recall(direction, prefix: false)
|
|
290
|
+
if @index == @entries.length
|
|
291
|
+
return if direction.positive?
|
|
292
|
+
|
|
293
|
+
refresh_history
|
|
294
|
+
end
|
|
295
|
+
@history_prefix = prefix ? (@history_prefix || @line.dup) : nil
|
|
296
|
+
index = @index + direction
|
|
297
|
+
while index.between?(0, @entries.length)
|
|
298
|
+
if index == @entries.length || !@history_prefix || history_text(index).start_with?(@history_prefix)
|
|
299
|
+
select_history(index)
|
|
300
|
+
@history_prefix = nil if index == @entries.length
|
|
301
|
+
return
|
|
302
|
+
end
|
|
303
|
+
index += direction
|
|
304
|
+
end
|
|
305
|
+
end
|
|
306
|
+
|
|
307
|
+
def search_history(key, get:, changed:, alert:, clear:, erase:, interrupt:)
|
|
308
|
+
query = "".force_encoding(encoding)
|
|
309
|
+
direction = history_direction(key)
|
|
310
|
+
anchor = @index
|
|
311
|
+
index = nil
|
|
312
|
+
failed = false
|
|
313
|
+
loop do
|
|
314
|
+
label = direction.negative? ? "reverse-i-search" : "forward-i-search"
|
|
315
|
+
label = "failed #{label}" if failed
|
|
316
|
+
prefix = "(#{label}: #{query}"
|
|
317
|
+
changed.call(prefix + "): " + (index ? history_text(index) : ""), prefix.length)
|
|
318
|
+
key = get.call
|
|
319
|
+
return nil unless key
|
|
320
|
+
raise Interrupt if key == interrupt
|
|
321
|
+
|
|
322
|
+
match = nil
|
|
323
|
+
case key
|
|
324
|
+
when TerminalKeys::CTRL_G, TerminalKeys::ESCAPE then return :cancel_search
|
|
325
|
+
when TerminalKeys::CTRL_L
|
|
326
|
+
clear.call
|
|
327
|
+
next
|
|
328
|
+
when *HISTORY_SEARCH_KEYS
|
|
329
|
+
direction = history_direction(key)
|
|
330
|
+
match = history_match(query, index ? index + direction : anchor, direction)
|
|
331
|
+
anchor = match if match
|
|
332
|
+
when erase, *TerminalKeys::BACKSPACE
|
|
333
|
+
query.chop!
|
|
334
|
+
index = nil if query.empty?
|
|
335
|
+
match = history_match(query, anchor, direction) unless query.empty?
|
|
336
|
+
else
|
|
337
|
+
if printable_key?(key)
|
|
338
|
+
query << key
|
|
339
|
+
match = history_match(query, anchor, direction)
|
|
340
|
+
elsif TerminalKeys::RETURN.include?(key) && (!index || failed)
|
|
341
|
+
alert.call
|
|
342
|
+
next
|
|
343
|
+
else
|
|
344
|
+
select_history(index) if index && !failed
|
|
345
|
+
return key
|
|
346
|
+
end
|
|
347
|
+
end
|
|
348
|
+
index = match if match
|
|
349
|
+
failed = match.nil? && !query.empty?
|
|
350
|
+
end
|
|
351
|
+
end
|
|
352
|
+
|
|
353
|
+
def history_direction(key)
|
|
354
|
+
key == TerminalKeys::CTRL_R ? -1 : 1
|
|
355
|
+
end
|
|
356
|
+
|
|
357
|
+
def history_match(query, start, direction)
|
|
358
|
+
fold = query == query.downcase
|
|
359
|
+
start = @entries.length - 1 if direction.negative? && start == @entries.length
|
|
360
|
+
while start.between?(0, @entries.length - 1)
|
|
361
|
+
text = history_text(start)
|
|
362
|
+
text = text.downcase if fold
|
|
363
|
+
return start if text.include?(query)
|
|
364
|
+
start += direction
|
|
365
|
+
end
|
|
366
|
+
nil
|
|
367
|
+
end
|
|
368
|
+
|
|
369
|
+
def select_history(index)
|
|
370
|
+
@draft = @line.dup if @index == @entries.length
|
|
371
|
+
@line = index == @entries.length ? @draft.dup : history_text(index)
|
|
372
|
+
@index = index
|
|
373
|
+
@position = @line.length
|
|
374
|
+
@undo.clear
|
|
375
|
+
end
|
|
376
|
+
|
|
377
|
+
def history_text(index)
|
|
378
|
+
@locale.text(@entries.fetch(index).last).scrub
|
|
379
|
+
end
|
|
380
|
+
end
|
|
381
|
+
end
|
|
382
|
+
end
|