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
@@ -1,3 +1,5 @@
1
+ require_relative "../shell/prompt_agent"
2
+
1
3
  # Namespace for the Kward CLI agent runtime.
2
4
  module Kward
3
5
  # Command-line frontend that coordinates terminal interaction, sessions, tools, and model turns.
@@ -7,6 +9,19 @@ module Kward
7
9
  MAX_TRANSIENT_TERMINAL_OUTPUT_BYTES = 1_048_576
8
10
  UNSAFE_TRANSCRIPT_CONTROL_PATTERN = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/.freeze
9
11
 
12
+ # Lets the PTY pumps resolve an ambiguous legacy Escape without reading ahead.
13
+ TerminalHandoffInput = Struct.new(:prompt, :on_tab_action) do
14
+ def call(chunk)
15
+ filtered = prompt.filter_terminal_handoff_input(chunk)
16
+ on_tab_action.call(filtered[:tab_action]) if filtered[:tab_action]
17
+ filtered
18
+ end
19
+
20
+ def flush_pending_escape
21
+ prompt.flush_terminal_handoff_escape if prompt.respond_to?(:flush_terminal_handoff_escape)
22
+ end
23
+ end
24
+
10
25
  private
11
26
 
12
27
  def new_conversation(workspace_root: current_workspace_root)
@@ -47,6 +62,11 @@ module Kward
47
62
 
48
63
  def runtime_output(text)
49
64
  content = text.to_s.chomp
65
+ if (tab = Thread.current[:kward_local_busy_tab]) && !content.empty?
66
+ tab.append_pending_runtime_output(content)
67
+ return
68
+ end
69
+
50
70
  label = colored(runtime_output_prompt, :gray, :bold)
51
71
  separator = content.include?("\n") ? "\n" : " "
52
72
  @prompt.say("\n#{label}#{separator}#{content}\n")
@@ -61,6 +81,7 @@ module Kward
61
81
  workspace: workspace,
62
82
  prompt: @prompt,
63
83
  skills: ConfigFiles.skills(workspace_root: conversation.workspace_root, project_skill_paths: project_skill_paths_for(conversation.workspace_root)),
84
+ plugin_tools: plugin_registry.tools,
64
85
  tool_approval: interactive_tool_approval_callback,
65
86
  hook_manager: hook_manager,
66
87
  hook_context: hook_context
@@ -210,21 +231,13 @@ module Kward
210
231
 
211
232
  def build_shell_prompt_agent(active_agent)
212
233
  active_conversation = active_agent.conversation
