oh-my-codex 0.19.0 → 0.20.0
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 +8 -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 +237 -6
- package/dist/cli/__tests__/codex-plugin-layout.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-context-window-warning.test.js +9 -9
- package/dist/cli/__tests__/doctor-context-window-warning.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-invalid-config.test.js +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__/index.test.js +53 -18
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/mission.test.d.ts +2 -0
- package/dist/cli/__tests__/mission.test.d.ts.map +1 -0
- package/dist/cli/__tests__/mission.test.js +239 -0
- package/dist/cli/__tests__/mission.test.js.map +1 -0
- 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__/session-scoped-runtime.test.js +67 -0
- package/dist/cli/__tests__/session-scoped-runtime.test.js.map +1 -1
- package/dist/cli/__tests__/setup-install-mode.test.js +46 -18
- 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 +29 -7
- package/dist/cli/__tests__/setup-refresh.test.js.map +1 -1
- package/dist/cli/__tests__/ultragoal.test.js +1 -1
- package/dist/cli/__tests__/uninstall.test.js +4 -4
- 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 +1 -1
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +9 -4
- 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 +107 -23
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/mission.d.ts +36 -0
- package/dist/cli/mission.d.ts.map +1 -0
- package/dist/cli/mission.js +443 -0
- package/dist/cli/mission.js.map +1 -0
- 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 +7 -4
- package/dist/cli/setup.js.map +1 -1
- package/dist/config/__tests__/generator-idempotent.test.js +23 -23
- package/dist/config/__tests__/generator-idempotent.test.js.map +1 -1
- package/dist/config/__tests__/generator-notify.test.js +9 -9
- 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 +1 -1
- package/dist/config/generator.d.ts.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/hud/__tests__/state.test.js +31 -6
- package/dist/hud/__tests__/state.test.js.map +1 -1
- package/dist/hud/state.d.ts.map +1 -1
- package/dist/hud/state.js +7 -3
- package/dist/hud/state.js.map +1 -1
- package/dist/leader/__tests__/contract.test.js +108 -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 +170 -0
- package/dist/leader/contract.js.map +1 -1
- package/dist/mcp/__tests__/state-paths.test.js +32 -1
- package/dist/mcp/__tests__/state-paths.test.js.map +1 -1
- package/dist/mcp/state-paths.d.ts +4 -0
- package/dist/mcp/state-paths.d.ts.map +1 -1
- package/dist/mcp/state-paths.js +6 -15
- package/dist/mcp/state-paths.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__/consensus-gate.test.js +193 -0
- package/dist/ralplan/__tests__/consensus-gate.test.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/consensus-gate.js +24 -3
- package/dist/ralplan/consensus-gate.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 +762 -20
- 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 +306 -22
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/scripts/generate-catalog-docs.js +1 -0
- package/dist/scripts/generate-catalog-docs.js.map +1 -1
- package/dist/state/__tests__/operations.test.js +737 -0
- package/dist/state/__tests__/operations.test.js.map +1 -1
- package/dist/state/__tests__/skill-active.test.js +59 -0
- package/dist/state/__tests__/skill-active.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 +80 -17
- package/dist/state/operations.js.map +1 -1
- package/dist/state/skill-active.js +3 -3
- package/dist/state/skill-active.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 +82 -5
- 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 +111 -14
- package/dist/ultragoal/artifacts.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/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 +824 -7
- package/src/scripts/codex-native-hook.ts +347 -20
- package/src/scripts/generate-catalog-docs.ts +1 -0
package/Cargo.lock
CHANGED
|
@@ -32,7 +32,7 @@ checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
|
|
|
32
32
|
|
|
33
33
|
[[package]]
|
|
34
34
|
name = "omx-api"
|
|
35
|
-
version = "0.
|
|
35
|
+
version = "0.20.0"
|
|
36
36
|
dependencies = [
|
|
37
37
|
"serde",
|
|
38
38
|
"serde_json",
|
|
@@ -40,14 +40,14 @@ dependencies = [
|
|
|
40
40
|
|
|
41
41
|
[[package]]
|
|
42
42
|
name = "omx-explore-harness"
|
|
43
|
-
version = "0.
|
|
43
|
+
version = "0.20.0"
|
|
44
44
|
dependencies = [
|
|
45
45
|
"libc",
|
|
46
46
|
]
|
|
47
47
|
|
|
48
48
|
[[package]]
|
|
49
49
|
name = "omx-mux"
|
|
50
|
-
version = "0.
|
|
50
|
+
version = "0.20.0"
|
|
51
51
|
dependencies = [
|
|
52
52
|
"serde",
|
|
53
53
|
"serde_json",
|
|
@@ -55,7 +55,7 @@ dependencies = [
|
|
|
55
55
|
|
|
56
56
|
[[package]]
|
|
57
57
|
name = "omx-runtime"
|
|
58
|
-
version = "0.
|
|
58
|
+
version = "0.20.0"
|
|
59
59
|
dependencies = [
|
|
60
60
|
"omx-mux",
|
|
61
61
|
"omx-runtime-core",
|
|
@@ -64,7 +64,7 @@ dependencies = [
|
|
|
64
64
|
|
|
65
65
|
[[package]]
|
|
66
66
|
name = "omx-runtime-core"
|
|
67
|
-
version = "0.
|
|
67
|
+
version = "0.20.0"
|
|
68
68
|
dependencies = [
|
|
69
69
|
"fs2",
|
|
70
70
|
"serde",
|
|
@@ -73,7 +73,7 @@ dependencies = [
|
|
|
73
73
|
|
|
74
74
|
[[package]]
|
|
75
75
|
name = "omx-sparkshell"
|
|
76
|
-
version = "0.
|
|
76
|
+
version = "0.20.0"
|
|
77
77
|
dependencies = [
|
|
78
78
|
"omx-mux",
|
|
79
79
|
]
|
package/Cargo.toml
CHANGED
package/README.md
CHANGED
|
@@ -198,6 +198,8 @@ clean, commit, or stash that worktree before relying on it for isolation.
|
|
|
198
198
|
For `omx team`, workers already use dedicated worktrees automatically by
|
|
199
199
|
default; `--worktree` on `omx team` is only a legacy-compatible override.
|
|
200
200
|
|
|
201
|
+
Repo-aware tools receive the same canonical context in launch, team-worker, and autoresearch runtimes: `OMX_REPO_ROOT`, `OMX_WORKTREE_ROOT`, `OMX_GIT_COMMON_DIR`, `OMX_WORKTREE_SCOPE`, `OMX_CODEGRAPH_MODE`, and `OMX_CODEGRAPH_PROJECT_PATH`. `OMX_CODEGRAPH_MODE=auto` prefers a worktree-local `.codegraph/codegraph.db`, then a leader/repo `.codegraph/codegraph.db`, otherwise resolves to `off`. Explicit `shared`, `local`, and `off` are honored. OMX does not install CodeGraph, auto-index worktrees, or copy/symlink `.codegraph`; shared leader indexes are useful for baseline navigation but are not branch-accurate for worktree-only changes.
|
|
202
|
+
|
|
201
203
|
If you want a one-off launch with no OMX tmux/HUD management, use `--direct`:
|
|
202
204
|
|
|
203
205
|
```bash
|
|
@@ -299,11 +301,16 @@ Inside an Ultragoal story, use `$team` only when that story benefits from coordi
|
|
|
299
301
|
| `$team "..."` | coordinated parallel execution when the work is big enough |
|
|
300
302
|
| `/skills` | browsing installed skills and supporting helpers |
|
|
301
303
|
| `/goal ...` | durable objective/checkpoint structure for tasks that must reconcile progress across turns |
|
|
304
|
+
| `omx mission <file>` | sequential prompt/checklist batch runs through `omx exec`, with `.omx/missions/<slug>/summary.json` and `ledger.jsonl` operator artifacts |
|
|
302
305
|
|
|
303
306
|
## Advanced / operator surfaces
|
|
304
307
|
|
|
305
308
|
These are useful, but they are not the main onboarding path.
|
|
306
309
|
|
|
310
|
+
### Mission queue runner
|
|
311
|
+
|
|
312
|
+
Use `omx mission` when you have a short checklist of OmX/Codex prompts that should run one after another instead of opening a separate shell command for each prompt. Start with `omx mission plan ./mission.md` or `omx mission ./mission.md --dry-run` to validate parsing and inspect the durable summary, then run `omx mission run ./mission.md -- --model gpt-5` when the prompts are ready. Interrupted runs can be inspected with `omx mission status ./mission.md`, continued with `omx mission resume ./mission.md`, operator-blocked with `omx mission mark ./mission.md --task task-002 --status blocked`, and repaired task-by-task with `omx mission rerun ./mission.md --task task-002`. See [`docs/mission.md`](./docs/mission.md) for input format, status output, and artifact details.
|
|
313
|
+
|
|
307
314
|
### Team runtime
|
|
308
315
|
|
|
309
316
|
Use the team runtime when you specifically need durable tmux/worktree coordination, not as the default way to begin using OMX. In Codex App or plain outside-tmux sessions, treat `omx team` as a tmux-runtime shell surface rather than a directly available in-app workflow; launch OMX CLI from shell first if you actually want team execution.
|
|
@@ -330,7 +337,7 @@ These are operator/support surfaces:
|
|
|
330
337
|
- `omx uninstall` removes OMX-managed wrappers from `.codex/hooks.json` but keeps the file when user hooks remain
|
|
331
338
|
- `omx update` checks npm immediately, installs the newest global OMX build, then reruns the same interactive setup refresh path
|
|
332
339
|
- launch-time update checks are throttled and prompt by default; use `OMX_AUTO_UPDATE=0` to disable them or `OMX_AUTO_UPDATE=defer` to schedule deferred updates without a prompt
|
|
333
|
-
- fresh OMX-managed `gpt-5.
|
|
340
|
+
- fresh OMX-managed `gpt-5.6-sol` config seeding now recommends `model_context_window = 250000` and `model_auto_compact_token_limit = 200000`, but only when those keys are missing
|
|
334
341
|
- `.omx-config.json` model/env routing is documented in [the model/env routing reference](./docs/reference/omx-config-schema-routing.md); only edit keys supported by your installed OMX version
|
|
335
342
|
- `omx doctor` verifies the install when something seems wrong; it does not prove that the active Codex profile can make an authenticated model call
|
|
336
343
|
- `omx hud --watch` is a monitoring/status surface, not the primary user workflow
|
|
@@ -2465,7 +2465,7 @@ mod tests {
|
|
|
2465
2465
|
let request = build_codex_native_request(
|
|
2466
2466
|
"/backend-api/codex",
|
|
2467
2467
|
&json!({
|
|
2468
|
-
"model": "gpt-5.
|
|
2468
|
+
"model": "gpt-5.6-terra",
|
|
2469
2469
|
"input": "summarize this",
|
|
2470
2470
|
"reasoning": {"effort": "low"},
|
|
2471
2471
|
"instructions": "Follow the sparkshell summary contract."
|
|
@@ -2507,7 +2507,7 @@ mod tests {
|
|
|
2507
2507
|
.iter()
|
|
2508
2508
|
.any(|(name, _)| name == CODEX_INSTALLATION_ID_HEADER));
|
|
2509
2509
|
|
|
2510
|
-
assert_eq!(request.body["model"], "gpt-5.
|
|
2510
|
+
assert_eq!(request.body["model"], "gpt-5.6-terra");
|
|
2511
2511
|
assert_eq!(request.body["tools"], json!([]));
|
|
2512
2512
|
assert_eq!(request.body["tool_choice"], "auto");
|
|
2513
2513
|
assert_eq!(request.body["parallel_tool_calls"], false);
|
|
@@ -2597,7 +2597,7 @@ mod tests {
|
|
|
2597
2597
|
format!("http://127.0.0.1:{}/backend-api/codex", addr.port()),
|
|
2598
2598
|
);
|
|
2599
2599
|
let text = real_private_text(&json!({
|
|
2600
|
-
"model": "gpt-5.
|
|
2600
|
+
"model": "gpt-5.6-terra",
|
|
2601
2601
|
"input": "ping",
|
|
2602
2602
|
"reasoning": {"effort": "low"},
|
|
2603
2603
|
"instructions": "Summarize via sparkshell."
|
|
@@ -207,7 +207,7 @@ fn binary_real_private_responses_json_uses_fake_upstream_e2e() {
|
|
|
207
207
|
let (response, upstream_raw) = real_private_once_request(
|
|
208
208
|
"/v1/responses",
|
|
209
209
|
serde_json::json!({
|
|
210
|
-
"model": "gpt-5.
|
|
210
|
+
"model": "gpt-5.6-terra",
|
|
211
211
|
"input": "hello from integration",
|
|
212
212
|
"reasoning": {"effort": "low"},
|
|
213
213
|
"instructions": "Use fake upstream."
|
|
@@ -236,7 +236,7 @@ fn binary_real_private_responses_json_uses_fake_upstream_e2e() {
|
|
|
236
236
|
.nth(1)
|
|
237
237
|
.expect("upstream body");
|
|
238
238
|
let forwarded_json: Value = serde_json::from_str(forwarded_body).expect("upstream JSON");
|
|
239
|
-
assert_eq!(forwarded_json["model"], "gpt-5.
|
|
239
|
+
assert_eq!(forwarded_json["model"], "gpt-5.6-terra");
|
|
240
240
|
assert_eq!(forwarded_json["stream"], true);
|
|
241
241
|
assert_eq!(
|
|
242
242
|
forwarded_json["reasoning"],
|
|
@@ -255,7 +255,7 @@ fn binary_real_private_responses_sse_uses_fake_upstream_e2e() {
|
|
|
255
255
|
let (response, upstream_raw) = real_private_once_request(
|
|
256
256
|
"/v1/responses",
|
|
257
257
|
serde_json::json!({
|
|
258
|
-
"model": "gpt-5.
|
|
258
|
+
"model": "gpt-5.6-terra",
|
|
259
259
|
"input": "stream please",
|
|
260
260
|
"stream": true
|
|
261
261
|
}),
|
|
@@ -292,7 +292,7 @@ fn binary_real_private_chat_sse_uses_chat_chunk_shape_with_fake_upstream_e2e() {
|
|
|
292
292
|
let (response, upstream_raw) = real_private_once_request(
|
|
293
293
|
"/v1/chat/completions",
|
|
294
294
|
serde_json::json!({
|
|
295
|
-
"model": "gpt-5.
|
|
295
|
+
"model": "gpt-5.6-terra",
|
|
296
296
|
"messages": [{"role": "user", "content": "chat through upstream"}],
|
|
297
297
|
"stream": true
|
|
298
298
|
}),
|
|
@@ -1554,9 +1554,9 @@ mod tests {
|
|
|
1554
1554
|
"--instructions-file",
|
|
1555
1555
|
"/tmp/explore-agents.md",
|
|
1556
1556
|
"--model-spark",
|
|
1557
|
-
"gpt-5.
|
|
1557
|
+
"gpt-5.6-luna",
|
|
1558
1558
|
"--model-fallback",
|
|
1559
|
-
"gpt-5.
|
|
1559
|
+
"gpt-5.6-sol",
|
|
1560
1560
|
]
|
|
1561
1561
|
.into_iter()
|
|
1562
1562
|
.map(OsString::from),
|
|
@@ -1567,8 +1567,8 @@ mod tests {
|
|
|
1567
1567
|
assert_eq!(args.prompt, "find auth");
|
|
1568
1568
|
assert_eq!(args.prompt_file, Path::new("/tmp/explore.md"));
|
|
1569
1569
|
assert_eq!(args.instructions_file, Path::new("/tmp/explore-agents.md"));
|
|
1570
|
-
assert_eq!(args.spark_model, "gpt-5.
|
|
1571
|
-
assert_eq!(args.fallback_model, "gpt-5.
|
|
1570
|
+
assert_eq!(args.spark_model, "gpt-5.6-luna");
|
|
1571
|
+
assert_eq!(args.fallback_model, "gpt-5.6-sol");
|
|
1572
1572
|
}
|
|
1573
1573
|
|
|
1574
1574
|
#[test]
|
|
@@ -9,8 +9,8 @@ use std::time::Duration;
|
|
|
9
9
|
|
|
10
10
|
pub const DEFAULT_SUMMARY_TIMEOUT_MS: u64 = 60_000;
|
|
11
11
|
pub const DEFAULT_API_BASE_URL: &str = "http://127.0.0.1:14510";
|
|
12
|
-
pub const DEFAULT_SPARK_MODEL: &str = "gpt-5.
|
|
13
|
-
pub const DEFAULT_STANDARD_MODEL: &str = "gpt-5.
|
|
12
|
+
pub const DEFAULT_SPARK_MODEL: &str = "gpt-5.6-luna";
|
|
13
|
+
pub const DEFAULT_STANDARD_MODEL: &str = "gpt-5.6-terra";
|
|
14
14
|
|
|
15
15
|
pub fn resolve_model() -> String {
|
|
16
16
|
env::var("OMX_SPARKSHELL_MODEL")
|
|
@@ -81,11 +81,11 @@ describe('agents/definitions', () => {
|
|
|
81
81
|
assert.equal(AGENT_DEFINITIONS[name].reasoningEffort, name === 'executor' ? 'medium' : 'high');
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
|
-
it('pins ralplan thesis and antithesis to exact gpt-5.
|
|
85
|
-
assert.equal(AGENT_DEFINITIONS.planner.exactModel, 'gpt-5.
|
|
84
|
+
it('pins ralplan thesis and antithesis to exact gpt-5.6-sol with role-specific reasoning', () => {
|
|
85
|
+
assert.equal(AGENT_DEFINITIONS.planner.exactModel, 'gpt-5.6-sol');
|
|
86
86
|
assert.equal(AGENT_DEFINITIONS.planner.reasoningEffort, 'medium');
|
|
87
87
|
assert.equal(AGENT_DEFINITIONS.planner.modelClass, 'frontier');
|
|
88
|
-
assert.equal(AGENT_DEFINITIONS.architect.exactModel, 'gpt-5.
|
|
88
|
+
assert.equal(AGENT_DEFINITIONS.architect.exactModel, 'gpt-5.6-sol');
|
|
89
89
|
assert.equal(AGENT_DEFINITIONS.architect.reasoningEffort, 'xhigh');
|
|
90
90
|
assert.equal(AGENT_DEFINITIONS.architect.modelClass, 'frontier');
|
|
91
91
|
assert.equal(AGENT_DEFINITIONS.critic.exactModel, undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definitions.test.js","sourceRoot":"","sources":["../../../src/agents/__tests__/definitions.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"definitions.test.js","sourceRoot":"","sources":["../../../src/agents/__tests__/definitions.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ const isolatedCodexHome = join(tmpdir(), `omx-native-config-empty-codex-home-${p
|
|
|
29
29
|
beforeEach(() => {
|
|
30
30
|
process.env.CODEX_HOME = isolatedCodexHome;
|
|
31
31
|
delete process.env.OMX_DEFAULT_FRONTIER_MODEL;
|
|
32
|
-
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.
|
|
32
|
+
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.6-terra";
|
|
33
33
|
delete process.env.OMX_DEFAULT_SPARK_MODEL;
|
|
34
34
|
delete process.env.OMX_SPARK_MODEL;
|
|
35
35
|
});
|
|
@@ -80,7 +80,7 @@ describe("agents/native-config", () => {
|
|
|
80
80
|
const prompt = `---\ntitle: demo\n---\n\nInstruction line\n\"\"\"danger\"\"\"`;
|
|
81
81
|
const toml = generateAgentToml(agent, prompt);
|
|
82
82
|
assert.match(toml, /# oh-my-codex agent: executor/);
|
|
83
|
-
assert.match(toml, /model = "gpt-5\.
|
|
83
|
+
assert.match(toml, /model = "gpt-5\.6-sol"/);
|
|
84
84
|
assert.match(toml, /model_reasoning_effort = "medium"/);
|
|
85
85
|
assert.ok(!toml.includes("title: demo"));
|
|
86
86
|
assert.ok(toml.includes("Instruction line"));
|
|
@@ -119,7 +119,7 @@ describe("agents/native-config", () => {
|
|
|
119
119
|
try {
|
|
120
120
|
await writeFile(join(codexHome, ".omx-config.json"), JSON.stringify({
|
|
121
121
|
agentModels: {
|
|
122
|
-
architect: "gpt-5.
|
|
122
|
+
architect: "gpt-5.6-sol",
|
|
123
123
|
},
|
|
124
124
|
agentReasoning: {
|
|
125
125
|
architect: "xhigh",
|
|
@@ -128,35 +128,64 @@ describe("agents/native-config", () => {
|
|
|
128
128
|
const toml = generateAgentToml(AGENT_DEFINITIONS.architect, "Architect prompt", {
|
|
129
129
|
codexHomeOverride: codexHome,
|
|
130
130
|
});
|
|
131
|
-
assert.match(toml, /model = "gpt-5\.
|
|
131
|
+
assert.match(toml, /model = "gpt-5\.6-sol"/);
|
|
132
132
|
assert.match(toml, /model_reasoning_effort = "xhigh"/);
|
|
133
|
-
assert.match(toml, /resolved_model: gpt-5\.
|
|
134
|
-
assert.doesNotMatch(toml, /model = "gpt-5\.
|
|
135
|
-
assert.doesNotMatch(toml, /exact gpt-5\.
|
|
136
|
-
assert.doesNotMatch(toml, /resolved_model: gpt-5\.
|
|
133
|
+
assert.match(toml, /resolved_model: gpt-5\.6-sol/);
|
|
134
|
+
assert.doesNotMatch(toml, /model = "gpt-5\.6-terra"/);
|
|
135
|
+
assert.doesNotMatch(toml, /exact gpt-5\.6-terra model/);
|
|
136
|
+
assert.doesNotMatch(toml, /resolved_model: gpt-5\.6-terra/);
|
|
137
137
|
}
|
|
138
138
|
finally {
|
|
139
139
|
await rm(codexHome, { recursive: true, force: true });
|
|
140
140
|
}
|
|
141
141
|
});
|
|
142
|
-
it("
|
|
143
|
-
|
|
144
|
-
|
|
142
|
+
it("applies Terra guidance when agentModels resolves exact-Sol roles to gpt-5.6-terra", async () => {
|
|
143
|
+
const codexHome = await mkdtemp(join(tmpdir(), "omx-native-config-terra-override-"));
|
|
144
|
+
try {
|
|
145
|
+
await writeFile(join(codexHome, ".omx-config.json"), JSON.stringify({
|
|
146
|
+
agentModels: {
|
|
147
|
+
planner: "gpt-5.6-terra",
|
|
148
|
+
architect: "gpt-5.6-terra",
|
|
149
|
+
},
|
|
150
|
+
}));
|
|
151
|
+
for (const role of ["planner", "architect"]) {
|
|
152
|
+
const toml = generateAgentToml(AGENT_DEFINITIONS[role], `${role} prompt`, {
|
|
153
|
+
codexHomeOverride: codexHome,
|
|
154
|
+
});
|
|
155
|
+
assert.match(toml, /model = "gpt-5\.6-terra"/);
|
|
156
|
+
assert.match(toml, /exact gpt-5\.6-terra model/);
|
|
157
|
+
}
|
|
158
|
+
await writeFile(join(codexHome, ".omx-config.json"), JSON.stringify({
|
|
159
|
+
agentModels: { planner: "gpt-5.6-terra-tuned" },
|
|
160
|
+
}));
|
|
161
|
+
const tunedToml = generateAgentToml(AGENT_DEFINITIONS.planner, "planner prompt", {
|
|
162
|
+
codexHomeOverride: codexHome,
|
|
163
|
+
});
|
|
164
|
+
assert.match(tunedToml, /model = "gpt-5\.6-terra-tuned"/);
|
|
165
|
+
assert.doesNotMatch(tunedToml, /exact gpt-5\.6-terra model/);
|
|
166
|
+
}
|
|
167
|
+
finally {
|
|
168
|
+
await rm(codexHome, { recursive: true, force: true });
|
|
169
|
+
}
|
|
170
|
+
});
|
|
171
|
+
it("pins planner and architect to exact gpt-5.6-sol while keeping researcher on exact Terra", () => {
|
|
172
|
+
process.env.OMX_DEFAULT_FRONTIER_MODEL = "gpt-5.6-sol";
|
|
173
|
+
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.6-sol";
|
|
145
174
|
for (const role of ["planner", "architect"]) {
|
|
146
175
|
const toml = generateAgentToml(AGENT_DEFINITIONS[role], `${role} prompt`);
|
|
147
|
-
assert.match(toml, /model = "gpt-5\.
|
|
148
|
-
assert.match(toml, /exact gpt-5\.
|
|
176
|
+
assert.match(toml, /model = "gpt-5\.6-sol"/, `${role} should use exact gpt-5.6-sol`);
|
|
177
|
+
assert.match(toml, /exact gpt-5\.6-sol model/, `${role} should receive exact-gpt-5.6-sol guidance`);
|
|
149
178
|
assert.match(toml, /strict execution order: inspect -> plan -> act -> verify/, `${role} should receive the exact-model guardrail`);
|
|
150
|
-
assert.match(toml, /resolved_model: gpt-5\.
|
|
179
|
+
assert.match(toml, /resolved_model: gpt-5\.6-sol/, `${role} should record exact gpt-5.6-sol metadata`);
|
|
151
180
|
}
|
|
152
181
|
const plannerToml = generateAgentToml(AGENT_DEFINITIONS.planner, "planner prompt");
|
|
153
182
|
assert.match(plannerToml, /model_reasoning_effort = "medium"/);
|
|
154
183
|
const architectToml = generateAgentToml(AGENT_DEFINITIONS.architect, "architect prompt");
|
|
155
184
|
assert.match(architectToml, /model_reasoning_effort = "xhigh"/);
|
|
156
185
|
const researcherToml = generateAgentToml(AGENT_DEFINITIONS.researcher, "researcher prompt");
|
|
157
|
-
assert.match(researcherToml, /model = "gpt-5\.
|
|
158
|
-
assert.match(researcherToml, /exact gpt-5\.
|
|
159
|
-
assert.match(researcherToml, /resolved_model: gpt-5
|
|
186
|
+
assert.match(researcherToml, /model = "gpt-5\.6-terra"/, "researcher should keep exact Terra");
|
|
187
|
+
assert.match(researcherToml, /exact gpt-5\.6-terra model/, "researcher should receive exact-Terra guidance");
|
|
188
|
+
assert.match(researcherToml, /resolved_model: gpt-5.6-terra/, "researcher should record exact Terra metadata");
|
|
160
189
|
assert.match(researcherToml, /model_reasoning_effort = "high"/);
|
|
161
190
|
for (const role of [
|
|
162
191
|
"critic",
|
|
@@ -167,11 +196,11 @@ describe("agents/native-config", () => {
|
|
|
167
196
|
"prometheus-strict-oracle",
|
|
168
197
|
]) {
|
|
169
198
|
const toml = generateAgentToml(AGENT_DEFINITIONS[role], `${role} prompt`);
|
|
170
|
-
assert.match(toml, /model = "gpt-5\.
|
|
171
|
-
assert.doesNotMatch(toml, /model = "gpt-5\.
|
|
199
|
+
assert.match(toml, /model = "gpt-5\.6-sol"/, `${role} should stay on configured/root gpt-5.6-sol`);
|
|
200
|
+
assert.doesNotMatch(toml, /model = "gpt-5\.6-terra"/, `${role} must not inherit exact-Terra pins`);
|
|
172
201
|
}
|
|
173
202
|
});
|
|
174
|
-
it("applies exact-model
|
|
203
|
+
it("applies exact-model Terra guidance only for resolved gpt-5.6-terra standard roles", () => {
|
|
175
204
|
const agent = {
|
|
176
205
|
name: "debugger",
|
|
177
206
|
description: "Root-cause analysis",
|
|
@@ -184,19 +213,19 @@ describe("agents/native-config", () => {
|
|
|
184
213
|
};
|
|
185
214
|
const prompt = "Instruction line";
|
|
186
215
|
const exactMiniToml = generateAgentToml(agent, prompt, {
|
|
187
|
-
env: { OMX_DEFAULT_STANDARD_MODEL: "gpt-5.
|
|
216
|
+
env: { OMX_DEFAULT_STANDARD_MODEL: "gpt-5.6-terra" },
|
|
188
217
|
});
|
|
189
218
|
const frontierToml = generateAgentToml(agent, prompt, {
|
|
190
|
-
env: { OMX_DEFAULT_STANDARD_MODEL: "gpt-5.
|
|
219
|
+
env: { OMX_DEFAULT_STANDARD_MODEL: "gpt-5.6-sol" },
|
|
191
220
|
});
|
|
192
221
|
const tunedToml = generateAgentToml(agent, prompt, {
|
|
193
|
-
env: { OMX_DEFAULT_STANDARD_MODEL: "gpt-5.
|
|
222
|
+
env: { OMX_DEFAULT_STANDARD_MODEL: "gpt-5.6-terra-tuned" },
|
|
194
223
|
});
|
|
195
|
-
assert.match(exactMiniToml, /exact gpt-5\.
|
|
224
|
+
assert.match(exactMiniToml, /exact gpt-5\.6-terra model/);
|
|
196
225
|
assert.match(exactMiniToml, /strict execution order: inspect -> plan -> act -> verify/);
|
|
197
|
-
assert.match(exactMiniToml, /resolved_model: gpt-5\.
|
|
198
|
-
assert.doesNotMatch(frontierToml, /exact gpt-5\.
|
|
199
|
-
assert.doesNotMatch(tunedToml, /exact gpt-5\.
|
|
226
|
+
assert.match(exactMiniToml, /resolved_model: gpt-5\.6-terra/);
|
|
227
|
+
assert.doesNotMatch(frontierToml, /exact gpt-5\.6-terra model/);
|
|
228
|
+
assert.doesNotMatch(tunedToml, /exact gpt-5\.6-terra model/);
|
|
200
229
|
});
|
|
201
230
|
it("adds a leaf guard after delegation guidance in generated native agent instructions", () => {
|
|
202
231
|
const codeReviewerToml = generateAgentToml(AGENT_DEFINITIONS["code-reviewer"], "code-reviewer prompt");
|
|
@@ -233,8 +262,8 @@ describe("agents/native-config", () => {
|
|
|
233
262
|
assert.match(metisToml, /native_subagent_delegation: allowed/);
|
|
234
263
|
});
|
|
235
264
|
it("keeps native-only leaf guards out of non-native role composition", () => {
|
|
236
|
-
const writerInstructions = composeRoleInstructionsForRole("writer", "writer prompt", "gpt-5.
|
|
237
|
-
const unknownInstructions = composeRoleInstructionsForRole("does-not-exist", "plain prompt", "gpt-5.
|
|
265
|
+
const writerInstructions = composeRoleInstructionsForRole("writer", "writer prompt", "gpt-5.6-sol");
|
|
266
|
+
const unknownInstructions = composeRoleInstructionsForRole("does-not-exist", "plain prompt", "gpt-5.6-sol");
|
|
238
267
|
assert.doesNotMatch(writerInstructions, /<native_subagent_leaf_guard>/);
|
|
239
268
|
assert.doesNotMatch(writerInstructions, /native_subagent_delegation: allowed/);
|
|
240
269
|
assert.doesNotMatch(unknownInstructions, /<native_subagent_leaf_guard>/);
|
|
@@ -257,7 +286,7 @@ describe("agents/native-config", () => {
|
|
|
257
286
|
assert.equal(existsSync(join(outDir, "planner.toml")), true);
|
|
258
287
|
assert.equal(existsSync(join(outDir, "style-reviewer.toml")), false);
|
|
259
288
|
const executorToml = await readFile(join(outDir, "executor.toml"), "utf8");
|
|
260
|
-
assert.match(executorToml, /model = "gpt-5\.
|
|
289
|
+
assert.match(executorToml, /model = "gpt-5\.6-sol"/);
|
|
261
290
|
assert.match(executorToml, /model_reasoning_effort = "medium"/);
|
|
262
291
|
const skipped = await installNativeAgentConfigs(root, {
|
|
263
292
|
agentsDir: outDir,
|
|
@@ -306,7 +335,7 @@ describe("agents/native-config", () => {
|
|
|
306
335
|
await mkdir(promptsDir, { recursive: true });
|
|
307
336
|
await mkdir(codexHome, { recursive: true });
|
|
308
337
|
await writeFile(join(codexHome, "config.toml"), [
|
|
309
|
-
'model = "gpt-5.
|
|
338
|
+
'model = "gpt-5.6-sol"',
|
|
310
339
|
'model_provider = "cheapRouter"',
|
|
311
340
|
'',
|
|
312
341
|
'[model_providers.cheapRouter]',
|
|
@@ -322,7 +351,7 @@ describe("agents/native-config", () => {
|
|
|
322
351
|
catalogManifest: manifestWithAgents(["executor"]),
|
|
323
352
|
});
|
|
324
353
|
const executorToml = await readFile(join(outDir, "executor.toml"), "utf8");
|
|
325
|
-
assert.match(executorToml, /model = "gpt-5\.
|
|
354
|
+
assert.match(executorToml, /model = "gpt-5\.6-sol"/);
|
|
326
355
|
assert.match(executorToml, /model_provider = "cheapRouter"/);
|
|
327
356
|
}
|
|
328
357
|
finally {
|
|
@@ -330,7 +359,7 @@ describe("agents/native-config", () => {
|
|
|
330
359
|
process.env.CODEX_HOME = previousCodexHome;
|
|
331
360
|
else
|
|
332
361
|
delete process.env.CODEX_HOME;
|
|
333
|
-
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.
|
|
362
|
+
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.6-terra";
|
|
334
363
|
await rm(root, { recursive: true, force: true });
|
|
335
364
|
}
|
|
336
365
|
});
|
|
@@ -346,11 +375,11 @@ describe("agents/native-config", () => {
|
|
|
346
375
|
await mkdir(codexHome, { recursive: true });
|
|
347
376
|
await writeFile(join(codexHome, ".omx-config.json"), JSON.stringify({
|
|
348
377
|
env: {
|
|
349
|
-
OMX_DEFAULT_SPARK_MODEL: "gpt-5.
|
|
378
|
+
OMX_DEFAULT_SPARK_MODEL: "gpt-5.6-luna",
|
|
350
379
|
},
|
|
351
380
|
}));
|
|
352
381
|
await writeFile(join(codexHome, "config.toml"), [
|
|
353
|
-
'model = "gpt-5.
|
|
382
|
+
'model = "gpt-5.6-sol"',
|
|
354
383
|
'model_provider = "OpenAI"',
|
|
355
384
|
'',
|
|
356
385
|
].join('\n'));
|
|
@@ -360,7 +389,7 @@ describe("agents/native-config", () => {
|
|
|
360
389
|
catalogManifest: manifestWithAgents(["explore"]),
|
|
361
390
|
});
|
|
362
391
|
const exploreToml = await readFile(join(outDir, "explore.toml"), "utf8");
|
|
363
|
-
assert.match(exploreToml, /model = "gpt-5\.
|
|
392
|
+
assert.match(exploreToml, /model = "gpt-5\.6-luna"/);
|
|
364
393
|
assert.doesNotMatch(exploreToml, /model_provider = /);
|
|
365
394
|
}
|
|
366
395
|
finally {
|
|
@@ -390,14 +419,14 @@ describe("agents/native-config", () => {
|
|
|
390
419
|
});
|
|
391
420
|
const debuggerToml = await readFile(join(outDir, "debugger.toml"), "utf8");
|
|
392
421
|
assert.match(debuggerToml, /model = "gpt-5\.2"/);
|
|
393
|
-
assert.doesNotMatch(debuggerToml, /model = "gpt-5\.
|
|
422
|
+
assert.doesNotMatch(debuggerToml, /model = "gpt-5\.6-terra"/);
|
|
394
423
|
}
|
|
395
424
|
finally {
|
|
396
425
|
if (typeof previousCodexHome === "string")
|
|
397
426
|
process.env.CODEX_HOME = previousCodexHome;
|
|
398
427
|
else
|
|
399
428
|
delete process.env.CODEX_HOME;
|
|
400
|
-
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.
|
|
429
|
+
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.6-terra";
|
|
401
430
|
await rm(root, { recursive: true, force: true });
|
|
402
431
|
}
|
|
403
432
|
});
|
|
@@ -408,7 +437,7 @@ describe("agents/native-config", () => {
|
|
|
408
437
|
const outDir = join(codexHome, "agents");
|
|
409
438
|
const previousCodexHome = process.env.CODEX_HOME;
|
|
410
439
|
try {
|
|
411
|
-
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.
|
|
440
|
+
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.6-terra";
|
|
412
441
|
process.env.CODEX_HOME = codexHome;
|
|
413
442
|
await mkdir(promptsDir, { recursive: true });
|
|
414
443
|
await mkdir(codexHome, { recursive: true });
|
|
@@ -419,7 +448,7 @@ describe("agents/native-config", () => {
|
|
|
419
448
|
catalogManifest: manifestWithAgents(["debugger"]),
|
|
420
449
|
});
|
|
421
450
|
const debuggerToml = await readFile(join(outDir, "debugger.toml"), "utf8");
|
|
422
|
-
assert.match(debuggerToml, /model = "gpt-5\.
|
|
451
|
+
assert.match(debuggerToml, /model = "gpt-5\.6-terra"/);
|
|
423
452
|
assert.doesNotMatch(debuggerToml, /model = "gpt-5\.2"/);
|
|
424
453
|
}
|
|
425
454
|
finally {
|
|
@@ -427,7 +456,7 @@ describe("agents/native-config", () => {
|
|
|
427
456
|
process.env.CODEX_HOME = previousCodexHome;
|
|
428
457
|
else
|
|
429
458
|
delete process.env.CODEX_HOME;
|
|
430
|
-
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.
|
|
459
|
+
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.6-terra";
|
|
431
460
|
await rm(root, { recursive: true, force: true });
|
|
432
461
|
}
|
|
433
462
|
});
|
|
@@ -456,7 +485,7 @@ describe("agents/native-config", () => {
|
|
|
456
485
|
process.env.CODEX_HOME = previousCodexHome;
|
|
457
486
|
else
|
|
458
487
|
delete process.env.CODEX_HOME;
|
|
459
|
-
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.
|
|
488
|
+
process.env.OMX_DEFAULT_STANDARD_MODEL = "gpt-5.6-terra";
|
|
460
489
|
await rm(root, { recursive: true, force: true });
|
|
461
490
|
}
|
|
462
491
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-config.test.js","sourceRoot":"","sources":["../../../src/agents/__tests__/native-config.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"native-config.test.js","sourceRoot":"","sources":["../../../src/agents/__tests__/native-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export interface AgentDefinition {
|
|
|
8
8
|
description: string;
|
|
9
9
|
reasoningEffort: 'low' | 'medium' | 'high' | 'xhigh';
|
|
10
10
|
/** Optional exact model pin for roles that should bypass tier defaults. */
|
|
11
|
-
exactModel?: 'gpt-5.
|
|
11
|
+
exactModel?: 'gpt-5.6-terra' | 'gpt-5.6-sol';
|
|
12
12
|
posture: 'frontier-orchestrator' | 'deep-worker' | 'fast-lane';
|
|
13
13
|
modelClass: 'frontier' | 'standard' | 'fast';
|
|
14
14
|
routingRole: 'leader' | 'specialist' | 'executor';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/agents/definitions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;IACrD,2EAA2E;IAC3E,UAAU,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/agents/definitions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;IACrD,2EAA2E;IAC3E,UAAU,CAAC,EAAE,eAAe,GAAG,aAAa,CAAC;IAC7C,OAAO,EAAE,uBAAuB,GAAG,aAAa,GAAG,WAAW,CAAC;IAC/D,UAAU,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM,CAAC;IAC7C,WAAW,EAAE,QAAQ,GAAG,YAAY,GAAG,UAAU,CAAC;IAClD,0BAA0B;IAC1B,KAAK,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,CAAC;IACvD;;;;;;OAMG;IACH,wBAAwB,CAAC,EAAE,SAAS,CAAC;IACrC,4BAA4B;IAC5B,QAAQ,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,cAAc,CAAC;CACtE;AAwBD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAkV7D,CAAC;AAEF,mCAAmC;AACnC,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAElE;AAED,mCAAmC;AACnC,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC,GAAG,eAAe,EAAE,CAE5F;AAED,0BAA0B;AAC1B,wBAAgB,aAAa,IAAI,MAAM,EAAE,CAExC"}
|