Merge remote-tracking branch 'origin/main' into HEAD

# Conflicts:
#	tests/test_lang_contract.c

Author: DeusData

src/cypher/cypher.c

@@ -181,6 +181,13 @@ typedef struct {
     int rel_count;
 } cbm_pattern_t;
 
+/* One argument to a multi-argument scalar function (coalesce, substring, ...). */
+typedef struct {
+    const char *variable; /* variable reference (NULL if a literal) */
+    const char *property; /* property of the variable (NULL if whole var / literal) */
+    const char *literal;  /* literal string/number text (NULL if a variable ref) */
+} cbm_func_arg_t;
+
 /* WHERE condition */
 typedef struct {
     const char *variable;
@@ -198,6 +205,11 @@ typedef struct {
      * anchor, `value` the edge type (NULL = any), `exists_dir` the direction
      * (0 = outbound, 1 = inbound, 2 = any). */
     int exists_dir;
+    /* Multi-arg scalar function on the LHS, e.g. coalesce(f.depth, 0) >= 2
+     * (#874). NULL func = plain variable/property LHS. */
+    const char *func;
+    cbm_func_arg_t *args;
+    int arg_count;
 } cbm_condition_t;
 
 /* Expression tree for WHERE clause */
@@ -237,13 +249,6 @@ typedef struct {
     const char *else_val; /* NULL if no ELSE */
 } cbm_case_expr_t;
 
-/* One argument to a multi-argument scalar function (coalesce, substring, ...). */
-typedef struct {
-    const char *variable; /* variable reference (NULL if a literal) */
-    const char *property; /* property of the variable (NULL if whole var / literal) */
-    const char *literal;  /* literal string/number text (NULL if a variable ref) */
-} cbm_func_arg_t;
-
 /* RETURN item */
 typedef struct {
     const char *variable;
@@ -332,4 +337,9 @@ int cbm_cypher_parse(const char *query, cbm_query_t **out, char **error);
 /* Free a query AST. */
 void cbm_query_free(cbm_query_t *q);
 
+/* Test-only (#601): force the wall-clock execution budget in milliseconds for
+ * subsequent queries on the calling thread. 0 = trip on the first hot-loop
+ * check; a negative value restores the default budget. */
+void cbm_cypher_test_set_deadline_ms(int64_t budget_ms);
+
 #endif /* CBM_CYPHER_H */

src/cypher/cypher.h

@@ -95,7 +95,7 @@ static cbm_system_info_t detect_system_bsd(void) {
     info.total_cores = nprocs > 0 ? (int)nprocs : 1;
     info.perf_cores = info.total_cores;
 
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
     int mib[2] = {CTL_HW, HW_PHYSMEM};
 #else
     int mib[2] = {CTL_HW, HW_PHYSMEM64};

src/foundation/system_info.c

@@ -117,7 +117,19 @@ char *cbm_pipeline_fqn_compute(const char *project, const char *rel_path, const
 
     char *path = strdup(rel_path ? rel_path : "");
     cbm_normalize_path_sep(path);
-    strip_file_extension(path);
+    /* #1077/#964: File-node QNs (name=="__file__") must preserve the full
+     * filename so sibling files sharing a stem get DISTINCT nodes — e.g.
+     * .env / .env.local / .env.production (which all strip to ".env" and
+     * collide, so only one survives per directory), and a C/C++ header vs
+     * its same-stem .cpp. Extension stripping stays for MODULE/symbol QNs
+     * (name==NULL or a symbol): that stem unification is load-bearing for
+     * C/C++ declaration↔definition cross-file resolution. All 26 __file__
+     * QN sites route through here, so creation and every lookup stay
+     * consistent. */
+    bool is_file_qn = name && strcmp(name, "__file__") == 0;
+    if (!is_file_qn) {
+        strip_file_extension(path);
+    }
 
     const char *segments[CBM_SZ_256];
     int seg_count = 0;

src/pipeline/fqn.c

@@ -615,6 +615,47 @@ static bool is_infra_file(const char *fp) {
             strstr(fp, ".tf") != NULL || strstr(fp, ".hcl") != NULL || strstr(fp, ".toml") != NULL);
 }
 
+/* CI/tooling configs describe the development TOOLCHAIN — their URLs are
+ * repository/action/registry references, never endpoints this service
+ * exposes. Minting infra Route nodes from them lets the route matcher's
+ * root-service heuristic attach every handler of an ambiguous "/" route to
+ * each tooling URL (junk HANDLES churn on plain pallets/flask, #999).
+ * Deny by file identity, not URL shape: deployment configs (Cloud
+ * Scheduler, compose) keep minting their genuine endpoints. */
+static bool is_ci_tooling_config(const char *fp) {
+    if (!fp) {
+        return false;
+    }
+    if (strstr(fp, ".github/") != NULL || strstr(fp, ".gitlab/") != NULL ||
+        strstr(fp, ".circleci/") != NULL) {
+        return true;
+    }
+    const char *slash = strrchr(fp, '/');
+    const char *base = slash ? slash + 1 : fp;
+    static const char *const tooling[] = {".pre-commit-config.yaml",
+                                          ".pre-commit-hooks.yaml",
+                                          ".gitlab-ci.yml",
+                                          ".travis.yml",
+                                          "azure-pipelines.yml",
+                                          "appveyor.yml",
+                                          "bitbucket-pipelines.yml",
+                                          ".readthedocs.yaml",
+                                          ".readthedocs.yml",
+                                          "codecov.yml",
+                                          ".codecov.yml",
+                                          ".goreleaser.yaml",
+                                          ".goreleaser.yml",
+                                          ".golangci.yml",
+                                          ".golangci.yaml",
+                                          NULL};
+    for (int i = 0; tooling[i]; i++) {
+        if (strcmp(base, tooling[i]) == 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
 /* True when a YAML key path denotes an UPSTREAM dependency, CONFIG value, or
  * HEALTHCHECK target rather than an endpoint this service exposes. Such URLs
  * (auth JWKS, downstream service base URLs, package-registry URLs, healthcheck
@@ -683,7 +724,8 @@ static void cbm_pipeline_extract_infra_routes(cbm_gbuf_t *gbuf, const cbm_file_i
     CBMHashTable *denied = cbm_ht_create(16);
     for (int pass = 0; pass < 2; pass++) {
         for (int i = 0; i < file_count; i++) {
-            if (!result_cache[i] || !is_infra_file(files[i].rel_path)) {
+            if (!result_cache[i] || !is_infra_file(files[i].rel_path) ||
+                is_ci_tooling_config(files[i].rel_path)) {
                 continue;
             }
             for (int si = 0; si < result_cache[i]->string_refs.count; si++) {

src/pipeline/pipeline.c

@@ -60,26 +60,36 @@ static int r964_file_node_exists(cbm_store_t *store, const char *project, const
     return found;
 }
 
-/* Count inbound IMPORTS edges whose TARGET node name is exactly `name`. */
-static int r964_inbound_imports(cbm_store_t *store, const char *project, const char *name) {
-    cbm_edge_t *edges = NULL;
-    int n = 0;
-    if (cbm_store_find_edges_by_type(store, project, "IMPORTS", &edges, &n) != CBM_STORE_OK)
-        return -1;
-    int hits = 0;
-    for (int i = 0; i < n; i++) {
-        cbm_node_t tgt;
-        if (cbm_store_find_node_by_id(store, edges[i].target_id, &tgt) != CBM_STORE_OK)
+/* Count INBOUND edges (any of the reporter's connection types) landing on the
+ * File node named `name` — the exact disconnection metric from the issue's
+ * query `NOT EXISTS { (f)<-[:IMPORTS|CALLS|CONTAINS_FILE|DEFINES|USAGE]-() }`.
+ * A header that used to have no node at all (extension-stripped QN collision)
+ * now has its own File node AND is connected (CONTAINS_FILE from its folder,
+ * plus DEFINES of the class it declares); `#include` itself resolves to the
+ * declared Class node via #983, not to the header File. */
+static int r964_file_inbound(cbm_store_t *store, const char *project, const char *name) {
+    static const char *const types[] = {"IMPORTS", "CALLS", "CONTAINS_FILE",
+                                         "DEFINES", "USAGE",  NULL};
+    int total = 0;
+    for (int t = 0; types[t]; t++) {
+        cbm_edge_t *edges = NULL;
+        int n = 0;
+        if (cbm_store_find_edges_by_type(store, project, types[t], &edges, &n) != CBM_STORE_OK)
             continue;
-        if (tgt.name && strcmp(tgt.name, name) == 0)
-            hits++;
-        cbm_node_free_fields(&tgt);
+        for (int i = 0; i < n; i++) {
+            cbm_node_t tgt;
+            if (cbm_store_find_node_by_id(store, edges[i].target_id, &tgt) != CBM_STORE_OK)
+                continue;
+            if (tgt.name && strcmp(tgt.name, name) == 0)
+                total++;
+            cbm_node_free_fields(&tgt);
+        }
+        cbm_store_free_edges(edges, n);
     }
-    cbm_store_free_edges(edges, n);
-    return hits;
+    return total;
 }
 
-TEST(repro_issue964_header_has_node_and_inbound_import) {
+TEST(repro_issue964_header_has_node_and_is_connected) {
     static const RFile files[] = {
         {"NodeController.h", "#pragma once\n"
                              "class NodeController {\n"
@@ -102,20 +112,20 @@ TEST(repro_issue964_header_has_node_and_inbound_import) {
     ASSERT_NOT_NULL(store);
 
     int header_node = r964_file_node_exists(store, lp.project, "NodeController.h");
-    int header_inbound = r964_inbound_imports(store, lp.project, "NodeController.h");
+    int header_inbound = r964_file_inbound(store, lp.project, "NodeController.h");
     if (!header_node || header_inbound < 1) {
         fprintf(stderr,
-                "  [964] FAIL header_file_node=%d inbound_imports=%d (header merged into "
-                "same-stem .cpp by extension-stripped QN collision)\n",
+                "  [964] FAIL header_file_node=%d inbound_edges=%d (header merged into "
+                "same-stem .cpp by extension-stripped QN collision, or left disconnected)\n",
                 header_node, header_inbound);
     }
-    ASSERT_TRUE(header_node);        /* header must keep its own File node */
-    ASSERT_TRUE(header_inbound >= 1); /* #include must land an edge on it */
+    ASSERT_TRUE(header_node);         /* header keeps its own File node (not merged) */
+    ASSERT_TRUE(header_inbound >= 1); /* and is connected (not the reporter's zero-inbound) */
 
     rh_cleanup(&lp, store);
     PASS();
 }
 
 SUITE(repro_issue964) {
-    RUN_TEST(repro_issue964_header_has_node_and_inbound_import);
+    RUN_TEST(repro_issue964_header_has_node_and_is_connected);
 }