collavre_openclaw 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47fb3ac9892c9b3c1ee7531645732dd47acdba3b7504d048cd207ff8ae4fa82e
-  data.tar.gz: e6233d85c5bff7f28ad2201b0cb84df1fe6c62827cd23666de54ef64060f41d5
+  metadata.gz: '09c2c291bce3fdf441d7c93dacf44883ca47804db6abb38d78b3ea70a412deaf'
+  data.tar.gz: 8bd10b6c57adedb5e655b23688088a1be0d8c2e97dca6300ef7470b1a28c8c33
 SHA512:
-  metadata.gz: 1a8b34146dedfcec60bc2b0b78ac4f9f51448c8b2bd3ee9064e24d24ac7854271e8cb943b5083da143ec9a18e7470b869e927f2b680db1518ff6a324897a0dc9
-  data.tar.gz: 6f97da70c3443dcda6087cfa114b5f068cb952e567b90849a07b27239d6df89c55cafa07f35e76a2c864337d02e56f9cc328e5bc33f8655af4fd87ec93c4dee7
+  metadata.gz: ba347bb7844c93e96b5601f728267df346ba28b78458d77e0ea8a8f83ceb77fc83127ddad0dd164704f8bad95701df1838ac636e8c59aaa356bab07c63e5d58d
+  data.tar.gz: 90b4555d3b69f2f0489dff54e6f326b4ee57404989e1ef7068a2b91d8761541ddf42be7154ed6e0a7b8e5f536d6408441b3412997731c3868c603fb3e25a7122

data/app/controllers/collavre_openclaw/health_controller.rb

@@ -23,7 +23,7 @@ module CollavreOpenclaw
 
     def authenticated?
       respond_to?(:current_user, true) && current_user.present?
-    rescue
+    rescue StandardError
       false
     end
   end

data/app/services/collavre_openclaw/ai_client_extension.rb

@@ -12,18 +12,24 @@ module CollavreOpenclaw
       end
     end
 
-    def chat(contents, tools: [], &block)
+    # @param messages_input [Hash, Array] Hash { messages:, first_message:, context_changed:, system_prompt: }
+    #   from SessionContextResolver, or a plain Array from standalone callers (e.g., CompressJob).
+    def chat(messages_input, tools: [], &block)
       normalized_vendor = vendor.to_s.downcase
+      messages_data = normalize_messages_input(messages_input)
 
       # Check if we have a custom adapter for this vendor
       adapter_class = self.class.adapter_registry[normalized_vendor]
 
       if adapter_class
         # Use the custom adapter (tools not supported for OpenClaw)
+        # Prefer resolved system_prompt from SessionContextResolver over instance default.
+        # key?(:system_prompt) distinguishes "not provided" (Array input) from "explicitly nil" (incremental session).
+        resolved_system_prompt = messages_data.key?(:system_prompt) ? messages_data[:system_prompt] : system_prompt
         user = context&.dig(:user)
         adapter = adapter_class.new(
           user: user,
-          system_prompt: system_prompt,
+          system_prompt: resolved_system_prompt,
           context: context
         )
 
@@ -31,13 +37,13 @@ module CollavreOpenclaw
         error_message = nil
 
         begin
