@jsonstudio/llms 0.6.467 → 0.6.567

package/dist/router/virtual-router/health-manager.d.ts

@@ -0,0 +1,23 @@
+import type { ProviderHealthConfig, ProviderHealthState } from './types.js';
+interface ProviderInternalState extends ProviderHealthState {
+    lastFailureAt?: number;
+}
+export declare class ProviderHealthManager {
+    private readonly states;
+    private config;
+    configure(config?: ProviderHealthConfig): void;
+    registerProviders(providerKeys: string[]): void;
+    recordFailure(providerKey: string, reason?: string): ProviderInternalState;
+    /**
+     * 为可恢复错误（例如 429）提供短暂冷静期：在 cooldownMs 内将 providerKey
+     * 视为不可用，但不使用 fatalCooldownMs 的长熔断时间。
+     */
+    cooldownProvider(providerKey: string, reason?: string, overrideMs?: number): ProviderInternalState;
+    recordSuccess(providerKey: string): ProviderInternalState;
+    tripProvider(providerKey: string, reason?: string, cooldownOverrideMs?: number): ProviderInternalState;
+    isAvailable(providerKey: string): boolean;
+    getSnapshot(): ProviderHealthState[];
+    getConfig(): Required<ProviderHealthConfig>;
+    private getState;
+}
+export {};

package/dist/router/virtual-router/health-manager.js

@@ -39,6 +39,20 @@ export class ProviderHealthManager {
         // 只有显式 fatal 或 tripProvider 调用时才会进入 tripped 状态。
         return state;
     }
