openclacky 1.5.13 → 1.5.15

data/lib/clacky/extension/api_extension.rb

@@ -17,7 +17,7 @@ module Clacky
   #
   #   class MyDashboardExt < Clacky::ApiExtension
   #     get "/summary" do
-  #       json(sessions: session_manager.list.size)
+  #       json(sessions: session_manager.all_sessions.size)
   #     end
   #   end
   #
@@ -272,9 +272,10 @@ module Clacky
     # controls the user-facing bubble shown in place of the raw prompt.
     # When `project_id` is given, the project's working_dir is inherited
     # (unless an explicit working_dir overrides it) and the session is
-    # associated with the project.
+    # associated with the project. `model_id` selects a configured model by
+    # its stable id; omitting it keeps the current default model.
     def create_session(name: nil, prompt: nil, working_dir: nil, profile: "general",
-                       source: :manual, display_message: nil, project_id: nil)
+                       source: :manual, display_message: nil, project_id: nil, model_id: nil)
       error!("server not ready", status: 503) unless @http_server
 
       src = source.to_s
@@ -290,6 +291,14 @@ module Clacky
       project = project_id ? project_manager&.find(project_id) : nil
       error!("Project not found", status: 404) if project_id && project.nil?
 
+      if model_id
+        model_id = model_id.to_s.strip
+        model_id = nil if model_id.empty?
+      end
+      if model_id && !agent_config.models.any? { |model| model["id"] == model_id }
+        error!("Model not found in configuration", status: 400)
+      end
+
       working_dir = File.expand_path(project[:working_dir]) if working_dir.nil? && project && project[:working_dir].to_s.strip != ""
 
       session_id = @http_server.send(
@@ -297,7 +306,8 @@ module Clacky
         name: name,
         working_dir: working_dir,
         profile: profile,
-        source: source
+        source: source,
+        model_id: model_id
       )
 
       if project_id
@@ -309,9 +319,11 @@ module Clacky
         end
       end
 
-      submit_task(session_id, prompt, display_message: display_message) if prompt && !prompt.strip.empty?
+      # Announce creation only after identity/placement metadata is persisted,
+      # and before submit_task can emit ordinary running-state updates.
+      @http_server.send(:broadcast_session_update, session_id, created: true)
 
-      @http_server.send(:broadcast_session_update, session_id)
+      submit_task(session_id, prompt, display_message: display_message) if prompt && !prompt.strip.empty?
 
       session_id
     end

data/lib/clacky/extension/verifier.rb

@@ -22,7 +22,7 @@ module Clacky
     PANEL_KEYS   = %w[id title title_zh description description_zh view order attach entry_points].freeze
     API_KEYS     = %w[id handler].freeze
     SKILL_KEYS   = %w[id dir protected].freeze
-    AGENT_KEYS   = %w[id title title_zh description description_zh order prompt panels skills avatar hidden tools].freeze
+    AGENT_KEYS   = %w[id title title_zh description description_zh order prompt panels skills disabled_skills avatar hidden tools].freeze
     CHANNEL_KEYS = %w[id platform adapter].freeze
     PATCH_KEYS   = %w[target file fingerprint on_mismatch].freeze
     HOOK_KEYS    = %w[event file].freeze

data/lib/clacky/json_ui_controller.rb

@@ -41,8 +41,10 @@ module Clacky
       emit("tool_call", name: name, args: args_data)
     end
 
-    def show_tool_result(result)
-      emit("tool_result", result: result)
+    def show_tool_result(result, ui: nil)
+      data = { result: result }
+      data[:ui] = ui if ui
+      emit("tool_result", **data)
     end
 
     def show_tool_error(error)

data/lib/clacky/media/openai_compat.rb

@@ -308,38 +308,69 @@ module Clacky
         end
 
         ext = mime_type.split(";").first.split("/").last.then { |e| e == "mpeg" ? "mp3" : e }
