kward 0.83.0 → 0.85.0

data/lib/kward/cli/tool_summaries.rb

@@ -6,6 +6,20 @@ module Kward
     module ToolSummaries
       private
 
+      def tool_activity(tool_call)
+        "running #{tool_call_name(tool_call).tr("_", " ")}"
+      end
+
+      def tool_summary_with_duration(summary, elapsed_ms)
+        return summary.to_s unless elapsed_ms
+
+        lines = summary.to_s.lines
+        first = lines.shift.to_s.chomp
+        duration = elapsed_ms < 1_000 ? "#{elapsed_ms.round} ms" : format("%.1f s", elapsed_ms / 1_000.0)
+        first = "#{first} · #{duration}"
+        lines.empty? ? first : (["#{first}\n"] + lines).join
+      end
+
       def tool_result_summary(tool_call, content)
         name = tool_call_name(tool_call)
         args = tool_call_args(tool_call)

data/lib/kward/{cli_transcript_formatter.rb → cli/transcript_formatter.rb}

@@ -1,7 +1,7 @@
 require "base64"
-require_relative "image_attachments"
-require_relative "message_access"
-require_relative "message_text"
+require_relative "../image_attachments"
+require_relative "../message_access"
+require_relative "../message_text"
 
 # Namespace for the Kward CLI agent runtime.
 module Kward
@@ -15,10 +15,17 @@ module Kward
 
     def reasoning_blocks(message)
       response_blocks = response_items(message).flat_map do |item|
-        next [] unless MessageAccess.value(item, :type) == "reasoning"
-
-        summary = response_item_text_parts(MessageAccess.value(item, :summary))
-        summary.empty? ? response_item_text_parts(MessageAccess.value(item, :content)) : summary
+        case MessageAccess.value(item, :type)
+        when "reasoning"
+          summary = response_item_text_parts(MessageAccess.value(item, :summary))
+          summary.empty? ? response_item_text_parts(MessageAccess.value(item, :content)) : summary
+        when "message"
+          next [] unless MessageAccess.value(item, :phase).to_s == "commentary"
+
+          response_item_text_parts(MessageAccess.value(item, :content))
+        else
+          []
+        end
       end
       return response_blocks unless response_blocks.empty?
 

data/lib/kward/cli/worktrees.rb

@@ -101,10 +101,14 @@ module Kward
           remove_active_worktree
         when "merge"
           merge_active_worktree
+        when "merge resolve"
+          resolve_active_worktree_merge
+        when "merge continue"
+          continue_active_worktree_merge
         when "merge abort"
           abort_active_worktree_merge
         else
-          runtime_output("Usage: /tab worktree [activate|detach|status|merge|merge abort|remove]")
+          runtime_output("Usage: /tab worktree [activate|detach|status|merge [resolve|continue|abort]|remove]")
         end
       end
 
@@ -222,6 +226,11 @@ module Kward
           raise GitWorktreeManager::Error, "Worktree branch changed: expected #{binding.branch}, found #{info.branch || "detached HEAD"}" unless info.branch == binding.branch
           status = git_worktree_manager.status(binding.path)
           lines << "Changes: #{status.clean? ? "clean" : "#{status.entries.length} local change(s)"}"
+          if git_worktree_manager.merge_in_progress?(binding.origin_root)
+            conflicts = git_worktree_manager.merge_conflict_marker_paths(binding.origin_root, cached: false)
+            lines << "Merge: in progress in origin#{conflicts.empty? ? "; ready to continue" : "; #{conflicts.length} unresolved conflict(s)"}"
+            lines << "Conflicts: #{conflicts.join(", ")}" unless conflicts.empty?
+          end
         rescue GitWorktreeManager::Error => e
           lines << "State: unavailable (#{e.message})"
         end
@@ -236,6 +245,10 @@ module Kward
         return runtime_output("Activate the worktree before merging it.") unless binding.active?
 
         validate_worktree_binding!(binding)
+        if git_worktree_manager.merge_in_progress?(binding.origin_root)
+          return runtime_output("A merge is already in progress in #{binding.origin_root}. Resolve it with /worktree merge resolve, continue it with /worktree merge continue, or abort it with /worktree merge abort.")
+        end
+
         source_status = git_worktree_manager.status(binding.path)
         return runtime_output("Worktree has local changes; commit or clean it before merging.") if source_status.dirty?
 
@@ -270,12 +283,62 @@ module Kward
         if result.merged?
           runtime_output("Merged #{binding.branch} into #{target_branch}.")
         else
