kward 0.78.0 → 0.80.0

data/lib/kward/conversation.rb

@@ -58,35 +58,37 @@ module Kward
     # @return [PluginRegistry, nil] registry used to collect plugin prompt context
     attr_accessor :plugin_registry
     # @return [String, nil] plugin prompt context used in the current system prompt
-    attr_reader :last_plugin_prompt_context
+    attr_reader :last_plugin_prompt_context, :execution_profile_context
     # @return [Hash] original large tool outputs retained outside model context
     attr_reader :tool_output_artifacts
     # @return [ContextBudgetMeter] runtime context savings for this conversation
     attr_reader :context_budget_meter
 
-    def initialize(system_message: DEFAULT_SYSTEM_MESSAGE, messages: [], read_paths: [], on_append: nil, on_compact: nil, on_tool_execution: nil, on_runtime_update: nil, workspace_root: Dir.pwd, compaction_system_message: DEFAULT_SYSTEM_MESSAGE, provider: nil, model: nil, reasoning_effort: nil, memory_context: nil, session_memories: [], last_memory_retrieval: nil, plugin_registry: nil)
+    def initialize(system_message: DEFAULT_SYSTEM_MESSAGE, messages: [], read_paths: [], on_append: nil, on_compact: nil, on_tool_execution: nil, on_runtime_update: nil, workspace_root: Dir.pwd, compaction_system_message: DEFAULT_SYSTEM_MESSAGE, provider: nil, model: nil, reasoning_effort: nil, memory_context: nil, session_memories: [], last_memory_retrieval: nil, plugin_registry: nil, execution_profile_context: nil)
       @workspace_root = ConfigFiles.canonical_workspace_root(workspace_root)
       @provider = provider
       @model = model
       @reasoning_effort = reasoning_effort
       @plugin_registry = plugin_registry
+      @execution_profile_context = execution_profile_context.to_s.empty? ? nil : execution_profile_context.to_s.freeze
       @messages = []
       restored_system_message, transcript_messages = split_system_message(messages)
       if system_message.equal?(DEFAULT_SYSTEM_MESSAGE)
-        if restored_system_message
+        if restored_system_message && @execution_profile_context.to_s.empty?
           system_message = restored_system_message
         else
           @last_plugin_prompt_context = plugin_prompt_context
-          system_message = Prompts.system_message(workspace_root: @workspace_root, model: @model, reasoning_effort: @reasoning_effort, now: prompt_time, memory_context: memory_context, plugin_context: @last_plugin_prompt_context)
+          system_message = Prompts.system_message(workspace_root: @workspace_root, model: @model, reasoning_effort: @reasoning_effort, now: prompt_time, memory_context: memory_context, plugin_context: @last_plugin_prompt_context, execution_profile_context: @execution_profile_context)
         end
       end
       @system_message = system_message
       @system_message_enabled = !@system_message.nil?
       if compaction_system_message.equal?(DEFAULT_SYSTEM_MESSAGE)
-        compaction_system_message = @system_message_enabled ? Prompts.system_message(workspace_root: @workspace_root, include_workspace_personality: false, model: @model, reasoning_effort: @reasoning_effort, now: prompt_time) : nil
+        compaction_system_message = @system_message_enabled ? Prompts.system_message(workspace_root: @workspace_root, include_workspace_personality: false, model: @model, reasoning_effort: @reasoning_effort, now: prompt_time, execution_profile_context: @execution_profile_context) : nil
       end
       @compaction_system_message = compaction_system_message
       @workspace_agents_mtime = workspace_agents_mtime
+      @system_prompt_sources_fingerprint = ConfigFiles.system_prompt_sources_fingerprint
       @last_entry_compaction = false
       @memory_context = memory_context
       @session_memories = Array(session_memories)
@@ -186,14 +188,20 @@ module Kward
       return nil unless @system_message_enabled
 
       @last_plugin_prompt_context = plugin_prompt_context
