nprasad2077/codebase-memory-mcp
1
0 Fork 0
mirror of https://github.com/DeusData/codebase-memory-mcp.git synced 2026-11-04 10:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/main into fix/1084-background-index-cpu

Browse Source 
Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
This commit is contained in:
Martin Vogel committed 2026-10-27 19:16:35 +01:00
2 parents db74648c22 83109dde52
commit a9fceeb06d
69 files changed
+3379 -386
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/pr-acknowledgement.yml
+12 -4
View File
@@ -51,17 +51,25 @@ jobs:
run: |
set -euo pipefail
MESSAGE_FILE=.github/pr-acknowledgement.md
BODY_FILE="$RUNNER_TEMP/pr-acknowledgement-body.md"
if [ ! -f "$MESSAGE_FILE" ]; then
echo "No $MESSAGE_FILE in the base tree — acknowledgements are off."
exit 0
fi
# An empty or whitespace-only file is the documented off switch.
if [ -z "$(tr -d '[:space:]' < "$MESSAGE_FILE")" ]; then
echo "$MESSAGE_FILE is blank — acknowledgements are off."
# HTML comments in the template are notes for maintainers. Posted
# verbatim they become text a reader cannot see but a tool can, and
# our own PR screening holds every comment that carries hidden text.
# Strip them (an unterminated one runs to the end, as GitHub renders
# it) so the posted body is exactly what the contributor sees.
perl -0777 -pe 's/<!--.*?(?:-->|\z)[ \t]*\n?//gs' "$MESSAGE_FILE" > "$BODY_FILE"
# A body with no visible text is the documented off switch.
if [ -z "$(tr -d '[:space:]' < "$BODY_FILE")" ]; then
echo "$MESSAGE_FILE has no visible text — acknowledgements are off."
exit 0
fi
gh pr comment "$PR_NUMBER" --repo "$REPO" --body-file "$MESSAGE_FILE"
gh pr comment "$PR_NUMBER" --repo "$REPO" --body-file "$BODY_FILE"
echo "Acknowledged PR #${PR_NUMBER}."
Makefile.cbm
+9 -2
View File
@@ -1386,6 +1386,7 @@ LLVM_BIN := $(shell brew --prefix llvm 2>/dev/null)/bin
CLANG_TIDY ?= $(shell [ -x "$(LLVM_BIN)/clang-tidy" ] && echo "$(LLVM_BIN)/clang-tidy" || echo clang-tidy)
CLANG_FORMAT ?= $(shell [ -x "$(LLVM_BIN)/clang-format" ] && echo "$(LLVM_BIN)/clang-format" || echo clang-format)
CPPCHECK ?= cppcheck
CPPCHECK_JOBS ?= 2
# macOS SDK sysroot (needed for Homebrew LLVM to find system headers)
SYSROOT = $(shell xcrun --show-sdk-path 2>/dev/null)
@@ -1410,10 +1411,16 @@ lint-tidy:
lint-tidy-diff:
@scripts/lint-tidy-diff.sh "$(CLANG_TIDY)" $(LINT_SRCS) -- $(CFLAGS_COMMON) $(SYSROOT_FLAG)
# cppcheck: complementary analysis (config in .cppcheck)
# cppcheck: complementary analysis (config in .cppcheck). A build directory
# retains whole-program analysis with parallel workers; each run owns its state.
lint-cppcheck:
@echo "=== cppcheck ==="
@$(CPPCHECK) --enable=warning,style,performance,portability \
@set -e; \
cppcheck_dir=$$(mktemp -d "$${TMPDIR:-/tmp}/cbm-cppcheck.XXXXXX"); \
trap 'status=$$?; rm -rf "$$cppcheck_dir" || :; exit "$$status"' EXIT; \
trap 'exit 129' HUP; trap 'exit 130' INT; trap 'exit 143' TERM; \
$(CPPCHECK) -j$(CPPCHECK_JOBS) --cppcheck-build-dir="$$cppcheck_dir" \
--enable=warning,style,performance,portability \
--std=c11 --language=c \
--suppressions-list=.cppcheck \
--error-exitcode=1 \
README.md
+8 -4
View File
@@ -695,14 +695,14 @@ overwrite user-modified agents.
| Agent | Activation | MCP config | Durable context / augmentation |
|-------|------------|------------|--------------------------------|
| Claude Code | Detected | `~/.claude.json` | Skill + three exact-tool graph agents; `SessionStart`, `SubagentStart`, non-blocking `PreToolUse` for `Grep`/`Glob`/`Bash`, and post-`Read` coverage |
| Codex CLI | Detected | `$CODEX_HOME/config.toml` | Managed `AGENTS.md` activation pointer, skill, three read-only agents; `SessionStart` + `SubagentStart` |
| Codex CLI | Detected | `$CODEX_HOME/config.toml` | Managed `AGENTS.md` activation pointer, skill, three read-only agents; `SessionStart` + `SubagentStart`, `PreToolUse` graph lookup for `Bash` searches |
| Gemini CLI | Detected | `.gemini/settings.json` | `GEMINI.md`, three explicit read/graph-tool subagents; `BeforeTool`, `AfterTool` `read_file` coverage, and `SessionStart` |
| Zed | Detected | platform `settings.json` (JSONC) | `AGENTS.md` + shared skill |
| OpenCode | Detected | `$OPENCODE_CONFIG` or resolved global config | `AGENTS.md`, skill, three deny-by-default read-only agents; plugin adds grep/glob graph lookup, post-`read` coverage, first-tool-result session context, and post-compaction reinjection |
| Antigravity | Detected | `.gemini/config/mcp_config.json` | `.gemini/GEMINI.md` |
| Aider | Detected | none | `CONVENTIONS.md` via `.aider.conf.yml` |
| KiloCode | Detected | `.config/kilo/kilo.jsonc` | Rule + three graph-tool subagents with deny-by-default permissions |
| VS Code | Detected | platform `Code/User/mcp.json` | `~/.copilot/skills`, three read-only agents, `sessionStart` + `subagentStart` |
| VS Code | Detected | platform `Code/User/mcp.json` | `~/.copilot/skills`, three read-only agents, `sessionStart` + `subagentStart`, post-search `PostToolUse` graph lookup |
| Cursor | Detected | `.cursor/mcp.json` | Skill + three read-only parent-handoff agents; context hooks withheld because session injection races and `readonly` blocks MCP |
| Windsurf | Detected | `~/.codeium/windsurf/mcp_config.json` | Always-on `global_rules.md` |
| Augment / Auggie | Detected | `~/.augment/settings.json` | Rule, three read-only handoff subagents, `SessionStart` + post-`view` coverage |
@@ -714,7 +714,7 @@ overwrite user-modified agents.
| Cline | Detected | `~/.cline/mcp.json` + `${CLINE_DATA_DIR:-~/.cline/data}/settings/cline_mcp_settings.json` | Rule + skill; automatic file hooks withheld because they auto-activate and their output is not reliably consumed; child agents cannot use MCP |
| Warp | Detected, skill only | UI, Warp Drive, or per invocation (manual) | Shared `~/.agents/skills/codebase-memory/SKILL.md` |
| Qwen Code | Detected | `.qwen/settings.json` | `QWEN.md`, skill, three explicit read/graph-tool agents; `SessionStart`, `SubagentStart`, and post-`ReadFile` coverage |
| GitHub Copilot CLI | Detected | `$COPILOT_HOME/mcp-config.json` | Instructions, skill, three read-only agents; `sessionStart` + `subagentStart` |
| GitHub Copilot CLI | Detected | `$COPILOT_HOME/mcp-config.json` | Instructions, skill, three read-only agents; `sessionStart` + `subagentStart`, post-search `PostToolUse` graph lookup |
| Factory Droid | Detected | `.factory/mcp.json` | `AGENTS.md`, skill, three droids with exact per-tier graph-tool lists (without additive whole-server exposure); `SessionStart` + post-`Read` coverage on macOS/Linux, withheld on Windows |
| Crush | Detected | `.config/crush/crush.json` | Managed context path with explicit parent-to-child handoff |
| Goose | Detected | `.config/goose/config.yaml` | `.goosehints` |
@@ -751,7 +751,11 @@ Hooks installed by this project are fail-open and context-only. Claude Code's
`PreToolUse` observes `Grep`/`Glob`/`Bash` and injects matching graph symbols as
`additionalContext`; `PostToolUse` on `Read` adds targeted coverage context when
the graph could not fully parse or index that file. It never denies or replaces
the requested tool call.
the requested tool call. Codex CLI's `PreToolUse` on `Bash` gives its shell
searches the same context. GitHub Copilot CLI and VS Code's Copilot runtime get
it after the search: their `preToolUse` can only decide permissions, so a
`PostToolUse` entry for `Bash`, `Grep` and `Glob` appends the graph symbols to
the tool result.
Claude Code, Codex CLI, Qwen Code, GitHub Copilot CLI, and VS Code's Copilot
runtime receive paired session/subagent context where the vendor exposes a
install.ps1
+32 -3
View File
@@ -277,8 +277,20 @@ try {
# Validate the zip namespace before extraction. Windows paths are
# case-insensitive, so two entries that differ only in case are ambiguous and
# must never be allowed to overwrite each other. The official five entries are
# must never be allowed to overwrite each other. The official four entries are
# required at the archive root with their exact release names.
#
# Two failure classes are reported differently (both still exit 1; nothing is
# relaxed). An unsafe entry path or a duplicate/case-conflicting entry is a
# hostile archive shape. A well-formed archive whose root file SET differs from
# $WindowsArchiveNames already passed checksum verification above, so it is
# the published artifact for $BaseUrl -- the usual cause is this script being
# newer or older than that release (e.g. install.ps1 run from main ahead of
# the latest release, #1218). Calling that "unsafe" sends the user hunting for
# tampering that is not there. Every entry is screened for the hostile class
# BEFORE any layout verdict, so a bad path can never hide behind a layout
# message just because an unexpected entry happened to come first.
$LayoutMismatch = $false
try {
Add-Type -AssemblyName System.IO.Compression.FileSystem
$zip = [System.IO.Compression.ZipFile]::OpenRead("$TmpDir\$Archive")
@@ -286,6 +298,7 @@ try {
$seen = New-Object 'System.Collections.Generic.HashSet[string]' ([System.StringComparer]::OrdinalIgnoreCase)
$archiveCounts = @{}
foreach ($archiveName in $WindowsArchiveNames) { $archiveCounts[$archiveName] = 0 }
$layoutProblem = $null
foreach ($entry in $zip.Entries) {
$entryName = $entry.FullName.Replace('\', '/')
$isDirectory = $entryName.EndsWith('/')
@@ -304,10 +317,16 @@ try {
throw "duplicate or case-conflicting zip entry: $($entry.FullName)"
}
if (-not ($WindowsArchiveNames -ccontains $entryName) -or $isDirectory) {
throw "archive contains an unexpected root entry: $($entry.FullName)"
if ($null -eq $layoutProblem) {
$layoutProblem = "archive contains an unexpected root entry: $($entry.FullName)"
}
continue
}
$archiveCounts[$entryName] = $archiveCounts[$entryName] + 1
}
# Every entry passed the hostile-shape checks; only now judge the layout.
$LayoutMismatch = $true
if ($null -ne $layoutProblem) { throw $layoutProblem }
foreach ($archiveName in $WindowsArchiveNames) {
if ($archiveCounts[$archiveName] -ne 1) {
throw "archive must contain exactly one $archiveName"
@@ -316,11 +335,21 @@ try {
if ($seen.Count -ne $WindowsArchiveNames.Count) {
throw "archive does not match the exact Windows release allowlist"
}
$LayoutMismatch = $false
} finally {
$zip.Dispose()
}
} catch {
Write-Host "error: unsafe or incomplete release archive: $_" -ForegroundColor Red
if ($LayoutMismatch) {
Write-Host "error: release archive layout does not match this installer: $_" -ForegroundColor Red
Write-Host " The archive matched the checksum published with it at $BaseUrl, so it is"
Write-Host " the genuine release artifact, built for a different installer version."
Write-Host " This installer expects: $($WindowsArchiveNames -join ', ')"
Write-Host " Fix: run the install.ps1 shipped inside that same release archive, or"
Write-Host " re-run this script after the next release is published."
} else {
Write-Host "error: unsafe release archive: $_" -ForegroundColor Red
}
Remove-Item -Recurse -Force $TmpDir -ErrorAction SilentlyContinue
exit 1
}
internal/cbm/extract_channels.c
+74 -11
View File
@@ -901,8 +901,42 @@ static void elixir_emit_second_arg(CBMExtractCtx *ctx, TSNode call, TSNode args,
}
}
static void elixir_process_call(CBMExtractCtx *ctx, TSNode call) {
/* tree-sitter-elixir gives a call's arguments node NO field name — its whole
* field set is key, left, operand, operator, quoted_start, quoted_end, right,
* target and value — so the generic field lookup is always null here and every
* channel below was silently skipped. extract_defs.c has carried the same
* positional fallback for the definition side since Elixir was added. */
static TSNode elixir_channel_call_args(TSNode call) {
TSNode args = ts_node_child_by_field_name(call, TS_FIELD("arguments"));
if (ts_node_is_null(args) && ts_node_child_count(call) > 1) {
args = ts_node_child(call, 1);
}
return args;
}
/* The callee of an Elixir `call`. The grammar labels it `target`; child(0) is
* the same node and is what extract_defs.c reads, so accept either. */
static TSNode elixir_channel_call_target(TSNode call) {
TSNode target = ts_node_child_by_field_name(call, TS_FIELD("target"));
if (ts_node_is_null(target) && ts_node_child_count(call) > 0) {
target = ts_node_child(call, 0);
}
return target;
}
/* Elixir def* macros. `def`/`defp` cover Phoenix channel callbacks; the macro
* forms are included because `handle_in` is generated by macros in some
* libraries. */
static bool elixir_channel_is_def_macro(const char *macro) {
if (!macro) {
return false;
}
return strcmp(macro, "def") == 0 || strcmp(macro, "defp") == 0 ||
strcmp(macro, "defmacro") == 0 || strcmp(macro, "defmacrop") == 0;
}
static void elixir_process_call(CBMExtractCtx *ctx, TSNode call) {
TSNode target = elixir_channel_call_target(call);
if (ts_node_is_null(target)) {
return;
}
@@ -911,7 +945,7 @@ static void elixir_process_call(CBMExtractCtx *ctx, TSNode call) {
return;
}
TSNode args = ts_node_child_by_field_name(call, TS_FIELD("arguments"));
TSNode args = elixir_channel_call_args(call);
if (strstr(target_text, "PubSub.broadcast") || strstr(target_text, "PubSub.local_broadcast")) {
elixir_emit_second_arg(ctx, call, args, "phoenix_pubsub", CBM_CHANNEL_EMIT);
@@ -927,10 +961,31 @@ static void elixir_process_call(CBMExtractCtx *ctx, TSNode call) {
}
}
/* Detect handle_in("event", payload, socket) — Phoenix Channel listener */
static void elixir_process_function_def(CBMExtractCtx *ctx, TSNode func_def) {
TSNode name_node = ts_node_child_by_field_name(func_def, TS_FIELD("name"));
if (ts_node_is_null(name_node)) {
/* Detect handle_in("event", payload, socket) — Phoenix Channel listener.
* `def_call` is the `call` node of a def* macro. Elixir has no `def` node type
* and no `name`/`parameters` fields: a definition is a call whose first
* argument is the head, itself a call of name(params) — wrapped in a `when`
* binary_operator when the clause carries a guard. */
static void elixir_process_function_def(CBMExtractCtx *ctx, TSNode def_call) {
TSNode args = elixir_channel_call_args(def_call);
if (ts_node_is_null(args) || ts_node_named_child_count(args) == 0) {
return;
}
TSNode head = ts_node_named_child(args, 0);
if (strcmp(ts_node_type(head), "binary_operator") == 0) {
TSNode op = ts_node_child_by_field_name(head, TS_FIELD("operator"));
TSNode left = ts_node_child_by_field_name(head, TS_FIELD("left"));
if (!ts_node_is_null(op) && !ts_node_is_null(left) &&
ts_node_end_byte(op) - ts_node_start_byte(op) == 4 &&
strncmp(ctx->source + ts_node_start_byte(op), "when", 4) == 0) {
head = left;
}
}
if (strcmp(ts_node_type(head), "call") != 0 || ts_node_child_count(head) == 0) {
return;
}
TSNode name_node = ts_node_child(head, 0);
if (ts_node_is_null(name_node) || strcmp(ts_node_type(name_node), "identifier") != 0) {
return;
}
char *name = cbm_node_text(ctx->arena, name_node, ctx->source);
@@ -938,7 +993,7 @@ static void elixir_process_function_def(CBMExtractCtx *ctx, TSNode func_def) {
return;
}
/* First parameter is the event name pattern */
TSNode params = ts_node_child_by_field_name(func_def, TS_FIELD("parameters"));
TSNode params = elixir_channel_call_args(head);
if (ts_node_is_null(params)) {
return;
}
@@ -952,7 +1007,7 @@ static void elixir_process_function_def(CBMExtractCtx *ctx, TSNode func_def) {
val = literal_from_first_child(ctx, first_param);
}
if (val) {
push_channel(ctx, val, "phoenix_channel", CBM_CHANNEL_LISTEN, func_def);
push_channel(ctx, val, "phoenix_channel", CBM_CHANNEL_LISTEN, def_call);
}
}
@@ -964,10 +1019,18 @@ static void extract_channels_elixir(CBMExtractCtx *ctx) {
while (stack.count > 0) {
TSNode node = ts_nstack_pop(&stack);
const char *kind = ts_node_type(node);
/* Everything in Elixir is a `call`, including `def`. The old dispatch
* tested for a "def" node type the grammar does not have, so the
* handle_in listener branch was unreachable. */
if (strcmp(kind, "call") == 0) {
elixir_process_call(ctx, node);
} else if (strcmp(kind, "def") == 0) {
elixir_process_function_def(ctx, node);
TSNode target = elixir_channel_call_target(node);
char *macro =
ts_node_is_null(target) ? NULL : cbm_node_text(ctx->arena, target, ctx->source);
if (elixir_channel_is_def_macro(macro)) {
elixir_process_function_def(ctx, node);
} else {
elixir_process_call(ctx, node);
}
}
uint32_t count = ts_node_child_count(node);
for (int i = (int)count - SKIP_ONE; i >= 0; i--) {
internal/cbm/lsp/py_lsp.c
+19 -9
View File
@@ -245,7 +245,7 @@ static void py_register_instance_field(PyLSPContext *ctx, const char *class_qn,
static void py_bind_for_target(PyLSPContext *ctx, TSNode left, const CBMType *elem_type);
static void py_register_lambda(PyLSPContext *ctx, const char *name, TSNode lambda_node);
static void py_register_dict_literal(PyLSPContext *ctx, const char *name, TSNode dict_node);
static TSNode py_lookup_lambda(PyLSPContext *ctx, const char *name);
static int py_lookup_lambda(PyLSPContext *ctx, const char *name);
static const char *py_lookup_dict_dispatch(PyLSPContext *ctx, const char *var, const char *key);
static void py_process_function(PyLSPContext *ctx, TSNode func_node, const char *container_qn);
static void py_process_class(PyLSPContext *ctx, TSNode class_node);
@@ -895,19 +895,21 @@ static void py_register_lambda(PyLSPContext *ctx, const char *name, TSNode lambd
}
ctx->lambdas[ctx->lambda_count].name = cbm_arena_strdup(ctx->arena, name);
ctx->lambdas[ctx->lambda_count].lambda_node = lambda_node;
ctx->lambdas[ctx->lambda_count].expanding = false;
ctx->lambda_count++;
}
static TSNode py_lookup_lambda(PyLSPContext *ctx, const char *name) {
TSNode null_node = {0};
/* Registry index of the lambda bound to `name`, or -1. An index, not a
* pointer: the registry array is replaced when it grows. */
static int py_lookup_lambda(PyLSPContext *ctx, const char *name) {
if (!ctx || !name)
return null_node;
return -1;
for (int i = 0; i < ctx->lambda_count; i++) {
if (ctx->lambdas[i].name && strcmp(ctx->lambdas[i].name, name) == 0) {
return ctx->lambdas[i].lambda_node;
return i;
}
}
return null_node;
return -1;
}
/* Helper for stripping quotes from a tree-sitter `string` node text. */
@@ -3157,12 +3159,18 @@ static void py_emit_call_for(PyLSPContext *ctx, TSNode call_node) {
/* These legacy entries have no lexical frame identity. During class
* execution, leave lambda replay unresolved instead of bypassing a
* local shadow or running the lambda against class locals. */
TSNode lambda_node =
ctx->class_body_outer_scope ? (TSNode){0} : py_lookup_lambda(ctx, fname);
if (!ts_node_is_null(lambda_node)) {
int lambda_idx = ctx->class_body_outer_scope ? -1 : py_lookup_lambda(ctx, fname);
if (lambda_idx >= 0) {
TSNode lambda_node = ctx->lambdas[lambda_idx].lambda_node;
TSNode params = ts_node_child_by_field_name(lambda_node, "parameters", 10);
TSNode body = ts_node_child_by_field_name(lambda_node, "body", 4);
TSNode args = ts_node_child_by_field_name(call_node, "arguments", 9);
// A lambda that reaches itself again (directly or through another
// lambda) would re-walk its body once per nesting level up to the
// walk-depth cap, and two such calls in one body double the work
// per level. Walk each body at most once per chain.
if (ctx->lambdas[lambda_idx].expanding)
return;
CBMScope *saved = ctx->current_scope;
ctx->current_scope = py_scope_push_checked(ctx);
// Bind each lambda param to the call-site arg's type.
@@ -3195,7 +3203,9 @@ static void py_emit_call_for(PyLSPContext *ctx, TSNode call_node) {
ctx->enclosing_func_qn = cbm_arena_sprintf(ctx->arena, "%s.<lambda>",
prev_func ? prev_func : ctx->module_qn);
if (!ts_node_is_null(body)) {
ctx->lambdas[lambda_idx].expanding = true;
py_resolve_calls_in(ctx, body);
ctx->lambdas[lambda_idx].expanding = false;
}
ctx->enclosing_func_qn = prev_func;
py_scope_restore(ctx, saved);
internal/cbm/lsp/py_lsp.h
+1
View File
@@ -13,6 +13,7 @@
typedef struct {
const char *name; // bound name, e.g. "fn"
TSNode lambda_node; // the lambda AST node
bool expanding; // body is being re-walked for a call site right now
} CBMLambdaEntry;
// Function-as-dict-value entry. When `funcs = {"a": foo, "b": bar}` is
internal/cbm/sqlite_writer.c
+23 -14
View File
@@ -35,13 +35,22 @@
#include <process.h>
#include <windows.h>
#define cbm_writer_getpid _getpid
/* long is 32 bits on Windows, so fseek/ftell cannot address past 2 GiB there. */
#define cbm_writer_seek(fp, off, whence) _fseeki64((fp), (long long)(off), (whence))
#define cbm_writer_tell(fp) ((int64_t)_ftelli64(fp))
#else
#include <unistd.h>
#define cbm_writer_getpid getpid
#define cbm_writer_seek(fp, off, whence) fseeko((fp), (off_t)(off), (whence))
#define cbm_writer_tell(fp) ((int64_t)ftello(fp))
#endif
#define CBM_PAGE_SIZE 65536
int64_t cbm_writer_page_offset(uint32_t page_num) {
return (int64_t)(page_num - SKIP_ONE) * CBM_PAGE_SIZE;
}
/* SQLite reserves the page containing the 1 GiB file offset (the "pending byte"
* used for file locking on Windows). This page MUST be skipped during allocation
* otherwise integrity_check reports "2nd reference to page N" because it marks
@@ -601,8 +610,8 @@ static void pb_flush_leaf(PageBuilder *pb) {
// Write page to file. Skip the pending byte page (SQLite reserved).
pb->next_page = cbm_skip_pending_byte(pb->next_page);
uint32_t page_num = pb->next_page;
long offset = (long)(page_num - SKIP_ONE) * CBM_PAGE_SIZE;
(void)fseek(pb->fp, offset, SEEK_SET);
int64_t offset = cbm_writer_page_offset(page_num);
(void)cbm_writer_seek(pb->fp, offset, SEEK_SET);
(void)fwrite(pb->page, SKIP_ONE, CBM_PAGE_SIZE, pb->fp);
// Record this leaf for interior page building
@@ -707,7 +716,7 @@ static int write_interior_page(PageBuilder *pb, uint8_t *page, int cell_count, i
page[HDR_FRAGBYTES_OFF] = 0;
put_u32(page + HDR_RIGHTCHILD_OFF, right_child_page);
(void)fseek(pb->fp, (long)(pnum - SKIP_ONE) * CBM_PAGE_SIZE, SEEK_SET);
(void)cbm_writer_seek(pb->fp, cbm_writer_page_offset(pnum), SEEK_SET);
(void)fwrite(page, SKIP_ONE, CBM_PAGE_SIZE, pb->fp);
if (parent_count >= *parent_cap) {
@@ -970,7 +979,7 @@ static uint32_t write_overflow_pages(FILE *fp, uint32_t *next_page, const uint8_
int data_len) {
int per_page = CBM_PAGE_SIZE - BTREE_PTR_SIZE;
uint32_t first_page = 0;
long prev_next_ptr_offset = -SKIP_ONE;
int64_t prev_next_ptr_offset = -SKIP_ONE;
int offset = 0;
while (offset < data_len) {
@@ -983,7 +992,7 @@ static uint32_t write_overflow_pages(FILE *fp, uint32_t *next_page, const uint8_
if (prev_next_ptr_offset >= 0) {
uint8_t ptr[BTREE_PTR_SIZE];
put_u32(ptr, pnum);
(void)fseek(fp, prev_next_ptr_offset, SEEK_SET);
(void)cbm_writer_seek(fp, prev_next_ptr_offset, SEEK_SET);
(void)fwrite(ptr, SKIP_ONE, BTREE_PTR_SIZE, fp);
}
@@ -997,9 +1006,9 @@ static uint32_t write_overflow_pages(FILE *fp, uint32_t *next_page, const uint8_
put_u32(page, 0); // next-page pointer — 0 for now, backpatched on next iteration
memcpy(page + BTREE_PTR_SIZE, data + offset, chunk);
long page_offset = (long)(pnum - SKIP_ONE) * CBM_PAGE_SIZE;
int64_t page_offset = cbm_writer_page_offset(pnum);
prev_next_ptr_offset = page_offset;
(void)fseek(fp, page_offset, SEEK_SET);
(void)cbm_writer_seek(fp, page_offset, SEEK_SET);
(void)fwrite(page, SKIP_ONE, CBM_PAGE_SIZE, fp);
offset += chunk;
@@ -1276,7 +1285,7 @@ static uint32_t write_table_btree(FILE *fp, uint32_t *next_page, const uint8_t *
put_u16(page + hdr + HDR_CELLCOUNT_OFF, 0); // 0 cells
put_u16(page + hdr + HDR_CONTENT_OFF, (uint16_t)CBM_PAGE_SIZE); // content at end of page
page[hdr + HDR_FRAGBYTES_OFF] = 0; // 0 fragmented bytes
(void)fseek(fp, (long)(pnum - SKIP_ONE) * CBM_PAGE_SIZE, SEEK_SET);
(void)cbm_writer_seek(fp, cbm_writer_page_offset(pnum), SEEK_SET);
(void)fwrite(page, SKIP_ONE, CBM_PAGE_SIZE, fp);
return pnum;
}
@@ -1326,7 +1335,7 @@ static uint32_t write_empty_index_leaf(FILE *fp, uint32_t *next_page) {
put_u16(page + HDR_CELLCOUNT_OFF, 0);
put_u16(page + HDR_CONTENT_OFF, (uint16_t)CBM_PAGE_SIZE);
page[HDR_FRAGBYTES_OFF] = 0;
(void)fseek(fp, (long)(pnum - SKIP_ONE) * CBM_PAGE_SIZE, SEEK_SET);
(void)cbm_writer_seek(fp, cbm_writer_page_offset(pnum), SEEK_SET);
(void)fwrite(page, SKIP_ONE, CBM_PAGE_SIZE, fp);
return pnum;
}
@@ -2020,7 +2029,7 @@ static int write_master_page1(FILE *fp, MasterEntry *master, int master_count, u
write_sqlite_file_header(page1, next_page - SKIP_ONE);
(void)fseek(fp, 0, SEEK_SET);
(void)cbm_writer_seek(fp, 0, SEEK_SET);
(void)fwrite(page1, SKIP_ONE, CBM_PAGE_SIZE, fp);
for (int i = 0; i < master_count; i++) {
@@ -2034,12 +2043,12 @@ static int write_master_page1(FILE *fp, MasterEntry *master, int master_count, u
/* Pad file to exact page boundary. */
static void pad_file_to_page_boundary(FILE *fp, uint32_t next_page) {
(void)fseek(fp, 0, SEEK_END);
long file_size = ftell(fp);
long expected_size = (long)(next_page - SKIP_ONE) * CBM_PAGE_SIZE;
(void)cbm_writer_seek(fp, 0, SEEK_END);
int64_t file_size = cbm_writer_tell(fp);
int64_t expected_size = cbm_writer_page_offset(next_page);
if (file_size < expected_size) {
uint8_t zero = 0;
(void)fseek(fp, expected_size - SKIP_ONE, SEEK_SET);
(void)cbm_writer_seek(fp, expected_size - SKIP_ONE, SEEK_SET);
(void)fwrite(&zero, SKIP_ONE, SKIP_ONE, fp);
}
}
internal/cbm/sqlite_writer.h
+4
View File
@@ -90,4 +90,8 @@ int cbm_writer_finalize(cbm_db_writer_t *w, const char *project, const char *roo
CBMDumpEdge *edges, int edge_count, CBMDumpVector *vectors,
int vector_count, CBMDumpTokenVec *token_vecs, int token_vec_count);
// Byte offset of 1-based page `page_num` in the output file. 64-bit on every
// platform, so databases larger than 2 GiB are addressed correctly on Windows.
int64_t cbm_writer_page_offset(uint32_t page_num);
#endif // CBM_SQLITE_WRITER_H
internal/cbm/vendored/grammars/MANIFEST.md
+3 -1
View File
@@ -50,7 +50,7 @@ The grammars were originally vendored as bare `parser.c`+`scanner.c` with **no r
newlines; the new files keep upstream's bytes exactly. Per-file SHA-256
values are pinned in `scripts/vendored-checksums.txt`. Regression coverage:
the `cs_*_issue1748` tests in `tests/test_parse_coverage.c`.
- **objectscript_udl / objectscript_routine** (added 2026-06-24): vendored from [intersystems/tree-sitter-objectscript](https://github.com/intersystems/tree-sitter-objectscript) @ `a7ffcdf` — MIT, the InterSystems-official grammars (a niche vendor language, hence `vendor-maintained`, not in nvim-treesitter/Helix). **Re-vendor note:** each `scanner.c`'s upstream `#include "../../common/scanner.h"` is repointed to a per-directory `objectscript_common.h` (a verbatim copy of upstream `common/scanner.h`), because this repo's shared `vendored/common/scanner.h` belongs to the cfml/fsharp grammars and differs. The generated `parser.c`/`scanner.c` are otherwise byte-for-byte upstream — on re-vendor, re-apply only that single include rename. **Local modification (2026-07-16):** in `objectscript_common.h`, two loop counters `uint8_t i` were widened to `int i` (the `reverse_marker` scan and the `html_marker_buffer` reversal) to clear CodeQL `cpp/comparison-with-wider-type` — a false positive in practice (both lengths are hard-bounded by `MARKER_BUFFER_MAX_LEN = 30`, so `uint8_t` could never wrap), fixed for cleanliness. On re-vendor, re-apply this widening too (or upstream it at intersystems/tree-sitter-objectscript).
- **objectscript_udl / objectscript_routine** (added 2026-06-24): vendored from [intersystems/tree-sitter-objectscript](https://github.com/intersystems/tree-sitter-objectscript) @ `a7ffcdf` — MIT, the InterSystems-official grammars (a niche vendor language, hence `vendor-maintained`, not in nvim-treesitter/Helix). **Re-vendor note:** each `scanner.c`'s upstream `#include "../../common/scanner.h"` is repointed to a per-directory `objectscript_common.h` (a verbatim copy of upstream `common/scanner.h`), because this repo's shared `vendored/common/scanner.h` belongs to the cfml/fsharp grammars and differs. The generated `parser.c` files remain byte-for-byte upstream. Each `scanner.c` also guards empty-state deserialization with `if (length > 0)` before `memcpy`, because Tree-sitter can pass a NULL buffer with zero length. On re-vendor, re-apply the include rename and this guard unless upstream already carries them. **Local modification (2026-07-16):** in `objectscript_common.h`, two loop counters `uint8_t i` were widened to `int i` (the `reverse_marker` scan and the `html_marker_buffer` reversal) to clear CodeQL `cpp/comparison-with-wider-type` — a false positive in practice (both lengths are hard-bounded by `MARKER_BUFFER_MAX_LEN = 30`, so `uint8_t` could never wrap), fixed for cleanliness. On re-vendor, re-apply this widening too (or upstream it at intersystems/tree-sitter-objectscript).
- **mojo** (added 2026-07-01): vendored from [lsh/tree-sitter-mojo](https://github.com/lsh/tree-sitter-mojo) @ `33193a99afe6` — MIT, ABI 15. Helix tracks `lsh/tree-sitter-mojo` as its Mojo grammar source, but the Helix-pinned commit (`3d7c53b8038f`) no longer resolves in the upstream repository after a force-push, so this vendor uses current upstream `main` rather than the stale registry SHA. Security review covered only the vendored C surface (`parser.c`, `scanner.c`, `tree_sitter/*.h`) plus upstream license/provenance metadata; no package manager hooks, workflow files, prompt/agent instruction files, or generated lockfiles were vendored.
- **arkts** (added 2026-08-26): **first-party derivative** — a fork of [tree-sitter/tree-sitter-typescript](https://github.com/tree-sitter/tree-sitter-typescript)'s `typescript` dialect pinned @ `75b3874edb2d` (v0.23.2, the same commit our vendored typescript/tsx come from), on the tree-sitter-javascript base @ `3a837b6f3658` (v0.23.1, the version upstream's own package-lock pins), extended with ArkTS/ArkUI syntax (`@Component struct` declarations, UI-DSL trailing-closure calls with post-block attribute chains, decorated function declarations, `import lazy`, `@Extend`/`@Styles` leading-dot attribute chains, anonymous `stateStyles` style blocks). Grammar source + corpus tests live in `tools/tree-sitter-arkts/`; regenerate with `npx tree-sitter-cli@0.25.10 generate` (ABI 15). **External scanner:** `scanner.c` is a symbol-rename trampoline; `_common_scanner.h` is byte-identical (same SHA-256) to the reviewed `typescript/_common_scanner.h` already shipped. **LICENSE:** tree-sitter-typescript's MIT text **verbatim and byte-identical** (© 2017 Max Brunsfeld) — which is what MIT requires of a derivative work, and what lets the provenance audit byte-verify it against upstream rather than take a note on trust. The fork is registered in the audit's `FORKS` map. Our own copyright for the ArkTS additions, and the tree-sitter-javascript attribution (© 2014 Max Brunsfeld), live with the SOURCE in `tools/tree-sitter-arkts/grammar.js` and in `THIRD_PARTY.md`, which is what ships in the release archives.
- **javascript + tsx** (forked 2026-09-25, #1736): **self-maintained forks** of the pins we already vendored — [tree-sitter/tree-sitter-javascript](https://github.com/tree-sitter/tree-sitter-javascript) @ `58404d8cf191` and [tree-sitter/tree-sitter-typescript](https://github.com/tree-sitter/tree-sitter-typescript)'s `tsx` dialect @ `75b3874edb2d` (javascript base @ `3a837b6f3658`, the version upstream's package-lock pins, as for arkts). **Why:** upstream accepts a `&` inside a JSX string only before a space/digit or as a complete character reference, and never inside JSX text, so a plain URL query (`href="…?a=1&b=2"`, Google Fonts `&display=swap`) or `<p>Tom & Jerry</p>` produced an ERROR node — a `parse_partial` flag, plus false USAGE edges from identifiers the error recovery pulled out of the URL (on vercel/next.js `examples/`: 45 of 92 flagged files, 115 false cross-example USAGE edges). **The change** is one patch, `tools/tree-sitter-javascript/patches/jsx-lone-ampersand.patch`, applied to both javascript bases: a lone `&` that does not begin a complete `html_character_reference` is a one-character token (lexical precedence -1, so `&amp;`/`&#38;` still lex as references) aliased to the EXISTING `string_fragment` / `jsx_text` nodes, and the string-fragment regexes stop before a `&` that directly precedes the closing quote. Node types are unchanged (same type/named set; `node-types.json` only gains an empty `fields` map on those two entries). Without the patch both directories regenerate upstream exactly (javascript: byte-identical `parser.c` apart from the generator-version comment; tsx: identical state/symbol counts, ABI 14 → 15 from the newer CLI). **External scanners** are unchanged: `javascript/scanner.c` and `tsx/scanner.c` + `_common_scanner.h` stay the reviewed upstream bytes. Regenerate with `npx tree-sitter-cli@0.25.10 generate` in `tools/tree-sitter-{javascript,tsx}/` (ABI 15) and copy `src/parser.c` (tsx: also `src/tree_sitter/*.h`) here. **On an upstream bump:** re-fetch the new pins, re-apply the patch, regenerate, re-run `test/corpus/jsx_ampersand.txt` — and drop the fork if upstream fixes it. **LICENSE:** upstream's MIT text byte-identical (registered in the audit's `FORKS` map); our copyright for the patch lives in the fork `grammar.js` headers and `THIRD_PARTY.md`.
@@ -109,6 +109,8 @@ row instead.
| crystal | `crystal/scanner.c`, serialize | guard `memcpy(&buffer[offset], state->literals.contents, literal_content_size)` with `if (literal_content_size > 0)` | UBSan: zero-length `memcpy` with a NULL/0-size source on the empty-state serialize round-trip (formal UB, harmless) |
| rescript | `rescript/scanner.c`, deserialize | guard `memcpy(state, buffer, n_bytes)` with `if (n_bytes > 0)` | UBSan: zero-length `memcpy` with a NULL `buffer` / `n_bytes == 0` on empty-state deserialize (formal UB, harmless). The sibling serialize copies a fixed `sizeof(ScannerState)` (always > 0, non-NULL src) and needs no guard. |
| rescript | `rescript/scanner.c`, scan, `TEMPLATE_CHARS` branch | `if (valid_symbols[TEMPLATE_CHARS])` → `if (valid_symbols[TEMPLATE_CHARS] && !valid_symbols[NEWLINE])` | **Quadratic lexing in error recovery (#2176).** The only parse state whose external lex state enables both tokens is tree-sitter's ERROR state (`ts_lex_modes[0]`, external state 1; the in-template state 7 has no `_newline`), where every external token is marked valid and the lexer retries at each byte. From every byte the template loop ran to the next `` ` ``, `$`, `\` or NUL — the end of file when there is none — and returned false, so an unparseable stretch cost O(n²) inside lexing, where the parse budget's progress callback never runs. 50 KB of `0xFF` took 5.3 s, 100 KB 30 s; after: 3 ms, linear (lexer bytes pulled for 4 KB → 8 KB of `0xFF`: 8.8 M → 35.3 M before, 8.7 K → 17.4 K after, `complexity_rescript_error_recovery_lexing_is_linear`). Valid files parse to byte-identical trees; broken files recover more (a `let` after an unterminated expression is kept instead of swallowed). Upstream pin `43c2f1f35024` carries the unguarded branch |
| objectscript_routine | `objectscript_routine/scanner.c`, deserialize | guard `memcpy(payload, buffer, length)` with `if (length > 0)` | UBSan: Tree-sitter passes a NULL buffer and zero length for empty scanner state; skip the zero-length copy |
| objectscript_udl | `objectscript_udl/scanner.c`, deserialize | guard `memcpy(payload, buffer, length)` with `if (length > 0)` | UBSan: Tree-sitter passes a NULL buffer and zero length for empty scanner state; skip the zero-length copy |
| purescript | `purescript/scanner.c`, serialize | guard `memcpy(buffer, indents->data, to_copy)` with `if (to_copy > 0)` | UBSan: zero-length `memcpy` with a NULL/0-size source when the indent vector is empty (formal UB, harmless) |
| plsql | `plsql/parser.c`, include | `#include <tree_sitter/parser.h>` → `#include "tree_sitter/parser.h"` | The older ABI-14 generator emits angle brackets; every other vendored grammar uses the quoted form, which resolves the per-grammar `tree_sitter/` header from the including file's directory |
| properties | `properties/scanner.c`, whole file | move the `reached_eof` flag out of a file-scope `static bool` and into a per-parser payload allocated by `..._external_scanner_create()` | **Data race, and the only one of its kind in 103 vendored scanners.** That flag is how the scanner refuses to emit a second end-of-input `FAKE_EOL`, and upstream keeps it in ONE process-wide object. With several worker threads indexing `.properties` files at once, whichever reached EOF first set the flag, so another thread's `!reached_eof` was false and its parse never received the `FAKE_EOL` it needed to finish — it sat at end-of-input asking for a token that would never arrive. Measured 2026-09-19: ~106 M parse operations on a 253-byte file before the per-file budget stopped it, after which the file was dropped from the graph and java/kotlin indexes differed run to run. Interleaved A/B under identical load, 40 runs each: unpatched 6 stalls, patched 0. The serialize/deserialize wire format is unchanged (the state is still the returned length). Upstream `6310671b24d4` still carries the static, so a re-vendor must re-apply this |
internal/cbm/vendored/grammars/objectscript_routine/scanner.c
Generated
+3 -1
View File
@@ -115,7 +115,9 @@ unsigned tree_sitter_objectscript_routine_external_scanner_serialize(void *paylo
void tree_sitter_objectscript_routine_external_scanner_deserialize(
void *payload, const char *buffer, unsigned length) {
memcpy(payload, buffer, length);
if (length > 0) {
memcpy(payload, buffer, length);
}
}
void tree_sitter_objectscript_routine_external_scanner_destroy(void *payload) {
internal/cbm/vendored/grammars/objectscript_udl/scanner.c
Generated
+3 -1
View File
@@ -119,7 +119,9 @@ void tree_sitter_objectscript_udl_external_scanner_deserialize(
void *payload, const char *buffer, unsigned length) {
// This one is a bit funky.
// length includes the sizeof(struct Scanner) and the structs it points to
memcpy(payload, buffer, length);
if (length > 0) {
memcpy(payload, buffer, length);
}
}
void tree_sitter_objectscript_udl_external_scanner_destroy(void *payload) {
scripts/embed-frontend.sh
+1 -1
View File
@@ -72,7 +72,7 @@ for file in "${FILES[@]}"; do
if $IS_LINUX; then
# Linux: ld -r -b binary (zero bloat, ELF only)
abs_obj="$(cd "$(dirname "$0")/.." && pwd)/$obj"
(cd "$DIST_DIR" && ld -r -b binary -o "$abs_obj" "$rel")
(cd "$DIST_DIR" && "${LD:-ld}" -r -b binary -o "$abs_obj" "$rel")
else
# macOS/Windows/MSYS2: generate C byte array + cc (no xxd dependency)
local_c="$OUTPUT_DIR/embed_${mangled}.c"
scripts/memory-core-baseline.txt
+1 -1
View File
@@ -16,7 +16,7 @@ internal/cbm/sqlite_writer.c 74
src/cli/activation_transaction.c 80
src/cli/agent_clients.c 73
src/cli/agent_profiles.c 7
src/cli/cli.c 170
src/cli/cli.c 166
src/cli/client_adapter.c 3
src/cli/config_edit_path.c 2
src/cli/config_json_like.c 142
scripts/vendored-checksums.txt
+3 -3
View File
@@ -5,7 +5,7 @@ c5cfb43042b6b72045f4ba997834d0a7786d2793d91680868b5815b39f14fc78 internal/cbm/v
b29c1c9fb7cc82f58c84b376df1297d6e2737a1d655fd356db0859e3c29c2fea internal/cbm/vendored/common/tree_sitter/alloc.h
31e60a1bff6f715afacce03b5b70efe42b58371b4f9595dd4af52a577ff9608c internal/cbm/vendored/common/tree_sitter/array.h
180b893c8734778fd32f372dfbc27bd6ad1cd2221f26150b31256ff6716320d2 internal/cbm/vendored/common/tree_sitter/parser.h
0cd77186d628637e5559fbf2b9dc678a293a69a68ae23778ba21ad42dbf2db8e internal/cbm/vendored/grammars/MANIFEST.md
38172147795b4729640a3d9ef61ac94719e68ab5e3f9aaca792aa1c8c36d2940 internal/cbm/vendored/grammars/MANIFEST.md
ad8425038de519f8c4e3e9339feebf99dfad8a6002dcf79227d91402780a32cc internal/cbm/vendored/grammars/ada/LICENSE
02805ec13939b749c891567be36bf024b09034e04c80683a1ae667272458d549 internal/cbm/vendored/grammars/ada/parser.c
115a75d000bef9c70c4de7dfbb7f2a80b90cbb14ba265056dc7abb1ef3b9b6db internal/cbm/vendored/grammars/ada/tree_sitter/alloc.h
@@ -525,14 +525,14 @@ c5fa4d1d5820cc59f39cb3cb9a9a171e5144b2f63d285cf3450be0a8e549ede8 internal/cbm/v
85b458dc150c4d17873dd5e73d01cfa23c797997a09d841884e08378242e929c internal/cbm/vendored/grammars/objectscript_routine/LICENSE
f3a047fba6d238da258c0370878e703504b347aad13add09a021935daa891bd3 internal/cbm/vendored/grammars/objectscript_routine/objectscript_common.h
fb9320a77f7c3c110540e9a569c2a8dd7ff74784ae05aac962f4bcbab1343640 internal/cbm/vendored/grammars/objectscript_routine/parser.c
2fde85097c7df0180b7a204eeae97c32a541f1fcc1b44a3837a57f26ac9966fa internal/cbm/vendored/grammars/objectscript_routine/scanner.c
1da66e46ba02fcf2f9ca42b2a80c8658e150ae7b5154d81b8968117b959b5af7 internal/cbm/vendored/grammars/objectscript_routine/scanner.c
b29c1c9fb7cc82f58c84b376df1297d6e2737a1d655fd356db0859e3c29c2fea internal/cbm/vendored/grammars/objectscript_routine/tree_sitter/alloc.h
31e60a1bff6f715afacce03b5b70efe42b58371b4f9595dd4af52a577ff9608c internal/cbm/vendored/grammars/objectscript_routine/tree_sitter/array.h
180b893c8734778fd32f372dfbc27bd6ad1cd2221f26150b31256ff6716320d2 internal/cbm/vendored/grammars/objectscript_routine/tree_sitter/parser.h
85b458dc150c4d17873dd5e73d01cfa23c797997a09d841884e08378242e929c internal/cbm/vendored/grammars/objectscript_udl/LICENSE
f3a047fba6d238da258c0370878e703504b347aad13add09a021935daa891bd3 internal/cbm/vendored/grammars/objectscript_udl/objectscript_common.h
2003ffb1a07ec30a2f7176c65aae958b804074af8356a81a3d42417a240f2e15 internal/cbm/vendored/grammars/objectscript_udl/parser.c
2e80c4939726948b0ebf8af56103a9c0278a038eeb5be0b769c59d2b4e2d36b1 internal/cbm/vendored/grammars/objectscript_udl/scanner.c
537be452c5079531e08edc302b65c63f45956510f6ee96ec88c1d7531d203f1e internal/cbm/vendored/grammars/objectscript_udl/scanner.c
b29c1c9fb7cc82f58c84b376df1297d6e2737a1d655fd356db0859e3c29c2fea internal/cbm/vendored/grammars/objectscript_udl/tree_sitter/alloc.h
31e60a1bff6f715afacce03b5b70efe42b58371b4f9595dd4af52a577ff9608c internal/cbm/vendored/grammars/objectscript_udl/tree_sitter/array.h
180b893c8734778fd32f372dfbc27bd6ad1cd2221f26150b31256ff6716320d2 internal/cbm/vendored/grammars/objectscript_udl/tree_sitter/parser.h
src/cli/cli.c
+121 -38
View File
@@ -22,6 +22,7 @@
#include "foundation/compat.h"
#include "foundation/platform.h"
#include "foundation/constants.h"
#include "foundation/json_writer.h"
#include "foundation/log.h"
#include "foundation/mem_core.h"
#include "foundation/sha256.h"
@@ -4112,13 +4113,14 @@ static int cbm_reconcile_codex_hooks_command_detailed(const char *config_path, c
const char *command_windows,
cbm_toml_codex_hook_action_t action,
bool check_only,
cbm_toml_codex_hook_failure_t *failure) {
cbm_toml_codex_hook_failure_t *failure,
int *pretool_written) {
if (!config_path || !command || !command_windows) {
return CLI_ERR;
}
return cbm_toml_reconcile_codex_hooks_detailed(config_path, CODEX_HOOK_BEGIN, CODEX_HOOK_END,
command, command_windows, action,
check_only ? 1 : 0, failure) == 0
return cbm_toml_reconcile_codex_hooks_detailed(
config_path, CODEX_HOOK_BEGIN, CODEX_HOOK_END, command, command_windows, action,
check_only ? 1 : 0, failure, pretool_written) == 0
? CLI_OK
: CLI_ERR;
}
@@ -4126,7 +4128,7 @@ static int cbm_reconcile_codex_hooks_command(const char *config_path, const char
const char *command_windows,
cbm_toml_codex_hook_action_t action, bool check_only) {
return cbm_reconcile_codex_hooks_command_detailed(config_path, command, command_windows, action,
check_only, NULL);
check_only, NULL, NULL);
}
static int cbm_upsert_codex_hooks_command(const char *config_path, const char *command,
const char *command_windows) {
@@ -4197,7 +4199,8 @@ enum { COPILOT_HOOK_TIMEOUT_SEC = 5 };
static int cbm_build_copilot_hook_command(const char *binary_path, const char *event,
bool powershell, char *out, size_t out_size) {
if (!binary_path || !event || !out ||
(strcmp(event, "SessionStart") != 0 && strcmp(event, "SubagentStart") != 0)) {
(strcmp(event, "SessionStart") != 0 && strcmp(event, "SubagentStart") != 0 &&
strcmp(event, "PostToolUse") != 0)) {
return CLI_ERR;
}
char quoted[CLI_BUF_8K];
@@ -4214,11 +4217,12 @@ static int cbm_build_copilot_hook_command(const char *binary_path, const char *e
}
static bool cbm_copilot_add_hook_event(yyjson_mut_doc *doc, yyjson_mut_val *hooks,
const char *event_key, const char *bash_command,
const char *powershell_command) {
const char *event_key, const char *matcher,
const char *bash_command, const char *powershell_command) {
yyjson_mut_val *entries = yyjson_mut_arr(doc);
yyjson_mut_val *entry = yyjson_mut_obj(doc);
if (!entries || !entry || !yyjson_mut_obj_add_str(doc, entry, "type", "command") ||
(matcher && !yyjson_mut_obj_add_str(doc, entry, "matcher", matcher)) ||
!yyjson_mut_obj_add_str(doc, entry, "bash", bash_command) ||
!yyjson_mut_obj_add_str(doc, entry, "powershell", powershell_command) ||
!yyjson_mut_obj_add_int(doc, entry, "timeoutSec", COPILOT_HOOK_TIMEOUT_SEC) ||
@@ -4229,11 +4233,25 @@ static bool cbm_copilot_add_hook_event(yyjson_mut_doc *doc, yyjson_mut_val *hook
return true;
}
static char *cbm_build_copilot_hook_manifest(const char *binary_path) {
/* Copilot CLI's preToolUse cannot add model context (its output is only a
* permission decision) and fails closed on hook errors, so searches are
* augmented after they run: postToolUse additionalContext is appended to the
* tool result the model sees. The PascalCase event name selects the
* Claude-format payload (tool_name Bash/Grep/Glob, tool_input), and the matcher
* names the Claude and the runtime tool names so either matcher reading fires. */
#define COPILOT_SEARCH_MATCHER "Bash|Grep|Glob|bash|powershell|grep|rg|glob"
/* include_posttool renders the current manifest; without it the function
* renders the previous lifecycle-only manifest, which installs up to v0.12 wrote
* and which upgrades and uninstalls must still recognize as owned. The result is
* released with cbm_free(CBM_MEM_CLASS_OTHER, ...). */
static char *cbm_build_copilot_hook_manifest(const char *binary_path, bool include_posttool) {
char session_bash[CLI_BUF_8K];
char session_powershell[CLI_BUF_8K];
char subagent_bash[CLI_BUF_8K];
char subagent_powershell[CLI_BUF_8K];
char post_bash[CLI_BUF_8K];
char post_powershell[CLI_BUF_8K];
if (cbm_build_copilot_hook_command(binary_path, "SessionStart", false, session_bash,
sizeof(session_bash)) != CLI_OK ||
cbm_build_copilot_hook_command(binary_path, "SessionStart", true, session_powershell,
@@ -4241,7 +4259,11 @@ static char *cbm_build_copilot_hook_manifest(const char *binary_path) {
cbm_build_copilot_hook_command(binary_path, "SubagentStart", false, subagent_bash,
sizeof(subagent_bash)) != CLI_OK ||
cbm_build_copilot_hook_command(binary_path, "SubagentStart", true, subagent_powershell,
sizeof(subagent_powershell)) != CLI_OK) {
sizeof(subagent_powershell)) != CLI_OK ||
cbm_build_copilot_hook_command(binary_path, "PostToolUse", false, post_bash,
sizeof(post_bash)) != CLI_OK ||
cbm_build_copilot_hook_command(binary_path, "PostToolUse", true, post_powershell,
sizeof(post_powershell)) != CLI_OK) {
return NULL;
}
@@ -4255,39 +4277,59 @@ static char *cbm_build_copilot_hook_manifest(const char *binary_path) {
return NULL;
}
yyjson_mut_doc_set_root(doc, root);
bool ok =
yyjson_mut_obj_add_int(doc, root, "version", 1) &&
cbm_copilot_add_hook_event(doc, hooks, "sessionStart", session_bash, session_powershell) &&
cbm_copilot_add_hook_event(doc, hooks, "subagentStart", subagent_bash,
subagent_powershell) &&
yyjson_mut_obj_add_val(doc, root, "hooks", hooks);
char *manifest = ok ? yyjson_mut_write(doc, YYJSON_WRITE_PRETTY, NULL) : NULL;
bool ok = yyjson_mut_obj_add_int(doc, root, "version", 1) &&
cbm_copilot_add_hook_event(doc, hooks, "sessionStart", NULL, session_bash,
session_powershell) &&
cbm_copilot_add_hook_event(doc, hooks, "subagentStart", NULL, subagent_bash,
subagent_powershell) &&
(!include_posttool ||
cbm_copilot_add_hook_event(doc, hooks, "PostToolUse", COPILOT_SEARCH_MATCHER,
post_bash, post_powershell)) &&
yyjson_mut_obj_add_val(doc, root, "hooks", hooks);
char *manifest = ok ? yyjson_mut_write_opts(doc, YYJSON_WRITE_PRETTY,
cbm_json_writer_allocator(), NULL, NULL)
: NULL;
yyjson_mut_doc_free(doc);
return manifest;
}
#ifdef CBM_CLI_ENABLE_TEST_API
char *cbm_build_copilot_hook_manifest_for_testing(const char *binary_path, bool include_posttool) {
return cbm_build_copilot_hook_manifest(binary_path, include_posttool);
}
#endif
/* Copilot loads every manifest in $COPILOT_HOME/hooks. Treat our dedicated
* filename as an exact-owned document: a foreign collision fails closed, and
* uninstall accepts only the complete generated lifecycle schema. */
* filename as an exact-owned document: a foreign collision fails closed. The
* current manifest or the exact previous one is ours, so install upgrades the
* previous one in place and uninstall removes either. */
static int cbm_upsert_copilot_hooks(const char *binary_path, const char *manifest_path) {
char *manifest = cbm_build_copilot_hook_manifest(binary_path);
if (!manifest || !manifest_path) {
free(manifest);
char *manifest = cbm_build_copilot_hook_manifest(binary_path, true);
char *previous = cbm_build_copilot_hook_manifest(binary_path, false);
if (!manifest || !previous || !manifest_path) {
cbm_free(CBM_MEM_CLASS_OTHER, manifest);
cbm_free(CBM_MEM_CLASS_OTHER, previous);
return CLI_ERR;
}
int rc = cbm_text_ensure_owned_document(manifest_path, manifest);
free(manifest);
const char *const released[] = {previous};
int rc = cbm_text_migrate_owned_document(manifest_path, manifest, released, 1U);
cbm_free(CBM_MEM_CLASS_OTHER, manifest);
cbm_free(CBM_MEM_CLASS_OTHER, previous);
return rc == 0 ? CLI_OK : CLI_ERR;
}
static int cbm_remove_copilot_hooks(const char *manifest_path, const char *binary_path) {
char *manifest = cbm_build_copilot_hook_manifest(binary_path);
if (!manifest || !manifest_path) {
free(manifest);
char *manifest = cbm_build_copilot_hook_manifest(binary_path, true);
char *previous = cbm_build_copilot_hook_manifest(binary_path, false);
if (!manifest || !previous || !manifest_path) {
cbm_free(CBM_MEM_CLASS_OTHER, manifest);
cbm_free(CBM_MEM_CLASS_OTHER, previous);
return CLI_ERR;
}
int rc = cbm_text_remove_owned_document(manifest_path, manifest);
free(manifest);
const char *const released[] = {previous};
int rc = cbm_text_remove_owned_document_any(manifest_path, manifest, released, 1U);
cbm_free(CBM_MEM_CLASS_OTHER, manifest);
cbm_free(CBM_MEM_CLASS_OTHER, previous);
return rc >= 0 ? CLI_OK : CLI_ERR;
}
@@ -6568,6 +6610,35 @@ static int cbm_remove_paired_lifecycle_hooks_json(const char *settings_path,
return session_result == CLI_OK && subagent_result == CLI_OK ? CLI_OK : CLI_ERR;
}
/* Codex names its shell tool Bash and passes {"command": "..."} as tool_input,
* the payload hook-augment already augments for Claude Code. Only the entry whose
* command is exactly ours is touched; the user's own PreToolUse hooks stay. */
static int cbm_upsert_codex_pretool_hooks_json(const char *settings_path, const char *command,
const char *command_windows) {
return upsert_hooks_json((hooks_upsert_args_t){
.settings_path = settings_path,
.hook_event = "PreToolUse",
.matcher_str = "Bash",
.command_str = command,
.command_windows = command_windows,
.timeout_value = CMM_HOOK_TIMEOUT_SEC,
.match_command_exact = command,
});
}
static int cbm_remove_codex_pretool_hooks_json(const char *settings_path,
const char *canonical_command) {
if (!canonical_command) {
return CLI_ERR;
}
return remove_hooks_json((hooks_remove_args_t){
.settings_path = settings_path,
.hook_event = "PreToolUse",
.matcher_str = "Bash",
.match_command_exact = canonical_command,
});
}
static int cbm_remove_qwen_lifecycle_hooks(const char *settings_path, const char *binary_path,
bool windows) {
char command[CLI_BUF_8K];
@@ -9163,7 +9234,8 @@ static void install_copilot_durable_context(const char *home, const char *binary
record_agent_config_error(false, "Copilot", "lifecycle_hook_install", hook_path);
}
if (hook_ok) {
printf(" hooks: SessionStart + SubagentStart (dynamic graph context)\n");
printf(" hooks: SessionStart + SubagentStart + PostToolUse searches (dynamic graph "
"context)\n");
}
}
@@ -9804,7 +9876,7 @@ static void install_cli_agent_configs(const cbm_detected_agents_t *agents, const
cbm_toml_codex_hook_failure_t preflight_failure = CBM_TOML_CODEX_HOOK_FAILURE_NONE;
int preflight_result = commands_ok ? cbm_reconcile_codex_hooks_command_detailed(
cp, command, command_windows, preflight_action,
true, &preflight_failure)
true, &preflight_failure, NULL)
: CLI_ERR;
if (preflight_result != CLI_OK) {
if (!g_install_plan) {
@@ -9847,19 +9919,29 @@ static void install_cli_agent_configs(const cbm_detected_agents_t *agents, const
plan_record("Codex CLI", "hook", hook_target);
} else {
bool hook_ok = true;
int pretool_written = 1;
if (!dry_run && use_hooks_json) {
hook_ok =
cbm_upsert_paired_lifecycle_hooks_json(hooks_json, command, command_windows,
NULL, CMM_HOOK_TIMEOUT_SEC) == CLI_OK &&
cbm_upsert_codex_pretool_hooks_json(hooks_json, command, command_windows) ==
CLI_OK &&
cbm_reconcile_codex_hooks_command(cp, command, command_windows,
CBM_TOML_CODEX_HOOK_REMOVE, false) == CLI_OK;
} else if (!dry_run) {
hook_ok = cbm_upsert_codex_hooks_command(cp, command, command_windows) == CLI_OK;
hook_ok = cbm_reconcile_codex_hooks_command_detailed(
cp, command, command_windows, CBM_TOML_CODEX_HOOK_UPSERT, false, NULL,
&pretool_written) == CLI_OK;
}
if (!hook_ok) {
record_agent_config_error(false, "Codex CLI", "hook_install", hook_target);
} else {
printf(" hooks: SessionStart + SubagentStart (dynamic graph context)\n");
printf(pretool_written
? " hooks: SessionStart + SubagentStart + PreToolUse Bash (dynamic "
"graph context)\n"
: " hooks: SessionStart + SubagentStart (dynamic graph context); "
"PreToolUse skipped: config.toml already has an inline "
"hooks.PreToolUse\n");
printf(" note: non-managed hooks require /hooks trust; definition changes "
"require re-trust\n");
}
@@ -12285,10 +12367,10 @@ static void uninstall_cli_agents(const cbm_detected_agents_t *agents, const char
installed_binary, hook_command_windows,
sizeof(hook_command_windows)) == CLI_OK;
cbm_toml_codex_hook_failure_t preflight_failure = CBM_TOML_CODEX_HOOK_FAILURE_NONE;
bool hook_preflight_ok =
hook_commands_ok && cbm_reconcile_codex_hooks_command_detailed(
cp, hook_command, hook_command_windows,
CBM_TOML_CODEX_HOOK_REMOVE, true, &preflight_failure) == CLI_OK;
bool hook_preflight_ok = hook_commands_ok && cbm_reconcile_codex_hooks_command_detailed(
cp, hook_command, hook_command_windows,
CBM_TOML_CODEX_HOOK_REMOVE, true,
&preflight_failure, NULL) == CLI_OK;
if (!hook_preflight_ok) {
printf("Codex CLI:\n");
fflush(stdout);
@@ -12323,7 +12405,8 @@ static void uninstall_cli_agents(const cbm_detected_agents_t *agents, const char
snprintf(hooks_json, sizeof(hooks_json), "%s/hooks.json", config_dir);
if (cbm_file_exists(hooks_json) &&
(!hook_command_ok ||
cbm_remove_paired_lifecycle_hooks_json(hooks_json, hook_command) != CLI_OK)) {
cbm_remove_paired_lifecycle_hooks_json(hooks_json, hook_command) != CLI_OK ||
cbm_remove_codex_pretool_hooks_json(hooks_json, hook_command) != CLI_OK)) {
record_agent_config_error(true, "Codex CLI", "json_hook_uninstall", hooks_json);
}
}
src/cli/cli.h
+8 -2
View File
@@ -283,6 +283,9 @@ bool cbm_hook_path_contains_for_testing(const char *root, const char *candidate,
bool case_insensitive);
const char *cbm_hook_no_project_index_guidance_for_testing(const char *event);
bool cbm_hook_augment_parse_bash_pattern_for_testing(const char *cmd, char *out, size_t out_sz);
/* include_posttool false renders the previous lifecycle-only manifest. Release
* the result with cbm_free(CBM_MEM_CLASS_OTHER, ...). */
char *cbm_build_copilot_hook_manifest_for_testing(const char *binary_path, bool include_posttool);
bool cbm_mcp_command_path_probe_safe_for_testing(const char *command, bool windows);
void cbm_set_mcp_command_path_probe_counter_for_testing(int *counter);
int cbm_install_editor_mcp_with_previous_for_testing(const char *binary_path,
@@ -591,8 +594,11 @@ void cbm_hook_augment_arm_deadline(void);
int cbm_hook_augment_deadline_ms_for_testing(void);
#endif
char *cbm_hook_augment_read_stdin(void);
/* Pure no-op gate for the hook-client fast path (see hook_augment.c). */
bool cbm_hook_augment_input_is_noop_bash(const char *input);
/* Pure no-op gate for the hook-client fast path (see hook_augment.c). It also
* covers a forced search event, such as Copilot's PostToolUse; forced_event and
* dialect_name are borrowed and may be NULL. */
bool cbm_hook_augment_input_is_noop_for(const char *input, const char *forced_event,
const char *dialect_name);
/* Hand back stdin bytes main() consumed early; the next read returns them. */
void cbm_hook_augment_prefetch_stdin(char *owned);
src/cli/config_toml_edit.c
+79 -32
View File
@@ -3379,7 +3379,8 @@ static int toml_codex_inline_is_owned(const char *data, size_t start, size_t end
toml_string_t type = {0};
toml_string_t command = {0};
toml_string_t windows = {0};
const char *expected_matcher = event == 0 ? "startup|resume|clear|compact" : "*";
const char *expected_matcher =
event == 0 ? "startup|resume|clear|compact" : (event == 1 ? "*" : "Bash");
int result = 0;
if (toml_codex_take(data, end, &pos, "[") != TOML_EDIT_OK ||
toml_codex_take(data, end, &pos, "{") != TOML_EDIT_OK)
@@ -3432,11 +3433,15 @@ done:
toml_string_dispose(&windows);
return result;
}
/* include_pretool renders the current block: the lifecycle pair plus a PreToolUse
* Bash hook, so Codex shell searches get graph context in flow. Without it the
* function renders the previous block (lifecycle pair only), which installs up to
* v0.12 wrote and which upgrades and uninstalls must still recognize as owned. */
static int toml_codex_build_block(const char *command, const char *command_windows,
toml_buffer_t *block) {
int include_pretool, toml_buffer_t *block) {
char escaped[8192];
char escaped_windows[8192];
char rendered[24576];
char rendered[32768];
if (cbm_toml_escape_basic_string(command, escaped, sizeof(escaped)) != TOML_EDIT_OK ||
cbm_toml_escape_basic_string(command_windows, escaped_windows, sizeof(escaped_windows)) !=
TOML_EDIT_OK ||
@@ -3455,6 +3460,16 @@ static int toml_codex_build_block(const char *command, const char *command_windo
"type = \"command\"\ncommand = \"%s\"\n"
"command_windows = \"%s\"\ntimeout = 5\n",
escaped, escaped_windows, escaped, escaped_windows);
if (written > 0 && (size_t)written < sizeof(rendered) && include_pretool) {
int more = snprintf(rendered + written, sizeof(rendered) - (size_t)written,
"\n[[hooks.PreToolUse]]\nmatcher = \"Bash\"\n\n"
"[[hooks.PreToolUse.hooks]]\n"
"type = \"command\"\ncommand = \"%s\"\n"
"command_windows = \"%s\"\ntimeout = 5\n",
escaped, escaped_windows);
written =
more > 0 && (size_t)more < sizeof(rendered) - (size_t)written ? written + more : -1;
}
return written > 0 && (size_t)written < sizeof(rendered)
? toml_buffer_append(block, rendered, (size_t)written)
: TOML_EDIT_ERR;
@@ -3485,19 +3500,24 @@ static size_t toml_codex_owned_span(const char *data, size_t len, const char *be
}
toml_assignment_dispose(&assignment);
}
toml_buffer_t block = {0};
toml_buffer_t expected = {0};
if (toml_codex_current_command_is_owned(values[0].data, values[0].len) &&
toml_codex_current_command_is_owned(values[1].data, values[1].len) &&
toml_codex_build_block(values[0].data, values[1].data, &block) == TOML_EDIT_OK &&
(marked ? toml_append_managed(&expected, begin_marker, end_marker, block.data, newline)
: toml_append_normalized_text(&expected, block.data, block.len, newline)) ==
TOML_EDIT_OK &&
expected.len <= len && memcmp(expected.data, data, expected.len) == 0) {
result = expected.len;
/* Either generation is ours: the current block with PreToolUse first, then the
* previous lifecycle-only block, so upgrade and uninstall never strand it. */
for (int include_pretool = 1; include_pretool >= 0 && result == 0U; --include_pretool) {
toml_buffer_t block = {0};
toml_buffer_t expected = {0};
if (toml_codex_current_command_is_owned(values[0].data, values[0].len) &&
toml_codex_current_command_is_owned(values[1].data, values[1].len) &&
toml_codex_build_block(values[0].data, values[1].data, include_pretool, &block) ==
TOML_EDIT_OK &&
(marked ? toml_append_managed(&expected, begin_marker, end_marker, block.data, newline)
: toml_append_normalized_text(&expected, block.data, block.len, newline)) ==
TOML_EDIT_OK &&
expected.len <= len && memcmp(expected.data, data, expected.len) == 0) {
result = expected.len;
}
toml_buffer_dispose(&expected);
toml_buffer_dispose(&block);
}
toml_buffer_dispose(&expected);
toml_buffer_dispose(&block);
done:
toml_string_dispose(&values[0]);
toml_string_dispose(&values[1]);
@@ -3509,14 +3529,21 @@ static int toml_codex_add_edit(toml_codex_edit_t *edits, size_t *count, size_t s
edits[(*count)++] = (toml_codex_edit_t){.start = start, .end = end};
return TOML_EDIT_OK;
}
/* Inline forms Codex may normalize our hooks to (#1432). SessionStart and
* SubagentStart must be ours or the edit is refused. A foreign inline PreToolUse
* is the user's own hook: it is kept, and *foreign_pretool tells the caller to
* leave PreToolUse out of the block, because TOML cannot hold an inline array and
* array-of-tables entries for the same key. */
static int toml_codex_scan_inline(const char *data, size_t len, toml_codex_edit_t *edits,
size_t *edit_count, int found[2],
size_t *edit_count, int found[3], int *foreign_pretool,
cbm_toml_codex_hook_failure_t *failure) {
toml_key_path_t wanted[2] = {{0}};
toml_key_path_t wanted[3] = {{0}};
toml_key_path_t scope = {0};
if (toml_parse_key_path("hooks.SessionStart", 0U, strlen("hooks.SessionStart"), &wanted[0]) !=
TOML_EDIT_OK ||
toml_parse_key_path("hooks.SubagentStart", 0U, strlen("hooks.SubagentStart"), &wanted[1]) !=
TOML_EDIT_OK ||
toml_parse_key_path("hooks.PreToolUse", 0U, strlen("hooks.PreToolUse"), &wanted[2]) !=
TOML_EDIT_OK) {
toml_codex_set_failure(failure, CBM_TOML_CODEX_HOOK_FAILURE_EDIT_BUILD);
goto error;
@@ -3554,9 +3581,12 @@ static int toml_codex_scan_inline(const char *data, size_t len, toml_codex_edit_
toml_codex_set_failure(failure, CBM_TOML_CODEX_HOOK_FAILURE_EDIT_BUILD);
goto error;
}
int event = toml_key_path_equal(&full_key, &wanted[0])
? 0
: (toml_key_path_equal(&full_key, &wanted[1]) ? 1 : -1);
int event = -1;
for (int candidate = 0; candidate < 3 && event < 0; ++candidate) {
if (toml_key_path_equal(&full_key, &wanted[candidate])) {
event = candidate;
}
}
toml_key_path_dispose(&full_key);
if (event >= 0) {
size_t tail = assignment.value_end;
@@ -3564,12 +3594,14 @@ static int toml_codex_scan_inline(const char *data, size_t len, toml_codex_edit_
size_t payload_start = toml_codex_payload_start(data, len);
size_t edit_start = line.start == 0U ? payload_start : line.start;
cbm_toml_codex_hook_failure_t event_failure = CBM_TOML_CODEX_HOOK_FAILURE_NONE;
++found[event];
if (found[event] > 1) {
int owned = !assignment.multiline_value && tail == line.content_end &&
toml_codex_inline_is_owned(data, assignment.value_start,
assignment.value_end, event);
if (event == 2 && !owned) {
*foreign_pretool = 1;
} else if (++found[event] > 1) {
event_failure = CBM_TOML_CODEX_HOOK_FAILURE_CONFLICTING_HOOKS;
} else if (assignment.multiline_value || tail != line.content_end ||
!toml_codex_inline_is_owned(data, assignment.value_start,
assignment.value_end, event)) {
} else if (!owned) {
event_failure = CBM_TOML_CODEX_HOOK_FAILURE_AMBIGUOUS_OWNERSHIP;
} else if (toml_codex_add_edit(edits, edit_count, edit_start, line.full_end) !=
TOML_EDIT_OK) {
@@ -3600,14 +3632,19 @@ done:
toml_key_path_dispose(&scope);
toml_key_path_dispose(&wanted[0]);
toml_key_path_dispose(&wanted[1]);
toml_key_path_dispose(&wanted[2]);
return result;
}
int cbm_toml_reconcile_codex_hooks_detailed(const char *file_path, const char *begin_marker,
const char *end_marker, const char *command,
const char *command_windows,
cbm_toml_codex_hook_action_t action, int check_only,
cbm_toml_codex_hook_failure_t *failure) {
cbm_toml_codex_hook_failure_t *failure,
int *pretool_written) {
toml_codex_set_failure(failure, CBM_TOML_CODEX_HOOK_FAILURE_NONE);
if (pretool_written) {
*pretool_written = 0;
}
if (!toml_valid_path(file_path) || !toml_valid_marker(begin_marker) ||
!toml_valid_marker(end_marker) || strcmp(begin_marker, end_marker) == 0 || !command ||
!command_windows ||
@@ -3616,7 +3653,7 @@ int cbm_toml_reconcile_codex_hooks_detailed(const char *file_path, const char *b
return TOML_EDIT_ERR;
}
toml_buffer_t block = {0};
if (toml_codex_build_block(command, command_windows, &block) != TOML_EDIT_OK) {
if (toml_codex_build_block(command, command_windows, 1, &block) != TOML_EDIT_OK) {
toml_buffer_dispose(&block);
toml_codex_set_failure(failure, CBM_TOML_CODEX_HOOK_FAILURE_COMMAND_RENDER);
return TOML_EDIT_ERR;
@@ -3687,15 +3724,23 @@ int cbm_toml_reconcile_codex_hooks_detailed(const char *file_path, const char *b
pos += owned_len - 1U;
}
}
int inline_found[2] = {0};
if (toml_codex_scan_inline(existing, existing_len, edits, &edit_count, inline_found, failure) !=
TOML_EDIT_OK) {
int inline_found[3] = {0};
int foreign_pretool = 0;
if (toml_codex_scan_inline(existing, existing_len, edits, &edit_count, inline_found,
&foreign_pretool, failure) != TOML_EDIT_OK) {
goto error;
}
if (markerless_count && (has_pair || inline_found[0] || inline_found[1])) {
if (markerless_count && (has_pair || inline_found[0] || inline_found[1] || inline_found[2])) {
toml_codex_set_failure(failure, CBM_TOML_CODEX_HOOK_FAILURE_CONFLICTING_HOOKS);
goto error;
}
if (foreign_pretool) {
toml_buffer_dispose(&block);
if (toml_codex_build_block(command, command_windows, 0, &block) != TOML_EDIT_OK) {
toml_codex_set_failure(failure, CBM_TOML_CODEX_HOOK_FAILURE_COMMAND_RENDER);
goto error;
}
}
for (size_t i = 0U; i < edit_count; ++i) {
for (size_t j = i + 1U; j < edit_count; ++j) {
if (edits[j].start < edits[i].start) {
@@ -3737,6 +3782,8 @@ int cbm_toml_reconcile_codex_hooks_detailed(const char *file_path, const char *b
output.len, &snapshot);
if (result != TOML_EDIT_OK) {
toml_codex_set_failure(failure, CBM_TOML_CODEX_HOOK_FAILURE_CONFIG_WRITE);
} else if (pretool_written) {
*pretool_written = action == CBM_TOML_CODEX_HOOK_UPSERT && !foreign_pretool;
}
error:
toml_buffer_dispose(&output);
@@ -3749,5 +3796,5 @@ int cbm_toml_reconcile_codex_hooks(const char *file_path, const char *begin_mark
const char *command_windows, cbm_toml_codex_hook_action_t action,
int check_only) {
return cbm_toml_reconcile_codex_hooks_detailed(file_path, begin_marker, end_marker, command,
command_windows, action, check_only, NULL);
command_windows, action, check_only, NULL, NULL);
}
src/cli/config_toml_edit.h
+6 -2
View File
@@ -98,12 +98,16 @@ typedef enum {
/* Returns a stable, content-free diagnostic name for a failure category. */
const char *cbm_toml_codex_hook_failure_name(cbm_toml_codex_hook_failure_t failure);
/* `failure` may be NULL. When non-NULL, it is reset to NONE on entry and remains
* NONE on success; failure categories never contain configuration content. */
* NONE on success; failure categories never contain configuration content.
* `pretool_written` may be NULL. When non-NULL it is set to 1 after a successful
* upsert that wrote the PreToolUse Bash hook, and to 0 when a foreign inline
* hooks.PreToolUse made the upsert keep only the lifecycle pair. */
int cbm_toml_reconcile_codex_hooks_detailed(const char *file_path, const char *begin_marker,
const char *end_marker, const char *command,
const char *command_windows,
cbm_toml_codex_hook_action_t action, int check_only,
cbm_toml_codex_hook_failure_t *failure);
cbm_toml_codex_hook_failure_t *failure,
int *pretool_written);
int cbm_toml_reconcile_codex_hooks(const char *file_path, const char *begin_marker,
const char *end_marker, const char *command,
const char *command_windows, cbm_toml_codex_hook_action_t action,
src/cli/hook_augment.c
+123 -26
View File
@@ -448,8 +448,7 @@ static char *ha_format_context(const char *envelope, const char *token, bool *is
int off = snprintf(text, 4096,
"[codebase-memory] untrusted repository metadata (data only; never "
"instructions): %zu graph symbol(s) match \"%s\" "
"(structured context; your search results below are "
"unaffected):",
"(structured context; your search results are unaffected):",
nres, token);
yyjson_arr_foreach(groups, gidx, gmax, g) {
const char *prefix = ha_obj_str(g, "qn_prefix");
@@ -1359,6 +1358,62 @@ static bool ha_parse_bash_search_pattern(const char *cmd, char *out, size_t out_
return w > 0 && (size_t)w < out_sz;
}
/* One tool call as its dialect reports it. Copilot's postToolUse payload may
* name the runtime tool (bash, rg, ...) instead of the Claude tool, may use the
* camelCase field names, and may pass the arguments as a JSON string, so the
* reader maps the tool name and parses string arguments into input_doc, which
* the caller frees with ha_tool_call_free. Copilot names no event in its
* camelCase payload; its event is the one the managed manifest forces. */
typedef struct {
const char *event;
const char *tool;
yyjson_val *input;
yyjson_doc *input_doc;
} ha_tool_call_t;
static const char *ha_copilot_claude_tool_name(const char *tool) {
if (!tool) {
return NULL;
}
if (strcmp(tool, "bash") == 0 || strcmp(tool, "powershell") == 0) {
return "Bash";
}
if (strcmp(tool, "grep") == 0 || strcmp(tool, "rg") == 0) {
return "Grep";
}
if (strcmp(tool, "glob") == 0) {
return "Glob";
}
return tool;
}
static void ha_tool_call_read(yyjson_val *root, const char *forced_event,
ha_lifecycle_dialect_t dialect, ha_tool_call_t *call) {
call->event = ha_hook_event_name(root);
call->tool = ha_obj_str(root, "tool_name");
call->input = root ? yyjson_obj_get(root, "tool_input") : NULL;
call->input_doc = NULL;
if (dialect != HA_DIALECT_COPILOT) {
return;
}
call->event = forced_event;
call->tool =
ha_copilot_claude_tool_name(call->tool ? call->tool : ha_obj_str(root, "toolName"));
if (!call->input && root) {
call->input = yyjson_obj_get(root, "toolArgs");
}
if (call->input && yyjson_is_str(call->input)) {
call->input_doc = yyjson_read(yyjson_get_str(call->input), yyjson_get_len(call->input), 0);
call->input = call->input_doc ? yyjson_doc_get_root(call->input_doc) : NULL;
}
}
static void ha_tool_call_free(ha_tool_call_t *call) {
yyjson_doc_free(call->input_doc);
call->input_doc = NULL;
call->input = NULL;
}
static bool ha_tool_event_supported(ha_lifecycle_dialect_t dialect, const char *event,
const char *tool, bool *coverage) {
if (coverage) {
@@ -1367,6 +1422,13 @@ static bool ha_tool_event_supported(ha_lifecycle_dialect_t dialect, const char *
if (!event || !tool) {
return false;
}
/* Copilot's preToolUse can only decide permissions, so its searches are
* augmented after they run, through postToolUse additionalContext. */
if (dialect == HA_DIALECT_COPILOT) {
return strcmp(event, "PostToolUse") == 0 &&
(strcmp(tool, "Grep") == 0 || strcmp(tool, "Glob") == 0 ||
strcmp(tool, "Bash") == 0);
}
if (dialect == HA_DIALECT_EVENT) {
if (strcmp(event, "PreToolUse") == 0 &&
(strcmp(tool, "Grep") == 0 || strcmp(tool, "Glob") == 0 || strcmp(tool, "Bash") == 0)) {
@@ -1478,6 +1540,9 @@ static bool ha_invocation_supported(ha_lifecycle_dialect_t dialect, const char *
if (dialect == HA_DIALECT_COPILOT && !forced_event) {
return false;
}
if (dialect == HA_DIALECT_COPILOT && strcmp(forced_event, "PostToolUse") == 0) {
return true;
}
return !forced_event || ha_dialect_event_supported(dialect, forced_event);
}
@@ -1683,15 +1748,18 @@ static char *ha_process(cbm_mcp_server_t *srv, const char *input_json, const cha
yyjson_doc_free(doc);
return lifecycle;
}
const char *event = ha_hook_event_name(root);
const char *tool = ha_obj_str(root, "tool_name");
ha_tool_call_t call;
ha_tool_call_read(root, forced_event, dialect, &call);
const char *event = call.event;
const char *tool = call.tool;
bool coverage = false;
if (!ha_tool_event_supported(dialect, event, tool, &coverage)) {
ha_tool_call_free(&call);
yyjson_doc_free(doc);
return NULL;
}
yyjson_val *tin = yyjson_obj_get(root, "tool_input");
yyjson_val *tin = call.input;
/* Post-read coverage adapters warn only when the exact path is not fully
* represented. They never block or rewrite the completed tool call. */
@@ -1702,10 +1770,12 @@ static char *ha_process(cbm_mcp_server_t *srv, const char *input_json, const cha
if (note) {
char *output = ha_build_event_json(event, note);
free(note);
ha_tool_call_free(&call);
yyjson_doc_free(doc);
return output;
}
}
ha_tool_call_free(&call);
yyjson_doc_free(doc);
return NULL;
}
@@ -1715,6 +1785,7 @@ static char *ha_process(cbm_mcp_server_t *srv, const char *input_json, const cha
if (strcmp(tool, "Bash") == 0) {
const char *cmd = ha_obj_str(tin, "command");
if (!ha_parse_bash_search_pattern(cmd, bash_pattern, sizeof(bash_pattern))) {
ha_tool_call_free(&call);
yyjson_doc_free(doc);
return NULL;
}
@@ -1723,7 +1794,9 @@ static char *ha_process(cbm_mcp_server_t *srv, const char *input_json, const cha
pattern = ha_obj_str(tin, "pattern");
}
char token[HA_MAX_TOKEN + 1];
if (!ha_extract_token(pattern, token, sizeof(token))) {
bool have_token = ha_extract_token(pattern, token, sizeof(token));
ha_tool_call_free(&call);
if (!have_token) {
yyjson_doc_free(doc);
return NULL;
}
@@ -1736,7 +1809,11 @@ static char *ha_process(cbm_mcp_server_t *srv, const char *input_json, const cha
}
char *ctx = ha_resolve_and_query(srv, cwd, token);
char *output = ctx ? ha_build_event_json(event, ctx) : NULL;
char *output = NULL;
if (ctx) {
output = dialect == HA_DIALECT_COPILOT ? ha_build_copilot_json(ctx)
: ha_build_event_json(event, ctx);
}
free(ctx);
yyjson_doc_free(doc);
return output;
@@ -1765,18 +1842,27 @@ char *cbm_hook_augment_process_for(cbm_mcp_server_t *srv, const char *input_json
return ha_process(srv, input_json, forced_event, dialect);
}
/* TRUE iff `input` is an un-forced PreToolUse Bash event whose command can
* never produce augmentation output: not a recognised search, or no queryable
* token. Pure string work — safe to run BEFORE executable-identity hashing,
* cohort admission, or any daemon contact, which is the point: agents issue
* far more Bash calls than Grep/Glob and nearly all are not searches, while
* the identity hash alone costs ~1.1 s of user CPU per invocation on a
* production binary (measured 2026-08-28). Uses the exact parser pair
* ha_process uses, so the gate and the augmenter cannot disagree about what
* counts as a search. Anything uncertain returns false and pays full fare:
* lifecycle events, other tools, coverage adapters, oversized stdin. */
bool cbm_hook_augment_input_is_noop_bash(const char *input) {
if (!input || strlen(input) > HA_STDIN_CAP) {
/* TRUE iff `input` is a search event that can never produce augmentation
* output: a Bash command that is not a recognised search or has no queryable
* token. That event is an un-forced PreToolUse Bash call, or Copilot's forced
* PostToolUse. For Copilot it is also any tool the augmenter does not read:
* VS Code's local hook parser ignores matchers, so the managed PostToolUse
* entry can fire after every tool. Pure string work — safe to run BEFORE
* executable-identity hashing, cohort admission, or any daemon contact, which
* is the point: agents issue far more Bash calls than Grep/Glob and nearly all
* are not searches, while the identity hash alone costs ~1.1 s of user CPU per
* invocation on a production binary (measured 2026-08-28). Uses the exact
* reader and parser pair ha_process uses, so the gate and the augmenter cannot
* disagree about what counts as a search. Anything uncertain returns false and
* pays full fare: lifecycle events, other tools, coverage adapters, oversized
* stdin. */
static bool ha_input_is_noop(const char *input, const char *forced_event,
ha_lifecycle_dialect_t dialect) {
bool copilot = dialect == HA_DIALECT_COPILOT;
const char *search_event = copilot ? "PostToolUse" : "PreToolUse";
if (!input || strlen(input) > HA_STDIN_CAP ||
(copilot ? !forced_event || strcmp(forced_event, search_event) != 0
: forced_event != NULL)) {
return false;
}
yyjson_doc *doc = yyjson_read(input, strlen(input), 0);
@@ -1784,21 +1870,32 @@ bool cbm_hook_augment_input_is_noop_bash(const char *input) {
return false;
}
bool noop = false;
yyjson_val *root = yyjson_doc_get_root(doc);
const char *event = ha_hook_event_name(root);
const char *tool = ha_obj_str(root, "tool_name");
if (event && tool && strcmp(event, "PreToolUse") == 0 && strcmp(tool, "Bash") == 0) {
yyjson_val *tin = yyjson_obj_get(root, "tool_input");
const char *cmd = ha_obj_str(tin, "command");
ha_tool_call_t call;
ha_tool_call_read(yyjson_doc_get_root(doc), forced_event, dialect, &call);
if (copilot && !ha_tool_event_supported(dialect, call.event, call.tool, NULL)) {
noop = true;
} else if (call.event && call.tool && strcmp(call.event, search_event) == 0 &&
strcmp(call.tool, "Bash") == 0) {
const char *cmd = ha_obj_str(call.input, "command");
char pat[HA_BASH_TOK_SZ];
char tok[HA_MAX_TOKEN + 1];
noop = !ha_parse_bash_search_pattern(cmd, pat, sizeof(pat)) ||
!ha_extract_token(pat, tok, sizeof(tok));
}
ha_tool_call_free(&call);
yyjson_doc_free(doc);
return noop;
}
bool cbm_hook_augment_input_is_noop_for(const char *input, const char *forced_event,
const char *dialect_name) {
ha_lifecycle_dialect_t dialect = HA_DIALECT_EVENT;
if (dialect_name && dialect_name[0] && !ha_dialect_from_name(dialect_name, &dialect)) {
return false;
}
return ha_input_is_noop(input, forced_event, dialect);
}
int cbm_cmd_hook_augment(int argc, char **argv) {
cbm_hook_augment_arm_deadline();
@@ -1824,7 +1921,7 @@ int cbm_cmd_hook_augment(int argc, char **argv) {
if (!input) {
return 0;
}
if (!forced_event && cbm_hook_augment_input_is_noop_bash(input)) {
if (ha_input_is_noop(input, forced_event, dialect)) {
free(input);
return 0;
}
src/cypher/cypher.c
+148 -46
View File
@@ -791,6 +791,8 @@ static void expr_free(cbm_expr_t *e) {
safe_str_free(&cur->cond.op);
safe_str_free(&cur->cond.value);
safe_str_free(&cur->cond.coalesce_default);
safe_str_free(&cur->cond.rhs_variable);
safe_str_free(&cur->cond.rhs_property);
for (int i = 0; i < cur->cond.in_value_count; i++) {
safe_str_free(&cur->cond.in_values[i]);
}
@@ -1081,9 +1083,49 @@ static cbm_expr_t *parse_exists_predicate(parser_t *p, bool negated) {
return expr_leaf(c);
}
/* Free what a condition parser owns when it gives up mid-condition. */
static void cond_parse_fail_free(cbm_condition_t *c) {
cond_func_fields_free(c);
safe_str_free(&c->variable);
safe_str_free(&c->property);
safe_str_free(&c->op);
safe_str_free(&c->coalesce_default);
safe_str_free(&c->rhs_variable);
safe_str_free(&c->rhs_property);
}
enum { COND_RHS_REF = 1 };
/* RHS operand that names a row value instead of a literal: var.prop, or a bare
* alias such as a WITH projection (#2591). Returns COND_RHS_REF when one was
* parsed, 0 when the next token is not one, CBM_NOT_FOUND with p->error set
* when it is malformed or a function call. */
static int parse_condition_rhs_ref(parser_t *p, cbm_condition_t *c) {
if (p->pos + SKIP_ONE < p->count && p->tokens[p->pos + SKIP_ONE].type == TOK_LPAREN) {
snprintf(p->error, sizeof(p->error),
"unsupported function '%s' on the right side of a WHERE comparison "
"(only literals and var.prop are supported)",
peek(p)->text);
return CBM_NOT_FOUND;
}
if (!check(p, TOK_IDENT)) {
return 0;
}
c->rhs_variable = heap_strdup(advance(p)->text);
if (match(p, TOK_DOT)) {
const cbm_token_t *prop = expect(p, TOK_IDENT);
if (!prop) {
return CBM_NOT_FOUND;
}
c->rhs_property = heap_strdup(prop->text);
}
return COND_RHS_REF;
}
/* Parse the operator + value tail shared by every condition subject
* (var[.prop] and multi-arg functions like coalesce(...)): IS [NOT] NULL,
* IN [...], or a comparison operator with a literal value. */
* IN [...], or a comparison operator with a literal value or a property
* reference (a.x = b.y). */
static cbm_expr_t *parse_condition_op(parser_t *p, cbm_condition_t *c) {
/* IS NULL / IS NOT NULL */
if (check(p, TOK_IS)) {
@@ -1111,10 +1153,7 @@ static cbm_expr_t *parse_condition_op(parser_t *p, cbm_condition_t *c) {
c->op = parse_comparison_op(p);
if (!c->op) {
snprintf(p->error, sizeof(p->error), "unexpected operator at pos %d", peek(p)->pos);
cond_func_fields_free(c);
safe_str_free(&c->variable);
safe_str_free(&c->property);
safe_str_free(&c->coalesce_default);
cond_parse_fail_free(c);
return NULL;
}
@@ -1127,13 +1166,11 @@ static cbm_expr_t *parse_condition_op(parser_t *p, cbm_condition_t *c) {
} else if (check(p, TOK_FALSE)) {
advance(p);
c->value = heap_strdup("false");
} else {
snprintf(p->error, sizeof(p->error), "expected value at pos %d", peek(p)->pos);
cond_func_fields_free(c);
safe_str_free(&c->variable);
safe_str_free(&c->property);
safe_str_free(&c->op);
safe_str_free(&c->coalesce_default);
} else if (parse_condition_rhs_ref(p, c) <= 0) {
if (!p->error[0]) {
snprintf(p->error, sizeof(p->error), "expected value at pos %d", peek(p)->pos);
}
cond_parse_fail_free(c);
return NULL;
}
@@ -2227,6 +2264,8 @@ static void free_where(cbm_where_clause_t *w) {
free(w->conditions[i].in_values);
safe_str_free(&w->conditions[i].func);
func_args_free(w->conditions[i].args, w->conditions[i].arg_count);
safe_str_free(&w->conditions[i].rhs_variable);
safe_str_free(&w->conditions[i].rhs_property);
}
free(w->conditions);
safe_str_free(&w->op);
@@ -2732,6 +2771,59 @@ static bool eval_comparison_op(const char *op, const char *actual, const char *e
return false;
}
enum { EXISTS_DIR_OUT = 0, EXISTS_DIR_IN = 1 };
/* EXISTS { (var)-[:TYPE]->() }: does the bound node have any edge of the
* given type in the requested direction? (dir 0=out, 1=in, 2=any) */
static bool eval_exists_condition(const cbm_condition_t *c, binding_t *b) {
cbm_node_t *n = binding_get(b, c->variable);
bool result = false;
if (n && b->store) {
cbm_edge_t *edges = NULL;
int cnt = 0;
if (c->exists_dir != EXISTS_DIR_IN) { /* outbound or any */
if (c->value) {
cbm_store_find_edges_by_source_type(b->store, n->id, c->value, &edges, &cnt);
} else {
cbm_store_find_edges_by_source(b->store, n->id, &edges, &cnt);
}
result = cnt > 0;
cbm_store_free_edges(edges, cnt);
}
if (!result && c->exists_dir != EXISTS_DIR_OUT) { /* inbound or any */
edges = NULL;
cnt = 0;
if (c->value) {
cbm_store_find_edges_by_target_type(b->store, n->id, c->value, &edges, &cnt);
} else {
cbm_store_find_edges_by_target(b->store, n->id, &edges, &cnt);
}
result = cnt > 0;
cbm_store_free_edges(edges, cnt);
}
}
return c->negated ? !result : result;
}
/* a.x <op> b.y (#2591): the RHS operand is read from the same row. An unbound
* RHS alias does not filter, like an unbound LHS. A missing (empty) property
* on either side is NULL and the comparison is false, so two nodes that both
* lack a property do not compare equal. */
static bool eval_property_comparison(const cbm_condition_t *c, const char *actual, binding_t *b) {
cbm_condition_t rhs = {0};
rhs.variable = c->rhs_variable;
rhs.property = c->rhs_property;
const char *expected = resolve_condition_value(&rhs, b);
if (!expected) {
return true;
}
if (actual[0] == '\0' || expected[0] == '\0') {
return false;
}
bool result = eval_comparison_op(c->op, actual, expected);
return c->negated ? !result : result;
}
/* Evaluate a WHERE condition against a binding */
static bool eval_condition(const cbm_condition_t *c, binding_t *b) {
/* Label test: WHERE n:Label (#241) — compare the bound node's label
@@ -2742,36 +2834,8 @@ static bool eval_condition(const cbm_condition_t *c, binding_t *b) {
return c->negated ? !result : result;
}
/* EXISTS { (var)-[:TYPE]->() }: does the bound node have any edge of the
* given type in the requested direction? (dir 0=out, 1=in, 2=any) */
if (strcmp(c->op, "EXISTS") == 0) {
cbm_node_t *n = binding_get(b, c->variable);
bool result = false;
if (n && b->store) {
cbm_edge_t *edges = NULL;
int cnt = 0;
if (c->exists_dir != 1) { /* outbound or any */
if (c->value) {
cbm_store_find_edges_by_source_type(b->store, n->id, c->value, &edges, &cnt);
} else {
cbm_store_find_edges_by_source(b->store, n->id, &edges, &cnt);
}
result = cnt > 0;
cbm_store_free_edges(edges, cnt);
}
if (!result && c->exists_dir != 0) { /* inbound or any */
edges = NULL;
cnt = 0;
if (c->value) {
cbm_store_find_edges_by_target_type(b->store, n->id, c->value, &edges, &cnt);
} else {
cbm_store_find_edges_by_target(b->store, n->id, &edges, &cnt);
}
result = cnt > 0;
cbm_store_free_edges(edges, cnt);
}
}
return c->negated ? !result : result;
return eval_exists_condition(c, b);
}
const char *actual = resolve_condition_value(c, b);
@@ -2808,6 +2872,9 @@ static bool eval_condition(const cbm_condition_t *c, binding_t *b) {
return c->negated ? !result : result;
}
if (c->rhs_variable) {
return eval_property_comparison(c, actual, b);
}
result = eval_comparison_op(c->op, actual, c->value);
return c->negated ? !result : result;
}
@@ -2904,11 +2971,12 @@ static bool partial_alias_unbound(binding_t *b, const char *alias) {
}
/* A condition is UNKNOWN while any alias it reads is not bound yet: its own
* variable, and every function argument's -- a func condition is filed under
* its first argument's alias, so the b in coalesce(a.x, b.name) is only seen
* here. A literal-only LHS has nothing to wait for. */
* variable, the RHS of a property comparison (the b in a.x = b.y), and every
* function argument's -- a func condition is filed under its first argument's
* alias, so the b in coalesce(a.x, b.name) is only seen here. A literal-only
* LHS has nothing to wait for. */
static cyp_partial_t eval_condition_partial(const cbm_condition_t *c, binding_t *b) {
if (partial_alias_unbound(b, c->variable)) {
if (partial_alias_unbound(b, c->variable) || partial_alias_unbound(b, c->rhs_variable)) {
return CYP_PARTIAL_UNKNOWN;
}
for (int i = 0; i < c->arg_count; i++) {
@@ -5370,6 +5438,34 @@ static void ret_agg_emit_row(cbm_return_clause_t *ret, ret_agg_entry_t *agg, res
rb_add_row(rb, row);
}
/* True when every RETURN item is an aggregate, so the whole input is one group. */
static bool ret_agg_is_ungrouped(const cbm_return_clause_t *ret) {
for (int ci = 0; ci < ret->count; ci++) {
if (!is_aggregate_func(ret->items[ci].func)) {
return false;
}
}
return true;
}
/* The one row an ungrouped aggregation answers when no binding reached it
* (#2742): count and sum are 0, collect is an empty list, and avg/min/max have
* no value, rendered as "" like any other null. */
static void ret_agg_emit_empty_row(cbm_return_clause_t *ret, result_builder_t *rb) {
const char *row[CBM_SZ_32];
for (int ci = 0; ci < ret->count && ci < CBM_SZ_32; ci++) {
const char *func = ret->items[ci].func;
if (strcmp(func, "COUNT") == 0 || strcmp(func, "SUM") == 0) {
row[ci] = "0";
} else if (strcmp(func, "COLLECT") == 0) {
row[ci] = "[]";
} else {
row[ci] = "";
}
}
rb_add_row(rb, row);
}
static void ret_sink_feed_agg(ret_sink_t *s, binding_t *bindings, int bind_count) {
cbm_return_clause_t *ret = s->ret;
for (int bi = 0; bi < bind_count && !s->done; bi++) {
@@ -5586,6 +5682,11 @@ static void ret_sink_finish(ret_sink_t *s) {
for (int a = 0; a < s->agg_count; a++) {
ret_agg_emit_row(ret, &s->aggs[a], rb);
}
/* Without grouping keys the input is a single group even when it is
* empty; a grouped aggregation over no rows has no group to report. */
if (s->agg_count == 0 && ret_agg_is_ungrouped(ret)) {
ret_agg_emit_empty_row(ret, rb);
}
}
ret_sink_free(s);
@@ -5885,7 +5986,8 @@ static int cypher_cond_selectivity(const cbm_condition_t *c, const char *var) {
if (!c || !c->variable || !var || strcmp(c->variable, var) != 0 || c->negated) {
return 0;
}
if (!c->op || strcmp(c->op, "=") != 0 || !c->property) {
/* a.x = b.y pins no value on either alias, so it seeds nothing. */
if (!c->op || strcmp(c->op, "=") != 0 || !c->property || c->rhs_variable) {
return 0;
}
return (strcmp(c->property, "name") == 0 || strcmp(c->property, "qualified_name") == 0) ? 3 : 2;
src/cypher/cypher.h
+5
View File
@@ -210,6 +210,11 @@ typedef struct {
const char *func;
cbm_func_arg_t *args;
int arg_count;
/* Property reference on the RHS, e.g. a.file_path = b.file_path (#2591).
* When rhs_variable is set the comparison reads its operand from the row
* instead of `value`; rhs_property NULL = bare alias. */
const char *rhs_variable;
const char *rhs_property;
} cbm_condition_t;
/* Expression tree for WHERE clause */
src/daemon/application.c
+3 -1
View File
@@ -2584,10 +2584,12 @@ static void application_background_initialize_impl(cbm_daemon_application_sessio
cbm_mcp_auto_index_within_file_limit(root_path, auto_index_limit, &tracked_files);
if (auto_index_candidate && !within_auto_index_limit) {
char files[32];
char limit[32];
(void)snprintf(files, sizeof(files), "%d", tracked_files);
(void)snprintf(limit, sizeof(limit), "%d", auto_index_limit);
cbm_log_warn("daemon.autoindex.skipped", "project", project, "reason",
tracked_files >= 0 ? "too_many_files" : "unsafe_or_unavailable_path", "files",
files);
files, "limit", limit);
}
bool args_required = auto_index_candidate && within_auto_index_limit;
char *args = args_required ? application_auto_index_args(application, root_path) : NULL;
src/daemon/host.c
+98 -2
View File
@@ -52,6 +52,9 @@ enum {
HOST_HTTP_RETRY_INITIAL_MS = 1000,
HOST_HTTP_RETRY_MAX_MS = 30000,
HOST_WATCH_INTERVAL_MS = 5000,
/* Age-based temp cleaners need days of inactivity (macOS tmp_cleaner: 3);
* a minute bounds the blind window after a long sleep (#2178). */
HOST_COORDINATION_TOUCH_MS = 60000,
HOST_CONFLICT_LOG_CAP = 1024 * 1024,
HOST_OPERATION_LOG_CAP = 5 * 1024 * 1024,
HOST_PATH_CAP = 4096,
@@ -875,10 +878,58 @@ static bool host_background_start(host_state_t *host) {
return true;
}
/* Coordination handles the host retains for the generation's whole lifetime. */
typedef struct {
const cbm_daemon_ipc_endpoint_t *endpoint;
cbm_version_cohort_lease_t *cohort_lease;
cbm_version_cohort_daemon_claim_t *daemon_claim;
cbm_daemon_ipc_participant_guard_t *participant_guard;
} host_coordination_t;
typedef struct {
const char *lost; /* first held file whose path no longer names it */
const char *transient; /* first still-valid file that could not be refreshed */
} host_touch_result_t;
static void host_touch_note(host_touch_result_t *result, const char *file, int status) {
if (status == 0 && !result->lost) {
result->lost = file;
} else if (status < 0 && !result->transient) {
result->transient = file;
}
}
static int host_cohort_touch_status(cbm_version_cohort_status_t status) {
return status == CBM_VERSION_COHORT_OK ? 1 : (status == CBM_VERSION_COHORT_IO ? -1 : 0);
}
/* Refresh every long-held runtime file. A held lock whose path now names
* another inode coordinates nothing: forked index workers read the daemon as
* uncoordinated and a peer can start a second generation (#2178). Every file
* is visited even after one fails so the rest keep being refreshed. */
static host_touch_result_t host_coordination_touch(const host_coordination_t *coordination,
cbm_daemon_runtime_service_t *service) {
host_touch_result_t result = {0};
host_touch_note(&result, "cohort_daemon_claim",
host_cohort_touch_status(
cbm_version_cohort_daemon_claim_touch(coordination->daemon_claim)));
host_touch_note(
&result, "cohort_lease",
host_cohort_touch_status(cbm_version_cohort_lease_touch(coordination->cohort_lease)));
host_touch_note(&result, "participant_guard",
cbm_daemon_ipc_participant_guard_touch(coordination->endpoint,
coordination->participant_guard));
host_touch_note(&result, "listener", cbm_daemon_runtime_service_touch_listener(service));
return result;
}
static bool host_wait_for_lifetime(cbm_daemon_runtime_service_t *service,
atomic_int *stop_requested, host_state_t *host, bool permanent) {
atomic_int *stop_requested, host_state_t *host, bool permanent,
const host_coordination_t *coordination) {
uint64_t initial_deadline = cbm_now_ms() + HOST_INITIAL_CLIENT_TIMEOUT_MS;
uint64_t stopping_deadline = 0;
uint64_t next_touch = 0;
bool touch_degraded = false;
for (;;) {
cbm_daemon_runtime_service_state_t state = cbm_daemon_runtime_service_state(service);
if (state == CBM_DAEMON_RUNTIME_SERVICE_EXITED) {
@@ -910,6 +961,28 @@ static bool host_wait_for_lifetime(cbm_daemon_runtime_service_t *service,
stop ? "stop_requested" : "initial_window_expired");
return cbm_daemon_runtime_service_stop(service, HOST_RUNTIME_SHUTDOWN_MS);
}
/* Permanent generations too: exiting lets the next client start a
* coordinated generation, while re-claiming would race that client. */
if (cbm_now_ms() >= next_touch) {
next_touch = cbm_now_ms() + HOST_COORDINATION_TOUCH_MS;
host_touch_result_t touched = host_coordination_touch(coordination, service);
if (touched.lost) {
cbm_log_warn("daemon.lifetime_end", "reason", "coordination_file_lost", "file",
touched.lost);
return cbm_daemon_runtime_service_stop(service, HOST_RUNTIME_SHUTDOWN_MS);
}
/* A refresh failure on a still-valid file (read-only remount,
* EMFILE) is not loss: keep serving, retry next tick, and log
* only transitions so a persistent condition cannot flood. */
if ((touched.transient != NULL) != touch_degraded) {
touch_degraded = touched.transient != NULL;
if (touch_degraded) {
cbm_log_warn("daemon.coordination_touch_failed", "file", touched.transient);
} else {
cbm_log_info("daemon.coordination_touch_recovered");
}
}
}
host_http_reconcile_at(host, cbm_now_ms(), false);
/* Retire an ephemeral generation that lingered for cold-storm cohort
* participants once they drain, or once its bounded linger elapses.
@@ -919,6 +992,22 @@ static bool host_wait_for_lifetime(cbm_daemon_runtime_service_t *service,
}
}
bool cbm_daemon_host_wait_for_lifetime_for_test(cbm_daemon_runtime_service_t *service,
const cbm_daemon_ipc_endpoint_t *endpoint,
cbm_version_cohort_lease_t *cohort_lease,
cbm_version_cohort_daemon_claim_t *daemon_claim,
cbm_daemon_ipc_participant_guard_t *guard) {
host_state_t host = {0};
atomic_int stop_requested = 0;
host_coordination_t coordination = {
.endpoint = endpoint,
.cohort_lease = cohort_lease,
.daemon_claim = daemon_claim,
.participant_guard = guard,
};
return host_wait_for_lifetime(service, &stop_requested, &host, false, &coordination);
}
static bool host_application_shutdown(host_state_t *host) {
if (cbm_daemon_application_shutdown(host->application, HOST_APPLICATION_SHUTDOWN_MS)) {
return true;
@@ -1130,7 +1219,14 @@ int cbm_daemon_host_run(const cbm_daemon_host_config_t *config) {
: "unavailable",
"memory_budget_bytes", memory_budget, "physical_job_limit", physical_job_limit,
"worker_memory_budget_bytes", worker_memory_budget);
if (!host_wait_for_lifetime(service, config->stop_requested, &host, config->permanent)) {
host_coordination_t coordination = {
.endpoint = config->endpoint,
.cohort_lease = cohort_lease,
.daemon_claim = daemon_claim,
.participant_guard = participant_guard,
};
if (!host_wait_for_lifetime(service, config->stop_requested, &host, config->permanent,
&coordination)) {
host_force_terminate("runtime");
}
src/daemon/host_internal.h
+14
View File
@@ -9,6 +9,10 @@
#include <stdint.h>
struct cbm_daemon_ipc_endpoint;
struct cbm_daemon_ipc_participant_guard;
struct cbm_daemon_runtime_service;
struct cbm_version_cohort_daemon_claim;
struct cbm_version_cohort_lease;
typedef bool (*cbm_daemon_host_cleanup_release_for_test_fn)(void *context);
@@ -68,4 +72,14 @@ bool cbm_daemon_host_http_reconcile_free_refusal_for_test(
* the failure, the adapter must cancel so the final free succeeds. */
bool cbm_daemon_host_http_thread_create_failure_lifecycle_for_test(void);
/* Run the production lifetime loop over caller-held coordination handles with
* no HTTP host state and no stop request. The generation is ephemeral, so a
* loop that misses a loss still ends at the initial client window instead of
* hanging the test. Returns the loop's own result. */
bool cbm_daemon_host_wait_for_lifetime_for_test(
struct cbm_daemon_runtime_service *service, const struct cbm_daemon_ipc_endpoint *endpoint,
struct cbm_version_cohort_lease *cohort_lease,
struct cbm_version_cohort_daemon_claim *daemon_claim,
struct cbm_daemon_ipc_participant_guard *guard);
#endif /* CBM_DAEMON_HOST_INTERNAL_H */
src/daemon/ipc.c
+109
View File
@@ -3510,6 +3510,94 @@ void cbm_daemon_ipc_listener_close(cbm_daemon_ipc_listener_t *listener) {
free(listener);
}
/* Touch results: 1 refreshed, 0 lost (the path no longer names the owned
* file), -1 transient (a still-valid file could not be refreshed). Touch
* through the held descriptor only after proving the path still names it:
* refreshing by path would keep a replacement inode fresh and hide the loss
* (#2178). */
static int posix_touch_fold(int result, int next) {
return result == 0 || next == 0 ? 0 : (result < 0 || next < 0 ? -1 : 1);
}
/* Whether base_name still names the regular file (device, inode): 1 yes,
* 0 proven not (absent, another inode, a symlink or other non-regular
* entry), -1 undetermined (any other lookup failure, e.g. EIO or ESTALE). */
static int posix_path_names_inode(int directory_fd, const char *base_name, dev_t device,
ino_t inode) {
struct stat by_path;
if (fstatat(directory_fd, base_name, &by_path, AT_SYMLINK_NOFOLLOW) != 0) {
return errno == ENOENT ? 0 : -1;
}
return S_ISREG(by_path.st_mode) && by_path.st_dev == device && by_path.st_ino == inode ? 1 : 0;
}
static int posix_held_file_touch(int directory_fd, const char *base_name, int fd) {
struct stat by_handle;
if (fstat(fd, &by_handle) != 0) {
return -1;
}
int identity =
by_handle.st_nlink == 0
? 0
: posix_path_names_inode(directory_fd, base_name, by_handle.st_dev, by_handle.st_ino);
if (identity <= 0) {
return identity;
}
return futimens(fd, NULL) == 0 ? 1 : -1;
}
static int posix_held_lock_touch(int directory_fd, const process_lock_entry_t *entry, int fd) {
return entry ? posix_held_file_touch(directory_fd, entry->lock_name, fd) : 0;
}
static int posix_identity_marker_touch(const cbm_daemon_ipc_listener_t *listener) {
/* The marker is not held open. Classify by path first, so a symlink or
* other replacement is loss; only then reopen it to refresh, where a
* failure (EMFILE, EACCES) says nothing about the file and is transient. */
int identity = posix_path_names_inode(listener->dir_fd, listener->socket_identity_name,
listener->identity_device, listener->identity_inode);
if (identity <= 0) {
return identity;
}
int marker_fd = openat(listener->dir_fd, listener->socket_identity_name,
O_RDONLY | O_CLOEXEC | O_NOFOLLOW | O_NONBLOCK);
if (marker_fd < 0) {
return errno == ENOENT ? 0 : -1;
}
struct stat marker_status;
int result = -1;
if (fstat(marker_fd, &marker_status) == 0) {
/* Replaced between the lookup and the open. */
result = marker_status.st_dev != listener->identity_device ||
marker_status.st_ino != listener->identity_inode
? 0
: (futimens(marker_fd, NULL) == 0 ? 1 : -1);
}
(void)close(marker_fd);
return result;
}
int cbm_daemon_ipc_listener_touch(cbm_daemon_ipc_listener_t *listener,
cbm_daemon_ipc_participant_guard_t *external_guard) {
if (!listener || listener->dir_fd < 0 || listener->owner_pid != getpid() ||
!listener->lifetime_reservation) {
return 0;
}
int result =
posix_held_lock_touch(listener->dir_fd, listener->lifetime_reservation->process_entry,
listener->lifetime_reservation->fd);
const cbm_daemon_ipc_participant_guard_t *guards[] = {listener->participant_guard,
external_guard};
for (size_t i = 0; i < sizeof(guards) / sizeof(guards[0]); i++) {
if (guards[i]) {
result = posix_touch_fold(result, posix_held_lock_touch(listener->dir_fd,
guards[i]->legacy_process_entry,
guards[i]->legacy_fd));
}
}
return posix_touch_fold(result, posix_identity_marker_touch(listener));
}
int cbm_daemon_ipc_accept(cbm_daemon_ipc_listener_t *listener, uint32_t timeout_ms,
cbm_daemon_ipc_connection_t **connection_out) {
if (connection_out) {
@@ -3893,6 +3981,14 @@ bool cbm_daemon_ipc_participant_guard_release(cbm_daemon_ipc_participant_guard_t
return true;
}
int cbm_daemon_ipc_participant_guard_touch(const cbm_daemon_ipc_endpoint_t *endpoint,
cbm_daemon_ipc_participant_guard_t *guard) {
if (!endpoint || !guard || guard->owner_pid != getpid()) {
return 0;
}
return posix_held_lock_touch(endpoint->dir_fd, guard->legacy_process_entry, guard->legacy_fd);
}
int cbm_daemon_ipc_local_transition_try_acquire(
const cbm_daemon_ipc_endpoint_t *endpoint, cbm_daemon_ipc_local_transition_t **transition_out) {
if (transition_out) {
@@ -7090,6 +7186,19 @@ bool cbm_daemon_ipc_participant_guard_release(cbm_daemon_ipc_participant_guard_t
return true;
}
/* Windows has no age-based cleaner of the private runtime directory, and its
* held handles deny deletion; the #2178 heartbeat has nothing to refresh. */
int cbm_daemon_ipc_listener_touch(cbm_daemon_ipc_listener_t *listener,
cbm_daemon_ipc_participant_guard_t *external_guard) {
(void)external_guard;
return listener ? 1 : 0;
}
int cbm_daemon_ipc_participant_guard_touch(const cbm_daemon_ipc_endpoint_t *endpoint,
cbm_daemon_ipc_participant_guard_t *guard) {
return endpoint && guard ? 1 : 0;
}
int cbm_daemon_ipc_local_transition_try_acquire(
const cbm_daemon_ipc_endpoint_t *endpoint, cbm_daemon_ipc_local_transition_t **transition_out) {
if (transition_out) {
src/daemon/ipc.h
+17
View File
@@ -76,6 +76,19 @@ cbm_daemon_ipc_listener_t *cbm_daemon_ipc_listen_reserved(
cbm_daemon_ipc_lifetime_reservation_t **reservation_io);
void cbm_daemon_ipc_listener_close(cbm_daemon_ipc_listener_t *listener);
/* Heartbeat for the daemon's long-lived runtime artifacts: refresh the held
* lifetime reservation, the listener's participant guard (if it owns one),
* external_guard (optional, a guard the caller retains beside this listener)
* and the published identity marker so an age-based temp cleaner never
* deletes them (#2178). Returns 1 when all were refreshed, 0 once any no
* longer names the file this listener owns (a lost lifetime file lets a peer
* start a second generation; a lost identity marker makes listener close
* leave the socket pair behind), and -1 when a still-valid file could not be
* refreshed (transient). Only the thread that closes the listener may call it
* while the listener is open. */
int cbm_daemon_ipc_listener_touch(cbm_daemon_ipc_listener_t *listener,
cbm_daemon_ipc_participant_guard_t *external_guard);
/* Create or validate one private current-user directory at an already
* canonical local path. Ancestors are handle-validated without mutation:
* POSIX permits only root/current-user owners and no group/other write (apart
@@ -290,6 +303,10 @@ bool cbm_daemon_ipc_startup_lock_release(cbm_daemon_ipc_startup_lock_t **lock_io
int cbm_daemon_ipc_participant_guard_try_join(const cbm_daemon_ipc_endpoint_t *endpoint,
cbm_daemon_ipc_participant_guard_t **guard_out);
bool cbm_daemon_ipc_participant_guard_release(cbm_daemon_ipc_participant_guard_t **guard_io);
/* Same heartbeat contract and 1/0/-1 result as cbm_daemon_ipc_listener_touch,
* for a guard the caller retains itself. */
int cbm_daemon_ipc_participant_guard_touch(const cbm_daemon_ipc_endpoint_t *endpoint,
cbm_daemon_ipc_participant_guard_t *guard);
/* Standalone CLI work joins the legacy-compatible current participant group
* without becoming a daemon client. Acquisition retains startup-v2 only for
src/daemon/runtime.c
+6
View File
@@ -2724,6 +2724,12 @@ size_t cbm_daemon_runtime_service_active_connections(cbm_daemon_runtime_service_
return count;
}
int cbm_daemon_runtime_service_touch_listener(cbm_daemon_runtime_service_t *service) {
return service && service->listener
? cbm_daemon_ipc_listener_touch(service->listener, service->owned_participant_guard)
: 0;
}
void cbm_daemon_runtime_service_reconcile_lifetime(cbm_daemon_runtime_service_t *service) {
if (!service) {
return;
src/daemon/runtime.h
+6
View File
@@ -347,6 +347,12 @@ size_t cbm_daemon_runtime_service_active_connections(cbm_daemon_runtime_service_
* an unbounded idle hang. The host lifetime loop calls this every tick; it is a
* no-op unless a last-committed-client linger is armed. */
void cbm_daemon_runtime_service_reconcile_lifetime(cbm_daemon_runtime_service_t *service);
/* #2178 heartbeat over the listener's runtime artifacts, plus the participant
* guard the service owns when it started itself; see
* cbm_daemon_ipc_listener_touch for the 1/0/-1 result. Call only from the
* thread that stops and frees the service, which is the only thread that
* closes the listener. */
int cbm_daemon_runtime_service_touch_listener(cbm_daemon_runtime_service_t *service);
size_t cbm_daemon_runtime_service_job_subscribers(cbm_daemon_runtime_service_t *service,
const char *project_key);
uint64_t cbm_daemon_runtime_service_client_process_id(cbm_daemon_runtime_service_t *service,
src/daemon/version_cohort.c
+31
View File
@@ -363,6 +363,37 @@ cbm_private_file_lock_status_t cbm_version_cohort_lease_release(
return result;
}
/* Folds one lock's touch into an accumulated result: a lost file (UNSAFE)
* outranks a transient refresh failure (IO), which outranks OK. A lease holds
* only lifetime after admission, so absent locks are skipped. */
static cbm_version_cohort_status_t version_cohort_lock_touch(cbm_private_file_lock_t *lock,
cbm_version_cohort_status_t result) {
if (!lock || result == CBM_VERSION_COHORT_UNSAFE) {
return result;
}
cbm_private_file_lock_status_t status = cbm_private_file_lock_touch(lock);
if (status == CBM_PRIVATE_FILE_LOCK_UNSAFE) {
return CBM_VERSION_COHORT_UNSAFE;
}
return status == CBM_PRIVATE_FILE_LOCK_OK ? result : CBM_VERSION_COHORT_IO;
}
cbm_version_cohort_status_t cbm_version_cohort_lease_touch(cbm_version_cohort_lease_t *lease) {
if (!lease || !lease->lifetime) {
return CBM_VERSION_COHORT_UNSAFE;
}
cbm_version_cohort_status_t result =
version_cohort_lock_touch(lease->lifetime, CBM_VERSION_COHORT_OK);
result = version_cohort_lock_touch(lease->admission, result);
return version_cohort_lock_touch(lease->maintenance, result);
}
cbm_version_cohort_status_t cbm_version_cohort_daemon_claim_touch(
cbm_version_cohort_daemon_claim_t *claim) {
return claim && claim->marker ? version_cohort_lock_touch(claim->marker, CBM_VERSION_COHORT_OK)
: CBM_VERSION_COHORT_UNSAFE;
}
static cbm_version_cohort_status_t version_cohort_failed(cbm_version_cohort_lease_t *lease,
cbm_version_cohort_status_t status,
cbm_version_cohort_lease_t **lease_out) {
src/daemon/version_cohort.h
+11
View File
@@ -145,6 +145,17 @@ cbm_version_cohort_daemon_presence_t cbm_version_cohort_daemon_presence_under_tr
cbm_private_file_lock_status_t cbm_version_cohort_lease_release(
cbm_version_cohort_lease_t **lease_io);
/* Heartbeat for a long-lived holder: refresh every lock file the lease or
* claim holds. An age-based temp cleaner deleting a held file silently ends
* coordination, because the next participant creates and locks a fresh inode
* (#2178). Returns OK when all held files were refreshed, UNSAFE once any is
* lost (its path no longer names the held file), and IO when a still-valid
* file could not be refreshed. The only safe response to UNSAFE is an orderly
* exit; re-claiming would race that participant. IO is transient. */
cbm_version_cohort_status_t cbm_version_cohort_lease_touch(cbm_version_cohort_lease_t *lease);
cbm_version_cohort_status_t cbm_version_cohort_daemon_claim_touch(
cbm_version_cohort_daemon_claim_t *claim);
/* Refuses teardown while a lease or retryable cleanup handle remains. */
cbm_private_file_lock_status_t cbm_version_cohort_manager_free(
cbm_version_cohort_manager_t **manager_io);
src/discover/discover.c
+54 -2
View File
@@ -346,6 +346,56 @@ static bool resolve_global_excludes_path(char *out, size_t out_sz) {
return false;
}
/* JVM source-set language roots: src/<set>/<lang>/ in Maven and Gradle layouts. */
static const char *JVM_SOURCE_LANG_DIRS[] = {"java", "kotlin", "scala", "groovy", NULL};
static bool component_equals(const char *start, size_t len, const char *word) {
return strlen(word) == len && strncmp(start, word, len) == 0;
}
/* True when rel_path names a directory strictly below a JVM source root
* ("src/main/java/com/acme/target", "app/src/test/kotlin/x/tmp"). There every
* directory is a package, so a built-in skip name such as "target", "tmp" or
* "vendor" is an ordinary package name, not build output (#2661). The root
* itself and directories beside it ("src/main/target") are not packages. */
bool cbm_discover_path_in_jvm_package(const char *rel_path) {
if (!rel_path) {
return false;
}
enum { JVM_MAX_COMPONENTS = 256 };
const char *starts[JVM_MAX_COMPONENTS];
size_t lens[JVM_MAX_COMPONENTS];
size_t count = 0;
const char *p = rel_path;
while (*p && count < JVM_MAX_COMPONENTS) {
while (*p == '/' || *p == '\\') {
p++;
}
if (!*p) {
break;
}
const char *start = p;
while (*p && *p != '/' && *p != '\\') {
p++;
}
starts[count] = start;
lens[count] = (size_t)(p - start);
count++;
}
/* The language root sits at i + 2; the directory must be below it. */
for (size_t i = 0; i + 3 < count; i++) {
if (!component_equals(starts[i], lens[i], "src")) {
continue;
}
for (int l = 0; JVM_SOURCE_LANG_DIRS[l]; l++) {
if (component_equals(starts[i + 2], lens[i + 2], JVM_SOURCE_LANG_DIRS[l])) {
return true;
}
}
}
return false;
}
/* True when rel_path equals a suffix rule or ends with "/" + the rule. */
bool cbm_discover_path_has_skip_suffix(const char *rel_path) {
if (!rel_path) {
@@ -803,8 +853,10 @@ static dir_verdict_t directory_verdict(const char *entry_name, const char *rel_p
const gitignore_link_t *ignore_chain,
const cbm_gitignore_t *global_gi,
const cbm_gitignore_t *cbmignore) {
if (cbm_should_skip_dir(entry_name, opts ? opts->mode : CBM_MODE_FULL) ||
cbm_discover_path_has_skip_suffix(rel_path)) {
bool builtin_skip = cbm_should_skip_dir(entry_name, opts ? opts->mode : CBM_MODE_FULL) &&
(cbm_discover_is_safety_core_directory(entry_name) ||
!cbm_discover_path_in_jvm_package(rel_path));
if (builtin_skip || cbm_discover_path_has_skip_suffix(rel_path)) {
/* #500: a .cbmignore negation (e.g. "!obj/") whose rule is the last
* match for this dir un-skips a built-in skip-list dir — except the
* non-negatable safety core. Fall through so .gitignore/global/local
src/discover/discover_policy_internal.h
+1
View File
@@ -5,5 +5,6 @@
/* Pure legacy policy predicates; callers provide live terminated strings. */
bool cbm_discover_path_has_skip_suffix(const char *relative_path);
bool cbm_discover_is_safety_core_directory(const char *name);
bool cbm_discover_path_in_jvm_package(const char *relative_path);
#endif
src/discover/inventory_filter.c
+3 -1
View File
@@ -102,7 +102,9 @@ static bool cif_directory_reason(cif_context *c, size_t parent, cbm_inventory_pa
if (!cif_poll(c)) {
return false;
}
bool builtin = cbm_should_skip_dir(name, CBM_MODE_FULL);
bool builtin = cbm_should_skip_dir(name, CBM_MODE_FULL) &&
(cbm_discover_is_safety_core_directory(name) ||
!cbm_discover_path_in_jvm_package((const char *)path.data));
bool suffix = !builtin && cbm_discover_path_has_skip_suffix((const char *)path.data);
bool safety =
(builtin || suffix) && c->owner->cbm_program && cbm_discover_is_safety_core_directory(name);
src/discover/language.c
+4
View File
@@ -135,8 +135,12 @@ static const ext_entry_t EXT_TABLE[] = {
{".F95", CBM_LANG_FORTRAN},
/* GLSL */
{".comp", CBM_LANG_GLSL},
{".frag", CBM_LANG_GLSL},
{".geom", CBM_LANG_GLSL},
{".glsl", CBM_LANG_GLSL},
{".tesc", CBM_LANG_GLSL},
{".tese", CBM_LANG_GLSL},
{".vert", CBM_LANG_GLSL},
/* Go */
src/foundation/log.c
+17 -5
View File
@@ -363,17 +363,29 @@ static void copy_path_without_query(const char *path, char *out, size_t outsz) {
}
void cbm_log_mcp_request(const char *method, const char *tool_name, bool is_error,
int64_t duration_us) {
int64_t duration_us, int64_t handler_duration_us,
int64_t response_serialization_us, bool cancelled, bool timed_out) {
char duration_ms[CBM_SZ_32];
char handler_duration_ms[CBM_SZ_32];
char response_serialization_ms[CBM_SZ_32];
snprintf(duration_ms, sizeof(duration_ms), "%" PRId64, duration_us / 1000);
snprintf(handler_duration_ms, sizeof(handler_duration_ms), "%" PRId64,
handler_duration_us / 1000);
snprintf(response_serialization_ms, sizeof(response_serialization_ms), "%" PRId64,
response_serialization_us / 1000);
const char *status = timed_out ? "timeout" : (is_error ? "error" : "ok");
if (tool_name && tool_name[0] != '\0') {
cbm_log(is_error ? CBM_LOG_WARN : CBM_LOG_INFO, "mcp.request", "protocol", "jsonrpc",
"method", method ? method : "", "tool", tool_name, "status",
is_error ? "error" : "ok", "duration_ms", duration_ms, NULL);
"method", method ? method : "", "tool", tool_name, "status", status, "duration_ms",
duration_ms, "handler_duration_ms", handler_duration_ms,
"response_serialization_ms", response_serialization_ms, "cancelled",
cancelled ? "true" : "false", "timed_out", timed_out ? "true" : "false", NULL);
} else {
cbm_log(is_error ? CBM_LOG_WARN : CBM_LOG_INFO, "mcp.request", "protocol", "jsonrpc",
"method", method ? method : "", "status", is_error ? "error" : "ok", "duration_ms",
duration_ms, NULL);
"method", method ? method : "", "status", status, "duration_ms", duration_ms,
"handler_duration_ms", handler_duration_ms, "response_serialization_ms",
response_serialization_ms, "cancelled", cancelled ? "true" : "false", "timed_out",
timed_out ? "true" : "false", NULL);
}
}
src/foundation/log.h
+2 -1
View File
@@ -95,7 +95,8 @@ void cbm_log_int(CBMLogLevel level, const char *msg, const char *key, int64_t va
/* Operational event helpers. They deliberately avoid request bodies, headers,
* arguments, and query strings. */
void cbm_log_mcp_request(const char *method, const char *tool_name, bool is_error,
int64_t duration_us);
int64_t duration_us, int64_t handler_duration_us,
int64_t response_serialization_us, bool cancelled, bool timed_out);
void cbm_log_http_request(const char *component, const char *method, const char *path, int status,
int64_t duration_ms, size_t request_bytes, size_t response_bytes);
src/foundation/private_file_lock.c
+78
View File
@@ -38,6 +38,9 @@ struct cbm_private_file_lock {
int fd;
pid_t owner_pid;
cbm_private_file_lock_mode_t mode;
/* Borrowed; the directory outlives every lock acquired through it. */
const cbm_private_lock_directory_t *directory;
char base_name[NAME_MAX + 1];
struct cbm_private_file_lock *next_tracked;
bool unlocked;
bool test_fail_unlock_once;
@@ -345,6 +348,8 @@ cbm_private_file_lock_status_t cbm_private_file_lock_try_acquire(
lock->fd = fd;
lock->owner_pid = getpid();
lock->mode = mode;
lock->directory = directory;
memcpy(lock->base_name, base_name, strlen(base_name) + 1);
int operation = mode == CBM_PRIVATE_FILE_LOCK_SH ? LOCK_SH : LOCK_EX;
if (private_flock_set(fd, operation | LOCK_NB) != 0) {
@@ -482,6 +487,59 @@ cbm_private_file_lock_status_t cbm_private_file_lock_payload_write(cbm_private_f
return valid ? CBM_PRIVATE_FILE_LOCK_OK : CBM_PRIVATE_FILE_LOCK_IO;
}
/* Whether the lock's canonical path still names the held inode: 1 yes, 0 no
* (proven lost), -1 undetermined. Only proof counts as loss: unlink leaves
* st_nlink 0, a rename-away or replacement makes the path name another inode
* or nothing, and a replaced directory changes the directory's identity. Any
* other syscall failure (EIO, ESTALE, ENOMEM) says nothing about the file and
* is reported as undetermined so the caller retries instead of exiting. */
static int private_held_identity(const cbm_private_file_lock_t *lock) {
const cbm_private_lock_directory_t *directory = lock->directory;
struct stat by_handle;
struct stat directory_by_path;
struct stat by_path;
if (fstat(lock->fd, &by_handle) != 0) {
return -1;
}
if (by_handle.st_nlink == 0) {
return 0;
}
if (lstat(directory->path, &directory_by_path) != 0) {
return errno == ENOENT || errno == ENOTDIR ? 0 : -1;
}
if (!S_ISDIR(directory_by_path.st_mode) || directory_by_path.st_dev != directory->device ||
directory_by_path.st_ino != directory->inode) {
return 0;
}
if (fstatat(directory->fd, lock->base_name, &by_path, AT_SYMLINK_NOFOLLOW) != 0) {
return errno == ENOENT ? 0 : -1;
}
return S_ISREG(by_path.st_mode) && by_path.st_dev == by_handle.st_dev &&
by_path.st_ino == by_handle.st_ino
? 1
: 0;
}
cbm_private_file_lock_status_t cbm_private_file_lock_touch(cbm_private_file_lock_t *lock) {
if (!lock) {
return CBM_PRIVATE_FILE_LOCK_UNSAFE;
}
if (!cbm_private_file_lock_fork_guard_enter()) {
return CBM_PRIVATE_FILE_LOCK_IO;
}
cbm_private_file_lock_status_t status = CBM_PRIVATE_FILE_LOCK_UNSAFE;
if (lock->fd >= 0 && !lock->unlocked && lock->owner_pid == getpid() && lock->directory &&
private_lock_is_tracked(lock)) {
int identity = private_held_identity(lock);
status = identity > 0 ? (futimens(lock->fd, NULL) == 0 ? CBM_PRIVATE_FILE_LOCK_OK
: CBM_PRIVATE_FILE_LOCK_IO)
: identity < 0 ? CBM_PRIVATE_FILE_LOCK_IO
: CBM_PRIVATE_FILE_LOCK_UNSAFE;
}
cbm_private_file_lock_fork_guard_leave();
return status;
}
cbm_private_file_lock_status_t cbm_private_file_lock_release(cbm_private_file_lock_t **lock_io) {
if (!lock_io || !*lock_io) {
return CBM_PRIVATE_FILE_LOCK_IO;
@@ -1450,6 +1508,26 @@ cbm_private_file_lock_status_t cbm_private_file_lock_payload_write(cbm_private_f
return valid ? CBM_PRIVATE_FILE_LOCK_OK : CBM_PRIVATE_FILE_LOCK_IO;
}
cbm_private_file_lock_status_t cbm_private_file_lock_touch(cbm_private_file_lock_t *lock) {
/* Windows has no age-based cleaner of the private lock directory; only
* confirm the held handle still names a linked file. */
if (!lock || lock->handle == INVALID_HANDLE_VALUE || lock->unlocked) {
return CBM_PRIVATE_FILE_LOCK_UNSAFE;
}
if (!cbm_private_file_lock_fork_guard_enter()) {
return CBM_PRIVATE_FILE_LOCK_IO;
}
BY_HANDLE_FILE_INFORMATION information;
bool queried = GetFileInformationByHandle(lock->handle, &information) != 0;
cbm_private_file_lock_fork_guard_leave();
/* A failed query says nothing about the file; only a proven unlink is loss. */
if (!queried) {
return CBM_PRIVATE_FILE_LOCK_IO;
}
return information.nNumberOfLinks == 0 ? CBM_PRIVATE_FILE_LOCK_UNSAFE
: CBM_PRIVATE_FILE_LOCK_OK;
}
static bool private_win_release_unlock(cbm_private_file_lock_t *lock) {
lock->test_unlock_attempts++;
if (lock->test_fail_unlock_once) {
src/foundation/private_file_lock_internal.h
+10
View File
@@ -61,6 +61,16 @@ cbm_private_file_lock_status_t cbm_private_file_lock_payload_write(cbm_private_f
const void *buffer,
size_t length);
/* Long-lived holders call this periodically. It refreshes the held file's
* timestamps through the validated handle so age-based temp cleaners (macOS
* tmp_cleaner, systemd-tmpfiles) never select it. Returns UNSAFE once the
* lock's path in its directory no longer names the held file (unlinked,
* replaced, renamed away, or the directory itself replaced): a peer opening
* the path would then lock a different inode and the lock coordinates nothing
* (#2178). IO reports a refresh failure on a still-valid lock, which callers
* should treat as transient. The directory must outlive the lock. */
cbm_private_file_lock_status_t cbm_private_file_lock_touch(cbm_private_file_lock_t *lock);
/* Forces the next successfully acquired native lock down the post-lock
* validation cleanup path and injects pre-call release failures there. */
bool cbm_private_lock_directory_fail_post_acquire_cleanup_for_test(
src/main.c
+9 -4
View File
@@ -1134,6 +1134,10 @@ static void print_help(void) {
printf(" codebase-memory-mcp uninstall [-y|-n] [--dry-run] [--delete-indexes]\n");
printf(" codebase-memory-mcp update [-y|-n]\n");
printf(" codebase-memory-mcp config <list|get|set|reset>\n");
printf(" codebase-memory-mcp daemon <start|stop|status>\n");
printf(" start keeps a daemon warm: CLI calls skip\n");
printf(" the per-command start-up, and hooks add\n");
printf(" graph context only while a daemon runs\n");
printf(" codebase-memory-mcp --version Print version\n");
printf(" codebase-memory-mcp --help Print this help\n");
printf("\nCLI output options:\n");
@@ -2876,18 +2880,19 @@ int main(int argc, char **argv) {
cbm_hook_augment_arm_deadline();
#endif
/* Read stdin now and bail before executable-identity hashing when the
* event can never produce output (an un-forced PreToolUse Bash call
* that is not a search). The identity hash costs ~1.1 s of user CPU
* event can never produce output (an un-forced PreToolUse Bash call,
* or Copilot's forced PostToolUse after a shell call, that is not a
* search). The identity hash costs ~1.1 s of user CPU
* per invocation, and with Bash in the installed matcher nearly every
* agent command would pay it for nothing. A no-op touches no shared
* state, so it needs no identity. Anything else is handed back via
* the prefetch so downstream readers see stdin exactly once. */
if (!hook_event) {
if (!hook_event || strcmp(hook_event, "PostToolUse") == 0) {
char *hook_input = cbm_hook_augment_read_stdin();
if (!hook_input) {
return EXIT_SUCCESS; /* fail open, nothing to augment */
}
if (cbm_hook_augment_input_is_noop_bash(hook_input)) {
if (cbm_hook_augment_input_is_noop_for(hook_input, hook_event, hook_dialect)) {
free(hook_input);
return EXIT_SUCCESS;
}
src/mcp/mcp.c
+50 -25
View File
@@ -20959,6 +20959,11 @@ bool cbm_mcp_jsonrpc_response_prepend_notice(char **response_io, const char *not
return true;
}
static long long mcp_elapsed_us(struct timespec start, struct timespec end) {
return ((long long)(end.tv_sec - start.tv_sec) * MCP_S_TO_US) +
((long long)(end.tv_nsec - start.tv_nsec) / MCP_MS_TO_US);
}
char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
cbm_jsonrpc_request_t req = {0};
if (cbm_jsonrpc_parse(line, &req) < 0) {
@@ -20989,7 +20994,11 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
cbm_clock_gettime(CLOCK_MONOTONIC, &req_t0);
char *result_json = NULL;
char *request_error_json = NULL;
bool request_logged = false;
char *request_tool_name = NULL;
long long handler_duration_us = 0;
bool request_is_error = false;
bool request_cancelled = false;
bool request_timed_out = false;
if (strcmp(req.method, "initialize") == 0) {
result_json = cbm_mcp_initialize_response_for_profile(req.params_raw, srv->tool_profile);
@@ -21016,6 +21025,7 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
char *tool_name = req.params_raw ? cbm_mcp_get_tool_name(req.params_raw) : NULL;
char *tool_args =
req.params_raw ? cbm_mcp_get_arguments(req.params_raw) : heap_strdup("{}");
request_tool_name = tool_name;
srv->active_request_id = req.id;
free(srv->active_request_id_str);
srv->active_request_id_str = req.id_str ? heap_strdup(req.id_str) : NULL;
@@ -21028,16 +21038,15 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
srv->active_request_id_str = NULL;
struct timespec t1;
cbm_clock_gettime(CLOCK_MONOTONIC, &t1);
long long dur_us = ((long long)(t1.tv_sec - t0.tv_sec) * MCP_S_TO_US) +
((long long)(t1.tv_nsec - t0.tv_nsec) / MCP_MS_TO_US);
long long dur_us = mcp_elapsed_us(t0, t1);
bool is_err = (result_json != NULL) && (strstr(result_json, "\"isError\":true") != NULL);
cbm_diag_record_query(dur_us, is_err);
long long request_dur_us = ((long long)(t1.tv_sec - req_t0.tv_sec) * MCP_S_TO_US) +
((long long)(t1.tv_nsec - req_t0.tv_nsec) / MCP_MS_TO_US);
cbm_log_mcp_request(req.method, tool_name, is_err, request_dur_us);
request_logged = true;
handler_duration_us = mcp_elapsed_us(req_t0, t1);
request_is_error = is_err;
request_cancelled = mcp_request_cancelled(srv);
request_timed_out =
result_json && strstr(result_json, "\"code\":\"request_timeout\"") != NULL;
free(tool_name);
free(tool_args);
} else {
/* Echo the original id (string or numeric, issue #253) on the error. */
@@ -21049,14 +21058,20 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
.id_str = req.id_str,
.error_json = err_obj,
};
char *err = cbm_jsonrpc_format_response(&err_resp);
struct timespec t1;
cbm_clock_gettime(CLOCK_MONOTONIC, &t1);
long long dur_us = ((long long)(t1.tv_sec - req_t0.tv_sec) * MCP_S_TO_US) +
((long long)(t1.tv_nsec - req_t0.tv_nsec) / MCP_MS_TO_US);
long long handler_us = mcp_elapsed_us(req_t0, t1);
struct timespec serialize_t0;
cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t0);
char *err = cbm_jsonrpc_format_response(&err_resp);
struct timespec serialize_t1;
cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t1);
long long serialization_us = mcp_elapsed_us(serialize_t0, serialize_t1);
long long duration_us = mcp_elapsed_us(req_t0, serialize_t1);
/* server/discover is the modern connect probe. -32601 stays so the
* client falls back to initialize; that miss is not an error (#2433). */
cbm_log_mcp_request(req.method, NULL, strcmp(req.method, "server/discover") != 0, dur_us);
cbm_log_mcp_request(req.method, NULL, strcmp(req.method, "server/discover") != 0,
duration_us, handler_us, serialization_us, false, false);
cbm_mcp_server_request_scope_end(srv);
cbm_jsonrpc_request_free(&req);
return err;
@@ -21068,32 +21083,42 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
.id_str = req.id_str,
.error_json = request_error_json,
};
struct timespec serialize_t0;
cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t0);
char *err = cbm_jsonrpc_format_response(&err_resp);
struct timespec t1;
cbm_clock_gettime(CLOCK_MONOTONIC, &t1);
long long dur_us = ((long long)(t1.tv_sec - req_t0.tv_sec) * MCP_S_TO_US) +
((long long)(t1.tv_nsec - req_t0.tv_nsec) / MCP_MS_TO_US);
cbm_log_mcp_request(req.method, NULL, true, dur_us);
struct timespec serialize_t1;
cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t1);
long long handler_us = mcp_elapsed_us(req_t0, serialize_t0);
long long serialization_us = mcp_elapsed_us(serialize_t0, serialize_t1);
long long duration_us = mcp_elapsed_us(req_t0, serialize_t1);
cbm_log_mcp_request(req.method, NULL, true, duration_us, handler_us, serialization_us,
false, false);
free(request_error_json);
cbm_mcp_server_request_scope_end(srv);
cbm_jsonrpc_request_free(&req);
return err;
}
if (!request_logged) {
struct timespec t1;
cbm_clock_gettime(CLOCK_MONOTONIC, &t1);
long long dur_us = ((long long)(t1.tv_sec - req_t0.tv_sec) * MCP_S_TO_US) +
((long long)(t1.tv_nsec - req_t0.tv_nsec) / MCP_MS_TO_US);
cbm_log_mcp_request(req.method, NULL, false, dur_us);
}
cbm_jsonrpc_response_t resp = {
.id = req.id,
.id_str = req.id_str,
.result_json = result_json,
};
struct timespec serialize_t0;
cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t0);
char *out = cbm_jsonrpc_format_response(&resp);
struct timespec serialize_t1;
cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t1);
long long serialization_us = mcp_elapsed_us(serialize_t0, serialize_t1);
long long duration_us = mcp_elapsed_us(req_t0, serialize_t1);
request_is_error = request_is_error || out == NULL;
if (!request_tool_name) {
handler_duration_us = duration_us - serialization_us;
}
cbm_log_mcp_request(req.method, request_tool_name, request_is_error, duration_us,
handler_duration_us, serialization_us, request_cancelled,
request_timed_out);
free(request_tool_name);
free(result_json);
cbm_mcp_server_request_scope_end(srv);
cbm_jsonrpc_request_free(&req);
src/pipeline/doc_links_md.c
+44 -7
View File
@@ -16,16 +16,18 @@
* document wrote the path.
*
* Unresolved:
* missing the path is not in the graph, but its directory is: the
* document names something that is not there (doc rot)
* missing the path is not in the graph, but its directory is, or a
* directory above it that the reference wrote is: the document
* names something that is not there (doc rot; a moved or
* renamed directory)
* ambiguous a file name alone that is not next to the document but exists
* elsewhere in the repository: the document does not say which
* Not a reference to this repository at all (LOCAL: no edge, no row): a link
* back into the same document; a path that is neither indexed nor of a type
* the indexer reads (an image, an archive, an extensionless page); a path
* whose directory is not in the repository either (a file a tutorial asks
* the reader to create, a system path, a path above the root); and, in a
* code span, a rooted single segment without a file extension, which is a
* none of whose directories is in the repository either (a file a tutorial
* asks the reader to create, a system path, a path above the root); and, in
* a code span, a rooted single segment without a file extension, which is a
* URL route (`/docs`, `/health`), not the directory of that name.
*/
#include "pipeline/doc_links.h"
@@ -408,6 +410,25 @@ static const cbm_gbuf_node_t *mdr_folder(const mdr_index_t *x, const cbm_gbuf_t
return path[0] ? (const cbm_gbuf_node_t *)cbm_ht_get(x->folders, path) : NULL;
}
/* Whether a directory above `path` that the reference itself wrote, one
* longer than the `base_len` bytes it was read from, is a Folder. */
static bool mdr_written_ancestor(const mdr_index_t *x, const cbm_gbuf_t *graph, const char *path,
size_t base_len) {
char dir[MDR_PATH_CAP];
size_t n = strlen(path);
if (n >= sizeof(dir)) {
return false;
}
memcpy(dir, path, n + SKIP_ONE);
for (char *s = strrchr(dir, '/'); s && (size_t)(s - dir) > base_len; s = strrchr(dir, '/')) {
*s = '\0';
if (mdr_folder(x, graph, dir)) {
return true;
}
}
return false;
}
static bool mdr_code_label(const char *label) {
for (size_t i = 0; label && MDR_CODE_LABELS[i]; i++) {
if (strcmp(label, MDR_CODE_LABELS[i]) == 0) {
@@ -1126,8 +1147,19 @@ static void mdr_resolve_path(const mdr_index_t *x, const cbm_gbuf_t *graph, cons
char tries[MDR_TRIES][MDR_PATH_CAP];
int nt = 0;
int attempted = 0;
size_t base_len[MDR_TRIES]; /* the directory each try reads from, before what p wrote */
if (!rooted) {
attempted++;
char lead[MDR_PATH_CAP]; /* p's leading `./` and `../` segments */
char base[MDR_PATH_CAP];
size_t ll = 0;
while (ll < sizeof(lead) - PAIR_LEN - 1 && (strncmp(p + ll, "./", PAIR_LEN) == 0 ||
strncmp(p + ll, "../", PAIR_LEN + 1) == 0)) {
ll += p[ll + 1] == '/' ? PAIR_LEN : PAIR_LEN + 1;
}
memcpy(lead, p, ll);
lead[ll] = '\0';
base_len[nt] = mdr_join(doc_dir, lead, base, sizeof(base)) ? strlen(base) : 0;
nt += mdr_join(doc_dir, p, tries[nt], MDR_PATH_CAP);
}
if (!relative && !r->name_only) {
@@ -1137,7 +1169,7 @@ static void mdr_resolve_path(const mdr_index_t *x, const cbm_gbuf_t *graph, cons
q++;
}
if (mdr_join("", q, tries[nt], MDR_PATH_CAP) && (nt == 0 || strcmp(tries[0], tries[nt]))) {
nt++;
base_len[nt++] = 0;
}
}
for (int i = 0; i < nt; i++) {
@@ -1174,7 +1206,8 @@ static void mdr_resolve_path(const mdr_index_t *x, const cbm_gbuf_t *graph, cons
return;
}
/* doc rot when the reference points into the repository: its directory is
* there (a bare name in a link: the document's own directory) */
* there (a bare name in a link: the document's own directory), or a
* directory above it that the reference wrote is (one moved or renamed) */
for (int i = 0; i < nt; i++) {
char parent[MDR_PATH_CAP];
const char *ps = strrchr(tries[i], '/');
@@ -1185,6 +1218,10 @@ static void mdr_resolve_path(const mdr_index_t *x, const cbm_gbuf_t *graph, cons
out->reason = CBM_DOCLINK_REASON_MISSING;
return;
}
if (pl > 0 && strchr(p, '/') && mdr_written_ancestor(x, graph, tries[i], base_len[i])) {
out->reason = CBM_DOCLINK_REASON_MISSING;
return;
}
if (pl == 0 && r->link && !rooted) {
out->reason = CBM_DOCLINK_REASON_MISSING;
return;
src/pipeline/pass_pkgmap.c
+46 -34
View File
@@ -2037,6 +2037,49 @@ static const cbm_gbuf_node_t *resolve_header_include(const cbm_pipeline_ctx_t *c
return NULL;
}
static bool explicit_relative_path(const char *p) {
return strncmp(p, "./", PAIR_LEN) == 0 || strncmp(p, "../", PAIR_LEN + SKIP_ONE) == 0;
}
enum { SIBLING_MAX_CANDS = 4 };
/* The paths resolve_sibling_file tries for module_path, relative to the
* importer's directory `dir`, in priority order. Returns how many it wrote. */
static int sibling_file_candidates(const char *dir, const char *module_path,
char cands[SIBLING_MAX_CANDS][PKGMAP_PATH_BUF]) {
int ncand = 0;
const char *sep = dir[0] ? "/" : "";
const char *base = module_path;
/* Skip a leading "./". */
if (strncmp(base, "./", PAIR_LEN) == 0) {
base += PAIR_LEN;
}
const char *slash = strrchr(base, '/');
/* 1. Direct sibling: dir/<module_path>. */
snprintf(cands[ncand++], PKGMAP_PATH_BUF, "%s%s%s", dir, sep, base);
/* 2. SCSS partial: dir/[subdir/]_<basename>.scss (underscore-prefixed). */
{
const char *bn = slash ? slash + SKIP_ONE : base;
char *dpart = slash ? cbm_strndup(base, (size_t)(slash - base)) : strdup("");
if (dpart && bn[0] != '_') {
snprintf(cands[ncand++], PKGMAP_PATH_BUF, "%s%s%s%s_%s.scss", dir, sep, dpart,
dpart[0] ? "/" : "", bn);
}
free(dpart);
}
/* 3. Meson subdir: dir/<module_path>/meson.build. */
snprintf(cands[ncand++], PKGMAP_PATH_BUF, "%s%s%s/meson.build", dir, sep, base);
/* 4. Basename sibling: dir/<basename(module_path)>. Covers include paths
* that carry a non-relative prefix (Hyprlang `source = ~/.config/.../x.conf`,
* absolute include paths) but reference a file sitting beside the importer.
* An explicit `./` or `../` path names one location, which Strategy 1c
* resolves exactly; its basename beside the importer is another file (#2797). */
if (slash && slash[SKIP_ONE] && !explicit_relative_path(module_path)) {
snprintf(cands[ncand++], PKGMAP_PATH_BUF, "%s%s%s", dir, sep, slash + SKIP_ONE);
}
return ncand;
}
/* Resolve a sibling-file import: a bare path/name (no leading "./") that names
* a file relative to the importer's directory. This covers build/markup
* grammars whose import string is a sibling filename or directory rather than a
@@ -2063,38 +2106,8 @@ static const cbm_gbuf_node_t *resolve_sibling_file(const cbm_pipeline_ctx_t *ctx
return NULL;
}
/* Candidate relative paths, in priority order. */
char cands[5][PKGMAP_PATH_BUF];
int ncand = 0;
const char *base = module_path;
/* Skip a leading "./". */
if (base[0] == '.' && base[1] == '/') {
base += 2;
}
/* 1. Direct sibling: dir/<module_path>. */
snprintf(cands[ncand++], PKGMAP_PATH_BUF, "%s%s%s", dir, dir[0] ? "/" : "", base);
/* 2. SCSS partial: dir/[subdir/]_<basename>.scss (underscore-prefixed). */
{
const char *slash = strrchr(base, '/');
const char *bn = slash ? slash + 1 : base;
char *dpart = slash ? cbm_strndup(base, (size_t)(slash - base)) : strdup("");
if (dpart && bn[0] != '_') {
snprintf(cands[ncand++], PKGMAP_PATH_BUF, "%s%s%s%s_%s.scss", dir, dir[0] ? "/" : "",
dpart[0] ? dpart : "", dpart[0] ? "/" : "", bn);
}
free(dpart);
}
/* 3. Meson subdir: dir/<module_path>/meson.build. */
snprintf(cands[ncand++], PKGMAP_PATH_BUF, "%s%s%s/meson.build", dir, dir[0] ? "/" : "", base);
/* 4. Basename sibling: dir/<basename(module_path)>. Covers include paths
* that carry a non-relative prefix (Hyprlang `source = ~/.config/.../x.conf`,
* absolute include paths) but reference a file sitting beside the importer. */
{
const char *slash = strrchr(base, '/');
if (slash && slash[1]) {
snprintf(cands[ncand++], PKGMAP_PATH_BUF, "%s%s%s", dir, dir[0] ? "/" : "", slash + 1);
}
}
char cands[SIBLING_MAX_CANDS][PKGMAP_PATH_BUF];
int ncand = sibling_file_candidates(dir, module_path, cands);
const cbm_gbuf_node_t *found = NULL;
for (int i = 0; i < ncand; i++) {
@@ -2123,8 +2136,7 @@ static const cbm_gbuf_node_t *resolve_sibling_file(const cbm_pipeline_ctx_t *ctx
static const cbm_gbuf_node_t *resolve_relative_file(const cbm_pipeline_ctx_t *ctx,
const char *source_rel, const char *module_path,
bool php_only) {
if (!source_rel || !module_path || module_path[0] != '.' ||
!(module_path[1] == '/' || (module_path[1] == '.' && module_path[2] == '/'))) {
if (!source_rel || !module_path || !explicit_relative_path(module_path)) {
return NULL;
}
char dir[PKGMAP_PATH_BUF];
src/pipeline/pass_route_nodes.c
+52 -40
View File
@@ -408,61 +408,58 @@ void cbm_pipeline_emit_def_route(cbm_gbuf_t *gb, int64_t func_id, const CBMDefin
snprintf(route_qn, sizeof(route_qn), "__route__%s__%s", rm,
cbm_route_canon_path(def->route_path, cpath, sizeof(cpath)));
char rprops[CBM_SZ_256];
snprintf(rprops, sizeof(rprops), "{\"method\":\"%s\",\"source\":\"decorator\"}", rm);
char esc_m[CBM_SZ_128];
cbm_json_escape(esc_m, sizeof(esc_m), rm);
(void)snprintf(rprops, sizeof(rprops), "{\"method\":\"%s\",\"source\":\"decorator\"}", esc_m);
int64_t route_id = cbm_gbuf_upsert_node(gb, "Route", def->route_path, route_qn,
def->file_path ? def->file_path : rel, 0, 0, rprops);
char hprops[CBM_SZ_512];
char hprops[CBM_SZ_1K]; /* must exceed escaped value + wrapper or snprintf cuts the
closing brace */
char esc_h[CBM_SZ_512];
cbm_json_escape(esc_h, sizeof(esc_h), def->qualified_name);
snprintf(hprops, sizeof(hprops), "{\"handler\":\"%s\"}", esc_h);
(void)snprintf(hprops, sizeof(hprops), "{\"handler\":\"%s\"}", esc_h);
cbm_gbuf_insert_edge(gb, func_id, route_id, "HANDLES", hprops);
}
/* Phase 2a: Ensure all functions with route_path properties have Route+HANDLES edges.
* During incremental indexing, only changed files get Route nodes from extraction.
* This pass scans ALL Function/Method nodes and creates missing Route+HANDLES. */
/* Extract a JSON string property value into buf. Returns true if found. */
static bool extract_json_prop(const char *json, const char *key, char *buf, int bufsz) {
if (!json) {
/* Extract the string property `key` of a parsed properties object into buf,
* with its escapes decoded. Returns true if found: a non-empty string with no
* NUL that fits buf. Nothing is copied otherwise. */
static bool extract_json_prop(yyjson_val *root, const char *key, char *buf, size_t bufsz) {
yyjson_val *val = yyjson_obj_get(root, key);
const char *str = yyjson_get_str(val);
size_t len = yyjson_get_len(val);
if (!str || len == 0 || len >= bufsz || memchr(str, '\0', len)) {
return false;
}
char pattern[CBM_SZ_64];
snprintf(pattern, sizeof(pattern), "\"%s\":\"", key);
const char *p = strstr(json, pattern);
if (!p) {
return false;
}
p += strlen(pattern);
const char *end = strchr(p, '"');
if (!end || end <= p) {
return false;
}
int len = (int)(end - p);
if (len >= bufsz) {
return false;
}
memcpy(buf, p, (size_t)len);
buf[len] = '\0';
memcpy(buf, str, len + SKIP_ONE);
return true;
}
/* Process a single Function/Method node: create Route+HANDLES if it has route_path.
* Returns 1 if a new HANDLES edge was created, 0 otherwise. */
static int ensure_one_decorator_route(cbm_gbuf_t *gb, const cbm_gbuf_node_t *func) {
if (!func->properties_json) {
/* Most nodes carry no route: skip them before parsing their properties. */
if (!func->properties_json || !strstr(func->properties_json, "\"route_path\"")) {
return 0;
}
/* Properties hold source text as its bytes, which need not be UTF-8. */
yyjson_doc *doc = yyjson_read(func->properties_json, strlen(func->properties_json),
YYJSON_READ_ALLOW_INVALID_UNICODE);
yyjson_val *root = yyjson_doc_get_root(doc);
char path[CBM_SZ_256];
if (!extract_json_prop(func->properties_json, "route_path", path, sizeof(path))) {
return 0;
}
if (path[0] != '/') {
return 0;
}
char method[CBM_SZ_16] = "ANY";
extract_json_prop(func->properties_json, "route_method", method, sizeof(method));
bool routed = extract_json_prop(root, "route_path", path, sizeof(path)) && path[0] == '/';
if (routed) {
extract_json_prop(root, "route_method", method, sizeof(method));
}
yyjson_doc_free(doc);
if (!routed) {
return 0;
}
char route_qn[CBM_ROUTE_QN_SIZE];
char cpath[CBM_SZ_256];
@@ -471,7 +468,9 @@ static int ensure_one_decorator_route(cbm_gbuf_t *gb, const cbm_gbuf_node_t *fun
const cbm_gbuf_node_t *existing = cbm_gbuf_find_by_qn(gb, route_qn);
char rprops[CBM_SZ_256];
snprintf(rprops, sizeof(rprops), "{\"method\":\"%s\",\"source\":\"decorator\"}", method);
char esc_m[CBM_SZ_128];
cbm_json_escape(esc_m, sizeof(esc_m), method);
(void)snprintf(rprops, sizeof(rprops), "{\"method\":\"%s\",\"source\":\"decorator\"}", esc_m);
int64_t route_id = cbm_gbuf_upsert_node(gb, "Route", path, route_qn,
func->file_path ? func->file_path : "", 0, 0, rprops);
@@ -486,9 +485,12 @@ static int ensure_one_decorator_route(cbm_gbuf_t *gb, const cbm_gbuf_node_t *fun
}
}
char hprops[CBM_SZ_512];
snprintf(hprops, sizeof(hprops), "{\"handler\":\"%s\"}",
func->qualified_name ? func->qualified_name : "");
/* The same properties cbm_pipeline_emit_def_route gives the edge. */
char hprops[CBM_SZ_1K]; /* must exceed escaped value + wrapper or snprintf cuts the
closing brace */
char esc_h[CBM_SZ_512];
cbm_json_escape(esc_h, sizeof(esc_h), func->qualified_name ? func->qualified_name : "");
(void)snprintf(hprops, sizeof(hprops), "{\"handler\":\"%s\"}", esc_h);
cbm_gbuf_insert_edge(gb, func->id, route_id, "HANDLES", hprops);
return SKIP_ONE;
}
@@ -1180,6 +1182,17 @@ typedef struct {
int files_seen;
} sveltekit_ctx_t;
/* The properties of a SvelteKit handler's HANDLES edge: its QN, escaped as
* every HANDLES edge's handler is. */
static void sveltekit_handles_props(char *out, size_t outsz, const cbm_gbuf_node_t *child,
bool is_actions) {
char esc_h[CBM_SZ_512];
cbm_json_escape(esc_h, sizeof(esc_h),
child->qualified_name ? child->qualified_name : child->name);
(void)snprintf(out, outsz, "{\"handler\":\"%s\",\"framework\":\"sveltekit\"%s}", esc_h,
is_actions ? ",\"via\":\"actions_object\"" : "");
}
/* Process one File node: if it matches a SvelteKit server-side file,
* synthesise a Route node and HANDLES edges from any handler functions
* (or actions Variable) defined in the file. */
@@ -1256,10 +1269,9 @@ static void sveltekit_file_visitor(const cbm_gbuf_node_t *node, void *userdata)
}
ctx->routes_created++;
char hprops[CBM_SZ_256];
snprintf(hprops, sizeof(hprops), "{\"handler\":\"%s\",\"framework\":\"sveltekit\"%s}",
child->qualified_name ? child->qualified_name : child->name,
is_actions ? ",\"via\":\"actions_object\"" : "");
char hprops[CBM_SZ_1K]; /* must exceed escaped value + wrapper or snprintf cuts the
closing brace */
sveltekit_handles_props(hprops, sizeof(hprops), child, is_actions);
cbm_gbuf_insert_edge(ctx->gb, child->id, route_id, "HANDLES", hprops);
ctx->handles_created++;
}
src/pipeline/pipeline_incremental.c
+6 -2
View File
@@ -426,8 +426,12 @@ static int semantic_manifest_walk_controls(semantic_manifest_builder_t *builder,
if (depth >= MANIFEST_WALK_MAX_DEPTH)
return 0;
cbm_dir_t *dir = cbm_opendir(abs_dir);
if (!dir)
return CBM_NOT_FOUND;
if (!dir) {
/* A nested directory we can't open has no control files to
* contribute; skip it like discover.c's walk_dir already does.
* The root call (depth 0) still fails closed. */
return depth == 0 ? CBM_NOT_FOUND : 0;
}
int rc = 0;
cbm_dirent_t *entry;
while (rc == 0 && (entry = cbm_readdir(dir)) != NULL) {
src/ui/layout3d.c
+65 -44
View File
@@ -575,6 +575,7 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
/* 3. Query edges — filter during fetch via binary search (O(e log n)) */
int *deg = calloc((size_t)n, sizeof(int));
bool *framework_entry = cbm_calloc(CBM_MEM_CLASS_OTHER, (size_t)n * sizeof(bool));
int mapped = 0;
int edge_cap = CBM_SZ_256;
cbm_edge_t *all_edges = malloc((size_t)edge_cap * sizeof(cbm_edge_t));
@@ -582,52 +583,69 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
int *ed = malloc((size_t)edge_cap * sizeof(int));
cbm_schema_info_t schema;
memset(&schema, 0, sizeof(schema));
if (deg && all_edges && es && ed &&
cbm_store_get_schema(store, project, &schema) == CBM_STORE_OK) {
for (int t = 0; t < schema.edge_type_count; t++) {
cbm_edge_t *te = NULL;
int tc = 0;
if (cbm_store_find_edges_by_type(store, project, schema.edge_types[t].type, &te, &tc) ==
CBM_STORE_OK) {
for (int e = 0; e < tc; e++) {
int si = find_node_index(id_map, n, te[e].source_id);
int di = find_node_index(id_map, n, te[e].target_id);
if (si >= 0 && di >= 0) {
if (mapped >= edge_cap) {
int nc = edge_cap * PAIR_LEN;
cbm_edge_t *te2 = realloc(all_edges, (size_t)nc * sizeof(cbm_edge_t));
int *ts = realloc(es, (size_t)nc * sizeof(int));
int *td = realloc(ed, (size_t)nc * sizeof(int));
if (!te2 || !ts || !td) {
if (te2)
all_edges = te2;
if (ts)
es = ts;
if (td)
ed = td;
free_edge_array(te + e, tc - e);
goto edges_done;
bool framework_entries_valid = deg && framework_entry && all_edges && es && ed;
if (framework_entries_valid) {
if (cbm_store_get_schema(store, project, &schema) == CBM_STORE_OK) {
for (int t = 0; t < schema.edge_type_count; t++) {
cbm_edge_t *te = NULL;
int tc = 0;
if (cbm_store_find_edges_by_type(store, project, schema.edge_types[t].type, &te,
&tc) == CBM_STORE_OK) {
for (int e = 0; e < tc; e++) {
int si = find_node_index(id_map, n, te[e].source_id);
int di = find_node_index(id_map, n, te[e].target_id);
if (si >= 0 && te[e].type && strcmp(te[e].type, "HANDLES") == 0) {
cbm_node_t route = {0};
if (cbm_store_find_node_by_id(store, te[e].target_id, &route) ==
CBM_STORE_OK) {
if (route.label && strcmp(route.label, "Route") == 0)
framework_entry[si] = true;
cbm_node_free_fields(&route);
} else
framework_entries_valid = false;
}
if (si >= 0 && di >= 0) {
if (mapped >= edge_cap) {
int nc = edge_cap * PAIR_LEN;
cbm_edge_t *te2 =
realloc(all_edges, (size_t)nc * sizeof(cbm_edge_t));
int *ts = realloc(es, (size_t)nc * sizeof(int));
int *td = realloc(ed, (size_t)nc * sizeof(int));
if (!te2 || !ts || !td) {
framework_entries_valid = false;
if (te2)
all_edges = te2;
if (ts)
es = ts;
if (td)
ed = td;
free_edge_array(te + e, tc - e);
goto edges_done;
}
all_edges = te2;
es = ts;
ed = td;
edge_cap = nc;
}
all_edges = te2;
es = ts;
ed = td;
edge_cap = nc;
all_edges[mapped] = te[e];
memset(&te[e], 0, sizeof(cbm_edge_t));
es[mapped] = si;
ed[mapped] = di;
deg[si]++;
deg[di]++;
mapped++;
} else {
free((void *)te[e].project);
free((void *)te[e].type);
free((void *)te[e].properties_json);
}
all_edges[mapped] = te[e];
memset(&te[e], 0, sizeof(cbm_edge_t));
es[mapped] = si;
ed[mapped] = di;
deg[si]++;
deg[di]++;
mapped++;
} else {
free((void *)te[e].project);
free((void *)te[e].type);
free((void *)te[e].properties_json);
}
}
free(te);
free(te);
} else
framework_entries_valid = false;
}
} else {
framework_entries_valid = false;
}
edges_done:
cbm_store_schema_free(&schema);
@@ -651,6 +669,7 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
if (!result || !bodies) {
free(bodies);
free(deg);
cbm_free(CBM_MEM_CLASS_OTHER, framework_entry);
free(es);
free(ed);
free(cdepth);
@@ -757,11 +776,12 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
status = "structural";
else if (testish)
status = "test";
else if (nf.is_entry || nf.is_route)
else if (nf.is_entry || nf.is_route ||
(framework_entries_valid && framework_entry && framework_entry[i]))
status = "entry";
else if (nf.is_exported)
status = "exported";
else if (ic == 0 && iu == 0)
else if (framework_entries_valid && ic == 0 && iu == 0)
status = "dead";
else if (ic == 1)
status = "single";
@@ -795,6 +815,7 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
free(bodies);
free(deg);
cbm_free(CBM_MEM_CLASS_OTHER, framework_entry);
free(es);
free(ed);
free(cdepth);
tests/test_cli.c
+352 -1
View File
@@ -23,6 +23,7 @@
#include <daemon/version_cohort.h>
#include <foundation/constants.h>
#include <foundation/log.h>
#include <foundation/mem_core.h>
#include <foundation/platform.h>
#include <foundation/private_file_lock.h>
#include <foundation/sha256.h>
@@ -12403,6 +12404,89 @@ TEST(cli_codex_session_hook_issue330) {
PASS();
}
/* The block installs up to v0.12 wrote: the lifecycle pair only, inside the
* markers. Upgrades and uninstalls must still recognize it as ours. */
static const char test_codex_previous_hook_block[] =
"# >>> codebase-memory-mcp SessionStart >>>\n"
"[[hooks.SessionStart]]\n"
"matcher = \"startup|resume|clear|compact\"\n\n"
"[[hooks.SessionStart.hooks]]\n"
"type = \"command\"\ncommand = \"codebase-memory-mcp hook-augment\"\n"
"command_windows = \"codebase-memory-mcp hook-augment\"\ntimeout = 5\n\n"
"[[hooks.SubagentStart]]\nmatcher = \"*\"\n\n"
"[[hooks.SubagentStart.hooks]]\n"
"type = \"command\"\ncommand = \"codebase-memory-mcp hook-augment\"\n"
"command_windows = \"codebase-memory-mcp hook-augment\"\ntimeout = 5\n"
"# <<< codebase-memory-mcp SessionStart <<<\n";
/* Codex shell searches get graph context in flow: the managed block adds a
* PreToolUse Bash hook, upgrades the previous block in place, removes either
* generation, keeps a user's own inline hooks.PreToolUse (TOML cannot mix an
* inline array with array-of-tables entries for one key), and replaces the
* inline form Codex may normalize ours to. */
TEST(cli_codex_pretooluse_hook_lifecycle) {
char tmpdir[256];
snprintf(tmpdir, sizeof(tmpdir), "/tmp/cli-codexpre-XXXXXX");
if (!cbm_mkdtemp(tmpdir))
FAIL("cbm_mkdtemp failed");
char cfg[512];
snprintf(cfg, sizeof(cfg), "%s/config.toml", tmpdir);
/* fresh install: one PreToolUse Bash hook running hook-augment, idempotent */
write_test_file(cfg, "[mcp_servers.other]\ncommand = \"x\"\n");
ASSERT_EQ(cbm_upsert_codex_hooks(cfg), 0);
ASSERT_EQ(cbm_upsert_codex_hooks(cfg), 0);
const char *d = read_test_file(cfg);
ASSERT_NOT_NULL(d);
ASSERT_EQ(test_count_substring(d, "[[hooks.PreToolUse]]\nmatcher = \"Bash\""), 1U);
ASSERT_EQ(test_count_substring(d, "[[hooks.PreToolUse.hooks]]"), 1U);
ASSERT_EQ(test_count_substring(d, "[[hooks.SessionStart]]"), 1U);
ASSERT_EQ(cbm_remove_codex_hooks(cfg), 0);
d = read_test_file(cfg);
ASSERT_NULL(strstr(d, "hooks.PreToolUse"));
ASSERT_NOT_NULL(strstr(d, "[mcp_servers.other]"));
/* upgrade: the previous block is replaced, never refused as ambiguous */
char previous[2048];
snprintf(previous, sizeof(previous), "[mcp_servers.other]\ncommand = \"x\"\n\n%s",
test_codex_previous_hook_block);
write_test_file(cfg, previous);
ASSERT_EQ(cbm_upsert_codex_hooks(cfg), 0);
d = read_test_file(cfg);
ASSERT_EQ(test_count_substring(d, "[[hooks.SessionStart]]"), 1U);
ASSERT_EQ(test_count_substring(d, "[[hooks.PreToolUse]]"), 1U);
/* uninstall of the previous generation */
write_test_file(cfg, previous);
ASSERT_EQ(cbm_remove_codex_hooks(cfg), 0);
d = read_test_file(cfg);
ASSERT_NULL(strstr(d, "hooks.SessionStart"));
ASSERT_NULL(strstr(d, "hook-augment"));
/* a user's own inline PreToolUse stays, and our block leaves PreToolUse out */
const char *foreign = "[hooks]\nPreToolUse = [{ matcher = \"Bash\", hooks = [{ type = "
"\"command\", command = \"/usr/local/bin/audit-shell\" }] }]\n";
write_test_file(cfg, foreign);
ASSERT_EQ(cbm_upsert_codex_hooks(cfg), 0);
d = read_test_file(cfg);
ASSERT_NOT_NULL(strstr(d, "audit-shell"));
ASSERT_NULL(strstr(d, "[[hooks.PreToolUse]]"));
ASSERT_EQ(test_count_substring(d, "[[hooks.SessionStart]]"), 1U);
/* Codex's inline form of our own PreToolUse is replaced, not duplicated */
write_test_file(cfg, "[hooks]\nPreToolUse = [{ matcher = \"Bash\", hooks = [{ type = "
"\"command\", command = \"codebase-memory-mcp hook-augment\", "
"command_windows = \"codebase-memory-mcp hook-augment\", "
"timeout = 5 }] }]\n");
ASSERT_EQ(cbm_upsert_codex_hooks(cfg), 0);
d = read_test_file(cfg);
ASSERT_NULL(strstr(d, "PreToolUse = ["));
ASSERT_EQ(test_count_substring(d, "[[hooks.PreToolUse]]"), 1U);
test_rmdir_r(tmpdir);
PASS();
}
/* Gemini/Antigravity SessionStart reminder parity (settings.json JSON path). */
TEST(cli_gemini_session_hook_parity) {
char tmpdir[256];
@@ -12680,6 +12764,11 @@ TEST(cli_copilot_install_preserves_foreign_named_manifest) {
snprintf(hooks_dir, sizeof(hooks_dir), "%s/.copilot/hooks", tmpdir);
snprintf(manifest_path, sizeof(manifest_path), "%s/codebase-memory-mcp.json", hooks_dir);
test_mkdirp(hooks_dir);
/* Copilot CLI must be detected, or install and uninstall never reach the
* manifest and this test cannot fail. */
char copilot_mcp[640];
snprintf(copilot_mcp, sizeof(copilot_mcp), "%s/.copilot/mcp-config.json", tmpdir);
write_test_file(copilot_mcp, "{}\n");
const char *foreign = "{\"version\":1,\"hooks\":{\"sessionStart\":[{\"type\":\"command\","
"\"bash\":\"user-hook\"}]},\"owner\":\"user\"}\n";
write_test_file(manifest_path, foreign);
@@ -12712,6 +12801,11 @@ TEST(cli_copilot_uninstall_preserves_foreign_named_manifest) {
snprintf(hooks_dir, sizeof(hooks_dir), "%s/.copilot/hooks", tmpdir);
snprintf(manifest_path, sizeof(manifest_path), "%s/codebase-memory-mcp.json", hooks_dir);
test_mkdirp(hooks_dir);
/* Copilot CLI must be detected, or install and uninstall never reach the
* manifest and this test cannot fail. */
char copilot_mcp[640];
snprintf(copilot_mcp, sizeof(copilot_mcp), "%s/.copilot/mcp-config.json", tmpdir);
write_test_file(copilot_mcp, "{}\n");
const char *foreign = "{\"version\":1,\"hooks\":{\"sessionStart\":[{\"type\":\"command\","
"\"bash\":\"user-hook\"}]},\"owner\":\"user\"}\n";
write_test_file(manifest_path, foreign);
@@ -12748,6 +12842,11 @@ TEST(cli_copilot_uninstall_preserves_canonical_shaped_foreign_manifest) {
snprintf(hooks_dir, sizeof(hooks_dir), "%s/.copilot/hooks", tmpdir);
snprintf(manifest_path, sizeof(manifest_path), "%s/codebase-memory-mcp.json", hooks_dir);
test_mkdirp(hooks_dir);
/* Copilot CLI must be detected, or install and uninstall never reach the
* manifest and this test cannot fail. */
char copilot_mcp[640];
snprintf(copilot_mcp, sizeof(copilot_mcp), "%s/.copilot/mcp-config.json", tmpdir);
write_test_file(copilot_mcp, "{}\n");
const char *foreign =
"{\"version\":1,\"hooks\":{"
"\"sessionStart\":[{\"type\":\"command\","
@@ -12781,6 +12880,111 @@ TEST(cli_copilot_uninstall_preserves_canonical_shaped_foreign_manifest) {
PASS();
}
/* Copilot's preToolUse can only decide permissions, so the managed manifest
* augments searches through a PascalCase PostToolUse entry whose matcher names
* the Claude and the runtime tool names. The previous lifecycle-only manifest
* is still rendered so upgrades and uninstalls recognize it. */
TEST(cli_copilot_manifest_adds_posttooluse_search_hook) {
const char *binary = "/usr/local/bin/codebase-memory-mcp";
char *current = cbm_build_copilot_hook_manifest_for_testing(binary, true);
char *previous = cbm_build_copilot_hook_manifest_for_testing(binary, false);
ASSERT_NOT_NULL(current);
ASSERT_NOT_NULL(previous);
yyjson_doc *doc = yyjson_read(current, strlen(current), 0);
ASSERT_NOT_NULL(doc);
yyjson_val *hooks = yyjson_obj_get(yyjson_doc_get_root(doc), "hooks");
yyjson_val *post = yyjson_obj_get(hooks, "PostToolUse");
yyjson_val *entry = yyjson_arr_get(post, 0U);
const char *matcher = yyjson_get_str(yyjson_obj_get(entry, "matcher"));
const char *bash = yyjson_get_str(yyjson_obj_get(entry, "bash"));
const char *powershell = yyjson_get_str(yyjson_obj_get(entry, "powershell"));
bool shaped = yyjson_obj_get(hooks, "sessionStart") && yyjson_obj_get(hooks, "subagentStart") &&
yyjson_arr_size(post) == 1U && matcher &&
strcmp(matcher, "Bash|Grep|Glob|bash|powershell|grep|rg|glob") == 0 && bash &&
strstr(bash, "hook-augment --event PostToolUse --dialect copilot") &&
powershell && strncmp(powershell, "& ", 2) == 0 &&
strstr(powershell, "hook-augment --event PostToolUse --dialect copilot") &&
yyjson_get_int(yyjson_obj_get(entry, "timeoutSec")) == 5;
bool previous_shape = strstr(previous, "sessionStart") && strstr(previous, "subagentStart") &&
!strstr(previous, "PostToolUse");
yyjson_doc_free(doc);
cbm_free(CBM_MEM_CLASS_OTHER, current);
cbm_free(CBM_MEM_CLASS_OTHER, previous);
if (!shaped || !previous_shape)
FAIL("Copilot manifest must add one PostToolUse search hook beside the lifecycle pair");
PASS();
}
/* An install that finds the previous lifecycle-only manifest upgrades it in
* place to the current manifest, and an uninstall removes the previous one. */
TEST(cli_copilot_install_upgrades_previous_manifest) {
char tmpdir[256];
snprintf(tmpdir, sizeof(tmpdir), "/tmp/cli-copilot-upgrade-XXXXXX");
if (!cbm_mkdtemp(tmpdir))
FAIL("cbm_mkdtemp failed");
char hooks_dir[512];
char manifest_path[640];
char copilot_mcp[640];
char binary[640];
snprintf(hooks_dir, sizeof(hooks_dir), "%s/.copilot/hooks", tmpdir);
snprintf(manifest_path, sizeof(manifest_path), "%s/codebase-memory-mcp.json", hooks_dir);
snprintf(copilot_mcp, sizeof(copilot_mcp), "%s/.copilot/mcp-config.json", tmpdir);
#ifdef _WIN32
snprintf(binary, sizeof(binary), "%s/.local/bin/codebase-memory-mcp.exe", tmpdir);
#else
snprintf(binary, sizeof(binary), "%s/.local/bin/codebase-memory-mcp", tmpdir);
#endif
test_mkdirp(hooks_dir);
write_test_file(copilot_mcp, "{}\n");
char *previous = cbm_build_copilot_hook_manifest_for_testing(binary, false);
char *current = cbm_build_copilot_hook_manifest_for_testing(binary, true);
if (!previous || !current) {
cbm_free(CBM_MEM_CLASS_OTHER, previous);
cbm_free(CBM_MEM_CLASS_OTHER, current);
test_rmdir_r(tmpdir);
FAIL("Copilot manifest rendering failed");
}
write_test_file(manifest_path, previous);
char *saved_home = save_test_env("HOME");
char *saved_path = save_test_env("PATH");
char *saved_copilot = save_test_env("COPILOT_HOME");
cbm_setenv("HOME", tmpdir, 1);
cbm_setenv("PATH", tmpdir, 1);
cbm_unsetenv("COPILOT_HOME");
int install_rc = cbm_install_agent_configs(tmpdir, binary, false, false);
char *upgraded = read_test_file_alloc(manifest_path);
bool is_current = upgraded && strcmp(upgraded, current) == 0;
int second_rc = cbm_install_agent_configs(tmpdir, binary, false, false);
char *again = read_test_file_alloc(manifest_path);
bool stable = again && strcmp(again, current) == 0;
write_test_file(manifest_path, previous);
char *argv[] = {"uninstall", "--yes"};
int uninstall_rc = cli_test_cmd_uninstall(2, argv);
struct stat removed;
bool previous_removed = stat(manifest_path, &removed) != 0;
free(upgraded);
free(again);
cbm_free(CBM_MEM_CLASS_OTHER, previous);
cbm_free(CBM_MEM_CLASS_OTHER, current);
restore_test_env("HOME", saved_home);
restore_test_env("PATH", saved_path);
restore_test_env("COPILOT_HOME", saved_copilot);
test_rmdir_r(tmpdir);
if (install_rc != 0 || !is_current || second_rc != 0 || !stable || uninstall_rc != 0 ||
!previous_removed) {
fprintf(stderr,
"Copilot upgrade diag install_rc=%d current=%d second_rc=%d stable=%d "
"uninstall_rc=%d previous_removed=%d\n",
install_rc, is_current, second_rc, stable, uninstall_rc, previous_removed);
FAIL("Copilot install must upgrade, and uninstall must remove, the previous manifest");
}
PASS();
}
TEST(cli_vscode_only_installs_copilot_durable_context) {
char tmpdir[256];
snprintf(tmpdir, sizeof(tmpdir), "/tmp/cli-vscode-durable-XXXXXX");
@@ -13427,7 +13631,8 @@ TEST(cli_codex_migrates_to_single_hook_representation) {
bool lifecycle_ok = first_rc == 0 && repeat_rc == 0 && dry_rc == 0 && first && repeated &&
after_dry && strcmp(first, repeated) == 0 && strcmp(first, after_dry) == 0;
bool migrated = migration_rc == 0 && toml && !strstr(toml, "SessionStart") && hooks &&
strstr(hooks, "SessionStart") && strstr(hooks, "SubagentStart");
strstr(hooks, "SessionStart") && strstr(hooks, "SubagentStart") &&
strstr(hooks, "PreToolUse");
free(first);
free(repeated);
free(after_dry);
@@ -13786,6 +13991,146 @@ TEST(cli_hook_augment_bash_pretooluse_reaches_augmenter) {
PASS();
}
/* Codex sends PreToolUse for its shell tool as tool_name "Bash" with a string
* tool_input.command, plus its own fields (turn_id, model, permission_mode,
* tool_use_id, a null transcript_path). The default dialect must augment it. */
TEST(cli_hook_augment_codex_pretooluse_payload) {
cbm_mcp_server_t *srv = cbm_mcp_server_new(NULL);
ASSERT_NOT_NULL(srv);
cbm_store_t *st = cbm_mcp_server_store(srv);
ASSERT_NOT_NULL(st);
char *project = cbm_project_name_from_path("/tmp/hookproj");
ASSERT_NOT_NULL(project);
cbm_mcp_server_set_project(srv, project);
cbm_store_upsert_project(st, project, "/tmp/hookproj");
char qualified_name[256];
snprintf(qualified_name, sizeof(qualified_name), "%s.mod.someIndexedSymbol", project);
cbm_node_t node = {.project = project,
.label = "Function",
.name = "someIndexedSymbol",
.qualified_name = qualified_name,
.file_path = "mod.py",
.start_line = 1,
.end_line = 4};
ASSERT_GT(cbm_store_upsert_node(st, &node), 0);
const char *input = "{\"session_id\":\"0199a1b2-codex\",\"turn_id\":\"turn-1\","
"\"transcript_path\":null,\"cwd\":\"/tmp/hookproj\","
"\"hook_event_name\":\"PreToolUse\",\"model\":\"gpt-5.6\","
"\"permission_mode\":\"default\",\"tool_name\":\"Bash\","
"\"tool_input\":{\"command\":\"rg -n someIndexedSymbol .\"},"
"\"tool_use_id\":\"call_1\"}";
char *output = cbm_hook_augment_process(srv, input);
bool reached = output && strstr(output, "\"hookEventName\":\"PreToolUse\"") &&
strstr(output, "additionalContext") && strstr(output, "someIndexedSymbol");
free(output);
cbm_mcp_server_free(srv);
free(project);
if (!reached)
FAIL("a Codex-shaped PreToolUse Bash payload must reach graph search augmentation");
PASS();
}
/* Copilot runs the managed hook as `--event PostToolUse --dialect copilot`.
* Its payload may name the runtime tool (rg, bash) or the Claude tool, may use
* camelCase fields, and may carry the arguments as a JSON string; each form
* reaches the graph lookup, and the answer is Copilot's top-level
* additionalContext, which Copilot appends after the tool result, so the text
* must not place the search results below it. */
TEST(cli_hook_augment_copilot_posttooluse_search) {
cbm_mcp_server_t *srv = cbm_mcp_server_new(NULL);
ASSERT_NOT_NULL(srv);
cbm_store_t *st = cbm_mcp_server_store(srv);
ASSERT_NOT_NULL(st);
char *project = cbm_project_name_from_path("/tmp/hookproj");
ASSERT_NOT_NULL(project);
cbm_mcp_server_set_project(srv, project);
cbm_store_upsert_project(st, project, "/tmp/hookproj");
char qualified_name[256];
snprintf(qualified_name, sizeof(qualified_name), "%s.mod.someIndexedSymbol", project);
cbm_node_t node = {.project = project,
.label = "Function",
.name = "someIndexedSymbol",
.qualified_name = qualified_name,
.file_path = "mod.py",
.start_line = 1,
.end_line = 4};
ASSERT_GT(cbm_store_upsert_node(st, &node), 0);
const char *inputs[] = {
"{\"hook_event_name\":\"PostToolUse\",\"tool_name\":\"rg\",\"cwd\":\"/tmp/hookproj\","
"\"tool_input\":{\"pattern\":\"someIndexedSymbol\"},"
"\"tool_result\":{\"result_type\":\"success\",\"text_result_for_llm\":\"mod.py:1\"}}",
"{\"hook_event_name\":\"PostToolUse\",\"tool_name\":\"Bash\",\"cwd\":\"/tmp/hookproj\","
"\"tool_input\":{\"command\":\"rg -n someIndexedSymbol .\"}}",
"{\"cwd\":\"/tmp/hookproj\",\"toolName\":\"bash\","
"\"toolArgs\":\"{\\\"command\\\":\\\"grep -rn someIndexedSymbol .\\\"}\"}",
};
bool reached[3] = {false, false, false};
for (size_t i = 0U; i < 3U; i++) {
char *output = cbm_hook_augment_process_for(srv, inputs[i], "PostToolUse", "copilot");
yyjson_doc *doc = output ? yyjson_read(output, strlen(output), 0) : NULL;
yyjson_val *root = doc ? yyjson_doc_get_root(doc) : NULL;
const char *context = yyjson_get_str(yyjson_obj_get(root, "additionalContext"));
reached[i] = context && strstr(context, "someIndexedSymbol") && strstr(context, "mod.py") &&
!strstr(context, "below") && !yyjson_obj_get(root, "hookSpecificOutput");
yyjson_doc_free(doc);
free(output);
}
char *view = cbm_hook_augment_process_for(
srv,
"{\"hook_event_name\":\"PostToolUse\",\"tool_name\":\"view\",\"cwd\":\"/tmp/hookproj\","
"\"tool_input\":{\"path\":\"mod.py\"}}",
"PostToolUse", "copilot");
bool supported = cbm_hook_augment_invocation_supported("PostToolUse", "copilot") &&
!cbm_hook_augment_invocation_supported("PreToolUse", "copilot");
bool view_silent = view == NULL;
free(view);
cbm_mcp_server_free(srv);
free(project);
if (!reached[0] || !reached[1] || !reached[2] || !view_silent || !supported) {
fprintf(stderr,
"Copilot PostToolUse diag rg=%d bash=%d camel=%d view_silent=%d "
"supported=%d\n",
reached[0], reached[1], reached[2], view_silent, supported);
FAIL("Copilot PostToolUse searches must reach graph augmentation");
}
PASS();
}
/* The hook-client fast path answers Copilot's PostToolUse before identity
* hashing when the augmenter could never respond: a shell command that is not
* a search, or a tool the augmenter does not read (VS Code's local hook parser
* ignores matchers). Searches still pay full fare. */
TEST(cli_hook_augment_copilot_posttooluse_noop_gate) {
const char *ls = "{\"tool_name\":\"bash\",\"tool_input\":{\"command\":\"ls -la\"}}";
const char *search =
"{\"tool_name\":\"bash\",\"tool_input\":{\"command\":\"rg -n FooService .\"}}";
const char *string_ls = "{\"toolName\":\"powershell\",\"toolArgs\":\"{\\\"command\\\":"
"\\\"Get-ChildItem\\\"}\"}";
const char *edit = "{\"tool_name\":\"edit\",\"tool_input\":{\"path\":\"a.c\"}}";
const char *grep = "{\"tool_name\":\"grep\",\"tool_input\":{\"pattern\":\"FooService\"}}";
bool ok = cbm_hook_augment_input_is_noop_for(ls, "PostToolUse", "copilot") &&
!cbm_hook_augment_input_is_noop_for(search, "PostToolUse", "copilot") &&
cbm_hook_augment_input_is_noop_for(string_ls, "PostToolUse", "copilot") &&
cbm_hook_augment_input_is_noop_for(edit, "PostToolUse", "copilot") &&
!cbm_hook_augment_input_is_noop_for(grep, "PostToolUse", "copilot") &&
!cbm_hook_augment_input_is_noop_for(ls, "SessionStart", "copilot") &&
!cbm_hook_augment_input_is_noop_for(ls, NULL, "copilot");
/* The Claude dialect keeps its un-forced PreToolUse Bash gate. */
const char *claude_ls =
"{\"hook_event_name\":\"PreToolUse\",\"tool_name\":\"Bash\",\"tool_input\":{"
"\"command\":\"ls -la\"}}";
ok = ok && cbm_hook_augment_input_is_noop_for(claude_ls, NULL, NULL) &&
cbm_hook_augment_input_is_noop_for(claude_ls, NULL, "gemini") &&
!cbm_hook_augment_input_is_noop_for(edit, NULL, NULL);
if (!ok)
FAIL("Copilot PostToolUse no-op gate must skip non-searches and keep searches");
PASS();
}
TEST(cli_hook_augment_bash_pattern_extractor) {
char out[256];
@@ -18708,6 +19053,7 @@ SUITE(cli) {
RUN_TEST(cli_hook_metadata_rejects_truncated_utf8_without_oob);
RUN_TEST(cli_aider_config_loads_installed_conventions);
RUN_TEST(cli_codex_session_hook_issue330);
RUN_TEST(cli_codex_pretooluse_hook_lifecycle);
RUN_TEST(cli_gemini_session_hook_parity);
RUN_TEST(cli_claude_subagent_hook);
RUN_TEST(cli_claude_hook_mutation_converges_mixed_owned_duplicates);
@@ -18717,6 +19063,8 @@ SUITE(cli) {
RUN_TEST(cli_copilot_install_preserves_foreign_named_manifest);
RUN_TEST(cli_copilot_uninstall_preserves_foreign_named_manifest);
RUN_TEST(cli_copilot_uninstall_preserves_canonical_shaped_foreign_manifest);
RUN_TEST(cli_copilot_manifest_adds_posttooluse_search_hook);
RUN_TEST(cli_copilot_install_upgrades_previous_manifest);
RUN_TEST(cli_vscode_only_installs_copilot_durable_context);
RUN_TEST(cli_lifecycle_hooks_preserve_foreign_substring_commands);
RUN_TEST(cli_read_only_agents_do_not_receive_mutating_mcp_server);
@@ -18733,6 +19081,9 @@ SUITE(cli) {
RUN_TEST(cli_hook_augment_context_tracks_search_json_shape);
RUN_TEST(cli_hook_augment_context_names_graph_follow_ups);
RUN_TEST(cli_hook_augment_bash_pretooluse_reaches_augmenter);
RUN_TEST(cli_hook_augment_codex_pretooluse_payload);
RUN_TEST(cli_hook_augment_copilot_posttooluse_search);
RUN_TEST(cli_hook_augment_copilot_posttooluse_noop_gate);
RUN_TEST(cli_hook_augment_bash_pattern_extractor);
RUN_TEST(cli_hook_augment_coverage_requests_machine_json);
RUN_TEST(cli_hook_augment_lifecycle_output_contract);
tests/test_config_toml_edit.c
+10 -3
View File
@@ -57,7 +57,8 @@ static int cte_codex_edit_commands_detailed(const char *path, const char *comman
cbm_toml_codex_hook_action_t action, int check_only,
cbm_toml_codex_hook_failure_t *failure) {
return cbm_toml_reconcile_codex_hooks_detailed(path, CTE_CODEX_BEGIN, CTE_CODEX_END, command,
command_windows, action, check_only, failure);
command_windows, action, check_only, failure,
NULL);
}
static int cte_codex_edit_detailed(const char *path, cbm_toml_codex_hook_action_t action,
@@ -1456,14 +1457,18 @@ TEST(config_toml_codex_accepts_v0102_managed_windows_crlf) {
ASSERT_EQ(cte_read(path, actual, sizeof(actual)), 0);
ASSERT_STR_EQ(actual, before);
/* The v0.10.2 lifecycle-only block is ours: the upsert upgrades it in place to
* the current block (which adds PreToolUse Bash) and keeps the BOM, CRLF and
* the surrounding tables; a second upsert is then byte-identical. */
ASSERT_EQ(cte_codex_edit_commands_detailed(path, command, command_windows,
CBM_TOML_CODEX_HOOK_UPSERT, 0, &failure),
0);
ASSERT_EQ(cte_read(path, actual, sizeof(actual)), 0);
ASSERT_STR_EQ(actual, before);
ASSERT_EQ(strncmp(actual, "\xEF\xBB\xBF", 3U), 0);
ASSERT_EQ(cte_occurrences(actual, CTE_CODEX_BEGIN), 1);
ASSERT_EQ(cte_occurrences(actual, "[[hooks.SessionStart]]"), 1);
ASSERT_EQ(cte_occurrences(actual, "[[hooks.SubagentStart]]"), 1);
ASSERT_EQ(cte_occurrences(actual, "[[hooks.PreToolUse]]"), 1);
ASSERT_NOT_NULL(strstr(actual, "[mcp_servers.other]"));
ASSERT_NOT_NULL(strstr(actual, "keep = true"));
for (const char *cursor = actual; *cursor; ++cursor) {
@@ -1471,12 +1476,14 @@ TEST(config_toml_codex_accepts_v0102_managed_windows_crlf) {
ASSERT(cursor > actual && cursor[-1] == '\r');
}
}
char upgraded[CTE_FILE_CAP];
ASSERT_GT(snprintf(upgraded, sizeof(upgraded), "%s", actual), 0);
ASSERT_EQ(cte_codex_edit_commands_detailed(path, command, command_windows,
CBM_TOML_CODEX_HOOK_UPSERT, 0, &failure),
0);
ASSERT_EQ(cte_read(path, actual, sizeof(actual)), 0);
ASSERT_STR_EQ(actual, before);
ASSERT_STR_EQ(actual, upgraded);
ASSERT_EQ(cte_codex_edit_commands_detailed(path, command, command_windows,
CBM_TOML_CODEX_HOOK_REMOVE, 0, &failure),
tests/test_cypher.c
+263
View File
@@ -3484,6 +3484,160 @@ TEST(cypher_exec_where_func_arg_on_unbound_target) {
PASS();
}
/* #2591: a WHERE comparison whose RHS is another property (a.file_path =
* b.file_path) failed to parse with "expected value at pos N". Fixture: Caller
* calls Helper in the same file and Remote in another one. */
static cbm_store_t *setup_issue2591_store(void) {
cbm_store_t *s = cbm_store_open_memory();
cbm_store_upsert_project(s, "test", "/tmp/test");
cbm_node_t caller = {.project = "test",
.label = "Function",
.name = "Caller",
.qualified_name = "test.Caller",
.file_path = "a.go",
.start_line = 1,
.end_line = 3};
cbm_node_t helper = {.project = "test",
.label = "Function",
.name = "Helper",
.qualified_name = "test.Helper",
.file_path = "a.go",
.start_line = 5,
.end_line = 7};
cbm_node_t remote = {.project = "test",
.label = "Function",
.name = "Remote",
.qualified_name = "test.Remote",
.file_path = "b.go",
.start_line = 1,
.end_line = 2};
int64_t id_caller = cbm_store_upsert_node(s, &caller);
int64_t id_helper = cbm_store_upsert_node(s, &helper);
int64_t id_remote = cbm_store_upsert_node(s, &remote);
cbm_edge_t e1 = {
.project = "test", .source_id = id_caller, .target_id = id_helper, .type = "CALLS"};
cbm_edge_t e2 = {
.project = "test", .source_id = id_caller, .target_id = id_remote, .type = "CALLS"};
cbm_store_insert_edge(s, &e1);
cbm_store_insert_edge(s, &e2);
return s;
}
/* Run `query` on the #2591 fixture and expect exactly one row whose last
* column is `want`. */
static int issue2591_expect_one(const char *query, const char *want) {
cbm_store_t *s = setup_issue2591_store();
cbm_cypher_result_t r = {0};
int rc = cbm_cypher_execute(s, query, "test", 0, &r);
int ok = rc == 0 && r.row_count == 1 && r.col_count > 0 &&
strcmp(r.rows[0][r.col_count - 1], want) == 0;
if (!ok) {
printf(" query: %s\n rc=%d rows=%d err=%s\n", query, rc, r.row_count,
r.error ? r.error : "(none)");
}
cbm_cypher_result_free(&r);
cbm_store_close(s);
return ok;
}
TEST(cypher_issue2591_parse_where_property_rhs) {
cbm_query_t *q = NULL;
char *err = NULL;
int rc = cbm_cypher_parse("MATCH (a)-[:CALLS]->(b) WHERE a.file_path <> b.file_path RETURN a",
&q, &err);
ASSERT_EQ(rc, 0);
ASSERT_NOT_NULL(q->where);
ASSERT_NOT_NULL(q->where->root);
ASSERT_EQ(q->where->root->type, EXPR_CONDITION);
ASSERT_STR_EQ(q->where->root->cond.variable, "a");
ASSERT_STR_EQ(q->where->root->cond.property, "file_path");
ASSERT_STR_EQ(q->where->root->cond.op, "<>");
ASSERT_STR_EQ(q->where->root->cond.rhs_variable, "b");
ASSERT_STR_EQ(q->where->root->cond.rhs_property, "file_path");
ASSERT_NULL(q->where->root->cond.value);
cbm_query_free(q);
PASS();
}
TEST(cypher_issue2591_where_property_eq_and_neq) {
ASSERT_TRUE(issue2591_expect_one("MATCH (a)-[:CALLS]->(b) WHERE a.file_path = b.file_path "
"RETURN a.name, b.name",
"Helper"));
ASSERT_TRUE(issue2591_expect_one("MATCH (a)-[:CALLS]->(b) WHERE a.file_path <> b.file_path "
"RETURN a.name, b.name",
"Remote"));
/* Operand order does not matter, and the RHS can sit inside an AND chain
* next to a literal comparison. */
ASSERT_TRUE(issue2591_expect_one("MATCH (a)-[:CALLS]->(b) WHERE b.file_path = a.file_path "
"AND a.name = \"Caller\" RETURN b.name",
"Helper"));
PASS();
}
TEST(cypher_issue2591_where_property_after_with) {
ASSERT_TRUE(issue2591_expect_one("MATCH (a)-[:CALLS]->(b) WITH a, b "
"WHERE a.file_path = b.file_path RETURN b.name",
"Helper"));
/* Bare projected aliases on both sides. */
ASSERT_TRUE(issue2591_expect_one("MATCH (a)-[:CALLS]->(b) WITH a.file_path AS af, "
"b.file_path AS bf, b.name AS callee "
"WHERE af <> bf RETURN callee",
"Remote"));
PASS();
}
/* The early WHERE pass binds only the seed alias a. The RHS b is not bound
* there, so the leaf must be UNKNOWN; reading it as a match would let the
* outer NOT prune every seed before CALLS expansion. */
TEST(cypher_issue2591_where_property_rhs_unbound_in_early_pass) {
ASSERT_TRUE(issue2591_expect_one(
"MATCH (a)-[:CALLS]->(b) WHERE NOT (a.file_path = b.file_path) RETURN b.name", "Remote"));
ASSERT_TRUE(issue2591_expect_one(
"MATCH (a)-[:CALLS]->(b) WHERE NOT a.file_path = b.file_path RETURN b.name", "Remote"));
PASS();
}
TEST(cypher_issue2591_where_property_numeric) {
/* Caller starts on line 1, Helper on 5, Remote on 1. */
ASSERT_TRUE(issue2591_expect_one(
"MATCH (a)-[:CALLS]->(b) WHERE a.start_line < b.start_line RETURN b.name", "Helper"));
ASSERT_TRUE(issue2591_expect_one(
"MATCH (a)-[:CALLS]->(b) WHERE a.start_line >= b.start_line RETURN b.name", "Remote"));
PASS();
}
/* A missing property is NULL, and a comparison with NULL never matches: two
* absent properties must not compare equal. */
TEST(cypher_issue2591_where_property_missing_is_null) {
const char *queries[] = {
"MATCH (a)-[:CALLS]->(b) WHERE a.no_such_prop = b.no_such_prop RETURN b.name",
"MATCH (a)-[:CALLS]->(b) WHERE a.no_such_prop <> b.file_path RETURN b.name",
};
for (size_t i = 0; i < sizeof(queries) / sizeof(queries[0]); i++) {
cbm_store_t *s = setup_issue2591_store();
cbm_cypher_result_t r = {0};
int rc = cbm_cypher_execute(s, queries[i], "test", 0, &r);
ASSERT_EQ(rc, 0);
ASSERT_EQ(r.row_count, 0);
cbm_cypher_result_free(&r);
cbm_store_close(s);
}
PASS();
}
TEST(cypher_issue2591_where_function_rhs_unsupported) {
cbm_query_t *q = NULL;
char *err = NULL;
const char *query = "MATCH (a)-[:CALLS]->(b) WHERE a.name = toLower(b.name) RETURN a";
int rc = cbm_cypher_parse(query, &q, &err);
ASSERT_EQ(rc, -1);
ASSERT_NOT_NULL(err);
ASSERT_TRUE(strstr(err, "unsupported function 'toLower' on the right side of a WHERE "
"comparison") != NULL);
free(err);
PASS();
}
TEST(cypher_exec_where_in) {
cbm_store_t *s = setup_cypher_store();
cbm_cypher_result_t r = {0};
@@ -4958,6 +5112,107 @@ TEST(cypher_issue305_count_star_alias) {
PASS();
}
/* Runs one query and asserts it answers exactly one row with `want` in the
* first column. */
static int expect_one_row(cbm_store_t *s, const char *project, const char *query,
const char *want) {
cbm_cypher_result_t r = {0};
int rc = cbm_cypher_execute(s, query, project, 0, &r);
ASSERT_EQ(rc, 0);
ASSERT_NULL(r.error);
ASSERT_EQ(r.row_count, 1);
ASSERT_STR_EQ(r.rows[0][0], want);
cbm_cypher_result_free(&r);
return 0;
}
/* #2742: an ungrouped aggregation is one row even when MATCH/WHERE produced no
* input rows. count(*) over nothing is 0, not an empty result: a caller asking
* "how many?" must not have to read "no rows" as "zero". */
TEST(cypher_count_star_empty_input_returns_zero) {
/* Empty graph: the project exists but holds no nodes. */
cbm_store_t *empty = cbm_store_open_memory();
cbm_store_upsert_project(empty, "empty", "/tmp/empty");
cbm_cypher_result_t r = {0};
int rc = cbm_cypher_execute(empty, "MATCH (n) RETURN count(*) AS total", "empty", 0, &r);
ASSERT_EQ(rc, 0);
ASSERT_NULL(r.error);
ASSERT_EQ(r.col_count, 1);
ASSERT_STR_EQ(r.columns[0], "total");
ASSERT_EQ(r.row_count, 1);
ASSERT_STR_EQ(r.rows[0][0], "0");
cbm_cypher_result_free(&r);
cbm_store_close(empty);
/* Nonempty graph, every row filtered out. */
cbm_store_t *s = setup_cypher_store();
ASSERT_EQ(expect_one_row(s, "test",
"MATCH (f:Function) WHERE f.name = \"NoSuchFunction\" "
"RETURN count(*) AS total",
"0"),
0);
ASSERT_EQ(expect_one_row(s, "test",
"MATCH (a)-[:CALLS]->(b) WHERE b.name = \"NoSuchFunction\" "
"RETURN count(*)",
"0"),
0);
ASSERT_EQ(expect_one_row(s, "test", "MATCH (n:NoSuchLabel) RETURN count(*)", "0"), 0);
ASSERT_EQ(expect_one_row(s, "test",
"MATCH (f:Function) WHERE f.name = \"NoSuchFunction\" "
"RETURN count(f) AS n",
"0"),
0);
ASSERT_EQ(expect_one_row(s, "test",
"MATCH (f:Function) WHERE f.name = \"NoSuchFunction\" "
"RETURN count(DISTINCT f.name) AS n",
"0"),
0);
/* The other aggregates in the same row take their empty-input values:
* sum 0, collect [], and avg/min/max null (rendered as ""). */
rc = cbm_cypher_execute(s,
"MATCH (f:Function) WHERE f.name = \"NoSuchFunction\" "
"RETURN count(*) AS c, sum(f.start_line) AS s, "
"avg(f.start_line) AS a, min(f.start_line) AS lo, "
"max(f.start_line) AS hi, collect(f.name) AS names",
"test", 0, &r);
ASSERT_EQ(rc, 0);
ASSERT_NULL(r.error);
ASSERT_EQ(r.row_count, 1);
ASSERT_STR_EQ(r.rows[0][0], "0");
ASSERT_STR_EQ(r.rows[0][1], "0");
ASSERT_STR_EQ(r.rows[0][2], "");
ASSERT_STR_EQ(r.rows[0][3], "");
ASSERT_STR_EQ(r.rows[0][4], "");
ASSERT_STR_EQ(r.rows[0][5], "[]");
cbm_cypher_result_free(&r);
/* A grouped aggregation has no group to report: still no rows. */
rc = cbm_cypher_execute(s,
"MATCH (f:Function) WHERE f.name = \"NoSuchFunction\" "
"RETURN f.label, count(*)",
"test", 0, &r);
ASSERT_EQ(rc, 0);
ASSERT_NULL(r.error);
ASSERT_EQ(r.row_count, 0);
cbm_cypher_result_free(&r);
/* SKIP still applies to the single aggregate row. */
rc = cbm_cypher_execute(s,
"MATCH (f:Function) WHERE f.name = \"NoSuchFunction\" "
"RETURN count(*) SKIP 1",
"test", 0, &r);
ASSERT_EQ(rc, 0);
ASSERT_NULL(r.error);
ASSERT_EQ(r.row_count, 0);
cbm_cypher_result_free(&r);
/* Nonempty input is unchanged. */
ASSERT_EQ(expect_one_row(s, "test", "MATCH (f:Function) RETURN count(*) AS total", "4"), 0);
cbm_store_close(s);
PASS();
}
/* Regression: projecting several computed/JSON properties in one row must yield
* DISTINCT values. node_prop previously returned a single shared static buffer,
* so every such column aliased the last property read — and because the search
@@ -6260,6 +6515,7 @@ SUITE(cypher) {
RUN_TEST(cypher_issue873_distinct_order_skip_limit_dedupes_before_skip);
RUN_TEST(cypher_issue252_tointeger);
RUN_TEST(cypher_issue305_count_star_alias);
RUN_TEST(cypher_count_star_empty_input_returns_zero);
RUN_TEST(cypher_exec_where_eq);
RUN_TEST(cypher_exec_unlabeled_where_beyond_result_limit_issue1196);
RUN_TEST(cypher_exec_aggregate_sees_all_edges_beyond_expansion_cap_issue1196);
@@ -6354,6 +6610,13 @@ SUITE(cypher) {
RUN_TEST(cypher_exec_where_not_source_node);
RUN_TEST(cypher_exec_where_not_target_node_count);
RUN_TEST(cypher_exec_where_func_arg_on_unbound_target);
RUN_TEST(cypher_issue2591_parse_where_property_rhs);
RUN_TEST(cypher_issue2591_where_property_eq_and_neq);
RUN_TEST(cypher_issue2591_where_property_after_with);
RUN_TEST(cypher_issue2591_where_property_rhs_unbound_in_early_pass);
RUN_TEST(cypher_issue2591_where_property_numeric);
RUN_TEST(cypher_issue2591_where_property_missing_is_null);
RUN_TEST(cypher_issue2591_where_function_rhs_unsupported);
RUN_TEST(cypher_exec_where_in);
RUN_TEST(cypher_exec_where_not_in);
RUN_TEST(cypher_exec_where_is_null);
tests/test_daemon_application.c
+49
View File
@@ -12,6 +12,7 @@
#include "foundation/compat.h"
#include "foundation/compat_fs.h"
#include "foundation/compat_thread.h"
#include "foundation/log.h"
#include "foundation/platform.h"
#include "foundation/sha256.h"
#include "foundation/subprocess.h"
@@ -2936,6 +2937,38 @@ TEST(daemon_application_programmatic_index_forwards_set_doc_candidates) {
ASSERT_EQ(garbage, -1);
PASS();
}
/* #1818: the daemon.autoindex.skipped warning must name the effective limit,
* like the MCP autoindex.skip event does (#1466). The warning is emitted on the
* background-initialize thread, before the release increment of the
* background-initialize counter that the test waits for, so the captured line
* is complete once that wait returns. */
static char app_autoindex_skipped_line[1024];
static atomic_bool app_autoindex_skipped_seen = ATOMIC_VAR_INIT(false);
static void app_autoindex_skipped_sink(const char *line) {
if (!line || !strstr(line, "msg=daemon.autoindex.skipped") ||
atomic_load_explicit(&app_autoindex_skipped_seen, memory_order_acquire)) {
return;
}
(void)snprintf(app_autoindex_skipped_line, sizeof(app_autoindex_skipped_line), "%s", line);
atomic_store_explicit(&app_autoindex_skipped_seen, true, memory_order_release);
}
/* True when `line` carries the whole key=value field `field` (not a prefix of
* a longer value such as limit=00). */
static bool app_log_line_has_field(const char *line, const char *field) {
size_t length = strlen(field);
for (const char *at = strstr(line, field); at; at = strstr(at + 1, field)) {
bool starts = at == line || at[-1] == ' ';
char next = at[length];
if (starts && (next == '\0' || next == ' ' || next == '\n' || next == '\r')) {
return true;
}
}
return false;
}
TEST(daemon_application_auto_index_honors_tracked_file_limit) {
app_env_backup_t cache_environment;
bool cache_saved = app_env_backup_capture(&cache_environment, "CBM_CACHE_DIR");
@@ -2980,6 +3013,13 @@ TEST(daemon_application_auto_index_honors_tracked_file_limit) {
cbm_daemon_application_runtime_callbacks(application);
cbm_daemon_runtime_application_session_t *session =
application ? app_test_open(&callbacks, 4190) : NULL;
app_autoindex_skipped_line[0] = '\0';
atomic_store_explicit(&app_autoindex_skipped_seen, false, memory_order_release);
CBMLogLevel previous_log_level = cbm_log_get_level();
CBMLogFormat previous_log_format = cbm_log_get_format();
cbm_log_set_level(CBM_LOG_INFO);
cbm_log_set_format(CBM_LOG_FORMAT_TEXT);
cbm_log_set_sink_ex(app_autoindex_skipped_sink, CBM_LOG_SINK_REPLACE);
int bg_baseline = cbm_daemon_application_background_initializes_for_test();
bool initialized = app_test_initialize_profile(&callbacks, session, root,
CBM_MCP_TOOL_PROFILE_ALL, NULL, NULL);
@@ -2987,6 +3027,11 @@ TEST(daemon_application_auto_index_honors_tracked_file_limit) {
bool limit_prevented_admission = initialized && admission_evaluated &&
atomic_load(&fake.starts) == 0 &&
cbm_daemon_application_active_jobs(application) == 0;
cbm_log_set_sink(NULL);
cbm_log_set_format(previous_log_format);
cbm_log_set_level(previous_log_level);
bool skip_logged = admission_evaluated &&
atomic_load_explicit(&app_autoindex_skipped_seen, memory_order_acquire);
if (session) {
callbacks.session_cancel(callbacks.context, session);
@@ -3006,6 +3051,10 @@ TEST(daemon_application_auto_index_honors_tracked_file_limit) {
ASSERT_TRUE(config_ready);
ASSERT_TRUE(initialized);
ASSERT_TRUE(limit_prevented_admission);
ASSERT_TRUE(skip_logged);
ASSERT_TRUE(app_log_line_has_field(app_autoindex_skipped_line, "reason=too_many_files"));
ASSERT_TRUE(app_log_line_has_field(app_autoindex_skipped_line, "files=1"));
ASSERT_TRUE(app_log_line_has_field(app_autoindex_skipped_line, "limit=0"));
ASSERT_TRUE(stopped);
ASSERT_TRUE(cache_restored);
PASS();
tests/test_daemon_ipc.c
+103
View File
@@ -2211,6 +2211,108 @@ TEST(daemon_ipc_lifetime_reservation_survives_saturated_second_listen) {
PASS();
}
/* #2178: an age-based temp cleaner unlinked the live daemon's lifetime lock
* and identity marker. The heartbeat must keep every listener-owned file
* young, and report loss (unlink, or replacement by a fresh file at the same
* name) so the daemon exits instead of serving under a lifetime file that
* coordinates nothing or leaving an unremovable socket pair behind at close. */
TEST(daemon_ipc_listener_touch_detects_lost_runtime_files) {
#ifdef _WIN32
SKIP_PLATFORM("unlink-while-held of runtime files is POSIX behavior");
#else
enum { TOUCH_CASES = 5 };
enum { LOSS_UNLINK, LOSS_REPLACE_FILE, LOSS_REPLACE_SYMLINK };
static const char key[] = "2178a2178a2178a0";
static const struct {
const char *suffix;
int loss;
} cases[TOUCH_CASES] = {
{"lifetime.lock", LOSS_UNLINK}, /* lifetime reservation */
{"lock", LOSS_UNLINK}, /* listener-owned participant guard */
{"sock.identity", LOSS_UNLINK}, /* identity marker, unlinked */
{"sock.identity", LOSS_REPLACE_FILE}, /* ... replaced by a fresh inode */
{"sock.identity", LOSS_REPLACE_SYMLINK} /* ... replaced by a symlink */,
};
const time_t stale = 1000000000;
char parent[TEST_PATH_CAP] = {0};
char runtime_dir[TEST_PATH_CAP] = {0};
cbm_daemon_ipc_endpoint_t *endpoint = NULL;
bool started[TOUCH_CASES] = {false};
int touched_intact[TOUCH_CASES] = {0};
bool refreshed[TOUCH_CASES] = {false};
bool lost[TOUCH_CASES] = {false};
int touched_after_loss[TOUCH_CASES] = {1, 1, 1, 1, 1};
int unreadable_touch = 0;
int readable_again_touch = 0;
if (ipc_test_parent_new(parent, "listener-touch")) {
endpoint = cbm_daemon_ipc_endpoint_new(key, parent);
}
if (endpoint) {
ipc_test_copy_path(runtime_dir, cbm_daemon_ipc_endpoint_runtime_dir(endpoint));
}
/* A still-valid marker that merely cannot be reopened (EACCES) is a
* transient refresh failure, not loss: the daemon must keep serving. */
if (endpoint) {
cbm_daemon_ipc_listener_t *listener = cbm_daemon_ipc_listen(endpoint);
char marker[TEST_PATH_CAP];
int written = snprintf(marker, sizeof(marker), "%s/cbm-%s.sock.identity", runtime_dir, key);
if (listener && written > 0 && written < (int)sizeof(marker) && chmod(marker, 0) == 0) {
unreadable_touch = cbm_daemon_ipc_listener_touch(listener, NULL);
readable_again_touch =
chmod(marker, 0600) == 0 ? cbm_daemon_ipc_listener_touch(listener, NULL) : -2;
}
cbm_daemon_ipc_listener_close(listener);
}
for (size_t i = 0; endpoint && i < TOUCH_CASES; i++) {
cbm_daemon_ipc_listener_t *listener = cbm_daemon_ipc_listen(endpoint);
started[i] = listener != NULL;
char path[TEST_PATH_CAP];
int written =
snprintf(path, sizeof(path), "%s/cbm-%s.%s", runtime_dir, key, cases[i].suffix);
bool path_ok = started[i] && written > 0 && written < (int)sizeof(path);
struct timespec stale_times[2] = {{.tv_sec = stale}, {.tv_sec = stale}};
bool aged = path_ok && utimensat(AT_FDCWD, path, stale_times, AT_SYMLINK_NOFOLLOW) == 0;
touched_intact[i] = aged ? cbm_daemon_ipc_listener_touch(listener, NULL) : -2;
struct stat after;
refreshed[i] = touched_intact[i] == 1 && stat(path, &after) == 0 &&
after.st_atime > stale && after.st_mtime > stale;
lost[i] = refreshed[i] && unlink(path) == 0;
if (lost[i] && cases[i].loss == LOSS_REPLACE_FILE) {
int fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC | O_NOFOLLOW, 0600);
lost[i] = fd >= 0 && close(fd) == 0;
} else if (lost[i] && cases[i].loss == LOSS_REPLACE_SYMLINK) {
lost[i] = symlink("/dev/null", path) == 0;
}
touched_after_loss[i] = lost[i] ? cbm_daemon_ipc_listener_touch(listener, NULL) : -2;
cbm_daemon_ipc_listener_close(listener);
/* A tampered marker makes close (correctly) keep the socket pair; clear
* this case's simulated leftovers so the next case can listen. */
static const char *const leftovers[] = {"sock.identity", "sock", "anc"};
for (size_t j = 0; j < sizeof(leftovers) / sizeof(leftovers[0]); j++) {
written = snprintf(path, sizeof(path), "%s/cbm-%s.%s", runtime_dir, key, leftovers[j]);
if (written > 0 && written < (int)sizeof(path)) {
(void)unlink(path);
}
}
}
cbm_daemon_ipc_endpoint_free(endpoint);
ipc_test_remove_tree(runtime_dir, parent);
/* Root bypasses mode 0, so the reopen succeeds there and the touch is 1. */
ASSERT_EQ(unreadable_touch, geteuid() == 0 ? 1 : -1);
ASSERT_EQ(readable_again_touch, 1);
for (size_t i = 0; i < TOUCH_CASES; i++) {
ASSERT_TRUE(started[i]);
ASSERT_EQ(touched_intact[i], 1);
ASSERT_TRUE(refreshed[i]);
ASSERT_TRUE(lost[i]);
ASSERT_EQ(touched_after_loss[i], 0);
}
PASS();
#endif
}
TEST(daemon_ipc_lifetime_reservation_transfers_without_unlock_window) {
static const char key[] = "1029384756abcdef";
char parent[TEST_PATH_CAP] = {0};
@@ -5868,6 +5970,7 @@ SUITE(daemon_ipc) {
RUN_TEST(daemon_ipc_rejects_uppercase_instance_key);
RUN_TEST(daemon_ipc_no_spawn_probe_distinguishes_absent_active_and_busy);
RUN_TEST(daemon_ipc_lifetime_reservation_survives_saturated_second_listen);
RUN_TEST(daemon_ipc_listener_touch_detects_lost_runtime_files);
RUN_TEST(daemon_ipc_lifetime_reservation_transfers_without_unlock_window);
RUN_TEST(daemon_ipc_local_frame_roundtrip);
RUN_TEST(daemon_ipc_bounded_receive_rejects_oversize_before_payload);
tests/test_daemon_runtime.c
+132
View File
@@ -1272,6 +1272,20 @@ static bool runtime_test_fixture_start_failed(const char *tag, const char *stage
static bool runtime_test_fixture_permanent = false;
typedef struct {
cbm_version_cohort_manager_t *manager;
cbm_version_cohort_lease_t *lease;
cbm_daemon_ipc_participant_guard_t *guard;
cbm_version_cohort_daemon_claim_t *claim;
bool held;
} runtime_test_coordination_t;
/* When set, the fixture takes the host's coordination handles in the host's
* order before starting the service: cohort admission refuses once a
* generation is already serving. Unlike the host's start_reserved, the
* fixture's convenience start also joins a service-owned participant guard. */
static runtime_test_coordination_t *runtime_test_fixture_coordination = NULL;
static bool runtime_test_fixture_start_configured(
runtime_test_fixture_t *fixture, const char *tag, const cbm_daemon_build_identity_t *identity,
uint32_t max_clients, uint64_t lease_timeout_ms,
@@ -1327,6 +1341,19 @@ static bool runtime_test_fixture_start_configured(
if (application) {
config.application = *application;
}
runtime_test_coordination_t *coordination = runtime_test_fixture_coordination;
if (coordination) {
cbm_daemon_conflict_t conflict;
coordination->manager = cbm_version_cohort_manager_new(fixture->endpoint);
coordination->held =
coordination->manager &&
cbm_version_cohort_acquire(coordination->manager, identity, cbm_now_ms() + 5000,
&coordination->lease, &conflict) == CBM_VERSION_COHORT_OK &&
cbm_daemon_ipc_participant_guard_try_join(fixture->endpoint, &coordination->guard) ==
1 &&
cbm_version_cohort_daemon_claim_acquire(coordination->manager, &coordination->claim) ==
CBM_VERSION_COHORT_OK;
}
fixture->service = cbm_daemon_runtime_service_start(&config);
if (!fixture->service) {
return runtime_test_fixture_start_failed(tag, "service-start",
@@ -1380,6 +1407,110 @@ TEST(daemon_runtime_convenience_service_owns_participant_guard) {
PASS();
}
#ifndef _WIN32
/* The runtime's threads log concurrently while the loop stops the service, so
* the sink only sets flags. */
static atomic_bool runtime_test_coordination_lost_logged;
static atomic_bool runtime_test_window_expired_logged;
static void runtime_test_lifetime_log_sink(const char *line) {
/* Substrings, not key=value spelling, so text and JSON formats both match. */
if (line && strstr(line, "daemon.lifetime_end") && strstr(line, "coordination_file_lost") &&
strstr(line, "cohort_lease")) {
atomic_store(&runtime_test_coordination_lost_logged, true);
}
if (line && strstr(line, "initial_window_expired")) {
atomic_store(&runtime_test_window_expired_logged, true);
}
}
#endif
/* #2178: the host lifetime loop must refresh every held coordination file on
* its tick and stop the generation once one is lost. The claim marker is aged
* and the cohort lifetime lock unlinked: the tick must refresh the marker
* through its held handle, name the lease (touched after the claim) as lost,
* and stop the runtime. */
TEST(daemon_runtime_host_loop_stops_on_coordination_file_loss) {
#ifdef _WIN32
SKIP_PLATFORM("unlinking a held lock file is POSIX behavior");
#else
cbm_daemon_build_identity_t identity =
runtime_test_identity("2.4.0", runtime_test_self_build());
identity.cache_fingerprint = RUNTIME_CACHE_A; /* cohort admission requires one */
runtime_test_fixture_t fixture;
runtime_test_coordination_t coordination = {0};
runtime_test_fixture_coordination = &coordination;
bool started = runtime_test_fixture_start(&fixture, "coordination-loss", &identity);
runtime_test_fixture_coordination = NULL;
bool held = coordination.held;
char marker[RUNTIME_TEST_PATH_CAP];
char lifetime[RUNTIME_TEST_PATH_CAP];
int marker_written = snprintf(marker, sizeof(marker), "%s/cbm-version-cohort-daemon-v1.lock",
fixture.runtime_dir);
int lifetime_written = snprintf(lifetime, sizeof(lifetime),
"%s/cbm-version-cohort-lifetime-v1.lock", fixture.runtime_dir);
const time_t stale = 1000000000;
struct timespec stale_times[2] = {{.tv_sec = stale}, {.tv_sec = stale}};
bool staged = held && marker_written > 0 && marker_written < (int)sizeof(marker) &&
lifetime_written > 0 && lifetime_written < (int)sizeof(lifetime) &&
utimensat(AT_FDCWD, marker, stale_times, 0) == 0 && unlink(lifetime) == 0;
bool loop_ok = false;
if (staged) {
atomic_store(&runtime_test_coordination_lost_logged, false);
atomic_store(&runtime_test_window_expired_logged, false);
CBMLogLevel previous_log_level = cbm_log_get_level();
cbm_log_set_level(CBM_LOG_INFO);
cbm_log_set_sink(runtime_test_lifetime_log_sink);
loop_ok = cbm_daemon_host_wait_for_lifetime_for_test(fixture.service, fixture.endpoint,
coordination.lease, coordination.claim,
coordination.guard);
cbm_log_set_sink(NULL);
cbm_log_set_level(previous_log_level);
}
cbm_daemon_runtime_service_state_t state =
started ? cbm_daemon_runtime_service_state(fixture.service)
: CBM_DAEMON_RUNTIME_SERVICE_RUNNING;
struct stat marker_status = {0};
bool marker_refreshed = staged && stat(marker, &marker_status) == 0 &&
marker_status.st_mtime > stale && marker_status.st_atime > stale;
/* Host teardown order: service first, then guard, claim and lease. Every
* handle references the endpoint, which the fixture frees. */
if (started && state != CBM_DAEMON_RUNTIME_SERVICE_EXITED) {
(void)cbm_daemon_runtime_service_stop(fixture.service, RUNTIME_TEST_TIMEOUT_MS);
}
if (fixture.service && cbm_daemon_runtime_service_free(fixture.service)) {
fixture.service = NULL;
}
(void)cbm_daemon_ipc_participant_guard_release(&coordination.guard);
while (coordination.claim && cbm_version_cohort_daemon_claim_release(&coordination.claim) !=
CBM_PRIVATE_FILE_LOCK_OK) {
cbm_usleep(1000);
}
while (coordination.lease &&
cbm_version_cohort_lease_release(&coordination.lease) != CBM_PRIVATE_FILE_LOCK_OK) {
cbm_usleep(1000);
}
while (coordination.manager &&
cbm_version_cohort_manager_free(&coordination.manager) != CBM_PRIVATE_FILE_LOCK_OK) {
cbm_usleep(1000);
}
runtime_test_fixture_finish(&fixture);
ASSERT_TRUE(started);
ASSERT_TRUE(held);
ASSERT_TRUE(staged);
ASSERT_TRUE(loop_ok);
ASSERT_EQ(state, CBM_DAEMON_RUNTIME_SERVICE_EXITED);
ASSERT_TRUE(marker_refreshed);
ASSERT_TRUE(atomic_load(&runtime_test_coordination_lost_logged));
ASSERT_FALSE(atomic_load(&runtime_test_window_expired_logged));
PASS();
#endif
}
static bool runtime_test_fixture_start_application(runtime_test_fixture_t *fixture, const char *tag,
const cbm_daemon_build_identity_t *identity,
runtime_application_context_t *context) {
@@ -5288,6 +5419,7 @@ SUITE(daemon_runtime) {
RUN_TEST(daemon_runtime_process_fingerprint_never_hashes_replacement_path);
#endif
RUN_TEST(daemon_runtime_convenience_service_owns_participant_guard);
RUN_TEST(daemon_runtime_host_loop_stops_on_coordination_file_loss);
RUN_TEST(daemon_runtime_rendezvous_layout_is_frozen_and_detailed_abi_independent);
RUN_TEST(daemon_runtime_exact_hello_issues_connection_bound_identity);
RUN_TEST(daemon_runtime_image_rejection_reaches_client_issue1383);
tests/test_discover.c
+70
View File
@@ -6,6 +6,7 @@
#include "test_framework.h"
#include "test_helpers.h"
#include "discover/discover.h"
#include "discover/discover_policy_internal.h"
#include "foundation/platform.h"
typedef struct {
@@ -1328,6 +1329,73 @@ TEST(discover_cbmignore_negates_always_skip_dir) {
PASS();
}
/* ── JVM packages named like build output (issue #2661) ─────────── */
/* Below src/<set>/{java,kotlin,scala,groovy}/ every directory is a package, so
* "target", "tmp", "vendor" there are package names, not build output. */
TEST(jvm_package_path_predicate_issue2661) {
ASSERT_TRUE(cbm_discover_path_in_jvm_package("src/main/java/com/acme/target"));
ASSERT_TRUE(cbm_discover_path_in_jvm_package("app/src/test/kotlin/x/tmp"));
ASSERT_TRUE(cbm_discover_path_in_jvm_package("src/main/scala/vendor"));
/* The language root itself and its siblings are not packages. */
ASSERT_FALSE(cbm_discover_path_in_jvm_package("src/main/java"));
ASSERT_FALSE(cbm_discover_path_in_jvm_package("src/main/target"));
ASSERT_FALSE(cbm_discover_path_in_jvm_package("target"));
ASSERT_FALSE(cbm_discover_path_in_jvm_package("module/target/classes"));
ASSERT_FALSE(cbm_discover_path_in_jvm_package("src/java/main/tmp"));
ASSERT_FALSE(cbm_discover_path_in_jvm_package(NULL));
PASS();
}
TEST(discover_keeps_jvm_packages_named_like_build_dirs_issue2661) {
char *base = th_mktempdir("cbm_disc_jvm_pkg");
ASSERT(base != NULL);
th_write_file(TH_PATH(base, "src/main/java/com/acme/target/Foo.java"),
"package com.acme.target;\nclass Foo {}\n");
th_write_file(TH_PATH(base, "src/test/java/com/acme/tmp/T.java"),
"package com.acme.tmp;\nclass T {}\n");
th_write_file(TH_PATH(base, "src/main/kotlin/com/acme/vendor/V.kt"),
"package com.acme.vendor\nclass V\n");
/* Real build output stays skipped. */
th_write_file(TH_PATH(base, "target/classes/Gen.java"), "class Gen {}\n");
th_write_file(TH_PATH(base, "src/main/target/Out.java"), "class Out {}\n");
/* The safety core is never un-skipped, even below a package root. */
th_write_file(TH_PATH(base, "src/main/java/com/.git/H.java"), "class H {}\n");
cbm_discover_opts_t opts = {0};
cbm_file_info_t *files = NULL;
int count = 0;
int rc = cbm_discover(base, &opts, &files, &count);
ASSERT_EQ(rc, 0);
ASSERT_TRUE(discover_has_rel_path(files, count, "src/main/java/com/acme/target/Foo.java"));
ASSERT_TRUE(discover_has_rel_path(files, count, "src/test/java/com/acme/tmp/T.java"));
ASSERT_TRUE(discover_has_rel_path(files, count, "src/main/kotlin/com/acme/vendor/V.kt"));
ASSERT_FALSE(discover_has_rel_path(files, count, "target/classes/Gen.java"));
ASSERT_FALSE(discover_has_rel_path(files, count, "src/main/target/Out.java"));
ASSERT_FALSE(discover_has_rel_path(files, count, "src/main/java/com/.git/H.java"));
ASSERT_EQ(count, 3);
cbm_discover_free(files, count);
/* Moderate/fast mode: a package named like a fast-mode skip dir is kept
* below a JVM source root, while the same name at the top stays skipped. */
th_write_file(TH_PATH(base, "src/main/java/com/acme/integration/I.java"),
"package com.acme.integration;\nclass I {}\n");
th_write_file(TH_PATH(base, "integration/Top.java"), "class Top {}\n");
cbm_discover_opts_t mod_opts = {.mode = CBM_MODE_MODERATE};
files = NULL;
count = 0;
rc = cbm_discover(base, &mod_opts, &files, &count);
ASSERT_EQ(rc, 0);
ASSERT_TRUE(discover_has_rel_path(files, count, "src/main/java/com/acme/integration/I.java"));
ASSERT_FALSE(discover_has_rel_path(files, count, "integration/Top.java"));
cbm_discover_free(files, count);
th_cleanup(base);
PASS();
}
/* ── Laravel compiled Blade view cache (issue #1735) ─────────────── */
/* storage/framework/views/ holds Laravel's compiled Blade templates: generated
@@ -2381,6 +2449,8 @@ SUITE(discover) {
RUN_TEST(skip_venv);
RUN_TEST(skip_dist);
RUN_TEST(skip_target);
RUN_TEST(jvm_package_path_predicate_issue2661);
RUN_TEST(discover_keeps_jvm_packages_named_like_build_dirs_issue2661);
RUN_TEST(skip_vendor);
RUN_TEST(skip_vendored);
RUN_TEST(skip_terraform);
tests/test_doc_links_md.c
+50
View File
@@ -444,6 +444,55 @@ TEST(doc_links_md_incremental) {
PASS();
}
/* #2588: a reference into a directory that was moved or renamed named a
* path whose directory is gone, so it counted as no reference to this
* repository: no edge and no row. A directory above it that the reference
* wrote is still there, so it is doc rot. A path none of whose directories
* the repository has stays no reference. */
TEST(doc_links_md_moved_directory_issue2588) {
char tmp[256];
snprintf(tmp, sizeof(tmp), "/tmp/cbm_dlmd_mv_XXXXXX");
ASSERT_NOT_NULL(cbm_mkdtemp(tmp));
char repo[512];
snprintf(repo, sizeof(repo), "%s/repo", tmp);
th_write_file(TH_PATH(repo, "docs/notes.md"), "# Notes\n"
"\n"
"See `src/util/rounding.py::clamp` and "
"[rounding](../src/util/rounding.py).\n"
"Create `scratch/new/thing.py` first.\n");
th_write_file(TH_PATH(repo, "src/ledger.py"), "def balance(ledger):\n"
" return sum(ledger)\n");
th_write_file(TH_PATH(repo, "src/util/rounding.py"), "def clamp(x, lo, hi):\n"
" return max(lo, min(hi, x))\n");
char db[512];
char full_db[512];
snprintf(db, sizeof(db), "%s/inc.db", tmp);
snprintf(full_db, sizeof(full_db), "%s/full.db", tmp);
ASSERT_EQ(dm_index(repo, db, NULL), 0);
char props[512];
char reason[64];
ASSERT_EQ(md_edge(db, "Notes", "rounding.clamp", props, sizeof(props)), 1);
/* src/util moves to src/helpers: both references are missing, on the
* incremental route as in a full index */
th_write_file(TH_PATH(repo, "src/helpers/rounding.py"), "def clamp(x, lo, hi):\n"
" return max(lo, min(hi, x))\n");
ASSERT_EQ(th_rmtree(TH_PATH(repo, "src/util")), 0);
ASSERT_EQ(dm_step(repo, db, full_db, "directory moved", CBM_INCREMENTAL_ROUTE_FORCED_FULL), 0);
ASSERT_EQ(md_edge(db, "Notes", "rounding.clamp", props, sizeof(props)), 0);
dm_row(db, "docs/notes.md", "src/util/rounding.py::clamp", reason, sizeof(reason), NULL, 0);
ASSERT_STR_EQ(reason, "missing");
dm_row(db, "docs/notes.md", "../src/util/rounding.py", reason, sizeof(reason), NULL, 0);
ASSERT_STR_EQ(reason, "missing");
/* no directory of it in the repository: still no reference */
dm_row(db, "docs/notes.md", "scratch/new/thing.py", reason, sizeof(reason), NULL, 0);
ASSERT_STR_EQ(reason, "");
th_cleanup(tmp);
PASS();
}
/* ── ADRs ────────────────────────────────────────────────────────── */
static void md_write_adrs(const char *tmp, const char *first_status) {
@@ -866,6 +915,7 @@ SUITE(doc_links_md) {
RUN_TEST(doc_links_md_classify_span);
RUN_TEST(doc_links_md_resolve);
RUN_TEST(doc_links_md_incremental);
RUN_TEST(doc_links_md_moved_directory_issue2588);
RUN_TEST(doc_links_md_adr);
RUN_TEST(doc_links_md_adr_label_choice);
RUN_TEST(doc_links_md_adr_reported);
tests/test_doc_mentions_jvm.c
+11 -7
View File
@@ -578,8 +578,10 @@ TEST(doc_mentions_jvm_java_families_and_reasons) {
jt_write(&r, "src/main/java/b/Helper.java", JT_HELPER);
jt_write(&r, "src/main/java/a/Shapes.java", JT_SHAPES);
jt_write(&r, "src/main/java/a/Widget.java", JT_WIDGET);
/* a real package in a directory the indexer skips by name */
jt_write(&r, "src/main/java/a/env/Config.java", "package a.env;\npublic class Config {}\n");
/* a real package in a layout discovery still skips by name: a plain
* src/<pkg>/ tree (the open part of #2661); below src/<set>/<lang>/ the
* same package is kept since #2724 */
jt_write(&r, "src/a/env/Config.java", "package a.env;\npublic class Config {}\n");
jt_write(&r, "src/test/java/a/GadgetTests.java",
"package a;\n/** Tests {@link Gadget}. */\npublic class GadgetTests {}\n");
ASSERT_EQ(dm_index(r.repo, r.db, NULL), 0);
@@ -643,8 +645,8 @@ TEST(doc_mentions_jvm_java_families_and_reasons) {
ASSERT_EQ(jt_edge(db, "a.Widget", "a.GadgetTests"), 0);
/* ... while test code binds product code */
ASSERT_EQ(jt_edge(db, "a.GadgetTests", "a.Gadget"), 1);
/* not_indexed: a package of the repository in a directory discovery
* skips, named by an import and by its qualified name */
/* not_indexed: a package of the repository in a layout discovery still
* skips by name, named by an import and by its qualified name */
ASSERT_STR_EQ(jt_reason(db, w, "Config"), "not_indexed");
ASSERT_STR_EQ(jt_reason(db, w, "a.env.Other"), "not_indexed");
/* graph_gap: a package (no node), a record component, an interface
@@ -1117,8 +1119,10 @@ TEST(doc_mentions_jvm_kotlin_families_and_reasons) {
jt_write(&r, "src/main/kotlin/far/Helper.kt",
"package far\n\nclass Helper {\n fun run() {}\n}\n");
jt_write(&r, "src/main/kotlin/far/sub/Deep.kt", "package far.sub\n\nclass Deep\n");
/* a real package in a directory the indexer skips by name */
jt_write(&r, "src/main/kotlin/k/env/Config.kt", "package k.env\n\nclass Config\n");
/* a real package in a layout discovery still skips by name: a plain
* src/<pkg>/ tree (the open part of #2661); below src/<set>/<lang>/ the
* same package is kept since #2724 */
jt_write(&r, "src/k/env/Config.kt", "package k.env\n\nclass Config\n");
jt_write(&r, "src/test/kotlin/k/GadgetTests.kt", "package k\n\nclass GadgetTests\n");
jt_write(&r, "src/test/kotlin/k/samples/Samples.kt",
"package k.samples\n\nfun widgetSample() {}\n");
@@ -1170,7 +1174,7 @@ TEST(doc_mentions_jvm_kotlin_families_and_reasons) {
ASSERT_STR_EQ(jt_reason(db, w, "far.sub"), "graph_gap");
/* test_only_target */
ASSERT_STR_EQ(jt_reason(db, w, "GadgetTests"), "test_only_target");
/* not_indexed: a package of the repository in a directory discovery skips */
/* not_indexed: a package of the repository in a layout discovery still skips by name */
ASSERT_STR_EQ(jt_reason(db, w, "k.env.Config"), "not_indexed");
/* unparseable: a path with an empty name in it */
ASSERT_STR_EQ(jt_reason(db, w, "Gadget..spin"), "unparseable");
tests/test_edge_imports.c
+47
View File
@@ -363,6 +363,51 @@ TEST(ei_relative_astro_css_imports_issue2558) {
PASS();
}
/* #2797: an explicit `../` path names one file. A same-named file beside the
* importer (checks/values.nix) must not stand in for it, whether the named
* file exists (lib/values.nix) or not (gone/values.nix). */
TEST(ei_nix_parent_relative_import_issue2797) {
static const EILangFile f[] = {
{"lib/values.nix", "{ port = 1; }\n"},
{"lib/helper.nix", "{ x }: { id = x; }\n"},
{"checks/values.nix", "{ unrelated = true; }\n"},
{"checks/user.nix", "let\n"
" inherit (import ../lib/helper.nix { x = 1; }) id;\n"
" port = (import ../lib/values.nix).port;\n"
" gone = import ../gone/values.nix;\n"
"in\n"
"{ inherit id port; }\n"},
{"top.nix", "{ v = (import ./lib/values.nix).port; }\n"},
};
static const EIFileEdgeExpect want[] = {
{"checks/user.nix", "lib/helper.nix"},
{"checks/user.nix", "lib/values.nix"},
{"top.nix", "lib/values.nix"},
};
ASSERT_TRUE(ei_file_edges_match(f, (int)(sizeof(f) / sizeof(f[0])), want,
(int)(sizeof(want) / sizeof(want[0])), 3));
PASS();
}
/* #2797: the same basename guess applies to any grammar whose import is a
* file path, not only Nix. */
TEST(ei_thrift_parent_relative_import_issue2797) {
static const EILangFile f[] = {
{"shared/base.thrift", "struct Base { 1: i32 id }\n"},
{"service/base.thrift", "struct Unrelated { 1: bool flag }\n"},
{"service/api.thrift", "include \"../shared/base.thrift\"\n"
"service Api { base.Base get() }\n"},
};
static const EIFileEdgeExpect want[] = {
{"service/api.thrift", "shared/base.thrift"},
};
ASSERT_TRUE(ei_file_edges_match(f, (int)(sizeof(f) / sizeof(f[0])), want,
(int)(sizeof(want) / sizeof(want[0])), 1));
PASS();
}
/* ═══════════════════════════════════════════════════════════════════════════
* GREEN GUARD — Python
*
@@ -2396,6 +2441,8 @@ TEST(ei_php_psr4_missing_class_leaves_type_evidence_unknown) {
SUITE(edge_imports) {
RUN_TEST(ei_relative_astro_css_imports_issue2558);
RUN_TEST(ei_nix_parent_relative_import_issue2797);
RUN_TEST(ei_thrift_parent_relative_import_issue2797);
/* ── GREEN GUARDS — Python (must stay passing) ── */
RUN_TEST(ei_python_relative_from_import);
tests/test_extraction.c
+49
View File
@@ -1848,6 +1848,54 @@ TEST(elixir_call_string_argument) {
PASS();
}
/* True when a channel with this name/transport/direction was extracted. */
static int has_channel(CBMFileResult *r, const char *name, const char *transport,
CBMChannelDirection dir) {
for (int i = 0; i < r->channels.count; i++) {
const CBMChannel *c = &r->channels.items[i];
if (c->channel_name && strcmp(c->channel_name, name) == 0 && c->transport &&
strcmp(c->transport, transport) == 0 && c->direction == dir)
return 1;
}
return 0;
}
/* Phoenix pub/sub and channel listeners. Both branches were unreachable: the
* emit side looked up an "arguments" FIELD that tree-sitter-elixir does not
* define, and the listener side dispatched on a "def" NODE TYPE that does not
* exist (Elixir defs are `call` nodes), so a Phoenix app produced no channels
* at all. */
TEST(elixir_channels_pubsub_and_handle_in) {
CBMFileResult *r =
extract("defmodule Acme.Notifier do\n"
" def announce(p) do\n"
" Phoenix.PubSub.broadcast(Acme.PubSub, \"user:created\", p)\n"
" end\n"
" def watch, do: Phoenix.PubSub.subscribe(Acme.PubSub, \"user:updated\")\n"
"end\n"
"defmodule AcmeWeb.RoomChannel do\n"
" def handle_in(\"new_msg\", payload, socket) do\n"
" push(socket, \"pong\", %{})\n"
" {:noreply, socket}\n"
" end\n"
" def handle_in(\"ping\", _p, socket) when is_map(socket) do\n"
" {:noreply, socket}\n"
" end\n"
"end\n",
CBM_LANG_ELIXIR, "t", "chan.ex");
ASSERT_NOT_NULL(r);
ASSERT_FALSE(r->has_error);
ASSERT(has_channel(r, "user:created", "phoenix_pubsub", CBM_CHANNEL_EMIT));
ASSERT(has_channel(r, "user:updated", "phoenix_pubsub", CBM_CHANNEL_LISTEN));
/* handle_in clauses are listeners — including the guarded one. */
ASSERT(has_channel(r, "new_msg", "phoenix_channel", CBM_CHANNEL_LISTEN));
ASSERT(has_channel(r, "ping", "phoenix_channel", CBM_CHANNEL_LISTEN));
/* A bare push/broadcast inside the channel module is an emit. */
ASSERT(has_channel(r, "pong", "phoenix_channel", CBM_CHANNEL_EMIT));
cbm_free_result(r);
PASS();
}
/* --- Haskell --- */
TEST(haskell_function) {
CBMFileResult *r = extract("add :: Int -> Int -> Int\nadd x y = x + y\n\nmultiply :: Int -> "
@@ -13290,6 +13338,7 @@ SUITE(extraction) {
/* Functional */
RUN_TEST(elixir_function);
RUN_TEST(elixir_call_string_argument);
RUN_TEST(elixir_channels_pubsub_and_handle_in);
RUN_TEST(haskell_function);
RUN_TEST(haskell_infix_definition_name);
RUN_TEST(ocaml_function);
tests/test_grammar_regression.c
+86
View File
@@ -16,6 +16,72 @@
#include "test_framework.h"
#include "cbm.h"
#include "grammar_cases.h"
#include <string.h>
typedef void *(*grammar_scanner_create_fn)(void);
typedef unsigned (*grammar_scanner_serialize_fn)(void *payload, char *buffer);
typedef void (*grammar_scanner_deserialize_fn)(void *payload, const char *buffer, unsigned length);
typedef void (*grammar_scanner_destroy_fn)(void *payload);
extern void *tree_sitter_objectscript_routine_external_scanner_create(void);
extern unsigned tree_sitter_objectscript_routine_external_scanner_serialize(void *payload,
char *buffer);
extern void tree_sitter_objectscript_routine_external_scanner_deserialize(void *payload,
const char *buffer,
unsigned length);
extern void tree_sitter_objectscript_routine_external_scanner_destroy(void *payload);
extern void *tree_sitter_objectscript_udl_external_scanner_create(void);
extern unsigned tree_sitter_objectscript_udl_external_scanner_serialize(void *payload,
char *buffer);
extern void tree_sitter_objectscript_udl_external_scanner_deserialize(void *payload,
const char *buffer,
unsigned length);
extern void tree_sitter_objectscript_udl_external_scanner_destroy(void *payload);
static bool grammar_scanner_empty_deserialize_and_roundtrip(
grammar_scanner_create_fn create, grammar_scanner_serialize_fn serialize,
grammar_scanner_deserialize_fn deserialize, grammar_scanner_destroy_fn destroy) {
char reference_state[4096];
char empty_state[4096];
char roundtrip_state[4096];
void *reference = create();
void *empty = create();
void *roundtrip = create();
bool passed = false;
if (!reference || !empty || !roundtrip) {
goto done;
}
unsigned reference_length = serialize(reference, reference_state);
if (reference_length == 0 || reference_length > sizeof(reference_state)) {
goto done;
}
deserialize(empty, NULL, 0);
unsigned empty_length = serialize(empty, empty_state);
if (reference_length != empty_length ||
memcmp(reference_state, empty_state, reference_length) != 0) {
goto done;
}
deserialize(roundtrip, reference_state, reference_length);
unsigned roundtrip_length = serialize(roundtrip, roundtrip_state);
passed = reference_length == roundtrip_length &&
memcmp(reference_state, roundtrip_state, reference_length) == 0;
done:
if (reference) {
destroy(reference);
}
if (empty) {
destroy(empty);
}
if (roundtrip) {
destroy(roundtrip);
}
return passed;
}
static int reg_has_def_any(CBMFileResult *r, const char *name) {
for (int i = 0; i < r->defs.count; i++) {
@@ -416,6 +482,26 @@ TEST(grammar_regression_all) {
PASS();
}
TEST(grammar_objectscript_routine_scanner_empty_deserialize_and_roundtrip) {
ASSERT_TRUE(grammar_scanner_empty_deserialize_and_roundtrip(
tree_sitter_objectscript_routine_external_scanner_create,
tree_sitter_objectscript_routine_external_scanner_serialize,
tree_sitter_objectscript_routine_external_scanner_deserialize,
tree_sitter_objectscript_routine_external_scanner_destroy));
PASS();
}
TEST(grammar_objectscript_udl_scanner_empty_deserialize_and_roundtrip) {
ASSERT_TRUE(grammar_scanner_empty_deserialize_and_roundtrip(
tree_sitter_objectscript_udl_external_scanner_create,
tree_sitter_objectscript_udl_external_scanner_serialize,
tree_sitter_objectscript_udl_external_scanner_deserialize,
tree_sitter_objectscript_udl_external_scanner_destroy));
PASS();
}
void suite_grammar_regression(void) {
RUN_TEST(grammar_objectscript_routine_scanner_empty_deserialize_and_roundtrip);
RUN_TEST(grammar_objectscript_udl_scanner_empty_deserialize_and_roundtrip);
RUN_TEST(grammar_regression_all);
}
tests/test_infrascan.c
+266
View File
@@ -2,10 +2,12 @@
#include "graph_buffer/graph_buffer.h"
#include "pipeline/pipeline_internal.h"
#include "service_patterns.h"
#include "yyjson/yyjson.h"
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
static int has_data_flow(cbm_gbuf_t *gb, int64_t source_id, int64_t target_id) {
const cbm_gbuf_edge_t **edges = NULL;
@@ -385,6 +387,264 @@ TEST(infrascan_http_calls_join_matching_handler_route) {
PASS();
}
/* An unchanged handler's Route is rebuilt from its stored route metadata. The
* metadata is JSON, so a route path with a quote or a backslash (a legal POSIX
* directory name) is stored escaped; reading it up to the first quote named a
* second Route "/api/a\" beside the extracted one, and the handler QN went into
* the HANDLES properties unescaped. Running the pass twice proves the rebuild
* finds the Route it made instead of adding another edge. */
TEST(infrascan_decorator_route_metadata_keeps_its_escapes) {
cbm_gbuf_t *gb = cbm_gbuf_new("test", "/tmp/cbm_infrascan_route_escapes");
ASSERT_NOT_NULL(gb);
int64_t handler = cbm_gbuf_upsert_node(
gb, "Function", "GET", "test.app.api.a\"b.route.GET", "app/api/a\"b/route.ts", 1, 1,
"{\"route_path\":\"/api/a\\\"b\\\\c\",\"route_method\":\"GET\"}");
ASSERT_GT(handler, 0);
cbm_pipeline_create_route_nodes(gb);
cbm_pipeline_create_route_nodes(gb);
const cbm_gbuf_node_t **routes = NULL;
int route_count = 0;
ASSERT_EQ(cbm_gbuf_find_by_label(gb, "Route", &routes, &route_count), 0);
ASSERT_EQ(route_count, 1);
const cbm_gbuf_node_t *route = cbm_gbuf_find_by_qn(gb, "__route__GET__/api/a\"b\\c");
ASSERT_NOT_NULL(route);
ASSERT_STR_EQ(route->name, "/api/a\"b\\c");
ASSERT_STR_EQ(route->file_path, "app/api/a\"b/route.ts");
const cbm_gbuf_edge_t **edges = NULL;
int edge_count = 0;
ASSERT_EQ(cbm_gbuf_find_edges_by_target_type(gb, route->id, "HANDLES", &edges, &edge_count), 0);
ASSERT_EQ(edge_count, 1);
ASSERT_EQ(edges[0]->source_id, handler);
yyjson_doc *doc = yyjson_read(edges[0]->properties_json, strlen(edges[0]->properties_json), 0);
ASSERT_NOT_NULL(doc);
const char *qn = yyjson_get_str(yyjson_obj_get(yyjson_doc_get_root(doc), "handler"));
bool same_handler = qn && strcmp(qn, "test.app.api.a\"b.route.GET") == 0;
yyjson_doc_free(doc);
ASSERT_TRUE(same_handler);
cbm_gbuf_free(gb);
PASS();
}
/* Does the one HANDLES edge into Route route_qn hold properties that parse to
* {"handler": qn}? */
static bool handles_names_handler(cbm_gbuf_t *gb, const char *route_qn, const char *qn) {
const cbm_gbuf_node_t *route = cbm_gbuf_find_by_qn(gb, route_qn);
const cbm_gbuf_edge_t **edges = NULL;
int edge_count = 0;
if (!route ||
cbm_gbuf_find_edges_by_target_type(gb, route->id, "HANDLES", &edges, &edge_count) != 0 ||
edge_count != 1) {
return false;
}
yyjson_doc *doc = yyjson_read(edges[0]->properties_json, strlen(edges[0]->properties_json), 0);
const char *handler = yyjson_get_str(yyjson_obj_get(yyjson_doc_get_root(doc), "handler"));
bool same = handler && strcmp(handler, qn) == 0;
yyjson_doc_free(doc);
return same;
}
/* The HANDLES properties hold the handler's QN escaped. A QN that fills the
* escape buffer left the closing `"}` off them, and one malformed properties
* row fails every query that reads edge properties. The edge extraction emits
* and the one an unchanged handler's metadata rebuilds must both parse. */
TEST(infrascan_handles_properties_hold_a_long_handler_qn) {
char qn[CBM_SZ_512];
memset(qn, 'q', sizeof(qn) - SKIP_ONE);
qn[sizeof(qn) - SKIP_ONE] = '\0';
cbm_gbuf_t *emitted = cbm_gbuf_new("test", "/tmp/cbm_infrascan_long_qn_emit");
ASSERT_NOT_NULL(emitted);
int64_t handler = cbm_gbuf_upsert_node(emitted, "Function", "GET", qn, "server.ts", 1, 1, "{}");
ASSERT_GT(handler, 0);
CBMDefinition def = {0};
def.qualified_name = qn;
def.file_path = "server.ts";
def.route_path = "/long";
def.route_method = "GET";
cbm_pipeline_emit_def_route(emitted, handler, &def, "server.ts");
bool emitted_parses = handles_names_handler(emitted, "__route__GET__/long", qn);
cbm_gbuf_free(emitted);
cbm_gbuf_t *rebuilt = cbm_gbuf_new("test", "/tmp/cbm_infrascan_long_qn_rebuild");
ASSERT_NOT_NULL(rebuilt);
ASSERT_GT(cbm_gbuf_upsert_node(rebuilt, "Function", "GET", qn, "server.ts", 1, 1,
"{\"route_path\":\"/long\",\"route_method\":\"GET\"}"),
0);
cbm_pipeline_create_route_nodes(rebuilt);
bool rebuilt_parses = handles_names_handler(rebuilt, "__route__GET__/long", qn);
cbm_gbuf_free(rebuilt);
ASSERT_TRUE(emitted_parses);
ASSERT_TRUE(rebuilt_parses);
PASS();
}
/* Does Route route_qn hold properties that parse to {"method": method}? */
static bool route_names_method(cbm_gbuf_t *gb, const char *route_qn, const char *method) {
const cbm_gbuf_node_t *route = cbm_gbuf_find_by_qn(gb, route_qn);
if (!route || !route->properties_json) {
return false;
}
yyjson_doc *doc = yyjson_read(route->properties_json, strlen(route->properties_json), 0);
const char *got = yyjson_get_str(yyjson_obj_get(yyjson_doc_get_root(doc), "method"));
bool same = got && strcmp(got, method) == 0;
yyjson_doc_free(doc);
return same;
}
/* A route method is source text where a Python DRF action names it
* (`@action(methods=['a"b'])`), so the Route's properties hold it escaped:
* both the Route extraction emits and the one rebuilt from the handler's
* metadata must parse. */
TEST(infrascan_route_properties_escape_the_method) {
cbm_gbuf_t *emitted = cbm_gbuf_new("test", "/tmp/cbm_infrascan_method_emit");
ASSERT_NOT_NULL(emitted);
int64_t handler =
cbm_gbuf_upsert_node(emitted, "Function", "act", "test.views.act", "views.py", 1, 1, "{}");
ASSERT_GT(handler, 0);
CBMDefinition def = {0};
def.qualified_name = "test.views.act";
def.file_path = "views.py";
def.route_path = "/m";
def.route_method = "A\"B";
cbm_pipeline_emit_def_route(emitted, handler, &def, "views.py");
bool emitted_parses = route_names_method(emitted, "__route__A\"B__/m", "A\"B");
cbm_gbuf_free(emitted);
cbm_gbuf_t *rebuilt = cbm_gbuf_new("test", "/tmp/cbm_infrascan_method_rebuild");
ASSERT_NOT_NULL(rebuilt);
ASSERT_GT(cbm_gbuf_upsert_node(rebuilt, "Function", "act", "test.views.act", "views.py", 1, 1,
"{\"route_path\":\"/m\",\"route_method\":\"A\\\"B\"}"),
0);
cbm_pipeline_create_route_nodes(rebuilt);
bool rebuilt_parses = route_names_method(rebuilt, "__route__A\"B__/m", "A\"B");
cbm_gbuf_free(rebuilt);
ASSERT_TRUE(emitted_parses);
ASSERT_TRUE(rebuilt_parses);
PASS();
}
/* A SvelteKit +server handler's HANDLES properties hold its QN escaped, as
* every other HANDLES edge's do: a quote in a route directory, or a QN longer
* than the old 256-byte properties buffer, made them malformed. */
TEST(infrascan_sveltekit_handles_properties_escape_the_handler_qn) {
char dir[CBM_SZ_512];
snprintf(dir, sizeof(dir), "a\"b/%0300d", 0);
char file[CBM_SZ_1K];
snprintf(file, sizeof(file), "src/routes/%s/+server.ts", dir);
char qn[CBM_SZ_1K];
snprintf(qn, sizeof(qn), "test.src.routes.%s.+server.GET", dir);
cbm_gbuf_t *gb = cbm_gbuf_new("test", "/tmp/cbm_infrascan_sveltekit_handles");
ASSERT_NOT_NULL(gb);
int64_t file_id =
cbm_gbuf_upsert_node(gb, "File", "+server.ts", "test.server", file, 1, 1, "{}");
int64_t handler = cbm_gbuf_upsert_node(gb, "Function", "GET", qn, file, 1, 1, "{}");
ASSERT_GT(file_id, 0);
ASSERT_GT(handler, 0);
cbm_gbuf_insert_edge(gb, file_id, handler, "DEFINES", "{}");
cbm_pipeline_create_route_nodes(gb);
const cbm_gbuf_edge_t **edges = NULL;
int edge_count = 0;
bool same = false;
if (cbm_gbuf_find_edges_by_source_type(gb, handler, "HANDLES", &edges, &edge_count) == 0 &&
edge_count == 1) {
yyjson_doc *doc =
yyjson_read(edges[0]->properties_json, strlen(edges[0]->properties_json), 0);
yyjson_val *root = yyjson_doc_get_root(doc);
const char *got = yyjson_get_str(yyjson_obj_get(root, "handler"));
const char *framework = yyjson_get_str(yyjson_obj_get(root, "framework"));
same = got && strcmp(got, qn) == 0 && framework && strcmp(framework, "sveltekit") == 0;
yyjson_doc_free(doc);
}
cbm_gbuf_free(gb);
ASSERT_TRUE(same);
PASS();
}
/* Route metadata that does not parse, is not a top-level string, holds a NUL or
* does not fit the path buffer names no Route at all, rather than whatever text
* happens to sit between two quotes. The 255-byte path is the longest that fits
* and must still route. */
TEST(infrascan_decorator_route_metadata_rejects_malformed_values) {
cbm_gbuf_t *gb = cbm_gbuf_new("test", "/tmp/cbm_infrascan_route_malformed");
ASSERT_NOT_NULL(gb);
char longest[CBM_SZ_256 + CBM_SZ_64];
char too_long[CBM_SZ_256 + CBM_SZ_64];
char path[CBM_SZ_256 + 1];
path[0] = '/';
memset(path + 1, 'x', CBM_SZ_256 - 1);
path[CBM_SZ_256] = '\0';
snprintf(too_long, sizeof(too_long), "{\"route_path\":\"%s\"}", path);
path[CBM_SZ_256 - 1] = '\0';
snprintf(longest, sizeof(longest), "{\"route_path\":\"%s\"}", path);
const char *props[] = {
"{\"route_path\":\"/truncated\"",
"{\"meta\":{\"route_path\":\"/nested\"}}",
"{\"route_path\":[\"/array\"]}",
"{\"route_path\":42}",
"{\"route_path\":\"/a\\u0000b\"}",
"{\"route_path\":\"\"}",
"{\"route_path\":\"relative\"}",
"[\"route_path\",\"/not-an-object\"]",
too_long,
};
const int prop_count = (int)(sizeof(props) / sizeof(props[0]));
for (int i = 0; i < prop_count; i++) {
char qn[CBM_SZ_32];
snprintf(qn, sizeof(qn), "test.bad%d", i);
ASSERT_GT(cbm_gbuf_upsert_node(gb, "Function", qn, qn, "server.ts", 1, 1, props[i]), 0);
}
cbm_pipeline_create_route_nodes(gb);
ASSERT_EQ(cbm_gbuf_edge_count_by_type(gb, "HANDLES"), 0);
const cbm_gbuf_node_t **routes = NULL;
int route_count = 0;
ASSERT_EQ(cbm_gbuf_find_by_label(gb, "Route", &routes, &route_count), 0);
ASSERT_EQ(route_count, 0);
int64_t fits =
cbm_gbuf_upsert_node(gb, "Function", "fits", "test.fits", "server.ts", 1, 1, longest);
ASSERT_GT(fits, 0);
cbm_pipeline_create_route_nodes(gb);
ASSERT_EQ(cbm_gbuf_find_by_label(gb, "Route", &routes, &route_count), 0);
ASSERT_EQ(route_count, 1);
ASSERT_STR_EQ(routes[0]->name, path);
ASSERT_EQ(cbm_gbuf_edge_count_by_type(gb, "HANDLES"), 1);
cbm_gbuf_free(gb);
PASS();
}
/* Properties hold source text as its bytes, which need not be UTF-8: a
* Latin-1 docstring beside the route metadata, or a Latin-1 route path. The
* Route extraction emits for them must come back from the stored metadata too,
* as it did before the metadata was parsed. */
TEST(infrascan_decorator_route_metadata_survives_invalid_utf8) {
cbm_gbuf_t *gb = cbm_gbuf_new("test", "/tmp/cbm_infrascan_route_latin1");
ASSERT_NOT_NULL(gb);
ASSERT_GT(cbm_gbuf_upsert_node(gb, "Function", "doc", "test.doc", "views.py", 1, 1,
"{\"docstring\":\"caf\xe9\",\"route_path\":\"/doc\","
"\"route_method\":\"GET\"}"),
0);
ASSERT_GT(cbm_gbuf_upsert_node(gb, "Function", "GET", "test.app.caf\xe9.route.GET",
"app/caf\xe9/route.ts", 1, 1,
"{\"route_path\":\"/caf\xe9\",\"route_method\":\"GET\"}"),
0);
cbm_pipeline_create_route_nodes(gb);
const cbm_gbuf_node_t *doc_route = cbm_gbuf_find_by_qn(gb, "__route__GET__/doc");
const cbm_gbuf_node_t *dir_route = cbm_gbuf_find_by_qn(gb, "__route__GET__/caf\xe9");
bool both = doc_route && dir_route && strcmp(dir_route->name, "/caf\xe9") == 0 &&
cbm_gbuf_edge_count_by_type(gb, "HANDLES") == 2;
cbm_gbuf_free(gb);
ASSERT_TRUE(both);
PASS();
}
/* FD16: a route's DATA_FLOWS were built from the first 64 callers and the first 32 infra handlers
* in edge-insertion order (parallel worker interleaving), so the flow set changed between two
* indexes of the same tree and every caller past the 64th lost its flow. */
@@ -557,6 +817,12 @@ SUITE(infrascan) {
RUN_TEST(infrascan_service_pattern_match_keeps_real_library_qns);
RUN_TEST(infrascan_route_nodes_skip_bad_http_url_paths);
RUN_TEST(infrascan_http_calls_join_matching_handler_route);
RUN_TEST(infrascan_decorator_route_metadata_keeps_its_escapes);
RUN_TEST(infrascan_decorator_route_metadata_rejects_malformed_values);
RUN_TEST(infrascan_decorator_route_metadata_survives_invalid_utf8);
RUN_TEST(infrascan_handles_properties_hold_a_long_handler_qn);
RUN_TEST(infrascan_route_properties_escape_the_method);
RUN_TEST(infrascan_sveltekit_handles_properties_escape_the_handler_qn);
RUN_TEST(infrascan_data_flows_link_every_caller_of_a_route);
RUN_TEST(infrascan_data_flows_do_not_depend_on_caller_insertion_order);
RUN_TEST(infrascan_data_flows_reach_every_infra_handler);
tests/test_language.c
+10
View File
@@ -500,6 +500,15 @@ TEST(lang_ext_vert) {
ASSERT_EQ(cbm_language_for_extension(".vert"), CBM_LANG_GLSL);
PASS();
}
/* Compute, geometry and tessellation stages are GLSL too (glslang naming). */
TEST(lang_ext_glsl_other_stages) {
ASSERT_EQ(cbm_language_for_extension(".comp"), CBM_LANG_GLSL);
ASSERT_EQ(cbm_language_for_extension(".geom"), CBM_LANG_GLSL);
ASSERT_EQ(cbm_language_for_extension(".tesc"), CBM_LANG_GLSL);
ASSERT_EQ(cbm_language_for_extension(".tese"), CBM_LANG_GLSL);
PASS();
}
TEST(lang_ext_frag) {
ASSERT_EQ(cbm_language_for_extension(".frag"), CBM_LANG_GLSL);
PASS();
@@ -1654,6 +1663,7 @@ SUITE(language) {
RUN_TEST(lang_ext_glsl);
RUN_TEST(lang_ext_vert);
RUN_TEST(lang_ext_frag);
RUN_TEST(lang_ext_glsl_other_stages);
RUN_TEST(lang_ext_ini);
RUN_TEST(lang_ext_cfg);
RUN_TEST(lang_ext_conf);
tests/test_log.c
+18 -1
View File
@@ -207,7 +207,8 @@ TEST(log_operational_helpers) {
cbm_log_set_level(CBM_LOG_DEBUG);
cbm_log_set_format(CBM_LOG_FORMAT_TEXT);
capture_start();
cbm_log_mcp_request("tools/call", "search_graph", false, 1250);
cbm_log_mcp_request("tools/call", "search_graph", false, 1250000, 1000000, 250000, false,
false);
cbm_log_http_request("graph_ui", "GET", "/api/layout", 200, 7, 0, 42);
const char *output = capture_end();
cbm_log_set_level(CBM_LOG_INFO);
@@ -216,10 +217,26 @@ TEST(log_operational_helpers) {
ASSERT(cbm_str_contains_raw(output, "protocol=jsonrpc"));
ASSERT(cbm_str_contains_raw(output, "method=tools/call"));
ASSERT(cbm_str_contains_raw(output, "tool=search_graph"));
ASSERT(cbm_str_contains_raw(output, "handler_duration_ms=1000"));
ASSERT(cbm_str_contains_raw(output, "response_serialization_ms=250"));
ASSERT(cbm_str_contains_raw(output, "cancelled=false"));
ASSERT(cbm_str_contains_raw(output, "timed_out=false"));
ASSERT(cbm_str_contains_raw(output, "msg=http.request"));
ASSERT(cbm_str_contains_raw(output, "method=GET"));
ASSERT(cbm_str_contains_raw(output, "path=/api/layout"));
ASSERT(cbm_str_contains_raw(output, "status=200"));
/* A request that hit its deadline reports status=timeout, even though the
* tool result itself is an error. */
cbm_log_set_level(CBM_LOG_DEBUG);
capture_start();
cbm_log_mcp_request("tools/call", "search_code", true, 2000000, 2000000, 0, false, true);
output = capture_end();
cbm_log_set_level(CBM_LOG_INFO);
ASSERT(cbm_str_contains_raw(output, "msg=mcp.request"));
ASSERT(cbm_str_contains_raw(output, "status=timeout"));
ASSERT(cbm_str_contains_raw(output, "timed_out=true"));
PASS();
}
tests/test_mcp.c
+55 -4
View File
@@ -2444,6 +2444,10 @@ TEST(server_handle_logs_request_without_params) {
ASSERT_NOT_NULL(strstr(mcp_log_buf, "protocol=jsonrpc"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "method=tools/list"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "status=ok"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "handler_duration_ms="));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "response_serialization_ms="));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "cancelled=false"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "timed_out=false"));
ASSERT_NULL(strstr(mcp_log_buf, "token"));
ASSERT_NULL(strstr(mcp_log_buf, "secret"));
PASS();
@@ -12462,14 +12466,27 @@ TEST(search_code_cancel_cleans_supervised_scan) {
};
cbm_mcp_server_set_command_test_hook(srv, mcp_search_command_hook_probe, &probe);
char *response =
cbm_mcp_handle_tool(srv, "search_code",
"{\"pattern\":\"HandleRequest\",\"project\":\"prefilter-search\","
"\"file_pattern\":\"*.go\"}");
mcp_log_buf[0] = '\0';
CBMLogLevel previous_level = cbm_log_get_level();
cbm_log_set_level(CBM_LOG_INFO);
cbm_log_set_sink_ex(mcp_capture_log, CBM_LOG_SINK_REPLACE);
char *response = cbm_mcp_server_handle(
srv, "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"tools/call\","
"\"params\":{\"name\":\"search_code\",\"arguments\":{\"pattern\":"
"\"HandleRequest\",\"project\":\"prefilter-search\",\"file_pattern\":"
"\"*.go\"}}}");
cbm_log_set_sink(NULL);
cbm_log_set_level(previous_level);
ASSERT_NOT_NULL(response);
ASSERT_TRUE(probe.cancel_accepted);
ASSERT_NOT_NULL(strstr(response, "cancelled"));
ASSERT_NOT_NULL(strstr(response, "\"isError\":true"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "msg=mcp.request"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "tool=search_code"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "cancelled=true"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "timed_out=false"));
ASSERT_NULL(strstr(mcp_log_buf, "HandleRequest"));
ASSERT_NULL(strstr(mcp_log_buf, "prefilter-search"));
char logs[640];
snprintf(logs, sizeof(logs), "%s/logs", cache.path);
@@ -12482,6 +12499,39 @@ TEST(search_code_cancel_cleans_supervised_scan) {
PASS();
}
TEST(server_handle_logs_timeout_without_query) {
char tmp[512], src_path[768], vendor_path[768];
cbm_mcp_server_t *srv = setup_prefilter_server(tmp, sizeof(tmp), src_path, sizeof(src_path),
vendor_path, sizeof(vendor_path));
ASSERT_NOT_NULL(srv);
cbm_mcp_server_set_search_scan_timeout_for_test(srv, 0, true);
mcp_log_buf[0] = '\0';
CBMLogLevel previous_level = cbm_log_get_level();
cbm_log_set_level(CBM_LOG_INFO);
cbm_log_set_sink_ex(mcp_capture_log, CBM_LOG_SINK_REPLACE);
char *response = cbm_mcp_server_handle(
srv, "{\"jsonrpc\":\"2.0\",\"id\":2,\"method\":\"tools/call\","
"\"params\":{\"name\":\"search_code\",\"arguments\":{\"pattern\":"
"\"HandleRequest\",\"project\":\"prefilter-search\"}}}");
cbm_log_set_sink(NULL);
cbm_log_set_level(previous_level);
ASSERT_NOT_NULL(response);
ASSERT_NOT_NULL(strstr(mcp_log_buf, "status=timeout"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "timed_out=true"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "cancelled=false"));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "handler_duration_ms="));
ASSERT_NOT_NULL(strstr(mcp_log_buf, "response_serialization_ms="));
ASSERT_NULL(strstr(mcp_log_buf, "HandleRequest"));
ASSERT_NULL(strstr(mcp_log_buf, "prefilter-search"));
free(response);
cbm_mcp_server_free(srv);
cleanup_prefilter_dir(tmp, src_path, vendor_path);
PASS();
}
TEST(search_code_output_limit_fails_closed_and_cleans_scan) {
mcp_search_cache_t cache;
ASSERT_TRUE(mcp_search_cache_open(&cache, "cbm-search-limit"));
@@ -25478,6 +25528,7 @@ SUITE(mcp) {
RUN_TEST(search_code_file_pattern_prefilter_boundaries);
RUN_TEST(search_code_windows_scope_prefilter_removes_pipeline_filter);
RUN_TEST(search_code_cancel_cleans_supervised_scan);
RUN_TEST(server_handle_logs_timeout_without_query);
RUN_TEST(search_code_output_limit_fails_closed_and_cleans_scan);
RUN_TEST(search_code_scan_deadline_fails_closed_and_resets);
RUN_TEST(search_code_scan_deadline_override_is_per_server);
tests/test_pipeline.c
+77
View File
@@ -8731,6 +8731,45 @@ TEST(pipeline_semantic_manifest_rejects_non_directory_root) {
PASS();
}
#ifndef _WIN32
/* A nested directory the process cannot open (permission-denied) must not
* abort the whole manifest walk: it has no control files to contribute, so
* it is skipped, and control files in sibling directories still get found.
* Root-not-a-directory (above) is a different, still fail-closed case. */
TEST(pipeline_semantic_manifest_skips_unreadable_subdirectory) {
char tmp[256];
snprintf(tmp, sizeof(tmp), "/tmp/cbm_manifest_locked_dir_XXXXXX");
ASSERT_NOT_NULL(cbm_mkdtemp(tmp));
write_temp_file(tmp, "readable.py", "def Readable():\n return 1\n");
write_temp_file(tmp, "locked/secret.txt", "should never be opened\n");
write_temp_file(tmp, "sibling/.gitignore", "*.log\n");
char locked_path[512];
snprintf(locked_path, sizeof(locked_path), "%s/locked", tmp);
ASSERT_EQ(chmod(locked_path, 0), 0);
cbm_file_hash_t *manifest = NULL;
int manifest_count = -1;
int rc = cbm_pipeline_build_semantic_manifest("manifest-skip-locked", tmp, NULL, 0, NULL, 0,
NULL, NULL, &manifest, &manifest_count);
bool found_sibling_gitignore = false;
for (int i = 0; i < manifest_count; i++) {
if (manifest[i].rel_path && strcmp(manifest[i].rel_path, "sibling/.gitignore") == 0) {
found_sibling_gitignore = true;
}
}
chmod(locked_path, 0755);
cbm_pipeline_free_semantic_manifest(manifest, manifest_count > 0 ? manifest_count : 0);
th_rmtree(tmp);
ASSERT_EQ(rc, 0);
ASSERT_TRUE(found_sibling_gitignore);
PASS();
}
#endif /* !_WIN32 */
/* A fully validated staged graph must be able to recover from a definitely
* non-SQLite destination without deleting evidence or overwriting an earlier
* quarantine. The replacement happens only after the corrupt bytes are moved. */
@@ -13935,6 +13974,40 @@ TEST(pipeline_native_fetch_classified_as_http_calls) {
PASS();
}
TEST(pipeline_native_fetch_template_base_url_makes_route) {
char tmp[256];
snprintf(tmp, sizeof(tmp), "/tmp/cbm_fetch_template_base_XXXXXX");
if (!cbm_mkdtemp(tmp)) {
FAIL("tmpdir");
}
write_temp_file(tmp, "src/api.ts",
"const BASE_URL = \"http://payments:8080\";\n"
"export async function createPayment(body: unknown) {\n"
" return fetch(`${BASE_URL}/v1/payments`, { method: 'POST', body });\n"
"}\n");
char db_path[512];
snprintf(db_path, sizeof(db_path), "%s/fetch_template_base.db", tmp);
cbm_pipeline_t *p = cbm_pipeline_new(tmp, db_path, CBM_MODE_FULL);
ASSERT_NOT_NULL(p);
ASSERT_EQ(cbm_pipeline_run(p), 0);
const char *project = cbm_pipeline_project_name(p);
cbm_store_t *s = cbm_store_open_path(db_path);
ASSERT_NOT_NULL(s);
int http_call_count = cbm_store_count_edges_by_type(s, project, "HTTP_CALLS");
int matching_route_count =
http_calls_to_route(s, project, "createPayment", "/v1/payments");
cbm_store_close(s);
cbm_pipeline_free(p);
th_rmtree(tmp);
ASSERT_EQ(http_call_count, 1);
ASSERT_EQ(matching_route_count, 1);
PASS();
}
/* #1892: Swift produced no Route node and no HTTP_CALLS edge, because the
* Swift grammar has no "arguments" field and the generic lookup therefore read
* no call arguments at all. Alamofire/URLSession were already in the service
@@ -28476,6 +28549,7 @@ SUITE(pipeline) {
RUN_TEST(pipeline_ts_config_object_url_http_calls_issue2235);
RUN_TEST(pipeline_arg_url_rejects_document_file_paths);
RUN_TEST(pipeline_native_fetch_classified_as_http_calls);
RUN_TEST(pipeline_native_fetch_template_base_url_makes_route);
RUN_TEST(pipeline_swift_nested_url_makes_route_issue1892);
RUN_TEST(pipeline_swift_http_call_makes_route_issue1892);
RUN_TEST(pipeline_route_prefix_bridge_is_order_free_and_root_bridges_nothing);
@@ -28880,6 +28954,9 @@ SUITE(pipeline_semantic_manifest_repro) {
RUN_TEST(pipeline_incremental_successful_publication_preserves_adr);
RUN_TEST(pipeline_full_adr_capture_failure_preserves_previous_generation);
RUN_TEST(pipeline_semantic_manifest_rejects_non_directory_root);
#ifndef _WIN32
RUN_TEST(pipeline_semantic_manifest_skips_unreadable_subdirectory);
#endif
RUN_TEST(pipeline_full_reindex_quarantines_corrupt_destination_without_overwrite);
RUN_TEST(pipeline_full_reindex_replaces_legacy_schema_without_quarantine);
#endif
tests/test_private_file_lock.c
+107 -1
View File
@@ -166,7 +166,10 @@ static void private_lock_fixture_finish(private_lock_fixture_t *fixture) {
"lock-attempt-cleanup.lock",
"acl-directory.lock",
"acl-file.lock",
"fork.lock"};
"fork.lock",
"touch.lock",
"touch-rename.lock",
"touch-renamed.lock"};
if (fixture->root[0]) {
for (size_t index = 0; index < sizeof(files) / sizeof(files[0]); index++) {
if (!private_lock_path(path, fixture, files[index])) {
@@ -480,6 +483,107 @@ TEST(private_file_lock_consumed_close_error_never_retries_recycled_fd) {
#endif
}
/* #2178: macOS tmp_cleaner unlinks /tmp files whose atime, mtime and ctime are
* all older than three days, including empty lock files a daemon holds for its
* whole life. The next participant then creates and locks a fresh inode, so
* the old lock coordinates nothing. Touch must keep a held file young and
* report the loss once the path stops naming it. */
TEST(private_file_lock_touch_refreshes_held_file_and_detects_unlink) {
#ifdef _WIN32
SKIP_PLATFORM("age-based temp cleaning and unlink-while-held are POSIX behaviors");
#else
private_lock_fixture_t fixture;
bool started = private_lock_fixture_start(&fixture);
char path[PRIVATE_LOCK_TEST_PATH_CAP];
bool path_ok = started && private_lock_path(path, &fixture, "touch.lock");
cbm_private_file_lock_t *held = NULL;
cbm_private_file_lock_t *successor = NULL;
cbm_private_file_lock_status_t acquired =
path_ok ? cbm_private_file_lock_try_acquire(fixture.directory, "touch.lock",
CBM_PRIVATE_FILE_LOCK_EX, &held)
: CBM_PRIVATE_FILE_LOCK_IO;
const time_t stale = 1000000000;
struct timespec stale_times[2] = {{.tv_sec = stale}, {.tv_sec = stale}};
bool aged = acquired == CBM_PRIVATE_FILE_LOCK_OK &&
futimens(cbm_private_file_lock_native_fd_for_test(held), stale_times) == 0;
cbm_private_file_lock_status_t linked_touch =
aged ? cbm_private_file_lock_touch(held) : CBM_PRIVATE_FILE_LOCK_IO;
struct stat refreshed = {0};
bool refreshed_ok = linked_touch == CBM_PRIVATE_FILE_LOCK_OK && stat(path, &refreshed) == 0;
bool unlinked = refreshed_ok && unlink(path) == 0;
cbm_private_file_lock_status_t unlinked_touch =
unlinked ? cbm_private_file_lock_touch(held) : CBM_PRIVATE_FILE_LOCK_IO;
/* The hazard itself: with the path gone, a peer's EX succeeds while the
* original holder still believes it is exclusive. */
cbm_private_file_lock_status_t successor_status =
unlinked ? cbm_private_file_lock_try_acquire(fixture.directory, "touch.lock",
CBM_PRIVATE_FILE_LOCK_EX, &successor)
: CBM_PRIVATE_FILE_LOCK_IO;
if (successor) {
(void)cbm_private_file_lock_release(&successor);
}
if (held) {
(void)cbm_private_file_lock_release(&held);
}
private_lock_fixture_finish(&fixture);
ASSERT_TRUE(started);
ASSERT_EQ(acquired, CBM_PRIVATE_FILE_LOCK_OK);
ASSERT_TRUE(aged);
ASSERT_EQ(linked_touch, CBM_PRIVATE_FILE_LOCK_OK);
ASSERT_TRUE(refreshed_ok);
ASSERT_TRUE(refreshed.st_atime > stale);
ASSERT_TRUE(refreshed.st_mtime > stale);
ASSERT_TRUE(unlinked);
ASSERT_EQ(unlinked_touch, CBM_PRIVATE_FILE_LOCK_UNSAFE);
ASSERT_EQ(successor_status, CBM_PRIVATE_FILE_LOCK_OK);
PASS();
#endif
}
/* A rename-away keeps the held inode linked (st_nlink stays 1) while the
* canonical path no longer names it, so a peer would create and lock a fresh
* file there. Touch must compare the path with the handle, not just count
* links. */
TEST(private_file_lock_touch_detects_rename_away) {
#ifdef _WIN32
SKIP_PLATFORM("renaming a held lock file away is POSIX behavior");
#else
private_lock_fixture_t fixture;
bool started = private_lock_fixture_start(&fixture);
char path[PRIVATE_LOCK_TEST_PATH_CAP];
char moved[PRIVATE_LOCK_TEST_PATH_CAP];
bool paths_ok = started && private_lock_path(path, &fixture, "touch-rename.lock") &&
private_lock_path(moved, &fixture, "touch-renamed.lock");
cbm_private_file_lock_t *held = NULL;
cbm_private_file_lock_status_t acquired =
paths_ok ? cbm_private_file_lock_try_acquire(fixture.directory, "touch-rename.lock",
CBM_PRIVATE_FILE_LOCK_EX, &held)
: CBM_PRIVATE_FILE_LOCK_IO;
cbm_private_file_lock_status_t intact_touch = acquired == CBM_PRIVATE_FILE_LOCK_OK
? cbm_private_file_lock_touch(held)
: CBM_PRIVATE_FILE_LOCK_IO;
bool renamed = intact_touch == CBM_PRIVATE_FILE_LOCK_OK && rename(path, moved) == 0;
struct stat moved_status = {0};
bool still_linked = renamed && stat(moved, &moved_status) == 0 && moved_status.st_nlink == 1;
cbm_private_file_lock_status_t renamed_touch =
renamed ? cbm_private_file_lock_touch(held) : CBM_PRIVATE_FILE_LOCK_IO;
if (held) {
(void)cbm_private_file_lock_release(&held);
}
private_lock_fixture_finish(&fixture);
ASSERT_TRUE(started);
ASSERT_EQ(acquired, CBM_PRIVATE_FILE_LOCK_OK);
ASSERT_EQ(intact_touch, CBM_PRIVATE_FILE_LOCK_OK);
ASSERT_TRUE(renamed);
ASSERT_TRUE(still_linked);
ASSERT_EQ(renamed_touch, CBM_PRIVATE_FILE_LOCK_UNSAFE);
PASS();
#endif
}
TEST(private_file_lock_post_acquire_failure_returns_cleanup_owner) {
private_lock_fixture_t fixture;
bool started = private_lock_fixture_start(&fixture);
@@ -863,6 +967,8 @@ SUITE(private_file_lock) {
RUN_TEST(private_file_lock_unlock_failure_retains_retryable_lock);
RUN_TEST(private_file_lock_close_failure_retries_without_duplicate_unlock);
RUN_TEST(private_file_lock_consumed_close_error_never_retries_recycled_fd);
RUN_TEST(private_file_lock_touch_refreshes_held_file_and_detects_unlink);
RUN_TEST(private_file_lock_touch_detects_rename_away);
RUN_TEST(private_file_lock_post_acquire_failure_returns_cleanup_owner);
RUN_TEST(private_file_lock_windows_lock_attempt_failure_returns_cleanup_owner);
RUN_TEST(private_file_lock_rejects_unsafe_entries_and_replaced_root);
tests/test_py_lsp.c
+52
View File
@@ -2045,6 +2045,56 @@ TEST(pylsp_lambda_rewalk_dedupes_dunder_occurrence) {
PASS();
}
/* A lambda body is also re-walked for calls made inside another lambda's
* re-walk, so a lambda that reaches itself again (directly or through another
* lambda) was re-walked once per nesting level until the walk-depth cap. With
* two such calls in one body the work doubled per level, and a two-line
* `fib = lambda n: fib(n - 1) + fib(n - 2)` drove extraction to many GB. A
* lambda already being re-walked must not be re-entered, so each helper()
* site below resolves once. The recursion here is linear, so without the
* guard this stays small and fails the count instead of exhausting memory. */
TEST(pylsp_recursive_lambda_rewalk_is_bounded) {
CBMFileResult *r = extract_py("def helper():\n"
" return 0\n"
"count = lambda n: helper() if n == 0 else count(n - 1)\n"
"even = lambda n: helper() if n == 0 else odd(n - 1)\n"
"odd = lambda n: even(n - 1)\n"
"count(3)\n"
"even(4)\n");
ASSERT_NOT_NULL(r);
ASSERT_FALSE(r->has_error || r->parse_incomplete);
int helper_resolutions = 0;
for (int i = 0; i < r->resolved_calls.count; i++) {
const CBMResolvedCall *rc = &r->resolved_calls.items[i];
if (rc->callee_qn && strstr(rc->callee_qn, ".helper"))
helper_resolutions++;
}
ASSERT_EQ(helper_resolutions, 2);
cbm_free_result(r);
PASS();
}
/* The re-walk guard is released after each walk, so a later call to the same
* lambda still binds its own argument type: both A.m and B.m resolve. */
TEST(pylsp_lambda_rewalk_guard_released_between_calls) {
CBMFileResult *r = extract_py("class A:\n"
" def m(self):\n"
" return 1\n"
"class B:\n"
" def m(self):\n"
" return 2\n"
"call_m = lambda x: x.m()\n"
"call_m(A())\n"
"call_m(B())\n");
ASSERT_NOT_NULL(r);
ASSERT_GTE(require_resolved(r, "<lambda>", ".A.m"), 0);
ASSERT_GTE(require_resolved(r, "<lambda>", ".B.m"), 0);
cbm_free_result(r);
PASS();
}
/* Parser-backed Python calls have the same occurrence-identity requirement as
* synthetic dunders. Distinct typed receivers can expose the same method leaf
* in one caller; each CBMCall must join the semantic record for its own site. */
@@ -4885,6 +4935,8 @@ SUITE(py_lsp) {
RUN_TEST(pylsp_round5_super_init);
RUN_TEST(pylsp_dunder_same_leaf_occurrences_join_by_exact_site);
RUN_TEST(pylsp_lambda_rewalk_dedupes_dunder_occurrence);
RUN_TEST(pylsp_recursive_lambda_rewalk_is_bounded);
RUN_TEST(pylsp_lambda_rewalk_guard_released_between_calls);
RUN_TEST(pylsp_ordinary_same_leaf_calls_join_by_exact_site);
/* Round 6 — generators, dataclasses, properties */
RUN_TEST(pylsp_round6_generator_yields_iterable);
tests/test_sqlite_writer.c
+13
View File
@@ -996,6 +996,18 @@ TEST(sw_publish_preserves_live_reader) {
/* ── Suite ─────────────────────────────────────────────────────── */
TEST(sw_page_offsets_do_not_wrap_past_4gib) {
/* A 32-bit long offset wraps negative at 2 GiB and back to 0 at 4 GiB: on
* Windows a staging DB stopped at exactly 4 GiB with its first pages
* overwritten, and publish failed with persist_failed (#2399). */
ASSERT_EQ(cbm_writer_page_offset(1), 0);
ASSERT_EQ(cbm_writer_page_offset(2), 65536);
ASSERT_EQ(cbm_writer_page_offset(32769), INT64_C(2147483648));
ASSERT_EQ(cbm_writer_page_offset(65537), INT64_C(4294967296));
ASSERT_EQ(cbm_writer_page_offset(UINT32_MAX), (int64_t)(UINT32_MAX - 1) * 65536);
PASS();
}
TEST(sw_open_truncated_path_names_its_reason) {
/* final_path is a fixed 4K buffer and make_writer_temp_path only fails by
* truncation. Neither sets an errno of its own, so without naming one the
@@ -1065,6 +1077,7 @@ SUITE(sqlite_writer) {
RUN_TEST(sw_publish_failure_preserves_destination_sidecars);
RUN_TEST(sw_publish_supports_non_ascii_path);
RUN_TEST(sw_publish_preserves_live_reader);
RUN_TEST(sw_page_offsets_do_not_wrap_past_4gib);
RUN_TEST(sw_open_truncated_path_names_its_reason);
RUN_TEST(sw_publish_failure_reports_the_rename_not_the_cleanup);
}
tests/test_ui.c
+50
View File
@@ -635,6 +635,30 @@ TEST(layout_dead_code_classification) {
.qualified_name = "dc::exportedfn",
.file_path = "src/d.c",
.properties_json = "{\"is_exported\":true}"};
cbm_node_t framework = {.project = "dc",
.label = "Function",
.name = "frameworkfn",
.qualified_name = "dc::frameworkfn",
.file_path = "src/routes.c",
.properties_json = "{}"};
cbm_node_t route = {.project = "dc",
.label = "Route",
.name = "GET /framework",
.qualified_name = "dc::route",
.file_path = "src/routes.c",
.properties_json = "{}"};
cbm_node_t unrelated = {.project = "dc",
.label = "Class",
.name = "UnrelatedTarget",
.qualified_name = "dc::unrelated",
.file_path = "src/routes.c",
.properties_json = "{}"};
cbm_node_t nonroute = {.project = "dc",
.label = "Function",
.name = "nonroutefn",
.qualified_name = "dc::nonroutefn",
.file_path = "src/routes.c",
.properties_json = "{}"};
cbm_node_t single = {.project = "dc",
.label = "Function",
.name = "calledonce",
@@ -666,6 +690,14 @@ TEST(layout_dead_code_classification) {
cbm_store_upsert_node(store, &tst);
cbm_store_upsert_node(store, &tstpath);
cbm_store_upsert_node(store, &exp);
int64_t id_framework = cbm_store_upsert_node(store, &framework);
int64_t id_route = cbm_store_upsert_node(store, &route);
int64_t id_unrelated = cbm_store_upsert_node(store, &unrelated);
int64_t id_nonroute = cbm_store_upsert_node(store, &nonroute);
ASSERT_GT(id_framework, 0);
ASSERT_GT(id_route, 0);
ASSERT_GT(id_unrelated, 0);
ASSERT_GT(id_nonroute, 0);
int64_t id_single = cbm_store_upsert_node(store, &single);
int64_t id_norm = cbm_store_upsert_node(store, &norm);
int64_t id_caller = cbm_store_upsert_node(store, &caller);
@@ -678,9 +710,15 @@ TEST(layout_dead_code_classification) {
cbm_edge_t e2 = {
.project = "dc", .source_id = id_caller, .target_id = id_norm, .type = "CALLS"};
cbm_edge_t e3 = {.project = "dc", .source_id = id_dead, .target_id = id_norm, .type = "CALLS"};
cbm_edge_t framework_route = {
.project = "dc", .source_id = id_framework, .target_id = id_route, .type = "HANDLES"};
cbm_edge_t framework_unrelated = {
.project = "dc", .source_id = id_nonroute, .target_id = id_unrelated, .type = "HANDLES"};
cbm_store_insert_edge(store, &e1);
cbm_store_insert_edge(store, &e2);
cbm_store_insert_edge(store, &e3);
ASSERT_GT(cbm_store_insert_edge(store, &framework_route), 0);
ASSERT_GT(cbm_store_insert_edge(store, &framework_unrelated), 0);
cbm_layout_result_t *r = cbm_layout_compute(store, "dc", CBM_LAYOUT_OVERVIEW, NULL, 0, 100);
ASSERT_NOT_NULL(r);
@@ -708,6 +746,18 @@ TEST(layout_dead_code_classification) {
ASSERT_NOT_NULL(ln);
ASSERT_STR_EQ(ln->status, "exported");
ln = find_layout_node(r, "frameworkfn");
ASSERT_NOT_NULL(ln);
ASSERT_STR_EQ(ln->status, "entry");
ln = find_layout_node(r, "nonroutefn");
ASSERT_NOT_NULL(ln);
ASSERT_STR_EQ(ln->status, "dead");
ln = find_layout_node(r, "GET /framework");
ASSERT_NOT_NULL(ln);
ASSERT_STR_EQ(ln->status, "structural");
ln = find_layout_node(r, "calledonce");
ASSERT_NOT_NULL(ln);
ASSERT_STR_EQ(ln->status, "single");
tests/test_version_cohort.c
+61
View File
@@ -22,6 +22,8 @@
#endif
#include <windows.h>
#else
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <unistd.h>
#endif
@@ -669,6 +671,64 @@ TEST(version_cohort_does_not_repurpose_daemon_startup_lock_for_lifetime) {
PASS();
}
/* #2178: a live daemon's lease holds only the lifetime file after admission
* (admission and maintenance are released), and its claim holds the marker.
* Touch must report both intact, then name each as lost once an age-based
* temp cleaner unlinks it, independently of the other. */
TEST(version_cohort_touch_reports_each_lost_file) {
#ifdef _WIN32
SKIP_PLATFORM("unlinking a held lock file is POSIX behavior");
#else
version_cohort_fixture_t fixture;
ASSERT_TRUE(version_cohort_fixture_start(&fixture, "touch"));
cbm_version_cohort_manager_t *manager = cbm_version_cohort_manager_new(fixture.endpoint);
ASSERT_NOT_NULL(manager);
cbm_daemon_build_identity_t identity = version_cohort_identity("1.0.0", VERSION_COHORT_BUILD_A);
cbm_daemon_conflict_t conflict;
cbm_version_cohort_lease_t *lease = NULL;
cbm_version_cohort_daemon_claim_t *claim = NULL;
ASSERT_EQ(
cbm_version_cohort_acquire(manager, &identity, cbm_now_ms() + 5000, &lease, &conflict),
CBM_VERSION_COHORT_OK);
ASSERT_EQ(cbm_version_cohort_daemon_claim_acquire(manager, &claim), CBM_VERSION_COHORT_OK);
const char *runtime_dir = cbm_daemon_ipc_endpoint_runtime_dir(fixture.endpoint);
char marker[VERSION_COHORT_TEST_PATH_CAP];
char lifetime[VERSION_COHORT_TEST_PATH_CAP];
ASSERT_TRUE(snprintf(marker, sizeof(marker), "%s/cbm-version-cohort-daemon-v1.lock",
runtime_dir) < (int)sizeof(marker));
ASSERT_TRUE(snprintf(lifetime, sizeof(lifetime), "%s/cbm-version-cohort-lifetime-v1.lock",
runtime_dir) < (int)sizeof(lifetime));
/* Age both held files the way a cleaner would see them, then prove the
* touch refreshed them through the held handles. */
const time_t stale = 1000000000;
struct timespec stale_times[2] = {{.tv_sec = stale}, {.tv_sec = stale}};
ASSERT_EQ(utimensat(AT_FDCWD, marker, stale_times, 0), 0);
ASSERT_EQ(utimensat(AT_FDCWD, lifetime, stale_times, 0), 0);
ASSERT_EQ(cbm_version_cohort_lease_touch(lease), CBM_VERSION_COHORT_OK);
ASSERT_EQ(cbm_version_cohort_daemon_claim_touch(claim), CBM_VERSION_COHORT_OK);
struct stat refreshed;
ASSERT_EQ(stat(marker, &refreshed), 0);
ASSERT_TRUE(refreshed.st_mtime > stale && refreshed.st_atime > stale);
ASSERT_EQ(stat(lifetime, &refreshed), 0);
ASSERT_TRUE(refreshed.st_mtime > stale && refreshed.st_atime > stale);
ASSERT_EQ(unlink(marker), 0);
ASSERT_EQ(cbm_version_cohort_daemon_claim_touch(claim), CBM_VERSION_COHORT_UNSAFE);
ASSERT_EQ(cbm_version_cohort_lease_touch(lease), CBM_VERSION_COHORT_OK);
ASSERT_EQ(unlink(lifetime), 0);
ASSERT_EQ(cbm_version_cohort_lease_touch(lease), CBM_VERSION_COHORT_UNSAFE);
ASSERT_EQ(cbm_version_cohort_daemon_claim_release(&claim), CBM_PRIVATE_FILE_LOCK_OK);
version_cohort_release(&lease);
version_cohort_manager_close(&manager);
version_cohort_fixture_finish(&fixture);
PASS();
#endif
}
TEST(version_cohort_distinguishes_coordinated_daemon_without_connecting) {
version_cohort_fixture_t fixture;
ASSERT_TRUE(version_cohort_fixture_start(&fixture, "daemon-marker"));
@@ -1034,6 +1094,7 @@ SUITE(version_cohort) {
RUN_TEST(version_cohort_mutation_waits_for_every_lifetime_participant);
RUN_TEST(version_cohort_mutation_timeout_releases_all_guards);
RUN_TEST(version_cohort_does_not_repurpose_daemon_startup_lock_for_lifetime);
RUN_TEST(version_cohort_touch_reports_each_lost_file);
RUN_TEST(version_cohort_distinguishes_coordinated_daemon_without_connecting);
RUN_TEST(version_cohort_transition_presence_is_authoritative_and_marker_checked);
RUN_TEST(version_cohort_transition_shutdown_order_has_no_false_conflict);
tests/test_windows_bundle_contract.sh
+26
View File
@@ -335,6 +335,32 @@ for relative, needles in exact_archive_guards.items():
"allowlist",
)
# install.ps1 reports two different archive failures differently (#1218). A
# checksum-verified archive whose root file set differs from the allowlist is a
# release/installer version skew, not tampering, and must say so; a hostile
# entry (unsafe path, duplicate or case conflict) stays "unsafe". Both exit 1.
# The layout verdict may only be reached after EVERY entry cleared the hostile
# checks, or an unexpected entry listed first would mask a later "../" entry.
installer_archive = read("install.ps1")
require(
"unsafe or incomplete release archive" not in installer_archive
and "error: unsafe release archive: " in installer_archive
and "error: release archive layout does not match this installer: " in installer_archive,
"install.ps1 must report a checksum-verified layout mismatch separately from an unsafe "
"archive (#1218)",
)
hostile_last = max(
installer_archive.find('throw "unsafe zip entry path:'),
installer_archive.find('throw "duplicate or case-conflicting zip entry:'),
)
layout_verdict = installer_archive.find("$LayoutMismatch = $true")
require(
hostile_last != -1 and layout_verdict > hostile_last
and installer_archive.count("$LayoutMismatch = $true") == 1,
"install.ps1 must screen every zip entry for unsafe paths and duplicates before it "
"classifies an archive as a layout mismatch (#1218)",
)
# A portable mutation refusal must point to the owning package manager.
guidance_contracts = {
"pkg/npm/bin.js": (