oh-my-codex 0.15.3 → 0.16.0

package/dist/team/runtime.js

@@ -9,10 +9,11 @@ import { queueInboxInstruction, queueDirectMailboxMessage, queueBroadcastMailbox
 import { appendTeamDeliveryLogForCwd } from './delivery-log.js';
 import { remapRepoAwareDecompositionMetadataToCreatedTasks, } from './repo-aware-decomposition.js';
 import { generateWorkerOverlay, writeTeamWorkerInstructionsFile, removeTeamWorkerInstructionsFile, writeWorkerWorktreeRootAgentsFile, removeWorkerWorktreeRootAgentsFile, generateInitialInbox, generateTaskAssignmentInbox, generateShutdownInbox, buildTriggerDirective, buildMailboxTriggerDirective, buildLeaderMailboxTriggerDirective, writeWorkerRoleInstructionsFile, } from './worker-bootstrap.js';
+import { buildTeamWorkerGoalInstruction } from './goal-workflow.js';
 import { synthesizeDelegationPlan } from './delegation-policy.js';
 import { loadRolePrompt } from './role-router.js';
 import { composeRoleInstructionsForRole } from '../agents/native-config.js';
-import { codexPromptsDir } from '../utils/paths.js';
+import { codexPromptsDir, omxStateDir } from '../utils/paths.js';
 import { isTerminalPhase } from './orchestrator.js';
 import { resolveTeamWorkerLaunchArgs, TEAM_LOW_COMPLEXITY_DEFAULT_MODEL, parseTeamWorkerLaunchArgs, splitWorkerLaunchArgs, resolveAgentDefaultModel, resolveAgentReasoningEffort, } from './model-contract.js';
 import { resolveCanonicalTeamStateRoot } from './state-root.js';
@@ -23,6 +24,7 @@ import { hasStructuredVerificationEvidence } from '../verification/verifier.js';
 import { buildRebalanceDecisions } from './rebalance-policy.js';
 import { getStatePath } from '../mcp/state-paths.js';
 import { readModeState, updateModeState } from '../modes/base.js';
+import { buildApprovedTeamExecutionBinding, normalizeApprovedTeamExecutionBinding, readApprovedTeamExecutionHintFromBinding, resolvePersistedApprovedTeamExecutionContinuityState, writePersistedApprovedTeamExecutionBinding, } from './approved-execution.js';
 import { appendTeamCommitHygieneEntries, buildTeamCommitHygieneContext, resolveTeamCommitHygieneArtifactCwd, writeTeamCommitHygieneContext, } from './commit-hygiene.js';
 import { assertCleanLeaderWorkspaceForWorkerWorktrees, ensureWorktree, isGitRepository, isWorktreeDirty, planWorktreeTarget, removeWorktreeForce, rollbackProvisionedWorktrees, } from './worktree.js';
 import { cleanupOmxMcpProcesses, findLaunchSafeCleanupCandidates, } from '../cli/cleanup.js';
@@ -949,6 +951,18 @@ const STARTUP_EVIDENCE_TIMEOUT_MS = 15_000;
 const STARTUP_EVIDENCE_POLL_MS = 100;
 const STARTUP_EVIDENCE_LAUNCH_TIMEOUT_MS = 45_000;
 const STARTUP_TIMING_LOG_VERSION = 1;
+export function teamStartupTimingPath(teamName, cwd) {
+    return join(resolveCanonicalTeamStateRoot(cwd), 'team', teamName, 'startup-timing.json');
+}
+export function teamRuntimeTeamsRoot(cwd) {
+    return join(resolveCanonicalTeamStateRoot(cwd), 'team');
+}
+export function teamRuntimeTeamRoot(teamName, cwd) {
+    return join(teamRuntimeTeamsRoot(cwd), teamName);
+}
+export function teamRuntimeSessionPath(cwd) {
+    return join(omxStateDir(cwd), 'session.json');
+}
 function createStartupTimingRecorder(teamName, cwd) {
     const startedAt = performance.now();
     const events = [];
@@ -962,7 +976,7 @@ function createStartupTimingRecorder(teamName, cwd) {
             });
         },
         flush: async () => {
-            const timingPath = join(cwd, '.omx', 'state', 'team', teamName, 'startup-timing.json');
+            const timingPath = teamStartupTimingPath(teamName, cwd);
             await writeAtomic(timingPath, JSON.stringify({ schema_version: STARTUP_TIMING_LOG_VERSION, team_name: teamName, events }, null, 2)).catch(() => { });
             for (const event of events) {
                 await appendTeamDeliveryLogForCwd(cwd, {
@@ -1449,10 +1463,16 @@ export { TEAM_LOW_COMPLEXITY_DEFAULT_MODEL };
 export { resolveCanonicalTeamStateRoot };
 function spawnPromptWorker(teamName, workerName, workerIndex, workerCwd, launchArgs, workerEnv, workerCli, initialPrompt, workerRole) {
     const processSpec = buildWorkerProcessLaunchSpec(teamName, workerIndex, launchArgs, workerCwd, workerEnv, workerCli, initialPrompt, workerRole);
+    const childEnv = { ...process.env, ...processSpec.env };
+    // Prompt workers are external CLI processes, not in-process runtime code.
+    // Keeping c8's NODE_V8_COVERAGE in their environment makes coverage runs
+    // track long-lived fake worker descendants and can keep node --test alive
+    // after the runtime test itself has completed.
+    delete childEnv.NODE_V8_COVERAGE;
     const child = spawn(processSpec.command, processSpec.args, {
         cwd: workerCwd,
         detached: process.platform !== 'win32',
-        env: { ...process.env, ...processSpec.env },
+        env: childEnv,
         stdio: ['pipe', 'ignore', 'ignore'],
     });
     registerPromptWorkerHandle(teamName, workerName, child);
@@ -1578,6 +1598,16 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
         }
     }
     const teamStateRoot = resolveCanonicalTeamStateRoot(leaderCwd);
+    const requestedApprovedExecution = normalizeApprovedTeamExecutionBinding(options.approvedExecution);
+    const selectedApprovedExecutionHint = requestedApprovedExecution
+        ? readApprovedTeamExecutionHintFromBinding(leaderCwd, requestedApprovedExecution)
+        : null;
+    if (requestedApprovedExecution && !selectedApprovedExecutionHint) {
+        throw new Error(`approved_execution_binding_stale:${requestedApprovedExecution.prd_path}:${requestedApprovedExecution.task}`);
+    }
+    const approvedExecution = selectedApprovedExecutionHint
+        ? buildApprovedTeamExecutionBinding(selectedApprovedExecutionHint)
+        : null;
     const activeWorktreeMode = effectiveWorktreeMode.enabled
         ? (effectiveWorktreeMode.detached ? 'detached' : 'named')
         : null;
@@ -1660,6 +1690,7 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
         config.requested_name = displayName;
         config.identity_source = identityScope.source;
         config.worktree_mode = effectiveWorktreeMode;
+        await writePersistedApprovedTeamExecutionBinding(sanitized, leaderCwd, approvedExecution, teamStateRoot);
         // 4. Create tasks. Repo-aware DAG dependencies are symbolic until the
         // state layer returns concrete task IDs, so create those tasks dependency
         // free and patch runtime dependency fields after ID assignment.
@@ -1756,6 +1787,7 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
                 worktreeRootAgentsCanonical: Boolean(workerWorkspace.worktreePath),
                 taskHints: effectiveDecompositionMetadata?.task_hints,
                 approvedContextSummary: effectiveDecompositionMetadata?.approved_context_summary,
+                workerGoalInstruction: buildTeamWorkerGoalInstruction(sanitized, workerName, workerTasks, { teamStateRoot }),
             });
             const triggerDirective = buildTriggerDirective(workerName, sanitized, resolveInstructionStateRoot(workerWorkspace.worktreePath));
             const trigger = triggerDirective.text;
@@ -2852,6 +2884,14 @@ export async function resumeTeam(teamName, cwd) {
     if (!config)
         return null;
     config.lifecycle_profile = 'default';
+    const leaderCwd = config.leader_cwd ?? cwd;
+    const approvedExecutionState = await resolvePersistedApprovedTeamExecutionContinuityState(sanitized, leaderCwd, config.team_state_root ?? resolveCanonicalTeamStateRoot(leaderCwd));
+    if (approvedExecutionState.status === 'malformed') {
+        throw new Error(`approved_execution_binding_malformed:${sanitized}`);
+    }
+    if (approvedExecutionState.status === 'stale') {
+        throw new Error(`approved_execution_binding_stale:${approvedExecutionState.binding.prd_path}:${approvedExecutionState.binding.task}`);
+    }
     if (config.worker_launch_mode === 'prompt') {
         const handleTeamConfig = { ...config, name: sanitized };
         const hasLivePromptWorker = config.workers.some((worker) => isPromptWorkerAlive(handleTeamConfig, worker));
@@ -2890,7 +2930,7 @@ export async function resumeTeam(teamName, cwd) {
     };
 }
 async function findActiveTeams(cwd, leaderSessionId) {
-    const root = join(cwd, '.omx', 'state', 'team');
+    const root = teamRuntimeTeamsRoot(cwd);
     if (!existsSync(root))
         return [];
     const sessions = new Set(listTeamSessions());
@@ -2926,7 +2966,7 @@ async function findActiveTeams(cwd, leaderSessionId) {
     return active;
 }
 async function detectAndCleanStaleTeam(teamName, leaderCwd, workerCount, confirmFn) {
-    const stateDir = join(leaderCwd, '.omx', 'state', 'team', teamName);
+    const stateDir = teamRuntimeTeamRoot(teamName, leaderCwd);
     if (!existsSync(stateDir))
         return;
     const sessions = new Set(listTeamSessions());
@@ -2975,7 +3015,7 @@ async function resolveLeaderSessionId(cwd) {
     const fromEnv = process.env.OMX_SESSION_ID || process.env.CODEX_SESSION_ID || process.env.SESSION_ID;
     if (fromEnv && fromEnv.trim() !== '')
         return fromEnv.trim();
-    const p = join(cwd, '.omx', 'state', 'session.json');
+    const p = teamRuntimeSessionPath(cwd);
     if (!existsSync(p))
         return '';
     try {