Skip to content

Commit f277034

Browse files
committed
fix(yaml): accept empty flow mappings in mapping bodies
Signed-off-by: pcristin <xxxokzxxx@protonmail.com>
1 parent 49d928b commit f277034

2 files changed

Lines changed: 120 additions & 3 deletions

File tree

‎src/cli/config_yaml_edit.c‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,8 +1266,8 @@ static int yaml_find_comment(const char *data, size_t start, size_t end, size_t
12661266
* The test is positional and deliberately conservative: an indicator is only
12671267
* honoured as one when nothing has appeared before it in the value. `key: *a`
12681268
* is still an alias and still refused; `key: 2 * 3` and `key: a*b` are text.
1269-
* `{`/`}` keep their existing treatment — empty flow mappings are a separate
1270-
* change with its own semantics. */
1269+
* `{`/`}` keep their existing treatment here; mapping-body validation admits
1270+
* exact empty flow mappings through a context-specific exception. */
12711271
static int yaml_range_has_unsupported(const char *data, size_t start, size_t end) {
12721272
char quote = '\0';
12731273
/* Last significant character seen, so an indicator can be judged by what
@@ -1387,6 +1387,19 @@ static int yaml_tail_is_explicit_empty_mapping(const char *data, size_t colon, s
13871387
return 0;
13881388
}
13891389

1390+
static int yaml_mapping_body_line_has_unsupported(const yaml_doc_t *doc, const yaml_line_t *line) {
1391+
size_t start = line->start + line->indent;
1392+
size_t colon = 0U;
1393+
bool empty_mapping = false;
1394+
if (yaml_find_mapping_colon(doc->data, start, line->text_end, &colon) == 0 &&
1395+
yaml_tail_is_explicit_empty_mapping(doc->data, colon, line->text_end, &empty_mapping) ==
1396+
0 &&
1397+
empty_mapping) {
1398+
return yaml_range_has_unsupported(doc->data, start, colon + YAML_UNIT);
1399+
}
1400+
return yaml_range_has_unsupported(doc->data, start, line->text_end);
1401+
}
1402+
13901403
static int yaml_value_starts_multiline(const char *data, size_t colon, size_t end) {
13911404
size_t pos = yaml_skip_spaces(data, colon + YAML_UNIT, end);
13921405
return pos < end && (data[pos] == '|' || data[pos] == '>');
@@ -1404,7 +1417,7 @@ static int yaml_validate_mapping_body(const yaml_doc_t *doc, size_t first_line,
14041417
continue;
14051418
}
14061419
if (line->indent < YAML_ENTRY_INDENT || (line->indent & YAML_UNIT) != 0U ||
1407-
yaml_range_has_unsupported(doc->data, line->start + line->indent, line->text_end)) {
1420+
yaml_mapping_body_line_has_unsupported(doc, line)) {
14081421
return YAML_ERROR;
14091422
}
14101423
size_t colon = 0U;

‎tests/test_config_yaml_edit.c‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,107 @@ TEST(config_yaml_edit_goose_extensions_preserve_siblings) {
812812
PASS();
813813
}
814814

815+
TEST(config_yaml_edit_goose_accepts_empty_flow_mapping_in_sibling_issue1673) {
816+
const char *initial = "extensions:\n"
817+
" demo:\n"
818+
" enabled: true\n"
819+
" type: stdio\n"
820+
" cmd: /bin/true\n"
821+
" args:\n"
822+
" - --serve\n"
823+
" envs: {}\n"
824+
" env_keys: []\n"
825+
" timeout: 300\n"
826+
"GOOSE_THINKING_EFFORT: max\n";
827+
const char *block = " type: stdio\n"
828+
" cmd: \"/opt/codebase-memory-mcp\"\n"
829+
" args: []\n"
830+
" enabled: true\n";
831+
const char *expected = "extensions:\n"
832+
" demo:\n"
833+
" enabled: true\n"
834+
" type: stdio\n"
835+
" cmd: /bin/true\n"
836+
" args:\n"
837+
" - --serve\n"
838+
" envs: {}\n"
839+
" env_keys: []\n"
840+
" timeout: 300\n"
841+
" codebase-memory-mcp:\n"
842+
" type: stdio\n"
843+
" cmd: \"/opt/codebase-memory-mcp\"\n"
844+
" args: []\n"
845+
" enabled: true\n"
846+
"GOOSE_THINKING_EFFORT: max\n";
847+
yaml_fixture_t fixture;
848+
ASSERT_EQ(yaml_fixture_init(&fixture, initial), 0);
849+
850+
ASSERT_EQ(cbm_yaml_upsert_owned_mapping_entry(fixture.path, "extensions", "codebase-memory-mcp",
851+
block),
852+
CBM_YAML_IDENTITY_EDIT_OK);
853+
char *installed = yaml_read_alloc(fixture.path);
854+
ASSERT_NOT_NULL(installed);
855+
ASSERT_STR_EQ(installed, expected);
856+
857+
free(installed);
858+
th_cleanup(fixture.dir);
859+
PASS();
860+
}
861+
862+
TEST(config_yaml_edit_goose_still_rejects_nonempty_flow_mapping_issue1673) {
863+
const char *initial = "extensions:\n"
864+
" demo:\n"
865+
" enabled: true\n"
866+
" type: stdio\n"
867+
" cmd: /bin/true\n"
868+
" args: []\n"
869+
" envs: {FOO: bar}\n"
870+
" env_keys: []\n"
871+
" timeout: 300\n";
872+
const char *block = " type: stdio\n"
873+
" cmd: \"/opt/codebase-memory-mcp\"\n"
874+
" args: []\n"
875+
" enabled: true\n";
876+
yaml_fixture_t fixture;
877+
ASSERT_EQ(yaml_fixture_init(&fixture, initial), 0);
878+
879+
ASSERT_EQ(cbm_yaml_upsert_owned_mapping_entry(fixture.path, "extensions", "codebase-memory-mcp",
880+
block),
881+
CBM_YAML_IDENTITY_EDIT_ERROR);
882+
char *unchanged = yaml_read_alloc(fixture.path);
883+
ASSERT_NOT_NULL(unchanged);
884+
ASSERT_STR_EQ(unchanged, initial);
885+
886+
free(unchanged);
887+
th_cleanup(fixture.dir);
888+
PASS();
889+
}
890+
891+
TEST(config_yaml_edit_goose_still_rejects_merge_key_with_empty_mapping_issue1673) {
892+
const char *initial = "extensions:\n"
893+
" demo:\n"
894+
" type: stdio\n"
895+
" cmd: /bin/true\n"
896+
" <<: {}\n";
897+
const char *block = " type: stdio\n"
898+
" cmd: \"/opt/codebase-memory-mcp\"\n"
899+
" args: []\n"
900+
" enabled: true\n";
901+
yaml_fixture_t fixture;
902+
ASSERT_EQ(yaml_fixture_init(&fixture, initial), 0);
903+
904+
ASSERT_EQ(cbm_yaml_upsert_owned_mapping_entry(fixture.path, "extensions", "codebase-memory-mcp",
905+
block),
906+
CBM_YAML_IDENTITY_EDIT_ERROR);
907+
char *unchanged = yaml_read_alloc(fixture.path);
908+
ASSERT_NOT_NULL(unchanged);
909+
ASSERT_STR_EQ(unchanged, initial);
910+
911+
free(unchanged);
912+
th_cleanup(fixture.dir);
913+
PASS();
914+
}
915+
815916
TEST(config_yaml_edit_owned_agent_mapping_installs_idempotently_and_removes_exact_state) {
816917
struct owned_mapping_case {
817918
const char *section;
@@ -1592,6 +1693,9 @@ SUITE(config_yaml_edit) {
15921693
RUN_TEST(config_yaml_edit_hermes_mapping_lifecycle);
15931694
RUN_TEST(config_yaml_edit_hermes_creates_missing_section);
15941695
RUN_TEST(config_yaml_edit_goose_extensions_preserve_siblings);
1696+
RUN_TEST(config_yaml_edit_goose_accepts_empty_flow_mapping_in_sibling_issue1673);
1697+
RUN_TEST(config_yaml_edit_goose_still_rejects_nonempty_flow_mapping_issue1673);
1698+
RUN_TEST(config_yaml_edit_goose_still_rejects_merge_key_with_empty_mapping_issue1673);
15951699
RUN_TEST(config_yaml_edit_owned_agent_mapping_installs_idempotently_and_removes_exact_state);
15961700
RUN_TEST(config_yaml_edit_owned_agent_mapping_preserves_foreign_same_name_state);
15971701
RUN_TEST(config_yaml_edit_mapping_remove_first_middle_last);

0 commit comments

Comments
 (0)