oh-my-codex 0.14.4 → 0.15.1

package/dist/config/codex-hooks.js

@@ -37,18 +37,13 @@ export function buildManagedCodexHooksConfig(pkgRoot) {
             PreToolUse: [
                 buildCommandHook(command, {
                     matcher: "Bash",
-                    statusMessage: "Running OMX Bash preflight",
                 }),
             ],
             PostToolUse: [
-                buildCommandHook(command, {
-                    statusMessage: "Running OMX tool review",
-                }),
+                buildCommandHook(command),
             ],
             UserPromptSubmit: [
-                buildCommandHook(command, {
-                    statusMessage: "Applying OMX prompt routing",
-                }),
+                buildCommandHook(command),
             ],
             Stop: [
                 buildCommandHook(command, {

package/dist/config/codex-hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-hooks.js","sourceRoot":"","sources":["../../src/config/codex-hooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-hooks.js","sourceRoot":"","sources":["../../src/config/codex-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,cAAc;IACd,YAAY;IACZ,aAAa;IACb,kBAAkB;IAClB,MAAM;CACE,CAAC;AAoBX,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,SAAS,CAAI,KAAQ;IAC5B,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAe,EACf,UAII,EAAE;IAEN,MAAM,IAAI,GAAG;QACX,IAAI,EAAE,SAAS;QACf,OAAO;QACP,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,CAAC,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7E,CAAC;IAEF,OAAO;QACL,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,KAAK,EAAE,CAAC,IAAI,CAAC;KACd,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,OAAe;IAEf,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,sBAAsB,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,SAAS,UAAU,GAAG,CAAC;IAEvC,OAAO;QACL,KAAK,EAAE;YACL,YAAY,EAAE;gBACZ,gBAAgB,CAAC,OAAO,EAAE;oBACxB,OAAO,EAAE,gBAAgB;iBAC1B,CAAC;aACH;YACD,UAAU,EAAE;gBACV,gBAAgB,CAAC,OAAO,EAAE;oBACxB,OAAO,EAAE,MAAM;iBAChB,CAAC;aACH;YACD,WAAW,EAAE;gBACX,gBAAgB,CAAC,OAAO,CAAC;aAC1B;YACD,gBAAgB,EAAE;gBAChB,gBAAgB,CAAC,OAAO,CAAC;aAC1B;YACD,IAAI,EAAE;gBACJ,gBAAgB,CAAC,OAAO,EAAE;oBACxB,OAAO,EAAE,EAAE;iBACZ,CAAC;aACH;SACF;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;QAC9C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;QAExC,OAAO;YACL,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC;YACvB,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;SAClE,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,OAAe;IAC9C,OAAO,8CAA8C,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAc;IAC9C,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACzD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACjC,OAAO,aAAa,CAAC,IAAI,CAAC;eACrB,IAAI,CAAC,IAAI,KAAK,SAAS;eACvB,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ;eAChC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC,MAAM,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,OAAe;IAEf,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QAC9C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACpD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;YACzB,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAc;IAIhD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACzD,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IACtD,CAAC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QACtC,OAAO,CAAC,CACN,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ;YAChC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CACtC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IACtD,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IACvC,CAAC;IAED,OAAO;QACL,KAAK,EAAE;YACL,GAAG,SAAS,CAAC,KAAK,CAAC;YACnB,KAAK,EAAE,SAAS;SACjB;QACD,YAAY;KACb,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAgB;IACjD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,eAA0C,EAC1C,OAAe;IAEf,MAAM,aAAa,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,MAAM,GACV,OAAO,eAAe,KAAK,QAAQ;QACjC,CAAC,CAAC,qBAAqB,CAAC,eAAe,CAAC;QACxC,CAAC,CAAC,IAAI,CAAC;IAEX,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAExD,KAAK,MAAM,SAAS,IAAI,mBAAmB,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACzD,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,gBAAgB,GAAc,EAAE,CAAC;QAEvC,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC5B,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,SAAS,CAAC,SAAS,CAAC,GAAG;YACrB,GAAG,gBAAgB;YACnB,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SACnE,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IAC7B,CAAC;SAAM,CAAC;QACN,OAAO,QAAQ,CAAC,KAAK,CAAC;IACxB,CAAC;IAED,OAAO,yBAAyB,CAAC,QAAQ,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,eAAuB;IAEvB,MAAM,MAAM,GAAG,qBAAqB,CAAC,eAAe,CAAC,CAAC;IACtD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAC3D,CAAC;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAChE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,SAAS;QAEzC,MAAM,gBAAgB,GAAc,EAAE,CAAC;QACvC,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;YACnD,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC;YACtC,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC5B,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,SAAS,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAC3D,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IAC7B,CAAC;SAAM,CAAC;QACN,OAAO,QAAQ,CAAC,KAAK,CAAC;IACxB,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IAC7C,CAAC;IAED,OAAO;QACL,WAAW,EAAE,yBAAyB,CAAC,QAAQ,CAAC;QAChD,YAAY;KACb,CAAC;AACJ,CAAC"}

package/dist/config/generator.d.ts

@@ -10,13 +10,22 @@
  *   3. [table] sections (env, mcp_servers, tui)
  */
 import type { UnifiedMcpRegistryServer } from "./mcp-registry.js";
+import type { HudPreset } from "../hud/types.js";
 interface MergeOptions {
     includeTui?: boolean;
     modelOverride?: string;
     sharedMcpServers?: UnifiedMcpRegistryServer[];
     sharedMcpRegistrySource?: string;
     verbose?: boolean;
+    statusLinePreset?: HudPreset;
+    forceStatusLinePreset?: boolean;
 }
+export declare 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. 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 declare const STATUS_LINE_PRESETS: Record<HudPreset, readonly string[]>;
+export declare const DEFAULT_STATUS_LINE_PRESET: HudPreset;
+export declare function statusLineForPreset(preset?: HudPreset): string;
+export declare function stripCodexModelAvailabilityNux(config: string): string;
+export declare function cleanCodexModelAvailabilityNuxIfNeeded(configPath: string): Promise<boolean>;
 export declare function hasLegacyOmxTeamRunTable(config: string): boolean;
 export declare function getRootModelName(config: string): string | undefined;
 export declare function stripOmxSeededBehavioralDefaults(config: string): string;
@@ -25,6 +34,7 @@ export declare function stripOmxSeededBehavioralDefaults(config: string): string
  * cleanly. Also removes the comment line that precedes them.
  */
 export declare function stripOmxTopLevelKeys(config: string): string;
+export declare function upsertCodexHooksFeatureFlag(config: string): string;
 /**
  * Remove OMX-owned feature flags from the [features] section.
  * If the section becomes empty after removal, remove the section header too.

package/dist/config/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/config/generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAQH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAElE,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,wBAAwB,EAAE,CAAC;IAC9C,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAqCD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAMD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEnE;AAoID,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CA2CvE;AA4CD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE3D;AAwKD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CA+C3D;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAyC1D;AAgJD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAuCA;AAED,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,MAAM,GAAG;IACnE,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAqCA;AAuPD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAAiB,GACzB,MAAM,CAkDR;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,CAclB;AAED,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CAoBf"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/config/generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAQH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,wBAAwB,EAAE,CAAC;IAC9C,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAyBD,eAAO,MAAM,0BAA0B,+cACua,CAAC;AAqB/c,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAIpE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,SAAqB,CAAC;AAE/D,wBAAgB,mBAAmB,CACjC,MAAM,GAAE,SAAsC,GAC7C,MAAM,CAKR;AAmCD,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAoBrE;AAED,wBAAsB,sCAAsC,CAC1D,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAMD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEnE;AAsID,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CA2CvE;AA4CD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE3D;AA+ED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAsClE;AA2FD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CA+C3D;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CA2C1D;AAmQD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAqCA;AAED,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,MAAM,GAAG;IACnE,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAqCA;AAqOD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAAiB,GACzB,MAAM,CA4DR;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CAoBf"}

package/dist/config/generator.js

@@ -15,6 +15,7 @@ import { join } from "path";
 import TOML from "@iarna/toml";
 import { AGENT_DEFINITIONS } from "../agents/definitions.js";
 import { DEFAULT_FRONTIER_MODEL } from "./models.js";
+import { getOmxFirstPartySetupMcpServers } from "./omx-first-party-mcp.js";
 function escapeTomlString(value) {
     return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
@@ -32,15 +33,86 @@ const DEFAULT_SETUP_MODEL_CONTEXT_WINDOW = 250000;
 const DEFAULT_SETUP_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. 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.";
 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 OMX_EXPLORE_ROUTING_DEFAULT = '1';
-const OMX_EXPLORE_CMD_ENV = 'USE_OMX_EXPLORE_CMD';
+const OMX_EXPLORE_ROUTING_DEFAULT = "1";
+const OMX_EXPLORE_CMD_ENV = "USE_OMX_EXPLORE_CMD";
 const DEFAULT_LAUNCHER_MCP_STARTUP_TIMEOUT_SEC = 15;
-const OMX_TUI_STATUS_LINE = 'status_line = ["model-with-reasoning", "git-branch", "context-remaining", "total-input-tokens", "total-output-tokens", "five-hour-limit", "weekly-limit"]';
+const STATUS_LINE_FOCUSED_FIELDS = [
+    "model-with-reasoning",
+    "git-branch",
+    "context-remaining",
+    "total-input-tokens",
+    "total-output-tokens",
+    "five-hour-limit",
+    "weekly-limit",
+];
+// `full` is currently identical to `focused`. It is reserved for future
+// expansion as Codex CLI adds support for additional status_line fields.
+export const STATUS_LINE_PRESETS = {
+    minimal: ["model-with-reasoning", "git-branch"],
+    focused: STATUS_LINE_FOCUSED_FIELDS,
+    full: STATUS_LINE_FOCUSED_FIELDS,
+};
+export const DEFAULT_STATUS_LINE_PRESET = "focused";
+export function statusLineForPreset(preset = DEFAULT_STATUS_LINE_PRESET) {
+    const fields = STATUS_LINE_PRESETS[preset] ??
+        STATUS_LINE_PRESETS[DEFAULT_STATUS_LINE_PRESET];
+    return `status_line = [${fields.map((field) => `"${field}"`).join(", ")}]`;
+}
+// Marker comment OMX emits immediately above any status_line it owns. New writes
+// always include it; the customized-section detector keys on this marker so a
+// user-edited status_line that happens to byte-match a preset literal (e.g.
+// `["model-with-reasoning", "git-branch"]` matching the `minimal` preset) is
+// still recognized as a user customization and preserved.
+const OMX_MANAGED_STATUS_LINE_MARKER = "# omx:managed-status-line";
+// Pre-marker installs only ever shipped the seven-field `focused` array.
+// Treat that exact value as OMX-managed for backward compatibility so
+// upgrades/preset switches still strip the legacy line. Any other preset
+// literal without the marker is assumed user-written.
+const LEGACY_OMX_STATUS_LINE = statusLineForPreset(DEFAULT_STATUS_LINE_PRESET);
+// Set of every status_line literal OMX itself can emit today. Used together
+// with the marker comment: if a status_line is preceded by the marker AND
+// its value is a known OMX preset, it is OMX-managed. If the marker is
+// present but the value is something else, the user edited the value (and
+// left the marker untouched) — treat as a user customization and preserve.
+const OMX_PRESET_STATUS_LINE_VALUES = new Set(Object.keys(STATUS_LINE_PRESETS).map((preset) => statusLineForPreset(preset)));
 const LEGACY_OMX_TEAM_RUN_TABLE_PATTERN = /^\s*\[mcp_servers\.(?:"omx_team_run"|omx_team_run)\]\s*$/m;
+const OMX_CONFIG_MARKER = "oh-my-codex (OMX) Configuration";
+const OMX_CONFIG_END_MARKER = "# End oh-my-codex";
+const CODEX_MODEL_AVAILABILITY_NUX_TABLE_PATTERN = /^\s*\[tui\.model_availability_nux\]\s*(?:#.*)?$/;
+const TOML_TABLE_HEADER_PATTERN = /^\s*\[\[?[^\]]+\]?\]\s*(?:#.*)?$/;
+export function stripCodexModelAvailabilityNux(config) {
+    const lines = config.split(/\r?\n/);
+    const result = [];
+    let removed = false;
+    for (let i = 0; i < lines.length;) {
+        if (CODEX_MODEL_AVAILABILITY_NUX_TABLE_PATTERN.test(lines[i])) {
+            removed = true;
+            i += 1;
+            while (i < lines.length && !TOML_TABLE_HEADER_PATTERN.test(lines[i])) {
+                i += 1;
+            }
+            continue;
+        }
+        result.push(lines[i]);
+        i += 1;
+    }
+    return removed ? result.join("\n") : config;
+}
+export async function cleanCodexModelAvailabilityNuxIfNeeded(configPath) {
+    if (!existsSync(configPath))
+        return false;
+    const content = await readFile(configPath, "utf-8");
+    const cleaned = stripCodexModelAvailabilityNux(content);
+    if (cleaned === content)
+        return false;
+    await writeFile(configPath, cleaned);
+    return true;
+}
 export function hasLegacyOmxTeamRunTable(config) {
     return LEGACY_OMX_TEAM_RUN_TABLE_PATTERN.test(config);
 }
@@ -108,7 +180,7 @@ function getOmxTopLevelLines(pkgRoot, existingConfig = "", modelOverride) {
         "# oh-my-codex top-level settings (must be before any [table])",
         `notify = ["node", "${escapedPath}"]`,
         'model_reasoning_effort = "medium"',
-        `developer_instructions = "You have oh-my-codex installed. AGENTS.md is your orchestration brain and the main orchestration surface. Use skill/keyword routing like $name plus spawned role-specialized subagents for specialized work. Codex native subagents are available via .codex/agents and may be used for independent parallel subtasks within a single session or team pane. Skills are loaded from installed SKILL.md files under .codex/skills, not from native agent TOMLs. Use workflow skills via $name when explicitly invoked or clearly routed by AGENTS.md. Treat installed prompts as narrower internal execution surfaces under AGENTS.md authority, even when user-facing docs prefer $name keywords."`,
+        `developer_instructions = "${escapeTomlString(OMX_DEVELOPER_INSTRUCTIONS)}"`,
     ];
     const existingModel = rootValues.get("model");
     const existingContextWindow = rootValues.get("model_context_window");
@@ -279,6 +351,39 @@ function upsertFeatureFlags(config) {
     }
     return lines.join("\n");
 }
+export function upsertCodexHooksFeatureFlag(config) {
+    const lines = config.split(/\r?\n/);
+    const featuresStart = lines.findIndex((line) => /^\s*\[features\]\s*$/.test(line));
+    if (featuresStart < 0) {
+        const base = config.trimEnd();
+        const featureBlock = ["[features]", "codex_hooks = true", ""].join("\n");
+        if (base.length === 0) {
+            return featureBlock;
+        }
+        return `${base}\n${featureBlock}`;
+    }
+    let sectionEnd = lines.length;
+    for (let i = featuresStart + 1; i < lines.length; i++) {
+        if (/^\s*\[\[?[^\]]+\]?\]\s*$/.test(lines[i])) {
+            sectionEnd = i;
+            break;
+        }
+    }
+    let codexHooksIdx = -1;
+    for (let i = featuresStart + 1; i < sectionEnd; i++) {
+        if (/^\s*codex_hooks\s*=/.test(lines[i])) {
+            codexHooksIdx = i;
+            break;
+        }
+    }
+    if (codexHooksIdx >= 0) {
+        lines[codexHooksIdx] = "codex_hooks = true";
+    }
+    else {
+        lines.splice(sectionEnd, 0, "codex_hooks = true");
+    }
+    return lines.join("\n");
+}
 function upsertEnvSettings(config) {
     const lines = config.split(/\r?\n/);
     const envStart = lines.findIndex((line) => /^\s*\[env\]\s*$/.test(line));
@@ -492,7 +597,59 @@ function stripOrphanedOmxSections(config) {
     }
     return result.join("\n");
 }
-function upsertTuiStatusLine(config) {
+function extractCustomizedTuiSectionsFromOmxBlocks(config) {
+    const sections = [];
+    let searchStart = 0;
+    while (true) {
+        const markerIdx = config.indexOf(OMX_CONFIG_MARKER, searchStart);
+        if (markerIdx < 0)
+            break;
+        const endIdx = config.indexOf(OMX_CONFIG_END_MARKER, markerIdx);
+        if (endIdx < 0)
+            break;
+        const blockLines = config.slice(markerIdx, endIdx).split(/\r?\n/);
+        for (let i = 0; i < blockLines.length; i++) {
+            if (!/^\s*\[tui\]\s*$/.test(blockLines[i]))
+                continue;
+            const tuiLines = [blockLines[i].trim()];
+            let hasCustomizedStatusLine = false;
+            let lastNonBlankBeforeStatusLine;
+            for (let j = i + 1; j < blockLines.length; j++) {
+                if (/^\s*\[\[?[^\]]+\]?\]\s*$/.test(blockLines[j]))
+                    break;
+                const trimmed = blockLines[j].trim();
+                if (!trimmed)
+                    continue;
+                tuiLines.push(trimmed);
+                if (/^status_line\s*=/.test(trimmed)) {
+                    // OMX-managed when:
+                    //   1. Preceded by the managed-status-line marker AND the value is
+                    //      a known OMX preset literal (post-marker installs). If the
+                    //      marker is present but the value isn't a preset, the user
+                    //      edited the value and left the marker — treat as customized.
+                    //   2. No marker but the value byte-matches the legacy seven-field
+                    //      default (pre-marker installs only ever shipped focused).
+                    // Anything else inside an OMX-marker block is treated as a user
+                    // customization and preserved across rebuild.
+                    const hasMarker = lastNonBlankBeforeStatusLine === OMX_MANAGED_STATUS_LINE_MARKER;
+                    const matchesPreset = OMX_PRESET_STATUS_LINE_VALUES.has(trimmed);
+                    const isManagedByMarker = hasMarker && matchesPreset;
+                    const isManagedByLegacyValue = !hasMarker && trimmed === LEGACY_OMX_STATUS_LINE;
+                    if (!isManagedByMarker && !isManagedByLegacyValue) {
+                        hasCustomizedStatusLine = true;
+                    }
+                }
+                lastNonBlankBeforeStatusLine = trimmed;
+            }
+            if (hasCustomizedStatusLine) {
+                sections.push(tuiLines.join("\n"));
+            }
+        }
+        searchStart = endIdx + OMX_CONFIG_END_MARKER.length;
+    }
+    return sections;
+}
+function upsertTuiStatusLine(config, preset = DEFAULT_STATUS_LINE_PRESET, options = {}) {
     const lines = config.split(/\r?\n/);
     const sections = [];
     for (let i = 0; i < lines.length; i++) {
@@ -513,23 +670,63 @@ function upsertTuiStatusLine(config) {
     }
     const preservedKeyLines = [];
     const seenKeys = new Set();
+    let preservedStatusLine;
     for (const section of sections) {
+        let lastNonBlankBeforeStatusLine;
         for (let i = section.start + 1; i < section.end; i++) {
             const line = lines[i];
             const trimmed = line.trim();
-            if (!trimmed || trimmed.startsWith("#"))
+            if (!trimmed)
+                continue;
+            if (trimmed.startsWith("#")) {
+                lastNonBlankBeforeStatusLine = trimmed;
                 continue;
+            }
             const keyMatch = trimmed.match(/^([A-Za-z0-9_-]+)\s*=/);
-            if (!keyMatch)
+            if (!keyMatch) {
+                lastNonBlankBeforeStatusLine = trimmed;
                 continue;
+            }
             const key = keyMatch[1];
-            if (key === "status_line" || seenKeys.has(key))
+            if (key === "status_line") {
+                const entryLines = [trimmed];
+                while (!parseStandaloneToml(entryLines.join("\n")) &&
+                    i + 1 < section.end) {
+                    i += 1;
+                    entryLines.push(lines[i].trim());
+                }
+                const statusLineEntry = entryLines.join("\n");
+                const hasMarker = lastNonBlankBeforeStatusLine === OMX_MANAGED_STATUS_LINE_MARKER;
+                const isManagedByMarker = hasMarker && OMX_PRESET_STATUS_LINE_VALUES.has(statusLineEntry);
+                const isManagedByLegacyValue = !hasMarker && statusLineEntry === LEGACY_OMX_STATUS_LINE;
+                const isOmxManagedStatusLine = isManagedByMarker || isManagedByLegacyValue;
+                if (!options.forceStatusLinePreset || !isOmxManagedStatusLine) {
+                    preservedStatusLine ??= statusLineEntry;
+                }
+                lastNonBlankBeforeStatusLine = statusLineEntry;
                 continue;
+            }
+            if (seenKeys.has(key)) {
+                lastNonBlankBeforeStatusLine = trimmed;
+                continue;
+            }
             seenKeys.add(key);
             preservedKeyLines.push(trimmed);
+            lastNonBlankBeforeStatusLine = trimmed;
         }
     }
-    const mergedSection = ["[tui]", ...preservedKeyLines, OMX_TUI_STATUS_LINE];
+    // When OMX is supplying the status_line (no user-preserved value),
+    // emit the managed-status-line marker comment alongside it so the
+    // customized-section detector can unambiguously tell our writes apart
+    // from a user edit on the next merge.
+    const mergedSection = preservedStatusLine
+        ? ["[tui]", ...preservedKeyLines, preservedStatusLine]
+        : [
+            "[tui]",
+            ...preservedKeyLines,
+            OMX_MANAGED_STATUS_LINE_MARKER,
+            statusLineForPreset(preset),
+        ];
     const firstStart = sections[0].start;
     const rebuilt = [];
     for (let i = 0; i < lines.length; i++) {
@@ -555,12 +752,10 @@ function upsertTuiStatusLine(config) {
 // OMX [table] sections block (appended at end of file)
 // ---------------------------------------------------------------------------
 export function stripExistingOmxBlocks(config) {
-    const marker = "oh-my-codex (OMX) Configuration";
-    const endMarker = "# End oh-my-codex";
     let cleaned = config;
     let removed = 0;
     while (true) {
-        const markerIdx = cleaned.indexOf(marker);
+        const markerIdx = cleaned.indexOf(OMX_CONFIG_MARKER);
         if (markerIdx < 0)
             break;
         let blockStart = cleaned.lastIndexOf("\n", markerIdx);
@@ -574,7 +769,7 @@ export function stripExistingOmxBlocks(config) {
             }
         }
         let blockEnd = cleaned.length;
-        const endIdx = cleaned.indexOf(endMarker, markerIdx);
+        const endIdx = cleaned.indexOf(OMX_CONFIG_END_MARKER, markerIdx);
         if (endIdx >= 0) {
             const endLineBreak = cleaned.indexOf("\n", endIdx);
             blockEnd = endLineBreak >= 0 ? endLineBreak + 1 : cleaned.length;
@@ -627,7 +822,7 @@ function configHasMcpServer(config, name) {
     return new RegExp(`^\\s*\\[${tableName}\\]\\s*$`, "m").test(config);
 }
 function launcherCommandBasename(command) {
-    return command.replace(/\\/g, "/").trim().split("/").pop()?.toLowerCase() ?? "";
+    return (command.replace(/\\/g, "/").trim().split("/").pop()?.toLowerCase() ?? "");
 }
 function isLauncherBackedMcpCommand(command, args) {
     const base = launcherCommandBasename(command);
@@ -661,7 +856,10 @@ function findLauncherTimeoutRepairTargets(config) {
         const mcpServers = parsed
             .mcp_servers;
         const [name, value] = Object.entries(mcpServers ?? {})[0] ?? [];
-        if (!name || name.startsWith("omx_") || typeof value !== "object" || !value) {
+        if (!name ||
+            name.startsWith("omx_") ||
+            typeof value !== "object" ||
+            !value) {
             start = end - 1;
             continue;
         }
@@ -672,9 +870,12 @@ function findLauncherTimeoutRepairTargets(config) {
             ? section.args
             : [];
         const hasStartupTimeout = (typeof section.startup_timeout_sec === "number" &&
-            Number.isFinite(section.startup_timeout_sec)) || (typeof section.startupTimeoutSec === "number" &&
-            Number.isFinite(section.startupTimeoutSec));
-        if (!command || hasStartupTimeout || !isLauncherBackedMcpCommand(command, args)) {
+            Number.isFinite(section.startup_timeout_sec)) ||
+            (typeof section.startupTimeoutSec === "number" &&
+                Number.isFinite(section.startupTimeoutSec));
+        if (!command ||
+            hasStartupTimeout ||
+            !isLauncherBackedMcpCommand(command, args)) {
             start = end - 1;
             continue;
         }
@@ -733,66 +934,41 @@ function getSharedMcpRegistryBlock(servers, sourcePath, existingConfig) {
  * OMX table-section block (MCP servers, TUI).
  * Contains ONLY [table] sections — no bare keys.
  */
-function getOmxTablesBlock(pkgRoot, includeTui = true) {
-    const stateServerPath = escapeTomlString(join(pkgRoot, "dist", "mcp", "state-server.js"));
-    const memoryServerPath = escapeTomlString(join(pkgRoot, "dist", "mcp", "memory-server.js"));
-    const codeIntelServerPath = escapeTomlString(join(pkgRoot, "dist", "mcp", "code-intel-server.js"));
-    const traceServerPath = escapeTomlString(join(pkgRoot, "dist", "mcp", "trace-server.js"));
-    const wikiServerPath = escapeTomlString(join(pkgRoot, "dist", "mcp", "wiki-server.js"));
-    return [
+function getOmxTablesBlock(pkgRoot, includeTui = true, statusLinePreset = DEFAULT_STATUS_LINE_PRESET) {
+    const lines = [
         "",
         "# ============================================================",
         "# oh-my-codex (OMX) Configuration",
         "# Managed by omx setup - manual edits preserved on next setup",
         "# ============================================================",
-        "",
-        "# OMX State Management MCP Server",
-        "[mcp_servers.omx_state]",
-        'command = "node"',
-        `args = ["${stateServerPath}"]`,
-        "enabled = true",
-        "startup_timeout_sec = 5",
-        "",
-        "# OMX Project Memory MCP Server",
-        "[mcp_servers.omx_memory]",
-        'command = "node"',
-        `args = ["${memoryServerPath}"]`,
-        "enabled = true",
-        "startup_timeout_sec = 5",
-        "",
-        "# OMX Code Intelligence MCP Server (LSP diagnostics, AST search)",
-        "[mcp_servers.omx_code_intel]",
-        'command = "node"',
-        `args = ["${codeIntelServerPath}"]`,
-        "enabled = true",
-        "startup_timeout_sec = 10",
-        "",
-        "# OMX Trace MCP Server (agent flow timeline & statistics)",
-        "[mcp_servers.omx_trace]",
-        'command = "node"',
-        `args = ["${traceServerPath}"]`,
-        "enabled = true",
-        "startup_timeout_sec = 5",
-        "",
-        "# OMX Wiki MCP Server (persistent project knowledge base)",
-        "[mcp_servers.omx_wiki]",
-        'command = "node"',
-        `args = ["${wikiServerPath}"]`,
-        "enabled = true",
-        "startup_timeout_sec = 5",
-        ...(includeTui
-            ? [
-                "",
-                "# OMX TUI StatusLine (Codex CLI v0.101.0+)",
-                "[tui]",
-                OMX_TUI_STATUS_LINE,
-                "",
-            ]
-            : []),
-        "# ============================================================",
-        "# End oh-my-codex",
-        "",
-    ].join("\n");
+    ];
+    for (const server of getOmxFirstPartySetupMcpServers(pkgRoot)) {
+        lines.push("");
+        lines.push(server.title);
+        lines.push(`[mcp_servers.${server.name}]`);
+        lines.push('command = "node"');
+        lines.push(`args = [${server.args
+            .map((arg) => `"${escapeTomlString(arg)}"`)
+            .join(", ")}]`);
+        lines.push(`enabled = ${server.enabled ? "true" : "false"}`);
+        if (typeof server.startupTimeoutSec === "number") {
+            lines.push(`startup_timeout_sec = ${server.startupTimeoutSec}`);
+        }
+    }
+    lines.push(...(includeTui
+        ? [
+            "",
+            "# OMX TUI StatusLine (Codex CLI v0.101.0+)",
+            "[tui]",
+            OMX_MANAGED_STATUS_LINE_MARKER,
+            statusLineForPreset(statusLinePreset),
+            "",
+        ]
+        : [""]));
+    lines.push("# ============================================================");
+    lines.push("# End oh-my-codex");
+    lines.push("");
+    return lines.join("\n");
 }
 // ---------------------------------------------------------------------------
 // Public API
@@ -811,9 +987,14 @@ function getOmxTablesBlock(pkgRoot, includeTui = true) {
 export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
     let existing = existingConfig;
     const includeTui = options.includeTui !== false;
-    if (existing.includes("oh-my-codex (OMX) Configuration")) {
+    const statusLinePreset = options.statusLinePreset ?? DEFAULT_STATUS_LINE_PRESET;
+    const customizedManagedTuiSections = extractCustomizedTuiSectionsFromOmxBlocks(existing);
+    if (existing.includes(OMX_CONFIG_MARKER)) {
         const stripped = stripExistingOmxBlocks(existing);
         existing = stripped.cleaned;
+        if (customizedManagedTuiSections.length > 0) {
+            existing = `${existing.trimEnd()}\n\n${customizedManagedTuiSections.join("\n\n")}\n`;
+        }
     }
     if (existing.includes(SHARED_MCP_REGISTRY_MARKER)) {
         const stripped = stripExistingSharedMcpRegistryBlock(existing);
@@ -829,11 +1010,13 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
     existing = upsertEnvSettings(existing);
     existing = upsertAgentsSettings(existing);
     const tuiUpsert = includeTui
-        ? upsertTuiStatusLine(existing)
+        ? upsertTuiStatusLine(existing, statusLinePreset, {
+            forceStatusLinePreset: options.forceStatusLinePreset,
+        })
         : { cleaned: existing, hadExistingTui: false };
     existing = tuiUpsert.cleaned;
     const topLines = getOmxTopLevelLines(pkgRoot, existing, options.modelOverride);
-    const tablesBlock = getOmxTablesBlock(pkgRoot, includeTui && !tuiUpsert.hadExistingTui);
+    const tablesBlock = getOmxTablesBlock(pkgRoot, includeTui && !tuiUpsert.hadExistingTui, statusLinePreset);
     const sharedRegistryBlock = getSharedMcpRegistryBlock(options.sharedMcpServers ?? [], options.sharedMcpRegistrySource, existing);
     let body = existing.trimEnd();
     if (sharedRegistryBlock) {