oh-my-codex 0.18.13 → 0.18.15

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, 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 { sanitizeTeamName, isTmuxAvailable, hasCurrentTmuxClientContext, createTeamSession, buildWorkerProcessLaunchSpec, scrubTeamWorkerHudOwnershipEnv, resolveTeamWorkerCli, resolveTeamWorkerCliPlan, resolveTeamWorkerLaunchMode, waitForWorkerReady, waitForWorkerReadyAsync, dismissTrustPromptIfPresent, evaluateStartupDirectTriggerSafety, sendToWorker, sendToWorkerStdin, isWorkerAlive, isWorkerPaneOpen, getWorkerPanePid, killWorkerByPaneIdAsync, paneHasOmxInstanceTag, readPaneTeamOwnerTagResult, 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';
@@ -16,7 +16,7 @@ import { loadRolePrompt } from './role-router.js';
 import { composeRoleInstructionsForRole } from '../agents/native-config.js';
 import { codexPromptsDir } 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 { resolveTeamWorkerLaunchArgs, resolveTeamWorkerLaunchDiagnostics, TEAM_LOW_COMPLEXITY_DEFAULT_MODEL, parseTeamWorkerLaunchArgs, resolveAgentDefaultModel, resolveAgentReasoningEffort, } from './model-contract.js';
 import { resolveCanonicalTeamStateRoot } from './state-root.js';
 import { buildInternalTeamName, resolveTeamIdentityScope, resolveTeamNameForCurrentContext } from './team-identity.js';
 import { inferPhaseTargetFromTaskCounts, reconcilePhaseStateForMonitor } from './phase-controller.js';
@@ -131,6 +131,7 @@ export function applyCreatedInteractiveSessionToConfig(config, createdSession, w
     config.tmux_session = createdSession.name;
     config.leader_pane_id = createdSession.leaderPaneId;
     config.hud_pane_id = createdSession.hudPaneId;
+    config.tmux_pane_owner_id = createdSession.teamPaneOwnerId;
     config.resize_hook_name = createdSession.resizeHookName;
     config.resize_hook_target = createdSession.resizeHookTarget;
     for (let i = 0; i < createdSession.workerPaneIds.length; i++) {
@@ -142,7 +143,7 @@ export function applyCreatedInteractiveSessionToConfig(config, createdSession, w
     }
 }
 function collectShutdownPaneIds(params) {
-    const { config, livePaneIds = [], restoredStandaloneHudPaneId = null, leaderPaneId = config.leader_pane_id, hudPaneId = config.hud_pane_id, } = params;
+    const { config, candidatePaneIds = [], includePersistedWorkerPaneIds = true, restoredStandaloneHudPaneId = null, leaderPaneId = config.leader_pane_id, hudPaneId = config.hud_pane_id, } = params;
     const excludedPaneIds = new Set([
         leaderPaneId,
         hudPaneId,
@@ -150,8 +151,8 @@ function collectShutdownPaneIds(params) {
     ].filter((paneId) => typeof paneId === 'string' && paneId.trim().startsWith('%')));
     const paneIds = new Set();
     for (const paneId of [
-        ...config.workers.map((worker) => worker.pane_id),
-        ...livePaneIds,
+        ...(includePersistedWorkerPaneIds ? config.workers.map((worker) => worker.pane_id) : []),
+        ...candidatePaneIds,
     ]) {
         if (typeof paneId !== 'string')
             continue;
@@ -164,6 +165,55 @@ function collectShutdownPaneIds(params) {
     }
     return [...paneIds];
 }
+function filterSharedSessionShutdownWorkerPaneIdsByOwner(paneIds, teamPaneOwnerId, legacyPersistedWorkerPaneIds = new Set(), onOwnerReadError) {
+    const expectedOwnerId = teamPaneOwnerId.trim();
+    if (!expectedOwnerId)
+        return [];
+    return paneIds.filter((paneId) => {
+        const actualOwnerId = readPaneTeamOwnerTagResult(paneId);
+        if (actualOwnerId.status === 'value')
+            return actualOwnerId.value === expectedOwnerId;
+        if (actualOwnerId.status === 'missing') {
+            // Legacy, already-running Team panes may not have @omx_team_pane_owner_id.
+            // Keep that compatibility path explicitly bounded to panes that are both
+            // live worker-command candidates and persisted in this team's state. This
+            // preserves old Team cleanup without letting arbitrary worker-looking
+            // panes become kill candidates merely because the owner tag is absent.
+            return legacyPersistedWorkerPaneIds.has(paneId);
+        }
+        onOwnerReadError?.(paneId, actualOwnerId.error);
+        return false;
+    });
+}
+function isSharedSessionHudPaneReclaimable(params) {
+    const { paneId, persistedHudPaneId, leaderOwnedHudPaneIds, teamPaneOwnerId, onOwnerReadError } = params;
+    const expectedOwnerId = teamPaneOwnerId.trim();
+    if (!expectedOwnerId)
+        return false;
+    const owner = readPaneTeamOwnerTagResult(paneId);
+    if (owner.status === 'value')
+        return owner.value === expectedOwnerId;
+    if (paneId !== persistedHudPaneId)
+        return false;
+    if (owner.status === 'missing')
+        return leaderOwnedHudPaneIds.includes(paneId);
+    onOwnerReadError?.(paneId, owner.error);
+    return false;
+}
+function isTrustedSharedSessionLeaderPaneForHudRestore(params) {
+    const { paneId, teamPaneOwnerId, legacyInstanceId } = params;
+    if (!paneId)
+        return false;
+    const expectedOwnerId = teamPaneOwnerId.trim();
+    if (expectedOwnerId) {
+        const owner = readPaneTeamOwnerTagResult(paneId);
+        if (owner.status === 'value')
+            return owner.value === expectedOwnerId;
+        if (owner.status === 'error')
+            return false;
+    }
+    return paneHasOmxInstanceTag(paneId, legacyInstanceId);
+}
 export function shouldPrekillInteractiveShutdownProcessTrees(sessionName) {
     // Shared-window tmux sessions can expose overlapping ancestry around the
     // invoking leader client. Rely on pane-targeted teardown there so shutdown
@@ -1623,24 +1673,24 @@ export function resolveWorkerLaunchArgsFromEnv(env, agentType, inheritedLeaderMo
         ? ['--model', inheritedLeaderModel.trim()]
         : [];
     const fallbackModel = resolveAgentDefaultModel(agentType, env.CODEX_HOME);
-    // Detect if an explicit reasoning override exists before resolving (for log source labelling)
-    const preEnvArgs = splitWorkerLaunchArgs(env.OMX_TEAM_WORKER_LAUNCH_ARGS);
-    const preAllArgs = [...preEnvArgs, ...inheritedArgs];
-    const hasExplicitReasoning = parseTeamWorkerLaunchArgs(preAllArgs).reasoningOverride !== null;
-    const resolved = resolveTeamWorkerLaunchArgs({
+    const diagnostics = resolveTeamWorkerLaunchDiagnostics({
         existingRaw: env.OMX_TEAM_WORKER_LAUNCH_ARGS,
         inheritedArgs,
         fallbackModel,
         preferredReasoning,
+        requestedAgentType: agentType,
     });
-    // Extract resolved model and thinking level from result args for startup log
-    const resolvedParsed = parseTeamWorkerLaunchArgs(resolved);
-    const resolvedModel = resolvedParsed.modelOverride ?? fallbackModel ?? 'default';
-    const reasoningMatch = resolvedParsed.reasoningOverride?.match(/model_reasoning_effort\s*=\s*"?(\w+)"?/);
-    const thinkingLevel = reasoningMatch?.[1] ?? 'none';
-    const source = hasExplicitReasoning
-        ? 'explicit'
-        : (preferredReasoning ? 'role-default' : 'none/default-none');
+    const resolved = diagnostics.actualLaunchArgs;
+    const resolvedModel = diagnostics.actualModel ?? diagnostics.requestedDefaultModel ?? 'default';
+    const thinkingLevel = diagnostics.actualReasoning ?? 'none';
+    const source = diagnostics.reasoningSource === 'none'
+        ? 'none/default-none'
+        : diagnostics.reasoningSource;
+    const modelSource = diagnostics.modelSource;
+    const inheritedParentModel = diagnostics.inheritedParentModel ? 'yes' : 'no';
+    const requestedRole = diagnostics.requestedAgentType ?? 'unknown';
+    const requestedDefaultModel = diagnostics.requestedDefaultModel ?? 'none';
+    const requestedDefaultReasoning = diagnostics.requestedDefaultReasoning ?? 'none';
     const effectiveWorkerCli = workerCliOverride ?? resolveEffectiveWorkerCliForStartupLog(resolved, env);
     if (effectiveWorkerCli === 'claude') {
         console.log('[omx:team] worker startup resolution: model=claude source=local-settings');
@@ -1649,7 +1699,7 @@ export function resolveWorkerLaunchArgsFromEnv(env, agentType, inheritedLeaderMo
         console.log('[omx:team] worker startup resolution: model=gemini source=local-settings');
     }
     else {
-        console.log(`[omx:team] worker startup resolution: model=${resolvedModel} thinking_level=${thinkingLevel} source=${source}`);
+        console.log(`[omx:team] worker startup resolution: requested_role=${requestedRole} requested_default_model=${requestedDefaultModel} requested_default_reasoning=${requestedDefaultReasoning} actual_model=${resolvedModel} thinking_level=${thinkingLevel} model_source=${modelSource} reasoning_source=${source} inherited_parent_model=${inheritedParentModel}`);
     }
     return resolved;
 }
@@ -2071,7 +2121,7 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
         });
         const startupTiming = createStartupTimingRecorder(sanitized, leaderCwd);
         if (workerLaunchMode === 'interactive') {
-            const createdSession = createTeamSession(sanitized, workerCount, leaderCwd, sharedWorkerLaunchArgs, workerStartups);
+            const createdSession = createTeamSession(sanitized, workerCount, leaderCwd, sharedWorkerLaunchArgs, workerStartups, { ownerSessionId: leaderSessionId, teamPaneOwnerId: config.tmux_pane_owner_id });
             sessionName = createdSession.name;
             sessionCreated = true;
             createdWorkerPaneIds.push(...createdSession.workerPaneIds);
@@ -2881,16 +2931,44 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
     const hudPaneId = config.hud_pane_id;
     if (config.worker_launch_mode === 'interactive') {
         const sharedSessionTopology = sessionName.includes(':')
-            ? resolveSharedSessionShutdownTopology(sessionName, leaderPaneId)
+            ? resolveSharedSessionShutdownTopology(sessionName, leaderPaneId, sanitized)
             : null;
-        const effectiveLeaderPaneId = sharedSessionTopology?.leaderPaneId ?? leaderPaneId;
-        const effectiveHudPaneId = sharedSessionTopology?.hudPaneIds.find((paneId) => paneId === hudPaneId)
-            ?? sharedSessionTopology?.hudPaneIds[0]
-            ?? hudPaneId;
-        const livePaneIds = sharedSessionTopology?.livePaneIds ?? listPaneIds(sessionName);
+        const effectiveLeaderPaneId = sharedSessionTopology ? sharedSessionTopology.leaderPaneId : leaderPaneId;
+        const tmuxPaneOwnerId = typeof config.tmux_pane_owner_id === 'string' ? config.tmux_pane_owner_id.trim() : '';
+        const legacyPersistedWorkerPaneIds = new Set(config.workers
+            .map((worker) => (typeof worker.pane_id === 'string' ? worker.pane_id.trim() : ''))
+            .filter((paneId) => paneId.startsWith('%')));
+        const ownerReadWarnings = new Set();
+        const warnOwnerReadError = (kind, paneId, error) => {
+            const key = `${kind}:${paneId}:${error}`;
+            if (ownerReadWarnings.has(key))
+                return;
+            ownerReadWarnings.add(key);
+            console.warn(`[team shutdown] ${sanitized}: skipped shared-session ${kind} ${paneId} because team owner tag could not be read: ${error}`);
+        };
+        const trustedHudRestoreLeaderPaneId = sharedSessionTopology
+            ? (isTrustedSharedSessionLeaderPaneForHudRestore({
+                paneId: effectiveLeaderPaneId,
+                teamPaneOwnerId: tmuxPaneOwnerId,
+                legacyInstanceId: leaderSessionId,
+            }) ? effectiveLeaderPaneId : null)
+            : effectiveLeaderPaneId;
+        const effectiveHudPaneId = sharedSessionTopology
+            ? (sharedSessionTopology.hudPaneIds.find((paneId) => isSharedSessionHudPaneReclaimable({
+                paneId,
+                persistedHudPaneId: hudPaneId,
+                leaderOwnedHudPaneIds: sharedSessionTopology.leaderOwnedHudPaneIds,
+                teamPaneOwnerId: tmuxPaneOwnerId,
+                onOwnerReadError: (hudPaneId, error) => warnOwnerReadError('HUD pane', hudPaneId, error),
+            })) ?? null)
+            : hudPaneId;
+        const shutdownCandidatePaneIds = sharedSessionTopology
+            ? filterSharedSessionShutdownWorkerPaneIdsByOwner(sharedSessionTopology.teamWorkerPaneIds, tmuxPaneOwnerId, legacyPersistedWorkerPaneIds, (paneId, error) => warnOwnerReadError('worker pane', paneId, error))
+            : listPaneIds(sessionName);
         let shutdownPaneIds = collectShutdownPaneIds({
             config,
-            livePaneIds,
+            candidatePaneIds: shutdownCandidatePaneIds,
+            includePersistedWorkerPaneIds: !sharedSessionTopology,
             leaderPaneId: effectiveLeaderPaneId,
             hudPaneId: effectiveHudPaneId,
         });
@@ -2924,15 +3002,23 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
         if (effectiveHudPaneId) {
             await killWorkerByPaneIdAsync(effectiveHudPaneId, effectiveLeaderPaneId ?? undefined);
             if (sessionName.includes(':')) {
-                restoredHudPaneId = restoreStandaloneHudPane(effectiveLeaderPaneId, cwd);
+                restoredHudPaneId = restoreStandaloneHudPane(trustedHudRestoreLeaderPaneId, cwd, {
+                    sessionId: leaderSessionId,
+                });
                 if (!restoredHudPaneId) {
-                    console.warn(`[team shutdown] ${sanitized}: failed to restore standalone HUD pane`);
+                    const reason = trustedHudRestoreLeaderPaneId
+                        ? 'failed to restore standalone HUD pane'
+                        : 'skipped standalone HUD restore because leader pane ownership could not be verified';
+                    console.warn(`[team shutdown] ${sanitized}: ${reason}`);
                 }
             }
         }
         shutdownPaneIds = collectShutdownPaneIds({
             config,
-            livePaneIds: listPaneIds(sessionName),
+            candidatePaneIds: sessionName.includes(':')
+                ? filterSharedSessionShutdownWorkerPaneIdsByOwner(resolveSharedSessionShutdownTopology(sessionName, effectiveLeaderPaneId, sanitized).teamWorkerPaneIds, tmuxPaneOwnerId, legacyPersistedWorkerPaneIds, (paneId, error) => warnOwnerReadError('worker pane', paneId, error))
+                : listPaneIds(sessionName),
+            includePersistedWorkerPaneIds: !sessionName.includes(':'),
             restoredStandaloneHudPaneId: restoredHudPaneId,
             leaderPaneId: effectiveLeaderPaneId,
             hudPaneId: effectiveHudPaneId,