oh-my-codex 0.8.11 → 0.8.13

package/dist/team/runtime.js

@@ -4,9 +4,9 @@ import { readdir, readFile } from 'fs/promises';
 import { performance } from 'perf_hooks';
 import { spawn } from 'child_process';
 import { sanitizeTeamName, isTmuxAvailable, createTeamSession, buildWorkerProcessLaunchSpec, resolveTeamWorkerCli, resolveTeamWorkerCliPlan, resolveTeamWorkerLaunchMode, waitForWorkerReady, dismissTrustPromptIfPresent, sleepFractionalSeconds, sendToWorker, sendToLeaderPane, sendToWorkerStdin, isWorkerAlive, getWorkerPanePid, killWorkerByPaneIdAsync, teardownWorkerPanes, unregisterResizeHook, destroyTeamSession, listTeamSessions, } from './tmux-session.js';
-import { teamInit as initTeamState, DEFAULT_MAX_WORKERS, teamReadConfig as readTeamConfig, teamWriteWorkerIdentity as writeWorkerIdentity, teamReadWorkerHeartbeat as readWorkerHeartbeat, teamReadWorkerStatus as readWorkerStatus, teamWriteWorkerInbox as writeWorkerInbox, teamCreateTask as createStateTask, teamReadTask as readTask, teamListTasks as listTasks, teamReadManifest as readTeamManifestV2, teamNormalizePolicy as normalizeTeamPolicy, teamClaimTask as claimTask, teamReleaseTaskClaim as releaseTaskClaim, teamReclaimExpiredTaskClaim as reclaimExpiredTaskClaim, teamAppendEvent as appendTeamEvent, teamReadTaskApproval as readTaskApproval, teamListMailbox as listMailboxMessages, teamMarkMessageDelivered as markMessageDelivered, teamMarkMessageNotified as markMessageNotified, teamEnqueueDispatchRequest as enqueueDispatchRequest, teamMarkDispatchRequestNotified as markDispatchRequestNotified, teamTransitionDispatchRequest as transitionDispatchRequest, teamReadDispatchRequest as readDispatchRequest, teamCleanup as cleanupTeamState, teamSaveConfig as saveTeamConfig, teamWriteShutdownRequest as writeShutdownRequest, teamReadShutdownAck as readShutdownAck, teamReadMonitorSnapshot as readMonitorSnapshot, teamWriteMonitorSnapshot as writeMonitorSnapshot, teamReadPhase as readTeamPhaseState, teamWritePhase as writeTeamPhaseState, } from './team-ops.js';
+import { teamInit as initTeamState, DEFAULT_MAX_WORKERS, teamReadConfig as readTeamConfig, teamWriteWorkerIdentity as writeWorkerIdentity, teamReadWorkerHeartbeat as readWorkerHeartbeat, teamReadWorkerStatus as readWorkerStatus, teamWriteWorkerInbox as writeWorkerInbox, teamCreateTask as createStateTask, teamReadTask as readTask, teamListTasks as listTasks, teamReadManifest as readTeamManifestV2, teamNormalizeGovernance as normalizeTeamGovernance, teamNormalizePolicy as normalizeTeamPolicy, teamClaimTask as claimTask, teamReleaseTaskClaim as releaseTaskClaim, teamReclaimExpiredTaskClaim as reclaimExpiredTaskClaim, teamAppendEvent as appendTeamEvent, teamReadTaskApproval as readTaskApproval, teamListMailbox as listMailboxMessages, teamMarkMessageDelivered as markMessageDelivered, teamMarkMessageNotified as markMessageNotified, teamEnqueueDispatchRequest as enqueueDispatchRequest, teamMarkDispatchRequestNotified as markDispatchRequestNotified, teamTransitionDispatchRequest as transitionDispatchRequest, teamReadDispatchRequest as readDispatchRequest, teamCleanup as cleanupTeamState, teamSaveConfig as saveTeamConfig, teamWriteShutdownRequest as writeShutdownRequest, teamReadShutdownAck as readShutdownAck, teamReadMonitorSnapshot as readMonitorSnapshot, teamWriteMonitorSnapshot as writeMonitorSnapshot, teamReadPhase as readTeamPhaseState, teamWritePhase as writeTeamPhaseState, } from './team-ops.js';
 import { queueInboxInstruction, queueDirectMailboxMessage, queueBroadcastMailboxMessage, waitForDispatchReceipt, } from './mcp-comm.js';
