github-sync-agent 0.1.3__py3-none-any.whl → 0.2.0__py3-none-any.whl

github_sync/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.2.0"

github_sync/api.py

@@ -0,0 +1,111 @@
+"""HTTP API for the GitHub Sync Agent."""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+
+from fastapi import Depends, FastAPI, HTTPException, Security
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
+from pydantic import BaseModel, Field
+
+from . import __version__
+from . import agent
+
+LOG = logging.getLogger(__name__)
+_security = HTTPBearer(auto_error=False)
+
+
+class SyncRequest(BaseModel):
+    dry_run: bool = False
+
+
+class SyncResult(BaseModel):
+    project: str
+    success: bool
+
+
+class SyncResponse(BaseModel):
+    success: bool
+    synced: int
+    failed: int
+    results: list[SyncResult]
+
+
+class StatusRow(BaseModel):
+    project: str
+    root: str
+    git: bool
+    remote: bool
+    changes: bool
+    on_github: bool
+
+
+class StatusResponse(BaseModel):
+    github_user: str
+    projects_root: list[str]
+    projects: list[StatusRow]
+
+
+def create_app(cfg: dict) -> FastAPI:
+    api_key: str = cfg.get("api_key") or ""
+
+    app = FastAPI(
+        title="GitHub Sync Agent API",
+        description="Trigger and inspect GitHub sync operations over HTTP.",
+        version=__version__,
+    )
+
+    async def require_auth(
+        credentials: HTTPAuthorizationCredentials | None = Security(_security),
+    ) -> None:
+        if not api_key:
+            return
+        if credentials is None or credentials.credentials != api_key:
+            raise HTTPException(status_code=401, detail="Invalid or missing API key")
+
+    @app.get("/health")
+    async def health() -> dict[str, str]:
+        return {"status": "ok", "version": __version__}
+
+    @app.get("/status", response_model=StatusResponse, dependencies=[Depends(require_auth)])
+    async def status() -> StatusResponse:
+        rows = await asyncio.to_thread(agent.get_status, cfg)
+        return StatusResponse(
+            github_user=cfg["github_user"],
+            projects_root=cfg["projects_root"],
+            projects=[StatusRow(**row) for row in rows],
+        )
+
+    @app.post("/sync", response_model=SyncResponse, dependencies=[Depends(require_auth)])
+    async def sync_all(body: SyncRequest = SyncRequest()) -> SyncResponse:
+        return await _run_sync(cfg, project=None, dry_run=body.dry_run)
+
+    @app.post("/sync/{project}", response_model=SyncResponse, dependencies=[Depends(require_auth)])
+    async def sync_one(project: str, body: SyncRequest = SyncRequest()) -> SyncResponse:
+        return await _run_sync(cfg, project=project, dry_run=body.dry_run)
+
+    return app
+
+
+async def _run_sync(cfg: dict, project: str | None, dry_run: bool) -> SyncResponse:
+    try:
+        projects = await asyncio.to_thread(agent.discover_projects, cfg, project)
+    except ValueError as exc:
+        raise HTTPException(status_code=404, detail=str(exc)) from exc
+
+    results: list[SyncResult] = []
+    for path in projects:
+        ok = await asyncio.to_thread(agent.sync_project, path, cfg, dry_run)
+        results.append(SyncResult(project=path.name, success=ok))
+        level = logging.INFO if ok else logging.ERROR
+        LOG.log(level, "%s %s", path.name, "synced" if ok else "FAILED")
+
+    synced = sum(1 for r in results if r.success)
+    failed = len(results) - synced
+    return SyncResponse(
+        success=failed == 0,
+        synced=synced,
+        failed=failed,
+        results=results,
+    )

github_sync/cli.py

@@ -207,8 +207,8 @@ def init() -> None:
 
     click.echo()
 
-    # ── 6. SSH key setup ────────────────────────────────────────────────────
-    click.echo(click.style("  Setting up SSH key for GitHub...", bold=True))
+    # ── 6. SSH setup + verification ─────────────────────────────────────────
+    click.echo(click.style("  Setting up SSH for GitHub...", bold=True))
 
     if not setup.ssh_key_exists():
         click.echo("  No SSH key found — generating one...")
@@ -220,17 +220,25 @@ def init() -> None:
     else:
         click.echo("  ✓ SSH key already exists")
 
-    setup.add_github_host_key()
+    setup.add_github_host_keys()
 
