smart_agent 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666973e72e303998abcf62405a78a124205ccdbc741c011d3a3cec05a234e7a0
-  data.tar.gz: eaf248d80cd7f5c203cfde80de6dc1ed9827539173dce3afb704e5661631cf77
+  metadata.gz: dffe825327912ea1a49ffba0cc2630a7e0078edbd9e2ac14b587b983c54ff7cd
+  data.tar.gz: e8efe4bb5e25e2f5b933b6c74dce6aa05249f5ef09967ee4e4d86abdd94611f2
 SHA512:
-  metadata.gz: bcf37c58978695dd35a844a31ea998f30cc8035c8b51b4267b47ab9a90d29d0d4b59de0a67194632c641e2737de1bc1692452d31fa1640b89e344760cb2e62e4
-  data.tar.gz: c4f6a71d195797d30ebf34a82c02e5f637bd31e3085ac056092189199628b0c34b6d23d54be3936e4c13d02d8e879c228840e2c66b3c66f16334b6cb0b7010de
+  metadata.gz: f6f921ece654b0352aef2dc0a215231d17a367dc4129969a5ec58b22e98d4d06f0ed6c72392b2a1d9f9d103989db119647e6e154d7e8f6d79deea61e7cd22c48
+  data.tar.gz: 9efad024502c4024b1f866a63b768b73d2529910de4f2cbb5c69e0a45b11ed5be7624c0abb08942fbdb28afabfdc8249626a690126808862b3d0d72427da690f

data/lib/smart_agent/agent.rb

@@ -72,6 +72,8 @@ module SmartAgent
     def call_worker(name, params, with_tools: true, with_history: false)
       SmartAgent.logger.info("Call Worker name is: #{name}")
       SmartAgent.logger.info("Call Worker params is: #{params}")
+      # 记录 session_id，call_tools 写工具结果时需要按 session 路由（HistoryManager 启用时）
+      @session_id = params[:session_id]
       if with_tools
         simple_tools = []
         if @agent.tools
@@ -107,46 +109,47 @@ module SmartAgent
     end
 
     def safe_parse(input)
-      # 保存原始输入用于调试
-      original_input = input.dup
+      return input unless input.is_a?(String)
 
-      # 步骤1: 清理输入
-      cleaned = input.strip
-
-      # 步骤2: 处理外层引号（如果存在）
-      if cleaned.start_with?('"') && cleaned.end_with?('"')
-        cleaned = cleaned[1...-1]
+      begin
+        return JSON.parse(input)
+      rescue JSON::ParserError
+        nil
       end
 
