feat: add 'fix' command for error suggestions and enhance command history tracking

Author: chandralegend

README.md

@@ -1,36 +1,4 @@
-```bash
-nutshell/
-├── src/
-│   ├── core/
-│   │   ├── shell.c          # Main shell loop
-│   │   ├── parser.c         # Command parsing
-│   │   └── executor.c       # Command execution
-│   ├── ai/
-│   │   ├── openai.c         # OpenAI integration
-│   │   └── local_ml.c       # On-device ML
-│   ├── pkg/
-│   │   ├── nutpkg.c         # Package manager core
-│   │   └── registry.c       # Package registry handling
-│   ├── utils/
-│   │   ├── security.c       # Security features
-│   │   ├── autocomplete.c   # Tab completion
-│   │   └── helpers.c        # Utility functions
-│   └── plugins/             # Loadable plugins
-├── include/
-│   ├── nutshell/
-│   │   ├── core.h
-│   │   ├── ai.h
-│   │   ├── pkg.h
-│   │   └── utils.h
-├── lib/                     # 3rd party libs
-├── scripts/                 # Build/install scripts
-├── packages/                # Local package cache
-├── tests/                   # Test suite
-├── Makefile
-└── README.md
-```
-
-# Nutshell
+# Nutshell 🥜
 
 Nutshell is an enhanced Unix shell that provides a simplified command language, package management, and AI-powered assistance.
 
@@ -93,7 +61,7 @@ Nutshell command | Unix equivalent | Description
 
 Commands work just like in a standard Unix shell:
 
-```
+```bash
 🥜 ~/projects ➜ peekaboo -la
 🥜 ~/projects ➜ hop nutshell
 🥜 ~/projects/nutshell ➜ command arg1 arg2
