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.
Files changed (245) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +164 -0
  3. data/CONTRIBUTING.md +1 -1
  4. data/Gemfile.lock +6 -2
  5. data/README.md +5 -5
  6. data/Rakefile +3 -0
  7. data/doc/agent-tools.md +24 -1
  8. data/doc/api.md +20 -2
  9. data/doc/composer.md +5 -4
  10. data/doc/configuration.md +86 -14
  11. data/doc/extensibility.md +4 -1
  12. data/doc/getting-started.md +3 -3
  13. data/doc/git.md +4 -2
  14. data/doc/memory.md +1 -1
  15. data/doc/pan.md +6 -0
  16. data/doc/permissions.md +4 -4
  17. data/doc/plugins.md +504 -20
  18. data/doc/providers.md +10 -4
  19. data/doc/rpc.md +279 -23
  20. data/doc/sandboxing.md +11 -5
  21. data/doc/security.md +7 -1
  22. data/doc/session-management.md +41 -5
  23. data/doc/shell.md +643 -27
  24. data/doc/tabs.md +8 -3
  25. data/doc/transports.md +15 -0
  26. data/doc/troubleshooting.md +1 -1
  27. data/doc/usage.md +25 -12
  28. data/doc/workspace-tools.md +9 -0
  29. data/examples/plugins/openrouter_proxy/README.md +103 -0
  30. data/examples/plugins/openrouter_proxy/fake_embeddings.rb +85 -0
  31. data/examples/plugins/openrouter_proxy/plugin.rb +7 -0
  32. data/examples/plugins/openrouter_proxy/protocol.rb +202 -0
  33. data/examples/plugins/openrouter_proxy/server.rb +186 -0
  34. data/examples/plugins/space_invaders.rb +1 -2
  35. data/examples/plugins/stardate_footer.rb +2 -2
  36. data/examples/plugins/telegram/plugin.rb +1 -1
  37. data/exe/kward +2 -2
  38. data/exe/kwsh +7 -0
  39. data/kward.gemspec +3 -1
  40. data/lib/kward/agent.rb +66 -19
  41. data/lib/kward/cli/commands.rb +41 -11
  42. data/lib/kward/cli/compaction.rb +9 -3
  43. data/lib/kward/cli/interactive_turn.rb +10 -0
  44. data/lib/kward/cli/plugins.rb +85 -12
  45. data/lib/kward/cli/prompt_interface.rb +29 -6
  46. data/lib/kward/cli/rendering.rb +24 -28
  47. data/lib/kward/cli/runtime_helpers.rb +168 -56
  48. data/lib/kward/cli/sessions.rb +9 -5
  49. data/lib/kward/cli/settings/menus.rb +745 -0
  50. data/lib/kward/cli/settings/model.rb +316 -0
  51. data/lib/kward/cli/settings.rb +6 -1055
  52. data/lib/kward/cli/slash_commands.rb +45 -4
  53. data/lib/kward/cli/tabs.rb +257 -44
  54. data/lib/kward/cli/tool_summaries.rb +2 -0
  55. data/lib/kward/{cli_transcript_formatter.rb → cli/transcript_formatter.rb} +6 -13
  56. data/lib/kward/cli/worktrees.rb +66 -2
  57. data/lib/kward/cli.rb +82 -31
  58. data/lib/kward/compactor.rb +18 -7
  59. data/lib/kward/config/core.rb +400 -0
  60. data/lib/kward/config/extensions.rb +99 -0
  61. data/lib/kward/config/paths.rb +11 -0
  62. data/lib/kward/config/prompts.rb +313 -0
  63. data/lib/kward/config/settings.rb +257 -0
  64. data/lib/kward/config_files.rb +14 -1008
  65. data/lib/kward/conversation.rb +41 -2
  66. data/lib/kward/entrypoint.rb +14 -0
  67. data/lib/kward/events.rb +2 -0
  68. data/lib/kward/generated_images.rb +237 -0
  69. data/lib/kward/image_attachments.rb +1 -1
  70. data/lib/kward/model/catalog.rb +6 -3
  71. data/lib/kward/model/client.rb +107 -38
  72. data/lib/kward/model/codex_images.rb +83 -0
  73. data/lib/kward/model/copilot_models.rb +10 -6
  74. data/lib/kward/model/model_info.rb +42 -7
  75. data/lib/kward/{openrouter_model_cache.rb → model/openrouter_model_cache.rb} +7 -5
  76. data/lib/kward/model/payloads.rb +18 -8
  77. data/lib/kward/model/sources.rb +3 -1
  78. data/lib/kward/model/stream_parser.rb +4 -7
  79. data/lib/kward/model/typesafe_client.rb +78 -0
  80. data/lib/kward/pan/index.html.erb +8 -1
  81. data/lib/kward/pan/server.rb +23 -8
  82. data/lib/kward/permissions/policy.rb +6 -2
  83. data/lib/kward/plugin_registry.rb +2 -659
  84. data/lib/kward/plugins/actions.rb +453 -0
  85. data/lib/kward/plugins/chat_contract.rb +121 -0
  86. data/lib/kward/{plugin_chat_runtime.rb → plugins/chat_runtime.rb} +62 -18
  87. data/lib/kward/plugins/codex_responses.rb +73 -0
  88. data/lib/kward/plugins/host.rb +248 -0
  89. data/lib/kward/plugins/http_server.rb +83 -0
  90. data/lib/kward/plugins/registry.rb +1229 -0
  91. data/lib/kward/plugins/resources.rb +206 -0
  92. data/lib/kward/plugins/turn_request.rb +36 -0
  93. data/lib/kward/plugins/ui.rb +219 -0
  94. data/lib/kward/prompt_interface/composer_controller.rb +0 -1
  95. data/lib/kward/prompt_interface/composer_renderer.rb +160 -73
  96. data/lib/kward/prompt_interface/composer_state.rb +1 -1
  97. data/lib/kward/prompt_interface/editor/controller.rb +2 -2
  98. data/lib/kward/prompt_interface/editor/renderer.rb +10 -7
  99. data/lib/kward/prompt_interface/editor/runner.rb +1 -1
  100. data/lib/kward/prompt_interface/editor/state.rb +1 -1
  101. data/lib/kward/prompt_interface/file_overlay.rb +3 -3
  102. data/lib/kward/prompt_interface/generated_image_preview.rb +162 -0
  103. data/lib/kward/prompt_interface/git_prompt.rb +18 -11
  104. data/lib/kward/prompt_interface/interactive/renderer.rb +1 -1
  105. data/lib/kward/prompt_interface/interactive/state.rb +18 -20
  106. data/lib/kward/prompt_interface/key_handler.rb +108 -25
  107. data/lib/kward/prompt_interface/layout.rb +11 -1
  108. data/lib/kward/prompt_interface/overlay_renderer.rb +26 -9
  109. data/lib/kward/prompt_interface/plugin_ui_requests.rb +82 -0
  110. data/lib/kward/prompt_interface/project_browser.rb +27 -54
  111. data/lib/kward/prompt_interface/prompt_renderer.rb +27 -35
  112. data/lib/kward/prompt_interface/question_prompt.rb +19 -28
  113. data/lib/kward/prompt_interface/runtime_state.rb +37 -10
  114. data/lib/kward/prompt_interface/screen.rb +30 -20
  115. data/lib/kward/prompt_interface/selection_prompt.rb +8 -8
  116. data/lib/kward/prompt_interface/slash_overlay.rb +1 -1
  117. data/lib/kward/prompt_interface/transcript_renderer.rb +7 -6
  118. data/lib/kward/prompt_interface.rb +149 -30
  119. data/lib/kward/prompts/commands.rb +2 -1
  120. data/lib/kward/prompts.rb +7 -1
  121. data/lib/kward/{adaptive_pty_output_sink.rb → pty/adaptive_output_sink.rb} +39 -5
  122. data/lib/kward/{interactive_pty_runner.rb → pty/interactive_runner.rb} +22 -30
  123. data/lib/kward/{local_command_runner.rb → pty/local_command_runner.rb} +1 -1
  124. data/lib/kward/{local_pty_command_runner.rb → pty/local_pty_runner.rb} +3 -9
  125. data/lib/kward/{pty_output_sink.rb → pty/output_sink.rb} +9 -4
  126. data/lib/kward/pty/transcript_normalizer.rb +137 -0
  127. data/lib/kward/rpc/config_manager.rb +3 -0
  128. data/lib/kward/rpc/plugin_chat_manager.rb +30 -10
  129. data/lib/kward/rpc/prompt_bridge.rb +25 -0
  130. data/lib/kward/rpc/server.rb +118 -17
  131. data/lib/kward/rpc/session_manager.rb +208 -60
  132. data/lib/kward/rpc/session_tree_rows.rb +2 -2
  133. data/lib/kward/rpc/tool_metadata.rb +1 -1
  134. data/lib/kward/rpc/transcript_normalizer.rb +11 -7
  135. data/lib/kward/sandbox/command_runner.rb +1 -1
  136. data/lib/kward/{session_catalog.rb → sessions/catalog.rb} +1 -1
  137. data/lib/kward/{session_store.rb → sessions/store.rb} +39 -12
  138. data/lib/kward/{session_tree_nodes.rb → sessions/tree_nodes.rb} +3 -3
  139. data/lib/kward/{session_tree_renderer.rb → sessions/tree_renderer.rb} +4 -4
  140. data/lib/kward/{session_tree_tool_display.rb → sessions/tree_tool_display.rb} +1 -1
  141. data/lib/kward/{kwsh.rb → shell/kwsh.rb} +30 -10
  142. data/lib/kward/{kwshrc.rb → shell/kwshrc.rb} +11 -2
  143. data/lib/kward/shell/native_arithmetic.rb +255 -0
  144. data/lib/kward/shell/native_arrays.rb +102 -0
  145. data/lib/kward/shell/native_braces.rb +96 -0
  146. data/lib/kward/shell/native_builtins.rb +476 -0
  147. data/lib/kward/shell/native_completion.rb +169 -0
  148. data/lib/kward/shell/native_condition.rb +75 -0
  149. data/lib/kward/shell/native_directory.rb +116 -0
  150. data/lib/kward/shell/native_exec_state.rb +73 -0
  151. data/lib/kward/shell/native_expansion.rb +252 -0
  152. data/lib/kward/shell/native_fields.rb +62 -0
  153. data/lib/kward/shell/native_glob.rb +96 -0
  154. data/lib/kward/shell/native_history.rb +242 -0
  155. data/lib/kward/shell/native_interactive.rb +164 -0
  156. data/lib/kward/shell/native_invocation.rb +42 -0
  157. data/lib/kward/shell/native_jobs.rb +250 -0
  158. data/lib/kward/shell/native_line_editor.rb +382 -0
  159. data/lib/kward/shell/native_line_terminal.rb +286 -0
  160. data/lib/kward/shell/native_locale.rb +109 -0
  161. data/lib/kward/shell/native_locals.rb +57 -0
  162. data/lib/kward/shell/native_pattern.rb +200 -0
  163. data/lib/kward/shell/native_process.rb +279 -0
  164. data/lib/kward/shell/native_program.rb +40 -0
  165. data/lib/kward/shell/native_programmable_completion.rb +115 -0
  166. data/lib/kward/shell/native_prompt_format.rb +89 -0
  167. data/lib/kward/shell/native_runtime.rb +964 -0
  168. data/lib/kward/shell/native_substitution.rb +110 -0
  169. data/lib/kward/shell/native_syntax.rb +946 -0
  170. data/lib/kward/shell/native_traps.rb +196 -0
  171. data/lib/kward/shell/native_vi.rb +407 -0
  172. data/lib/kward/shell/native_vi_terminal.rb +19 -0
  173. data/lib/kward/shell/native_worker.rb +82 -0
  174. data/lib/kward/{persistent_shell_session.rb → shell/persistent_session.rb} +187 -193
  175. data/lib/kward/shell/prompt.rb +66 -0
  176. data/lib/kward/shell/prompt_agent.rb +17 -0
  177. data/lib/kward/{shell_prompt_session.rb → shell/prompt_session.rb} +1 -1
  178. data/lib/kward/shell/script_runner.rb +244 -0
  179. data/lib/kward/shell/standalone_agent.rb +31 -0
  180. data/lib/kward/shell/standalone_link.rb +78 -0
  181. data/lib/kward/shell/standalone_terminal.rb +287 -0
  182. data/lib/kward/skills/trust_store.rb +1 -1
  183. data/lib/kward/tabs/driver.rb +194 -0
  184. data/lib/kward/{tab_store.rb → tabs/store.rb} +2 -2
  185. data/lib/kward/{clipboard.rb → terminal/clipboard.rb} +1 -1
  186. data/lib/kward/{terminal_image_support.rb → terminal/image_support.rb} +1 -1
  187. data/lib/kward/{terminal_keys.rb → terminal/keys.rb} +22 -1
  188. data/lib/kward/terminal/locale_text.rb +29 -0
  189. data/lib/kward/{terminal_sequences.rb → terminal/sequences.rb} +45 -4
  190. data/lib/kward/tools/base.rb +18 -0
  191. data/lib/kward/tools/context_for_task.rb +15 -6
  192. data/lib/kward/tools/datetime.rb +85 -0
  193. data/lib/kward/tools/edit_file.rb +9 -6
  194. data/lib/kward/tools/generate_image.rb +36 -0
  195. data/lib/kward/tools/git_commit.rb +13 -7
  196. data/lib/kward/tools/list_directory.rb +4 -4
  197. data/lib/kward/tools/plugin_tool.rb +41 -0
  198. data/lib/kward/tools/prepare_shell_command.rb +1 -1
  199. data/lib/kward/tools/read_file.rb +7 -6
  200. data/lib/kward/tools/registry.rb +130 -21
  201. data/lib/kward/tools/run_shell_command.rb +10 -8
  202. data/lib/kward/tools/search/code.rb +1 -1
  203. data/lib/kward/tools/summarize_file_structure.rb +5 -5
  204. data/lib/kward/tools/tool_call.rb +4 -1
  205. data/lib/kward/tools/typesafe_evaluate.rb +81 -0
  206. data/lib/kward/tools/workspace_targets.rb +58 -0
  207. data/lib/kward/tools/write_file.rb +9 -6
  208. data/lib/kward/{export_path.rb → transcripts/export_path.rb} +1 -1
  209. data/lib/kward/{markdown_transcript.rb → transcripts/markdown_transcript.rb} +10 -2
  210. data/lib/kward/transcripts/turn_summary_formatter.rb +93 -0
  211. data/lib/kward/transport/contracts.rb +200 -0
  212. data/lib/kward/transport/gateway.rb +81 -36
  213. data/lib/kward/transport/plugin_chat_gateway.rb +3 -2
  214. data/lib/kward/transport.rb +1 -200
  215. data/lib/kward/turn_summary.rb +68 -0
  216. data/lib/kward/version.rb +1 -1
  217. data/lib/kward/{workspace_factory.rb → workspace/factory.rb} +2 -2
  218. data/lib/kward/{git_worktree_manager.rb → workspace/git_worktree_manager.rb} +28 -0
  219. data/lib/kward/{workspace.rb → workspace/workspace.rb} +3 -3
  220. data/lib/main.rb +6 -3
  221. data/templates/default/fulldoc/html/css/kward.css +125 -0
  222. data/templates/default/fulldoc/html/images/kward_screen_1.png +0 -0
  223. data/templates/default/fulldoc/html/setup.rb +1 -1
  224. data/templates/default/layout/html/layout.erb +16 -4
  225. metadata +150 -48
  226. data/lib/kward/pty_transcript_normalizer.rb +0 -93
  227. data/lib/kward/shell_prompt.rb +0 -52
  228. data/lib/kward/tab_driver.rb +0 -90
  229. data/templates/default/fulldoc/html/images/kward_workflow.svg +0 -52
  230. /data/lib/kward/{editor_prompt.rb → cli/editor_prompt.rb} +0 -0
  231. /data/lib/kward/{editor_prompt_session.rb → cli/editor_prompt_session.rb} +0 -0
  232. /data/lib/kward/{diff_view_mode.rb → prompt_interface/editor/diff_view_mode.rb} +0 -0
  233. /data/lib/kward/{editor_mode.rb → prompt_interface/editor/editor_mode.rb} +0 -0
  234. /data/lib/kward/{markdown_code_block.rb → prompt_interface/editor/markdown_code_block.rb} +0 -0
  235. /data/lib/kward/{scratchpad_languages.rb → prompt_interface/editor/scratchpad_languages.rb} +0 -0
  236. /data/lib/kward/{scratchpad_runner.rb → prompt_interface/editor/scratchpad_runner.rb} +0 -0
  237. /data/lib/kward/{detached_run.rb → pty/detached_run.rb} +0 -0
  238. /data/lib/kward/{session_diff.rb → sessions/diff.rb} +0 -0
  239. /data/lib/kward/{session_naming.rb → sessions/naming.rb} +0 -0
  240. /data/lib/kward/{session_trash.rb → sessions/trash.rb} +0 -0
  241. /data/lib/kward/{ansi.rb → terminal/ansi.rb} +0 -0
  242. /data/lib/kward/{terminal_text.rb → terminal/text.rb} +0 -0
  243. /data/lib/kward/{transcript_export.rb → transcripts/transcript_export.rb} +0 -0
  244. /data/lib/kward/{project_files.rb → workspace/files.rb} +0 -0
  245. /data/lib/kward/{path_guard.rb → workspace/path_guard.rb} +0 -0
