Repository navigation
Commit 2577a86
committed
Merge origin/main into carry/1862-install-hook-optout
Maintainer carry of DeusData#1862 (persistent install-hook opt-out, direction
approved in DeusData#753). Main's current behaviour is kept everywhere; only the
PR's intent -- persisting `install --no-hooks` / `--hooks` -- is
re-applied on top of it.
Textual conflicts:
- docs/CONFIGURATION.md: both sides appended rows to the "Current keys"
table. Kept main's `index_max_files` and `index_max_source_mb` rows
unchanged, then added the PR's `install_hooks` row after them. The PR's
explanatory paragraph follows the table, so the table stays one
contiguous block.
- src/main.c (print_help): main added a second `install` usage line for
`[--clients=<tokens>]`; the PR appended `[--hooks|--no-hooks]` to the
first line. Kept both: main's first line plus the PR's hook flags,
followed by main's `--clients` line unchanged.
Semantic conflicts (merged cleanly as text, wrong against main):
- src/cli/cli.c, install_claude_code_config() --no-hooks branch: main
now registers Claude hooks shell-free (DeusData#1733), as
`<binary> hook-augment`, and changed cbm_remove_session_hooks() to take
(settings_path, binary_path). The PR's disable path still called
cbm_remove_session_hooks(settings_path), which no longer compiles, and
used the NULL-binary cbm_remove_claude_hooks() /
cbm_remove_claude_subagent_hooks() wrappers, which do not match the
exec-form entries main installs. The disable path now calls the same
binary-aware removers as main's uninstall_claude_code():
cbm_remove_claude_hooks_with_binary(), cbm_remove_session_hooks(...,
binary_path) and cbm_remove_claude_subagent_hooks_with_binary(), all
with the binary_path the install side registers. Legacy shell-form
entries are still covered through those functions' old_commands lists.
- tests/test_cli.c,
cli_install_hooks_preference_persists_and_migrates_owned_state: the
settings.json checks looked for "cbm-code-discovery-gate", but main no
longer writes that name into settings.json (main's own
cli_claude_hook_commands_use_exec_form_with_custom_config_dir asserts it
is absent). The presence checks would be RED and the absence checks
would pass without testing anything. They now use "hook-augment", the
owned marker main's tests use. The script-file checks are unchanged,
because main still writes the shim scripts.
- scripts/smoke-test.sh 8e-i: same stale marker. The --no-hooks check
now also rejects "hook-augment" in settings.json, and the --hooks check
requires it. Both checks use "$GATE_SCRIPT" (set per platform in 8e)
in place of the extensionless shim path, which on Windows (.cmd) could
never exist and so checked nothing there.
Everything else (cli.c hook gating, cli.h key, README, CONFIG_KEYS
table, test registrations) auto-merged against main without change.
Signed-off-by: Martin Vogel <[email protected]>397 files changed
Lines changed: 62182 additions & 8804 deletions
File tree
- .github/workflows
- docs
- graph-ui
- src
- components
- hooks
- internal/cbm
- lsp
- vendored/grammars
- properties
- swift
- pkg
- chocolatey
- tools
- go/cmd/codebase-memory-mcp
- npm
- pypi
- src/codebase_memory_mcp
- scripts
- ci
- hooks
- src
- cli
- cypher
- daemon
- discover
- foundation
- graph_buffer
- mcp
- pipeline
- semantic
- simhash
- store
- traces
- ui
- watcher
- test-infrastructure
- vm
- tests
- fixtures/complexity_pass_cycle_order
- fuzz
- corpus
- config
- cypher
- extract
- repro
- windows
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 | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
| 71 | + | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
75 | 75 | | |
76 | | - | |
| 76 | + | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
| 79 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
44 | 52 | | |
45 | 53 | | |
46 | 54 | | |
| |||
77 | 85 | | |
78 | 86 | | |
79 | 87 | | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
80 | 120 | | |
81 | 121 | | |
82 | | - | |
| 122 | + | |
83 | 123 | | |
84 | | - | |
| 124 | + | |
85 | 125 | | |
86 | 126 | | |
87 | 127 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
110 | 136 | | |
111 | 137 | | |
112 | 138 | | |
| |||
227 | 253 | | |
228 | 254 | | |
229 | 255 | | |
230 | | - | |
| 256 | + | |
231 | 257 | | |
232 | 258 | | |
233 | | - | |
| 259 | + | |
234 | 260 | | |
235 | | - | |
| 261 | + | |
236 | 262 | | |
237 | 263 | | |
238 | 264 | | |
| |||
247 | 273 | | |
248 | 274 | | |
249 | 275 | | |
250 | | - | |
| 276 | + | |
251 | 277 | | |
252 | 278 | | |
253 | 279 | | |
254 | | - | |
| 280 | + | |
255 | 281 | | |
256 | 282 | | |
257 | 283 | | |
| |||
311 | 337 | | |
312 | 338 | | |
313 | 339 | | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
314 | 346 | | |
315 | | - | |
| 347 | + | |
316 | 348 | | |
317 | 349 | | |
318 | 350 | | |
| |||
327 | 359 | | |
328 | 360 | | |
329 | 361 | | |
330 | | - | |
| 362 | + | |
331 | 363 | | |
332 | 364 | | |
333 | 365 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
0 commit comments