@cloudcli-ai/cloudcli 1.37.0 → 1.37.1

package/server/modules/providers/list/codex/codex-models.provider.ts

@@ -7,7 +7,6 @@ import TOML from '@iarna/toml';
 import type { IProviderModels } from '@/shared/interfaces.js';
 import type {
   ProviderCurrentActiveModel,
-  ProviderModelOption,
   ProviderModelsDefinition,
 } from '@/shared/types.js';
 import {
@@ -16,11 +15,60 @@ import {
   readOptionalString,
 } from '@/shared/utils.js';
 
-export const CODEX_FALLBACK_MODELS: ProviderModelsDefinition = {
+/** Curated Codex catalog shipped as immutable CloudCLI defaults. */
+export const CODEX_PREDEFINED_MODELS: ProviderModelsDefinition = {
   OPTIONS: [
+    {
+      value: 'gpt-5.6-sol',
+      label: 'GPT-5.6 Sol',
+      description: 'Latest frontier agentic coding model.',
+      effort: {
+        default: 'low',
+        values: [
+          { value: 'low' },
+          { value: 'medium' },
+          { value: 'high' },
+          { value: 'xhigh' },
+          { value: 'max' },
+          { value: 'ultra' },
+        ],
+      },
+    },
+    {
+      value: 'gpt-5.6-terra',
+      label: 'GPT-5.6 Terra',
+      description: 'Balanced agentic coding model for everyday work.',
+      effort: {
+        default: 'medium',
+        values: [
+          { value: 'low' },
+          { value: 'medium' },
+          { value: 'high' },
+          { value: 'xhigh' },
+          { value: 'max' },
+          { value: 'ultra' },
+        ],
+      },
+    },
+    {
+      value: 'gpt-5.6-luna',
+      label: 'GPT-5.6 Luna',
+      description: 'Fast and affordable agentic coding model.',
+      effort: {
+        default: 'medium',
+        values: [
+          { value: 'low' },
+          { value: 'medium' },
+          { value: 'high' },
+          { value: 'xhigh' },
+          { value: 'max' },
+        ],
+      },
+    },
     {
       value: 'gpt-5.5',
-      label: 'gpt-5.5',
+      label: 'GPT-5.5',
+      description: 'Frontier model for complex coding, research, and real-world work.',
       effort: {
         default: 'medium',
         values: [{ value: 'low' }, { value: 'medium' }, { value: 'high' }, { value: 'xhigh' }],
@@ -28,7 +76,8 @@ export const CODEX_FALLBACK_MODELS: ProviderModelsDefinition = {
     },
     {
       value: 'gpt-5.4',
-      label: 'gpt-5.4',
+      label: 'GPT-5.4',
+      description: 'Strong model for everyday coding.',
       effort: {
         default: 'medium',
         values: [{ value: 'low' }, { value: 'medium' }, { value: 'high' }, { value: 'xhigh' }],
@@ -36,113 +85,23 @@ export const CODEX_FALLBACK_MODELS: ProviderModelsDefinition = {
     },
     {
       value: 'gpt-5.4-mini',
-      label: 'gpt-5.4-mini',
+      label: 'GPT-5.4 Mini',
+      description: 'Small, fast, and cost-efficient model for simpler coding tasks.',
       effort: {
         default: 'medium',
         values: [{ value: 'low' }, { value: 'medium' }, { value: 'high' }, { value: 'xhigh' }],
       },
     },
   ],
-  DEFAULT: 'gpt-5.4',
+  DEFAULT: 'gpt-5.6-sol',
 };
 
-type CodexCachedModel = {
-  slug?: string;
-  display_name?: string;
-  description?: string;
-  priority?: number;
-  visibility?: string;
-  supported_in_api?: boolean;
-  default_reasoning_level?: string;
-  supported_reasoning_levels?: Array<{
-    effort?: string;
-    description?: string;
-  }>;
-};
-
-const CODEX_MODELS_CACHE_PATH = path.join(os.homedir(), '.codex', 'models_cache.json');
 const CODEX_CONFIG_PATH = path.join(os.homedir(), '.codex', 'config.toml');
 
-const isCodexCachedModel = (value: unknown): value is CodexCachedModel => {
-  const record = readObjectRecord(value);
-  return Boolean(record && readOptionalString(record.slug));
-};
-
-const readCodexPriority = (value: unknown): number => (
-  typeof value === 'number' && Number.isFinite(value) ? value : Number.MAX_SAFE_INTEGER
-);
-
-const mapCodexModel = (model: CodexCachedModel): ProviderModelOption => {
-  const effortValues = Array.isArray(model.supported_reasoning_levels)
-    ? model.supported_reasoning_levels
-      .map((level) => {
-        const value = readOptionalString(level?.effort);
-        if (!value) {
-          return null;
-        }
-
-        return {
-          value,
-          description: readOptionalString(level?.description),
-        };
-      })
-      .filter((level): level is NonNullable<typeof level> => Boolean(level))
-    : [];
-
-  return {
-    value: model.slug as string,
-    label: readOptionalString(model.display_name) ?? (model.slug as string),
-    description: readOptionalString(model.description),
-    effort: effortValues.length > 0
-      ? {
-          default: readOptionalString(model.default_reasoning_level) ?? undefined,
-          values: effortValues,
-        }
-      : undefined,
-  };
-};
-
-const buildCodexModelsDefinition = (models: CodexCachedModel[]): ProviderModelsDefinition => {
-  const sortedModels = [...models]
-    .filter((model) => model.visibility === 'list' && model.supported_in_api !== false)
-    .sort((left, right) => readCodexPriority(left.priority) - readCodexPriority(right.priority));
-
-  const options: ProviderModelOption[] = [];
-  const seenValues = new Set<string>();
-
-  for (const model of sortedModels) {
-    const mappedModel = mapCodexModel(model);
-    if (seenValues.has(mappedModel.value)) {
-      continue;
-    }
-
-    seenValues.add(mappedModel.value);
-    options.push(mappedModel);
-  }
-
-  if (options.length === 0) {
-    return CODEX_FALLBACK_MODELS;
-  }
-
-  return {
-    OPTIONS: options,
-    DEFAULT: options[0]?.value ?? CODEX_FALLBACK_MODELS.DEFAULT,
-  };
-};
-
+/** Provider registry model adapter for Codex predefined models and active config. */
 export class CodexProviderModels implements IProviderModels {
   async getSupportedModels(): Promise<ProviderModelsDefinition> {
-    try {
-      const raw = await readFile(CODEX_MODELS_CACHE_PATH, 'utf8');
-      const parsed = readObjectRecord(JSON.parse(raw));
-      const models = Array.isArray(parsed?.models)
-        ? parsed.models.filter(isCodexCachedModel)
-        : [];
-
-      return buildCodexModelsDefinition(models);
-    } catch {
-      return CODEX_FALLBACK_MODELS;
-    }
+    return CODEX_PREDEFINED_MODELS;
   }
 
   async getCurrentActiveModel(): Promise<ProviderCurrentActiveModel> {

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

@@ -134,23 +134,7 @@ export class CodexSessionSynchronizer implements IProviderSessionSynchronizer {
       };
     }
 
-    // Sessions started by sending a message from cloudcli carry a distinct
-    // app-allocated session_id mapped to the provider id. For these we title the
-    // conversation from the first user message the user typed, instead of the
-    // generic "Untitled Codex Session" placeholder. Sessions discovered purely
-    // by indexing (session_id === provider_session_id) keep the existing
-    // thread_name/last-agent-message setup below.
-    const isAppCreated =
-      existingSession != null &&
-      existingSession.provider_session_id != null &&
-      existingSession.session_id !== existingSession.provider_session_id;
-
-    let sessionName = isAppCreated
-      ? await this.extractFirstUserMessageFromStart(filePath)
-      : undefined;
-    if (!sessionName) {
-      sessionName = nameMap.get(parsed.sessionId);
-    }
+    let sessionName = nameMap.get(parsed.sessionId);
     if (!sessionName) {
       sessionName = await this.extractLastAgentMessageFromEnd(filePath);
     }
@@ -180,49 +164,6 @@ export class CodexSessionSynchronizer implements IProviderSessionSynchronizer {
     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.
-   *
-   * Reads the `event_msg`/`user_message` payload rather than the raw
-   * `response_item` user turn so injected `<environment_context>` boilerplate is
-   * never mistaken for the user's prompt.
-   */
-  private async extractFirstUserMessageFromStart(filePath: string): Promise<string | undefined> {
-    try {
-      const content = await readFile(filePath, 'utf8');
-      const lines = content.split(/\r?\n/);
-
-      for (const rawLine of lines) {
-        const line = rawLine.trim();
-        if (!line) {
-          continue;
-        }
-
-        let parsed: unknown;
-        try {
-          parsed = JSON.parse(line);
-        } catch {
-          continue;
-        }
-
-        const data = parsed as Record<string, unknown>;
-        const eventType = typeof data.type === 'string' ? data.type : undefined;
-        const payload = data.payload as Record<string, unknown> | undefined;
-        const payloadType = typeof payload?.type === 'string' ? payload.type : undefined;
-        const message = typeof payload?.message === 'string' ? payload.message : undefined;
-
-        if (eventType === 'event_msg' && payloadType === 'user_message' && message?.trim()) {
-          return message;
-        }
-      }
-    } catch {
-      // Ignore missing/unreadable files so sync can continue.
-    }
-
-    return undefined;
-  }
-
   private async extractLastAgentMessageFromEnd(filePath: string): Promise<string | undefined> {
     try {
       const content = await readFile(filePath, 'utf8');

package/server/modules/providers/list/codex/codex-sessions.provider.ts

@@ -143,7 +143,7 @@ function decodeJavaScriptStringLiteral(literal: string): string {
 
 function extractNestedCodexCommands(source: string): string[] {
   const commands: string[] = [];
-  const commandPattern = /\bcommand\s*:\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`)/gs;
+  const commandPattern = /(?:["']command["']|\bcommand)\s*:\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`)/gs;
   for (const match of source.matchAll(commandPattern)) {
     commands.push(decodeJavaScriptStringLiteral(match[1]));
   }
@@ -173,7 +173,7 @@ function extractNestedCodexCommands(source: string): string[] {
  */
 function translateCodexExecInput(input: unknown): { toolName: string; toolInput: string } | null {
   const source = typeof input === 'string' ? input : String(input || '');
-  if (/\btools\.shell_command\s*\(/.test(source)) {
+  if (/\btools\.(?:shell_command|exec_command)\s*\(/.test(source)) {
     const commands = extractNestedCodexCommands(source);
     if (commands.length > 0) {
       return {
@@ -506,19 +506,19 @@ async function getCodexSessionMessages(
         if (entry.type === 'response_item' && entry.payload?.type === 'custom_tool_call') {
           let toolName = entry.payload.name || 'custom_tool';
           const input = entry.payload.input || '';
+          let toolInput = input;
 
           if (toolName === 'exec') {
             const translated = translateCodexExecInput(input);
-            if (!translated) {
-              ignoredToolCallIds.add(entry.payload.call_id);
-              continue;
+            if (translated) {
+              toolName = translated.toolName;
+              toolInput = translated.toolInput;
             }
-            toolName = translated.toolName;
             messages.push({
               type: 'tool_use',
               timestamp: entry.timestamp,
               toolName,
-              toolInput: translated.toolInput,
+              toolInput,
               toolCallId: entry.payload.call_id,
             });
             execToolCallIds.add(entry.payload.call_id);