@jsonstudio/llms 0.6.938 → 0.6.1164

package/dist/servertool/handlers/followup-request-builder.js

@@ -1,6 +1,6 @@
-import { buildAnthropicRequestFromOpenAIChat } from '../../conversion/codecs/anthropic-openai-codec.js';
-import { buildChatRequestFromResponses, buildResponsesRequestFromChat, captureResponsesContext } from '../../conversion/responses/responses-openai-bridge.js';
+import { buildChatRequestFromResponses, captureResponsesContext } from '../../conversion/responses/responses-openai-bridge.js';
 import { cloneJson } from '../server-side-tools.js';
+import { trimOpenAiMessagesForFollowup } from './followup-message-trimmer.js';
 function extractResponsesTopLevelParameters(record) {
     const allowed = new Set([
         'temperature',
@@ -79,32 +79,6 @@ export function normalizeFollowupParameters(value) {
     delete cloned.stream;
     return Object.keys(cloned).length ? cloned : undefined;
 }
-export function buildEntryAwareFollowupPayload(args) {
-    const chatPayload = {
-        ...(args.model ? { model: args.model } : {}),
-        messages: args.messages,
-        ...(args.tools ? { tools: args.tools } : {})
-    };
-    const normalizedEntry = typeof args.entryEndpoint === 'string' ? args.entryEndpoint.trim().toLowerCase() : '';
-    if (normalizedEntry.includes('/v1/responses')) {
-        return buildResponsesRequestFromChat(chatPayload, {
-            stream: false,
-            ...(args.parameters ? { parameters: args.parameters } : {})
-        }).request;
-    }
-    if (normalizedEntry.includes('/v1/messages')) {
-        const anthropicChatPayload = {
-            ...chatPayload,
-            ...(args.parameters ? args.parameters : {})
-        };
-        return buildAnthropicRequestFromOpenAIChat(anthropicChatPayload);
-    }
-    const openaiChatPayload = {
-        ...chatPayload,
-        ...(args.parameters ? args.parameters : {})
-    };
-    return openaiChatPayload;
-}
 export function dropToolByFunctionName(tools, dropName) {
     const name = typeof dropName === 'string' ? dropName.trim() : '';
     if (!tools || !tools.length || !name) {
@@ -120,3 +94,249 @@ export function dropToolByFunctionName(tools, dropName) {
         return toolName !== name;
     });
 }
+function extractAssistantMessageFromChatLike(chatResponse) {
+    if (!chatResponse || typeof chatResponse !== 'object') {
+        return null;
+    }
+    const choices = Array.isArray(chatResponse.choices)
+        ? chatResponse.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) {
+            return cloneJson(msg);
+        }
+    }
+    // Responses-like fallback: try output_text.
+    const outputText = chatResponse.output_text;
+    if (typeof outputText === 'string' && outputText.trim().length) {
+        return { role: 'assistant', content: outputText.trim() };
+    }
+    return null;
+}
+function buildToolMessagesFromToolOutputs(chatResponse) {
+    const toolOutputs = Array.isArray(chatResponse.tool_outputs)
+        ? chatResponse.tool_outputs
+        : [];
+    const messages = [];
+    for (const entry of toolOutputs) {
+        if (!entry || typeof entry !== 'object' || Array.isArray(entry))
+            continue;
+        const record = entry;
+        const toolCallId = typeof record.tool_call_id === 'string' ? record.tool_call_id : undefined;
+        if (!toolCallId)
+            continue;
+        const name = typeof record.name === 'string' && record.name.trim() ? record.name.trim() : 'tool';
+        const rawContent = record.content;
+        let contentText;
+        if (typeof rawContent === 'string') {
+            contentText = rawContent;
+        }
+        else {
+            try {
+                contentText = JSON.stringify(rawContent ?? {});
+            }
+            catch {
+                contentText = String(rawContent ?? '');
+            }
+        }
+        messages.push({
+            role: 'tool',
+            tool_call_id: toolCallId,
+            name,
+            content: contentText
+        });
+    }
+    return messages;
+}
+function injectVisionSummaryIntoMessages(source, summary) {
+    const messages = Array.isArray(source) ? cloneJson(source) : [];
+    let injected = false;
+    for (const message of messages) {
+        if (!message || typeof message !== 'object')
+            continue;
+        const content = message.content;
+        if (!Array.isArray(content))
+            continue;
+        const nextParts = [];
+        let removed = false;
+        for (const part of content) {
+            if (part && typeof part === 'object') {
+                const typeValue = typeof part.type === 'string'
+                    ? String(part.type).toLowerCase()
+                    : '';
+                if (typeValue.includes('image')) {
+                    removed = true;
+                    continue;
+                }
+            }
+            nextParts.push(part);
+        }
+        if (removed) {
+            nextParts.push({
+                type: 'text',
+                text: `[Vision] ${summary}`
+            });
+            message.content = nextParts;
+            injected = true;
+        }
+    }
+    if (!injected) {
+        for (let i = messages.length - 1; i >= 0; i -= 1) {
+            const msg = messages[i];
+            if (!msg || typeof msg !== 'object')
+                continue;
+            const role = typeof msg.role === 'string'
+                ? String(msg.role).toLowerCase()
+                : '';
+            if (role !== 'user')
+                continue;
+            const content = msg.content;
+            if (Array.isArray(content)) {
+                content.push({
+                    type: 'text',
+                    text: `[Vision] ${summary}`
+                });
+                injected = true;
+                break;
+            }
+            if (typeof content === 'string' && content.length) {
+                msg.content = `${content}\n[Vision] ${summary}`;
+            }
+            else {
+                msg.content = `[Vision] ${summary}`;
+            }
+            injected = true;
+            break;
+        }
+    }
+    if (!injected) {
+        messages.push({
+            role: 'user',
+            content: `[Vision] ${summary}`
+        });
+    }
+    return messages;
+}
+function injectSystemTextIntoMessages(source, text) {
+    const messages = Array.isArray(source) ? cloneJson(source) : [];
+    const content = typeof text === 'string' ? text : '';
+    if (!content.trim().length) {
+        return messages;
+    }
+    const sys = { role: 'system', content };
+    let insertAt = 0;
+    while (insertAt < messages.length) {
+        const msg = messages[insertAt];
+        const role = msg && typeof msg === 'object' && !Array.isArray(msg) && typeof msg.role === 'string'
+            ? String(msg.role).trim().toLowerCase()
+            : '';
+        if (role === 'system') {
+            insertAt += 1;
+            continue;
+        }
+        break;
+    }
+    messages.splice(insertAt, 0, sys);
+    return messages;
+}
+/**
+ * Build a canonical followup request body from injection ops.
+ *
+ * Important: this returns a protocol-agnostic "chat-like" payload:
+ * { model, messages, tools?, parameters? }
+ *
+ * The followup is expected to re-enter HubPipeline at the chat-process entry,
+ * so we must not convert to /v1/responses or /v1/messages here.
+ */
+export function buildServerToolFollowupChatPayloadFromInjection(args) {
+    const captured = args.adapterContext && typeof args.adapterContext === 'object'
+        ? args.adapterContext.capturedChatRequest
+        : undefined;
+    const seed = extractCapturedChatSeed(captured);
+    if (!seed) {
+        return null;
+    }
+    if (!seed.model || typeof seed.model !== 'string' || !seed.model.trim()) {
+        return null;
+    }
+    let messages = Array.isArray(seed.messages) ? cloneJson(seed.messages) : [];
+    let tools = seed.tools ? cloneJson(seed.tools) : undefined;
+    const parameters = seed.parameters ? cloneJson(seed.parameters) : undefined;
+    const ops = Array.isArray(args.injection?.ops) ? args.injection.ops : [];
+    for (const op of ops) {
+        if (!op || typeof op !== 'object')
+            continue;
+        if (op.op === 'trim_openai_messages') {
+            const maxNonSystemMessages = typeof op.maxNonSystemMessages === 'number'
+                ? op.maxNonSystemMessages
+                : 16;
+            messages = trimOpenAiMessagesForFollowup(messages, { maxNonSystemMessages });
+            continue;
+        }
+        if (op.op === 'append_assistant_message') {
+            const required = op.required !== false;
+            const msg = extractAssistantMessageFromChatLike(args.chatResponse);
+            if (!msg) {
+                if (required)
+                    return null;
+                continue;
+            }
+            messages.push(msg);
+            continue;
+        }
+        if (op.op === 'append_tool_messages_from_tool_outputs') {
+            const required = op.required !== false;
+            const toolMessages = buildToolMessagesFromToolOutputs(args.chatResponse);
+            if (!toolMessages.length) {
+                if (required)
+                    return null;
+                continue;
+            }
+            messages.push(...toolMessages);
+            continue;
+        }
+        if (op.op === 'inject_system_text') {
+            const text = typeof op.text === 'string' ? String(op.text) : '';
+            if (text.trim().length) {
+                messages = injectSystemTextIntoMessages(messages, text.trim());
+            }
+            continue;
+        }
+        if (op.op === 'append_user_text') {
+            const text = typeof op.text === 'string' ? String(op.text) : '';
+            if (text.trim().length) {
+                messages.push({ role: 'user', content: text });
+            }
+            continue;
+        }
+        if (op.op === 'drop_tool_by_name') {
+            const name = typeof op.name === 'string' ? String(op.name) : '';
+            if (name.trim().length) {
+                tools = dropToolByFunctionName(tools, name.trim());
+            }
+            continue;
+        }
+        if (op.op === 'inject_vision_summary') {
+            const summary = typeof op.summary === 'string' ? String(op.summary) : '';
+            if (summary.trim().length) {
+                messages = injectVisionSummaryIntoMessages(messages, summary.trim());
+            }
+            continue;
+        }
+    }
+    return {
+        model: seed.model,
+        messages,
+        ...(tools ? { tools } : {}),
+        ...(parameters ? { parameters } : {})
+    };
+}

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

@@ -1,10 +1,9 @@
 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';
+import { extractCapturedChatSeed } from './followup-request-builder.js';
 const FLOW_ID = 'gemini_empty_reply_continue';
 const handler = async (ctx) => {
-    if (!ctx.options.reenterPipeline) {
+    if (!ctx.capabilities.reenterPipeline) {
         return null;
     }
     // 避免在 followup 请求里再次触发，防止循环。
@@ -17,10 +16,10 @@ const handler = async (ctx) => {
         return null;
     }
     // 仅针对 gemini-chat 协议 + antigravity.* providerKey 的 /v1/responses 路径启用。
-    if (ctx.options.providerProtocol !== 'gemini-chat') {
+    if (ctx.providerProtocol !== 'gemini-chat') {
         return null;
     }
-    const entryEndpoint = (ctx.options.entryEndpoint || '').toLowerCase();
+    const entryEndpoint = (ctx.entryEndpoint || '').toLowerCase();
     if (!entryEndpoint.includes('/v1/responses')) {
         return null;
     }
@@ -53,6 +52,10 @@ const handler = async (ctx) => {
     if (isCompactionRequest(captured)) {
         return null;
     }
+    const seed = extractCapturedChatSeed(captured);
+    if (!seed) {
+        return null;
+    }
     // 超过最多 3 次空回复：返回一个 HTTP_HANDLER_ERROR 形状的错误，交由上层错误中心处理。
     if (nextCount > 3) {
         const errorChat = {
@@ -66,34 +69,37 @@ const handler = async (ctx) => {
             }
         };
         return {
-            chatResponse: errorChat,
-            execution: {
-                flowId: FLOW_ID
-            }
+            flowId: FLOW_ID,
+            finalize: async () => ({
+                chatResponse: errorChat,
+                execution: {
+                    flowId: FLOW_ID
+                }
+            })
         };
     }
-    const assistantMessage = extractAssistantMessage(ctx.base);
-    const followupPayload = buildContinueFollowupPayload(captured, assistantMessage);
-    if (!followupPayload) {
-        return null;
-    }
+    const assistantMessage = extractAssistantMessageForFollowup(ctx.base);
     return {
-        chatResponse: ctx.base,
-        execution: {
-            flowId: FLOW_ID,
-            followup: {
-                requestIdSuffix: ':continue',
-                payload: followupPayload,
-                metadata: {
-                    serverToolFollowup: true,
-                    stream: false,
-                    preserveRouteHint: false,
-                    disableStickyRoutes: true,
-                    serverToolOriginalEntryEndpoint: ctx.options.entryEndpoint,
-                    geminiEmptyReplyCount: nextCount
+        flowId: FLOW_ID,
+        finalize: async () => ({
+            chatResponse: ctx.base,
+            execution: {
+                flowId: FLOW_ID,
+                followup: {
+                    requestIdSuffix: ':continue',
+                    entryEndpoint: ctx.entryEndpoint,
+                    injection: {
+                        ops: [
+                            { op: 'append_assistant_message', required: false },
+                            { op: 'append_user_text', text: '继续执行' }
+                        ]
+                    },
+                    metadata: {
+                        geminiEmptyReplyCount: nextCount
+                    }
                 }
             }
-        }
+        })
     };
 };
 registerServerToolHandler('gemini_empty_reply_continue', handler, { trigger: 'auto' });
@@ -153,6 +159,34 @@ function decideEmptyReply(base) {
     // 允许 output 为空或仅包含空消息：视作空回复，触发自动续写。
     return { shouldTrigger: true };
 }
+function extractAssistantMessageForFollowup(chatResponse) {
+    if (!chatResponse || typeof chatResponse !== 'object' || Array.isArray(chatResponse)) {
+        return null;
+    }
+    const choices = Array.isArray(chatResponse.choices)
+        ? chatResponse.choices
+        : [];
+    if (!choices.length) {
+        return null;
+    }
+    const first = choices[0];
+    if (!first || typeof first !== 'object' || Array.isArray(first)) {
+        return null;
+    }
+    const message = first.message;
+    if (!message || typeof message !== 'object' || Array.isArray(message)) {
+        return null;
+    }
+    const role = typeof message.role === 'string' ? String(message.role) : '';
+    if (role && role.toLowerCase() !== 'assistant') {
+        return null;
+    }
+    const content = message.content;
+    if (typeof content !== 'string' || !content.trim()) {
+        return null;
+    }
+    return { role: 'assistant', content: content.trim() };
+}
 function extractResponsesOutputText(base) {
     const raw = base.output_text;
     if (typeof raw === 'string') {
@@ -216,112 +250,6 @@ function getCapturedRequest(adapterContext) {
     }
     return captured;
 }
-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 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));
-    }
-    messages.push({
-        role: 'user',
-        content: '继续执行'
-    });
-    const chatPayload = {
-        ...(model ? { model } : {}),
-        messages,
-        ...(originalTools ? { tools: originalTools } : {})
-    };
-    return buildResponsesRequestFromChat(chatPayload, {
-        stream: false,
-        ...(parametersForFollowup ? { parameters: parametersForFollowup } : {})
-    }).request;
-}
 function hasCompactionFlag(record) {
     const flag = record.compactionRequest;
     if (flag === true) {
@@ -332,38 +260,3 @@ 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,9 +1,9 @@
 import { registerServerToolHandler } from '../registry.js';
 import { isCompactionRequest } from './compaction-detect.js';
-import { buildEntryAwareFollowupPayload, extractCapturedChatSeed } from './followup-request-builder.js';
+import { extractCapturedChatSeed } from './followup-request-builder.js';
 const FLOW_ID = 'iflow_model_error_retry';
 const handler = async (ctx) => {
-    if (!ctx.options.reenterPipeline) {
+    if (!ctx.capabilities.reenterPipeline) {
         return null;
     }
     const adapterRecord = ctx.adapterContext;
@@ -16,10 +16,10 @@ const handler = async (ctx) => {
         return null;
     }
     // 仅针对 openai-chat 协议 + iflow.* providerKey 的 /v1/responses 路径启用。
-    if (ctx.options.providerProtocol !== 'openai-chat') {
+    if (ctx.providerProtocol !== 'openai-chat') {
         return null;
     }
-    const entryEndpoint = (ctx.options.entryEndpoint || '').toLowerCase();
+    const entryEndpoint = (ctx.entryEndpoint || '').toLowerCase();
     if (!entryEndpoint.includes('/v1/responses')) {
         return null;
     }
@@ -46,22 +46,25 @@ const handler = async (ctx) => {
     if (isCompactionRequest(captured)) {
         return null;
     }
-    const followupPayload = buildRetryFollowupPayload(captured, ctx.options.entryEndpoint || ctx.adapterContext?.entryEndpoint || '/v1/chat/completions');
-    if (!followupPayload) {
+    const seed = extractCapturedChatSeed(captured);
+    if (!seed) {
         return null;
     }
     return {
-        chatResponse: ctx.base,
-        execution: {
-            flowId: FLOW_ID,
-            followup: {
-                requestIdSuffix: ':retry',
-                payload: followupPayload,
-                metadata: {
-                    serverToolFollowup: true
+        flowId: FLOW_ID,
+        finalize: async () => ({
+            chatResponse: ctx.base,
+            execution: {
+                flowId: FLOW_ID,
+                followup: {
+                    requestIdSuffix: ':retry',
+                    entryEndpoint: ctx.entryEndpoint,
+                    injection: {
+                        ops: []
+                    }
                 }
             }
-        }
+        })
     };
 };
 registerServerToolHandler('iflow_model_error_retry', handler, { trigger: 'auto' });
@@ -75,19 +78,6 @@ function getCapturedRequest(adapterContext) {
     }
     return captured;
 }
-function buildRetryFollowupPayload(source, entryEndpoint) {
-    const seed = extractCapturedChatSeed(source);
-    if (!seed) {
-        return null;
-    }
-    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;
     if (flag === true) {

package/dist/servertool/handlers/recursive-detection-guard.d.ts

@@ -0,0 +1 @@
+export {};