-        filename = "chunk.#{ext}"
-        audio_data = Base64.decode64(audio_base64)
-        boundary = "----FormBoundary#{SecureRandom.hex(8)}"
-        # A multipart body is a byte stream: build it in binary so UTF-8 text
-        # parts (e.g. a non-ASCII vocabulary prompt) don't clash with the
-        # ASCII-8BIT audio bytes.
-        body = "".b
-        body << "--#{boundary}\r\n".b
-        body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{filename}\"\r\n".b
-        body << "Content-Type: #{mime_type.split(';').first}\r\n\r\n".b
-        body << audio_data.b
-        body << "\r\n--#{boundary}\r\n".b
-        body << "Content-Disposition: form-data; name=\"model\"\r\n\r\n".b
-        body << @model.to_s.b
-        unless prompt.to_s.strip.empty?
-          body << "\r\n--#{boundary}\r\n".b
-          body << "Content-Disposition: form-data; name=\"prompt\"\r\n\r\n".b
-          body << prompt.to_s.strip.b
-        end
-        body << "\r\n--#{boundary}--\r\n".b
 
-        begin
-          response = stt_connection.post("audio/transcriptions") do |req|
-            req.headers["Content-Type"]  = "multipart/form-data; boundary=#{boundary}"
-            req.headers["Authorization"] = "Bearer #{@api_key}"
-            req.body = body
+        # OpenRouter caps multipart uploads at 25 MB and redirects larger files
+        # to base64 JSON via input_audio. Plain OpenAI-compatible providers keep
+        # multipart (incl. the openclacky gateway, which only parses multipart
+        # on its /audio/transcriptions today — enable the JSON flavor there once
+        # the server supports it).
+        if provider_id == Clacky::Providers::OPENROUTER_ID
+          ext = "m4a" if ext == "mp4" # OpenRouter wants the audio format, not the container
+          payload = {
+            model: @model,
+            input_audio: {
+              data:   audio_base64, # raw base64 bytes, NOT a data URI
+              format: ext
+            }
+          }
+          payload[:prompt] = prompt.to_s.strip unless prompt.to_s.strip.empty?
+
+          begin
+            response = stt_json_connection.post("audio/transcriptions") do |req|
+              req.headers["Content-Type"]  = "application/json"
+              req.headers["Authorization"] = "Bearer #{@api_key}"
+              req.body = JSON.generate(payload)
+            end
+          rescue Faraday::Error => e
+            return transcription_error_response(
+              error: "HTTP request failed: #{e.message}",
+              error_type: "network_error", provider: provider_id
+            )
+          end
+        else
+          filename = "chunk.#{ext}"
+          audio_data = Base64.decode64(audio_base64)
+          boundary = "----FormBoundary#{SecureRandom.hex(8)}"
+          # A multipart body is a byte stream: build it in binary so UTF-8 text
+          # parts (e.g. a non-ASCII vocabulary prompt) don't clash with the
+          # ASCII-8BIT audio bytes.
+          body = "".b
+          body << "--#{boundary}\r\n".b
+          body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{filename}\"\r\n".b
+          body << "Content-Type: #{mime_type.split(';').first}\r\n\r\n".b
+          body << audio_data.b
+          body << "\r\n--#{boundary}\r\n".b
+          body << "Content-Disposition: form-data; name=\"model\"\r\n\r\n".b
+          body << @model.to_s.b
+          unless prompt.to_s.strip.empty?
+            body << "\r\n--#{boundary}\r\n".b
+            body << "Content-Disposition: form-data; name=\"prompt\"\r\n\r\n".b
+            body << prompt.to_s.strip.b
+          end
+          body << "\r\n--#{boundary}--\r\n".b
+
+          begin
+            response = stt_connection.post("audio/transcriptions") do |req|
+              req.headers["Content-Type"]  = "multipart/form-data; boundary=#{boundary}"
+              req.headers["Authorization"] = "Bearer #{@api_key}"
+              req.body = body
+            end
+          rescue Faraday::Error => e
+            return transcription_error_response(
+              error: "HTTP request failed: #{e.message}",
+              error_type: "network_error", provider: provider_id
+            )
           end
