golem15/msd-core
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1142 from medhatgalal/AI/fix-codex-markerless-gsd-merge

Browse Source 
Fix duplicate Codex GSD agent blocks without marker
This commit is contained in:
Tom Boucher
2026-03-19 12:11:48 -04:00
committed by GitHub
parent 62a1d5186f 10294128c9
commit 1f2e17923a
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bin/install.js
View File

@@ -1002,6 +1002,10 @@ function generateCodexConfigBlock(agents) {
return lines.join('\n');
}
function stripCodexGsdAgentSections(content) {
return content.replace(/^\[agents\.gsd-[^\]]+\]\n(?:(?!\[)[^\n]*\n?)*/gm, '');
}
/**
* Strip GSD sections from Codex config.toml content.
* Returns cleaned content, or null if file would be empty.
@@ -1027,7 +1031,7 @@ function stripGsdFromCodexConfig(content) {
cleaned = cleaned.replace(/^default_mode_request_user_input\s*=\s*true\s*\n?/m, '');
// Remove [agents.gsd-*] sections (from header to next section or EOF)
cleaned = cleaned.replace(/^\[agents\.gsd-[^\]]+\]\n(?:(?!\[)[^\n]*\n?)*/gm, '');
cleaned = stripCodexGsdAgentSections(cleaned);
// Remove [features] section if now empty (only header, no keys before next section)
cleaned = cleaned.replace(/^\[features\]\s*\n(?=\[|$)/m, '');
@@ -1061,7 +1065,7 @@ function mergeCodexConfig(configPath, gsdBlock) {
let before = existing.substring(0, markerIndex).trimEnd();
if (before) {
// Strip any GSD-managed sections that leaked above the marker from previous installs
before = before.replace(/^\[agents\.gsd-[^\]]+\]\n(?:(?!\[)[^\n]*\n?)*/gm, '');
before = stripCodexGsdAgentSections(before);
before = before.replace(/^\[agents\]\n(?:(?!\[)[^\n]*\n?)*/m, '');
before = before.replace(/\n{3,}/g, '\n\n').trimEnd();
@@ -1074,7 +1078,14 @@ function mergeCodexConfig(configPath, gsdBlock) {
// Case 3: No marker — append GSD block
let content = existing;
content = content.trimEnd() + '\n\n' + gsdBlock + '\n';
content = stripCodexGsdAgentSections(content);
content = content.replace(/\n{3,}/g, '\n\n').trimEnd();
if (content) {
content = content + '\n\n' + gsdBlock + '\n';
} else {
content = gsdBlock + '\n';
}
fs.writeFileSync(configPath, content);
}