aos-git 0.1.0__tar.gz

aos_git-0.1.0/PKG-INFO

@@ -0,0 +1,73 @@
+Metadata-Version: 2.4
+Name: aos-git
+Version: 0.1.0
+Summary: AI-powered Git merge conflict resolver — let AI merge both sides intelligently
+License: MIT
+Project-URL: Homepage, https://github.com/YOUR_USERNAME/aos-git
+Project-URL: Issues, https://github.com/YOUR_USERNAME/aos-git/issues
+Keywords: git,merge,conflict,ai,cli
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Environment :: Console
+Classifier: Topic :: Software Development :: Version Control :: Git
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+Requires-Dist: click>=8.1
+Requires-Dist: rich>=13.0
+Requires-Dist: toml>=0.10
+Requires-Dist: openai>=1.0
+Requires-Dist: anthropic>=0.25
+
+# aos — AI-powered Git merge conflict resolver
+
+`aos`는 git을 감싸는 CLI 도구입니다. `git pull` / `git merge` 시 충돌이 발생하면
+AI가 양쪽 변경사항을 자동으로 분석해서 **둘 다 살리는 방향으로 통합**해드립니다.
+
+## 설치
+
+```bash
+pip install aos-git
+```
+
+## 최초 설정
+
+```bash
+aos setup
+```
+
+Databricks 또는 Anthropic API 키를 입력하면 `~/.aos/config.toml`에 저장됩니다.
+
+## 사용법
+
+기존 git 명령어 대신 `aos`를 사용하세요:
+
+| git 명령 | aos 명령 | 설명 |
+|----------|----------|------|
+| `git pull` | `aos pull` | 충돌 시 AI 자동 해결 |
+| `git merge <branch>` | `aos merge <branch>` | 충돌 시 AI 자동 해결 |
+| `git push` | `aos push` | 그대로 |
+| `git commit -m "..."` | `aos commit -m "..."` | 전체 스테이징 후 커밋 |
+| `git status` | `aos status` | 친화적인 상태 표시 |
+
+## 충돌 해결 흐름
+
+```
+aos pull
+  └─→ 충돌 감지
+        └─→ AI가 양쪽 변경사항 분석 (타임스탬프 참고)
+              └─→ 통합 결과 미리보기 출력
+                    └─→ [Y] 적용 / [n] 건너뜀 / [e] 직접 편집
+```
+
+## AI 제공자
+
+- **Databricks Model Serving** (기본): 사내 Databricks 환경
+- **Anthropic API**: `claude-sonnet-4-6` 등
+
+설정 전환: `aos setup`으로 언제든지 변경 가능
+
+## 요구사항
+
+- Python 3.11+
+- git

aos_git-0.1.0/README.md

@@ -0,0 +1,52 @@
+# aos — AI-powered Git merge conflict resolver
+
+`aos`는 git을 감싸는 CLI 도구입니다. `git pull` / `git merge` 시 충돌이 발생하면
+AI가 양쪽 변경사항을 자동으로 분석해서 **둘 다 살리는 방향으로 통합**해드립니다.
+
+## 설치
+
+```bash
+pip install aos-git
+```
+
+## 최초 설정
+
+```bash
+aos setup
+```
+
+Databricks 또는 Anthropic API 키를 입력하면 `~/.aos/config.toml`에 저장됩니다.
+
+## 사용법
+
+기존 git 명령어 대신 `aos`를 사용하세요:
+
+| git 명령 | aos 명령 | 설명 |
+|----------|----------|------|
+| `git pull` | `aos pull` | 충돌 시 AI 자동 해결 |
+| `git merge <branch>` | `aos merge <branch>` | 충돌 시 AI 자동 해결 |
+| `git push` | `aos push` | 그대로 |
+| `git commit -m "..."` | `aos commit -m "..."` | 전체 스테이징 후 커밋 |
+| `git status` | `aos status` | 친화적인 상태 표시 |
+
+## 충돌 해결 흐름
+
+```
+aos pull
+  └─→ 충돌 감지
+        └─→ AI가 양쪽 변경사항 분석 (타임스탬프 참고)
+              └─→ 통합 결과 미리보기 출력
+                    └─→ [Y] 적용 / [n] 건너뜀 / [e] 직접 편집
+```
+
+## AI 제공자
+
+- **Databricks Model Serving** (기본): 사내 Databricks 환경
+- **Anthropic API**: `claude-sonnet-4-6` 등
+
+설정 전환: `aos setup`으로 언제든지 변경 가능
+
+## 요구사항
+
+- Python 3.11+
+- git

aos_git-0.1.0/pyproject.toml

