Skip to content

Added Markdown support. Co-authored by Codex 5.2#104

Merged
runonthespot merged 10 commits into
BeaconBay:mainfrom
szavadsky:topic/md-clean
May 24, 2026
Merged

Added Markdown support. Co-authored by Codex 5.2#104
runonthespot merged 10 commits into
BeaconBay:mainfrom
szavadsky:topic/md-clean

Conversation

@szavadsky
Copy link
Copy Markdown
Contributor

No description provided.

@runonthespot
Copy link
Copy Markdown
Contributor

Reviewed — this looks great. Solid coverage: query file + post-processing for markdown's tiny chunks via merge_small_chunks + a unit test + fixture. Approved.

The CI machinery was actually broken on main when you opened this — we fixed it in #110 (just merged). To get a meaningful green CI run on this PR, could you either:

  1. Merge main into your branch (the recommended path), or
  2. Tick 'Allow edits from maintainers' on the PR — we'll do the merge from this side.

Once CI is green I'll merge. Thanks again @szavadsky.

@szavadsky
Copy link
Copy Markdown
Contributor Author

@runonthespot thanks, done. Thanks for the outstanding software

@runonthespot
Copy link
Copy Markdown
Contributor

Heads-up — main moved a lot today (0.7.5/0.7.6/0.7.7 cut + a 20-pack of dependabot bumps merged via #125). This PR now has a small conflict in Cargo.toml:

  • main: fastembed = "5.13"
  • this PR: fastembed = "5.1" + added tree-sitter-md = "0.2"

Resolution is just keeping both — fastembed = "5.13" AND tree-sitter-md = "0.2". I verified locally that the merged result builds cleanly + needs a quick cargo fmt. Could you rebase + push?

If easier, say the word and I'll open a follow-up PR from my fork that supersedes this one (giving you full credit). Otherwise happy to wait.

@szavadsky
Copy link
Copy Markdown
Contributor Author

@runonthespot I feel a follow-up PR by you will be easier for both

runonthespot added a commit that referenced this pull request May 24, 2026
Ships #133 (security: 11 CodeQL alerts + 4 npm transitives closed) and
#134 (clippy pedantic auto-fix cleanup across 27 files).

After this release: open security alerts = 0 across both Dependabot
and CodeQL surfaces.

Cutting partly so the in-flight community PRs (#102 C/C++ support, #104
markdown support) have a clean current base to rebase on.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@runonthespot
Copy link
Copy Markdown
Contributor

Quick update @szavadsky — we're cutting 0.7.10 right now (ships shortly), and after that we'll hold off merging any further changes to main until both your PRs (#102 C/C++ + #104 markdown) are in. That way you only need to rebase once and don't have to keep chasing a moving target.

When you've got a moment, the rebase pattern is:

git fetch upstream  # or origin if your fork tracks BeaconBay/ck
git checkout your-branch
git merge upstream/main
# resolve any conflicts (likely just Cargo.lock — see my prior comment for the pattern)
cargo check --workspace && cargo fmt --all
git push

I already verified locally that both branches resolve cleanly against current main with just a Cargo.lock regeneration. Once you push, CI will run fresh and I'll merge as soon as it's green. Thanks for the patience and the excellent work.

szavadsky and others added 3 commits May 24, 2026 12:32
Conflicts resolved:
- CHANGELOG.md, README.md, docs-site language tables — kept both
  the C/C++ rows (from BeaconBay#102) and the Markdown row
- ck-chunk/src/lib.rs — added template-prefix merge (Cpp) and
  small-chunk merge (Markdown) side by side; expanded the
  decorator-like trivia kinds match arm to include Markdown
- Cargo.lock auto-resolved by cargo via the workspace deps

Plus mechanical clippy --fix for 2 new warnings introduced by the
merge interaction (needless_borrow + manual_range_contains).
@runonthespot
Copy link
Copy Markdown
Contributor

Pushed conflict resolution to your branch via maintainer-edits (36bed6c):

Conflicts resolved (after #102 landed):

  • CHANGELOG.md, README.md, docs-site/{advanced-usage,limitations}.md — kept both the C/C++ rows (from Enchancement: C and CPP support #102) and your Markdown row; updated the language count where applicable
  • ck-chunk/src/lib.rs — Cpp template-prefix merge and Markdown small-chunk merge sit side by side (mutually exclusive conditions); extended the decorator-trivia arm to C | Cpp | Markdown
  • Cargo.lock auto-resolved via cargo

Plus 2 clippy fixes (needless_borrow, manual_range_contains) that crept in from the merge interaction.

Verified locally:

  • cargo fmt --check clean
  • cargo clippy --workspace --all-features --all-targets -D warnings clean
  • cargo test -p ck-chunk --no-default-features — 50 passed (was 47 before; your 3 new markdown tests included)

My prior review notes from #102 don't apply here. The markdown PR is good as-is — merge_small_chunks + the explanatory doc comment you added in the iteration are the right call for markdown's tiny atomic chunks.

CI is running now. Will merge as soon as it's green.

@runonthespot runonthespot merged commit fd52546 into BeaconBay:main May 24, 2026
9 checks passed
runonthespot added a commit that referenced this pull request May 24, 2026
Headline: C, C++, and Markdown language support land via #102 and #104
(both by @szavadsky). Plus the docs-deploy fix (#135) that resolves
the vitepress build break caused by my unbounded vite override in 0.7.10.

Also the live test of npm trusted publishing now that the repo's
trusted-publisher config is verified saved on the npm side.

See CHANGELOG.md.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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.

3 participants