@@ -3,15 +3,15 @@ require "digest"
3
3
  require "json"
4
4
  require "securerandom"
5
5
  require "time"
6
- require_relative "config_files"
7
- require_relative "conversation"
8
- require_relative "message_access"
9
- require_relative "message_text"
10
- require_relative "private_file"
11
- require_relative "rpc/tool_event_normalizer"
12
- require_relative "session_catalog"
13
- require_relative "tools/tool_call"
14
- require_relative "workspace"
6
+ require_relative "../config_files"
7
+ require_relative "../conversation"
8
+ require_relative "../message_access"
9
+ require_relative "../message_text"
10
+ require_relative "../private_file"
11
+ require_relative "../rpc/tool_event_normalizer"
12
+ require_relative "catalog"
13
+ require_relative "../tools/tool_call"
14
+ require_relative "../workspace/workspace"
15
15
 
16
16
  # Namespace for the Kward CLI agent runtime.
17
17
  module Kward
@@ -85,6 +85,7 @@ module Kward
85
85
  def attach(conversation)
86
86
  conversation.on_append = lambda { |message| append_message(message) }
87
87
  conversation.on_compact = lambda { |message| compact(message) }
88
+ conversation.on_turn_summary = lambda { |message, summary| append_turn_summary(message, summary) }
88
89
  conversation.on_tool_execution = lambda { |tool_call, content| append_tool_execution(tool_call, content) }
