tune-basic-toolset 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tune-basic-toolset",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Basic toolset for tune",
   "main": "src/index.js",
   "files": [

package/src/cmd.tool.js

@@ -12,5 +12,5 @@ module.exports = async function cmd({ text }) {
   } catch (e) {
     result = e.stderr + e.stdout;
   }
-  return (result || "").replaceAll("@", "\\@");
+  return (result || "")
 };

package/src/curry.proc.js

@@ -1,3 +1,5 @@
+const { parseArgs } = require('./utils.js')
+
 module.exports = async function curry(node, args, ctx) {
   if (!node || node.type !== 'tool' ) {
     throw Error('curry can only modify tool') 
@@ -6,25 +8,7 @@ module.exports = async function curry(node, args, ctx) {
   // parse args string to object
   // supports key=value pairs where value can be quoted string
   // keys can optionally start with $
-
-  const parsedArgs = {};
-  // regex to split on spaces but keep quoted substrings together
-  const regex = /([^\s"']+|"[^"]*"|'[^']*')+/g;
-  const tokens = args.match(regex) || [];
-
-  tokens.forEach(token => {
-    const equalIndex = token.indexOf('=');
-    if (equalIndex > 0) {
-      const key = token.substring(0, equalIndex);
-      let value = token.substring(equalIndex + 1);
-
-      // strip double or single quotes from value if present
-      if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
-        value = value.substring(1, value.length - 1);
-      }
-      parsedArgs[key] = value;
-    }
-  });
+  const parsedArgs = parseArgs(args.trim())
   const schema = { ...node.schema }
   const curryParams = {} 
   const newNode = { 
@@ -35,10 +19,10 @@ module.exports = async function curry(node, args, ctx) {
   for(const key in parsedArgs) {
     if (key.indexOf("$") === -1)  {
       curryParams[key] = parsedArgs[key]
-      if (!schema.parameters.properties[key]) {
-        throw Error(`parameter ${key} is not defined in ${node.name}'s schema`)
+      if (schema.parameters.properties[key]) {
+        // throw Error(`parameter ${key} is not defined in ${node.name}'s schema`)
+        delete schema.parameters.properties[key]
       }
-      delete schema.parameters.properties[key]
       const idx = (schema.parameters.required || []).indexOf(key)
       if (idx !== -1) {
         schema.parameters.required.splice(idx, 1)

package/src/grep.tool.js

@@ -12,5 +12,5 @@ module.exports = async function grep({filename, text, regex, regex_flags}, ctx)
   }
 
   const r = new RegExp(regex, regex_flags)
-  return text.split(/\r?\n/).filter(line => r.test(line)).join("\n").replaceAll("@", "\\@")
+  return text.split(/\r?\n/).filter(line => r.test(line)).join("\n")
 }

package/src/jina_r.tool.js

@@ -23,5 +23,5 @@ module.exports = async function fetchFromUrl({ url, filename, links }, ctx) {
     await ctx.write(filename, res);
     return `@${filename}`;
   }
-  return res.replace(/@/g, "\\@");
-};
+  return res
+};

package/src/js.tool.js

@@ -53,8 +53,8 @@ module.exports = async function execute({ text, inputType }, ctx) {
         input: modifiedCode, 
       });
 
-    return (res.stderr + res.stdout).trim().replace(/@/g, "\\@");
+    return (res.stderr + res.stdout).trim()
   } finally {
     unlinkSync(filename);
   }
-};
+};

package/src/log.proc.js

@@ -1,15 +1,20 @@
 const fs = require("fs")
 const path = require("path")
 
-module.exports = async (node, args, ctx)  => ({
-  ...node,
-  exec: async function(payload, ctx) {
-    const res = await node.exec(payload, ctx)
-    const body = JSON.parse(res.body)
-    payload = {...res, body};
-    const filename = args.trim() || "log.json"
-    const content =  path.extname(filename) == ".chat" ? ctx.msg2text(payload.body.messages, true) : JSON.stringify(payload, null, "  ") 
-    fs.writeFileSync(filename, content);
-    return res
+module.exports = async (node, args, ctx)  => { 
+  if (!node || node.type !== 'llm') {
+    throw Error("llm required for 'log' processor")
   }
-})
+  return ({
+    ...node,
+    exec: async function(payload, ctx) {
+      const res = await node.exec(payload, ctx)
+      const body = JSON.parse(res.body)
+      payload = {...res, body};
+      const filename = args.trim() || "log.json"
+      const content =  path.extname(filename) == ".chat" ? ctx.msg2text(payload.body.messages, true) : JSON.stringify(payload, null, "  ") 
+      fs.writeFileSync(filename, content);
+      return res
+    }
+  }) 
+}

package/src/patch.tool.js

@@ -1,20 +1,21 @@
 const fs = require('fs').promises;
 
 // Patch tool to apply custom diffs marked with <<<<<<< ORIGINAL and >>>>>>> UPDATED
-// Handles patches with context and applies only the segments between markers.
-
+// More tolerant to whitespace differences on each line and reports per-block success.
 module.exports = async function patch({ text, filename }, ctx) {
-  // Regex to match each patch block
-  // Be lenient about the number of conflict marker characters because some
-  // environments may trim one or more > or < characters.
-  const patchRegex = /<{6,}\s*ORIGINAL[^\n]*\n([\s\S]*?)=+\n([\s\S]*?)>{6,}\s*UPDATED[^\n]*(?:\n|$)/g;
-  const patches = [];
-  let match;
+  if (!text || !filename) {
+    return "No patch text or filename provided";
+  }
 
-  // Extract all old/new segments
-  while ((match = patchRegex.exec(text)) !== null) {
-    const oldPart = match[1].replace(/^\n+|\n+$/g, "");
-    const newPart = match[2].replace(/^\n+|\n+$/g, "");
+  // Match: <<<<<<< ORIGINAL ... ======= ... >>>>>>> UPDATED
+  // Be tolerant to CRLF/LF and optional trailing text/spaces on the markers.
+  const patchRegex = /<{6,}\s*ORIGINAL[^\n]*\r?\n([\s\S]*?)=+[^\n]*\r?\n([\s\S]*?)>{6,}\s*UPDATED[^\n]*(?:\r?\n|$)/g;
+
+  const patches = [];
+  let m;
+  while ((m = patchRegex.exec(text)) !== null) {
+    const oldPart = String(m[1]).replace(/^\s*\r?\n+|\r?\n+\s*$/g, "");
+    const newPart = String(m[2]).replace(/^\s*\r?\n+|\r?\n+\s*$/g, "");
     patches.push({ oldPart, newPart });
   }
 
@@ -24,18 +25,41 @@ module.exports = async function patch({ text, filename }, ctx) {
 
   let fileContent = await ctx.read(filename);
 
-  for (const { oldPart, newPart } of patches) {
-    // Escape regex special chars in oldPart.
-    // Do NOT relax all whitespace to \s+; that can swallow preceding newlines.
-    // Only normalize line endings so CRLF in patches can match LF in files.
-    let escaped = oldPart.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  function buildPattern(oldStr) {
+    // Escape special regex chars
+    let escaped = oldStr.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    // Normalize line endings to \r?\n so CRLF/LF both match
     escaped = escaped.replace(/\r?\n/g, "\\r?\\n");
-    const oldRegex = new RegExp(escaped, "g");
+    // Tolerate indentation/space differences (spaces or tabs), zero-or-more
+    // Keep newlines strict so structure must still match.
+    escaped = escaped.replace(/[ \t]+/g, "[ \\t]*");
+    return new RegExp(escaped, "g");
+  }
+
+  const totalSegments = patches.length;
+  let appliedSegments = 0;
+  let totalReplacements = 0;
 
-    // Perform replacement using a function to avoid replacement string ambiguities
-    fileContent = fileContent.replace(oldRegex, () => newPart);
+  for (const { oldPart, newPart } of patches) {
+    const re = buildPattern(oldPart);
+    let matches = 0;
+    fileContent = fileContent.replace(re, () => {
+      matches += 1;
+      return newPart;
+    });
+    if (matches > 0) {
+      appliedSegments += 1;
+      totalReplacements += matches;
+    }
   }
 
   await ctx.write(filename, fileContent);
-  return "patched";
+
+  if (appliedSegments === 0) {
+    return `no matches applied (0/${totalSegments})`;
+  }
+  if (appliedSegments < totalSegments) {
+    return `patched partially (${appliedSegments}/${totalSegments}), replacements: ${totalReplacements}`;
+  }
+  return `patched (${appliedSegments}/${totalSegments}), replacements: ${totalReplacements}`;
 };

package/src/powershell.tool.js

@@ -12,5 +12,5 @@ module.exports = async function powershell({ text }) {
   } catch (e) {
     result = e.stderr + e.stdout;
   }
-  return (result || "").replaceAll("@", "\\@");
+  return (result || "")
 };

package/src/proc.proc.js

@@ -1,3 +1,4 @@
+const { parseCommandLine } = require('./utils.js')
 
 module.exports = async function proc(node, args, ctx) {
   /*
@@ -25,113 +26,4 @@ module.exports = async function proc(node, args, ctx) {
   }
 }
 
-// Examples:
-// parseCommandLine('command hello world bla bla')
-// -> ["command", { text: "hello world bla bla" }]
-//
-// parseCommandLine('cmd hello=world num=8 text="bla \\"bla"')
-// -> ["cmd", { hello: "world", num: 8, text: 'bla "bla' }]
-//
-// parseCommandLine('cmd')
-// -> ["cmd", {}]
 
-function parseCommandLine(input) {
-  const s = String(input);
-  let i = 0, len = s.length;
-
-  function skipWS() { while (i < len && /\s/.test(s[i])) i++; }
-
-  // 1) Parse leading alphanumeric command
-  skipWS();
-  const cmdStart = i;
-  while (i < len && /[A-Za-z0-9_\-]/.test(s[i])) i++;
-  const command = s.slice(cmdStart, i);
-  if (!command) return [null, {}];
-
-  // 2) Parse the remainder as args
-  skipWS();
-  const r = s.slice(i);
-  if (!r.trim()) return [command, {}];
-
-  function parseArgs(str) {
-    if (!/^\s*[A-Za-z0-9]+=/.test(str)) {
-      return { text: str.trim() };
-    }
-
-    let j = 0;
-    const L = str.length;
-    const out = {};
-
-    function skipW() { while (j < L && /\s/.test(str[j])) j++; }
-
-    function parseKey() {
-      const start = j;
-      while (j < L && str[j] !== '=' && !/\s/.test(str[j])) j++;
-      return str.slice(start, j);
-    }
-
-    function parseQuotedValue(q) {
-      j++; // skip opening quote
-      let val = '';
-      while (j < L) {
-        const ch = str[j++];
-        if (ch === '\\') {
-          if (j >= L) break;
-          const esc = str[j++];
-          if (esc === 'n') val += '\n';
-          else if (esc === 't') val += '\t';
-          else if (esc === 'r') val += '\r';
-          else val += esc; // includes \" \\ \'
-        } else if (ch === q) {
-          return val;
-        } else {
-          val += ch;
-        }
-      }
-      return val; // best-effort if unclosed
-    }
-
-    function parseUnquotedValue() {
-      const start = j;
-      while (j < L && !/\s/.test(str[j])) j++;
-      return str.slice(start, j);
-    }
-
-    function coerce(v) {
-      if (/^-?\d+(\.\d+)?$/.test(v)) return Number(v);
-      const low = v.toLowerCase();
-      if (low === 'true') return true;
-      if (low === 'false') return false;
-      if (low === 'null') return null;
-      return v;
-    }
-
-    while (j < L) {
-      skipW();
-      if (j >= L) break;
-
-      const key = parseKey();
-      if (!key) return { text: str.trim() };
-
-      skipW();
-      if (j < L && str[j] === '=') {
-        j++; // skip '='
-        skipW();
-        let valueStr = '';
-        if (j < L && (str[j] === '"' || str[j] === "'")) {
-          valueStr = parseQuotedValue(str[j]);
-        } else {
-          valueStr = parseUnquotedValue();
-        }
-        out[key] = coerce(valueStr);
-      } else {
-        // If a non key=value token appears, treat the whole remainder as text
-        return { text: str.trim() };
-      }
-    }
-
-    return out;
-  }
-
-  return [command, parseArgs(r)];
-}

package/src/rf.schema.json

@@ -13,5 +13,6 @@
       }
     },
     "required": ["filename"]
-  }
+  },
+  "$escape_output": false
 }

package/src/rf.tool.js

@@ -1,13 +1,13 @@
 const { relative, dirname } = require('path');
 
-module.exports = async function readFile({ filename, linenum }, ctx) {
+module.exports = async function readFile({ filename, linenum, autotext }, ctx) {
   const resolved = await ctx.resolve(filename);
   if (!resolved) {
     return "File not found";
   }
   const relFile = relative(process.cwd(), filename);
   const pathArr = [ relFile ];
-  if (resolved.type !== 'text') {
+  if (resolved.type !== 'text' && ((typeof autotext === 'undefined') || autotext) && resolved.read) {
     pathArr.push('text');
   }
   if (linenum) {
@@ -19,5 +19,5 @@ module.exports = async function readFile({ filename, linenum }, ctx) {
   if (relFile.match(/\s+/)) {
     return `@{${relFile}}`;
   }
-  return `@${relFile}`;
+  return `@${relFile||"."}`;
 };

package/src/sh.tool.js

@@ -29,5 +29,5 @@ module.exports = async function sh({ text }) {
       }
     }
   }
-  return (result || "").replaceAll("@", "\\@");
-};
+  return (result || "")
+};

package/src/shp.proc.js

@@ -24,7 +24,7 @@ const shp = async (node, args, ctx) => ({
     } catch (e) {
       result = e.stderr + e.stdout;
     }
-    return result.replaceAll('@', '\\@');
+    return result;
   }
 });
 

package/src/sqlite.tool.js

@@ -15,5 +15,5 @@ module.exports = async function sqlite({ filename, text, format = "table"}, ctx)
       result = e.stack
     }
   }
-  return (result || "").replaceAll("@", "\\@");
+  return (result || "");
 }

package/src/utils.js

@@ -0,0 +1,112 @@
+function parseArgs(str) {
+  if (!/^\s*[_$A-Za-z0-9]+=/.test(str)) {
+    return { text: str.trim() };
+  }
+
+  let j = 0;
+  const L = str.length;
+  const out = {};
+
+  function skipW() { while (j < L && /\s/.test(str[j])) j++; }
+
+  function parseKey() {
+    const start = j;
+    while (j < L && str[j] !== '=' && !/\s/.test(str[j])) j++;
+    return str.slice(start, j);
+  }
+
+  function parseQuotedValue(q) {
+    j++; // skip opening quote
+    let val = '';
+    while (j < L) {
+      const ch = str[j++];
+      if (ch === '\\') {
+        if (j >= L) break;
+        const esc = str[j++];
+        if (esc === 'n') val += '\n';
+        else if (esc === 't') val += '\t';
+        else if (esc === 'r') val += '\r';
+        else val += esc; // includes \" \\ \'
+      } else if (ch === q) {
+        return val;
+      } else {
+        val += ch;
+      }
+    }
+    return val; // best-effort if unclosed
+  }
+
+  function parseUnquotedValue() {
+    const start = j;
+    while (j < L && !/\s/.test(str[j])) j++;
+    return str.slice(start, j);
+  }
+
+  function coerce(v) {
+    if (/^-?\d+(\.\d+)?$/.test(v)) return Number(v);
+    const low = v.toLowerCase();
+    if (low === 'true') return true;
+    if (low === 'false') return false;
+    if (low === 'null') return null;
+    return v;
+  }
+
+  while (j < L) {
+    skipW();
+    if (j >= L) break;
+
+    const key = parseKey();
+    if (!key) return { text: str.trim() };
+
+    skipW();
+    if (j < L && str[j] === '=') {
+      j++; // skip '='
+      skipW();
+      let valueStr = '';
+      if (j < L && (str[j] === '"' || str[j] === "'")) {
+        valueStr = parseQuotedValue(str[j]);
+      } else {
+        valueStr = parseUnquotedValue();
+      }
+      out[key] = coerce(valueStr);
+    } else {
+      // If a non key=value token appears, treat the whole remainder as text
+      return { text: str.trim() };
+    }
+  }
+
+  return out;
+}
+
+// Examples:
+// parseCommandLine('command hello world bla bla')
+// -> ["command", { text: "hello world bla bla" }]
+//
+// parseCommandLine('cmd hello=world num=8 text="bla \\"bla"')
+// -> ["cmd", { hello: "world", num: 8, text: 'bla "bla' }]
+//
+// parseCommandLine('cmd')
+// -> ["cmd", {}]
+
+function parseCommandLine(input) {
+  const s = String(input);
+  let i = 0, len = s.length;
+
+  function skipWS() { while (i < len && /\s/.test(s[i])) i++; }
+
+  // 1) Parse leading alphanumeric command
+  skipWS();
+  const cmdStart = i;
+  while (i < len && /[A-Za-z0-9_\-]/.test(s[i])) i++;
+  const command = s.slice(cmdStart, i);
+  if (!command) return [null, {}];
+
+  // 2) Parse the remainder as args
+  skipWS();
+  const r = s.slice(i);
+  if (!r.trim()) return [command, {}];
+
+
+  return [command, parseArgs(r)];
+}
+module.exports = { parseCommandLine, parseArgs }