portacode 0.3.19.dev0__tar.gz → 0.3.19.dev2__tar.gz

{portacode-0.3.19.dev0 → portacode-0.3.19.dev2}/.claude/settings.local.json

@@ -8,7 +8,8 @@
       "Bash(find:*)",
       "Bash(touch:*)",
       "Bash(npm run lint)",
-      "Bash(node:*)"
+      "Bash(node:*)",
+      "Bash(rm:*)"
     ],
     "deny": []
   }

{portacode-0.3.19.dev0 → portacode-0.3.19.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portacode
-Version: 0.3.19.dev0
+Version: 0.3.19.dev2
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian
@@ -22,6 +22,7 @@ Requires-Dist: pywinpty>=2.0; platform_system == "Windows"
 Requires-Dist: GitPython>=3.1.45
 Requires-Dist: watchdog>=3.0
 Requires-Dist: diff-match-patch>=20230430
+Requires-Dist: Pygments>=2.14.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8; extra == "dev"

{portacode-0.3.19.dev0 → portacode-0.3.19.dev2}/portacode/_version.py

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

{portacode-0.3.19.dev0 → portacode-0.3.19.dev2}/portacode/connection/handlers/project_state_handlers.py

@@ -35,6 +35,21 @@ except ImportError:
     DIFF_MATCH_PATCH_AVAILABLE = False
     diff_match_patch = None
 
+# Import Pygments with fallback
+try:
+    from pygments import highlight
+    from pygments.lexers import get_lexer_for_filename, get_lexer_by_name
+    from pygments.formatters import HtmlFormatter
+    from pygments.util import ClassNotFound
+    PYGMENTS_AVAILABLE = True
+except ImportError:
+    PYGMENTS_AVAILABLE = False
+    highlight = None
+    get_lexer_for_filename = None
+    get_lexer_by_name = None
+    HtmlFormatter = None
+    ClassNotFound = Exception
+
 # Cross-platform file system monitoring
 try:
     from watchdog.observers import Observer
@@ -322,6 +337,205 @@ class GitManager:
             logger.error("Error computing diff details: %s", e)
             return None
     
+    def _get_pygments_lexer(self, file_path: str) -> Optional[object]:
+        """Get Pygments lexer for a file path."""
+        if not PYGMENTS_AVAILABLE:
+            return None
+        
+        try:
+            # Try to get lexer by filename
+            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
+        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 syntax highlighting using Pygments and diff-match-patch."""
+        if not DIFF_MATCH_PATCH_AVAILABLE or not PYGMENTS_AVAILABLE:
+            logger.debug("Required libraries not available for HTML diff generation")
+            return None
+        
+        try:
+            # Get diff details
+            dmp = diff_match_patch()
+            diffs = dmp.diff_main(original_content, modified_content)
+            dmp.diff_cleanupSemantic(diffs)
+            
+            # Get Pygments lexer for syntax highlighting
+            lexer = self._get_pygments_lexer(file_path)
+            
+            # Convert diffs to line-based unified diff
+            unified_diff_lines = self._create_unified_diff_lines(diffs, original_content, modified_content)
+            
+            # Build HTML
+            html_parts = []
+            html_parts.append('<div class="unified-diff-container">')
+            
+            # Add stats header
+            char_additions = sum(len(text) for op, text in diffs if op == 1)
+            char_deletions = sum(len(text) for op, text in diffs if op == -1)
+            
+            html_parts.append(f'''
+                <div class="diff-stats">
+                    <span class="additions">+{char_additions}</span>
+                    <span class="deletions">-{char_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 unified_diff_lines:
+                line_type = line_info['type']  # 'context', 'delete', 'add', 'header'
+                old_line_num = line_info.get('old_line_num', '')
+                new_line_num = line_info.get('new_line_num', '')
+                content = line_info['content']
+                
+                # Apply syntax highlighting to the content
+                if lexer and content.strip() and line_type != 'header':
+                    try:
+                        # Remove the +/- prefix for highlighting, then add it back
+                        clean_content = content[1:] if content and content[0] in '+-' else content
+                        highlighted = highlight(clean_content, lexer, HtmlFormatter(nowrap=True, noclasses=False))
+                        # Add the prefix back
+                        if content and content[0] in '+-':
+                            highlighted = content[0] + highlighted[len(clean_content):]
+                        content = highlighted
+                    except Exception:
+                        content = self._escape_html(content)
+                else:
+                    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">{content}</td>
+                    </tr>
+                ''')
+            
+            html_parts.append('</table>')
+            html_parts.append('</div>')
+            html_parts.append('</div>')
+            
+            return ''.join(html_parts)
+            
+        except Exception as e:
+            logger.error("Error generating HTML diff: %s", e)
+            return None
+    
+    def _create_unified_diff_lines(self, diffs, original_content: str, modified_content: str):
+        """Create unified diff lines from diff-match-patch output."""
+        lines = []
+        
+        # Split content into lines
+        original_lines = original_content.splitlines()
+        modified_lines = modified_content.splitlines()
+        
+        old_line_num = 1
+        new_line_num = 1
+        
+        # Process each diff operation
+        for op, text in diffs:
+            text_lines = text.splitlines()
+            
+            if op == 0:  # EQUAL - context lines
+                for line in text_lines:
+                    lines.append({
+                        'type': 'context',
+                        'old_line_num': old_line_num,
+                        'new_line_num': new_line_num,
+                        'content': ' ' + line
+                    })
+                    old_line_num += 1
+                    new_line_num += 1
+                    
+            elif op == -1:  # DELETE
+                for line in text_lines:
+                    lines.append({
+                        'type': 'delete',
+                        'old_line_num': old_line_num,
+                        'new_line_num': '',
+                        'content': '-' + line
+                    })
+                    old_line_num += 1
+                    
+            elif op == 1:  # INSERT
+                for line in text_lines:
+                    lines.append({
+                        'type': 'add',
+                        'old_line_num': '',
+                        'new_line_num': new_line_num,
+                        'content': '+' + line
+                    })
+                    new_line_num += 1
+        
+        return lines
+    
+    def _escape_html(self, text: str) -> str:
+        """Escape HTML special characters."""
+        return (text.replace('&', '&amp;')
+                   .replace('<', '&lt;')
+                   .replace('>', '&gt;')
+                   .replace('"', '&quot;')
+                   .replace("'", '&#x27;'))
+    
     def get_head_commit_hash(self) -> Optional[str]:
         """Get the hash of the HEAD commit."""
         if not self.is_git_repo or not self.repo:
@@ -1249,6 +1463,9 @@ 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)
+            
             # Create a descriptive title for the diff
             title_parts = []
             if from_ref == "commit" and from_hash:
@@ -1274,7 +1491,8 @@ class ProjectStateManager:
                 'to_ref': to_ref,
                 'from_hash': from_hash,
                 'to_hash': to_hash,
-                'diff_timeline': True
+                'diff_timeline': True,
+                'html_diff': html_diff
             })
             
             project_state.open_tabs[tab_key] = diff_tab

{portacode-0.3.19.dev0 → portacode-0.3.19.dev2}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portacode
-Version: 0.3.19.dev0
+Version: 0.3.19.dev2
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian
@@ -22,6 +22,7 @@ Requires-Dist: pywinpty>=2.0; platform_system == "Windows"
 Requires-Dist: GitPython>=3.1.45
 Requires-Dist: watchdog>=3.0
 Requires-Dist: diff-match-patch>=20230430
+Requires-Dist: Pygments>=2.14.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8; extra == "dev"

{portacode-0.3.19.dev0 → portacode-0.3.19.dev2}/portacode.egg-info/requires.txt

@@ -8,6 +8,7 @@ pyte>=0.8
 GitPython>=3.1.45
 watchdog>=3.0
 diff-match-patch>=20230430
+Pygments>=2.14.0
 
 [:platform_system == "Windows"]
 pywinpty>=2.0

{portacode-0.3.19.dev0 → portacode-0.3.19.dev2}/setup.py

@@ -30,6 +30,7 @@ setup(
         "GitPython>=3.1.45",
         "watchdog>=3.0",
         "diff-match-patch>=20230430",
+        "Pygments>=2.14.0",
     ],
     extras_require={
         "dev": ["black", "flake8", "pytest"],