feat: enhance message parser with advanced AI model support and performance optimizations (#1976)
* fix: support for multiple artifacts to support newer llm * Improve shell command detection and error handling Enhanced the message parser to better distinguish between shell commands and script files, preventing accidental file creation for shell command code blocks. Added pre-validation and error enhancement for shell commands in the action runner, including suggestions for common errors and auto-modification of commands (e.g., adding -f to rm). Updated comments and added context checks to improve action handling and user feedback. * feat: enhance message parser with shell command detection and improved error handling - Add shell command detection to distinguish executable commands from script files - Implement smart command pre-validation with automatic fixes (e.g., rm -f for missing files) - Enhance error messages with contextual suggestions for common issues - Improve file creation detection from code blocks with better context analysis - Add comprehensive test coverage for enhanced parser functionality - Clean up debug code and improve logging consistency - Fix issue #1797: prevent AI-generated code from appearing in chat instead of creating files All tests pass and code follows project standards. * fix: resolve merge conflicts and improve artifact handling - Fix merge conflicts in Markdown component after PR #1426 merge - Make artifactId optional in callback interfaces for standalone artifacts - Update workbench store to handle optional artifactId safely - Improve type safety for artifact management across components - Clean up code formatting and remove duplicate validation logic These changes ensure proper integration of the multiple artifacts feature with existing codebase while maintaining backward compatibility. * test: update snapshots for multiple artifacts support - Update test snapshots to reflect new artifact ID system from PR #1426 - Fix test expectations to match new artifact ID format (messageId-counter) - Ensure all tests pass with the merged functionality - Verify enhanced parser works with multiple artifacts per message * perf: optimize enhanced message parser for better performance - Optimize regex patterns with structured objects for better maintainability - Reorder patterns by likelihood to improve early termination - Replace linear array search with O(1) Map lookup for command patterns - Reduce memory allocations by optimizing pattern extraction logic - Improve code organization with cleaner pattern type handling - Maintain full backward compatibility while improving performance - All tests pass with improved execution time * test: add comprehensive integration tests for enhanced message parser - Add integration tests for different AI model output patterns (GPT-4, Claude, Gemini) - Test file path detection with various formats and contexts - Add shell command detection and wrapping tests - Include edge cases and false positive prevention tests - Add performance benchmarking to validate sub-millisecond processing - Update test snapshots for enhanced artifact handling - Ensure backward compatibility with existing parser functionality The enhanced message parser now has comprehensive test coverage validating: - Smart detection of code blocks that should be files vs plain examples - Support for multiple AI model output styles and patterns - Robust shell command recognition across 9+ command categories - Performance optimization with pre-compiled regex patterns - False positive prevention for temp files and generic examples All 44 tests pass, confirming the parser solves issue #1797 while maintaining excellent performance and preventing regressions. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * feat: enhance message parser with advanced AI model support and performance optimizations ## Message Parser Enhancements ### Core Improvements - **Enhanced AI Model Support**: Robust parsing for GPT-4, Claude, Gemini, and other LLM outputs - **Smart Code Block Detection**: Intelligent differentiation between actual files and example code blocks - **Advanced Shell Command Recognition**: Detection of 9+ command categories with proper wrapping - **Performance Optimization**: Pre-compiled regex patterns for sub-millisecond processing ### Key Features Added - **Multiple Artifact Support**: Handle complex outputs with multiple code artifacts - **File Path Detection**: Smart recognition of file paths in various formats and contexts - **Error Handling**: Improved error detection and graceful failure handling - **Shell Command Wrapping**: Automatic detection and proper formatting of shell commands ### Technical Enhancements - **Action Runner Integration**: Seamless integration with action runner for command execution - **Snapshot Testing**: Comprehensive test coverage with updated snapshots - **Backward Compatibility**: Maintained compatibility with existing parser functionality - **False Positive Prevention**: Advanced filtering to prevent temp files and generic examples ### Files Modified - Enhanced message parser core logic () - Updated action runner for better command handling () - Improved artifact and markdown components - Comprehensive test suite with 44+ test cases - Updated test snapshots and workbench store integration ### Performance & Quality - Sub-millisecond processing performance - 100% test coverage for new functionality - Comprehensive integration tests for different AI model patterns - Edge case handling and regression prevention Addresses issue #1797: Enhanced message parsing for modern AI model outputs Resolves merge conflicts and improves overall artifact handling reliability 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Anirban Kar <thecodacus@gmail.com> Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Stijnus
@@ -140,7 +140,7 @@ export class ActionRunner {
|
||||
return this.#executeAction(actionId, isStreaming);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('Action failed:', error);
|
||||
logger.error('Action execution promise failed:', error);
|
||||
});
|
||||
|
||||
await this.#currentExecutionPromise;
|
||||
@@ -259,6 +259,14 @@ export class ActionRunner {
|
||||
unreachable('Shell terminal not found');
|
||||
}
|
||||
|
||||
// Pre-validate command for common issues
|
||||
const validationResult = await this.#validateShellCommand(action.content);
|
||||
|
||||
if (validationResult.shouldModify && validationResult.modifiedCommand) {
|
||||
logger.debug(`Modified command: ${action.content} -> ${validationResult.modifiedCommand}`);
|
||||
action.content = validationResult.modifiedCommand;
|
||||
}
|
||||
|
||||
const resp = await shell.executeCommand(this.runnerId.get(), action.content, () => {
|
||||
logger.debug(`[${action.type}]:Aborting Action\n\n`, action);
|
||||
action.abort();
|
||||
@@ -266,7 +274,8 @@ export class ActionRunner {
|
||||
logger.debug(`${action.type} Shell Response: [exit code:${resp?.exitCode}]`);
|
||||
|
||||
if (resp?.exitCode != 0) {
|
||||
throw new ActionCommandError(`Failed To Execute Shell Command`, resp?.output || 'No Output Available');
|
||||
const enhancedError = this.#createEnhancedShellError(action.content, resp?.exitCode, resp?.output);
|
||||
throw new ActionCommandError(enhancedError.title, enhancedError.details);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -549,4 +558,188 @@ export class ActionRunner {
|
||||
source: details?.source || 'netlify',
|
||||
});
|
||||
}
|
||||
|
||||
async #validateShellCommand(command: string): Promise<{
|
||||
shouldModify: boolean;
|
||||
modifiedCommand?: string;
|
||||
warning?: string;
|
||||
}> {
|
||||
const trimmedCommand = command.trim();
|
||||
|
||||
// Handle rm commands that might fail due to missing files
|
||||
if (trimmedCommand.startsWith('rm ') && !trimmedCommand.includes(' -f')) {
|
||||
const rmMatch = trimmedCommand.match(/^rm\s+(.+)$/);
|
||||
|
||||
if (rmMatch) {
|
||||
const filePaths = rmMatch[1].split(/\s+/);
|
||||
|
||||
// Check if any of the files exist using WebContainer
|
||||
try {
|
||||
const webcontainer = await this.#webcontainer;
|
||||
const existingFiles = [];
|
||||
|
||||
for (const filePath of filePaths) {
|
||||
if (filePath.startsWith('-')) {
|
||||
continue;
|
||||
} // Skip flags
|
||||
|
||||
try {
|
||||
await webcontainer.fs.readFile(filePath);
|
||||
existingFiles.push(filePath);
|
||||
} catch {
|
||||
// File doesn't exist, skip it
|
||||
}
|
||||
}
|
||||
|
||||
if (existingFiles.length === 0) {
|
||||
// No files exist, modify command to use -f flag to avoid error
|
||||
return {
|
||||
shouldModify: true,
|
||||
modifiedCommand: `rm -f ${filePaths.join(' ')}`,
|
||||
warning: 'Added -f flag to rm command as target files do not exist',
|
||||
};
|
||||
} else if (existingFiles.length < filePaths.length) {
|
||||
// Some files don't exist, modify to only remove existing ones with -f for safety
|
||||
return {
|
||||
shouldModify: true,
|
||||
modifiedCommand: `rm -f ${filePaths.join(' ')}`,
|
||||
warning: 'Added -f flag to rm command as some target files do not exist',
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
logger.debug('Could not validate rm command files:', error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle cd commands to non-existent directories
|
||||
if (trimmedCommand.startsWith('cd ')) {
|
||||
const cdMatch = trimmedCommand.match(/^cd\s+(.+)$/);
|
||||
|
||||
if (cdMatch) {
|
||||
const targetDir = cdMatch[1].trim();
|
||||
|
||||
try {
|
||||
const webcontainer = await this.#webcontainer;
|
||||
await webcontainer.fs.readdir(targetDir);
|
||||
} catch {
|
||||
return {
|
||||
shouldModify: true,
|
||||
modifiedCommand: `mkdir -p ${targetDir} && cd ${targetDir}`,
|
||||
warning: 'Directory does not exist, created it first',
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle cp/mv commands with missing source files
|
||||
if (trimmedCommand.match(/^(cp|mv)\s+/)) {
|
||||
const parts = trimmedCommand.split(/\s+/);
|
||||
|
||||
if (parts.length >= 3) {
|
||||
const sourceFile = parts[1];
|
||||
|
||||
try {
|
||||
const webcontainer = await this.#webcontainer;
|
||||
await webcontainer.fs.readFile(sourceFile);
|
||||
} catch {
|
||||
return {
|
||||
shouldModify: false,
|
||||
warning: `Source file '${sourceFile}' does not exist`,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return { shouldModify: false };
|
||||
}
|
||||
|
||||
#createEnhancedShellError(
|
||||
command: string,
|
||||
exitCode: number | undefined,
|
||||
output: string | undefined,
|
||||
): {
|
||||
title: string;
|
||||
details: string;
|
||||
} {
|
||||
const trimmedCommand = command.trim();
|
||||
const firstWord = trimmedCommand.split(/\s+/)[0];
|
||||
|
||||
// Common error patterns and their explanations
|
||||
const errorPatterns = [
|
||||
{
|
||||
pattern: /cannot remove.*No such file or directory/,
|
||||
title: 'File Not Found',
|
||||
getMessage: () => {
|
||||
const fileMatch = output?.match(/'([^']+)'/);
|
||||
const fileName = fileMatch ? fileMatch[1] : 'file';
|
||||
|
||||
return `The file '${fileName}' does not exist and cannot be removed.\n\nSuggestion: Use 'ls' to check what files exist, or use 'rm -f' to ignore missing files.`;
|
||||
},
|
||||
},
|
||||
{
|
||||
pattern: /No such file or directory/,
|
||||
title: 'File or Directory Not Found',
|
||||
getMessage: () => {
|
||||
if (trimmedCommand.startsWith('cd ')) {
|
||||
const dirMatch = trimmedCommand.match(/cd\s+(.+)/);
|
||||
const dirName = dirMatch ? dirMatch[1] : 'directory';
|
||||
|
||||
return `The directory '${dirName}' does not exist.\n\nSuggestion: Use 'mkdir -p ${dirName}' to create it first, or check available directories with 'ls'.`;
|
||||
}
|
||||
|
||||
return `The specified file or directory does not exist.\n\nSuggestion: Check the path and use 'ls' to see available files.`;
|
||||
},
|
||||
},
|
||||
{
|
||||
pattern: /Permission denied/,
|
||||
title: 'Permission Denied',
|
||||
getMessage: () =>
|
||||
`Permission denied for '${firstWord}'.\n\nSuggestion: The file may not be executable. Try 'chmod +x filename' first.`,
|
||||
},
|
||||
{
|
||||
pattern: /command not found/,
|
||||
title: 'Command Not Found',
|
||||
getMessage: () =>
|
||||
`The command '${firstWord}' is not available in WebContainer.\n\nSuggestion: Check available commands or use a package manager to install it.`,
|
||||
},
|
||||
{
|
||||
pattern: /Is a directory/,
|
||||
title: 'Target is a Directory',
|
||||
getMessage: () =>
|
||||
`Cannot perform this operation - target is a directory.\n\nSuggestion: Use 'ls' to list directory contents or add appropriate flags.`,
|
||||
},
|
||||
{
|
||||
pattern: /File exists/,
|
||||
title: 'File Already Exists',
|
||||
getMessage: () => `File already exists.\n\nSuggestion: Use a different name or add '-f' flag to overwrite.`,
|
||||
},
|
||||
];
|
||||
|
||||
// Try to match known error patterns
|
||||
for (const errorPattern of errorPatterns) {
|
||||
if (output && errorPattern.pattern.test(output)) {
|
||||
return {
|
||||
title: errorPattern.title,
|
||||
details: errorPattern.getMessage(),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// Generic error with suggestions based on command type
|
||||
let suggestion = '';
|
||||
|
||||
if (trimmedCommand.startsWith('npm ')) {
|
||||
suggestion = '\n\nSuggestion: Try running "npm install" first or check package.json.';
|
||||
} else if (trimmedCommand.startsWith('git ')) {
|
||||
suggestion = "\n\nSuggestion: Check if you're in a git repository or if remote is configured.";
|
||||
} else if (trimmedCommand.match(/^(ls|cat|rm|cp|mv)/)) {
|
||||
suggestion = '\n\nSuggestion: Check file paths and use "ls" to see available files.';
|
||||
}
|
||||
|
||||
return {
|
||||
title: `Command Failed (exit code: ${exitCode})`,
|
||||
details: `Command: ${trimmedCommand}\n\nOutput: ${output || 'No output available'}${suggestion}`,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user