devstuff 1.13.1__tar.gz → 1.14.0__tar.gz

{devstuff-1.13.1 → devstuff-1.14.0}/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.14.0 (2026-07-12)
+
+### Feat
+
+- add skills command to append GitHub skills to claude, codex, pi
+
 ## v1.13.1 (2026-07-11)
 
 ## v1.13.0 (2026-07-05)

{devstuff-1.13.1 → devstuff-1.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devstuff
-Version: 1.13.1
+Version: 1.14.0
 Summary: Development environment setup CLI for Linux
 Project-URL: Repository, https://github.com/thesawdawg/dev-setup-py
 Author-email: Sawyer <sawyerksu@gmail.com>
@@ -269,6 +269,28 @@ When a user key matches a bundled key, the user definition overrides the bundled
 
 ---
 
+### `skills`
+
+Interactively clone a GitHub repository and copy its skills into `claude`, `codex`, and/or `pi`.
+
+```bash
+devstuff skills add
+```
+
+You'll be prompted for:
+
+- **Repository** — `owner/repo` or a full URL.
+- **Targets** — which of `claude` (`~/.claude/skills`), `codex` (`~/.codex/skills`), and `pi`
+  (`~/.pi/skills`) to install into.
+
+The repo is cloned anonymously first. If that fails (private repo), you're prompted to
+authenticate via an SSH key file or a GitHub personal access token. If the repo has a top-level
+`skills/` directory, every subdirectory under it is treated as its own skill; otherwise the whole
+repo is treated as a single skill. Existing skill directories are only overwritten after
+confirmation.
+
+---
+
 ## Functions/Scripts
 
 Reusable shell functions/snippets, tracked in a separate catalog from installable tools

{devstuff-1.13.1 → devstuff-1.14.0}/README.md

@@ -242,6 +242,28 @@ When a user key matches a bundled key, the user definition overrides the bundled
 
 ---
 
+### `skills`
+
+Interactively clone a GitHub repository and copy its skills into `claude`, `codex`, and/or `pi`.
+
+```bash
+devstuff skills add
+```
+
+You'll be prompted for:
+
+- **Repository** — `owner/repo` or a full URL.
+- **Targets** — which of `claude` (`~/.claude/skills`), `codex` (`~/.codex/skills`), and `pi`
+  (`~/.pi/skills`) to install into.
+
+The repo is cloned anonymously first. If that fails (private repo), you're prompted to
+authenticate via an SSH key file or a GitHub personal access token. If the repo has a top-level
+`skills/` directory, every subdirectory under it is treated as its own skill; otherwise the whole
+repo is treated as a single skill. Existing skill directories are only overwritten after
+confirmation.
+
+---
+
 ## Functions/Scripts
 
 Reusable shell functions/snippets, tracked in a separate catalog from installable tools

{devstuff-1.13.1 → devstuff-1.14.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devstuff"
-version = "1.13.1"
+version = "1.14.0"
 description = "Development environment setup CLI for Linux"
 readme = "README.md"
 requires-python = ">=3.11"

{devstuff-1.13.1 → devstuff-1.14.0}/src/dev_setup/cli.py

@@ -30,6 +30,7 @@ def _register_commands() -> None:
     from dev_setup.commands.list_cmd import list_cmd
     from dev_setup.commands.remove_cmd import remove_cmd
     from dev_setup.commands.run_cmd import run_cmd
+    from dev_setup.commands.skills_cmd import skills_cmd
     from dev_setup.commands.update_cmd import update_cmd
 
     cli.add_command(list_cmd, "list")
@@ -44,6 +45,7 @@ def _register_commands() -> None:
     cli.add_command(catalog_cmd, "catalog")
     cli.add_command(run_cmd, "run")
     cli.add_command(functions_cmd, "functions")
+    cli.add_command(skills_cmd, "skills")
 
 
 _register_commands()

{devstuff-1.13.1 → devstuff-1.14.0}/src/dev_setup/commands/help_cmd.py

@@ -19,6 +19,7 @@ def print_help() -> None:
         ("docs",    "<package>",                              "Open documentation in browser"),
         ("run",     "<function> [args...]",                   "Run a function/script"),
         ("functions", "<list|enable|disable|path>",           "Manage functions/scripts"),
+        ("skills",  "add",                                    "Append skills from a GitHub repo to claude/codex/pi"),
         ("version", "",                                        "Show version"),
     ]
     for cmd, args, desc in rows:

devstuff-1.14.0/src/dev_setup/commands/skills_cmd.py

@@ -0,0 +1,210 @@
+from __future__ import annotations
+
+import shutil
+import subprocess
+import tempfile
+from pathlib import Path
+
+import click
+import questionary
+
+from dev_setup import ui
+
+_TARGETS: dict[str, Path] = {
+    "claude": Path.home() / ".claude" / "skills",
+    "codex": Path.home() / ".codex" / "skills",
+    "pi": Path.home() / ".pi" / "skills",
+}
+
+
+@click.group("skills", invoke_without_command=True)
+@click.pass_context
+def skills_cmd(ctx: click.Context) -> None:
+    """Append skills from a GitHub repository to claude, codex, and/or pi."""
+    if ctx.invoked_subcommand is None:
+        ctx.invoke(add_cmd)
+
+
+@skills_cmd.command("add")
+def add_cmd() -> None:
+    """Clone a GitHub repo and copy its skills into the selected tools."""
+    ui.section("Add Skills From GitHub")
+
+    repo = ui.text_input(
+        "GitHub repository (e.g. owner/repo or a full URL):", required=True
+    )
+
+    targets = ui.checkbox(
+        "Apply skills to which tools?",
+        [
+            questionary.Choice(title="claude", checked=True),
+            questionary.Choice(title="codex", checked=True),
+            questionary.Choice(title="pi", checked=True),
+        ],
+    )
+    if not targets:
+        ui.warn("No targets selected — aborted.")
+        return
+
+    tmp_dir = Path(tempfile.mkdtemp(prefix="devstuff-skills-"))
+    try:
+        clone_url = _clone_repo(repo, tmp_dir)
+        if clone_url is None:
+            return
+
+        skill_dirs = _discover_skills(tmp_dir, repo)
+        if not skill_dirs:
+            ui.error("No skills found in the repository.")
+            ui.dim(
+                "Expected a top-level skills/<name>/ directory, or a repo whose "
+                "root itself is a single skill."
+            )
+            return
+
+        ui.console.print()
+        ui.info(f"Found {len(skill_dirs)} skill(s): {', '.join(d.name for d in skill_dirs)}")
+        ui.console.print()
+
+        _install_skills(skill_dirs, targets)
+    finally:
+        shutil.rmtree(tmp_dir, ignore_errors=True)
+
+
+def _clone_repo(repo: str, dest: Path) -> str | None:
+    """Clone `repo` into `dest`, prompting for auth if the initial attempt fails."""
+    https_url = _to_https_url(repo)
+
+    with ui.spinner(f"Cloning {https_url}..."):
+        result = _git_clone(https_url, dest)
+    if result.returncode == 0:
+        ui.success("Repository cloned.")
+        return https_url
+
+    ui.warn("Could not clone the repository anonymously — it may be private.")
+    auth_method = ui.select(
+        "How would you like to authenticate?",
+        ["SSH key file", "Personal access token", "Abort"],
+    )
+
+    if auth_method == "SSH key file":
+        ssh_key = ui.text_input(
+            "Path to SSH private key file:", default="~/.ssh/id_ed25519", required=True
+        )
+        ssh_key_path = Path(ssh_key).expanduser()
+        if not ssh_key_path.is_file():
+            ui.error(f"No such file: {ssh_key_path}")
+            return None
+
+        ssh_url = _to_ssh_url(repo)
+        env_overrides = {
+            "GIT_SSH_COMMAND": (
+                f"ssh -i {ssh_key_path} -o IdentitiesOnly=yes "
+                f"-o StrictHostKeyChecking=accept-new"
+            )
+        }
+        with ui.spinner(f"Cloning {ssh_url}..."):
+            result = _git_clone(ssh_url, dest, env_overrides=env_overrides)
+        if result.returncode != 0:
+            ui.error("Clone failed with the provided SSH key.")
+            ui.dim(result.stderr.strip()[-500:])
+            return None
+        ui.success("Repository cloned.")
+        return ssh_url
+
+    if auth_method == "Personal access token":
+        token = questionary.password("GitHub personal access token:").ask()
+        if not token:
+            ui.warn("No token provided — aborted.")
+            return None
+        owner_repo = _owner_repo(repo)
+        token_url = f"https://x-access-token:{token}@github.com/{owner_repo}.git"
+        with ui.spinner("Cloning with token..."):
+            result = _git_clone(token_url, dest)
+        if result.returncode != 0:
+            ui.error("Clone failed with the provided token.")
+            ui.dim(result.stderr.strip()[-500:])
+            return None
+        ui.success("Repository cloned.")
+        return https_url  # don't retain the token in the returned URL
+
+    ui.warn("Aborted.")
+    return None
+
+
+def _git_clone(
+    url: str, dest: Path, env_overrides: dict[str, str] | None = None
+) -> subprocess.CompletedProcess:
+    import os
+
+    env = os.environ.copy()
+    if env_overrides:
+        env.update(env_overrides)
+    # dest already exists (mkdtemp); clone into it directly.
+    return subprocess.run(
+        ["git", "clone", "--depth", "1", url, str(dest)],
+        capture_output=True,
+        text=True,
+        env=env,
+    )
+
+
+def _owner_repo(repo: str) -> str:
+    """Normalize 'owner/repo', a full https URL, or an ssh URL to 'owner/repo'."""
+    r = repo.strip()
+    r = r.removeprefix("https://github.com/").removeprefix("git@github.com:")
+    r = r.removesuffix(".git")
+    return r.strip("/")
+
+
+def _to_https_url(repo: str) -> str:
+    if repo.startswith(("http://", "https://", "git@")):
+        return repo
+    return f"https://github.com/{_owner_repo(repo)}.git"
+
+
+def _to_ssh_url(repo: str) -> str:
+    if repo.startswith("git@"):
+        return repo
+    return f"git@github.com:{_owner_repo(repo)}.git"
+
+
+def _discover_skills(repo_dir: Path, repo: str) -> list[Path]:
+    """Return the list of skill directories found in a cloned repo."""
+    skills_root = repo_dir / "skills"
+    if skills_root.is_dir():
+        return sorted(
+            p for p in skills_root.iterdir()
+            if p.is_dir() and not p.name.startswith(".")
+        )
+
+    # No skills/ subdir — if the repo root looks like a single skill, use it.
+    has_content = any(
+        p.name not in (".git",) for p in repo_dir.iterdir()
+    )
+    if not has_content:
+        return []
+
+    name = _owner_repo(repo).split("/")[-1]
+    single = repo_dir.parent / f"_single_skill_{name}"
+    if single.exists():
+        shutil.rmtree(single)
+    shutil.copytree(repo_dir, single, ignore=shutil.ignore_patterns(".git"))
+    return [single]
+
+
+def _install_skills(skill_dirs: list[Path], targets: list[str]) -> None:
+    for target in targets:
+        base = _TARGETS[target]
+        base.mkdir(parents=True, exist_ok=True)
+        for skill_dir in skill_dirs:
+            dest = base / skill_dir.name
+            if dest.exists():
+                if not ui.confirm(
+                    f"'{skill_dir.name}' already exists for {target} — overwrite?",
+                    default=False,
+                ):
+                    ui.dim(f"Skipped {skill_dir.name} for {target}.")
+                    continue
+                shutil.rmtree(dest)
+            shutil.copytree(skill_dir, dest, ignore=shutil.ignore_patterns(".git"))
+            ui.success(f"Installed '{skill_dir.name}' → {dest}")

{devstuff-1.13.1 → devstuff-1.14.0}/uv.lock

@@ -167,7 +167,7 @@ wheels = [
 
 [[package]]
 name = "devstuff"
-version = "1.13.0"
+version = "1.14.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },