pwn 0.5.757 → 0.5.758

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9bcba2a6a58d7e3f7990a1dbbf0cc73a1234efe20bfd7dd0eae786ecc4c4c32
-  data.tar.gz: 252972a638225c5ddd3693839eb4fe7db2311529e3ceb2a32f69f0cc3056fd27
+  metadata.gz: 004ad4f77955698492a48591db3dad3f54d141fb94ddb7952211e86dc4945526
+  data.tar.gz: 5c76e0a2f71fdc1afd13f8af828c2027cb8183f3e73612d81f220b864b6df636
 SHA512:
-  metadata.gz: e581b4c0dd6a4b1e05beccfade96bc635f48bf47c63168209b4900e6fb68a9d8e0b2394b4f6458a5aa96a9373248a0f96adb9ae0dcdeea2210f10f908bae630c
-  data.tar.gz: c87a11936f1cf59e2d6373c2d941ccf33f5aa4edac9e91fa09e1c9b5b871bcf2def227c10a6659131bc4279e05c7b6d85e28eeb23ff701d3ebadb0a3359ba129
+  metadata.gz: ffe44c731211488e5d07938e29dc1c503307801de30d0c2effc55d139d0f00b0a40a7deeda375f05b581ea88e379b9b82f031b589236bd5a08edd590078b3511
+  data.tar.gz: 9c8275fd41e044aed262bcbe7fcf9fe00694b43227030ba1ce90d907c6e68b54efa53dacd3c3cb712890acc159005f5ecd4c9cf1caf065de8032cfc4123041de

data/lib/pwn/ai/ollama.rb

@@ -436,6 +436,9 @@ module PWN
       # - function.arguments must be a Hash/Array object, not a JSON string
       #   (string args → HTTP 400 "can't find closing '}' symbol")
       # - assistant content nil + tool_calls → "" (Open WebUI form validation)
+      # - system/developer rows after the first message are merged into one
+      #   leading system message. Qwen-style templates raise HTTP 500
+      #   "System message must be at the beginning" otherwise.
       private_class_method def self.parse_tool_arguments_object(opts = {})
         raw = opts[:arguments]
         case raw
@@ -458,7 +461,7 @@ module PWN
       end
 
       private_class_method def self.normalize_messages_for_ollama(opts = {})
-        Array(opts[:messages]).filter_map do |m|
+        rows = Array(opts[:messages]).filter_map do |m|
           next unless m.is_a?(Hash)
 
           role = (m[:role] || m['role']).to_s
@@ -508,6 +511,71 @@ module PWN
 
           out
         end
+        lead_system(messages: rows, fold_into_user: opts[:fold_into_user])
+      end
+
+      # One system role is only safe when the server does not already prepend one.
+      # Models whose template raises "System message must be at the beginning"
+      # already carry a Modelfile SYSTEM prompt. Fold client system text into
+      # the first user message instead of sending a second system role.
+      private_class_method def self.lead_system(opts = {})
+        parts = []
+        rest = []
+        Array(opts[:messages]).each do |row|
+          next unless row.is_a?(Hash)
+
+          role = (row[:role] || row['role']).to_s
+          if %w[system developer].include?(role)
+            text = (row.key?(:content) ? row[:content] : row['content']).to_s
+            parts << text unless text.strip.empty?
+          else
+            rest << row
+          end
+        end
+        return rest if parts.empty?
+
+        text = parts.join("\n\n")
+        return [{ role: 'system', content: text }] + rest unless opts[:fold_into_user]
+
+        user = rest.find { |row| (row[:role] || row['role']).to_s == 'user' }
+        if user
+          body = (user.key?(:content) ? user[:content] : user['content']).to_s
+          user[:content] = "#{text}\n\n#{body}"
+          user.delete('content')
+          rest
+        else
+          [{ role: 'user', content: text }] + rest
+        end
+      end
+
+      private_class_method def self.strict_system_template?(opts = {})
+        name = opts[:model].to_s.strip
+        return false if name.empty?
+
+        @strict_system_cache ||= {}
+        return @strict_system_cache[name] if @strict_system_cache.key?(name)
+
+        @strict_system_cache[name] = template_rejects_later_system?(model: name)
+      rescue StandardError
+        false
+      end
+
+      private_class_method def self.template_rejects_later_system?(opts = {})
+        name = opts[:model].to_s
+        names = [name]
+        names << "#{name}:latest" unless name.include?(':')
+        names.each do |candidate|
+          raw = ollama_rest_call(
+            http_method: :post, rest_call: 'api/show',
+            http_body: { model: candidate }, timeout: 8, quiet: true, non_interactive: true
+          )
+          template = PWN::AI::ModelCatalog.parse_row(raw: raw)
+          text = template.is_a?(Hash) ? (template[:template] || template['template']).to_s : ''
+          return true if text.include?('System message must be at the beginning')
+        end
+        false
+      rescue StandardError
+        false
       end
 
       # Supported Method Parameters::
