Skip to content

merge: reconcile upstream through 5da4a41d - #499

Merged
bompus merged 3 commits into
fork/consolidatedfrom
reconcile/upstream-5da4a41d
Oct 14, 2026
Merged

bompus merged 3 commits into
fork/consolidatedfrom
reconcile/upstream-5da4a41d

Conversation

@bompus

@bompus bompus commented Oct 14, 2026 •

Copy link
Copy Markdown
Owner

fork/consolidated now contains upstream main through 5da4a41d (one commit, colbymchenry#2557), so codegraph_explore stops listing tests, examples and fixtures that the engine already treats as test files.

The upstream commit makes explore's low-value check and the dominant-file filter in src/db/queries.ts build on isTestFile, which closes gaps such as C++ foo_test.cc and FooTest.cpp, unittests/, __mocks__/ and Gradle foo-test/ modules, and ends false positives such as Latest.java.

Conflict. One, in the import line of src/db/queries.ts: the fork imports getStemVariants, upstream imports isTestFile. The merged line imports both; nothing else needed a decision. The merge is a true merge commit (landed with merge-pr.sh --merge) so upstream's commit stays an ancestor.

Checks, on this head. Full suite 721 files / 9065 tests pass, including upstream's new __tests__/explore-low-value-tests.test.ts; tsc --noEmit and check:agent-docs are clean. The kernel sources are unchanged, so no golden or precision run applies.

README. The "About this fork" merge-point paragraph now names 5da4a41d. No other row, and no number the README quotes, changed.

Not covered: promoting the deployed build.


Summary by cubic

Reconciles fork/consolidated with upstream through 5da4a41d, so codegraph_explore and the dominant-file filter now rely on the engine's isTestFile check instead of separate regex lists. Explore no longer lists tests, examples, fixtures, or benchmarks that the engine already considers test files, covering C++ foo_test.cc/FooTest.cpp, unittests/, e2e/, and Gradle foo-test/ modules, and ends false positives like Latest.java.

  • Resolves the conflict in src/db/queries.ts by importing both getStemVariants and isTestFile.
  • Adds tests covering explore output and route-file detection for these cases.
  • Updates README merge-point to 5da4a41d. Full suite (9065 tests) passes; no re-index needed.

Written for commit 789f257. Summary will update on new commits.

View guided diff Turn on auto-fix

Summary by CodeRabbit

  • Bug Fixes
    • Exploration answers now exclude test files and examples, and route selection is less likely to favor test or mock-server files.
    • JavaScript- and Python-family import links now update when modules, exports, or re-exports change, including changes propagated through re-export chains.
    • JavaScript and TypeScript re-exports and component imports are now reflected as file dependencies.
    • Extensionless imports now resolve to a newly added higher-priority sibling file when applicable. Some links missed by earlier versions may require re-indexing.

colbymchenry and others added 3 commits October 14, 2026 08:56
…'s answer (colbymchenry#2557)

codegraph_explore's low-value check (the hard filter, the rank penalty and
the comparator key) and the dominant-file, route-file and routing-manifest
filter in db/queries.ts each kept a regex list of their own. They missed
every test convention isTestFile learned since: C++ `foo_test.cc` and
`FooTest.cpp`, Google's `foo_unittest.cc`, LLVM's `unittests/`, `testing/`,
`e2e/`, `__mocks__/`, Gradle `foo-test/` modules, Kotlin source sets, and
the examples, samples, fixtures and benchmarks that explore's gather already
dampens through isTestFile.

Both now build on isTestFile, keeping icons/i18n (explore) and generated
files (queries), plus the singular `__test__/` the old lists matched.
Dropping their lowercase suffix patterns also ends false positives such as
`Latest.java` and `contest.cs`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	src/db/queries.ts
@coderabbitai

coderabbitai Bot commented Oct 14, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Repository YAML (base), Organization UI (inherited)
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: a8de7b53-f77b-48f3-b34d-0f30a6851cbf
📥 Commits

Reviewing files that changed from the base of the PR and between 948c92f and 789f257.

📒 Files selected for processing: 5
  • CHANGELOG.md
  • README.md
  • __tests__/explore-low-value-tests.test.ts
  • src/db/queries.ts
  • src/mcp/tools.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 2 remain after this review.

📝 Walkthrough

The pull request routes test-file detection through shared isTestFile logic in two classifiers, adds integration tests for explore filtering and route-file selection, records import-linking changes in the changelog, and updates the documented upstream baseline.

Changes: Low-value file filtering

Layer / File(s) Summary
Shared test classification and validation
src/db/queries.ts, src/mcp/tools.ts, __tests__/explore-low-value-tests.test.ts, CHANGELOG.md
Both classifiers now use isTestFile while retaining their other shown low-value checks. Integration tests check that codegraph_explore excludes test paths and that getTopRouteFile() selects src/routes.js. The changelog records exclusion of test- and example-classified files from exploration and route-file selection.

Import-linking changelog entries

Layer / File(s) Summary
Import and re-export relinking entries
CHANGELOG.md
The changelog records import and use relinking for JavaScript-family and Python modules, including re-export chains, nested barrels, and extensionless imports.
File-dependency entries
CHANGELOG.md
The changelog records JavaScript and TypeScript re-export files and Vue, Svelte, and Astro component imports as file dependencies.

Documented upstream baseline

Layer / File(s) Summary
Update fork baseline
README.md
The README updates the documented upstream commit from 1753472a to 5da4a41d.

Priority: ⬇️ Low

Merge Risk: ⚪ Minimal · up to 789f2

The filtering and documentation changes appear ready to merge after normal checks.

Pre-merge checks: Passed 6
Passed Passed checks: 6 passed
Check name Status Explanation
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title clearly identifies the primary change: merging upstream through commit 5da4a41. It is concise and specific.
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Suppressions Explained Passed PASS. The pull request changes five files and adds no lint, type-check, or compiler suppression directive. The added comments describe test-file filtering, not diagnostic suppression. No lint or TypeS…
User-Visible Changes Documented Passed The pull request changes test/example file classification in src/db/queries.ts and src/mcp/tools.ts, adds integration tests, and updates CHANGELOG.md plus the fork commit reference in `README.md…
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Warning

Some tools did not complete. Review the errors below.

🔧 LanguageTool
CHANGELOG.md

LanguageTool checks are incomplete because the per-file request limit of 5 was reached. Remaining text was skipped; findings from completed checks are retained.

Comment @coderabbitai help to get the list of available commands.

@cubic-dev-ai cubic-dev-ai Bot left a comment •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All reported issues were addressed across 5 files

Reply with feedback, questions, or to request a fix.

View guided diff | Turn on auto-fix | Re-trigger cubic

Comment thread src/mcp/tools.ts
Comment thread CHANGELOG.md
Comment thread src/db/queries.ts
@bompus
bompus merged commit b61573c into fork/consolidated Oct 14, 2026
5 checks passed
@bompus
bompus deleted the reconcile/upstream-5da4a41d branch October 14, 2026 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants