oh-my-codex 0.18.16 → 0.19.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/crates/omx-sparkshell/tests/execution.rs +8 -1
- package/dist/agents/__tests__/definitions.test.js +5 -5
- package/dist/agents/__tests__/definitions.test.js.map +1 -1
- package/dist/agents/__tests__/native-config.test.js +18 -14
- package/dist/agents/__tests__/native-config.test.js.map +1 -1
- package/dist/agents/definitions.d.ts +2 -2
- package/dist/agents/definitions.d.ts.map +1 -1
- package/dist/agents/definitions.js +4 -4
- package/dist/agents/definitions.js.map +1 -1
- package/dist/agents/native-config.d.ts +1 -0
- package/dist/agents/native-config.d.ts.map +1 -1
- package/dist/agents/native-config.js +18 -16
- package/dist/agents/native-config.js.map +1 -1
- package/dist/auth/hotswap.d.ts.map +1 -1
- package/dist/auth/hotswap.js +17 -4
- package/dist/auth/hotswap.js.map +1 -1
- package/dist/autopilot/__tests__/planner-routing.test.js +2 -2
- package/dist/autopilot/__tests__/planner-routing.test.js.map +1 -1
- package/dist/autopilot/fsm.d.ts +1 -1
- package/dist/autopilot/fsm.d.ts.map +1 -1
- package/dist/autopilot/fsm.js +1 -1
- package/dist/autopilot/fsm.js.map +1 -1
- package/dist/cli/__tests__/auth.test.js +78 -3
- package/dist/cli/__tests__/auth.test.js.map +1 -1
- package/dist/cli/__tests__/codex-plugin-layout.test.js +30 -5
- package/dist/cli/__tests__/codex-plugin-layout.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-warning-copy.test.js +2 -0
- package/dist/cli/__tests__/doctor-warning-copy.test.js.map +1 -1
- package/dist/cli/__tests__/index.test.js +96 -8
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/launch-fallback.test.js +135 -1
- package/dist/cli/__tests__/launch-fallback.test.js.map +1 -1
- package/dist/cli/__tests__/mcp-parity.test.js +2 -4
- package/dist/cli/__tests__/mcp-parity.test.js.map +1 -1
- package/dist/cli/__tests__/plugin-marketplace-idempotent.test.js +14 -0
- package/dist/cli/__tests__/plugin-marketplace-idempotent.test.js.map +1 -1
- package/dist/cli/__tests__/ralph-goal-mode-contract.test.js +8 -0
- package/dist/cli/__tests__/ralph-goal-mode-contract.test.js.map +1 -1
- package/dist/cli/__tests__/resume.test.js +229 -1
- package/dist/cli/__tests__/resume.test.js.map +1 -1
- package/dist/cli/__tests__/session-scoped-runtime.test.js +46 -0
- package/dist/cli/__tests__/session-scoped-runtime.test.js.map +1 -1
- package/dist/cli/__tests__/setup-install-mode.test.js +37 -0
- package/dist/cli/__tests__/setup-install-mode.test.js.map +1 -1
- package/dist/cli/__tests__/ultragoal.test.js +21 -0
- package/dist/cli/__tests__/ultragoal.test.js.map +1 -1
- package/dist/cli/__tests__/version.test.js +13 -1
- package/dist/cli/__tests__/version.test.js.map +1 -1
- package/dist/cli/auth.d.ts +1 -1
- package/dist/cli/auth.d.ts.map +1 -1
- package/dist/cli/auth.js +49 -9
- package/dist/cli/auth.js.map +1 -1
- package/dist/cli/index.d.ts +25 -2
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +233 -32
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/plugin-marketplace.d.ts.map +1 -1
- package/dist/cli/plugin-marketplace.js +22 -1
- package/dist/cli/plugin-marketplace.js.map +1 -1
- package/dist/cli/ralph.d.ts.map +1 -1
- package/dist/cli/ralph.js +4 -0
- package/dist/cli/ralph.js.map +1 -1
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +3 -1
- package/dist/cli/setup.js.map +1 -1
- package/dist/goal-workflows/__tests__/codex-goal-snapshot.test.js +7 -0
- package/dist/goal-workflows/__tests__/codex-goal-snapshot.test.js.map +1 -1
- package/dist/goal-workflows/codex-goal-snapshot.js +1 -1
- package/dist/goal-workflows/codex-goal-snapshot.js.map +1 -1
- package/dist/hooks/__tests__/autopilot-skill-contract.test.js +12 -0
- package/dist/hooks/__tests__/autopilot-skill-contract.test.js.map +1 -1
- package/dist/hooks/__tests__/keyword-detector.test.js +267 -7
- package/dist/hooks/__tests__/keyword-detector.test.js.map +1 -1
- package/dist/hooks/keyword-detector.d.ts.map +1 -1
- package/dist/hooks/keyword-detector.js +143 -30
- package/dist/hooks/keyword-detector.js.map +1 -1
- package/dist/hud/__tests__/reconcile.test.js +121 -0
- package/dist/hud/__tests__/reconcile.test.js.map +1 -1
- package/dist/hud/__tests__/state.test.js +110 -0
- package/dist/hud/__tests__/state.test.js.map +1 -1
- package/dist/hud/__tests__/tmux.test.js +1 -1
- package/dist/hud/__tests__/tmux.test.js.map +1 -1
- package/dist/hud/reconcile.d.ts +3 -1
- package/dist/hud/reconcile.d.ts.map +1 -1
- package/dist/hud/reconcile.js +281 -151
- package/dist/hud/reconcile.js.map +1 -1
- package/dist/hud/render.d.ts.map +1 -1
- package/dist/hud/render.js +4 -2
- package/dist/hud/render.js.map +1 -1
- package/dist/hud/state.d.ts.map +1 -1
- package/dist/hud/state.js +44 -12
- package/dist/hud/state.js.map +1 -1
- package/dist/hud/tmux.d.ts.map +1 -1
- package/dist/hud/tmux.js +1 -4
- package/dist/hud/tmux.js.map +1 -1
- package/dist/hud/types.d.ts +5 -0
- package/dist/hud/types.d.ts.map +1 -1
- package/dist/hud/types.js.map +1 -1
- package/dist/leader/__tests__/contract.test.d.ts +2 -0
- package/dist/leader/__tests__/contract.test.d.ts.map +1 -0
- package/dist/leader/__tests__/contract.test.js +75 -0
- package/dist/leader/__tests__/contract.test.js.map +1 -0
- package/dist/leader/contract.d.ts +26 -0
- package/dist/leader/contract.d.ts.map +1 -0
- package/dist/leader/contract.js +97 -0
- package/dist/leader/contract.js.map +1 -0
- package/dist/modes/base.d.ts.map +1 -1
- package/dist/modes/base.js +22 -7
- package/dist/modes/base.js.map +1 -1
- package/dist/notifications/__tests__/dispatcher.test.js +16 -0
- package/dist/notifications/__tests__/dispatcher.test.js.map +1 -1
- package/dist/notifications/__tests__/profiles.test.js +87 -0
- package/dist/notifications/__tests__/profiles.test.js.map +1 -1
- package/dist/notifications/config.d.ts +1 -0
- package/dist/notifications/config.d.ts.map +1 -1
- package/dist/notifications/config.js +60 -22
- package/dist/notifications/config.js.map +1 -1
- package/dist/notifications/dispatcher.d.ts.map +1 -1
- package/dist/notifications/dispatcher.js +6 -16
- package/dist/notifications/dispatcher.js.map +1 -1
- package/dist/pipeline/__tests__/stages.test.js +2 -0
- package/dist/pipeline/__tests__/stages.test.js.map +1 -1
- package/dist/pipeline/stages/ultragoal.d.ts.map +1 -1
- package/dist/pipeline/stages/ultragoal.js +6 -1
- package/dist/pipeline/stages/ultragoal.js.map +1 -1
- package/dist/question/__tests__/renderer.test.js +58 -4
- package/dist/question/__tests__/renderer.test.js.map +1 -1
- package/dist/question/renderer.d.ts +1 -1
- package/dist/question/renderer.d.ts.map +1 -1
- package/dist/question/renderer.js +73 -5
- package/dist/question/renderer.js.map +1 -1
- package/dist/ralplan/__tests__/runtime.test.js +202 -0
- package/dist/ralplan/__tests__/runtime.test.js.map +1 -1
- package/dist/ralplan/runtime.d.ts +7 -0
- package/dist/ralplan/runtime.d.ts.map +1 -1
- package/dist/ralplan/runtime.js +63 -4
- package/dist/ralplan/runtime.js.map +1 -1
- package/dist/scripts/__tests__/codex-native-hook.test.js +8484 -4560
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/codex-native-hook.d.ts +1 -0
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +4387 -190
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/state/__tests__/operations.test.js +1137 -0
- package/dist/state/__tests__/operations.test.js.map +1 -1
- package/dist/state/__tests__/planning-gate.test.js +410 -0
- package/dist/state/__tests__/planning-gate.test.js.map +1 -1
- package/dist/state/operations.d.ts +10 -0
- package/dist/state/operations.d.ts.map +1 -1
- package/dist/state/operations.js +242 -8
- package/dist/state/operations.js.map +1 -1
- package/dist/state/skill-active.d.ts +4 -1
- package/dist/state/skill-active.d.ts.map +1 -1
- package/dist/state/skill-active.js +5 -3
- package/dist/state/skill-active.js.map +1 -1
- package/dist/state/workflow-transition.d.ts.map +1 -1
- package/dist/state/workflow-transition.js +642 -1
- package/dist/state/workflow-transition.js.map +1 -1
- package/dist/subagents/__tests__/tracker.test.js +248 -1
- package/dist/subagents/__tests__/tracker.test.js.map +1 -1
- package/dist/subagents/tracker.d.ts +60 -0
- package/dist/subagents/tracker.d.ts.map +1 -1
- package/dist/subagents/tracker.js +225 -1
- package/dist/subagents/tracker.js.map +1 -1
- package/dist/team/__tests__/model-contract.test.js +72 -4
- package/dist/team/__tests__/model-contract.test.js.map +1 -1
- package/dist/team/__tests__/runtime.test.js +44 -2
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/__tests__/tmux-session.test.js +127 -8
- package/dist/team/__tests__/tmux-session.test.js.map +1 -1
- package/dist/team/__tests__/worker-runtime-identity.test.js +89 -0
- package/dist/team/__tests__/worker-runtime-identity.test.js.map +1 -1
- package/dist/team/model-contract.d.ts +3 -0
- package/dist/team/model-contract.d.ts.map +1 -1
- package/dist/team/model-contract.js +42 -5
- package/dist/team/model-contract.js.map +1 -1
- package/dist/team/runtime.d.ts +2 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +21 -11
- package/dist/team/runtime.js.map +1 -1
- package/dist/team/scaling.d.ts.map +1 -1
- package/dist/team/scaling.js +13 -11
- package/dist/team/scaling.js.map +1 -1
- package/dist/team/tmux-session.d.ts +1 -0
- package/dist/team/tmux-session.d.ts.map +1 -1
- package/dist/team/tmux-session.js +63 -13
- package/dist/team/tmux-session.js.map +1 -1
- package/dist/ultragoal/__tests__/artifacts.test.js +7 -0
- package/dist/ultragoal/__tests__/artifacts.test.js.map +1 -1
- package/dist/ultragoal/artifacts.d.ts.map +1 -1
- package/dist/ultragoal/artifacts.js +5 -0
- package/dist/ultragoal/artifacts.js.map +1 -1
- package/dist/utils/__tests__/agents-model-table.test.js +2 -2
- package/dist/utils/__tests__/agents-model-table.test.js.map +1 -1
- package/package.json +1 -1
- package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
- package/plugins/oh-my-codex/hooks/codex-native-hook.mjs +19 -7
- package/plugins/oh-my-codex/skills/code-review/SKILL.md +16 -0
- package/plugins/oh-my-codex/skills/ultragoal/SKILL.md +23 -0
- package/plugins/oh-my-codex/skills/ultrawork/references/agent-tiers.md +3 -2
- package/skills/code-review/SKILL.md +16 -0
- package/skills/ecomode/references/agent-tiers.md +1 -1
- package/skills/ultragoal/SKILL.md +23 -0
- package/skills/ultrawork/references/agent-tiers.md +3 -2
- package/src/scripts/__tests__/codex-native-hook.test.ts +14014 -9097
- package/src/scripts/codex-native-hook.ts +4459 -199
|
@@ -13,6 +13,72 @@ export function createSubagentTrackingState() {
|
|
|
13
13
|
sessions: {},
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
|
+
function normalizeSubagentStatus(value) {
|
|
17
|
+
const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
|
|
18
|
+
if (normalized === 'available' || normalized === 'closed' || normalized === 'unavailable') {
|
|
19
|
+
return normalized;
|
|
20
|
+
}
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
function readOptionalTrimmedString(value) {
|
|
24
|
+
const normalized = typeof value === 'string' ? value.trim() : '';
|
|
25
|
+
return normalized ? normalized : undefined;
|
|
26
|
+
}
|
|
27
|
+
function rankSubagentStatus(status) {
|
|
28
|
+
if (status === 'available')
|
|
29
|
+
return 0;
|
|
30
|
+
if (status === 'closed')
|
|
31
|
+
return 1;
|
|
32
|
+
return 2;
|
|
33
|
+
}
|
|
34
|
+
function compareOptionalTimestampDesc(left, right) {
|
|
35
|
+
const leftMs = left ? Date.parse(left) : Number.NaN;
|
|
36
|
+
const rightMs = right ? Date.parse(right) : Number.NaN;
|
|
37
|
+
const leftValid = Number.isFinite(leftMs);
|
|
38
|
+
const rightValid = Number.isFinite(rightMs);
|
|
39
|
+
if (leftValid && rightValid && leftMs !== rightMs)
|
|
40
|
+
return rightMs - leftMs;
|
|
41
|
+
if (leftValid !== rightValid)
|
|
42
|
+
return leftValid ? -1 : 1;
|
|
43
|
+
return 0;
|
|
44
|
+
}
|
|
45
|
+
function compareResumeEntries(left, right) {
|
|
46
|
+
const leftStatusRank = rankSubagentStatus(left.status);
|
|
47
|
+
const rightStatusRank = rankSubagentStatus(right.status);
|
|
48
|
+
if (leftStatusRank !== rightStatusRank)
|
|
49
|
+
return leftStatusRank - rightStatusRank;
|
|
50
|
+
const leftActivityRank = left.lastSeenAt ? 0 : 1;
|
|
51
|
+
const rightActivityRank = right.lastSeenAt ? 0 : 1;
|
|
52
|
+
if (leftActivityRank !== rightActivityRank)
|
|
53
|
+
return leftActivityRank - rightActivityRank;
|
|
54
|
+
const lastSeenComparison = compareOptionalTimestampDesc(left.lastSeenAt, right.lastSeenAt);
|
|
55
|
+
if (lastSeenComparison !== 0)
|
|
56
|
+
return lastSeenComparison;
|
|
57
|
+
const leftCompletedComparison = compareOptionalTimestampDesc(left.completedAt, right.completedAt);
|
|
58
|
+
if (leftCompletedComparison !== 0)
|
|
59
|
+
return leftCompletedComparison;
|
|
60
|
+
return left.agentId.localeCompare(right.agentId);
|
|
61
|
+
}
|
|
62
|
+
function normalizeLedgerEntry(thread, status) {
|
|
63
|
+
const role = thread.role ?? thread.mode;
|
|
64
|
+
const laneId = thread.lane_id ?? thread.agent_nickname ?? role;
|
|
65
|
+
return {
|
|
66
|
+
agentId: thread.thread_id,
|
|
67
|
+
threadId: thread.thread_id,
|
|
68
|
+
...(role ? { role } : {}),
|
|
69
|
+
...(laneId ? { laneId } : {}),
|
|
70
|
+
...(thread.scope ? { scope: thread.scope } : {}),
|
|
71
|
+
...(thread.agent_nickname ? { agentNickname: thread.agent_nickname } : {}),
|
|
72
|
+
status,
|
|
73
|
+
...(thread.last_seen_at ? { lastSeenAt: thread.last_seen_at } : {}),
|
|
74
|
+
...(thread.completed_at ? { completedAt: thread.completed_at } : {}),
|
|
75
|
+
...(thread.last_handoff_summary ? { lastHandoffSummary: thread.last_handoff_summary } : {}),
|
|
76
|
+
...(thread.resume_requested_at ? { resumeRequestedAt: thread.resume_requested_at } : {}),
|
|
77
|
+
...(thread.resume_completed_at ? { resumeCompletedAt: thread.resume_completed_at } : {}),
|
|
78
|
+
...(thread.resume_failed_at ? { resumeFailedAt: thread.resume_failed_at } : {}),
|
|
79
|
+
...(thread.resume_failure_reason ? { resumeFailureReason: thread.resume_failure_reason } : {}),
|
|
80
|
+
};
|
|
81
|
+
}
|
|
16
82
|
export function isTrustedSubagentThread(session, threadId) {
|
|
17
83
|
const normalizedThreadId = threadId.trim();
|
|
18
84
|
if (!session || !normalizedThreadId)
|
|
@@ -68,7 +134,27 @@ export function normalizeSubagentTrackingState(input) {
|
|
|
68
134
|
? candidate.turn_count
|
|
69
135
|
: 1,
|
|
70
136
|
...(typeof candidate.mode === 'string' && candidate.mode.trim().length > 0 ? { mode: candidate.mode } : {}),
|
|
137
|
+
...(typeof candidate.role === 'string' && candidate.role.trim().length > 0 ? { role: candidate.role.trim() } : {}),
|
|
138
|
+
...(typeof candidate.lane_id === 'string' && candidate.lane_id.trim().length > 0 ? { lane_id: candidate.lane_id.trim() } : {}),
|
|
139
|
+
...(typeof candidate.scope === 'string' && candidate.scope.trim().length > 0 ? { scope: candidate.scope.trim() } : {}),
|
|
140
|
+
...(typeof candidate.agent_nickname === 'string' && candidate.agent_nickname.trim().length > 0 ? { agent_nickname: candidate.agent_nickname.trim() } : {}),
|
|
71
141
|
...(typeof candidate.completion_source === 'string' && candidate.completion_source.trim().length > 0 ? { completion_source: candidate.completion_source } : {}),
|
|
142
|
+
...(normalizeSubagentStatus(candidate.status) ? { status: normalizeSubagentStatus(candidate.status) } : {}),
|
|
143
|
+
...(typeof candidate.last_handoff_summary === 'string' && candidate.last_handoff_summary.trim().length > 0
|
|
144
|
+
? { last_handoff_summary: candidate.last_handoff_summary.trim() }
|
|
145
|
+
: {}),
|
|
146
|
+
...(typeof candidate.resume_requested_at === 'string' && candidate.resume_requested_at.trim().length > 0
|
|
147
|
+
? { resume_requested_at: candidate.resume_requested_at.trim() }
|
|
148
|
+
: {}),
|
|
149
|
+
...(typeof candidate.resume_completed_at === 'string' && candidate.resume_completed_at.trim().length > 0
|
|
150
|
+
? { resume_completed_at: candidate.resume_completed_at.trim() }
|
|
151
|
+
: {}),
|
|
152
|
+
...(typeof candidate.resume_failed_at === 'string' && candidate.resume_failed_at.trim().length > 0
|
|
153
|
+
? { resume_failed_at: candidate.resume_failed_at.trim() }
|
|
154
|
+
: {}),
|
|
155
|
+
...(typeof candidate.resume_failure_reason === 'string' && candidate.resume_failure_reason.trim().length > 0
|
|
156
|
+
? { resume_failure_reason: candidate.resume_failure_reason.trim() }
|
|
157
|
+
: {}),
|
|
72
158
|
};
|
|
73
159
|
}
|
|
74
160
|
const sessionCandidate = rawSession;
|
|
@@ -150,6 +236,22 @@ export function recordSubagentTurn(state, input) {
|
|
|
150
236
|
: requestedKind === 'leader' && existingKind === 'subagent'
|
|
151
237
|
? 'subagent'
|
|
152
238
|
: requestedKind ?? (threadId === leaderThreadId ? 'leader' : existingKind ?? 'subagent');
|
|
239
|
+
const requestedStatus = normalizeSubagentStatus(input.status);
|
|
240
|
+
const preservedStatus = normalizeSubagentStatus(existingThread?.status);
|
|
241
|
+
const preserveCompletionEvidence = input.preserveCompletionEvidence === true;
|
|
242
|
+
const clearsPriorCompletion = input.completed !== true
|
|
243
|
+
&& preserveCompletionEvidence !== true
|
|
244
|
+
&& Boolean(existingThread?.completed_at);
|
|
245
|
+
const status = requestedStatus
|
|
246
|
+
?? (input.completed ? 'closed' : undefined)
|
|
247
|
+
?? (clearsPriorCompletion ? undefined : preservedStatus);
|
|
248
|
+
const preservedCompletion = preserveCompletionEvidence && existingThread?.completed_at
|
|
249
|
+
? {
|
|
250
|
+
completed_at: existingThread.completed_at,
|
|
251
|
+
...(existingThread.last_completed_turn_id ? { last_completed_turn_id: existingThread.last_completed_turn_id } : {}),
|
|
252
|
+
...(existingThread.completion_source ? { completion_source: existingThread.completion_source } : {}),
|
|
253
|
+
}
|
|
254
|
+
: {};
|
|
153
255
|
const nextThread = {
|
|
154
256
|
thread_id: threadId,
|
|
155
257
|
kind,
|
|
@@ -163,8 +265,30 @@ export function recordSubagentTurn(state, input) {
|
|
|
163
265
|
...(input.turnId?.trim() ? { last_completed_turn_id: input.turnId.trim() } : {}),
|
|
164
266
|
...(input.completionSource?.trim() ? { completion_source: input.completionSource.trim() } : {}),
|
|
165
267
|
}
|
|
166
|
-
:
|
|
268
|
+
: preservedCompletion),
|
|
167
269
|
...(input.mode?.trim() ? { mode: input.mode.trim() } : existingThread?.mode ? { mode: existingThread.mode } : {}),
|
|
270
|
+
...(input.role?.trim() ? { role: input.role.trim() } : existingThread?.role ? { role: existingThread.role } : {}),
|
|
271
|
+
...(input.laneId?.trim() ? { lane_id: input.laneId.trim() } : existingThread?.lane_id ? { lane_id: existingThread.lane_id } : {}),
|
|
272
|
+
...(input.scope?.trim() ? { scope: input.scope.trim() } : existingThread?.scope ? { scope: existingThread.scope } : {}),
|
|
273
|
+
...(input.agentNickname?.trim()
|
|
274
|
+
? { agent_nickname: input.agentNickname.trim() }
|
|
275
|
+
: existingThread?.agent_nickname ? { agent_nickname: existingThread.agent_nickname } : {}),
|
|
276
|
+
...(status ? { status } : {}),
|
|
277
|
+
...(input.lastHandoffSummary?.trim()
|
|
278
|
+
? { last_handoff_summary: input.lastHandoffSummary.trim() }
|
|
279
|
+
: existingThread?.last_handoff_summary ? { last_handoff_summary: existingThread.last_handoff_summary } : {}),
|
|
280
|
+
...(input.resumeRequestedAt?.trim()
|
|
281
|
+
? { resume_requested_at: input.resumeRequestedAt.trim() }
|
|
282
|
+
: existingThread?.resume_requested_at ? { resume_requested_at: existingThread.resume_requested_at } : {}),
|
|
283
|
+
...(input.resumeCompletedAt?.trim()
|
|
284
|
+
? { resume_completed_at: input.resumeCompletedAt.trim() }
|
|
285
|
+
: existingThread?.resume_completed_at ? { resume_completed_at: existingThread.resume_completed_at } : {}),
|
|
286
|
+
...(input.resumeFailedAt?.trim()
|
|
287
|
+
? { resume_failed_at: input.resumeFailedAt.trim() }
|
|
288
|
+
: existingThread?.resume_failed_at ? { resume_failed_at: existingThread.resume_failed_at } : {}),
|
|
289
|
+
...(input.resumeFailureReason?.trim()
|
|
290
|
+
? { resume_failure_reason: input.resumeFailureReason.trim() }
|
|
291
|
+
: existingThread?.resume_failure_reason ? { resume_failure_reason: existingThread.resume_failure_reason } : {}),
|
|
168
292
|
};
|
|
169
293
|
const threads = {
|
|
170
294
|
...existingSession.threads,
|
|
@@ -209,20 +333,120 @@ export function summarizeSubagentSession(state, sessionId, options = {}) {
|
|
|
209
333
|
return false;
|
|
210
334
|
if (thread.completed_at)
|
|
211
335
|
return false;
|
|
336
|
+
const status = normalizeSubagentStatus(thread.status);
|
|
337
|
+
if (status === 'closed' || status === 'unavailable')
|
|
338
|
+
return false;
|
|
212
339
|
const seenAt = Date.parse(thread.last_seen_at);
|
|
213
340
|
if (!Number.isFinite(seenAt))
|
|
214
341
|
return false;
|
|
215
342
|
return nowMs - seenAt <= activeWindowMs;
|
|
216
343
|
});
|
|
344
|
+
const activeSubagentThreadIdSet = new Set(activeSubagentThreadIds);
|
|
345
|
+
const savedSubagents = allSubagentThreadIds.map((threadId) => {
|
|
346
|
+
const thread = session.threads[threadId];
|
|
347
|
+
const role = thread.role ?? thread.mode;
|
|
348
|
+
const laneId = thread.lane_id ?? thread.agent_nickname ?? role;
|
|
349
|
+
return {
|
|
350
|
+
agentId: thread.thread_id,
|
|
351
|
+
threadId: thread.thread_id,
|
|
352
|
+
...(role ? { role } : {}),
|
|
353
|
+
...(laneId ? { laneId } : {}),
|
|
354
|
+
...(thread.scope ? { scope: thread.scope } : {}),
|
|
355
|
+
...(thread.agent_nickname ? { agentNickname: thread.agent_nickname } : {}),
|
|
356
|
+
status: thread.status ?? (activeSubagentThreadIdSet.has(threadId) ? 'available' : 'closed'),
|
|
357
|
+
};
|
|
358
|
+
});
|
|
217
359
|
return {
|
|
218
360
|
sessionId,
|
|
219
361
|
leaderThreadId: session.leader_thread_id,
|
|
220
362
|
allThreadIds,
|
|
221
363
|
allSubagentThreadIds,
|
|
222
364
|
activeSubagentThreadIds,
|
|
365
|
+
savedSubagents,
|
|
223
366
|
updatedAt: session.updated_at,
|
|
224
367
|
};
|
|
225
368
|
}
|
|
369
|
+
export function buildSubagentResumeLedger(state, sessionId, options = {}) {
|
|
370
|
+
const summary = summarizeSubagentSession(state, sessionId, options);
|
|
371
|
+
if (!summary)
|
|
372
|
+
return null;
|
|
373
|
+
const normalized = normalizeSubagentTrackingState(state);
|
|
374
|
+
const session = normalized.sessions[sessionId];
|
|
375
|
+
if (!session)
|
|
376
|
+
return null;
|
|
377
|
+
const savedSubagents = summary.savedSubagents.map((entry) => {
|
|
378
|
+
const thread = session.threads[entry.threadId];
|
|
379
|
+
if (!thread)
|
|
380
|
+
return { ...entry };
|
|
381
|
+
const computedStatus = thread.status ?? entry.status;
|
|
382
|
+
return normalizeLedgerEntry(thread, computedStatus);
|
|
383
|
+
});
|
|
384
|
+
const resumeTargets = [...savedSubagents].sort(compareResumeEntries);
|
|
385
|
+
const unavailableSubagents = savedSubagents.filter((entry) => entry.status === 'unavailable');
|
|
386
|
+
return {
|
|
387
|
+
...summary,
|
|
388
|
+
savedSubagents,
|
|
389
|
+
resumeTargets,
|
|
390
|
+
unavailableSubagents,
|
|
391
|
+
};
|
|
392
|
+
}
|
|
393
|
+
export async function readSubagentSessionLedger(cwd, sessionId, options = {}) {
|
|
394
|
+
return buildSubagentResumeLedger(await readSubagentTrackingState(cwd), sessionId, options);
|
|
395
|
+
}
|
|
396
|
+
export function selectReusableSubagentEntry(entries, criteria = {}) {
|
|
397
|
+
const normalizedRole = readOptionalTrimmedString(criteria.role);
|
|
398
|
+
const normalizedLaneId = readOptionalTrimmedString(criteria.laneId);
|
|
399
|
+
const normalizedScope = readOptionalTrimmedString(criteria.scope);
|
|
400
|
+
const normalizedAgentNickname = readOptionalTrimmedString(criteria.agentNickname);
|
|
401
|
+
const matchingEntries = entries.filter((entry) => {
|
|
402
|
+
if (entry.status === 'unavailable')
|
|
403
|
+
return false;
|
|
404
|
+
if (normalizedRole && entry.role !== normalizedRole)
|
|
405
|
+
return false;
|
|
406
|
+
if (normalizedLaneId && entry.laneId !== normalizedLaneId)
|
|
407
|
+
return false;
|
|
408
|
+
if (normalizedScope && entry.scope !== normalizedScope)
|
|
409
|
+
return false;
|
|
410
|
+
if (normalizedAgentNickname && entry.agentNickname !== normalizedAgentNickname)
|
|
411
|
+
return false;
|
|
412
|
+
return true;
|
|
413
|
+
});
|
|
414
|
+
const scoredEntries = matchingEntries
|
|
415
|
+
.map((entry, index) => {
|
|
416
|
+
const statusRank = rankSubagentStatus(entry.status);
|
|
417
|
+
let score = 0;
|
|
418
|
+
if (entry.status === 'available')
|
|
419
|
+
score += 100;
|
|
420
|
+
else if (entry.status === 'closed')
|
|
421
|
+
score += 60;
|
|
422
|
+
else
|
|
423
|
+
score -= 100;
|
|
424
|
+
if (normalizedRole && entry.role === normalizedRole)
|
|
425
|
+
score += 30;
|
|
426
|
+
if (normalizedLaneId && entry.laneId === normalizedLaneId)
|
|
427
|
+
score += 24;
|
|
428
|
+
if (normalizedScope && entry.scope === normalizedScope)
|
|
429
|
+
score += 18;
|
|
430
|
+
if (normalizedAgentNickname && entry.agentNickname === normalizedAgentNickname)
|
|
431
|
+
score += 12;
|
|
432
|
+
if (entry.lastSeenAt)
|
|
433
|
+
score += 6;
|
|
434
|
+
if (entry.lastHandoffSummary)
|
|
435
|
+
score += 4;
|
|
436
|
+
return { entry, index, score, statusRank };
|
|
437
|
+
})
|
|
438
|
+
.sort((left, right) => {
|
|
439
|
+
if (right.score !== left.score)
|
|
440
|
+
return right.score - left.score;
|
|
441
|
+
if (left.statusRank !== right.statusRank)
|
|
442
|
+
return left.statusRank - right.statusRank;
|
|
443
|
+
const leftActivity = compareOptionalTimestampDesc(left.entry.lastSeenAt, right.entry.lastSeenAt);
|
|
444
|
+
if (leftActivity !== 0)
|
|
445
|
+
return leftActivity;
|
|
446
|
+
return left.index - right.index;
|
|
447
|
+
});
|
|
448
|
+
return scoredEntries[0]?.entry ?? null;
|
|
449
|
+
}
|
|
226
450
|
export async function readSubagentSessionSummary(cwd, sessionId, options = {}) {
|
|
227
451
|
return summarizeSubagentSession(await readSubagentTrackingState(cwd), sessionId, options);
|
|
228
452
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracker.js","sourceRoot":"","sources":["../../src/subagents/tracker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tracker.js","sourceRoot":"","sources":["../../src/subagents/tracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,7 +112,7 @@ describe('team model contract', () => {
|
|
|
112
112
|
it('maps worker roles to default reasoning effort tiers', () => {
|
|
113
113
|
assert.equal(resolveAgentReasoningEffort('explore'), 'low');
|
|
114
114
|
assert.equal(resolveAgentReasoningEffort('executor'), 'medium');
|
|
115
|
-
assert.equal(resolveAgentReasoningEffort('architect'), '
|
|
115
|
+
assert.equal(resolveAgentReasoningEffort('architect'), 'xhigh');
|
|
116
116
|
assert.equal(resolveAgentReasoningEffort('does-not-exist'), undefined);
|
|
117
117
|
});
|
|
118
118
|
it('maps worker roles through configured per-agent reasoning overrides', async () => {
|
|
@@ -139,6 +139,15 @@ describe('team model contract', () => {
|
|
|
139
139
|
assert.equal(resolveAgentDefaultModel('does-not-exist'), undefined);
|
|
140
140
|
});
|
|
141
141
|
});
|
|
142
|
+
it('honors exact model pins before frontier fallback routing', () => {
|
|
143
|
+
withIsolatedDefaultModelEnv(() => {
|
|
144
|
+
process.env.OMX_DEFAULT_FRONTIER_MODEL = 'gpt-5.2-frontier';
|
|
145
|
+
assert.equal(resolveAgentDefaultModel('planner'), 'gpt-5.5');
|
|
146
|
+
assert.equal(resolveAgentDefaultModel('architect'), 'gpt-5.5');
|
|
147
|
+
assert.equal(resolveAgentDefaultModel('researcher'), 'gpt-5.4-mini');
|
|
148
|
+
assert.equal(resolveAgentDefaultModel('critic'), 'gpt-5.2-frontier');
|
|
149
|
+
});
|
|
150
|
+
});
|
|
142
151
|
it('honors per-agent model overrides before class and spark fallback routing', async () => {
|
|
143
152
|
const codexHome = await mkdtemp(join(tmpdir(), 'omx-model-contract-agent-models-'));
|
|
144
153
|
try {
|
|
@@ -163,6 +172,65 @@ describe('team model contract', () => {
|
|
|
163
172
|
assert.equal(resolveAgentReasoningEffort('style-reviewer'), 'low');
|
|
164
173
|
});
|
|
165
174
|
});
|
|
175
|
+
it('lets exact role model defaults override inherited mini leader model when requested', () => {
|
|
176
|
+
withIsolatedDefaultModelEnv(() => {
|
|
177
|
+
assert.deepEqual(resolveTeamWorkerLaunchArgs({
|
|
178
|
+
inheritedArgs: ['--dangerously-bypass-approvals-and-sandbox', '--model', 'gpt-5.4-mini'],
|
|
179
|
+
fallbackModel: resolveAgentDefaultModel('planner'),
|
|
180
|
+
preferredReasoning: 'high',
|
|
181
|
+
honorExactRoleModel: true,
|
|
182
|
+
}), [
|
|
183
|
+
'--dangerously-bypass-approvals-and-sandbox',
|
|
184
|
+
'-c',
|
|
185
|
+
'model_reasoning_effort="high"',
|
|
186
|
+
'--model',
|
|
187
|
+
'gpt-5.5',
|
|
188
|
+
]);
|
|
189
|
+
});
|
|
190
|
+
});
|
|
191
|
+
it('preserves explicit worker model overrides before exact role defaults', () => {
|
|
192
|
+
withIsolatedDefaultModelEnv(() => {
|
|
193
|
+
assert.deepEqual(resolveTeamWorkerLaunchArgs({
|
|
194
|
+
existingRaw: '--model explicit-worker-model',
|
|
195
|
+
inheritedArgs: ['--dangerously-bypass-approvals-and-sandbox', '--model', 'gpt-5.4-mini'],
|
|
196
|
+
fallbackModel: resolveAgentDefaultModel('planner'),
|
|
197
|
+
preferredReasoning: 'high',
|
|
198
|
+
honorExactRoleModel: true,
|
|
199
|
+
}), [
|
|
200
|
+
'--dangerously-bypass-approvals-and-sandbox',
|
|
201
|
+
'-c',
|
|
202
|
+
'model_reasoning_effort="high"',
|
|
203
|
+
'--model',
|
|
204
|
+
'explicit-worker-model',
|
|
205
|
+
]);
|
|
206
|
+
const diagnostics = resolveTeamWorkerLaunchDiagnostics({
|
|
207
|
+
requestedAgentType: 'planner',
|
|
208
|
+
existingRaw: '--model explicit-worker-model',
|
|
209
|
+
inheritedArgs: ['--model', 'gpt-5.4-mini'],
|
|
210
|
+
fallbackModel: resolveAgentDefaultModel('planner'),
|
|
211
|
+
preferredReasoning: 'high',
|
|
212
|
+
honorExactRoleModel: true,
|
|
213
|
+
});
|
|
214
|
+
assert.equal(diagnostics.actualModel, 'explicit-worker-model');
|
|
215
|
+
assert.equal(diagnostics.modelSource, 'env');
|
|
216
|
+
assert.equal(diagnostics.inheritedParentModel, false);
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
it('preserves inherited mini leader model for roles without exact-model enforcement', () => {
|
|
220
|
+
withIsolatedDefaultModelEnv(() => {
|
|
221
|
+
assert.deepEqual(resolveTeamWorkerLaunchArgs({
|
|
222
|
+
inheritedArgs: ['--dangerously-bypass-approvals-and-sandbox', '--model', 'gpt-5.4-mini'],
|
|
223
|
+
fallbackModel: resolveAgentDefaultModel('executor'),
|
|
224
|
+
preferredReasoning: resolveAgentReasoningEffort('executor'),
|
|
225
|
+
}), [
|
|
226
|
+
'--dangerously-bypass-approvals-and-sandbox',
|
|
227
|
+
'-c',
|
|
228
|
+
'model_reasoning_effort="medium"',
|
|
229
|
+
'--model',
|
|
230
|
+
'gpt-5.4-mini',
|
|
231
|
+
]);
|
|
232
|
+
});
|
|
233
|
+
});
|
|
166
234
|
it('reports requested versus actual worker launch resolution for role defaults', () => {
|
|
167
235
|
withIsolatedDefaultModelEnv(() => {
|
|
168
236
|
assert.deepEqual(resolveTeamWorkerLaunchDiagnostics({
|
|
@@ -172,13 +240,13 @@ describe('team model contract', () => {
|
|
|
172
240
|
}), {
|
|
173
241
|
requestedAgentType: 'architect',
|
|
174
242
|
requestedDefaultModel: 'gpt-5.5',
|
|
175
|
-
requestedDefaultReasoning: '
|
|
243
|
+
requestedDefaultReasoning: 'xhigh',
|
|
176
244
|
actualModel: 'gpt-5.5',
|
|
177
|
-
actualReasoning: '
|
|
245
|
+
actualReasoning: 'xhigh',
|
|
178
246
|
modelSource: 'fallback',
|
|
179
247
|
reasoningSource: 'role-default',
|
|
180
248
|
inheritedParentModel: false,
|
|
181
|
-
actualLaunchArgs: ['-c', 'model_reasoning_effort="
|
|
249
|
+
actualLaunchArgs: ['-c', 'model_reasoning_effort="xhigh"', '--model', 'gpt-5.5'],
|
|
182
250
|
});
|
|
183
251
|
});
|
|
184
252
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-contract.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/model-contract.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model-contract.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/model-contract.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@ import { tmpdir } from 'os';
|
|
|
8
8
|
import { existsSync } from 'fs';
|
|
9
9
|
import { HUD_TMUX_TEAM_HEIGHT_LINES } from '../../hud/constants.js';
|
|
10
10
|
import { DEFAULT_MAX_WORKERS, initTeamState, createTask, writeWorkerInbox, readTeamConfig, saveTeamConfig, listMailboxMessages, listDispatchRequests, transitionDispatchRequest, updateWorkerHeartbeat, writeAtomic, readTask, readMonitorSnapshot, claimTask, transitionTaskStatus, readWorkerStatus, writeWorkerStatus, } from '../state.js';
|
|
11
|
-
import { monitorTeam, shutdownTeam, resumeTeam, startTeam, assignTask, sendWorkerMessage, applyCreatedInteractiveSessionToConfig, resolveWorkerLaunchArgsFromEnv, shouldPrekillInteractiveShutdownProcessTrees, waitForWorkerStartupEvidence, waitForClaudeStartupEvidence, cleanupTeamWorkerLaunchOrphanedMcpProcesses, settleStartupAttemptResults, } from '../runtime.js';
|
|
12
|
-
import { resolveAgentReasoningEffort, resolveTeamLowComplexityDefaultModel } from '../model-contract.js';
|
|
11
|
+
import { monitorTeam, shutdownTeam, resumeTeam, startTeam, assignTask, sendWorkerMessage, applyCreatedInteractiveSessionToConfig, resolveWorkerLaunchArgsFromEnv, resolveTeamWorkerCliForResolvedLaunchArgs, shouldPrekillInteractiveShutdownProcessTrees, waitForWorkerStartupEvidence, waitForClaudeStartupEvidence, cleanupTeamWorkerLaunchOrphanedMcpProcesses, settleStartupAttemptResults, } from '../runtime.js';
|
|
12
|
+
import { resolveAgentReasoningEffort, resolveTeamLowComplexityDefaultModel, TEAM_WORKER_INHERITED_MODEL_ENV, } from '../model-contract.js';
|
|
13
13
|
import { readTeamEvents } from '../state/events.js';
|
|
14
14
|
import { sanitizeTeamName } from '../tmux-session.js';
|
|
15
15
|
import { buildInternalTeamName, resolveTeamIdentityScope } from '../team-identity.js';
|
|
@@ -480,6 +480,45 @@ describe('runtime', () => {
|
|
|
480
480
|
assert.deepEqual(args, ['--no-alt-screen', '-c', 'model_reasoning_effort="medium"', '--model', 'gpt-5.5']);
|
|
481
481
|
});
|
|
482
482
|
});
|
|
483
|
+
it('resolveWorkerLaunchArgsFromEnv keeps planner on exact gpt-5.5 medium when inherited leader is mini', () => {
|
|
484
|
+
withIsolatedDefaultModelEnv(() => {
|
|
485
|
+
const args = resolveWorkerLaunchArgsFromEnv({
|
|
486
|
+
OMX_TEAM_WORKER_LAUNCH_ARGS: '--dangerously-bypass-approvals-and-sandbox --model gpt-5.4-mini',
|
|
487
|
+
[TEAM_WORKER_INHERITED_MODEL_ENV]: 'gpt-5.4-mini',
|
|
488
|
+
}, 'planner', undefined, resolveAgentReasoningEffort('planner'), 'codex');
|
|
489
|
+
assert.deepEqual(args, [
|
|
490
|
+
'--dangerously-bypass-approvals-and-sandbox',
|
|
491
|
+
'-c',
|
|
492
|
+
'model_reasoning_effort="medium"',
|
|
493
|
+
'--model',
|
|
494
|
+
'gpt-5.5',
|
|
495
|
+
]);
|
|
496
|
+
});
|
|
497
|
+
});
|
|
498
|
+
it('resolveTeamWorkerCliForResolvedLaunchArgs derives auto CLI from exact-model resolved launch args', () => {
|
|
499
|
+
withIsolatedDefaultModelEnv(() => {
|
|
500
|
+
const resolvedLaunchArgs = resolveWorkerLaunchArgsFromEnv({
|
|
501
|
+
[TEAM_WORKER_INHERITED_MODEL_ENV]: 'claude-sonnet-4-6',
|
|
502
|
+
}, 'planner', 'claude-sonnet-4-6', resolveAgentReasoningEffort('planner'), 'codex');
|
|
503
|
+
const workerCli = resolveTeamWorkerCliForResolvedLaunchArgs(1, 1, resolvedLaunchArgs, { OMX_TEAM_WORKER_CLI_MAP: 'auto' });
|
|
504
|
+
assert.equal(workerCli, 'codex');
|
|
505
|
+
});
|
|
506
|
+
});
|
|
507
|
+
it('resolveWorkerLaunchArgsFromEnv honors inherited leader model from the dedicated env path', () => {
|
|
508
|
+
withIsolatedDefaultModelEnv(() => {
|
|
509
|
+
const args = resolveWorkerLaunchArgsFromEnv({
|
|
510
|
+
OMX_TEAM_WORKER_LAUNCH_ARGS: '--dangerously-bypass-approvals-and-sandbox --model gpt-5.4-mini',
|
|
511
|
+
[TEAM_WORKER_INHERITED_MODEL_ENV]: 'gpt-5.4-mini',
|
|
512
|
+
}, 'planner', undefined, resolveAgentReasoningEffort('planner'), 'codex');
|
|
513
|
+
assert.deepEqual(args, [
|
|
514
|
+
'--dangerously-bypass-approvals-and-sandbox',
|
|
515
|
+
'-c',
|
|
516
|
+
'model_reasoning_effort="medium"',
|
|
517
|
+
'--model',
|
|
518
|
+
'gpt-5.5',
|
|
519
|
+
]);
|
|
520
|
+
});
|
|
521
|
+
});
|
|
483
522
|
it('resolveWorkerLaunchArgsFromEnv treats *-low aliases as low complexity', () => {
|
|
484
523
|
const args = resolveWorkerLaunchArgsFromEnv({ OMX_TEAM_WORKER_LAUNCH_ARGS: '--no-alt-screen' }, 'executor-low');
|
|
485
524
|
assert.deepEqual(args, ['--no-alt-screen', '--model', expectedLowComplexityModel()]);
|
|
@@ -488,6 +527,9 @@ describe('runtime', () => {
|
|
|
488
527
|
assert.deepEqual(resolveWorkerLaunchArgsFromEnv({ OMX_TEAM_WORKER_LAUNCH_ARGS: '--model gpt-5' }, 'explore'), ['--model', 'gpt-5']);
|
|
489
528
|
assert.deepEqual(resolveWorkerLaunchArgsFromEnv({ OMX_TEAM_WORKER_LAUNCH_ARGS: '--model=gpt-5.3' }, 'explore'), ['--model', 'gpt-5.3']);
|
|
490
529
|
});
|
|
530
|
+
it('resolveWorkerLaunchArgsFromEnv preserves explicit env model before planner exact model', () => {
|
|
531
|
+
assert.deepEqual(resolveWorkerLaunchArgsFromEnv({ OMX_TEAM_WORKER_LAUNCH_ARGS: '--model explicit-worker-model' }, 'planner', 'gpt-5.4-mini', 'high', 'codex'), ['-c', 'model_reasoning_effort="high"', '--model', 'explicit-worker-model']);
|
|
532
|
+
});
|
|
491
533
|
it('resolveWorkerLaunchArgsFromEnv uses inherited leader model for all agent types', () => {
|
|
492
534
|
const args = resolveWorkerLaunchArgsFromEnv({ OMX_TEAM_WORKER_LAUNCH_ARGS: '--no-alt-screen' }, 'executor', 'gpt-4.1');
|
|
493
535
|
assert.deepEqual(args, ['--no-alt-screen', '--model', 'gpt-4.1']);
|