Skip to content

Local code intelligence for developers and AI agents. Connect code, docs and infrastructure in a persistent graph, with CBM Lens, MCP tools, agent integrations and change-aware test selection.

Merge main into external import shadow fix

Martin Vogel884bf9917d4d
diff --cc src/pipeline/pass_calls.c
index f80be332e,f3570904d..61a72f141
--- a/src/pipeline/pass_calls.c
+++ b/src/pipeline/pass_calls.c
@@@ -1168,9 -1159,9 +1168,12 @@@ static int resolve_single_call(cbm_pipe
(lang == CBM_LANG_PYTHON && cbm_suppress_weak_import_bound_call(true, true, res.strategy) &&
cbm_python_import_binding_contradicts(imports, call->callee_name, res.qualified_name,
ctx->gbuf, ctx->project_name, rel)) ||
+ cbm_suppress_external_import_shadow(call->callee_name, res.strategy, imports, imp_keys,
+ imp_count, cbm_pipeline_get_pkgmap(),
- cbm_pipeline_get_nsmap());
++ cbm_pipeline_get_nsmap()) ||
+ /* MUST match pass_parallel.c exactly. */
+ (lang == CBM_LANG_PHP && cbm_suppress_weak_member_match(true, true, res.strategy) &&
+ cbm_pipeline_php_receiver_type_unindexed(lsp_calls, call, ctx->registry));
/* Service-pattern HTTP/ASYNC calls to an EXTERNAL client library (e.g.
* `requests.get("/api/orders/{id}")`) resolve to a QN containing the library
diff --cc src/pipeline/pass_parallel.c
index 3aadeb4dc,73ce742ad..988da3060
--- a/src/pipeline/pass_parallel.c
+++ b/src/pipeline/pass_parallel.c
@@@ -3431,9 -3422,9 +3431,12 @@@ static void resolve_file_calls(resolve_
cbm_python_import_binding_contradicts(&result->imports, call->callee_name,
res.qualified_name, rc->main_gbuf,
rc->project_name, rel)) ||
+ cbm_suppress_external_import_shadow(call->callee_name, res.strategy, &result->imports,
+ imp_keys, imp_count, cbm_pipeline_get_pkgmap(),
- cbm_pipeline_get_nsmap());
++ cbm_pipeline_get_nsmap()) ||
+ /* MUST match pass_calls.c exactly. */
+ (lang == CBM_LANG_PHP && cbm_suppress_weak_member_match(true, true, res.strategy) &&
+ cbm_pipeline_php_receiver_type_unindexed(&result->resolved_calls, call, rc->registry));
/* Service-pattern HTTP/ASYNC client call (`requests.get(url)`): the
* service signal lives in the callee_name. The registry can mis-resolve