oh-my-codex 0.17.0 → 0.17.2
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 +5 -5
- package/Cargo.toml +1 -1
- package/dist/cli/__tests__/question.test.js +2 -0
- package/dist/cli/__tests__/question.test.js.map +1 -1
- package/dist/cli/__tests__/ralph-goal-mode-contract.test.js +3 -0
- package/dist/cli/__tests__/ralph-goal-mode-contract.test.js.map +1 -1
- package/dist/cli/__tests__/ralph.test.js +0 -124
- package/dist/cli/__tests__/ralph.test.js.map +1 -1
- package/dist/cli/__tests__/setup-install-mode.test.js +156 -3
- package/dist/cli/__tests__/setup-install-mode.test.js.map +1 -1
- package/dist/cli/__tests__/setup-refresh.test.js +3 -3
- package/dist/cli/__tests__/setup-refresh.test.js.map +1 -1
- package/dist/cli/__tests__/team.test.js +166 -42
- package/dist/cli/__tests__/team.test.js.map +1 -1
- package/dist/cli/doctor.js +9 -4
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/plugin-marketplace.d.ts +5 -1
- package/dist/cli/plugin-marketplace.d.ts.map +1 -1
- package/dist/cli/plugin-marketplace.js +31 -2
- package/dist/cli/plugin-marketplace.js.map +1 -1
- package/dist/cli/question.d.ts +1 -1
- package/dist/cli/question.d.ts.map +1 -1
- package/dist/cli/question.js +98 -4
- package/dist/cli/question.js.map +1 -1
- package/dist/cli/ralph.d.ts.map +1 -1
- package/dist/cli/ralph.js +1 -49
- package/dist/cli/ralph.js.map +1 -1
- package/dist/cli/setup.d.ts +1 -0
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +75 -9
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/team.d.ts.map +1 -1
- package/dist/cli/team.js +21 -29
- package/dist/cli/team.js.map +1 -1
- package/dist/config/generator.d.ts +4 -0
- package/dist/config/generator.d.ts.map +1 -1
- package/dist/config/generator.js +58 -0
- package/dist/config/generator.js.map +1 -1
- package/dist/hooks/__tests__/agents-overlay.test.js +29 -0
- package/dist/hooks/__tests__/agents-overlay.test.js.map +1 -1
- package/dist/hooks/__tests__/session.test.js +126 -1
- package/dist/hooks/__tests__/session.test.js.map +1 -1
- package/dist/hooks/agents-overlay.d.ts.map +1 -1
- package/dist/hooks/agents-overlay.js +6 -3
- package/dist/hooks/agents-overlay.js.map +1 -1
- package/dist/hooks/session.d.ts +11 -3
- package/dist/hooks/session.d.ts.map +1 -1
- package/dist/hooks/session.js +68 -6
- package/dist/hooks/session.js.map +1 -1
- package/dist/hud/__tests__/reconcile.test.js +63 -0
- package/dist/hud/__tests__/reconcile.test.js.map +1 -1
- package/dist/hud/__tests__/tmux.test.d.ts +2 -0
- package/dist/hud/__tests__/tmux.test.d.ts.map +1 -0
- package/dist/hud/__tests__/tmux.test.js +92 -0
- package/dist/hud/__tests__/tmux.test.js.map +1 -0
- package/dist/hud/reconcile.d.ts +2 -0
- package/dist/hud/reconcile.d.ts.map +1 -1
- package/dist/hud/reconcile.js +14 -1
- package/dist/hud/reconcile.js.map +1 -1
- package/dist/hud/tmux.d.ts +12 -0
- package/dist/hud/tmux.d.ts.map +1 -1
- package/dist/hud/tmux.js +88 -0
- package/dist/hud/tmux.js.map +1 -1
- package/dist/mcp/__tests__/hermes-bridge.test.js +82 -1
- package/dist/mcp/__tests__/hermes-bridge.test.js.map +1 -1
- package/dist/mcp/hermes-bridge.d.ts +34 -1
- package/dist/mcp/hermes-bridge.d.ts.map +1 -1
- package/dist/mcp/hermes-bridge.js +75 -0
- package/dist/mcp/hermes-bridge.js.map +1 -1
- package/dist/mcp/hermes-server.d.ts +111 -6
- package/dist/mcp/hermes-server.d.ts.map +1 -1
- package/dist/mcp/hermes-server.js +38 -1
- package/dist/mcp/hermes-server.js.map +1 -1
- package/dist/pipeline/__tests__/stages.test.js +18 -9
- package/dist/pipeline/__tests__/stages.test.js.map +1 -1
- package/dist/pipeline/stages/team-exec.d.ts.map +1 -1
- package/dist/pipeline/stages/team-exec.js +2 -7
- package/dist/pipeline/stages/team-exec.js.map +1 -1
- package/dist/planning/__tests__/approved-execution-lifecycle-matrix.test.js +111 -269
- package/dist/planning/__tests__/approved-execution-lifecycle-matrix.test.js.map +1 -1
- package/dist/planning/__tests__/approved-launch-hint-lineage-matrix.test.js +31 -72
- package/dist/planning/__tests__/approved-launch-hint-lineage-matrix.test.js.map +1 -1
- package/dist/planning/__tests__/artifacts.test.js +27 -372
- package/dist/planning/__tests__/artifacts.test.js.map +1 -1
- package/dist/planning/artifacts.d.ts +1 -14
- package/dist/planning/artifacts.d.ts.map +1 -1
- package/dist/planning/artifacts.js +11 -31
- package/dist/planning/artifacts.js.map +1 -1
- package/dist/question/__tests__/state.test.js +349 -1
- package/dist/question/__tests__/state.test.js.map +1 -1
- package/dist/question/__tests__/ui.test.js +6 -6
- package/dist/question/__tests__/ui.test.js.map +1 -1
- package/dist/question/events.d.ts +53 -0
- package/dist/question/events.d.ts.map +1 -0
- package/dist/question/events.js +201 -0
- package/dist/question/events.js.map +1 -0
- package/dist/question/state.d.ts +30 -2
- package/dist/question/state.d.ts.map +1 -1
- package/dist/question/state.js +276 -5
- package/dist/question/state.js.map +1 -1
- package/dist/question/types.d.ts +1 -0
- package/dist/question/types.d.ts.map +1 -1
- package/dist/question/types.js.map +1 -1
- package/dist/question/ui.d.ts.map +1 -1
- package/dist/question/ui.js +3 -18
- package/dist/question/ui.js.map +1 -1
- package/dist/ralph/__tests__/completion-audit.test.js +39 -0
- package/dist/ralph/__tests__/completion-audit.test.js.map +1 -1
- package/dist/scripts/__tests__/codex-native-hook.test.js +111 -1
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/__tests__/run-test-files.test.js +22 -0
- package/dist/scripts/__tests__/run-test-files.test.js.map +1 -1
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +93 -1
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/scripts/codex-native-pre-post.d.ts.map +1 -1
- package/dist/scripts/codex-native-pre-post.js +12 -6
- package/dist/scripts/codex-native-pre-post.js.map +1 -1
- package/dist/scripts/run-test-files.js +12 -1
- package/dist/scripts/run-test-files.js.map +1 -1
- package/dist/team/__tests__/approved-execution.test.js +25 -24
- package/dist/team/__tests__/approved-execution.test.js.map +1 -1
- package/dist/team/__tests__/runtime.test.js +173 -26
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/__tests__/scaling.test.js +66 -17
- package/dist/team/__tests__/scaling.test.js.map +1 -1
- package/dist/team/__tests__/tmux-session.test.js +42 -0
- package/dist/team/__tests__/tmux-session.test.js.map +1 -1
- package/dist/team/__tests__/worker-bootstrap.test.js +205 -0
- package/dist/team/__tests__/worker-bootstrap.test.js.map +1 -1
- package/dist/team/approved-execution.d.ts +13 -0
- package/dist/team/approved-execution.d.ts.map +1 -1
- package/dist/team/approved-execution.js +65 -30
- package/dist/team/approved-execution.js.map +1 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +28 -24
- package/dist/team/runtime.js.map +1 -1
- package/dist/team/scaling.d.ts.map +1 -1
- package/dist/team/scaling.js +7 -8
- package/dist/team/scaling.js.map +1 -1
- package/dist/team/tmux-session.d.ts.map +1 -1
- package/dist/team/tmux-session.js +48 -2
- package/dist/team/tmux-session.js.map +1 -1
- package/dist/team/ultragoal-context.d.ts +35 -0
- package/dist/team/ultragoal-context.d.ts.map +1 -0
- package/dist/team/ultragoal-context.js +191 -0
- package/dist/team/ultragoal-context.js.map +1 -0
- package/dist/ultragoal/__tests__/docs-contract.test.js +19 -0
- package/dist/ultragoal/__tests__/docs-contract.test.js.map +1 -1
- package/package.json +1 -1
- package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
- package/plugins/oh-my-codex/skills/plan/SKILL.md +3 -3
- package/plugins/oh-my-codex/skills/ralph/SKILL.md +2 -2
- package/plugins/oh-my-codex/skills/ralplan/SKILL.md +1 -1
- package/plugins/oh-my-codex/skills/team/SKILL.md +6 -0
- package/plugins/oh-my-codex/skills/ultragoal/SKILL.md +11 -0
- package/skills/plan/SKILL.md +3 -3
- package/skills/ralph/SKILL.md +2 -2
- package/skills/ralplan/SKILL.md +1 -1
- package/skills/team/SKILL.md +6 -0
- package/skills/ultragoal/SKILL.md +11 -0
- package/src/scripts/__tests__/codex-native-hook.test.ts +133 -1
- package/src/scripts/__tests__/run-test-files.test.ts +32 -0
- package/src/scripts/codex-native-hook.ts +121 -2
- package/src/scripts/codex-native-pre-post.ts +12 -6
- package/src/scripts/run-test-files.ts +13 -2
- package/dist/planning/__tests__/context-pack-status.test.d.ts +0 -2
- package/dist/planning/__tests__/context-pack-status.test.d.ts.map +0 -1
- package/dist/planning/__tests__/context-pack-status.test.js +0 -795
- package/dist/planning/__tests__/context-pack-status.test.js.map +0 -1
- package/dist/planning/__tests__/ready-context-pack-role-refs.test.d.ts +0 -2
- package/dist/planning/__tests__/ready-context-pack-role-refs.test.d.ts.map +0 -1
- package/dist/planning/__tests__/ready-context-pack-role-refs.test.js +0 -612
- package/dist/planning/__tests__/ready-context-pack-role-refs.test.js.map +0 -1
- package/dist/planning/context-pack-status.d.ts +0 -73
- package/dist/planning/context-pack-status.d.ts.map +0 -1
- package/dist/planning/context-pack-status.js +0 -745
- package/dist/planning/context-pack-status.js.map +0 -1
package/dist/cli/ralph.js
CHANGED
|
@@ -172,55 +172,7 @@ function buildRalphApprovedContextLines(approvedHint) {
|
|
|
172
172
|
lines.push('Approved repository context summary (bounded, inspectable):');
|
|
173
173
|
lines.push(approvedHint.repositoryContextSummary.content);
|
|
174
174
|
}
|
|
175
|
-
|
|
176
|
-
if (approvedHint.contextPack) {
|
|
177
|
-
lines.push(`- approved context pack: ${approvedHint.contextPack.path}`);
|
|
178
|
-
}
|
|
179
|
-
if (approvedHint.contextPackRoleRefs) {
|
|
180
|
-
const { build, verify, scope } = approvedHint.contextPackRoleRefs;
|
|
181
|
-
if (build.length > 0) {
|
|
182
|
-
lines.push(`- build refs (read first): ${build.join(', ')}`);
|
|
183
|
-
}
|
|
184
|
-
if (verify.length > 0) {
|
|
185
|
-
lines.push(`- verify refs: ${verify.join(', ')}`);
|
|
186
|
-
}
|
|
187
|
-
if (scope.length > 0) {
|
|
188
|
-
lines.push(`- scope refs: ${scope.join(', ')}`);
|
|
189
|
-
}
|
|
190
|
-
if (build.length > 0 || verify.length > 0 || scope.length > 0) {
|
|
191
|
-
lines.push(build.length > 0
|
|
192
|
-
? '- Read the build refs above before broader repo exploration.'
|
|
193
|
-
: '- Read the approved refs above before broader repo exploration.');
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
|
-
return lines;
|
|
197
|
-
}
|
|
198
|
-
if (approvedHint.contextPackStatus === 'plan-only') {
|
|
199
|
-
lines.push('- context pack: not declared in the approved plan; using the pre-context-pack plan-only handoff baseline.');
|
|
200
|
-
lines.push('- Plan-only fallback: use the approved plan, matching test specs, and any deep-interview artifacts as repair inputs; do not treat this as approved context-bearing execution.');
|
|
201
|
-
return lines;
|
|
202
|
-
}
|
|
203
|
-
if (approvedHint.contextPackStatus === 'incomplete') {
|
|
204
|
-
if (approvedHint.contextPackIssues.length > 0) {
|
|
205
|
-
lines.push(`- incomplete context pack issues: ${approvedHint.contextPackIssues.join(' | ')}`);
|
|
206
|
-
}
|
|
207
|
-
if (approvedHint.missingRequiredContextPackRoles.length > 0) {
|
|
208
|
-
lines.push(`- missing required context roles: ${approvedHint.missingRequiredContextPackRoles.join(', ')}`);
|
|
209
|
-
}
|
|
210
|
-
lines.push('- Incomplete-pack fallback: use the approved plan, matching test specs, and any deep-interview artifacts only as repair inputs; repair or recreate the canonical context pack with required role coverage before broadening context.');
|
|
211
|
-
return lines;
|
|
212
|
-
}
|
|
213
|
-
if (approvedHint.contextPackStatus === 'invalid') {
|
|
214
|
-
if (approvedHint.contextPackIssues.length > 0) {
|
|
215
|
-
lines.push(`- invalid context pack issues: ${approvedHint.contextPackIssues.join(' | ')}`);
|
|
216
|
-
}
|
|
217
|
-
lines.push('- Invalid-pack fallback: use the approved plan, matching test specs, and any deep-interview artifacts only as repair inputs; repair or recreate the canonical context pack before broadening context.');
|
|
218
|
-
return lines;
|
|
219
|
-
}
|
|
220
|
-
if (approvedHint.contextPackIssues.length > 0) {
|
|
221
|
-
lines.push(`- missing-baseline issues: ${approvedHint.contextPackIssues.join(' | ')}`);
|
|
222
|
-
}
|
|
223
|
-
lines.push('- Missing-baseline fallback: the latest approved plan is missing its matching test spec, so use the surfaced plan as lineage guidance only and restore the missing baseline before broadening context.');
|
|
175
|
+
lines.push('- Approved execution baseline is ready: use the approved plan, matching test specs, and any deep-interview artifacts as execution inputs.');
|
|
224
176
|
return lines;
|
|
225
177
|
}
|
|
226
178
|
export function normalizeRalphCliArgs(args) {
|
package/dist/cli/ralph.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ralph.js","sourceRoot":"","sources":["../../src/cli/ralph.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ralph.js","sourceRoot":"","sources":["../../src/cli/ralph.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/setup.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ interface SetupOptions {
|
|
|
21
21
|
pluginAgentsMdPrompt?: (destinationPath: string) => Promise<boolean>;
|
|
22
22
|
pluginDeveloperInstructionsPrompt?: (configPath: string) => Promise<boolean>;
|
|
23
23
|
pluginDeveloperInstructionsOverwritePrompt?: (configPath: string) => Promise<boolean>;
|
|
24
|
+
firstPartyMcpRemovalPrompt?: (configPath: string, registrationKinds: string[]) => Promise<boolean>;
|
|
24
25
|
mcpRegistryCandidates?: string[];
|
|
25
26
|
}
|
|
26
27
|
export { SETUP_INSTALL_MODES, SETUP_MCP_MODES, SETUP_SCOPES };
|
package/dist/cli/setup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/cli/setup.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/cli/setup.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/setup.js
CHANGED
|
@@ -9,7 +9,7 @@ import { spawnSync } from "child_process";
|
|
|
9
9
|
import { createInterface } from "readline/promises";
|
|
10
10
|
import { homedir } from "os";
|
|
11
11
|
import { codexHome, codexConfigPath, codexPromptsDir, codexAgentsDir, userSkillsDir, omxStateDir, detectLegacySkillRootOverlap, omxPlansDir, omxLogsDir, } from "../utils/paths.js";
|
|
12
|
-
import { buildMergedConfig, getRootModelName, getRootTomlArray, hasLegacyOmxTeamRunTable, isOmxManagedNotifyCommand, sanitizePreviousNotifyCommand, stripExistingOmxBlocks, stripExistingSharedMcpRegistryBlock, mergeSharedMcpRegistryBlock, stripOmxEnvSettings, stripOmxFeatureFlags, stripOmxSeededBehavioralDefaults, upsertPluginModeRuntimeFeatureFlags, upsertManagedCodexHookTrustState, stripManagedCodexHookTrustState, OMX_PLUGIN_DEVELOPER_INSTRUCTIONS, } from "../config/generator.js";
|
|
12
|
+
import { buildMergedConfig, getRootModelName, getRootTomlArray, hasLegacyOmxTeamRunTable, isOmxManagedNotifyCommand, sanitizePreviousNotifyCommand, stripExistingOmxBlocks, stripExistingSharedMcpRegistryBlock, mergeSharedMcpRegistryBlock, stripOmxEnvSettings, stripOmxFeatureFlags, stripOmxSeededBehavioralDefaults, upsertPluginModeRuntimeFeatureFlags, upsertManagedCodexHookTrustState, stripManagedCodexHookTrustState, OMX_PLUGIN_DEVELOPER_INSTRUCTIONS, hasFirstPartyOmxMcpRegistrations, extractFirstPartyOmxMcpSections, stripFirstPartyOmxMcpSections, } from "../config/generator.js";
|
|
13
13
|
import { buildManagedCodexNativeHookWindowsShimContent, buildManagedCodexNativeHookWindowsShimPath, mergeManagedCodexHooksConfig, } from "../config/codex-hooks.js";
|
|
14
14
|
import { getLegacyUnifiedMcpRegistryCandidate, getUnifiedMcpRegistryCandidates, loadUnifiedMcpRegistry, planClaudeCodeMcpSettingsSync, } from "../config/mcp-registry.js";
|
|
15
15
|
import { generateAgentToml } from "../agents/native-config.js";
|
|
@@ -23,7 +23,7 @@ import { DEFAULT_FRONTIER_MODEL } from "../config/models.js";
|
|
|
23
23
|
import { addGeneratedAgentsMarker, hasOmxManagedAgentsSections, isOmxGeneratedAgentsMd, upsertManagedAgentsBlock, } from "../utils/agents-md.js";
|
|
24
24
|
import { DEFAULT_HUD_CONFIG } from "../hud/types.js";
|
|
25
25
|
import { SETUP_INSTALL_MODES, SETUP_MCP_MODES, SETUP_SCOPES, getSetupScopeFilePath, readPersistedSetupPreferences, } from "./setup-preferences.js";
|
|
26
|
-
import { OMX_LOCAL_MARKETPLACE_NAME, OMX_PLUGIN_NAME, materializePackagedOmxPluginCache, resolvePackagedOmxMarketplace, upsertLocalOmxMarketplaceRegistration, upsertLocalOmxPluginEnablement, upsertLocalOmxPluginMcpServerEnablement, } from "./plugin-marketplace.js";
|
|
26
|
+
import { OMX_LOCAL_MARKETPLACE_NAME, OMX_PLUGIN_NAME, materializePackagedOmxPluginCache, resolvePackagedOmxMarketplace, upsertLocalOmxMarketplaceRegistration, upsertLocalOmxPluginEnablement, upsertLocalOmxPluginMcpServerEnablement, hasLocalOmxPluginMcpServerRegistrations, } from "./plugin-marketplace.js";
|
|
27
27
|
import { resolveCodexHookFeatureFlagForCli } from "./codex-feature-probe.js";
|
|
28
28
|
async function resolveStatusLinePresetForSetup(projectRoot, options) {
|
|
29
29
|
if (options.force) {
|
|
@@ -349,6 +349,28 @@ async function promptForSetupInstallMode(defaultMode) {
|
|
|
349
349
|
rl.close();
|
|
350
350
|
}
|
|
351
351
|
}
|
|
352
|
+
async function promptForFirstPartyMcpRemoval(configPath, registrationKinds) {
|
|
353
|
+
if (!process.stdin.isTTY || !process.stdout.isTTY) {
|
|
354
|
+
return false;
|
|
355
|
+
}
|
|
356
|
+
const rl = createInterface({
|
|
357
|
+
input: process.stdin,
|
|
358
|
+
output: process.stdout,
|
|
359
|
+
});
|
|
360
|
+
try {
|
|
361
|
+
console.log("Deprecated first-party OMX MCP registration detected:");
|
|
362
|
+
console.log(` ${configPath}`);
|
|
363
|
+
console.log(` ${registrationKinds.join(", ")}`);
|
|
364
|
+
console.log(" OMX is CLI-first by default now; first-party MCP compatibility is legacy/explicit.");
|
|
365
|
+
const answer = (await rl.question("Remove first-party OMX MCP registrations now? [y/N]: "))
|
|
366
|
+
.trim()
|
|
367
|
+
.toLowerCase();
|
|
368
|
+
return answer === "y" || answer === "yes";
|
|
369
|
+
}
|
|
370
|
+
finally {
|
|
371
|
+
rl.close();
|
|
372
|
+
}
|
|
373
|
+
}
|
|
352
374
|
function hasPersistedSetupPreferences(preferences) {
|
|
353
375
|
return Boolean(preferences?.scope || preferences?.installMode);
|
|
354
376
|
}
|
|
@@ -902,7 +924,7 @@ function insertRootTomlKey(config, line) {
|
|
|
902
924
|
const after = lines.slice(firstTableIndex);
|
|
903
925
|
return [...before, line, "", ...after].join("\n") + "\n";
|
|
904
926
|
}
|
|
905
|
-
async function ensurePluginMarketplaceRegistration(configPath, pkgRoot, mcpMode, backupContext, summary, options) {
|
|
927
|
+
async function ensurePluginMarketplaceRegistration(configPath, pkgRoot, mcpMode, removeFirstPartyMcp, backupContext, summary, options) {
|
|
906
928
|
const packagedMarketplace = await resolvePackagedOmxMarketplace(pkgRoot);
|
|
907
929
|
if (!packagedMarketplace) {
|
|
908
930
|
summary.skipped += 1;
|
|
@@ -911,7 +933,7 @@ async function ensurePluginMarketplaceRegistration(configPath, pkgRoot, mcpMode,
|
|
|
911
933
|
const existingConfig = existsSync(configPath)
|
|
912
934
|
? await readFile(configPath, "utf-8")
|
|
913
935
|
: "";
|
|
914
|
-
const nextConfig = upsertLocalOmxMarketplaceRegistration(upsertLocalOmxPluginMcpServerEnablement(upsertLocalOmxPluginEnablement(existingConfig), mcpMode === "compat"), pkgRoot);
|
|
936
|
+
const nextConfig = upsertLocalOmxMarketplaceRegistration(upsertLocalOmxPluginMcpServerEnablement(upsertLocalOmxPluginEnablement(existingConfig), mcpMode === "compat", { removeWhenDisabled: removeFirstPartyMcp }), pkgRoot);
|
|
915
937
|
const destinationExists = existsSync(configPath);
|
|
916
938
|
if (nextConfig === existingConfig) {
|
|
917
939
|
summary.unchanged += 1;
|
|
@@ -997,7 +1019,11 @@ async function cleanupPluginModeLegacyConfig(configPath, backupContext, options)
|
|
|
997
1019
|
if (!existsSync(configPath))
|
|
998
1020
|
return false;
|
|
999
1021
|
const original = await readFile(configPath, "utf-8");
|
|
1022
|
+
const preservedFirstPartyMcp = options.preserveFirstPartyMcp
|
|
1023
|
+
? extractFirstPartyOmxMcpSections(original)
|
|
1024
|
+
: "";
|
|
1000
1025
|
let config = original;
|
|
1026
|
+
config = stripFirstPartyOmxMcpSections(config);
|
|
1001
1027
|
config = stripExistingOmxBlocks(config).cleaned;
|
|
1002
1028
|
config = stripExistingSharedMcpRegistryBlock(config).cleaned;
|
|
1003
1029
|
config = stripPluginModeLegacyRootDefaults(config);
|
|
@@ -1005,6 +1031,9 @@ async function cleanupPluginModeLegacyConfig(configPath, backupContext, options)
|
|
|
1005
1031
|
config = stripOmxFeatureFlags(config);
|
|
1006
1032
|
config = stripManagedCodexHookTrustState(config);
|
|
1007
1033
|
config = stripOmxEnvSettings(config);
|
|
1034
|
+
if (preservedFirstPartyMcp) {
|
|
1035
|
+
config = `${config.trimEnd()}\n\n${preservedFirstPartyMcp}\n`;
|
|
1036
|
+
}
|
|
1008
1037
|
config = config.trim();
|
|
1009
1038
|
const nextConfig = config.length > 0 ? `${config}\n` : "";
|
|
1010
1039
|
if (nextConfig === original)
|
|
@@ -1043,7 +1072,7 @@ async function cleanupPluginModeLegacyAgentsMd(agentsMdPath, backupContext, opti
|
|
|
1043
1072
|
return true;
|
|
1044
1073
|
}
|
|
1045
1074
|
export async function setup(options = {}) {
|
|
1046
|
-
const { force = false, dryRun = false, installMode: requestedInstallMode, mcpMode: requestedMcpMode, scope: requestedScope, verbose = false, setupScopePrompt, persistedSetupReviewPrompt, installModePrompt, modelUpgradePrompt, pluginAgentsMdPrompt, pluginDeveloperInstructionsPrompt, pluginDeveloperInstructionsOverwritePrompt, } = options;
|
|
1075
|
+
const { force = false, dryRun = false, installMode: requestedInstallMode, mcpMode: requestedMcpMode, scope: requestedScope, verbose = false, setupScopePrompt, persistedSetupReviewPrompt, installModePrompt, modelUpgradePrompt, pluginAgentsMdPrompt, pluginDeveloperInstructionsPrompt, pluginDeveloperInstructionsOverwritePrompt, firstPartyMcpRemovalPrompt, } = options;
|
|
1047
1076
|
const pkgRoot = getPackageRoot();
|
|
1048
1077
|
const projectRoot = process.cwd();
|
|
1049
1078
|
const persistedPreferences = await readPersistedSetupPreferences(projectRoot, { warnOnLegacyScope: true });
|
|
@@ -1072,6 +1101,29 @@ export async function setup(options = {}) {
|
|
|
1072
1101
|
const resolvedInstallMode = await resolveSetupInstallMode(projectRoot, resolvedScope.scope, requestedInstallMode, installModePrompt, persistedReviewDecision, persistedPreferences);
|
|
1073
1102
|
const resolvedMcpMode = resolveSetupMcpMode(resolvedScope.scope, requestedMcpMode, persistedReviewDecision, persistedPreferences);
|
|
1074
1103
|
const scopeDirs = resolveScopeDirectories(resolvedScope.scope, projectRoot);
|
|
1104
|
+
const existingConfigForMcpMigration = existsSync(scopeDirs.codexConfigFile)
|
|
1105
|
+
? await readFile(scopeDirs.codexConfigFile, "utf-8")
|
|
1106
|
+
: "";
|
|
1107
|
+
const firstPartyMcpRegistrationKinds = [
|
|
1108
|
+
hasFirstPartyOmxMcpRegistrations(existingConfigForMcpMigration)
|
|
1109
|
+
? "config.toml [mcp_servers.omx_*]"
|
|
1110
|
+
: null,
|
|
1111
|
+
hasLocalOmxPluginMcpServerRegistrations(existingConfigForMcpMigration)
|
|
1112
|
+
? "plugin mcp_servers overrides"
|
|
1113
|
+
: null,
|
|
1114
|
+
].filter((kind) => typeof kind === "string");
|
|
1115
|
+
let removeFirstPartyMcpRegistrations = false;
|
|
1116
|
+
const shouldOfferFirstPartyMcpRemoval = resolvedMcpMode.mcpMode !== "compat" &&
|
|
1117
|
+
firstPartyMcpRegistrationKinds.length > 0;
|
|
1118
|
+
if (shouldOfferFirstPartyMcpRemoval) {
|
|
1119
|
+
const canPrompt = typeof firstPartyMcpRemovalPrompt === "function" ||
|
|
1120
|
+
(process.stdin.isTTY && process.stdout.isTTY);
|
|
1121
|
+
if (canPrompt) {
|
|
1122
|
+
removeFirstPartyMcpRegistrations = firstPartyMcpRemovalPrompt
|
|
1123
|
+
? await firstPartyMcpRemovalPrompt(scopeDirs.codexConfigFile, firstPartyMcpRegistrationKinds)
|
|
1124
|
+
: await promptForFirstPartyMcpRemoval(scopeDirs.codexConfigFile, firstPartyMcpRegistrationKinds);
|
|
1125
|
+
}
|
|
1126
|
+
}
|
|
1075
1127
|
const scopeSourceMessage = resolvedScope.source === "persisted" ? " (from .omx/setup-scope.json)" : "";
|
|
1076
1128
|
const backupContext = getBackupContext(resolvedScope.scope, projectRoot);
|
|
1077
1129
|
const isPluginInstallMode = resolvedInstallMode?.installMode === "plugin";
|
|
@@ -1101,6 +1153,14 @@ export async function setup(options = {}) {
|
|
|
1101
1153
|
? " (from .omx/setup-scope.json)"
|
|
1102
1154
|
: "";
|
|
1103
1155
|
console.log(`Using setup MCP mode: ${resolvedMcpMode.mcpMode}${mcpModeSourceMessage}\n`);
|
|
1156
|
+
if (shouldOfferFirstPartyMcpRemoval) {
|
|
1157
|
+
if (removeFirstPartyMcpRegistrations) {
|
|
1158
|
+
console.log("Deprecated first-party OMX MCP registrations will be removed from config.toml during this setup run.\n");
|
|
1159
|
+
}
|
|
1160
|
+
else {
|
|
1161
|
+
console.log("warning: deprecated first-party OMX MCP registrations were detected but preserved. OMX supports CLI-first setup by default; rerun interactively and answer yes to remove them, or use --mcp compat only when explicit MCP compatibility is required.\n");
|
|
1162
|
+
}
|
|
1163
|
+
}
|
|
1104
1164
|
// Step 1: Ensure directories exist
|
|
1105
1165
|
console.log("[1/8] Creating directories...");
|
|
1106
1166
|
const dirs = isPluginInstallMode
|
|
@@ -1270,14 +1330,19 @@ export async function setup(options = {}) {
|
|
|
1270
1330
|
console.log(` warning: ${warning}`);
|
|
1271
1331
|
}
|
|
1272
1332
|
if (isPluginInstallMode) {
|
|
1273
|
-
const configCleaned = await cleanupPluginModeLegacyConfig(scopeDirs.codexConfigFile, backupContext, {
|
|
1333
|
+
const configCleaned = await cleanupPluginModeLegacyConfig(scopeDirs.codexConfigFile, backupContext, {
|
|
1334
|
+
dryRun,
|
|
1335
|
+
verbose,
|
|
1336
|
+
preserveFirstPartyMcp: shouldOfferFirstPartyMcpRemoval &&
|
|
1337
|
+
!removeFirstPartyMcpRegistrations,
|
|
1338
|
+
});
|
|
1274
1339
|
if (configCleaned)
|
|
1275
1340
|
summary.config.removed += 1;
|
|
1276
1341
|
console.log(configCleaned
|
|
1277
1342
|
? ` ${dryRun ? "Would clean" : "Cleaned"} legacy OMX config entries for plugin mode.\n`
|
|
1278
1343
|
: " Config refresh skipped; no legacy OMX config entries found.\n");
|
|
1279
1344
|
await applyPluginModeHooksConfig(scopeDirs.codexConfigFile, scopeDirs.codexHooksFile, pkgRoot, scopeDirs.codexHomeDir, backupContext, summary.config, { dryRun, verbose, codexHookFeatureFlag });
|
|
1280
|
-
const pluginMarketplaceResult = await ensurePluginMarketplaceRegistration(scopeDirs.codexConfigFile, pkgRoot, resolvedMcpMode.mcpMode, backupContext, summary.config, { dryRun, verbose });
|
|
1345
|
+
const pluginMarketplaceResult = await ensurePluginMarketplaceRegistration(scopeDirs.codexConfigFile, pkgRoot, resolvedMcpMode.mcpMode, removeFirstPartyMcpRegistrations, backupContext, summary.config, { dryRun, verbose });
|
|
1281
1346
|
if (pluginMarketplaceResult === "unavailable") {
|
|
1282
1347
|
console.log(` warning: packaged ${OMX_LOCAL_MARKETPLACE_NAME} Codex plugin marketplace metadata not found; /skills plugin discovery was not registered.`);
|
|
1283
1348
|
}
|
|
@@ -1337,7 +1402,7 @@ export async function setup(options = {}) {
|
|
|
1337
1402
|
}
|
|
1338
1403
|
else {
|
|
1339
1404
|
const statusLinePreset = await resolveStatusLinePresetForSetup(projectRoot, { force });
|
|
1340
|
-
const managedConfig = await updateManagedConfig(scopeDirs.codexConfigFile, scopeDirs.codexHooksFile, pkgRoot, sharedMcpRegistry, resolvedMcpMode.mcpMode, resolvedScope.scope, scopeDirs.codexHomeDir, summary.config, backupContext, {
|
|
1405
|
+
const managedConfig = await updateManagedConfig(scopeDirs.codexConfigFile, scopeDirs.codexHooksFile, pkgRoot, sharedMcpRegistry, resolvedMcpMode.mcpMode, shouldOfferFirstPartyMcpRemoval && !removeFirstPartyMcpRegistrations, resolvedScope.scope, scopeDirs.codexHomeDir, summary.config, backupContext, {
|
|
1341
1406
|
dryRun,
|
|
1342
1407
|
modelUpgradePrompt,
|
|
1343
1408
|
verbose,
|
|
@@ -2150,7 +2215,7 @@ async function buildNotifyMergePlan(existingConfig, pkgRoot, codexHomeDir, scope
|
|
|
2150
2215
|
},
|
|
2151
2216
|
};
|
|
2152
2217
|
}
|
|
2153
|
-
async function updateManagedConfig(configPath, hooksPath, pkgRoot, sharedMcpRegistry, mcpMode, scope, codexHomeDir, summary, backupContext, options) {
|
|
2218
|
+
async function updateManagedConfig(configPath, hooksPath, pkgRoot, sharedMcpRegistry, mcpMode, preserveExistingFirstPartyMcp, scope, codexHomeDir, summary, backupContext, options) {
|
|
2154
2219
|
const existing = existsSync(configPath)
|
|
2155
2220
|
? await readFile(configPath, "utf-8")
|
|
2156
2221
|
: "";
|
|
@@ -2185,6 +2250,7 @@ async function updateManagedConfig(configPath, hooksPath, pkgRoot, sharedMcpRegi
|
|
|
2185
2250
|
forceStatusLinePreset: options.forceStatusLinePreset,
|
|
2186
2251
|
notifyCommand: notifyPlan.notifyCommand,
|
|
2187
2252
|
includeFirstPartyMcp: mcpMode === "compat",
|
|
2253
|
+
preserveExistingFirstPartyMcp,
|
|
2188
2254
|
});
|
|
2189
2255
|
const changed = existing !== finalConfig;
|
|
2190
2256
|
if (!changed) {
|