oh-my-codex 0.20.0 → 0.20.1

package/dist/config/generator.js

@@ -13,7 +13,6 @@ import { readFile, writeFile } from "fs/promises";
 import { existsSync } from "fs";
 import { join, resolve } from "path";
 import TOML from "@iarna/toml";
-import { AGENT_DEFINITIONS } from "../agents/definitions.js";
 import { DEFAULT_FRONTIER_MODEL } from "./models.js";
 import { DEFAULT_CODEX_HOOK_FEATURE_FLAG, CODEX_HOOK_FEATURE_FLAGS, CODEX_PLUGIN_SCOPED_HOOKS_FEATURE_FLAG, formatCodexHookFeatureFlagLine, normalizeCodexHookFeatureFlag, } from "./codex-feature-flags.js";
 import { OMX_FIRST_PARTY_MCP_SERVER_NAMES, getOmxFirstPartySetupMcpServers, } from "./omx-first-party-mcp.js";
@@ -34,25 +33,65 @@ const OMX_TOP_LEVEL_KEYS = [
     "developer_instructions",
 ];
 export const DEFAULT_SETUP_MODEL = DEFAULT_FRONTIER_MODEL;
-export const DEFAULT_SETUP_MODEL_CONTEXT_WINDOW = 250000;
-export const DEFAULT_SETUP_MODEL_AUTO_COMPACT_TOKEN_LIMIT = 200000;
-export function getModelContextRecommendation(model) {
-    if (model !== DEFAULT_SETUP_MODEL)
-        return null;
-    return {
-        model,
-        modelContextWindow: DEFAULT_SETUP_MODEL_CONTEXT_WINDOW,
-        modelAutoCompactTokenLimit: DEFAULT_SETUP_MODEL_AUTO_COMPACT_TOKEN_LIMIT,
-    };
-}
+const LEGACY_SEEDED_MODEL_CONTEXT_WINDOW = 250000;
+const LEGACY_SEEDED_MODEL_AUTO_COMPACT_TOKEN_LIMIT = 200000;
 const OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER = "# oh-my-codex seeded behavioral defaults (uninstall removes unchanged defaults)";
 const OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER = "# End oh-my-codex seeded behavioral defaults";
 export const OMX_DEVELOPER_INSTRUCTIONS = "You have oh-my-codex installed. AGENTS.md is the orchestration brain and main control surface. Follow AGENTS.md for skill/keyword routing, $name workflow invocation, and role-specialized subagents; when spawning native subagents, set `agent_type` to an installed role and never omit it for OMX work. Use outcome-first, concise progress updates: state the target result, constraints, validation evidence, and stop condition before adding process detail. Native subagents live in .codex/agents and may handle independent parallel subtasks within one Codex session or team pane. Skills load from .codex/skills, not native-agent TOMLs. Treat installed prompts as narrower execution surfaces under AGENTS.md authority.";
 export const OMX_PLUGIN_DEVELOPER_INSTRUCTIONS = '<omx version="1">You have oh-my-codex installed through Codex plugin mode. AGENTS.md is the orchestration brain and main control surface. Follow AGENTS.md for skill/keyword routing and $name workflow invocation. When spawning native subagents, set `agent_type` to an installed role and never omit it for OMX work. Registered Codex plugin marketplace surfaces supply OMX workflows and plugin-scoped companion resources when the plugin is installed; native agent roles are installed as setup-owned Codex agent TOML files in plugin mode so agent_type routing works. User-installed skills may still live under ~/.codex/skills. Use outcome-first, concise progress updates: state the target result, constraints, validation evidence, and stop condition before adding process detail.</omx>';
 const SHARED_MCP_REGISTRY_MARKER = "oh-my-codex (OMX) Shared MCP Registry Sync";
 const SHARED_MCP_REGISTRY_END_MARKER = "# End oh-my-codex shared MCP registry sync";
