smart_agent 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d47b79a77d34353e5bc8edf2b872e2fc86f33a86e89ad4b27071829ea5f50621
-  data.tar.gz: 43bbcf0ae440c94fd9ff2aa8f1e4cd28acd7d984850ae7d63c3dcbc1173c78e3
+  metadata.gz: dffe825327912ea1a49ffba0cc2630a7e0078edbd9e2ac14b587b983c54ff7cd
+  data.tar.gz: e8efe4bb5e25e2f5b933b6c74dce6aa05249f5ef09967ee4e4d86abdd94611f2
 SHA512:
-  metadata.gz: 67269ed3772754ca359b5eecfe4fadfdeb6cbd6d836c6421a39ae0e458d0bee0135ec669bf2894fd13f99557bedbceb6dfe12508cfa58b7f7e02bdb7601ab8aa
-  data.tar.gz: 002b98eef6bf175add168a8cc3b3af9d21234e135a6f7b7d7f2ba0dd715192883072de261520075112dc3d22be9cbd3c81788f7b3f637250bcbde0f512183068
+  metadata.gz: f6f921ece654b0352aef2dc0a215231d17a367dc4129969a5ec58b22e98d4d06f0ed6c72392b2a1d9f9d103989db119647e6e154d7e8f6d79deea61e7cd22c48
+  data.tar.gz: 9efad024502c4024b1f866a63b768b73d2529910de4f2cbb5c69e0a45b11ed5be7624c0abb08942fbdb28afabfdc8249626a690126808862b3d0d72427da690f

data/lib/smart_agent/agent.rb

@@ -109,41 +109,32 @@ 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
 
+      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)

data/lib/smart_agent/version.rb

@@ -1,3 +1,3 @@
 module SmartAgent
-  VERSION = "0.2.9"
+  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.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Zhuang Biaowei