@@ -0,0 +1,36 @@
+[build-system]
+requires = ["setuptools>=68", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "aos-git"
+version = "0.1.0"
+description = "AI-powered Git merge conflict resolver — let AI merge both sides intelligently"
+readme = "README.md"
+license = { text = "MIT" }
+requires-python = ">=3.11"
+keywords = ["git", "merge", "conflict", "ai", "cli"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Environment :: Console",
+    "Topic :: Software Development :: Version Control :: Git",
+]
+dependencies = [
+    "click>=8.1",
+    "rich>=13.0",
+    "toml>=0.10",
+    "openai>=1.0",
+    "anthropic>=0.25",
+]
+
+[project.urls]
+Homepage = "https://github.com/YOUR_USERNAME/aos-git"
+Issues = "https://github.com/YOUR_USERNAME/aos-git/issues"
+
+[project.scripts]
+aos = "aos.cli:main"
+
+[tool.setuptools.packages.find]
+where = ["src"]

aos_git-0.1.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

aos_git-0.1.0/src/aos/ai/adapter.py

@@ -0,0 +1,38 @@
+from abc import ABC, abstractmethod
+from aos.conflict.parser import ConflictBlock
+
+SYSTEM_PROMPT = """당신은 git merge conflict 해결 전문가입니다.
+두 개발자가 같은 코드를 수정했을 때, 양쪽의 변경 의도를 모두 보존하여 논리적으로 통합된 코드를 반환합니다.
+- 한쪽 변경사항을 일방적으로 버리지 마세요.
+- 충돌 마커(<<<<<<, =======, >>>>>>>) 없이 최종 코드만 반환하세요.
+- 코드 블록 마크다운(```) 없이 순수 코드만 반환하세요."""
+
+USER_TEMPLATE = """다음 충돌을 해결해주세요.
+
+파일: {file_path}
+BASE (공통 조상):
+{base}
+
+OURS (커밋 시각: {ours_ts}):
+{ours}
+
+THEIRS (커밋 시각: {theirs_ts}):
+{theirs}
+
+주변 코드:
+{context_before}
+[충돌 위치]
+{context_after}
+
+두 변경사항을 모두 살려 통합된 코드를 반환하세요."""
+
+
+class AIAdapter(ABC):
+    @abstractmethod
+    def resolve_conflict(
+        self,
+        block: ConflictBlock,
+        ours_ts: str,
+        theirs_ts: str,
+    ) -> str:
+        """통합된 코드 문자열을 반환한다."""

aos_git-0.1.0/src/aos/ai/anthropic_adapter.py

@@ -0,0 +1,39 @@
+from typing import Optional
+import anthropic
+from aos.ai.adapter import AIAdapter, SYSTEM_PROMPT, USER_TEMPLATE
+from aos.conflict.parser import ConflictBlock
+
+
+class AnthropicAdapter(AIAdapter):
+    def __init__(
+        self,
+        api_key: str,
+        model: str = "claude-sonnet-4-6",
+        _client: Optional[object] = None,
+    ):
+        self.model = model
+        self._client = _client or anthropic.Anthropic(api_key=api_key)
+
+    def resolve_conflict(
+        self,
+        block: ConflictBlock,
+        ours_ts: str,
+        theirs_ts: str,
+    ) -> str:
+        prompt = USER_TEMPLATE.format(
+            file_path=block.file_path,
+            base=block.base or "(없음)",
+            ours=block.ours,
+            theirs=block.theirs,
+            ours_ts=ours_ts or "알 수 없음",
+            theirs_ts=theirs_ts or "알 수 없음",
+            context_before=block.context_before,
+            context_after=block.context_after,
+        )
+        response = self._client.messages.create(
+            model=self.model,
+            max_tokens=4096,
+            system=SYSTEM_PROMPT,
+            messages=[{"role": "user", "content": prompt}],
+        )
+        return response.content[0].text

aos_git-0.1.0/src/aos/ai/databricks.py

@@ -0,0 +1,44 @@
+from typing import Optional
+from openai import OpenAI
+from aos.ai.adapter import AIAdapter, SYSTEM_PROMPT, USER_TEMPLATE
+from aos.conflict.parser import ConflictBlock
+
+
+class DatabricksAdapter(AIAdapter):
+    def __init__(
+        self,
+        host: str,
+        token: str,
+        model: str = "databricks-claude-sonnet-4-6",
+        _client: Optional[object] = None,
+    ):
+        self.model = model
+        self._client = _client or OpenAI(
+            api_key=token,
+            base_url=f"{host.rstrip('/')}/serving-endpoints",
+        )
+
+    def resolve_conflict(
+        self,
+        block: ConflictBlock,
+        ours_ts: str,
+        theirs_ts: str,
+    ) -> str:
+        prompt = USER_TEMPLATE.format(
+            file_path=block.file_path,
+            base=block.base or "(없음)",
+            ours=block.ours,
+            theirs=block.theirs,
+            ours_ts=ours_ts or "알 수 없음",
+            theirs_ts=theirs_ts or "알 수 없음",
+            context_before=block.context_before,
+            context_after=block.context_after,
+        )
+        response = self._client.chat.completions.create(
+            model=self.model,
+            messages=[
+                {"role": "system", "content": SYSTEM_PROMPT},
+                {"role": "user", "content": prompt},
+            ],
+        )
+        return response.choices[0].message.content

aos_git-0.1.0/src/aos/ai/factory.py

@@ -0,0 +1,25 @@
+from aos.config.settings import Config
+from aos.ai.adapter import AIAdapter
+from aos.ai.databricks import DatabricksAdapter
+from aos.ai.anthropic_adapter import AnthropicAdapter
+
+
+def build_adapter(config: Config) -> AIAdapter:
+    """설정에 따라 적절한 AI 어댑터를 반환한다."""
+    if config.ai.provider == "databricks":
+        if not config.databricks or not config.databricks.host:
+            raise ValueError("Databricks 설정이 없습니다. 'aos setup'을 실행하세요.")
+        return DatabricksAdapter(
+            host=config.databricks.host,
+            token=config.databricks.token,
+            model=config.ai.model,
+        )
+    elif config.ai.provider == "anthropic":
+        if not config.anthropic or not config.anthropic.api_key:
+            raise ValueError("Anthropic API 키가 없습니다. 'aos setup'을 실행하세요.")
+        return AnthropicAdapter(
+            api_key=config.anthropic.api_key,
+            model=config.ai.model,
+        )
+    else:
+        raise ValueError(f"알 수 없는 AI 제공자: {config.ai.provider}")

aos_git-0.1.0/src/aos/cli.py

@@ -0,0 +1,20 @@
+import click
+from aos.commands.pull import pull_cmd
+from aos.commands.push import push_cmd
+from aos.commands.commit import commit_cmd
+from aos.commands.status import status_cmd
+from aos.commands.merge import merge_cmd
+from aos.commands.setup import setup_cmd
+
+
+@click.group()
+def main():
+    """aos — AI-powered git helper. 충돌을 AI가 해결해드립니다."""
+
+
+main.add_command(pull_cmd, name="pull")
+main.add_command(push_cmd, name="push")
+main.add_command(commit_cmd, name="commit")
+main.add_command(status_cmd, name="status")
+main.add_command(merge_cmd, name="merge")
+main.add_command(setup_cmd, name="setup")

aos_git-0.1.0/src/aos/commands/commit.py

@@ -0,0 +1,23 @@
+import subprocess
+import click
+from rich.console import Console
+
+console = Console()
+
+
+@click.command("commit")
+@click.option("-m", "--message", default="", help="커밋 메시지")
+def commit_cmd(message: str):
+    """모든 변경사항을 스테이징하고 커밋한다."""
+    subprocess.run(["git", "add", "-A"], check=True)
+    console.print("[cyan][aos] 모든 변경사항을 스테이징했습니다.[/cyan]")
+
+    if not message:
+        message = click.prompt("커밋 메시지를 입력하세요")
+
+    result = subprocess.run(["git", "commit", "-m", message])
+    if result.returncode == 0:
+        console.print("[green][aos] 커밋 완료.[/green]")
+    else:
+        console.print("[red][aos] 커밋 실패.[/red]")
+        raise click.Abort()

aos_git-0.1.0/src/aos/commands/merge.py

@@ -0,0 +1,37 @@
+import subprocess
+from pathlib import Path
+import click
+from rich.console import Console
+from aos.config.settings import load_config
+from aos.ai.factory import build_adapter
+from aos.conflict.resolver import resolve_all_conflicts
+
+console = Console()
+
+
+@click.command("merge")
+@click.argument("branch")
+def merge_cmd(branch: str):
+    """브랜치를 병합하고, 충돌 시 AI가 해결을 제안한다."""
+    console.print(f"[cyan][aos] git merge {branch} 실행 중...[/cyan]")
+    result = subprocess.run(["git", "merge", branch], capture_output=True, text=True)
+    console.print(result.stdout)
+
+    if result.returncode == 0:
+        console.print("[green][aos] 병합 완료.[/green]")
+        return
+
+    if "CONFLICT" in result.stdout or "conflict" in result.stderr.lower():
+        console.print("[yellow][aos] 충돌이 감지되었습니다. AI 해결을 시도합니다...[/yellow]")
+        try:
+            cfg = load_config()
+            adapter = build_adapter(cfg)
+        except ValueError as e:
+            console.print(f"[red][aos] {e}[/red]")
+            raise click.Abort()
+
+        repo_root = Path.cwd()
+        resolve_all_conflicts(repo_root, adapter, cfg.behavior)
+    else:
+        console.print(f"[red][aos] 오류: {result.stderr}[/red]")
+        raise click.Abort()

aos_git-0.1.0/src/aos/commands/pull.py

@@ -0,0 +1,43 @@
+import subprocess
+from pathlib import Path
+import click
+from rich.console import Console
+from aos.config.settings import load_config
+from aos.ai.factory import build_adapter
+from aos.conflict.resolver import resolve_all_conflicts
+
+console = Console()
+
+
+@click.command("pull")
+@click.option("--remote", default="origin", help="원격 저장소 이름")
+@click.option("--branch", default="", help="브랜치 이름 (기본: 현재 브랜치)")
+def pull_cmd(remote: str, branch: str):
+    """원격에서 변경사항을 가져오고, 충돌 시 AI가 해결을 제안한다."""
+    cmd = ["git", "pull", remote]
+    if branch:
+        cmd.append(branch)
+
+    console.print(f"[cyan][aos] {' '.join(cmd)} 실행 중...[/cyan]")
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    console.print(result.stdout)
+
+    if result.returncode == 0:
+        console.print("[green][aos] 완료.[/green]")
+        return
+
+    # 충돌 여부 확인
+    if "CONFLICT" in result.stdout or "conflict" in result.stderr.lower():
+        console.print("[yellow][aos] 충돌이 감지되었습니다. AI 해결을 시도합니다...[/yellow]")
+        try:
+            cfg = load_config()
+            adapter = build_adapter(cfg)
+        except ValueError as e:
+            console.print(f"[red][aos] {e}[/red]")
+            raise click.Abort()
+
+        repo_root = Path.cwd()
+        resolve_all_conflicts(repo_root, adapter, cfg.behavior)
+    else:
+        console.print(f"[red][aos] 오류: {result.stderr}[/red]")
+        raise click.Abort()

aos_git-0.1.0/src/aos/commands/push.py

@@ -0,0 +1,22 @@
+import subprocess
+import click
+from rich.console import Console
+
+console = Console()
+
+
+@click.command("push")
+@click.option("--remote", default="origin")
+@click.option("--branch", default="")
+def push_cmd(remote: str, branch: str):
+    """변경사항을 원격 저장소에 올린다."""
+    cmd = ["git", "push", remote]
+    if branch:
+        cmd.append(branch)
+    console.print(f"[cyan][aos] {' '.join(cmd)} 실행 중...[/cyan]")
+    result = subprocess.run(cmd)
+    if result.returncode == 0:
+        console.print("[green][aos] 푸시 완료.[/green]")
+    else:
+        console.print("[red][aos] 푸시 실패. git push 출력을 확인하세요.[/red]")
+        raise click.Abort()

aos_git-0.1.0/src/aos/commands/setup.py

@@ -0,0 +1,47 @@
+import subprocess
+import click
+from rich.console import Console
+from aos.config.settings import (
+    load_config, save_config, AIConfig,
+    DatabricksConfig, AnthropicConfig, BehaviorConfig,
+)
+
+console = Console()
+
+
+@click.command("setup")
+def setup_cmd():
+    """AI 제공자를 설정하고 git을 구성한다."""
+    console.print("[bold cyan][aos] 설정을 시작합니다.[/bold cyan]")
+
+    provider = click.prompt(
+        "AI 제공자를 선택하세요",
+        type=click.Choice(["databricks", "anthropic"]),
+        default="databricks",
+    )
+
+    cfg = load_config()
+    cfg.ai = AIConfig(provider=provider)
+
+    if provider == "databricks":
+        host = click.prompt("Databricks Host (예: https://xxx.azuredatabricks.net)")
+        token = click.prompt("Databricks Token", hide_input=True)
+        model = click.prompt("모델 엔드포인트", default="databricks-claude-sonnet-4-6")
+        cfg.databricks = DatabricksConfig(host=host, token=token)
+        cfg.ai.model = model
+    else:
+        api_key = click.prompt("Anthropic API Key", hide_input=True)
+        model = click.prompt("모델", default="claude-sonnet-4-6")
+        cfg.anthropic = AnthropicConfig(api_key=api_key)
+        cfg.ai.model = model
+
+    lang = click.prompt("안내 메시지 언어", type=click.Choice(["ko", "en"]), default="ko")
+    cfg.behavior = BehaviorConfig(language=lang)
+
+    save_config(cfg)
+
+    # diff3 스타일 자동 설정 (BASE 포함 파싱을 위해 필요)
+    subprocess.run(["git", "config", "--global", "merge.conflictstyle", "diff3"], check=False)
+
+    console.print("[green][aos] 설정 완료! ~/.aos/config.toml 에 저장됨.[/green]")
+    console.print("[green]       git merge.conflictstyle=diff3 적용됨.[/green]")

aos_git-0.1.0/src/aos/commands/status.py

@@ -0,0 +1,53 @@
+import subprocess
+import click
+from rich.console import Console
+from rich.table import Table
+
+console = Console()
+
+
+@click.command("status")
+def status_cmd():
+    """현재 git 상태를 친화적으로 표시한다."""
+    result = subprocess.run(
+        ["git", "status", "--porcelain=v1", "-b"],
+        capture_output=True, text=True,
+    )
+    if result.returncode != 0:
+        console.print("[red]git 저장소가 아니거나 오류가 발생했습니다.[/red]")
+        raise click.Abort()
+
+    lines = result.stdout.splitlines()
+    branch_line = lines[0] if lines else ""
+    file_lines = lines[1:]
+
+    branch = branch_line.replace("## ", "").split("...")[0]
+    console.print(f"\n[bold]현재 브랜치:[/bold] [cyan]{branch}[/cyan]\n")
+
+    if not file_lines:
+        console.print("[green]변경사항 없음. 깨끗한 상태입니다.[/green]")
+        return
+
+    table = Table(show_header=True, header_style="bold")
+    table.add_column("상태", width=12)
+    table.add_column("파일")
+
+    STATUS_MAP = {
+        "M": ("수정됨", "yellow"),
+        "A": ("추가됨", "green"),
+        "D": ("삭제됨", "red"),
+        "R": ("이름변경", "blue"),
+        "?": ("미추적", "dim"),
+        "U": ("충돌", "bold red"),
+    }
+
+    for line in file_lines:
+        if len(line) < 3:
+            continue
+        xy = line[:2].strip() or line[0]
+        filepath = line[3:]
+        code = xy[0] if xy else "?"
+        label, color = STATUS_MAP.get(code, (code, "white"))
+        table.add_row(f"[{color}]{label}[/{color}]", filepath)
+
+    console.print(table)

aos_git-0.1.0/src/aos/config/settings.py

@@ -0,0 +1,71 @@
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Optional
+import toml
+
+CONFIG_PATH = Path.home() / ".aos" / "config.toml"
+
+
+@dataclass
+class AIConfig:
+    provider: str = "databricks"
+    model: str = "databricks-claude-sonnet-4-6"
+
+
+@dataclass
+class DatabricksConfig:
+    host: str = ""
+    token: str = ""
+
+
+@dataclass
+class AnthropicConfig:
+    api_key: str = ""
+
+
+@dataclass
+class BehaviorConfig:
+    auto_apply: bool = False
+    context_lines: int = 20
+    language: str = "ko"
+
+
+@dataclass
+class Config:
+    ai: AIConfig = field(default_factory=AIConfig)
+    databricks: Optional[DatabricksConfig] = field(default_factory=DatabricksConfig)
+    anthropic: Optional[AnthropicConfig] = field(default_factory=AnthropicConfig)
+    behavior: BehaviorConfig = field(default_factory=BehaviorConfig)
+
+
+def load_config() -> Config:
+    if not CONFIG_PATH.exists():
+        return Config()
+    data = toml.load(CONFIG_PATH)
+    return Config(
+        ai=AIConfig(**data.get("ai", {})),
+        databricks=DatabricksConfig(**data.get("databricks", {})),
+        anthropic=AnthropicConfig(**data.get("anthropic", {})),
+        behavior=BehaviorConfig(**data.get("behavior", {})),
+    )
+
+
+def save_config(config: Config) -> None:
+    CONFIG_PATH.parent.mkdir(parents=True, exist_ok=True)
+    data = {
+        "ai": {"provider": config.ai.provider, "model": config.ai.model},
+        "databricks": {
+            "host": config.databricks.host if config.databricks else "",
+            "token": config.databricks.token if config.databricks else "",
+        },
+        "anthropic": {
+            "api_key": config.anthropic.api_key if config.anthropic else "",
+        },
+        "behavior": {
+            "auto_apply": config.behavior.auto_apply,
+            "context_lines": config.behavior.context_lines,
+            "language": config.behavior.language,
+        },
+    }
+    with open(CONFIG_PATH, "w") as f:
+        toml.dump(data, f)

aos_git-0.1.0/src/aos/conflict/applier.py

@@ -0,0 +1,20 @@
+from pathlib import Path
+
+
+def apply_resolution(file_path: Path, line_start: int, resolved: str) -> None:
+    """파일에서 line_start 위치의 충돌 블록을 resolved로 교체한다."""
+    text = file_path.read_text(encoding="utf-8")
+    lines = text.splitlines(keepends=True)
+    # line_start는 1-based; <<<<<<< 줄 찾기
+    i = line_start - 1
+    if i >= len(lines) or not lines[i].startswith("<<<<<<<"):
+        return
+    # 블록 끝(>>>>>>>) 찾기
+    j = i + 1
+    while j < len(lines):
+        if lines[j].startswith(">>>>>>>"):
+            j += 1
+            break
+        j += 1
+    new_lines = lines[:i] + [resolved] + lines[j:]
+    file_path.write_text("".join(new_lines), encoding="utf-8")

aos_git-0.1.0/src/aos/conflict/detector.py

@@ -0,0 +1,18 @@
+from pathlib import Path
+
+CONFLICT_MARKER = "<<<<<<< "
+SKIP_DIRS = {".git", "__pycache__", "node_modules", ".venv", "venv"}
+
+
+def find_conflict_files(repo_root: Path) -> list[Path]:
+    """repo_root 아래에서 충돌 마커가 있는 파일 목록을 반환한다."""
+    conflict_files = []
+    for path in repo_root.rglob("*"):
+        if path.is_file() and not any(p.name in SKIP_DIRS for p in path.parents):
+            try:
+                text = path.read_text(encoding="utf-8", errors="ignore")
+                if CONFLICT_MARKER in text:
+                    conflict_files.append(path)
+            except (PermissionError, OSError):
+                pass
+    return conflict_files

aos_git-0.1.0/src/aos/conflict/parser.py

@@ -0,0 +1,76 @@
+from dataclasses import dataclass
+from pathlib import Path
+import subprocess
+
+
+@dataclass
+class ConflictBlock:
+    file_path: Path
+    line_start: int    # 1-based, <<<<<<< 줄 번호
+    ours: str
+    base: str          # diff3 스타일 있을 때만 채워짐
+    theirs: str
+    context_before: str
+    context_after: str
+
+
+def parse_conflicts(file_path: Path, context_lines: int = 20) -> list[ConflictBlock]:
+    """파일 내 모든 충돌 블록을 파싱하여 반환한다."""
+    text = file_path.read_text(encoding="utf-8")
+    lines = text.splitlines(keepends=True)
+    blocks = []
+    i = 0
+    while i < len(lines):
+        if lines[i].startswith("<<<<<<<"):
+            block_start = i
+            ours_lines, base_lines, theirs_lines = [], [], []
+            section = "ours"
+            i += 1
+            while i < len(lines):
+                line = lines[i]
+                if line.startswith("|||||||"):
+                    section = "base"
+                    i += 1
+                    continue
+                elif line.startswith("======="):
+                    section = "theirs"
+                    i += 1
+                    continue
+                elif line.startswith(">>>>>>>"):
+                    i += 1
+                    break
+                if section == "ours":
+                    ours_lines.append(line)
+                elif section == "base":
+                    base_lines.append(line)
+                else:
+                    theirs_lines.append(line)
+                i += 1
+            ctx_start = max(0, block_start - context_lines)
+            ctx_end = min(len(lines), i + context_lines)
+            blocks.append(ConflictBlock(
+                file_path=file_path,
+                line_start=block_start + 1,
+                ours="".join(ours_lines),
+                base="".join(base_lines),
+                theirs="".join(theirs_lines),
+                context_before="".join(lines[ctx_start:block_start]),
+                context_after="".join(lines[i:ctx_end]),
+            ))
+        else:
+            i += 1
+    return blocks
+
+
+def get_merge_timestamps(repo_root: Path) -> tuple[str, str]:
+    """HEAD(OURS)와 MERGE_HEAD(THEIRS)의 커밋 타임스탬프를 반환한다."""
+    def _ts(ref: str) -> str:
+        try:
+            r = subprocess.run(
+                ["git", "log", "-1", "--format=%ci", ref],
+                capture_output=True, text=True, cwd=repo_root, timeout=5,
+            )
+            return r.stdout.strip()
+        except Exception:
+            return ""
+    return _ts("HEAD"), _ts("MERGE_HEAD")

aos_git-0.1.0/src/aos/conflict/preview.py

@@ -0,0 +1,38 @@
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+from rich.columns import Columns
+from aos.conflict.parser import ConflictBlock
+
+console = Console()
+
+
+def show_conflict_preview(
+    block: ConflictBlock,
+    resolved: str,
+    index: int,
+    total: int,
+) -> None:
+    """충돌 블록과 AI 해결안을 터미널에 나란히 출력한다."""
+    console.rule(f"[bold yellow]충돌 {index}/{total}[/] — {block.file_path} (라인 {block.line_start})")
+
+    ours_text = Text(f"[OURS]\n{block.ours}", style="red")
+    theirs_text = Text(f"[THEIRS]\n{block.theirs}", style="blue")
+    resolved_text = Text(f"[AI 통합 결과]\n{resolved}", style="green")
+
+    console.print(Columns([
+        Panel(ours_text, title="내 변경사항", border_style="red"),
+        Panel(theirs_text, title="상대방 변경사항", border_style="blue"),
+        Panel(resolved_text, title="AI 제안", border_style="green"),
+    ]))
+
+
+def ask_apply(language: str = "ko") -> str:
+    """사용자에게 적용 여부를 묻고 'y', 'n', 'e' 중 하나를 반환한다."""
+    msg = "적용할까요?" if language == "ko" else "Apply this resolution?"
+    choice = console.input(f"[bold]{msg}[/] \\[Y/n/e(직접편집)] ").strip().lower()
+    if choice in ("", "y"):
+        return "y"
+    elif choice == "e":
+        return "e"
+    return "n"

aos_git-0.1.0/src/aos/conflict/resolver.py

@@ -0,0 +1,65 @@
+import click
+from pathlib import Path
+from rich.console import Console
+
+from aos.conflict.detector import find_conflict_files
+from aos.conflict.parser import parse_conflicts, get_merge_timestamps
+from aos.conflict.preview import show_conflict_preview, ask_apply
+from aos.conflict.applier import apply_resolution
+from aos.ai.adapter import AIAdapter
+
+console = Console()
+
+
+def resolve_all_conflicts(repo_root: Path, adapter: AIAdapter, behavior) -> bool:
+    """
+    repo_root 내 모든 충돌을 처리한다.
+    같은 파일 내 여러 충돌은 결정을 먼저 모두 수집한 뒤 역순으로 적용한다.
+    (앞 블록을 먼저 적용하면 뒤 블록의 줄 번호가 어긋나는 버그 방지)
+    반환값: 모든 충돌이 적용되면 True, 하나라도 건너뛰면 False.
+    """
+    conflict_files = find_conflict_files(repo_root)
+    if not conflict_files:
+        console.print("[green][aos] 충돌이 없습니다.[/green]")
+        return True
+
+    ours_ts, theirs_ts = get_merge_timestamps(repo_root)
+    all_applied = True
+    total_blocks = sum(len(parse_conflicts(f)) for f in conflict_files)
+    index = 0
+
+    for file_path in conflict_files:
+        blocks = parse_conflicts(file_path, context_lines=behavior.context_lines)
+        # 1단계: 모든 블록에 대해 AI 해결 + 사용자 결정 수집
+        decisions: list[tuple] = []  # (block, resolved, choice)
+        for block in blocks:
+            index += 1
+            try:
+                resolved = adapter.resolve_conflict(block, ours_ts=ours_ts, theirs_ts=theirs_ts)
+            except Exception as e:
+                console.print(f"[red][aos] AI 호출 실패: {e}[/red]")
+                console.print("[yellow]수동 해결: git mergetool[/yellow]")
+                decisions.append((block, "", "n"))
+                all_applied = False
+                continue
+
+            show_conflict_preview(block, resolved, index, total_blocks)
+            choice = "y" if behavior.auto_apply else ask_apply(behavior.language)
+            decisions.append((block, resolved, choice))
+
+        # 2단계: 역순으로 적용 (줄 번호 보존)
+        for block, resolved, choice in reversed(decisions):
+            if choice == "y":
+                apply_resolution(file_path, block.line_start, resolved)
+                console.print(f"[green]  적용됨 (라인 {block.line_start})[/green]")
+            elif choice == "e":
+                click.edit(filename=str(file_path))
+                all_applied = False
+            else:
+                console.print(f"[yellow]  건너뜀 (라인 {block.line_start}) — 충돌 마커 유지됨[/yellow]")
+                all_applied = False
+
+    if not all_applied:
+        console.print("[yellow][aos] 일부 충돌이 남아 있습니다. 'git merge --abort' 또는 수동 해결하세요.[/yellow]")
+
+    return all_applied

aos_git-0.1.0/src/aos_git.egg-info/PKG-INFO

@@ -0,0 +1,73 @@
+Metadata-Version: 2.4
+Name: aos-git
+Version: 0.1.0
+Summary: AI-powered Git merge conflict resolver — let AI merge both sides intelligently
+License: MIT
+Project-URL: Homepage, https://github.com/YOUR_USERNAME/aos-git
+Project-URL: Issues, https://github.com/YOUR_USERNAME/aos-git/issues
+Keywords: git,merge,conflict,ai,cli
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Environment :: Console
+Classifier: Topic :: Software Development :: Version Control :: Git
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+Requires-Dist: click>=8.1
+Requires-Dist: rich>=13.0
+Requires-Dist: toml>=0.10
+Requires-Dist: openai>=1.0
+Requires-Dist: anthropic>=0.25
+
+# aos — AI-powered Git merge conflict resolver
+
+`aos`는 git을 감싸는 CLI 도구입니다. `git pull` / `git merge` 시 충돌이 발생하면
+AI가 양쪽 변경사항을 자동으로 분석해서 **둘 다 살리는 방향으로 통합**해드립니다.
+
+## 설치
+
+```bash
+pip install aos-git
+```
+
+## 최초 설정
+
+```bash
+aos setup
+```
+
+Databricks 또는 Anthropic API 키를 입력하면 `~/.aos/config.toml`에 저장됩니다.
+
+## 사용법
+
+기존 git 명령어 대신 `aos`를 사용하세요:
+
+| git 명령 | aos 명령 | 설명 |
+|----------|----------|------|
+| `git pull` | `aos pull` | 충돌 시 AI 자동 해결 |
+| `git merge <branch>` | `aos merge <branch>` | 충돌 시 AI 자동 해결 |
+| `git push` | `aos push` | 그대로 |
+| `git commit -m "..."` | `aos commit -m "..."` | 전체 스테이징 후 커밋 |
+| `git status` | `aos status` | 친화적인 상태 표시 |
+
+## 충돌 해결 흐름
+
+```
+aos pull
+  └─→ 충돌 감지
+        └─→ AI가 양쪽 변경사항 분석 (타임스탬프 참고)
+              └─→ 통합 결과 미리보기 출력
+                    └─→ [Y] 적용 / [n] 건너뜀 / [e] 직접 편집
+```
+
+## AI 제공자
+
+- **Databricks Model Serving** (기본): 사내 Databricks 환경
+- **Anthropic API**: `claude-sonnet-4-6` 등
+
+설정 전환: `aos setup`으로 언제든지 변경 가능
+
+## 요구사항
+
+- Python 3.11+
+- git

aos_git-0.1.0/src/aos_git.egg-info/SOURCES.txt

@@ -0,0 +1,35 @@
+README.md
+pyproject.toml
+src/aos/__init__.py
+src/aos/cli.py
+src/aos/ai/__init__.py
+src/aos/ai/adapter.py
+src/aos/ai/anthropic_adapter.py
+src/aos/ai/databricks.py
+src/aos/ai/factory.py
+src/aos/commands/__init__.py
+src/aos/commands/commit.py
+src/aos/commands/merge.py
+src/aos/commands/pull.py
+src/aos/commands/push.py
+src/aos/commands/setup.py
+src/aos/commands/status.py
+src/aos/config/__init__.py
+src/aos/config/settings.py
+src/aos/conflict/__init__.py
+src/aos/conflict/applier.py
+src/aos/conflict/detector.py
+src/aos/conflict/parser.py
+src/aos/conflict/preview.py
+src/aos/conflict/resolver.py
+src/aos_git.egg-info/PKG-INFO
+src/aos_git.egg-info/SOURCES.txt
+src/aos_git.egg-info/dependency_links.txt
+src/aos_git.egg-info/entry_points.txt
+src/aos_git.egg-info/requires.txt
+src/aos_git.egg-info/top_level.txt
+tests/test_adapter.py
+tests/test_applier.py
+tests/test_config.py
+tests/test_detector.py
+tests/test_parser.py

aos_git-0.1.0/src/aos_git.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

aos_git-0.1.0/src/aos_git.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+aos = aos.cli:main

aos_git-0.1.0/src/aos_git.egg-info/requires.txt

@@ -0,0 +1,5 @@
+click>=8.1
+rich>=13.0
+toml>=0.10
+openai>=1.0
+anthropic>=0.25

aos_git-0.1.0/src/aos_git.egg-info/top_level.txt

@@ -0,0 +1 @@
+aos

aos_git-0.1.0/tests/test_adapter.py

@@ -0,0 +1,50 @@
+from unittest.mock import MagicMock
+from aos.ai.databricks import DatabricksAdapter
+from aos.ai.anthropic_adapter import AnthropicAdapter
+from aos.conflict.parser import ConflictBlock
+from pathlib import Path
+
+
+def _make_block(ours: str, base: str, theirs: str) -> ConflictBlock:
+    return ConflictBlock(
+        file_path=Path("app.py"),
+        line_start=1,
+        ours=ours,
+        base=base,
+        theirs=theirs,
+        context_before="",
+        context_after="",
+    )
+
+
+def test_databricks_adapter_returns_resolved_string():
+    block = _make_block("def f():\n    return 1\n", "", "def f(x):\n    return x\n")
+    mock_client = MagicMock()
+    mock_client.chat.completions.create.return_value = MagicMock(
+        choices=[MagicMock(message=MagicMock(content="def f(x=None):\n    return x\n"))]
+    )
+    adapter = DatabricksAdapter(
+        host="https://fake.databricks.net",
+        token="fake-token",
+        model="databricks-claude-sonnet-4-6",
+        _client=mock_client,
+    )
+    result = adapter.resolve_conflict(block, ours_ts="2026-04-20", theirs_ts="2026-04-21")
+    assert "def f(" in result
+    mock_client.chat.completions.create.assert_called_once()
+
+
+def test_anthropic_adapter_returns_resolved_string():
+    block = _make_block("x = 1\n", "", "x = 2\n")
+    mock_client = MagicMock()
+    mock_client.messages.create.return_value = MagicMock(
+        content=[MagicMock(text="x = 1  # merged\n")]
+    )
+    adapter = AnthropicAdapter(
+        api_key="fake-key",
+        model="claude-sonnet-4-6",
+        _client=mock_client,
+    )
+    result = adapter.resolve_conflict(block, ours_ts="2026-04-20", theirs_ts="2026-04-21")
+    assert "x = " in result
+    mock_client.messages.create.assert_called_once()

aos_git-0.1.0/tests/test_applier.py

@@ -0,0 +1,40 @@
+from pathlib import Path
+from aos.conflict.applier import apply_resolution
+
+
+def test_apply_resolution_replaces_conflict_block(tmp_path):
+    f = tmp_path / "app.py"
+    f.write_text(
+        "# header\n"
+        "<<<<<<< HEAD\n"
+        "x = 1\n"
+        "=======\n"
+        "x = 2\n"
+        ">>>>>>> other\n"
+        "# footer\n"
+    )
+    apply_resolution(f, line_start=2, resolved="x = 1  # merged\n")
+    result = f.read_text()
+    assert "<<<<<<" not in result
+    assert "=======" not in result
+    assert ">>>>>>" not in result
+    assert "x = 1  # merged" in result
+    assert "# header" in result
+    assert "# footer" in result
+
+
+def test_apply_resolution_with_diff3_block(tmp_path):
+    f = tmp_path / "app.py"
+    f.write_text(
+        "<<<<<<< HEAD\n"
+        "a = 1\n"
+        "||||||| base\n"
+        "a = 0\n"
+        "=======\n"
+        "a = 2\n"
+        ">>>>>>> other\n"
+    )
+    apply_resolution(f, line_start=1, resolved="a = 1 + 2\n")
+    result = f.read_text()
+    assert "a = 1 + 2" in result
+    assert "<<<<<<" not in result

aos_git-0.1.0/tests/test_config.py

@@ -0,0 +1,29 @@
+import pytest
+from pathlib import Path
+from unittest.mock import patch
+from aos.config.settings import load_config, save_config, Config, AIConfig, BehaviorConfig
+
+
+def test_load_config_returns_defaults_when_missing(tmp_path):
+    config_path = tmp_path / "config.toml"
+    with patch("aos.config.settings.CONFIG_PATH", config_path):
+        cfg = load_config()
+    assert cfg.ai.provider == "databricks"
+    assert cfg.behavior.auto_apply is False
+    assert cfg.behavior.context_lines == 20
+
+
+def test_save_and_load_roundtrip(tmp_path):
+    config_path = tmp_path / ".aos" / "config.toml"
+    with patch("aos.config.settings.CONFIG_PATH", config_path):
+        cfg = Config(
+            ai=AIConfig(provider="anthropic", model="claude-opus-4-6"),
+            databricks=None,
+            anthropic=None,
+            behavior=BehaviorConfig(auto_apply=True, context_lines=30, language="en"),
+        )
+        save_config(cfg)
+        loaded = load_config()
+    assert loaded.ai.provider == "anthropic"
+    assert loaded.behavior.auto_apply is True
+    assert loaded.behavior.context_lines == 30

aos_git-0.1.0/tests/test_detector.py

@@ -0,0 +1,24 @@
+from pathlib import Path
+from aos.conflict.detector import find_conflict_files
+
+
+def test_find_conflict_files_detects_marker(tmp_path):
+    conflict_file = tmp_path / "main.py"
+    conflict_file.write_text(
+        "def foo():\n"
+        "<<<<<<< HEAD\n"
+        "    return 1\n"
+        "=======\n"
+        "    return 2\n"
+        ">>>>>>> feature\n"
+    )
+    clean_file = tmp_path / "clean.py"
+    clean_file.write_text("def bar():\n    return 3\n")
+
+    result = find_conflict_files(tmp_path)
+    assert conflict_file in result
+    assert clean_file not in result
+
+
+def test_find_conflict_files_empty_dir(tmp_path):
+    assert find_conflict_files(tmp_path) == []

aos_git-0.1.0/tests/test_parser.py

@@ -0,0 +1,55 @@
+from pathlib import Path
+from aos.conflict.parser import parse_conflicts, ConflictBlock
+
+
+def test_parse_single_conflict_diff3(tmp_path):
+    f = tmp_path / "app.py"
+    f.write_text(
+        "# header\n"
+        "<<<<<<< HEAD\n"
+        "def login():\n"
+        "    pass\n"
+        "||||||| base\n"
+        "def login():\n"
+        "    return None\n"
+        "=======\n"
+        "def login(user_id):\n"
+        "    pass\n"
+        ">>>>>>> feature/auth\n"
+        "# footer\n"
+    )
+    blocks = parse_conflicts(f, context_lines=1)
+    assert len(blocks) == 1
+    b = blocks[0]
+    assert "def login():\n    pass\n" in b.ours
+    assert "def login():\n    return None\n" in b.base
+    assert "def login(user_id):\n    pass\n" in b.theirs
+    assert b.line_start == 2
+
+
+def test_parse_conflict_without_base(tmp_path):
+    """diff3 없는 경우 base가 빈 문자열이어야 한다."""
+    f = tmp_path / "app.py"
+    f.write_text(
+        "<<<<<<< HEAD\n"
+        "x = 1\n"
+        "=======\n"
+        "x = 2\n"
+        ">>>>>>> other\n"
+    )
+    blocks = parse_conflicts(f)
+    assert len(blocks) == 1
+    assert blocks[0].base == ""
+    assert blocks[0].ours == "x = 1\n"
+    assert blocks[0].theirs == "x = 2\n"
+
+
+def test_parse_multiple_conflicts(tmp_path):
+    f = tmp_path / "app.py"
+    f.write_text(
+        "<<<<<<< HEAD\na = 1\n=======\na = 2\n>>>>>>> other\n"
+        "middle\n"
+        "<<<<<<< HEAD\nb = 1\n=======\nb = 2\n>>>>>>> other\n"
+    )
+    blocks = parse_conflicts(f)
+    assert len(blocks) == 2