oh-my-codex 0.18.8 → 0.18.10

package/dist/team/runtime.js

@@ -3,7 +3,7 @@ import { existsSync, appendFileSync, mkdirSync } from 'fs';
 import { mkdir, readdir, readFile, writeFile } from 'fs/promises';
 import { performance } from 'perf_hooks';
 import { spawn, spawnSync } from 'child_process';
-import { sanitizeTeamName, isTmuxAvailable, hasCurrentTmuxClientContext, createTeamSession, buildWorkerProcessLaunchSpec, resolveTeamWorkerCli, resolveTeamWorkerCliPlan, resolveTeamWorkerLaunchMode, waitForWorkerReady, waitForWorkerReadyAsync, dismissTrustPromptIfPresent, evaluateStartupDirectTriggerSafety, sendToWorker, sendToWorkerStdin, isWorkerAlive, isWorkerPaneOpen, getWorkerPanePid, killWorkerByPaneIdAsync, restoreStandaloneHudPane, teardownWorkerPanes, unregisterResizeHook, destroyTeamSession, listPaneIds, listTeamSessions, resolveSharedSessionShutdownTopology, } from './tmux-session.js';
+import { sanitizeTeamName, isTmuxAvailable, hasCurrentTmuxClientContext, createTeamSession, buildWorkerProcessLaunchSpec, scrubTeamWorkerHudOwnershipEnv, resolveTeamWorkerCli, resolveTeamWorkerCliPlan, resolveTeamWorkerLaunchMode, waitForWorkerReady, waitForWorkerReadyAsync, dismissTrustPromptIfPresent, evaluateStartupDirectTriggerSafety, sendToWorker, sendToWorkerStdin, isWorkerAlive, isWorkerPaneOpen, getWorkerPanePid, killWorkerByPaneIdAsync, restoreStandaloneHudPane, teardownWorkerPanes, unregisterResizeHook, destroyTeamSession, listPaneIds, listTeamSessions, resolveSharedSessionShutdownTopology, } 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, teamUpdateTask as updateTask, 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, teamWriteWorkerStatus as writeWorkerStatus, writeAtomic, } from './team-ops.js';
 import { queueInboxInstruction, queueDirectMailboxMessage, queueBroadcastMailboxMessage, waitForDispatchReceipt, } from './mcp-comm.js';
 import { appendTeamDeliveryLogForCwd } from './delivery-log.js';
@@ -26,7 +26,7 @@ import { buildRebalanceDecisions } from './rebalance-policy.js';
 import { getStatePath } from '../mcp/state-paths.js';
 import { readModeState, updateModeState } from '../modes/base.js';
 import { buildApprovedTeamHandoffSection, buildApprovedTeamExecutionBinding, normalizeApprovedTeamExecutionBinding, readApprovedTeamExecutionHintOutcomeFromBinding, resolvePersistedApprovedTeamExecutionContinuityState, writePersistedApprovedTeamExecutionBinding, } from './approved-execution.js';
-import { readPersistedTeamUltragoalContext, renderLeaderOwnedUltragoalContextSection, resolveLeaderOwnedUltragoalContext, writePersistedTeamUltragoalContext, } from './ultragoal-context.js';
+import { readPersistedTeamUltragoalContext, renderLeaderOwnedUltragoalContextSection, resolveLeaderOwnedUltragoalContextOutcome, writePersistedTeamUltragoalContext, } from './ultragoal-context.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';
@@ -958,6 +958,62 @@ function resolveEffectiveTeamWorktreeMode(leaderCwd, requestedMode) {
     }
     return { enabled: false };
 }
