tune-basic-toolset 0.1.14 → 0.1.16

package/README.md

@@ -10,7 +10,7 @@ Basic toolset for [Tune](https://github.com/iovdin/tune).
   - [wf](#wf) write file
   - [patch](#patch) patch file  
   - [append](#append) append to file
-  - [sh](#sh) execute shell command
+  - [sh](#sh) execute shell command locally and remotely
   - [cmd](#cmd) execute Windows cmd command
   - [powershell](#powershell) execute PowerShell command
   - [grep](#grep) search for patterns in text or files
@@ -25,7 +25,6 @@ Basic toolset for [Tune](https://github.com/iovdin/tune).
   - [message](#message) talk to another chat/agent (separate context)
 - [Processors](#processors)
   - [proc](#proc) converts tool to processor
-  - [shp](#shp) include shell command output
   - [init](#init) set initial value
   - [json_format](#json_format) make LLM respond with JSON
   - [log](#log) save LLM payload
@@ -130,7 +129,7 @@ appended
 ```
 
 ### `sh`
-Execute shell command
+Execute shell command locally or with ssh
 ```chat
 user: @sh
 find with ripgrep where echo is used
@@ -141,6 +140,15 @@ tool_result:
 ./README.md:  const text = "s: \@echo\nu: hello world";
 ./tools/echo.txt:you are echo, you print everything back
 ./tools/README.md:* `echo.txt` - to debug variable expansions and context
+
+user:
+check contents directory on root\@host.com
+assistant:
+tool_call: sh {"host": "root@host.com"}
+ls
+tool_result:
+file1
+file2
 ```
 
 ### `cmd`
@@ -463,29 +471,6 @@ execut python script text="384 * 123" and insert back result
 @{| proc py 384 * 123  }
 ```
 
-### `shp`
-Insert shell command output
-```chat
-system:
-include project file list to system prompt
-@{| shp git ls-files }
-
-include buffer content on osx
-@{| shp pbpaste }
-
-include current date
-@{| shp date }
-
-pipe filename content to shell command
-@{ a.log | shp tail }
-
-@{ a.log | shp grep pattern }
-
-print screen of one of tmux session
-@{| shp tmux capture-pane -t 0 -p }
-
-```
-
 ### `init` 
 Set default value for non set variables
 

package/package.json

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

package/src/patch.tool.js

@@ -1,21 +1,20 @@
 const fs = require('fs').promises;
 
 // Patch tool to apply custom diffs marked with <<<<<<< ORIGINAL and >>>>>>> UPDATED
-// More tolerant to whitespace differences on each line and reports per-block success.
-module.exports = async function patch({ text, filename }, ctx) {
-  if (!text || !filename) {
-    return "No patch text or filename provided";
-  }
-
-  // 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;
+// Handles patches with context and applies only the segments between markers.
 
+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 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, "");
+  let match;
+
+  // 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, "");
     patches.push({ oldPart, newPart });
   }
 
@@ -25,41 +24,18 @@ module.exports = async function patch({ text, filename }, ctx) {
 
   let fileContent = await ctx.read(filename);
 
-  function buildPattern(oldStr) {
-    // Escape special regex chars
-    let escaped = oldStr.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    // Normalize line endings to \r?\n so CRLF/LF both match
+  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, "\\$&");
     escaped = escaped.replace(/\r?\n/g, "\\r?\\n");
-    // 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;
+    const oldRegex = new RegExp(escaped, "g");
 
-  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;
-    }
+    // Perform replacement using a function to avoid replacement string ambiguities
+    fileContent = fileContent.replace(oldRegex, () => newPart);
   }
 
   await ctx.write(filename, fileContent);
-
-  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}`;
+  return "patched";
 };

package/src/sh.schema.json

@@ -6,6 +6,10 @@
       "text": {
         "type": "string",
         "description": "The shell command to execute"
+      },
+      "host": {
+        "type": "string",
+        "description": "remote host like user@host.com to execute the shell comand on (uses ssh)"
       }
     },
     "required": ["text"]

package/src/sh.tool.js

@@ -1,11 +1,23 @@
-const { execSync } = require('child_process');
+const { spawnSync, execSync } = require('child_process');
 
-module.exports = async function sh({ text }) {
+//TODO look back do not escape escaped
+const escape = (str) => str.replace(/'/g, "\\'")
+
+module.exports = async function sh({ text, host }) {
   let result = "";
   try {
+    let cmd = text
+    let args = []
+    if (host) {
+      cmd = "ssh"
+      args = [host, text]
+    }
     // Increase maxBuffer to reduce ERR_CHILD_PROCESS_STDIO_MAXBUFFER risk on large outputs
-    result = execSync(text, { encoding: "utf8", maxBuffer: 10 * 1024 * 1024 });
+    result = spawnSync(cmd, args, { encoding: "utf8", maxBuffer: 10 * 1024 * 1024, shell: true });
+    result = (result.stdout || "") + (result.stderr || "")
+    return result
   } catch (e) {
+    return e
     const stderr = e && typeof e.stderr !== "undefined" ? String(e.stderr || "") : "";
     const stdout = e && typeof e.stdout !== "undefined" ? String(e.stdout || "") : "";
 

package/src/shp.proc.js

@@ -1,31 +0,0 @@
-const { execSync, spawnSync } = require('child_process');
-
-const shp = async (node, args, ctx) => ({
-  type: 'text',
-  read: async () => {
-    let input = null;
-
-    if (node && node.type === 'text') {
-      input = await node.read();
-    }
-
-    let result;
-    try {
-      if (input !== null) {
-        const res = spawnSync(args.trim() || "sh", {
-          input,
-          encoding: 'utf8',
-          shell: true
-        });
-        result = (res.stdout || '') + (res.stderr || '');
-      } else {
-        result = execSync(args.trim(), { encoding: 'utf8' });
-      }
-    } catch (e) {
-      result = e.stderr + e.stdout;
-    }
-    return result;
-  }
-});
-
-module.exports = shp;