-import { generateWorkerOverlay, writeTeamWorkerInstructionsFile, removeTeamWorkerInstructionsFile, generateInitialInbox, generateTaskAssignmentInbox, generateShutdownInbox, generateTriggerMessage, generateMailboxTriggerMessage, writeWorkerRoleInstructionsFile, } from './worker-bootstrap.js';
+import { generateWorkerOverlay, writeTeamWorkerInstructionsFile, removeTeamWorkerInstructionsFile, generateInitialInbox, generateTaskAssignmentInbox, generateShutdownInbox, generateTriggerMessage, generateMailboxTriggerMessage, generateLeaderMailboxTriggerMessage, writeWorkerRoleInstructionsFile, } from './worker-bootstrap.js';
 import { loadRolePrompt } from './role-router.js';
 import { codexPromptsDir } from '../utils/paths.js';
 import { isLowComplexityAgentType, resolveTeamWorkerLaunchArgs, TEAM_LOW_COMPLEXITY_DEFAULT_MODEL, resolveTeamLowComplexityDefaultModel, parseTeamWorkerLaunchArgs, splitWorkerLaunchArgs, resolveAgentReasoningEffort, } from './model-contract.js';
@@ -14,6 +14,7 @@ import { resolveCanonicalTeamStateRoot } from './state-root.js';
 import { inferPhaseTargetFromTaskCounts, reconcilePhaseStateForMonitor } from './phase-controller.js';
 import { getTeamTmuxSessions } from '../notifications/tmux.js';
 import { hasStructuredVerificationEvidence } from '../verification/verifier.js';
+import { buildRebalanceDecisions } from './rebalance-policy.js';
 import { readModeState, updateModeState } from '../modes/base.js';
 import { ensureWorktree, planWorktreeTarget, rollbackProvisionedWorktrees, } from './worktree.js';
 async function syncRootTeamModeStateOnTerminalPhase(teamName, phase, cwd) {
@@ -46,6 +47,46 @@ async function syncRootTeamModeStateOnTerminalPhase(teamName, phase, cwd) {
         // Best-effort compatibility sync only.
     }
 }
