@jsonstudio/llms 0.6.473 → 0.6.568

package/dist/tools/tool-description-utils.js

@@ -0,0 +1,50 @@
+const SHELL_TOOL_ALIASES = new Set(['shell', 'shell_command', 'exec_command']);
+const APPLY_PATCH_NAME = 'apply_patch';
+export function normalizeToolName(value) {
+    return typeof value === 'string' ? value.trim().toLowerCase() : '';
+}
+function extractToolFunctionName(entry) {
+    if (!entry || typeof entry !== 'object') {
+        return '';
+    }
+    const fnName = typeof entry.function?.name === 'string'
+        ? entry.function.name
+        : undefined;
+    if (fnName && fnName.trim().length > 0) {
+        return fnName.trim();
+    }
+    const topName = typeof entry.name === 'string' ? entry.name : '';
+    return topName.trim();
+}
+export function isShellToolName(value) {
+    return SHELL_TOOL_ALIASES.has(normalizeToolName(value));
+}
+export function hasApplyPatchToolDeclared(tools) {
+    if (!Array.isArray(tools)) {
+        return false;
+    }
+    return tools.some((entry) => normalizeToolName(extractToolFunctionName(entry)) === APPLY_PATCH_NAME);
+}
+export function buildShellDescription(toolDisplayName, hasApplyPatch) {
+    const label = toolDisplayName && toolDisplayName.trim().length > 0
+        ? toolDisplayName.trim()
+        : 'shell';
+    const base = 'Runs a shell command and returns its output.';
+    const workdirLine = `- Always set the \`workdir\` param when using the ${label} function. Avoid using \`cd\` unless absolutely necessary.`;
+    const applyPatchLine = '- Prefer apply_patch for editing files instead of shell redirection or here-doc usage.';
+    return hasApplyPatch ? `${base}\n${workdirLine}\n${applyPatchLine}` : `${base}\n${workdirLine}`;
+}
+export function appendApplyPatchReminder(description, hasApplyPatch) {
+    if (!hasApplyPatch) {
+        return description;
+    }
+    const trimmed = description?.trim() ?? '';
+    if (!trimmed) {
+        return buildShellDescription('shell', true);
+    }
+    if (trimmed.includes('apply_patch')) {
+        return trimmed;
+    }
+    const applyPatchLine = '- Prefer apply_patch for editing files instead of shell redirection or here-doc usage.';
+    return `${trimmed}\n${applyPatchLine}`;
+}

package/dist/tools/tool-registry.js

@@ -1,4 +1,5 @@
 // Tool registry and validator (single source of truth)
+import { buildStructuredPatch, isStructuredApplyPatchPayload, StructuredApplyPatchError } from './apply-patch-structured.js';
 const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
 const asString = (value) => {
     if (typeof value === 'string' && value.trim().length > 0) {
@@ -95,12 +96,20 @@ export function validateToolCall(name, argsString) {
     const rawArgs = tryParseJson(typeof argsString === 'string' ? argsString : '{}');
     switch (normalizedName) {
         case 'apply_patch': {
-            const input = asString(rawArgs.input);
-            const patch = asString(rawArgs.patch) ?? input;
-            if (!patch) {
-                return { ok: false, reason: 'missing_input' };
+            const record = rawArgs;
+            if (!isStructuredApplyPatchPayload(record)) {
+                return { ok: false, reason: 'missing_changes' };
+            }
+            try {
+                const patchText = buildStructuredPatch(record);
+                return { ok: true, normalizedArgs: toJson({ patch: patchText, input: patchText }) };
+            }
+            catch (error) {
+                if (error instanceof StructuredApplyPatchError) {
+                    return { ok: false, reason: error.reason || 'invalid_patch_payload' };
+                }
+                return { ok: false, reason: 'invalid_patch_payload' };
             }
-            return { ok: true, normalizedArgs: toJson({ input: patch, patch }) };
         }
         case 'shell': {
             const rawCommand = rawArgs.command;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.473",
+  "version": "0.6.568",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -62,4 +62,4 @@
     "dist",
     "README.md"
   ]
-}
+}