path-sync 0.8.0__tar.gz → 0.9.0__tar.gz

{path_sync-0.8.0 → path_sync-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: path-sync
-Version: 0.8.0
+Version: 0.9.0
 Summary: Sync files from a source repo to multiple destination repos
 Author-email: EspenAlbert <espen.albert1@gmail.com>
 License-Expression: MIT
@@ -43,6 +43,7 @@ Sync files from a source repo to multiple destination repos.
 - Files with headers are updated on each sync
 - Remove a header to opt-out (file becomes DEST-owned)
 - Orphaned files (removed from SRC) are deleted in DEST
+- Dest-only extras under dir or glob mappings survive `copy`; `pull --dest-only` harvests them; `prune` deletes them
 - Dest improvements can be harvested back to SRC with `pull` (local working tree only; you commit SRC yourself)
 - Idempotent: PR body is left unchanged when already synced from an equal or newer source commit
 - Stale PRs auto-close when source and destination are already in sync (zero file changes)
@@ -158,7 +159,41 @@ path-sync pull -n cursor -d lz --dest-only -i '.cursor/*'
 
 See also: [pull command reference](docs/pull/index.md).
 
-### 4. Validate (run in dest repo)
+### 4. Prune dest-only files
+
+Delete dest files whose SRC counterpart is missing. Uses the same collect as `pull --dest-only`, then skips opted-out dest files before listing.
+
+The following dest extras differ:
+
+- **copy orphans:** Dest files that still have a path-sync header for this config and are no longer in this copy run. `_cleanup_orphans` deletes them unless `--skip-orphan-cleanup`.
+- **prune dest-only:** Dest files under a dir, glob, or single-file mapping whose SRC counterpart is missing. No header required (`sync_mode: replace` extras such as `.cursor/`). `path-sync prune` unlinks after confirm.
+- **pull dest-only:** Same collect as prune, then copy dest → SRC. Opted-out dest files (`sync_mode: sync`, header removed) stay on dest for prune; pull `--dest-only` can still harvest them.
+
+```bash
+path-sync prune -n myconfig -d dest1
+path-sync prune -n myconfig -d dest1 --dry-run
+path-sync prune -n myconfig -d dest1 -i '.cursor/*'
+```
+
+Unlike `copy`, `prune` never auto-deletes. `--dry-run` and non-TTY list candidates and write nothing.
+
+- **`-d dest`:** Required. Exactly one destination name (not comma-separated).
+- **`--dry-run`:** Print candidates; no prompt; no delete. Non-TTY behaves the same.
+- **`-i`, `--include`:** Allowlist on dest-relative path ([fnmatch](https://docs.python.org/3/library/fnmatch.html); quote globs in zsh).
+- **`-e`, `--exclude`:** Denylist after include (same matcher).
+
+**Dest-only example** (same cursor config as pull):
+
+```bash
+# ../lz/.cursor/rules/bar.mdc exists; SRC has no bar.mdc yet
+path-sync prune -n cursor -d lz
+```
+
+After `copy`, when prune-eligible dest-only files remain, path-sync prints the count plus the pull and prune commands. Copy does not delete them.
+
+See also: [prune command reference](docs/prune/index.md).
+
+### 5. Validate (run in dest repo)
 
 ```bash
 uvx path-sync validate-no-changes -b main

{path_sync-0.8.0 → path_sync-0.9.0}/README.md

@@ -25,6 +25,7 @@ Sync files from a source repo to multiple destination repos.
 - Files with headers are updated on each sync
 - Remove a header to opt-out (file becomes DEST-owned)
 - Orphaned files (removed from SRC) are deleted in DEST
+- Dest-only extras under dir or glob mappings survive `copy`; `pull --dest-only` harvests them; `prune` deletes them
 - Dest improvements can be harvested back to SRC with `pull` (local working tree only; you commit SRC yourself)
 - Idempotent: PR body is left unchanged when already synced from an equal or newer source commit
 - Stale PRs auto-close when source and destination are already in sync (zero file changes)
@@ -140,7 +141,41 @@ path-sync pull -n cursor -d lz --dest-only -i '.cursor/*'
 
 See also: [pull command reference](docs/pull/index.md).
 
-### 4. Validate (run in dest repo)
+### 4. Prune dest-only files
+
+Delete dest files whose SRC counterpart is missing. Uses the same collect as `pull --dest-only`, then skips opted-out dest files before listing.
+
+The following dest extras differ:
+
+- **copy orphans:** Dest files that still have a path-sync header for this config and are no longer in this copy run. `_cleanup_orphans` deletes them unless `--skip-orphan-cleanup`.
+- **prune dest-only:** Dest files under a dir, glob, or single-file mapping whose SRC counterpart is missing. No header required (`sync_mode: replace` extras such as `.cursor/`). `path-sync prune` unlinks after confirm.
+- **pull dest-only:** Same collect as prune, then copy dest → SRC. Opted-out dest files (`sync_mode: sync`, header removed) stay on dest for prune; pull `--dest-only` can still harvest them.
+
+```bash
+path-sync prune -n myconfig -d dest1
+path-sync prune -n myconfig -d dest1 --dry-run
+path-sync prune -n myconfig -d dest1 -i '.cursor/*'
+```
+
+Unlike `copy`, `prune` never auto-deletes. `--dry-run` and non-TTY list candidates and write nothing.
+
+- **`-d dest`:** Required. Exactly one destination name (not comma-separated).
+- **`--dry-run`:** Print candidates; no prompt; no delete. Non-TTY behaves the same.
+- **`-i`, `--include`:** Allowlist on dest-relative path ([fnmatch](https://docs.python.org/3/library/fnmatch.html); quote globs in zsh).
+- **`-e`, `--exclude`:** Denylist after include (same matcher).
+
+**Dest-only example** (same cursor config as pull):
+
+```bash
+# ../lz/.cursor/rules/bar.mdc exists; SRC has no bar.mdc yet
+path-sync prune -n cursor -d lz
+```
+
+After `copy`, when prune-eligible dest-only files remain, path-sync prints the count plus the pull and prune commands. Copy does not delete them.
+
+See also: [prune command reference](docs/prune/index.md).
+
+### 5. Validate (run in dest repo)
 
 ```bash
 uvx path-sync validate-no-changes -b main

{path_sync-0.8.0 → path_sync-0.9.0}/path_sync/__init__.py

@@ -2,14 +2,16 @@
 # flake8: noqa
 from path_sync import copy
 from path_sync import dep_update
+from path_sync import prune
 from path_sync import pull
 from path_sync import validate_no_changes
 from path_sync import config
 
-VERSION = "0.8.0"
+VERSION = "0.9.0"
 __all__ = [
     "copy",
     "dep_update",
+    "prune",
     "pull",
     "validate_no_changes",
     "config",

{path_sync-0.8.0 → path_sync-0.9.0}/path_sync/__main__.py

@@ -1,6 +1,6 @@
 import logging
 
-from path_sync._internal import cmd_boot, cmd_copy, cmd_dep_update, cmd_pull, cmd_validate  # noqa: F401
+from path_sync._internal import cmd_boot, cmd_copy, cmd_dep_update, cmd_prune, cmd_pull, cmd_validate  # noqa: F401
 from path_sync._internal.models import LOG_FORMAT
 from path_sync._internal.typer_app import app
 

{path_sync-0.8.0 → path_sync-0.9.0}/path_sync/_internal/cmd_copy.py

@@ -12,6 +12,7 @@ from pydantic import BaseModel
 from path_sync import sections
 from path_sync._internal import cmd_options, git_ops, header, prompt_utils, verify
 from path_sync._internal.auto_merge import PRRef, handle_auto_merge
+from path_sync._internal.dest_only import collect_dest_only_files, prune_eligible
 from path_sync._internal.file_utils import ensure_parents_write_text
 from path_sync._internal.log_capture import capture_log
 from path_sync._internal.models import (
@@ -273,6 +274,7 @@ def _sync_destination(
         )
     result = _sync_paths(config, dest, src_root, dest_root, opts)
     _print_sync_summary(result)
+    _print_dest_only_hint(config, dest, src_root, dest_root)
 
     if result.total == 0:
         typer.echo("  No changes", err=True)
@@ -316,6 +318,22 @@ def _print_dest_header(dest: Destination) -> None:
     typer.echo(line, err=True)
 
 
+def _print_dest_only_hint(config: SrcConfig, dest: Destination, src_root: Path, dest_root: Path) -> None:
+    if not dest_root.exists() or not git_ops.is_git_repo(dest_root):
+        return
+    dest_repo = git_ops.get_repo(dest_root)
+    files = prune_eligible(collect_dest_only_files(config, dest, src_root, dest_root, dest_repo, set()))
+    if not files:
+        return
+    label = "file" if len(files) == 1 else "files"
+    typer.echo(
+        f"  {len(files)} dest-only {label}. "
+        f"Harvest: path-sync pull -n {config.name} -d {dest.name} --dest-only. "
+        f"Delete: path-sync prune -n {config.name} -d {dest.name}.",
+        err=True,
+    )
+
+
 def _print_sync_summary(result: SyncResult) -> None:
     if result.content_changes > 0:
         typer.echo(f"  [{result.content_changes} files synced]", err=True)

path_sync-0.9.0/path_sync/_internal/cmd_prune.py

@@ -0,0 +1,95 @@
+from __future__ import annotations
+
+import logging
+import sys
+from pathlib import Path
+
+import typer
+from pydantic import BaseModel, Field
+
+from path_sync._internal import git_ops, prompt_utils
+from path_sync._internal.cmd_pull import _EXCLUDE_OPTION, _INCLUDE_OPTION, _keep_pull_path, _validate_dest_name
+from path_sync._internal.dest_only import collect_dest_only_files, prune_eligible
+from path_sync._internal.models import Destination, SrcConfig, find_repo_root, resolve_config_path
+from path_sync._internal.repo_utils import resolve_repo_path
+from path_sync._internal.typer_app import app
+from path_sync._internal.yaml_utils import load_yaml_model
+
+logger = logging.getLogger(__name__)
+
+
+class PruneOptions(BaseModel):
+    dry_run: bool = False
+    include: list[str] = Field(default_factory=list)
+    exclude: list[str] = Field(default_factory=list)
+
+
+def _run_prune(config: SrcConfig, dest: Destination, src_root: Path, opts: PruneOptions) -> None:
+    dest_root = resolve_repo_path(dest, src_root, "")
+    if not git_ops.is_git_repo(dest_root):
+        raise ValueError(f"Not a git repository: {dest_root}")
+
+    dest_repo = git_ops.get_repo(dest_root)
+    files = prune_eligible(collect_dest_only_files(config, dest, src_root, dest_root, dest_repo, set()))
+    files = [
+        row for row in files if _keep_pull_path(str(row.dest_path.relative_to(dest_root)), opts.include, opts.exclude)
+    ]
+
+    if not files:
+        typer.echo("No prune candidates.", err=True)
+        return
+
+    typer.echo(f"\nPrune dest-only files in {dest.name}?\n", err=True)
+    for row in files:
+        typer.echo(str(row.dest_path.relative_to(dest_root)), err=True)
+
+    if opts.dry_run or not sys.stdin.isatty():
+        return
+    if prompt_utils.prompt_pull_confirm("Confirm?"):
+        for row in files:
+            row.dest_path.unlink()
+            logger.info(f"Pruned: {row.dest_path}")
+
+
+@app.command()
+def prune(
+    name: str = typer.Option("", "-n", "--name", help="Config name"),
+    config_path_opt: str = typer.Option("", "-c", "--config-path", help="Full path to config file"),
+    src_root_opt: str = typer.Option("", "--src-root", help="Source repo root"),
+    dest_name: str = typer.Option(..., "-d", "--dest", help="Destination name (exactly one)"),
+    dry_run: bool = typer.Option(False, "--dry-run", help="Print candidates without deleting"),
+    include: list[str] = _INCLUDE_OPTION,
+    exclude: list[str] = _EXCLUDE_OPTION,
+) -> None:
+    """Delete dest-only files after one confirm.
+
+    Quote glob patterns (e.g. -i '.cursor/*').
+    """
+    if name and config_path_opt:
+        logger.error("Cannot use both --name and --config-path")
+        raise typer.Exit(1)
+    if not name and not config_path_opt:
+        logger.error("Either --name or --config-path is required")
+        raise typer.Exit(1)
+
+    try:
+        dest_filter = _validate_dest_name(dest_name)
+    except ValueError as e:
+        logger.error(str(e))
+        raise typer.Exit(1)
+
+    src_root = Path(src_root_opt) if src_root_opt else find_repo_root(Path.cwd())
+    config_path = Path(config_path_opt) if config_path_opt else resolve_config_path(src_root, name)
+    if not config_path.exists():
+        logger.error(f"Config not found: {config_path}")
+        raise typer.Exit(1)
+
+    config = load_yaml_model(config_path, SrcConfig)
+    dest = config.find_destination(dest_filter)
+    opts = PruneOptions(dry_run=dry_run, include=include, exclude=exclude)
+
+    try:
+        _run_prune(config, dest, src_root, opts)
+    except ValueError as e:
+        logger.error(f"Prune failed: {e}")
+        raise typer.Exit(1)

{path_sync-0.8.0 → path_sync-0.9.0}/path_sync/_internal/cmd_pull.py

@@ -7,7 +7,6 @@ from dataclasses import dataclass
 from datetime import UTC, datetime
 from enum import StrEnum
 from pathlib import Path
-from typing import NamedTuple
 
 import typer
 from git import Repo
@@ -16,10 +15,10 @@ from pydantic import BaseModel, Field
 from path_sync import sections
 from path_sync._internal import git_ops, header, prompt_utils
 from path_sync._internal.cmd_copy import _iter_sync_files
+from path_sync._internal.dest_only import DestOnlyFile, collect_dest_only_files, is_opted_out
 from path_sync._internal.file_utils import ensure_parents_write_text
 from path_sync._internal.models import (
     Destination,
-    PathMapping,
     SrcConfig,
     SyncMode,
     find_repo_root,
@@ -49,11 +48,6 @@ class PullOptions(BaseModel):
     exclude: list[str] = Field(default_factory=list)
 
 
-class _DestFileMap(NamedTuple):
-    src_path: Path
-    dest_key: str
-
-
 @dataclass
 class PullCandidate:
     src_path: Path
@@ -90,10 +84,6 @@ def _diff_section_ids(dest_map: dict[str, str], src_map: dict[str, str]) -> list
     return sorted(i for i in ids if dest_map.get(i) != src_map.get(i))
 
 
-def _is_opted_out(dest_text: str, sync_mode: SyncMode) -> bool:
-    return sync_mode == SyncMode.SYNC and not header.has_header(dest_text)
-
-
 def _collect_mapped_candidates(
     config: SrcConfig,
     dest: Destination,
@@ -130,43 +120,17 @@ def _collect_mapped_candidates(
     return candidates
 
 
-def _src_for_dest_file(
-    mapping: PathMapping,
-    dest_path: Path,
-    src_root: Path,
-    dest_root: Path,
-) -> _DestFileMap | None:
-    if "*" in mapping.src_path:
-        glob_prefix = mapping.src_path.split("*")[0].rstrip("/")
-        dest_base = mapping.dest_path or glob_prefix
-        src_base = glob_prefix
-    elif (dest_root / mapping.resolved_dest_path()).is_dir():
-        dest_base = mapping.resolved_dest_path()
-        src_base = mapping.src_path
-    elif dest_path == dest_root / mapping.resolved_dest_path():
-        dest_base = mapping.resolved_dest_path()
-        return _DestFileMap(src_root / mapping.src_path, dest_base)
-    else:
-        return None
-
-    dest_anchor = dest_root / dest_base
-    if dest_path.is_relative_to(dest_anchor):
-        rel = dest_path.relative_to(dest_anchor)
-        return _DestFileMap(src_root / src_base / rel, str(Path(dest_base) / rel))
-    return None
-
-
-def _dest_only_candidate(src_path: Path, dest_path: Path, dest_key: str) -> PullCandidate:
+def _dest_only_candidate(row: DestOnlyFile) -> PullCandidate:
     try:
-        dest_path.read_text()
+        row.dest_path.read_text()
     except UnicodeDecodeError:
         kind = PullKind.BINARY
     else:
         kind = PullKind.WHOLE
     return PullCandidate(
-        src_path=src_path,
-        dest_path=dest_path,
-        dest_key=dest_key,
+        src_path=row.src_path,
+        dest_path=row.dest_path,
+        dest_key=row.dest_key,
         kind=kind,
         section_ids=[],
         dest_ts=None,
@@ -184,25 +148,10 @@ def _collect_dest_only_candidates(
     dest_repo: Repo,
     skip_keys: set[str],
 ) -> list[PullCandidate]:
-    candidates: list[PullCandidate] = []
-    seen = set(skip_keys)
-    for mapping in config.resolve_paths(dest):
-        if mapping.sync_mode == SyncMode.SCAFFOLD:
-            continue
-        for dest_path in mapping.expand_dest_paths(dest_root):
-            if dest_path.is_dir() or mapping.is_excluded(dest_path):
-                continue
-            mapped = _src_for_dest_file(mapping, dest_path, src_root, dest_root)
-            if mapped is None:
-                continue
-            if dest.is_skipped(mapped.dest_key) or mapped.src_path.exists() or mapped.dest_key in seen:
-                continue
-            if git_ops.path_is_tracked_dirty(dest_repo, dest_path):
-                logger.warning(f"Skipping dirty dest path: {dest_path}")
-                continue
-            seen.add(mapped.dest_key)
-            candidates.append(_dest_only_candidate(mapped.src_path, dest_path, mapped.dest_key))
-    return candidates
+    return [
+        _dest_only_candidate(row)
+        for row in collect_dest_only_files(config, dest, src_root, dest_root, dest_repo, skip_keys)
+    ]
 
 
 def _text_pull_kind(
@@ -213,7 +162,7 @@ def _text_pull_kind(
     sync_mode: SyncMode,
     skip_list: list[str],
 ) -> tuple[PullKind, list[str]] | None:
-    if _is_opted_out(dest_text, sync_mode):
+    if is_opted_out(dest_text, sync_mode):
         return None
 
     dest_body = header.remove_header(dest_text)

path_sync-0.9.0/path_sync/_internal/dest_only.py

@@ -0,0 +1,102 @@
+from __future__ import annotations
+
+import logging
+from pathlib import Path
+from typing import NamedTuple
+
+from git import Repo
+
+from path_sync._internal import git_ops, header
+from path_sync._internal.models import Destination, PathMapping, SrcConfig, SyncMode
+
+logger = logging.getLogger(__name__)
+
+
+class DestOnlyFile(NamedTuple):
+    src_path: Path
+    dest_path: Path
+    dest_key: str
+    sync_mode: SyncMode
+
+
+class _DestFileMap(NamedTuple):
+    src_path: Path
+    dest_key: str
+
+
+def is_opted_out(dest_text: str, sync_mode: SyncMode) -> bool:
+    return sync_mode == SyncMode.SYNC and not header.has_header(dest_text)
+
+
+def prune_eligible(files: list[DestOnlyFile]) -> list[DestOnlyFile]:
+    eligible: list[DestOnlyFile] = []
+    for row in files:
+        try:
+            dest_text = row.dest_path.read_text()
+        except UnicodeDecodeError:
+            continue
+        if not is_opted_out(dest_text, row.sync_mode):
+            eligible.append(row)
+    return eligible
+
+
+def _src_for_dest_file(
+    mapping: PathMapping,
+    dest_path: Path,
+    src_root: Path,
+    dest_root: Path,
+) -> _DestFileMap | None:
+    if "*" in mapping.src_path:
+        glob_prefix = mapping.src_path.split("*")[0].rstrip("/")
+        dest_base = mapping.dest_path or glob_prefix
+        src_base = glob_prefix
+    elif (dest_root / mapping.resolved_dest_path()).is_dir():
+        dest_base = mapping.resolved_dest_path()
+        src_base = mapping.src_path
+    elif dest_path == dest_root / mapping.resolved_dest_path():
+        dest_base = mapping.resolved_dest_path()
+        return _DestFileMap(src_root / mapping.src_path, dest_base)
+    else:
+        return None
+
+    dest_anchor = dest_root / dest_base
+    if dest_path.is_relative_to(dest_anchor):
+        rel = dest_path.relative_to(dest_anchor)
+        return _DestFileMap(src_root / src_base / rel, str(Path(dest_base) / rel))
+    return None
+
+
+def collect_dest_only_files(
+    config: SrcConfig,
+    dest: Destination,
+    src_root: Path,
+    dest_root: Path,
+    dest_repo: Repo,
+    skip_keys: set[str],
+) -> list[DestOnlyFile]:
+    files: list[DestOnlyFile] = []
+    seen = set(skip_keys)
+    for mapping in config.resolve_paths(dest):
+        if mapping.sync_mode == SyncMode.SCAFFOLD:
+            continue
+        for dest_path in mapping.expand_dest_paths(dest_root):
+            if dest_path.is_dir() or mapping.is_excluded(dest_path):
+                continue
+            mapped = _src_for_dest_file(mapping, dest_path, src_root, dest_root)
+            if mapped is None:
+                continue
+            if dest.is_skipped(mapped.dest_key) or mapped.src_path.exists() or mapped.dest_key in seen:
+                continue
+            if git_ops.path_is_tracked_dirty(dest_repo, dest_path):
+                logger.warning(f"Skipping dirty dest path: {dest_path}")
+                continue
+            seen.add(mapped.dest_key)
+            files.append(
+                DestOnlyFile(
+                    src_path=mapped.src_path,
+                    dest_path=dest_path,
+                    dest_key=mapped.dest_key,
+                    sync_mode=mapping.sync_mode,
+                )
+            )
+    return files

path_sync-0.9.0/path_sync/prune.py

@@ -0,0 +1,4 @@
+# Generated by pkg-ext
+from path_sync._internal.cmd_prune import prune as _prune
+
+prune = _prune

{path_sync-0.8.0 → path_sync-0.9.0}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "path-sync"
-version = "0.8.0"
+version = "0.9.0"
 description = "Sync files from a source repo to multiple destination repos"
 requires-python = ">=3.13"
 license = "MIT"
@@ -69,13 +69,6 @@ target-version = "py313"
 # UP047: use type parameters instead of `Generic[T]` subclass
 extend-ignore = ["E501", "UP006", "UP007", "UP035", "UP040", "UP046", "UP047"]
 extend-select = ["Q", "RUF100", "C90", "UP", "I", "T", "FURB"]
-
-[tool.ruff.lint.flake8-bugbear]
-extend-immutable-calls = ["typer.Option", "typer.Argument"]
-
-[tool.ruff.format]
-# pytest-examples print prefix is `#>`; ruff 0.16 markdown format turns that into `# >`
-exclude = ["docs/examples/**"]
 # === OK_EDIT: path-sync ruff ===
 
 # === DO_NOT_EDIT: path-sync pytest ===
@@ -102,7 +95,7 @@ exclude = [".venv/", "*test.py"]
 # === DO_NOT_EDIT: path-sync dev-lint ===
 [dependency-groups]
 dev-lint = [
-  "ty==0.0.76",
+  "pyright>=1.1",
   "ruff>=0.14",
   "vulture>=2.14",
 ]