@@ -526,13 +594,16 @@ module PWN
       # NDJSON chunks back into a single response.
 
       public_class_method def self.chat_with_tools(opts = {})
-        engine   = PWN::Env[:ai][:ollama]
-        messages = normalize_messages_for_ollama(messages: opts[:messages])
-        raise 'ERROR: messages array is required' if messages.nil? || messages.empty?
-
+        engine = PWN::Env[:ai][:ollama]
         model = opts[:model] ||= engine[:model]
         raise 'ERROR: Model is required.  Call #get_models method for details' if model.nil?
 
+        messages = normalize_messages_for_ollama(
+          messages: opts[:messages],
+          fold_into_user: strict_system_template?(model: model)
+        )
+        raise 'ERROR: messages array is required' if messages.nil? || messages.empty?
+
         temp = opts[:temp].to_f
         temp = engine[:temp].to_f.nonzero? || 1 if temp.zero?
 
@@ -656,6 +727,10 @@ module PWN
         end
 
         http_body[:messages].push(user_role)
+        http_body[:messages] = lead_system(
+          messages: http_body[:messages],
+          fold_into_user: strict_system_template?(model: model)
+        )
 
         timeout = opts[:timeout]
         spinner = opts[:spinner]

data/lib/pwn/ai/open_web_ui.rb

@@ -468,6 +468,9 @@ module PWN
       # - function.arguments must be a Hash/Array object, not a JSON string
       #   (string args → HTTP 400 "can't find closing '}' symbol")
       # - assistant content nil + tool_calls → "" (Open WebUI form validation)
+      # - system/developer rows after the first message are merged into one
+      #   leading system message. Qwen-style templates raise HTTP 500
+      #   "System message must be at the beginning" otherwise.
       private_class_method def self.parse_tool_arguments_object(opts = {})
         raw = opts[:arguments]
         case raw
@@ -490,7 +493,7 @@ module PWN
       end
 
       private_class_method def self.normalize_messages_for_ollama(opts = {})
-        Array(opts[:messages]).filter_map do |m|
+        rows = Array(opts[:messages]).filter_map do |m|
           next unless m.is_a?(Hash)
 
           role = (m[:role] || m['role']).to_s
@@ -540,6 +543,71 @@ module PWN
 
           out
         end
+        lead_system(messages: rows, fold_into_user: opts[:fold_into_user])
+      end
+
+      # One system role is only safe when the server does not already prepend one.
+      # mini-mythos-mission-ready has a Modelfile SYSTEM prompt and a template that
+      # raises if any later message has role system. Fold those rows into the
+      # first user message instead of sending a second system role.
+      private_class_method def self.lead_system(opts = {})
+        parts = []
+        rest = []
+        Array(opts[:messages]).each do |row|
+          next unless row.is_a?(Hash)
+
+          role = (row[:role] || row['role']).to_s
+          if %w[system developer].include?(role)
+            text = (row.key?(:content) ? row[:content] : row['content']).to_s
+            parts << text unless text.strip.empty?
+          else
+            rest << row
+          end
+        end
+        return rest if parts.empty?
+
+        text = parts.join("\n\n")
+        return [{ role: 'system', content: text }] + rest unless opts[:fold_into_user]
+
+        user = rest.find { |row| (row[:role] || row['role']).to_s == 'user' }
+        if user
+          body = (user.key?(:content) ? user[:content] : user['content']).to_s
+          user[:content] = "#{text}\n\n#{body}"
+          user.delete('content')
+          rest
+        else
+          [{ role: 'user', content: text }] + rest
+        end
+      end
+
+      private_class_method def self.strict_system_template?(opts = {})
+        name = opts[:model].to_s.strip
+        return false if name.empty?
+
+        @strict_system_cache ||= {}
+        return @strict_system_cache[name] if @strict_system_cache.key?(name)
+
+        @strict_system_cache[name] = template_rejects_later_system?(model: name)
+      rescue StandardError
+        false
+      end
+
+      private_class_method def self.template_rejects_later_system?(opts = {})
+        name = opts[:model].to_s
+        names = [name]
+        names << "#{name}:latest" unless name.include?(':')
+        names.each do |candidate|
+          raw = openwebui_rest_call(
+            http_method: :post, rest_call: 'ollama/api/show',
+            http_body: { model: candidate }, timeout: 8, quiet: true, non_interactive: true
+          )
+          template = PWN::AI::ModelCatalog.parse_row(raw: raw)
+          text = template.is_a?(Hash) ? (template[:template] || template['template']).to_s : ''
+          return true if text.include?('System message must be at the beginning')
+        end
+        false
+      rescue StandardError
+        false
       end
 
       # Supported Method Parameters::
