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
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mission.test.d.ts","sourceRoot":"","sources":["../../../src/cli/__tests__/mission.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
import { describe, it } from "node:test";
|
|
2
|
+
import assert from "node:assert/strict";
|
|
3
|
+
import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
|
4
|
+
import { tmpdir } from "node:os";
|
|
5
|
+
import { join } from "node:path";
|
|
6
|
+
import { HELP } from "../index.js";
|
|
7
|
+
import { missionCommand, parseMissionTasks } from "../mission.js";
|
|
8
|
+
async function withTempDir(run) {
|
|
9
|
+
const cwd = await mkdtemp(join(tmpdir(), "omx-mission-"));
|
|
10
|
+
try {
|
|
11
|
+
return await run(cwd);
|
|
12
|
+
}
|
|
13
|
+
finally {
|
|
14
|
+
await rm(cwd, { recursive: true, force: true });
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
describe("omx mission", () => {
|
|
18
|
+
it("parses simple prompt lists and markdown checklists", () => {
|
|
19
|
+
const tasks = parseMissionTasks([
|
|
20
|
+
"# Mission",
|
|
21
|
+
"",
|
|
22
|
+
"- [ ] Inspect the failure",
|
|
23
|
+
"- [x] Keep the passing behavior",
|
|
24
|
+
"1. Write focused tests",
|
|
25
|
+
"<!-- comment -->",
|
|
26
|
+
"Plain prompt",
|
|
27
|
+
].join("\n"));
|
|
28
|
+
assert.deepEqual(tasks.map((task) => [task.id, task.source_line, task.prompt]), [
|
|
29
|
+
["task-001", 3, "Inspect the failure"],
|
|
30
|
+
["task-002", 4, "Keep the passing behavior"],
|
|
31
|
+
["task-003", 5, "Write focused tests"],
|
|
32
|
+
["task-004", 7, "Plain prompt"],
|
|
33
|
+
]);
|
|
34
|
+
});
|
|
35
|
+
it("writes a dry-run summary and ledger without executing tasks", async () => {
|
|
36
|
+
await withTempDir(async (cwd) => {
|
|
37
|
+
await writeFile(join(cwd, "mission.md"), "- [ ] First prompt\n- [ ] Second prompt\n", "utf-8");
|
|
38
|
+
const out = [];
|
|
39
|
+
let runCount = 0;
|
|
40
|
+
await missionCommand(["mission.md", "--dry-run", "--slug", "demo"], {
|
|
41
|
+
cwd,
|
|
42
|
+
now: () => new Date("2026-07-06T00:00:00.000Z"),
|
|
43
|
+
stdout: (line) => out.push(line),
|
|
44
|
+
runTask: async () => {
|
|
45
|
+
runCount += 1;
|
|
46
|
+
return 0;
|
|
47
|
+
},
|
|
48
|
+
});
|
|
49
|
+
assert.equal(runCount, 0);
|
|
50
|
+
assert.match(out.join("\n"), /mission planned: demo \(2 tasks\)/);
|
|
51
|
+
const summary = JSON.parse(await readFile(join(cwd, ".omx", "missions", "demo", "summary.json"), "utf-8"));
|
|
52
|
+
assert.equal(summary.status, "planned");
|
|
53
|
+
assert.equal(summary.counts.total, 2);
|
|
54
|
+
assert.equal(summary.counts.planned, 2);
|
|
55
|
+
assert.deepEqual(summary.tasks.map((task) => task.status), ["planned", "planned"]);
|
|
56
|
+
const ledger = await readFile(join(cwd, ".omx", "missions", "demo", "ledger.jsonl"), "utf-8");
|
|
57
|
+
assert.match(ledger, /mission_planned/);
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
it("runs tasks sequentially, records failures, and skips remaining tasks by default", async () => {
|
|
61
|
+
await withTempDir(async (cwd) => {
|
|
62
|
+
await writeFile(join(cwd, "mission.md"), "First\nSecond\nThird\n", "utf-8");
|
|
63
|
+
const seen = [];
|
|
64
|
+
const exits = [0, 7];
|
|
65
|
+
await missionCommand(["run", "mission.md", "--slug", "demo", "--", "--model", "gpt-5"], {
|
|
66
|
+
cwd,
|
|
67
|
+
stdout: () => undefined,
|
|
68
|
+
runTask: async (prompt, args) => {
|
|
69
|
+
seen.push({ prompt, args });
|
|
70
|
+
return exits.shift() ?? 0;
|
|
71
|
+
},
|
|
72
|
+
});
|
|
73
|
+
assert.deepEqual(seen, [
|
|
74
|
+
{ prompt: "First", args: ["--model", "gpt-5"] },
|
|
75
|
+
{ prompt: "Second", args: ["--model", "gpt-5"] },
|
|
76
|
+
]);
|
|
77
|
+
const summary = JSON.parse(await readFile(join(cwd, ".omx", "missions", "demo", "summary.json"), "utf-8"));
|
|
78
|
+
assert.equal(summary.status, "failed");
|
|
79
|
+
assert.deepEqual(summary.tasks.map((task) => task.status), ["passed", "failed", "skipped"]);
|
|
80
|
+
assert.equal(summary.counts.failed, 1);
|
|
81
|
+
assert.equal(summary.counts.skipped, 1);
|
|
82
|
+
process.exitCode = undefined;
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
it("reports status from an existing summary by file or slug", async () => {
|
|
86
|
+
await withTempDir(async (cwd) => {
|
|
87
|
+
await writeFile(join(cwd, "mission.md"), "First\nSecond\n", "utf-8");
|
|
88
|
+
await missionCommand(["mission.md", "--dry-run", "--slug", "demo"], { cwd, stdout: () => undefined });
|
|
89
|
+
const byFile = [];
|
|
90
|
+
await missionCommand(["status", "mission.md", "--slug", "demo"], { cwd, stdout: (line) => byFile.push(line) });
|
|
91
|
+
assert.match(byFile.join("\n"), /mission status: demo \[planned\]/);
|
|
92
|
+
assert.match(byFile.join("\n"), /\[planned\] task-001 line 1: First/);
|
|
93
|
+
const bySlug = [];
|
|
94
|
+
await missionCommand(["status", "demo"], { cwd, stdout: (line) => bySlug.push(line) });
|
|
95
|
+
assert.match(bySlug.join("\n"), /summary: .*\.omx.*missions.*demo.*summary\.json/);
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
it("reports invalid summary JSON as a mission error", async () => {
|
|
99
|
+
await withTempDir(async (cwd) => {
|
|
100
|
+
const summaryPath = join(cwd, "summary.json");
|
|
101
|
+
await writeFile(summaryPath, "{not json", "utf-8");
|
|
102
|
+
const err = [];
|
|
103
|
+
await missionCommand(["status", "demo", "--summary", summaryPath], {
|
|
104
|
+
cwd,
|
|
105
|
+
stdout: () => undefined,
|
|
106
|
+
stderr: (line) => err.push(line),
|
|
107
|
+
});
|
|
108
|
+
assert.deepEqual(err, [`[mission] Invalid mission summary at ${summaryPath}.`]);
|
|
109
|
+
assert.equal(process.exitCode, 1);
|
|
110
|
+
process.exitCode = undefined;
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
it("resumes durable summaries by skipping passed tasks and retrying stale running work", async () => {
|
|
114
|
+
await withTempDir(async (cwd) => {
|
|
115
|
+
await writeFile(join(cwd, "mission.md"), "First\nSecond\nThird\n", "utf-8");
|
|
116
|
+
await missionCommand(["run", "mission.md", "--slug", "demo", "--continue-on-error"], {
|
|
117
|
+
cwd,
|
|
118
|
+
stdout: () => undefined,
|
|
119
|
+
runTask: async (prompt) => prompt === "First" ? 0 : 9,
|
|
120
|
+
});
|
|
121
|
+
process.exitCode = undefined;
|
|
122
|
+
const summaryPath = join(cwd, ".omx", "missions", "demo", "summary.json");
|
|
123
|
+
const interrupted = JSON.parse(await readFile(summaryPath, "utf-8"));
|
|
124
|
+
interrupted.status = "running";
|
|
125
|
+
interrupted.completed_at = undefined;
|
|
126
|
+
interrupted.tasks[1].status = "running";
|
|
127
|
+
interrupted.tasks[1].completed_at = undefined;
|
|
128
|
+
await writeFile(summaryPath, `${JSON.stringify(interrupted, null, 2)}\n`, "utf-8");
|
|
129
|
+
const seen = [];
|
|
130
|
+
await missionCommand(["resume", "mission.md", "--slug", "demo", "--continue-on-error"], {
|
|
131
|
+
cwd,
|
|
132
|
+
stdout: () => undefined,
|
|
133
|
+
runTask: async (prompt) => {
|
|
134
|
+
seen.push(prompt);
|
|
135
|
+
return 0;
|
|
136
|
+
},
|
|
137
|
+
});
|
|
138
|
+
assert.deepEqual(seen, ["Second", "Third"]);
|
|
139
|
+
const resumed = JSON.parse(await readFile(summaryPath, "utf-8"));
|
|
140
|
+
assert.equal(resumed.status, "passed");
|
|
141
|
+
assert.deepEqual(resumed.tasks.map((task) => task.status), ["passed", "passed", "passed"]);
|
|
142
|
+
const ledger = await readFile(join(cwd, ".omx", "missions", "demo", "ledger.jsonl"), "utf-8");
|
|
143
|
+
assert.match(ledger, /mission_resumed/);
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
it("reruns one requested task from the existing summary", async () => {
|
|
147
|
+
await withTempDir(async (cwd) => {
|
|
148
|
+
await writeFile(join(cwd, "mission.md"), "First\nSecond\nThird\n", "utf-8");
|
|
149
|
+
await missionCommand(["run", "mission.md", "--slug", "demo", "--continue-on-error"], {
|
|
150
|
+
cwd,
|
|
151
|
+
stdout: () => undefined,
|
|
152
|
+
runTask: async (prompt) => prompt === "Second" ? 4 : 0,
|
|
153
|
+
});
|
|
154
|
+
process.exitCode = undefined;
|
|
155
|
+
const seen = [];
|
|
156
|
+
await missionCommand(["rerun", "mission.md", "--slug", "demo", "--task", "task-002"], {
|
|
157
|
+
cwd,
|
|
158
|
+
stdout: () => undefined,
|
|
159
|
+
runTask: async (prompt) => {
|
|
160
|
+
seen.push(prompt);
|
|
161
|
+
return 0;
|
|
162
|
+
},
|
|
163
|
+
});
|
|
164
|
+
assert.deepEqual(seen, ["Second"]);
|
|
165
|
+
const summary = JSON.parse(await readFile(join(cwd, ".omx", "missions", "demo", "summary.json"), "utf-8"));
|
|
166
|
+
assert.equal(summary.status, "passed");
|
|
167
|
+
assert.deepEqual(summary.tasks.map((task) => task.status), ["passed", "passed", "passed"]);
|
|
168
|
+
});
|
|
169
|
+
});
|
|
170
|
+
it("marks blocked and needs-human-review tasks in status counts", async () => {
|
|
171
|
+
await withTempDir(async (cwd) => {
|
|
172
|
+
await writeFile(join(cwd, "mission.md"), "First\nSecond\nThird\n", "utf-8");
|
|
173
|
+
await missionCommand(["run", "mission.md", "--slug", "demo"], {
|
|
174
|
+
cwd,
|
|
175
|
+
stdout: () => undefined,
|
|
176
|
+
runTask: async () => 0,
|
|
177
|
+
});
|
|
178
|
+
await missionCommand(["mark", "demo", "--task", "task-002", "--status", "blocked"], { cwd, stdout: () => undefined });
|
|
179
|
+
await missionCommand(["mark", "demo", "--task", "task-003", "--status", "needs-human-review"], { cwd, stdout: () => undefined });
|
|
180
|
+
const out = [];
|
|
181
|
+
await missionCommand(["status", "demo"], { cwd, stdout: (line) => out.push(line) });
|
|
182
|
+
const status = out.join("\n");
|
|
183
|
+
assert.match(status, /mission status: demo \[blocked\]/);
|
|
184
|
+
assert.match(status, /1\/3 passed, 0 failed, 0 skipped, 1 blocked, 1 needs-human-review, 0 planned/);
|
|
185
|
+
assert.match(status, /\[blocked\] task-002 line 2: Second/);
|
|
186
|
+
assert.match(status, /\[needs-human-review\] task-003 line 3: Third/);
|
|
187
|
+
const summary = JSON.parse(await readFile(join(cwd, ".omx", "missions", "demo", "summary.json"), "utf-8"));
|
|
188
|
+
assert.equal(summary.status, "blocked");
|
|
189
|
+
assert.equal(summary.counts.blocked, 1);
|
|
190
|
+
assert.equal(summary.counts["needs-human-review"], 1);
|
|
191
|
+
const ledger = await readFile(join(cwd, ".omx", "missions", "demo", "ledger.jsonl"), "utf-8");
|
|
192
|
+
assert.match(ledger, /task_marked/);
|
|
193
|
+
});
|
|
194
|
+
});
|
|
195
|
+
it("leaves operator-marked tasks on resume and allows explicit rerun", async () => {
|
|
196
|
+
await withTempDir(async (cwd) => {
|
|
197
|
+
await writeFile(join(cwd, "mission.md"), "First\nSecond\nThird\n", "utf-8");
|
|
198
|
+
await missionCommand(["run", "mission.md", "--slug", "demo"], {
|
|
199
|
+
cwd,
|
|
200
|
+
stdout: () => undefined,
|
|
201
|
+
runTask: async () => 0,
|
|
202
|
+
});
|
|
203
|
+
await missionCommand(["mark", "mission.md", "--slug", "demo", "--task", "task-002", "--status", "blocked"], { cwd, stdout: () => undefined });
|
|
204
|
+
await missionCommand(["mark", "mission.md", "--slug", "demo", "--task", "task-003", "--status", "needs-human-review"], { cwd, stdout: () => undefined });
|
|
205
|
+
const resumedPrompts = [];
|
|
206
|
+
await missionCommand(["resume", "mission.md", "--slug", "demo"], {
|
|
207
|
+
cwd,
|
|
208
|
+
stdout: () => undefined,
|
|
209
|
+
runTask: async (prompt) => {
|
|
210
|
+
resumedPrompts.push(prompt);
|
|
211
|
+
return 0;
|
|
212
|
+
},
|
|
213
|
+
});
|
|
214
|
+
assert.deepEqual(resumedPrompts, []);
|
|
215
|
+
assert.equal(process.exitCode, 1);
|
|
216
|
+
process.exitCode = undefined;
|
|
217
|
+
const rerunPrompts = [];
|
|
218
|
+
await missionCommand(["rerun", "mission.md", "--slug", "demo", "--task", "task-002"], {
|
|
219
|
+
cwd,
|
|
220
|
+
stdout: () => undefined,
|
|
221
|
+
runTask: async (prompt) => {
|
|
222
|
+
rerunPrompts.push(prompt);
|
|
223
|
+
return 0;
|
|
224
|
+
},
|
|
225
|
+
});
|
|
226
|
+
assert.deepEqual(rerunPrompts, ["Second"]);
|
|
227
|
+
const summary = JSON.parse(await readFile(join(cwd, ".omx", "missions", "demo", "summary.json"), "utf-8"));
|
|
228
|
+
assert.equal(summary.status, "needs-human-review");
|
|
229
|
+
assert.deepEqual(summary.tasks.map((task) => task.status), ["passed", "passed", "needs-human-review"]);
|
|
230
|
+
assert.equal(process.exitCode, 1);
|
|
231
|
+
process.exitCode = undefined;
|
|
232
|
+
});
|
|
233
|
+
});
|
|
234
|
+
it("documents mission in top-level help", () => {
|
|
235
|
+
assert.match(HELP, /omx mission <file>/);
|
|
236
|
+
assert.match(HELP, /prompt\/checklist file sequentially through omx exec/);
|
|
237
|
+
});
|
|
238
|
+
});
|
|
239
|
+
//# sourceMappingURL=mission.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mission.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/mission.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ function applyPluginModeConfig(content, packageRoot) {
|
|
|
12
12
|
describe("plugin marketplace config upserts", () => {
|
|
13
13
|
it("keeps repeated plugin-mode setup config updates idempotent", () => {
|
|
14
14
|
const packageRoot = "/tmp/oh-my-codex";
|
|
15
|
-
const first = applyPluginModeConfig('model = "gpt-5.
|
|
15
|
+
const first = applyPluginModeConfig('model = "gpt-5.6-sol"\n', packageRoot);
|
|
16
16
|
const second = applyPluginModeConfig(first, packageRoot);
|
|
17
17
|
assert.equal(second, first);
|
|
18
18
|
assert.equal(countMatches(second, /^\[marketplaces\.oh-my-codex-local\]$/gm), 1);
|
|
@@ -24,7 +24,7 @@ describe("plugin marketplace config upserts", () => {
|
|
|
24
24
|
});
|
|
25
25
|
it("normalizes legacy local plugin scalar before emitting plugin table", () => {
|
|
26
26
|
const repaired = upsertLocalOmxPluginEnablement([
|
|
27
|
-
'model = "gpt-5.
|
|
27
|
+
'model = "gpt-5.6-sol"',
|
|
28
28
|
'',
|
|
29
29
|
'[plugins]',
|
|
30
30
|
`"${OMX_LOCAL_PLUGIN_CONFIG_KEY}" = true`,
|
|
@@ -39,7 +39,7 @@ describe("plugin marketplace config upserts", () => {
|
|
|
39
39
|
it("dedupes existing local marketplace and plugin MCP blocks without removing unrelated config", () => {
|
|
40
40
|
const packageRoot = "/tmp/oh-my-codex-new";
|
|
41
41
|
const duplicated = [
|
|
42
|
-
'model = "gpt-5.
|
|
42
|
+
'model = "gpt-5.6-sol"',
|
|
43
43
|
'',
|
|
44
44
|
'[mcp_servers.user_tool]',
|
|
45
45
|
'command = "user-tool"',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-marketplace-idempotent.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/plugin-marketplace-idempotent.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAAE,gCAAgC,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EACN,0BAA0B,EAC1B,2BAA2B,EAC3B,qCAAqC,EACrC,8BAA8B,EAC9B,uCAAuC,GACvC,MAAM,0BAA0B,CAAC;AAElC,SAAS,YAAY,CAAC,OAAe,EAAE,OAAe;IACrD,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAC9C,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe,EAAE,WAAmB;IAClE,OAAO,qCAAqC,CAC3C,uCAAuC,CACtC,8BAA8B,CAAC,OAAO,CAAC,EACvC,IAAI,CACJ,EACD,WAAW,CACX,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAClD,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACrE,MAAM,WAAW,GAAG,kBAAkB,CAAC;QACvC,MAAM,KAAK,GAAG,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"plugin-marketplace-idempotent.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/plugin-marketplace-idempotent.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAAE,gCAAgC,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EACN,0BAA0B,EAC1B,2BAA2B,EAC3B,qCAAqC,EACrC,8BAA8B,EAC9B,uCAAuC,GACvC,MAAM,0BAA0B,CAAC;AAElC,SAAS,YAAY,CAAC,OAAe,EAAE,OAAe;IACrD,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAC9C,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe,EAAE,WAAmB;IAClE,OAAO,qCAAqC,CAC3C,uCAAuC,CACtC,8BAA8B,CAAC,OAAO,CAAC,EACvC,IAAI,CACJ,EACD,WAAW,CACX,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAClD,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACrE,MAAM,WAAW,GAAG,kBAAkB,CAAC;QACvC,MAAM,KAAK,GAAG,qBAAqB,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,qBAAqB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAEzD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5B,MAAM,CAAC,KAAK,CACX,YAAY,CAAC,MAAM,EAAE,yCAAyC,CAAC,EAC/D,CAAC,CACD,CAAC;QACF,MAAM,CAAC,KAAK,CACX,YAAY,CACX,MAAM,EACN,kDAAkD,CAClD,EACD,CAAC,CACD,CAAC;QACF,KAAK,MAAM,UAAU,IAAI,gCAAgC,EAAE,CAAC;YAC3D,MAAM,CAAC,KAAK,CACX,YAAY,CACX,MAAM,EACN,IAAI,MAAM,CACT,iBAAiB,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,oBAAoB,UAAU,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAC9K,IAAI,CACJ,CACD,EACD,CAAC,EACD,GAAG,UAAU,yBAAyB,CACtC,CAAC;QACH,CAAC;QACD,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC7E,MAAM,QAAQ,GAAG,8BAA8B,CAC9C;YACC,uBAAuB;YACvB,EAAE;YACF,WAAW;YACX,IAAI,2BAA2B,UAAU;YACzC,qBAAqB;YACrB,EAAE;SACF,CAAC,IAAI,CAAC,IAAI,CAAC,CACZ,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,KAAK,2BAA2B,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QACzF,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAC;QACjD,MAAM,CAAC,KAAK,CACX,YAAY,CACX,QAAQ,EACR,kDAAkD,CAClD,EACD,CAAC,CACD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4FAA4F,EAAE,GAAG,EAAE;QACrG,MAAM,WAAW,GAAG,sBAAsB,CAAC;QAC3C,MAAM,UAAU,GAAG;YAClB,uBAAuB;YACvB,EAAE;YACF,yBAAyB;YACzB,uBAAuB;YACvB,EAAE;YACF,YAAY,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,GAAG;YAC1D,iBAAiB;YACjB,EAAE;YACF,YAAY,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,GAAG;YAC1D,iBAAiB;YACjB,EAAE;YACF,YAAY,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,yBAAyB;YAChF,iBAAiB;YACjB,EAAE;YACF,YAAY,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,yBAAyB;YAChF,iBAAiB;YACjB,EAAE;YACF,iBAAiB,0BAA0B,GAAG;YAC9C,uBAAuB;YACvB,qBAAqB;YACrB,EAAE;YACF,iBAAiB,0BAA0B,GAAG;YAC9C,uBAAuB;YACvB,uBAAuB;YACvB,EAAE;SACF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,qBAAqB,CAAC,CAAC;QAEnE,MAAM,QAAQ,GAAG,qBAAqB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAEhE,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,+BAA+B,CAAC,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,0BAA0B,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CACX,YAAY,CAAC,QAAQ,EAAE,yCAAyC,CAAC,EACjE,CAAC,CACD,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QACrF,MAAM,CAAC,KAAK,CACX,YAAY,CACX,QAAQ,EACR,0EAA0E,CAC1E,EACD,CAAC,CACD,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { describe, it } from 'node:test';
|
|
2
2
|
import assert from 'node:assert/strict';
|
|
3
3
|
import TOML from '@iarna/toml';
|
|
4
|
-
import { chmod, mkdir, mkdtemp, readFile, readdir, realpath, rm, symlink, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { chmod, mkdir, mkdtemp, readFile, readdir, realpath, rm, stat, symlink, utimes, writeFile } from 'node:fs/promises';
|
|
5
5
|
import { spawnSync } from 'node:child_process';
|
|
6
6
|
import { tmpdir } from 'node:os';
|
|
7
7
|
import { dirname, join } from 'node:path';
|
|
@@ -41,7 +41,7 @@ describe('omx resume', () => {
|
|
|
41
41
|
await mkdir(join(wd, '.omx'), { recursive: true });
|
|
42
42
|
await mkdir(dirname(rolloutPath), { recursive: true });
|
|
43
43
|
await writeFile(join(wd, '.omx', 'setup-scope.json'), JSON.stringify({ scope: 'project' }));
|
|
44
|
-
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.
|
|
44
|
+
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.6-sol"\n');
|
|
45
45
|
await writeFile(join(projectCodexHome, 'state_5.sqlite'), 'state db placeholder');
|
|
46
46
|
await writeFile(join(projectCodexHome, 'state_5.sqlite-wal'), 'state db wal placeholder');
|
|
47
47
|
await writeFile(rolloutPath, '{"type":"session_meta","payload":{"id":"session-2712"}}\n');
|
|
@@ -88,7 +88,7 @@ if [ -f "$CODEX_HOME/sessions/2026/06/03/rollout-session-2712.jsonl" ]; then ech
|
|
|
88
88
|
await mkdir(join(wd, '.omx'), { recursive: true });
|
|
89
89
|
await mkdir(projectCodexHome, { recursive: true });
|
|
90
90
|
await writeFile(join(wd, '.omx', 'setup-scope.json'), JSON.stringify({ scope: 'project' }));
|
|
91
|
-
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.
|
|
91
|
+
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.6-sol"\n');
|
|
92
92
|
await writeFile(fakeCodexPath, `#!/bin/sh
|
|
93
93
|
mkdir -p "$CODEX_HOME/sessions/2026/06/16"
|
|
94
94
|
printf '{"type":"session_meta","payload":{"id":"session-2835"}}\n' > "$CODEX_HOME/sessions/2026/06/16/rollout-session-2835.jsonl"
|
|
@@ -132,7 +132,7 @@ printf 'fake-codex:%s\n' "$*"
|
|
|
132
132
|
await mkdir(projectCodexHome, { recursive: true });
|
|
133
133
|
await mkdir(dirname(runtimeRolloutPath), { recursive: true });
|
|
134
134
|
await writeFile(join(wd, '.omx', 'setup-scope.json'), JSON.stringify({ scope: 'project' }));
|
|
135
|
-
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.
|
|
135
|
+
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.6-sol"\n');
|
|
136
136
|
await writeFile(runtimeRolloutPath, '{"type":"session_meta","payload":{"id":"runtime-session"}}\n');
|
|
137
137
|
await writeFile(fakeCodexPath, `#!/bin/sh
|
|
138
138
|
printf 'fake-codex:%s\n' "$*"
|
|
@@ -176,7 +176,7 @@ if [ -f "$CODEX_HOME/sessions/2026/06/17/rollout-runtime-session.jsonl" ]; then
|
|
|
176
176
|
await mkdir(previousRuntimeCodexHome, { recursive: true });
|
|
177
177
|
await mkdir(duplicateRuntimeCodexHome, { recursive: true });
|
|
178
178
|
await writeFile(join(wd, '.omx', 'setup-scope.json'), JSON.stringify({ scope: 'project' }));
|
|
179
|
-
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.
|
|
179
|
+
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.6-sol"\n');
|
|
180
180
|
await writeFile(projectRolloutPath, '{"type":"session_meta","payload":{"id":"project-session"}}\n');
|
|
181
181
|
await writeFile(join(projectCodexHome, 'history.jsonl'), '{"session_id":"project-session"}\n');
|
|
182
182
|
await writeFile(join(projectCodexHome, 'session_index.jsonl'), '{"id":"project-session"}\n');
|
|
@@ -232,7 +232,7 @@ if [ -f "$CODEX_HOME/sessions/2026/06/18/rollout-project-session.jsonl" ]; then
|
|
|
232
232
|
await mkdir(projectCodexHome, { recursive: true });
|
|
233
233
|
await mkdir(dirname(runtimeRolloutPath), { recursive: true });
|
|
234
234
|
await writeFile(join(wd, '.omx', 'setup-scope.json'), JSON.stringify({ scope: 'project' }));
|
|
235
|
-
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.
|
|
235
|
+
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.6-sol"\n');
|
|
236
236
|
await writeFile(join(projectCodexHome, 'history.jsonl'), '{"session_id":"project-session"}\n');
|
|
237
237
|
await writeFile(join(projectCodexHome, 'session_index.jsonl'), '{"id":"project-session"}\n');
|
|
238
238
|
await writeFile(runtimeRolloutPath, '{"type":"session_meta","payload":{"id":"runtime-session"}}\n');
|
|
@@ -515,6 +515,56 @@ case "$(cat "$CODEX_HOME/config.toml")" in *'source = "${repoRoot}"'*) echo mark
|
|
|
515
515
|
await rm(wd, { recursive: true, force: true });
|
|
516
516
|
}
|
|
517
517
|
});
|
|
518
|
+
it('preserves transcript mtimes while materializing runtime history for updated sort', async () => {
|
|
519
|
+
const wd = await mkdtemp(join(tmpdir(), 'omx-resume-updated-sort-mtime-'));
|
|
520
|
+
try {
|
|
521
|
+
const home = join(wd, 'home');
|
|
522
|
+
const projectCodexHome = join(wd, '.codex');
|
|
523
|
+
const previousRuntimeCodexHome = join(wd, '.omx', 'runtime', 'codex-home', 'omx-existing-runtime');
|
|
524
|
+
const fakeBin = join(wd, 'bin');
|
|
525
|
+
const fakeCodexPath = join(fakeBin, 'codex');
|
|
526
|
+
const fakePsPath = join(fakeBin, 'ps');
|
|
527
|
+
const oldRolloutPath = join(projectCodexHome, 'sessions', '2024', '01', '02', 'rollout-old-a.jsonl');
|
|
528
|
+
const newerRolloutPath = join(projectCodexHome, 'sessions', '2024', '03', '04', 'rollout-old-b.jsonl');
|
|
529
|
+
const oldMtime = new Date('2024-01-02T03:04:05Z');
|
|
530
|
+
const newerMtime = new Date('2024-03-04T05:06:07Z');
|
|
531
|
+
await mkdir(home, { recursive: true });
|
|
532
|
+
await mkdir(fakeBin, { recursive: true });
|
|
533
|
+
await mkdir(dirname(oldRolloutPath), { recursive: true });
|
|
534
|
+
await mkdir(dirname(newerRolloutPath), { recursive: true });
|
|
535
|
+
await mkdir(previousRuntimeCodexHome, { recursive: true });
|
|
536
|
+
await writeFile(join(wd, '.omx', 'setup-scope.json'), JSON.stringify({ scope: 'project' }));
|
|
537
|
+
await writeFile(join(projectCodexHome, 'config.toml'), 'model = "gpt-5.6-sol"\n');
|
|
538
|
+
await writeFile(oldRolloutPath, '{"type":"session_meta","payload":{"id":"old-a"}}\n');
|
|
539
|
+
await writeFile(newerRolloutPath, '{"type":"session_meta","payload":{"id":"old-b"}}\n');
|
|
540
|
+
await utimes(oldRolloutPath, oldMtime, oldMtime);
|
|
541
|
+
await utimes(newerRolloutPath, newerMtime, newerMtime);
|
|
542
|
+
await symlink(join(projectCodexHome, 'sessions'), join(previousRuntimeCodexHome, 'sessions'), 'dir');
|
|
543
|
+
await writeFile(fakeCodexPath, `#!/bin/sh
|
|
544
|
+
printf 'fake-codex:%s\\n' "$*"
|
|
545
|
+
find "$CODEX_HOME/sessions" -type f -name '*.jsonl' -exec stat -c '%y %n' {} \\; | sort
|
|
546
|
+
`);
|
|
547
|
+
await chmod(fakeCodexPath, 0o755);
|
|
548
|
+
await writeFile(fakePsPath, '#!/bin/sh\nexit 0\n');
|
|
549
|
+
await chmod(fakePsPath, 0o755);
|
|
550
|
+
const result = runOmx(wd, ['resume', '--sort', 'updated'], {
|
|
551
|
+
HOME: home,
|
|
552
|
+
PATH: `${fakeBin}:/usr/bin:/bin`,
|
|
553
|
+
OMX_AUTO_UPDATE: '0',
|
|
554
|
+
OMX_NOTIFY_FALLBACK: '0',
|
|
555
|
+
OMX_HOOK_DERIVED_SIGNALS: '0',
|
|
556
|
+
});
|
|
557
|
+
assert.equal(result.status, 0, result.error || result.stderr || result.stdout);
|
|
558
|
+
assert.match(result.stdout, /fake-codex:resume --sort updated\b/);
|
|
559
|
+
assert.match(result.stdout, /2024-01-02 03:04:05\.\d+ .*rollout-old-a\.jsonl/);
|
|
560
|
+
assert.match(result.stdout, /2024-03-04 05:06:07\.\d+ .*rollout-old-b\.jsonl/);
|
|
561
|
+
assert.equal((await stat(oldRolloutPath)).mtime.toISOString(), oldMtime.toISOString());
|
|
562
|
+
assert.equal((await stat(newerRolloutPath)).mtime.toISOString(), newerMtime.toISOString());
|
|
563
|
+
}
|
|
564
|
+
finally {
|
|
565
|
+
await rm(wd, { recursive: true, force: true });
|
|
566
|
+
}
|
|
567
|
+
});
|
|
518
568
|
it('forwards --last to codex resume through the normal launch wrapper', async () => {
|
|
519
569
|
const wd = await mkdtemp(join(tmpdir(), 'omx-resume-cli-'));
|
|
520
570
|
try {
|
|
@@ -669,5 +719,44 @@ if [ -d "$selected_codex_home/plugins/cache/oh-my-codex-local/oh-my-codex/${stal
|
|
|
669
719
|
await rm(wd, { recursive: true, force: true });
|
|
670
720
|
}
|
|
671
721
|
});
|
|
722
|
+
it('does not bootstrap plugin mode during clean legacy resume', async () => {
|
|
723
|
+
const wd = await mkdtemp(join(tmpdir(), 'omx-resume-clean-legacy-'));
|
|
724
|
+
try {
|
|
725
|
+
const home = join(wd, 'home');
|
|
726
|
+
const codexHome = join(home, '.codex');
|
|
727
|
+
const fakeBin = join(wd, 'bin');
|
|
728
|
+
const fakeCodexPath = join(fakeBin, 'codex');
|
|
729
|
+
const fakePsPath = join(fakeBin, 'ps');
|
|
730
|
+
await mkdir(home, { recursive: true });
|
|
731
|
+
await mkdir(fakeBin, { recursive: true });
|
|
732
|
+
await writeFile(fakeCodexPath, `#!/bin/sh
|
|
733
|
+
set -eu
|
|
734
|
+
selected_codex_home="\${CODEX_HOME:-$HOME/.codex}"
|
|
735
|
+
printf 'fake-codex:%s\n' "$*"
|
|
736
|
+
if [ -f "$selected_codex_home/config.toml" ]; then echo config-created=yes; else echo config-created=no; fi
|
|
737
|
+
if [ -d "$selected_codex_home/plugins/cache/oh-my-codex-local/oh-my-codex" ]; then echo plugin-cache-created=yes; else echo plugin-cache-created=no; fi
|
|
738
|
+
`);
|
|
739
|
+
await chmod(fakeCodexPath, 0o755);
|
|
740
|
+
await writeFile(fakePsPath, '#!/bin/sh\nexit 0\n');
|
|
741
|
+
await chmod(fakePsPath, 0o755);
|
|
742
|
+
const result = runOmx(wd, ['resume', 'legacy-session'], {
|
|
743
|
+
HOME: home,
|
|
744
|
+
PATH: `${fakeBin}:/usr/bin:/bin`,
|
|
745
|
+
OMX_AUTO_UPDATE: '0',
|
|
746
|
+
OMX_NOTIFY_FALLBACK: '0',
|
|
747
|
+
OMX_HOOK_DERIVED_SIGNALS: '0',
|
|
748
|
+
OMX_LAUNCH_POLICY: 'direct',
|
|
749
|
+
});
|
|
750
|
+
assert.equal(result.status, 0, result.error || result.stderr || result.stdout);
|
|
751
|
+
assert.match(result.stdout, /fake-codex:resume legacy-session\b/);
|
|
752
|
+
assert.match(result.stdout, /config-created=no/);
|
|
753
|
+
assert.match(result.stdout, /plugin-cache-created=no/);
|
|
754
|
+
await assert.rejects(readFile(join(codexHome, 'config.toml'), 'utf-8'), /ENOENT/);
|
|
755
|
+
await assert.rejects(readFile(join(codexHome, 'plugins', 'cache', 'oh-my-codex-local', 'oh-my-codex'), 'utf-8'), /ENOENT/);
|
|
756
|
+
}
|
|
757
|
+
finally {
|
|
758
|
+
await rm(wd, { recursive: true, force: true });
|
|
759
|
+
}
|
|
760
|
+
});
|
|
672
761
|
});
|
|
673
762
|
//# sourceMappingURL=resume.test.js.map
|