-          runtime_output("Merge conflicts in #{result.conflicts.join(", ")}. Resolve them in #{binding.origin_root} or run /tab worktree merge abort.")
+          runtime_output(<<~MESSAGE.strip)
+            Merge conflicts in #{result.conflicts.join(", ")}.
+            Merge paused in #{binding.origin_root}; this tab remains on #{binding.branch}.
+            Run /worktree merge resolve to let the agent inspect and fix the conflicts here, or /worktree merge abort to cancel.
+          MESSAGE
         end
       rescue GitWorktreeManager::Error => e
         runtime_output("Worktree error: #{e.message}")
       end
 
+      def resolve_active_worktree_merge
+        tab = active_tab
+        binding = worktree_binding_for(tab)
+        return runtime_output("Tab #{active_tab_number} has no worktree binding.") unless binding
+        return runtime_output("Tab #{active_tab_number} is running and cannot resolve its worktree merge yet.") if tab.running? || tab.local_busy? || tab.shell
+        return runtime_output("Activate the worktree before resolving its merge.") unless binding.active?
+        return runtime_output("No merge is in progress in the original workspace.") unless git_worktree_manager.merge_in_progress?(binding.origin_root)
+
+        validate_worktree_binding!(binding)
+        conflicts = git_worktree_manager.unmerged_paths(binding.origin_root)
+        return runtime_output("No unresolved conflicts remain in #{binding.origin_root}; run /worktree merge continue to finish the merge.") if conflicts.empty?
+
+        submit_tab_input(
+          tab,
+          <<~PROMPT.strip,
+            Resolve the in-progress Git merge in the verified origin workspace. Use target: "origin" for every workspace inspection, edit, and test operation. Read the applicable AGENTS.md files first, inspect the unmerged paths, resolve the conflicts, and run the relevant tests. Do not commit the merge; leave it ready for /worktree merge continue after all conflicts are resolved.
+
+            Unmerged paths: #{conflicts.join(", ")}
+          PROMPT
+          display_input: "Resolve merge conflicts in origin"
+        )
+      rescue GitWorktreeManager::Error => e
+        runtime_output("Worktree error: #{e.message}")
+      end
+
+      def continue_active_worktree_merge
+        tab = active_tab
+        binding = worktree_binding_for(tab)
+        return runtime_output("Tab #{active_tab_number} has no worktree binding.") unless binding
+        return runtime_output("Tab #{active_tab_number} is running and cannot continue its worktree merge yet.") if tab.running? || tab.local_busy? || tab.shell
+        return runtime_output("Activate the worktree before continuing its merge.") unless binding.active?
+        return runtime_output("No merge is in progress in the original workspace.") unless git_worktree_manager.merge_in_progress?(binding.origin_root)
+
+        validate_worktree_binding!(binding)
+        markers = git_worktree_manager.merge_conflict_marker_paths(binding.origin_root, cached: false)
+        return runtime_output("Merge still contains conflict markers: #{markers.join(", ")}.") unless markers.empty?
+        target_branch = git_worktree_manager.current_branch(binding.origin_root)
+        return runtime_output("Original workspace is in detached HEAD state; resolve that before continuing the merge.") if target_branch.empty?
+        return unless confirm_worktree_action("Complete the merge of #{binding.branch} into #{target_branch} in #{binding.origin_root}?")
+
+        git_worktree_manager.continue_merge(binding.origin_root)
+        runtime_output("Completed the merge of #{binding.branch} into #{target_branch}.")
+      rescue GitWorktreeManager::Error => e
+        runtime_output("Worktree error: #{e.message}")
+      end
+
       def abort_active_worktree_merge
         tab = active_tab
         binding = worktree_binding_for(tab)

data/lib/kward/cli.rb

@@ -3,26 +3,26 @@ require "json"
 require "thread"
 require "tty-prompt"
 require_relative "agent"
-require_relative "ansi"
+require_relative "terminal/ansi"
 require_relative "version"
 require_relative "model/client"
 require_relative "compactor"
 require_relative "config_files"
-require_relative "clipboard"
+require_relative "terminal/clipboard"
 require_relative "cancellation"
-require_relative "editor_prompt"
-require_relative "editor_prompt_session"
-require_relative "shell_prompt"
-require_relative "shell_prompt_session"
-require_relative "cli_transcript_formatter"
+require_relative "cli/editor_prompt"
+require_relative "cli/editor_prompt_session"
+require_relative "shell/prompt"
+require_relative "shell/prompt_session"
+require_relative "cli/transcript_formatter"
 require_relative "model/context_usage"
 require_relative "events"
