Skip to content

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

refactor(cli): share the managed-block read step with the ownership probe

Martin Vogel6bb7acdf3af4
diff --git a/src/cli/config_text_edit.c b/src/cli/config_text_edit.c
index d4e23e0a4..b89a20b94 100644
--- a/src/cli/config_text_edit.c
+++ b/src/cli/config_text_edit.c
@@ -1020,6 +1020,42 @@ static int text_validate_markers(const char *begin_marker, const char *end_marke
return TEXT_OK;
}
+/* A managed document as read from disk, with our block located in it. */
+typedef struct {
+ char *data;
+ size_t len;
+ size_t bom_len;
+ text_file_snapshot_t snapshot;
+ text_managed_region_t region;
+} text_managed_document_t;
+
+/* The read-validate-scan step shared by the upsert and the read-only ownership
+ * probe, so both judge a file by the same rules. An absent file reads as an
+ * empty document. On success the caller owns doc->data and releases it; on
+ * failure nothing is left allocated. */
+static int text_read_managed_document(const char *file_path, const char *begin_marker,
+ size_t begin_len, const char *end_marker, size_t end_len,
+ text_managed_document_t *doc) {
+ doc->data = NULL;
+ doc->len = 0U;
+ doc->bom_len = 0U;
+ int status = text_read_file(file_path, &doc->data, &doc->len, &doc->snapshot);
+ if (status == TEXT_OK) {
+ status = text_validate_bytes(doc->data, doc->len, 1);
+ }
+ if (status == TEXT_OK) {
+ doc->bom_len = text_bom_length(doc->data, doc->len);
+ status = text_scan_managed_region(doc->data, doc->len, doc->bom_len, begin_marker,
+ begin_len, end_marker, end_len, &doc->region);
+ }
+ if (status != TEXT_OK) {
+ free(doc->data);
+ doc->data = NULL;
+ return TEXT_ERROR;
+ }
+ return TEXT_OK;
+}
+
static int text_upsert_managed_block(const char *file_path, const char *begin_marker,
const char *end_marker, const char *owned_content,
size_t max_document_bytes) {
@@ -1036,21 +1072,17 @@ static int text_upsert_managed_block(const char *file_path, const char *begin_ma
return TEXT_ERROR;
}
- char *old_data = NULL;
- size_t old_len = 0U;
- text_file_snapshot_t snapshot;
- if (text_read_file(file_path, &old_data, &old_len, &snapshot) != TEXT_OK ||
- text_validate_bytes(old_data, old_len, 1) != TEXT_OK) {
- free(old_data);
- return TEXT_ERROR;
- }
- size_t bom_len = text_bom_length(old_data, old_len);
- text_managed_region_t region;
- if (text_scan_managed_region(old_data, old_len, bom_len, begin_marker, begin_len, end_marker,
- end_len, &region) != TEXT_OK) {
- free(old_data);
+ text_managed_document_t doc;
+ int read_status =
+ text_read_managed_document(file_path, begin_marker, begin_len, end_marker, end_len, &doc);
+ if (read_status != TEXT_OK) {
return TEXT_ERROR;
}
+ char *old_data = doc.data;
+ size_t old_len = doc.len;
+ size_t bom_len = doc.bom_len;
+ text_file_snapshot_t snapshot = doc.snapshot;
+ text_managed_region_t region = doc.region;
text_buffer_t updated = {0};
int result = TEXT_ERROR;
@@ -1113,33 +1145,23 @@ int cbm_text_managed_block_status(const char *file_path, const char *begin_marke
text_validate_markers(begin_marker, end_marker, &begin_len, &end_len) != TEXT_OK) {
return TEXT_ERROR;
}
- char *data = NULL;
- size_t len = 0U;
- text_file_snapshot_t snapshot;
- if (text_read_file(file_path, &data, &len, &snapshot) != TEXT_OK) {
- free(data);
+ text_managed_document_t doc;
+ int read_status =
+ text_read_managed_document(file_path, begin_marker, begin_len, end_marker, end_len, &doc);
+ if (read_status != TEXT_OK) {
return TEXT_ERROR;
}
int result = TEXT_OK;
- if (snapshot.exists && text_validate_bytes(data, len, 1) != TEXT_OK) {
- result = TEXT_ERROR;
- } else if (snapshot.exists) {
- size_t bom_len = text_bom_length(data, len);
- text_managed_region_t region;
- if (text_scan_managed_region(data, len, bom_len, begin_marker, begin_len, end_marker,
- end_len, &region) != TEXT_OK) {
- result = TEXT_ERROR;
- } else if (!region.present) {
- for (size_t pos = bom_len; pos < len; pos++) {
- char byte = data[pos];
- if (byte != ' ' && byte != '\t' && byte != '\r' && byte != '\n') {
- result = TEXT_UNOWNED;
- break;
- }
+ if (!doc.region.present) {
+ for (size_t pos = doc.bom_len; pos < doc.len; pos++) {
+ char byte = doc.data[pos];
+ if (byte != ' ' && byte != '\t' && byte != '\r' && byte != '\n') {
+ result = TEXT_UNOWNED;
+ break;
}
}
}
- free(data);
+ free(doc.data);
return result;
}