oh-my-codex 0.13.0 → 0.13.2

package/src/scripts/notify-fallback-watcher.ts

@@ -34,6 +34,8 @@ import {
 } from '../subagents/tracker.js';
 import { listNotifyCanonicalActiveTeams } from './notify-hook/active-team.js';
 import { sameFilePath } from '../utils/paths.js';
+import { validateSessionId } from '../mcp/state-paths.js';
+import { TEAM_NAME_SAFE_PATTERN } from '../team/contracts.js';
 
 function argValue(name: string, fallback = ''): string {
   const idx = process.argv.indexOf(name);
@@ -50,6 +52,21 @@ function safeString(v: unknown): string {
   return typeof v === 'string' ? v : '';
 }
 
+function normalizeValidSessionId(value: unknown): string {
+  const trimmed = safeString(value).trim();
+  if (!trimmed) return '';
+  try {
+    return validateSessionId(trimmed) ?? '';
+  } catch {
+    return '';
+  }
+}
+
+function normalizeValidTeamName(value: unknown): string {
+  const trimmed = safeString(value).trim();
+  return TEAM_NAME_SAFE_PATTERN.test(trimmed) ? trimmed : '';
+}
+
 function parsePositivePid(value: unknown): number | null {
   const pid = Math.trunc(asNumber(value as string | number | undefined, 0));
   return pid > 0 ? pid : null;
@@ -523,8 +540,8 @@ async function resolveActiveModeState(mode: string): Promise<ActiveModeResult> {
   const session = await readSessionState(cwd);
   if (session?.session_id) {
     if (isSessionStateAuthoritativeForCwd(session, cwd)) {
-      currentSessionId = safeString(session.session_id).trim();
-      currentSessionIsLive = !isSessionStale(session);
+      currentSessionId = normalizeValidSessionId(session.session_id);
+      currentSessionIsLive = currentSessionId !== '' && !isSessionStale(session);
     }
     if (currentSessionId && currentSessionIsLive) {
       candidateDirs.push(join(stateDir, 'sessions', currentSessionId));
@@ -590,8 +607,8 @@ async function resolveActiveTeamState(): Promise<ActiveTeamResult> {
   let currentSessionIsLive = false;
   const session = await readSessionState(cwd);
   if (session?.session_id) {
-    currentSessionId = safeString(session.session_id).trim();
-    currentSessionIsLive = !isSessionStale(session);
+    currentSessionId = normalizeValidSessionId(session.session_id);
+    currentSessionIsLive = currentSessionId !== '' && !isSessionStale(session);
     if (currentSessionId && currentSessionIsLive) {
       candidateDirs.push(join(stateDir, 'sessions', currentSessionId));
     }
@@ -610,7 +627,7 @@ async function resolveActiveTeamState(): Promise<ActiveTeamResult> {
       .catch(() => null);
     if (!parsed || typeof parsed !== 'object' || parsed.active !== true) continue;
 
-    const teamName = safeString(parsed.team_name).trim();
+    const teamName = normalizeValidTeamName(parsed.team_name);
     if (!teamName) continue;
 
     const teamConfigDir = join(stateDir, 'team', teamName);
@@ -653,7 +670,9 @@ async function resolveActiveTeamState(): Promise<ActiveTeamResult> {
 
   const canonicalFallbackTeams = await listNotifyCanonicalActiveTeams(cwd, currentSessionId).catch(() => []);
   for (const team of canonicalFallbackTeams) {
-    const teamConfigDir = join(stateDir, 'team', team.teamName);
+    const teamName = normalizeValidTeamName(team.teamName);
+    if (!teamName) continue;
+    const teamConfigDir = join(stateDir, 'team', teamName);
     const manifestPath = join(teamConfigDir, 'manifest.v2.json');
     const configPath = join(teamConfigDir, 'config.json');
     const teamConfigPath = existsSync(manifestPath) ? manifestPath : configPath;
@@ -678,10 +697,10 @@ async function resolveActiveTeamState(): Promise<ActiveTeamResult> {
       path: team.path,
       state: {
         active: true,
-        team_name: team.teamName,
+        team_name: teamName,
         current_phase: team.phase,
       },
-      team_name: team.teamName,
+      team_name: teamName,
       pane_count: paneStatus.paneCount,
     };
   }
@@ -755,10 +774,13 @@ async function readRalphSteerLock(path: string): Promise<RalphSteerLockRecord |
   }
 }
 
+const RALPH_STEER_LOCK_MAX_RETRIES = 5;
+
 async function withRalphSteerLock<T>(task: () => Promise<T>): Promise<T | null> {
   await mkdir(dirname(ralphSteerLockPath), { recursive: true }).catch(() => {});
 
-  while (true) {
+  let acquired = false;
+  for (let attempt = 0; attempt < RALPH_STEER_LOCK_MAX_RETRIES; attempt++) {
     let handle;
     try {
       handle = await open(ralphSteerLockPath, 'wx');
@@ -767,6 +789,7 @@ async function withRalphSteerLock<T>(task: () => Promise<T>): Promise<T | null>
         acquired_at: new Date().toISOString(),
       };
       await handle.writeFile(JSON.stringify(payload, null, 2));
+      acquired = true;
       break;
     } catch (error) {
       const code = error !== null && typeof error === 'object' ? (error as NodeJS.ErrnoException).code : '';
@@ -786,6 +809,11 @@ async function withRalphSteerLock<T>(task: () => Promise<T>): Promise<T | null>
     }
   }
 
+  if (!acquired) {
+    lastRalphContinueSteer.last_reason = 'global_lock_exhausted';
+    return null;
+  }
+
   try {
     return await task();
   } finally {
@@ -847,18 +875,18 @@ async function readRalphProgressGate(
   return { allow: true, reason: 'progress_stale', progress_at: progressAt, subagent_session_id: subagentSessionId };
 }
 
-function shouldSkipRalphContinue(now: number, candidateIso: string, startupIso: string): { skip: boolean; reason: string; anchorMs: number; anchorIso: string } {
+function shouldSkipRalphContinue(now: number, candidateIso: string): { skip: boolean; reason: string; anchorMs: number; anchorIso: string } {
   const sharedMs = parseIsoMillis(candidateIso);
   const localMs = parseIsoMillis(lastRalphContinueSteer.last_sent_at);
-  const startupAnchorIso = lastRalphContinueSteer.cooldown_anchor_at || startupIso;
+  const startupAnchorIso = lastRalphContinueSteer.cooldown_anchor_at;
   const startupAnchorMs = parseIsoMillis(startupAnchorIso);
-  const startupCooldown = sharedMs === null && localMs === null;
-  const anchorMs = sharedMs ?? localMs ?? startupAnchorMs ?? startedAt;
+  const startupCooldown = sharedMs === null && localMs === null && startupAnchorMs !== null;
+  const anchorMs = sharedMs ?? localMs ?? startupAnchorMs ?? 0;
   const anchorIso = sharedMs !== null
     ? candidateIso
     : (localMs !== null ? lastRalphContinueSteer.last_sent_at : startupAnchorIso);
   return {
-    skip: now - anchorMs < RALPH_CONTINUE_CADENCE_MS,
+    skip: anchorMs > 0 && now - anchorMs < RALPH_CONTINUE_CADENCE_MS,
     reason: startupCooldown ? 'startup_cooldown' : (sharedMs !== null ? 'global_cooldown' : 'cooldown'),
     anchorMs,
     anchorIso,
@@ -1004,7 +1032,6 @@ async function writePidFileRecord(): Promise<void> {
 async function runRalphContinueSteerTick(): Promise<void> {
   const now = Date.now();
   const nowIso = new Date(now).toISOString();
-  const startupIso = new Date(startedAt).toISOString();
   const activeRalph = await resolveActiveRalphState();
   const activePaneId = safeString(activeRalph.state?.tmux_pane_id).trim();
   lastRalphContinueSteer = {
@@ -1030,13 +1057,9 @@ async function runRalphContinueSteerTick(): Promise<void> {
     return;
   }
 
-  if (parseIsoMillis(lastRalphContinueSteer.last_sent_at) === null && parseIsoMillis(lastRalphContinueSteer.cooldown_anchor_at) === null) {
-    lastRalphContinueSteer.cooldown_anchor_at = startupIso;
-  }
-
   const sharedBeforeLock = await readRalphSteerTimestamp();
   lastRalphContinueSteer.shared_last_sent_at = sharedBeforeLock;
-  const initialCooldown = shouldSkipRalphContinue(now, sharedBeforeLock, startupIso);
+  const initialCooldown = shouldSkipRalphContinue(now, sharedBeforeLock);
   if (initialCooldown.skip) {
     lastRalphContinueSteer.last_reason = initialCooldown.reason;
     if (!sharedBeforeLock && initialCooldown.reason === 'startup_cooldown') {
@@ -1048,7 +1071,7 @@ async function runRalphContinueSteerTick(): Promise<void> {
   const outcome = await withRalphSteerLock(async () => {
     const sharedLastSentAt = await readRalphSteerTimestamp();
     lastRalphContinueSteer.shared_last_sent_at = sharedLastSentAt;
-    const cooldown = shouldSkipRalphContinue(Date.now(), sharedLastSentAt, startupIso);
+    const cooldown = shouldSkipRalphContinue(Date.now(), sharedLastSentAt);
     if (cooldown.skip) {
       lastRalphContinueSteer.last_reason = cooldown.reason;
       if (!sharedLastSentAt && cooldown.reason === 'startup_cooldown') {

package/src/scripts/notify-hook/active-team.ts

@@ -3,6 +3,7 @@ import { readdir } from 'fs/promises';
 import { join } from 'path';
 import { readTeamManifestV2, readTeamPhase } from '../../team/state.js';
 import { resolveCanonicalTeamStateRoot } from '../../team/state-root.js';
+import { TEAM_NAME_SAFE_PATTERN } from '../../team/contracts.js';
 import { isTerminalPhase, safeString } from './utils.js';
 
 export interface NotifyCanonicalActiveTeam {
@@ -28,7 +29,7 @@ export async function listNotifyCanonicalActiveTeams(
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
     const teamName = entry.name.trim();
-    if (!teamName) continue;
+    if (!teamName || !TEAM_NAME_SAFE_PATTERN.test(teamName)) continue;
 
     const [manifest, phaseState] = await Promise.all([
       readTeamManifestV2(teamName, cwd),

package/src/scripts/notify-hook/ralph-session-resume.ts

@@ -128,7 +128,22 @@ function isActiveRalphCandidate(state: Record<string, unknown> | null): state is
   return state.active === true && !isTerminalRalphPhase(state.current_phase);
 }
 
-async function readCurrentOmxSessionId(stateDir: string): Promise<string> {
+function readSessionIdFromEnvironment(env: NodeJS.ProcessEnv = process.env): string {
+  const candidates = [env.OMX_SESSION_ID, env.CODEX_SESSION_ID, env.SESSION_ID];
+  for (const candidate of candidates) {
+    const sessionId = safeString(candidate).trim();
+    if (SESSION_ID_PATTERN.test(sessionId)) return sessionId;
+  }
+  return '';
+}
+
+async function readCurrentOmxSessionId(stateDir: string, env: NodeJS.ProcessEnv = process.env): Promise<string> {
+  const envSessionId = readSessionIdFromEnvironment(env);
+  if (envSessionId) {
+    const envScopedDir = join(stateDir, 'sessions', envSessionId);
+    if (existsSync(envScopedDir)) return envSessionId;
+  }
+
   const session = await readUsableSessionState(resolve(stateDir, '..', '..'));
   const sessionId = safeString(session?.session_id).trim();
   return SESSION_ID_PATTERN.test(sessionId) ? sessionId : '';
@@ -194,7 +209,7 @@ export async function reconcileRalphSessionResume({
   const lockedResult = await withRalphResumeLock(stateDir, async () => {
     await hooks?.afterLockAcquired?.();
 
-    const currentOmxSessionId = await readCurrentOmxSessionId(stateDir);
+    const currentOmxSessionId = await readCurrentOmxSessionId(stateDir, env);
     if (!currentOmxSessionId) {
       return {
         currentOmxSessionId: '',

package/src/scripts/notify-hook/state-io.ts

@@ -25,7 +25,23 @@ function isSafeStateFileName(fileName: string): boolean {
     && !fileName.includes('\\');
 }
 
+function readSessionIdFromEnvironment(env: NodeJS.ProcessEnv = process.env): string | undefined {
+  const candidates = [env.OMX_SESSION_ID, env.CODEX_SESSION_ID, env.SESSION_ID];
+  for (const candidate of candidates) {
+    const sessionId = safeString(candidate).trim();
+    if (!SESSION_ID_PATTERN.test(sessionId)) continue;
+    return sessionId;
+  }
+  return undefined;
+}
+
 export async function readCurrentSessionId(baseStateDir: string): Promise<string | undefined> {
+  const envSessionId = readSessionIdFromEnvironment();
+  if (envSessionId) {
+    const envScopedDir = join(baseStateDir, 'sessions', envSessionId);
+    if (existsSync(envScopedDir)) return envSessionId;
+  }
+
   const cwd = resolve(baseStateDir, '..', '..');
   const session = await readUsableSessionState(cwd);
   const sessionId = safeString(session?.session_id);

package/src/scripts/notify-hook/team-leader-nudge.ts

@@ -23,6 +23,8 @@ import { isLeaderRuntimeStale } from '../../team/leader-activity.js';
 import { appendTeamDeliveryLog } from '../../team/delivery-log.js';
 import { writeTeamLeaderAttention } from '../../team/state.js';
 import { readLatestTeamProgressEvidenceMs } from '../../team/progress-evidence.js';
+import { validateSessionId } from '../../mcp/state-paths.js';
+import { TEAM_NAME_SAFE_PATTERN } from '../../team/contracts.js';
 const LEADER_PANE_MISSING_NO_INJECTION_REASON = 'leader_pane_missing_no_injection';
 const LEADER_PANE_SHELL_NO_INJECTION_REASON = 'leader_pane_shell_no_injection';
 const LEADER_PANE_SAME_CLASSIFIED_STATE_SUPPRESSED_REASON = 'pane_already_shows_same_classified_state';
@@ -34,6 +36,21 @@ const ACK_LIKE_PATTERNS = [
   /^(?:on it|will do|i(?:'|')ll do it|working on it)[.!]*$/i,
 ];
 
+function normalizeValidSessionId(value) {
+  const trimmed = safeString(value).trim();
+  if (!trimmed) return '';
+  try {
+    return validateSessionId(trimmed) ?? '';
+  } catch {
+    return '';
+  }
+}
+
+function normalizeValidTeamName(value) {
+  const trimmed = safeString(value).trim();
+  return TEAM_NAME_SAFE_PATTERN.test(trimmed) ? trimmed : '';
+}
+
 export function resolveLeaderNudgeIntervalMs() {
   const raw = safeString(process.env.OMX_TEAM_LEADER_NUDGE_MS || '');
   const parsed = asNumber(raw);
@@ -251,8 +268,9 @@ async function resolveCurrentSessionId(stateDir) {
     || process.env.SESSION_ID
     || '',
   ).trim();
-  if (fromEnv) return fromEnv;
-  return safeString((await readUsableSessionState(resolve(stateDir, '..', '..')))?.session_id).trim();
+  const envSessionId = normalizeValidSessionId(fromEnv);
+  if (envSessionId) return envSessionId;
+  return normalizeValidSessionId((await readUsableSessionState(resolve(stateDir, '..', '..')))?.session_id);
 }
 
 async function readWorkerStatusSnapshot(stateDir, teamName, workerName) {
@@ -601,7 +619,7 @@ export async function maybeNudgeTeamLeader({
       if (!existsSync(teamStatePath)) continue;
       const parsed = JSON.parse(await readFile(teamStatePath, 'utf-8'));
       if (!parsed) continue;
-      const teamName = safeString(parsed.team_name || '').trim();
+      const teamName = normalizeValidTeamName(parsed.team_name || '');
       if (!teamName) continue;
 
       const phaseSnapshot = await readTeamPhaseSnapshot(stateDir, teamName, nowIso);
@@ -619,7 +637,9 @@ export async function maybeNudgeTeamLeader({
 
   const canonicalFallbackTeams = await listNotifyCanonicalActiveTeams(cwd, currentSessionId).catch(() => []);
   for (const team of canonicalFallbackTeams) {
-    candidateTeamNames.add(team.teamName);
+    const teamName = normalizeValidTeamName(team.teamName);
+    if (!teamName) continue;
+    candidateTeamNames.add(teamName);
   }
 
   // Use pre-computed staleness (captured before HUD state was updated this turn)

package/src/scripts/notify-hook.ts

@@ -586,13 +586,8 @@ async function main() {
         shouldSendSessionIdleHookEvent,
         recordSessionIdleHookEventSent,
       } = await import('../notifications/idle-cooldown.js');
-      const sessionJsonPath = join(stateDir, 'session.json');
       const idleFingerprint = buildIdleNotificationFingerprint(payload);
-      let notifySessionId = '';
-      try {
-        const sessionData = JSON.parse(await readFile(sessionJsonPath, 'utf-8'));
-        notifySessionId = safeString(sessionData && sessionData.session_id ? sessionData.session_id : '');
-      } catch { /* no session file */ }
+      const notifySessionId = getEffectiveSessionId();
 
       const shouldNotifyLifecycle = notifySessionId
         && shouldSendIdleNotification(stateDir, notifySessionId, idleFingerprint);

package/templates/AGENTS.md

@@ -218,7 +218,7 @@ Runtime availability gate:
 | "autopilot", "build me", "I want a" | `$autopilot` | Runtime-only: read `~/.codex/skills/autopilot/SKILL.md`, execute autonomous pipeline only inside OMX CLI/runtime |
 | "ultrawork", "ulw", "parallel" | `$ultrawork` | Runtime-only: read `~/.codex/skills/ultrawork/SKILL.md`, execute parallel agents only inside OMX CLI/runtime |
 | "ultraqa" | `$ultraqa` | Runtime-only: read `~/.codex/skills/ralph/SKILL.md`, run persistent completion and verification loop only inside OMX CLI/runtime (UltraQA compatibility alias) |
-| "analyze", "investigate" | `$analyze` | Read `~/.codex/prompts/debugger.md`, run root-cause analysis (analyze compatibility alias) |
+| "analyze", "investigate" | `$analyze` | Read `~/.codex/skills/analyze/SKILL.md`, run read-only deep analysis with ranked synthesis, explicit confidence, and concrete file references |
 | "plan this", "plan the", "let's plan" | `$plan` | Read `~/.codex/skills/plan/SKILL.md`, start planning workflow |
 | "interview", "deep interview", "gather requirements", "interview me", "don't assume", "ouroboros" | `$deep-interview` | Read `~/.codex/skills/deep-interview/SKILL.md`, run Ouroboros-inspired Socratic ambiguity-gated interview workflow |
 | "ralplan", "consensus plan" | `$ralplan` | Read `~/.codex/skills/ralplan/SKILL.md`, start consensus planning with RALPLAN-DR structured deliberation (short by default, `--deliberate` for high-risk) |

package/templates/catalog-manifest.json

@@ -41,8 +41,7 @@
     {
       "name": "ultraqa",
       "category": "execution",
-      "status": "merged",
-      "canonical": "ralph",
+      "status": "active",
       "core": false,
       "internalRequired": false
     },
@@ -79,8 +78,7 @@
     {
       "name": "analyze",
       "category": "shortcut",
-      "status": "alias",
-      "canonical": "debugger",
+      "status": "active",
       "core": false,
       "internalRequired": false
     },