@cloudcli-ai/cloudcli 1.36.2 → 1.37.0

package/server/{openai-codex.js → modules/providers/list/codex/codex-runtime.provider.js}

@@ -3,11 +3,11 @@
  * =============================
  *
  * This module provides integration with the OpenAI Codex SDK for non-interactive
- * chat sessions. It mirrors the pattern used in claude-sdk.js for consistency.
+ * chat sessions. It mirrors the Claude runtime adapter for consistency.
  *
  * ## Usage
  *
- * - queryCodex(command, options, ws) - Execute a prompt with streaming via WebSocket
+ * - codexRuntime.run(command, options, writer, context) - Execute a streamed prompt
  * - abortCodexSession(sessionId) - Cancel an active session
  * - isCodexSessionActive(sessionId) - Check if a session is running
  * - getActiveCodexSessions() - List all active sessions
@@ -15,12 +15,13 @@
 
 import { Codex } from '@openai/codex-sdk';
 
-import { buildCodexInputItems, normalizeImageDescriptors } from './shared/image-attachments.js';
-import { notifyRunFailed, notifyRunStopped } from './services/notification-orchestrator.js';
-import { sessionsService } from './modules/providers/services/sessions.service.js';
-import { providerAuthService } from './modules/providers/services/provider-auth.service.js';
-import { providerModelsService } from './modules/providers/services/provider-models.service.js';
-import { createCompleteMessage, createNormalizedMessage } from './shared/utils.js';
+import {
+  appendFilesInputTag,
+  buildCodexInputItems,
+  normalizeImageDescriptors
+} from '@/shared/image-attachments.js';
+import { notifyRunFailed, notifyRunStopped } from '@/modules/notifications/index.js';
+import { createCompleteMessage, createNormalizedMessage } from '@/shared/utils.js';
 
 const activeCodexSessions = new Map();
 
