oh-my-codex 0.19.1 → 0.20.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +6 -6
- package/Cargo.toml +1 -1
- package/README.md +3 -1
- package/crates/omx-api/src/lib.rs +3 -3
- package/crates/omx-api/tests/cli.rs +4 -4
- package/crates/omx-explore/src/main.rs +4 -4
- package/crates/omx-sparkshell/src/codex_bridge.rs +2 -2
- package/dist/agents/__tests__/definitions.test.js +3 -3
- package/dist/agents/__tests__/definitions.test.js.map +1 -1
- package/dist/agents/__tests__/native-config.test.js +71 -42
- package/dist/agents/__tests__/native-config.test.js.map +1 -1
- package/dist/agents/definitions.d.ts +1 -1
- package/dist/agents/definitions.d.ts.map +1 -1
- package/dist/agents/definitions.js +3 -3
- package/dist/agents/definitions.js.map +1 -1
- package/dist/agents/native-config.d.ts +2 -2
- package/dist/agents/native-config.d.ts.map +1 -1
- package/dist/agents/native-config.js +7 -5
- package/dist/agents/native-config.js.map +1 -1
- package/dist/autopilot/__tests__/planner-routing.test.js +19 -12
- package/dist/autopilot/__tests__/planner-routing.test.js.map +1 -1
- package/dist/autopilot/__tests__/ralplan-gate.test.js +151 -0
- package/dist/autopilot/__tests__/ralplan-gate.test.js.map +1 -1
- package/dist/autopilot/planner-routing.d.ts.map +1 -1
- package/dist/autopilot/planner-routing.js +4 -2
- package/dist/autopilot/planner-routing.js.map +1 -1
- package/dist/autopilot/ralplan-gate.d.ts +1 -0
- package/dist/autopilot/ralplan-gate.d.ts.map +1 -1
- package/dist/autopilot/ralplan-gate.js +38 -2
- package/dist/autopilot/ralplan-gate.js.map +1 -1
- package/dist/autoresearch/runtime.d.ts +2 -0
- package/dist/autoresearch/runtime.d.ts.map +1 -1
- package/dist/autoresearch/runtime.js +8 -0
- package/dist/autoresearch/runtime.js.map +1 -1
- package/dist/capabilities/__tests__/lockfile.test.d.ts +2 -0
- package/dist/capabilities/__tests__/lockfile.test.d.ts.map +1 -0
- package/dist/capabilities/__tests__/lockfile.test.js +115 -0
- package/dist/capabilities/__tests__/lockfile.test.js.map +1 -0
- package/dist/capabilities/lockfile.d.ts +102 -0
- package/dist/capabilities/lockfile.d.ts.map +1 -0
- package/dist/capabilities/lockfile.js +334 -0
- package/dist/capabilities/lockfile.js.map +1 -0
- package/dist/cli/__tests__/agents.test.js +5 -5
- package/dist/cli/__tests__/agents.test.js.map +1 -1
- package/dist/cli/__tests__/capabilities.test.d.ts +2 -0
- package/dist/cli/__tests__/capabilities.test.d.ts.map +1 -0
- package/dist/cli/__tests__/capabilities.test.js +135 -0
- package/dist/cli/__tests__/capabilities.test.js.map +1 -0
- package/dist/cli/__tests__/codex-plugin-layout.test.js +264 -6
- package/dist/cli/__tests__/codex-plugin-layout.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-context-window-warning.test.js +83 -78
- package/dist/cli/__tests__/doctor-context-window-warning.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-invalid-config.test.js +10 -1
- package/dist/cli/__tests__/doctor-invalid-config.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-spark-routing.test.js +22 -6
- package/dist/cli/__tests__/doctor-spark-routing.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-warning-copy.test.js +87 -1
- package/dist/cli/__tests__/doctor-warning-copy.test.js.map +1 -1
- package/dist/cli/__tests__/index.test.js +53 -18
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/plugin-marketplace-idempotent.test.js +3 -3
- package/dist/cli/__tests__/plugin-marketplace-idempotent.test.js.map +1 -1
- package/dist/cli/__tests__/resume.test.js +95 -6
- package/dist/cli/__tests__/resume.test.js.map +1 -1
- package/dist/cli/__tests__/setup-hooks-shared-ownership.test.js +54 -2
- package/dist/cli/__tests__/setup-hooks-shared-ownership.test.js.map +1 -1
- package/dist/cli/__tests__/setup-install-mode.test.js +49 -21
- package/dist/cli/__tests__/setup-install-mode.test.js.map +1 -1
- package/dist/cli/__tests__/setup-prompts-overwrite.test.js +3 -3
- package/dist/cli/__tests__/setup-refresh.test.js +166 -12
- package/dist/cli/__tests__/setup-refresh.test.js.map +1 -1
- package/dist/cli/__tests__/setup-scope.test.js +27 -3
- package/dist/cli/__tests__/setup-scope.test.js.map +1 -1
- package/dist/cli/__tests__/uninstall.test.js +301 -7
- package/dist/cli/__tests__/uninstall.test.js.map +1 -1
- package/dist/cli/agents.js +1 -1
- package/dist/cli/agents.js.map +1 -1
- package/dist/cli/capabilities.d.ts +3 -0
- package/dist/cli/capabilities.d.ts.map +1 -0
- package/dist/cli/capabilities.js +118 -0
- package/dist/cli/capabilities.js.map +1 -0
- package/dist/cli/doctor.d.ts +3 -1
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +50 -34
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/index.d.ts +7 -4
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +77 -19
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/plugin-marketplace.d.ts +1 -0
- package/dist/cli/plugin-marketplace.d.ts.map +1 -1
- package/dist/cli/plugin-marketplace.js +31 -0
- package/dist/cli/plugin-marketplace.js.map +1 -1
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +9 -6
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +3 -4
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/config/__tests__/generator-idempotent.test.js +210 -114
- package/dist/config/__tests__/generator-idempotent.test.js.map +1 -1
- package/dist/config/__tests__/generator-notify.test.js +26 -52
- package/dist/config/__tests__/generator-notify.test.js.map +1 -1
- package/dist/config/__tests__/models.test.js +51 -26
- package/dist/config/__tests__/models.test.js.map +1 -1
- package/dist/config/generator.d.ts +20 -11
- package/dist/config/generator.d.ts.map +1 -1
- package/dist/config/generator.js +169 -152
- package/dist/config/generator.js.map +1 -1
- package/dist/config/models.d.ts +16 -6
- package/dist/config/models.d.ts.map +1 -1
- package/dist/config/models.js +19 -8
- package/dist/config/models.js.map +1 -1
- package/dist/hooks/__tests__/keyword-detector.test.js +12 -4
- package/dist/hooks/__tests__/keyword-detector.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-auto-nudge.test.js +1 -1
- package/dist/hooks/__tests__/prometheus-strict-contract.test.js +2 -2
- package/dist/hooks/__tests__/prometheus-strict-contract.test.js.map +1 -1
- package/dist/hooks/__tests__/tmux-hook-engine.test.js +2 -2
- package/dist/leader/__tests__/contract.test.js +150 -1
- package/dist/leader/__tests__/contract.test.js.map +1 -1
- package/dist/leader/contract.d.ts +26 -0
- package/dist/leader/contract.d.ts.map +1 -1
- package/dist/leader/contract.js +188 -0
- package/dist/leader/contract.js.map +1 -1
- package/dist/modes/base.d.ts +1 -1
- package/dist/modes/base.d.ts.map +1 -1
- package/dist/pipeline/__tests__/stages.test.js +27 -1
- package/dist/pipeline/__tests__/stages.test.js.map +1 -1
- package/dist/pipeline/stages/ralplan.d.ts +2 -1
- package/dist/pipeline/stages/ralplan.d.ts.map +1 -1
- package/dist/pipeline/stages/ralplan.js +1 -0
- package/dist/pipeline/stages/ralplan.js.map +1 -1
- package/dist/pipeline/stages/ultragoal.d.ts +5 -1
- package/dist/pipeline/stages/ultragoal.d.ts.map +1 -1
- package/dist/pipeline/stages/ultragoal.js +14 -4
- package/dist/pipeline/stages/ultragoal.js.map +1 -1
- package/dist/ralplan/__tests__/runtime.test.js +132 -0
- package/dist/ralplan/__tests__/runtime.test.js.map +1 -1
- package/dist/ralplan/runtime.d.ts +17 -0
- package/dist/ralplan/runtime.d.ts.map +1 -1
- package/dist/ralplan/runtime.js +97 -1
- package/dist/ralplan/runtime.js.map +1 -1
- package/dist/scripts/__tests__/codex-native-hook.test.js +1528 -32
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +377 -31
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/state/__tests__/operations.test.js +450 -0
- package/dist/state/__tests__/operations.test.js.map +1 -1
- package/dist/state/__tests__/workflow-transition.test.js +14 -0
- package/dist/state/__tests__/workflow-transition.test.js.map +1 -1
- package/dist/state/operations.d.ts.map +1 -1
- package/dist/state/operations.js +72 -11
- package/dist/state/operations.js.map +1 -1
- package/dist/state/terminal-normalization.d.ts +8 -0
- package/dist/state/terminal-normalization.d.ts.map +1 -0
- package/dist/state/terminal-normalization.js +127 -0
- package/dist/state/terminal-normalization.js.map +1 -0
- package/dist/state/workflow-transition-reconcile.d.ts.map +1 -1
- package/dist/state/workflow-transition-reconcile.js +3 -1
- package/dist/state/workflow-transition-reconcile.js.map +1 -1
- package/dist/team/__tests__/delegation-policy.test.js +2 -2
- package/dist/team/__tests__/delegation-policy.test.js.map +1 -1
- package/dist/team/__tests__/model-contract.test.js +25 -25
- package/dist/team/__tests__/model-contract.test.js.map +1 -1
- package/dist/team/__tests__/runtime.test.js +28 -28
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/__tests__/scaling.test.js +7 -7
- package/dist/team/__tests__/scaling.test.js.map +1 -1
- package/dist/team/__tests__/tmux-claude-workers-demo.test.js +5 -5
- package/dist/team/__tests__/tmux-claude-workers-demo.test.js.map +1 -1
- package/dist/team/__tests__/tmux-session.test.js +12 -12
- package/dist/team/__tests__/tmux-session.test.js.map +1 -1
- package/dist/team/__tests__/worker-bootstrap.test.js +57 -9
- package/dist/team/__tests__/worker-bootstrap.test.js.map +1 -1
- package/dist/team/__tests__/worker-runtime-identity.test.js +3 -3
- package/dist/team/__tests__/worker-runtime-identity.test.js.map +1 -1
- package/dist/team/model-contract.d.ts +1 -1
- package/dist/team/model-contract.d.ts.map +1 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +11 -0
- package/dist/team/runtime.js.map +1 -1
- package/dist/team/worker-bootstrap.d.ts +2 -0
- package/dist/team/worker-bootstrap.d.ts.map +1 -1
- package/dist/team/worker-bootstrap.js +6 -1
- package/dist/team/worker-bootstrap.js.map +1 -1
- package/dist/ultragoal/__tests__/artifacts.test.js +68 -1
- package/dist/ultragoal/__tests__/artifacts.test.js.map +1 -1
- package/dist/ultragoal/artifacts.d.ts +5 -1
- package/dist/ultragoal/artifacts.d.ts.map +1 -1
- package/dist/ultragoal/artifacts.js +41 -9
- package/dist/ultragoal/artifacts.js.map +1 -1
- package/dist/utils/__tests__/agents-md.test.js +16 -0
- package/dist/utils/__tests__/agents-md.test.js.map +1 -1
- package/dist/utils/__tests__/agents-model-table.test.js +7 -7
- package/dist/utils/__tests__/agents-model-table.test.js.map +1 -1
- package/dist/utils/__tests__/worktree-tool-context.test.d.ts +2 -0
- package/dist/utils/__tests__/worktree-tool-context.test.d.ts.map +1 -0
- package/dist/utils/__tests__/worktree-tool-context.test.js +118 -0
- package/dist/utils/__tests__/worktree-tool-context.test.js.map +1 -0
- package/dist/utils/agents-md.d.ts.map +1 -1
- package/dist/utils/agents-md.js +4 -3
- package/dist/utils/agents-md.js.map +1 -1
- package/dist/utils/worktree-tool-context.d.ts +25 -0
- package/dist/utils/worktree-tool-context.d.ts.map +1 -0
- package/dist/utils/worktree-tool-context.js +116 -0
- package/dist/utils/worktree-tool-context.js.map +1 -0
- package/package.json +1 -1
- package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
- package/plugins/oh-my-codex/hooks/codex-native-hook.mjs +96 -10
- package/plugins/oh-my-codex/skills/ai-slop-cleaner/SKILL.md +1 -1
- package/plugins/oh-my-codex/skills/code-review/SKILL.md +1 -1
- package/plugins/oh-my-codex/skills/omx-setup/SKILL.md +5 -5
- package/plugins/oh-my-codex/skills/prometheus-strict/SKILL.md +3 -3
- package/plugins/oh-my-codex/skills/ralplan/SKILL.md +1 -1
- package/plugins/oh-my-codex/skills/team/SKILL.md +1 -1
- package/plugins/oh-my-codex/skills/ultrawork/references/agent-tiers.md +2 -2
- package/prompts/prometheus-strict-metis.md +1 -1
- package/skills/ai-slop-cleaner/SKILL.md +1 -1
- package/skills/code-review/SKILL.md +1 -1
- package/skills/ecomode/references/agent-tiers.md +1 -1
- package/skills/omx-setup/SKILL.md +5 -5
- package/skills/prometheus-strict/SKILL.md +3 -3
- package/skills/ralplan/SKILL.md +1 -1
- package/skills/team/SKILL.md +1 -1
- package/skills/ultrawork/references/agent-tiers.md +2 -2
- package/src/scripts/__tests__/codex-native-hook.test.ts +1818 -113
- package/src/scripts/codex-native-hook.ts +414 -27
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.test.js","sourceRoot":"","sources":["../../../src/config/__tests__/models.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"models.test.js","sourceRoot":"","sources":["../../../src/config/__tests__/models.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,17 +29,22 @@ interface MergeOptions {
|
|
|
29
29
|
includeFirstPartyMcp?: boolean;
|
|
30
30
|
preserveExistingFirstPartyMcp?: boolean;
|
|
31
31
|
}
|
|
32
|
-
export
|
|
33
|
-
model: string;
|
|
34
|
-
modelContextWindow: number;
|
|
35
|
-
modelAutoCompactTokenLimit: number;
|
|
36
|
-
}
|
|
37
|
-
export declare const DEFAULT_SETUP_MODEL = "gpt-5.5";
|
|
38
|
-
export declare const DEFAULT_SETUP_MODEL_CONTEXT_WINDOW = 250000;
|
|
39
|
-
export declare const DEFAULT_SETUP_MODEL_AUTO_COMPACT_TOKEN_LIMIT = 200000;
|
|
40
|
-
export declare function getModelContextRecommendation(model: string): ModelContextRecommendation | null;
|
|
32
|
+
export declare const DEFAULT_SETUP_MODEL = "gpt-5.6-sol";
|
|
41
33
|
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; 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.";
|
|
42
34
|
export declare 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>";
|
|
35
|
+
export type LegacyMultiAgentKey = "features.multi_agent" | "agents.max_threads" | "agents.max_depth";
|
|
36
|
+
export type LegacyKeyState = "absent" | "retained-legacy" | "custom" | "invalid/duplicate";
|
|
37
|
+
export type LegacyReasonCode = "key-absent" | "exact-legacy-value" | "custom-value" | "toml-parse-error" | "toml-duplicate-key";
|
|
38
|
+
export interface LegacyKeyAssessment {
|
|
39
|
+
key: LegacyMultiAgentKey;
|
|
40
|
+
state: LegacyKeyState;
|
|
41
|
+
reasonCode: LegacyReasonCode;
|
|
42
|
+
value?: unknown;
|
|
43
|
+
}
|
|
44
|
+
export interface LegacyMultiAgentAnalysis {
|
|
45
|
+
assessments: Record<LegacyMultiAgentKey, LegacyKeyAssessment>;
|
|
46
|
+
}
|
|
47
|
+
export declare function analyzeLegacyMultiAgentConfig(configText: string): LegacyMultiAgentAnalysis;
|
|
43
48
|
export declare const STATUS_LINE_PRESETS: Record<HudPreset, readonly string[]>;
|
|
44
49
|
export declare const DEFAULT_STATUS_LINE_PRESET: HudPreset;
|
|
45
50
|
export declare function statusLineForPreset(preset?: HudPreset): string;
|
|
@@ -51,6 +56,7 @@ export declare function formatTomlStringArray(values: readonly string[]): string
|
|
|
51
56
|
export declare function getRootTomlArray(config: string, key: string): string[] | null;
|
|
52
57
|
export declare function isOmxManagedNotifyCommand(command: readonly string[] | null | undefined, pkgRoot?: string): boolean;
|
|
53
58
|
export declare function sanitizePreviousNotifyCommand(command: readonly string[] | null | undefined, pkgRoot?: string): string[] | null;
|
|
59
|
+
export declare function hasExactOmxSeededBehavioralDefaultsPair(config: string): boolean;
|
|
54
60
|
export declare function stripOmxSeededBehavioralDefaults(config: string): string;
|
|
55
61
|
/**
|
|
56
62
|
* Remove any existing OMX-owned top-level keys so we can re-insert them
|
|
@@ -87,9 +93,12 @@ export declare function upsertPluginModeRuntimeFeatureFlags(config: string, code
|
|
|
87
93
|
}): string;
|
|
88
94
|
/**
|
|
89
95
|
* Remove OMX-owned feature flags from the [features] section.
|
|
96
|
+
* If `preserveMultiAgent` is set, retain multi_agent unchanged.
|
|
90
97
|
* If the section becomes empty after removal, remove the section header too.
|
|
91
98
|
*/
|
|
92
|
-
export declare function stripOmxFeatureFlags(config: string
|
|
99
|
+
export declare function stripOmxFeatureFlags(config: string, options?: {
|
|
100
|
+
preserveMultiAgent?: boolean;
|
|
101
|
+
}): string;
|
|
93
102
|
/**
|
|
94
103
|
* Preserve native Codex hook enablement without re-adding other OMX feature
|
|
95
104
|
* flags. Used by uninstall when user-owned hooks remain in hooks.json.
|
|
@@ -118,7 +127,7 @@ export declare function mergeSharedMcpRegistryBlock(config: string, servers: Uni
|
|
|
118
127
|
*
|
|
119
128
|
* Layout:
|
|
120
129
|
* 1. OMX top-level keys (notify, model_reasoning_effort, developer_instructions)
|
|
121
|
-
* 2. [features] with
|
|
130
|
+
* 2. [features] with child_agents_md + hooks + goals
|
|
122
131
|
* 3. [shell_environment_policy.set] with defaulted deprecated explore-routing opt-out
|
|
123
132
|
* 4. … user sections …
|
|
124
133
|
* 5. OMX [table] sections (mcp_servers, tui)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/config/generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/config/generator.ts"],"names":[],"mappings":"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"}
|
package/dist/config/generator.js
CHANGED
|
@@ -13,7 +13,6 @@ import { readFile, writeFile } from "fs/promises";
|
|
|
13
13
|
import { existsSync } from "fs";
|
|
14
14
|
import { join, resolve } from "path";
|
|
15
15
|
import TOML from "@iarna/toml";
|
|
16
|
-
import { AGENT_DEFINITIONS } from "../agents/definitions.js";
|
|
17
16
|
import { DEFAULT_FRONTIER_MODEL } from "./models.js";
|
|
18
17
|
import { DEFAULT_CODEX_HOOK_FEATURE_FLAG, CODEX_HOOK_FEATURE_FLAGS, CODEX_PLUGIN_SCOPED_HOOKS_FEATURE_FLAG, formatCodexHookFeatureFlagLine, normalizeCodexHookFeatureFlag, } from "./codex-feature-flags.js";
|
|
19
18
|
import { OMX_FIRST_PARTY_MCP_SERVER_NAMES, getOmxFirstPartySetupMcpServers, } from "./omx-first-party-mcp.js";
|
|
@@ -34,25 +33,65 @@ const OMX_TOP_LEVEL_KEYS = [
|
|
|
34
33
|
"developer_instructions",
|
|
35
34
|
];
|
|
36
35
|
export const DEFAULT_SETUP_MODEL = DEFAULT_FRONTIER_MODEL;
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
export function getModelContextRecommendation(model) {
|
|
40
|
-
if (model !== DEFAULT_SETUP_MODEL)
|
|
41
|
-
return null;
|
|
42
|
-
return {
|
|
43
|
-
model,
|
|
44
|
-
modelContextWindow: DEFAULT_SETUP_MODEL_CONTEXT_WINDOW,
|
|
45
|
-
modelAutoCompactTokenLimit: DEFAULT_SETUP_MODEL_AUTO_COMPACT_TOKEN_LIMIT,
|
|
46
|
-
};
|
|
47
|
-
}
|
|
36
|
+
const LEGACY_SEEDED_MODEL_CONTEXT_WINDOW = 250000;
|
|
37
|
+
const LEGACY_SEEDED_MODEL_AUTO_COMPACT_TOKEN_LIMIT = 200000;
|
|
48
38
|
const OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER = "# oh-my-codex seeded behavioral defaults (uninstall removes unchanged defaults)";
|
|
49
39
|
const OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER = "# End oh-my-codex seeded behavioral defaults";
|
|
50
40
|
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.";
|
|
51
41
|
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>';
|
|
52
42
|
const SHARED_MCP_REGISTRY_MARKER = "oh-my-codex (OMX) Shared MCP Registry Sync";
|
|
53
43
|
const SHARED_MCP_REGISTRY_END_MARKER = "# End oh-my-codex shared MCP registry sync";
|
|
54
|
-
const
|
|
55
|
-
|
|
44
|
+
const LEGACY_MULTI_AGENT_KEYS = [
|
|
45
|
+
"features.multi_agent",
|
|
46
|
+
"agents.max_threads",
|
|
47
|
+
"agents.max_depth",
|
|
48
|
+
];
|
|
49
|
+
const LEGACY_MULTI_AGENT_VALUES = {
|
|
50
|
+
"features.multi_agent": true,
|
|
51
|
+
"agents.max_threads": 6,
|
|
52
|
+
"agents.max_depth": 2,
|
|
53
|
+
};
|
|
54
|
+
export function analyzeLegacyMultiAgentConfig(configText) {
|
|
55
|
+
let parsed;
|
|
56
|
+
try {
|
|
57
|
+
parsed = TOML.parse(configText);
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
const reasonCode = /duplicate|redefine|already defined/i.test(String(error))
|
|
61
|
+
? "toml-duplicate-key"
|
|
62
|
+
: "toml-parse-error";
|
|
63
|
+
return {
|
|
64
|
+
assessments: Object.fromEntries(LEGACY_MULTI_AGENT_KEYS.map((key) => [
|
|
65
|
+
key,
|
|
66
|
+
{ key, state: "invalid/duplicate", reasonCode },
|
|
67
|
+
])),
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
return {
|
|
71
|
+
assessments: Object.fromEntries(LEGACY_MULTI_AGENT_KEYS.map((key) => {
|
|
72
|
+
const [table, entry] = key.split(".");
|
|
73
|
+
const value = isRecord(parsed[table]) ? parsed[table][entry] : undefined;
|
|
74
|
+
if (value === undefined) {
|
|
75
|
+
return [key, { key, state: "absent", reasonCode: "key-absent" }];
|
|
76
|
+
}
|
|
77
|
+
if (value === LEGACY_MULTI_AGENT_VALUES[key]) {
|
|
78
|
+
return [
|
|
79
|
+
key,
|
|
80
|
+
{
|
|
81
|
+
key,
|
|
82
|
+
state: "retained-legacy",
|
|
83
|
+
reasonCode: "exact-legacy-value",
|
|
84
|
+
value,
|
|
85
|
+
},
|
|
86
|
+
];
|
|
87
|
+
}
|
|
88
|
+
return [
|
|
89
|
+
key,
|
|
90
|
+
{ key, state: "custom", reasonCode: "custom-value", value },
|
|
91
|
+
];
|
|
92
|
+
})),
|
|
93
|
+
};
|
|
94
|
+
}
|
|
56
95
|
const OMX_EXPLORE_ROUTING_DEFAULT = "0";
|
|
57
96
|
const OMX_EXPLORE_CMD_ENV = "USE_OMX_EXPLORE_CMD";
|
|
58
97
|
const DEFAULT_LAUNCHER_MCP_STARTUP_TIMEOUT_SEC = 15;
|
|
@@ -343,71 +382,117 @@ function getOmxTopLevelLines(pkgRoot, existingConfig = "", modelOverride, notify
|
|
|
343
382
|
`developer_instructions = "${escapeTomlString(OMX_DEVELOPER_INSTRUCTIONS)}"`,
|
|
344
383
|
];
|
|
345
384
|
const existingModel = rootValues.get("model");
|
|
346
|
-
const existingContextWindow = rootValues.get("model_context_window");
|
|
347
|
-
const existingAutoCompact = rootValues.get("model_auto_compact_token_limit");
|
|
348
385
|
const selectedModel = modelOverride ?? unwrapTomlString(existingModel) ?? DEFAULT_SETUP_MODEL;
|
|
349
386
|
if (modelOverride || !existingModel) {
|
|
350
387
|
lines.push(`model = "${selectedModel}"`);
|
|
351
388
|
}
|
|
352
|
-
if (selectedModel === DEFAULT_SETUP_MODEL) {
|
|
353
|
-
const seededBehavioralDefaults = [];
|
|
354
|
-
if (!existingContextWindow) {
|
|
355
|
-
seededBehavioralDefaults.push(`model_context_window = ${DEFAULT_SETUP_MODEL_CONTEXT_WINDOW}`);
|
|
356
|
-
}
|
|
357
|
-
if (!existingAutoCompact) {
|
|
358
|
-
seededBehavioralDefaults.push(`model_auto_compact_token_limit = ${DEFAULT_SETUP_MODEL_AUTO_COMPACT_TOKEN_LIMIT}`);
|
|
359
|
-
}
|
|
360
|
-
if (seededBehavioralDefaults.length > 0) {
|
|
361
|
-
lines.push(OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER);
|
|
362
|
-
lines.push(...seededBehavioralDefaults);
|
|
363
|
-
lines.push(OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER);
|
|
364
|
-
}
|
|
365
|
-
}
|
|
366
389
|
return lines;
|
|
367
390
|
}
|
|
368
|
-
function
|
|
369
|
-
const
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
391
|
+
function sourceLines(config) {
|
|
392
|
+
const lines = [];
|
|
393
|
+
let start = 0;
|
|
394
|
+
for (let index = 0; index < config.length; index += 1) {
|
|
395
|
+
if (config[index] !== "\n")
|
|
396
|
+
continue;
|
|
397
|
+
lines.push({
|
|
398
|
+
content: config.slice(start, index - (index > start && config[index - 1] === "\r" ? 1 : 0)),
|
|
399
|
+
start,
|
|
400
|
+
end: index + 1,
|
|
401
|
+
});
|
|
402
|
+
start = index + 1;
|
|
403
|
+
}
|
|
404
|
+
if (start < config.length)
|
|
405
|
+
lines.push({ content: config.slice(start), start, end: config.length });
|
|
406
|
+
return lines;
|
|
381
407
|
}
|
|
382
|
-
|
|
383
|
-
const lines = config
|
|
384
|
-
const firstTable = lines.findIndex((line) =>
|
|
385
|
-
const boundary = firstTable
|
|
386
|
-
const
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
408
|
+
function analyzeOmxSeededBehavioralDefaults(config) {
|
|
409
|
+
const lines = sourceLines(config);
|
|
410
|
+
const firstTable = lines.findIndex((line) => TOML_TABLE_HEADER_PATTERN.test(line.content));
|
|
411
|
+
const boundary = firstTable < 0 ? lines.length : firstTable;
|
|
412
|
+
const starts = lines.map((line, index) => ({ line, index }))
|
|
413
|
+
.filter(({ line }) => line.content === OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER);
|
|
414
|
+
const ends = lines.map((line, index) => ({ line, index }))
|
|
415
|
+
.filter(({ line }) => line.content === OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER);
|
|
416
|
+
if (starts.length === 0 && ends.length === 0)
|
|
417
|
+
return { state: "absent", spans: [] };
|
|
418
|
+
if (starts.length !== 1 || ends.length !== 1 || starts[0].index >= ends[0].index) {
|
|
419
|
+
return { state: "malformed-or-ambiguous", spans: [] };
|
|
420
|
+
}
|
|
421
|
+
const rootText = lines.slice(0, boundary).map((line) => line.content).join("\n");
|
|
422
|
+
let entryStart = 0;
|
|
423
|
+
const rootEntries = splitRootLevelEntries(rootText).entries.map((entry) => {
|
|
424
|
+
const indexed = { entry, start: entryStart, end: entryStart + entry.lines.length };
|
|
425
|
+
entryStart = indexed.end;
|
|
426
|
+
return indexed;
|
|
427
|
+
});
|
|
428
|
+
const isStandaloneRootMarker = (index) => index < boundary && rootEntries.some(({ entry, start, end }) => !entry.key && start === index && end === index + 1);
|
|
429
|
+
const start = starts[0];
|
|
430
|
+
const end = ends[0];
|
|
431
|
+
if (!isStandaloneRootMarker(start.index) || !isStandaloneRootMarker(end.index)) {
|
|
432
|
+
return { state: "malformed-or-ambiguous", spans: [] };
|
|
433
|
+
}
|
|
434
|
+
const block = lines.slice(start.index, end.index + 1);
|
|
435
|
+
const exact = (body) => block.length === body.length + 2 &&
|
|
436
|
+
block[0].content === OMX_SEEDED_BEHAVIORAL_DEFAULTS_START_MARKER &&
|
|
437
|
+
block.at(-1)?.content === OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER &&
|
|
438
|
+
body.every((line, index) => block[index + 1].content === line);
|
|
439
|
+
const blockSpan = [{ start: start.line.start, end: end.line.end }];
|
|
440
|
+
const markerSpans = [
|
|
441
|
+
{ start: start.line.start, end: start.line.end },
|
|
442
|
+
{ start: end.line.start, end: end.line.end },
|
|
443
|
+
];
|
|
444
|
+
if (exact([
|
|
445
|
+
`model_context_window = ${LEGACY_SEEDED_MODEL_CONTEXT_WINDOW}`,
|
|
446
|
+
`model_auto_compact_token_limit = ${LEGACY_SEEDED_MODEL_AUTO_COMPACT_TOKEN_LIMIT}`,
|
|
447
|
+
])) {
|
|
448
|
+
const hasOutsideDuplicate = rootEntries.some(({ entry, start: entryStart, end: entryEnd }) => (entryEnd <= start.index || entryStart > end.index) &&
|
|
449
|
+
(entry.key === "model_context_window" || entry.key === "model_auto_compact_token_limit"));
|
|
450
|
+
return hasOutsideDuplicate
|
|
451
|
+
? { state: "malformed-or-ambiguous", spans: [] }
|
|
452
|
+
: { state: "exact-pair", spans: blockSpan };
|
|
453
|
+
}
|
|
454
|
+
const singletonState = (singletonKey, siblingKey) => {
|
|
455
|
+
let singletonDuplicates = 0;
|
|
456
|
+
let siblingCount = 0;
|
|
457
|
+
let invalidSibling = false;
|
|
458
|
+
for (const { entry, start: entryStart, end: entryEnd } of rootEntries) {
|
|
459
|
+
const outside = entryEnd <= start.index || entryStart > end.index;
|
|
460
|
+
if (outside && entry.key === singletonKey)
|
|
461
|
+
singletonDuplicates += 1;
|
|
462
|
+
if (outside && entry.key === siblingKey) {
|
|
463
|
+
siblingCount += 1;
|
|
464
|
+
invalidSibling ||= !parseStandaloneToml(entry.lines.join("\n"));
|
|
400
465
|
}
|
|
401
|
-
index = endIndex;
|
|
402
|
-
continue;
|
|
403
|
-
}
|
|
404
|
-
if (index < boundary &&
|
|
405
|
-
trimmed === OMX_SEEDED_BEHAVIORAL_DEFAULTS_END_MARKER) {
|
|
406
|
-
continue;
|
|
407
466
|
}
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
467
|
+
if (singletonDuplicates > 0 || siblingCount > 1 || invalidSibling)
|
|
468
|
+
return "malformed-or-ambiguous";
|
|
469
|
+
return siblingCount === 1 ? "exact" : "bounded-nonremovable";
|
|
470
|
+
};
|
|
471
|
+
if (exact([`model_context_window = ${LEGACY_SEEDED_MODEL_CONTEXT_WINDOW}`])) {
|
|
472
|
+
const state = singletonState("model_context_window", "model_auto_compact_token_limit");
|
|
473
|
+
return state === "exact"
|
|
474
|
+
? { state: "exact-context-singleton", spans: blockSpan }
|
|
475
|
+
: state === "bounded-nonremovable"
|
|
476
|
+
? { state, spans: markerSpans }
|
|
477
|
+
: { state, spans: [] };
|
|
478
|
+
}
|
|
479
|
+
if (exact([`model_auto_compact_token_limit = ${LEGACY_SEEDED_MODEL_AUTO_COMPACT_TOKEN_LIMIT}`])) {
|
|
480
|
+
const state = singletonState("model_auto_compact_token_limit", "model_context_window");
|
|
481
|
+
return state === "exact"
|
|
482
|
+
? { state: "exact-auto-singleton", spans: blockSpan }
|
|
483
|
+
: state === "bounded-nonremovable"
|
|
484
|
+
? { state, spans: markerSpans }
|
|
485
|
+
: { state, spans: [] };
|
|
486
|
+
}
|
|
487
|
+
return { state: "bounded-nonremovable", spans: markerSpans };
|
|
488
|
+
}
|
|
489
|
+
export function hasExactOmxSeededBehavioralDefaultsPair(config) {
|
|
490
|
+
return analyzeOmxSeededBehavioralDefaults(config).state === "exact-pair";
|
|
491
|
+
}
|
|
492
|
+
export function stripOmxSeededBehavioralDefaults(config) {
|
|
493
|
+
return [...analyzeOmxSeededBehavioralDefaults(config).spans]
|
|
494
|
+
.sort((left, right) => right.start - left.start)
|
|
495
|
+
.reduce((result, span) => result.slice(0, span.start) + result.slice(span.end), config);
|
|
411
496
|
}
|
|
412
497
|
function stripRootLevelKeys(config, keys) {
|
|
413
498
|
const { entries, remainder } = splitRootLevelEntries(config);
|
|
@@ -511,7 +596,6 @@ function upsertFeatureFlags(config, codexHookFeatureFlag = DEFAULT_CODEX_HOOK_FE
|
|
|
511
596
|
const base = config.trimEnd();
|
|
512
597
|
const featureBlock = [
|
|
513
598
|
"[features]",
|
|
514
|
-
"multi_agent = true",
|
|
515
599
|
"child_agents_md = true",
|
|
516
600
|
hookFeatureFlagLine,
|
|
517
601
|
"goals = true",
|
|
@@ -529,31 +613,19 @@ function upsertFeatureFlags(config, codexHookFeatureFlag = DEFAULT_CODEX_HOOK_FE
|
|
|
529
613
|
break;
|
|
530
614
|
}
|
|
531
615
|
}
|
|
532
|
-
// Remove deprecated
|
|
533
|
-
// the misspelled singular 'goal' flag written by unreleased PR builds.
|
|
616
|
+
// Remove deprecated collab and unreleased singular goal flags.
|
|
534
617
|
for (let i = sectionEnd - 1; i > featuresStart; i--) {
|
|
535
618
|
if (/^\s*(?:collab|goal)\s*=/.test(lines[i])) {
|
|
536
619
|
lines.splice(i, 1);
|
|
537
620
|
sectionEnd -= 1;
|
|
538
621
|
}
|
|
539
622
|
}
|
|
540
|
-
let multiAgentIdx = -1;
|
|
541
623
|
let childAgentsIdx = -1;
|
|
542
624
|
for (let i = featuresStart + 1; i < sectionEnd; i++) {
|
|
543
|
-
if (/^\s*
|
|
544
|
-
multiAgentIdx = i;
|
|
545
|
-
}
|
|
546
|
-
else if (/^\s*child_agents_md\s*=/.test(lines[i])) {
|
|
625
|
+
if (/^\s*child_agents_md\s*=/.test(lines[i])) {
|
|
547
626
|
childAgentsIdx = i;
|
|
548
627
|
}
|
|
549
628
|
}
|
|
550
|
-
if (multiAgentIdx >= 0) {
|
|
551
|
-
lines[multiAgentIdx] = "multi_agent = true";
|
|
552
|
-
}
|
|
553
|
-
else {
|
|
554
|
-
lines.splice(sectionEnd, 0, "multi_agent = true");
|
|
555
|
-
sectionEnd += 1;
|
|
556
|
-
}
|
|
557
629
|
if (childAgentsIdx >= 0) {
|
|
558
630
|
lines[childAgentsIdx] = "child_agents_md = true";
|
|
559
631
|
}
|
|
@@ -1015,52 +1087,12 @@ function upsertEnvSettings(config) {
|
|
|
1015
1087
|
}
|
|
1016
1088
|
return lines.join("\n");
|
|
1017
1089
|
}
|
|
1018
|
-
function upsertAgentsSettings(config) {
|
|
1019
|
-
const lines = config.split(/\r?\n/);
|
|
1020
|
-
const agentsStart = lines.findIndex((line) => /^\s*\[agents\]\s*$/.test(line));
|
|
1021
|
-
if (agentsStart < 0) {
|
|
1022
|
-
const base = config.trimEnd();
|
|
1023
|
-
const agentsBlock = [
|
|
1024
|
-
"[agents]",
|
|
1025
|
-
`max_threads = ${OMX_AGENTS_MAX_THREADS}`,
|
|
1026
|
-
`max_depth = ${OMX_AGENTS_MAX_DEPTH}`,
|
|
1027
|
-
"",
|
|
1028
|
-
].join("\n");
|
|
1029
|
-
if (base.length === 0)
|
|
1030
|
-
return agentsBlock;
|
|
1031
|
-
return `${base}\n\n${agentsBlock}`;
|
|
1032
|
-
}
|
|
1033
|
-
let sectionEnd = lines.length;
|
|
1034
|
-
for (let i = agentsStart + 1; i < lines.length; i++) {
|
|
1035
|
-
if (/^\s*\[\[?[^\]]+\]?\]\s*$/.test(lines[i])) {
|
|
1036
|
-
sectionEnd = i;
|
|
1037
|
-
break;
|
|
1038
|
-
}
|
|
1039
|
-
}
|
|
1040
|
-
let maxThreadsIdx = -1;
|
|
1041
|
-
let maxDepthIdx = -1;
|
|
1042
|
-
for (let i = agentsStart + 1; i < sectionEnd; i++) {
|
|
1043
|
-
if (/^\s*max_threads\s*=/.test(lines[i])) {
|
|
1044
|
-
maxThreadsIdx = i;
|
|
1045
|
-
}
|
|
1046
|
-
else if (/^\s*max_depth\s*=/.test(lines[i])) {
|
|
1047
|
-
maxDepthIdx = i;
|
|
1048
|
-
}
|
|
1049
|
-
}
|
|
1050
|
-
if (maxThreadsIdx < 0) {
|
|
1051
|
-
lines.splice(sectionEnd, 0, `max_threads = ${OMX_AGENTS_MAX_THREADS}`);
|
|
1052
|
-
sectionEnd += 1;
|
|
1053
|
-
}
|
|
1054
|
-
if (maxDepthIdx < 0) {
|
|
1055
|
-
lines.splice(sectionEnd, 0, `max_depth = ${OMX_AGENTS_MAX_DEPTH}`);
|
|
1056
|
-
}
|
|
1057
|
-
return lines.join("\n");
|
|
1058
|
-
}
|
|
1059
1090
|
/**
|
|
1060
1091
|
* Remove OMX-owned feature flags from the [features] section.
|
|
1092
|
+
* If `preserveMultiAgent` is set, retain multi_agent unchanged.
|
|
1061
1093
|
* If the section becomes empty after removal, remove the section header too.
|
|
1062
1094
|
*/
|
|
1063
|
-
export function stripOmxFeatureFlags(config) {
|
|
1095
|
+
export function stripOmxFeatureFlags(config, options = {}) {
|
|
1064
1096
|
const lines = config.split(/\r?\n/);
|
|
1065
1097
|
const featuresStart = lines.findIndex((line) => /^\s*\[features\]\s*$/.test(line));
|
|
1066
1098
|
if (featuresStart < 0)
|
|
@@ -1073,7 +1105,7 @@ export function stripOmxFeatureFlags(config) {
|
|
|
1073
1105
|
}
|
|
1074
1106
|
}
|
|
1075
1107
|
const omxFlags = [
|
|
1076
|
-
"multi_agent",
|
|
1108
|
+
...(options.preserveMultiAgent ? [] : ["multi_agent"]),
|
|
1077
1109
|
"child_agents_md",
|
|
1078
1110
|
"hooks",
|
|
1079
1111
|
"codex_hooks",
|
|
@@ -1139,10 +1171,6 @@ export function stripOmxEnvSettings(config) {
|
|
|
1139
1171
|
// ---------------------------------------------------------------------------
|
|
1140
1172
|
// Orphaned OMX table sections (no marker block)
|
|
1141
1173
|
// ---------------------------------------------------------------------------
|
|
1142
|
-
/**
|
|
1143
|
-
* Check whether a TOML table name belongs to a legacy OMX-managed agent entry.
|
|
1144
|
-
* Handles both `agents.name` and `agents."name"` forms.
|
|
1145
|
-
*/
|
|
1146
1174
|
function isOmxFirstPartyMcpSection(tableName) {
|
|
1147
1175
|
const match = tableName.match(/^mcp_servers\.(?:"([^"]+)"|([A-Za-z0-9_-]+))$/);
|
|
1148
1176
|
const name = match?.[1] ?? match?.[2];
|
|
@@ -1150,20 +1178,10 @@ function isOmxFirstPartyMcpSection(tableName) {
|
|
|
1150
1178
|
(OMX_FIRST_PARTY_MCP_SERVER_NAMES.includes(name) ||
|
|
1151
1179
|
name === "omx_team_run"));
|
|
1152
1180
|
}
|
|
1153
|
-
function isLegacyOmxAgentSection(tableName) {
|
|
1154
|
-
const m = tableName.match(/^agents\.(?:"([^"]+)"|(\w[\w-]*))$/);
|
|
1155
|
-
if (!m)
|
|
1156
|
-
return false;
|
|
1157
|
-
const name = m[1] || m[2] || "";
|
|
1158
|
-
return Object.prototype.hasOwnProperty.call(AGENT_DEFINITIONS, name);
|
|
1159
|
-
}
|
|
1160
1181
|
/**
|
|
1161
|
-
* Strip
|
|
1182
|
+
* Strip first-party OMX MCP table sections that exist outside the marker block.
|
|
1162
1183
|
* This covers legacy configs that were written before markers were added,
|
|
1163
1184
|
* or configs where the marker was accidentally removed.
|
|
1164
|
-
*
|
|
1165
|
-
* Targets: exact first-party [mcp_servers.<name>] entries, retired
|
|
1166
|
-
* [mcp_servers.omx_team_run], and legacy [agents.<name>] entries.
|
|
1167
1185
|
*/
|
|
1168
1186
|
function stripOrphanedOmxSections(config) {
|
|
1169
1187
|
const lines = config.split(/\r?\n/);
|
|
@@ -1177,8 +1195,7 @@ function stripOrphanedOmxSections(config) {
|
|
|
1177
1195
|
// Note: [tui] is NOT stripped here because it could be user-owned.
|
|
1178
1196
|
// The marker-based stripExistingOmxBlocks already handles [tui]
|
|
1179
1197
|
// when it lives inside the OMX marker block.
|
|
1180
|
-
const isOmxSection = isOmxFirstPartyMcpSection(tableName)
|
|
1181
|
-
isLegacyOmxAgentSection(tableName);
|
|
1198
|
+
const isOmxSection = isOmxFirstPartyMcpSection(tableName);
|
|
1182
1199
|
if (isOmxSection) {
|
|
1183
1200
|
// Remove preceding OMX comment lines and blank lines
|
|
1184
1201
|
while (result.length > 0) {
|
|
@@ -1726,13 +1743,13 @@ function getOmxTablesBlock(pkgRoot, includeTui = true, statusLinePreset = DEFAUL
|
|
|
1726
1743
|
*
|
|
1727
1744
|
* Layout:
|
|
1728
1745
|
* 1. OMX top-level keys (notify, model_reasoning_effort, developer_instructions)
|
|
1729
|
-
* 2. [features] with
|
|
1746
|
+
* 2. [features] with child_agents_md + hooks + goals
|
|
1730
1747
|
* 3. [shell_environment_policy.set] with defaulted deprecated explore-routing opt-out
|
|
1731
1748
|
* 4. … user sections …
|
|
1732
1749
|
* 5. OMX [table] sections (mcp_servers, tui)
|
|
1733
1750
|
*/
|
|
1734
1751
|
export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
|
|
1735
|
-
let existing = existingConfig;
|
|
1752
|
+
let existing = stripOmxSeededBehavioralDefaults(existingConfig);
|
|
1736
1753
|
const preservedFirstPartyMcpSections = options.preserveExistingFirstPartyMcp === true &&
|
|
1737
1754
|
options.includeFirstPartyMcp !== true
|
|
1738
1755
|
? extractFirstPartyOmxMcpSections(existing)
|
|
@@ -1755,11 +1772,11 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
|
|
|
1755
1772
|
!isOmxManagedNotifyCommand(getRootTomlArray(existing, "notify"), pkgRoot)
|
|
1756
1773
|
? getRootTomlArray(existing, "notify")
|
|
1757
1774
|
: null;
|
|
1758
|
-
existing = stripOmxTopLevelKeys(existing);
|
|
1775
|
+
existing = stripOmxTopLevelKeys(existing).trimStart();
|
|
1759
1776
|
if (userNotifyToPreserve) {
|
|
1760
1777
|
existing = `${`notify = ${formatTomlStringArray(userNotifyToPreserve)}`}\n${existing.trimStart()}`;
|
|
1761
1778
|
}
|
|
1762
|
-
existing = stripOrphanedManagedNotify(existing, pkgRoot);
|
|
1779
|
+
existing = stripOrphanedManagedNotify(existing, pkgRoot).trimStart();
|
|
1763
1780
|
const managedTrustState = buildManagedCodexHookTrustStateForConfig(options.codexHooksFile, pkgRoot, {
|
|
1764
1781
|
codexHomeDir: options.codexHomeDir,
|
|
1765
1782
|
platform: options.hookCommandPlatform,
|
|
@@ -1777,7 +1794,6 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
|
|
|
1777
1794
|
}
|
|
1778
1795
|
existing = upsertFeatureFlags(existing, options.codexHookFeatureFlag);
|
|
1779
1796
|
existing = upsertEnvSettings(existing);
|
|
1780
|
-
existing = upsertAgentsSettings(existing);
|
|
1781
1797
|
const tuiUpsert = includeTui
|
|
1782
1798
|
? upsertTuiStatusLine(existing, statusLinePreset, {
|
|
1783
1799
|
forceStatusLinePreset: options.forceStatusLinePreset,
|
|
@@ -1792,11 +1808,12 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
|
|
|
1792
1808
|
platform: options.hookCommandPlatform,
|
|
1793
1809
|
}, options.includeFirstPartyMcp === true, hookTrustStrip.preservedConflictKeys);
|
|
1794
1810
|
const sharedRegistryBlock = getSharedMcpRegistryBlock(options.sharedMcpServers ?? [], options.sharedMcpRegistrySource, existing);
|
|
1795
|
-
let body = existing.
|
|
1811
|
+
let body = existing.trim();
|
|
1796
1812
|
if (sharedRegistryBlock) {
|
|
1797
1813
|
body = body ? `${body}\n\n${sharedRegistryBlock}` : sharedRegistryBlock;
|
|
1798
1814
|
}
|
|
1799
|
-
|
|
1815
|
+
const bodySeparator = body.length > 0 && !/^\s*\[/.test(body) ? "\n" : "\n\n";
|
|
1816
|
+
return addDefaultLauncherMcpStartupTimeouts(topLines.join("\n") + bodySeparator + body + "\n" + tablesBlock);
|
|
1800
1817
|
}
|
|
1801
1818
|
/**
|
|
1802
1819
|
* Detect and repair upgrade-era managed config incompatibilities in config.toml.
|