@midscene/core 1.12.8 → 1.12.9-beta-20260917120835.0

package/dist/es/agent/utils.mjs

@@ -153,7 +153,7 @@ async function matchElementFromCache(context, cacheEntry, cachePrompt, cacheable
         return;
     }
 }
-const getMidsceneVersion = ()=>"1.12.8";
+const getMidsceneVersion = ()=>"1.12.9-beta-20260917120835.0";
 const parsePrompt = (prompt)=>{
     if ('string' == typeof prompt) return {
         textPrompt: prompt,

package/dist/es/ai-model/service-caller/call-ai.mjs

@@ -1,49 +1,160 @@
-import { assert } from "@midscene/shared/utils";
-import { assertJsonObject } from "../shared/json.mjs";
-import { callAI } from "./call.mjs";
-import { callAiAndParseWithRetry, withSemanticRetryFeedback } from "./semantic-retry.mjs";
-import { AIResponseParseError } from "./utils.mjs";
-function parseAIObjectResponse(response, modelRuntime, jsonParserSource = 'generic-object') {
-    const { adapter } = modelRuntime;
-    assert(response, 'empty response');
-    const jsonContent = adapter.jsonParser(response.content, {
-        source: jsonParserSource
+import { getDebug } from "@midscene/shared/logger";
+import { assert, uuid } from "@midscene/shared/utils";
+import { callCodex, prepareCodexCall } from "./codex/call-codex.mjs";
+import { isCodexAppServerProvider } from "./codex/codex-app-server.mjs";
+import { isModelCallRecordingEnabled, recordModelCallEvent } from "./model-call-recorder.mjs";
+import { callOpenAI } from "./openai/call-openai.mjs";
+import { prepareChatCompletion } from "./openai/chat-completion/chat-completion.mjs";
+import { buildRequestAbortSignal, resolveEffectiveTimeoutMs, runWithAbortSignal, waitForRetry } from "./request-timeout.mjs";
+import { appendAIRequestFailureSummary, buildUsageInfo, nextInternalCallId, normalizeRetryCount, toError } from "./utils.mjs";
+function _define_property(obj, key, value) {
+    if (key in obj) Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
     });
-    assertJsonObject(jsonContent);
-    return {
-        content: jsonContent,
-        contentString: response.content,
-        usage: response.usage,
-        reasoning_content: response.reasoning_content,
-        rawChoiceMessage: response.rawChoiceMessage
-    };
+    else obj[key] = value;
+    return obj;
 }
-async function callAIWithObjectResponse(messages, modelRuntime, options) {
+async function callAI(messages, modelRuntime, options) {
+    options?.abortSignal?.throwIfAborted();
+    const isStreaming = options?.stream === true;
+    if (isStreaming) assert('function' == typeof options?.onChunk, 'onChunk is required when stream is true');
+    const executionId = modelRuntime.executionId ?? `unscoped-${uuid()}`;
+    const internalCallId = nextInternalCallId();
     const { config: modelConfig } = modelRuntime;
-    return callAiAndParseWithRetry({
-        callAi: (retryAttempt, previousParseError)=>callAI(withSemanticRetryFeedback(messages, previousParseError), modelRuntime, {
-                abortSignal: options?.abortSignal,
-                expectedJsonObjectResponse: true,
-                semanticRetryAttempt: retryAttempt
-            }),
-        parseResponse: (response)=>parseAIObjectResponse(response, modelRuntime, options?.jsonParserSource),
-        toParseError: (error, response)=>{
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            return new AIResponseParseError(errorMessage, response.content, response.usage, response.rawChoiceMessage, response.reasoning_content);
-        },
-        parseRetryTimes: options?.retryTimes ?? modelConfig.retryCount,
-        parseRetryInterval: options?.retryInterval ?? modelConfig.retryInterval,
-        abortSignal: options?.abortSignal
+    const prepare = async ()=>isCodexAppServerProvider(modelConfig.openaiBaseURL) ? {
+            protocol: 'codex',
+            input: prepareCodexCall({
+                messages,
+                modelRuntime,
+                options
+            })
+        } : {
+            protocol: 'chat-completion',
+            input: await prepareChatCompletion({
+                messages,
+                modelRuntime,
+                options
+            })
+        };
+    const prepared = options?.abortSignal ? await runWithAbortSignal(options.abortSignal, prepare) : await prepare();
+    const result = await callModelWithRetry({
+        messages,
+        modelRuntime,
+        options,
+        executionId,
+        internalCallId,
+        prepared
     });
-}
-async function callAIWithStringResponse(msgs, modelRuntime, options) {
-    const { content, usage, rawChoiceMessage } = await callAI(msgs, modelRuntime, options);
+    const { rawUsage, timeCost, totalTimeCost, retryCount, requestId, responseModelName, ...response } = result;
+    const usage = buildUsageInfo({
+        usageData: rawUsage,
+        timeCost,
+        totalTimeCost,
+        retryCount,
+        requestId,
+        responseModelName,
+        modelName: modelConfig.modelName,
+        modelDescription: modelConfig.modelDescription,
+        slot: modelConfig.slot,
+        internalCallId
+    });
+    const debugProfileStats = getDebug('ai:profile:stats');
+    const debugProfileDetail = getDebug('ai:profile:detail');
+    debugProfileStats(`model, ${modelConfig.modelName}, mode, ${modelConfig.modelFamily || 'default'}, streaming, ${response.isStreamed}, prompt-tokens, ${usage?.prompt_tokens ?? ''}, completion-tokens, ${usage?.completion_tokens ?? ''}, total-tokens, ${usage?.total_tokens ?? ''}, cached-input, ${usage?.cached_input ?? ''}, cost-ms, ${timeCost ?? ''}, requestId, ${requestId ?? ''}, slot, ${modelConfig.slot}, configured-temperature, ${modelConfig.temperature ?? ''}`);
+    debugProfileDetail(`model usage detail: ${JSON.stringify(usage)}`);
+    if (usage && modelRuntime.onUsage) modelRuntime.onUsage(usage);
     return {
-        content,
-        usage,
-        rawChoiceMessage
+        ...response,
+        usage
+    };
+}
+class NonRetryableModelCallError extends Error {
+    constructor(cause){
+        super(cause.message, {
+            cause
+        }), _define_property(this, "cause", void 0);
+        this.cause = cause;
+    }
+}
+async function callModelWithRetry(input) {
+    const startTime = Date.now();
+    const { modelRuntime: { config }, options } = input;
+    const maxAttempts = normalizeRetryCount(config.retryCount) + 1;
+    const retryInterval = config.retryInterval ?? 2000;
+    const attemptErrors = [];
+    for(let attempt = 1;; attempt++){
+        options?.abortSignal?.throwIfAborted();
+        try {
+            const result = await callModelOnce(input, attempt);
+            return {
+                ...result,
+                totalTimeCost: Date.now() - startTime,
+                retryCount: attempt - 1
+            };
+        } catch (error) {
+            options?.abortSignal?.throwIfAborted();
+            if (error instanceof NonRetryableModelCallError) throw error.cause;
+            const lastError = toError(error);
+            attemptErrors.push({
+                attempt,
+                error: lastError
+            });
+            if (attempt === maxAttempts) throw appendAIRequestFailureSummary(lastError, attemptErrors, maxAttempts);
+            getDebug('ai:call', {
+                console: true
+            })(`AI call failed (attempt ${attempt}/${maxAttempts}), retrying in ${retryInterval}ms... Error: ${lastError.message}`);
+        }
+        await waitForRetry(retryInterval, options?.abortSignal);
+    }
+}
+async function callModelOnce({ messages, modelRuntime, options, executionId, internalCallId, prepared }, attempt) {
+    const { config: modelConfig } = modelRuntime;
+    const recordEvent = isModelCallRecordingEnabled() ? (event)=>{
+        recordModelCallEvent({
+            executionId,
+            callId: internalCallId,
+            semanticRetryAttempt: options?.semanticRetryAttempt,
+            slot: modelConfig.slot,
+            intent: modelConfig.intent,
+            modelFamily: modelConfig.modelFamily,
+            ...event,
+            attempt
+        });
+    } : void 0;
+    const effectiveTimeoutMs = resolveEffectiveTimeoutMs(modelConfig.timeout);
+    const { signal: requestSignal, cleanup } = buildRequestAbortSignal(effectiveTimeoutMs, options?.abortSignal);
+    let deliveredChunk = false;
+    const onChunk = options?.onChunk;
+    const context = {
+        messages,
+        modelRuntime,
+        executionId,
+        recordEvent,
+        requestSignal,
+        effectiveTimeoutMs,
+        options: onChunk ? {
+            ...options,
+            onChunk: (chunk)=>{
+                requestSignal.throwIfAborted();
+                deliveredChunk = true;
+                onChunk(chunk);
+            }
+        } : options
     };
+    try {
+        return await runWithAbortSignal(requestSignal, ()=>'codex' === prepared.protocol ? callCodex(context, prepared.input) : callOpenAI(context, prepared.input));
+    } catch (error) {
+        options?.abortSignal?.throwIfAborted();
+        const lastError = toError(error);
+        if (deliveredChunk) throw new NonRetryableModelCallError(lastError);
+        throw lastError;
+    } finally{
+        cleanup();
+    }
 }
-export { callAIWithObjectResponse, callAIWithStringResponse, parseAIObjectResponse };
+export { callAI };
 
 //# sourceMappingURL=call-ai.mjs.map

package/dist/es/ai-model/service-caller/call-ai.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ai-model/service-caller/call-ai.mjs","sources":["../../../../src/ai-model/service-caller/call-ai.ts"],"sourcesContent":["import type { AIUsageInfo } from '@/types';\nimport { assert } from '@midscene/shared/utils';\nimport type { ChatCompletionMessageParam } from 'openai/resources/index';\nimport type { ModelRuntime } from '../models';\nimport { type JsonParserSource, assertJsonObject } from '../shared/json';\nimport { callAI } from './call';\nimport {\n  callAiAndParseWithRetry,\n  withSemanticRetryFeedback,\n} from './semantic-retry';\nimport type { CallAIOptions } from './types';\nimport type { AIArgs } from './types';\nimport { AIResponseParseError } from './utils';\n\nexport type AIObjectResponse<T> = {\n  // TODO: `content` is a misleading name here because this is already the parsed object response. Consider renaming it to `object` or `data`.\n  content: T;\n  contentString: string;\n  usage?: AIUsageInfo;\n  reasoning_content?: string;\n  rawChoiceMessage?: unknown;\n};\n\nexport function parseAIObjectResponse<T>(\n  response: Awaited<ReturnType<typeof callAI>>,\n  modelRuntime: ModelRuntime,\n  jsonParserSource: JsonParserSource = 'generic-object',\n): AIObjectResponse<T> {\n  const { adapter } = modelRuntime;\n  assert(response, 'empty response');\n  const jsonContent = adapter.jsonParser(response.content, {\n    source: jsonParserSource,\n  });\n  assertJsonObject(jsonContent);\n  return {\n    content: jsonContent as T,\n    contentString: response.content,\n    usage: response.usage,\n    reasoning_content: response.reasoning_content,\n    rawChoiceMessage: response.rawChoiceMessage,\n  };\n}\n\nexport async function callAIWithObjectResponse<T>(\n  messages: ChatCompletionMessageParam[],\n  modelRuntime: ModelRuntime,\n  options?: {\n    abortSignal?: AbortSignal;\n    jsonParserSource?: JsonParserSource;\n    retryTimes?: number;\n    retryInterval?: number;\n  },\n): Promise<AIObjectResponse<T>> {\n  const { config: modelConfig } = modelRuntime;\n  return callAiAndParseWithRetry({\n    callAi: (retryAttempt, previousParseError) =>\n      callAI(\n        withSemanticRetryFeedback(messages, previousParseError),\n        modelRuntime,\n        {\n          abortSignal: options?.abortSignal,\n          expectedJsonObjectResponse: true,\n          semanticRetryAttempt: retryAttempt,\n        },\n      ),\n    parseResponse: (response) =>\n      parseAIObjectResponse<T>(\n        response,\n        modelRuntime,\n        options?.jsonParserSource,\n      ),\n    toParseError: (error, response) => {\n      const errorMessage =\n        error instanceof Error ? error.message : String(error);\n      return new AIResponseParseError(\n        errorMessage,\n        response.content,\n        response.usage,\n        response.rawChoiceMessage,\n        response.reasoning_content,\n      );\n    },\n    parseRetryTimes: options?.retryTimes ?? modelConfig.retryCount,\n    parseRetryInterval: options?.retryInterval ?? modelConfig.retryInterval,\n    abortSignal: options?.abortSignal,\n  });\n}\n\nexport async function callAIWithStringResponse(\n  msgs: AIArgs,\n  modelRuntime: ModelRuntime,\n  options?: Pick<CallAIOptions, 'abortSignal' | 'requiresOriginalImageDetail'>,\n): Promise<{\n  content: string;\n  usage?: AIUsageInfo;\n  rawChoiceMessage?: unknown;\n}> {\n  const { content, usage, rawChoiceMessage } = await callAI(\n    msgs,\n    modelRuntime,\n    options,\n  );\n  return { content, usage, rawChoiceMessage };\n}\n"],"names":["parseAIObjectResponse","response","modelRuntime","jsonParserSource","adapter","assert","jsonContent","assertJsonObject","callAIWithObjectResponse","messages","options","modelConfig","callAiAndParseWithRetry","retryAttempt","previousParseError","callAI","withSemanticRetryFeedback","error","errorMessage","Error","String","AIResponseParseError","callAIWithStringResponse","msgs","content","usage","rawChoiceMessage"],"mappings":";;;;;AAuBO,SAASA,sBACdC,QAA4C,EAC5CC,YAA0B,EAC1BC,mBAAqC,gBAAgB;IAErD,MAAM,EAAEC,OAAO,EAAE,GAAGF;IACpBG,OAAOJ,UAAU;IACjB,MAAMK,cAAcF,QAAQ,UAAU,CAACH,SAAS,OAAO,EAAE;QACvD,QAAQE;IACV;IACAI,iBAAiBD;IACjB,OAAO;QACL,SAASA;QACT,eAAeL,SAAS,OAAO;QAC/B,OAAOA,SAAS,KAAK;QACrB,mBAAmBA,SAAS,iBAAiB;QAC7C,kBAAkBA,SAAS,gBAAgB;IAC7C;AACF;AAEO,eAAeO,yBACpBC,QAAsC,EACtCP,YAA0B,EAC1BQ,OAKC;IAED,MAAM,EAAE,QAAQC,WAAW,EAAE,GAAGT;IAChC,OAAOU,wBAAwB;QAC7B,QAAQ,CAACC,cAAcC,qBACrBC,OACEC,0BAA0BP,UAAUK,qBACpCZ,cACA;gBACE,aAAaQ,SAAS;gBACtB,4BAA4B;gBAC5B,sBAAsBG;YACxB;QAEJ,eAAe,CAACZ,WACdD,sBACEC,UACAC,cACAQ,SAAS;QAEb,cAAc,CAACO,OAAOhB;YACpB,MAAMiB,eACJD,iBAAiBE,QAAQF,MAAM,OAAO,GAAGG,OAAOH;YAClD,OAAO,IAAII,qBACTH,cACAjB,SAAS,OAAO,EAChBA,SAAS,KAAK,EACdA,SAAS,gBAAgB,EACzBA,SAAS,iBAAiB;QAE9B;QACA,iBAAiBS,SAAS,cAAcC,YAAY,UAAU;QAC9D,oBAAoBD,SAAS,iBAAiBC,YAAY,aAAa;QACvE,aAAaD,SAAS;IACxB;AACF;AAEO,eAAeY,yBACpBC,IAAY,EACZrB,YAA0B,EAC1BQ,OAA4E;IAM5E,MAAM,EAAEc,OAAO,EAAEC,KAAK,EAAEC,gBAAgB,EAAE,GAAG,MAAMX,OACjDQ,MACArB,cACAQ;IAEF,OAAO;QAAEc;QAASC;QAAOC;IAAiB;AAC5C"}
+{"version":3,"file":"ai-model/service-caller/call-ai.mjs","sources":["../../../../src/ai-model/service-caller/call-ai.ts"],"sourcesContent":["import { getDebug } from '@midscene/shared/logger';\nimport { assert, uuid } from '@midscene/shared/utils';\nimport type { ChatCompletionMessageParam } from 'openai/resources/index';\nimport type { ModelRuntime } from '../models';\nimport { callCodex, prepareCodexCall } from './codex/call-codex';\nimport { isCodexAppServerProvider } from './codex/codex-app-server';\nimport {\n  isModelCallRecordingEnabled,\n  recordModelCallEvent,\n} from './model-call-recorder';\nimport { callOpenAI } from './openai/call-openai';\nimport { prepareChatCompletion } from './openai/chat-completion/chat-completion';\nimport {\n  buildRequestAbortSignal,\n  resolveEffectiveTimeoutMs,\n  runWithAbortSignal,\n  waitForRetry,\n} from './request-timeout';\nimport type {\n  AICallResult,\n  CallAIOptions,\n  ModelCallContext,\n  ModelCallResult,\n} from './types';\nimport {\n  appendAIRequestFailureSummary,\n  buildUsageInfo,\n  nextInternalCallId,\n  normalizeRetryCount,\n  toError,\n} from './utils';\n\nexport async function callAI(\n  messages: ChatCompletionMessageParam[],\n  modelRuntime: ModelRuntime,\n  options?: CallAIOptions,\n): Promise<AICallResult> {\n  options?.abortSignal?.throwIfAborted();\n  const isStreaming = options?.stream === true;\n  if (isStreaming) {\n    assert(\n      typeof options?.onChunk === 'function',\n      'onChunk is required when stream is true',\n    );\n  }\n\n  // Low-level callers without a TaskRunner still need a stable ID for the\n  // lifetime of this model call (including its network retries).\n  const executionId = modelRuntime.executionId ?? `unscoped-${uuid()}`;\n\n  // Stable internal ID for this call, used by the agent to deduplicate usage\n  // across the onUsage callback and the task-dump-based collectUsageMetrics()\n  // path when the provider does not return a request_id.\n  const internalCallId = nextInternalCallId();\n\n  const { config: modelConfig } = modelRuntime;\n\n  const prepare = async (): Promise<PreparedModelInput> =>\n    isCodexAppServerProvider(modelConfig.openaiBaseURL)\n      ? {\n          protocol: 'codex',\n          input: prepareCodexCall({ messages, modelRuntime, options }),\n        }\n      : {\n          protocol: 'chat-completion',\n          input: await prepareChatCompletion({\n            messages,\n            modelRuntime,\n            options,\n          }),\n        };\n\n  const prepared = options?.abortSignal\n    ? await runWithAbortSignal(options.abortSignal, prepare)\n    : await prepare();\n\n  const result = await callModelWithRetry({\n    messages,\n    modelRuntime,\n    options,\n    executionId,\n    internalCallId,\n    prepared,\n  });\n\n  const {\n    rawUsage,\n    timeCost,\n    totalTimeCost,\n    retryCount,\n    requestId,\n    responseModelName,\n    ...response\n  } = result;\n\n  const usage = buildUsageInfo({\n    usageData: rawUsage,\n    timeCost,\n    totalTimeCost,\n    retryCount,\n    requestId,\n    responseModelName,\n    modelName: modelConfig.modelName,\n    modelDescription: modelConfig.modelDescription,\n    slot: modelConfig.slot,\n    internalCallId,\n  });\n\n  const debugProfileStats = getDebug('ai:profile:stats');\n  const debugProfileDetail = getDebug('ai:profile:detail');\n  debugProfileStats(\n    `model, ${modelConfig.modelName}, mode, ${modelConfig.modelFamily || 'default'}, streaming, ${response.isStreamed}, prompt-tokens, ${usage?.prompt_tokens ?? ''}, completion-tokens, ${usage?.completion_tokens ?? ''}, total-tokens, ${usage?.total_tokens ?? ''}, cached-input, ${usage?.cached_input ?? ''}, cost-ms, ${timeCost ?? ''}, requestId, ${requestId ?? ''}, slot, ${modelConfig.slot}, configured-temperature, ${modelConfig.temperature ?? ''}`,\n  );\n  debugProfileDetail(`model usage detail: ${JSON.stringify(usage)}`);\n\n  if (usage && modelRuntime.onUsage) {\n    modelRuntime.onUsage(usage);\n  }\n  return { ...response, usage };\n}\n\ntype PreparedModelInput =\n  | { protocol: 'codex'; input: ReturnType<typeof prepareCodexCall> }\n  | {\n      protocol: 'chat-completion';\n      input: Awaited<ReturnType<typeof prepareChatCompletion>>;\n    };\n\ntype ModelCallInput = {\n  messages: ChatCompletionMessageParam[];\n  modelRuntime: ModelRuntime;\n  options?: CallAIOptions;\n  executionId: string;\n  internalCallId: string;\n  prepared: PreparedModelInput;\n};\n\n/** Carries the original failure across the retry boundary without replaying output. */\nclass NonRetryableModelCallError extends Error {\n  readonly cause: Error;\n\n  constructor(cause: Error) {\n    super(cause.message, { cause });\n    this.cause = cause;\n  }\n}\n\nasync function callModelWithRetry(\n  input: ModelCallInput,\n): Promise<ModelCallResult & { totalTimeCost: number; retryCount: number }> {\n  const startTime = Date.now();\n  const {\n    modelRuntime: { config },\n    options,\n  } = input;\n  const maxAttempts = normalizeRetryCount(config.retryCount) + 1;\n  const retryInterval = config.retryInterval ?? 2000;\n  const attemptErrors: Array<{ attempt: number; error: unknown }> = [];\n\n  for (let attempt = 1; ; attempt++) {\n    options?.abortSignal?.throwIfAborted();\n    try {\n      const result = await callModelOnce(input, attempt);\n      return {\n        ...result,\n        totalTimeCost: Date.now() - startTime,\n        retryCount: attempt - 1,\n      };\n    } catch (error) {\n      options?.abortSignal?.throwIfAborted();\n      if (error instanceof NonRetryableModelCallError) {\n        throw error.cause;\n      }\n      const lastError = toError(error);\n      attemptErrors.push({ attempt, error: lastError });\n      if (attempt === maxAttempts) {\n        throw appendAIRequestFailureSummary(\n          lastError,\n          attemptErrors,\n          maxAttempts,\n        );\n      }\n      getDebug('ai:call', { console: true })(\n        `AI call failed (attempt ${attempt}/${maxAttempts}), retrying in ${retryInterval}ms... Error: ${lastError.message}`,\n      );\n    }\n    await waitForRetry(retryInterval, options?.abortSignal);\n  }\n}\n\nasync function callModelOnce(\n  {\n    messages,\n    modelRuntime,\n    options,\n    executionId,\n    internalCallId,\n    prepared,\n  }: ModelCallInput,\n  attempt: number,\n): Promise<ModelCallResult> {\n  const { config: modelConfig } = modelRuntime;\n  const recordEvent = isModelCallRecordingEnabled()\n    ? (event: Record<string, unknown>) => {\n        void recordModelCallEvent({\n          executionId,\n          callId: internalCallId,\n          semanticRetryAttempt: options?.semanticRetryAttempt,\n          slot: modelConfig.slot,\n          intent: modelConfig.intent,\n          modelFamily: modelConfig.modelFamily,\n          ...event,\n          attempt,\n        });\n      }\n    : undefined;\n  const effectiveTimeoutMs = resolveEffectiveTimeoutMs(modelConfig.timeout);\n  const { signal: requestSignal, cleanup } = buildRequestAbortSignal(\n    effectiveTimeoutMs,\n    options?.abortSignal,\n  );\n  let deliveredChunk = false;\n  const onChunk = options?.onChunk;\n  const context: ModelCallContext = {\n    messages,\n    modelRuntime,\n    executionId,\n    recordEvent,\n    requestSignal,\n    effectiveTimeoutMs,\n    options: onChunk\n      ? {\n          ...options,\n          onChunk: (chunk) => {\n            requestSignal.throwIfAborted();\n            deliveredChunk = true;\n            onChunk(chunk);\n          },\n        }\n      : options,\n  };\n  try {\n    return await runWithAbortSignal(requestSignal, () =>\n      prepared.protocol === 'codex'\n        ? callCodex(context, prepared.input)\n        : callOpenAI(context, prepared.input),\n    );\n  } catch (error) {\n    options?.abortSignal?.throwIfAborted();\n    const lastError = toError(error);\n    if (deliveredChunk) {\n      throw new NonRetryableModelCallError(lastError);\n    }\n    throw lastError;\n  } finally {\n    cleanup();\n  }\n}\n"],"names":["callAI","messages","modelRuntime","options","isStreaming","assert","executionId","uuid","internalCallId","nextInternalCallId","modelConfig","prepare","isCodexAppServerProvider","prepareCodexCall","prepareChatCompletion","prepared","runWithAbortSignal","result","callModelWithRetry","rawUsage","timeCost","totalTimeCost","retryCount","requestId","responseModelName","response","usage","buildUsageInfo","debugProfileStats","getDebug","debugProfileDetail","JSON","NonRetryableModelCallError","Error","cause","input","startTime","Date","config","maxAttempts","normalizeRetryCount","retryInterval","attemptErrors","attempt","callModelOnce","error","lastError","toError","appendAIRequestFailureSummary","waitForRetry","recordEvent","isModelCallRecordingEnabled","event","recordModelCallEvent","undefined","effectiveTimeoutMs","resolveEffectiveTimeoutMs","requestSignal","cleanup","buildRequestAbortSignal","deliveredChunk","onChunk","context","chunk","callCodex","callOpenAI"],"mappings":"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"}

package/dist/es/ai-model/service-caller/codex/call-codex.mjs

@@ -1,6 +1,27 @@
+import { applyImageDetail } from "../utils.mjs";
 import { callAIWithCodexAppServer } from "./codex-app-server.mjs";
-const callCodex = async ({ messages, modelRuntime, options, recordEvent })=>{
+const prepareCodexCall = ({ messages, modelRuntime, options })=>{
     const { config: modelConfig, adapter } = modelRuntime;
+    const { config, imageDetail } = adapter.buildCodexAppServerParams({
+        intent: modelConfig.intent,
+        userConfig: {
+            reasoningEnabled: modelConfig.reasoningEnabled,
+            reasoningEffort: modelConfig.reasoningEffort,
+            reasoningBudget: modelConfig.reasoningBudget
+        },
+        requiresOriginalImageDetail: options?.requiresOriginalImageDetail
+    });
+    const messagesWithImageDetail = applyImageDetail({
+        imageDetail,
+        messages
+    });
+    return {
+        messages: messagesWithImageDetail,
+        requestParams: config
+    };
+};
+const callCodex = async ({ modelRuntime, options, recordEvent, requestSignal }, { messages, requestParams })=>{
+    const { config: modelConfig } = modelRuntime;
     let protocolChunkSequence = 0;
     const codexStartTime = Date.now();
     const recordCodexEvent = recordEvent ? (event)=>{
@@ -21,23 +42,14 @@ const callCodex = async ({ messages, modelRuntime, options, recordEvent })=>{
         });
     } : void 0;
     try {
-        const { config, imageDetail } = adapter.buildCodexAppServerParams({
-            intent: modelConfig.intent,
-            userConfig: {
-                reasoningEnabled: modelConfig.reasoningEnabled,
-                reasoningEffort: modelConfig.reasoningEffort,
-                reasoningBudget: modelConfig.reasoningBudget
-            },
-            requiresOriginalImageDetail: options?.requiresOriginalImageDetail
-        });
         const codexResult = await callAIWithCodexAppServer(messages, modelConfig, {
             stream: options?.stream,
             onChunk: options?.onChunk,
-            params: config,
-            abortSignal: options?.abortSignal,
-            imageDetail,
+            params: requestParams,
+            abortSignal: requestSignal,
             onRecordEvent: recordCodexEvent
         });
+        requestSignal.throwIfAborted();
         const { protocolMetadata, usage: rawUsage, ...response } = codexResult;
         const timeCost = Date.now() - codexStartTime;
         recordEvent?.({
@@ -72,6 +84,6 @@ const callCodex = async ({ messages, modelRuntime, options, recordEvent })=>{
         throw error;
     }
 };
-export { callCodex };
+export { callCodex, prepareCodexCall };
 
 //# sourceMappingURL=call-codex.mjs.map

package/dist/es/ai-model/service-caller/codex/call-codex.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ai-model/service-caller/codex/call-codex.mjs","sources":["../../../../../src/ai-model/service-caller/codex/call-codex.ts"],"sourcesContent":["import type { ModelCallContext, ModelCallResult } from '../types';\nimport {\n  type CodexAppServerRecordEvent,\n  callAIWithCodexAppServer,\n} from './codex-app-server';\n\nexport const callCodex = async ({\n  messages,\n  modelRuntime,\n  options,\n  recordEvent,\n}: ModelCallContext): Promise<ModelCallResult> => {\n  const { config: modelConfig, adapter } = modelRuntime;\n  let protocolChunkSequence = 0;\n  const codexStartTime = Date.now();\n  const recordCodexEvent = recordEvent\n    ? (event: CodexAppServerRecordEvent) => {\n        if (event.type === 'chunk') {\n          protocolChunkSequence += 1;\n          recordEvent({\n            ...event,\n            attempt: 1,\n            sequence: protocolChunkSequence,\n            provider: 'codex-app-server',\n          });\n          return;\n        }\n\n        recordEvent({\n          ...event,\n          attempt: 1,\n          provider: 'codex-app-server',\n        });\n      }\n    : undefined;\n\n  try {\n    const { config, imageDetail } = adapter.buildCodexAppServerParams({\n      intent: modelConfig.intent,\n      userConfig: {\n        reasoningEnabled: modelConfig.reasoningEnabled,\n        reasoningEffort: modelConfig.reasoningEffort,\n        reasoningBudget: modelConfig.reasoningBudget,\n      },\n      requiresOriginalImageDetail: options?.requiresOriginalImageDetail,\n    });\n    const codexResult = await callAIWithCodexAppServer(messages, modelConfig, {\n      stream: options?.stream,\n      onChunk: options?.onChunk,\n      params: config,\n      abortSignal: options?.abortSignal,\n      imageDetail,\n      onRecordEvent: recordCodexEvent,\n    });\n    const { protocolMetadata, usage: rawUsage, ...response } = codexResult;\n    const timeCost = Date.now() - codexStartTime;\n    recordEvent?.({\n      type: 'response',\n      attempt: 1,\n      provider: 'codex-app-server',\n      final: {\n        content: response.content,\n        reasoningContent: response.reasoning_content,\n        usage: rawUsage,\n        timeCost,\n        protocol: protocolMetadata,\n      },\n    });\n    return {\n      ...response,\n      rawUsage,\n      timeCost,\n      requestId: protocolMetadata.turnId,\n    };\n  } catch (error) {\n    recordEvent?.({\n      type: 'error',\n      attempt: 1,\n      provider: 'codex-app-server',\n      error:\n        error instanceof Error\n          ? {\n              name: error.name,\n              message: error.message,\n              stack: error.stack,\n            }\n          : String(error),\n    });\n    throw error;\n  }\n};\n"],"names":["callCodex","messages","modelRuntime","options","recordEvent","modelConfig","adapter","protocolChunkSequence","codexStartTime","Date","recordCodexEvent","event","undefined","config","imageDetail","codexResult","callAIWithCodexAppServer","protocolMetadata","rawUsage","response","timeCost","error","Error","String"],"mappings":";AAMO,MAAMA,YAAY,OAAO,EAC9BC,QAAQ,EACRC,YAAY,EACZC,OAAO,EACPC,WAAW,EACM;IACjB,MAAM,EAAE,QAAQC,WAAW,EAAEC,OAAO,EAAE,GAAGJ;IACzC,IAAIK,wBAAwB;IAC5B,MAAMC,iBAAiBC,KAAK,GAAG;IAC/B,MAAMC,mBAAmBN,cACrB,CAACO;QACC,IAAIA,AAAe,YAAfA,MAAM,IAAI,EAAc;YAC1BJ,yBAAyB;YACzBH,YAAY;gBACV,GAAGO,KAAK;gBACR,SAAS;gBACT,UAAUJ;gBACV,UAAU;YACZ;YACA;QACF;QAEAH,YAAY;YACV,GAAGO,KAAK;YACR,SAAS;YACT,UAAU;QACZ;IACF,IACAC;IAEJ,IAAI;QACF,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAE,GAAGR,QAAQ,yBAAyB,CAAC;YAChE,QAAQD,YAAY,MAAM;YAC1B,YAAY;gBACV,kBAAkBA,YAAY,gBAAgB;gBAC9C,iBAAiBA,YAAY,eAAe;gBAC5C,iBAAiBA,YAAY,eAAe;YAC9C;YACA,6BAA6BF,SAAS;QACxC;QACA,MAAMY,cAAc,MAAMC,yBAAyBf,UAAUI,aAAa;YACxE,QAAQF,SAAS;YACjB,SAASA,SAAS;YAClB,QAAQU;YACR,aAAaV,SAAS;YACtBW;YACA,eAAeJ;QACjB;QACA,MAAM,EAAEO,gBAAgB,EAAE,OAAOC,QAAQ,EAAE,GAAGC,UAAU,GAAGJ;QAC3D,MAAMK,WAAWX,KAAK,GAAG,KAAKD;QAC9BJ,cAAc;YACZ,MAAM;YACN,SAAS;YACT,UAAU;YACV,OAAO;gBACL,SAASe,SAAS,OAAO;gBACzB,kBAAkBA,SAAS,iBAAiB;gBAC5C,OAAOD;gBACPE;gBACA,UAAUH;YACZ;QACF;QACA,OAAO;YACL,GAAGE,QAAQ;YACXD;YACAE;YACA,WAAWH,iBAAiB,MAAM;QACpC;IACF,EAAE,OAAOI,OAAO;QACdjB,cAAc;YACZ,MAAM;YACN,SAAS;YACT,UAAU;YACV,OACEiB,iBAAiBC,QACb;gBACE,MAAMD,MAAM,IAAI;gBAChB,SAASA,MAAM,OAAO;gBACtB,OAAOA,MAAM,KAAK;YACpB,IACAE,OAAOF;QACf;QACA,MAAMA;IACR;AACF"}
+{"version":3,"file":"ai-model/service-caller/codex/call-codex.mjs","sources":["../../../../../src/ai-model/service-caller/codex/call-codex.ts"],"sourcesContent":["import type { ModelCallContext, ModelCallResult } from '../types';\nimport { applyImageDetail } from '../utils';\nimport {\n  type CodexAppServerRecordEvent,\n  callAIWithCodexAppServer,\n} from './codex-app-server';\n\nexport const prepareCodexCall = ({\n  messages,\n  modelRuntime,\n  options,\n}: Pick<ModelCallContext, 'messages' | 'modelRuntime' | 'options'>) => {\n  const { config: modelConfig, adapter } = modelRuntime;\n  const { config, imageDetail } = adapter.buildCodexAppServerParams({\n    intent: modelConfig.intent,\n    userConfig: {\n      reasoningEnabled: modelConfig.reasoningEnabled,\n      reasoningEffort: modelConfig.reasoningEffort,\n      reasoningBudget: modelConfig.reasoningBudget,\n    },\n    requiresOriginalImageDetail: options?.requiresOriginalImageDetail,\n  });\n  const messagesWithImageDetail = applyImageDetail({ imageDetail, messages });\n  return { messages: messagesWithImageDetail, requestParams: config };\n};\n\nexport const callCodex = async (\n  { modelRuntime, options, recordEvent, requestSignal }: ModelCallContext,\n  { messages, requestParams }: ReturnType<typeof prepareCodexCall>,\n): Promise<ModelCallResult> => {\n  const { config: modelConfig } = modelRuntime;\n  let protocolChunkSequence = 0;\n  const codexStartTime = Date.now();\n  const recordCodexEvent = recordEvent\n    ? (event: CodexAppServerRecordEvent) => {\n        if (event.type === 'chunk') {\n          protocolChunkSequence += 1;\n          recordEvent({\n            ...event,\n            attempt: 1,\n            sequence: protocolChunkSequence,\n            provider: 'codex-app-server',\n          });\n          return;\n        }\n\n        recordEvent({\n          ...event,\n          attempt: 1,\n          provider: 'codex-app-server',\n        });\n      }\n    : undefined;\n\n  try {\n    const codexResult = await callAIWithCodexAppServer(messages, modelConfig, {\n      stream: options?.stream,\n      onChunk: options?.onChunk,\n      params: requestParams,\n      abortSignal: requestSignal,\n      onRecordEvent: recordCodexEvent,\n    });\n    requestSignal.throwIfAborted();\n    const { protocolMetadata, usage: rawUsage, ...response } = codexResult;\n    const timeCost = Date.now() - codexStartTime;\n    recordEvent?.({\n      type: 'response',\n      attempt: 1,\n      provider: 'codex-app-server',\n      final: {\n        content: response.content,\n        reasoningContent: response.reasoning_content,\n        usage: rawUsage,\n        timeCost,\n        protocol: protocolMetadata,\n      },\n    });\n    return {\n      ...response,\n      rawUsage,\n      timeCost,\n      requestId: protocolMetadata.turnId,\n    };\n  } catch (error) {\n    recordEvent?.({\n      type: 'error',\n      attempt: 1,\n      provider: 'codex-app-server',\n      error:\n        error instanceof Error\n          ? {\n              name: error.name,\n              message: error.message,\n              stack: error.stack,\n            }\n          : String(error),\n    });\n    throw error;\n  }\n};\n"],"names":["prepareCodexCall","messages","modelRuntime","options","modelConfig","adapter","config","imageDetail","messagesWithImageDetail","applyImageDetail","callCodex","recordEvent","requestSignal","requestParams","protocolChunkSequence","codexStartTime","Date","recordCodexEvent","event","undefined","codexResult","callAIWithCodexAppServer","protocolMetadata","rawUsage","response","timeCost","error","Error","String"],"mappings":";;AAOO,MAAMA,mBAAmB,CAAC,EAC/BC,QAAQ,EACRC,YAAY,EACZC,OAAO,EACyD;IAChE,MAAM,EAAE,QAAQC,WAAW,EAAEC,OAAO,EAAE,GAAGH;IACzC,MAAM,EAAEI,MAAM,EAAEC,WAAW,EAAE,GAAGF,QAAQ,yBAAyB,CAAC;QAChE,QAAQD,YAAY,MAAM;QAC1B,YAAY;YACV,kBAAkBA,YAAY,gBAAgB;YAC9C,iBAAiBA,YAAY,eAAe;YAC5C,iBAAiBA,YAAY,eAAe;QAC9C;QACA,6BAA6BD,SAAS;IACxC;IACA,MAAMK,0BAA0BC,iBAAiB;QAAEF;QAAaN;IAAS;IACzE,OAAO;QAAE,UAAUO;QAAyB,eAAeF;IAAO;AACpE;AAEO,MAAMI,YAAY,OACvB,EAAER,YAAY,EAAEC,OAAO,EAAEQ,WAAW,EAAEC,aAAa,EAAoB,EACvE,EAAEX,QAAQ,EAAEY,aAAa,EAAuC;IAEhE,MAAM,EAAE,QAAQT,WAAW,EAAE,GAAGF;IAChC,IAAIY,wBAAwB;IAC5B,MAAMC,iBAAiBC,KAAK,GAAG;IAC/B,MAAMC,mBAAmBN,cACrB,CAACO;QACC,IAAIA,AAAe,YAAfA,MAAM,IAAI,EAAc;YAC1BJ,yBAAyB;YACzBH,YAAY;gBACV,GAAGO,KAAK;gBACR,SAAS;gBACT,UAAUJ;gBACV,UAAU;YACZ;YACA;QACF;QAEAH,YAAY;YACV,GAAGO,KAAK;YACR,SAAS;YACT,UAAU;QACZ;IACF,IACAC;IAEJ,IAAI;QACF,MAAMC,cAAc,MAAMC,yBAAyBpB,UAAUG,aAAa;YACxE,QAAQD,SAAS;YACjB,SAASA,SAAS;YAClB,QAAQU;YACR,aAAaD;YACb,eAAeK;QACjB;QACAL,cAAc,cAAc;QAC5B,MAAM,EAAEU,gBAAgB,EAAE,OAAOC,QAAQ,EAAE,GAAGC,UAAU,GAAGJ;QAC3D,MAAMK,WAAWT,KAAK,GAAG,KAAKD;QAC9BJ,cAAc;YACZ,MAAM;YACN,SAAS;YACT,UAAU;YACV,OAAO;gBACL,SAASa,SAAS,OAAO;gBACzB,kBAAkBA,SAAS,iBAAiB;gBAC5C,OAAOD;gBACPE;gBACA,UAAUH;YACZ;QACF;QACA,OAAO;YACL,GAAGE,QAAQ;YACXD;YACAE;YACA,WAAWH,iBAAiB,MAAM;QACpC;IACF,EAAE,OAAOI,OAAO;QACdf,cAAc;YACZ,MAAM;YACN,SAAS;YACT,UAAU;YACV,OACEe,iBAAiBC,QACb;gBACE,MAAMD,MAAM,IAAI;gBAChB,SAASA,MAAM,OAAO;gBACtB,OAAOA,MAAM,KAAK;YACpB,IACAE,OAAOF;QACf;QACA,MAAMA;IACR;AACF"}

package/dist/es/ai-model/service-caller/codex/codex-app-server.mjs

@@ -11,7 +11,7 @@ function _define_property(obj, key, value) {
     return obj;
 }
 const CODEX_PROVIDER_SCHEME = 'codex://';
-const CODEX_DEFAULT_TIMEOUT_MS = 600000;
+const CODEX_INTERRUPT_TIMEOUT_MS = 5000;
 const CODEX_DEFAULT_PROCESS_START_TIMEOUT_MS = 15000;
 const CODEX_DEFAULT_CLEANUP_TIMEOUT_MS = 8000;
 const CODEX_TEXT_INPUT_MAX_LENGTH = 262144;
@@ -81,7 +81,7 @@ const extractTextFromMessage = (message)=>{
     }).filter(Boolean).join('\n');
     return '';
 };
-const extractImageInputs = (message, imageDetailOverride)=>{
+const extractImageInputs = (message)=>{
     const content = message.content;
     if (!Array.isArray(content)) return [];
     const inputs = [];
@@ -89,7 +89,7 @@ const extractImageInputs = (message, imageDetailOverride)=>{
         if (!part || 'object' != typeof part) continue;
         const partType = String(part.type || '');
         const imageUrl = 'image_url' === partType ? toNonEmptyString(part.image_url?.url) : 'input_image' === partType ? toNonEmptyString(part.image_url || part.url) : void 0;
-        const imageDetail = imageDetailOverride ?? toCodexImageDetail('image_url' === partType ? part.image_url?.detail : part.detail);
+        const imageDetail = toCodexImageDetail('image_url' === partType ? part.image_url?.detail : part.detail);
         if (imageUrl) {
             if (imageUrl.startsWith('/') || imageUrl.startsWith('./') || imageUrl.startsWith('../') || imageUrl.startsWith('file://')) {
                 const path = imageUrl.startsWith('file://') ? normalizeCodexLocalImagePath(imageUrl) : imageUrl;
@@ -113,7 +113,7 @@ const extractImageInputs = (message, imageDetailOverride)=>{
     }
     return inputs;
 };
-const buildCodexTurnPayloadFromMessages = (messages, imageDetailOverride)=>{
+const buildCodexTurnPayloadFromMessages = (messages)=>{
     const developerInstructionParts = [];
     const transcriptParts = [];
     const imageInputs = [];
@@ -127,7 +127,7 @@ const buildCodexTurnPayloadFromMessages = (messages, imageDetailOverride)=>{
         const roleTag = role.toUpperCase();
         if (text.trim()) transcriptParts.push(`[${roleTag}]\n${text.trim()}`);
         else transcriptParts.push(`[${roleTag}]\n(no text content)`);
-        if ('user' === role) imageInputs.push(...extractImageInputs(message, imageDetailOverride));
+        if ('user' === role) imageInputs.push(...extractImageInputs(message));
     }
     const fullTranscript = transcriptParts.join('\n\n');
     const transcriptText = (fullTranscript.length > CODEX_TEXT_INPUT_MAX_LENGTH ? fullTranscript.slice(-CODEX_TEXT_INPUT_MAX_LENGTH) : fullTranscript) || 'Please answer the latest user request.';
@@ -175,11 +175,9 @@ class CodexAppServerConnection {
     isClosed() {
         return this.closed;
     }
-    async runTurn({ messages, modelConfig, stream, onChunk, params, abortSignal, imageDetail, onRecordEvent }) {
-        const timeoutMs = modelConfig.timeout || CODEX_DEFAULT_TIMEOUT_MS;
-        const deadlineAt = Date.now() + timeoutMs;
+    async runTurn({ messages, modelConfig, stream, onChunk, params, abortSignal, onRecordEvent }) {
         const isStreaming = !!(stream && onChunk);
-        const { developerInstructions, input } = buildCodexTurnPayloadFromMessages(messages, imageDetail);
+        const { developerInstructions, input } = buildCodexTurnPayloadFromMessages(messages);
         let threadId;
         let turnId;
         let latestErrorMessage;
@@ -219,7 +217,6 @@ class CodexAppServerConnection {
             const threadStartResponse = await this.request({
                 method: 'thread/start',
                 params: threadStartParams,
-                deadlineAt,
                 abortSignal
             });
             onRecordEvent?.({
@@ -248,7 +245,6 @@ class CodexAppServerConnection {
             const turnStartResponse = await this.request({
                 method: 'turn/start',
                 params: turnStartParams,
-                deadlineAt,
                 abortSignal
             });
             onRecordEvent?.({
@@ -264,7 +260,6 @@ class CodexAppServerConnection {
             let turnStatus;
             while(!turnStatus){
                 const message = await this.nextMessage({
-                    deadlineAt,
                     abortSignal
                 });
                 if (this.isResponseMessage(message)) continue;
@@ -353,7 +348,7 @@ class CodexAppServerConnection {
                     threadId,
                     turnId
                 },
-                deadlineAt: Date.now() + 5000
+                deadlineAt: Date.now() + CODEX_INTERRUPT_TIMEOUT_MS
             }).catch(()=>{});
             throw error;
         } finally{
@@ -448,6 +443,7 @@ class CodexAppServerConnection {
         return message?.id !== void 0 && (message?.result !== void 0 || message?.error !== void 0) && 'string' != typeof message?.method;
     }
     async request({ method, params, deadlineAt, abortSignal }) {
+        abortSignal?.throwIfAborted();
         const requestId = this.nextRequestId++;
         await this.sendMessage({
             id: requestId,
@@ -554,9 +550,11 @@ class CodexAppServerConnection {
     }
 }
 class CodexAppServerConnectionManager {
-    async runTurn({ messages, modelConfig, stream, onChunk, params, abortSignal, imageDetail, onRecordEvent }) {
+    async runTurn({ messages, modelConfig, stream, onChunk, params, abortSignal, onRecordEvent }) {
         return this.runner.run(async ()=>{
+            abortSignal?.throwIfAborted();
             const connection = await this.getConnection();
+            abortSignal?.throwIfAborted();
             try {
                 return await connection.runTurn({
                     messages,
@@ -565,7 +563,6 @@ class CodexAppServerConnectionManager {
                     onChunk,
                     params,
                     abortSignal,
-                    imageDetail,
                     onRecordEvent
                 });
             } catch (error) {
@@ -606,7 +603,6 @@ async function callAIWithCodexAppServer(messages, modelConfig, options) {
         onChunk: options?.onChunk,
         params: options?.params,
         abortSignal: options?.abortSignal,
-        imageDetail: options?.imageDetail,
         onRecordEvent: options?.onRecordEvent
     });
 }