pdd-cli 0.0.240__tar.gz → 0.0.241__tar.gz

{pdd_cli-0.0.240/pdd_cli.egg-info → pdd_cli-0.0.241}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdd-cli
-Version: 0.0.240
+Version: 0.0.241
 Summary: PDD (Prompt-Driven Development) Command Line Interface
 Author: Greg Tanaka
 Author-email: glt@alumni.caltech.edu
@@ -66,7 +66,7 @@ Requires-Dist: twine; extra == "dev"
 Requires-Dist: httpx==0.28.1; extra == "dev"
 Dynamic: license-file
 
-.. image:: https://img.shields.io/badge/pdd--cli-v0.0.240-blue
+.. image:: https://img.shields.io/badge/pdd--cli-v0.0.241-blue
    :alt: PDD-CLI Version
 
 .. image:: https://img.shields.io/badge/Discord-join%20chat-7289DA.svg?logo=discord&logoColor=white&link=https://discord.gg/Yp4RTh8bG7
@@ -143,7 +143,7 @@ After installation, verify:
 
    pdd --version
 
-You'll see the current PDD version (e.g., 0.0.240).
+You'll see the current PDD version (e.g., 0.0.241).
 
 Getting Started with Examples
 -----------------------------

{pdd_cli-0.0.240 → pdd_cli-0.0.241}/README.md

@@ -1,6 +1,6 @@
 # PDD (Prompt-Driven Development) Command Line Interface
 