89
90
  conversation.on_runtime_update = lambda { |provider:, model:, reasoning_effort:| update_runtime(provider: provider, model: model, reasoning_effort: reasoning_effort) }
90
91
  conversation.on_system_message_change = lambda { |system_message| append_system_prompt_snapshot(system_message, reason: "changed") }
@@ -108,6 +109,18 @@ module Kward
108
109
  mark_modified(record)
109
110
  end
110
111
 
112
+ # Anchors display-only stats to an existing entry without advancing the leaf.
113
+ def append_turn_summary(message, summary)
114
+ record = {
115
+ type: "turn_summary",
116
+ targetId: message["id"] || message[:id],
117
+ timestamp: Time.now.utc.iso8601(3),
118
+ summary: summary
119
+ }
120
+ @store.append_record(@path, record)
121
+ mark_modified(record)
122
+ end
123
+
111
124
  # Persists normalized tool execution metadata alongside transcript messages.
112
125
  def append_tool_execution(tool_call, content)
113
126
  record = RPC::ToolEventNormalizer.new(tool_call, content: content).execution_record
@@ -461,7 +474,7 @@ module Kward
461
474
  records = records_from_file(resolve_session_path(path))
462
475
  labels = labels_by_target(records)
463
476
  timestamps = label_timestamps_by_target(records)