-        rescue Faraday::Error => e
-          return transcription_error_response(
-            error: "HTTP request failed: #{e.message}",
-            error_type: "network_error", provider: provider_id
-          )
         end
 
         unless response.success?
@@ -479,6 +510,15 @@ module Clacky
         end
       end
 
+      # STT JSON body carries a large base64 payload; upstream may need longer
+      # to decode/transcribe it than the 30s multipart path.
+      private def stt_json_connection
+        Faraday.new(url: normalized_base_url) do |f|
+          f.options.timeout      = 120
+          f.options.open_timeout = 10
+        end
+      end
+
       private def vu_connection
         Faraday.new(url: normalized_base_url) do |f|
           f.options.timeout      = 60

data/lib/clacky/message_format/bedrock.rb

@@ -26,6 +26,8 @@ module Clacky
       # the same Clacky proxy on a different endpoint. The *model prefix* is
       # the source of truth for which upstream format the proxy expects:
       #
+      #   abs-gpt-* → OpenAI-compatible (POST /chat/completions) — GPT models
+      #               on Bedrock use the OpenAI endpoint, not Converse
       #   abs-*  → Bedrock Converse  (POST /model/{id}/converse)
       #   dsk-*  → OpenAI-compatible (POST /chat/completions)
       #   or-*   → OpenAI-compatible (POST /chat/completions)
@@ -38,7 +40,10 @@ module Clacky
       # will route correctly without touching this file.
       def self.bedrock_api_key?(api_key, model)
         return true if api_key.to_s.start_with?("ABSK")
-        model.to_s.start_with?("abs-")
+        model_str = model.to_s
+        # abs-gpt-* is served through Bedrock's OpenAI-compatible endpoint.
+        return false if model_str.start_with?("abs-gpt-")
+        model_str.start_with?("abs-")
       end
 
       module_function

data/lib/clacky/message_format/open_ai.rb

@@ -217,9 +217,13 @@ module Clacky
       # unchanged, preserving the provider default for all models.
       #
       # Single source of truth for reasoning param mapping — shared with
-      # MessageFormat::OpenAIResponses (the Responses API accepts the same
-      # top-level fields).
-      def self.apply_reasoning_params(body, model, reasoning_effort)
+      # MessageFormat::OpenAIResponses.
+      #
+      # @param responses_api [Boolean] emit the generic effort as the Responses
+      #   API's nested `reasoning: { effort: ... }`. The top-level
+      #   `reasoning_effort` field is Chat Completions only — the Responses API
+      #   rejects it with "Unknown parameter: 'reasoning_effort'".
+      def self.apply_reasoning_params(body, model, reasoning_effort, responses_api: false)
         effort_str = reasoning_effort.to_s
 
         if model.to_s.match?(/\Aglm-5[-.]3/i)
@@ -306,9 +310,22 @@ module Clacky
                    when "xhigh" then "max"
                    else effort_str
                    end
-          body[:reasoning_effort] = effort unless effort.empty?
+          assign_effort(body, effort, responses_api)
         elsif reasoning_effort && !effort_str.empty?
-          body[:reasoning_effort] = effort_str
+          assign_effort(body, effort_str, responses_api)
+        end
+      end
+
+      # Write the resolved effort into the field shape the target API expects.
+      # Chat Completions takes the top-level reasoning_effort; the Responses API
+      # takes reasoning.effort and errors out on the flat field.
+      private_class_method def self.assign_effort(body, effort, responses_api)
+        return if effort.nil? || effort.empty?
+
+        if responses_api
+          body[:reasoning] = { effort: effort }
+        else
+          body[:reasoning_effort] = effort
         end
       end
 

data/lib/clacky/message_format/open_ai_responses.rb

@@ -53,7 +53,7 @@ module Clacky
           body[:tools] = convert_tools_to_responses_format(tools)
         end
 