@@ -559,13 +627,16 @@ module PWN
       # Bare POST /api/chat is not an API route on stock Open WebUI (405).
 
       public_class_method def self.chat_with_tools(opts = {})
-        engine   = PWN::Env[:ai][:openwebui]
-        messages = normalize_messages_for_ollama(messages: opts[:messages])
-        raise 'ERROR: messages array is required' if messages.nil? || messages.empty?
-
+        engine = PWN::Env[:ai][:openwebui]
         model = opts[:model] ||= engine[:model]
         raise 'ERROR: Model is required.  Call #get_models method for details' unless real_config_value?(value: model)
 
+        messages = normalize_messages_for_ollama(
+          messages: opts[:messages],
+          fold_into_user: strict_system_template?(model: model)
+        )
+        raise 'ERROR: messages array is required' if messages.nil? || messages.empty?
+
         temp = opts[:temp].to_f
         temp = engine[:temp].to_f.nonzero? || 1 if temp.zero?
 
@@ -682,6 +753,10 @@ module PWN
         end
 
         http_body[:messages].push(user_role)
+        http_body[:messages] = lead_system(
+          messages: http_body[:messages],
+          fold_into_user: strict_system_template?(model: model)
+        )
 
         timeout = opts[:timeout]
         spinner = opts[:spinner]

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.5.757'
+  VERSION = '0.5.758'
 end

data/spec/lib/pwn/ai/ollama_spec.rb

@@ -12,10 +12,11 @@ describe PWN::AI::Ollama do
       allow(described_class).to receive(:sleep)
       allow(described_class).to receive(:rand).and_return(0.5)
       allow(PWN::AI::HttpRetry).to receive(:report_event)
+      described_class.instance_variable_set(:@strict_system_cache, nil)
       expect do
         described_class.chat_with_tools(messages: [{ role: 'user', content: 'hello' }], quiet: quiet)
       end.to raise_error(RuntimeError, /Ollama.*429.*rate limit exceeded/)
-      expect(RestClient::Request).to have_received(:execute).exactly(5).times
+      expect(RestClient::Request).to have_received(:execute).exactly(6).times
       expect(described_class).to have_received(:sleep).with(2.5).exactly(4).times
     end
   end