-const OMX_AGENTS_MAX_THREADS = 6;
-const OMX_AGENTS_MAX_DEPTH = 2;
+const LEGACY_MULTI_AGENT_KEYS = [
+    "features.multi_agent",
+    "agents.max_threads",
+    "agents.max_depth",
+];
+const LEGACY_MULTI_AGENT_VALUES = {
+    "features.multi_agent": true,
+    "agents.max_threads": 6,
+    "agents.max_depth": 2,
+};
+export function analyzeLegacyMultiAgentConfig(configText) {
+    let parsed;
+    try {
+        parsed = TOML.parse(configText);
+    }
+    catch (error) {
+        const reasonCode = /duplicate|redefine|already defined/i.test(String(error))
+            ? "toml-duplicate-key"
+            : "toml-parse-error";
+        return {
+            assessments: Object.fromEntries(LEGACY_MULTI_AGENT_KEYS.map((key) => [
+                key,
+                { key, state: "invalid/duplicate", reasonCode },
+            ])),
+        };
+    }
+    return {
+        assessments: Object.fromEntries(LEGACY_MULTI_AGENT_KEYS.map((key) => {
+            const [table, entry] = key.split(".");
+            const value = isRecord(parsed[table]) ? parsed[table][entry] : undefined;
+            if (value === undefined) {
+                return [key, { key, state: "absent", reasonCode: "key-absent" }];
+            }
+            if (value === LEGACY_MULTI_AGENT_VALUES[key]) {
+                return [
+                    key,
+                    {
+                        key,
+                        state: "retained-legacy",
+                        reasonCode: "exact-legacy-value",
+                        value,
+                    },
+                ];
+            }
+            return [
+                key,
+                { key, state: "custom", reasonCode: "custom-value", value },
+            ];
+        })),
+    };
+}
 const OMX_EXPLORE_ROUTING_DEFAULT = "0";
 const OMX_EXPLORE_CMD_ENV = "USE_OMX_EXPLORE_CMD";
 const DEFAULT_LAUNCHER_MCP_STARTUP_TIMEOUT_SEC = 15;
@@ -343,71 +382,117 @@ function getOmxTopLevelLines(pkgRoot, existingConfig = "", modelOverride, notify
         `developer_instructions = "${escapeTomlString(OMX_DEVELOPER_INSTRUCTIONS)}"`,
     ];
     const existingModel = rootValues.get("model");
-    const existingContextWindow = rootValues.get("model_context_window");
-    const existingAutoCompact = rootValues.get("model_auto_compact_token_limit");
     const selectedModel = modelOverride ?? unwrapTomlString(existingModel) ?? DEFAULT_SETUP_MODEL;
     if (modelOverride || !existingModel) {
         lines.push(`model = "${selectedModel}"`);
     }
-    if (selectedModel === DEFAULT_SETUP_MODEL) {
-        const seededBehavioralDefaults = [];
-        if (!existingContextWindow) {
-            seededBehavioralDefaults.push(`model_context_window = ${DEFAULT_SETUP_MODEL_CONTEXT_WINDOW}`);
-        }
-        if (!existingAutoCompact) {
-            seededBehavioralDefaults.push(`model_auto_compact_token_limit = ${DEFAULT_SETUP_MODEL_AUTO_COMPACT_TOKEN_LIMIT}`);
-        }
-        if (seededBehavioralDefaults.length > 0) {
-            lines.push(OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER);
-            lines.push(...seededBehavioralDefaults);
-            lines.push(OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER);
-        }
-    }
     return lines;
 }
