p-api-agent 0.0.7 → 0.0.8

package/dist/index.cjs

@@ -152,6 +152,7 @@ var Agent = class {
     };
     const result = { result: "", use_tools: [] };
     const tool_fail_count = {};
+    let format_fail_count = 0;
     for (let turn = 0; turn < this.max_loop; turn++) {
       let raw;
       try {
@@ -162,8 +163,19 @@ var Agent = class {
       }
       const cmd = this.parse_command(raw);
       if (!cmd) {
-        result.result = raw;
-        return result;
+        format_fail_count++;
+        history.push({
+          role: "user",
+          content: [{
+            type: "text",
+            text: '\u4F60\u7684\u4E0A\u4E00\u6761\u8F93\u51FA\u683C\u5F0F\u4E0D\u5408\u6CD5\u3002\u8BF7\u4E25\u683C\u53EA\u8FD4\u56DE\u4E00\u6761 JSON \u6307\u4EE4\uFF0C\u4E14\u5FC5\u987B\u4F7F\u7528 {"command":"end"|"use_tool"|"no_ability", ...} \u7ED3\u6784\uFF0C\u4E0D\u8981\u8F93\u51FA <|FunctionCallBegin|>\u3001tool_calls\u3001\u6570\u7EC4\u5305\u88F9\u6216\u4EFB\u4F55\u989D\u5916\u6587\u672C\u3002'
+          }]
+        });
+        if (format_fail_count >= 2) {
+          result.result = "LLM\u8F93\u51FA\u683C\u5F0F\u4E0D\u7B26\u5408\u534F\u8BAE\uFF0C\u8BF7\u68C0\u67E5\u7CFB\u7EDF\u63D0\u793A\u8BCD\u6216\u6A21\u578B\u914D\u7F6E";
+          return result;
+        }
+        continue;
       }
       if (cmd.command === "end") {
         result.result = cmd.result;
@@ -261,133 +273,16 @@ ${tool_schemas}`;
     return [...input];
   }
   parse_command(raw) {
-    const normalized = this.normalize_llm_output(raw);
-    const json = this.safe_extract_json(normalized);
-    if (!json) return null;
-    if (typeof json.command === "string") {
-      return json;
-    }
-    return this.adapt_common_tool_call(json);
+    const json = this.safe_extract_json(raw);
+    if (!json || typeof json.command !== "string") return null;
+    return json;
   }
   safe_extract_json(content) {
     try {
       return LLM_Utils.extract_json(content);
     } catch {
-      const json_candidate = this.find_first_json_block(content);
-      if (!json_candidate) return null;
-      try {
-        return LLM_Utils.parse_json(json_candidate);
-      } catch {
-        return null;
-      }
-    }
-  }
-  /**
-   * 兼容部分模型返回的函数调用包裹标记，例如：
-   * <|FunctionCallBegin|> ... <|FunctionCallEnd|>
-   */
-  normalize_llm_output(raw) {
-    return raw.replace(/<\|FunctionCallBegin\|>/gi, "").replace(/<\|FunctionCallEnd\|>/gi, "").replace(/<\|tool_call\|>/gi, "").replace(/<tool_call>/gi, "").replace(/<\/tool_call>/gi, "").trim();
-  }
-  /** 从混杂文本中提取第一个 JSON 对象字符串 */
-  find_first_json_block(content) {
-    const fenced = content.match(/```json\s*([\s\S]*?)\s*```/i);
-    if (fenced?.[1]) return fenced[1];
-    const objectStart = content.indexOf("{");
-    const arrayStart = content.indexOf("[");
-    let start = -1;
-    let openChar = "{";
-    let closeChar = "}";
-    if (objectStart >= 0 && (arrayStart < 0 || objectStart < arrayStart)) {
-      start = objectStart;
-      openChar = "{";
-      closeChar = "}";
-    } else if (arrayStart >= 0) {
-      start = arrayStart;
-      openChar = "[";
-      closeChar = "]";
-    }
-    if (start < 0) return null;
-    let depth = 0;
-    let inString = false;
-    let escaped = false;
-    for (let i = start; i < content.length; i++) {
-      const ch = content[i];
-      if (inString) {
-        if (escaped) {
-          escaped = false;
-          continue;
-        }
-        if (ch === "\\") {
-          escaped = true;
-          continue;
-        }
-        if (ch === '"') {
-          inString = false;
-        }
-        continue;
-      }
-      if (ch === '"') {
-        inString = true;
-        continue;
-      }
-      if (ch === openChar) depth++;
-      if (ch === closeChar) {
-        depth--;
-        if (depth === 0) {
-          return content.slice(start, i + 1);
-        }
-      }
-    }
-    return null;
-  }
-  /** 兼容常见 Function Calling 输出结构并转换为内部指令 */
-  adapt_common_tool_call(json) {
-    if (Array.isArray(json) && json.length > 0) {
-      return this.adapt_common_tool_call(json[0]);
-    }
-    if (typeof json?.name === "string") {
-      const params = this.normalize_params(json.params ?? json.arguments ?? {});
-      return {
-        command: "use_tool",
-        tool_name: json.name,
-        params,
-        reasoning: typeof json.reasoning === "string" ? json.reasoning : void 0
-      };
-    }
-    if (typeof json?.function?.name === "string") {
-      const params = this.normalize_params(json.function.arguments ?? {});
-      return {
-        command: "use_tool",
-        tool_name: json.function.name,
-        params,
-        reasoning: typeof json.reasoning === "string" ? json.reasoning : void 0
-      };
-    }
-    const first_tool_call = Array.isArray(json?.tool_calls) ? json.tool_calls[0] : null;
-    if (typeof first_tool_call?.function?.name === "string") {
-      const params = this.normalize_params(first_tool_call.function.arguments ?? {});
-      return {
-        command: "use_tool",
-        tool_name: first_tool_call.function.name,
-        params,
-        reasoning: typeof json.reasoning === "string" ? json.reasoning : void 0
-      };
-    }
-    return null;
-  }
-  normalize_params(params) {
-    if (params == null) return {};
-    if (typeof params === "string") {
-      try {
-        const parsed = LLM_Utils.parse_json(params);
-        return typeof parsed === "object" && parsed ? parsed : { value: parsed };
-      } catch {
-        return { value: params };
-      }
+      return null;
     }
-    if (typeof params === "object") return params;
-    return { value: params };
   }
   async call_llm_with_retry(input) {
     let last_error;

package/dist/index.d.cts

@@ -121,16 +121,6 @@ declare class Agent {
     private normalize_input;
     private parse_command;
     private safe_extract_json;
-    /**
-     * 兼容部分模型返回的函数调用包裹标记，例如：
-     * <|FunctionCallBegin|> ... <|FunctionCallEnd|>
-     */
-    private normalize_llm_output;
-    /** 从混杂文本中提取第一个 JSON 对象字符串 */
-    private find_first_json_block;
-    /** 兼容常见 Function Calling 输出结构并转换为内部指令 */
-    private adapt_common_tool_call;
-    private normalize_params;
     private call_llm_with_retry;
 }
 

package/dist/index.d.ts

@@ -121,16 +121,6 @@ declare class Agent {
     private normalize_input;
     private parse_command;
     private safe_extract_json;
-    /**
-     * 兼容部分模型返回的函数调用包裹标记，例如：
-     * <|FunctionCallBegin|> ... <|FunctionCallEnd|>
-     */
-    private normalize_llm_output;
-    /** 从混杂文本中提取第一个 JSON 对象字符串 */
-    private find_first_json_block;
-    /** 兼容常见 Function Calling 输出结构并转换为内部指令 */
-    private adapt_common_tool_call;
-    private normalize_params;
     private call_llm_with_retry;
 }
 

package/dist/index.js

@@ -123,6 +123,7 @@ var Agent = class {
     };
     const result = { result: "", use_tools: [] };
     const tool_fail_count = {};
+    let format_fail_count = 0;
     for (let turn = 0; turn < this.max_loop; turn++) {
       let raw;
       try {
@@ -133,8 +134,19 @@ var Agent = class {
       }
       const cmd = this.parse_command(raw);
       if (!cmd) {
-        result.result = raw;
-        return result;
+        format_fail_count++;
+        history.push({
+          role: "user",
+          content: [{
+            type: "text",
+            text: '\u4F60\u7684\u4E0A\u4E00\u6761\u8F93\u51FA\u683C\u5F0F\u4E0D\u5408\u6CD5\u3002\u8BF7\u4E25\u683C\u53EA\u8FD4\u56DE\u4E00\u6761 JSON \u6307\u4EE4\uFF0C\u4E14\u5FC5\u987B\u4F7F\u7528 {"command":"end"|"use_tool"|"no_ability", ...} \u7ED3\u6784\uFF0C\u4E0D\u8981\u8F93\u51FA <|FunctionCallBegin|>\u3001tool_calls\u3001\u6570\u7EC4\u5305\u88F9\u6216\u4EFB\u4F55\u989D\u5916\u6587\u672C\u3002'
+          }]
+        });
+        if (format_fail_count >= 2) {
+          result.result = "LLM\u8F93\u51FA\u683C\u5F0F\u4E0D\u7B26\u5408\u534F\u8BAE\uFF0C\u8BF7\u68C0\u67E5\u7CFB\u7EDF\u63D0\u793A\u8BCD\u6216\u6A21\u578B\u914D\u7F6E";
+          return result;
+        }
+        continue;
       }
       if (cmd.command === "end") {
         result.result = cmd.result;
@@ -232,133 +244,16 @@ ${tool_schemas}`;
     return [...input];
   }
   parse_command(raw) {
-    const normalized = this.normalize_llm_output(raw);
-    const json = this.safe_extract_json(normalized);
-    if (!json) return null;
-    if (typeof json.command === "string") {
-      return json;
-    }
-    return this.adapt_common_tool_call(json);
+    const json = this.safe_extract_json(raw);
+    if (!json || typeof json.command !== "string") return null;
+    return json;
   }
   safe_extract_json(content) {
     try {
       return LLM_Utils.extract_json(content);
     } catch {
-      const json_candidate = this.find_first_json_block(content);
-      if (!json_candidate) return null;
-      try {
-        return LLM_Utils.parse_json(json_candidate);
-      } catch {
-        return null;
-      }
-    }
-  }
-  /**
-   * 兼容部分模型返回的函数调用包裹标记，例如：
-   * <|FunctionCallBegin|> ... <|FunctionCallEnd|>
-   */
-  normalize_llm_output(raw) {
-    return raw.replace(/<\|FunctionCallBegin\|>/gi, "").replace(/<\|FunctionCallEnd\|>/gi, "").replace(/<\|tool_call\|>/gi, "").replace(/<tool_call>/gi, "").replace(/<\/tool_call>/gi, "").trim();
-  }
-  /** 从混杂文本中提取第一个 JSON 对象字符串 */
-  find_first_json_block(content) {
-    const fenced = content.match(/```json\s*([\s\S]*?)\s*```/i);
-    if (fenced?.[1]) return fenced[1];
-    const objectStart = content.indexOf("{");
-    const arrayStart = content.indexOf("[");
-    let start = -1;
-    let openChar = "{";
-    let closeChar = "}";
-    if (objectStart >= 0 && (arrayStart < 0 || objectStart < arrayStart)) {
-      start = objectStart;
-      openChar = "{";
-      closeChar = "}";
-    } else if (arrayStart >= 0) {
-      start = arrayStart;
-      openChar = "[";
-      closeChar = "]";
-    }
-    if (start < 0) return null;
-    let depth = 0;
-    let inString = false;
-    let escaped = false;
-    for (let i = start; i < content.length; i++) {
-      const ch = content[i];
-      if (inString) {
-        if (escaped) {
-          escaped = false;
-          continue;
-        }
-        if (ch === "\\") {
-          escaped = true;
-          continue;
-        }
-        if (ch === '"') {
-          inString = false;
-        }
-        continue;
-      }
-      if (ch === '"') {
-        inString = true;
-        continue;
-      }
-      if (ch === openChar) depth++;
-      if (ch === closeChar) {
-        depth--;
-        if (depth === 0) {
-          return content.slice(start, i + 1);
-        }
-      }
-    }
-    return null;
-  }
-  /** 兼容常见 Function Calling 输出结构并转换为内部指令 */
-  adapt_common_tool_call(json) {
-    if (Array.isArray(json) && json.length > 0) {
-      return this.adapt_common_tool_call(json[0]);
-    }
-    if (typeof json?.name === "string") {
-      const params = this.normalize_params(json.params ?? json.arguments ?? {});
-      return {
-        command: "use_tool",
-        tool_name: json.name,
-        params,
-        reasoning: typeof json.reasoning === "string" ? json.reasoning : void 0
-      };
-    }
-    if (typeof json?.function?.name === "string") {
-      const params = this.normalize_params(json.function.arguments ?? {});
-      return {
-        command: "use_tool",
-        tool_name: json.function.name,
-        params,
-        reasoning: typeof json.reasoning === "string" ? json.reasoning : void 0
-      };
-    }
-    const first_tool_call = Array.isArray(json?.tool_calls) ? json.tool_calls[0] : null;
-    if (typeof first_tool_call?.function?.name === "string") {
-      const params = this.normalize_params(first_tool_call.function.arguments ?? {});
-      return {
-        command: "use_tool",
-        tool_name: first_tool_call.function.name,
-        params,
-        reasoning: typeof json.reasoning === "string" ? json.reasoning : void 0
-      };
-    }
-    return null;
-  }
-  normalize_params(params) {
-    if (params == null) return {};
-    if (typeof params === "string") {
-      try {
-        const parsed = LLM_Utils.parse_json(params);
-        return typeof parsed === "object" && parsed ? parsed : { value: parsed };
-      } catch {
-        return { value: params };
-      }
+      return null;
     }
-    if (typeof params === "object") return params;
-    return { value: params };
   }
   async call_llm_with_retry(input) {
     let last_error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "p-api-agent",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "files": [