-    if not setup.ssh_key_on_github():
-        click.echo("  Uploading SSH key to GitHub...")
-        if setup.upload_ssh_key_to_github():
-            click.echo("  ✓ SSH key added to GitHub")
-        else:
-            click.echo(click.style("  ✗ Failed to upload SSH key.", fg="yellow"))
-            click.echo("    Run manually: gh ssh-key add ~/.ssh/id_ed25519.pub")
+    click.echo("  Verifying SSH connection to GitHub...")
+    ok, msg, fixes = setup.ensure_github_ssh()
+
+    for fix in fixes:
+        click.echo(f"    → applied fix: {fix}")
+
+    if ok:
+        user = setup.ssh_auth_username(msg) or github_user
+        click.echo(f"  ✓ SSH verified as {user}")
     else:
-        click.echo("  ✓ SSH key already on GitHub")
+        click.echo(click.style("  ✗ SSH verification failed.", fg="red"))
+        click.echo(f"    {msg}")
+        click.echo()
+        click.echo("  Manual checks:")
+        click.echo("    ssh -T git@github.com")
+        click.echo("    gh ssh-key add ~/.ssh/id_ed25519.pub")
+        sys.exit(1)
 
     click.echo()
 
@@ -245,8 +253,43 @@ def init() -> None:
     click.echo(f"  github-sync status          # see all your projects")
     click.echo(f"  github-sync sync --dry-run  # preview what will be synced")
     click.echo(f"  github-sync sync            # sync everything to GitHub")
+    click.echo(f"  github-sync serve           # start HTTP API (requires [api] extra)")
+    click.echo()
+
+
+# ---------------------------------------------------------------------------
+# serve
+# ---------------------------------------------------------------------------
+
+@cli.command()
+@click.option("--host", default=None, help="Bind address (default: api_host from config)")
+@click.option("--port", default=None, type=int, help="Port (default: api_port from config)")
+@click.pass_context
+def serve(ctx: click.Context, host: str | None, port: int | None) -> None:
+    """Start the HTTP API server."""
+    try:
+        import uvicorn
+    except ImportError:
+        click.echo("Error: API dependencies not installed.", err=True)
+        click.echo("Run: pip install 'github-sync-agent[api]'", err=True)
+        sys.exit(1)
+
+    cfg = ctx.obj["cfg"]
+    _setup_logging(cfg)
+
+    from .api import create_app
+
+    bind_host = host or cfg.get("api_host", "127.0.0.1")
+    bind_port = port or int(cfg.get("api_port", 8741))
+    app = create_app(cfg)
+
+    auth_note = "API key required" if cfg.get("api_key") else "no auth (localhost only recommended)"
+    click.echo(f"Starting GitHub Sync API on http://{bind_host}:{bind_port} ({auth_note})")
+    click.echo("Endpoints: GET /health  GET /status  POST /sync  POST /sync/{project}")
     click.echo()
 
+    uvicorn.run(app, host=bind_host, port=bind_port, log_level=cfg.get("log_level", "info").lower())
+
 
 # ---------------------------------------------------------------------------
 # Entry point

github_sync/config.py

@@ -26,6 +26,9 @@ def _apply_defaults(cfg: dict) -> None:
     cfg.setdefault("exclude", [])
     cfg.setdefault("log_file", str(Path.home() / ".local" / "share" / "github-sync" / "github-sync.log"))
     cfg.setdefault("log_level", "INFO")
+    cfg.setdefault("api_host", "127.0.0.1")
+    cfg.setdefault("api_port", 8741)
+    cfg.setdefault("api_key", "")
 
     if not cfg.get("github_user"):
         raise ValueError("Missing required config key: 'github_user'")

github_sync/setup.py

