fix(setup): keep Codex TOML comments when adding or removing REA
Setup and uninstall rewrote the whole Codex config.toml with a fresh TOML serializer, which dropped every comment and respelled unrelated values, although the plan promises to preserve unrelated configuration. Grok Build already edited only REA's server tables. Share that table editor with Codex, without Grok's root disabled_mcp_servers handling, keep the original final line break, and fall back to the full rewrite only when the edited text would not parse to the requested document. Fixes #1163 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
de5bfec79f
commit
e9c48a61e4
@@ -1,8 +1,11 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import { parse as parseToml } from "smol-toml";
|
||||
|
||||
import {
|
||||
clientConfigurationServersKey,
|
||||
parseClientConfiguration,
|
||||
serializeClientConfiguration,
|
||||
} from "./ClientConfigurationDocument.js";
|
||||
|
||||
describe("JSON client configuration BOM handling", () => {
|
||||
@@ -40,3 +43,55 @@ describe("TOML client configuration BOM handling", () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("Codex TOML serialization", () => {
|
||||
const unrelated = [
|
||||
"# Keep this explanation.",
|
||||
'notify = ["a", "b"]',
|
||||
"literal = 'C:\\demo\\path'",
|
||||
"",
|
||||
].join("\n");
|
||||
const rea = { command: "npx", args: ["-y", "rea-agents@6.1.0", "mcp"] };
|
||||
const registered = `${unrelated}\n[mcp_servers.rea]\ncommand = "npx"\nargs = ["-y", "rea-agents@6.1.0", "mcp"]\n`;
|
||||
const documentOf = (text: string): Record<string, unknown> =>
|
||||
parseClientConfiguration(text, "toml").document;
|
||||
const serialize = (document: Record<string, unknown>, original: string) =>
|
||||
serializeClientConfiguration(document, "toml", original, [
|
||||
["mcp_servers", "rea"],
|
||||
]);
|
||||
|
||||
it("adds REA's table without rewriting comments or unrelated values", () => {
|
||||
const document = { ...documentOf(unrelated), mcp_servers: { rea } };
|
||||
const written = serialize(document, unrelated);
|
||||
|
||||
expect(written.startsWith(unrelated)).toBe(true);
|
||||
expect(parseToml(written)).toEqual(document);
|
||||
});
|
||||
|
||||
it("removes REA's table and leaves the rest of the file byte for byte", () => {
|
||||
const document = { ...documentOf(registered), mcp_servers: {} };
|
||||
|
||||
expect(serialize(document, registered)).toBe(unrelated);
|
||||
});
|
||||
|
||||
it("leaves a root disabled_mcp_servers list, which Codex does not read", () => {
|
||||
const original = `# Codex ignores this list.\ndisabled_mcp_servers = ["rea"]\n`;
|
||||
const document = { ...documentOf(original), mcp_servers: { rea } };
|
||||
const written = serialize(document, original);
|
||||
|
||||
expect(written.startsWith(original)).toBe(true);
|
||||
expect(parseToml(written)).toEqual(document);
|
||||
});
|
||||
|
||||
it("rewrites the document when an edit would not hold the requested values", () => {
|
||||
const document = {
|
||||
...documentOf(unrelated),
|
||||
notify: ["changed"],
|
||||
mcp_servers: { rea },
|
||||
};
|
||||
const written = serialize(document, unrelated);
|
||||
|
||||
expect(written).not.toContain("# Keep this explanation.");
|
||||
expect(parseToml(written)).toEqual(document);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user