Repository navigation
Commit ef63dc3
committed
Merge upstream 8df0639 into the CLI fork (step 9)
Merge upstream's Ansible/configlink and graph-memory changes onto the
step-8 fork head, retaining the CLI-only boundary and the fork's operation
semantics. The upstream range is 932dd1d..8df0639 (33 commits through
DeusData#2643/DeusData#2644/DeusData#2642). MCP transport files remain deleted.
Conflicts and resolutions:
- Makefile.cbm: keep the fork's operation/daemon/UI source graph and MCP
removals; wire pass_ansible, pass_envjoin, graph_mem and relevant tests.
- README.md: preserve CLI-fork positioning and MCP-removal documentation,
incorporate upstream capability additions.
- src/cypher/cypher.c: retain streamed execution and graph-store improvements;
restore the fork's max_rows projection cap for oversized explicit LIMITs.
- src/foundation/mem_core.{c,h}: retain fork budget APIs and operation_arg,
add upstream graph_cache class.
- src/pipeline/pipeline.c: combine fork timing metrics with upstream backup
and no-op state.
- tests/test_main.c and tests/test_cypher.c: merge suite/test registrations
and preserve the fork row-budget contract.
- scripts/memory-core-baseline.txt: regenerate after the memory-core merge.
- src/mcp/** and tests/test_mcp*.c: keep removed; convert the graph-cache
request-eviction test to a CLI operation dispatch.
Ported:
- Add read batches to short-lived read operations and end them on store close.
- Use cbm_git_branch_resolve for project branch records; add CONNECTS_TO to
trace topology.
- Use chunked source reads, per-request root-containment caching, indexed
search-result lookup, and the scoped in-process source scanner with fallback.
- Add the graph-memory adjacency cache, trace/degree integration and idle
eviction after operation execution.
- Add operation-level source-search tests and upstream Ansible/envjoin passes.
Validation: scripts/build-dev.sh (-Werror), test-runner build, source_search
suite (3 passed), required and touched suites (1,225 passed), scripts/lint.sh
--ci, Jenkins daemon-recovery test, vendored checksums (1,083 OK), and
memory-core lint passed. No push.73 files changed
Lines changed: 14493 additions & 774 deletions
File tree
- internal/cbm
- scripts
- src
- cli
- cypher
- daemon
- foundation
- git
- graph_buffer
- operations
- pipeline
- store
- tests
- fixtures/complexity
- HCL
- Kubernetes
- repro
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
451 | 451 | | |
452 | 452 | | |
453 | 453 | | |
454 | | - | |
| 454 | + | |
455 | 455 | | |
456 | 456 | | |
457 | 457 | | |
| |||
541 | 541 | | |
542 | 542 | | |
543 | 543 | | |
| 544 | + | |
544 | 545 | | |
| 546 | + | |
545 | 547 | | |
546 | 548 | | |
547 | 549 | | |
| |||
745 | 747 | | |
746 | 748 | | |
747 | 749 | | |
| 750 | + | |
748 | 751 | | |
749 | 752 | | |
750 | 753 | | |
| |||
760 | 763 | | |
761 | 764 | | |
762 | 765 | | |
| 766 | + | |
763 | 767 | | |
764 | 768 | | |
765 | 769 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| 63 | + | |
| 64 | + | |
63 | 65 | | |
64 | 66 | | |
65 | 67 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
701 | 701 | | |
702 | 702 | | |
703 | 703 | | |
704 | | - | |
705 | | - | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
706 | 708 | | |
707 | 709 | | |
708 | 710 | | |
709 | | - | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
710 | 715 | | |
711 | 716 | | |
712 | 717 | | |
713 | 718 | | |
714 | 719 | | |
715 | 720 | | |
716 | | - | |
717 | | - | |
| 721 | + | |
| 722 | + | |
718 | 723 | | |
719 | 724 | | |
720 | | - | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
721 | 733 | | |
722 | 734 | | |
723 | 735 | | |
724 | 736 | | |
725 | 737 | | |
726 | 738 | | |
727 | 739 | | |
728 | | - | |
| 740 | + | |
| 741 | + | |
729 | 742 | | |
730 | 743 | | |
731 | 744 | | |
| |||
737 | 750 | | |
738 | 751 | | |
739 | 752 | | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
740 | 760 | | |
741 | 761 | | |
742 | 762 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7197 | 7197 | | |
7198 | 7198 | | |
7199 | 7199 | | |
7200 | | - | |
| 7200 | + | |
| 7201 | + | |
| 7202 | + | |
7201 | 7203 | | |
7202 | 7204 | | |
7203 | 7205 | | |
7204 | | - | |
7205 | | - | |
7206 | | - | |
7207 | | - | |
7208 | | - | |
7209 | | - | |
| 7206 | + | |
| 7207 | + | |
| 7208 | + | |
| 7209 | + | |
| 7210 | + | |
| 7211 | + | |
7210 | 7212 | | |
7211 | | - | |
7212 | 7213 | | |
7213 | 7214 | | |
7214 | 7215 | | |
| |||
0 commit comments