@@ -3,6 +3,8 @@ Setup helpers used by `github-sync init`.
 Checks prerequisites, detects credentials, sets up SSH.
 """
 
+import platform
+import re
 import shutil
 import subprocess
 from pathlib import Path
@@ -49,6 +51,16 @@ def get_github_username() -> str | None:
 # ---------------------------------------------------------------------------
 
 DEFAULT_KEY = Path.home() / ".ssh" / "id_ed25519"
+SSH_CONFIG = Path.home() / ".ssh" / "config"
+
+GITHUB_PORT443_BLOCK = """
+# Added by github-sync — use port 443 when port 22 is blocked
+Host github.com
+  HostName ssh.github.com
+  Port 443
+  User git
+  IdentityFile ~/.ssh/id_ed25519
+"""
 
 
 def ssh_key_exists() -> bool:
@@ -56,6 +68,7 @@ def ssh_key_exists() -> bool:
 
 
 def generate_ssh_key(passphrase: str = "") -> bool:
+    Path.home().joinpath(".ssh").mkdir(mode=0o700, exist_ok=True)
     result = subprocess.run(
         ["ssh-keygen", "-t", "ed25519", "-C", "github-sync", "-f", str(DEFAULT_KEY), "-N", passphrase],
         capture_output=True, text=True,
@@ -63,29 +76,101 @@ def generate_ssh_key(passphrase: str = "") -> bool:
     return result.returncode == 0
 
 
-def add_github_host_key() -> bool:
-    result = subprocess.run(
-        ["ssh-keyscan", "-t", "ed25519", "github.com"],
-        capture_output=True, text=True,
-    )
-    if result.returncode != 0:
+def _append_known_hosts(hostname: str, port: int | None = None) -> bool:
+    cmd = ["ssh-keyscan", "-t", "ed25519"]
+    if port:
+        cmd.extend(["-p", str(port)])
+    cmd.append(hostname)
+
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    if result.returncode != 0 or not result.stdout.strip():
         return False
+
     known_hosts = Path.home() / ".ssh" / "known_hosts"
     known_hosts.parent.mkdir(mode=0o700, exist_ok=True)
     existing = known_hosts.read_text() if known_hosts.exists() else ""
-    if "github.com" not in existing:
+    if hostname not in existing:
         with open(known_hosts, "a") as f:
             f.write(result.stdout)
     return True
 
 
-def ssh_key_on_github() -> bool:
-    """Test if the current SSH key authenticates to GitHub."""
+def add_github_host_keys() -> None:
+    """Trust GitHub host keys for both port 22 and port 443."""
+    _append_known_hosts("github.com")
+    _append_known_hosts("ssh.github.com", port=443)
+
+
+def test_github_ssh() -> tuple[bool, str]:
+    """Test SSH auth to GitHub. Returns (success, combined output)."""
     result = subprocess.run(
-        ["ssh", "-T", "-o", "BatchMode=yes", "-o", "StrictHostKeyChecking=no", "git@github.com"],
+        [
+            "ssh", "-T",
+            "-o", "BatchMode=yes",
+            "-o", "ConnectTimeout=15",
+            "-o", "StrictHostKeyChecking=accept-new",
+            "git@github.com",
+        ],
         capture_output=True, text=True,
     )
-    return "successfully authenticated" in (result.stdout + result.stderr)
+    output = (result.stdout + result.stderr).strip()
+    ok = "successfully authenticated" in output.lower()
+    return ok, output
+
+
+def ssh_auth_username(output: str) -> str | None:
+    match = re.search(r"Hi ([^!]+)!", output)
+    return match.group(1) if match else None
+
+
+def is_ssh_connection_error(message: str) -> bool:
+    lower = message.lower()
+    return any(
+        phrase in lower
+        for phrase in ("connection closed", "connection reset", "timed out", "network is unreachable")
+    )
+
+
+def is_ssh_auth_error(message: str) -> bool:
+    lower = message.lower()
+    return "permission denied" in lower or "publickey" in lower
+
+
+def has_github_port443_config() -> bool:
+    if not SSH_CONFIG.exists():
+        return False
+    content = SSH_CONFIG.read_text()
+    return "ssh.github.com" in content and "443" in content
+
+
+def configure_github_ssh_port_443() -> bool:
+    """Configure ~/.ssh/config to reach GitHub over port 443."""
+    if has_github_port443_config():
+        return True
+
+    SSH_CONFIG.parent.mkdir(mode=0o700, exist_ok=True)
+    with open(SSH_CONFIG, "a") as f:
+        f.write(GITHUB_PORT443_BLOCK)
+    SSH_CONFIG.chmod(0o600)
+    _append_known_hosts("ssh.github.com", port=443)
+    return True
+
+
+def add_ssh_key_to_agent() -> bool:
+    """Load the default key into ssh-agent (required on some macOS setups)."""
+    if not DEFAULT_KEY.exists():
+        return False
+
+    commands = []
+    if platform.system() == "Darwin":
+        commands.append(["ssh-add", "--apple-use-keychain", str(DEFAULT_KEY)])
+    commands.append(["ssh-add", str(DEFAULT_KEY)])
+
+    for cmd in commands:
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        if result.returncode == 0:
+            return True
+    return False
 
 
 def upload_ssh_key_to_github(title: str = "github-sync") -> bool:
@@ -99,6 +184,55 @@ def upload_ssh_key_to_github(title: str = "github-sync") -> bool:
     return result.returncode == 0
 
 
+def ssh_key_on_github() -> bool:
+    """Back-compat wrapper."""
+    ok, _ = test_github_ssh()
+    return ok
+
+
+def ensure_github_ssh() -> tuple[bool, str, list[str]]:
+    """
+    Verify GitHub SSH works; apply fixes as needed.
+    Returns (success, last_message, fixes_applied).
+    """
+    fixes: list[str] = []
+
+    ok, msg = test_github_ssh()
+    if ok:
+        return True, msg, fixes
+
+    if is_ssh_connection_error(msg):
+        configure_github_ssh_port_443()
+        fixes.append("configured port 443")
+        ok, msg = test_github_ssh()
+        if ok:
+            return True, msg, fixes
+
+    if is_ssh_auth_error(msg):
+        if upload_ssh_key_to_github():
+            fixes.append("uploaded SSH key")
+            ok, msg = test_github_ssh()
+            if ok:
+                return True, msg, fixes
+
+    if add_ssh_key_to_agent():
+        fixes.append("loaded key into ssh-agent")
+        ok, msg = test_github_ssh()
+        if ok:
+            return True, msg, fixes
+
+    # Last resort: port 443 + agent together
+    if is_ssh_connection_error(msg) and not has_github_port443_config():
+        configure_github_ssh_port_443()
+        add_ssh_key_to_agent()
+        fixes.append("port 443 + ssh-agent")
+        ok, msg = test_github_ssh()
+        if ok:
+            return True, msg, fixes
+
+    return False, msg, fixes
+
+
 # ---------------------------------------------------------------------------
 # Config writer
 # ---------------------------------------------------------------------------
@@ -142,6 +276,11 @@ exclude: []
 # Logging
 log_file: {log_file}
 log_level: INFO
+
+# HTTP API (github-sync serve)
+api_host: "127.0.0.1"
+api_port: 8741
+# api_key: "change-me"   # uncomment to require: Authorization: Bearer <key>
 """
 
 

