dominds 1.13.2 → 1.15.2

package/dist/llm/gen/mock.js

@@ -63,10 +63,19 @@ const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
 const log_1 = require("../../log");
+const reply_prompt_copy_1 = require("../../runtime/reply-prompt-copy");
 const REPLY_TOOL_REMINDER_PREFIXES = [
     '[Dominds replyTellask required]',
     '[Dominds 必须调用回复工具]',
 ];
+const RUNTIME_PROMPT_WRAPPER_PREFIXES = [
+    reply_prompt_copy_1.ACTIVE_REPLY_TOOL_PREFIX_EN,
+    reply_prompt_copy_1.ACTIVE_REPLY_TOOL_PREFIX_ZH,
+    reply_prompt_copy_1.REPLY_REASSERTION_PREFIX_EN,
+    reply_prompt_copy_1.REPLY_REASSERTION_PREFIX_ZH,
+    reply_prompt_copy_1.REPLY_SUPPRESSION_PREFIX_EN,
+    reply_prompt_copy_1.REPLY_SUPPRESSION_PREFIX_ZH,
+];
 function normalizeDelayMs(value) {
     if (typeof value !== 'number' || !Number.isFinite(value))
         return 0;
@@ -116,12 +125,11 @@ class MockGen {
                 case 'prompting_msg':
                 case 'func_result_msg':
                 case 'tellask_result_msg':
-                case 'tellask_carryover_result_msg':
+                case 'tellask_carryover_msg':
                     return { content: msg.content, role: msg.role };
                 case 'environment_msg':
                 case 'transient_guide_msg':
                 case 'saying_msg':
-                case 'ui_only_markdown_msg':
                 case 'thinking_msg':
                 case 'func_call_msg':
                     break;
@@ -141,11 +149,10 @@ class MockGen {
                 case 'transient_guide_msg':
                 case 'prompting_msg':
                 case 'saying_msg':
-                case 'ui_only_markdown_msg':
                 case 'thinking_msg':
                 case 'func_result_msg':
                 case 'tellask_result_msg':
-                case 'tellask_carryover_result_msg':
+                case 'tellask_carryover_msg':
                     return lastMsg.content;
                 case 'func_call_msg':
                     return '';
@@ -229,11 +236,10 @@ class MockGen {
                 case 'transient_guide_msg':
                 case 'prompting_msg':
                 case 'saying_msg':
-                case 'ui_only_markdown_msg':
                 case 'thinking_msg':
                 case 'func_result_msg':
                 case 'tellask_result_msg':
-                case 'tellask_carryover_result_msg':
+                case 'tellask_carryover_msg':
                     availableContents.push(msg.content);
                     break;
                 case 'func_call_msg':
@@ -301,17 +307,37 @@ class MockGen {
         if (!role) {
             throw new Error('role is required for mock response matching');
         }
-        const normalizedInput = input.trim().toLowerCase();
-        // Exact match only: "role:message"
-        const exactKey = `${role}:${normalizedInput}`;
-        const candidates = database.lookupMap.get(exactKey);
-        if (!candidates || candidates.length === 0) {
-            return null;
-        }
-        for (let i = candidates.length - 1; i >= 0; i--) {
-            const candidate = candidates[i];
-            if (candidate && this.responseMatchesContext(candidate, context)) {
-                return candidate;
+        const normalizedInputs = (() => {
+            const variants = new Set();
+            const trimmed = input.trim();
+            if (trimmed !== '') {
+                variants.add(trimmed.toLowerCase());
+            }
+            const hasRuntimeWrapper = RUNTIME_PROMPT_WRAPPER_PREFIXES.some((prefix) => trimmed.startsWith(prefix));
+            if (!hasRuntimeWrapper) {
+                return [...variants];
+            }
+            const separatorIndex = trimmed.indexOf('\n\n');
+            if (separatorIndex < 0) {
+                return [...variants];
+            }
+            const stripped = trimmed.slice(separatorIndex + 2).trim();
+            if (stripped !== '') {
+                variants.add(stripped.toLowerCase());
+            }
+            return [...variants];
+        })();
+        for (const normalizedInput of normalizedInputs) {
+            const exactKey = `${role}:${normalizedInput}`;
+            const candidates = database.lookupMap.get(exactKey);
+            if (!candidates || candidates.length === 0) {
+                continue;
+            }
+            for (let i = candidates.length - 1; i >= 0; i--) {
+                const candidate = candidates[i];
+                if (candidate && this.responseMatchesContext(candidate, context)) {
+                    return candidate;
+                }
             }
         }
         return null;
@@ -378,11 +404,10 @@ responses:
                         case 'transient_guide_msg':
                         case 'prompting_msg':
                         case 'saying_msg':
-                        case 'ui_only_markdown_msg':
                         case 'thinking_msg':
                         case 'func_result_msg':
                         case 'tellask_result_msg':
-                        case 'tellask_carryover_result_msg':
+                        case 'tellask_carryover_msg':
                             return acc + msg.content.length;
                         case 'func_call_msg':
                             return acc + msg.name.length + msg.arguments.length;
@@ -486,11 +511,10 @@ responses:
                             case 'transient_guide_msg':
                             case 'prompting_msg':
                             case 'saying_msg':
-                            case 'ui_only_markdown_msg':
                             case 'thinking_msg':
                             case 'func_result_msg':
                             case 'tellask_result_msg':
-                            case 'tellask_carryover_result_msg':
+                            case 'tellask_carryover_msg':
                                 return acc + msg.content.length;
                             case 'func_call_msg':
                                 return acc + msg.name.length + msg.arguments.length;

package/dist/llm/gen/openai-compatible.d.ts

@@ -7,6 +7,8 @@
  * - Many "OpenAI-compatible" providers implement the Chat Completions API but not the newer
  *   Responses API. Dominds' `apiType: openai` uses the Responses API; this generator targets
  *   chat-completions-only providers (e.g. Volcano Engine Ark `.../api/v3`).
+ * - Isolation principle: this wrapper may reuse the `model_params.openai.*` namespace, but it
+ *   still owns Chat Completions semantics and must not inherit Codex-specific request meanings.
  */
 import type { ChatCompletionMessageParam } from 'openai/resources/chat/completions';
 import type { Team } from '../../team';

package/dist/llm/gen/openai-compatible.js

@@ -8,6 +8,8 @@
  * - Many "OpenAI-compatible" providers implement the Chat Completions API but not the newer
  *   Responses API. Dominds' `apiType: openai` uses the Responses API; this generator targets
  *   chat-completions-only providers (e.g. Volcano Engine Ark `.../api/v3`).
+ * - Isolation principle: this wrapper may reuse the `model_params.openai.*` namespace, but it
+ *   still owns Chat Completions semantics and must not inherit Codex-specific request meanings.
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -55,15 +57,39 @@ function tryExtractChatUsage(usage) {
         totalTokens: typeof total === 'number' ? total : prompt + completion,
     };
 }
-function buildChatCompletionResponseFormat(openAiParams, jsonResponseEnabled) {
-    if (!jsonResponseEnabled)
+function buildChatCompletionResponseFormat(openAiParams) {
+    const textFormat = openAiParams.text_format;
+    if (textFormat === 'text' || textFormat === 'json_object') {
+        return { type: textFormat };
+    }
+    if (textFormat !== 'json_schema')
         return undefined;
-    return { type: 'json_object' };
-}
-function resolveOpenAiCompatibleJsonResponseEnabled(agent, openAiParams) {
-    if (openAiParams.json_response !== undefined)
-        return openAiParams.json_response;
-    return agent.model_params?.json_response === true;
+    const schemaName = openAiParams.text_format_json_schema_name?.trim();
+    const rawSchema = openAiParams.text_format_json_schema?.trim();
+    if (!schemaName || !rawSchema) {
+        throw new Error('Invalid openai text_format=json_schema: text_format_json_schema_name and text_format_json_schema are required.');
+    }
+    let parsedSchema;
+    try {
+        parsedSchema = JSON.parse(rawSchema);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Invalid openai text_format_json_schema: ${message}`);
+    }
+    if (!isRecord(parsedSchema)) {
+        throw new Error('Invalid openai text_format_json_schema: expected a JSON object at the top level.');
+    }
+    return {
+        type: 'json_schema',
+        json_schema: {
+            name: schemaName,
+            schema: parsedSchema,
+            ...(openAiParams.text_format_json_schema_strict !== undefined
+                ? { strict: openAiParams.text_format_json_schema_strict }
+                : {}),
+        },
+    };
 }
 function buildReasoningPayloadFromText(text) {
     if (text.trim().length === 0)
@@ -123,11 +149,10 @@ function chatMessageToChatCompletionMessage(msg) {
         case 'environment_msg':
         case 'prompting_msg':
         case 'tellask_result_msg':
-        case 'tellask_carryover_result_msg':
+        case 'tellask_carryover_msg':
             return { role: 'user', content: msg.content };
         case 'transient_guide_msg':
         case 'saying_msg':
-        case 'ui_only_markdown_msg':
         case 'thinking_msg':
             return { role: 'assistant', content: msg.content };
         case 'func_call_msg':
@@ -495,32 +520,22 @@ class OpenAiCompatibleGen {
         });
         const openAiParams = agent.model_params?.openai || {};
         const maxTokens = agent.model_params?.max_tokens;
-        const jsonResponseEnabled = resolveOpenAiCompatibleJsonResponseEnabled(agent, openAiParams);
         const modelInfo = providerConfig.models[agent.model];
         const outputLength = modelInfo?.output_length;
         const maxOutputTokens = maxTokens ?? openAiParams.max_tokens ?? outputLength ?? 1024;
         const parallelToolCalls = openAiParams.parallel_tool_calls ?? true;
-        const responseFormat = buildChatCompletionResponseFormat(openAiParams, jsonResponseEnabled);
+        const responseFormat = buildChatCompletionResponseFormat(openAiParams);
         const payload = {
             model: agent.model,
             messages,
             stream: true,
             stream_options: { include_usage: true },
             ...(openAiParams.service_tier !== undefined && { service_tier: openAiParams.service_tier }),
+            ...(openAiParams.safety_identifier !== undefined && {
+                safety_identifier: openAiParams.safety_identifier,
+            }),
             ...(openAiParams.temperature !== undefined && { temperature: openAiParams.temperature }),
             ...(openAiParams.top_p !== undefined && { top_p: openAiParams.top_p }),
-            ...(openAiParams.stop !== undefined && { stop: openAiParams.stop }),
-            ...(openAiParams.presence_penalty !== undefined && {
-                presence_penalty: openAiParams.presence_penalty,
-            }),
-            ...(openAiParams.frequency_penalty !== undefined && {
-                frequency_penalty: openAiParams.frequency_penalty,
-            }),
-            ...(openAiParams.seed !== undefined && { seed: openAiParams.seed }),
-            ...(openAiParams.logprobs !== undefined && { logprobs: openAiParams.logprobs }),
-            ...(openAiParams.top_logprobs !== undefined && { top_logprobs: openAiParams.top_logprobs }),
-            ...(openAiParams.logit_bias !== undefined && { logit_bias: openAiParams.logit_bias }),
-            ...(openAiParams.user !== undefined && { user: openAiParams.user }),
             ...(responseFormat !== undefined && { response_format: responseFormat }),
             ...(funcTools.length > 0
                 ? { tools: funcTools.map(funcToolToChatCompletionTool), tool_choice: 'auto' }
@@ -699,29 +714,19 @@ class OpenAiCompatibleGen {
         });
         const openAiParams = agent.model_params?.openai || {};
         const maxTokens = agent.model_params?.max_tokens;
-        const jsonResponseEnabled = resolveOpenAiCompatibleJsonResponseEnabled(agent, openAiParams);
         const modelInfo = providerConfig.models[agent.model];
         const outputLength = modelInfo?.output_length;
         const maxOutputTokens = maxTokens ?? openAiParams.max_tokens ?? outputLength ?? 1024;
         const parallelToolCalls = openAiParams.parallel_tool_calls ?? true;
-        const responseFormat = buildChatCompletionResponseFormat(openAiParams, jsonResponseEnabled);
+        const responseFormat = buildChatCompletionResponseFormat(openAiParams);
         const payload = {
             model: agent.model,
             messages,
+            ...(openAiParams.safety_identifier !== undefined && {
+                safety_identifier: openAiParams.safety_identifier,
+            }),
             ...(openAiParams.temperature !== undefined && { temperature: openAiParams.temperature }),
             ...(openAiParams.top_p !== undefined && { top_p: openAiParams.top_p }),
-            ...(openAiParams.stop !== undefined && { stop: openAiParams.stop }),
-            ...(openAiParams.presence_penalty !== undefined && {
-                presence_penalty: openAiParams.presence_penalty,
-            }),
-            ...(openAiParams.frequency_penalty !== undefined && {
-                frequency_penalty: openAiParams.frequency_penalty,
-            }),
-            ...(openAiParams.seed !== undefined && { seed: openAiParams.seed }),
-            ...(openAiParams.logprobs !== undefined && { logprobs: openAiParams.logprobs }),
-            ...(openAiParams.top_logprobs !== undefined && { top_logprobs: openAiParams.top_logprobs }),
-            ...(openAiParams.logit_bias !== undefined && { logit_bias: openAiParams.logit_bias }),
-            ...(openAiParams.user !== undefined && { user: openAiParams.user }),
             ...(responseFormat !== undefined && { response_format: responseFormat }),
             ...(funcTools.length > 0 && { tools: funcTools.map(funcToolToChatCompletionTool) }),
             tool_choice: 'auto',

package/dist/llm/gen/openai.d.ts

@@ -1,7 +1,9 @@
 /**
  * Module: llm/gen/openai
  *
- * OpenAI-compatible Responses API integration implementing streaming and batch generation.
+ * OpenAI Responses API integration implementing streaming and batch generation.
+ * Isolation principle: this wrapper owns OpenAI Responses request/stream semantics and must not
+ * inherit Codex-specific abstractions or parameter aliases.
  */
 import type { ResponseInputItem } from 'openai/resources/responses/responses';
 import type { Team } from '../../team';