-function isUnchangedOmxSeededBehavioralDefaultsBlock(lines) {
-    const relevant = lines.filter((line) => {
-        const trimmed = line.trim();
-        return trimmed.length > 0 && !trimmed.startsWith("#");
-    });
-    if (relevant.length !== 2)
-        return false;
-    const parsed = parseRootKeyValues(relevant.join("\n"));
-    return (parsed.size === 2 &&
-        parsed.get("model_context_window") ===
-            String(DEFAULT_SETUP_MODEL_CONTEXT_WINDOW) &&
-        parsed.get("model_auto_compact_token_limit") ===
-            String(DEFAULT_SETUP_MODEL_AUTO_COMPACT_TOKEN_LIMIT));
+function sourceLines(config) {
+    const lines = [];
+    let start = 0;
+    for (let index = 0; index < config.length; index += 1) {
+        if (config[index] !== "\n")
+            continue;
+        lines.push({
+            content: config.slice(start, index - (index > start && config[index - 1] === "\r" ? 1 : 0)),
+            start,
+            end: index + 1,
+        });
+        start = index + 1;
+    }
+    if (start < config.length)
+        lines.push({ content: config.slice(start), start, end: config.length });
+    return lines;
 }
-export function stripOmxSeededBehavioralDefaults(config) {
-    const lines = config.split(/\r?\n/);
-    const firstTable = lines.findIndex((line) => /^\s*\[/.test(line));
-    const boundary = firstTable >= 0 ? firstTable : lines.length;
-    const result = [];
-    for (let index = 0; index < lines.length; index += 1) {
-        const trimmed = lines[index].trim();
-        if (index < boundary &&
-            trimmed === OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER) {
-            const endIndex = lines.findIndex((line, candidateIndex) => candidateIndex > index &&
-                candidateIndex < boundary &&
-                line.trim() === OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER);
-            if (endIndex < 0) {
-                continue;
-            }
-            const blockLines = lines.slice(index + 1, endIndex);
-            if (!isUnchangedOmxSeededBehavioralDefaultsBlock(blockLines)) {
-                result.push(...blockLines);
+function analyzeOmxSeededBehavioralDefaults(config) {
+    const lines = sourceLines(config);
+    const firstTable = lines.findIndex((line) => TOML_TABLE_HEADER_PATTERN.test(line.content));
+    const boundary = firstTable < 0 ? lines.length : firstTable;
+    const starts = lines.map((line, index) => ({ line, index }))
+        .filter(({ line }) => line.content === OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER);
+    const ends = lines.map((line, index) => ({ line, index }))
+        .filter(({ line }) => line.content === OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER);
+    if (starts.length === 0 && ends.length === 0)
+        return { state: "absent", spans: [] };
+    if (starts.length !== 1 || ends.length !== 1 || starts[0].index >= ends[0].index) {
+        return { state: "malformed-or-ambiguous", spans: [] };
+    }
+    const rootText = lines.slice(0, boundary).map((line) => line.content).join("\n");
+    let entryStart = 0;
+    const rootEntries = splitRootLevelEntries(rootText).entries.map((entry) => {
+        const indexed = { entry, start: entryStart, end: entryStart + entry.lines.length };
+        entryStart = indexed.end;
+        return indexed;
+    });
+    const isStandaloneRootMarker = (index) => index < boundary && rootEntries.some(({ entry, start, end }) => !entry.key && start === index && end === index + 1);
+    const start = starts[0];
+    const end = ends[0];
+    if (!isStandaloneRootMarker(start.index) || !isStandaloneRootMarker(end.index)) {
+        return { state: "malformed-or-ambiguous", spans: [] };
+    }
+    const block = lines.slice(start.index, end.index + 1);
+    const exact = (body) => block.length === body.length + 2 &&
+        block[0].content === OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER &&
+        block.at(-1)?.content === OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER &&
+        body.every((line, index) => block[index + 1].content === line);
+    const blockSpan = [{ start: start.line.start, end: end.line.end }];
+    const markerSpans = [
+        { start: start.line.start, end: start.line.end },
+        { start: end.line.start, end: end.line.end },
+    ];
+    if (exact([
+        `model_context_window = ${LEGACY_SEEDED_MODEL_CONTEXT_WINDOW}`,
+        `model_auto_compact_token_limit = ${LEGACY_SEEDED_MODEL_AUTO_COMPACT_TOKEN_LIMIT}`,
+    ])) {
+        const hasOutsideDuplicate = rootEntries.some(({ entry, start: entryStart, end: entryEnd }) => (entryEnd <= start.index || entryStart > end.index) &&
+            (entry.key === "model_context_window" || entry.key === "model_auto_compact_token_limit"));
+        return hasOutsideDuplicate
+            ? { state: "malformed-or-ambiguous", spans: [] }
+            : { state: "exact-pair", spans: blockSpan };
+    }
+    const singletonState = (singletonKey, siblingKey) => {
+        let singletonDuplicates = 0;
+        let siblingCount = 0;
+        let invalidSibling = false;
+        for (const { entry, start: entryStart, end: entryEnd } of rootEntries) {
+            const outside = entryEnd <= start.index || entryStart > end.index;
+            if (outside && entry.key === singletonKey)
+                singletonDuplicates += 1;
+            if (outside && entry.key === siblingKey) {
+                siblingCount += 1;
+                invalidSibling ||= !parseStandaloneToml(entry.lines.join("\n"));
             }
-            index = endIndex;
-            continue;
-        }
-        if (index < boundary &&
-            trimmed === OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER) {
-            continue;
         }
-        result.push(lines[index]);
-    }
-    return result.join("\n");
+        if (singletonDuplicates > 0 || siblingCount > 1 || invalidSibling)
+            return "malformed-or-ambiguous";
+        return siblingCount === 1 ? "exact" : "bounded-nonremovable";
+    };
+    if (exact([`model_context_window = ${LEGACY_SEEDED_MODEL_CONTEXT_WINDOW}`])) {
+        const state = singletonState("model_context_window", "model_auto_compact_token_limit");
+        return state === "exact"
+            ? { state: "exact-context-singleton", spans: blockSpan }
+            : state === "bounded-nonremovable"
+                ? { state, spans: markerSpans }
+                : { state, spans: [] };
+    }
+    if (exact([`model_auto_compact_token_limit = ${LEGACY_SEEDED_MODEL_AUTO_COMPACT_TOKEN_LIMIT}`])) {
+        const state = singletonState("model_auto_compact_token_limit", "model_context_window");
+        return state === "exact"
+            ? { state: "exact-auto-singleton", spans: blockSpan }
+            : state === "bounded-nonremovable"
+                ? { state, spans: markerSpans }
+                : { state, spans: [] };
+    }
+    return { state: "bounded-nonremovable", spans: markerSpans };
+}
+export function hasExactOmxSeededBehavioralDefaultsPair(config) {
+    return analyzeOmxSeededBehavioralDefaults(config).state === "exact-pair";
+}
+export function stripOmxSeededBehavioralDefaults(config) {
+    return [...analyzeOmxSeededBehavioralDefaults(config).spans]
+        .sort((left, right) => right.start - left.start)
+        .reduce((result, span) => result.slice(0, span.start) + result.slice(span.end), config);
 }
 function stripRootLevelKeys(config, keys) {
     const { entries, remainder } = splitRootLevelEntries(config);
@@ -511,7 +596,6 @@ function upsertFeatureFlags(config, codexHookFeatureFlag = DEFAULT_CODEX_HOOK_FE
         const base = config.trimEnd();
         const featureBlock = [
             "[features]",
-            "multi_agent = true",
             "child_agents_md = true",
             hookFeatureFlagLine,
             "goals = true",
@@ -529,31 +613,19 @@ function upsertFeatureFlags(config, codexHookFeatureFlag = DEFAULT_CODEX_HOOK_FE
             break;
         }
     }
-    // Remove deprecated 'collab' key (superseded by multi_agent) and
-    // the misspelled singular 'goal' flag written by unreleased PR builds.
+    // Remove deprecated collab and unreleased singular goal flags.
     for (let i = sectionEnd - 1; i > featuresStart; i--) {
         if (/^\s*(?:collab|goal)\s*=/.test(lines[i])) {
             lines.splice(i, 1);
             sectionEnd -= 1;
         }
     }
-    let multiAgentIdx = -1;
     let childAgentsIdx = -1;
     for (let i = featuresStart + 1; i < sectionEnd; i++) {
-        if (/^\s*multi_agent\s*=/.test(lines[i])) {
-            multiAgentIdx = i;
-        }
-        else if (/^\s*child_agents_md\s*=/.test(lines[i])) {
+        if (/^\s*child_agents_md\s*=/.test(lines[i])) {
             childAgentsIdx = i;
         }
     }
-    if (multiAgentIdx >= 0) {
-        lines[multiAgentIdx] = "multi_agent = true";
-    }
-    else {
-        lines.splice(sectionEnd, 0, "multi_agent = true");
-        sectionEnd += 1;
-    }
     if (childAgentsIdx >= 0) {
         lines[childAgentsIdx] = "child_agents_md = true";
     }
@@ -1015,52 +1087,12 @@ function upsertEnvSettings(config) {
     }
     return lines.join("\n");
 }
-function upsertAgentsSettings(config) {
-    const lines = config.split(/\r?\n/);
-    const agentsStart = lines.findIndex((line) => /^\s*\[agents\]\s*$/.test(line));
-    if (agentsStart < 0) {
-        const base = config.trimEnd();
-        const agentsBlock = [
-            "[agents]",
-            `max_threads = ${OMX_AGENTS_MAX_THREADS}`,
-            `max_depth = ${OMX_AGENTS_MAX_DEPTH}`,
-            "",
-        ].join("\n");
-        if (base.length === 0)
-            return agentsBlock;
-        return `${base}\n\n${agentsBlock}`;
-    }
-    let sectionEnd = lines.length;
-    for (let i = agentsStart + 1; i < lines.length; i++) {
-        if (/^\s*\[\[?[^\]]+\]?\]\s*$/.test(lines[i])) {
-            sectionEnd = i;
-            break;
-        }
-    }
-    let maxThreadsIdx = -1;
-    let maxDepthIdx = -1;
-    for (let i = agentsStart + 1; i < sectionEnd; i++) {
-        if (/^\s*max_threads\s*=/.test(lines[i])) {
-            maxThreadsIdx = i;
-        }
-        else if (/^\s*max_depth\s*=/.test(lines[i])) {
-            maxDepthIdx = i;
-        }
-    }
-    if (maxThreadsIdx < 0) {
-        lines.splice(sectionEnd, 0, `max_threads = ${OMX_AGENTS_MAX_THREADS}`);
-        sectionEnd += 1;
-    }
-    if (maxDepthIdx < 0) {
-        lines.splice(sectionEnd, 0, `max_depth = ${OMX_AGENTS_MAX_DEPTH}`);
-    }
-    return lines.join("\n");
-}
 /**
  * Remove OMX-owned feature flags from the [features] section.
+ * If `preserveMultiAgent` is set, retain multi_agent unchanged.
  * If the section becomes empty after removal, remove the section header too.
  */
-export function stripOmxFeatureFlags(config) {
+export function stripOmxFeatureFlags(config, options = {}) {
     const lines = config.split(/\r?\n/);
     const featuresStart = lines.findIndex((line) => /^\s*\[features\]\s*$/.test(line));
     if (featuresStart < 0)
@@ -1073,7 +1105,7 @@ export function stripOmxFeatureFlags(config) {
         }
     }
     const omxFlags = [
-        "multi_agent",
+        ...(options.preserveMultiAgent ? [] : ["multi_agent"]),
         "child_agents_md",
         "hooks",
         "codex_hooks",
@@ -1139,10 +1171,6 @@ export function stripOmxEnvSettings(config) {
 // ---------------------------------------------------------------------------
 // Orphaned OMX table sections (no marker block)
 // ---------------------------------------------------------------------------
-/**
- * Check whether a TOML table name belongs to a legacy OMX-managed agent entry.
- * Handles both `agents.name` and `agents."name"` forms.
- */
 function isOmxFirstPartyMcpSection(tableName) {
     const match = tableName.match(/^mcp_servers\.(?:"([^"]+)"|([A-Za-z0-9_-]+))$/);
     const name = match?.[1] ?? match?.[2];
@@ -1150,20 +1178,10 @@ function isOmxFirstPartyMcpSection(tableName) {
         (OMX_FIRST_PARTY_MCP_SERVER_NAMES.includes(name) ||
             name === "omx_team_run"));
 }
-function isLegacyOmxAgentSection(tableName) {
-    const m = tableName.match(/^agents\.(?:"([^"]+)"|(\w[\w-]*))$/);
-    if (!m)
-        return false;
-    const name = m[1] || m[2] || "";
-    return Object.prototype.hasOwnProperty.call(AGENT_DEFINITIONS, name);
-}
 /**
- * Strip OMX-owned table sections that exist outside the marker block.
+ * Strip first-party OMX MCP table sections that exist outside the marker block.
  * This covers legacy configs that were written before markers were added,
  * or configs where the marker was accidentally removed.
- *
- * Targets: exact first-party [mcp_servers.<name>] entries, retired
- * [mcp_servers.omx_team_run], and legacy [agents.<name>] entries.
  */
 function stripOrphanedOmxSections(config) {
     const lines = config.split(/\r?\n/);
@@ -1177,8 +1195,7 @@ function stripOrphanedOmxSections(config) {
             // Note: [tui] is NOT stripped here because it could be user-owned.
             // The marker-based stripExistingOmxBlocks already handles [tui]
             // when it lives inside the OMX marker block.
-            const isOmxSection = isOmxFirstPartyMcpSection(tableName) ||
-                isLegacyOmxAgentSection(tableName);
+            const isOmxSection = isOmxFirstPartyMcpSection(tableName);
             if (isOmxSection) {
                 // Remove preceding OMX comment lines and blank lines
                 while (result.length > 0) {
@@ -1726,13 +1743,13 @@ function getOmxTablesBlock(pkgRoot, includeTui = true, statusLinePreset = DEFAUL
  *
  * Layout:
  *   1. OMX top-level keys (notify, model_reasoning_effort, developer_instructions)
- *   2. [features] with multi_agent + child_agents_md + hooks + goals
+ *   2. [features] with child_agents_md + hooks + goals
  *   3. [shell_environment_policy.set] with defaulted deprecated explore-routing opt-out
  *   4. … user sections …
  *   5. OMX [table] sections (mcp_servers, tui)
  */
 export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
-    let existing = existingConfig;
+    let existing = stripOmxSeededBehavioralDefaults(existingConfig);
     const preservedFirstPartyMcpSections = options.preserveExistingFirstPartyMcp === true &&
         options.includeFirstPartyMcp !== true
         ? extractFirstPartyOmxMcpSections(existing)
@@ -1755,11 +1772,11 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
         !isOmxManagedNotifyCommand(getRootTomlArray(existing, "notify"), pkgRoot)
         ? getRootTomlArray(existing, "notify")
         : null;
-    existing = stripOmxTopLevelKeys(existing);
+    existing = stripOmxTopLevelKeys(existing).trimStart();
     if (userNotifyToPreserve) {
         existing = `${`notify = ${formatTomlStringArray(userNotifyToPreserve)}`}\n${existing.trimStart()}`;
     }
-    existing = stripOrphanedManagedNotify(existing, pkgRoot);
+    existing = stripOrphanedManagedNotify(existing, pkgRoot).trimStart();
     const managedTrustState = buildManagedCodexHookTrustStateForConfig(options.codexHooksFile, pkgRoot, {
         codexHomeDir: options.codexHomeDir,
         platform: options.hookCommandPlatform,
@@ -1777,7 +1794,6 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
     }
     existing = upsertFeatureFlags(existing, options.codexHookFeatureFlag);
     existing = upsertEnvSettings(existing);
-    existing = upsertAgentsSettings(existing);
     const tuiUpsert = includeTui
         ? upsertTuiStatusLine(existing, statusLinePreset, {
             forceStatusLinePreset: options.forceStatusLinePreset,
@@ -1792,11 +1808,12 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
         platform: options.hookCommandPlatform,
     }, options.includeFirstPartyMcp === true, hookTrustStrip.preservedConflictKeys);
     const sharedRegistryBlock = getSharedMcpRegistryBlock(options.sharedMcpServers ?? [], options.sharedMcpRegistrySource, existing);
-    let body = existing.trimEnd();
+    let body = existing.trim();
     if (sharedRegistryBlock) {
         body = body ? `${body}\n\n${sharedRegistryBlock}` : sharedRegistryBlock;
     }
-    return addDefaultLauncherMcpStartupTimeouts(topLines.join("\n") + "\n\n" + body + "\n" + tablesBlock);
+    const bodySeparator = body.length > 0 && !/^\s*\[/.test(body) ? "\n" : "\n\n";
+    return addDefaultLauncherMcpStartupTimeouts(topLines.join("\n") + bodySeparator + body + "\n" + tablesBlock);
 }
 /**
  * Detect and repair upgrade-era managed config incompatibilities in config.toml.