-        OpenAI.apply_reasoning_params(body, model, reasoning_effort)
+        OpenAI.apply_reasoning_params(body, model, reasoning_effort, responses_api: true)
 
         body
       end
@@ -156,8 +156,12 @@ module Clacky
           { type: "input_text", text: text }
         when "image_url"
           if vision_supported
-            # Responses API uses input_image with image_url sub-field
-            { type: "input_image", image_url: block[:image_url] }
+            # Responses API takes the URL as a plain string — the Chat
+            # Completions { url: ... } wrapper fails schema validation with
+            # "Invalid 'input': value did not match any expected variant".
+            url = block[:image_url]
+            url = url[:url] || url["url"] if url.is_a?(Hash)
+            { type: "input_image", image_url: url }
           else
             { type: "input_text", text: "[Image content removed - current model does not support vision input]" }
           end

data/lib/clacky/plain_ui_controller.rb

@@ -56,7 +56,7 @@ module Clacky
       puts_line("[tool] #{display}")
     end
 
-    def show_tool_result(result)
+    def show_tool_result(result, ui: nil)
       text = result.to_s.strip
       return if text.empty?
 

data/lib/clacky/prompts/base.md

@@ -3,7 +3,7 @@
 - Ask clarifying questions if requirements are unclear.
 - Break down complex tasks into manageable steps.
 - **USE TOOLS to create/modify files** — don't just return content.
-- When the user asks to send/download a file or you generate one for them, append `[filename](file://~/path/to/file)` at the end of your reply. Use the raw file path as-is (keep non-ASCII characters and spaces literal); never URL-encode it.
+- When the user asks to send/download a file or you generate one for them, append `[filename](file:///absolute/path/to/file)` at the end of your reply. Use the exact absolute path the write tool returned — don't rewrite or abbreviate it with `~` (keep non-ASCII characters and spaces literal); never URL-encode it.
 
 ## Tool Usage Rules
 

data/lib/clacky/providers.rb

@@ -29,8 +29,12 @@ module Clacky
         "name" => "OpenClacky",
         "base_url" => "https://api.openclacky.com",
         "api" => "bedrock",