@@ -222,7 +223,7 @@ function mapPermissionModeToCodexOptions(permissionMode) {
  * @param {object} options - Options including cwd, sessionId, model, permissionMode
  * @param {WebSocket|object} ws - WebSocket connection or response writer
  */
-export async function queryCodex(command, options = {}, ws) {
+export async function queryCodex(command, options = {}, ws, context) {
   const {
     sessionId,
     sessionSummary,
@@ -231,18 +232,19 @@ export async function queryCodex(command, options = {}, ws) {
     model,
     effort,
     images,
+    files,
     permissionMode = 'default'
   } = options;
 
-  const resolvedModel = await providerModelsService.resolveResumeModel(
-    'codex',
-    sessionId,
-    model,
-  );
+  // Callers pass the stable app session id; the SDK resumes threads with the
+  // provider-native id recorded on the session row.
+  const providerSessionId = context.resolveProviderSessionId(sessionId);
+
+  const resolvedModel = await context.resolveResumeModel(sessionId, model);
 
   const workingDirectory = cwd || projectPath || process.cwd();
   const { sandboxMode, approvalPolicy } = mapPermissionModeToCodexOptions(permissionMode);
-  const catalog = (await providerModelsService.getProviderModels('codex')).models;
+  const catalog = await context.getProviderModels();
   const selectedModel = catalog.OPTIONS.find((option) => option.value === resolvedModel) || null;
   const allowedEfforts = selectedModel?.effort?.values?.map((value) => value.value) || [];
   const resolvedEffort = typeof effort === 'string' && effort !== 'default' && allowedEfforts.includes(effort)
@@ -251,10 +253,15 @@ export async function queryCodex(command, options = {}, ws) {
 
   let codex;
   let thread;
-  let capturedSessionId = sessionId;
+  // Provider-native thread id (starts as the resume id, or is captured from
+  // the stream for brand-new sessions).
+  let capturedSessionId = providerSessionId;
   let sessionCreatedSent = false;
   let terminalFailure = null;
   const abortController = new AbortController();
+  // Session-map key: the app session id when the caller supplied one, else
+  // the provider-native thread id once captured (legacy/direct API callers).
+  const sessionKey = () => sessionId || capturedSessionId || null;
 
   try {
     codex = new Codex();
@@ -268,8 +275,8 @@ export async function queryCodex(command, options = {}, ws) {
       modelReasoningEffort: resolvedEffort,
     };
 
-    if (sessionId) {
-      thread = codex.resumeThread(sessionId, threadOptions);
+    if (providerSessionId) {
+      thread = codex.resumeThread(providerSessionId, threadOptions);
     } else {
       thread = codex.startThread(threadOptions);
     }
@@ -287,15 +294,16 @@ export async function queryCodex(command, options = {}, ws) {
       });
     };
 
-    if (capturedSessionId) {
-      registerSession(capturedSessionId);
+    if (sessionKey()) {
+      registerSession(sessionKey());
     }
 
     // Execute with streaming. Turns with image attachments send structured
     // input items so Codex reads the images from their local asset paths.
+    const promptWithFiles = appendFilesInputTag(command, files);
     const turnInput = normalizeImageDescriptors(images).length > 0
-      ? buildCodexInputItems(command, images, workingDirectory)
-      : command;
+      ? buildCodexInputItems(promptWithFiles, images, workingDirectory)
+      : promptWithFiles;
     const streamedTurn = await thread.runStreamed(turnInput, {
       signal: abortController.signal
     });
@@ -306,13 +314,13 @@ export async function queryCodex(command, options = {}, ws) {
         const discoveredSessionId = event.thread_id || event.id || null;
         if (discoveredSessionId && !capturedSessionId) {
           capturedSessionId = discoveredSessionId;
-          registerSession(capturedSessionId);
+          registerSession(sessionKey());
 
           if (ws.setSessionId && typeof ws.setSessionId === 'function') {
             ws.setSessionId(capturedSessionId);
           }
 
-          if (!sessionId && !sessionCreatedSent) {
+          if (!providerSessionId && !sessionCreatedSent) {
             sessionCreatedSent = true;
             sendMessage(ws, createNormalizedMessage({ kind: 'session_created', newSessionId: capturedSessionId, sessionId: capturedSessionId, provider: 'codex' }));
           }
@@ -323,8 +331,8 @@ export async function queryCodex(command, options = {}, ws) {
       if (abortController.signal.aborted) {
         break;
       }
-      if (capturedSessionId) {
-        const session = activeCodexSessions.get(capturedSessionId);
+      if (sessionKey()) {
+        const session = activeCodexSessions.get(sessionKey());
         if (session?.status === 'aborted') {
           break;
         }
@@ -337,17 +345,18 @@ export async function queryCodex(command, options = {}, ws) {
       const transformed = transformCodexEvent(event);
 
       // Normalize the transformed event into NormalizedMessage(s) via adapter
-      const normalizedMsgs = sessionsService.normalizeMessage('codex', transformed, capturedSessionId || sessionId || null);
+      const normalizedMsgs = context.normalizeMessage(transformed, capturedSessionId || sessionId || null);
       for (const msg of normalizedMsgs) {
         sendMessage(ws, msg);
       }
 
       if (event.type === 'turn.failed' && !terminalFailure) {
         terminalFailure = event.error || new Error('Turn failed');
+        // Notifications are app-facing, so they carry the app session id.
         notifyRunFailed({
           userId: ws?.userId || null,
           provider: 'codex',
-          sessionId: capturedSessionId || sessionId || null,
+          sessionId: sessionId || capturedSessionId || null,
           sessionName: sessionSummary,
           error: terminalFailure
         });
@@ -364,7 +373,7 @@ export async function queryCodex(command, options = {}, ws) {
 
     // Send the terminal completion event — skipped for aborted runs, whose
     // terminal `complete` (aborted: true) was already sent by abort-session.
-    const runSession = capturedSessionId ? activeCodexSessions.get(capturedSessionId) : null;
+    const runSession = sessionKey() ? activeCodexSessions.get(sessionKey()) : null;
     const runAborted = runSession?.status === 'aborted' || abortController.signal.aborted;
     if (!runAborted) {
       sendMessage(ws, createCompleteMessage({
@@ -377,7 +386,7 @@ export async function queryCodex(command, options = {}, ws) {
         notifyRunStopped({
           userId: ws?.userId || null,
           provider: 'codex',
-          sessionId: capturedSessionId || sessionId || null,
+          sessionId: sessionId || capturedSessionId || null,
           sessionName: sessionSummary,
           stopReason: 'completed'
         });
@@ -385,7 +394,7 @@ export async function queryCodex(command, options = {}, ws) {
     }
 
   } catch (error) {
-    const session = capturedSessionId ? activeCodexSessions.get(capturedSessionId) : null;
+    const session = sessionKey() ? activeCodexSessions.get(sessionKey()) : null;
     const wasAborted =
       session?.status === 'aborted' ||
       error?.name === 'AbortError' ||
@@ -395,7 +404,7 @@ export async function queryCodex(command, options = {}, ws) {
       console.error('[Codex] Error:', error);
 
       // Check if Codex SDK is available for a clearer error message
-      const installed = await providerAuthService.isProviderInstalled('codex');
+      const installed = await context.isProviderInstalled();
       const errorContent = !installed
         ? 'Codex CLI is not configured. Please set up authentication first.'
         : error.message;
@@ -410,7 +419,7 @@ export async function queryCodex(command, options = {}, ws) {
         notifyRunFailed({
           userId: ws?.userId || null,
           provider: 'codex',
-          sessionId: capturedSessionId || sessionId || null,
+          sessionId: sessionId || capturedSessionId || null,
           sessionName: sessionSummary,
           error
         });
@@ -419,8 +428,8 @@ export async function queryCodex(command, options = {}, ws) {
 
   } finally {
     // Update session status
-    if (capturedSessionId) {
-      const session = activeCodexSessions.get(capturedSessionId);
+    if (sessionKey()) {
+      const session = activeCodexSessions.get(sessionKey());
       if (session) {
         session.status = session.status === 'aborted' ? 'aborted' : 'completed';
       }
@@ -480,6 +489,11 @@ export function getActiveCodexSessions() {
   return sessions;
 }
 
+export const codexRuntime = {
+  run: queryCodex,
+  abort: abortCodexSession,
+};
+
 /**
  * Helper to send message via WebSocket or writer
  * @param {WebSocket|object} ws - WebSocket or response writer
@@ -500,7 +514,7 @@ function sendMessage(ws, data) {
 }
 
 // Clean up old completed sessions periodically
-setInterval(() => {
+const completedSessionCleanupTimer = setInterval(() => {
   const now = Date.now();
   const maxAge = 30 * 60 * 1000; // 30 minutes
 
@@ -513,3 +527,7 @@ setInterval(() => {
     }
   }
 }, 5 * 60 * 1000); // Every 5 minutes
+
+// Runtime cleanup should not keep focused tests or one-off scripts alive after
+// their provider work has completed.
+completedSessionCleanupTimer.unref?.();

package/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts

@@ -114,10 +114,11 @@ export class CodexSessionSynchronizer implements IProviderSessionSynchronizer {
       return {
         sessionId,
         projectPath,
+        isSubagent: payload ? this.isSubagentSessionMeta(payload) : false,
       };
     });
 
-    if (!parsed) {
+    if (!parsed || parsed.isSubagent) {
       return null;
     }
 
@@ -160,6 +161,25 @@ export class CodexSessionSynchronizer implements IProviderSessionSynchronizer {
     };
   }
 
+  /**
+   * Returns true when a session_meta payload belongs to a Codex sub-agent
+   * thread (Codex >=0.144 collaboration spawn_agent, review, compact, etc.).
+   * Sub-agent rollouts live in the same sessions tree as user sessions, so
+   * they must be skipped here to stay out of the sidebar — the Codex
+   * equivalent of the Claude synchronizer's subagent transcript skip.
+   * Top-level sessions carry thread_source "user" and a string source
+   * ("exec"/"cli"); sub-agents carry thread_source "subagent" and an object
+   * source keyed by "subagent".
+   */
+  private isSubagentSessionMeta(payload: Record<string, unknown>): boolean {
+    if (payload.thread_source === 'subagent') {
+      return true;
+    }
+
+    const source = payload.source;
+    return typeof source === 'object' && source !== null && 'subagent' in source;
+  }
+
   /**
    * Returns the first user message text in a Codex transcript, used to title
    * app-created sessions from the prompt the user sent from cloudcli.