@jsonstudio/llms 0.6.1449 → 0.6.1643

package/dist/conversion/hub/process/chat-process.js

@@ -3,8 +3,10 @@ import { ToolGovernanceEngine } from '../tool-governance/index.js';
 import { readRuntimeMetadata } from '../../shared/runtime-metadata.js';
 import { ensureApplyPatchSchema } from '../../shared/tool-mapping.js';
 import { normalizeApplyPatchToolCallsOnRequest } from '../../shared/tool-governor.js';
+import { buildAnthropicToolAliasMap } from '../../shared/anthropic-message-utils.js';
 import { clearClockSession, resolveClockConfig, reserveDueTasksForRequest, startClockDaemonIfNeeded } from '../../../servertool/clock/task-store.js';
 import { logClock } from '../../../servertool/clock/log.js';
+import { buildTimeTagLine, getClockTimeSnapshot } from '../../../servertool/clock/ntp.js';
 import { clearPendingServerToolInjection, loadPendingServerToolInjection } from '../../../servertool/pending-session.js';
 import { isJsonObject } from '../types/json.js';
 import { applyHubOperations } from '../ops/operations.js';
@@ -38,6 +40,35 @@ async function applyRequestToolGovernance(request, context) {
     const metadataToolHints = metadata.toolFilterHints;
     const metadataStreamFlag = metadata.stream;
     const inboundStreamIntent = typeof metadataStreamFlag === 'boolean' ? metadataStreamFlag : request.parameters?.stream === true;
+    // /v1/messages: preserve the caller's tool naming (Bash/Glob/Read, etc.) so we can
+    // remap tool calls back to the client protocol shape after routing through providers
+    // that canonicalize tool names (e.g. OpenAI function names lowercased).
+    //
+    // NOTE: This is mappable semantics and must live in request.semantics (never metadata).
+    try {
+        if (entryEndpoint.toLowerCase().includes('/v1/messages')) {
+            request.semantics = request.semantics && typeof request.semantics === 'object' && !Array.isArray(request.semantics)
+                ? request.semantics
+                : {};
+            const semanticsTools = request.semantics.tools && typeof request.semantics.tools === 'object' && !Array.isArray(request.semantics.tools)
+                ? request.semantics.tools
+                : (request.semantics.tools = {});
+            const hasAlias = isJsonObject(semanticsTools.toolNameAliasMap) ||
+                isJsonObject(semanticsTools.toolAliasMap);
+            if (!hasAlias) {
+                const sourceTools = Array.isArray(semanticsTools.clientToolsRaw) && semanticsTools.clientToolsRaw.length
+                    ? semanticsTools.clientToolsRaw
+                    : request.tools;
+                const aliasMap = buildAnthropicToolAliasMap(sourceTools);
+                if (aliasMap) {
+                    semanticsTools.toolNameAliasMap = aliasMap;
+                }
+            }
+        }
+    }
+    catch {
+        // best-effort: never block request handling due to alias map propagation failures
+    }
     const shaped = {
         model: request.model,
         messages: deepClone(request.messages),
@@ -287,23 +318,31 @@ function stripHistoricalImageAttachments(messages) {
     if (!Array.isArray(messages) || !messages.length) {
         return messages;
     }
-    // 找到最新一条 user 消息，仅允许该消息保留图片分段；
-    // 更早的 user 消息中若存在图片，则移除其 image* 分段，保留纯文本与非图片内容。
+    const placeholderText = '[Image omitted]';
+    const last = messages[messages.length - 1];
+    const lastRole = typeof last?.role === 'string' ? String(last.role) : '';
+    const isNewUserTurn = lastRole === 'user';
+    // 找到最新一条 user 消息：
+    // - 若本轮是 user 输入（最后一条消息 role=user），则仅允许这一条保留图片分段；
+    // - 若本轮是 followup（最后一条消息非 user，例如 tool/assistant），则所有 user 消息的图片都应替换为占位符，
+    //   避免在工具循环/多次 followup 中反复透传大体积图片数据。
     let latestUserIndex = -1;
-    for (let idx = messages.length - 1; idx >= 0; idx -= 1) {
-        const candidate = messages[idx];
-        if (candidate && typeof candidate === 'object' && candidate.role === 'user') {
-            latestUserIndex = idx;
-            break;
+    if (isNewUserTurn) {
+        for (let idx = messages.length - 1; idx >= 0; idx -= 1) {
+            const candidate = messages[idx];
+            if (candidate && typeof candidate === 'object' && candidate.role === 'user') {
+                latestUserIndex = idx;
+                break;
+            }
+        }
+        if (latestUserIndex < 0) {
+            return messages;
         }
-    }
-    if (latestUserIndex < 0) {
-        return messages;
     }
     let changed = false;
     const next = messages.slice();
     for (let idx = 0; idx < messages.length; idx += 1) {
-        if (idx === latestUserIndex) {
+        if (isNewUserTurn && idx === latestUserIndex) {
             continue;
         }
         const message = messages[idx];
@@ -324,6 +363,7 @@ function stripHistoricalImageAttachments(messages) {
                 const typeValue = part.type;
                 if (typeof typeValue === 'string' && typeValue.toLowerCase().includes('image')) {
                     removed = true;
+                    filtered.push({ type: 'text', text: placeholderText });
                     continue;
                 }
             }
@@ -344,19 +384,13 @@ function containsImageAttachment(messages) {
     if (!Array.isArray(messages) || !messages.length) {
         return false;
     }
-    // 仅检查当前请求中「最新一条 user 消息」是否携带图片，避免历史对话中的图片导致后续轮次反复触发。
-    let latestUser;
-    for (let idx = messages.length - 1; idx >= 0; idx -= 1) {
-        const candidate = messages[idx];
-        if (candidate && typeof candidate === 'object' && candidate.role === 'user') {
-            latestUser = candidate;
-            break;
-        }
-    }
-    if (!latestUser) {
+    // 仅检查“当前这一轮用户输入”（messages 最后一条必须是 user）是否携带图片。
+    // 避免在 tool/assistant followup 请求中，因为历史 user 消息含图片而反复触发 image 标记。
+    const last = messages[messages.length - 1];
+    if (!last || typeof last !== 'object' || Array.isArray(last) || last.role !== 'user') {
         return false;
     }
-    const content = latestUser.content;
+    const content = last.content;
     if (!Array.isArray(content)) {
         return false;
     }
@@ -628,8 +662,8 @@ function buildClockOperations(metadata) {
         properties: {
             action: {
                 type: 'string',
-                enum: ['schedule', 'list', 'cancel', 'clear'],
-                description: 'Schedule, list, cancel, or clear session-scoped reminders.'
+                enum: ['get', 'schedule', 'list', 'cancel', 'clear'],
+                description: 'Get current time, or schedule/list/cancel/clear session-scoped reminders.'
             },
             items: {
                 type: 'array',
@@ -674,7 +708,7 @@ function buildClockOperations(metadata) {
         type: 'function',
         function: {
             name: 'clock',
-            description: 'Schedule session-scoped reminders. Use schedule/list/cancel/clear. Scheduled reminders will be injected into future requests as [scheduled task:"..."].',
+            description: 'Time + Alarm for this session. Use get/schedule/list/cancel/clear. Scheduled reminders will be injected into future requests.',
             parameters,
             strict: true
         }
@@ -766,14 +800,14 @@ async function maybeInjectClockRemindersAndApplyDirectives(request, metadata, re
     const lastUserIdx = findLastUserMessageIndex(messages);
     // 1) Apply <**clock:clear**> directive (latest user message only).
     let hadClear = false;
-    let nextMessages = messages;
+    let baseMessages = messages;
     if (lastUserIdx >= 0) {
         const lastUser = messages[lastUserIdx];
         const stripped = stripClockClearDirectiveFromContent(lastUser.content);
         hadClear = stripped.hadClear;
         if (hadClear) {
-            nextMessages = messages.slice();
-            nextMessages[lastUserIdx] = { ...lastUser, content: stripped.next };
+            baseMessages = messages.slice();
+            baseMessages[lastUserIdx] = { ...lastUser, content: stripped.next };
         }
     }
     if (hadClear) {
@@ -786,50 +820,249 @@ async function maybeInjectClockRemindersAndApplyDirectives(request, metadata, re
                 // best-effort: user directive should not crash request
             }
         }
-        return { ...request, messages: nextMessages };
-    }
-    // 2) Inject due reminders as a system message + attach reservation for response-side commit.
-    if (!sessionId) {
-        return request;
-    }
-    try {
-        const { reservation, injectText } = await reserveDueTasksForRequest({
-            reservationId: `${requestId}:clock`,
-            sessionId,
-            config: clockConfig
-        });
-        if (!reservation || typeof injectText !== 'string' || !injectText.trim()) {
-            return request;
+        // Continue: still inject per-request time tag (but skip due reminders).
+    }
+    // 2) Inject due reminders as a user message + attach reservation for response-side commit.
+    let reservation = null;
+    let dueInjectText = '';
+    if (!hadClear && sessionId) {
+        try {
+            const reserved = await reserveDueTasksForRequest({
+                reservationId: `${requestId}:clock`,
+                sessionId,
+                config: clockConfig,
+                requestId
+            });
+            reservation = reserved.reservation;
+            dueInjectText = typeof reserved.injectText === 'string' ? reserved.injectText.trim() : '';
         }
-        logClock('inject_due', {
-            sessionId,
-            reservationId: reservation.reservationId,
-            taskIds: Array.isArray(reservation.taskIds) ? reservation.taskIds.length : 0
-        });
-        const baseMetadata = request.metadata && typeof request.metadata === 'object'
-            ? request.metadata
-            : {
-                originalEndpoint: readString(metadata.originalEndpoint) ?? '/v1/chat/completions'
-            };
+        catch {
+            // best-effort
+            reservation = null;
+            dueInjectText = '';
+        }
+    }
+    const dueUserMessage = (() => {
+        if (!reservation || !dueInjectText)
+            return null;
         return {
-            ...request,
-            messages: [
-                ...messages,
-                {
-                    role: 'system',
-                    content: injectText.trim()
-                }
-            ],
-            metadata: {
-                ...baseMetadata,
-                __clockReservation: reservation
-            }
+            role: 'user',
+            content: [
+                '[Clock Reminder]: scheduled tasks are due.',
+                dueInjectText,
+                'You may call tools to complete these tasks. If the tool list is incomplete, standard tools have been injected.'
+            ].join('\n')
         };
+    })();
+    // 3) When we have due tasks, ensure a standard tool set is present (best-effort).
+    let nextRequest = request;
+    if (dueUserMessage) {
+        const ensureToolsOps = buildClockStandardToolsOperations();
+        nextRequest = applyHubOperations(nextRequest, ensureToolsOps);
+    }
+    // 4) Per-request time injection (user time tag or paired clock.get tool result).
+    let snapshot = null;
+    try {
+        snapshot = await getClockTimeSnapshot();
     }
     catch {
-        // best-effort: never break request due to reminder injection failures
-        return request;
-    }
+        snapshot = null;
+    }
+    const timeTagLine = snapshot
+        ? buildTimeTagLine(snapshot)
+        : '[Time/Date]: utc=`1970-01-01T00:00:00.000Z` local=`1970-01-01 00:00:00.000 +00:00` tz=`unknown` nowMs=`0` ntpOffsetMs=`0`';
+    const baseMetadata = nextRequest.metadata && typeof nextRequest.metadata === 'object'
+        ? nextRequest.metadata
+        : {
+            originalEndpoint: readString(metadata.originalEndpoint) ?? '/v1/chat/completions'
+        };
+    const withReservationMetadata = dueUserMessage && reservation
+        ? {
+            ...baseMetadata,
+            __clockReservation: reservation
+        }
+        : baseMetadata;
+    const messagesWithDue = dueUserMessage ? [...baseMessages, dueUserMessage] : baseMessages.slice();
+    // Always inject time via user-role content to keep the tag visible without adding
+    // extra tool-call semantics that may distract the model.
+    //
+    // IMPORTANT: do not append an extra trailing user message, otherwise the Virtual Router
+    // sees `latestMessageFromUser=true` and will force "thinking:user-input" even during
+    // tool followups (last message role=tool), which breaks `coding/search/tools` routing.
+    const timeInjectedMessages = (() => {
+        const idx = findLastUserMessageIndex(messagesWithDue);
+        if (idx < 0) {
+            return [...messagesWithDue, { role: 'user', content: timeTagLine }];
+        }
+        const msg = messagesWithDue[idx];
+        const content = msg.content;
+        const nextContent = (() => {
+            if (typeof content === 'string') {
+                const base = content.trimEnd();
+                return base ? `${base}\n${timeTagLine}` : timeTagLine;
+            }
+            if (Array.isArray(content)) {
+                return [...content, timeTagLine];
+            }
+            return timeTagLine;
+        })();
+        const cloned = messagesWithDue.slice();
+        cloned[idx] = { ...msg, content: nextContent };
+        return cloned;
+    })();
+    return {
+        ...nextRequest,
+        messages: timeInjectedMessages,
+        metadata: withReservationMetadata
+    };
+}
+function buildClockStandardToolsOperations() {
+    const tools = [
+        {
+            type: 'function',
+            function: {
+                name: 'shell',
+                description: 'Runs a shell command and returns its output.',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        command: { oneOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' } }] },
+                        workdir: { type: 'string' }
+                    },
+                    required: ['command'],
+                    additionalProperties: false
+                }
+            }
+        },
+        {
+            type: 'function',
+            function: {
+                name: 'exec_command',
+                description: 'Execute a command in a PTY and return output.',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        cmd: { type: 'string' },
+                        workdir: { type: 'string' },
+                        timeout_ms: { type: 'number' },
+                        max_output_tokens: { type: 'number' },
+                        yield_time_ms: { type: 'number' }
+                    },
+                    required: ['cmd'],
+                    additionalProperties: false
+                }
+            }
+        },
+        {
+            type: 'function',
+            function: {
+                name: 'apply_patch',
+                description: 'Apply a patch to repository files.',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        patch: { type: 'string' }
+                    },
+                    required: ['patch'],
+                    additionalProperties: false
+                }
+            }
+        },
+        {
+            type: 'function',
+            function: {
+                name: 'update_plan',
+                description: 'Update the task plan.',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        explanation: { type: 'string' },
+                        plan: {
+                            type: 'array',
+                            items: {
+                                type: 'object',
+                                properties: {
+                                    step: { type: 'string' },
+                                    status: { type: 'string' }
+                                },
+                                required: ['step', 'status'],
+                                additionalProperties: false
+                            }
+                        }
+                    },
+                    required: ['plan'],
+                    additionalProperties: false
+                }
+            }
+        },
+        {
+            type: 'function',
+            function: {
+                name: 'view_image',
+                description: 'View a local image by file path.',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        path: { type: 'string' }
+                    },
+                    required: ['path'],
+                    additionalProperties: false
+                }
+            }
+        },
+        {
+            type: 'function',
+            function: {
+                name: 'list_mcp_resources',
+                description: 'List resources exposed by MCP servers.',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        server: { type: 'string' },
+                        filter: { type: 'string' },
+                        root: { type: 'string' }
+                    },
+                    additionalProperties: false
+                }
+            }
+        },
+        {
+            type: 'function',
+            function: {
+                name: 'list_mcp_resource_templates',
+                description: 'List resource templates exposed by MCP servers.',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        server: { type: 'string' },
+                        cursor: { type: 'string' }
+                    },
+                    additionalProperties: false
+                }
+            }
+        },
+        {
+            type: 'function',
+            function: {
+                name: 'read_mcp_resource',
+                description: 'Read a specific MCP resource by { server, uri }.',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        server: { type: 'string' },
+                        uri: { type: 'string' }
+                    },
+                    required: ['server', 'uri'],
+                    additionalProperties: false
+                }
+            }
+        }
+    ];
+    return tools.map((tool) => ({
+        op: 'append_tool_if_missing',
+        toolName: tool.function.name,
+        tool
+    }));
 }
 function extractWebSearchSemantics(semantics) {
     if (!semantics || typeof semantics !== 'object') {

package/dist/conversion/hub/response/provider-response.js

@@ -17,7 +17,7 @@ import { recordResponsesResponse } from '../../shared/responses-conversation-sto
 import { ProviderProtocolError } from '../../shared/errors.js';
 import { readRuntimeMetadata } from '../../shared/runtime-metadata.js';
 import { runServerToolOrchestration } from '../../../servertool/engine.js';
-import { commitClockReservation, normalizeClockConfig } from '../../../servertool/clock/task-store.js';
+import { commitClockReservation, resolveClockConfig } from '../../../servertool/clock/task-store.js';
 const PROVIDER_RESPONSE_REGISTRY = {
     'openai-chat': {
         createFormatAdapter: () => new ChatFormatAdapter(),
@@ -89,7 +89,7 @@ function coerceClockReservation(value) {
 async function maybeCommitClockReservationFromContext(context) {
     try {
         const rt = readRuntimeMetadata(context);
-        const clockConfig = normalizeClockConfig(rt?.clock);
+        const clockConfig = resolveClockConfig(rt?.clock);
         if (!clockConfig) {
             return;
         }
@@ -269,8 +269,9 @@ export async function convertProviderResponse(options) {
         ? String(loopState.flowId || '').trim()
         : '';
     const isStopMessageFlow = flowId === 'stop_message_flow';
+    const allowNestedServerTools = isStopMessageFlow || flowId === 'antigravity_thought_signature_bootstrap';
     // stop_message_flow 的 followup 允许再次触发（直到 maxRepeats），其他 followup 跳过。
-    const skipServerTools = (isFollowup && !isStopMessageFlow) || !hasServerToolSupport;
+    const skipServerTools = (isFollowup && !allowNestedServerTools) || !hasServerToolSupport;
     // 对于由 server-side 工具触发的内部跳转（二跳/三跳），统一禁用 SSE 聚合输出，
     // 始终返回完整的 ChatCompletion JSON，便于在 llms 内部直接解析，而不是拿到
     // __sse_responses 可读流。