-require_relative "export_path"
-require_relative "ekwsh"
-require_relative "persistent_shell_session"
-require_relative "interactive_pty_runner"
-require_relative "adaptive_pty_output_sink"
-require_relative "pty_transcript_normalizer"
+require_relative "transcripts/export_path"
+require_relative "shell/kwsh"
+require_relative "shell/persistent_session"
+require_relative "pty/interactive_runner"
+require_relative "pty/adaptive_output_sink"
+require_relative "pty/transcript_normalizer"
 require_relative "auth/anthropic_oauth"
 require_relative "auth/api_key_store"
 require_relative "auth/github_oauth"
@@ -30,7 +30,7 @@ require_relative "auth/openrouter_api_key"
 require_relative "image_attachments"
 require_relative "memory/manager"
 require_relative "memory/turn_context"
-require_relative "transcript_export"
+require_relative "transcripts/transcript_export"
 require_relative "message_access"
 require_relative "model/model_info"
 require_relative "model/azure_openai_config"
@@ -38,18 +38,18 @@ require_relative "model/provider_catalog"
 require_relative "model/catalog"
 require_relative "auth/openai_oauth"
 require_relative "pan/server"
-require_relative "plugin_registry"
+require_relative "plugins/registry"
 require_relative "prompts/commands"
 require_relative "model/retry_message"
 require_relative "rpc/server"
 require_relative "transport/runtime"
-require_relative "session_diff"
-require_relative "session_store"
-require_relative "session_naming"
-require_relative "tab_store"
-require_relative "tab_driver"
-require_relative "session_trash"
-require_relative "session_tree_renderer"
+require_relative "sessions/diff"
+require_relative "sessions/store"
+require_relative "sessions/naming"
+require_relative "tabs/store"
+require_relative "tabs/driver"
+require_relative "sessions/trash"
+require_relative "sessions/tree_renderer"
 require_relative "skills/capture"
 require_relative "starter_pack_installer"
 require_relative "steering"
@@ -57,8 +57,8 @@ require_relative "update_check"
 require_relative "tools/tool_call"
 require_relative "tools/registry"
 require_relative "telemetry/stats"
-require_relative "workspace_factory"
-require_relative "git_worktree_manager"
+require_relative "workspace/factory"
+require_relative "workspace/git_worktree_manager"
 require_relative "cli/commands"
 require_relative "cli/auth_commands"
 require_relative "cli/doctor"
@@ -92,7 +92,7 @@ module Kward
     RESTORED_TOOL_OUTPUT_LIMIT = 2_000
     INTERACTIVE_TOOL_OUTPUT_LINE_LIMIT = 10
     STREAM_RENDER_INTERVAL = 0.025
-    INTERACTIVE_EVENT_DRAIN_LIMIT = 100
+    INTERACTIVE_EVENT_DRAIN_LIMIT = 12
     BUILTIN_SLASH_COMMANDS = PromptCommands::BUILTIN_COMMANDS
     BUILTIN_SLASH_COMMAND_NAMES = PromptCommands::BUILTIN_RESERVED_COMMAND_NAMES
 
@@ -156,7 +156,18 @@ module Kward
       warn e.message
       warn "Run `kward help` for available commands."
       exit 1
+    rescue Client::AuthenticationError => e
+      raise if debug_errors?
+
+      warn authentication_error_message(e)
+      exit 1
+    rescue StandardError => e
+      raise if debug_errors?
+
+      warn runtime_error_message(e)
+      exit 1
     ensure
+      shutdown_plugins if respond_to?(:shutdown_plugins, true)
       ConfigFiles.skip_config = false
     end
 
@@ -184,6 +195,30 @@ module Kward
       MESSAGE
     end
 
+    def authentication_error_message(error)
+      <<~MESSAGE.rstrip
+        Authentication required
+
+        #{error.message}
+
+        Run `kward doctor` to inspect your setup.
+      MESSAGE
+    end
+
+    def runtime_error_message(error)
+      <<~MESSAGE.rstrip
+        Kward could not complete the request.
+
+        #{error.message}
+
+        Set KWARD_DEBUG=1 to show a backtrace.
+      MESSAGE
+    end
+
+    def debug_errors?
+      ENV["KWARD_DEBUG"] == "1"
+    end
+
     def dispatch
       if @prompt_delimited
         ConfigFiles.ensure_default_config!
@@ -229,7 +264,7 @@ module Kward
         raise ArgumentError, command_usage("doctor") unless @argv.length == 1
 
         ensure_client!
-        print_doctor
+        exit 1 unless print_doctor
         return
       end
 
@@ -239,7 +274,7 @@ module Kward
           return
         end
 
-        handle_hooks_command((@argv[1..] || []).join(" "))
+        handle_hooks_command((@argv[1..] || []).join(" "), command_line: true)
         return
       end
 
