@xuda.io/ai_module 1.1.5606 → 1.1.5607

package/index.mjs

@@ -111,6 +111,26 @@ const parse_codex_jsonl = function (stdout) {
   return events;
 };
 
+const get_number_value = function (...values) {
+  for (const value of values) {
+    if (typeof value === 'number' && Number.isFinite(value)) return value;
+    if (typeof value === 'string' && value.trim() && Number.isFinite(Number(value))) return Number(value);
+  }
+
+  return 0;
+};
+
+const normalize_codex_usage = function (usage) {
+  if (!usage || typeof usage !== 'object') {
+    return { input_tokens: 0, output_tokens: 0 };
+  }
+
+  const input_tokens = get_number_value(usage.input_tokens, usage.inputTokens, usage.prompt_tokens, usage.promptTokens, usage.total_input_tokens, usage.totalInputTokens, usage.total_token_usage?.input_tokens, usage.totalTokenUsage?.inputTokens);
+  const output_tokens = get_number_value(usage.output_tokens, usage.outputTokens, usage.completion_tokens, usage.completionTokens, usage.total_output_tokens, usage.totalOutputTokens, usage.total_token_usage?.output_tokens, usage.totalTokenUsage?.outputTokens);
+
+  return { input_tokens, output_tokens };
+};
+
 const create_codex_jsonl_stream_parser = function (onEvent) {
   let buffer = '';
 
@@ -137,11 +157,24 @@ const get_openai_codex_cli_command = function () {
   return _conf.openai_codex_command || 'codex';
 };
 
-const get_openai_codex_exec_args = function () {
+const get_openai_codex_model = function () {
+  return _conf.openai_codex_model || _conf.ai_models?.openai_codex_model?.model || null;
+};
+
+const get_openai_codex_usage_model = function (codex_model, requested_codex_model) {
+  if (requested_codex_model) return codex_model;
+  return _conf.ai_models?.openai_codex_model ? 'openai_codex_model' : codex_model || _conf.openai_codex_command || 'openai_codex_cli';
+};
+
+const get_openai_codex_exec_args = function (codex_model) {
   const args = ['exec', '--json'];
   const bypass_approvals_and_sandbox = typeof _conf.openai_codex_bypass_approvals_and_sandbox === 'undefined' ? true : _conf.openai_codex_bypass_approvals_and_sandbox;
   const sandbox = _conf.openai_codex_sandbox;
 
+  if (codex_model) {
+    args.push('--model', codex_model);
+  }
+
   if (bypass_approvals_and_sandbox) {
     args.push('--dangerously-bypass-approvals-and-sandbox');
   } else if (sandbox) {
@@ -1216,11 +1249,14 @@ export const execute_codex_request = async function (req_or_ip, prompt_arg, atta
     const prompt = is_req_call ? req_or_ip.prompt : prompt_arg;
     let attachments = is_req_call ? req_or_ip.attachments || [] : attachments_arg;
     const uid = is_req_call ? req_or_ip.uid : undefined;
+    const account_profile_info = is_req_call && uid ? req_or_ip.account_profile_info || (await get_active_account_profile_info(uid, req_or_ip.profile_id)) : undefined;
+    const requested_codex_model = is_req_call ? req_or_ip.codex_model || req_or_ip.model : null;
+    const codex_model = requested_codex_model || get_openai_codex_model();
     const conversation_id = is_req_call ? req_or_ip.conversation_id || req_or_ip.conversation_doc?._id : undefined;
     const job_id = is_req_call ? prompt_arg || req_or_ip.job_id : undefined;
     stream_enabled = is_req_call ? req_or_ip.stream !== false && req_or_ip.stream !== 'false' : false;
-    const prompt_conversation_item_id = is_req_call ? await _common.xuda_get_uuid('chat_conversation_item') : undefined;
-    const response_conversation_item_id = is_req_call ? await _common.xuda_get_uuid('chat_conversation_item') : undefined;
+    const prompt_conversation_item_id = is_req_call && uid ? await _common.xuda_get_uuid('chat_conversation_item') : undefined;
+    const response_conversation_item_id = is_req_call && uid ? await _common.xuda_get_uuid('chat_conversation_item') : undefined;
 
     let stream_delta_seq = 0;
     let stream_delta_text = '';
@@ -1286,6 +1322,7 @@ export const execute_codex_request = async function (req_or_ip, prompt_arg, atta
     }
 
     const reasoning = [];
+    let codex_usage = { input_tokens: 0, output_tokens: 0 };
     let streamed_agent_messages = new Set();
     const pushReasoning = function (type, text, metadata = {}) {
       if (!text) return;
@@ -1345,6 +1382,7 @@ export const execute_codex_request = async function (req_or_ip, prompt_arg, atta
           emitToDashboard('stream_phase', event.message, { update: true, error: true });
           break;
         case 'turn.completed':
+          codex_usage = normalize_codex_usage(event.usage);
           emitToDashboard('stream_phase', 'Codex request completed', { update: true, usage: event.usage });
           break;
         case 'turn.failed':
@@ -1401,7 +1439,7 @@ ${prompt}`;
     }
 
     const openai_codex_command = get_openai_codex_cli_command();
-    const codex_args = get_openai_codex_exec_args();
+    const codex_args = get_openai_codex_exec_args(codex_model);
     for (const image_path of image_paths) {
       codex_args.push('--image', image_path);
     }
@@ -1415,6 +1453,29 @@ ${prompt}`;
       onStdout: create_codex_jsonl_stream_parser(handleCodexEvent),
     });
     const events = parse_codex_jsonl(ret.stdout);
+    if (!codex_usage.input_tokens && !codex_usage.output_tokens && Array.isArray(events)) {
+      const completed_event_with_usage = events.findLast((event) => event?.type === 'turn.completed' && event.usage);
+      codex_usage = normalize_codex_usage(completed_event_with_usage?.usage);
+    }
+
+    if (uid && account_profile_info && (codex_usage.input_tokens || codex_usage.output_tokens)) {
+      account_msa.record_ai_usage(
+        uid,
+        codex_usage.input_tokens,
+        codex_usage.output_tokens,
+        'execute codex request',
+        prompt,
+        get_openai_codex_usage_model(codex_model, requested_codex_model),
+        {
+          conversation_id,
+          job_id,
+          remote_host: get_codex_remote_host(ip),
+          exit_code: ret.exit_code,
+          attachments_count: attachments.length,
+        },
+        account_profile_info,
+      );
+    }
 
     if (ret.exit_code !== 0) {
       emitToDashboard('stream_phase', 'Codex request failed', { update: true });
@@ -1432,6 +1493,7 @@ ${prompt}`;
           stderr: ret.stderr,
           events,
           reasoning,
+          usage: codex_usage,
         },
       };
     }
@@ -1448,6 +1510,7 @@ ${prompt}`;
         stderr: ret.stderr,
         events,
         reasoning,
+        usage: codex_usage,
       },
     };
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/ai_module",
-  "version": "1.1.5606",
+  "version": "1.1.5607",
   "description": "Xuda AI Module",
   "main": "index.mjs",
   "type": "module",