464
- records.select { |record| tree_entry_record?(record) }.map do |record|
477
+ entries_with_turn_summaries(records).map do |record|
465
478
  id = record["id"].to_s
466
479
  record.dup.tap do |copy|
467
480
  copy["resolvedLabel"] = labels[id] if labels.key?(id)
@@ -717,7 +730,7 @@ module Kward
717
730
 
718
731
 
719
732
  def build_session_tree(records)
720
- entries = records.select { |record| tree_entry_record?(record) }
733
+ entries = entries_with_turn_summaries(records)
721
734
  labels = labels_by_target(records)
722
735
  label_timestamps = label_timestamps_by_target(records)
723
736
  nodes = entries.each_with_object({}) do |entry, map|
@@ -749,8 +762,22 @@ module Kward
749
762
  entry.dup
750
763
  end
751
764
 
765
+ def entries_with_turn_summaries(records)
766
+ summaries = records.each_with_object({}) do |record, result|
767
+ result[record["targetId"]] = record["summary"] if record["type"] == "turn_summary"
768
+ end
769
+ records.select { |record| tree_entry_record?(record) }.map do |record|
770
+ summary = summaries[record["id"]]
771
+ if summary.is_a?(Hash) && record["message"].is_a?(Hash)
772
+ record.merge("message" => record["message"].merge("turn_summary" => summary))
773
+ else
774
+ record
775
+ end
776
+ end
777
+ end
778
+
752
779
  def branch_records(records)
753
- entries = records.select { |record| tree_entry_record?(record) && !record["id"].to_s.empty? }
780
+ entries = entries_with_turn_summaries(records).reject { |record| record["id"].to_s.empty? }
754
781
  by_id = entries.to_h { |record| [record["id"].to_s, record] }
755
782
  leaf_id = current_leaf_id(records)
756
783
  return [] if leaf_id.nil?
@@ -1,6 +1,6 @@
1
- require_relative "message_access"
2
- require_relative "message_text"
3
- require_relative "tools/tool_call"
1
+ require_relative "../message_access"
2
+ require_relative "../message_text"
3
+ require_relative "../tools/tool_call"
4
4
 
5
5
  # Namespace for the Kward CLI agent runtime.
6
6
  module Kward
