@jsonstudio/llms 0.6.802 → 0.6.938

package/dist/servertool/handlers/gemini-empty-reply-continue.js

@@ -1,6 +1,7 @@
 import { registerServerToolHandler } from '../registry.js';
 import { cloneJson } from '../server-side-tools.js';
 import { isCompactionRequest } from './compaction-detect.js';
+import { buildResponsesRequestFromChat, captureResponsesContext, buildChatRequestFromResponses } from '../../conversion/responses/responses-openai-bridge.js';
 const FLOW_ID = 'gemini_empty_reply_continue';
 const handler = async (ctx) => {
     if (!ctx.options.reenterPipeline) {
@@ -31,41 +32,12 @@ const handler = async (ctx) => {
     if (!isAntigravity && !isGeminiCli) {
         return null;
     }
-    // 仅在 finish_reason=stop 且第一条消息内容为空、无 tool_calls 时触发。
+    // 支持两种客户端协议形状：
+    // - OpenAI Chat: choices[0].message.content
+    // - OpenAI Responses: output/output_text/status
     const base = ctx.base;
-    const choices = Array.isArray(base.choices) ? base.choices : [];
-    if (!choices.length) {
-        return null;
-    }
-    const firstRaw = choices[0];
-    if (!firstRaw || typeof firstRaw !== 'object') {
-        return null;
-    }
-    const first = firstRaw;
-    const finishReasonRaw = typeof first.finish_reason === 'string' && first.finish_reason.trim()
-        ? first.finish_reason.trim()
-        : '';
-    const finishReason = finishReasonRaw.toLowerCase();
-    const isStop = finishReason === 'stop';
-    const isMaxTokens = finishReason === 'length'; // 映射自 Gemini 的 MAX_TOKENS
-    if (!isStop && !isMaxTokens) {
-        return null;
-    }
-    const message = first.message && typeof first.message === 'object' && !Array.isArray(first.message)
-        ? first.message
-        : null;
-    if (!message) {
-        return null;
-    }
-    const contentRaw = message.content;
-    const contentText = typeof contentRaw === 'string' ? contentRaw.trim() : '';
-    // 对于 finish_reason=stop，仅在真正“空回复”时触发；
-    // 对于 finish_reason=length（MAX_TOKENS 截断），允许已有内容，视为需要自动续写。
-    if (isStop && contentText.length > 0) {
-        return null;
-    }
-    const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
-    if (toolCalls.length > 0) {
+    const emptyDecision = decideEmptyReply(base);
+    if (!emptyDecision.shouldTrigger) {
         return null;
     }
     // 统计连续空回复次数，超过上限后不再自动续写，而是返回一个可重试错误。
@@ -100,7 +72,8 @@ const handler = async (ctx) => {
             }
         };
     }
-    const followupPayload = buildContinueFollowupPayload(captured);
+    const assistantMessage = extractAssistantMessage(ctx.base);
+    const followupPayload = buildContinueFollowupPayload(captured, assistantMessage);
     if (!followupPayload) {
         return null;
     }
@@ -114,6 +87,9 @@ const handler = async (ctx) => {
                 metadata: {
                     serverToolFollowup: true,
                     stream: false,
+                    preserveRouteHint: false,
+                    disableStickyRoutes: true,
+                    serverToolOriginalEntryEndpoint: ctx.options.entryEndpoint,
                     geminiEmptyReplyCount: nextCount
                 }
             }
@@ -121,6 +97,115 @@ const handler = async (ctx) => {
     };
 };
 registerServerToolHandler('gemini_empty_reply_continue', handler, { trigger: 'auto' });
+function decideEmptyReply(base) {
+    // 1) OpenAI Chat shape
+    const choices = Array.isArray(base.choices) ? base.choices : [];
+    if (choices.length > 0) {
+        const firstRaw = choices[0];
+        if (!firstRaw || typeof firstRaw !== 'object') {
+            return { shouldTrigger: false };
+        }
+        const first = firstRaw;
+        const finishReasonRaw = typeof first.finish_reason === 'string' && first.finish_reason.trim()
+            ? first.finish_reason.trim()
+            : '';
+        const finishReason = finishReasonRaw.toLowerCase();
+        const isStop = finishReason === 'stop';
+        const isMaxTokens = finishReason === 'length'; // 映射自 Gemini 的 MAX_TOKENS
+        if (!isStop && !isMaxTokens) {
+            return { shouldTrigger: false };
+        }
+        const message = first.message && typeof first.message === 'object' && !Array.isArray(first.message)
+            ? first.message
+            : null;
+        if (!message) {
+            return { shouldTrigger: false };
+        }
+        const contentRaw = message.content;
+        const contentText = typeof contentRaw === 'string' ? contentRaw.trim() : '';
+        // 对于 finish_reason=stop，仅在真正“空回复”时触发；
+        // 对于 finish_reason=length（MAX_TOKENS 截断），允许已有内容，视为需要自动续写。
+        if (isStop && contentText.length > 0) {
+            return { shouldTrigger: false };
+        }
+        const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
+        if (toolCalls.length > 0) {
+            return { shouldTrigger: false };
+        }
+        return { shouldTrigger: true };
+    }
+    // 2) OpenAI Responses shape
+    const statusRaw = typeof base.status === 'string' ? base.status.trim().toLowerCase() : '';
+    if (statusRaw && statusRaw !== 'completed') {
+        return { shouldTrigger: false };
+    }
+    if (base.required_action && typeof base.required_action === 'object') {
+        return { shouldTrigger: false };
+    }
+    const outputText = extractResponsesOutputText(base);
+    if (outputText.length > 0) {
+        return { shouldTrigger: false };
+    }
+    const outputRaw = Array.isArray(base.output) ? base.output : [];
+    if (outputRaw.some((item) => hasToolLikeOutput(item))) {
+        return { shouldTrigger: false };
+    }
+    // 允许 output 为空或仅包含空消息：视作空回复，触发自动续写。
+    return { shouldTrigger: true };
+}
+function extractResponsesOutputText(base) {
+    const raw = base.output_text;
+    if (typeof raw === 'string') {
+        return raw.trim();
+    }
+    if (Array.isArray(raw)) {
+        const texts = raw
+            .map((entry) => (typeof entry === 'string' ? entry : ''))
+            .filter((entry) => entry.trim().length > 0);
+        if (texts.length > 0) {
+            return texts.join('\n').trim();
+        }
+    }
+    const output = Array.isArray(base.output) ? (base.output) : [];
+    const chunks = [];
+    for (const item of output) {
+        if (!item || typeof item !== 'object' || Array.isArray(item))
+            continue;
+        if (typeof item.type !== 'string')
+            continue;
+        const type = String(item.type).trim().toLowerCase();
+        if (type !== 'message')
+            continue;
+        const content = Array.isArray(item.content) ? (item.content) : [];
+        for (const part of content) {
+            if (!part || typeof part !== 'object' || Array.isArray(part))
+                continue;
+            const pType = typeof part.type === 'string'
+                ? String(part.type).trim().toLowerCase()
+                : '';
+            if (pType === 'output_text') {
+                const text = typeof part.text === 'string' ? String(part.text) : '';
+                if (text.trim().length)
+                    chunks.push(text.trim());
+            }
+        }
+    }
+    return chunks.join('\n').trim();
+}
+function hasToolLikeOutput(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return false;
+    }
+    const typeRaw = value.type;
+    const type = typeof typeRaw === 'string' ? typeRaw.trim().toLowerCase() : '';
+    if (!type) {
+        return false;
+    }
+    return (type === 'tool_call' ||
+        type === 'tool_use' ||
+        type === 'function_call' ||
+        type.includes('tool'));
+}
 function getCapturedRequest(adapterContext) {
     if (!adapterContext || typeof adapterContext !== 'object') {
         return null;
@@ -131,30 +216,111 @@ function getCapturedRequest(adapterContext) {
     }
     return captured;
 }
-function buildContinueFollowupPayload(source) {
+function extractChatSeedFromCapturedRequest(source) {
+    const model = typeof source.model === 'string' && source.model.trim()
+        ? source.model.trim()
+        : undefined;
+    const rawMessages = Array.isArray(source.messages)
+        ? source.messages
+        : null;
+    if (rawMessages) {
+        const tools = Array.isArray(source.tools)
+            ? cloneJson(source.tools)
+            : undefined;
+        return {
+            ...(model ? { model } : {}),
+            messages: cloneJson(rawMessages),
+            ...(tools ? { tools } : {})
+        };
+    }
+    const rawInput = Array.isArray(source.input)
+        ? source.input
+        : null;
+    if (rawInput) {
+        try {
+            const ctx = captureResponsesContext(source);
+            if (!ctx.isResponsesPayload) {
+                return null;
+            }
+            const rebuilt = buildChatRequestFromResponses(source, ctx).request;
+            const rebuiltModel = typeof rebuilt.model === 'string' && rebuilt.model.trim().length ? String(rebuilt.model).trim() : model;
+            const rebuiltMessages = Array.isArray(rebuilt.messages) ? rebuilt.messages : [];
+            const rebuiltTools = Array.isArray(rebuilt.tools) ? rebuilt.tools : undefined;
+            return {
+                ...(rebuiltModel ? { model: rebuiltModel } : {}),
+                messages: cloneJson(rebuiltMessages),
+                ...(rebuiltTools ? { tools: cloneJson(rebuiltTools) } : {})
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    return null;
+}
+function buildContinueFollowupPayload(source, assistant) {
     if (!source || typeof source !== 'object') {
         return null;
     }
-    const payload = {};
-    if (typeof source.model === 'string' && source.model.trim()) {
-        payload.model = source.model.trim();
+    const chatSeed = extractChatSeedFromCapturedRequest(source);
+    const model = chatSeed?.model;
+    const originalMessages = chatSeed?.messages ? cloneJson(chatSeed.messages) : [];
+    const originalTools = chatSeed?.tools ? cloneJson(chatSeed.tools) : undefined;
+    const originalParameters = (() => {
+        const direct = source.parameters;
+        if (direct && typeof direct === 'object' && !Array.isArray(direct)) {
+            return cloneJson(direct);
+        }
+        // Backward/compat: captured request might be a raw `/v1/responses` payload with
+        // top-level parameters (max_output_tokens, temperature, ...), not nested under `parameters`.
+        const record = source;
+        const allowed = new Set([
+            'temperature',
+            'top_p',
+            'max_output_tokens',
+            'seed',
+            'logit_bias',
+            'user',
+            'parallel_tool_calls',
+            'tool_choice',
+            'response_format',
+            'stream'
+        ]);
+        const out = {};
+        if (record.max_output_tokens === undefined && record.max_tokens !== undefined) {
+            out.max_output_tokens = record.max_tokens;
+        }
+        for (const key of Object.keys(record)) {
+            if (!allowed.has(key))
+                continue;
+            out[key] = record[key];
+        }
+        return Object.keys(out).length ? cloneJson(out) : undefined;
+    })();
+    const parametersForFollowup = originalParameters
+        ? (() => {
+            const cloned = cloneJson(originalParameters);
+            delete cloned.stream;
+            return cloned;
+        })()
+        : undefined;
+    const messages = [...originalMessages];
+    if (assistant && typeof assistant === 'object' && !Array.isArray(assistant)) {
+        messages.push(cloneJson(assistant));
     }
-    const rawMessages = source.messages;
-    const messages = Array.isArray(rawMessages) ? cloneJson(rawMessages) : [];
     messages.push({
         role: 'user',
         content: '继续执行'
     });
-    payload.messages = messages;
-    if (Array.isArray(source.tools) && source.tools.length) {
-        payload.tools = cloneJson(source.tools);
-    }
-    const parameters = source.parameters;
-    if (parameters && typeof parameters === 'object' && !Array.isArray(parameters)) {
-        const params = cloneJson(parameters);
-        Object.assign(payload, params);
-    }
-    return payload;
+    const chatPayload = {
+        ...(model ? { model } : {}),
+        messages,
+        ...(originalTools ? { tools: originalTools } : {})
+    };
+    return buildResponsesRequestFromChat(chatPayload, {
+        stream: false,
+        ...(parametersForFollowup ? { parameters: parametersForFollowup } : {})
+    }).request;
 }
 function hasCompactionFlag(record) {
     const flag = record.compactionRequest;
@@ -166,3 +332,38 @@ function hasCompactionFlag(record) {
     }
     return false;
 }
+function extractAssistantMessage(baseResponse) {
+    if (!baseResponse || typeof baseResponse !== 'object' || Array.isArray(baseResponse)) {
+        return null;
+    }
+    const base = baseResponse;
+    // OpenAI Chat shape
+    const choices = Array.isArray(base.choices) ? base.choices : [];
+    if (choices.length > 0) {
+        const first = choices[0] && typeof choices[0] === 'object' && !Array.isArray(choices[0])
+            ? choices[0]
+            : null;
+        const msg = first &&
+            first.message &&
+            typeof first.message === 'object' &&
+            !Array.isArray(first.message)
+            ? first.message
+            : null;
+        if (msg) {
+            const content = typeof msg.content === 'string' ? msg.content.trim() : '';
+            if (!content) {
+                return null;
+            }
+            return cloneJson(msg);
+        }
+    }
+    // OpenAI Responses shape
+    const outputText = extractResponsesOutputText(base);
+    if (outputText.length > 0) {
+        return {
+            role: 'assistant',
+            content: outputText
+        };
+    }
+    return null;
+}

package/dist/servertool/handlers/iflow-model-error-retry.js

@@ -1,6 +1,6 @@
 import { registerServerToolHandler } from '../registry.js';
-import { cloneJson } from '../server-side-tools.js';
 import { isCompactionRequest } from './compaction-detect.js';
+import { buildEntryAwareFollowupPayload, extractCapturedChatSeed } from './followup-request-builder.js';
 const FLOW_ID = 'iflow_model_error_retry';
 const handler = async (ctx) => {
     if (!ctx.options.reenterPipeline) {
@@ -46,7 +46,7 @@ const handler = async (ctx) => {
     if (isCompactionRequest(captured)) {
         return null;
     }
-    const followupPayload = buildRetryFollowupPayload(captured);
+    const followupPayload = buildRetryFollowupPayload(captured, ctx.options.entryEndpoint || ctx.adapterContext?.entryEndpoint || '/v1/chat/completions');
     if (!followupPayload) {
         return null;
     }
@@ -75,28 +75,18 @@ function getCapturedRequest(adapterContext) {
     }
     return captured;
 }
-function buildRetryFollowupPayload(source) {
-    if (!source || typeof source !== 'object') {
+function buildRetryFollowupPayload(source, entryEndpoint) {
+    const seed = extractCapturedChatSeed(source);
+    if (!seed) {
         return null;
     }
-    const payload = {};
-    if (typeof source.model === 'string' && source.model.trim()) {
-        payload.model = source.model.trim();
-    }
-    const rawMessages = source.messages;
-    if (Array.isArray(rawMessages)) {
-        payload.messages = cloneJson(rawMessages);
-    }
-    const rawTools = source.tools;
-    if (Array.isArray(rawTools) && rawTools.length) {
-        payload.tools = cloneJson(rawTools);
-    }
-    const parameters = source.parameters;
-    if (parameters && typeof parameters === 'object' && !Array.isArray(parameters)) {
-        const params = cloneJson(parameters);
-        Object.assign(payload, params);
-    }
-    return payload;
+    return buildEntryAwareFollowupPayload({
+        entryEndpoint,
+        model: seed.model,
+        messages: seed.messages,
+        ...(seed.tools ? { tools: seed.tools } : {}),
+        ...(seed.parameters ? { parameters: seed.parameters } : {})
+    });
 }
 function hasCompactionFlag(record) {
     const flag = record.compactionRequest;