refactor: update patch application instructions to use standard patch format and tweak env rule

Author: NicolasIRAGNE

app/actions/rules.yaml

@@ -84,6 +84,7 @@ env-secrets:
     ## Environment Variables
     - Store secrets in a .env file (never commit it)
     - A .env.example file should be provided for reference and any new secrets should be added to it
+    - Any secret that is no longer needed should be removed from the .env.example file
     - The implementation should use the dotenv (or similar) library to load environment variables from .env files
     - Variables should also be loaded from the environment
 

app/routes/generate.py

@@ -122,31 +122,20 @@ def generate_patch(files: Dict[str, str], source: str = "scratch", repo_url: str
     # Add a comment header explaining the patch
     if source == "repo" and repo_url:
         patch_lines.append(f"# Gitrules configuration patch generated from repository: {repo_url}")
-        patch_lines.append("# Apply with: git apply <this-patch>")
-        use_git_format = True
+        patch_lines.append("# Apply with: patch -p0 < <this-patch>")
     elif source == "template":
         patch_lines.append("# Gitrules configuration patch generated from template")
         patch_lines.append("# Apply with: patch -p0 < <this-patch>")
-        use_git_format = False
     else:
         patch_lines.append("# Gitrules configuration patch generated from scratch")
         patch_lines.append("# Apply with: patch -p0 < <this-patch>")
-        use_git_format = False
 
     patch_lines.append("")
 
     for filepath, content in files.items():
-        if use_git_format:
-            # Git format
-            patch_lines.append(f"diff --git a/{filepath} b/{filepath}")
-            patch_lines.append("new file mode 100644")
-            patch_lines.append("index 0000000..1234567")
-            patch_lines.append("--- /dev/null")
-            patch_lines.append(f"+++ b/{filepath}")
-        else:
-            # Standard patch format
-            patch_lines.append(f"--- /dev/null")
-            patch_lines.append(f"+++ {filepath}")
+        # Standard patch format
+        patch_lines.append(f"--- /dev/null")
+        patch_lines.append(f"+++ {filepath}")
 
         lines = content.split('\n')
         if lines and lines[-1] == '':

app/templates/components/final_step_modal.html

@@ -56,7 +56,7 @@ <h3 class="text-lg font-black mb-3">👁️ File Preview</h3>
                 <h3 class="text-lg font-black mb-3">🔧 Patch Preview</h3>
                 <div class="bg-yellow-50 border-2 border-black p-3 text-sm">
                     <p class="mb-2">The following patch file will be generated for easy application to your repository:</p>
-                    <code class="block bg-white border border-black p-2 font-mono text-xs">git apply gitrules-config.patch</code>
+                    <code class="block bg-white border border-black p-2 font-mono text-xs">patch -p0 &lt; gitrules-config.patch</code>
                 </div>
                 <div id="patch-preview" class="bg-gray-50 border-2 border-black p-4 font-mono text-xs overflow-x-auto max-h-64 overflow-y-auto mt-2">
                     <!-- Patch content will be shown here -->
@@ -248,12 +248,9 @@ <h4 class="font-bold mb-2">🤖 Agents (${selectedAgents.length})</h4>
 
     // Generate patch for each file
     Object.entries(state.files).forEach(([path, content]) => {
-        // Create a proper git diff format
-        patchContent += `diff --git a/${path} b/${path}\n`;
-        patchContent += `new file mode 100644\n`;
-        patchContent += `index 0000000..0000000\n`;
+        // Create a proper patch format
         patchContent += `--- /dev/null\n`;
-        patchContent += `+++ b/${path}\n`;
+        patchContent += `+++ ${path}\n`;
 
         // Add file content with + prefix for each line
         const lines = content.split('\n');
@@ -323,11 +320,8 @@ <h4 class="font-bold mb-2">🤖 Agents (${selectedAgents.length})</h4>
 
     // Generate patch for each file
     Object.entries(state.files).forEach(([path, content]) => {
-        patchContent += `diff --git a/${path} b/${path}\n`;
-        patchContent += `new file mode 100644\n`;
-        patchContent += `index 0000000..0000000\n`;
         patchContent += `--- /dev/null\n`;
-        patchContent += `+++ b/${path}\n`;
+        patchContent += `+++ ${path}\n`;
 
         const lines = content.split('\n');
         patchContent += `@@ -0,0 +1,${lines.length} @@\n`;
@@ -350,7 +344,7 @@ <h4 class="font-bold mb-2">🤖 Agents (${selectedAgents.length})</h4>
 
     // Copy patch to clipboard
     navigator.clipboard.writeText(patchContent).then(() => {
-        alert('Patch copied to clipboard! You can now paste and apply it using: git apply');
+        alert('Patch copied to clipboard! You can now paste and apply it using: patch -p0');
     }).catch(err => {
         console.error('Failed to copy patch:', err);
         alert('Failed to copy patch to clipboard. Please download the files instead.');

app/templates/generate.html

@@ -58,7 +58,7 @@
 }
 </style>
 
-<div class="min-h-screen bg-cyan-50 -mt-20 pt-20 page-content">
+<div class="bg-cyan-50 -mt-20 pt-20 flex flex-col min-h-screen page-content">
     <!-- Header -->
     <div class="bg-cyan-50 border-b-2 border-black shadow-[0_4px_0px_0px_rgba(0,0,0,1)] sticky top-0 z-10">
         <div class="container mx-auto px-4 py-4">
@@ -74,11 +74,11 @@ <h1 class="text-2xl font-black text-black">Generate Your Configuration</h1>
         </div>
     </div>
 
-    <div class="container mx-auto px-4 py-6">
+    <div class="container mx-auto px-4 py-6 flex-1 overflow-auto">
         <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
             <!-- Left Column: Summary -->
             <div class="lg:col-span-1">
-                <div class="bg-white border-2 border-black shadow-[4px_4px_0px_0px_rgba(0,0,0,1)] p-4 sticky top-24">
+                <div class="bg-white border-2 border-black shadow-[4px_4px_0px_0px_rgba(0,0,0,1)] p-4">
                     <h3 class="text-xl font-black text-black mb-4">📋 Selected Tools</h3>
                     <div id="selectedSummary" class="space-y-3">
                         <!-- Will be populated dynamically -->
@@ -415,11 +415,7 @@ <h4 class="font-bold mb-2">🔌 MCPs (${grouped.mcps.length})</h4>
     const commandElement = document.getElementById('patchCommand');
 
     // Update command based on source
-    if (sourceInfo.source === 'repo') {
-        commandElement.innerHTML = 'git apply &lt;&lt; \'EOF\'<br/>[patch content]<br/>EOF';
-    } else {
-        commandElement.innerHTML = 'patch -p0 &lt;&lt; \'EOF\'<br/>[patch content]<br/>EOF';
-    }
+    commandElement.innerHTML = 'patch -p0 &lt;&lt; \'EOF\'<br/>[patch content]<br/>EOF';
 
     if (!patchContent) {
         container.innerHTML = '<div class="text-gray-500">No patch generated</div>';
@@ -545,19 +541,11 @@ <h4 class="font-bold mb-2">🔌 MCPs (${grouped.mcps.length})</h4>
     let contentToCopy;
     let message;
 
-    if (isFromRepo) {
-        // For repo source: git apply with inline patch
-        contentToCopy = `git apply << 'EOF'
+    // Use patch for all sources
+    contentToCopy = `patch -p0 << 'EOF'
 ${patchContent}
 EOF`;
-        message = 'Git patch command copied to clipboard! Paste and run directly in your terminal';
-    } else {
-        // For template/scratch: patch with inline content
-        contentToCopy = `patch -p0 << 'EOF'
-${patchContent}
-EOF`;
-        message = 'Patch command copied to clipboard! Paste and run directly in your terminal';
-    }
+    message = 'Patch command copied to clipboard! Paste and run directly in your terminal';
 
     navigator.clipboard.writeText(contentToCopy).then(() => {
         showNotification(message);
@@ -589,17 +577,15 @@ <h4 class="font-bold mb-2">🔌 MCPs (${grouped.mcps.length})</h4>
 
 function applyConfiguration() {
     // Show instructions for applying
-    const isFromRepo = sourceInfo.source === 'repo';
-    const command = isFromRepo ? 'git apply gitrules-config.patch' : 'patch -p0 < gitrules-config.patch';
-    const reviewStep = isFromRepo ? 'git status' : 'ls -la';
-    const commitStep = isFromRepo ? 'git commit -am "Add Gitrules configuration"' : '';
+    const command = 'patch -p0 < gitrules-config.patch';
+    const reviewStep = 'ls -la';
 
     const instructions = `
 To apply this configuration to your repository:
 
 1. Save the patch file as 'gitrules-config.patch'
 2. Run: ${command}
-3. Review the changes with: ${reviewStep}${commitStep ? '\n4. Commit when ready: ' + commitStep : ''}
+3. Review the changes with: ${reviewStep}
     `;
 
     alert(instructions);