@@ -1,7 +1,7 @@
1
- require_relative "message_access"
2
- require_relative "message_text"
3
- require_relative "session_tree_nodes"
4
- require_relative "session_tree_tool_display"
1
+ require_relative "../message_access"
2
+ require_relative "../message_text"
3
+ require_relative "tree_nodes"
4
+ require_relative "tree_tool_display"
5
5
 
6
6
  # Namespace for the Kward CLI agent runtime.
7
7
  module Kward
@@ -1,5 +1,5 @@
1
1
  require "json"
2
- require_relative "tools/tool_call"
2
+ require_relative "../tools/tool_call"
3
3
 
4
4
  # Namespace for the Kward CLI agent runtime.
5
5
  module Kward
@@ -1,8 +1,9 @@
1
1
  require "shellwords"
2
- require_relative "ansi"
3
- require_relative "local_command_runner"
2
+ require_relative "kwshrc"
3
+ require_relative "../terminal/ansi"
4
+ require_relative "../pty/local_command_runner"
4
5
  begin
5
- require_relative "local_pty_command_runner"
6
+ require_relative "../pty/local_pty_runner"
6
7
  rescue LoadError
7
8
  nil
8
9
  end
@@ -13,7 +14,7 @@ module Kward
13
14
  class Kwsh
14
15
  Result = Struct.new(:output, :exit_status, :exit_shell, :clear, :open_editor_path, :interactive_command, :streamed, keyword_init: true)
15
16
  Completion = Struct.new(:range, :replacement, :candidates, keyword_init: true)
16
- BUILTINS = %w[alias capture cd pwd export source unset unalias clear exit logout pty].freeze
17
+ BUILTINS = Kwshrc::PROMPT_BUILTINS
17
18
  DEFAULT_SHELL = "/bin/sh"
18
19
  DEFAULT_TIMEOUT_SECONDS = 300
19
20
  DEFAULT_MAX_OUTPUT_BYTES = 1_048_576
@@ -111,6 +112,15 @@ module Kward
111
112
  Completion.new(range: token[:range], replacement: replacement, candidates: candidates)
112
113
  end
113
114
 
115
+ # Directory field completion uses shell matching but no shell quoting or expansion.
116
+ def complete_directory(input, cursor, root: @cwd)
117
+ prefix = input[0...cursor]
118
+ candidates = path_candidates(prefix, directories_only: true, literal: true, root: root)
119
+ return if candidates.empty?
120
+
121
+ Completion.new(range: 0...input.length, replacement: completion_replacement(prefix, candidates), candidates: candidates)
122
+ end
123
+
114
124
  def expand_alias(command, interactive: false)
115
125
  words = shell_words(command)
116
126
  return command if words.empty? || BUILTINS.include?(words.first)
@@ -246,19 +256,23 @@ module Kward
246
256
  @path_executables_cache = nil
247
257
  end
248
258
 
249
- def path_candidates(prefix, directories_only: false, quote: nil)
259
+ def path_candidates(prefix, directories_only: false, quote: nil, literal: false, root: nil)
250
260
  raw_dir, raw_base = split_path_prefix(prefix)
251
- dir = File.expand_path(unescape_path(raw_dir.empty? ? "." : raw_dir), @cwd)
261
+ base = raw_dir.empty? ? "." : raw_dir
262
+ dir = File.expand_path(literal ? base : unescape_path(base), @cwd)
252
263
  return [] unless File.directory?(dir)
264
+ return [] if root && !directory_under_root?(dir, root)
253
265
 
254
266
  Dir.children(dir).filter_map do |entry|
255
- next unless entry.start_with?(unescape_path(raw_base))
267
+ next unless entry.start_with?(literal ? raw_base : unescape_path(raw_base))
268
+ next if literal && entry.match?(/[[:cntrl:]]/)
256
269
 
257
270
  path = File.join(dir, entry)
258
271
  directory = File.directory?(path)
259
272
  next if directories_only && !directory
273
+ next if root && !directory_under_root?(path, root)
260
274
 
261
- completed = path_completion_candidate(raw_dir, entry, quote: quote)
275
+ completed = literal ? "#{raw_dir}#{entry}" : path_completion_candidate(raw_dir, entry, quote: quote)
262
276
  completed = "#{completed}/" if directory
263
277
  completed
264
278
  end.sort
@@ -266,6 +280,13 @@ module Kward
266
280
  []
267
281
  end
268
282
 
283
+ def directory_under_root?(path, root)
284
+ resolved = File.realpath(path)
285
+ resolved == root || resolved.start_with?(root.end_with?("/") ? root : "#{root}/")
286
+ rescue SystemCallError
287
+ false
288
+ end
289
+
269
290
  def path_completion_candidate(raw_dir, entry, quote: nil)
270
291
  completed = "#{raw_dir}#{entry}"
271
292
  return "#{quote}#{completed.gsub(quote, "\\#{quote}")}" if quote
@@ -429,7 +450,7 @@ module Kward
429
450
  end
430
451
 
431
452
  def self.valid_alias_name?(name)
432
- name.to_s.match?(/\A[A-Za-z_][A-Za-z0-9_-]*\z/) && !BUILTINS.include?(name.to_s)
453
+ Kwshrc.valid_alias_name?(name)
433
454
  end
434
455
 
435
456
  def run_expanded_command(command, cancellation: nil, &block)
@@ -539,7 +560,6 @@ module Kward
539
560
  return Result.new(output: "#{command_echo(command)}Usage: source <file>\n", exit_status: 2)
540
561
  end
541
562
 
542
- require_relative "kwshrc"
543
563
  path = Kwshrc.resolve_path(words[1], cwd: @cwd, env: @env)
544
564
  config = Kwshrc.read_file(path, env: @env)
545
565
  path_changed = config[:env].key?("PATH")