213
- config = ConfigFiles.read_config
214
- configured_provider = ConfigFiles.shell_agent_provider(config)
215
- conversation = Conversation.new(
216
- system_message: ShellPrompt.system_message,
217
- workspace_root: active_conversation.workspace_root,
218
- provider: configured_provider || active_conversation.provider || current_model_provider,
219
- model: ConfigFiles.shell_agent_model(config) || (configured_provider ? nil : active_conversation.model || current_model_id),
220
- reasoning_effort: ConfigFiles.shell_agent_reasoning_effort(config) || (configured_provider ? nil : active_conversation.reasoning_effort || current_reasoning_effort)
221
- )
222
- Agent.new(
234
+ ShellPromptAgent.build(
223
235
  client: @client,
224
- tool_registry: active_agent.tool_registry,
225
- conversation: conversation,
226
- strict_provider: !configured_provider.nil?,
227
- warning_sink: ConfigFiles.warning_sink
236
+ registry: active_agent.tool_registry,
237
+ workspace_root: active_conversation.workspace_root,
238
+ provider: active_conversation.provider || current_model_provider,
239
+ model: active_conversation.model || current_model_id,
240
+ reasoning_effort: active_conversation.reasoning_effort || current_reasoning_effort
228
241
  )
229
242
  end
230
243
 
@@ -320,8 +333,13 @@ module Kward
320
333
  @prompt.say(intro_message)
321
334
  end
322
335
  origin_tab = active_tab if respond_to?(:active_tab, true)
323
- result = run_interactive_pty_with_terminal_handoff(shell, command, env: env, cwd: cwd) do |sink, completed_result|
324
- transcript_output = record_completed_pty_output(sink, completed_result, tab: origin_tab)
336
+ result = run_interactive_pty_with_terminal_handoff(shell, command, env: env, cwd: cwd) do |sink, completed_result, background_state|
337
+ transcript_output = record_completed_pty_output(
338
+ sink,
339
+ completed_result,
340
+ tab: origin_tab,
341
+ background_state: background_state
342
+ )
325
343
  yield(transcript_output, completed_result) if block_given?
326
344
  end
327
345
  refresh_composer_status
@@ -337,7 +355,13 @@ module Kward
337
355
  with_interactive_terminal_handoff do |input, sink|
338
356
  tab_action_handler = terminal_handoff_tab_action_handler
339
357
  on_detach = if origin_tab
340
- -> { BufferedPtyOutputSink.new(max_capture_bytes: Kward::CLI::Tabs::TRANSIENT_SHELL_OUTPUT_LIMIT) }
358
+ lambda do
359
+ BufferedPtyOutputSink.new(
360
+ max_capture_bytes: Kward::CLI::Tabs::TRANSIENT_SHELL_OUTPUT_LIMIT,
361
+ initial_output: sink.captured_output,
362
+ initial_truncated: sink.truncated?
363
+ )
364
+ end
341
365
  end
342
366
  result = if shell.respond_to?(:run_interactive)
343
367
  shell.run_interactive(command, input: input, sink: sink, tab_action_handler: tab_action_handler, on_detach: on_detach)
@@ -345,7 +369,7 @@ module Kward
345
369
  runner.run(shell, "-c", command, env: env, cwd: cwd, input: input, sink: sink, tab_action_handler: tab_action_handler, on_detach: on_detach)
346
370
  end
347
371
  if result&.background
348
- register_background_tab_run(origin_tab, result.background, &on_complete)
372
+ register_background_tab_run(origin_tab, result.background, output_kind: :pty, &on_complete)
349
373
  else
350
374
  on_complete.call(sink, result) if on_complete
351
375
  end
@@ -355,13 +379,15 @@ module Kward
355
379
 
356
380
  def with_interactive_terminal_handoff
357
381
  if @prompt.respond_to?(:with_inline_terminal_handoff)
358
- with_tab_keybinding_handoff(:with_inline_terminal_handoff) do |input, output, transition|
382
+ with_tab_keybinding_handoff(:with_inline_terminal_handoff) do |input, output, transition, keep_view|
359
383
  sink = AdaptivePtyOutputSink.new(
360
384
  output: output,
361
385
  on_exclusive: transition,
362
386
  max_capture_bytes: MAX_TRANSIENT_TERMINAL_OUTPUT_BYTES
363
387
  )
364
- yield(input, sink)
388
+ result = yield(input, sink)
389
+ keep_view&.call if result && !result.tab_action && !result.background && sink.preserve_terminal_view?
390
+ result
365
391
  end
366
392
  elsif @prompt.respond_to?(:with_terminal_handoff)
367
393
  with_tab_keybinding_handoff(:with_terminal_handoff) do |input, output|
@@ -396,15 +422,86 @@ module Kward
396
422
  return unless @prompt.respond_to?(:filter_terminal_handoff_input)
397
423
  return unless respond_to?(:handle_tab_action, true)
398
424
 
399
- lambda do |chunk|
400
- filtered = @prompt.filter_terminal_handoff_input(chunk)
401
- action = filtered[:tab_action]
402
- handle_tab_action(action, @session_store) if action
403
- filtered
425
+ TerminalHandoffInput.new(@prompt, ->(action) { handle_tab_action(action, @session_store) })
426
+ end
427
+
428
+ def record_completed_pty_output(sink, result, tab: nil, background_state: nil)
429
+ transcript_output = background_shell_transcript_output(sink, result)
430
+ return unless transcript_output
431
+
432
+ rendered_output = background_state&.fetch(:rendered_output, "").to_s
433
+ delta = if transcript_output.start_with?(rendered_output)
434
+ transcript_output[rendered_output.length..].to_s
435
+ else
436
+ transcript_output
437
+ end
438
+ if background_state
439
+ background_state[:rendered_output] = transcript_output
440
+ render_background_tab_delta(tab, delta) unless delta.empty?
441
+ else
442
+ record_tab_transient_shell_output(transcript_output, render: false, tab: tab)
443
+ if @prompt.respond_to?(:record_transient_terminal_output) && (!tab || tab == active_tab)
444
+ @prompt.record_transient_terminal_output(transcript_output, render: false)
445
+ end
446
+ end
447
+ transcript_output
448
+ end
449
+
450
+ def flush_background_tab_output(tab, state, result: nil, complete: false)
451
+ sink = state[:run].sink
452
+ output = sink&.captured_output.to_s
453
+ return if output.empty?
454
+
455
+ transcript_output = if state[:output_kind] == :streamed
456
+ background_stream_transcript_output(sink)
457
+ else
458
+ transcript_result = result if result.respond_to?(:input_forwarded)
459
+ transcript_result ||= InteractivePtyRunner::Result.new(exit_status: 0, input_forwarded: false)
460
+ background_shell_transcript_output(sink, transcript_result)
461
+ end
462
+ return unless transcript_output
463
+
464
+ if state[:output_kind] == :pty && !complete
465
+ # Transcript entries finish on a new line; keep a partial PTY row buffered.
466
+ newline = transcript_output.rindex("\n")
467
+ transcript_output = newline ? transcript_output[0..newline] : ""
468
+ end
469
+
470
+ rendered_output = state[:rendered_output].to_s
471
+ if transcript_output.start_with?(rendered_output)
472
+ delta = transcript_output[rendered_output.length..].to_s
473
+ return if delta.empty?
474
+
475
+ state[:rendered_output] = transcript_output
476
+ render_background_tab_delta(tab, delta)
477
+ else
478
+ state[:rendered_output] = transcript_output
479
+ render_tab(tab, restore_composer: false) if tab == active_tab
404
480
  end
405
481
  end
406
482
 
407
- def record_completed_pty_output(sink, result, tab: nil)
483
+ def render_background_tab_delta(tab, delta)
484
+ return unless tab == active_tab
485
+
486
+ if @prompt.respond_to?(:record_transient_terminal_output)
487
+ @prompt.record_transient_terminal_output(delta)
488
+ elsif @prompt.respond_to?(:say)
489
+ @prompt.say(delta)
490
+ end
491
+ end
492
+
493
+ def background_stream_transcript_output(sink)
494
+ return if sink&.truncated?
495
+
496
+ text = ANSI.normalize_transcript_encoding(sink&.captured_output.to_s).gsub("\r\n", "\n")
497
+ sanitized = PtyTranscriptNormalizer.normalize(text, columns: TTY::Screen.width, max_bytes: MAX_TRANSIENT_TERMINAL_OUTPUT_BYTES)
498
+ return if sanitized.nil? || sanitized.empty?
499
+ return if ANSI.strip_control_sequences(sanitized).match?(UNSAFE_TRANSCRIPT_CONTROL_PATTERN)
500
+
501
+ sanitized
502
+ end
503
+
504
+ def background_shell_transcript_output(sink, result)
408
505
  classified_output = sink.respond_to?(:transcript_safe?)
409
506
  return if classified_output && !sink.transcript_safe?
410
507
 
@@ -412,20 +509,13 @@ module Kward
412
509
  allow_input = classified_output &&
413
510
  sink.respond_to?(:pre_input_capture_only?) &&
414
511
  sink.pre_input_capture_only?
415
- transcript_output = terminal_transcript_output(
512
+ terminal_transcript_output(
416
513
  output,
417
514
  result,
418
515
  truncated: sink&.truncated? || false,
419
516
  allow_input: allow_input,
420
517
  normalize_line_controls: classified_output
421
518
  )
422
- return unless transcript_output
423
-
424
- record_tab_transient_shell_output(transcript_output, render: false, tab: tab)
425
- if @prompt.respond_to?(:record_transient_terminal_output) && (!tab || tab == active_tab)
426
- @prompt.record_transient_terminal_output(transcript_output, render: false)
427
- end
428
- transcript_output
429
519
  end
430
520
 
431
521
  def terminal_transcript_output(
@@ -441,14 +531,14 @@ module Kward
441
531
  return if text.empty?
442
532
 
443
533
  if normalize_line_controls
444
- sanitized = PtyTranscriptNormalizer.normalize(text)
534
+ sanitized = PtyTranscriptNormalizer.normalize(text, columns: TTY::Screen.width, max_bytes: MAX_TRANSIENT_TERMINAL_OUTPUT_BYTES)
445
535
  else
446
536
  return if text.include?("\r")
447
537
 
448
538
  sanitized = ANSI.sanitize_transcript(text)
449
539
  return unless sanitized == text
450
540
  end
451
- return if sanitized.empty?
541
+ return if sanitized.nil? || sanitized.empty?
452
542
  return if ANSI.strip_control_sequences(sanitized).match?(UNSAFE_TRANSCRIPT_CONTROL_PATTERN)
453
543
 
454
544
  sanitized
@@ -511,9 +601,9 @@ module Kward
511
601
  pty_result = run_kwsh_interactive_pty_command(shell, result)
512
602
  return :tab_action if pty_result&.tab_action
513
603
 
514
- next
604
+ next unless shell.respond_to?(:exited?) && shell.exited?
515
605
  end
516
- if result.exit_shell
606
+ if result.exit_shell || shell.respond_to?(:exited?) && shell.exited?
517
607
  close_kwsh_session(shell)
518
608
  tab.shell = nil if tab
519
609
  tab.shell_agent = nil if tab
@@ -559,10 +649,17 @@ module Kward
559
649
 
560
650
  def ask_kwsh(shell)
561
651
  provider = ->(input, cursor) { shell.complete(input, cursor) }
562
- if @prompt.respond_to?(:with_completion_provider)
563
- @prompt.with_completion_provider(provider, slash_overlay: false) { @prompt.ask(shell.prompt_label) }
564
- else
565
- @prompt.ask(shell.prompt_label)
652
+ loop do
653
+ label = shell.respond_to?(:input_prompt_label) ? shell.input_prompt_label : shell.prompt_label
654
+ input = if @prompt.respond_to?(:with_completion_provider)
655
+ @prompt.with_completion_provider(provider, slash_overlay: false) { @prompt.ask(label) }
656
+ else
657
+ @prompt.ask(label)
658
+ end
659
+ return input unless input.is_a?(String) && shell.respond_to?(:compose_input)
660
+
661
+ source = shell.compose_input(input)
662
+ return source if source
566
663
  end
567
664
  end
568
665
 
@@ -602,6 +699,7 @@ module Kward
602
699
  chunks = Queue.new
603
700
  queued_inputs = []
604
701
  origin_tab = active_tab if respond_to?(:active_tab, true)
702
+ streamed_output = BufferedPtyOutputSink.new(max_capture_bytes: Kward::CLI::Tabs::TRANSIENT_SHELL_OUTPUT_LIMIT)
605
703
  detached_sink = nil
606
704
  result = nil
607
705
  error = nil
@@ -610,6 +708,7 @@ module Kward
610
708
  if detached_sink
611
709
  detached_sink.write(chunk)
612
710
  else
711
+ streamed_output.write(chunk)
613
712
  chunks << chunk
614
713
  end
615
714
  end
@@ -626,17 +725,18 @@ module Kward
626
725
  elsif poll_result.is_a?(Hash) && poll_result[:tab_action]
627
726
  (@pending_inputs ||= []).unshift(poll_result)
628
727
  if origin_tab
629
- detached_sink = BufferedPtyOutputSink.new(max_capture_bytes: Kward::CLI::Tabs::TRANSIENT_SHELL_OUTPUT_LIMIT)
728
+ detached_sink = BufferedPtyOutputSink.new(
729
+ max_capture_bytes: Kward::CLI::Tabs::TRANSIENT_SHELL_OUTPUT_LIMIT,
730
+ initial_output: streamed_output.captured_output,
731
+ initial_truncated: streamed_output.truncated?
732
+ )
630
733
  background = DetachedRun.new(sink: detached_sink, canceler: -> { cancellation.cancel! }) do
631
734
  worker.join
632
735
  raise error if error
633
736
 
634
737
  result
635
738
  end
636
- register_background_tab_run(origin_tab, background) do |_sink, completed_result|
637
- record_tab_transient_shell_output(completed_result.output, render: false, tab: origin_tab)
638
- @prompt.say(completed_result.output) if origin_tab == active_tab && completed_result.output.to_s != ""
639
- end
739
+ register_background_tab_run(origin_tab, background, output_kind: :streamed)
640
740
  return Kwsh::Result.new(output: "", exit_status: 0, streamed: true)
641
741
  end
642
742
  cancellation.cancel!
@@ -737,44 +837,56 @@ module Kward
737
837
  queued_inputs = []
738
838
  result = nil
739
839
  error = nil
740
- begin_local_busy_command(activity)
840
+ cancelled = false
841
+ origin_tab = active_tab
842
+ cancellation = Cancellation.new
843
+ begin_local_busy_command(activity, tab: origin_tab)
741
844
 
742
845
  worker = Thread.new do
743
- result = yield
846
+ Thread.current[:kward_local_busy_tab] = origin_tab
847
+ result = yield(cancellation)
744
848
  rescue StandardError => e
745
849
  error = e
850
+ ensure
851
+ Thread.current[:kward_local_busy_tab] = nil
746
852
  end
747
853
 
748
854
  while worker.alive?
749
855
  poll_result = collect_queued_input(queued_inputs)
856
+ if poll_result == PromptInterface::CANCEL_INPUT && !cancelled
857
+ cancelled = true
858
+ cancellation.cancel!
859
+ end
750
860
  handle_busy_local_tab_action(poll_result, activity: activity) if busy_local_tab_action?(poll_result)
751
861
  sleep 0.02
752
862
  end
753
863
  worker.join
754
864
  drain_queued_input(queued_inputs)
755
- raise error if error
865
+ flushed = flush_pending_runtime_outputs(origin_tab)
866
+ origin_tab.unread = true if origin_tab && !flushed && origin_tab.pending_runtime_outputs.any?
867
+ raise error if error && !error.is_a?(Cancellation::CancelledError)
756
868
 
757
869
  [result, queued_inputs]
758
870
  ensure
759
- finish_local_busy_command(activity)
871
+ finish_local_busy_command(activity, tab: origin_tab)
760
872
  end
761
873
 
762
874
  def run_busy_local_command_and_requeue(activity: "loading")
763
875
  return yield unless prompt_interface?
764
876
 
765
- result, queued_inputs = run_busy_local_command(activity: activity) { yield }
877
+ result, queued_inputs = run_busy_local_command(activity: activity) { |cancellation| yield(cancellation) }
766
878
  queued_inputs.reverse_each { |pending_input| @pending_inputs.unshift(pending_input) }
767
879
  result
768
880
  end
769
881
 
770
- def begin_local_busy_command(activity)
771
- active_tab.local_busy_activity = activity if active_tab
882
+ def begin_local_busy_command(activity, tab: active_tab)
883
+ tab.local_busy_activity = activity if tab
772
884
  @prompt.begin_busy_input("You>", activity: activity) if @prompt.respond_to?(:begin_busy_input)
773
885
  update_prompt_tabs if respond_to?(:update_prompt_tabs, true)
774
886
  end
775
887
 
776
- def finish_local_busy_command(activity)
777
- tab = local_busy_tab(activity)
888
+ def finish_local_busy_command(activity, tab: nil)
889
+ tab ||= local_busy_tab(activity)
778
890
  tab.local_busy_activity = nil if tab
779
891
  update_prompt_tabs if respond_to?(:update_prompt_tabs, true)
780
892
  @prompt.finish_busy_input if prompt_interface? && @prompt.respond_to?(:finish_busy_input) && (!active_tab || active_tab == tab)
@@ -392,13 +392,15 @@ module Kward
392
392
  end
393
393
 
394
394
  def reload_active_session(session_store)
395
+ workspace_root = current_workspace_root
396
+ worktree = worktree_binding_for(active_tab)
395
397
  @active_session, conversation = session_store.load(
396
398
  @active_session.path,
397
- workspace: configured_workspace(root: session_store.cwd),
399
+ workspace: configured_workspace(root: workspace_root, strict: worktree&.active? == true),
398
400
  provider: current_model_provider,
399
401
  model: current_model_id,
400
402
  reasoning_effort: current_reasoning_effort,
401
- project_skill_paths: project_skill_paths_for(session_store.cwd) || []
403
+ project_skill_paths: project_skill_paths_for(workspace_root) || []
402
404
  )
403
405
  reset_session_diff(@active_session.path)
404
406
  track_session(@active_session)
@@ -415,7 +417,7 @@ module Kward
415
417
  SessionTreeRenderer.new(roots: roots, current_leaf_id: current_leaf_id).items
416
418
  end
417
419
 
418
- def rename_session(argument, require_name: false)
420
+ def rename_session(argument, require_name: false, announce: true)
419
421
  unless @active_session
420
422
  runtime_output("No active persisted session.")
421
423
  return
@@ -430,8 +432,10 @@ module Kward
430
432
  old_name = @active_session.name
431
433
  @active_session.rename(name)
432
434
  run_lifecycle_hook("session_rename", conversation: new_conversation(workspace_root: current_workspace_root), session: @active_session, payload: { old_name: old_name, new_name: @active_session.name })
433
- label = @active_session.name ? "Named session: #{@active_session.name}" : "Cleared session name."
434
- runtime_output(label)
435
+ if announce
436
+ label = @active_session.name ? "Named session: #{@active_session.name}" : "Cleared session name."
437
+ runtime_output(label)
438
+ end
435
439
  end
436
440
 
437
441
  def clone_session(session_store, agent)