kward 0.85.0 → 0.86.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +130 -0
- data/CONTRIBUTING.md +1 -1
- data/Gemfile.lock +6 -2
- data/README.md +3 -3
- data/Rakefile +3 -0
- data/doc/agent-tools.md +11 -0
- data/doc/api.md +4 -1
- data/doc/composer.md +4 -3
- data/doc/configuration.md +60 -11
- data/doc/extensibility.md +2 -0
- data/doc/getting-started.md +3 -3
- data/doc/git.md +1 -1
- data/doc/memory.md +1 -1
- data/doc/plugins.md +40 -5
- data/doc/providers.md +10 -4
- data/doc/rpc.md +125 -7
- data/doc/session-management.md +36 -1
- data/doc/shell.md +643 -27
- data/doc/tabs.md +2 -1
- data/doc/troubleshooting.md +1 -1
- data/doc/usage.md +21 -11
- data/examples/plugins/openrouter_proxy/README.md +103 -0
- data/examples/plugins/openrouter_proxy/fake_embeddings.rb +85 -0
- data/examples/plugins/openrouter_proxy/plugin.rb +7 -0
- data/examples/plugins/openrouter_proxy/protocol.rb +202 -0
- data/examples/plugins/openrouter_proxy/server.rb +186 -0
- data/examples/plugins/space_invaders.rb +0 -1
- data/exe/kward +2 -2
- data/exe/kwsh +7 -0
- data/kward.gemspec +3 -1
- data/lib/kward/agent.rb +43 -9
- data/lib/kward/cli/commands.rb +41 -11
- data/lib/kward/cli/interactive_turn.rb +10 -0
- data/lib/kward/cli/plugins.rb +5 -1
- data/lib/kward/cli/prompt_interface.rb +4 -1
- data/lib/kward/cli/rendering.rb +21 -28
- data/lib/kward/cli/runtime_helpers.rb +52 -34
- data/lib/kward/cli/settings/model.rb +1 -12
- data/lib/kward/cli/tabs.rb +91 -18
- data/lib/kward/cli/tool_summaries.rb +2 -0
- data/lib/kward/cli/transcript_formatter.rb +3 -10
- data/lib/kward/cli/worktrees.rb +1 -0
- data/lib/kward/cli.rb +56 -7
- data/lib/kward/config/core.rb +16 -5
- data/lib/kward/config/extensions.rb +3 -0
- data/lib/kward/config/paths.rb +11 -0
- data/lib/kward/config/settings.rb +7 -0
- data/lib/kward/conversation.rb +11 -1
- data/lib/kward/entrypoint.rb +14 -0
- data/lib/kward/events.rb +2 -0
- data/lib/kward/generated_images.rb +237 -0
- data/lib/kward/model/catalog.rb +6 -3
- data/lib/kward/model/client.rb +105 -36
- data/lib/kward/model/codex_images.rb +83 -0
- data/lib/kward/model/copilot_models.rb +8 -4
- data/lib/kward/model/model_info.rb +27 -9
- data/lib/kward/model/openrouter_model_cache.rb +4 -2
- data/lib/kward/model/payloads.rb +6 -5
- data/lib/kward/model/sources.rb +3 -1
- data/lib/kward/model/stream_parser.rb +4 -7
- data/lib/kward/pan/index.html.erb +8 -1
- data/lib/kward/pan/server.rb +13 -1
- data/lib/kward/plugins/codex_responses.rb +73 -0
- data/lib/kward/plugins/host.rb +16 -0
- data/lib/kward/plugins/http_server.rb +83 -0
- data/lib/kward/plugins/registry.rb +39 -0
- data/lib/kward/prompt_interface/composer_controller.rb +0 -1
- data/lib/kward/prompt_interface/composer_renderer.rb +159 -72
- data/lib/kward/prompt_interface/editor/controller.rb +1 -1
- data/lib/kward/prompt_interface/editor/renderer.rb +10 -7
- data/lib/kward/prompt_interface/file_overlay.rb +3 -3
- data/lib/kward/prompt_interface/generated_image_preview.rb +162 -0
- data/lib/kward/prompt_interface/git_prompt.rb +18 -11
- data/lib/kward/prompt_interface/interactive/renderer.rb +1 -1
- data/lib/kward/prompt_interface/interactive/state.rb +18 -20
- data/lib/kward/prompt_interface/key_handler.rb +108 -25
- data/lib/kward/prompt_interface/layout.rb +11 -1
- data/lib/kward/prompt_interface/overlay_renderer.rb +25 -8
- data/lib/kward/prompt_interface/project_browser.rb +27 -54
- data/lib/kward/prompt_interface/prompt_renderer.rb +27 -35
- data/lib/kward/prompt_interface/question_prompt.rb +19 -28
- data/lib/kward/prompt_interface/runtime_state.rb +31 -9
- data/lib/kward/prompt_interface/screen.rb +24 -21
- data/lib/kward/prompt_interface/selection_prompt.rb +8 -8
- data/lib/kward/prompt_interface/slash_overlay.rb +1 -1
- data/lib/kward/prompt_interface/transcript_renderer.rb +7 -6
- data/lib/kward/prompt_interface.rb +109 -39
- data/lib/kward/prompts.rb +7 -1
- data/lib/kward/pty/adaptive_output_sink.rb +38 -4
- data/lib/kward/pty/interactive_runner.rb +20 -28
- data/lib/kward/pty/transcript_normalizer.rb +65 -21
- data/lib/kward/rpc/config_manager.rb +3 -0
- data/lib/kward/rpc/server.rb +27 -5
- data/lib/kward/rpc/session_manager.rb +62 -17
- data/lib/kward/rpc/transcript_normalizer.rb +11 -7
- data/lib/kward/sessions/store.rb +30 -3
- data/lib/kward/shell/kwsh.rb +27 -7
- data/lib/kward/shell/kwshrc.rb +11 -2
- data/lib/kward/shell/native_arithmetic.rb +255 -0
- data/lib/kward/shell/native_arrays.rb +102 -0
- data/lib/kward/shell/native_braces.rb +96 -0
- data/lib/kward/shell/native_builtins.rb +476 -0
- data/lib/kward/shell/native_completion.rb +169 -0
- data/lib/kward/shell/native_condition.rb +75 -0
- data/lib/kward/shell/native_directory.rb +116 -0
- data/lib/kward/shell/native_exec_state.rb +73 -0
- data/lib/kward/shell/native_expansion.rb +252 -0
- data/lib/kward/shell/native_fields.rb +62 -0
- data/lib/kward/shell/native_glob.rb +96 -0
- data/lib/kward/shell/native_history.rb +242 -0
- data/lib/kward/shell/native_interactive.rb +164 -0
- data/lib/kward/shell/native_invocation.rb +42 -0
- data/lib/kward/shell/native_jobs.rb +250 -0
- data/lib/kward/shell/native_line_editor.rb +382 -0
- data/lib/kward/shell/native_line_terminal.rb +286 -0
- data/lib/kward/shell/native_locale.rb +109 -0
- data/lib/kward/shell/native_locals.rb +57 -0
- data/lib/kward/shell/native_pattern.rb +200 -0
- data/lib/kward/shell/native_process.rb +279 -0
- data/lib/kward/shell/native_program.rb +40 -0
- data/lib/kward/shell/native_programmable_completion.rb +115 -0
- data/lib/kward/shell/native_prompt_format.rb +89 -0
- data/lib/kward/shell/native_runtime.rb +964 -0
- data/lib/kward/shell/native_substitution.rb +110 -0
- data/lib/kward/shell/native_syntax.rb +946 -0
- data/lib/kward/shell/native_traps.rb +196 -0
- data/lib/kward/shell/native_vi.rb +407 -0
- data/lib/kward/shell/native_vi_terminal.rb +19 -0
- data/lib/kward/shell/native_worker.rb +82 -0
- data/lib/kward/shell/persistent_session.rb +184 -190
- data/lib/kward/shell/prompt.rb +14 -0
- data/lib/kward/shell/prompt_agent.rb +17 -0
- data/lib/kward/shell/script_runner.rb +244 -0
- data/lib/kward/shell/standalone_agent.rb +31 -0
- data/lib/kward/shell/standalone_link.rb +78 -0
- data/lib/kward/shell/standalone_terminal.rb +287 -0
- data/lib/kward/terminal/keys.rb +22 -1
- data/lib/kward/terminal/locale_text.rb +29 -0
- data/lib/kward/terminal/sequences.rb +45 -4
- data/lib/kward/tools/datetime.rb +85 -0
- data/lib/kward/tools/generate_image.rb +36 -0
- data/lib/kward/tools/registry.rb +35 -9
- data/lib/kward/tools/tool_call.rb +3 -1
- data/lib/kward/transcripts/markdown_transcript.rb +8 -0
- data/lib/kward/transcripts/turn_summary_formatter.rb +93 -0
- data/lib/kward/transport/gateway.rb +2 -1
- data/lib/kward/turn_summary.rb +68 -0
- data/lib/kward/version.rb +1 -1
- data/lib/main.rb +6 -3
- metadata +84 -1
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
module Kward
|
|
2
|
+
module NativeShell
|
|
3
|
+
# Signal callbacks only enqueue names. Native source runs at interpreter safe
|
|
4
|
+
# points, with the interrupted status restored unless the action exits.
|
|
5
|
+
module Traps
|
|
6
|
+
INTERACTIVE_SIGNALS = %w[INT QUIT TERM TSTP TTIN TTOU].freeze
|
|
7
|
+
RUBY_RESERVED_SIGNALS = %w[ILL FPE BUS SEGV VTALRM].freeze
|
|
8
|
+
|
|
9
|
+
def with_prompt_input
|
|
10
|
+
@reading_prompt = true
|
|
11
|
+
yield
|
|
12
|
+
ensure
|
|
13
|
+
@reading_prompt = false
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
def finish(input: $stdin, output: $stdout, error: $stderr)
|
|
17
|
+
streams = { 0 => input, 1 => output, 2 => error }.merge(@persistent_descriptors)
|
|
18
|
+
action = @traps.delete("EXIT")
|
|
19
|
+
with_signal_handlers { run_trap(action, streams) } if action && !action.empty?
|
|
20
|
+
@status
|
|
21
|
+
rescue Flow => flow
|
|
22
|
+
@status = flow.status
|
|
23
|
+
rescue SyntaxError, ExpansionError, ExecutionError, SystemCallError, IOError, ArgumentError => e
|
|
24
|
+
error&.puts("kwsh: #{e.message}")
|
|
25
|
+
@status = 2
|
|
26
|
+
end
|
|
27
|
+
|
|
28
|
+
def with_signals
|
|
29
|
+
with_signal_handlers { yield }
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
def poll_signals(input: $stdin, output: $stdout, error: $stderr)
|
|
33
|
+
notify_jobs(error: error)
|
|
34
|
+
run_pending_traps({ 0 => input, 1 => output, 2 => error }.merge(@persistent_descriptors))
|
|
35
|
+
rescue Flow => flow
|
|
36
|
+
@exited = true if flow.kind == :exit
|
|
37
|
+
@status = flow.status
|
|
38
|
+
rescue SyntaxError, ExpansionError, ExecutionError, SystemCallError, IOError, ArgumentError => e
|
|
39
|
+
error&.puts("kwsh: #{e.message}")
|
|
40
|
+
@status = 2
|
|
41
|
+
end
|
|
42
|
+
|
|
43
|
+
private
|
|
44
|
+
|
|
45
|
+
def signal_name(value)
|
|
46
|
+
value = value.to_s.sub(/\ASIG/, "")
|
|
47
|
+
number = value.match?(/\A[0-9]+\z/) ? value.to_i : Signal.list[value]
|
|
48
|
+
name = Signal.list.key(number)
|
|
49
|
+
raise InvalidSignal, "invalid signal: #{value}" unless name && Signal.list.key?(name)
|
|
50
|
+
name
|
|
51
|
+
end
|
|
52
|
+
|
|
53
|
+
def trap_builtin(args, streams)
|
|
54
|
+
defaults = args.first == "-p"
|
|
55
|
+
args.shift if defaults
|
|
56
|
+
args.shift if args.first == "--"
|
|
57
|
+
if args.empty? || defaults
|
|
58
|
+
actions = @trap_snapshot || @traps
|
|
59
|
+
names = if args.empty?
|
|
60
|
+
defaults ? Signal.list.values.uniq.map { |number| Signal.list.key(number) } - %w[KILL STOP] : actions.keys
|
|
61
|
+
else
|
|
62
|
+
args.map { |name| signal_name(name) }
|
|
63
|
+
end
|
|
64
|
+
reserved_shutdown = @trap_snapshot ? @trap_snapshot_hosted : @hosted && !@job_child
|
|
65
|
+
names -= ["USR2"] if reserved_shutdown
|
|
66
|
+
names.each do |name|
|
|
67
|
+
write_line(streams, "trap -- #{Shellwords.escape(actions.fetch(name, '-'))} #{name}")
|
|
68
|
+
end
|
|
69
|
+
@trap_snapshot = nil unless args.empty?
|
|
70
|
+
return 0
|
|
71
|
+
end
|
|
72
|
+
action = args.first.match?(/\A[0-9]+\z/) ? "-" : args.shift
|
|
73
|
+
raise ExecutionError, "trap: expected an action and signals" if args.empty?
|
|
74
|
+
names = args.map { |name| signal_name(name) }
|
|
75
|
+
if @hosted && !@job_child && names.include?("USR2")
|
|
76
|
+
raise ExecutionError, "USR2 is reserved for hosted shell shutdown"
|
|
77
|
+
end
|
|
78
|
+
raise ExecutionError, "trap: KILL and STOP cannot be trapped" if action != "-" && (names & %w[KILL STOP]).any?
|
|
79
|
+
@trap_snapshot = nil
|
|
80
|
+
names.each do |name|
|
|
81
|
+
next if %w[KILL STOP].include?(name)
|
|
82
|
+
next if !interactive_scope? && @entry_ignored.include?(name)
|
|
83
|
+
if RUBY_RESERVED_SIGNALS.include?(name) && action != "-"
|
|
84
|
+
raise ExecutionError, "trap: #{name} is reserved by the Ruby runtime"
|
|
85
|
+
end
|
|
86
|
+
changed = @traps.key?(name) || action != "-"
|
|
87
|
+
@entry_ignored.delete(name) if interactive_scope?
|
|
88
|
+
action == "-" ? @traps.delete(name) : @traps[name] = action
|
|
89
|
+
install_signal(name) if changed && name != "EXIT"
|
|
90
|
+
end
|
|
91
|
+
0
|
|
92
|
+
rescue InvalidSignal => e
|
|
93
|
+
streams[2]&.puts("kwsh: #{e.message}")
|
|
94
|
+
1
|
|
95
|
+
end
|
|
96
|
+
|
|
97
|
+
def child_signal_dispositions
|
|
98
|
+
INTERACTIVE_SIGNALS.to_h do |name|
|
|
99
|
+
[name, @traps[name] == "" ? "IGNORE" : "DEFAULT"]
|
|
100
|
+
end
|
|
101
|
+
end
|
|
102
|
+
|
|
103
|
+
def default_signal_handler(name)
|
|
104
|
+
if !@hosted && interactive_scope? && INTERACTIVE_SIGNALS.include?(name)
|
|
105
|
+
name == "INT" ? proc { raise Interrupt if @reading_prompt } : "IGNORE"
|
|
106
|
+
elsif @hosted && !@job_child
|
|
107
|
+
@saved_signals.fetch(name, "DEFAULT")
|
|
108
|
+
else
|
|
109
|
+
"DEFAULT"
|
|
110
|
+
end
|
|
111
|
+
end
|
|
112
|
+
|
|
113
|
+
def install_signal(name)
|
|
114
|
+
return unless @saved_signals
|
|
115
|
+
return if RUBY_RESERVED_SIGNALS.include?(name)
|
|
116
|
+
handler = if !@traps.key?(name)
|
|
117
|
+
default_signal_handler(name)
|
|
118
|
+
elsif @traps[name].empty?
|
|
119
|
+
"IGNORE"
|
|
120
|
+
else
|
|
121
|
+
proc do
|
|
122
|
+
unless name == "CHLD" && @active_signal == "CHLD" || @pending_signals.include?(name)
|
|
123
|
+
@pending_signals << name
|
|
124
|
+
end
|
|
125
|
+
end
|
|
126
|
+
end
|
|
127
|
+
previous = Signal.trap(name, handler)
|
|
128
|
+
@saved_signals[name] = previous unless @saved_signals.key?(name)
|
|
129
|
+
end
|
|
130
|
+
|
|
131
|
+
def with_signal_handlers
|
|
132
|
+
return yield if @saved_signals
|
|
133
|
+
@saved_signals = {}
|
|
134
|
+
begin
|
|
135
|
+
names = @traps.keys
|
|
136
|
+
names |= INTERACTIVE_SIGNALS if !@hosted && interactive_scope?
|
|
137
|
+
names.each { |name| install_signal(name) unless name == "EXIT" }
|
|
138
|
+
yield
|
|
139
|
+
ensure
|
|
140
|
+
@saved_signals.each { |name, handler| Signal.trap(name, handler || "DEFAULT") }
|
|
141
|
+
@saved_signals = nil
|
|
142
|
+
end
|
|
143
|
+
end
|
|
144
|
+
|
|
145
|
+
def run_trap(action, streams)
|
|
146
|
+
saved = @status
|
|
147
|
+
evaluate(Parser.parse(action, aliases: @aliases), streams, ignored: true)
|
|
148
|
+
@status = saved
|
|
149
|
+
end
|
|
150
|
+
|
|
151
|
+
def run_pending_traps(streams)
|
|
152
|
+
return if @running_trap
|
|
153
|
+
@running_trap = true
|
|
154
|
+
begin
|
|
155
|
+
signals = @pending_signals
|
|
156
|
+
@pending_signals = []
|
|
157
|
+
signals.each do |signal|
|
|
158
|
+
@active_signal = signal
|
|
159
|
+
action = @traps[signal]
|
|
160
|
+
run_trap(action, streams) if action && !action.empty?
|
|
161
|
+
end
|
|
162
|
+
ensure
|
|
163
|
+
@active_signal = nil
|
|
164
|
+
@running_trap = false
|
|
165
|
+
end
|
|
166
|
+
end
|
|
167
|
+
|
|
168
|
+
def reset_child_state(job_group: @owned_job_group)
|
|
169
|
+
# Inspection retains the parent actions until a trap command supplies
|
|
170
|
+
# operands; execution uses reset dispositions immediately.
|
|
171
|
+
unless @trap_snapshot
|
|
172
|
+
@trap_snapshot = @traps.dup
|
|
173
|
+
@trap_snapshot_hosted = @hosted && !@job_child
|
|
174
|
+
end
|
|
175
|
+
names = (@saved_signals || {}).keys | @traps.keys | INTERACTIVE_SIGNALS | %w[HUP USR2]
|
|
176
|
+
@traps = @traps.select { |name, action| name != "EXIT" && action.empty? }
|
|
177
|
+
names.each do |name|
|
|
178
|
+
next if name == "EXIT" || RUBY_RESERVED_SIGNALS.include?(name)
|
|
179
|
+
Signal.trap(name, @traps[name] == "" ? "IGNORE" : "DEFAULT")
|
|
180
|
+
end
|
|
181
|
+
@pending_signals = []
|
|
182
|
+
@saved_signals = nil
|
|
183
|
+
@jobs = {}
|
|
184
|
+
@active_streams = []
|
|
185
|
+
@last_background_pid = nil
|
|
186
|
+
@job_child = true
|
|
187
|
+
@owned_job_group = job_group
|
|
188
|
+
@options.delete("monitor")
|
|
189
|
+
@replace_process = !@hosted
|
|
190
|
+
@loop_depth = 0
|
|
191
|
+
@function_depth = 0
|
|
192
|
+
@process_substitutions = nil
|
|
193
|
+
end
|
|
194
|
+
end
|
|
195
|
+
end
|
|
196
|
+
end
|
|
@@ -0,0 +1,407 @@
|
|
|
1
|
+
require_relative "../terminal/keys"
|
|
2
|
+
require_relative "native_locale"
|
|
3
|
+
require_relative "native_pattern"
|
|
4
|
+
|
|
5
|
+
module Kward
|
|
6
|
+
module NativeShell
|
|
7
|
+
# Character-oriented vi edit state. IO/raw mode and command execution belong
|
|
8
|
+
# to the standalone runner; history copies never mutate retained entries.
|
|
9
|
+
class ViEditor
|
|
10
|
+
Result = Struct.new(:text, :external, keyword_init: true)
|
|
11
|
+
class InvalidCommand < StandardError; end
|
|
12
|
+
MOTIONS = " hl0^$|wWbBeEfFtT;,".freeze
|
|
13
|
+
MAX_MACRO_DEPTH = 100
|
|
14
|
+
MAX_MACRO_BYTES = 1_048_576
|
|
15
|
+
CHANGES = "aAiIRcdCDSrxXpP~_*\\".freeze
|
|
16
|
+
|
|
17
|
+
def initialize(runtime)
|
|
18
|
+
@runtime = runtime
|
|
19
|
+
@saved = ""
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def encoding
|
|
23
|
+
@locale.encoding
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
def read(get:, changed:, alert:, erase: TerminalKeys::BACKSPACE.last, kill: TerminalKeys::CTRL_U, eof: TerminalKeys::CTRL_D, interrupt: TerminalKeys::CTRL_C, draft: nil)
|
|
27
|
+
@get, @changed, @alert = get, changed, alert
|
|
28
|
+
@erase, @kill, @eof, @interrupt = erase, kill, eof, interrupt
|
|
29
|
+
@line, @draft, @original = +"", +"", +""
|
|
30
|
+
@position = 0
|
|
31
|
+
@history_index = entries.length
|
|
32
|
+
@insert = @initial = true
|
|
33
|
+
@replace = false
|
|
34
|
+
@queue = []
|
|
35
|
+
@recording = @undo = nil
|
|
36
|
+
@macro_bytes = 0
|
|
37
|
+
Locale.with(@runtime.variables) do |locale|
|
|
38
|
+
@locale = locale
|
|
39
|
+
@line = draft.to_s.b.force_encoding(locale.encoding).scrub
|
|
40
|
+
@position = @line.length
|
|
41
|
+
loop do
|
|
42
|
+
@changed.call(@line, @position)
|
|
43
|
+
key = input
|
|
44
|
+
return nil unless key
|
|
45
|
+
raise Interrupt if key == @interrupt
|
|
46
|
+
if @insert
|
|
47
|
+
if TerminalKeys::RETURN.include?(key)
|
|
48
|
+
@recording[-1] = TerminalKeys::ESCAPE if @recording
|
|
49
|
+
finish_change
|
|
50
|
+
return Result.new(text: @line + "\n")
|
|
51
|
+
end
|
|
52
|
+
return nil if key == @eof && @line.empty?
|
|
53
|
+
insert_key(key)
|
|
54
|
+
else
|
|
55
|
+
return Result.new(text: @line + "\n") if TerminalKeys::RETURN.include?(key)
|
|
56
|
+
result = command(key)
|
|
57
|
+
return result if result
|
|
58
|
+
end
|
|
59
|
+
rescue InvalidCommand, SyntaxError, ExpansionError, ExecutionError, ArgumentError, RangeError, SystemCallError, IOError
|
|
60
|
+
@recording = nil
|
|
61
|
+
@alert.call
|
|
62
|
+
end
|
|
63
|
+
end
|
|
64
|
+
ensure
|
|
65
|
+
@locale = @get = @changed = @alert = nil
|
|
66
|
+
end
|
|
67
|
+
|
|
68
|
+
private
|
|
69
|
+
|
|
70
|
+
def entries
|
|
71
|
+
@runtime.history.entries
|
|
72
|
+
end
|
|
73
|
+
|
|
74
|
+
def input
|
|
75
|
+
value = @queue.empty? ? @get.call : @queue.shift
|
|
76
|
+
value, @macro_depth = value.is_a?(Array) ? value : [value, 0]
|
|
77
|
+
@recording << value if @recording && value
|
|
78
|
+
value
|
|
79
|
+
end
|
|
80
|
+
|
|
81
|
+
def operand(interrupt: true)
|
|
82
|
+
key = input || raise(InvalidCommand)
|
|
83
|
+
raise Interrupt if interrupt && key == @interrupt
|
|
84
|
+
key
|
|
85
|
+
end
|
|
86
|
+
|
|
87
|
+
def insert_key(key)
|
|
88
|
+
case key
|
|
89
|
+
when TerminalKeys::ESCAPE
|
|
90
|
+
@insert = @replace = false
|
|
91
|
+
@position = [@position - 1, 0].max
|
|
92
|
+
@original = @line.dup if @initial
|
|
93
|
+
@initial = false
|
|
94
|
+
finish_change
|
|
95
|
+
when @erase
|
|
96
|
+
if @position > 0
|
|
97
|
+
@line.slice!(@position - 1)
|
|
98
|
+
@position -= 1
|
|
99
|
+
else
|
|
100
|
+
@alert.call
|
|
101
|
+
end
|
|
102
|
+
when @kill
|
|
103
|
+
@line.clear
|
|
104
|
+
@position = 0
|
|
105
|
+
when TerminalKeys::CTRL_W
|
|
106
|
+
start = @position
|
|
107
|
+
start -= 1 while start > 0 && blank?(@line[start - 1])
|
|
108
|
+
kind = category(@line[start - 1]) if start > 0
|
|
109
|
+
start -= 1 while start > 0 && category(@line[start - 1]) == kind
|
|
110
|
+
@line.slice!(start...@position)
|
|
111
|
+
@position = start
|
|
112
|
+
else
|
|
113
|
+
key = operand(interrupt: false) if key == TerminalKeys::CTRL_V
|
|
114
|
+
key = @locale.text(key)
|
|
115
|
+
if @replace && @position < @line.length
|
|
116
|
+
@line[@position] = key
|
|
117
|
+
else
|
|
118
|
+
@line.insert(@position, key)
|
|
119
|
+
end
|
|
120
|
+
@position += key.length
|
|
121
|
+
end
|
|
122
|
+
end
|
|
123
|
+
|
|
124
|
+
def command(key)
|
|
125
|
+
digits = +""
|
|
126
|
+
while key.match?(/\A[0-9]\z/) && (key != "0" || !digits.empty?)
|
|
127
|
+
digits << key
|
|
128
|
+
key = operand
|
|
129
|
+
end
|
|
130
|
+
count = digits.empty? ? 1 : digits.to_i
|
|
131
|
+
@recording = digits.chars + [key] if CHANGES.include?(key)
|
|
132
|
+
@changed_command = false
|
|
133
|
+
case key
|
|
134
|
+
when *MOTIONS.chars
|
|
135
|
+
@position = motion(key, count).first
|
|
136
|
+
when "a", "A", "i", "I", "R"
|
|
137
|
+
begin_change
|
|
138
|
+
@position = [@position + 1, @line.length].min if key == "a"
|
|
139
|
+
@position = @line.length if key == "A"
|
|
140
|
+
@position = 0 if key == "I"
|
|
141
|
+
@insert = true
|
|
142
|
+
@replace = key == "R"
|
|
143
|
+
when "c", "d", "y"
|
|
144
|
+
operation(key, operand, count)
|
|
145
|
+
when "C", "D", "S", "Y"
|
|
146
|
+
operation({ "C" => "c", "D" => "d", "S" => "c", "Y" => "y" }.fetch(key), key == "S" ? "c" : "$", count)
|
|
147
|
+
when "x", "X"
|
|
148
|
+
raise InvalidCommand if @line.empty? || key == "X" && @position.zero?
|
|
149
|
+
from = key == "X" ? [@position - count, 0].max : @position
|
|
150
|
+
to = key == "X" ? @position : [@position + count, @line.length].min
|
|
151
|
+
delete(from...to)
|
|
152
|
+
when "p", "P"
|
|
153
|
+
raise InvalidCommand if @saved.empty?
|
|
154
|
+
begin_change
|
|
155
|
+
at = key == "P" ? @position : [@position + 1, @line.length].min
|
|
156
|
+
text = @saved * count
|
|
157
|
+
@line.insert(at, text)
|
|
158
|
+
@position = at + text.length - 1
|
|
159
|
+
when "r"
|
|
160
|
+
character = operand
|
|
161
|
+
raise InvalidCommand if @line.empty? || character == TerminalKeys::ESCAPE
|
|
162
|
+
begin_change
|
|
163
|
+
length = [count, @line.length - @position].min
|
|
164
|
+
@line[@position, length] = character * length
|
|
165
|
+
@position += length - 1
|
|
166
|
+
when "~"
|
|
167
|
+
raise InvalidCommand if @line.empty?
|
|
168
|
+
begin_change
|
|
169
|
+
length = [count, @line.length - @position].min
|
|
170
|
+
@line[@position, length] = @locale.swapcase(@line[@position, length])
|
|
171
|
+
@position = [@position + length, @line.length - 1].min
|
|
172
|
+
when "u"
|
|
173
|
+
raise InvalidCommand unless @undo && @history_index == entries.length
|
|
174
|
+
previous = [@line.dup, @position]
|
|
175
|
+
@line, @position = @undo
|
|
176
|
+
@undo = previous
|
|
177
|
+
when "U"
|
|
178
|
+
raise InvalidCommand unless @history_index == entries.length
|
|
179
|
+
begin_change
|
|
180
|
+
@line = @original.dup
|
|
181
|
+
@position = 0
|
|
182
|
+
when "k", "-", "j", "+", "G"
|
|
183
|
+
target = case key
|
|
184
|
+
when "k", "-" then @history_index - count
|
|
185
|
+
when "j", "+" then @history_index + count
|
|
186
|
+
else digits.empty? ? 0 : entries.index { |number, _| number == count }
|
|
187
|
+
end
|
|
188
|
+
raise InvalidCommand unless target && target >= 0
|
|
189
|
+
@alert.call if target > entries.length
|
|
190
|
+
select_history([target, entries.length].min)
|
|
191
|
+
when "/", "?"
|
|
192
|
+
pattern = +""
|
|
193
|
+
loop do
|
|
194
|
+
char = operand
|
|
195
|
+
break if TerminalKeys::RETURN.include?(char)
|
|
196
|
+
raise InvalidCommand if char == TerminalKeys::ESCAPE
|
|
197
|
+
char == @erase ? pattern.chop! : pattern << char
|
|
198
|
+
@changed.call(key + pattern, pattern.length + 1)
|
|
199
|
+
end
|
|
200
|
+
@search = pattern unless pattern.empty?
|
|
201
|
+
@search_direction = key == "/" ? -1 : 1
|
|
202
|
+
search(@search_direction)
|
|
203
|
+
when "n", "N"
|
|
204
|
+
raise InvalidCommand unless @search_direction
|
|
205
|
+
search(key == "N" ? -@search_direction : @search_direction)
|
|
206
|
+
when "_"
|
|
207
|
+
words = entries.last&.last.to_s.split(/[[:space:]]+/)
|
|
208
|
+
word = digits.empty? ? words.last : words[count - 1]
|
|
209
|
+
raise InvalidCommand unless word
|
|
210
|
+
begin_change
|
|
211
|
+
@position = [@position + 1, @line.length].min
|
|
212
|
+
@line.insert(@position, " " + word)
|
|
213
|
+
@position += word.length + 1
|
|
214
|
+
@insert = true
|
|
215
|
+
when "."
|
|
216
|
+
raise InvalidCommand unless @last_change
|
|
217
|
+
repeat = @last_change.dup
|
|
218
|
+
repeat.shift while !digits.empty? && repeat.first&.match?(/\A[0-9]\z/)
|
|
219
|
+
repeat = digits.chars + repeat unless digits.empty?
|
|
220
|
+
@queue = repeat + @queue
|
|
221
|
+
when "@"
|
|
222
|
+
letter = operand
|
|
223
|
+
raise InvalidCommand unless letter.match?(/\A[A-Za-z]\z/)
|
|
224
|
+
value = @runtime.aliases.fetch("_#{letter}", "")
|
|
225
|
+
@macro_bytes += value.bytesize
|
|
226
|
+
raise ExecutionError, "vi alias expansion limit exceeded" if @macro_bytes > MAX_MACRO_BYTES || @macro_depth >= MAX_MACRO_DEPTH
|
|
227
|
+
@queue = @locale.text(value).chars.map { |char| [char, @macro_depth + 1] } + @queue
|
|
228
|
+
when "#"
|
|
229
|
+
return Result.new(text: "#" + @line + "\n")
|
|
230
|
+
when "v"
|
|
231
|
+
text = digits.empty? ? @line : entries.find { |number, _| number == count }&.last
|
|
232
|
+
raise InvalidCommand unless text
|
|
233
|
+
return Result.new(text: text, external: true)
|
|
234
|
+
when "=", "\\", "*"
|
|
235
|
+
expand_word(key)
|
|
236
|
+
when TerminalKeys::CTRL_L
|
|
237
|
+
# The terminal adapter redraws after every operation.
|
|
238
|
+
else
|
|
239
|
+
raise InvalidCommand
|
|
240
|
+
end
|
|
241
|
+
finish_change unless @insert
|
|
242
|
+
nil
|
|
243
|
+
end
|
|
244
|
+
|
|
245
|
+
def begin_change
|
|
246
|
+
if @history_index != entries.length
|
|
247
|
+
@history_index = entries.length
|
|
248
|
+
@original = @line.dup
|
|
249
|
+
end
|
|
250
|
+
@undo = [@line.dup, @position]
|
|
251
|
+
@changed_command = true
|
|
252
|
+
end
|
|
253
|
+
|
|
254
|
+
def finish_change
|
|
255
|
+
@last_change = @recording.dup if @recording && @changed_command
|
|
256
|
+
@recording = nil
|
|
257
|
+
end
|
|
258
|
+
|
|
259
|
+
def delete(range)
|
|
260
|
+
begin_change
|
|
261
|
+
@saved = @line.slice!(range)
|
|
262
|
+
@position = [range.begin, [@line.length - 1, 0].max].min
|
|
263
|
+
end
|
|
264
|
+
|
|
265
|
+
def operation(operator, movement, count)
|
|
266
|
+
if movement == operator
|
|
267
|
+
range = 0...@line.length
|
|
268
|
+
else
|
|
269
|
+
target, inclusive = motion(movement, count)
|
|
270
|
+
from, to = [@position, target].minmax
|
|
271
|
+
to += 1 if target >= @position && inclusive
|
|
272
|
+
range = from...to
|
|
273
|
+
end
|
|
274
|
+
if operator == "y"
|
|
275
|
+
@saved = @line[range]
|
|
276
|
+
else
|
|
277
|
+
delete(range)
|
|
278
|
+
if operator == "c"
|
|
279
|
+
@position = [range.begin, @line.length].min
|
|
280
|
+
@insert = true
|
|
281
|
+
end
|
|
282
|
+
end
|
|
283
|
+
end
|
|
284
|
+
|
|
285
|
+
def motion(key, count)
|
|
286
|
+
last = [@line.length - 1, 0].max
|
|
287
|
+
target = @position
|
|
288
|
+
inclusive = false
|
|
289
|
+
case key
|
|
290
|
+
when "h" then target = [target - count, 0].max
|
|
291
|
+
when "l", " " then target = [target + count, last].min
|
|
292
|
+
when "0" then target = 0
|
|
293
|
+
when "^" then target = @line.index(/[^ \t]/) || 0
|
|
294
|
+
when "$" then target = last; inclusive = true
|
|
295
|
+
when "|" then target = [count - 1, last].min
|
|
296
|
+
when "w", "W", "e", "E", "b", "B"
|
|
297
|
+
[count, @line.length + 1].min.times do
|
|
298
|
+
target = word_motion(target, key)
|
|
299
|
+
end
|
|
300
|
+
inclusive = "eE".include?(key) || target == last && "wW".include?(key)
|
|
301
|
+
when "f", "F", "t", "T", ";", ","
|
|
302
|
+
if key == ";" || key == ","
|
|
303
|
+
raise InvalidCommand unless @find
|
|
304
|
+
character, direction, till = @find
|
|
305
|
+
direction = -direction if key == ","
|
|
306
|
+
repeat = true
|
|
307
|
+
else
|
|
308
|
+
character = operand
|
|
309
|
+
direction = key == key.upcase ? -1 : 1
|
|
310
|
+
till = key.downcase == "t"
|
|
311
|
+
@find = [character, direction, till]
|
|
312
|
+
end
|
|
313
|
+
raise InvalidCommand if count > @line.length
|
|
314
|
+
start = target + (repeat && till ? direction * 2 : direction)
|
|
315
|
+
count.times do
|
|
316
|
+
raise InvalidCommand unless start.between?(0, last)
|
|
317
|
+
target = direction == 1 ? @line.index(character, start) : @line.rindex(character, start)
|
|
318
|
+
raise InvalidCommand unless target
|
|
319
|
+
start = target + direction
|
|
320
|
+
end
|
|
321
|
+
target -= direction if till
|
|
322
|
+
inclusive = direction == 1
|
|
323
|
+
else
|
|
324
|
+
raise InvalidCommand
|
|
325
|
+
end
|
|
326
|
+
raise InvalidCommand if target == @position && "hl wWbBeE".include?(key)
|
|
327
|
+
[target, inclusive]
|
|
328
|
+
end
|
|
329
|
+
|
|
330
|
+
def word_motion(position, key)
|
|
331
|
+
last = [@line.length - 1, 0].max
|
|
332
|
+
big = key == key.upcase
|
|
333
|
+
case key.downcase
|
|
334
|
+
when "w"
|
|
335
|
+
kind = category(@line[position], big: big)
|
|
336
|
+
position += 1 while position < last && category(@line[position], big: big) == kind
|
|
337
|
+
position += 1 while position < last && blank?(@line[position])
|
|
338
|
+
when "b"
|
|
339
|
+
position -= 1 if position > 0
|
|
340
|
+
position -= 1 while position > 0 && blank?(@line[position])
|
|
341
|
+
kind = category(@line[position], big: big)
|
|
342
|
+
position -= 1 while position > 0 && category(@line[position - 1], big: big) == kind
|
|
343
|
+
when "e"
|
|
344
|
+
position += 1 if position < last
|
|
345
|
+
position += 1 while position < last && blank?(@line[position])
|
|
346
|
+
kind = category(@line[position], big: big)
|
|
347
|
+
position += 1 while position < last && category(@line[position + 1], big: big) == kind
|
|
348
|
+
end
|
|
349
|
+
position
|
|
350
|
+
end
|
|
351
|
+
|
|
352
|
+
def blank?(character)
|
|
353
|
+
character && (character == "\n" || @locale.bracket?("[[:blank:]]", character))
|
|
354
|
+
end
|
|
355
|
+
|
|
356
|
+
def category(character, big: false)
|
|
357
|
+
return :blank if blank?(character) || !character
|
|
358
|
+
return :word if big || character == "_" || @locale.bracket?("[[:alnum:]]", character)
|
|
359
|
+
:punctuation
|
|
360
|
+
end
|
|
361
|
+
|
|
362
|
+
def select_history(index)
|
|
363
|
+
@draft = @line.dup if @history_index == entries.length
|
|
364
|
+
@line = @locale.text(index == entries.length ? @draft : entries.fetch(index).last)
|
|
365
|
+
@history_index = index
|
|
366
|
+
@position = 0
|
|
367
|
+
end
|
|
368
|
+
|
|
369
|
+
def search(direction)
|
|
370
|
+
raise InvalidCommand unless @search && !@search.empty?
|
|
371
|
+
pattern = @search.start_with?("^") ? @search.delete_prefix("^") + "*" : "*#{@search}*"
|
|
372
|
+
matcher = Pattern.new(pattern, locale: @locale)
|
|
373
|
+
index = @history_index + direction
|
|
374
|
+
while index.between?(0, entries.length - 1)
|
|
375
|
+
return select_history(index) if matcher.match?(entries[index].last)
|
|
376
|
+
index += direction
|
|
377
|
+
end
|
|
378
|
+
raise InvalidCommand
|
|
379
|
+
end
|
|
380
|
+
|
|
381
|
+
def expand_word(key)
|
|
382
|
+
from = @position
|
|
383
|
+
from -= 1 while from > 0 && !blank?(@line[from - 1])
|
|
384
|
+
to = @position
|
|
385
|
+
to += 1 while to < @line.length && !blank?(@line[to])
|
|
386
|
+
matches = @runtime.vi_expansions(@line[from...to], full: key == "=")
|
|
387
|
+
raise InvalidCommand if matches.empty?
|
|
388
|
+
if key == "="
|
|
389
|
+
@changed.call(matches.join("\n"), nil)
|
|
390
|
+
return
|
|
391
|
+
end
|
|
392
|
+
text = if key == "*"
|
|
393
|
+
matches.map { |match| Shellwords.escape(match) }.join(" ")
|
|
394
|
+
else
|
|
395
|
+
prefix = matches.first.dup
|
|
396
|
+
prefix.chop! until matches.all? { |match| match.start_with?(prefix) }
|
|
397
|
+
suffix = matches.one? && !prefix.end_with?("/") ? " " : ""
|
|
398
|
+
Shellwords.escape(prefix) + suffix
|
|
399
|
+
end
|
|
400
|
+
begin_change
|
|
401
|
+
@line[from...to] = text
|
|
402
|
+
@position = from + text.length
|
|
403
|
+
@insert = true
|
|
404
|
+
end
|
|
405
|
+
end
|
|
406
|
+
end
|
|
407
|
+
end
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
require_relative "native_vi"
|
|
2
|
+
require_relative "native_line_terminal"
|
|
3
|
+
|
|
4
|
+
module Kward
|
|
5
|
+
module NativeShell
|
|
6
|
+
class ViTerminal < LineTerminal
|
|
7
|
+
def initialize(runtime)
|
|
8
|
+
super(runtime, ViEditor.new(runtime))
|
|
9
|
+
end
|
|
10
|
+
|
|
11
|
+
def read(source, **options)
|
|
12
|
+
super
|
|
13
|
+
rescue ExecutionError, SystemCallError, IOError => e
|
|
14
|
+
@runtime.vi_input_error(e, error: options.fetch(:error))
|
|
15
|
+
ViEditor::Result.new(text: "")
|
|
16
|
+
end
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
end
|