Merge branch 'sync/upstream-step1' into sync/upstream-step2

Author: ngallodev

scripts/hooks/pre-commit

@@ -13,7 +13,10 @@ FORMATTER="${CLANG_FORMAT:-clang-format-20}"
 FORMAT_FILES=()
 while IFS= read -r file; do
     [ -n "$file" ] && FORMAT_FILES+=("$file")
-done < <(git diff --cached --name-only --diff-filter=ACMR -- '*.c' '*.h')
+# Vendored sources are pinned by scripts/vendored-checksums.txt and must stay
+# byte-identical to upstream, so they are never reformatted.
+done < <(git diff --cached --name-only --diff-filter=ACMR -- '*.c' '*.h' \
+    ':(exclude)internal/cbm/vendored/**' ':(exclude)vendored/**')
 if [ "${#FORMAT_FILES[@]}" -gt 0 ]; then
     command -v "$FORMATTER" >/dev/null 2>&1 || {
         echo "pre-commit: required formatter not found: $FORMATTER" >&2

src/daemon/application.c

@@ -923,6 +923,10 @@ static int application_max_restarts(void) {
     return (int)v;
 }
 
+int cbm_index_restart_cap_for_testing(void) {
+    return application_max_restarts();
+}
+
 static void application_attempt_init(application_attempt_t *attempt) {
     memset(attempt, 0, sizeof(*attempt));
     attempt->result.outcome = CBM_PROC_SPAWN_FAILED;

src/daemon/application.h

@@ -83,6 +83,9 @@ void cbm_daemon_application_set_permanent(cbm_daemon_application_t *application,
 /* Cancel and reap all daemon-owned operations within timeout_ms. Normal final
  * client shutdown calls this before watcher/store teardown. Idempotent. */
 bool cbm_daemon_application_shutdown(cbm_daemon_application_t *application, uint32_t timeout_ms);
+
+/* CBM_INDEX_MAX_RESTARTS as the index supervisor reads it. Test hook. */
+int cbm_index_restart_cap_for_testing(void);
 /* Destroy application storage only after every borrowed callback and physical
  * operation is quiescent. Returns false without freeing anything when the
  * timeout expires; the caller must retain both the application and every