Keep five-slice regression changes scoped to their fixtures

Author: ngallodev

tests/test_cli.c

@@ -4297,7 +4297,7 @@ TEST(cli_cline_data_dir_only_redirects_data_state) {
     }
     free(plan);
 
-    int install_rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-mcp", false, false);
+    int install_rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-cli", false, false);
     struct stat state;
     const char *const instruction_terms[] = {"Codebase Memory", "codebase-memory-cli search",
                                              "codebase-memory-cli trace"};
@@ -4474,7 +4474,7 @@ TEST(cli_junie_current_durable_context_contract) {
     yyjson_doc_free(plan_doc);
     free(plan);
 
-    int first_rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-mcp", false, false);
+    int first_rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-cli", false, false);
     char *skill_once = read_test_file_alloc(skill_path);
     char *agent_after_install = read_test_file_alloc(agent_path);
     char *settings_after_install = read_test_file_alloc(settings_path);
@@ -4488,7 +4488,7 @@ TEST(cli_junie_current_durable_context_contract) {
     free(agent_after_install);
     free(settings_after_install);
 
-    int second_rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-mcp", false, false);
+    int second_rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-cli", false, false);
     char *skill_twice = read_test_file_alloc(skill_path);
     bool idempotent =
         second_rc == 0 && skill_once && skill_twice && strcmp(skill_once, skill_twice) == 0;
@@ -4506,7 +4506,7 @@ TEST(cli_junie_current_durable_context_contract) {
     free(agent_after_uninstall);
     free(settings_after_uninstall);
 
-    int reinstall_rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-mcp", false, false);
+    int reinstall_rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-cli", false, false);
     const char *modified_skill = "---\nname: codebase-memory\n---\nUser-owned Junie skill.\n";
     write_test_file(skill_path, modified_skill);
     int modified_uninstall_rc = cli_test_cmd_uninstall(2, argv);
@@ -8447,7 +8447,7 @@ TEST(cli_upgrade_migrates_released_claude_hook_scripts) {
     cbm_setenv("PATH", tmpdir, 1);
     cbm_unsetenv("CLAUDE_CONFIG_DIR");
     cbm_unsetenv("CODEX_HOME");
-    int rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-mcp", false, false);
+    int rc = cbm_install_agent_configs(tmpdir, "/opt/codebase-memory-cli", false, false);
 
     char *gate = read_test_file_alloc(gate_path);
     char *session = read_test_file_alloc(session_path);

tests/test_daemon_application.c

@@ -169,16 +169,12 @@ static cbm_daemon_runtime_application_status_t app_test_request(
 
 static bool app_test_response_contains(const uint8_t *response, uint32_t response_length,
                                        const char *needle) {
-    if (!response || !needle)
-        return false;
+    if (!response || !needle) return false;
     size_t needle_length = strlen(needle);
-    if (needle_length == 0)
-        return true;
-    if (needle_length > response_length)
-        return false;
+    if (needle_length == 0) return true;
+    if (needle_length > response_length) return false;
     for (uint32_t i = 0; i <= response_length - needle_length; i++) {
-        if (memcmp(response + i, needle, needle_length) == 0)
-            return true;
+        if (memcmp(response + i, needle, needle_length) == 0) return true;
     }
     return false;
 }
@@ -686,8 +682,8 @@ TEST(daemon_application_requires_immutable_explicit_context) {
     uint8_t *response = NULL;
     uint32_t response_length = 0;
     bool operation_ok = app_test_tool_request("projects", "{}", &operation, &operation_length);
-    cbm_daemon_runtime_application_status_t before = app_test_request(
-        &callbacks, session, operation, operation_length, &response, &response_length);
+    cbm_daemon_runtime_application_status_t before =
+        app_test_request(&callbacks, session, operation, operation_length, &response, &response_length);
     free(response);
     response = NULL;
     bool context_ok = root_ok && app_test_context_request(root, root, &context, &context_length);
@@ -703,8 +699,8 @@ TEST(daemon_application_requires_immutable_explicit_context) {
                    : CBM_DAEMON_RUNTIME_APPLICATION_TRANSPORT_ERROR;
     free(response);
     response = NULL;
-    cbm_daemon_runtime_application_status_t after = app_test_request(
-        &callbacks, session, operation, operation_length, &response, &response_length);
+    cbm_daemon_runtime_application_status_t after =
+        app_test_request(&callbacks, session, operation, operation_length, &response, &response_length);
     bool operation_response = response && response_length > 1 && response[0] == 0;
 
     callbacks.session_close(callbacks.context, session);
@@ -777,11 +773,11 @@ TEST(daemon_application_hook_context_preserves_event_and_dialect) {
     (void)snprintf(input, sizeof(input), "{\"cwd\":\"%s\"}", root);
     uint8_t *hook = NULL;
     uint32_t hook_length = 0;
-    bool encoded = root_ok && session &&
-                   app_test_context_request_options(root, root, "SessionStart", "copilot", &context,
-                                                    &context_length) &&
-                   app_test_text_request(CBM_DAEMON_APPLICATION_REQUEST_HOOK_AUGMENT, input, &hook,
-                                         &hook_length);
+    bool encoded =
+        root_ok && session &&
+        app_test_context_request_options(root, root, "SessionStart", "copilot", &context, &context_length) &&
+        app_test_text_request(CBM_DAEMON_APPLICATION_REQUEST_HOOK_AUGMENT, input, &hook,
+                              &hook_length);
     uint8_t *response = NULL;
     uint32_t response_length = 0;
     cbm_daemon_runtime_application_status_t context_status =
@@ -1623,22 +1619,23 @@ static bool app_env_backup_restore(app_env_backup_t *backup) {
     return status == 0;
 }
 
-static bool app_test_initialize_session(const cbm_daemon_runtime_application_callbacks_t *callbacks,
-                                        cbm_daemon_runtime_application_session_t *session,
-                                        const char *root, const char *hook_event,
-                                        const char *hook_dialect) {
+static bool app_test_initialize_session(
+    const cbm_daemon_runtime_application_callbacks_t *callbacks,
+    cbm_daemon_runtime_application_session_t *session, const char *root,
+    const char *hook_event, const char *hook_dialect) {
     uint8_t *context = NULL;
     uint32_t context_length = 0;
-    bool encoded = session && app_test_context_request_options(root, root, hook_event, hook_dialect,
-                                                               &context, &context_length);
+    bool encoded = session &&
+                   app_test_context_request_options(root, root, hook_event, hook_dialect,
+                                                    &context, &context_length);
     uint8_t *response = NULL;
     uint32_t response_length = 0;
     cbm_daemon_runtime_application_status_t status =
         encoded ? app_test_request(callbacks, session, context, context_length, &response,
                                    &response_length)
                 : CBM_DAEMON_RUNTIME_APPLICATION_TRANSPORT_ERROR;
-    bool initialized =
-        status == CBM_DAEMON_RUNTIME_APPLICATION_OK && response == NULL && response_length == 0;
+    bool initialized = status == CBM_DAEMON_RUNTIME_APPLICATION_OK && response == NULL &&
+                       response_length == 0;
     free(response);
     free(context);
     return initialized;
@@ -1679,9 +1676,9 @@ static cbm_daemon_runtime_application_status_t app_test_list_projects(
     return status;
 }
 
-/* Regression contract: neutral context establishment is the ownership boundary for daemon
- * background indexing. Hook sessions do not participate; identical roots share one physical worker
- * but retain one subscription per live session. */
+/* Regression contract: neutral context establishment is the ownership boundary for daemon background
+ * indexing. Hook sessions do not participate; identical roots share
+ * one physical worker but retain one subscription per live session. */
 TEST(daemon_application_initialize_coalesces_auto_index_for_full_sessions) {
     app_env_backup_t cache_environment;
     bool cache_saved = app_env_backup_capture(&cache_environment, "CBM_CACHE_DIR");
@@ -1723,21 +1720,20 @@ TEST(daemon_application_initialize_coalesces_auto_index_for_full_sessions) {
     }
 
     int bg_baseline = cbm_daemon_application_background_initializes_for_test();
-    bool hook_only_initialized =
-        app_test_initialize_session(&callbacks, sessions[2], root, "SessionStart", "copilot");
-    bool hook_initialized =
-        app_test_initialize_session(&callbacks, sessions[3], root, "SessionStart", "copilot");
+    bool hook_only_initialized = app_test_initialize_session(&callbacks, sessions[2], root, "SessionStart", "copilot");
+    bool hook_initialized = app_test_initialize_session(
+        &callbacks, sessions[3], root, "SessionStart", "copilot");
     bool admissions_evaluated = app_wait_for_background_initializes(bg_baseline + 2);
     bool restricted_started_nothing =
         admissions_evaluated && atomic_load(&fake.starts) == 0 && application && project &&
-        cbm_daemon_application_job_subscribers(application, project) == 0 && true;
+        cbm_daemon_application_job_subscribers(application, project) == 0 &&
+        true;
 
     bool first_initialized = app_test_initialize_session(&callbacks, sessions[0], root, NULL, NULL);
     bool first_owned = first_initialized && project &&
                        app_wait_for_subscribers(application, project, 1) &&
                        app_wait_for_atomic_int(&fake.starts, 1);
-    bool second_initialized =
-        app_test_initialize_session(&callbacks, sessions[1], root, NULL, NULL);
+    bool second_initialized = app_test_initialize_session(&callbacks, sessions[1], root, NULL, NULL);
     bool coalesced = first_owned && second_initialized && project &&
                      app_wait_for_subscribers(application, project, 2) &&
                      cbm_daemon_application_active_jobs(application) == 1 &&
@@ -1870,15 +1866,14 @@ TEST(daemon_application_sensitive_root_blocks_auto_index_but_preserves_controls)
         application ? app_test_open(&callbacks, 4032) : NULL;
 
     int background_baseline = cbm_daemon_application_background_initializes_for_test();
-    bool sensitive_initialized =
-        app_test_initialize_session(&callbacks, sensitive_session, sensitive, NULL, NULL);
+    bool sensitive_initialized = app_test_initialize_session(
+        &callbacks, sensitive_session, sensitive, NULL, NULL);
     bool sensitive_evaluated = app_wait_for_background_initializes(background_baseline + 1);
     bool sensitive_blocked = sensitive_initialized && sensitive_evaluated &&
                              atomic_load(&fake.starts) == 0 &&
                              cbm_daemon_application_active_jobs(application) == 0;
 
-    bool ordinary_initialized =
-        app_test_initialize_session(&callbacks, ordinary_session, ordinary, NULL, NULL);
+    bool ordinary_initialized = app_test_initialize_session(&callbacks, ordinary_session, ordinary, NULL, NULL);
     bool ordinary_admitted = ordinary_initialized && app_wait_for_atomic_int(&fake.starts, 1) &&
                              cbm_daemon_application_active_jobs(application) == 1;
     if (ordinary_session) {
@@ -1894,8 +1889,7 @@ TEST(daemon_application_sensitive_root_blocks_auto_index_but_preserves_controls)
     bool approved = ordinary_reaped && cbm_workspace_grant_add(cache, sensitive, sensitive, true,
                                                                grant_error, sizeof(grant_error));
     bool approved_initialized =
-        approved &&
-        app_test_initialize_session(&callbacks, approved_session, sensitive, NULL, NULL);
+        approved && app_test_initialize_session(&callbacks, approved_session, sensitive, NULL, NULL);
     bool approved_admitted = approved_initialized && app_wait_for_atomic_int(&fake.starts, 2) &&
                              cbm_daemon_application_active_jobs(application) == 1;
 
@@ -2004,11 +1998,10 @@ TEST(daemon_application_sensitive_root_blocks_watch_but_preserves_controls) {
     cbm_daemon_runtime_application_session_t *approved_session =
         application ? app_test_open(&callbacks, 4035) : NULL;
 
-    bool sensitive_initialized =
-        app_test_initialize_session(&callbacks, sensitive_session, sensitive, NULL, NULL);
+    bool sensitive_initialized = app_test_initialize_session(
+        &callbacks, sensitive_session, sensitive, NULL, NULL);
     bool sensitive_blocked = sensitive_initialized && cbm_watcher_watch_count(watcher) == 0;
-    bool ordinary_initialized =
-        app_test_initialize_session(&callbacks, ordinary_session, ordinary, NULL, NULL);
+    bool ordinary_initialized = app_test_initialize_session(&callbacks, ordinary_session, ordinary, NULL, NULL);
     bool ordinary_watched = ordinary_initialized && cbm_watcher_watch_count(watcher) == 1;
     if (ordinary_session) {
         callbacks.session_close(callbacks.context, ordinary_session);
@@ -2020,8 +2013,7 @@ TEST(daemon_application_sensitive_root_blocks_watch_but_preserves_controls) {
     bool approved = ordinary_released && cbm_workspace_grant_add(cache, sensitive, sensitive, true,
                                                                  grant_error, sizeof(grant_error));
     bool approved_initialized =
-        approved &&
-        app_test_initialize_session(&callbacks, approved_session, sensitive, NULL, NULL);
+        approved && app_test_initialize_session(&callbacks, approved_session, sensitive, NULL, NULL);
     bool approved_watched = approved_initialized && cbm_watcher_watch_count(watcher) == 1;
 
     if (sensitive_session) {
@@ -2263,8 +2255,8 @@ TEST(daemon_application_auto_index_retries_transient_busy_admission) {
     cbm_daemon_runtime_application_session_t *session =
         application ? app_test_open(&callbacks, 4191) : NULL;
     int bg_baseline = cbm_daemon_application_background_initializes_for_test();
-    bool initialized = occupied_admitted &&
-                       app_test_initialize_session(&callbacks, session, auto_root, NULL, NULL);
+    bool initialized =
+        occupied_admitted && app_test_initialize_session(&callbacks, session, auto_root, NULL, NULL);
     bool admission_evaluated = app_wait_for_background_initializes(bg_baseline + 1);
     bool initially_deferred = initialized && admission_evaluated && atomic_load(&fake.starts) == 1;
 
@@ -2404,12 +2396,8 @@ TEST(daemon_application_coalesces_semantically_identical_index_requests) {
     ASSERT_EQ(atomic_load(&fake.destroys), 1);
     ASSERT_EQ(requests[0].status, CBM_DAEMON_RUNTIME_APPLICATION_OK);
     ASSERT_EQ(requests[1].status, CBM_DAEMON_RUNTIME_APPLICATION_OK);
-    ASSERT_TRUE(
-        requests[0].response &&
-        app_test_response_contains(requests[0].response, requests[0].response_length, "indexed"));
-    ASSERT_TRUE(
-        requests[1].response &&
-        app_test_response_contains(requests[1].response, requests[1].response_length, "indexed"));
+    ASSERT_TRUE(requests[0].response && app_test_response_contains(requests[0].response, requests[0].response_length, "indexed"));
+    ASSERT_TRUE(requests[1].response && app_test_response_contains(requests[1].response, requests[1].response_length, "indexed"));
 
     free(requests[0].response);
     free(requests[1].response);
@@ -2539,9 +2527,7 @@ TEST(daemon_application_fresh_request_does_not_reuse_terminal_subscribed_job) {
     ASSERT_TRUE(stopped);
     for (size_t i = 0; i < PRIOR_SUBSCRIBERS; i++) {
         ASSERT_EQ(prior[i].status, CBM_DAEMON_RUNTIME_APPLICATION_OK);
-        ASSERT_TRUE(prior[i].response &&
-                    app_test_response_contains(prior[i].response, prior[i].response_length,
-                                               "stale-generation"));
+        ASSERT_TRUE(prior[i].response && app_test_response_contains(prior[i].response, prior[i].response_length, "stale-generation"));
         free(prior[i].response);
     }
 
@@ -2641,8 +2627,7 @@ TEST(daemon_application_request_cancel_detaches_only_one_coalesced_subscriber) {
     bool stopped = application && cbm_daemon_application_shutdown(application, APP_TEST_TIMEOUT_MS);
     cbm_daemon_application_free(application);
     bool second_indexed =
-        requests[1].response &&
-        app_test_response_contains(requests[1].response, requests[1].response_length, "indexed");
+        requests[1].response && app_test_response_contains(requests[1].response, requests[1].response_length, "indexed");
     int final_cancels = atomic_load(&fake.cancels);
     int final_starts = atomic_load(&fake.starts);
     int final_destroys = atomic_load(&fake.destroys);
@@ -3567,8 +3552,7 @@ TEST(daemon_application_serializes_adr_mutation_with_index_job) {
     bool stopped = application && cbm_daemon_application_shutdown(application, APP_TEST_TIMEOUT_MS);
     cbm_daemon_application_free(application);
     bool adr_response_updated =
-        adr_request.response &&
-        app_test_response_contains(adr_request.response, adr_request.response_length, "updated");
+        adr_request.response && app_test_response_contains(adr_request.response, adr_request.response_length, "updated");
 
     free(index_request.response);
     free(adr_request.response);
@@ -4568,11 +4552,9 @@ TEST(daemon_application_queues_explicit_index_behind_physical_job_limit) {
      * admitted and complete on its own. */
     atomic_store(&fake.allow_completion, true);
     bool request_joined = request_started && cbm_thread_join(&request_thread) == 0;
-    bool queued_succeeded =
-        request_joined && queued.status == CBM_DAEMON_RUNTIME_APPLICATION_OK && queued.response &&
-        app_test_response_contains(queued.response, queued.response_length, "indexed") &&
-        !app_test_response_contains(queued.response, queued.response_length,
-                                    "physical index job limit");
+    bool queued_succeeded = request_joined && queued.status == CBM_DAEMON_RUNTIME_APPLICATION_OK &&
+                            queued.response && app_test_response_contains(queued.response, queued.response_length, "indexed") &&
+                            !app_test_response_contains(queued.response, queued.response_length, "physical index job limit");
 
     callbacks.session_close(callbacks.context, session);
     bool stopped = application && cbm_daemon_application_shutdown(application, APP_TEST_TIMEOUT_MS);
@@ -4735,16 +4717,20 @@ TEST(daemon_application_rejects_clean_exit_when_process_tree_is_not_contained) {
     PASS();
 }
 
+
 TEST(daemon_application_index_args_compare_repo_path_separator_equivalently) {
     ASSERT_TRUE(cbm_daemon_application_index_args_equal_for_test(
-        "{\"repo_path\":\"C:\\\\repos\\\\cbm\"}", "{\"repo_path\":\"C:/repos/cbm\"}"));
+        "{\"repo_path\":\"C:\\\\repos\\\\cbm\"}",
+        "{\"repo_path\":\"C:/repos/cbm\"}"));
     ASSERT_TRUE(cbm_daemon_application_index_args_equal_for_test(
         "{\"repo_path\":\"C:\\\\repos\\\\cbm\",\"mode\":\"full\"}",
         "{\"mode\":\"full\",\"repo_path\":\"C:/repos/cbm\"}"));
     ASSERT_FALSE(cbm_daemon_application_index_args_equal_for_test(
-        "{\"repo_path\":\"C:\\\\repos\\\\cbm\"}", "{\"repo_path\":\"C:/repos/cbm2\"}"));
+        "{\"repo_path\":\"C:\\\\repos\\\\cbm\"}",
+        "{\"repo_path\":\"C:/repos/cbm2\"}"));
     ASSERT_FALSE(cbm_daemon_application_index_args_equal_for_test(
-        "{\"repo_path\":\"C:\\\\repos\\\\cbm\"}", "{\"repo_path\":\"C:/repos/cbm/sub\"}"));
+        "{\"repo_path\":\"C:\\\\repos\\\\cbm\"}",
+        "{\"repo_path\":\"C:/repos/cbm/sub\"}"));
     ASSERT_FALSE(cbm_daemon_application_index_args_equal_for_test(
         "{\"repo_path\":\"C:\\\\repos\\\\cbm\",\"mode\":\"incremental\"}",
         "{\"repo_path\":\"C:/repos/cbm\"}"));