-        "default_model" => "abs-claude-sonnet-5",
+        "default_model" => "or-gemini-3-8-flash",
         "models" => [
+          "abs-gpt-6-astra",
+          "abs-gpt-5.6-sol",
+          "abs-gpt-5.6-terra",
+          "abs-gpt-5.6-luna",
           "abs-claude-fable-5-1",
           "abs-claude-fable-5",
           "abs-claude-opus-5",
@@ -41,9 +45,8 @@ module Clacky
           "abs-claude-sonnet-4-6",
           "abs-claude-sonnet-4-5",
           "abs-claude-haiku-4-5",
+          "dsk-deepseek-flash",
           "dsk-deepseek-v4-pro",
-          "dsk-deepseek-v4-flash",
-          "dsk-deepseek-v4-flash-vision-exp",
           "or-gemini-3-1-pro",
           "or-gemini-3-8-flash",
           "or-gemini-3-7-flash",
@@ -134,23 +137,28 @@ module Clacky
         # Default OCR sidecar — used when the primary model is text-only.
         # Candidates are derived from the provider's vision-capable models;
         # this just picks the cheap+fast default to surface in "auto" mode.
-        "default_ocr_model" => "dsk-deepseek-v4-flash-vision-exp",
+        "default_ocr_model" => "or-gemini-3-8-flash",
         # Provider-level default: the Claude family served here is vision-capable.
         "capabilities" => { "vision" => true }.freeze,
         # Model-level overrides: DeepSeek models routed through this provider
-        # are text-only, except the flash-vision-exp variant which accepts
-        # image input; images uploaded for text-only models must be downgraded
-        # to disk refs. Gemini 3.1 Pro keeps the provider-default vision=true
+        # are text-only except V4.1 Flash, which is natively multimodal;
+        # images uploaded for text-only models must be downgraded to disk
+        # refs. Gemini 3.1 Pro keeps the provider-default vision=true
         # (it accepts image/audio/video input natively via OpenRouter).
         "model_capabilities" => {
-          "dsk-deepseek-v4-pro"              => { "vision" => false }.freeze,
-          "dsk-deepseek-v4-flash"            => { "vision" => false }.freeze,
-          "dsk-deepseek-v4-flash-vision-exp" => { "vision" => true }.freeze
+          "dsk-deepseek-flash"  => { "vision" => true }.freeze,
+          "dsk-deepseek-v4-pro" => { "vision" => false }.freeze
+        }.freeze,
+        # Bedrock GPT models (abs-gpt-*) are served through the OpenAI
+        # Responses API — their Chat Completions endpoint rejects function
+        # tools for reasoning models (GPT-6 Astra).
+        "model_api_overrides" => {
+          /\Aabs-gpt-/ => "openai-responses"
         }.freeze,
         # Per-primary lite pairing: keys are "strong" primary models, values
         # are the lite sidekick to auto-inject when that primary is the
         # default. Lite is consumed by some subagents for cheap/fast work;
-        # weak models (haiku / v4-flash / 3-5-flash) ARE the lite tier
+        # weak models (haiku / flash / 3-5-flash) ARE the lite tier
         # themselves, so they're intentionally not listed here as keys —
         # no injection happens when the default model is already lite-class.
         "lite_models" => {
@@ -163,7 +171,9 @@ module Clacky
           "abs-claude-sonnet-5"   => "abs-claude-haiku-4-5",
           "abs-claude-sonnet-4-6" => "abs-claude-haiku-4-5",
           "abs-claude-sonnet-4-5" => "abs-claude-haiku-4-5",
-          "dsk-deepseek-v4-pro"   => "dsk-deepseek-v4-flash",
+          "abs-gpt-5.6-sol"       => "abs-gpt-5.6-luna",
+          "abs-gpt-5.6-terra"     => "abs-gpt-5.6-luna",
+          "dsk-deepseek-v4-pro"   => "dsk-deepseek-flash",
           "or-gemini-3-1-pro"     => "or-gemini-3-6-flash"
         },
         # Fallback chain: if a model is unavailable, try the next one in order.
@@ -266,14 +276,17 @@ module Clacky
         # deprecated on 2026-07-24; they map to deepseek-v4-flash's non-thinking
         # and thinking modes respectively. Prefer deepseek-v4-flash / deepseek-v4-pro.
         "models" => [
+          "deepseek-flash",
           "deepseek-v4-pro",
           "deepseek-v4-flash",
           "deepseek-v4-flash-vision-exp",
         ],
         # DeepSeek V4 API is text-only across all models, except the
-        # flash-vision-exp variant which accepts image input.
+        # flash-vision-exp variant which accepts image input. V4.1 Flash
+        # (deepseek-flash) is natively multimodal.
         "capabilities" => { "vision" => false }.freeze,
         "model_capabilities" => {
+          "deepseek-flash"               => { "vision" => true }.freeze,
           "deepseek-v4-flash-vision-exp" => { "vision" => true }.freeze
         }.freeze,
         "website_url" => "https://platform.deepseek.com/api_keys"
@@ -420,6 +433,7 @@ module Clacky
         "api" => "openai-completions",
         "default_model" => "gpt-5.5",
         "models" => [
+          "gpt-6-astra",
           "gpt-5.6-sol",
           "gpt-5.6-terra",
           "gpt-5.6-luna",
@@ -703,6 +717,23 @@ module Clacky
 
     }.freeze
 
+    # Canonical provider identifiers. Mirror the PRESETS keys above; keep both
+    # in sync when adding or renaming a provider.
+    OPENCLACKY_ID     = "openclacky"
+    OPENROUTER_ID     = "openrouter"
+    DEEPSEEKV4_ID     = "deepseekv4"
+    GLM_ID            = "glm"
+    KIMI_ID           = "kimi"
+    KIMI_CODING_ID    = "kimi-coding"
+    MINIMAX_ID        = "minimax"
+    ANTHROPIC_ID      = "anthropic"
+    OPENAI_ID         = "openai"
+    QWEN_ID           = "qwen"
+    MIMO_ID           = "mimo"
+    VOLCENGINE_ARK_ID = "volcengine-ark"
+    OLLAMA_ID         = "ollama"
+    ORCAROUTER_ID     = "orcarouter"
+
     MEDIA_KINDS = %w[image video audio stt video_understanding].freeze
 
     # Per-model maximum output token limits.

data/lib/clacky/rich_ui/components/composer_guidance.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "unicode/display_width"
+
+module Clacky
+  module RichUI
+    # Extend the composer's attachment area rather than adding a layout sibling.
+    # Keep pending entries out of @attachments so submitting/deleting a draft
+    # cannot accidentally upload or consume queued messages.
+    module ComposerGuidance
+      attr_accessor :guidance_lines_provider
+
+      def desired_height
+        super + pending_guidance_lines.size
+      end
+
+      def native_cursor_position
+        return nil unless focused?
+
+        editor_row, editor_col = @editor.cursor_visual_position(width: [inner_width - 2, 1].max)
+        attachments = render_attachments
+        raw_row = attachments.size + editor_row
+        lines = attachments + render_input_lines
+        lines.concat(render_menu_lines) if menu_open?
+        height = [@height.to_i, 1].max
+        visible_row = raw_row - [lines.size - height, 0].max
+        return nil if visible_row.negative? || visible_row >= height
+
+        [visible_row, 2 + editor_col]
+      end
+
+      private def pending_guidance_lines
+        @guidance_lines_provider&.call || []
+      end
+
+      private def render_attachments
+        super + pending_guidance_lines.map do |line|
+          used = 0
+          clipped = line.each_char.take_while do |char|
+            used += Unicode::DisplayWidth.of(char)
+            used <= [inner_width - 1, 0].max
+          end.join
+          clipped += "…" if clipped.length < line.length && inner_width.positive?
+          clipped
+        end
+      end
+    end
+  end
+end

data/lib/clacky/rich_ui/rich_ui_controller.rb

@@ -6,6 +6,7 @@ require "base64"
 require "set"
 require "ruby_rich"
 require_relative "../ui_interface"
+require_relative "../cli_guidance"
 require_relative "../providers"
 require_relative "../ui2/components/welcome_banner"
 require_relative "shell/rich_agent_shell"
@@ -22,6 +23,7 @@ require_relative "components/dialogs/approval_dialog"
 module Clacky
   class RichUIController
     include Clacky::UIInterface
+      include Clacky::CliGuidance
     include Clacky::RichUI::ViewRenderer
 
     STREAMING_MARKDOWN_THRESHOLD = 240
@@ -151,6 +153,7 @@ module Clacky
     def set_skill_loader(skill_loader, agent_profile = nil)
       return unless skill_loader
 
+      @shell.composer.register_command(name: "/input-mode", description: "Input behavior: steer or interrupt")
       skills = skill_loader.user_invocable_skills(agent_profile)
 
       skills.each do |skill|
@@ -166,6 +169,8 @@ module Clacky
 
     def set_agent(_agent, _agent_profile = nil); end
 
+    attr_accessor :queue_input_while_running
+
     def on_input(&block)
       @input_callback = block
     end
@@ -245,7 +250,7 @@ module Clacky
       end
     end
 
-    def show_tool_result(result)
+    def show_tool_result(result, ui: nil)
       if (id = @tracker.pop_tool_id)
         @shell.finish_tool_call(id, status: :done, output: format_tool_output(result.to_s, :done))
         update_tool_activity(id, :done)
@@ -457,6 +462,20 @@ module Clacky
       { model: selected, persist: persist_choice }
     end
 
+    def dispatch_guidance_action(action, id)
+      run_callback_async { @guidance_action&.call(action, id) }
+    end
+
+    def refresh_guidance
+      @shell.live&.refresh
+    end
+
+    def show_user_message(content, created_at: nil, files: [], source: :web, steering: false)
+      return unless steering
+      @shell.add_user_message(content)
+      add_file_summary(files) unless files.empty?
+    end
+
     def clear_input
       @shell.composer.editor.clear
     end
@@ -470,6 +489,7 @@ module Clacky
         Commands:
           /clear - Clear output and restart session
           /exit - Exit application
+          /input-mode [steer|interrupt] - View or change input behavior
 
         Input:
           Shift+Enter - New line
@@ -496,7 +516,7 @@ module Clacky
         when :add
           new_model = show_model_edit_form(nil, test_callback: test_callback)
           if new_model
-            anthropic_format = new_model[:provider] == "anthropic"
+            anthropic_format = new_model[:provider] == Clacky::Providers::ANTHROPIC_ID
             current_config.add_model(
               model: new_model[:model],
               api_key: new_model[:api_key],
@@ -628,10 +648,10 @@ module Clacky
 
     def wire_shell_callbacks
       @shell.on_submit do |text, attachments|
-        reset_task_sidebar_tracking
+        reset_task_sidebar_tracking unless guidance_deferred?(text)
         @ctrl_c_warning = nil
         files = Array(attachments).map { |attachment| attachment.respond_to?(:to_h) ? attachment.to_h : attachment }
-        @shell.add_user_message(text)
+        @shell.add_user_message(text) unless guidance_deferred?(text)
         run_callback_async { @input_callback&.call(text, files, display: text) }
       end
 

data/lib/clacky/rich_ui/shell/rich_agent_shell.rb

@@ -4,6 +4,7 @@ require "ruby_rich"
 require_relative "../components/sidebar"
 require_relative "../components/thinking_live_view"
 require_relative "../components/status_view"
+require_relative "../components/composer_guidance"
 
 module Clacky
   class RichAgentShell < RubyRich::AgentShell
@@ -80,6 +81,8 @@ module Clacky
 
     def attach_agent_controls
       @composer.instance_variable_set(:@on_interrupt, nil)
+      @composer.singleton_class.prepend(RichUI::ComposerGuidance)
+      @composer.guidance_lines_provider = -> { @clacky_controller&.guidance_lines || [] }
       # Register /model command
       shell_ref = self
       @composer.register_command(name: "/model", description: "Switch LLM model",
@@ -95,6 +98,16 @@ module Clacky
         handled ? nil : native_escape.call
       end
       # Clear Ctrl+C warning as soon as the user starts typing
+      native_ctrl_d = @composer.method(:ctrl_d)
+      @composer.define_singleton_method(:ctrl_d) do |live|
+        handled = shell.clacky_controller&.request_guidance_action(:remove)
+        native_ctrl_d.call(live) unless handled
+      end
+      @layout.key(:ctrl_g, 250) do |_event, _live|
+        @clacky_controller&.request_guidance_action(:send_now) if @composer.focused?
+        false
+      end
+
       native_insert = @composer.method(:insert_text)
       @composer.define_singleton_method(:insert_text) do |text|
         shell.callbacks[:clear_ctrlc]&.call

data/lib/clacky/search_config.rb

@@ -6,10 +6,10 @@ require "fileutils"
 module Clacky
   # Search provider selection, backed by ~/.clacky/search.yml.
   #
-  # The built-in DuckDuckGo/Bing scrapers need no configuration and stay the
-  # default. Pointing `provider` at a script in ~/.clacky/searchers/ routes
+  # The built-in Parallel/DuckDuckGo/Bing providers need no configuration and
+  # stay the default. Pointing `provider` at a script in ~/.clacky/searchers/ routes
   # web_search through an API-backed engine instead, which is what users who
-  # want higher-quality results (or China-reachable ones) reach for.
+  # want a provider-specific API or policy controls reach for.
   #
   # search.yml schema:
   #   provider: tavily     — basename of a script in ~/.clacky/searchers/;