-![PDD-CLI Version](https://img.shields.io/badge/pdd--cli-v0.0.240-blue) [![Discord](https://img.shields.io/badge/Discord-join%20chat-7289DA.svg?logo=discord&logoColor=white)](https://discord.gg/Yp4RTh8bG7)
+![PDD-CLI Version](https://img.shields.io/badge/pdd--cli-v0.0.241-blue) [![Discord](https://img.shields.io/badge/Discord-join%20chat-7289DA.svg?logo=discord&logoColor=white)](https://discord.gg/Yp4RTh8bG7)
 
 ## Introduction
 
@@ -362,7 +362,7 @@ For proper model identifiers to use in your custom configuration, refer to the [
 
 ## Version
 
-Current version: 0.0.240
+Current version: 0.0.241
 
 To check your installed version, run:
 ```

{pdd_cli-0.0.240 → pdd_cli-0.0.241}/pdd/ci_drift_heal.py

@@ -18,7 +18,7 @@ import subprocess
 import sys
 import tempfile
 from dataclasses import dataclass
-from pathlib import Path
+from pathlib import Path, PurePosixPath
 from typing import Any, Dict, List, Optional, Sequence, Set, Tuple
 
 from rich.console import Console
@@ -918,23 +918,90 @@ def _healed_module_file_relpaths(module: Any, repo_root: Path) -> List[str]:
     return relpaths
 
 
+def _has_symlinked_ancestor(rel: str, repo_root: Path) -> bool:
+    """Return True if any directory ancestor of ``rel`` under ``repo_root`` is a symlink.
+
+    ``git add`` refuses pathspecs whose ancestor directory is a symlink ("pathspec
+    'X' is beyond a symbolic link"). When ``_git_relative_path_candidates`` returns
+    both the symlinked form (e.g. ``prompts/foo.prompt`` via ``prompts -> pdd/prompts``)
+    and the canonical form (``pdd/prompts/foo.prompt``) for the same source path,
+    the symlinked form will fail staging. Dropping it lets the canonical form get
+    staged instead.
+    """
+    parts = PurePosixPath(rel).parts
+    if len(parts) <= 1:
+        return False
+    cur = repo_root
+    for part in parts[:-1]:
+        cur = cur / part
+        try:
+            if cur.is_symlink():
+                return True
+        except OSError:
+            return False
+    return False
+
+
 def _git_add_pathspecs(pathspecs: Sequence[str], cwd: Optional[Path] = None) -> bool:
     """Stage existing pathspecs with an explicit git-add call.
 
-    Filters out paths that ``.gitignore`` excludes before invoking ``git add``
-    — otherwise Git refuses the whole batch with "paths are ignored", aborting
-    an otherwise-successful heal commit. Examples include per-run reports
-    under ``.pdd/meta/*_run.json``, which the repo intentionally ignores but
-    which appear in the healed module's metadata pathspecs.
+    Two filters run **before** ``git add`` and **before** ``git check-ignore``:
+
+    1. **Symlink-traversal filter.** Drops pathspecs whose ancestor directory is
+       a symlink (e.g. the repo-root ``prompts -> pdd/prompts`` shim). Recent
+       Git fatals on such paths with "pathspec 'X' is beyond a symbolic link" —
+       and that fatal hits ``git check-ignore`` first, not just ``git add``, so
+       the symlink filter MUST run before any git invocation. The canonical
+       form is normally also present in the list because
+       ``_git_relative_path_candidates`` returns both shapes.
+
+    2. **Gitignore filter.** Run ``git check-ignore`` on the symlink-free
+       survivors so we know which paths to skip — otherwise ``git add`` refuses
+       the whole batch with "paths are ignored" (e.g. per-run reports under
+       ``.pdd/meta/*_run.json``), aborting an otherwise-successful heal commit.
+
+    Returns True on success or on a "nothing to stage" no-op. Returns False
+    only if ``git add`` itself fails after filters have been applied. Emits a
+    warning (not a hard failure) if all input paths get filtered out, since
+    silent drops are observable here but would be invisible at the caller.
     """
+    repo_root = (cwd or Path.cwd()).resolve()
     existing = [rel for rel in pathspecs if (cwd or Path.cwd()).joinpath(rel).exists()]
     if not existing:
         return True
 
+    # Filter 1: symlink-traversal. Must come BEFORE check-ignore — git's
+    # "beyond a symbolic link" fatal applies to check-ignore too, not just to
+    # `git add`. If the symlink filter ran after check-ignore, a mixed batch
+    # would lose its ignore information when check-ignore fatals on the
+    # symlinked entry, and ignored paths would then leak through to `git add`
+    # (which would refuse the whole batch). Invariant:
+    # `_git_relative_path_candidates` emits both the symlinked and the
+    # canonical form for any source that traverses a symlinked ancestor, so
+    # dropping the symlinked form here loses nothing.
+    symlinked = {rel for rel in existing if _has_symlinked_ancestor(rel, repo_root)}
+    if symlinked:
+        console.print(
+            f"[dim]ci-heal: skipping symlink-traversal paths during stage: "
+            f"{sorted(symlinked)}[/dim]"
+        )
+    survivors = [rel for rel in existing if rel not in symlinked]
+    if not survivors:
+        # Every input went through a symlinked ancestor and was dropped.
+        # That's almost certainly a caller bug (the canonical form was not
+        # supplied alongside), so make it observable.
+        console.print(
+            f"[yellow]ci-heal: every input pathspec was dropped as symlink-traversal "
+            f"({sorted(symlinked)}); nothing staged. Caller should also pass the "
+            f"canonical (resolved) form for these paths.[/yellow]"
+        )
+        return True
+
+    # Filter 2: gitignore.
     ignored: Set[str] = set()
     try:
         rc_check = subprocess.run(
-            ["git", "check-ignore", "--", *existing],
+            ["git", "check-ignore", "--", *survivors],
             cwd=cwd,
             capture_output=True,
             text=True,
@@ -959,7 +1026,7 @@ def _git_add_pathspecs(pathspecs: Sequence[str], cwd: Optional[Path] = None) ->
             f"{sorted(ignored)}[/dim]"
         )
 
-    stageable = [rel for rel in existing if rel not in ignored]
+    stageable = [rel for rel in survivors if rel not in ignored]
     if not stageable:
         return True
 

{pdd_cli-0.0.240 → pdd_cli-0.0.241}/pdd/pdd_completion.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # PDD CLI Bash Completion Script
-# Version: 0.0.240
+# Version: 0.0.241
 # Supports all PDD commands and options with filename completion
 
 _pdd() {

{pdd_cli-0.0.240 → pdd_cli-0.0.241/pdd_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdd-cli
-Version: 0.0.240
+Version: 0.0.241
 Summary: PDD (Prompt-Driven Development) Command Line Interface
 Author: Greg Tanaka
 Author-email: glt@alumni.caltech.edu
@@ -66,7 +66,7 @@ Requires-Dist: twine; extra == "dev"
 Requires-Dist: httpx==0.28.1; extra == "dev"
 Dynamic: license-file
 
-.. image:: https://img.shields.io/badge/pdd--cli-v0.0.240-blue
+.. image:: https://img.shields.io/badge/pdd--cli-v0.0.241-blue
    :alt: PDD-CLI Version
 
 .. image:: https://img.shields.io/badge/Discord-join%20chat-7289DA.svg?logo=discord&logoColor=white&link=https://discord.gg/Yp4RTh8bG7
@@ -143,7 +143,7 @@ After installation, verify:
 
    pdd --version
 
-You'll see the current PDD version (e.g., 0.0.240).
+You'll see the current PDD version (e.g., 0.0.241).
 
 Getting Started with Examples
 -----------------------------

{pdd_cli-0.0.240 → pdd_cli-0.0.241}/pypi_description.rst

@@ -1,4 +1,4 @@
-.. image:: https://img.shields.io/badge/pdd--cli-v0.0.240-blue
+.. image:: https://img.shields.io/badge/pdd--cli-v0.0.241-blue
    :alt: PDD-CLI Version
 
 .. image:: https://img.shields.io/badge/Discord-join%20chat-7289DA.svg?logo=discord&logoColor=white&link=https://discord.gg/Yp4RTh8bG7
@@ -75,7 +75,7 @@ After installation, verify:
 
    pdd --version
 
-You'll see the current PDD version (e.g., 0.0.240).
+You'll see the current PDD version (e.g., 0.0.241).
 
 Getting Started with Examples
 -----------------------------

{pdd_cli-0.0.240 → pdd_cli-0.0.241}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pdd-cli"
-version = "0.0.240"
+version = "0.0.241"
 description = "PDD (Prompt-Driven Development) Command Line Interface"
 readme = {file = "pypi_description.rst", content-type = "text/x-rst"}
 authors = [
@@ -132,7 +132,7 @@ filterwarnings = [
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.0.240"
+version = "0.0.241"
 tag_format = "v$version"
 version_files = [
     "pyproject.toml:version",

{pdd_cli-0.0.240 → pdd_cli-0.0.241}/tests/test_ci_drift_heal.py

@@ -14,7 +14,9 @@ from pdd.ci_drift_heal import (
     PromptRevertError,
     _AUTO_HEAL_SUCCESS_TRAILER,
     _capture_rollback_state,
+    _git_add_pathspecs,
     _git_relative_path_candidates,
+    _has_symlinked_ancestor,
     _run_pdd_command,
     _get_git_changed_files,
     detect_drift,
@@ -163,14 +165,39 @@ class TestDetectDrift:
         assert len(example_drifts) == 0
 
     def test_pr_touched_metadata_modules_are_not_left_in_drift(self):
-        """Regression guard for PR metadata churn on long-running modules."""
-        prompt_drifts, example_drifts = detect_drift(
-            modules=[
-                "metadata_sync",
-                "agentic_change_orchestrator",
-                "ci_drift_heal",
-            ]
-        )
+        """Regression guard for PR metadata churn on long-running modules.
+
+        Isolates from the developer's working-tree state. Without isolation
+        this test breaks any time someone has an in-flight edit to one of
+        the listed modules (operation: 'verify' fires from
+        sync_determine_operation, lands in example_drifts, assert fails).
+        That breakage is the kind of false positive the auto-heal CI cycle
+        is supposed to catch and resolve, not a unit test.
+        """
+        modules = [
+            "metadata_sync",
+            "agentic_change_orchestrator",
+            "ci_drift_heal",
+        ]
+        # Pretend sync_determine_operation reports no work for these
+        # modules. The test then verifies detect_drift correctly maps
+        # "nothing to do" → empty drift lists for these specific modules
+        # (no module-name-based special casing that would re-flag them).
+        no_op = MagicMock(operation="nothing", reason="clean")
+        files = [Path(f"prompts/{bn}_python.prompt") for bn in modules]
+
+        def fake_infer(path):
+            stem = Path(path).stem
+            base, _, lang = stem.rpartition("_")
+            return base, lang
+
+        def fake_sync(basename, language, target_coverage, log_mode):
+            return no_op
+
+        with patch("pdd.user_story_tests.discover_prompt_files", return_value=files), \
+             patch("pdd.operation_log.infer_module_identity", side_effect=fake_infer), \
+             patch("pdd.sync_determine_operation.sync_determine_operation", side_effect=fake_sync):
+            prompt_drifts, example_drifts = detect_drift(modules=modules)
 
         assert prompt_drifts == []
         assert example_drifts == []
@@ -285,6 +312,213 @@ class TestGetGitChangedFiles:
         assert "pdd/prompts/auth_python.prompt" in candidates
 
 
+# ---------------------------------------------------------------------------
+# _has_symlinked_ancestor / _git_add_pathspecs symlink-staging tests
+# ---------------------------------------------------------------------------
+
+
+class TestSymlinkStaging:
+    """Regression: auto-heal must not pass symlink-traversal pathspecs to git add.
+
+    `_git_relative_path_candidates` returns both the symlinked form
+    (e.g. ``prompts/foo.prompt`` via a tracked ``prompts -> pdd/prompts`` shim)
+    and the canonical form (``pdd/prompts/foo.prompt``) for the same source.
+    Newer Git refuses the symlinked form with
+    ``pathspec 'prompts/foo.prompt' is beyond a symbolic link``, which kills
+    the whole heal commit. The fix drops symlink-traversal paths at the
+    staging boundary so the canonical form (always also in the list) wins.
+    """
+
+    def _make_symlink_repo(self, tmp_path: Path) -> Path:
+        """Set up a fake repo where ``prompts -> pdd/prompts``."""
+        (tmp_path / "pdd" / "prompts").mkdir(parents=True)
+        (tmp_path / "prompts").symlink_to("pdd/prompts")
+        (tmp_path / "pdd" / "prompts" / "foo.prompt").write_text("% prompt", encoding="utf-8")
+        return tmp_path
+
+    def test_has_symlinked_ancestor_detects_symlinked_dir(self, tmp_path):
+        self._make_symlink_repo(tmp_path)
+        assert _has_symlinked_ancestor("prompts/foo.prompt", tmp_path) is True
+        assert _has_symlinked_ancestor("pdd/prompts/foo.prompt", tmp_path) is False
+        # Trivial top-level files have no ancestor to traverse.
+        assert _has_symlinked_ancestor("foo.prompt", tmp_path) is False
+
+    def test_git_add_pathspecs_drops_symlinked_form(self, tmp_path):
+        """When both forms of a symlinked path are passed, only the canonical
+        form reaches `git add`; the symlinked form is dropped."""
+        self._make_symlink_repo(tmp_path)
+
+        captured: dict = {}
+
+        def fake_run(cmd, **kwargs):
+            captured.setdefault("calls", []).append(list(cmd))
+            # check-ignore: pretend none are ignored
+            if cmd[:2] == ["git", "check-ignore"]:
+                return MagicMock(returncode=1, stdout="", stderr="")
+            # git add: succeed
+            if cmd[:2] == ["git", "add"]:
+                return MagicMock(returncode=0, stdout="", stderr="")
+            return MagicMock(returncode=0, stdout="", stderr="")
+
+        with patch("pdd.ci_drift_heal.subprocess.run", side_effect=fake_run):
+            ok = _git_add_pathspecs(
+                ["prompts/foo.prompt", "pdd/prompts/foo.prompt"],
+                cwd=tmp_path,
+            )
+
+        assert ok is True
+        add_calls = [c for c in captured["calls"] if c[:2] == ["git", "add"]]
+        assert len(add_calls) == 1, f"expected one git add call, got {add_calls}"
+        staged = add_calls[0][add_calls[0].index("--") + 1 :]
+        assert "pdd/prompts/foo.prompt" in staged
+        assert "prompts/foo.prompt" not in staged, (
+            "symlinked-ancestor path must be filtered before git add"
+        )
+
+    def test_git_add_pathspecs_unchanged_without_symlink(self, tmp_path):
+        """No symlinks in the repo → no filtering, behaviour matches the
+        original (gitignore-only) filter path."""
+        (tmp_path / "pdd").mkdir()
+        (tmp_path / "pdd" / "foo.py").write_text("# foo", encoding="utf-8")
+
+        captured: dict = {}
+
+        def fake_run(cmd, **kwargs):
+            captured.setdefault("calls", []).append(list(cmd))
+            if cmd[:2] == ["git", "check-ignore"]:
+                return MagicMock(returncode=1, stdout="", stderr="")
+            if cmd[:2] == ["git", "add"]:
+                return MagicMock(returncode=0, stdout="", stderr="")
+            return MagicMock(returncode=0, stdout="", stderr="")
+
+        with patch("pdd.ci_drift_heal.subprocess.run", side_effect=fake_run):
+            ok = _git_add_pathspecs(["pdd/foo.py"], cwd=tmp_path)
+
+        assert ok is True
+        add_calls = [c for c in captured["calls"] if c[:2] == ["git", "add"]]
+        assert len(add_calls) == 1
+        staged = add_calls[0][add_calls[0].index("--") + 1 :]
+        assert staged == ["pdd/foo.py"]
+
+
+class TestSymlinkStagingRealGit:
+    """Integration tests that exercise the *real* git binary, no subprocess mocking.
+
+    The mocked tests above prove the helper builds the right ``git add`` argv.
+    These tests prove the helper survives the actual git fatals that the
+    auto-heal CI Cloud Build hit in production — specifically that
+    ``git check-ignore`` ALSO refuses pathspecs whose ancestor is a symlink
+    ("pathspec 'X' is beyond a symbolic link", exit 128), so a filter that
+    only runs after ``check-ignore`` is too late.
+
+    Regression for the mixed-batch case the reviewer of PR #1048 surfaced:
+    when ``prompts/foo.prompt`` (via symlink) and ``pdd/meta/foo_run.json``
+    (gitignored) appear in the same batch, naive ordering loses the ignore
+    info to a check-ignore fatal and the heal commit blows up at ``git add``.
+    """
+
+    def _init_repo(self, tmp_path: Path) -> None:
+        """Build a tmp git repo with the exact shape that triggers the bug.
+
+        - ``prompts/`` is a tracked symlink to ``pdd/prompts/``.
+        - ``.gitignore`` excludes ``*_run.json``.
+        - One file exists under each: a prompt under ``pdd/prompts/`` and an
+          ignored metadata file under ``pdd/meta/``.
+        """
+        subprocess.run(["git", "init", "-q"], cwd=tmp_path, check=True)
+        subprocess.run(
+            ["git", "config", "user.email", "test@example.com"],
+            cwd=tmp_path,
+            check=True,
+        )
+        subprocess.run(
+            ["git", "config", "user.name", "test"], cwd=tmp_path, check=True
+        )
+        (tmp_path / "pdd" / "prompts").mkdir(parents=True)
+        (tmp_path / "pdd" / "meta").mkdir(parents=True)
+        (tmp_path / "prompts").symlink_to("pdd/prompts")
+        (tmp_path / "pdd" / "prompts" / "foo.prompt").write_text("% prompt\n", encoding="utf-8")
+        (tmp_path / ".gitignore").write_text("*_run.json\n", encoding="utf-8")
+        (tmp_path / "pdd" / "meta" / "foo_run.json").write_text("{}\n", encoding="utf-8")
+        subprocess.run(["git", "add", ".gitignore", "prompts"], cwd=tmp_path, check=True)
+        subprocess.run(
+            ["git", "commit", "-q", "-m", "init"], cwd=tmp_path, check=True
+        )
+
+    def test_mixed_batch_with_symlink_and_ignored_path(self, tmp_path):
+        """Reviewer-of-#1048's exact reproducer: mixed batch including a
+        symlinked path AND a gitignored path. ``check-ignore`` fatals on the
+        symlinked path; if the symlink filter runs too late, the ignore info
+        is lost and ``git add`` refuses the batch."""
+        self._init_repo(tmp_path)
+
+        ok = _git_add_pathspecs(
+            [
+                "prompts/foo.prompt",  # symlinked form — fatals on check-ignore
+                "pdd/prompts/foo.prompt",  # canonical form — must stage cleanly
+                "pdd/meta/foo_run.json",  # gitignored — must NOT reach git add
+            ],
+            cwd=tmp_path,
+        )
+        assert ok is True, (
+            "helper must return True; symlink filter must run before "
+            "check-ignore so the ignore info isn't lost"
+        )
+
+        # Confirm the right path actually landed in the index.
+        status = subprocess.run(
+            ["git", "status", "--porcelain"],
+            cwd=tmp_path,
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        staged_lines = [line for line in status.stdout.splitlines() if line.startswith("A ")]
+        assert any("pdd/prompts/foo.prompt" in line for line in staged_lines), (
+            f"canonical prompt path must be staged; got {status.stdout!r}"
+        )
+        assert not any("foo_run.json" in line for line in staged_lines), (
+            f"gitignored path must not be staged; got {status.stdout!r}"
+        )
+
+    def test_canonical_only_batch_still_works(self, tmp_path):
+        """Sanity: when the caller passes only the canonical form (no
+        symlinked twin), the helper still stages correctly."""
+        self._init_repo(tmp_path)
+
+        ok = _git_add_pathspecs(
+            ["pdd/prompts/foo.prompt", "pdd/meta/foo_run.json"],
+            cwd=tmp_path,
+        )
+        assert ok is True
+
+    def test_symlinked_only_batch_warns_and_no_ops(self, tmp_path):
+        """Defensive log path: if the caller passes ONLY a symlinked path
+        (no canonical twin), the helper should not stage anything but must
+        return True (so the heal commit isn't crashed by a silent miss)."""
+        self._init_repo(tmp_path)
+
+        ok = _git_add_pathspecs(
+            ["prompts/foo.prompt"],  # only the symlinked form
+            cwd=tmp_path,
+        )
+        # Returning True here is intentional: the caller (auto-heal) typically
+        # has both forms in the candidate list; if it only has the symlinked
+        # form, that's a caller bug we want surfaced via the warning log, not
+        # a False return that aborts an otherwise-successful heal commit.
+        assert ok is True
+
+        # Nothing should be staged.
+        status = subprocess.run(
+            ["git", "status", "--porcelain"],
+            cwd=tmp_path,
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        assert "A " not in status.stdout
+
+
 # ---------------------------------------------------------------------------
 # detect_drift with diff_base (git-based reclassification) tests
 # ---------------------------------------------------------------------------