@jsonstudio/llms 0.6.3539 → 0.6.3551

package/dist/quota/quota-state.js

@@ -1,6 +1,7 @@
 const COOLDOWN_SCHEDULE_429_MS = [3_000, 10_000, 31_000, 61_000];
 const COOLDOWN_SCHEDULE_FATAL_MS = [3_000, 10_000, 31_000, 61_000];
 const COOLDOWN_SCHEDULE_DEFAULT_MS = [3_000, 10_000, 31_000, 61_000];
+const COOLDOWN_SCHEDULE_TRANSIENT_KEEP_POOL_MS = [3_000, 5_000, 10_000, 31_000];
 const ERROR_CHAIN_WINDOW_MS = 10 * 60_000;
 const NETWORK_ERROR_CODES = [
     'ECONNRESET',
@@ -84,10 +85,23 @@ function computeCooldownMsBySeries(series, consecutive) {
     const idx = Math.min(consecutive - 1, schedule.length - 1);
     return schedule[idx] ?? null;
 }
+function shouldKeepProviderInPoolDuringCooldown(series, consecutive) {
+    if (consecutive <= 0) {
+        return false;
+    }
+    return (series === 'ENET' || series === 'E5XX' || series === 'EOTHER') && consecutive <= 2;
+}
+function computeTransientKeepPoolCooldownMs(series, consecutive) {
+    if (!shouldKeepProviderInPoolDuringCooldown(series, consecutive)) {
+        return null;
+    }
+    const idx = Math.min(consecutive - 1, COOLDOWN_SCHEDULE_TRANSIENT_KEEP_POOL_MS.length - 1);
+    return COOLDOWN_SCHEDULE_TRANSIENT_KEEP_POOL_MS[idx] ?? null;
+}
 export function tickQuotaStateTime(state, nowMs) {
     let next = state;
     if (typeof next.cooldownUntil === 'number' && next.cooldownUntil <= nowMs) {
-        next = { ...next, cooldownUntil: null };
+        next = { ...next, cooldownUntil: null, cooldownKeepsPool: undefined };
     }
     if (typeof next.blacklistUntil === 'number' && next.blacklistUntil <= nowMs) {
         next = { ...next, blacklistUntil: null };
@@ -107,14 +121,15 @@ export function tickQuotaStateTime(state, nowMs) {
         return next;
     }
     if (inCooldown) {
-        if (next.inPool !== false || next.reason !== 'cooldown') {
-            next = { ...next, inPool: false, reason: 'cooldown' };
+        const keepInPool = next.cooldownKeepsPool === true;
+        if (next.inPool !== keepInPool || next.reason !== 'cooldown') {
+            next = { ...next, inPool: keepInPool, reason: 'cooldown' };
         }
         return next;
     }
     // TTLs expired: only auto-reset "cooldown/blacklist" back to ok.
     if (next.reason === 'cooldown' || next.reason === 'blacklist') {
-        next = { ...next, inPool: true, reason: 'ok' };
+        next = { ...next, inPool: true, reason: 'ok', cooldownKeepsPool: undefined };
     }
     return next;
 }
@@ -139,7 +154,7 @@ export function applyErrorEvent(state, event, nowMs = event.timestampMs ?? Date.
             : COOLDOWN_SCHEDULE_DEFAULT_MS;
     const rawNextCount = sameErrorKey ? state.consecutiveErrorCount + 1 : 1;
     const nextCount = rawNextCount > schedule.length ? 1 : rawNextCount;
-    const cooldownMs = computeCooldownMsBySeries(series, nextCount);
+    const cooldownMs = computeTransientKeepPoolCooldownMs(series, nextCount) ?? computeCooldownMsBySeries(series, nextCount);
     const nextUntil = cooldownMs ? nowMs + cooldownMs : null;
     const existingUntil = typeof state.cooldownUntil === 'number' ? state.cooldownUntil : null;
     const cooldownUntil = typeof nextUntil === 'number' && Number.isFinite(nextUntil)
@@ -149,12 +164,14 @@ export function applyErrorEvent(state, event, nowMs = event.timestampMs ?? Date.
         : existingUntil;
     const inCooldown = typeof cooldownUntil === 'number' && cooldownUntil > nowMs;
     const inBlacklist = typeof state.blacklistUntil === 'number' && state.blacklistUntil > nowMs;
-    const inPool = !inCooldown && !inBlacklist;
+    const cooldownKeepsPool = shouldKeepProviderInPoolDuringCooldown(series, nextCount);
+    const inPool = !inBlacklist && (!inCooldown || cooldownKeepsPool);
     return {
         ...state,
         inPool,
         reason: inBlacklist ? 'blacklist' : inCooldown ? 'cooldown' : 'ok',
         cooldownUntil,
+        cooldownKeepsPool: inCooldown ? cooldownKeepsPool : undefined,
         lastErrorSeries: series,
         lastErrorCode: errorKey,
         lastErrorAtMs: nowMs,

package/dist/quota/types.d.ts

@@ -26,6 +26,7 @@ export interface QuotaState {
     authIssue?: QuotaAuthIssue;
     priorityTier: number;
     cooldownUntil: number | null;
+    cooldownKeepsPool?: boolean;
     blacklistUntil: number | null;
     lastErrorSeries: ErrorSeries | null;
     lastErrorCode: string | null;

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

@@ -1,4 +1,5 @@
 import { buildChatRequestFromResponses, captureResponsesContext } from '../../conversion/responses/responses-openai-bridge.js';
+import { stripHistoricalImageAttachments } from '../../conversion/hub/process/chat-process-media.js';
 import { cloneJson } from '../server-side-tools.js';
 import { trimOpenAiMessagesForFollowup } from './followup-message-trimmer.js';
 function extractResponsesTopLevelParameters(record) {
@@ -74,9 +75,13 @@ export function normalizeFollowupParameters(value) {
         return undefined;
     }
     const cloned = cloneJson(value);
-    // Followup requests are always non-streaming (servertool orchestration enforces this),
-    // so remove any inherited stream hints to avoid conflicting flags.
+    // Followup requests are always re-entered as a fresh hop:
+    // - non-streaming (servertool orchestration enforces this)
+    // - no inherited tool-selection hints, otherwise the resumed turn can be biased toward
+    //   immediately calling tools again instead of consuming the tool outputs that were just injected.
+    // Keep `parallel_tool_calls` inherited; provider compat can still disable it selectively.
     delete cloned.stream;
+    delete cloned.tool_choice;
     return Object.keys(cloned).length ? cloned : undefined;
 }
 export function dropToolByFunctionName(tools, dropName) {
@@ -418,6 +423,11 @@ export function buildServerToolFollowupChatPayloadFromInjection(args) {
         return null;
     }
     let messages = Array.isArray(seed.messages) ? cloneJson(seed.messages) : [];
+    // ServerTool followups must enter marker/routing/chat-process analysis with the same
+    // historical-media invariants as normal chat-process requests:
+    // only the latest live user turn may keep inline image payloads; earlier user turns
+    // are scrubbed to placeholders before any followup ops append new assistant/user items.
+    messages = stripHistoricalImageAttachments(messages);
     const ops = Array.isArray(args.injection?.ops) ? args.injection.ops : [];
     // Followup is a normal request hop: inherit tool schema from the captured request and
     // let compat/tool-governance apply standard sanitization rules.

package/dist/servertool/server-side-tools.d.ts

@@ -1,7 +1,6 @@
 import type { JsonObject } from '../conversion/hub/types/json.js';
 import type { ServerSideToolEngineOptions, ServerSideToolEngineResult, ToolCall } from './types.js';
 import './handlers/iflow-model-error-retry.js';
-import './handlers/gemini-empty-reply-continue.js';
 import './handlers/antigravity-thought-signature-bootstrap.js';
 import './handlers/stop-message-auto.js';
 import './handlers/clock.js';

package/dist/servertool/server-side-tools.js

@@ -3,7 +3,6 @@ import { ProviderProtocolError } from '../conversion/provider-protocol-error.js'
 import { executeWebSearchBackendPlan } from './handlers/web-search.js';
 import { executeVisionBackendPlan } from './handlers/vision.js';
 import './handlers/iflow-model-error-retry.js';
-import './handlers/gemini-empty-reply-continue.js';
 import './handlers/antigravity-thought-signature-bootstrap.js';
 import './handlers/stop-message-auto.js';
 import './handlers/clock.js';
@@ -22,7 +21,7 @@ function traceAutoHook(options, event) {
         // best-effort trace callback
     }
 }
-const OPTIONAL_PRIMARY_HOOK_ORDER = ['empty_reply_continue', 'clock_auto', 'stop_message_auto'];
+const OPTIONAL_PRIMARY_HOOK_ORDER = ['clock_auto', 'stop_message_auto'];
 const MANDATORY_HOOK_ORDER = [];
 let fallbackToolCallIdSeq = 0;
 function ensureToolCallId(record) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.3539",
+  "version": "0.6.3551",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",