data/spec/lib/pwn/ai/ollama_system_message_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Ollama and Open WebUI system-message placement' do
+  it 'puts a later Ollama system message first so the chat template does not 500' do
+    engine = { model: 'mini-mythos-mission-ready', num_ctx: 2048, keep_alive: '1m', temp: 0.1, tool_temp: 0.1 }
+    allow(PWN::Env).to receive(:[]).and_call_original
+    allow(PWN::Env).to receive(:[]).with(:ai).and_return({ ollama: engine, active: 'ollama' })
+    captured = nil
+    allow(PWN::AI::Ollama).to receive(:ollama_rest_call) do |**kwargs|
+      captured = kwargs[:http_body]
+      '{"message":{"role":"assistant","content":"ok"}}'
+    end
+    PWN::AI::Ollama.chat_with_tools(
+      model: 'mini-mythos-mission-ready',
+      messages: [
+        { role: 'user', content: 'hello' },
+        { role: 'system', content: 'must lead' },
+        { role: 'developer', content: 'also lead' }
+      ]
+    )
+    expect(captured[:messages].map { |row| row[:role] }).to eq(%w[system user])
+    expect(captured[:messages][0][:content]).to include('must lead', 'also lead')
+  end
+
+  it 'folds Open WebUI system text into the user message when the template rejects a second system role' do
+    engine = { model: 'mini-mythos-mission-ready:latest', num_ctx: 2048, keep_alive: '1m', temp: 0.1, tool_temp: 0.1 }
+    allow(PWN::Env).to receive(:[]).and_call_original
+    allow(PWN::Env).to receive(:[]).with(:ai).and_return({ openwebui: engine, active: 'openwebui' })
+    PWN::AI::OpenWebUI.instance_variable_set(:@strict_system_cache, nil)
+    captured = nil
+    allow(PWN::AI::OpenWebUI).to receive(:openwebui_rest_call) do |**kwargs|
+      if kwargs[:rest_call].to_s.end_with?('show')
+        { template: "raise_exception('System message must be at the beginning.')" }.to_json
+      else
+        captured = kwargs[:http_body]
+        '{"message":{"role":"assistant","content":"ok"}}'
+      end
+    end
+    PWN::AI::OpenWebUI.chat_with_tools(
+      model: 'mini-mythos-mission-ready:latest',
+      messages: [
+        { role: 'system', content: 'operator rules' },
+        { role: 'user', content: 'ping' },
+        { role: 'system', content: 'ENGAGEMENT MEMORY' }
+      ]
+    )
+    expect(captured[:messages].map { |row| row[:role] }).to eq(%w[user])
+    expect(captured[:messages][0][:content]).to include('operator rules', 'ENGAGEMENT MEMORY', 'ping')
+  end
+end

data/spec/lib/pwn/ai/open_web_ui_spec.rb

@@ -12,10 +12,11 @@ describe PWN::AI::OpenWebUI do
       allow(described_class).to receive(:sleep)
       allow(described_class).to receive(:rand).and_return(0.5)
       allow(PWN::AI::HttpRetry).to receive(:report_event)
+      described_class.instance_variable_set(:@strict_system_cache, nil)
       expect do
         described_class.chat_with_tools(messages: [{ role: 'user', content: 'hello' }], quiet: quiet)
       end.to raise_error(RuntimeError, /Open WebUI.*429.*rate limit exceeded/)
-      expect(RestClient::Request).to have_received(:execute).exactly(5).times
+      expect(RestClient::Request).to have_received(:execute).exactly(6).times
       expect(described_class).to have_received(:sleep).with(2.5).exactly(4).times
     end
   end
@@ -83,6 +84,33 @@ describe PWN::AI::OpenWebUI do
     expect(captured_chat[:stream]).to be true
   end
 