@@ -1,5 +1,5 @@
1
1
  require "shellwords"
2
- require_relative "kwsh"
2
+ require_relative "../config/paths"
3
3
 
4
4
  # Namespace for the Kward CLI agent runtime.
5
5
  module Kward
@@ -8,12 +8,21 @@ module Kward
8
8
  # Only aliases, exports, and source directives are handled. Other shell
9
9
  # syntax is intentionally ignored until kwsh supports scripting.
10
10
  class Kwshrc
11
+ PROMPT_BUILTINS = %w[alias capture cd pwd export source unset unalias clear exit logout pty].freeze
11
12
  VARIABLE_NAME = /\A[A-Za-z_][A-Za-z0-9_]*\z/
12
13
  VARIABLE_PATTERN = /[A-Za-z_][A-Za-z0-9_]*/
13
14
 
14
15
  class ParseError < StandardError
15
16
  end
16
17
 
18
+ def self.paths(primary = File.join(ConfigPaths.config_dir, "kwshrc"))
19
+ [primary, File.expand_path("~/.kwshrc")].uniq
20
+ end
21
+
22
+ def self.valid_alias_name?(name)
23
+ name.to_s.match?(/\A[A-Za-z_][A-Za-z0-9_-]*\z/) && !PROMPT_BUILTINS.include?(name.to_s)
24
+ end
25
+
17
26
  def self.read(paths, env: ENV.to_h)
18
27
  new(env: env).read(paths)
19
28
  end
@@ -92,7 +101,7 @@ module Kward
92
101
  def parse_aliases(words)
93
102
  words.each do |assignment|
94
103
  name, command = assignment.split("=", 2)
95
- next unless command && Kwsh.valid_alias_name?(name)
104
+ next unless command && self.class.valid_alias_name?(name)
96
105
  next if command.empty?
97
106
 
98
107
  @aliases[name] = command
