Fix glob resolution in catalog directives within included files

[jeduden]

Summary

This PR fixes glob resolution for catalog directives that are transplanted into documents via file inclusion. When a catalog directive is included from a subdirectory, its glob patterns now correctly resolve relative to that subdirectory rather than the including file's directory.

Key Changes

• Include rule enhancement: Added injectSourceDir() function that automatically injects a source-dir parameter into multi-line processing instructions when content is included from a different directory. This ensures downstream directives (like catalog) know where to resolve globs from.

• Catalog rule updates:

  • Added resolveGlobFS() to determine the correct filesystem and path prefix for glob resolution based on the source-dir parameter
  • Refactored resolveGlobMatches() into resolveGlobMatchesFrom() to accept an explicit filesystem for glob resolution
  • Updated buildCatalogEntries() to use the source-dir-aware filesystem and prefix matched filenames so links resolve correctly from the including file
  • Fixed resolveGitignore() to compute the gitignore base directory relative to source-dir when present

• Test coverage: Added comprehensive tests for:

  • Glob resolution from subdirectories with source-dir
  • Front matter reading from the correct directory
  • Exclude patterns working relative to source-dir
  • Source-dir injection into included catalog directives
  • Preservation of existing parameters during injection
  • Avoiding unnecessary injection when files are in the same directory

Implementation Details

The solution works by having the include rule detect when content is being included from a different directory and automatically inject a source-dir parameter into multi-line processing instructions. This parameter is then used by the catalog rule to:

1. Resolve globs against the correct subdirectory of the root filesystem
2. Prefix matched filenames so they resolve correctly from the including file's location
3. Read front matter from files in the correct directory

The injection is skipped for single-line PIs and when content is wrapped in code fences (where PIs aren't parsed).

https://claude.ai/code/session_01VN3XGWEbs4qRPet8qBia59

[codecov]

Codecov Report

❌ Patch coverage is 92.30769% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.31%. Comparing base (8377db3) to head (8d714ba).
⚠️ Report is 38 commits behind head on main.

Files with missing lines	Patch %	Lines
internal/rules/catalog/rule.go	89.18%	3 Missing and 1 partial ⚠️
internal/rules/include/rule.go	95.12%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #134      +/-   ##
==========================================
+ Coverage   86.25%   86.31%   +0.05%     
==========================================
  Files          92       92              
  Lines        9880     9950      +70     
==========================================
+ Hits         8522     8588      +66     
- Misses        886      889       +3     
- Partials      472      473       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[Copilot]

Pull request overview

This PR aims to fix <?catalog?> glob resolution when a catalog directive is brought into another document via <?include?>, by carrying the included file’s directory context forward (via a source-dir parameter) and making the catalog rule resolve globs/front matter relative to that directory.

Changes:

• Include expansion: injects a source-dir parameter into multi-line processing instructions in included content when inclusion crosses directories.
• Catalog rule: resolves globs and reads front matter from a source-dir-scoped filesystem; prefixes generated filenames so links work from the including file.
• Tests: adds coverage for source-dir injection and catalog glob/front matter/exclude behavior under source-dir.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.

File	Description
internal/rules/include/rule.go	Injects source-dir into included processing instructions to preserve directory context for downstream directives.
internal/rules/include/rule_test.go	Adds tests validating source-dir injection behavior during include fix.
internal/rules/catalog/rule.go	Introduces source-dir-aware glob FS selection and uses it for globbing/front matter, with path prefixing for output filenames.
internal/rules/catalog/rule_test.go	Adds tests ensuring catalog globbing/front matter/excludes work correctly when source-dir is provided.

[Copilot]

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

[Copilot]

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (1)

.github/copilot-instructions.md:27

• Adding source-dir: "." changes {filename} to be emitted relative to this file’s directory (it will be prefixed with .. for .github/). With the current row: "- [{summary}](../{filename})", generated links will likely become ../../docs/... (double ..) instead of the intended ../docs/.... Consider updating the row template to link directly to {filename} (or otherwise adjust) now that filenames are source-dir-aware.

<?catalog
source-dir: "."
glob:
  - "docs/**/*.md"
  - "!docs/research/**"
  - "!docs/security/**"
sort: path
header: ""
row: "- [{summary}](../{filename})"
?>

[Copilot]

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (1)

internal/rules/catalog/rule.go:312

• buildCatalogEntries now stores the display path (with prefix, which can be ".." when source-dir: "." is used from a subdirectory) into the filename field. Downstream logic like checkCatalogIncludeCycle reads files via f.FS using this filename value; paths containing .. are invalid for os.DirFS, so cycle detection will silently stop working for those entries.

Consider keeping a separate internal path for filesystem access (e.g., repo-root-relative path when source-dir is set, or the raw glob match) and update the cycle check to use that, while continuing to use the prefixed display path for links/templates.

	for _, p := range files {
		displayPath := p
		if prefix != "" {
			displayPath = path.Join(prefix, p)
		}
		fields := map[string]any{"filename": displayPath}
		if needFM {
			for k, v := range readFrontMatter(globFS, p) {
				fields[k] = v
			}
		}
		entries = append(entries, fileEntry{fields: fields})

[jeduden]

Merge queue: CI failed

[jeduden]

🟢 Merge Queue — picked up

This PR is in the queue and will be batched with other queue-labelled PRs.

Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run.

[jeduden]

🔵 Merge Queue — CI running

Merged into batch branch merge-queue/batch-134-1776608153. View CI run.

Next: No action needed — you'll be notified when CI completes.

[jeduden]

✅ Merge Queue — merged

This PR landed on main via commit 1bde75e. CI run that validated the merge.

Next: Done — nothing more to do here.