-      replacement = Prompts.system_message(workspace_root: @workspace_root, model: @model, reasoning_effort: @reasoning_effort, now: prompt_time, memory_context: @memory_context, plugin_context: @last_plugin_prompt_context)
+      replacement = Prompts.system_message(workspace_root: @workspace_root, model: @model, reasoning_effort: @reasoning_effort, now: prompt_time, memory_context: @memory_context, plugin_context: @last_plugin_prompt_context, execution_profile_context: @execution_profile_context)
       @system_message = replacement
       @on_system_message_change&.call(replacement)
-      @compaction_system_message = Prompts.system_message(workspace_root: @workspace_root, include_workspace_personality: false, model: @model, reasoning_effort: @reasoning_effort, now: prompt_time)
+      @compaction_system_message = Prompts.system_message(workspace_root: @workspace_root, include_workspace_personality: false, model: @model, reasoning_effort: @reasoning_effort, now: prompt_time, execution_profile_context: @execution_profile_context)
       @workspace_agents_mtime = workspace_agents_mtime
+      @system_prompt_sources_fingerprint = ConfigFiles.system_prompt_sources_fingerprint
       replacement
     end
 
+    def update_execution_profile_context!(context)
+      @execution_profile_context = context.to_s.empty? ? nil : context.to_s.freeze
+      refresh_system_message!
+    end
+
     def update_runtime_context!(provider: nil, model:, reasoning_effort:, refresh: true)
       @provider = provider unless provider.to_s.empty?
       @model = model
@@ -206,7 +214,18 @@ module Kward
     end
 
     def refresh_system_message_if_workspace_agents_changed!
-      refresh_system_message! if @system_message_enabled && workspace_agents_mtime != @workspace_agents_mtime
+      refresh_system_message_if_sources_changed!
+    end
+
+    # Refreshes runtime prompt state after workspace or config-owned prompt
+    # sources change. Keep the older public method above as a compatibility
+    # alias for existing callers.
+    def refresh_system_message_if_sources_changed!
+      return unless @system_message_enabled
+
+      changed = workspace_agents_mtime != @workspace_agents_mtime ||
+        ConfigFiles.system_prompt_sources_fingerprint != @system_prompt_sources_fingerprint
+      refresh_system_message! if changed
     end
 
     def mark_read(path)

data/lib/kward/git_worktree_manager.rb