+    /**
+     * 为可恢复错误（例如 429）提供短暂冷静期：在 cooldownMs 内将 providerKey
+     * 视为不可用，但不使用 fatalCooldownMs 的长熔断时间。
+     */
+    cooldownProvider(providerKey, reason, overrideMs) {
+        const state = this.getState(providerKey);
+        state.failureCount += 1;
+        state.state = 'tripped';
+        state.reason = reason;
+        const ttl = overrideMs ?? this.config.cooldownMs;
+        state.cooldownExpiresAt = Date.now() + ttl;
+        state.lastFailureAt = Date.now();
+        return state;
+    }
     recordSuccess(providerKey) {
         const state = this.getState(providerKey);
         state.failureCount = 0;

package/dist/router/virtual-router/message-utils.js

@@ -20,6 +20,28 @@ export function extractMessageText(message) {
     if (typeof message.content === 'string' && message.content.trim()) {
         return message.content;
     }
+    const content = message.content;
+    if (Array.isArray(content)) {
+        const parts = [];
+        for (const entry of content) {
+            if (typeof entry === 'string' && entry.trim()) {
+                parts.push(entry);
+            }
+            else if (entry && typeof entry === 'object' && !Array.isArray(entry)) {
+                const record = entry;
+                if (typeof record.text === 'string' && record.text.trim()) {
+                    parts.push(record.text);
+                }
+                else if (typeof record.content === 'string' && record.content.trim()) {
+                    parts.push(record.content);
+                }
+            }
+        }
+        const joined = parts.join('\n').trim();
+        if (joined) {
+            return joined;
+        }
+    }
     return '';
 }
 export function detectKeyword(text, keywords) {

package/dist/router/virtual-router/routing-instructions.d.ts

@@ -1,11 +1,13 @@
 import type { StandardizedMessage } from '../../conversion/hub/types/standardized.js';
 export interface RoutingInstruction {
-    type: 'force' | 'sticky' | 'disable' | 'enable' | 'clear' | 'allow';
+    type: 'force' | 'sticky' | 'disable' | 'enable' | 'clear' | 'allow' | 'stopMessageSet' | 'stopMessageClear';
     provider?: string;
     keyAlias?: string;
     keyIndex?: number;
     model?: string;
     pathLength?: number;
+    stopMessageText?: string;
+    stopMessageMaxRepeats?: number;
 }
 export interface RoutingInstructionState {
     forcedTarget?: {
@@ -26,6 +28,9 @@ export interface RoutingInstructionState {
     disabledProviders: Set<string>;
     disabledKeys: Map<string, Set<string | number>>;
     disabledModels: Map<string, Set<string>>;
+    stopMessageText?: string;
+    stopMessageMaxRepeats?: number;
+    stopMessageUsed?: number;
 }
 export declare function parseRoutingInstructions(messages: StandardizedMessage[]): RoutingInstruction[];
 export declare function applyRoutingInstructions(instructions: RoutingInstruction[], currentState: RoutingInstructionState): RoutingInstructionState;

package/dist/router/virtual-router/routing-instructions.js

@@ -49,6 +49,11 @@ function expandInstructionSegments(instruction) {
     if (!trimmed) {
         return [];
     }
+    // stopMessage 指令需要整体解析，不能按逗号拆分，否则类似
+    // "<**stopMessage:\"继续\",3**>" 会被错误拆成 ["stopMessage:\"继续\"", "3"]。
+    if (/^stopMessage\s*:/i.test(trimmed)) {
+        return [trimmed];
+    }
     const prefix = trimmed[0];
     if (prefix === '!' || prefix === '#' || prefix === '@') {
         const tokens = splitInstructionTargets(trimmed.substring(1));
@@ -69,6 +74,74 @@ function parseSingleInstruction(instruction) {
     if (instruction === 'clear') {
         return { type: 'clear' };
     }
+    if (/^stopMessage\s*:/i.test(instruction)) {
+        const body = instruction.slice('stopMessage'.length + 1).trim();
+        if (!body) {
+            return null;
+        }
+        if (/^clear$/i.test(body)) {
+            return { type: 'stopMessageClear' };
+        }
+        let text = '';
+        let maxRepeats = 1;
+        let cursor = body;
+        if (cursor[0] === '"') {
+            let escaped = false;
+            let endIndex = -1;
+            for (let i = 1; i < cursor.length; i += 1) {
+                const ch = cursor[i];
+                if (escaped) {
+                    escaped = false;
+                    continue;
+                }
+                if (ch === '\\') {
+                    escaped = true;
+                    continue;
+                }
+                if (ch === '"') {
+                    endIndex = i;
+                    break;
+                }
+            }
+            if (endIndex <= 0) {
+                return null;
+            }
+            const rawText = cursor.slice(1, endIndex);
+            text = rawText.replace(/\\"/g, '"');
+            cursor = cursor.slice(endIndex + 1).trim();
+            if (cursor.startsWith(',')) {
+                const countRaw = cursor.slice(1).trim();
+                if (countRaw) {
+                    const parsed = Number.parseInt(countRaw, 10);
+                    if (!Number.isNaN(parsed) && parsed > 0) {
+                        maxRepeats = parsed;
+                    }
+                }
+            }
+        }
+        else {
+            // 支持无引号的简单形式：stopMessage:继续,3
+            const parts = cursor.split(',').map((part) => part.trim()).filter(Boolean);
+            if (!parts.length) {
+                return null;
+            }
+            text = parts[0];
+            if (parts.length > 1) {
+                const parsed = Number.parseInt(parts[1], 10);
+                if (!Number.isNaN(parsed) && parsed > 0) {
+                    maxRepeats = parsed;
+                }
+            }
+        }
+        if (!text) {
+            return null;
+        }
+        return {
+            type: 'stopMessageSet',
+            stopMessageText: text,
+            stopMessageMaxRepeats: maxRepeats
+        };
+    }
     if (instruction.startsWith('!')) {
         const target = instruction.substring(1).trim();
         if (!target) {
@@ -113,6 +186,16 @@ function parseSingleInstruction(instruction) {
             return { type: 'force', ...normalized };
         }
     }
+    else if (isValidIdentifier(instruction)) {
+        // 仅 provider 标识（无 .）时，视为 provider 级白名单，等价于 "<**!provider**>"。
+        // 这样可以用 "<**antigravity**>" 快速激活当前 routing 中所有 antigravity 相关池子，
+        // 并保证路由仅命中该 provider 的所有模型/key。
+        return {
+            type: 'allow',
+            provider: instruction,
+            pathLength: 1
+        };
+    }
     return null;
 }
 function parseTarget(target) {
@@ -189,7 +272,10 @@ export function applyRoutingInstructions(instructions, currentState) {
         allowedProviders: new Set(currentState.allowedProviders),
         disabledProviders: new Set(currentState.disabledProviders),
         disabledKeys: new Map(Array.from(currentState.disabledKeys.entries()).map(([k, v]) => [k, new Set(v)])),
-        disabledModels: new Map(Array.from(currentState.disabledModels.entries()).map(([k, v]) => [k, new Set(v)]))
+        disabledModels: new Map(Array.from(currentState.disabledModels.entries()).map(([k, v]) => [k, new Set(v)])),
+        stopMessageText: currentState.stopMessageText,
+        stopMessageMaxRepeats: currentState.stopMessageMaxRepeats,
+        stopMessageUsed: currentState.stopMessageUsed
     };
     let allowReset = false;
     let disableReset = false;
@@ -302,6 +388,25 @@ export function applyRoutingInstructions(instructions, currentState) {
                 newState.disabledKeys.clear();
                 newState.disabledModels.clear();
                 break;
+            case 'stopMessageSet': {
+                const text = typeof instruction.stopMessageText === 'string' && instruction.stopMessageText.trim()
+                    ? instruction.stopMessageText.trim()
+                    : '';
+                const maxRepeats = typeof instruction.stopMessageMaxRepeats === 'number' && Number.isFinite(instruction.stopMessageMaxRepeats)
+                    ? Math.floor(instruction.stopMessageMaxRepeats)
+                    : 0;
+                if (text && maxRepeats > 0) {
+                    newState.stopMessageText = text;
+                    newState.stopMessageMaxRepeats = maxRepeats;
+                    newState.stopMessageUsed = 0;
+                }
+                break;
+            }
+            case 'stopMessageClear':
+                newState.stopMessageText = undefined;
+                newState.stopMessageMaxRepeats = undefined;
+                newState.stopMessageUsed = undefined;
+                break;
         }
     }
     return newState;
@@ -341,7 +446,16 @@ export function serializeRoutingInstructionState(state) {
         disabledModels: Array.from(state.disabledModels.entries()).map(([provider, models]) => ({
             provider,
             models: Array.from(models)
-        }))
+        })),
+        ...(typeof state.stopMessageText === 'string' && state.stopMessageText.trim()
+            ? { stopMessageText: state.stopMessageText }
+            : {}),
+        ...(typeof state.stopMessageMaxRepeats === 'number' && Number.isFinite(state.stopMessageMaxRepeats)
+            ? { stopMessageMaxRepeats: state.stopMessageMaxRepeats }
+            : {}),
+        ...(typeof state.stopMessageUsed === 'number' && Number.isFinite(state.stopMessageUsed)
+            ? { stopMessageUsed: state.stopMessageUsed }
+            : {})
     };
 }
 export function deserializeRoutingInstructionState(data) {
@@ -351,7 +465,10 @@ export function deserializeRoutingInstructionState(data) {
         allowedProviders: new Set(),
         disabledProviders: new Set(),
         disabledKeys: new Map(),
-        disabledModels: new Map()
+        disabledModels: new Map(),
+        stopMessageText: undefined,
+        stopMessageMaxRepeats: undefined,
+        stopMessageUsed: undefined
     };
     if (data.forcedTarget && typeof data.forcedTarget === 'object') {
         state.forcedTarget = data.forcedTarget;
@@ -379,5 +496,14 @@ export function deserializeRoutingInstructionState(data) {
             }
         }
     }
+    if (typeof data.stopMessageText === 'string' && data.stopMessageText.trim()) {
+        state.stopMessageText = data.stopMessageText;
+    }
+    if (typeof data.stopMessageMaxRepeats === 'number' && Number.isFinite(data.stopMessageMaxRepeats)) {
+        state.stopMessageMaxRepeats = Math.floor(data.stopMessageMaxRepeats);
+    }
+    if (typeof data.stopMessageUsed === 'number' && Number.isFinite(data.stopMessageUsed)) {
+        state.stopMessageUsed = Math.max(0, Math.floor(data.stopMessageUsed));
+    }
     return state;
 }

package/dist/router/virtual-router/types.d.ts

@@ -200,6 +200,12 @@ export interface RouterMetadataInput {
      * 禁用的 provider keyIndex 列表 (从 1 开始)
      */
     disabledProviderKeyIndexes?: number[];
+    /**
+     * 本次请求内需要临时排除的 providerKey 列表。
+     * 与 disabledProviders/disabledKeys 不同，这些 key 仅对当前路由决策生效，
+     * 不会写入或持久化到 RoutingInstructionState/sticky 存储中。
+     */
+    excludedProviderKeys?: string[];
     sessionId?: string;
     conversationId?: string;
     responsesResume?: {

package/dist/servertool/handlers/gemini-empty-reply-continue.d.ts

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

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

@@ -0,0 +1,120 @@
+import { registerServerToolHandler } from '../registry.js';
+import { cloneJson } from '../server-side-tools.js';
+const FLOW_ID = 'gemini_empty_reply_continue';
+const handler = async (ctx) => {
+    if (!ctx.options.reenterPipeline) {
+        return null;
+    }
+    // 避免在 followup 请求里再次触发，防止循环。
+    const adapterRecord = ctx.adapterContext;
+    const followupRaw = adapterRecord.serverToolFollowup;
+    if (followupRaw === true || (typeof followupRaw === 'string' && followupRaw.trim().toLowerCase() === 'true')) {
+        return null;
+    }
+    // 仅针对 gemini-chat 协议 + antigravity.* providerKey 的 /v1/responses 路径启用。
+    if (ctx.options.providerProtocol !== 'gemini-chat') {
+        return null;
+    }
+    const entryEndpoint = (ctx.options.entryEndpoint || '').toLowerCase();
+    if (!entryEndpoint.includes('/v1/responses')) {
+        return null;
+    }
+    const providerKey = typeof adapterRecord.providerKey === 'string' && adapterRecord.providerKey.trim()
+        ? adapterRecord.providerKey.trim().toLowerCase()
+        : '';
+    if (!providerKey.startsWith('antigravity.')) {
+        return null;
+    }
+    // 仅在 finish_reason=stop 且第一条消息内容为空、无 tool_calls 时触发。
+    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 finishReason = typeof first.finish_reason === 'string' && first.finish_reason.trim()
+        ? first.finish_reason.trim()
+        : '';
+    if (finishReason !== 'stop') {
+        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()
+        : '';
+    if (contentText.length > 0) {
+        return null;
+    }
+    const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
+    if (toolCalls.length > 0) {
+        return null;
+    }
+    const captured = getCapturedRequest(ctx.adapterContext);
+    if (!captured) {
+        return null;
+    }
+    const followupPayload = buildContinueFollowupPayload(captured);
+    if (!followupPayload) {
+        return null;
+    }
+    return {
+        chatResponse: ctx.base,
+        execution: {
+            flowId: FLOW_ID,
+            followup: {
+                requestIdSuffix: ':continue',
+                payload: followupPayload,
+                metadata: {
+                    serverToolFollowup: true,
+                    stream: false
+                }
+            }
+        }
+    };
+};
+registerServerToolHandler('gemini_empty_reply_continue', handler, { trigger: 'auto' });
+function getCapturedRequest(adapterContext) {
+    if (!adapterContext || typeof adapterContext !== 'object') {
+        return null;
+    }
+    const captured = adapterContext.capturedChatRequest;
+    if (!captured || typeof captured !== 'object' || Array.isArray(captured)) {
+        return null;
+    }
+    return captured;
+}
+function buildContinueFollowupPayload(source) {
+    if (!source || typeof source !== 'object') {
+        return null;
+    }
+    const payload = {};
+    if (typeof source.model === 'string' && source.model.trim()) {
+        payload.model = source.model.trim();
+    }
+    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;
+}

package/dist/servertool/handlers/stop-message-auto.d.ts

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

package/dist/servertool/handlers/stop-message-auto.js

@@ -0,0 +1,147 @@
+import { registerServerToolHandler } from '../registry.js';
+import { cloneJson } from '../server-side-tools.js';
+import { loadRoutingInstructionStateSync, saveRoutingInstructionStateAsync } from '../../router/virtual-router/sticky-session-store.js';
+const FLOW_ID = 'stop_message_flow';
+const handler = async (ctx) => {
+    const record = ctx.adapterContext;
+    const followupRaw = record.serverToolFollowup;
+    if (followupRaw === true || (typeof followupRaw === 'string' && followupRaw.trim().toLowerCase() === 'true')) {
+        return null;
+    }
+    const clientDisconnectedRaw = record.clientDisconnected;
+    if (clientDisconnectedRaw === true ||
+        (typeof clientDisconnectedRaw === 'string' && clientDisconnectedRaw.trim().toLowerCase() === 'true')) {
+        return null;
+    }
+    const stickyKey = resolveStickyKey(record);
+    if (!stickyKey) {
+        return null;
+    }
+    const state = loadRoutingInstructionStateSync(stickyKey);
+    if (!state || !state.stopMessageText || !state.stopMessageMaxRepeats) {
+        return null;
+    }
+    const text = typeof state.stopMessageText === 'string' ? state.stopMessageText.trim() : '';
+    const maxRepeats = typeof state.stopMessageMaxRepeats === 'number' && Number.isFinite(state.stopMessageMaxRepeats)
+        ? Math.max(1, Math.floor(state.stopMessageMaxRepeats))
+        : 0;
+    if (!text || maxRepeats <= 0) {
+        return null;
+    }
+    const used = typeof state.stopMessageUsed === 'number' && Number.isFinite(state.stopMessageUsed)
+        ? Math.max(0, Math.floor(state.stopMessageUsed))
+        : 0;
+    if (used >= maxRepeats) {
+        return null;
+    }
+    if (!isStopFinishReason(ctx.base)) {
+        return null;
+    }
+    const captured = getCapturedRequest(ctx.adapterContext);
+    if (!captured) {
+        return null;
+    }
+    state.stopMessageUsed = used + 1;
+    saveRoutingInstructionStateAsync(stickyKey, state);
+    const followupPayload = buildStopMessageFollowupPayload(captured, text);
+    if (!followupPayload) {
+        return null;
+    }
+    return {
+        chatResponse: ctx.base,
+        execution: {
+            flowId: FLOW_ID,
+            followup: {
+                requestIdSuffix: ':stop_followup',
+                payload: followupPayload,
+                metadata: {
+                    serverToolFollowup: true,
+                    stream: false
+                }
+            }
+        }
+    };
+};
+registerServerToolHandler('stop_message_auto', handler, { trigger: 'auto' });
+function resolveStickyKey(record) {
+    const sessionId = typeof record.sessionId === 'string' && record.sessionId.trim() ? record.sessionId.trim() : '';
+    if (sessionId) {
+        return `session:${sessionId}`;
+    }
+    const conversationId = typeof record.conversationId === 'string' && record.conversationId.trim()
+        ? record.conversationId.trim()
+        : '';
+    if (conversationId) {
+        return `conversation:${conversationId}`;
+    }
+    return undefined;
+}
+function isStopFinishReason(base) {
+    if (!base || typeof base !== 'object' || Array.isArray(base)) {
+        return false;
+    }
+    const payload = base;
+    const choicesRaw = payload.choices;
+    if (!Array.isArray(choicesRaw) || !choicesRaw.length) {
+        return false;
+    }
+    const first = choicesRaw[0];
+    if (!first || typeof first !== 'object' || Array.isArray(first)) {
+        return false;
+    }
+    const finishReasonRaw = first.finish_reason;
+    const finishReason = typeof finishReasonRaw === 'string' && finishReasonRaw.trim()
+        ? finishReasonRaw.trim().toLowerCase()
+        : '';
+    if (finishReason !== 'stop') {
+        return false;
+    }
+    const message = first.message &&
+        typeof first.message === 'object' &&
+        !Array.isArray(first.message)
+        ? first.message
+        : null;
+    if (!message) {
+        return false;
+    }
+    const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
+    if (toolCalls.length > 0) {
+        return false;
+    }
+    return true;
+}
+function getCapturedRequest(adapterContext) {
+    if (!adapterContext || typeof adapterContext !== 'object') {
+        return null;
+    }
+    const captured = adapterContext.capturedChatRequest;
+    if (!captured || typeof captured !== 'object' || Array.isArray(captured)) {
+        return null;
+    }
+    return captured;
+}
+function buildStopMessageFollowupPayload(source, text) {
+    if (!source || typeof source !== 'object') {
+        return null;
+    }
+    const payload = {};
+    if (typeof source.model === 'string' && source.model.trim()) {
+        payload.model = source.model.trim();
+    }
+    const rawMessages = source.messages;
+    const messages = Array.isArray(rawMessages) ? cloneJson(rawMessages) : [];
+    messages.push({
+        role: 'user',
+        content: text
+    });
+    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;
+}