+async function syncLinkedRalphModeStateOnTerminalPhase(teamName, phase, cwd, nowIso = new Date().toISOString()) {
+    if (phase !== 'complete' && phase !== 'failed' && phase !== 'cancelled')
+        return;
+    try {
+        const [teamState, ralphState] = await Promise.all([
+            readModeState('team', cwd),
+            readModeState('ralph', cwd),
+        ]);
+        if (!teamState || !ralphState)
+            return;
+        const stateTeamName = typeof teamState.team_name === 'string' ? teamState.team_name.trim() : '';
+        if (stateTeamName && stateTeamName !== teamName)
+            return;
+        if (teamState.linked_ralph !== true || ralphState.linked_team !== true)
+            return;
+        const terminalAt = typeof teamState.completed_at === 'string' && teamState.completed_at
+            ? teamState.completed_at
+            : nowIso;
+        const alreadySynced = ralphState.active === false
+            && ralphState.current_phase === phase
+            && ralphState.linked_team_terminal_phase === phase
+            && ralphState.linked_team_terminal_at === terminalAt
+            && ralphState.completed_at === terminalAt;
+        if (alreadySynced)
+            return;
+        await updateModeState('ralph', {
+            active: false,
+            current_phase: phase,
+            linked_mode: 'team',
+            linked_team: true,
+            linked_team_terminal_phase: phase,
+            linked_team_terminal_at: terminalAt,
+            completed_at: terminalAt,
+            last_turn_at: nowIso,
+        }, cwd);
+    }
+    catch {
+        // Best-effort compatibility sync only.
+    }
+}
 function collectProvisionedShutdownWorktrees(config) {
     const seenWorktreePaths = new Set();
     const worktrees = [];
@@ -96,6 +137,43 @@ function resolveWorkerReadyTimeoutMs(env) {
         return parsed;
     return 45_000;
 }
+function parseTeamWorkerContext(raw) {
+    if (typeof raw !== 'string' || raw.trim() === '')
+        return null;
+    const [teamName, workerName] = raw.trim().split('/');
+    if (!teamName || !workerName)
+        return null;
+    return { teamName, workerName };
+}
+function resolveManifestLookupCwds(cwd) {
+    const candidates = new Set([resolve(cwd)]);
+    const leaderCwd = process.env[TEAM_LEADER_CWD_ENV];
+    if (typeof leaderCwd === 'string' && leaderCwd.trim() !== '') {
+        candidates.add(resolve(leaderCwd));
+    }
+    const teamStateRoot = process.env[TEAM_STATE_ROOT_ENV];
+    if (typeof teamStateRoot === 'string' && teamStateRoot.trim() !== '') {
+        candidates.add(resolve(teamStateRoot, '..', '..'));
+    }
+    return [...candidates];
+}
+function resolveGovernancePolicy(governance, legacyPolicy) {
+    return normalizeTeamGovernance(governance, legacyPolicy);
+}
+async function assertNestedTeamAllowed(cwd) {
+    const workerContext = parseTeamWorkerContext(process.env.OMX_TEAM_WORKER);
+    if (!workerContext)
+        return;
+    for (const candidateCwd of resolveManifestLookupCwds(cwd)) {
+        const manifest = await readTeamManifestV2(workerContext.teamName, candidateCwd);
+        const governance = resolveGovernancePolicy(manifest?.governance, manifest?.policy);
+        if (governance.nested_teams_allowed)
+            return;
+        if (manifest)
+            break;
+    }
+    throw new Error('nested_team_disallowed');
+}
 async function readWorkerStartupEvidence(teamName, workerName, cwd) {
     const status = await readWorkerStatus(teamName, workerName, cwd);
     if (typeof status.current_task_id === 'string' && status.current_task_id.trim() !== '') {
@@ -360,9 +438,8 @@ function resolveEffectiveWorkerCliForStartupLog(resolvedLaunchArgs, env) {
  * Start a new team: init state, create tmux session, bootstrap workers.
  */
 export async function startTeam(teamName, task, agentType, workerCount, tasks, cwd, options = {}) {
-    if (process.env.OMX_TEAM_WORKER) {
-        throw new Error('nested_team_disallowed');
-    }
+    const leaderCwd = resolve(cwd);
+    await assertNestedTeamAllowed(leaderCwd);
     const workerLaunchMode = resolveTeamWorkerLaunchMode(process.env);
     const displayMode = workerLaunchMode === 'interactive' ? 'split_pane' : 'auto';
     if (workerLaunchMode === 'interactive') {
@@ -373,7 +450,6 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
             throw new Error('Team mode requires running inside tmux current leader pane');
         }
     }
-    const leaderCwd = resolve(cwd);
     const sanitized = sanitizeTeamName(teamName);
     const teamStateRoot = resolveCanonicalTeamStateRoot(leaderCwd);
     const activeWorktreeMode = options.worktreeMode?.enabled
@@ -802,7 +878,7 @@ export async function monitorTeam(teamName, cwd) {
         if (reclaimed.ok && reclaimed.reclaimed)
             reclaimedTaskIds.push(task.id);
     }
-    const taskView = reclaimedTaskIds.length > 0 ? await listTasks(sanitized, cwd) : allTasks;
+    let taskView = reclaimedTaskIds.length > 0 ? await listTasks(sanitized, cwd) : allTasks;
     const taskById = new Map(taskView.map((task) => [task.id, task]));
     const inProgressByOwner = new Map();
     for (const task of taskView) {
@@ -863,6 +939,39 @@ export async function monitorTeam(teamName, cwd) {
             recommendations.push(`Send reminder to non-reporting ${w.name}`);
         }
     }
+    for (const taskId of reclaimedTaskIds) {
+        recommendations.push(`Reclaimed expired claim for task-${taskId}`);
+    }
+    const rebalanceDecisions = buildRebalanceDecisions({
+        tasks: taskView,
+        workers: workers.map((worker) => ({
+            name: worker.name,
+            role: config.workers.find((entry) => entry.name === worker.name)?.role,
+            alive: worker.alive,
+            status: worker.status,
+        })),
+        reclaimedTaskIds,
+    });
+    let assignedDuringMonitor = false;
+    for (const decision of rebalanceDecisions) {
+        if (decision.type === 'assign' && decision.taskId && decision.workerName) {
+            try {
+                await assignTask(sanitized, decision.workerName, decision.taskId, cwd);
+                recommendations.push(`Assigned task-${decision.taskId} to ${decision.workerName}: ${decision.reason}`);
+                assignedDuringMonitor = true;
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                recommendations.push(`Unable to assign task-${decision.taskId} to ${decision.workerName}: ${message}`);
+            }
+        }
+        else {
+            recommendations.push(decision.reason);
+        }
+    }
+    if (assignedDuringMonitor) {
+        taskView = await listTasks(sanitized, cwd);
+    }
     // Count tasks
     const taskCounts = {
         total: taskView.length,
@@ -895,9 +1004,7 @@ export async function monitorTeam(teamName, cwd) {
     await writeTeamPhaseState(sanitized, phaseState, cwd);
     const phase = phaseState.current_phase;
     await syncRootTeamModeStateOnTerminalPhase(sanitized, phase, cwd);
-    for (const taskId of reclaimedTaskIds) {
-        recommendations.push(`Reclaimed expired claim for task-${taskId}`);
-    }
+    await syncLinkedRalphModeStateOnTerminalPhase(sanitized, phase, cwd);
     if (deadWorkerStall) {
         recommendations.push('All workers are dead while work remains; mark the team failed or restart with fresh workers.');
     }
@@ -969,10 +1076,11 @@ export async function assignTask(teamName, workerName, taskId, cwd) {
     if (!task)
         throw new Error(`Task ${taskId} not found`);
     const manifest = await readTeamManifestV2(sanitized, cwd);
-    if (manifest?.policy?.delegation_only && workerName === 'leader-fixed') {
+    const governance = resolveGovernancePolicy(manifest?.governance, manifest?.policy);
+    if (governance.delegation_only && workerName === 'leader-fixed') {
         throw new Error('delegation_only_violation');
     }
-    if (manifest?.policy?.plan_approval_required && task.requires_code_change === true) {
+    if (governance.plan_approval_required && task.requires_code_change === true) {
         const approved = await isTaskApprovedForExecution(sanitized, taskId, cwd);
         if (!approved) {
             throw new Error('plan_approval_required');
@@ -1073,6 +1181,8 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
         restoreTeamModelInstructionsFile(sanitized);
         return;
     }
+    const manifest = await readTeamManifestV2(sanitized, cwd);
+    const governance = resolveGovernancePolicy(manifest?.governance, manifest?.policy);
     if (!force) {
         const allTasks = await listTasks(sanitized, cwd);
         const gate = {
@@ -1084,11 +1194,12 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
             failed: allTasks.filter((t) => t.status === 'failed').length,
             allowed: false,
         };
-        gate.allowed = gate.pending === 0 && gate.blocked === 0 && gate.in_progress === 0 && gate.failed === 0;
+        gate.allowed = governance.cleanup_requires_all_workers_inactive !== true
+            || (gate.pending === 0 && gate.blocked === 0 && gate.in_progress === 0 && gate.failed === 0);
         await appendTeamEvent(sanitized, {
             type: 'shutdown_gate',
             worker: 'leader-fixed',
-            reason: `allowed=${gate.allowed} total=${gate.total} pending=${gate.pending} blocked=${gate.blocked} in_progress=${gate.in_progress} completed=${gate.completed} failed=${gate.failed}${ralph ? ' policy=ralph' : ''}`,
+            reason: `allowed=${gate.allowed} total=${gate.total} pending=${gate.pending} blocked=${gate.blocked} in_progress=${gate.in_progress} completed=${gate.completed} failed=${gate.failed} cleanup_requires_all_workers_inactive=${governance.cleanup_requires_all_workers_inactive}${ralph ? ' policy=ralph' : ''}`,
         }, cwd).catch(() => { });
         if (!gate.allowed) {
             const hasActiveWork = gate.pending > 0 || gate.blocked > 0 || gate.in_progress > 0;
@@ -1114,7 +1225,6 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
         }, cwd).catch(() => { });
     }
     const sessionName = config.tmux_session;
-    const manifest = await readTeamManifestV2(sanitized, cwd);
     const dispatchPolicy = resolveDispatchPolicy(manifest?.policy, config.worker_launch_mode);
     const shutdownRequestTimes = new Map();
     // 1. Send shutdown inbox to each worker
@@ -1209,6 +1319,9 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
             leaderPaneId,
             hudPaneId,
         });
+        if (hudPaneId) {
+            await killWorkerByPaneIdAsync(hudPaneId, leaderPaneId ?? undefined);
+        }
         // 4. Destroy tmux session
         if (!sessionName.includes(':')) {
             try {
@@ -1250,6 +1363,7 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
             worker: 'leader-fixed',
             reason: `total=${finalTasks.length} completed=${completed} failed=${failed} pending=${pending} force=${force}`,
         }, cwd).catch(() => { });
+        await syncLinkedRalphModeStateOnTerminalPhase(sanitized, 'cancelled', cwd);
     }
     const cleanupErrors = [];
     const provisionedWorktrees = collectProvisionedShutdownWorktrees(config);
@@ -1331,7 +1445,8 @@ async function findActiveTeams(cwd, leaderSessionId) {
         const teamName = e.name;
         const cfg = await readTeamConfig(teamName, cwd);
         const manifest = await readTeamManifestV2(teamName, cwd);
-        if (manifest?.policy?.one_team_per_leader_session === false)
+        const governance = resolveGovernancePolicy(manifest?.governance, manifest?.policy);
+        if (governance.one_team_per_leader_session === false)
             continue;
         const workerLaunchMode = cfg?.worker_launch_mode
             ?? manifest?.policy?.worker_launch_mode
@@ -1807,7 +1922,7 @@ export async function sendWorkerMessage(teamName, fromWorker, toWorker, body, cw
     const manifest = await readTeamManifestV2(sanitized, cwd);
     const dispatchPolicy = resolveDispatchPolicy(manifest?.policy, config.worker_launch_mode);
     if (toWorker === 'leader-fixed') {
-        const leaderTriggerMessage = `Team ${sanitized}: new worker message for leader from ${fromWorker}`;
+        const leaderTriggerMessage = generateLeaderMailboxTriggerMessage(sanitized, fromWorker);
         const leaderTransportPreference = dispatchPolicy.dispatch_mode === 'transport_direct'
             ? 'transport_direct'
             : 'hook_preferred_with_fallback';