portacode 0.3.19.dev4__tar.gz → 0.3.19.dev6__tar.gz

{portacode-0.3.19.dev4 → portacode-0.3.19.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portacode
-Version: 0.3.19.dev4
+Version: 0.3.19.dev6
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-0.3.19.dev4 → portacode-0.3.19.dev6}/portacode/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.19.dev4'
-__version_tuple__ = version_tuple = (0, 3, 19, 'dev4')
+__version__ = version = '0.3.19.dev6'
+__version_tuple__ = version_tuple = (0, 3, 19, 'dev6')

{portacode-0.3.19.dev4 → portacode-0.3.19.dev6}/portacode/connection/handlers/project_state_handlers.py

@@ -338,70 +338,23 @@ class GitManager:
             return None
     
     def _get_pygments_lexer(self, file_path: str) -> Optional[object]:
-        """Get Pygments lexer for a file path."""
+        """Get Pygments lexer for a file path using built-in detection."""
         if not PYGMENTS_AVAILABLE:
             return None
         
         try:
-            # Try to get lexer by filename
+            # Use Pygments' built-in filename detection
             return get_lexer_for_filename(file_path)
         except ClassNotFound:
-            # Fallback to common extensions
-            extension = os.path.splitext(file_path)[1].lower()
-            lexer_map = {
-                '.py': 'python',
-                '.js': 'javascript',
-                '.jsx': 'jsx',
-                '.ts': 'typescript',
-                '.tsx': 'tsx',
-                '.html': 'html',
-                '.htm': 'html',
-                '.css': 'css',
-                '.scss': 'scss',
-                '.sass': 'sass',
-                '.json': 'json',
-                '.xml': 'xml',
-                '.yaml': 'yaml',
-                '.yml': 'yaml',
-                '.java': 'java',
-                '.c': 'c',
-                '.cpp': 'cpp',
-                '.cc': 'cpp',
-                '.cxx': 'cpp',
-                '.h': 'c',
-                '.hpp': 'cpp',
-                '.cs': 'csharp',
-                '.php': 'php',
-                '.rb': 'ruby',
-                '.go': 'go',
-                '.rs': 'rust',
-                '.sh': 'bash',
-                '.bash': 'bash',
-                '.zsh': 'zsh',
-                '.fish': 'fish',
-                '.sql': 'sql',
-                '.md': 'markdown',
-                '.rst': 'rst'
-            }
-            
-            lexer_name = lexer_map.get(extension)
-            if lexer_name:
-                try:
-                    return get_lexer_by_name(lexer_name)
-                except ClassNotFound:
-                    pass
-            
-            # Final fallback to text
-            try:
-                return get_lexer_by_name('text')
-            except ClassNotFound:
-                return None
+            # If no lexer found, return None (will fall back to plain text)
+            logger.debug("No Pygments lexer found for file: %s", file_path)
+            return None
         except Exception as e:
             logger.debug("Error getting Pygments lexer: %s", e)
             return None
     
-    def _generate_html_diff(self, original_content: str, modified_content: str, file_path: str) -> Optional[str]:
-        """Generate unified HTML diff with intra-line highlighting using GitPython and diff-match-patch."""
+    def _generate_html_diff(self, original_content: str, modified_content: str, file_path: str) -> Optional[Dict[str, str]]:
+        """Generate unified HTML diff with intra-line highlighting. Returns both minimal and full context versions."""
         if not PYGMENTS_AVAILABLE:
             logger.debug("Pygments not available for HTML diff generation")
             return None
@@ -413,85 +366,138 @@ class GitManager:
             original_lines = original_content.splitlines(keepends=True)
             modified_lines = modified_content.splitlines(keepends=True)
             
