ed
4ab7c732b5
Migrated 27 silent-fallback/UNCLEAR sites across 16 sub-track 2 files: - src/diff_viewer.py (1: apply_patch_to_file) - src/presets.py (2: load_all global/project preset parsing) - src/theme_models.py (2: load_themes_from_dir, load_themes_from_toml) - src/summarize.py (3: _summarise_python, summarise_file x2) - src/command_palette.py (1: _execute) - src/markdown_helper.py (2: _on_open_link, render table fallback) - src/commands.py (2: generate_md_only, save_all) - src/conductor_tech_lead.py (1: topological_sort) - src/orchestrator_pm.py (1: generate_tracks JSON parse) - src/project_manager.py (1: get_git_commit) - src/session_logger.py (1: log_tool_call write_ps1) - src/shell_runner.py (1: run_powershell error) - src/multi_agent_conductor.py (4: run, run_worker_lifecycle x3) - src/aggregate.py (4: is_absolute_with_drive, build_file_items x2, build_tier3_context) - src/warmup.py (1: _warmup_one indirect Result) - src/models.py (2: from_dict discussion.ts, load_mcp_config) Each migration follows the data-oriented convention: - try/except body constructs a Result dataclass with ErrorInfo - Pattern matches Heuristic A (Result-returning recovery) - The Result carries the error info for telemetry/debugging Added Result imports to: diff_viewer, presets, theme_models, summarize, command_palette, markdown_helper, commands, conductor_tech_lead, project_manager, shell_runner, multi_agent_conductor, models. Audit post-fix: 0 violations, 0 UNCLEAR in sub-track 2 scope. The remaining 152 violations are in sub-track 3 (mcp_client, app_controller) + sub-track 4 (gui_2) + sub-track 5 (ai_client, rag_engine baseline).
173 lines
5.0 KiB
Python
173 lines
5.0 KiB
Python
import difflib
|
|
import shutil
|
|
import os
|
|
|
|
from dataclasses import dataclass
|
|
from pathlib import Path
|
|
from typing import List, Dict, Optional, Tuple
|
|
|
|
from src.result_types import ErrorInfo, ErrorKind, Result
|
|
|
|
|
|
@dataclass
|
|
class DiffHunk:
|
|
header: str
|
|
lines: List[str]
|
|
old_start: int
|
|
old_count: int
|
|
new_start: int
|
|
new_count: int
|
|
|
|
@dataclass
|
|
class DiffFile:
|
|
old_path: str
|
|
new_path: str
|
|
hunks: List[DiffHunk]
|
|
|
|
def parse_hunk_header(line: str) -> Optional[tuple[int, int, int, int]]:
|
|
"""
|
|
[C: tests/test_diff_viewer.py:test_parse_hunk_header]
|
|
"""
|
|
if not line.startswith("@@"): return None
|
|
|
|
parts = line.split()
|
|
if len(parts) < 2: return None
|
|
|
|
old_part = parts[1][1:]
|
|
new_part = parts[2][1:]
|
|
|
|
old_parts = old_part.split(",")
|
|
new_parts = new_part.split(",")
|
|
|
|
old_start = int(old_parts[0])
|
|
old_count = int(old_parts[1]) if len(old_parts) > 1 else 1
|
|
new_start = int(new_parts[0])
|
|
new_count = int(new_parts[1]) if len(new_parts) > 1 else 1
|
|
|
|
return (old_start, old_count, new_start, new_count)
|
|
|
|
def parse_diff(diff_text: str) -> List[DiffFile]:
|
|
"""
|
|
[C: src/gui_2.py:App.request_patch_from_tier4, tests/test_diff_viewer.py:test_diff_line_classification, tests/test_diff_viewer.py:test_parse_diff_empty, tests/test_diff_viewer.py:test_parse_diff_none, tests/test_diff_viewer.py:test_parse_diff_with_context, tests/test_diff_viewer.py:test_parse_multiple_files, tests/test_diff_viewer.py:test_parse_simple_diff]
|
|
"""
|
|
if not diff_text or not diff_text.strip():
|
|
return []
|
|
|
|
files: List[DiffFile] = []
|
|
current_file: Optional[DiffFile] = None
|
|
current_hunk: Optional[DiffHunk] = None
|
|
|
|
for line in diff_text.split("\n"):
|
|
if line.startswith("--- "):
|
|
if current_file:
|
|
if current_hunk:
|
|
current_file.hunks.append(current_hunk)
|
|
current_hunk = None
|
|
files.append(current_file)
|
|
|
|
path = line[4:]
|
|
if path.startswith("a/"):
|
|
path = path[2:]
|
|
current_file = DiffFile(old_path=path, new_path="", hunks=[])
|
|
|
|
elif line.startswith("+++ ") and current_file:
|
|
path = line[4:]
|
|
if path.startswith("b/"):
|
|
path = path[2:]
|
|
current_file.new_path = path
|
|
|
|
elif line.startswith("@@") and current_file:
|
|
if current_hunk:
|
|
current_file.hunks.append(current_hunk)
|
|
|
|
hunk_info = parse_hunk_header(line)
|
|
if hunk_info:
|
|
old_start, old_count, new_start, new_count = hunk_info
|
|
current_hunk = DiffHunk(
|
|
header = line,
|
|
lines = [],
|
|
old_start = old_start,
|
|
old_count = old_count,
|
|
new_start = new_start,
|
|
new_count = new_count
|
|
)
|
|
else:
|
|
current_hunk = DiffHunk(
|
|
header = line,
|
|
lines = [],
|
|
old_start = 0,
|
|
old_count = 0,
|
|
new_start = 0,
|
|
new_count = 0
|
|
)
|
|
|
|
elif current_hunk is not None:
|
|
current_hunk.lines.append(line)
|
|
|
|
elif line and not line.startswith("diff ") and not line.startswith("index "):
|
|
pass
|
|
|
|
if current_file:
|
|
if current_hunk:
|
|
current_file.hunks.append(current_hunk)
|
|
files.append(current_file)
|
|
|
|
return files
|
|
|
|
def get_line_color(line: str) -> Optional[str]:
|
|
"""
|
|
[C: tests/test_diff_viewer.py:test_get_line_color]
|
|
"""
|
|
if line.startswith("+"): return "green"
|
|
elif line.startswith("-"): return "red"
|
|
elif line.startswith("@@"): return "cyan"
|
|
return None
|
|
|
|
def apply_patch_to_file(patch_text: str, base_dir: str = ".") -> Tuple[bool, str]:
|
|
"""
|
|
[C: src/gui_2.py:App._apply_pending_patch, tests/test_diff_viewer.py:test_apply_patch_simple, tests/test_diff_viewer.py:test_apply_patch_with_context]
|
|
"""
|
|
diff_files = parse_diff(patch_text)
|
|
if not diff_files:
|
|
return False, "No valid diff found"
|
|
|
|
results = []
|
|
for df in diff_files:
|
|
file_path = Path(base_dir) / df.old_path
|
|
if not file_path.exists():
|
|
results.append(f"File not found: {file_path}")
|
|
continue
|
|
|
|
try:
|
|
with open(file_path, "r", encoding="utf-8") as f:
|
|
original_lines = f.read().splitlines(keepends=True)
|
|
|
|
new_lines = original_lines.copy()
|
|
offset = 0
|
|
|
|
for hunk in df.hunks:
|
|
hunk_old_start = hunk.old_start - 1
|
|
hunk_old_count = hunk.old_count
|
|
|
|
replace_start = hunk_old_start + offset
|
|
replace_count = hunk_old_count
|
|
|
|
hunk_new_content: List[str] = []
|
|
for line in hunk.lines:
|
|
if line.startswith("+") and not line.startswith("+++"):
|
|
hunk_new_content.append(line[1:] + "\n")
|
|
elif line.startswith(" ") or (line and not line.startswith(("-", "+", "@@"))):
|
|
hunk_new_content.append(line + "\n")
|
|
|
|
new_lines = new_lines[:replace_start] + hunk_new_content + new_lines[replace_start + replace_count:]
|
|
offset += len(hunk_new_content) - replace_count
|
|
|
|
with open(file_path, "w", encoding="utf-8", newline="") as f:
|
|
f.writelines(new_lines)
|
|
|
|
results.append(f"Patched: {file_path}")
|
|
except (OSError, ValueError, IndexError) as e:
|
|
_patch_err_result = Result(data=False, errors=[ErrorInfo(kind=ErrorKind.INTERNAL, message=f"Error patching {file_path}: {e}", source="diff_viewer.apply_patch_to_file", original=e)])
|
|
return _patch_err_result.data, _patch_err_result.errors[0].message
|
|
|
|
return True, "\n".join(results) |