@@ -0,0 +1,291 @@
+require "fileutils"
+require "open3"
+require "pathname"
+
+require_relative "path_guard"
+
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  # Durable association between a session tab and a linked Git worktree.
+  class GitWorktreeBinding
+    FIELDS = %i[repository_root origin_root path branch base_revision active owned].freeze
+
+    attr_accessor :repository_root, :origin_root, :path, :branch, :base_revision, :active, :owned
+
+    def initialize(repository_root:, origin_root:, path:, branch:, base_revision:, active: true, owned: true)
+      @repository_root = repository_root.to_s
+      @origin_root = origin_root.to_s
+      @path = path.to_s
+      @branch = branch.to_s
+      @base_revision = base_revision.to_s
+      @active = active != false
+      @owned = owned != false
+    end
+
+    def active?
+      active == true
+    end
+
+    def descriptor
+      {
+        "repository_root" => repository_root,
+        "origin_root" => origin_root,
+        "path" => path,
+        "branch" => branch,
+        "base_revision" => base_revision,
+        "active" => active?,
+        "owned" => owned != false
+      }
+    end
+
+    def self.from_descriptor(value)
+      data = value.respond_to?(:transform_keys) ? value.transform_keys(&:to_s) : {}
+      required = %w[repository_root origin_root path branch base_revision]
+      return nil unless required.all? { |key| !data[key].to_s.empty? }
+
+      new(
+        repository_root: data["repository_root"],
+        origin_root: data["origin_root"],
+        path: data["path"],
+        branch: data["branch"],
+        base_revision: data["base_revision"],
+        active: data.fetch("active", true),
+        owned: data.fetch("owned", true)
+      )
+    end
+  end
+
+  # Performs safe, structured operations on linked Git worktrees.
+  class GitWorktreeManager
+    class Error < StandardError; end
+
+    WorktreeInfo = Struct.new(
+      :path,
+      :head,
+      :branch,
+      :detached,
+      :locked,
+      :prunable,
+      keyword_init: true
+    )
+
+    GitStatus = Struct.new(:entries, keyword_init: true) do
+      def clean?
+        entries.empty?
+      end
+
+      def dirty?
+        !clean?
+      end
+    end
+
+    MergeResult = Struct.new(:status, :output, :conflicts, keyword_init: true) do
+      def merged?
+        status == :merged
+      end
+
+      def conflicted?
+        status == :conflicted
+      end
+    end
+
+    def repository_root(path)
+      output = run_git(path, "rev-parse", "--show-toplevel")
+      canonical_existing_path(output.strip)
+    rescue Error
+      raise Error, "Not a Git repository: #{path}"
+    end
+
+    def status(path)
+      output = run_git(path, "status", "--porcelain=v1", "--untracked-files=all")
+      GitStatus.new(entries: output.lines(chomp: true))
+    end
+
+    def current_revision(path)
+      run_git(path, "rev-parse", "HEAD").strip
+    end
+
+    def current_branch(path)
+      run_git(path, "branch", "--show-current").strip
+    end
+
+    def merge(repository_root:, target_path:, source_branch:)
+      repository_root = canonical_existing_path(repository_root)
+      target_path = canonical_existing_path(target_path)
+      source_branch = source_branch.to_s.strip
+      validate_merge!(repository_root, target_path, source_branch)
+
+      output, status = capture_git(target_path, "merge", "--no-edit", source_branch)
+      return MergeResult.new(status: :merged, output: output, conflicts: []) if status.success?
+
+      conflicts = unmerged_paths(target_path)
+      return MergeResult.new(status: :conflicted, output: output, conflicts: conflicts) if merge_in_progress?(target_path)
+
+      raise Error, git_error("merge", output)
+    end
+
+    def merge_in_progress?(path)
+      _output, status = capture_git(path, "rev-parse", "-q", "--verify", "MERGE_HEAD")
+      status.success?
+    end
+
+    def unmerged_paths(path)
+      run_git(path, "diff", "--name-only", "--diff-filter=U").lines(chomp: true)
+    end
+
+    def abort_merge(path)
+      raise Error, "No merge is in progress." unless merge_in_progress?(path)
+
+      run_git(path, "merge", "--abort")
+      true
+    end
+
+    def create(repository_root:, origin_root:, path:, branch:, base: "HEAD")
+      repository_root = canonical_existing_path(repository_root)
+      origin_root = canonical_existing_path(origin_root)
+      path = planned_path(path)
+      branch = branch.to_s.strip
+      base = base.to_s.strip
+      validate_creation!(repository_root, origin_root, path, branch, base)
+
+      run_git(repository_root, "worktree", "add", "-b", branch, path, base)
+      GitWorktreeBinding.new(
+        repository_root: repository_root,
+        origin_root: origin_root,
+        path: path,
+        branch: branch,
+        base_revision: revision_for(repository_root, base),
+        active: true,
+        owned: true
+      )
+    end
+
+    def inspect(repository_root:, path:)
+      repository_root = canonical_existing_path(repository_root)
+      expected_path = planned_path(path)
+      worktree = list(repository_root).find { |entry| same_path?(entry.path, expected_path) }
+      raise Error, "Git worktree is not registered: #{expected_path}" unless worktree
+
+      worktree
+    end
+
+    def list(repository_root)
+      output = run_git(repository_root, "worktree", "list", "--porcelain")
+      parse_worktree_list(output)
+    end
+
+    def remove(repository_root:, path:, force: false)
+      repository_root = canonical_existing_path(repository_root)
+      expected_path = planned_path(path)
+      inspect(repository_root: repository_root, path: expected_path)
+      arguments = ["worktree", "remove"]
+      arguments << "--force" if force
+      arguments << expected_path
+      run_git(repository_root, *arguments)
+      true
+    end
+
+    private
+
+    def validate_merge!(repository_root, target_path, source_branch)
+      raise Error, "Merge target must be inside the repository: #{target_path}" unless PathGuard.inside?(target_path, repository_root)
+      raise Error, "Source branch is required" if source_branch.empty?
+      raise Error, "Invalid source branch: #{source_branch}" unless git_succeeds?(repository_root, "check-ref-format", "--branch", source_branch)
+      raise Error, "Source branch does not exist: #{source_branch}" unless valid_revision?(repository_root, source_branch)
+      raise Error, "A merge is already in progress: #{target_path}" if merge_in_progress?(target_path)
+    end
+
+    def validate_creation!(repository_root, origin_root, path, branch, base)
+      raise Error, "Worktree path must be outside the repository: #{path}" if PathGuard.inside?(path, repository_root)
+      raise Error, "Worktree origin must be inside the repository: #{origin_root}" unless PathGuard.inside?(origin_root, repository_root)
+      raise Error, "Branch name is required" if branch.empty?
+      raise Error, "Base revision is required" if base.empty?
+      raise Error, "Invalid branch name: #{branch}" unless git_succeeds?(repository_root, "check-ref-format", "--branch", branch)
+      raise Error, "Invalid base revision: #{base}" unless valid_revision?(repository_root, base)
+      raise Error, "Worktree path is a file: #{path}" if File.file?(path)
+      raise Error, "Worktree path is not empty: #{path}" if File.directory?(path) && !Dir.empty?(path)
+      raise Error, "Worktree path is already registered: #{path}" if list(repository_root).any? { |entry| same_path?(entry.path, path) }
+
+      FileUtils.mkdir_p(File.dirname(path))
+    end
+
+    def valid_revision?(repository_root, revision)
+      return false if revision.start_with?("-") || revision.match?(/\s/)
+
+      git_succeeds?(repository_root, "rev-parse", "--verify", "#{revision}^{commit}")
+    end
+
+    def revision_for(repository_root, revision)
+      run_git(repository_root, "rev-parse", "--verify", "#{revision}^{commit}").strip
+    end
+
+    def parse_worktree_list(output)
+      output.split(/\n\n+/).filter_map do |block|
+        fields = block.lines(chomp: true).each_with_object({}) do |line, values|
+          key, value = line.split(" ", 2)
+          values[key] = value.to_s unless key.nil? || key.empty?
+        end
+        path = fields["worktree"]
+        next if path.to_s.empty?
+
+        branch = fields["branch"].to_s.delete_prefix("refs/heads/")
+        WorktreeInfo.new(
+          path: path,
+          head: fields["HEAD"].to_s,
+          branch: branch.empty? ? nil : branch,
+          detached: fields.key?("detached"),
+          locked: fields.key?("locked"),
+          prunable: fields.key?("prunable")
+        )
+      end
+    end
+
+    def run_git(root, *arguments)
+      output, status = capture_git(root, *arguments)
+      return output if status.success?
+
+      raise Error, git_error(arguments.join(" "), output)
+    end
+
+    def capture_git(root, *arguments)
+      Open3.capture2e("git", "-C", root.to_s, *arguments)
+    rescue Errno::ENOENT => e
+      raise Error, e.message
+    end
+
+    def git_error(command, output)
+      message = output.to_s.strip
+      message = "git #{command} failed" if message.empty?
+      message
+    end
+
+    def git_succeeds?(root, *arguments)
+      _output, status = Open3.capture2e("git", "-C", root.to_s, *arguments)
+      status.success?
+    rescue Errno::ENOENT
+      false
+    end
+
+    def canonical_existing_path(path)
+      File.realpath(path.to_s)
+    rescue Errno::ENOENT, Errno::ENOTDIR
+      raise Error, "Path does not exist: #{path}"
+    end
+
+    def planned_path(path)
+      expanded = Pathname.new(path.to_s).expand_path
+      return File.realpath(expanded.to_s) if File.exist?(expanded.to_s)
+
+      ancestor = expanded
+      ancestor = ancestor.parent until File.exist?(ancestor.to_s) || ancestor == ancestor.parent
+      canonical_ancestor = Pathname.new(File.realpath(ancestor.to_s))
+      canonical_ancestor.join(expanded.relative_path_from(ancestor)).to_s
+    rescue ArgumentError, Errno::ENOENT, Errno::ENOTDIR
+      raise Error, "Invalid worktree path: #{path}"
+    end
+
+    def same_path?(left, right)
+      planned_path(left) == planned_path(right)
+    end
+  end
+end