-            # Generate unified diff
-            diff_lines = list(difflib.unified_diff(
+            # Generate both minimal (3 lines context) and full context diffs
+            minimal_diff_lines = list(difflib.unified_diff(
                 original_lines, 
                 modified_lines, 
                 fromfile='a/' + os.path.basename(file_path),
                 tofile='b/' + os.path.basename(file_path),
-                lineterm=''
+                lineterm='',
+                n=3  # 3 lines of context (default)
             ))
             
-            # Parse the unified diff and add intra-line highlighting
-            parsed_diff = self._parse_unified_diff_with_intraline(diff_lines, original_lines, modified_lines)
+            full_diff_lines = list(difflib.unified_diff(
+                original_lines, 
+                modified_lines, 
+                fromfile='a/' + os.path.basename(file_path),
+                tofile='b/' + os.path.basename(file_path),
+                lineterm='',
+                n=len(original_lines) + len(modified_lines)  # Show all lines
+            ))
             
-            # Get Pygments lexer for syntax highlighting
-            lexer = self._get_pygments_lexer(file_path)
+            # Parse both diffs
+            minimal_parsed = self._parse_unified_diff_with_intraline(minimal_diff_lines, original_lines, modified_lines)
+            full_parsed = self._parse_unified_diff_with_intraline(full_diff_lines, original_lines, modified_lines)
             
-            # Build HTML
-            html_parts = []
-            html_parts.append('<div class="unified-diff-container">')
+            # Generate HTML for both versions
+            minimal_html = self._generate_diff_html(minimal_parsed, file_path, 'minimal')
+            full_html = self._generate_diff_html(full_parsed, file_path, 'full')
             
-            # Add stats header
-            line_additions = sum(1 for line in parsed_diff if line['type'] == 'add')
-            line_deletions = sum(1 for line in parsed_diff if line['type'] == 'delete')
+            return {
+                'minimal': minimal_html,
+                'full': full_html
+            }
             
-            html_parts.append(f'''
-                <div class="diff-stats">
+        except Exception as e:
+            logger.error("Error generating HTML diff: %s", e)
+            return None
+    
+    def _generate_diff_html(self, parsed_diff: List[Dict], file_path: str, view_mode: str) -> str:
+        """Generate HTML for a parsed diff."""
+        # Get Pygments lexer for syntax highlighting
+        lexer = self._get_pygments_lexer(file_path)
+        
+        # Build HTML
+        html_parts = []
+        html_parts.append(f'<div class="unified-diff-container" data-view-mode="{view_mode}">')
+        
+        # Add stats header with toggle
+        line_additions = sum(1 for line in parsed_diff if line['type'] == 'add')
+        line_deletions = sum(1 for line in parsed_diff if line['type'] == 'delete')
+        
+        html_parts.append(f'''
+            <div class="diff-stats">
+                <div class="diff-stats-left">
                     <span class="additions">+{line_additions}</span>
                     <span class="deletions">-{line_deletions}</span>
                     <span class="file-path">{os.path.basename(file_path)}</span>
                 </div>
-            ''')
-            
-            # Generate unified diff view
-            html_parts.append('<div class="diff-content">')
-            html_parts.append('<table class="diff-table">')
-            
-            for line_info in parsed_diff:
-                if line_info['type'] == 'header':
-                    continue  # Skip diff headers
-                    
-                line_type = line_info['type']
-                old_line_num = line_info.get('old_line_num', '')
-                new_line_num = line_info.get('new_line_num', '')
-                content = line_info['content']
-                intraline_html = line_info.get('intraline_html', '')
+                <div class="diff-stats-right">
+                    <button class="diff-toggle-btn" data-current-mode="{view_mode}">
+                        <i class="fas fa-eye"></i>
+                        <span class="toggle-text">{''}</span>
+                    </button>
+                </div>
+            </div>
+        ''')
+        
+        # Generate unified diff view
+        html_parts.append('<div class="diff-content">')
+        html_parts.append('<table class="diff-table">')
+        
+        for line_info in parsed_diff:
+            if line_info['type'] == 'header':
+                continue  # Skip all diff headers including --- and +++ lines
                 
-                # Use intra-line highlighted content if available, otherwise apply syntax highlighting
-                if intraline_html:
-                    final_content = intraline_html
-                elif lexer and content.strip():
-                    try:
-                        # Apply syntax highlighting to the content (without the +/- prefix)
-                        clean_content = content[1:] if content and content[0] in '+-' else content
-                        highlighted = highlight(clean_content, lexer, HtmlFormatter(nowrap=True, noclasses=False))
-                        final_content = content[0] + highlighted if content and content[0] in '+-' else highlighted
-                    except Exception:
+            line_type = line_info['type']
+            old_line_num = line_info.get('old_line_num', '')
+            new_line_num = line_info.get('new_line_num', '')
+            content = line_info['content']
+            intraline_html = line_info.get('intraline_html', '')
+            
+            # Use intra-line highlighted content if available
+            if intraline_html:
+                final_content = intraline_html
+            else:
+                # Apply syntax highlighting to the content
+                if content and content[0] in '+-':
+                    # For added/deleted lines, highlight the content without the prefix
+                    prefix = content[0]
+                    clean_content = content[1:]
+                    
+                    if lexer and clean_content.strip():
+                        try:
+                            # Apply syntax highlighting
+                            highlighted = highlight(clean_content, lexer, HtmlFormatter(nowrap=True, noclasses=False))
+                            final_content = prefix + highlighted
+                        except Exception as e:
+                            logger.debug("Error applying syntax highlighting: %s", e)
+                            final_content = self._escape_html(content)
+                    else:
+                        final_content = self._escape_html(content)
+                elif content and content[0] == ' ':
+                    # For context lines, highlight without the space prefix
+                    clean_content = content[1:]
+                    
+                    if lexer and clean_content.strip():
+                        try:
+                            # Apply syntax highlighting
+                            highlighted = highlight(clean_content, lexer, HtmlFormatter(nowrap=True, noclasses=False))
+                            final_content = ' ' + highlighted
+                        except Exception as e:
+                            logger.debug("Error applying syntax highlighting: %s", e)
+                            final_content = self._escape_html(content)
+                    else:
                         final_content = self._escape_html(content)
                 else:
                     final_content = self._escape_html(content)
-                
-                # CSS classes for different line types
-                row_class = f'diff-line diff-{line_type}'
-                
-                html_parts.append(f'''
-                    <tr class="{row_class}">
-                        <td class="line-num old-line-num">{old_line_num}</td>
-                        <td class="line-num new-line-num">{new_line_num}</td>
-                        <td class="line-content">{final_content}</td>
-                    </tr>
-                ''')
-            
-            html_parts.append('</table>')
-            html_parts.append('</div>')
-            html_parts.append('</div>')
             
-            return ''.join(html_parts)
+            # CSS classes for different line types
+            row_class = f'diff-line diff-{line_type}'
             
-        except Exception as e:
-            logger.error("Error generating HTML diff: %s", e)
-            return None
+            html_parts.append(f'''
+                <tr class="{row_class}">
+                    <td class="line-num old-line-num">{old_line_num}</td>
+                    <td class="line-num new-line-num">{new_line_num}</td>
+                    <td class="line-content">{final_content}</td>
+                </tr>
+            ''')
+        
+        html_parts.append('</table>')
+        html_parts.append('</div>')
+        html_parts.append('</div>')
+        
+        return ''.join(html_parts)
     
     def _parse_unified_diff_with_intraline(self, diff_lines, original_lines, modified_lines):
         """Parse unified diff and add intra-line character highlighting."""
@@ -1556,8 +1562,8 @@ class ProjectStateManager:
             # Compute diff details for the client
             diff_details = git_manager._compute_diff_details(original_content, modified_content)
             
-            # Generate HTML diff with syntax highlighting
-            html_diff = git_manager._generate_html_diff(original_content, modified_content, file_path)
+            # Generate HTML diff with syntax highlighting (both minimal and full context)
+            html_diff_versions = git_manager._generate_html_diff(original_content, modified_content, file_path)
             
             # Create a descriptive title for the diff
             title_parts = []
@@ -1585,7 +1591,7 @@ class ProjectStateManager:
                 'from_hash': from_hash,
                 'to_hash': to_hash,
                 'diff_timeline': True,
-                'html_diff': html_diff
+                'html_diff_versions': html_diff_versions
             })
             
             project_state.open_tabs[tab_key] = diff_tab

{portacode-0.3.19.dev4 → portacode-0.3.19.dev6}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portacode
-Version: 0.3.19.dev4
+Version: 0.3.19.dev6
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-0.3.19.dev4 → portacode-0.3.19.dev6}/restore.sh

@@ -8,8 +8,6 @@ BACKUP_DIR="${1:-$PWD/../backups}"
 VOLUME_NAME="portacode_pgdata"
 SERVICE="db"
 
-SDFSD
-
 # ─── PICK A BACKUP ────────────────────────────────────────────────────────
 mapfile -t BACKUPS < <(
   find "$BACKUP_DIR" -maxdepth 1 -type f -name "pgdata-*.tar.gz" \