collavre_openclaw 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff18cc7843b54de3c5e86de861f69b9225aa47dd7e57aae94cd612d7698d1d55
-  data.tar.gz: 8b83ffc51769d3946de8660b0583ccc672079f08d80db9b93178c12c1c374279
+  metadata.gz: '09c2c291bce3fdf441d7c93dacf44883ca47804db6abb38d78b3ea70a412deaf'
+  data.tar.gz: 8bd10b6c57adedb5e655b23688088a1be0d8c2e97dca6300ef7470b1a28c8c33
 SHA512:
-  metadata.gz: 54bf09a092ed87b269621100c55edadd8fd0591f41f25270672f27cf6837d3767dff33a3cff6bb6fe4315c90cbb5d596805b6ce6d2ec055eb5d0cd0f73e7d5d6
-  data.tar.gz: b967fc6beb11b41889b0574b937b94532910acba29e9b349e2ec40289fcb57bd9096ea4cf06756a5db05acdc5f9a13a51c1c3474fb8fe85709e1c68fafe703dc
+  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,8 +12,8 @@ module CollavreOpenclaw
       end
     end
 
-    # @param messages_input [Hash, Array] Hash { messages:, first_message:, context_changed: }
-    #   from MessageBuilder, or a plain Array from standalone callers (e.g., CompressJob).
+    # @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)
@@ -23,10 +23,13 @@ module CollavreOpenclaw
 
       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
         )
 

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
     #
@@ -72,27 +74,12 @@ module CollavreOpenclaw
 
     private
 
-    CONTEXT_KINDS = %i[creative_context context_creative referenced_creative].freeze
-
     def parse_messages_data!(data)
       @all_messages    = data[:messages] || []
       @first_message   = data[:first_message]
       @context_changed = data[:context_changed]
     end
 
-    def context_messages
-      @all_messages.select { |m| CONTEXT_KINDS.include?(m[:kind]) }
-    end
-
-    def trigger_message
-      @all_messages.find { |m| m[:kind] == :trigger }
-    end
-
-    # Send system prompt and context on first message or when they changed.
-    def include_full_context?
-      @first_message || @context_changed
-    end
-
     # ─────────────────────────────────────────────
     # WebSocket transport
     # ─────────────────────────────────────────────
@@ -159,42 +146,24 @@ module CollavreOpenclaw
       end
     end
 
-    # Build WebSocket chat.send payload.
-    #
-    # Token optimization: only includes system prompt and creative context on
-    # the first message or when context has changed. The Gateway maintains its
-    # own session history, so chat history is never sent — only the trigger.
     def build_ws_chat_payload
-      trigger = trigger_message
       {
         message: format_message_for_ws,
-        attachments: trigger ? extract_ws_attachments([ trigger ]).presence : nil
+        attachments: extract_ws_attachments(@all_messages).presence
       }
     end
 
-    # Format messages for WebSocket chat.send text payload.
-    #
-    # On first message (or context change):
-    #   [system prompt] + [creative context] + [trigger]
-    # On subsequent messages:
-    #   [trigger only]
-    #
-    # Chat history is NOT included — the Gateway's SessionManager tracks
-    # conversation turns automatically.
+    # SessionContextResolver already decided what to include.
+    # We just format and send everything we received.
     def format_message_for_ws
       parts = []
+      parts << @system_prompt if @system_prompt.present?
 
-      if include_full_context?
-        parts << @system_prompt if @system_prompt.present?
-        context_messages.each do |m|
-          text = extract_message_text(m)
-          parts << text if text.present?
-        end
+      @all_messages.each do |m|
+        text = extract_message_text(m)
+        parts << text if text.present?
       end
 
-      trigger = trigger_message
-      parts << extract_message_text(trigger) if trigger
-
       parts.join("\n\n")
     end
 
@@ -347,28 +316,14 @@ module CollavreOpenclaw
     # HTTP payload building
     # ─────────────────────────────────────────────
 
-    # Build HTTP payload with token optimization.
-    #
-    # On first message (or context change):
-    #   system prompt + creative context + trigger
-    # On subsequent messages:
-    #   trigger only
-    #
-    # Chat history is NOT included — the Gateway's SessionManager tracks
-    # conversation turns via the stable session key.
+    # 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"
 
       formatted = []
-
-      if include_full_context?
-        formatted << { role: "system", content: @system_prompt } if @system_prompt.present?
-        context_messages.each { |m| formatted << format_single_message(m) }
-      end
-
-      trigger = trigger_message
-      formatted << format_single_message(trigger) if trigger
+      formatted << { role: "system", content: @system_prompt } if @system_prompt.present?
+      @all_messages.each { |m| formatted << format_single_message(m) }
 
       {
         model: model_value,

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
@@ -659,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.6.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.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Collavre