You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit bff6508
Browse filesBrowse the repository at this point in the historyBrowse files
Ancestry-preserving merge of upstream DeusData/codebase-memory-mcp through
first-parent merge e0c7a1d ("Merge pull request DeusData#2395 ... Swift init
extraction"). First parent is the 13M-1 merge 3a4fdb9; 73 upstream-only
commits across 7 first-parent merges:
DeusData#2389 PHP inline HTML, DeusData#2878 download-artifact 8.0.2, DeusData#2896 Hermes remover
with empty hooks, DeusData#1784 MCP frontend recovery, DeusData#2499 memory-lint gate warning
suffix, DeusData#1724 resource-managed indexing worker, DeusData#2395 Swift initializer
extraction.
Conflict resolution (CLI-first):
- src/mcp/*, src/daemon/frontend.{c,h}, tests/test_mcp.c,
tests/test_daemon_frontend.c: kept deleted. DeusData#1784 only changes the MCP
stdio JSON-RPC frontend (reconnect after daemon replacement); the fork has
no such frontend, so it is an MCP-only exclusion.
- src/daemon/application.h, src/main.c: fork side (protocol-neutral operation
client; no MCP client role, UI-flag or frontend run loop).
- .github/workflows/_smoke.yml: upstream (setup-go for the Go wrapper smoke,
download-artifact v8.0.2). release.yml and README.md: fork side.
- tests/test_index_supervisor.c: fork tests kept, upstream resource tests
appended (missing brace from the textual merge repaired).
- tests/test_daemon_application.c: fork session initializer with upstream's
6-argument worker-policy assertion.
DeusData#1724 port (MCP-side code moved into the operations layer):
- CBM_INDEX_SUPERVISED_RESULT_RESOURCE_FAILURE added; classification checks
resource violations after cancellation/unsafe-terminal and before CLEAN,
matching upstream order.
- cbm_index_policy_from_internal_args (was static
index_policy_from_worker_args), cbm_index_request_facts_{t,begin,record}
and cbm_index_worker_resource_response live in src/operations/index.{c,h}.
The response is a native operation-result wire payload with upstream's
fields (code, resource, observed/limit/unit, retryable,
serving_index_preserved, message, repo_path).
- Daemon application_consume_attempt records request facts and stops on
RESOURCE_FAILURE (no retry, quarantine or partial publish) for initial,
recovery and partial attempts.
- Worker-side publish gate wired via cbm_pipeline_set_publish_gate so a
worker cannot replace the serving DB after the supervisor claims
publication for a limit.
- docs/INDEX_RESOURCE_LIMITS.md uses codebase-memory-cli.
- New tests: index_supervisor_resource_response_reports_preservation_for_the_request,
daemon_application_worker_resource_failure_after_crash_stops_recovery.
Upstream MCP-host tests needing cbm_mcp_server_t were not ported; equivalent
daemon/supervisor tests cover the behaviour.
- src/operations/index.c raw allocator sites 56 -> 46 via index_release_text;
memory-core baseline lowered accordingly.
Checks: build-dev.sh and build/c/test-runner compile with -Werror;
lint-memory-core passes (3201 raw sites, none grew); strict Actions policy
passes; index_supervisor suite 21/21; six daemon_application worker-policy
and resource-failure tests 6/6; no fork-defined function lost.
Copy file name to clipboardExpand all lines: docs/CONFIGURATION.md
+7-3Lines changed: 7 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -98,6 +98,8 @@ Current keys:
98
98
|`watcher_enabled`|`true`| Master switch for the retained background watcher subsystem. Set `false` to stop its poll thread/project registration. Reindex manually with `codebase-memory-cli index` when disabled. |
99
99
|`index_max_files`|`off`| Optional maximum number of accepted source files in one discovery run. |
100
100
|`index_max_source_mb`|`off`| Optional maximum accepted source size in MiB in one discovery run. |
101
+
|`index_max_rss_mb`|`off`| Optional maximum charged memory in MiB for the complete contained index-worker process tree (`64..1048576`). On macOS this is phys_footprint, not resident size. |
102
+
|`index_max_duration_seconds`|`off`| Optional maximum wall-clock duration in seconds for the whole index request, including crash/hang recovery (`1..86400`). Like `index_max_rss_mb`, it stops a worker only before it starts to publish the new index; see [INDEX_RESOURCE_LIMITS.md](INDEX_RESOURCE_LIMITS.md). |
101
103
102
104
> **`watcher_enabled` vs `auto_watch`.**`watcher_enabled` controls whether the
103
105
> retained watcher subsystem starts at all. `auto_watch` is narrower: it controls
@@ -109,11 +111,13 @@ Current keys:
109
111
> value. Disabling the watcher does not disable explicit `index`, `search`,
110
112
> `trace`, `snippet`, or `coverage` commands.
111
113
112
-
The two`index_max_*` settings are independent and disabled by default. They
114
+
The four`index_max_*` settings are independent and disabled by default. They
113
115
apply to explicit indexing, automatic indexing, and watcher re-indexing, but not
114
116
to `cross-repo-intelligence`, which does not scan repository source files.
115
-
Equality is allowed; exceeding either setting fails the complete index request
116
-
and preserves any previously serving database. See
117
+
Equality is allowed; exceeding any setting fails the complete index request and
118
+
preserves any previously serving database. Worker RSS covers descendants and is
119
+
not the same as the internal `CBM_MEM_BUDGET_MB` allocation budget. Total
120
+
duration is independent of the existing 15-minute no-log-progress timeout. See
117
121
[Index resource limits](INDEX_RESOURCE_LIMITS.md) for counting, validation, and
0 commit comments