github-sync-agent 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

github_sync/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.2"
+__version__ = "0.1.4"

github_sync/cli.py

@@ -1,4 +1,5 @@
 import logging
+import platform
 import sys
 from pathlib import Path
 
@@ -35,10 +36,16 @@ def _setup_logging(cfg: dict) -> None:
 def cli(ctx: click.Context, config_path: Path | None) -> None:
     """GitHub Sync Agent — sync local projects to GitHub."""
     ctx.ensure_object(dict)
+
+    # init creates the config — it must not require one to exist first
+    if ctx.invoked_subcommand == "init":
+        return
+
     try:
         ctx.obj["cfg"] = config.load(config_path)
     except (FileNotFoundError, ValueError) as exc:
         click.echo(f"Error: {exc}", err=True)
+        click.echo("Run 'github-sync init' to create a config file.", err=True)
         sys.exit(1)
 
 
@@ -123,6 +130,15 @@ def status(ctx: click.Context) -> None:
 # init
 # ---------------------------------------------------------------------------
 
+def _install_hint(tool: str) -> str:
+    system = platform.system()
+    if system == "Darwin":
+        return f"brew install {tool}"
+    if system == "Linux":
+        return f"sudo apt-get install -y {tool}"
+    return f"Install {tool} from your system package manager"
+
+
 @cli.command()
 def init() -> None:
     """Interactive setup wizard — run this first on a new machine."""
@@ -136,7 +152,7 @@ def init() -> None:
         click.echo(f"  ✓ git found: {git_ver}")
     else:
         click.echo(click.style("  ✗ git is not installed.", fg="red"))
-        click.echo("    Install it with:  sudo apt-get install -y git")
+        click.echo(f"    Install it with:  {_install_hint('git')}")
         sys.exit(1)
 
     # ── 2. Check gh ─────────────────────────────────────────────────────────
@@ -145,7 +161,7 @@ def init() -> None:
         click.echo(f"  ✓ gh found: {gh_ver}")
     else:
         click.echo(click.style("  ✗ gh (GitHub CLI) is not installed.", fg="red"))
-        click.echo("    Install it with:  sudo apt-get install -y gh")
+        click.echo(f"    Install it with:  {_install_hint('gh')}")
         sys.exit(1)
 
     # ── 3. GitHub authentication ─────────────────────────────────────────────
@@ -191,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...")
@@ -204,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()
 

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
 # ---------------------------------------------------------------------------

{github_sync_agent-0.1.2.dist-info → github_sync_agent-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github-sync-agent
-Version: 0.1.2
+Version: 0.1.4
 Summary: Sync all your local projects to GitHub automatically
 License: MIT
 Project-URL: Homepage, https://github.com/yuvalavni/Agents
@@ -49,8 +49,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

github_sync_agent-0.1.4.dist-info/RECORD

@@ -0,0 +1,10 @@
+github_sync/__init__.py,sha256=Wzf5T3NBDfhQoTnhnRNHSlAsE0XMqbclXG-M81Vas70,22
+github_sync/agent.py,sha256=2WnJCwupDwT3C9bNZLoj2CAvZW-eoqZChqFTk4wNRKw,6692
+github_sync/cli.py,sha256=72iJIhveIXoYJUdi375iazVf21Q1RAaCwqgaX-VRJJk,9976
+github_sync/config.py,sha256=BQrSW7DyhcZB6gZnDKkc-W6u1vtD-l76Rn_gW8Egypk,1444
+github_sync/setup.py,sha256=8QS0bBjp1dZfUlfxmnoNu87ULDsUxDzqTyVG7zuXtuE,8504
+github_sync_agent-0.1.4.dist-info/METADATA,sha256=IU6Z_jprTGtNZq6kKO47jrXzCzRTaJkaTWqQlQ0tCfA,2782
+github_sync_agent-0.1.4.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+github_sync_agent-0.1.4.dist-info/entry_points.txt,sha256=-LmJUTvRzj5cvyS-dEWdipouBj3dgkW6hqrTz1GmyGw,53
+github_sync_agent-0.1.4.dist-info/top_level.txt,sha256=fPYTA83USK1N4JwfouV8zcejgWfWmqRAKQVDCAT8a5I,12
+github_sync_agent-0.1.4.dist-info/RECORD,,

github_sync_agent-0.1.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-github_sync/__init__.py,sha256=YvuYzWnKtqBb-IqG8HAu-nhIYAsgj9Vmc_b9o7vO-js,22
-github_sync/agent.py,sha256=2WnJCwupDwT3C9bNZLoj2CAvZW-eoqZChqFTk4wNRKw,6692
-github_sync/cli.py,sha256=ndmfTQhK4KbtVEjXWuOg4RLs3UVFpgb0rZAf_YZFWgs,9336
-github_sync/config.py,sha256=BQrSW7DyhcZB6gZnDKkc-W6u1vtD-l76Rn_gW8Egypk,1444
-github_sync/setup.py,sha256=2ZO0ZCCxQ_LyVSdQbWrObwjjBQCDLqdu_IHplUqW0qU,4720
-github_sync_agent-0.1.2.dist-info/METADATA,sha256=u4dfGfpiUf-TQgtldf043Wj1NSZFvTy8fJG2bYj4dFo,2644
-github_sync_agent-0.1.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-github_sync_agent-0.1.2.dist-info/entry_points.txt,sha256=-LmJUTvRzj5cvyS-dEWdipouBj3dgkW6hqrTz1GmyGw,53
-github_sync_agent-0.1.2.dist-info/top_level.txt,sha256=fPYTA83USK1N4JwfouV8zcejgWfWmqRAKQVDCAT8a5I,12
-github_sync_agent-0.1.2.dist-info/RECORD,,