-      # 步骤3: 反转义双重转义字符
-      # 关键：只处理需要反转义的字符，保持JSON合法性
-      cleaned = cleaned
-        .gsub(/\\"/, '"') # 反转义引号
-        .gsub(/\\\\/, '\\')    # 反转义反斜杠
-      # 不反转义\n, \t, \r等，因为它们是JSON合法的转义序列
-
-      # 步骤4: 尝试解析
-      begin
-        return JSON.parse(cleaned)
-      rescue JSON::ParserError => e
-        # 如果清理后失败，尝试原始输入
+      stripped = input.strip
+      if stripped.start_with?('"') && stripped.end_with?('"')   # 双重编码: "{\"command\":\"ls\"}"
         begin
-          return JSON.parse(original_input)
+          inner = JSON.parse(stripped)
+          return JSON.parse(inner) if inner.is_a?(String)
         rescue JSON::ParserError
-          puts "Failed to parse JSON: #{e.message}"
-          puts "Original: #{original_input}"
-          puts "Cleaned: #{cleaned}"
-          # 返回原始字符串以便后续处理
-          return original_input
+          nil
         end
       end
-    end
 
-    def call_tools(result)
+      begin
+        JSON.parse(stripped.gsub(/\\"/, '"'))   # 只做引号级清理，不碰反斜杠
+      rescue JSON::ParserError => e
+        SmartAgent.logger&.warn("safe_parse failed: #{e.class}: #{e.message} input=#{input[0, 200].inspect}")
+        input
+      end
+    end
+    
+    def call_tools(result, calls: nil)
       @agent.processor(:tool).call({ :status => :start }) if @agent.processor(:tool)
       SmartAgent.logger.info("call tools: " + result.to_s)
       results = []
-      result.call_tools.each do |tool|
+      completed_calls = []
+      completed_messages = []
+      # DeepSeek thinking 模式要求带 tool_calls 的 assistant 消息回传 reasoning_content，否则 400
+      reasoning = begin
+        result.response.dig("choices", 0, "message", "reasoning_content")
+      rescue StandardError
+        nil
+      end
+      # 调用方可传入 calls: 覆盖本次要执行的工具调用集合（如截断 / DSML 兑底解析后的结果）
+      source = calls || result.call_tools
+      (source || []).each do |tool|
         tool_call_id = tool["id"]
         tool_name = tool["function"]["name"].to_sym
         params = safe_parse(tool["function"]["arguments"])
@@ -154,8 +157,8 @@ module SmartAgent
           tool_result = Tool.find_tool(tool_name).call(params, @agent)
           if tool_result
             @agent.processor(:tool).call({ :content => tool_result }) if @agent.processor(:tool)
-            SmartAgent.prompt_engine.history_messages << { "role" => "assistant", "content" => "", "tool_calls" => [tool] } #result.response.dig("choices", 0, "message")
-            SmartAgent.prompt_engine.history_messages << { "role" => "tool", "tool_call_id" => tool_call_id, "content" => tool_result.to_s.force_encoding("UTF-8") }
+            completed_calls << tool
+            completed_messages << { "role" => "tool", "tool_call_id" => tool_call_id, "content" => tool_result.to_s.force_encoding("UTF-8") }
             results << tool_result
           end
         end
@@ -163,8 +166,8 @@ module SmartAgent
           tool_result = MCPClient.new(server_name).call(tool_name, params, @agent)
           if tool_result
             @agent.processor(:tool).call({ :content => tool_result }) if @agent.processor(:tool)
-            SmartAgent.prompt_engine.history_messages << { "role" => "assistant", "content" => "", "tool_calls" => [tool] } # result.response.dig("choices", 0, "message")
-            SmartAgent.prompt_engine.history_messages << { "role" => "tool", "tool_call_id" => tool_call_id, "content" => tool_result.to_s }
+            completed_calls << tool
+            completed_messages << { "role" => "tool", "tool_call_id" => tool_call_id, "content" => tool_result.to_s }
             results << tool_result
           end
         end
@@ -172,6 +175,26 @@ module SmartAgent
       end
       @agent.processor(:tool).call({ :status => :end }) if @agent.processor(:tool)
       return results
+    ensure
+      # 每轮写一条 assistant 消息（含全部 tool_calls），而不是每个工具各写一条，
+      # 避免交错产生 assistant/tool/assistant/tool 序列；被中断时也保留已完成部分。
+      if completed_calls && completed_calls.any?
+        message = { "role" => "assistant", "content" => "", "tool_calls" => completed_calls }
+        message["reasoning_content"] = reasoning if reasoning
+        append_history_message(message)
+        completed_messages.each { |m| append_history_message(m) }
+      end
+    end
+
+    # 写历史：HistoryManager 可用时按 session 路由（否则工具结果写全局、读 session 会失忆），
+    # 不可用时回退到全局数组（与旧行为一致）。
+    def append_history_message(message)
+      engine = SmartAgent.prompt_engine
+      if engine.respond_to?(:history_manager) && engine.history_manager && @session_id
+        engine.history_manager.add_message(@session_id, message)
+      elsif engine.respond_to?(:history_messages)
+        engine.history_messages << message
+      end
     end
 
     def call_tool(name, params = {})

data/lib/smart_agent/version.rb

@@ -1,3 +1,3 @@
 module SmartAgent
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Zhuang Biaowei
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: mcp-sdk.rb
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.13
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Intelligent agent framework with DSL and MCP integration
 test_files: []