oh-my-codex 0.22.2 → 0.22.4
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/dist/cli/__tests__/resume-hint.test.d.ts +2 -0
- package/dist/cli/__tests__/resume-hint.test.d.ts.map +1 -0
- package/dist/cli/__tests__/resume-hint.test.js +305 -0
- package/dist/cli/__tests__/resume-hint.test.js.map +1 -0
- package/dist/cli/__tests__/resume.test.js +51 -0
- package/dist/cli/__tests__/resume.test.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +65 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/resume-hint.d.ts +32 -0
- package/dist/cli/resume-hint.d.ts.map +1 -0
- package/dist/cli/resume-hint.js +97 -0
- package/dist/cli/resume-hint.js.map +1 -0
- package/dist/hooks/__tests__/skill-guidance-contract.test.js +19 -0
- package/dist/hooks/__tests__/skill-guidance-contract.test.js.map +1 -1
- package/dist/session-history/search.d.ts +16 -0
- package/dist/session-history/search.d.ts.map +1 -1
- package/dist/session-history/search.js +48 -0
- package/dist/session-history/search.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 +7 -7
- package/plugins/oh-my-codex/skills/ralplan/SKILL.md +2 -2
- package/skills/plan/SKILL.md +7 -7
- package/skills/ralplan/SKILL.md +2 -2
package/Cargo.lock
CHANGED
|
@@ -32,7 +32,7 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
|
|
|
32
32
|
|
|
33
33
|
[[package]]
|
|
34
34
|
name = "omx-api"
|
|
35
|
-
version = "0.22.
|
|
35
|
+
version = "0.22.4"
|
|
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.22.
|
|
43
|
+
version = "0.22.4"
|
|
44
44
|
dependencies = [
|
|
45
45
|
"libc",
|
|
46
46
|
]
|
|
47
47
|
|
|
48
48
|
[[package]]
|
|
49
49
|
name = "omx-mux"
|
|
50
|
-
version = "0.22.
|
|
50
|
+
version = "0.22.4"
|
|
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.22.
|
|
58
|
+
version = "0.22.4"
|
|
59
59
|
dependencies = [
|
|
60
60
|
"fs2",
|
|
61
61
|
"libc",
|
|
@@ -67,7 +67,7 @@ dependencies = [
|
|
|
67
67
|
|
|
68
68
|
[[package]]
|
|
69
69
|
name = "omx-runtime-core"
|
|
70
|
-
version = "0.22.
|
|
70
|
+
version = "0.22.4"
|
|
71
71
|
dependencies = [
|
|
72
72
|
"fs2",
|
|
73
73
|
"serde",
|
|
@@ -76,7 +76,7 @@ dependencies = [
|
|
|
76
76
|
|
|
77
77
|
[[package]]
|
|
78
78
|
name = "omx-sparkshell"
|
|
79
|
-
version = "0.22.
|
|
79
|
+
version = "0.22.4"
|
|
80
80
|
dependencies = [
|
|
81
81
|
"omx-mux",
|
|
82
82
|
]
|
package/Cargo.toml
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resume-hint.test.d.ts","sourceRoot":"","sources":["../../../src/cli/__tests__/resume-hint.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,305 @@
|
|
|
1
|
+
import { describe, it } from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { mkdir, mkdtemp, rm, utimes, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { spawnSync } from 'node:child_process';
|
|
5
|
+
import { tmpdir } from 'node:os';
|
|
6
|
+
import { dirname, join } from 'node:path';
|
|
7
|
+
import { fileURLToPath } from 'node:url';
|
|
8
|
+
import { buildResumeCommand, extractCodexDirectoryOverride, formatResumeBlock, resolveEffectiveSessionCwd, shellQuote } from '../resume-hint.js';
|
|
9
|
+
import { findLatestSession } from '../../session-history/search.js';
|
|
10
|
+
const SID = '01a1bee6-529f-7f43-bb86-e85cdc099614';
|
|
11
|
+
async function writeRollout(home, name, id, mtime) {
|
|
12
|
+
const path = join(home, 'sessions', '2026', '11', '09', `rollout-${name}.jsonl`);
|
|
13
|
+
await mkdir(dirname(path), { recursive: true });
|
|
14
|
+
await writeFile(path, `${JSON.stringify({ type: 'session_meta', payload: { id, timestamp: 't', cwd: '/x' } })}\n`);
|
|
15
|
+
await utimes(path, mtime / 1000, mtime / 1000);
|
|
16
|
+
}
|
|
17
|
+
describe('resume block formatting', () => {
|
|
18
|
+
it('plain launch uses only codex-native `resume <id>`', () => {
|
|
19
|
+
const out = formatResumeBlock({ sessionId: SID, launchArgs: [], launchCwd: '/p' });
|
|
20
|
+
assert.match(out, new RegExp(`Session id: ${SID}`));
|
|
21
|
+
assert.match(out, new RegExp(`^ omx resume ${SID}$`, 'm'));
|
|
22
|
+
assert.doesNotMatch(out, /--latest/);
|
|
23
|
+
});
|
|
24
|
+
it('madmax /exit prints isolated state line first, then a command that keeps --madmax/--high from the source cwd', () => {
|
|
25
|
+
const out = formatResumeBlock({
|
|
26
|
+
sessionId: SID,
|
|
27
|
+
launchArgs: ['--madmax', '--high'],
|
|
28
|
+
launchCwd: '/src/proj',
|
|
29
|
+
madmaxStateDir: '/home/u/.omx-runs/run-1',
|
|
30
|
+
});
|
|
31
|
+
const lines = out.trimEnd().split('\n');
|
|
32
|
+
assert.equal(lines[0], '[omx] madmax isolated state: /home/u/.omx-runs/run-1 (source: /src/proj)');
|
|
33
|
+
assert.equal(lines.at(-1), ` cd /src/proj && omx --madmax --high resume ${SID}`);
|
|
34
|
+
});
|
|
35
|
+
it('worktree variant names the worktree and cds into it', () => {
|
|
36
|
+
const out = formatResumeBlock({
|
|
37
|
+
sessionId: SID,
|
|
38
|
+
launchArgs: ['--worktree', 'feat-x'],
|
|
39
|
+
launchCwd: '/repo',
|
|
40
|
+
worktree: { path: '/repo.omx-worktrees/feat x', name: 'feat-x' },
|
|
41
|
+
});
|
|
42
|
+
assert.match(out, /\[omx\] worktree: feat-x \(\/repo\.omx-worktrees\/feat x\)/);
|
|
43
|
+
assert.match(out, new RegExp(`cd '/repo\\.omx-worktrees/feat x' && omx resume ${SID}`));
|
|
44
|
+
});
|
|
45
|
+
it('re-emits model flag but omits project flag for durable homes', () => {
|
|
46
|
+
// When projectLocalHome is false (default after cleanup), --project should not be added
|
|
47
|
+
assert.equal(buildResumeCommand({ sessionId: SID, launchArgs: ['--model', 'gpt-5'], launchCwd: '/p', projectLocalHome: false }), `omx --model gpt-5 resume ${SID}`);
|
|
48
|
+
});
|
|
49
|
+
it('includes project flag only when explicitly requested (legacy support)', () => {
|
|
50
|
+
// When projectLocalHome is true, --project is added
|
|
51
|
+
assert.equal(buildResumeCommand({ sessionId: SID, launchArgs: ['--model', 'gpt-5'], launchCwd: '/p', projectLocalHome: true }), `omx --model gpt-5 --project resume ${SID}`);
|
|
52
|
+
});
|
|
53
|
+
it('without a session id says so and prints no broken resume command', () => {
|
|
54
|
+
const out = formatResumeBlock({ sessionId: null, launchArgs: ['--madmax'], launchCwd: '/p' });
|
|
55
|
+
assert.match(out, /No Codex session id was captured/);
|
|
56
|
+
assert.doesNotMatch(out, /resume (null|undefined|'')/);
|
|
57
|
+
assert.equal(buildResumeCommand({ sessionId: null, launchArgs: [], launchCwd: '/p' }), null);
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
describe('findLatestSession (backs `resume --last`)', () => {
|
|
61
|
+
it('returns null when no sessions exist', async () => {
|
|
62
|
+
const home = await mkdtemp(join(tmpdir(), 'omx-latest-empty-'));
|
|
63
|
+
try {
|
|
64
|
+
assert.equal(await findLatestSession({ codexHomeDirs: [home] }), null);
|
|
65
|
+
}
|
|
66
|
+
finally {
|
|
67
|
+
await rm(home, { recursive: true, force: true });
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
it('filters by cwd to avoid concurrent sessions from other launches', async () => {
|
|
71
|
+
const home = await mkdtemp(join(tmpdir(), 'omx-latest-cwd-filter-'));
|
|
72
|
+
try {
|
|
73
|
+
await mkdir(join(home, 'sessions', '2026', '11', '09'), { recursive: true });
|
|
74
|
+
const path1 = join(home, 'sessions', '2026', '11', '09', 'rollout-1.jsonl');
|
|
75
|
+
const path2 = join(home, 'sessions', '2026', '11', '09', 'rollout-2.jsonl');
|
|
76
|
+
// Write session from /project-a with older mtime
|
|
77
|
+
await writeFile(path1, `${JSON.stringify({ type: 'session_meta', payload: { id: 'session-a', timestamp: 't', cwd: '/project-a' } })}
|
|
78
|
+
`);
|
|
79
|
+
await utimes(path1, 1000 / 1000, 1000 / 1000);
|
|
80
|
+
// Write session from /project-b with newer mtime
|
|
81
|
+
await writeFile(path2, `${JSON.stringify({ type: 'session_meta', payload: { id: 'session-b', timestamp: 't', cwd: '/project-b' } })}
|
|
82
|
+
`);
|
|
83
|
+
await utimes(path2, 2000 / 1000, 2000 / 1000);
|
|
84
|
+
// Without filter, should pick newest (session-b)
|
|
85
|
+
const noFilter = await findLatestSession({ codexHomeDirs: [home] });
|
|
86
|
+
assert.equal(noFilter?.session_id, 'session-b');
|
|
87
|
+
// With filter for /project-a, should pick session-a even though it's older
|
|
88
|
+
const withFilter = await findLatestSession({ codexHomeDirs: [home], cwdFilter: '/project-a' });
|
|
89
|
+
assert.equal(withFilter?.session_id, 'session-a');
|
|
90
|
+
// With filter for non-existent cwd, should return null
|
|
91
|
+
const noMatch = await findLatestSession({ codexHomeDirs: [home], cwdFilter: '/project-c' });
|
|
92
|
+
assert.equal(noMatch, null);
|
|
93
|
+
}
|
|
94
|
+
finally {
|
|
95
|
+
await rm(home, { recursive: true, force: true });
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
it('extractCodexDirectoryOverride: extracts -C or --cd flags from args', () => {
|
|
99
|
+
// Should extract -C flag with value
|
|
100
|
+
assert.equal(extractCodexDirectoryOverride(['-C', '/other/dir', 'launch']), '/other/dir');
|
|
101
|
+
// Should extract --cd flag with value
|
|
102
|
+
assert.equal(extractCodexDirectoryOverride(['--cd', '/override', 'launch']), '/override');
|
|
103
|
+
// Should extract --cd=value syntax
|
|
104
|
+
assert.equal(extractCodexDirectoryOverride(['--cd=/path', 'launch']), '/path');
|
|
105
|
+
// Should return undefined if no override
|
|
106
|
+
assert.equal(extractCodexDirectoryOverride(['launch']), undefined);
|
|
107
|
+
// Should return undefined if flag has no value
|
|
108
|
+
assert.equal(extractCodexDirectoryOverride(['-C']), undefined);
|
|
109
|
+
});
|
|
110
|
+
it('resolveEffectiveSessionCwd: returns worktree path, then -C override, then launch cwd', () => {
|
|
111
|
+
// When worktree is disabled and no override, should return launch cwd
|
|
112
|
+
assert.equal(resolveEffectiveSessionCwd('/launch/cwd', false, undefined, undefined), '/launch/cwd');
|
|
113
|
+
// When -C override is used but no worktree, should return override path
|
|
114
|
+
assert.equal(resolveEffectiveSessionCwd('/launch/cwd', false, undefined, '/override/dir'), '/override/dir');
|
|
115
|
+
// When worktree is enabled, should return worktree path (takes precedence over -C)
|
|
116
|
+
assert.equal(resolveEffectiveSessionCwd('/launch/cwd', true, '/worktree/path', '/override/dir'), '/worktree/path');
|
|
117
|
+
// When worktree is disabled and worktree path is undefined, should return launch cwd
|
|
118
|
+
assert.equal(resolveEffectiveSessionCwd('/launch/cwd', false, undefined), '/launch/cwd');
|
|
119
|
+
});
|
|
120
|
+
it('worktree filter: findLatestSession picks correct session when filtering by effective cwd', async () => {
|
|
121
|
+
const home = await mkdtemp(join(tmpdir(), 'omx-worktree-effective-cwd-'));
|
|
122
|
+
try {
|
|
123
|
+
await mkdir(join(home, 'sessions', '2026', '11', '09'), { recursive: true });
|
|
124
|
+
const path1 = join(home, 'sessions', '2026', '11', '09', 'rollout-1.jsonl');
|
|
125
|
+
const path2 = join(home, 'sessions', '2026', '11', '09', 'rollout-2.jsonl');
|
|
126
|
+
// Write session from original launch cwd with older mtime
|
|
127
|
+
await writeFile(path1, `${JSON.stringify({ type: 'session_meta', payload: { id: 'session-launch', timestamp: 't', cwd: '/repo' } })}
|
|
128
|
+
`);
|
|
129
|
+
await utimes(path1, 1000 / 1000, 1000 / 1000);
|
|
130
|
+
// Write session from worktree cwd with newer mtime (simulates a worktree launch)
|
|
131
|
+
await writeFile(path2, `${JSON.stringify({ type: 'session_meta', payload: { id: 'session-worktree', timestamp: 't', cwd: '/repo/.omx-worktrees/feat-x' } })}
|
|
132
|
+
`);
|
|
133
|
+
await utimes(path2, 2000 / 1000, 2000 / 1000);
|
|
134
|
+
// Critical: If code reverts to using launchCwd instead of effectiveCwdForSession,
|
|
135
|
+
// it would find session-launch instead of the correct session-worktree
|
|
136
|
+
const effectiveCwd = resolveEffectiveSessionCwd('/repo', true, '/repo/.omx-worktrees/feat-x');
|
|
137
|
+
const found = await findLatestSession({ codexHomeDirs: [home], cwdFilter: effectiveCwd });
|
|
138
|
+
assert.equal(found?.session_id, 'session-worktree', 'must find session created in worktree cwd when filtering by effective cwd');
|
|
139
|
+
// Verify the other case: when filtering by launch cwd, find the launch session
|
|
140
|
+
const launchSession = await findLatestSession({ codexHomeDirs: [home], cwdFilter: '/repo' });
|
|
141
|
+
assert.equal(launchSession?.session_id, 'session-launch', 'should find session-launch when filtering by launch cwd');
|
|
142
|
+
}
|
|
143
|
+
finally {
|
|
144
|
+
await rm(home, { recursive: true, force: true });
|
|
145
|
+
}
|
|
146
|
+
});
|
|
147
|
+
it('picks the newest of several sessions across homes', async () => {
|
|
148
|
+
const a = await mkdtemp(join(tmpdir(), 'omx-latest-a-'));
|
|
149
|
+
const b = await mkdtemp(join(tmpdir(), 'omx-latest-b-'));
|
|
150
|
+
try {
|
|
151
|
+
await writeRollout(a, '1-old', 'old', 1_000_000);
|
|
152
|
+
await writeRollout(a, '2-mid', 'mid', 2_000_000);
|
|
153
|
+
await writeRollout(b, '3-new', 'new', 3_000_000);
|
|
154
|
+
assert.equal((await findLatestSession({ codexHomeDirs: [a, b] }))?.session_id, 'new');
|
|
155
|
+
assert.equal((await findLatestSession({ codexHomeDirs: [a] }))?.session_id, 'mid');
|
|
156
|
+
assert.equal(await findLatestSession({ codexHomeDirs: [a, b], modifiedSinceMs: 4_000_000 }), null);
|
|
157
|
+
}
|
|
158
|
+
finally {
|
|
159
|
+
await rm(a, { recursive: true, force: true });
|
|
160
|
+
await rm(b, { recursive: true, force: true });
|
|
161
|
+
}
|
|
162
|
+
});
|
|
163
|
+
it('finds session persisted from runtime home to durable home', async () => {
|
|
164
|
+
const runtime = await mkdtemp(join(tmpdir(), 'omx-latest-runtime-'));
|
|
165
|
+
const durable = await mkdtemp(join(tmpdir(), 'omx-latest-durable-'));
|
|
166
|
+
try {
|
|
167
|
+
// Write session to runtime home
|
|
168
|
+
await writeRollout(runtime, 'sess1', 'sess1-id', 1_000_000);
|
|
169
|
+
assert.equal((await findLatestSession({ codexHomeDirs: [runtime, durable] }))?.session_id, 'sess1-id');
|
|
170
|
+
// Remove from runtime (simulate cleanup) and add to durable with newer mtime
|
|
171
|
+
await rm(join(runtime, 'sessions'), { recursive: true, force: true });
|
|
172
|
+
await writeRollout(durable, 'sess1', 'sess1-id', 2_000_000);
|
|
173
|
+
// Should still find it in durable home
|
|
174
|
+
assert.equal((await findLatestSession({ codexHomeDirs: [runtime, durable] }))?.session_id, 'sess1-id');
|
|
175
|
+
}
|
|
176
|
+
finally {
|
|
177
|
+
await rm(runtime, { recursive: true, force: true });
|
|
178
|
+
await rm(durable, { recursive: true, force: true });
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
});
|
|
182
|
+
describe('omx launch exit output (fake codex, isolated HOME)', () => {
|
|
183
|
+
function run(args, wd, fakeBin, extra = {}) {
|
|
184
|
+
const repoRoot = join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..');
|
|
185
|
+
return spawnSync(process.execPath, [join(repoRoot, 'dist', 'cli', 'omx.js'), ...args], {
|
|
186
|
+
cwd: wd,
|
|
187
|
+
encoding: 'utf-8',
|
|
188
|
+
env: {
|
|
189
|
+
...process.env,
|
|
190
|
+
HOME: join(wd, 'home'),
|
|
191
|
+
CODEX_HOME: join(wd, 'home', '.codex'),
|
|
192
|
+
OMX_RUNS_DIR: join(wd, 'runs'),
|
|
193
|
+
PATH: `${fakeBin}:${process.env.PATH ?? ''}`,
|
|
194
|
+
OMX_AUTO_UPDATE: '0',
|
|
195
|
+
OMX_NOTIFY_FALLBACK: '0',
|
|
196
|
+
OMX_HOOK_DERIVED_SIGNALS: '0',
|
|
197
|
+
OMX_LAUNCH_POLICY: 'direct',
|
|
198
|
+
...extra,
|
|
199
|
+
},
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
async function setup(writeSession, exitCode = 0) {
|
|
203
|
+
const wd = await mkdtemp(join(tmpdir(), 'omx-exit-block-'));
|
|
204
|
+
const fakeBin = join(wd, 'bin');
|
|
205
|
+
await mkdir(fakeBin, { recursive: true });
|
|
206
|
+
await mkdir(join(wd, 'home', '.codex'), { recursive: true });
|
|
207
|
+
const script = writeSession
|
|
208
|
+
? `mkdir -p "$CODEX_HOME/sessions/2026/11/09"\nprintf '{"type":"session_meta","payload":{"id":"${SID}","cwd":"%s"}}\\n' "$PWD" > "$CODEX_HOME/sessions/2026/11/09/rollout-a.jsonl"\nexit ${exitCode}\n`
|
|
209
|
+
: `exit ${exitCode}\n`;
|
|
210
|
+
await writeFile(join(fakeBin, 'codex'), `#!/bin/sh\n${script}`, { mode: 0o755 });
|
|
211
|
+
return { wd, fakeBin };
|
|
212
|
+
}
|
|
213
|
+
it('normal /exit prints the resume block', async () => {
|
|
214
|
+
const { wd, fakeBin } = await setup(true);
|
|
215
|
+
try {
|
|
216
|
+
const r = run([], wd, fakeBin);
|
|
217
|
+
assert.match(r.stderr, new RegExp(`Session id: ${SID}`), r.stderr);
|
|
218
|
+
assert.match(r.stderr, new RegExp(`omx resume ${SID}`));
|
|
219
|
+
}
|
|
220
|
+
finally {
|
|
221
|
+
await rm(wd, { recursive: true, force: true });
|
|
222
|
+
}
|
|
223
|
+
});
|
|
224
|
+
it('madmax /exit prints the block after the isolated-state line', async () => {
|
|
225
|
+
const { wd, fakeBin } = await setup(true);
|
|
226
|
+
try {
|
|
227
|
+
const r = run(['--madmax', '--high'], wd, fakeBin);
|
|
228
|
+
const stateAt = r.stderr.indexOf('[omx] madmax isolated state:');
|
|
229
|
+
const blockAt = r.stderr.indexOf('Session id:');
|
|
230
|
+
assert.ok(stateAt >= 0 && blockAt > stateAt, r.stderr);
|
|
231
|
+
assert.match(r.stderr, new RegExp(`omx --madmax --high resume ${SID}`));
|
|
232
|
+
}
|
|
233
|
+
finally {
|
|
234
|
+
await rm(wd, { recursive: true, force: true });
|
|
235
|
+
}
|
|
236
|
+
});
|
|
237
|
+
it('abnormal child exit still prints the block when a session id is known', async () => {
|
|
238
|
+
const { wd, fakeBin } = await setup(true, 3);
|
|
239
|
+
try {
|
|
240
|
+
const r = run([], wd, fakeBin);
|
|
241
|
+
assert.match(r.stderr, new RegExp(`omx resume ${SID}`), r.stderr);
|
|
242
|
+
}
|
|
243
|
+
finally {
|
|
244
|
+
await rm(wd, { recursive: true, force: true });
|
|
245
|
+
}
|
|
246
|
+
});
|
|
247
|
+
it('no captured session id says so', async () => {
|
|
248
|
+
const { wd, fakeBin } = await setup(false);
|
|
249
|
+
try {
|
|
250
|
+
const r = run([], wd, fakeBin);
|
|
251
|
+
assert.match(r.stderr, /No Codex session id was captured/, r.stderr);
|
|
252
|
+
}
|
|
253
|
+
finally {
|
|
254
|
+
await rm(wd, { recursive: true, force: true });
|
|
255
|
+
}
|
|
256
|
+
});
|
|
257
|
+
it('resume --last with no sessions errors clearly and does not launch codex', async () => {
|
|
258
|
+
const { wd, fakeBin } = await setup(false);
|
|
259
|
+
try {
|
|
260
|
+
const r = run(['resume', '--last'], wd, fakeBin);
|
|
261
|
+
assert.notEqual(r.status, 0);
|
|
262
|
+
assert.match(r.stderr, /no previous sessions found/, r.stderr);
|
|
263
|
+
}
|
|
264
|
+
finally {
|
|
265
|
+
await rm(wd, { recursive: true, force: true });
|
|
266
|
+
}
|
|
267
|
+
});
|
|
268
|
+
it('exit block for project-scoped launch does not include --project flag', async () => {
|
|
269
|
+
const { wd, fakeBin } = await setup(true);
|
|
270
|
+
try {
|
|
271
|
+
const r = run(['--project'], wd, fakeBin);
|
|
272
|
+
// Should print resume block
|
|
273
|
+
assert.match(r.stderr, new RegExp(`Session id: ${SID}`), r.stderr);
|
|
274
|
+
// Should NOT include --project in the suggested resume command
|
|
275
|
+
assert.match(r.stderr, new RegExp(`omx resume ${SID}`), r.stderr);
|
|
276
|
+
assert.doesNotMatch(r.stderr, /omx.*--project.*resume/, r.stderr);
|
|
277
|
+
}
|
|
278
|
+
finally {
|
|
279
|
+
await rm(wd, { recursive: true, force: true });
|
|
280
|
+
}
|
|
281
|
+
});
|
|
282
|
+
});
|
|
283
|
+
describe('shellQuote escaping (round-trip through bash)', () => {
|
|
284
|
+
function bashEvalRoundTrip(value) {
|
|
285
|
+
const result = spawnSync('bash', ['-c', `printf %s ${shellQuote(value)}`], { encoding: 'utf-8' });
|
|
286
|
+
return result.stdout;
|
|
287
|
+
}
|
|
288
|
+
it('preserves path with apostrophe', () => {
|
|
289
|
+
const path = "/tmp/user's repo";
|
|
290
|
+
assert.equal(bashEvalRoundTrip(path), path);
|
|
291
|
+
});
|
|
292
|
+
it('preserves model name with apostrophe', () => {
|
|
293
|
+
const modelName = "gpt-4o-mini's variant";
|
|
294
|
+
assert.equal(bashEvalRoundTrip(modelName), modelName);
|
|
295
|
+
});
|
|
296
|
+
it('preserves plain value with apostrophe', () => {
|
|
297
|
+
const value = "don't forget this";
|
|
298
|
+
assert.equal(bashEvalRoundTrip(value), value);
|
|
299
|
+
});
|
|
300
|
+
it('preserves value with multiple apostrophes', () => {
|
|
301
|
+
const value = "it's what's best";
|
|
302
|
+
assert.equal(bashEvalRoundTrip(value), value);
|
|
303
|
+
});
|
|
304
|
+
});
|
|
305
|
+
//# sourceMappingURL=resume-hint.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resume-hint.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/resume-hint.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -658,8 +658,12 @@ fi | sort
|
|
|
658
658
|
await chmod(fakeCodexPath, 0o755);
|
|
659
659
|
await writeFile(fakePsPath, '#!/bin/sh\nexit 0\n');
|
|
660
660
|
await chmod(fakePsPath, 0o755);
|
|
661
|
+
const seededRollout = join(home, '.codex', 'sessions', '2026', '11', '09', 'rollout-seed.jsonl');
|
|
662
|
+
await mkdir(dirname(seededRollout), { recursive: true });
|
|
663
|
+
await writeFile(seededRollout, '{"type":"session_meta","payload":{"id":"seed-session"}}\n');
|
|
661
664
|
const result = runOmx(wd, ['resume', '--last'], {
|
|
662
665
|
HOME: home,
|
|
666
|
+
CODEX_HOME: join(home, '.codex'),
|
|
663
667
|
PATH: `${fakeBin}:/usr/bin:/bin`,
|
|
664
668
|
OMX_AUTO_UPDATE: '0',
|
|
665
669
|
OMX_NOTIFY_FALLBACK: '0',
|
|
@@ -839,5 +843,52 @@ if [ -d "$selected_codex_home/plugins/cache/oh-my-codex-local/oh-my-codex" ]; th
|
|
|
839
843
|
await rm(wd, { recursive: true, force: true });
|
|
840
844
|
}
|
|
841
845
|
});
|
|
846
|
+
it('exit block avoids advertising concurrent sessions from different cwds', async () => {
|
|
847
|
+
// This test verifies that the exit resume block doesn't pick up sessions
|
|
848
|
+
// from concurrent Codex runs in different project directories.
|
|
849
|
+
// Since the exit block printing happens before cleanup, both sessions exist in the home.
|
|
850
|
+
// The cwdFilter ensures we pick the session from THIS launch, not a concurrent one.
|
|
851
|
+
const wd = await mkdtemp(join(tmpdir(), 'omx-exit-block-concurrent-'));
|
|
852
|
+
try {
|
|
853
|
+
const home = join(wd, 'home');
|
|
854
|
+
const codexHome = join(home, '.codex');
|
|
855
|
+
const projectA = join(wd, 'project-a');
|
|
856
|
+
const projectB = join(wd, 'project-b');
|
|
857
|
+
const fakeBin = join(wd, 'bin');
|
|
858
|
+
const fakeCodexPath = join(fakeBin, 'codex');
|
|
859
|
+
await mkdir(projectA, { recursive: true });
|
|
860
|
+
await mkdir(projectB, { recursive: true });
|
|
861
|
+
await mkdir(join(codexHome, 'sessions', '2026', '11', '09'), { recursive: true });
|
|
862
|
+
await mkdir(fakeBin, { recursive: true });
|
|
863
|
+
// Concurrent session from project-b with newer mtime
|
|
864
|
+
await writeFile(join(codexHome, 'sessions', '2026', '11', '09', 'rollout-concurrent.jsonl'), `${JSON.stringify({ type: 'session_meta', payload: { id: 'concurrent-session', timestamp: 't', cwd: projectB } })}\n`);
|
|
865
|
+
await utimes(join(codexHome, 'sessions', '2026', '11', '09', 'rollout-concurrent.jsonl'), 2000 / 1000, 2000 / 1000);
|
|
866
|
+
// Script that writes our session after a delay to ensure concurrent mtime is newer
|
|
867
|
+
await writeFile(fakeCodexPath, `#!/bin/sh
|
|
868
|
+
set -eu
|
|
869
|
+
selected_codex_home="${codexHome}"
|
|
870
|
+
mkdir -p "$selected_codex_home/sessions/2026/11/09"
|
|
871
|
+
# Write our session slightly after concurrent one to have newer mtime
|
|
872
|
+
sleep 0.1
|
|
873
|
+
printf '{"type":"session_meta","payload":{"id":"our-session","timestamp":"t","cwd":"${projectA}"}}\n' > "$selected_codex_home/sessions/2026/11/09/rollout-our-session.jsonl"
|
|
874
|
+
`);
|
|
875
|
+
await chmod(fakeCodexPath, 0o755);
|
|
876
|
+
const result = runOmx(projectA, [], {
|
|
877
|
+
HOME: home,
|
|
878
|
+
PATH: `${fakeBin}:/usr/bin:/bin`,
|
|
879
|
+
OMX_AUTO_UPDATE: '0',
|
|
880
|
+
OMX_NOTIFY_FALLBACK: '0',
|
|
881
|
+
OMX_HOOK_DERIVED_SIGNALS: '0',
|
|
882
|
+
OMX_LAUNCH_POLICY: 'direct',
|
|
883
|
+
});
|
|
884
|
+
// Even though concurrent-session has newer mtime, we should advertise our-session
|
|
885
|
+
// because it matches our launch cwd
|
|
886
|
+
assert.match(result.stderr, /Session id: our-session/, `should advertise our-session, stderr: ${result.stderr}`);
|
|
887
|
+
assert.doesNotMatch(result.stderr, /concurrent-session/, `should not advertise concurrent-session, stderr: ${result.stderr}`);
|
|
888
|
+
}
|
|
889
|
+
finally {
|
|
890
|
+
await rm(wd, { recursive: true, force: true });
|
|
891
|
+
}
|
|
892
|
+
});
|
|
842
893
|
});
|
|
843
894
|
//# sourceMappingURL=resume.test.js.map
|