-          response_content = adapter.chat(contents, &block)
+          response_content = adapter.chat(messages_data, &block)
         rescue StandardError => e
           error_message = e.message
           raise
         ensure
           log_interaction(
-            messages: Array(contents),
+            messages: messages_data[:messages],
             tools: [],
             response_content: response_content,
             error_message: error_message,
@@ -49,12 +55,24 @@ module CollavreOpenclaw
         return response_content
       end
 
-      # Fall back to original implementation
-      super
+      # Fall back to original RubyLLM implementation (expects Array)
+      super(messages_data[:messages], tools: tools, &block)
     end
 
     private
 
     attr_reader :vendor, :system_prompt, :context
+
+    # Wrap plain Array input (from standalone callers like CompressJob)
+    # into the Hash format expected by the adapter.
+    def normalize_messages_input(input)
+      return input if input.is_a?(Hash)
+
+      {
+        messages: Array(input).map { |m| m.merge(kind: :trigger) },
+        first_message: true,
+        context_changed: false
+      }
+    end
   end
 end

data/app/services/collavre_openclaw/connection_manager.rb

@@ -205,7 +205,7 @@ module CollavreOpenclaw
           next unless @idle_check_counter >= 60 # Run check every ~60 seconds
           @idle_check_counter = 0
           check_idle_connections!
-        rescue => e
+        rescue StandardError => e
           Rails.logger.error("[CollavreOpenclaw::ConnectionManager] Idle checker error: #{e.message}")
         end
       end

data/app/services/collavre_openclaw/openclaw_adapter.rb

@@ -3,9 +3,11 @@ require "json"
 
 module CollavreOpenclaw
   class OpenclawAdapter
-    # Adapter for OpenClaw AI Gateway
+    # Pure transport adapter for OpenClaw AI Gateway.
+    # Session context filtering (full vs incremental) is handled upstream
+    # by SessionContextResolver — this adapter sends exactly what it receives.
     #
-    # Supports two transport modes:
+    # Transport modes:
     # 1. WebSocket (primary) - via faye-websocket + EventMachine
     # 2. HTTP (fallback) - via Faraday POST /v1/chat/completions
     #
@@ -20,7 +22,10 @@ module CollavreOpenclaw
       @context = context
     end
 
-    def chat(messages, &block)
+    # @param messages_data [Hash] { messages:, first_message:, context_changed: }
+    def chat(messages_data, &block)
+      parse_messages_data!(messages_data)
+
       unless @user&.gateway_url.present?
         Rails.logger.error("[CollavreOpenclaw] No Gateway URL configured for user #{@user&.id}")
         yield "Error: OpenClaw Gateway URL not configured" if block_given?
@@ -38,11 +43,11 @@ module CollavreOpenclaw
       # Set OPENCLAW_TRANSPORT=http to force HTTP-only mode
       if CollavreOpenclaw.config.transport == "http"
         Rails.logger.info("[CollavreOpenclaw::WS] TRANSPORT mode=http_forced")
-        chat_via_http(messages, &block)
+        chat_via_http(&block)
       elsif websocket_available?
-        chat_via_websocket(messages, &block)
+        chat_via_websocket(&block)
       else
-        chat_via_http(messages, &block)
+        chat_via_http(&block)
       end
     end
 
@@ -69,6 +74,12 @@ module CollavreOpenclaw
 
     private
 
+    def parse_messages_data!(data)
+      @all_messages    = data[:messages] || []
+      @first_message   = data[:first_message]
+      @context_changed = data[:context_changed]
+    end
+
     # ─────────────────────────────────────────────
     # WebSocket transport
     # ─────────────────────────────────────────────
@@ -83,14 +94,14 @@ module CollavreOpenclaw
       false
     end
 
-    def chat_via_websocket(messages, &block)
+    def chat_via_websocket(&block)
       response_content = +""
 
       begin
         client = ConnectionManager.instance.connection_for(@user)
-        payload = build_ws_chat_payload(messages)
+        payload = build_ws_chat_payload
 
-        Rails.logger.info("[CollavreOpenclaw] Sending via WebSocket (session: #{session_key})")
+        Rails.logger.info("[CollavreOpenclaw] Sending via WebSocket (session: #{session_key}, first: #{@first_message}, changed: #{@context_changed})")
 
         client.chat_send(
           session_key: session_key,
@@ -121,7 +132,7 @@ module CollavreOpenclaw
       rescue CollavreOpenclaw::ConnectionError,
              CollavreOpenclaw::TimeoutError => e
         Rails.logger.warn("[CollavreOpenclaw::WS] FALLBACK gateway=#{@user.gateway_url} reason=#{e.class}:#{e.message}")
-        chat_via_http(messages, &block)
+        chat_via_http(&block)
       rescue CollavreOpenclaw::ChatError, CollavreOpenclaw::RpcError => e
         Rails.logger.error("[CollavreOpenclaw] WebSocket chat error: #{e.message}")
         error_msg = "OpenClaw Error: #{e.message}"
@@ -131,70 +142,26 @@ module CollavreOpenclaw
         Rails.logger.error("[CollavreOpenclaw] WebSocket unexpected error: #{e.message}\n" \
                            "#{e.backtrace.first(5).join("\n")}")
         Rails.logger.info("[CollavreOpenclaw::WS] FALLBACK gateway=#{@user.gateway_url} reason=#{e.class}:#{e.message}")
-        chat_via_http(messages, &block)
+        chat_via_http(&block)
       end
     end
 
-    # Build WebSocket chat.send payload.
-    #
-    # Includes the same full text context as HTTP mode plus optional base64
-    # image attachments supported by the Gateway's chat.send.attachments field.
-    def build_ws_chat_payload(messages)
+    def build_ws_chat_payload
       {
-        message: format_message_for_ws(messages),
-        attachments: extract_ws_attachments(messages).presence
+        message: format_message_for_ws,
+        attachments: extract_ws_attachments(@all_messages).presence
       }
     end
 
-    # Format messages for WebSocket chat.send text payload.
-    #
-    # Includes full context on EVERY request, matching HTTP mode behavior.
-    # The Gateway's WS session may be new (no prior history), so we cannot
-    # assume context was sent before. This is consistent with how the HTTP
-    # Chat Completions API works (full history on every request).
-    #
-    # Message structure sent:
-    #   [system prompt]
-    #   [creative context messages]
-    #   [context creative messages]
-    #   [chat history]
-    #   [latest user message]
-    def format_message_for_ws(messages)
-      formatted = Array(messages)
-      return "" if formatted.empty?
-
+    # SessionContextResolver already decided what to include.
+    # We just format and send everything we received.
+    def format_message_for_ws
       parts = []
-
-      # 1. System prompt (same as HTTP mode's build_payload)
       parts << @system_prompt if @system_prompt.present?
 
-      # 2. All context messages (Creative:, Context Creative:, Referenced Creative:)
-      formatted.each do |m|
-        role = m[:role] || m["role"]
-        next unless role.to_s == "user"
-
+      @all_messages.each do |m|
         text = extract_message_text(m)
-        next unless text.present?
-        next unless text.match?(/\A(Creative|Context Creative|Referenced Creative)\s*\(/)
-
-        parts << text
-      end
-
-      # 3. Chat history (prior user/assistant exchanges)
-      formatted.each do |m|
-        role = (m[:role] || m["role"]).to_s
-        text = extract_message_text(m)
-        next unless text.present?
-
-        # Skip context messages (already included above)
-        next if text.match?(/\A(Creative|Context Creative|Referenced Creative)\s*\(/)
-
-        case role
-        when "user"
-          parts << text
-        when "assistant", "model"
-          parts << "[Assistant]: #{text}"
-        end
+        parts << text if text.present?
       end
 
       parts.join("\n\n")
@@ -297,13 +264,13 @@ module CollavreOpenclaw
     # HTTP transport (fallback)
     # ─────────────────────────────────────────────
 
-    def chat_via_http(messages, &block)
+    def chat_via_http(&block)
       response_content = +""
 
       begin
-        payload = build_payload(messages)
+        payload = build_payload
 
-        Rails.logger.info("[CollavreOpenclaw] Sending via HTTP to #{api_endpoint} (session: #{session_key})")
+        Rails.logger.info("[CollavreOpenclaw] Sending via HTTP to #{api_endpoint} (session: #{session_key}, first: #{@first_message}, changed: #{@context_changed})")
 
         stream_response(payload) do |chunk|
           response_content << chunk
@@ -349,22 +316,21 @@ module CollavreOpenclaw
     # HTTP payload building
     # ─────────────────────────────────────────────
 
-    def build_payload(messages)
+    # SessionContextResolver already decided what to include.
+    def build_payload
       agent_id = extract_agent_id_from_email
       model_value = agent_id.present? ? "openclaw:#{agent_id}" : "openclaw"
 
-      payload = {
+      formatted = []
+      formatted << { role: "system", content: @system_prompt } if @system_prompt.present?
+      @all_messages.each { |m| formatted << format_single_message(m) }
+
+      {
         model: model_value,
-        messages: format_messages(messages),
-        stream: true
+        messages: formatted,
+        stream: true,
+        user: build_user_context
       }
-
-      if @system_prompt.present?
-        payload[:messages].unshift({ role: "system", content: @system_prompt })
-      end
-
-      payload[:user] = build_user_context
-      payload
     end
 
     def build_user_context
@@ -400,28 +366,26 @@ module CollavreOpenclaw
       end
     end
 
-    def format_messages(messages)
-      Array(messages).map do |msg|
-        role = msg[:role] || msg["role"]
-        text = extract_message_text(msg)
+    def format_single_message(msg)
+      role = msg[:role] || msg["role"]
+      text = extract_message_text(msg)
 
-        sender_name = msg[:sender_name] || msg["sender_name"]
-        if sender_name.present? && normalize_role(role) == "user"
-          text = "[#{sender_name}]: #{text}"
-        end
+      sender_name = msg[:sender_name] || msg["sender_name"]
+      if sender_name.present? && normalize_role(role) == "user"
+        text = "[#{sender_name}]: #{text}"
+      end
 
-        image_sources = extract_image_sources(msg)
+      image_sources = extract_image_sources(msg)
 
-        if image_sources.any?
-          content_parts = [ { type: "text", text: text.to_s } ]
-          image_sources.each do |source|
-            image_data = encode_image_source(source)
-            content_parts << image_data if image_data
-          end
-          { role: normalize_role(role), content: content_parts }
-        else
-          { role: normalize_role(role), content: text.to_s }
+      if image_sources.any?
+        content_parts = [ { type: "text", text: text.to_s } ]
+        image_sources.each do |source|
+          image_data = encode_image_source(source)
+          content_parts << image_data if image_data
         end
+        { role: normalize_role(role), content: content_parts }
+      else
+        { role: normalize_role(role), content: text.to_s }
       end
     end
 

data/app/services/collavre_openclaw/websocket_client.rb

@@ -94,7 +94,7 @@ module CollavreOpenclaw
       EmReactor.next_tick do
         begin
           do_connect!(queue)
-        rescue => e
+        rescue StandardError => e
           queue.push({ error: e.message })
         end
       end
@@ -265,6 +265,21 @@ module CollavreOpenclaw
       end
     end
 
+    # Inject an assistant message into a session transcript.
+    # Useful for pre-populating context without triggering an agent run.
+    #
+    # @param session_key [String]
+    # @param message [String] content to inject
+    # @param label [String, nil] optional label for the injected message
+    def chat_inject(session_key:, message:, label: nil)
+      ensure_connected!
+      touch_activity!
+
+      params = { sessionKey: session_key, message: message }
+      params[:label] = label if label
+      send_rpc("chat.inject", params)
+    end
+
     # Fetch chat history for a session
     def chat_history(session_key:, limit: nil)
       ensure_connected!
@@ -644,7 +659,7 @@ module CollavreOpenclaw
               schedule_reconnect!
             end
           end
-        rescue => e
+        rescue StandardError => e
           Rails.logger.error("[CollavreOpenclaw::WS] RECONNECT gateway=#{url} state=fail reason=#{e.message}")
           schedule_reconnect!
         end

data/lib/collavre_openclaw/configuration.rb

@@ -27,7 +27,11 @@ module CollavreOpenclaw
 
     def initialize
       @open_timeout = ENV.fetch("OPENCLAW_OPEN_TIMEOUT", 10).to_i
-      @read_timeout = ENV.fetch("OPENCLAW_READ_TIMEOUT", 180).to_i  # 3 minutes for AI responses
+      @read_timeout = begin
+        Collavre::SystemSetting.llm_request_timeout_seconds
+      rescue StandardError
+        1800
+      end
       @max_retries = ENV.fetch("OPENCLAW_MAX_RETRIES", 2).to_i
       @ws_idle_timeout = ENV.fetch("OPENCLAW_WS_IDLE_TIMEOUT", 1800).to_i     # 30 minutes
       @ws_reconnect_max = ENV.fetch("OPENCLAW_WS_RECONNECT_MAX", 10).to_i

data/lib/collavre_openclaw/engine.rb

@@ -50,7 +50,7 @@ module CollavreOpenclaw
           ConnectionManager.instance.disconnect_all
         end
         EmReactor.stop! if EmReactor.running?
-      rescue => e
+      rescue StandardError => e
         Rails.logger.warn("[CollavreOpenclaw] Shutdown cleanup error: #{e.message}")
       end
     end

data/lib/collavre_openclaw/version.rb

@@ -1,3 +1,3 @@
 module CollavreOpenclaw
-  VERSION = "0.5.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_openclaw
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Collavre