collavre_openclaw 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47fb3ac9892c9b3c1ee7531645732dd47acdba3b7504d048cd207ff8ae4fa82e
-  data.tar.gz: e6233d85c5bff7f28ad2201b0cb84df1fe6c62827cd23666de54ef64060f41d5
+  metadata.gz: ff18cc7843b54de3c5e86de861f69b9225aa47dd7e57aae94cd612d7698d1d55
+  data.tar.gz: 8b83ffc51769d3946de8660b0583ccc672079f08d80db9b93178c12c1c374279
 SHA512:
-  metadata.gz: 1a8b34146dedfcec60bc2b0b78ac4f9f51448c8b2bd3ee9064e24d24ac7854271e8cb943b5083da143ec9a18e7470b869e927f2b680db1518ff6a324897a0dc9
-  data.tar.gz: 6f97da70c3443dcda6087cfa114b5f068cb952e567b90849a07b27239d6df89c55cafa07f35e76a2c864337d02e56f9cc328e5bc33f8655af4fd87ec93c4dee7
+  metadata.gz: 54bf09a092ed87b269621100c55edadd8fd0591f41f25270672f27cf6837d3767dff33a3cff6bb6fe4315c90cbb5d596805b6ce6d2ec055eb5d0cd0f73e7d5d6
+  data.tar.gz: b967fc6beb11b41889b0574b937b94532910acba29e9b349e2ec40289fcb57bd9096ea4cf06756a5db05acdc5f9a13a51c1c3474fb8fe85709e1c68fafe703dc

data/app/services/collavre_openclaw/ai_client_extension.rb

@@ -12,8 +12,11 @@ module CollavreOpenclaw
       end
     end
 
-    def chat(contents, tools: [], &block)
+    # @param messages_input [Hash, Array] Hash { messages:, first_message:, context_changed: }
+    #   from MessageBuilder, 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]
@@ -31,13 +34,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 +52,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/openclaw_adapter.rb

@@ -20,7 +20,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 +41,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 +72,27 @@ 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
     # ─────────────────────────────────────────────
@@ -83,14 +107,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 +145,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,72 +155,46 @@ 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)
+    # 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(messages),
-        attachments: extract_ws_attachments(messages).presence
+        message: format_message_for_ws,
+        attachments: trigger ? extract_ws_attachments([ trigger ]).presence : nil
       }
     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).
+    # On first message (or context change):
+    #   [system prompt] + [creative context] + [trigger]
+    # On subsequent messages:
+    #   [trigger only]
     #
-    # 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?
-
+    # Chat history is NOT included — the Gateway's SessionManager tracks
+    # conversation turns automatically.
+    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"
-
-        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}"
+      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
       end
 
+      trigger = trigger_message
+      parts << extract_message_text(trigger) if trigger
+
       parts.join("\n\n")
     end
 
@@ -297,13 +295,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 +347,35 @@ module CollavreOpenclaw
     # HTTP payload building
     # ─────────────────────────────────────────────
 
-    def build_payload(messages)
+    # 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.
+    def build_payload
       agent_id = extract_agent_id_from_email
       model_value = agent_id.present? ? "openclaw:#{agent_id}" : "openclaw"
 
-      payload = {
-        model: model_value,
-        messages: format_messages(messages),
-        stream: true
-      }
+      formatted = []
 
-      if @system_prompt.present?
-        payload[:messages].unshift({ role: "system", content: @system_prompt })
+      if include_full_context?
+        formatted << { role: "system", content: @system_prompt } if @system_prompt.present?
+        context_messages.each { |m| formatted << format_single_message(m) }
       end
 
-      payload[:user] = build_user_context
-      payload
+      trigger = trigger_message
+      formatted << format_single_message(trigger) if trigger
+
+      {
+        model: model_value,
+        messages: formatted,
+        stream: true,
+        user: build_user_context
+      }
     end
 
     def build_user_context
@@ -400,28 +411,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

@@ -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!

data/lib/collavre_openclaw/version.rb

@@ -1,3 +1,3 @@
 module CollavreOpenclaw
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 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.0
 platform: ruby
 authors:
 - Collavre