@vtstech/pi-react-fallback 1.0.8 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtstech/pi-react-fallback",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "ReAct fallback extension for Pi Coding Agent",
   "main": "react-fallback.js",
   "keywords": ["pi-extensions"],
@@ -14,7 +14,7 @@
     "url": "https://github.com/VTSTech/pi-coding-agent"
   },
   "dependencies": {
-    "@vtstech/pi-shared": "1.0.8"
+    "@vtstech/pi-shared": "1.1.0"
   },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": ">=0.66"

package/react-fallback.js

@@ -3,6 +3,7 @@ import os from "node:os";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { section, ok, fail, warn, info } from "@vtstech/pi-shared/format";
+import { EXTENSION_VERSION } from "@vtstech/pi-shared/ollama";
 function sanitizeModelJson(text) {
   text = text.replace(/:\s*True\b/g, ": true");
   text = text.replace(/:\s*False\b/g, ": false");
@@ -15,12 +16,72 @@ function sanitizeModelJson(text) {
   text = text.replace(/\\\\\\\\/g, "\\\\");
   return text;
 }
-var THOUGHT_RE = /Thought:\s*(.*?)(?=Action:|Final Answer:|$)/is;
-var ACTION_RE = /Action:\s*[`"']?(\w+)[`"']?\s*\n?\s*Action Input:\s*(.*?)(?=\n\s*(?:Observation:|Thought:|Final Answer:|Action:)|$)/is;
-var ACTION_RE_SAMELINE = /Action:\s*[`"']?(\w+)[`"']?\s+Action Input:\s*(.*?)(?=\n\s*(?:Observation:|Thought:|Final Answer:)|$)/is;
-var ACTION_RE_LOOSE = /Action:\s*(.+?)\n\s*Action Input:\s*(.*?)(?=\n\s*(?:Observation:|Thought:|Final Answer:|Action:)|$)/is;
-var ACTION_RE_PAREN = /Action:\s*(\w+)\s*\(([^)]*)\)/i;
-var FINAL_ANSWER_RE = /Final Answer:\s*([\s\S]*?)$/i;
+var REACT_DIALECTS = [
+  {
+    name: "react",
+    actionTag: "Action:",
+    inputTag: "Action Input:",
+    thoughtTag: "Thought:",
+    stopTags: ["Observation:", "Thought:", "Final Answer:", "Action:"],
+    finalTag: "Final Answer:"
+  },
+  {
+    name: "function",
+    actionTag: "Function:",
+    inputTag: "Function Input:",
+    thoughtTag: "Thought:",
+    stopTags: ["Observation:", "Thought:", "Final Answer:", "Function:", "Action:"],
+    finalTag: "Final Answer:"
+  },
+  {
+    name: "tool",
+    actionTag: "Tool:",
+    inputTag: "Tool Input:",
+    thoughtTag: "Thought:",
+    stopTags: ["Observation:", "Thought:", "Final Answer:", "Tool:", "Action:"],
+    finalTag: "Final Answer:"
+  },
+  {
+    name: "call",
+    actionTag: "Call:",
+    inputTag: "Input:",
+    thoughtTag: "Thought:",
+    stopTags: ["Observation:", "Thought:", "Final Answer:", "Call:", "Action:"],
+    finalTag: "Final Answer:"
+  }
+];
+function buildDialectPatterns(d) {
+  const esc = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const aT = esc(d.actionTag);
+  const iT = esc(d.inputTag);
+  const stopAlt = d.stopTags.map(esc).join("|");
+  const tT = d.thoughtTag ? esc(d.thoughtTag) : void 0;
+  const fT = d.finalTag ? esc(d.finalTag) : void 0;
+  const thoughtRe = tT ? new RegExp(`${tT}\\s*(.*?)(?=${aT}|${fT}|$)`, "is") : void 0;
+  const actionRe = new RegExp(
+    `${aT}\\s*[\\x60"']?(\\w+)[\\x60"']?\\s*\\n?\\s*${iT}\\s*(.*?)(?=\\n\\s*(?:${stopAlt})|$)`,
+    "is"
+  );
+  const actionReSameline = new RegExp(
+    `${aT}\\s*[\\x60"']?(\\w+)[\\x60"']?\\s+${iT}\\s*(.*?)(?=\\n\\s*(?:${stopAlt})|$)`,
+    "is"
+  );
+  const actionReLoose = new RegExp(
+    `${aT}\\s*(.+?)\\n\\s*${iT}\\s*(.*?)(?=\\n\\s*(?:${stopAlt})|$)`,
+    "is"
+  );
+  const actionReParen = new RegExp(`${aT}\\s*(\\w+)\\s*\\(([^)]*)\\)`, "i");
+  const finalAnswerRe = fT ? new RegExp(`${fT}\\s*([\\s\\S]*?)$`, "i") : void 0;
+  return { thoughtRe, actionRe, actionReSameline, actionReLoose, actionReParen, finalAnswerRe, dialect: d };
+}
+var ALL_DIALECT_PATTERNS = REACT_DIALECTS.map(buildDialectPatterns);
+var CLASSIC_PATTERNS = ALL_DIALECT_PATTERNS[0];
+var THOUGHT_RE = CLASSIC_PATTERNS.thoughtRe;
+var ACTION_RE = CLASSIC_PATTERNS.actionRe;
+var ACTION_RE_SAMELINE = CLASSIC_PATTERNS.actionReSameline;
+var ACTION_RE_LOOSE = CLASSIC_PATTERNS.actionReLoose;
+var ACTION_RE_PAREN = CLASSIC_PATTERNS.actionReParen;
+var FINAL_ANSWER_RE = CLASSIC_PATTERNS.finalAnswerRe;
 function extractJsonArgs(rawArgs) {
   const start = rawArgs.indexOf("{");
   if (start === -1) return null;
@@ -56,18 +117,43 @@ function extractJsonArgs(rawArgs) {
   return { input: jsonStr };
 }
 function parseReact(text) {
+  for (const dp of ALL_DIALECT_PATTERNS) {
+    const result = parseReactWithPatterns(text, dp);
+    if (result) return result;
+  }
+  return null;
+}
+function parseReactWithPatterns(text, dp, tightLoose = false) {
   let thought;
-  const thoughtMatch = THOUGHT_RE.exec(text);
-  if (thoughtMatch) thought = thoughtMatch[1].trim();
-  let match = ACTION_RE.exec(text);
-  if (!match) match = ACTION_RE_SAMELINE.exec(text);
+  if (dp.thoughtRe) {
+    const thoughtMatch = dp.thoughtRe.exec(text);
+    if (thoughtMatch) thought = thoughtMatch[1].trim();
+  }
+  let match = dp.actionRe.exec(text);
+  if (!match) match = dp.actionReSameline.exec(text);
   let looseMatch = false;
-  if (!match) match = ACTION_RE_LOOSE.exec(text), looseMatch = true;
+  if (!match) {
+    const looseResult = dp.actionReLoose.exec(text);
+    if (looseResult) {
+      if (tightLoose) {
+        const candidate = looseResult[1].trim().replace(/[`"']/g, "");
+        const isToolIdentifier = /^\w+$/.test(candidate) && (candidate.includes("_") || candidate.includes("-"));
+        const isKnownTool = /^(get_weather|calculate)$/i.test(candidate);
+        if (isToolIdentifier || isKnownTool) {
+          match = looseResult;
+          looseMatch = true;
+        }
+      } else {
+        match = looseResult;
+        looseMatch = true;
+      }
+    }
+  }
   let parenMatch = false;
-  if (!match) match = ACTION_RE_PAREN.exec(text), parenMatch = true;
+  if (!match) match = dp.actionReParen.exec(text), parenMatch = true;
   if (match) {
     let toolName = match[1].trim().replace(/[`"']/g, "");
-    if (looseMatch && pi.context?.session?.tools) {
+    if (looseMatch && !tightLoose && pi.context?.session?.tools) {
       const availableTools = pi.context.session.tools || [];
       for (const real of availableTools) {
         const rl = real.toLowerCase().replace(/_/g, "");
@@ -115,9 +201,18 @@ function parseReact(text) {
       args = extractJsonArgs(rawArgs) || { input: rawArgs };
     }
     let finalAnswer;
-    const faMatch = FINAL_ANSWER_RE.exec(text);
-    if (faMatch) finalAnswer = faMatch[1].trim();
-    return { name: toolName, args, thought, finalAnswer, raw: match[0] };
+    if (dp.finalAnswerRe) {
+      const faMatch = dp.finalAnswerRe.exec(text);
+      if (faMatch) finalAnswer = faMatch[1].trim();
+    }
+    return { name: toolName, args, thought, finalAnswer, raw: match[0], dialect: dp.dialect.name };
+  }
+  return null;
+}
+function detectReactDialect(text) {
+  for (const dp of ALL_DIALECT_PATTERNS) {
+    const tagPattern = new RegExp(`^\\s*${dp.dialect.actionTag.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\s*`, "im");
+    if (tagPattern.test(text)) return dp.dialect;
   }
   return null;
 }
@@ -296,7 +391,7 @@ function react_fallback_temp_default(pi2) {
   let reactModeEnabled = readReactConfig().enabled;
   let stats = { bridgeCalls: 0, fuzzyMatches: 0, argNormalizations: 0, parseFailures: 0 };
   const branding = [
-    `  \u26A1 Pi ReAct Fallback Extension v1.0.8`,
+    `  \u26A1 Pi ReAct Fallback Extension v${EXTENSION_VERSION}`,
     `  Written by VTSTech`,
     `  GitHub: https://github.com/VTSTech`,
     `  Website: www.vts-tech.org`
@@ -430,15 +525,23 @@ ${argsJson}`
       const lines = [branding];
       lines.push(section("REACT PARSER TEST"));
       lines.push(info(`Input: ${text.slice(0, 100)}${text.length > 100 ? "..." : ""}`));
+      const detectedDialect = detectReactDialect(text);
       const reactResult = parseReact(text);
       if (reactResult) {
-        lines.push(ok("ReAct format detected!"));
+        lines.push(ok(`ReAct format detected! (dialect: ${reactResult.dialect || "react"})`));
         lines.push(info(`Tool: ${reactResult.name}`));
         lines.push(info(`Args: ${JSON.stringify(reactResult.args)}`));
         if (reactResult.thought) lines.push(info(`Thought: ${reactResult.thought}`));
         if (reactResult.finalAnswer) lines.push(info(`Final Answer: ${reactResult.finalAnswer}`));
       } else {
-        lines.push(fail("No ReAct format detected"));
+        if (detectedDialect) {
+          lines.push(warn(`Dialect tag "${detectedDialect.actionTag}" detected but no valid tool call parsed`));
+        } else {
+          lines.push(fail("No ReAct format detected"));
+        }
+      }
+      if (detectedDialect && detectedDialect.name !== "react") {
+        lines.push(info(`Detected dialect: ${detectedDialect.name} (${detectedDialect.actionTag} / ${detectedDialect.inputTag})`));
       }
       try {
         const firstBrace = text.indexOf("{");
@@ -460,8 +563,9 @@ ${argsJson}`
       if (looksLikeSchemaDump(text)) {
         lines.push(warn("Text appears to be a tool schema dump (not a tool call)"));
       }
-      if (FINAL_ANSWER_RE.test(text)) {
-        const fa = FINAL_ANSWER_RE.exec(text)[1].trim();
+      const faMatch = FINAL_ANSWER_RE.exec(text);
+      if (faMatch) {
+        const fa = faMatch[1].trim();
         lines.push(ok(`Final Answer: ${fa}`));
       }
       pi2.sendMessage({
@@ -473,13 +577,18 @@ ${argsJson}`
   });
   pi2._reactParser = {
     parseReact,
+    parseReactWithPatterns,
+    detectReactDialect,
     sanitizeModelJson,
     extractToolFromJson,
     fuzzyMatchToolName,
     normalizeArguments,
-    looksLikeSchemaDump
+    looksLikeSchemaDump,
+    REACT_DIALECTS,
+    ALL_DIALECT_PATTERNS
   };
 }
 export {
-  react_fallback_temp_default as default
+  react_fallback_temp_default as default,
+  detectReactDialect
 };