@@ -0,0 +1,255 @@
1
+ require "strscan"
2
+
3
+ module Kward
4
+ module NativeShell
5
+ # Integer arithmetic ASTs preserve short-circuiting and lvalue ownership.
6
+ # Parsing is independent of shell state; evaluation never uses Ruby eval.
7
+ module Arithmetic
8
+ class Error < StandardError; end
9
+ MAX_BITS = 4_096
10
+ MAX_DEPTH = 100
11
+
12
+ def self.integer(text)
13
+ value = text.to_s.strip
14
+ return 0 if value.empty?
15
+ unless value.match?(/\A[+-]?(?:0[xX][0-9a-fA-F]+|0[0-7]*|[1-9][0-9]*)\z/)
16
+ raise Error, "arithmetic requires an integer value"
17
+ end
18
+ negative = value.start_with?("-")
19
+ digits = value.delete_prefix("+").delete_prefix("-")
20
+ base = digits.start_with?("0x", "0X") ? 16 : digits.start_with?("0") ? 8 : 10
21
+ digits = digits[2..] if base == 16
22
+ digits = digits.sub(/\A0+/, "")
23
+ return 0 if digits.empty?
24
+ # More significant digits than bits cannot fit in any supported base.
25
+ # Reject before constructing a huge integer; leading zeros cost no bits.
26
+ raise Error, "arithmetic result exceeds #{MAX_BITS} bits" if digits.length > MAX_BITS
27
+ bounded(Integer(digits, base) * (negative ? -1 : 1))
28
+ end
29
+
30
+ def self.bounded(value)
31
+ raise Error, "arithmetic result exceeds #{MAX_BITS} bits" if value.bit_length > MAX_BITS
32
+ value
33
+ end
34
+
35
+ def self.evaluate(source, assign: nil, &variable)
36
+ Evaluator.new(variable, assign).evaluate(Parser.new(source).parse)
37
+ end
38
+
39
+ def self.binary(operator, left, right)
40
+ value = case operator
41
+ when "+" then left + right
42
+ when "-" then left - right
43
+ when "*" then left * right
44
+ when "/", "%"
45
+ raise Error, "arithmetic division by zero" if right.zero?
46
+ quotient = left.abs / right.abs
47
+ quotient = -quotient if left.negative? != right.negative?
48
+ operator == "/" ? quotient : left - quotient * right
49
+ when "**"
50
+ raise Error, "negative arithmetic exponent" if right.negative?
51
+ raise Error, "arithmetic exponent exceeds result limit" if left.abs > 1 && (left.abs.bit_length - 1) * right > MAX_BITS
52
+ if left == -1
53
+ right.odd? ? -1 : 1
54
+ elsif left == 0
55
+ right.zero? ? 1 : 0
56
+ elsif left == 1
57
+ 1
58
+ else
59
+ left**right
60
+ end
61
+ when "<<", ">>"
62
+ raise Error, "arithmetic shift exceeds limit" unless (0..MAX_BITS).cover?(right)
63
+ operator == "<<" ? left << right : left >> right
64
+ when "&" then left & right
65
+ when "|" then left | right
66
+ when "^" then left ^ right
67
+ when "==" then left == right ? 1 : 0
68
+ when "!=" then left != right ? 1 : 0
69
+ when "<" then left < right ? 1 : 0
70
+ when "<=" then left <= right ? 1 : 0
71
+ when ">" then left > right ? 1 : 0
72
+ when ">=" then left >= right ? 1 : 0
73
+ when "," then right
74
+ else raise Error, "unknown arithmetic operator"
75
+ end
76
+ bounded(value)
77
+ end
78
+
79
+ class Evaluator
80
+ def initialize(variable, assign)
81
+ @variable, @assign = variable, assign
82
+ @depth = 0
83
+ @reading = []
84
+ end
85
+
86
+ def evaluate(node)
87
+ @depth += 1
88
+ raise Error, "arithmetic nesting exceeds #{MAX_DEPTH} levels" if @depth > MAX_DEPTH
89
+ kind, *args = node
90
+ case kind
91
+ when :number then args.first
92
+ when :variable, :parameter then read(args.first)
93
+ when :unary
94
+ operator, operand = args
95
+ value = evaluate(operand)
96
+ result = case operator
97
+ when "+" then value
98
+ when "-" then -value
99
+ when "!" then value.zero? ? 1 : 0
100
+ when "~" then ~value
101
+ end
102
+ Arithmetic.bounded(result)
103
+ when :update
104
+ name, delta, post = args
105
+ before = read(name)
106
+ after = store(name, Arithmetic.bounded(before + delta))
107
+ post ? before : after
108
+ when :assign
109
+ name, operator, operand = args
110
+ before = read(name) unless operator == "="
111
+ value = evaluate(operand)
112
+ store(name, operator == "=" ? value : Arithmetic.binary(operator.delete_suffix("="), before, value))
113
+ when :conditional
114
+ condition, yes, no = args
115
+ evaluate(evaluate(condition).zero? ? no : yes)
116
+ when :binary then binary_chain(node)
117
+ end
118
+ ensure
119
+ @depth -= 1
120
+ end
121
+
122
+ private
123
+
124
+ # A long left-associative chain is not recursive expression nesting.
125
+ def binary_chain(node)
126
+ operations = []
127
+ while node.first == :binary
128
+ _, operator, left, right = node
129
+ operations << [operator, right]
130
+ node = left
131
+ end
132
+ value = evaluate(node)
133
+ operations.reverse_each do |operator, right|
134
+ value = if operator == "&&"
135
+ value.zero? ? 0 : (evaluate(right).zero? ? 0 : 1)
136
+ elsif operator == "||"
137
+ value.zero? ? (evaluate(right).zero? ? 0 : 1) : 1
138
+ else
139
+ Arithmetic.binary(operator, value, evaluate(right))
140
+ end
141
+ end
142
+ value
143
+ end
144
+
145
+ def read(name)
146
+ raise Error, "recursive arithmetic variable: #{name}" if @reading.include?(name)
147
+ @reading << name
148
+ begin
149
+ value = @variable.call(name).to_s
150
+ value.strip.empty? ? 0 : evaluate(Parser.new(value).parse)
151
+ ensure
152
+ @reading.pop
153
+ end
154
+ end
155
+
156
+ def store(name, value)
157
+ raise Error, "arithmetic assignment is unavailable" unless @assign
158
+ @assign.call(name, value.to_s)
159
+ value
160
+ end
161
+ end
162
+
163
+ class Parser
164
+ LEVELS = [ %w[,], %w[= += -= *= /= %= <<= >>= &= ^= |=], %w[?], %w[||], %w[&&], %w[|], %w[^], %w[&], %w[== !=], %w[< <= > >=], %w[<< >>], %w[+ -], %w[* / %], %w[**] ].freeze
165
+ PRECEDENCE = LEVELS.each_with_index.each_with_object({}) { |(operators, index), result| operators.each { |operator| result[operator] = index + 1 } }.freeze
166
+
167
+ def initialize(source)
168
+ @scanner = StringScanner.new(source)
169
+ @depth = 0
170
+ advance
171
+ end
172
+
173
+ def parse
174
+ result = expression
175
+ raise Error, "unexpected token in arithmetic expression" if @token
176
+ result
177
+ end
178
+
179
+ private
180
+
181
+ def advance
182
+ @scanner.skip(/\s+/)
183
+ @token = if @scanner.eos?
184
+ nil
185
+ elsif (number = @scanner.scan(/0[xX][0-9a-fA-F]+|[0-9]+/))
186
+ [:number, Arithmetic.integer(number)]
187
+ elsif (name = @scanner.scan(/[A-Za-z_][A-Za-z0-9_]*/))
188
+ [:variable, name]
189
+ elsif @scanner.scan(/\$\{([A-Za-z_][A-Za-z0-9_]*|[0-9]+|[?#$])\}/) || @scanner.scan(/\$([A-Za-z_][A-Za-z0-9_]*|[0-9?#$])/)
190
+ [:parameter, @scanner[1]]
191
+ elsif (operator = @scanner.scan(/<<=|>>=|\+\+|--|\*\*|&&|\|\||<<|>>|[+*\/%&|^!<>=-]=|[+*\/%()~!<>=?:,&|^-]/))
192
+ operator
193
+ else
194
+ raise Error, "unsupported token in arithmetic expression"
195
+ end
196
+ end
197
+
198
+ def expression(minimum = 1)
199
+ @depth += 1
200
+ raise Error, "arithmetic nesting exceeds #{MAX_DEPTH} levels" if @depth > MAX_DEPTH
201
+ left = unary
202
+ while (precedence = PRECEDENCE[@token]) && precedence >= minimum
203
+ operator = @token
204
+ advance
205
+ if operator == "?"
206
+ yes = expression
207
+ raise Error, "expected : in arithmetic conditional" unless @token == ":"
208
+ advance
209
+ left = [:conditional, left, yes, expression(precedence)]
210
+ else
211
+ assignment = LEVELS[1].include?(operator)
212
+ name = lvalue(left) if assignment
213
+ right = expression(assignment || operator == "**" ? precedence : precedence + 1)
214
+ left = assignment ? [:assign, name, operator, right] : [:binary, operator, left, right]
215
+ end
216
+ end
217
+ left
218
+ ensure
219
+ @depth -= 1
220
+ end
221
+
222
+ def unary
223
+ if %w[+ - ! ~ ++ --].include?(@token)
224
+ operator = @token
225
+ advance
226
+ operand = expression(15)
227
+ return [:update, lvalue(operand), operator == "++" ? 1 : -1, false] if %w[++ --].include?(operator)
228
+ return [:unary, operator, operand]
229
+ end
230
+ if @token == "("
231
+ advance
232
+ value = expression
233
+ raise Error, "expected ) in arithmetic expression" unless @token == ")"
234
+ advance
235
+ elsif @token.is_a?(Array)
236
+ value = @token
237
+ advance
238
+ else
239
+ raise Error, "expected an integer, variable, or ( in arithmetic expression"
240
+ end
241
+ if %w[++ --].include?(@token)
242
+ value = [:update, lvalue(value), @token == "++" ? 1 : -1, true]
243
+ advance
244
+ end
245
+ value
246
+ end
247
+
248
+ def lvalue(node)
249
+ raise Error, "arithmetic assignment requires a variable" unless node.first == :variable
250
+ node[1]
251
+ end
252
+ end
253
+ end
254
+ end
255
+ end
@@ -0,0 +1,102 @@
1
+ module Kward
2
+ module NativeShell
3
+ module Arrays
4
+ ArrayValue = Struct.new(:associative, :values, keyword_init: true)
5
+
6
+ private
7
+
8
+ def declare_array(args)
9
+ mode = args.shift
10
+ raise ExecutionError, "declare: use -a for indexed or -A for associative arrays" unless %w[-a -A].include?(mode)
11
+ raise ExecutionError, "declare: expected an array name" if args.empty?
12
+ args.each do |name|
13
+ validate_name(name)
14
+ raise ExecutionError, "#{name}: readonly variable" if @readonly.include?(name)
15
+ existing = @arrays[name]
16
+ associative = mode == "-A"
17
+ raise ExecutionError, "#{name}: cannot change array type" if existing && existing.associative != associative
18
+ values = @variables.key?(name) ? { associative ? "0" : 0 => @variables.delete(name) } : {}
19
+ @arrays[name] ||= ArrayValue.new(associative: associative, values: values)
20
+ end
21
+ 0
22
+ end
23
+
24
+ def array_index(reference, array)
25
+ value = scalar(reference.subscript)
26
+ if array.associative
27
+ raise ExpansionError, "empty associative array key" if value.empty?
28
+ value
29
+ else
30
+ index = arithmetic_value(value.empty? ? "0" : value).to_i
31
+ index += (array.values.keys.max || -1) + 1 if index.negative?
32
+ raise ExpansionError, "negative array index" if index.negative?
33
+ raise ExpansionError, "array index exceeds limit" if index > 2**31 - 1
34
+ index
35
+ end
36
+ end
37
+
38
+ def array_values(reference, keys: false)
39
+ array = @arrays[reference.name]
40
+ unless array
41
+ value = @variables[reference.name]
42
+ return value ? (keys ? ["0"] : [value]) : []
43
+ end
44
+ indices = array.associative ? array.values.keys : array.values.keys.sort
45
+ indices.map { |key| keys ? key.to_s : array.values.fetch(key) }
46
+ end
47
+
48
+ def array_read(reference)
49
+ return array_values(reference).join(ifs[0].to_s) if %w[@ *].include?(reference.subscript.literal)
50
+ array = @arrays[reference.name] || ArrayValue.new(associative: false, values: @variables.key?(reference.name) ? { 0 => @variables[reference.name] } : {})
51
+ array.values[array_index(reference, array)]
52
+ end
53
+
54
+ def array_store(reference, value)
55
+ validate_name(reference.name)
56
+ raise ExecutionError, "#{reference.name}: readonly variable" if @readonly.include?(reference.name)
57
+ raise ExecutionError, "cannot assign to all array elements" if %w[@ *].include?(reference.subscript.literal)
58
+ array = @arrays[reference.name] ||= ArrayValue.new(associative: false, values: @variables.key?(reference.name) ? { 0 => @variables.delete(reference.name) } : {})
59
+ key = array_index(reference, array)
60
+ array.values[key] = reference.append ? array.values.fetch(key, "") + value : value
61
+ end
62
+
63
+ def array_assignment(name, words, append = false)
64
+ raise ExecutionError, "#{name}: readonly variable" if @readonly.include?(name)
65
+ array = @arrays[name] ||= ArrayValue.new(associative: false, values: {})
66
+ @variables.delete(name)
67
+ array.values.clear unless append
68
+ populate_array(array, name, words, append: append)
69
+ end
70
+
71
+ def populate_array(array, name, words, append: false)
72
+ index = append && !array.associative ? (array.values.keys.max || -1) + 1 : 0
73
+ words.each do |word|
74
+ if (element = word.array_element)
75
+ reference, value = element
76
+ reference = Reference.new(name: name, subscript: reference.subscript, append: reference.append)
77
+ key = array_index(reference, array)
78
+ result = scalar(value)
79
+ array.values[key] = reference.append ? array.values.fetch(key, "") + result : result
80
+ index = key + 1 unless array.associative
81
+ else
82
+ raise ExecutionError, "associative array elements require [key]=value" if array.associative
83
+ expand(word).each do |value|
84
+ array.values[index] = value
85
+ index += 1
86
+ end
87
+ end
88
+ end
89
+ 0
90
+ end
91
+
92
+ def array_fields(reference, quoted, keys: false, values: nil)
93
+ values ||= array_values(reference, keys: keys)
94
+ if reference.subscript.literal == "*" && quoted
95
+ [Fields.characters(values.join(ifs[0].to_s), quoted: true)]
96
+ else
97
+ values.map { |value| Fields.characters(value, quoted: quoted, split: !quoted) }
98
+ end
99
+ end
100
+ end
101
+ end
102
+ end