+function isExplicitUltragoalLinkedTeam(task, approvedExecution, selectedApprovedExecutionHint) {
+    const approvedHaystack = [
+        JSON.stringify(approvedExecution ?? {}),
+        JSON.stringify(selectedApprovedExecutionHint ?? {}),
+    ].join('\n');
+    if (/(?:ultragoal|\.omx\/ultragoal)/i.test(approvedHaystack))
+        return true;
+    return /(?:\.omx\/ultragoal|ultragoal\s+(?:goal|plan|checkpoint)|goal\s+G\d{3}|\bG\d{3}[-\w]*\b)/i.test(task);
+}
+async function writeTeamPreflightContextPacket(params) {
+    const packetPath = join(params.teamStateRoot, 'team', params.teamName, 'preflight-context.json');
+    const packet = {
+        schema_version: 1,
+        created_at: new Date().toISOString(),
+        team_id: params.teamName,
+        display_name: params.displayName,
+        leader_cwd: params.leaderCwd,
+        task: params.task,
+        worker_count: params.workerCount,
+        worker_allocation: params.workerBootstrapPlans.map((plan) => ({
+            worker: plan.workerName,
+            role: plan.workerRole,
+            task_ids: plan.workerTasks.map((task) => task.id),
+            task_subjects: plan.workerTasks.map((task) => task.subject),
+        })),
+        approved_execution: params.approvedExecution
+            ? {
+                prd_path: params.approvedExecution.prd_path,
+                task: params.approvedExecution.task,
+            }
+            : null,
+        ultragoal: {
+            status: params.ultragoalOutcome.status,
+            active_goal_id: params.ultragoalOutcome.context?.activeGoalId ?? null,
+            active_goal_title: params.ultragoalOutcome.context?.activeGoalTitle ?? null,
+            warning: params.ultragoalOutcome.warning?.message ?? null,
+        },
+        verification_checklist: [
+            'collect worker evidence before leader checkpoint',
+            'run targeted verification for changed files',
+            'leader performs any Ultragoal checkpoint from fresh get_goal evidence',
+        ],
+        prohibitions: [
+            'workers_must_not_mutate_ultragoal',
+            'workers_must_not_checkpoint_ultragoal',
+        ],
+        resume_instructions: [
+            `After compaction, reload ${packetPath}`,
+            'Verify the active Ultragoal goal still matches this packet before checkpointing.',
+            'Resume Team monitoring with omx team status before dispatching follow-up work.',
+        ],
+    };
+    await mkdir(dirname(packetPath), { recursive: true });
+    await writeFile(packetPath, `${JSON.stringify(packet, null, 2)}\n`, 'utf-8');
+    return packetPath;
+}
 const MODEL_INSTRUCTIONS_FILE_ENV = 'OMX_MODEL_INSTRUCTIONS_FILE';
 const TEAM_STATE_ROOT_ENV = 'OMX_TEAM_STATE_ROOT';
 const TEAM_LEADER_CWD_ENV = 'OMX_TEAM_LEADER_CWD';
@@ -1547,7 +1603,7 @@ 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 };
+    const childEnv = scrubTeamWorkerHudOwnershipEnv({ ...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
@@ -1706,7 +1762,12 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
     const approvedExecution = selectedApprovedExecutionHint
         ? buildApprovedTeamExecutionBinding(selectedApprovedExecutionHint)
         : null;
-    const ultragoalContext = await resolveLeaderOwnedUltragoalContext(leaderCwd);
+    const explicitUltragoalLinkedTeam = isExplicitUltragoalLinkedTeam(task, requestedApprovedExecution ?? approvedExecution, selectedApprovedExecutionHint);
+    const ultragoalOutcome = await resolveLeaderOwnedUltragoalContextOutcome(leaderCwd);
+    if (explicitUltragoalLinkedTeam && ultragoalOutcome.status !== 'valid') {
+        throw new Error(`invalid_ultragoal_team_context:${ultragoalOutcome.warning?.message ?? ultragoalOutcome.status}`);
+    }
+    const ultragoalContext = ultragoalOutcome.status === 'valid' ? ultragoalOutcome.context : null;
     const approvedContextSection = joinContextSections(buildApprovedTeamHandoffSection(selectedApprovedExecutionHint), renderLeaderOwnedUltragoalContextSection(ultragoalContext));
     const activeWorktreeMode = effectiveWorktreeMode.enabled
         ? (effectiveWorktreeMode.detached ? 'detached' : 'named')
@@ -1993,6 +2054,17 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
             await writeWorkerInbox(sanitized, bootstrapPlan.workerName, bootstrapPlan.inbox, leaderCwd);
         };
         // 6. Create worker runtime (interactive tmux panes or prompt-mode child processes)
+        await writeTeamPreflightContextPacket({
+            teamName: sanitized,
+            displayName,
+            teamStateRoot,
+            leaderCwd,
+            task,
+            workerCount,
+            workerBootstrapPlans,
+            approvedExecution,
+            ultragoalOutcome,
+        });
         await cleanupTeamWorkerLaunchOrphanedMcpProcesses({
             cleanup: options.cleanupLaunchOrphanedMcpProcesses,
             writeWarning: options.writeCleanupWarning,
@@ -2730,11 +2802,8 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
             worker: 'leader-fixed',
             reason: 'force_bypass',
         }, cwd).catch(() => { });
-    }
-    if (force && config.worker_launch_mode === 'prompt') {
-        // Prompt-mode workers are raw CLI children, not team-runtime workers that
-        // participate in the shutdown-ack handshake. Waiting the full ack window
-        // before force-killing them only adds deterministic suite slowness.
+        // Explicit force means teardown now. Do not spend the graceful ack window
+        // waiting for interactive panes or prompt workers that will be killed below.
         skipWorkerAcks = true;
     }
     const sessionName = config.tmux_session;