+  it 'merges later system and developer messages into one leading system message' do
+    engine = { model: 'mini-mythos-mission-ready', num_ctx: 2048, keep_alive: '1m', temp: 0.1, tool_temp: 0.1 }
+    allow(PWN::Env).to receive(:[]).and_call_original
+    allow(PWN::Env).to receive(:[]).with(:ai).and_return({ openwebui: engine, active: 'openwebui' })
+    captured = nil
+    allow(described_class).to receive(:openwebui_rest_call) do |**kwargs|
+      captured = kwargs[:http_body]
+      '{"message":{"role":"assistant","content":"ok"}}'
+    end
+    described_class.chat_with_tools(
+      messages: [
+        { role: 'system', content: 'operator rules' },
+        { role: 'user', content: 'hello' },
+        { role: 'system', content: 'ENGAGEMENT MEMORY\nnotes' },
+        { role: 'developer', content: 'mid-turn reminder' },
+        { role: 'assistant', content: '', tool_calls: [{ id: 'c1', type: 'function', function: { name: 'shell', arguments: '{"cmd":"id"}' } }] }
+      ],
+      model: 'mini-mythos-mission-ready'
+    )
+    roles = captured[:messages].map { |row| row[:role] }
+    expect(roles).to eq(%w[system user assistant])
+    expect(captured[:messages][0][:content]).to include('operator rules')
+    expect(captured[:messages][0][:content]).to include('ENGAGEMENT MEMORY')
+    expect(captured[:messages][0][:content]).to include('mid-turn reminder')
+    expect(captured[:messages][2][:tool_calls].first[:function][:arguments]).to eq({ cmd: 'id' })
+  end
+
   it 'assembles native /api/chat NDJSON stream into a single message' do
     body = [
       { model: 'm', message: { role: 'assistant', content: 'Hel' }, done: false }.to_json,

data/third_party/pwn_rdoc.jsonl

@@ -1201,6 +1201,7 @@
 {"messages":[{"role":"user","content":"PWN::AI::Ollama.get_model Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.get_model`: Supported Method Parameters\n\nmodel = PWN::AI::Ollama.get_model(name: ‘required - tag name’)\n\nLocal tags have size and family, not token prices. get_model reads /api/show for that tag and returns it. Missing pricing stays missing.\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Ollama.get_models Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.get_models`: Supported Method Parameters\n\nresponse = PWN::AI::Ollama.get_models\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Ollama.help Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.help`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::Ollama.lead_system Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.lead_system`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Ollama.normalize_messages_for_ollama Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.normalize_messages_for_ollama`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Ollama.ollama_rest_call Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.ollama_rest_call`: Supported Method Parameters\n\nollama_rest_call(\n\nhttp_method: 'optional HTTP method (defaults to GET)',\nrest_call: 'required rest call path relative to base_uri (e.g. api/chat)',\nparams: 'optional params passed in the URI or HTTP Headers',\nhttp_body: 'optional HTTP body sent in HTTP methods that support it e.g. POST',\ntimeout: 'optional timeout in seconds (defaults to 900)',\nspinner: 'optional - display spinner (defaults to false)'\n\n)\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Ollama.parse_tool_arguments_object Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.parse_tool_arguments_object`: "}]}
@@ -1252,6 +1253,7 @@
 {"messages":[{"role":"user","content":"PWN::AI::OpenWebUI.get_model Usage"},{"role":"assistant","content":"`PWN::AI::OpenWebUI.get_model`: Supported Method Parameters\n\nmodel = PWN::AI::OpenWebUI.get_model(name: ‘required - model id’)\n\nOpen WebUI mixes OpenAI-compat rows and proxied Ollama tags. A direct model route is tried first; otherwise the already-fetched catalog row is returned. Local tags without a price stay unpriced.\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::OpenWebUI.get_models Usage"},{"role":"assistant","content":"`PWN::AI::OpenWebUI.get_models`: Supported Method Parameters\n\nresponse = PWN::AI::OpenWebUI.get_models\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::OpenWebUI.help Usage"},{"role":"assistant","content":"`PWN::AI::OpenWebUI.help`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::OpenWebUI.lead_system Usage"},{"role":"assistant","content":"`PWN::AI::OpenWebUI.lead_system`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::OpenWebUI.normalize_messages_for_ollama Usage"},{"role":"assistant","content":"`PWN::AI::OpenWebUI.normalize_messages_for_ollama`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::OpenWebUI.openwebui_rest_call Usage"},{"role":"assistant","content":"`PWN::AI::OpenWebUI.openwebui_rest_call`: Supported Method Parameters\n\nopenwebui_rest_call(\n\nhttp_method: 'optional HTTP method (defaults to GET)',\nrest_call: 'required rest call path relative to base_uri',\nparams: 'optional params passed in the URI or HTTP Headers',\nhttp_body: 'optional HTTP body sent in HTTP methods that support it e.g. POST',\ntimeout: 'optional timeout in seconds (defaults to 900)',\nspinner: 'optional - display spinner (defaults to false)'\n\n)\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::OpenWebUI.parse_tool_arguments_object Usage"},{"role":"assistant","content":"`PWN::AI::OpenWebUI.parse_tool_arguments_object`: "}]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.757
+  version: 0.5.758
 platform: ruby
 authors:
 - 0day Inc.
@@ -6754,6 +6754,7 @@ files:
 - spec/lib/pwn/ai/model_catalog_spec.rb
 - spec/lib/pwn/ai/model_lookup_spec.rb
 - spec/lib/pwn/ai/ollama_spec.rb
+- spec/lib/pwn/ai/ollama_system_message_spec.rb
 - spec/lib/pwn/ai/open_ai_oauth_transport_spec.rb
 - spec/lib/pwn/ai/open_ai_spec.rb
 - spec/lib/pwn/ai/open_web_ui_spec.rb