oh-my-codex 0.13.0 → 0.13.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +5 -5
- package/Cargo.toml +1 -1
- package/README.md +40 -6
- package/crates/omx-explore/src/main.rs +221 -10
- package/dist/catalog/__tests__/generator.test.js +2 -0
- package/dist/catalog/__tests__/generator.test.js.map +1 -1
- package/dist/cli/__tests__/index.test.js +150 -1
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/setup-skills-overwrite.test.js +41 -3
- package/dist/cli/__tests__/setup-skills-overwrite.test.js.map +1 -1
- package/dist/cli/__tests__/update.test.js +25 -1
- package/dist/cli/__tests__/update.test.js.map +1 -1
- package/dist/cli/index.d.ts +1 -0
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +73 -9
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +15 -0
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/update.js +1 -1
- package/dist/cli/update.js.map +1 -1
- package/dist/hooks/__tests__/agents-overlay.test.js +20 -2
- package/dist/hooks/__tests__/agents-overlay.test.js.map +1 -1
- package/dist/hooks/__tests__/analyze-routing-contract.test.d.ts +2 -0
- package/dist/hooks/__tests__/analyze-routing-contract.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/analyze-routing-contract.test.js +36 -0
- package/dist/hooks/__tests__/analyze-routing-contract.test.js.map +1 -0
- package/dist/hooks/__tests__/analyze-skill-contract.test.d.ts +2 -0
- package/dist/hooks/__tests__/analyze-skill-contract.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/analyze-skill-contract.test.js +48 -0
- package/dist/hooks/__tests__/analyze-skill-contract.test.js.map +1 -0
- package/dist/hooks/__tests__/keyword-detector.test.js +32 -0
- package/dist/hooks/__tests__/keyword-detector.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-fallback-watcher.test.js +185 -8
- package/dist/hooks/__tests__/notify-fallback-watcher.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-session-idle-dedupe.test.js +26 -0
- package/dist/hooks/__tests__/notify-hook-session-idle-dedupe.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-session-scope.test.js +44 -0
- package/dist/hooks/__tests__/notify-hook-session-scope.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-team-leader-nudge.test.js +126 -0
- package/dist/hooks/__tests__/notify-hook-team-leader-nudge.test.js.map +1 -1
- package/dist/hooks/__tests__/session.test.js +21 -0
- package/dist/hooks/__tests__/session.test.js.map +1 -1
- package/dist/hooks/agents-overlay.d.ts.map +1 -1
- package/dist/hooks/agents-overlay.js +9 -0
- package/dist/hooks/agents-overlay.js.map +1 -1
- package/dist/hooks/keyword-detector.d.ts.map +1 -1
- package/dist/hooks/keyword-detector.js +8 -1
- package/dist/hooks/keyword-detector.js.map +1 -1
- package/dist/hooks/session.d.ts.map +1 -1
- package/dist/hooks/session.js +9 -0
- package/dist/hooks/session.js.map +1 -1
- package/dist/hud/__tests__/state.test.js +55 -0
- package/dist/hud/__tests__/state.test.js.map +1 -1
- package/dist/hud/state.d.ts.map +1 -1
- package/dist/hud/state.js +23 -4
- package/dist/hud/state.js.map +1 -1
- package/dist/mcp/__tests__/bootstrap.test.js +38 -0
- package/dist/mcp/__tests__/bootstrap.test.js.map +1 -1
- package/dist/mcp/bootstrap.d.ts +1 -1
- package/dist/mcp/bootstrap.d.ts.map +1 -1
- package/dist/mcp/bootstrap.js +11 -3
- package/dist/mcp/bootstrap.js.map +1 -1
- package/dist/notifications/__tests__/reply-listener.test.js +34 -1
- package/dist/notifications/__tests__/reply-listener.test.js.map +1 -1
- package/dist/notifications/reply-listener.d.ts +1 -0
- package/dist/notifications/reply-listener.d.ts.map +1 -1
- package/dist/notifications/reply-listener.js +14 -2
- package/dist/notifications/reply-listener.js.map +1 -1
- package/dist/scripts/__tests__/codex-native-hook.test.js +248 -15
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/__tests__/generate-release-body.test.d.ts +2 -0
- package/dist/scripts/__tests__/generate-release-body.test.d.ts.map +1 -0
- package/dist/scripts/__tests__/generate-release-body.test.js +144 -0
- package/dist/scripts/__tests__/generate-release-body.test.js.map +1 -0
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +39 -49
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/scripts/generate-release-body.d.ts +34 -0
- package/dist/scripts/generate-release-body.d.ts.map +1 -0
- package/dist/scripts/generate-release-body.js +249 -0
- package/dist/scripts/generate-release-body.js.map +1 -0
- package/dist/scripts/notify-fallback-watcher.js +43 -20
- package/dist/scripts/notify-fallback-watcher.js.map +1 -1
- package/dist/scripts/notify-hook/active-team.d.ts.map +1 -1
- package/dist/scripts/notify-hook/active-team.js +2 -1
- package/dist/scripts/notify-hook/active-team.js.map +1 -1
- package/dist/scripts/notify-hook/ralph-session-resume.d.ts.map +1 -1
- package/dist/scripts/notify-hook/ralph-session-resume.js +17 -2
- package/dist/scripts/notify-hook/ralph-session-resume.js.map +1 -1
- package/dist/scripts/notify-hook/state-io.d.ts.map +1 -1
- package/dist/scripts/notify-hook/state-io.js +16 -0
- package/dist/scripts/notify-hook/state-io.js.map +1 -1
- package/dist/scripts/notify-hook/team-leader-nudge.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-leader-nudge.js +26 -5
- package/dist/scripts/notify-hook/team-leader-nudge.js.map +1 -1
- package/dist/scripts/notify-hook.js +1 -7
- package/dist/scripts/notify-hook.js.map +1 -1
- package/dist/team/__tests__/model-contract.test.js +6 -0
- package/dist/team/__tests__/model-contract.test.js.map +1 -1
- package/dist/team/__tests__/tmux-session.test.js +1 -1
- package/dist/team/__tests__/tmux-session.test.js.map +1 -1
- package/dist/team/__tests__/worker-runtime-identity.test.d.ts +2 -0
- package/dist/team/__tests__/worker-runtime-identity.test.d.ts.map +1 -0
- package/dist/team/__tests__/worker-runtime-identity.test.js +250 -0
- package/dist/team/__tests__/worker-runtime-identity.test.js.map +1 -0
- package/dist/team/leader-activity.d.ts.map +1 -1
- package/dist/team/leader-activity.js +26 -15
- package/dist/team/leader-activity.js.map +1 -1
- package/dist/team/model-contract.d.ts.map +1 -1
- package/dist/team/model-contract.js.map +1 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +9 -8
- package/dist/team/runtime.js.map +1 -1
- package/dist/team/scaling.d.ts.map +1 -1
- package/dist/team/scaling.js +10 -9
- package/dist/team/scaling.js.map +1 -1
- package/dist/team/tmux-session.d.ts.map +1 -1
- package/dist/team/tmux-session.js +3 -2
- package/dist/team/tmux-session.js.map +1 -1
- package/dist/verification/__tests__/explore-harness-release-workflow.test.js +3 -0
- package/dist/verification/__tests__/explore-harness-release-workflow.test.js.map +1 -1
- package/dist/wiki/__tests__/slug-nonascii.test.js +11 -5
- package/dist/wiki/__tests__/slug-nonascii.test.js.map +1 -1
- package/dist/wiki/storage.d.ts.map +1 -1
- package/dist/wiki/storage.js +2 -1
- package/dist/wiki/storage.js.map +1 -1
- package/package.json +3 -1
- package/skills/analyze/SKILL.md +101 -134
- package/src/scripts/__tests__/codex-native-hook.test.ts +297 -17
- package/src/scripts/__tests__/generate-release-body.test.ts +166 -0
- package/src/scripts/codex-native-hook.ts +99 -66
- package/src/scripts/generate-release-body.ts +295 -0
- package/src/scripts/notify-fallback-watcher.ts +44 -21
- package/src/scripts/notify-hook/active-team.ts +2 -1
- package/src/scripts/notify-hook/ralph-session-resume.ts +17 -2
- package/src/scripts/notify-hook/state-io.ts +16 -0
- package/src/scripts/notify-hook/team-leader-nudge.ts +24 -4
- package/src/scripts/notify-hook.ts +1 -6
- package/templates/AGENTS.md +1 -1
- package/templates/catalog-manifest.json +2 -4
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
import { describe, it } from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { mkdtemp, rm, writeFile, readFile, mkdir, chmod } from 'fs/promises';
|
|
4
|
+
import { join } from 'path';
|
|
5
|
+
import { tmpdir } from 'os';
|
|
6
|
+
import { existsSync } from 'fs';
|
|
7
|
+
import { initTeamState, createTask, readTeamConfig, saveTeamConfig, } from '../state.js';
|
|
8
|
+
import { startTeam, shutdownTeam, resolveWorkerLaunchArgsFromEnv, } from '../runtime.js';
|
|
9
|
+
import { scaleUp } from '../scaling.js';
|
|
10
|
+
import { resolveTeamLowComplexityDefaultModel } from '../model-contract.js';
|
|
11
|
+
function expectedLowComplexityModel(codexHomeOverride) {
|
|
12
|
+
return resolveTeamLowComplexityDefaultModel(codexHomeOverride);
|
|
13
|
+
}
|
|
14
|
+
function withoutTeamWorkerEnv(fn) {
|
|
15
|
+
const prev = process.env.OMX_TEAM_WORKER;
|
|
16
|
+
delete process.env.OMX_TEAM_WORKER;
|
|
17
|
+
let restoreImmediately = true;
|
|
18
|
+
try {
|
|
19
|
+
const result = fn();
|
|
20
|
+
if (result instanceof Promise) {
|
|
21
|
+
restoreImmediately = false;
|
|
22
|
+
return result.finally(() => {
|
|
23
|
+
if (typeof prev === 'string')
|
|
24
|
+
process.env.OMX_TEAM_WORKER = prev;
|
|
25
|
+
else
|
|
26
|
+
delete process.env.OMX_TEAM_WORKER;
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
return result;
|
|
30
|
+
}
|
|
31
|
+
finally {
|
|
32
|
+
if (restoreImmediately) {
|
|
33
|
+
if (typeof prev === 'string')
|
|
34
|
+
process.env.OMX_TEAM_WORKER = prev;
|
|
35
|
+
else
|
|
36
|
+
delete process.env.OMX_TEAM_WORKER;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
function withMockPromptModeCodexAllowed(fn) {
|
|
41
|
+
const previous = process.env.OMX_TEST_ALLOW_NONTTY_CODEX_PROMPT;
|
|
42
|
+
process.env.OMX_TEST_ALLOW_NONTTY_CODEX_PROMPT = '1';
|
|
43
|
+
let restoreImmediately = true;
|
|
44
|
+
const restore = () => {
|
|
45
|
+
if (typeof previous === 'string')
|
|
46
|
+
process.env.OMX_TEST_ALLOW_NONTTY_CODEX_PROMPT = previous;
|
|
47
|
+
else
|
|
48
|
+
delete process.env.OMX_TEST_ALLOW_NONTTY_CODEX_PROMPT;
|
|
49
|
+
};
|
|
50
|
+
try {
|
|
51
|
+
const result = fn();
|
|
52
|
+
if (result instanceof Promise) {
|
|
53
|
+
restoreImmediately = false;
|
|
54
|
+
return result.finally(restore);
|
|
55
|
+
}
|
|
56
|
+
return result;
|
|
57
|
+
}
|
|
58
|
+
finally {
|
|
59
|
+
if (restoreImmediately)
|
|
60
|
+
restore();
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
describe('worker runtime identity contract', () => {
|
|
64
|
+
it('keeps low-complexity launch defaults without changing the role lane', () => {
|
|
65
|
+
const args = resolveWorkerLaunchArgsFromEnv({ OMX_TEAM_WORKER_LAUNCH_ARGS: '--no-alt-screen' }, 'explore');
|
|
66
|
+
assert.deepEqual(args, ['--no-alt-screen', '--model', expectedLowComplexityModel()]);
|
|
67
|
+
});
|
|
68
|
+
it('startTeam preserves low-complexity assigned roles as outer runtime identities', async () => {
|
|
69
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-identity-start-'));
|
|
70
|
+
const binDir = join(cwd, 'bin');
|
|
71
|
+
const fakeCodexPath = join(binDir, 'codex');
|
|
72
|
+
const captureDir = join(cwd, 'captures');
|
|
73
|
+
const promptsDir = join(cwd, '.codex', 'prompts');
|
|
74
|
+
await mkdir(binDir, { recursive: true });
|
|
75
|
+
await mkdir(captureDir, { recursive: true });
|
|
76
|
+
await mkdir(promptsDir, { recursive: true });
|
|
77
|
+
await writeFile(join(promptsDir, 'explore.md'), '<identity>You are Explorer.</identity>');
|
|
78
|
+
await writeFile(join(promptsDir, 'style-reviewer.md'), '<identity>You are Style Reviewer.</identity>');
|
|
79
|
+
await writeFile(join(promptsDir, 'sisyphus-lite.md'), '<identity>You are Sisyphus-lite.</identity>');
|
|
80
|
+
await writeFile(fakeCodexPath, `#!/usr/bin/env node
|
|
81
|
+
const fs = require('fs');
|
|
82
|
+
const path = require('path');
|
|
83
|
+
const worker = String(process.env.OMX_TEAM_WORKER || 'unknown').replace(/[^a-zA-Z0-9_-]+/g, '__');
|
|
84
|
+
const out = path.join(process.env.OMX_ARGV_CAPTURE_DIR, worker + '.json');
|
|
85
|
+
fs.writeFileSync(out, JSON.stringify({ argv: process.argv.slice(2), worker }, null, 2));
|
|
86
|
+
process.stdin.resume();
|
|
87
|
+
setTimeout(() => process.exit(0), 5000);
|
|
88
|
+
process.on('SIGTERM', () => process.exit(0));
|
|
89
|
+
`, { mode: 0o755 });
|
|
90
|
+
const prevPath = process.env.PATH;
|
|
91
|
+
const prevTmux = process.env.TMUX;
|
|
92
|
+
const prevLaunchMode = process.env.OMX_TEAM_WORKER_LAUNCH_MODE;
|
|
93
|
+
const prevWorkerCli = process.env.OMX_TEAM_WORKER_CLI;
|
|
94
|
+
const prevCaptureDir = process.env.OMX_ARGV_CAPTURE_DIR;
|
|
95
|
+
process.env.PATH = `${binDir}:${prevPath ?? ''}`;
|
|
96
|
+
delete process.env.TMUX;
|
|
97
|
+
process.env.OMX_TEAM_WORKER_LAUNCH_MODE = 'prompt';
|
|
98
|
+
process.env.OMX_TEAM_WORKER_CLI = 'codex';
|
|
99
|
+
process.env.OMX_ARGV_CAPTURE_DIR = captureDir;
|
|
100
|
+
let runtime = null;
|
|
101
|
+
try {
|
|
102
|
+
runtime = await withMockPromptModeCodexAllowed(() => withoutTeamWorkerEnv(() => startTeam('team-low-role-routing', 'low complexity routing handoff', 'executor', 2, [
|
|
103
|
+
{ subject: 'map files', description: 'map files', owner: 'worker-1', role: 'explore' },
|
|
104
|
+
{ subject: 'review style', description: 'review style', owner: 'worker-2', role: 'style-reviewer' },
|
|
105
|
+
], cwd)));
|
|
106
|
+
assert.equal(runtime.config.worker_launch_mode, 'prompt');
|
|
107
|
+
assert.equal(runtime.config.workers[0]?.role, 'explore');
|
|
108
|
+
assert.equal(runtime.config.workers[1]?.role, 'style-reviewer');
|
|
109
|
+
const worker1Instructions = await readFile(join(cwd, '.omx', 'state', 'team', runtime.teamName, 'workers', 'worker-1', 'AGENTS.md'), 'utf-8');
|
|
110
|
+
const worker2Instructions = await readFile(join(cwd, '.omx', 'state', 'team', runtime.teamName, 'workers', 'worker-2', 'AGENTS.md'), 'utf-8');
|
|
111
|
+
assert.match(worker1Instructions, /You are operating as the \*\*explore\*\* role/);
|
|
112
|
+
assert.match(worker1Instructions, /You are Explorer\./);
|
|
113
|
+
assert.doesNotMatch(worker1Instructions, /Sisyphus-lite/);
|
|
114
|
+
assert.match(worker2Instructions, /You are operating as the \*\*style-reviewer\*\* role/);
|
|
115
|
+
assert.match(worker2Instructions, /You are Style Reviewer\./);
|
|
116
|
+
assert.doesNotMatch(worker2Instructions, /Sisyphus-lite/);
|
|
117
|
+
let worker1Args = null;
|
|
118
|
+
let worker2Args = null;
|
|
119
|
+
for (let attempt = 0; attempt < 50; attempt += 1) {
|
|
120
|
+
const worker1Path = join(captureDir, 'team-low-role-routing__worker-1.json');
|
|
121
|
+
const worker2Path = join(captureDir, 'team-low-role-routing__worker-2.json');
|
|
122
|
+
if (existsSync(worker1Path) && existsSync(worker2Path)) {
|
|
123
|
+
worker1Args = JSON.parse(await readFile(worker1Path, 'utf-8')).argv;
|
|
124
|
+
worker2Args = JSON.parse(await readFile(worker2Path, 'utf-8')).argv;
|
|
125
|
+
break;
|
|
126
|
+
}
|
|
127
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
128
|
+
}
|
|
129
|
+
assert.ok(worker1Args, 'worker-1 argv capture file should be written');
|
|
130
|
+
assert.ok(worker2Args, 'worker-2 argv capture file should be written');
|
|
131
|
+
const worker1Joined = worker1Args.join(' ');
|
|
132
|
+
const worker2Joined = worker2Args.join(' ');
|
|
133
|
+
assert.match(worker1Joined, /model_reasoning_effort="low"/);
|
|
134
|
+
assert.match(worker1Joined, /--model gpt-5\.3-codex-spark/);
|
|
135
|
+
assert.match(worker2Joined, /model_reasoning_effort="low"/);
|
|
136
|
+
assert.match(worker2Joined, /--model gpt-5\.3-codex-spark/);
|
|
137
|
+
await shutdownTeam(runtime.teamName, cwd, { force: true });
|
|
138
|
+
runtime = null;
|
|
139
|
+
}
|
|
140
|
+
finally {
|
|
141
|
+
if (runtime) {
|
|
142
|
+
await shutdownTeam(runtime.teamName, cwd, { force: true }).catch(() => { });
|
|
143
|
+
}
|
|
144
|
+
if (typeof prevPath === 'string')
|
|
145
|
+
process.env.PATH = prevPath;
|
|
146
|
+
else
|
|
147
|
+
delete process.env.PATH;
|
|
148
|
+
if (typeof prevTmux === 'string')
|
|
149
|
+
process.env.TMUX = prevTmux;
|
|
150
|
+
else
|
|
151
|
+
delete process.env.TMUX;
|
|
152
|
+
if (typeof prevLaunchMode === 'string')
|
|
153
|
+
process.env.OMX_TEAM_WORKER_LAUNCH_MODE = prevLaunchMode;
|
|
154
|
+
else
|
|
155
|
+
delete process.env.OMX_TEAM_WORKER_LAUNCH_MODE;
|
|
156
|
+
if (typeof prevWorkerCli === 'string')
|
|
157
|
+
process.env.OMX_TEAM_WORKER_CLI = prevWorkerCli;
|
|
158
|
+
else
|
|
159
|
+
delete process.env.OMX_TEAM_WORKER_CLI;
|
|
160
|
+
if (typeof prevCaptureDir === 'string')
|
|
161
|
+
process.env.OMX_ARGV_CAPTURE_DIR = prevCaptureDir;
|
|
162
|
+
else
|
|
163
|
+
delete process.env.OMX_ARGV_CAPTURE_DIR;
|
|
164
|
+
await rm(cwd, { recursive: true, force: true });
|
|
165
|
+
}
|
|
166
|
+
});
|
|
167
|
+
it('scaleUp preserves low-complexity assigned roles as outer runtime identities', async () => {
|
|
168
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-identity-scale-'));
|
|
169
|
+
const fakeBinDir = await mkdtemp(join(tmpdir(), 'omx-runtime-identity-scale-bin-'));
|
|
170
|
+
const tmuxStubPath = join(fakeBinDir, 'tmux');
|
|
171
|
+
const tmuxLogPath = join(fakeBinDir, 'tmux.log');
|
|
172
|
+
const previousPath = process.env.PATH;
|
|
173
|
+
try {
|
|
174
|
+
await writeFile(tmuxStubPath, [
|
|
175
|
+
'#!/bin/sh',
|
|
176
|
+
'set -eu',
|
|
177
|
+
`printf '%s\n' "$*" >> "${tmuxLogPath}"`,
|
|
178
|
+
'case "${1:-}" in',
|
|
179
|
+
' -V)',
|
|
180
|
+
' echo "tmux 3.2a"',
|
|
181
|
+
' ;;',
|
|
182
|
+
' split-window)',
|
|
183
|
+
' echo "%31"',
|
|
184
|
+
' ;;',
|
|
185
|
+
' list-panes)',
|
|
186
|
+
' echo "42424"',
|
|
187
|
+
' ;;',
|
|
188
|
+
' capture-pane)',
|
|
189
|
+
' echo ""',
|
|
190
|
+
' ;;',
|
|
191
|
+
'esac',
|
|
192
|
+
'exit 0',
|
|
193
|
+
'',
|
|
194
|
+
].join('\n'));
|
|
195
|
+
await chmod(tmuxStubPath, 0o755);
|
|
196
|
+
process.env.PATH = `${fakeBinDir}:${previousPath ?? ''}`;
|
|
197
|
+
await mkdir(join(cwd, '.codex', 'prompts'), { recursive: true });
|
|
198
|
+
await writeFile(join(cwd, '.codex', 'prompts', 'explore.md'), '<identity>You are Explorer.</identity>');
|
|
199
|
+
await writeFile(join(cwd, '.codex', 'prompts', 'sisyphus-lite.md'), '<identity>You are Sisyphus-lite.</identity>');
|
|
200
|
+
await mkdir(join(cwd, '.omx', 'state', 'team', 'low-role-scale'), { recursive: true });
|
|
201
|
+
await writeFile(join(cwd, '.omx', 'state', 'team', 'low-role-scale', 'worker-agents.md'), '# Base worker instructions\n');
|
|
202
|
+
await initTeamState('low-role-scale', 'task', 'executor', 1, cwd, undefined, process.env, {
|
|
203
|
+
workspace_mode: 'single',
|
|
204
|
+
leader_cwd: cwd,
|
|
205
|
+
team_state_root: join(cwd, '.omx', 'state'),
|
|
206
|
+
});
|
|
207
|
+
await createTask('low-role-scale', {
|
|
208
|
+
subject: 'existing task',
|
|
209
|
+
description: 'already persisted',
|
|
210
|
+
status: 'pending',
|
|
211
|
+
owner: 'worker-1',
|
|
212
|
+
}, cwd);
|
|
213
|
+
const config = await readTeamConfig('low-role-scale', cwd);
|
|
214
|
+
assert.ok(config);
|
|
215
|
+
if (!config)
|
|
216
|
+
return;
|
|
217
|
+
config.tmux_session = 'omx-team-low-role-scale';
|
|
218
|
+
config.leader_pane_id = '%11';
|
|
219
|
+
config.workers[0].pane_id = '%21';
|
|
220
|
+
await saveTeamConfig(config, cwd);
|
|
221
|
+
const manifestPath = join(cwd, '.omx', 'state', 'team', 'low-role-scale', 'manifest.v2.json');
|
|
222
|
+
const manifest = JSON.parse(await readFile(manifestPath, 'utf-8'));
|
|
223
|
+
manifest.policy = {
|
|
224
|
+
...(manifest.policy ?? {}),
|
|
225
|
+
dispatch_mode: 'transport_direct',
|
|
226
|
+
};
|
|
227
|
+
await writeFile(manifestPath, JSON.stringify(manifest, null, 2));
|
|
228
|
+
const result = await scaleUp('low-role-scale', 1, 'executor', [{ subject: 'map files', description: 'map files', owner: 'worker-2', role: 'explore' }], cwd, { OMX_TEAM_SCALING_ENABLED: '1', OMX_TEAM_SKIP_READY_WAIT: '1' });
|
|
229
|
+
assert.equal(result.ok, true);
|
|
230
|
+
if (!result.ok)
|
|
231
|
+
return;
|
|
232
|
+
const workerAgents = await readFile(join(cwd, '.omx', 'state', 'team', 'low-role-scale', 'workers', 'worker-2', 'AGENTS.md'), 'utf-8');
|
|
233
|
+
assert.match(workerAgents, /You are operating as the \*\*explore\*\* role/);
|
|
234
|
+
assert.match(workerAgents, /You are Explorer\./);
|
|
235
|
+
assert.doesNotMatch(workerAgents, /Sisyphus-lite/);
|
|
236
|
+
const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
|
|
237
|
+
assert.match(tmuxLog, /gpt-5\.3-codex-spark/);
|
|
238
|
+
assert.match(tmuxLog, /model_reasoning_effort.*low/);
|
|
239
|
+
}
|
|
240
|
+
finally {
|
|
241
|
+
if (typeof previousPath === 'string')
|
|
242
|
+
process.env.PATH = previousPath;
|
|
243
|
+
else
|
|
244
|
+
delete process.env.PATH;
|
|
245
|
+
await rm(cwd, { recursive: true, force: true });
|
|
246
|
+
await rm(fakeBinDir, { recursive: true, force: true });
|
|
247
|
+
}
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
//# sourceMappingURL=worker-runtime-identity.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-runtime-identity.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/worker-runtime-identity.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"leader-activity.d.ts","sourceRoot":"","sources":["../../src/team/leader-activity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"leader-activity.d.ts","sourceRoot":"","sources":["../../src/team/leader-activity.ts"],"names":[],"mappings":"AAqBA,UAAU,yBAAyB;IACjC,MAAM,EAAE,KAAK,GAAG,yBAAyB,GAAG,4BAA4B,CAAC;IACzE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;CAChB;AA6GD,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBjF;AAoCD,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,SAA2B,GAChC,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAgCtC;AAED,wBAAsB,sCAAsC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAI9F;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAKjH"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { execFile } from 'node:child_process';
|
|
2
|
+
import { promisify } from 'node:util';
|
|
3
|
+
const execFileAsync = promisify(execFile);
|
|
2
4
|
import { existsSync, statSync } from 'node:fs';
|
|
3
5
|
import { mkdir, readFile, stat, writeFile } from 'node:fs/promises';
|
|
4
|
-
import { dirname, join, posix, resolve, win32 } from 'node:path';
|
|
6
|
+
import { basename, dirname, join, posix, resolve, sep, win32 } from 'node:path';
|
|
5
7
|
import { omxStateDir } from '../utils/paths.js';
|
|
6
8
|
import { findGitLayout, readGitLayoutFile } from '../utils/git-layout.js';
|
|
7
9
|
const MIN_GIT_ACTIVITY_CACHE_TTL_MS = 1000;
|
|
@@ -41,7 +43,7 @@ function resolveGitOutputPath(cwd, gitPath) {
|
|
|
41
43
|
*
|
|
42
44
|
* See: https://github.com/Yeachan-Heo/oh-my-codex/issues/1100
|
|
43
45
|
*/
|
|
44
|
-
function tryReadGitValue(cwd, args) {
|
|
46
|
+
async function tryReadGitValue(cwd, args) {
|
|
45
47
|
if (process.platform === 'win32') {
|
|
46
48
|
try {
|
|
47
49
|
const gitLayout = findGitLayout(cwd);
|
|
@@ -60,7 +62,11 @@ function tryReadGitValue(cwd, args) {
|
|
|
60
62
|
}
|
|
61
63
|
if (cmd.startsWith('rev-parse --git-path logs/refs/heads/')) {
|
|
62
64
|
const branch = args[args.length - 1].replace('logs/', '');
|
|
63
|
-
|
|
65
|
+
const candidate = resolve(join(gitLayout.commonDir, 'logs', branch));
|
|
66
|
+
const resolvedBase = resolve(gitLayout.commonDir);
|
|
67
|
+
if (candidate !== resolvedBase && !candidate.startsWith(resolvedBase + sep))
|
|
68
|
+
return null;
|
|
69
|
+
return candidate;
|
|
64
70
|
}
|
|
65
71
|
if (cmd === 'show -s --format=%ct HEAD') {
|
|
66
72
|
// Use HEAD file mtime as a proxy for last-commit timestamp.
|
|
@@ -76,18 +82,17 @@ function tryReadGitValue(cwd, args) {
|
|
|
76
82
|
}
|
|
77
83
|
catch { /* fall through */ }
|
|
78
84
|
}
|
|
79
|
-
return tryReadGitValueExec(cwd, args);
|
|
85
|
+
return await tryReadGitValueExec(cwd, args);
|
|
80
86
|
}
|
|
81
|
-
function tryReadGitValueExec(cwd, args) {
|
|
87
|
+
async function tryReadGitValueExec(cwd, args) {
|
|
82
88
|
try {
|
|
83
|
-
const
|
|
89
|
+
const { stdout } = await execFileAsync('git', args, {
|
|
84
90
|
cwd,
|
|
85
91
|
encoding: 'utf-8',
|
|
86
|
-
stdio: ['ignore', 'pipe', 'ignore'],
|
|
87
92
|
timeout: 2000,
|
|
88
93
|
windowsHide: true,
|
|
89
|
-
})
|
|
90
|
-
return
|
|
94
|
+
});
|
|
95
|
+
return stdout.trim() || null;
|
|
91
96
|
}
|
|
92
97
|
catch {
|
|
93
98
|
return null;
|
|
@@ -104,18 +109,24 @@ async function statMsIfExists(path) {
|
|
|
104
109
|
}
|
|
105
110
|
}
|
|
106
111
|
function stateDirToProjectRoot(stateDir) {
|
|
112
|
+
let current = resolve(stateDir);
|
|
113
|
+
while (current !== dirname(current)) {
|
|
114
|
+
if (basename(current) === '.omx')
|
|
115
|
+
return dirname(current);
|
|
116
|
+
current = dirname(current);
|
|
117
|
+
}
|
|
107
118
|
return dirname(dirname(stateDir));
|
|
108
119
|
}
|
|
109
120
|
export async function readBranchGitActivityMsForPath(cwd) {
|
|
110
|
-
const gitDir = tryReadGitValue(cwd, ['rev-parse', '--git-dir']);
|
|
121
|
+
const gitDir = await tryReadGitValue(cwd, ['rev-parse', '--git-dir']);
|
|
111
122
|
if (!gitDir)
|
|
112
123
|
return Number.NaN;
|
|
113
|
-
const branch = tryReadGitValue(cwd, ['symbolic-ref', '--quiet', '--short', 'HEAD']);
|
|
114
|
-
const headLogPath = tryReadGitValue(cwd, ['rev-parse', '--git-path', 'logs/HEAD']);
|
|
124
|
+
const branch = await tryReadGitValue(cwd, ['symbolic-ref', '--quiet', '--short', 'HEAD']);
|
|
125
|
+
const headLogPath = await tryReadGitValue(cwd, ['rev-parse', '--git-path', 'logs/HEAD']);
|
|
115
126
|
const branchLogPath = branch
|
|
116
|
-
? tryReadGitValue(cwd, ['rev-parse', '--git-path', `logs/refs/heads/${branch}`])
|
|
127
|
+
? await tryReadGitValue(cwd, ['rev-parse', '--git-path', `logs/refs/heads/${branch}`])
|
|
117
128
|
: null;
|
|
118
|
-
const headCommitEpoch = tryReadGitValue(cwd, ['show', '-s', '--format=%ct', 'HEAD']);
|
|
129
|
+
const headCommitEpoch = await tryReadGitValue(cwd, ['show', '-s', '--format=%ct', 'HEAD']);
|
|
119
130
|
const [headLogMs, branchLogMs] = await Promise.all([
|
|
120
131
|
statMsIfExists(resolveGitOutputPath(cwd, headLogPath)),
|
|
121
132
|
statMsIfExists(resolveGitOutputPath(cwd, branchLogPath)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"leader-activity.js","sourceRoot":"","sources":["../../src/team/leader-activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"leader-activity.js","sourceRoot":"","sources":["../../src/team/leader-activity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-contract.d.ts","sourceRoot":"","sources":["../../src/team/model-contract.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,iCAAiC,wBAAsB,CAAC;AACrE,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AAEtE,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,kCAAkC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;CAC1C;
|
|
1
|
+
{"version":3,"file":"model-contract.d.ts","sourceRoot":"","sources":["../../src/team/model-contract.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,iCAAiC,wBAAsB,CAAC;AACrE,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AAEtE,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,kCAAkC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;CAC1C;AA0BD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAMvE;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,0BAA0B,CAkDpF;AAED,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQ9E;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,MAAM,EAAE,EACd,cAAc,CAAC,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,mBAAmB,GACvC,MAAM,EAAE,CAgBV;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,kCAAkC,GAAG,MAAM,EAAE,CAUjG;AAED,wBAAgB,2BAA2B,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAG/F;AAED,wBAAgB,wBAAwB,CACtC,SAAS,CAAC,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,GAAG,SAAS,CAiBpB;AAED,wBAAgB,wBAAwB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAMpE;AAED,wBAAgB,oCAAoC,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,MAAM,CAEvF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-contract.js","sourceRoot":"","sources":["../../src/team/model-contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,GAAG,UAAU,CAAC;AAC/B,MAAM,iBAAiB,GAAG,4CAA4C,CAAC;AACvE,MAAM,UAAU,GAAG,SAAS,CAAC;AAC7B,MAAM,WAAW,GAAG,IAAI,CAAC;AACzB,MAAM,aAAa,GAAG,wBAAwB,CAAC;AAE/C,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC;IACzC,SAAS;IACT,UAAU;IACV,gBAAgB;CACjB,CAAC,CAAC;AAEH,oHAAoH;AACpH,MAAM,CAAC,MAAM,iCAAiC,GAAG,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"model-contract.js","sourceRoot":"","sources":["../../src/team/model-contract.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/team/runtime.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/team/runtime.ts"],"names":[],"mappings":"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"}
|
package/dist/team/runtime.js
CHANGED
|
@@ -1525,13 +1525,14 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
|
|
|
1525
1525
|
const workerRole = taskRoles.length > 0 && uniqueTaskRoles.size === 1
|
|
1526
1526
|
? taskRoles[0]
|
|
1527
1527
|
: agentType;
|
|
1528
|
-
const
|
|
1529
|
-
|
|
1530
|
-
|
|
1531
|
-
const
|
|
1528
|
+
const runtimeRole = workerRole;
|
|
1529
|
+
const rawRolePromptContent = await loadRolePrompt(runtimeRole, join(leaderCwd, '.codex', 'prompts'))
|
|
1530
|
+
?? await loadRolePrompt(runtimeRole, codexPromptsDir());
|
|
1531
|
+
const preferredReasoning = resolveAgentReasoningEffort(runtimeRole) ?? resolveAgentReasoningEffort(agentType);
|
|
1532
|
+
const workerLaunchArgs = resolveWorkerLaunchArgsFromEnv(process.env, runtimeRole, undefined, preferredReasoning, workerCliPlan[i - 1]);
|
|
1532
1533
|
const resolvedWorkerModel = parseTeamWorkerLaunchArgs(workerLaunchArgs).modelOverride ?? undefined;
|
|
1533
1534
|
const rolePromptContent = rawRolePromptContent
|
|
1534
|
-
? composeRoleInstructionsForRole(
|
|
1535
|
+
? composeRoleInstructionsForRole(runtimeRole, rawRolePromptContent, resolvedWorkerModel)
|
|
1535
1536
|
: null;
|
|
1536
1537
|
const workerWorktreePath = workerWorkspace.worktreePath ?? undefined;
|
|
1537
1538
|
const fallbackInstructionsPath = workerInstructionsPath ?? join(leaderCwd, 'AGENTS.md');
|
|
@@ -1539,19 +1540,19 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
|
|
|
1539
1540
|
? await writeWorkerWorktreeRootAgentsFile({
|
|
1540
1541
|
teamName: sanitized,
|
|
1541
1542
|
workerName,
|
|
1542
|
-
workerRole,
|
|
1543
|
+
workerRole: runtimeRole,
|
|
1543
1544
|
rolePromptContent: rolePromptContent ?? "",
|
|
1544
1545
|
teamStateRoot,
|
|
1545
1546
|
leaderCwd,
|
|
1546
1547
|
worktreePath: workerWorktreePath,
|
|
1547
1548
|
})
|
|
1548
1549
|
: rolePromptContent
|
|
1549
|
-
? await writeWorkerRoleInstructionsFile(sanitized, workerName, leaderCwd, fallbackInstructionsPath,
|
|
1550
|
+
? await writeWorkerRoleInstructionsFile(sanitized, workerName, leaderCwd, fallbackInstructionsPath, runtimeRole, rolePromptContent)
|
|
1550
1551
|
: fallbackInstructionsPath;
|
|
1551
1552
|
const inbox = generateInitialInbox(workerName, sanitized, agentType, workerTasks, {
|
|
1552
1553
|
teamStateRoot,
|
|
1553
1554
|
leaderCwd,
|
|
1554
|
-
workerRole,
|
|
1555
|
+
workerRole: runtimeRole,
|
|
1555
1556
|
rolePromptContent: rawRolePromptContent ?? undefined,
|
|
1556
1557
|
worktreeRootAgentsCanonical: Boolean(workerWorkspace.worktreePath),
|
|
1557
1558
|
});
|