contextzip 0.4.4__tar.gz → 0.4.5__tar.gz

{contextzip-0.4.4 → contextzip-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: contextzip
-Version: 0.4.4
+Version: 0.4.5
 Summary: Intelligently package your codebase for AI tools
 Author-email: Deepesh <akadeepesh@gmail.com>
 License-Expression: MIT
@@ -27,7 +27,11 @@ Requires-Dist: pathspec>=0.12
 Requires-Dist: httpx>=0.27
 Dynamic: license-file
 
-<img width="1536" height="1024" alt="cz" src="https://github.com/user-attachments/assets/a930b49c-34a0-447b-8f3a-1909eae977c8" />
+
+
+https://github.com/user-attachments/assets/91913ad6-6161-430d-9075-b0fa76498021
+
+<!-- <img width="1536" height="1024" alt="cz" src="https://github.com/user-attachments/assets/a930b49c-34a0-447b-8f3a-1909eae977c8" /> -->
 
 # contextzip
 

{contextzip-0.4.4 → contextzip-0.4.5}/README.md

@@ -1,4 +1,8 @@
-<img width="1536" height="1024" alt="cz" src="https://github.com/user-attachments/assets/a930b49c-34a0-447b-8f3a-1909eae977c8" />
+
+
+https://github.com/user-attachments/assets/91913ad6-6161-430d-9075-b0fa76498021
+
+<!-- <img width="1536" height="1024" alt="cz" src="https://github.com/user-attachments/assets/a930b49c-34a0-447b-8f3a-1909eae977c8" /> -->
 
 # contextzip
 

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip/__init__.py

@@ -1,6 +1,6 @@
 """contextzip — intelligent codebase packager for AI tools."""
 
-__version__ = "0.4.4"
+__version__ = "0.4.5"
 
 from contextzip.api import (
     FileCollection,

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip/api.py

@@ -43,12 +43,15 @@ from contextzip.applier import ApplyResult
 from contextzip.detector import DetectionResult, detect
 from contextzip.filters import (
     ResolveResult,
+    build_force_include_spec,
     build_spec,
+    normalize_pattern,
     resolve_files,
     resolve_files_from_git,
 )
 from contextzip.git import GitError, GitErrorKind, get_changed_files
 from contextzip.packager import PackageResult, create_zip_silent
+from contextzip.project_config import load_project_config
 
 
 # ---------------------------------------------------------------------------
@@ -139,19 +142,27 @@ class ZipNotFoundError(ContextzipError):
 
 def get_git_changes(
     path: str | Path | None = None,
+    *,
+    use_project_config: bool = True,
 ) -> FileCollection:
     """
     Return the files that git reports as modified, added, or untracked.
 
     The git root is found automatically by walking up from *path* (or the
     current working directory). Files are filtered through contextzip's base
-    safety rules so secrets, binaries, and similar files are always excluded.
+    safety rules so secrets, binaries, and similar files are always excluded,
+    and through the project's ``.contextzip/config.json``
+    (``always_include`` / ``always_exclude`` / ``limits``) — the same as the
+    CLI's ``--git-changes``.
 
     Parameters
     ----------
     path:
         Directory to start from. Defaults to ``Path.cwd()``. The actual
         git root may be a parent of this directory.
+    use_project_config:
+        Apply the project's ``.contextzip/config.json``. Defaults to
+        ``True``; pass ``False`` to use only the built-in rules.
 
     Returns
     -------
@@ -192,9 +203,12 @@ def get_git_changes(
     if git_result.is_empty:
         return FileCollection(project_dir=project_dir)
 
+    cfg = load_project_config(project_dir) if use_project_config else None
+
     resolved = resolve_files_from_git(
         git_files=git_result.files,
         project_dir=project_dir,
+        **_config_kwargs(cfg),
     )
 
     detection = detect(project_dir)
@@ -212,6 +226,7 @@ def get_files(
     include: list[str] | None = None,
     exclude: list[str] | None = None,
     use_gitignore: bool = True,
+    use_project_config: bool = True,
 ) -> FileCollection:
     """
     Return all project files after applying contextzip's standard exclusion rules.
@@ -229,6 +244,11 @@ def get_files(
     use_gitignore:
         Whether to apply the project's ``.gitignore`` file.
         Defaults to ``True``.
+    use_project_config:
+        Apply the project's ``.contextzip/config.json`` (``always_include``,
+        ``always_exclude``, ``limits``), the same as the CLI. Defaults to
+        ``True``; pass ``False`` to use only the built-in rules and the
+        arguments above.
 
     Returns
     -------
@@ -256,9 +276,12 @@ def get_files(
 
     gitignore_path = (project_dir / ".gitignore") if use_gitignore else None
 
+    cfg = load_project_config(project_dir) if use_project_config else None
+    cfg_kwargs = _config_kwargs(cfg, extra_exclude=exclude)
+
     spec = build_spec(
         rule_modules=detection.rule_modules,
-        extra_exclude=exclude or None,
+        extra_exclude=cfg_kwargs["extra_exclude"],
         gitignore_path=gitignore_path,
     )
 
@@ -266,6 +289,8 @@ def get_files(
         project_dir=project_dir,
         spec=spec,
         include_only=include or None,
+        force_include=cfg_kwargs["force_include"],
+        large_file_warn_bytes=cfg_kwargs["large_file_warn_bytes"],
     )
 
     return _resolve_result_to_collection(resolved, project_dir, detection)
@@ -447,6 +472,31 @@ def detect_ecosystem(
 # ---------------------------------------------------------------------------
 
 
+def _config_kwargs(cfg, extra_exclude: list[str] | None = None) -> dict:
+    """
+    Translate a ProjectConfig (or None) into the shared filter inputs:
+    extra_exclude (caller patterns + always_exclude), force_include
+    (always_include) and large_file_warn_bytes (limits.max_file_size_mb).
+    """
+    from contextzip.filters import LARGE_FILE_WARN_BYTES
+
+    patterns = [normalize_pattern(p) for p in extra_exclude or []]
+    if cfg is None:
+        return {
+            "extra_exclude": patterns or None,
+            "force_include": None,
+            "large_file_warn_bytes": LARGE_FILE_WARN_BYTES,
+        }
+    patterns += [normalize_pattern(p) for p in cfg.always_exclude]
+    return {
+        "extra_exclude": patterns or None,
+        "force_include": build_force_include_spec(
+            [normalize_pattern(p) for p in cfg.always_include]
+        ),
+        "large_file_warn_bytes": int(cfg.limits.max_file_size_mb * 1024 * 1024),
+    }
+
+
 def _resolve_dir(path: str | Path | None) -> Path:
     if path is None:
         return Path(os.getcwd()).resolve()

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip/cli.py

@@ -927,6 +927,18 @@ def _run(
         if saved:
             project_cfg = load_project_config(project_dir)
 
+    # ── Include/exclude inputs shared by every scan mode ─────────────────────
+    # CLI --exclude/-e patterns plus any standing always_exclude patterns from
+    # project config — both are additive, persistent behavior comes from
+    # config.json so it doesn't need to be re-typed every run. always_include
+    # is a standing negation. Built once here so standard and --git-changes
+    # runs honour project config identically.
+    normalized_exclude = [normalize_pattern(p) for p in extra_exclude or []]
+    normalized_exclude += [normalize_pattern(p) for p in project_cfg.always_exclude]
+    force_include = build_force_include_spec(
+        [normalize_pattern(p) for p in project_cfg.always_include]
+    )
+
     # ── Git-changes mode ─────────────────────────────────────────────────────
     if git_changes:
         with console.status("[cyan]Querying git for changed files…[/]", spinner="dots"):
@@ -939,7 +951,7 @@ def _run(
         print_git_deleted_and_submodules(git_result)
 
         if git_result.is_empty:
-            info("Nothing to package — working tree is clean.")
+            info("Nothing to compress in this one — working tree is clean.")
             return
 
         scan_label, scan_detail = git_scan_label_and_detail(git_result)
@@ -953,27 +965,21 @@ def _run(
                 large_file_warn_bytes=int(
                     project_cfg.limits.max_file_size_mb * 1024 * 1024
                 ),
+                extra_exclude=normalized_exclude if normalized_exclude else None,
+                include_only=include_only if include_only else None,
+                force_include=force_include,
             )
 
     else:
         # ── Build exclusion spec ─────────────────────────────────────────────
         gitignore_path = None if no_gitignore else (project_dir / ".gitignore")
 
-        # CLI --exclude/-e patterns plus any standing always_exclude patterns
-        # from project config — both are additive, persistent behavior comes
-        # from config.json so it doesn't need to be re-typed every run.
-        normalized_exclude = [normalize_pattern(p) for p in extra_exclude or []]
-        normalized_exclude += [normalize_pattern(p) for p in project_cfg.always_exclude]
-
         with console.status("[cyan]Building exclusion rules…[/]", spinner="dots"):
             spec = build_spec(
                 rule_modules=detection.rule_modules,
                 extra_exclude=normalized_exclude if normalized_exclude else None,
                 gitignore_path=gitignore_path,
             )
-            force_include = build_force_include_spec(
-                [normalize_pattern(p) for p in project_cfg.always_include]
-            )
 
         # ── Resolve files ─────────────────────────────────────────────────────
         with console.status("[cyan]Scanning project files…[/]", spinner="dots"):
@@ -1027,7 +1033,7 @@ def _run(
         return
 
     if not resolved.included:
-        err("Nothing to package — all files were excluded.")
+        err("Nothing to compress in this one — all files were excluded.")
         info("Try contextzip include PATH or -i PATH to override.")
         return
 

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip/cli_ai.py

@@ -15,38 +15,11 @@ from pathlib import Path
 from rich.console import Console
 
 from contextzip.cli_display import print_ai_selection, err, warn, info
+from contextzip.filters import normalize_pattern  # noqa: F401  (re-exported for cli.py)
 
 console = Console()
 
 
-# ---------------------------------------------------------------------------
-# Pattern normalisation
-# ---------------------------------------------------------------------------
-
-
-def normalize_pattern(p: str) -> str:
-    """
-    Canonicalise a user-supplied exclusion pattern.
-
-    Rules applied in order:
-      1. Strip a leading ``./`` or ``.\\`` so that ``./CHANGELOG.md``
-         and ``CHANGELOG.md`` are treated identically.
-      2. Replace every backslash with a forward slash for cross-platform
-         consistency (Windows paths entered on the CLI).
-      3. Collapse ``folder/*`` → ``folder/`` so that gitignore-style
-         directory globs work as expected.
-    """
-    # 1. Strip leading ./ or .\\
-    if p.startswith("./") or p.startswith(".\\"):
-        p = p[2:]
-    # 2. Normalise path separators
-    p = p.replace("\\", "/")
-    # 3. folder/* → folder/
-    if p.endswith("/*"):
-        p = p[:-1]
-    return p
-
-
 # ---------------------------------------------------------------------------
 # AI selection (full run — produces ZIP)
 # ---------------------------------------------------------------------------

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip/cli_display.py

@@ -64,6 +64,10 @@ def print_detection(detection, *, con: Console = console) -> None:
     """One line: what was detected and how confident contextzip is."""
     if detection.is_unknown:
         ok("Detected", "unknown ecosystem, base rules only", con=con)
+        info(
+            "Don't see your language? Add it here: https://example.com",
+            con=con,
+        )
         return
 
     parts = []

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip/error_parser.py

@@ -22,6 +22,8 @@ from __future__ import annotations
 import re
 from pathlib import Path
 
+from contextzip.filters import filter_paths_by_config
+
 # ---------------------------------------------------------------------------
 # ANSI escape code stripping
 # ---------------------------------------------------------------------------
@@ -453,6 +455,8 @@ def process_buffer(
     project_dir: Path,
     ecosystems: list[str],
     ecosystem_display: str,
+    always_exclude: list[str] | None = None,
+    always_include: list[str] | None = None,
 ) -> tuple[str, str, list[Path]] | None:
     """
     Run the full pipeline on *raw_buffer*.
@@ -472,6 +476,11 @@ def process_buffer(
         List of detected ecosystem names from DetectionResult.ecosystems.
     ecosystem_display:
         Human-readable display string, e.g. "Next.js + Node.js".
+    always_exclude / always_include:
+        A project config's standing patterns. Files named in the stack trace
+        that match always_exclude are left out of the referenced-file list
+        (and therefore out of source-files.zip and prompt.txt), unless they
+        also match always_include.
     """
     # 1. Strip ANSI
     clean_text = strip_ansi(raw_buffer)
@@ -493,6 +502,9 @@ def process_buffer(
 
     # 4. Extract file paths
     referenced_paths = extract_paths(error_block_raw, project_dir, ecosystems)
+    referenced_paths = filter_paths_by_config(
+        referenced_paths, project_dir, always_exclude, always_include
+    )
 
     # 5. Build prompt.txt
     prompt_txt = build_prompt_txt(

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip/filters.py

@@ -12,14 +12,18 @@ Phase 5 hardening:
 Git mode:
   - resolve_files_from_git() accepts a GitChanges result and builds a
     ResolveResult from only the modified/added/untracked files reported
-    by git, while still running all size and binary checks.
+    by git, while still running all size and binary checks. It honours the
+    same extra-exclude / include-only / force-include inputs as
+    resolve_files(), so project config (always_include / always_exclude)
+    and CLI --include/--exclude behave identically with and without
+    --git-changes.
 
 Force-include (Phase 7):
   - build_force_include_spec() turns a project config's "always_include"
-    patterns into a PathSpec. resolve_files() accepts it as force_include
-    and, when a file (or one of its parent directories) matches, treats
-    the file as not excluded — a standing negation on top of auto-rules
-    and .gitignore. It does not apply in git-changes mode, and it does not
+    patterns into a PathSpec. resolve_files() and resolve_files_from_git()
+    accept it as force_include and, when a file (or one of its parent
+    directories) matches, treat the file as not excluded — a standing
+    negation on top of auto-rules, .gitignore and --exclude. It does not
     override an explicit --include/-i for the current run.
 """
 
@@ -106,6 +110,27 @@ class ResolveResult:
 # ---------------------------------------------------------------------------
 
 
+def normalize_pattern(p: str) -> str:
+    """
+    Canonicalise a user-supplied exclusion/inclusion pattern (CLI flag or
+    project config entry).
+
+    Rules applied in order:
+      1. Strip a leading ``./`` or ``.\\`` so that ``./CHANGELOG.md``
+         and ``CHANGELOG.md`` are treated identically.
+      2. Replace every backslash with a forward slash for cross-platform
+         consistency (Windows paths entered on the CLI).
+      3. Collapse ``folder/*`` → ``folder/`` so that gitignore-style
+         directory globs work as expected.
+    """
+    if p.startswith("./") or p.startswith(".\\"):
+        p = p[2:]
+    p = p.replace("\\", "/")
+    if p.endswith("/*"):
+        p = p[:-1]
+    return p
+
+
 def build_spec(
     rule_modules: list[str],
     extra_exclude: list[str] | None = None,
@@ -368,6 +393,9 @@ def resolve_files_from_git(
     git_files: list[Path],
     project_dir: Path,
     large_file_warn_bytes: int = LARGE_FILE_WARN_BYTES,
+    extra_exclude: list[str] | None = None,
+    include_only: list[str] | None = None,
+    force_include: pathspec.PathSpec | None = None,
 ) -> ResolveResult:
     """
     Build a :class:`ResolveResult` from a pre-selected list of files reported
@@ -378,6 +406,16 @@ def resolve_files_from_git(
     Size and binary checks are also performed so that the usual warnings appear
     in the CLI output.
 
+    Precedence mirrors :func:`resolve_files` exactly, so a project's config
+    behaves the same with and without ``--git-changes``:
+
+      1. *force_include* (config ``always_include``) — a match short-circuits
+         every exclusion check below, including the base safety floor.
+      2. Base safety floor + *extra_exclude* (CLI ``--exclude`` plus config
+         ``always_exclude``) — a match excludes the file.
+      3. *include_only* (CLI ``--include``) — the file must live under one of
+         these paths, even if it was force-included.
+
     Parameters
     ----------
     git_files:
@@ -388,10 +426,18 @@ def resolve_files_from_git(
     large_file_warn_bytes:
         Overrides the module default (1 MB) — typically a project's
         `limits.max_file_size_mb` preference (.contextzip/config.json).
+    extra_exclude:
+        Additional gitignore-style exclusion patterns, layered on top of the
+        base safety floor.
+    include_only:
+        If given, only files under these path prefixes are kept.
+    force_include:
+        Spec from :func:`build_force_include_spec`; matching files skip all
+        exclusion checks.
     """
     # Build the base spec once — this is our safety floor regardless of what
     # git reports as changed. It blocks .env, secrets, binaries, etc.
-    base_spec = build_spec(rule_modules=["base"])
+    base_spec = build_spec(rule_modules=["base"], extra_exclude=extra_exclude or None)
 
     result = ResolveResult()
 
@@ -417,9 +463,23 @@ def resolve_files_from_git(
             result.skipped.append((abs_path, "outside project tree"))
             continue
 
-        # ── Base safety floor — block secrets / binaries even if git-tracked ─
         rel_str = rel.as_posix()
-        if _any_parent_excluded(rel, base_spec) or base_spec.match_file(rel_str):
+
+        # ── force_include (config always_include) short-circuits exclusion ───
+        forced = force_include is not None and (
+            force_include.match_file(rel_str)
+            or _any_parent_excluded(rel, force_include)
+        )
+
+        # ── Base safety floor + extra excludes (CLI --exclude / always_exclude)
+        if not forced and (
+            _any_parent_excluded(rel, base_spec) or base_spec.match_file(rel_str)
+        ):
+            result.excluded.append(abs_path)
+            continue
+
+        # ── Apply --include filter (exact prefix, not substring) ─────────────
+        if include_only and not _matches_any_prefix(rel_str, include_only):
             result.excluded.append(abs_path)
             continue
 
@@ -443,6 +503,54 @@ def resolve_files_from_git(
     return result
 
 
+def filter_paths_by_config(
+    paths: list[Path],
+    project_dir: Path,
+    always_exclude: list[str] | None = None,
+    always_include: list[str] | None = None,
+) -> list[Path]:
+    """
+    Drop any of *paths* matched by a project config's ``always_exclude``,
+    unless it's also matched by ``always_include`` (same precedence as
+    :func:`resolve_files`: force-include wins).
+
+    For callers that pick files by some other means than a directory scan
+    (e.g. ``contextzip watch`` collects files named in a stack trace) but
+    must still respect the user's manual include/exclude choices. Paths
+    outside *project_dir* are left untouched.
+    """
+    if not always_exclude:
+        return list(paths)
+
+    exclude_spec = build_spec(
+        rule_modules=[],
+        extra_exclude=[normalize_pattern(p) for p in always_exclude],
+    )
+    force_spec = build_force_include_spec(
+        [normalize_pattern(p) for p in always_include or []]
+    )
+
+    kept: list[Path] = []
+    for path in paths:
+        try:
+            rel = path.relative_to(project_dir)
+        except ValueError:
+            kept.append(path)
+            continue
+        rel_str = rel.as_posix()
+
+        forced = force_spec is not None and (
+            force_spec.match_file(rel_str) or _any_parent_excluded(rel, force_spec)
+        )
+        excluded = _any_parent_excluded(rel, exclude_spec) or exclude_spec.match_file(
+            rel_str
+        )
+        if excluded and not forced:
+            continue
+        kept.append(path)
+    return kept
+
+
 def summarise_exclusions(excluded: list[Path], project_dir: Path) -> dict[str, int]:
     """Group excluded files by top-level directory / filename, sorted by count."""
     buckets: dict[str, int] = {}

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip/watcher.py

@@ -513,11 +513,19 @@ def _package_debug_context(
             )
             referenced_paths: list[Path] = []
         else:
+            # Honour the project's manual include/exclude choices — a file
+            # the user put in always_exclude must not leak into the debug
+            # zip just because a stack trace happened to mention it.
+            from contextzip.project_config import load_project_config
+
+            project_cfg = load_project_config(project_dir)
             result = process_buffer(
                 raw_buffer=raw_text,
                 project_dir=project_dir,
                 ecosystems=ecosystems,
                 ecosystem_display=ecosystem_display,
+                always_exclude=project_cfg.always_exclude,
+                always_include=project_cfg.always_include,
             )
 
             if result is None:

{contextzip-0.4.4 → contextzip-0.4.5}/contextzip.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: contextzip
-Version: 0.4.4
+Version: 0.4.5
 Summary: Intelligently package your codebase for AI tools
 Author-email: Deepesh <akadeepesh@gmail.com>
 License-Expression: MIT
@@ -27,7 +27,11 @@ Requires-Dist: pathspec>=0.12
 Requires-Dist: httpx>=0.27
 Dynamic: license-file
 
-<img width="1536" height="1024" alt="cz" src="https://github.com/user-attachments/assets/a930b49c-34a0-447b-8f3a-1909eae977c8" />
+
+
+https://github.com/user-attachments/assets/91913ad6-6161-430d-9075-b0fa76498021
+
+<!-- <img width="1536" height="1024" alt="cz" src="https://github.com/user-attachments/assets/a930b49c-34a0-447b-8f3a-1909eae977c8" /> -->
 
 # contextzip
 

{contextzip-0.4.4 → contextzip-0.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "contextzip"
-version = "0.4.4"
+version = "0.4.5"
 description = "Intelligently package your codebase for AI tools"
 readme = "README.md"
 requires-python = ">=3.9"