@vybestack/llxprt-code-core 0.1.15 → 0.1.16-hotfix1

package/dist/src/parsers/TextToolCallParser.js

@@ -126,6 +126,21 @@ export class GemmaToolCallParser {
             }
             catch (error) {
                 if (typeof args === 'string') {
+                    // Attempt targeted repair for common unescaped inner quotes in JSON strings
+                    const repaired = this.tryRepairJson(args);
+                    if (repaired) {
+                        try {
+                            const parsedArgs = JSON.parse(repaired);
+                            toolCalls.push({
+                                name: toolName,
+                                arguments: parsedArgs,
+                            });
+                            continue;
+                        }
+                        catch (_ignored) {
+                            // fall through to legacy fallback
+                        }
+                    }
                     // Try to extract a simpler JSON pattern if the full match fails
                     const simpleJsonMatch = args.match(/^{[^{]*}$/);
                     if (simpleJsonMatch) {
@@ -150,7 +165,7 @@ export class GemmaToolCallParser {
                 }
             }
         }
-        // Clean up any extra whitespace and stray markers that were not matched (best effort)
+        // Clean up stray markers that were not matched (best effort) but preserve original whitespace
         cleanedContent = cleanedContent
             .replace(/\[TOOL_REQUEST(?:_END)?]/g, '')
             .replace(/<\|im_start\|>assistant/g, '')
@@ -162,14 +177,41 @@ export class GemmaToolCallParser {
             // .replace(/<think>[\s\S]*?<\/think>/g, '') // Keep think tags visible by default
             .replace(/<tool_call>\s*\{[^}]*$/gm, '') // Remove incomplete tool calls
             .replace(/\{"name"\s*:\s*"[^"]*"\s*,?\s*"arguments"\s*:\s*\{[^}]*$/gm, '') // Remove incomplete JSON tool calls
-            .replace(/✦\s*<think>/g, '') // Remove ✦ symbol followed by think tag
-            .replace(/\s+/g, ' ')
+            .replace(/✦\s*<think>/g, '')
+            .trim();
+        // Collapse multiple consecutive newlines/spaces after removing tool calls
+        cleanedContent = cleanedContent
+            .replace(/\n\s*\n/g, '\n')
+            .replace(/\n/g, ' ')
             .trim();
         return {
             cleanedContent,
             toolCalls,
         };
     }
+    // Best-effort repair for JSON with unescaped inner quotes in string values.
+    tryRepairJson(args) {
+        try {
+            JSON.parse(args);
+            return args; // already valid
+        }
+        catch {
+            // Target only inner quotes within JSON string values, preserving multibyte and spacing
+            // e.g., { "command": "printf "ありがとう 世界"" } -> { "command": "printf \"ありがとう 世界\"" }
+            const repaired = args.replace(/:(\s)*"((?:\\.|[^"])*?)"(\s*)([,}])/gs, (_m, s1, val, s2, tail) => {
+                // Escape only unescaped quotes inside the value
+                const fixed = val.replace(/(?<!\\)"/g, '\\"');
+                return `:${s1}"${fixed}"${s2}${tail}`;
+            });
+            try {
+                JSON.parse(repaired);
+                return repaired;
+            }
+            catch {
+                return null;
+            }
+        }
+    }
     parseKeyValuePairs(str) {
         const args = {};
         // Parse "key value key2 value2" format

package/dist/src/parsers/TextToolCallParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"TextToolCallParser.js","sourceRoot":"","sources":["../../../src/parsers/TextToolCallParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TextToolCallParser.js","sourceRoot":"","sources":["../../../src/parsers/TextToolCallParser.ts"],"names":[],"mappings":"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"}

package/dist/src/parsers/TextToolCallParser.multibyte.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/parsers/TextToolCallParser.multibyte.test.js

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 Vybestack LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { describe, it, expect } from 'vitest';
+import { GemmaToolCallParser } from './TextToolCallParser.js';
+// Simulate a Hermes/text style tool call directive embedded in text
+// We'll use the simplest recognized pattern: [TOOL_REQUEST] name {args} [TOOL_REQUEST_END]
+// Where args is JSON.
+describe('TextToolCallParser multibyte handling', () => {
+    it('preserves quoted spaces and multibyte chars in run_shell_command.command', () => {
+        const parser = new GemmaToolCallParser();
+        const commandValue = 'printf "ありがとう 世界"';
+        const jsonArgs = JSON.stringify({ command: commandValue }, null, 2);
+        const content = `Some text before
+[TOOL_REQUEST] run_shell_command ${jsonArgs} [TOOL_REQUEST_END]
+And after.`;
+        const { cleanedContent, toolCalls } = parser.parse(content);
+        expect(toolCalls.length).toBe(1);
+        expect(toolCalls[0].name).toBe('run_shell_command');
+        const args = toolCalls[0].arguments;
+        expect(args.command).toBe('printf "ありがとう 世界"');
+        // Ensure original content around tool call remains and spacing preserved
+        expect(cleanedContent).toContain('Some text before');
+        expect(cleanedContent).toContain('And after.');
+        // Ensure the exact multibyte phrase with space remains in surrounding text if present
+        // (cleanedContent should not collapse spaces globally)
+        expect(cleanedContent.includes('ありがとう 世界')).toBe(false); // tool call removed, not present in cleaned
+    });
+});
+//# sourceMappingURL=TextToolCallParser.multibyte.test.js.map

package/dist/src/parsers/TextToolCallParser.multibyte.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TextToolCallParser.multibyte.test.js","sourceRoot":"","sources":["../../../src/parsers/TextToolCallParser.multibyte.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,oEAAoE;AACpE,2FAA2F;AAC3F,sBAAsB;AAEtB,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACrD,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAClF,MAAM,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;QAEzC,MAAM,YAAY,GAAG,mBAAmB,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEpE,MAAM,OAAO,GAAG;mCACe,QAAQ;WAChC,CAAC;QAER,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE5D,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,SAAoC,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAE/C,yEAAyE;QACzE,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACrD,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,sFAAsF;QACtF,uDAAuD;QACvD,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,4CAA4C;IACvG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/prompt-config/TemplateEngine.d.ts

@@ -0,0 +1,35 @@
+import { TemplateVariables, TemplateProcessingOptions, PromptContext } from './types.js';
+/**
+ * TemplateEngine - Handles variable substitution in prompt templates
+ *
+ * Implements REQ-004: Template Processing requirements
+ * - Supports {{VARIABLE_NAME}} syntax
+ * - Substitutes TOOL_NAME, MODEL, and PROVIDER variables
+ * - Handles malformed templates gracefully
+ * - Logs substitutions when DEBUG=1 (REQ-010.4)
+ */
+export declare class TemplateEngine {
+    /**
+     * Process a template string with variable substitution
+     * @param content Template content with {{variables}}
+     * @param variables Map of variable names to values
+     * @param options Optional processing configuration
+     * @returns Processed content with variables substituted
+     */
+    processTemplate(content: string, variables: TemplateVariables, options?: TemplateProcessingOptions): string;
+    /**
+     * Create template variables from runtime context
+     * @param context Runtime context with provider, model, tools, and environment
+     * @param currentTool Optional current tool being processed
+     * @returns Map of variable names to values
+     */
+    createVariablesFromContext(context: PromptContext, currentTool?: string | null): TemplateVariables;
+    /**
+     * Log variable substitution for debugging (when DEBUG=1)
+     * @param variable Variable name being substituted
+     * @param value Value being substituted
+     * @param options Processing options
+     */
+    private logSubstitution;
+}
+export default TemplateEngine;

package/dist/src/prompt-config/TemplateEngine.js

@@ -0,0 +1,149 @@
+/**
+ * TemplateEngine - Handles variable substitution in prompt templates
+ *
+ * Implements REQ-004: Template Processing requirements
+ * - Supports {{VARIABLE_NAME}} syntax
+ * - Substitutes TOOL_NAME, MODEL, and PROVIDER variables
+ * - Handles malformed templates gracefully
+ * - Logs substitutions when DEBUG=1 (REQ-010.4)
+ */
+export class TemplateEngine {
+    /**
+     * Process a template string with variable substitution
+     * @param content Template content with {{variables}}
+     * @param variables Map of variable names to values
+     * @param options Optional processing configuration
+     * @returns Processed content with variables substituted
+     */
+    processTemplate(content, variables, options) {
+        // Step 1: Validate inputs
+        if (content === null || content === undefined) {
+            return '';
+        }
+        if (typeof content !== 'string') {
+            return content;
+        }
+        const vars = variables || {};
+        // Step 2: Initialize processing state
+        let result = '';
+        let currentPosition = 0;
+        const contentLength = content.length;
+        // Step 3: Process template
+        while (currentPosition < contentLength) {
+            // Find position of next "{{"
+            const openBracketPos = content.indexOf('{{', currentPosition);
+            if (openBracketPos === -1) {
+                // No more variables, append rest and break
+                result += content.substring(currentPosition);
+                break;
+            }
+            // Append content before "{{"
+            result += content.substring(currentPosition, openBracketPos);
+            // Find position of next "}}"
+            const closeBracketPos = content.indexOf('}}', openBracketPos + 2);
+            if (closeBracketPos === -1) {
+                // No closing brackets, append rest and break
+                result += content.substring(openBracketPos);
+                break;
+            }
+            // Extract variable name and trim whitespace
+            const variableName = content
+                .substring(openBracketPos + 2, closeBracketPos)
+                .trim();
+            // Handle empty variable names - leave as-is
+            if (variableName === '') {
+                result += content.substring(openBracketPos, closeBracketPos + 2);
+                currentPosition = closeBracketPos + 2;
+                continue;
+            }
+            // Check if variable name contains brackets (nested variables not supported)
+            if (variableName.includes('{{') || variableName.includes('}}')) {
+                // Leave the whole pattern as-is and move to next character
+                result += content.substring(openBracketPos, openBracketPos + 2);
+                currentPosition = openBracketPos + 2;
+                continue;
+            }
+            // Perform substitution
+            if (variableName in vars) {
+                const variableValue = vars[variableName];
+                if (variableValue === null || variableValue === undefined) {
+                    // Append empty string
+                    result += '';
+                }
+                else {
+                    result += String(variableValue);
+                    // Log substitution if debug is enabled
+                    this.logSubstitution(variableName, String(variableValue), options);
+                }
+            }
+            else {
+                // Variable not found, substitute with empty string
+                result += '';
+                this.logSubstitution(variableName, '', options);
+            }
+            // Update position to after "}}"
+            currentPosition = closeBracketPos + 2;
+        }
+        return result;
+    }
+    /**
+     * Create template variables from runtime context
+     * @param context Runtime context with provider, model, tools, and environment
+     * @param currentTool Optional current tool being processed
+     * @returns Map of variable names to values
+     */
+    createVariablesFromContext(context, currentTool = null) {
+        // Validate context - return minimal valid object if no context
+        if (!context) {
+            return {
+                MODEL: '',
+                PROVIDER: '',
+            };
+        }
+        // Initialize variables map with required fields
+        const variables = {
+            MODEL: context.model || '',
+            PROVIDER: context.provider || '',
+        };
+        // Add tool-specific variable
+        if (currentTool && currentTool.trim()) {
+            variables['TOOL_NAME'] = currentTool;
+        }
+        // Add environment variables
+        if (context.environment) {
+            if (context.environment.isGitRepository === true) {
+                variables['IS_GIT_REPO'] = 'true';
+            }
+            if (context.environment.isSandboxed === true) {
+                variables['IS_SANDBOXED'] = 'true';
+            }
+            if (context.environment.hasIdeCompanion === true) {
+                variables['HAS_IDE'] = 'true';
+            }
+        }
+        // Add derived variables
+        if (context.provider) {
+            variables['PROVIDER_UPPER'] = context.provider.toUpperCase();
+        }
+        if (context.model) {
+            variables['MODEL_SAFE'] = context.model.replace(/[^a-zA-Z0-9]/g, '_');
+        }
+        return variables;
+    }
+    /**
+     * Log variable substitution for debugging (when DEBUG=1)
+     * @param variable Variable name being substituted
+     * @param value Value being substituted
+     * @param options Processing options
+     */
+    logSubstitution(variable, value, options) {
+        // Check if debug is enabled via environment variable or options
+        const debugEnabled = process.env.DEBUG === '1' || options?.debug === true;
+        if (debugEnabled) {
+            console.log(`Template substitution: ${variable} -> ${value}`);
+        }
+    }
+}
+// Export the class as default for convenience
+export default TemplateEngine;
+//# sourceMappingURL=TemplateEngine.js.map

package/dist/src/prompt-config/TemplateEngine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TemplateEngine.js","sourceRoot":"","sources":["../../../src/prompt-config/TemplateEngine.ts"],"names":[],"mappings":"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"}

package/dist/src/prompt-config/TemplateEngine.test.d.ts

@@ -0,0 +1 @@
+export {};