data/lib/kward/local_command_runner.rb

@@ -18,7 +18,7 @@ module Kward
       @terminate_on_output_limit = terminate_on_output_limit
     end
 
-    def run(*command, env: {}, cwd: Dir.pwd, cancellation: nil, &block)
+    def run(*command, env: {}, cwd: Dir.pwd, cancellation: nil, unsetenv_others: false, &block)
       cancellation&.raise_if_cancelled!
       stdout_buffer = +""
       stderr_buffer = +""
@@ -27,7 +27,7 @@ module Kward
       timed_out = false
       queue = Queue.new
 
-      Open3.popen3(env.to_h, *command, chdir: cwd.to_s, pgroup: true) do |stdin, stdout, stderr, wait_thread|
+      Open3.popen3(env.to_h, *command, chdir: cwd.to_s, pgroup: true, unsetenv_others: unsetenv_others) do |stdin, stdout, stderr, wait_thread|
         stdin.close
         readers = [
           read_stream(stdout, :stdout, queue),

data/lib/kward/model/azure_openai_config.rb

@@ -0,0 +1,54 @@
+require "uri"
+
+# Namespace for Kward model-provider support.
+module Kward
+  # Validated Azure OpenAI endpoint and deployment settings.
+  class AzureOpenAIConfig
+    DEPLOYMENT_PATTERN = /\A[a-zA-Z0-9._-]+\z/
+    API_VERSION_PATTERN = /\A[a-zA-Z0-9._-]+\z/
+
+    def initialize(endpoint:, deployment:, api_version:)
+      @endpoint = normalize_endpoint(endpoint)
+      @deployment = validate_value(deployment, "deployment name", DEPLOYMENT_PATTERN)
+      @api_version = validate_value(api_version, "API version", API_VERSION_PATTERN)
+    end
+
+    attr_reader :endpoint, :deployment, :api_version
+
+    def chat_completions_url
+      URI("#{endpoint}/openai/deployments/#{deployment}/chat/completions?api-version=#{api_version}")
+    end
+
+    def to_config
+      {
+        "azure_openai_endpoint" => endpoint,
+        "azure_openai_model" => deployment,
+        "azure_openai_api_version" => api_version
+      }
+    end
+
+    private
+
+    def normalize_endpoint(value)
+      text = value.to_s.strip
+      raise ArgumentError, "Azure OpenAI endpoint must be a non-empty HTTPS URL" if text.empty?
+
+      uri = URI.parse(text)
+      unless uri.is_a?(URI::HTTPS) && !uri.host.to_s.empty? && uri.user.nil? && uri.password.nil? && uri.query.nil? && uri.fragment.nil?
+        raise ArgumentError, "Azure OpenAI endpoint must be an HTTPS URL without credentials, query, or fragment"
+      end
+
+      uri.to_s.sub(%r{/+\z}, "")
+    rescue URI::InvalidURIError
+      raise ArgumentError, "Azure OpenAI endpoint must be a valid HTTPS URL"
+    end
+
+    def validate_value(value, label, pattern)
+      text = value.to_s.strip
+      raise ArgumentError, "Azure OpenAI #{label} must be a non-empty string" if text.empty?
+      raise ArgumentError, "Azure OpenAI #{label} contains invalid characters" unless text.match?(pattern)
+
+      text
+    end
+  end
+end

data/lib/kward/model/catalog.rb

@@ -0,0 +1,113 @@
+require "json"
+require "net/http"
+require "time"
+require "uri"
+require_relative "../config_files"
+require_relative "../http"
+require_relative "../private_file"
+require_relative "provider_catalog"
+
+# Namespace for Kward model catalogs.
+module Kward
+  # Fetches, normalizes, and caches provider model lists without storing secrets.
+  class ModelCatalog
+    VERSION = 1
+    attr_reader :path
+
+    def initialize(provider_id:, api_key:, path: nil, requester: nil)
+      @provider = ProviderCatalog.fetch(provider_id)
+      @api_key = api_key.to_s
+      @path = File.expand_path(path || ConfigFiles.model_catalog_cache_path(@provider.id))
+      @requester = requester
+    end
+
+    def refresh
+      raise "No #{@provider.name} API key found" if @api_key.empty?
+      raise "#{@provider.name} does not support automatic model discovery" unless runtime.automatic_model_discovery?
+
+      data = cache_data(normalize(response_body))
+      PrivateFile.write_json(path, data)
+      data.fetch("models")
+    end
+
+    def models
+      Array(read&.fetch("models", []))
+    end
+
+    def read
+      return nil unless File.exist?(path)
+
+      data = JSON.parse(File.read(path))
+      return nil unless data.is_a?(Hash) && data["version"] == VERSION && data["provider"] == @provider.id
+
+      data
+    rescue JSON::ParserError
+      nil
+    end
+
+    private
+
+    def response_body
+      return @requester.call(url, headers) if @requester
+
+      response = Net::HTTP.start(url.hostname, url.port, use_ssl: true) do |http|
+        http.request(Http.apply_user_agent(Net::HTTP::Get.new(url)).tap do |request|
+          headers.each { |name, value| request[name] = value }
+        end)
+      end
+      raise "#{@provider.name} model refresh failed: #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+
+      response.body
+    end
+
+    def url
+      base = runtime.model_list_url
+      return URI("#{base}?key=#{URI.encode_www_form_component(@api_key)}") if @provider.id == "gemini"
+
+      URI(base)
+    end
+
+    def runtime
+      ProviderCatalog.runtime(@provider.id)
+    end
+
+    def headers
+      return { "x-api-key" => @api_key, "anthropic-version" => "2023-06-01" } if @provider.id == "anthropic"
+      return {} if @provider.id == "gemini"
+
+      { "Authorization" => "Bearer #{@api_key}", "Accept" => "application/json" }
+    end
+
+    def normalize(body)
+      payload = JSON.parse(body.to_s)
+      entries = payload["data"] || payload["models"] || []
+      Array(entries).filter_map { |entry| normalize_entry(entry) }.sort_by { |entry| entry["id"] }
+    rescue JSON::ParserError
+      raise "#{@provider.name} model refresh returned invalid JSON"
+    end
+
+    def normalize_entry(entry)
+      return unless entry.is_a?(Hash)
+
+      id = (entry["id"] || entry["name"]).to_s.delete_prefix("models/")
+      return if id.empty?
+
+      {
+        "provider" => @provider.id,
+        "id" => id,
+        "name" => entry["display_name"] || entry["displayName"] || entry["name"] || id,
+        "contextWindow" => entry["context_window"] || entry["context_length"] || entry["inputTokenLimit"],
+        "supportedParameters" => Array(entry["supported_parameters"] || entry["supportedGenerationMethods"])
+      }.compact
+    end
+
+    def cache_data(models)
+      {
+        "version" => VERSION,
+        "provider" => @provider.id,
+        "refreshed_at" => Time.now.utc.iso8601,
+        "models" => models
+      }
+    end
+  end
+end