@@ -390,6 +425,7 @@ module Kward
         tool_registry: ToolRegistry.new(
           workspace: configured_workspace,
           prompt: @prompt,
+          plugin_tools: plugin_registry.tools,
           hook_manager: hook_manager,
           hook_context: hook_context
         ),
@@ -478,8 +514,9 @@ module Kward
       install_bang_completion_provider(agent)
 
       loop do
-        if @pending_inputs.empty? && active_tab&.shell
-          run_ekwsh_loop(active_tab.shell, tab: active_tab, history: build_ekwsh_history(active_tab.agent))
+        service_background_tab_runs if respond_to?(:service_background_tab_runs, true)
+        if @pending_inputs.empty? && active_tab&.shell && !active_tab.local_busy?
+          run_kwsh_loop(active_tab.shell, tab: active_tab, history: build_kwsh_history(active_tab.agent))
         end
         input = @pending_inputs.shift || (active_tab ? poll_active_tab_input : @prompt.ask("You>"))
         if input.is_a?(Hash) && input[:editor_prompt]
@@ -537,7 +574,10 @@ module Kward
           end
         end
         next if handled
-        next if shell_command_input?(command_input) && handle_interactive_shell_command(command_input, agent)
+        if shell_command_input?(command_input)
+          shell_result = handle_interactive_shell_command(command_input, agent)
+          next if shell_result == true || shell_result == :tab_action
+        end
 
         flush_pending_reasoning_config(conversation: active_tab.agent.conversation) if active_tab&.agent
         flush_pending_reasoning_config(conversation: agent.conversation) unless active_tab

data/lib/kward/compactor.rb

@@ -1,5 +1,6 @@
 require "json"
 require_relative "model/chat_invocation"
+require_relative "cancellation"
 require_relative "compaction/file_operation_tracker"
 require_relative "compaction/token_estimator"
 require_relative "config_files"
@@ -671,29 +672,33 @@ module Kward
         @prompt_builder = prompt_builder
       end
 
-      def summarize(preparation, custom_instructions: nil)
+      def summarize(preparation, custom_instructions: nil, cancellation: nil)
         summary = chat(
           @prompt_builder.build(preparation, custom_instructions: custom_instructions),
-          max_tokens: @prompt_builder.normal_summary_max_tokens(preparation.settings, model_max_tokens: model_max_tokens)
+          max_tokens: @prompt_builder.normal_summary_max_tokens(preparation.settings, model_max_tokens: model_max_tokens),
+          cancellation: cancellation
         )
         if preparation.split_turn && !preparation.turn_prefix_messages.empty?
           turn_summary = chat(
             @prompt_builder.build_split(preparation),
-            max_tokens: @prompt_builder.split_turn_max_tokens(preparation.settings, model_max_tokens: model_max_tokens)
+            max_tokens: @prompt_builder.split_turn_max_tokens(preparation.settings, model_max_tokens: model_max_tokens),
+            cancellation: cancellation
           )
           summary = "#{summary}\n\n---\n\n**Turn Context (split turn):**\n\n#{turn_summary}"
         end
         summary.to_s.strip
       rescue Cancelled
         raise
+      rescue Kward::Cancellation::CancelledError
+        raise
       rescue StandardError => e
         raise SummarizationFailed, e.message
       end
 
       private
 
-      def chat(messages, max_tokens: nil)
-        message = ChatInvocation.call(@client, messages, { tools: [], max_tokens: max_tokens })
+      def chat(messages, max_tokens: nil, cancellation: nil)
+        message = ChatInvocation.call(@client, messages, { tools: [], max_tokens: max_tokens, cancellation: cancellation })
         content = message_content(message)
         text = message_content_text(content).strip
         raise SummarizationFailed, "Compaction produced an empty summary; context was not changed." if text.empty?
@@ -752,13 +757,19 @@ module Kward
       false
     end
 
-    def compact(custom_instructions: nil, compaction_summary: true)
+    def compact(custom_instructions: nil, compaction_summary: true, cancellation: nil)
+      cancellation&.raise_if_cancelled!
       old_count = @conversation.messages.length
       preparation = prepare
-      summary = @summarizer.summarize(preparation, custom_instructions: custom_instructions)
+      summary = if cancellation
+        @summarizer.summarize(preparation, custom_instructions: custom_instructions, cancellation: cancellation)
+      else
+        @summarizer.summarize(preparation, custom_instructions: custom_instructions)
+      end
       summary = append_files_section(summary, preparation.file_ops)
       raise Compaction::SummarizationFailed, "Compaction produced an empty summary; context was not changed." if summary.strip.empty?
 
+      cancellation&.raise_if_cancelled!
       @conversation.compact!(
         summary,
         compaction_summary: compaction_summary,