{github_sync_agent-0.1.3.dist-info → github_sync_agent-0.2.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: github-sync-agent
-Version: 0.1.3
+Version: 0.2.0
 Summary: Sync all your local projects to GitHub automatically
 License: MIT
 Project-URL: Homepage, https://github.com/yuvalavni/Agents
 Project-URL: Repository, https://github.com/yuvalavni/Agents
 Project-URL: Bug Tracker, https://github.com/yuvalavni/Agents/issues
-Keywords: github,git,sync,backup,automation,cli
+Keywords: github,git,sync,backup,automation,cli,api
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
@@ -16,6 +16,9 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: click>=8.0
+Provides-Extra: api
+Requires-Dist: fastapi>=0.100; extra == "api"
+Requires-Dist: uvicorn>=0.23; extra == "api"
 
 # GitHub Sync Agent
 
@@ -49,8 +52,11 @@ The wizard will:
 - Authenticate with GitHub (`gh auth login`)
 - Ask which folder to scan for projects
 - Set up your SSH key automatically
+- **Verify SSH works** (auto-fixes port 443 and ssh-agent if needed)
 - Write a config file to `~/.config/github-sync/config.yaml`
 
+Setup will **not** complete until `ssh -T git@github.com` succeeds.
+
 ---
 
 ## Usage
@@ -71,6 +77,64 @@ github-sync status
 
 ---
 
+## HTTP API
+
+Install API dependencies:
+
+```bash
+pip install 'github-sync-agent[api]'
+```
+
+Start the server:
+
+```bash
+github-sync serve
+# → http://127.0.0.1:8741
+```
+
+### Endpoints
+
+| Method | Path | Description |
+|--------|------|-------------|
+| `GET` | `/health` | Health check (no auth) |
+| `GET` | `/status` | Sync status for all projects |
+| `POST` | `/sync` | Sync all projects |
+| `POST` | `/sync/{project}` | Sync one project |
+
+Optional body for POST: `{"dry_run": false}`
+
+### Examples
+
+```bash
+curl http://127.0.0.1:8741/health
+curl http://127.0.0.1:8741/status
+curl -X POST http://127.0.0.1:8741/sync
+curl -X POST http://127.0.0.1:8741/sync/Agents
+```
+
+### API authentication (optional)
+
+Add to `config.yaml`:
+
+```yaml
+api_key: "your-secret-key"
+```
+
+Then pass the key on every request (except `/health`):
+
+```bash
+curl -H "Authorization: Bearer your-secret-key" http://127.0.0.1:8741/status
+```
+
+### Run as a systemd service
+
+```bash
+cp systemd/github-sync-api.service ~/.config/systemd/user/
+systemctl --user enable --now github-sync-api.service
+```
+
+---
+
 ## Configuration (`~/.config/github-sync/config.yaml`)
 
 Generated by `github-sync init`. You can edit it at any time.
@@ -85,6 +149,9 @@ Generated by `github-sync init`. You can edit it at any time.
 | `exclude` | `[]` | Directory names to skip |
 | `log_file` | `~/.local/share/github-sync/github-sync.log` | Log file path |
 | `log_level` | `INFO` | `DEBUG` / `INFO` / `WARNING` / `ERROR` |
+| `api_host` | `127.0.0.1` | API bind address |
+| `api_port` | `8741` | API port |
+| `api_key` | _(empty)_ | Optional Bearer token for API auth |
 
 ### Excluding a project
 

github_sync_agent-0.2.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+github_sync/__init__.py,sha256=Zn1KFblwuFHiDRdRAiRnDBRkbPttWh44jKa5zG2ov0E,22
+github_sync/agent.py,sha256=2WnJCwupDwT3C9bNZLoj2CAvZW-eoqZChqFTk4wNRKw,6692
+github_sync/api.py,sha256=4EK1ZXgfQyGD3WBPsRlMipwyZTS0DWZLSLuvRV8tU7Y,3320
+github_sync/cli.py,sha256=fOC532dUM5aZUaKcR0ljYc8OcoUs299JWzT6uEdrAf8,11407
+github_sync/config.py,sha256=mnBYyIbtAnMGtjrs3gl-mg35Argos0sk_zOBeUdJpfA,1559
+github_sync/setup.py,sha256=yxast9nVJiTC2OCxaEnKk0wwTmH2kOO2pLG2CKJDOmg,8650
+github_sync_agent-0.2.0.dist-info/METADATA,sha256=HFlq_rklk8ExcLmRxTpm_HcgcPBInOMCA932Dz7TP6o,4115
+github_sync_agent-0.2.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+github_sync_agent-0.2.0.dist-info/entry_points.txt,sha256=-LmJUTvRzj5cvyS-dEWdipouBj3dgkW6hqrTz1GmyGw,53
+github_sync_agent-0.2.0.dist-info/top_level.txt,sha256=fPYTA83USK1N4JwfouV8zcejgWfWmqRAKQVDCAT8a5I,12
+github_sync_agent-0.2.0.dist-info/RECORD,,

github_sync_agent-0.1.3.dist-info/RECORD

@@ -1,10 +0,0 @@
-github_sync/__init__.py,sha256=XEqb2aiIn8fzGE68Mph4ck1FtQqsR_am0wRWvrYPffQ,22
-github_sync/agent.py,sha256=2WnJCwupDwT3C9bNZLoj2CAvZW-eoqZChqFTk4wNRKw,6692
-github_sync/cli.py,sha256=xsbYJXhlSGSDgEOlTm43XcDSdn5M83u2uz6UuzfG5s0,9827
-github_sync/config.py,sha256=BQrSW7DyhcZB6gZnDKkc-W6u1vtD-l76Rn_gW8Egypk,1444
-github_sync/setup.py,sha256=2ZO0ZCCxQ_LyVSdQbWrObwjjBQCDLqdu_IHplUqW0qU,4720
-github_sync_agent-0.1.3.dist-info/METADATA,sha256=_FnEkvuZNeHDyHSojYdDEg6z-cxLbVWlwn6Upf3jIxo,2644
-github_sync_agent-0.1.3.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-github_sync_agent-0.1.3.dist-info/entry_points.txt,sha256=-LmJUTvRzj5cvyS-dEWdipouBj3dgkW6hqrTz1GmyGw,53
-github_sync_agent-0.1.3.dist-info/top_level.txt,sha256=fPYTA83USK1N4JwfouV8zcejgWfWmqRAKQVDCAT8a5I,12
-github_sync_agent-0.1.3.dist-info/RECORD,,