@@ -107,7 +75,7 @@ Nutshell includes AI features to help with shell commands:
 
 1. Get an OpenAI API key from [OpenAI Platform](https://platform.openai.com/)
 2. Set your API key:
-   ```
+   ```bash
    🥜 ~ ➜ set-api-key YOUR_API_KEY
    ```
 
@@ -122,7 +90,7 @@ Nutshell includes AI features to help with shell commands:
 
 Convert natural language to shell commands:
 
-```
+```bash
 🥜 ~ ➜ ask find all PDF files modified in the last week
 ```
 
@@ -132,10 +100,21 @@ The shell will return the proper command and ask if you want to execute it.
 
 Get explanations for complex commands:
 
-```
+```bash
 🥜 ~ ➜ explain find . -name "*.txt" -mtime -7 -exec grep -l "important" {} \;
 ```
 
+#### Fix commands
+
+Automatically fix common command errors:
+
+```bash
+🥜 ~ ➜ torch apple.txt
+🥜 ~ ➜ fix # Will suggest to use touch apple.txt instead.
+```
+
+The shell will suggest corrections for common mistakes and ask if you want to apply them.
+
 ### Debug Options
 
 Enable AI debugging with environment variables:
@@ -309,6 +288,42 @@ make test-pkg   # Test package installation
 make test-ai    # Test AI integration
 ```
 
+## Contributing
+
+Contributions are welcome! Please read the [contributing guidelines](CONTRIBUTING.md) before submitting a pull request.
+
+```bash
+nutshell/
+├── src/
+│   ├── core/
+│   │   ├── shell.c          # Main shell loop
+│   │   ├── parser.c         # Command parsing
+│   │   └── executor.c       # Command execution
+│   ├── ai/
+│   │   ├── openai.c         # OpenAI integration
+│   │   └── local_ml.c       # On-device ML
+│   ├── pkg/
+│   │   ├── nutpkg.c         # Package manager core
+│   │   └── registry.c       # Package registry handling
+│   ├── utils/
+│   │   ├── security.c       # Security features
+│   │   ├── autocomplete.c   # Tab completion
+│   │   └── helpers.c        # Utility functions
+│   └── plugins/             # Loadable plugins
+├── include/
+│   ├── nutshell/
+│   │   ├── core.h
+│   │   ├── ai.h
+│   │   ├── pkg.h
+│   │   └── utils.h
+├── lib/                     # 3rd party libs
+├── scripts/                 # Build/install scripts
+├── packages/                # Local package cache
+├── tests/                   # Test suite
+├── Makefile
+└── README.md
+```
+
 ## License
 
 [MIT License](LICENSE)

include/nutshell/ai.h

@@ -2,6 +2,7 @@
 #define NUTSHELL_AI_H
 
 #include <stdbool.h>
+#include <nutshell/core.h> // Add this to get ParsedCommand definition
 
 // Initialize AI integration
 bool init_ai_integration();
@@ -15,6 +16,15 @@ char *explain_command_ai(const char *command);
 // Get command suggestions based on context
 char *suggest_commands(const char *context);
 
+// Get fix suggestion for an error
+char *suggest_fix(const char *command, const char *error, int exit_status);
+
+// Handle AI commands in the shell
+bool handle_ai_command(ParsedCommand *cmd);
+
+// Initialize AI shell integration
+void init_ai_shell();
+
 // Cleanup AI resources
 void cleanup_ai_integration();
 

include/nutshell/core.h

@@ -32,6 +32,17 @@ typedef struct ParsedCommand {
     bool background;
 } ParsedCommand;
 
+// Command history tracking
+typedef struct CommandHistory {
+    char *last_command;
+    char *last_output;
+    int exit_status;
+    bool has_error;
+} CommandHistory;
+
+// Global command history for error fixing
+extern CommandHistory cmd_history;
+
 // Registry functions
 void init_registry();
 void register_command(const char *unix_cmd, const char *nut_cmd, bool is_builtin);

src/ai/openai.c

@@ -330,10 +330,13 @@ static char *request_completion(const char *system_prompt, const char *user_prom
 // Function pointers for testing
 typedef char* (*NlToCommandFunc)(const char*);
 typedef char* (*ExplainCommandFunc)(const char*);
+typedef char* (*SuggestFixFunc)(const char*, const char*, int);
 
 // Default to the real implementations
 static NlToCommandFunc nl_to_command_impl = NULL;
 static ExplainCommandFunc explain_command_impl = NULL;
+// Remove static to make it accessible to tests
+SuggestFixFunc suggest_fix_impl = NULL;
 
 // The actual implementation functions
 char* real_nl_to_command(const char* natural_language_query) {
@@ -362,6 +365,32 @@ char* real_explain_command_ai(const char* command) {
     return request_completion(system_prompt, command);
 }
 
+// Define this function early so it can be referenced by set_ai_mock_functions
+char *real_suggest_fix(const char *command, const char *error, int exit_status) {
+    // System prompt for fix suggestions
+    const char *system_prompt = 
+        "You are a shell command assistant helping fix errors. The user has run a command "
+        "that produced an error. Please suggest a fix or alternative command.\n"
+        "Rules:\n"
+        "1. Analyze why the command failed and provide a brief explanation\n"
+        "2. Suggest a corrected command that will likely work\n"
+        "3. If there are multiple possible fixes, list the most likely one first\n"
+        "4. Use Nutshell commands where appropriate (peekaboo for ls, hop for cd, etc.)\n"
+        "5. Format your response with sections: 'Explanation:', 'Suggested Fix:', followed by 'Corrected command:' on a new line\n"
+        "6. Be helpful and educational in your response";
+    
+    // Create user prompt with context
+    char user_prompt[4096];
+    snprintf(user_prompt, sizeof(user_prompt),
+             "Command: %s\nOutput/Error: %s\nExit status: %d\n"
+             "Please suggest how to fix this command. If the command has a typo or common error, "
+             "show the corrected version. Format your response with 'Explanation:' followed by "
+             "'Corrected command:' sections.",
+             command, error && strlen(error) > 0 ? error : "No error output available", exit_status);
+    
+    return request_completion(system_prompt, user_prompt);
+}
+
 // Public API functions that use the function pointers
 char* nl_to_command(const char* natural_language_query) {
     if (nl_to_command_impl == NULL) {
@@ -377,10 +406,19 @@ char* explain_command_ai(const char* command) {
     return explain_command_impl(command);
 }
 
-// Function to set mock implementations for testing
+// Function to set mock implementations for testing - modified to match header
 void set_ai_mock_functions(NlToCommandFunc nl_func, ExplainCommandFunc explain_func) {
     nl_to_command_impl = nl_func ? nl_func : real_nl_to_command;
     explain_command_impl = explain_func ? explain_func : real_explain_command_ai;
+    // Remove the third parameter handling
+}
+
+// Public wrapper function
+char *suggest_fix(const char *command, const char *error, int exit_status) {
+    if (suggest_fix_impl == NULL) {
+        suggest_fix_impl = real_suggest_fix;
+    }
+    return suggest_fix_impl(command, error, exit_status);
 }
 
 // Suggest commands based on context
@@ -517,3 +555,153 @@ void reset_api_key_for_testing() {
     }
     AI_DEBUG("API key reset for testing");
 }
+
+// Built-in command to get fix suggestions for the last command
+int fix_command(int argc, char **argv) {
+    // Suppress unused parameter warnings
+    (void)argc;
+    (void)argv;
+    
+    // Import command history
+    extern CommandHistory cmd_history;
+    
+    // Check if we have a last command
+    if (!cmd_history.last_command || strlen(cmd_history.last_command) == 0) {
+        printf("No previous command to fix.\n");
+        return 1;
+    }
+    
+    // Check if we have API key
+    if (!has_api_key()) {
+        printf("No OpenAI API key found. Please set one with: set-api-key YOUR_API_KEY\n");
+        return 1;
+    }
+    
+    printf("Analyzing: %s\n", cmd_history.last_command);
+    if (cmd_history.has_error) {
+        printf("Exit status: %d\n", cmd_history.exit_status);
+    }
+    
+    // If there's no error output but we have a non-zero exit status, use a generic message
+    const char *error_text = cmd_history.last_output && strlen(cmd_history.last_output) > 0 ? 
+                             cmd_history.last_output : "Command failed with no output";
+    
+    // Get fix suggestion
+    char *result = suggest_fix(cmd_history.last_command, error_text, cmd_history.exit_status);
+    
+    if (result) {
+        printf("\n%s\n\n", result);
+        
+        // Skip interactive prompt in testing mode
+        if (getenv("NUTSHELL_TESTING")) {
+            free(result);
+            return 0;
+        }
+        
+        // Create a copy of the result for parsing
+        char *result_copy = strdup(result);
+        if (!result_copy) {
+            free(result);
+            return 1;
+        }
+        
+        // Extract command from the suggestion
+        char *suggested_cmd = NULL;
+        char *lines[100] = {0};  // Increased max lines to 100
+        int line_count = 0;
+        
+        // Split the result into lines
+        char *line = strtok(result_copy, "\n");
+        while (line && line_count < 100) {
+            lines[line_count++] = line;
+            line = strtok(NULL, "\n");
+        }
+        
+        // Try to find a code block with a command
+        bool in_code_block = false;
+        char *code_block_content = NULL;
+        
+        AI_DEBUG("Searching for command in AI response with %d lines", line_count);
+        
+        for (int i = 0; i < line_count; i++) {
+            AI_DEBUG("Line %d: %s", i, lines[i]);
+            
+            // Check for code block markers (with or without language specifier)
+            if (strncmp(lines[i], "```", 3) == 0) {
+                if (!in_code_block) {
+                    // Start of code block - skip this line
+                    in_code_block = true;
+                    AI_DEBUG("Code block starts at line %d", i);
+                } else {
+                    // End of code block
+                    in_code_block = false;
+                    AI_DEBUG("Code block ends at line %d", i);
+                }
+                continue;
+            }
+            
+            // If we're in a code block, check for actual command content
+            if (in_code_block) {
+                // Skip empty lines or comments
+                if (strlen(lines[i]) == 0 || lines[i][0] == '#') {
+                    continue;
+                }
+                
+                // Found code within a code block
+                code_block_content = lines[i];
+                AI_DEBUG("Found command in code block: %s", code_block_content);
+                break;
+            }
+            
+            // Look for lines after "Corrected command:" pattern
+            if (strstr(lines[i], "Corrected command:") != NULL && i + 1 < line_count) {
+                // The next line is likely our command
+                // Skip to the next line that's not empty and doesn't start with ```
+                for (int j = i + 1; j < line_count; j++) {
+                    if (strlen(lines[j]) == 0 || strncmp(lines[j], "```", 3) == 0) {
+                        continue;
+                    }
+                    suggested_cmd = lines[j];
+                    AI_DEBUG("Found command after 'Corrected command:' pattern: %s", suggested_cmd);
+                    break;
+                }
+                if (suggested_cmd) {
+                    break;
+                }
+            }
+        }
+        
+        // If we found a likely command, ask if user wants to execute it
+        if (code_block_content) {
+            suggested_cmd = code_block_content;
+        }
+        
+        if (suggested_cmd) {
+            printf("Would you like to execute: %s ? (y/n): ", suggested_cmd);
+            char response[10] = {0};
+            if (fgets(response, sizeof(response), stdin)) {
+                if (response[0] == 'y' || response[0] == 'Y') {
+                    // Create a temporary script and execute it
+                    char temp_script[1024];
+                    snprintf(temp_script, sizeof(temp_script), "%s/.nutshell/temp_fix.sh", getenv("HOME"));
+                    FILE *fp = fopen(temp_script, "w");
+                    if (fp) {
+                        fprintf(fp, "#!/bin/bash\n%s\n", suggested_cmd);
+                        fclose(fp);
+                        chmod(temp_script, 0700);
+                        system(temp_script);
+                        // Clean up
+                        unlink(temp_script);
+                    }
+                }
+            }
+        }
+        
+        free(result_copy);
+        free(result);
+    } else {
+        printf("Failed to get a fix suggestion.\n");
+    }
+    
+    return 0;
+}