Fix: compilation.exclude does not filter primitive discovery#477
Merged
danielmeppiel merged 5 commits intomainfrom Apr 6, 2026
Merged
Fix: compilation.exclude does not filter primitive discovery#477danielmeppiel merged 5 commits intomainfrom
danielmeppiel merged 5 commits intomainfrom
Conversation
Agent-Logs-Url: https://github.com/microsoft/apm/sessions/6aae940e-6c6a-40f5-9f06-994570e01fa7 Co-authored-by: danielmeppiel <51440732+danielmeppiel@users.noreply.github.com>
Propagate exclude patterns from CompilationConfig to the primitive discovery phase so that .instructions.md files (and other primitives) inside excluded directories are never discovered or compiled. Fixes #464 Agent-Logs-Url: https://github.com/microsoft/apm/sessions/6aae940e-6c6a-40f5-9f06-994570e01fa7 Co-authored-by: danielmeppiel <51440732+danielmeppiel@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix compilation.exclude to filter primitive discovery
Fix: compilation.exclude does not filter primitive discovery
Mar 27, 2026
7 tasks
Contributor
|
Tested, and it works :). Thank you. |
Coolomina
approved these changes
Mar 30, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a gap where compilation.exclude patterns were only applied during context optimization, not during primitive discovery, allowing excluded .instructions.md files to be discovered and compiled.
Changes:
- Thread
exclude_patternsthrough primitive discovery entry points and apply filtering before parsing discovered files. - Propagate
CompilationConfig.excludeinto both discovery paths inAgentsCompiler. - Add unit tests to cover exclusion behavior for local scanning and both discovery entry points.
Show a summary per file
| File | Description |
|---|---|
| uv.lock | Updates editable project version metadata to 0.8.6. |
| src/apm_cli/primitives/discovery.py | Adds exclude-aware discovery helpers and wires exclude filtering into discovery/scan flows. |
| src/apm_cli/compilation/agents_compiler.py | Passes config.exclude into discovery functions for both local-only and dependency-aware compilation. |
| tests/unit/primitives/test_discovery_parser.py | Adds tests validating exclusion behavior across discovery APIs. |
| tests/unit/compilation/test_agents_compiler_coverage.py | Updates mock assertion for the new discovery call signature. |
| CHANGELOG.md | Adds an Unreleased fix entry for exclude filtering during discovery. |
Copilot's findings
- Files reviewed: 5/6 changed files
- Comments generated: 4
CHANGELOG.md
Outdated
Comment on lines
+11
to
+13
| ### Fixed | ||
|
|
||
| - `compilation.exclude` patterns now filter primitive discovery, preventing `.instructions.md` files in excluded directories from leaking into compiled output (#464) |
There was a problem hiding this comment.
src/apm_cli/primitives/discovery.py
Outdated
Comment on lines
+201
to
+207
| try: | ||
| rel_path = file_path.resolve().relative_to(base_dir.resolve()) | ||
| except ValueError: | ||
| return False | ||
|
|
||
| rel_path_str = rel_path.as_posix() | ||
|
|
There was a problem hiding this comment.
_should_exclude_file() uses Path.resolve().relative_to() but only catches ValueError. On Windows (and some CI setups) resolve()/relative_to() can also raise OSError/RuntimeError (e.g., 8.3 short-name mismatches). Consider using utils.paths.portable_relpath() or expanding the exception handling so exclude filtering does not crash discovery.
Comment on lines
75
to
+81
| # Find and parse files for each primitive type | ||
| for primitive_type, patterns in LOCAL_PRIMITIVE_PATTERNS.items(): | ||
| files = find_primitive_files(base_dir, patterns) | ||
|
|
||
| for file_path in files: | ||
| if _should_exclude_file(file_path, base_path, exclude_patterns): | ||
| continue |
There was a problem hiding this comment.
discover_primitives() is used for --local-only ("Ignore dependencies"), but it does not filter out files under apm_modules/. Because LOCAL_PRIMITIVE_PATTERNS includes recursive "/.apm/..." and "/*.instructions.md" patterns, primitives from installed dependencies can still be discovered in local-only mode. Consider applying the same apm_modules exclusion used in scan_local_primitives(), or refactoring local-only discovery to reuse scan_local_primitives().
…erage - Extract duplicated glob matcher from discovery.py and context_optimizer.py into shared src/apm_cli/utils/exclude.py - Add validate_exclude_patterns() with consecutive ** collapse and segment cap (max 5 non-consecutive) to prevent exponential recursion DoS - Cover _discover_local_skill() with exclusion filtering (was bypassed) - Add debug logging for excluded files - Add 34 tests for shared exclude util (validation, matching, DoS guard) - Add SKILL.md exclusion and DoS validation tests to discovery tests - Revert uv.lock version bump artifact - Net -160 lines from deduplication Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
compilation.excludepatterns were only applied during context optimization (directory scanning/placement), not during primitive discovery. This caused.instructions.mdfiles in excluded directories to leak into compiled output.Files under
docs/were still discovered, parsed, and compiled into AGENTS.md/CLAUDE.md.Changes:
discovery.py: Addedexclude_patternsparameter todiscover_primitives(),discover_primitives_with_dependencies(), andscan_local_primitives()with glob matching helpers (**support, cross-platform path normalization)agents_compiler.py: Passesconfig.excludeto both discovery code pathsType of change
Testing
⚡ Quickly spin up Copilot coding agent tasks from anywhere on your macOS or Windows machine with Raycast.