portacode 0.3.19.dev2__tar.gz → 0.3.19.dev3__tar.gz

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

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

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

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

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

@@ -401,35 +401,45 @@ class GitManager:
             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")
+        """Generate unified HTML diff with intra-line highlighting using GitPython and diff-match-patch."""
+        if not PYGMENTS_AVAILABLE:
+            logger.debug("Pygments 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)
+            import difflib
+            
+            # Get line-based diff using Python's difflib (similar to git diff)
+            original_lines = original_content.splitlines(keepends=True)
+            modified_lines = modified_content.splitlines(keepends=True)
+            
+            # Generate unified diff
+            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=''
+            ))
+            
+            # Parse the unified diff and add intra-line highlighting
+            parsed_diff = self._parse_unified_diff_with_intraline(diff_lines, original_lines, modified_lines)
             
             # 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)
+            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">
-                    <span class="additions">+{char_additions}</span>
-                    <span class="deletions">-{char_deletions}</span>
+                    <span class="additions">+{line_additions}</span>
+                    <span class="deletions">-{line_deletions}</span>
                     <span class="file-path">{os.path.basename(file_path)}</span>
                 </div>
             ''')
@@ -438,26 +448,29 @@ class GitManager:
             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'
+            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', '')
                 
-                # Apply syntax highlighting to the content
-                if lexer and content.strip() and line_type != 'header':
+                # Use intra-line highlighted content if available, otherwise apply syntax highlighting
+                if intraline_html:
+                    final_content = intraline_html
+                elif lexer and content.strip():
                     try:
-                        # Remove the +/- prefix for highlighting, then add it back
+                        # 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))
-                        # Add the prefix back
-                        if content and content[0] in '+-':
-                            highlighted = content[0] + highlighted[len(clean_content):]
-                        content = highlighted
+                        final_content = content[0] + highlighted if content and content[0] in '+-' else highlighted
                     except Exception:
-                        content = self._escape_html(content)
+                        final_content = self._escape_html(content)
                 else:
-                    content = self._escape_html(content)
+                    final_content = self._escape_html(content)
                 
                 # CSS classes for different line types
                 row_class = f'diff-line diff-{line_type}'
@@ -466,7 +479,7 @@ class GitManager:
                     <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>
+                        <td class="line-content">{final_content}</td>
                     </tr>
                 ''')
             
@@ -480,53 +493,133 @@ class GitManager:
             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
+    def _parse_unified_diff_with_intraline(self, diff_lines, original_lines, modified_lines):
+        """Parse unified diff and add intra-line character highlighting."""
+        parsed = []
+        old_line_num = 0
+        new_line_num = 0
+        
+        pending_deletes = []
+        pending_adds = []
+        
+        def flush_pending():
+            """Process pending delete/add pairs for intra-line highlighting."""
+            if pending_deletes and pending_adds:
+                # Apply intra-line highlighting to delete/add pairs
+                for i, (del_line, add_line) in enumerate(zip(pending_deletes, pending_adds)):
+                    del_content = del_line['content'][1:]  # Remove '-' prefix
+                    add_content = add_line['content'][1:]  # Remove '+' prefix
+                    
+                    del_highlighted, add_highlighted = self._generate_intraline_diff(del_content, add_content)
                     
-            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
+                    # Update the parsed lines with intra-line highlighting
+                    del_line['intraline_html'] = '-' + del_highlighted
+                    add_line['intraline_html'] = '+' + add_highlighted
                     
-            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
+                    parsed.append(del_line)
+                    parsed.append(add_line)
+                
+                # Handle remaining unmatched deletes/adds
+                for del_line in pending_deletes[len(pending_adds):]:
+                    parsed.append(del_line)
+                for add_line in pending_adds[len(pending_deletes):]:
+                    parsed.append(add_line)
+            else:
+                # No pairs to highlight, just add them as-is
+                parsed.extend(pending_deletes)
+                parsed.extend(pending_adds)
+            
+            pending_deletes.clear()
+            pending_adds.clear()
+        
+        for line in diff_lines:
+            if line.startswith('@@'):
+                # Flush any pending changes before hunk header
+                flush_pending()
+                
+                # Parse hunk header to get line numbers
+                import re
+                match = re.match(r'@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@', line)
+                if match:
+                    old_line_num = int(match.group(1)) - 1
+                    new_line_num = int(match.group(2)) - 1
+                
+                parsed.append({
+                    'type': 'header',
+                    'content': line,
+                    'old_line_num': '',
+                    'new_line_num': ''
+                })
+            elif line.startswith('-'):
+                pending_deletes.append({
+                    'type': 'delete',
+                    'old_line_num': old_line_num + 1,
+                    'new_line_num': '',
+                    'content': line
+                })
+                old_line_num += 1
+            elif line.startswith('+'):
+                pending_adds.append({
+                    'type': 'add',
+                    'old_line_num': '',
+                    'new_line_num': new_line_num + 1,
+                    'content': line
+                })
+                new_line_num += 1
+            elif line.startswith(' '):
+                # Flush pending changes before context line
+                flush_pending()
+                
+                old_line_num += 1
+                new_line_num += 1
+                parsed.append({
+                    'type': 'context',
+                    'old_line_num': old_line_num,
+                    'new_line_num': new_line_num,
+                    'content': line
+                })
+            elif line.startswith('---') or line.startswith('+++'):
+                parsed.append({
+                    'type': 'header',
+                    'content': line,
+                    'old_line_num': '',
+                    'new_line_num': ''
+                })
+        
+        # Flush any remaining pending changes
+        flush_pending()
+        
+        return parsed
+    
+    def _generate_intraline_diff(self, old_text: str, new_text: str) -> tuple[str, str]:
+        """Generate intra-line character-level diff highlighting."""
+        if not DIFF_MATCH_PATCH_AVAILABLE:
+            return self._escape_html(old_text), self._escape_html(new_text)
+        
+        try:
+            dmp = diff_match_patch()
+            diffs = dmp.diff_main(old_text, new_text)
+            dmp.diff_cleanupSemantic(diffs)
+            
+            old_parts = []
+            new_parts = []
+            
+            for op, text in diffs:
+                escaped_text = self._escape_html(text)
+                
+                if op == 0:  # EQUAL
+                    old_parts.append(escaped_text)
+                    new_parts.append(escaped_text)
+                elif op == -1:  # DELETE
+                    old_parts.append(f'<span class="intraline-delete">{escaped_text}</span>')
+                elif op == 1:  # INSERT
+                    new_parts.append(f'<span class="intraline-add">{escaped_text}</span>')
+            
+            return ''.join(old_parts), ''.join(new_parts)
+            
+        except Exception as e:
+            logger.debug("Error generating intra-line diff: %s", e)
+            return self._escape_html(old_text), self._escape_html(new_text)
     
     def _escape_html(self, text: str) -> str:
         """Escape HTML special characters."""

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

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

{portacode-0.3.19.dev2 → portacode-0.3.19.dev3}/restore.sh

@@ -8,6 +8,8 @@ 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" \