Merge pull request #41 from badri-s2001/feature/model-fallback
Feature/model fallback
This commit is contained in:
30
CLAUDE.md
30
CLAUDE.md
@@ -17,6 +17,12 @@ npm install
|
||||
# Start server (runs on port 8080)
|
||||
npm start
|
||||
|
||||
# Start with model fallback enabled (falls back to alternate model when quota exhausted)
|
||||
npm start -- --fallback
|
||||
|
||||
# Start with debug logging
|
||||
npm start -- --debug
|
||||
|
||||
# Start with file watching for development
|
||||
npm run dev
|
||||
|
||||
@@ -36,6 +42,7 @@ npm run test:streaming # Streaming SSE events
|
||||
npm run test:interleaved # Interleaved thinking
|
||||
npm run test:images # Image processing
|
||||
npm run test:caching # Prompt caching
|
||||
npm run test:crossmodel # Cross-model thinking signatures
|
||||
```
|
||||
|
||||
## Architecture
|
||||
@@ -53,6 +60,7 @@ src/
|
||||
├── server.js # Express server
|
||||
├── constants.js # Configuration values
|
||||
├── errors.js # Custom error classes
|
||||
├── fallback-config.js # Model fallback mappings and helpers
|
||||
│
|
||||
├── cloudcode/ # Cloud Code API client
|
||||
│ ├── index.js # Public API exports
|
||||
@@ -87,7 +95,7 @@ src/
|
||||
│ ├── content-converter.js # Message content conversion
|
||||
│ ├── schema-sanitizer.js # JSON Schema cleaning for Gemini
|
||||
│ ├── thinking-utils.js # Thinking block validation/recovery
|
||||
│ └── signature-cache.js # In-memory signature cache
|
||||
│ └── signature-cache.js # Signature cache (tool_use + thinking signatures)
|
||||
│
|
||||
└── utils/ # Utilities
|
||||
├── helpers.js # formatDuration, sleep
|
||||
@@ -101,7 +109,8 @@ src/
|
||||
- **src/account-manager/**: Multi-account pool with sticky selection, rate limit handling, and automatic cooldown
|
||||
- **src/auth/**: Authentication including Google OAuth, token extraction, and database access
|
||||
- **src/format/**: Format conversion between Anthropic and Google Generative AI formats
|
||||
- **src/constants.js**: API endpoints, model mappings, OAuth config, and all configuration values
|
||||
- **src/constants.js**: API endpoints, model mappings, fallback config, OAuth config, and all configuration values
|
||||
- **src/fallback-config.js**: Model fallback mappings (`getFallbackModel()`, `hasFallback()`)
|
||||
- **src/errors.js**: Custom error classes (`RateLimitError`, `AuthError`, `ApiError`, etc.)
|
||||
|
||||
**Multi-Account Load Balancing:**
|
||||
@@ -117,6 +126,22 @@ src/
|
||||
- `cache_read_input_tokens` returned in usage metadata when cache hits
|
||||
- Token calculation: `input_tokens = promptTokenCount - cachedContentTokenCount`
|
||||
|
||||
**Model Fallback (--fallback flag):**
|
||||
- When all accounts are exhausted for a model, automatically falls back to an alternate model
|
||||
- Fallback mappings defined in `MODEL_FALLBACK_MAP` in `src/constants.js`
|
||||
- Thinking models fall back to thinking models (e.g., `claude-sonnet-4-5-thinking` → `gemini-3-flash`)
|
||||
- Fallback is disabled on recursive calls to prevent infinite chains
|
||||
- Enable with `npm start -- --fallback` or `FALLBACK=true` environment variable
|
||||
|
||||
**Cross-Model Thinking Signatures:**
|
||||
- Claude and Gemini use incompatible thinking signatures
|
||||
- When switching models mid-conversation, incompatible signatures are detected and dropped
|
||||
- Signature cache tracks model family ('claude' or 'gemini') for each signature
|
||||
- `hasGeminiHistory()` detects Gemini→Claude cross-model scenarios
|
||||
- Thinking recovery (`closeToolLoopForThinking()`) injects synthetic messages to close interrupted tool loops
|
||||
- For Gemini targets: strict validation - drops unknown or mismatched signatures
|
||||
- For Claude targets: lenient - lets Claude validate its own signatures
|
||||
|
||||
## Testing Notes
|
||||
|
||||
- Tests require the server to be running (`npm start` in separate terminal)
|
||||
@@ -129,6 +154,7 @@ src/
|
||||
**Constants:** All configuration values are centralized in `src/constants.js`:
|
||||
- API endpoints and headers
|
||||
- Model mappings and model family detection (`getModelFamily()`, `isThinkingModel()`)
|
||||
- Model fallback mappings (`MODEL_FALLBACK_MAP`)
|
||||
- OAuth configuration
|
||||
- Rate limit thresholds
|
||||
- Thinking model settings
|
||||
|
||||
@@ -25,7 +25,8 @@
|
||||
"test:streaming": "node tests/test-multiturn-thinking-tools-streaming.cjs",
|
||||
"test:interleaved": "node tests/test-interleaved-thinking.cjs",
|
||||
"test:images": "node tests/test-images.cjs",
|
||||
"test:caching": "node tests/test-caching-streaming.cjs"
|
||||
"test:caching": "node tests/test-caching-streaming.cjs",
|
||||
"test:crossmodel": "node tests/test-cross-model-thinking.cjs"
|
||||
},
|
||||
"keywords": [
|
||||
"claude",
|
||||
|
||||
@@ -18,6 +18,7 @@ import { logger } from '../utils/logger.js';
|
||||
import { parseResetTime } from './rate-limit-parser.js';
|
||||
import { buildCloudCodeRequest, buildHeaders } from './request-builder.js';
|
||||
import { parseThinkingSSEResponse } from './sse-parser.js';
|
||||
import { getFallbackModel } from '../fallback-config.js';
|
||||
|
||||
/**
|
||||
* Send a non-streaming request to Cloud Code with multi-account support
|
||||
@@ -32,7 +33,7 @@ import { parseThinkingSSEResponse } from './sse-parser.js';
|
||||
* @returns {Promise<Object>} Anthropic-format response object
|
||||
* @throws {Error} If max retries exceeded or no accounts available
|
||||
*/
|
||||
export async function sendMessage(anthropicRequest, accountManager) {
|
||||
export async function sendMessage(anthropicRequest, accountManager, fallbackEnabled = false) {
|
||||
const model = anthropicRequest.model;
|
||||
const isThinking = isThinkingModel(model);
|
||||
|
||||
@@ -76,6 +77,16 @@ export async function sendMessage(anthropicRequest, accountManager) {
|
||||
}
|
||||
|
||||
if (!account) {
|
||||
// Check if fallback is enabled and available
|
||||
if (fallbackEnabled) {
|
||||
const fallbackModel = getFallbackModel(model);
|
||||
if (fallbackModel) {
|
||||
logger.warn(`[CloudCode] All accounts exhausted for ${model}. Attempting fallback to ${fallbackModel}`);
|
||||
// Retry with fallback model
|
||||
const fallbackRequest = { ...anthropicRequest, model: fallbackModel };
|
||||
return await sendMessage(fallbackRequest, accountManager, false); // Disable fallback for recursive call
|
||||
}
|
||||
}
|
||||
throw new Error('No accounts available');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
*/
|
||||
|
||||
import crypto from 'crypto';
|
||||
import { MIN_SIGNATURE_LENGTH } from '../constants.js';
|
||||
import { cacheSignature } from '../format/signature-cache.js';
|
||||
import { MIN_SIGNATURE_LENGTH, getModelFamily } from '../constants.js';
|
||||
import { cacheSignature, cacheThinkingSignature } from '../format/signature-cache.js';
|
||||
import { logger } from '../utils/logger.js';
|
||||
|
||||
/**
|
||||
@@ -110,6 +110,9 @@ export async function* streamSSEResponse(response, originalModel) {
|
||||
|
||||
if (signature && signature.length >= MIN_SIGNATURE_LENGTH) {
|
||||
currentThinkingSignature = signature;
|
||||
// Cache thinking signature with model family for cross-model compatibility
|
||||
const modelFamily = getModelFamily(originalModel);
|
||||
cacheThinkingSignature(signature, modelFamily);
|
||||
}
|
||||
|
||||
yield {
|
||||
|
||||
@@ -16,6 +16,7 @@ import { logger } from '../utils/logger.js';
|
||||
import { parseResetTime } from './rate-limit-parser.js';
|
||||
import { buildCloudCodeRequest, buildHeaders } from './request-builder.js';
|
||||
import { streamSSEResponse } from './sse-streamer.js';
|
||||
import { getFallbackModel } from '../fallback-config.js';
|
||||
|
||||
|
||||
/**
|
||||
@@ -31,7 +32,7 @@ import { streamSSEResponse } from './sse-streamer.js';
|
||||
* @yields {Object} Anthropic-format SSE events (message_start, content_block_start, content_block_delta, etc.)
|
||||
* @throws {Error} If max retries exceeded or no accounts available
|
||||
*/
|
||||
export async function* sendMessageStream(anthropicRequest, accountManager) {
|
||||
export async function* sendMessageStream(anthropicRequest, accountManager, fallbackEnabled = false) {
|
||||
const model = anthropicRequest.model;
|
||||
|
||||
// Retry loop with account failover
|
||||
@@ -74,6 +75,17 @@ export async function* sendMessageStream(anthropicRequest, accountManager) {
|
||||
}
|
||||
|
||||
if (!account) {
|
||||
// Check if fallback is enabled and available
|
||||
if (fallbackEnabled) {
|
||||
const fallbackModel = getFallbackModel(model);
|
||||
if (fallbackModel) {
|
||||
logger.warn(`[CloudCode] All accounts exhausted for ${model}. Attempting fallback to ${fallbackModel} (streaming)`);
|
||||
// Retry with fallback model
|
||||
const fallbackRequest = { ...anthropicRequest, model: fallbackModel };
|
||||
yield* sendMessageStream(fallbackRequest, accountManager, false); // Disable fallback for recursive call
|
||||
return;
|
||||
}
|
||||
}
|
||||
throw new Error('No accounts available');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,6 +144,16 @@ export const OAUTH_CONFIG = {
|
||||
};
|
||||
export const OAUTH_REDIRECT_URI = `http://localhost:${OAUTH_CONFIG.callbackPort}/oauth-callback`;
|
||||
|
||||
// Model fallback mapping - maps primary model to fallback when quota exhausted
|
||||
export const MODEL_FALLBACK_MAP = {
|
||||
'gemini-3-pro-high': 'claude-opus-4-5-thinking',
|
||||
'gemini-3-pro-low': 'claude-sonnet-4-5',
|
||||
'gemini-3-flash': 'claude-sonnet-4-5-thinking',
|
||||
'claude-opus-4-5-thinking': 'gemini-3-pro-high',
|
||||
'claude-sonnet-4-5-thinking': 'gemini-3-flash',
|
||||
'claude-sonnet-4-5': 'gemini-3-flash'
|
||||
};
|
||||
|
||||
export default {
|
||||
ANTIGRAVITY_ENDPOINT_FALLBACKS,
|
||||
ANTIGRAVITY_HEADERS,
|
||||
@@ -165,5 +175,6 @@ export default {
|
||||
getModelFamily,
|
||||
isThinkingModel,
|
||||
OAUTH_CONFIG,
|
||||
OAUTH_REDIRECT_URI
|
||||
OAUTH_REDIRECT_URI,
|
||||
MODEL_FALLBACK_MAP
|
||||
};
|
||||
|
||||
29
src/fallback-config.js
Normal file
29
src/fallback-config.js
Normal file
@@ -0,0 +1,29 @@
|
||||
/**
|
||||
* Model Fallback Configuration
|
||||
*
|
||||
* Defines fallback mappings for when a model's quota is exhausted across all accounts.
|
||||
* Enables graceful degradation to alternative models with similar capabilities.
|
||||
*/
|
||||
|
||||
import { MODEL_FALLBACK_MAP } from './constants.js';
|
||||
|
||||
// Re-export for convenience
|
||||
export { MODEL_FALLBACK_MAP };
|
||||
|
||||
/**
|
||||
* Get fallback model for a given model ID
|
||||
* @param {string} model - Primary model ID
|
||||
* @returns {string|null} Fallback model ID or null if no fallback exists
|
||||
*/
|
||||
export function getFallbackModel(model) {
|
||||
return MODEL_FALLBACK_MAP[model] || null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a model has a fallback configured
|
||||
* @param {string} model - Model ID to check
|
||||
* @returns {boolean} True if fallback exists
|
||||
*/
|
||||
export function hasFallback(model) {
|
||||
return model in MODEL_FALLBACK_MAP;
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
*/
|
||||
|
||||
import { MIN_SIGNATURE_LENGTH, GEMINI_SKIP_SIGNATURE } from '../constants.js';
|
||||
import { getCachedSignature } from './signature-cache.js';
|
||||
import { getCachedSignature, getCachedSignatureFamily } from './signature-cache.js';
|
||||
import { logger } from '../utils/logger.js';
|
||||
|
||||
/**
|
||||
@@ -155,16 +155,31 @@ export function convertContentToParts(content, isClaudeModel = false, isGeminiMo
|
||||
// Add any images from the tool result as separate parts
|
||||
parts.push(...imageParts);
|
||||
} else if (block.type === 'thinking') {
|
||||
// Handle thinking blocks - only those with valid signatures
|
||||
// Handle thinking blocks with signature compatibility check
|
||||
if (block.signature && block.signature.length >= MIN_SIGNATURE_LENGTH) {
|
||||
// Convert to Gemini format with signature
|
||||
const signatureFamily = getCachedSignatureFamily(block.signature);
|
||||
const targetFamily = isClaudeModel ? 'claude' : isGeminiModel ? 'gemini' : null;
|
||||
|
||||
// Drop blocks with incompatible signatures for Gemini (cross-model switch)
|
||||
if (isGeminiModel && signatureFamily && targetFamily && signatureFamily !== targetFamily) {
|
||||
logger.debug(`[ContentConverter] Dropping incompatible ${signatureFamily} thinking for ${targetFamily} model`);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Drop blocks with unknown signature origin for Gemini (cold cache - safe default)
|
||||
if (isGeminiModel && !signatureFamily && targetFamily) {
|
||||
logger.debug(`[ContentConverter] Dropping thinking with unknown signature origin`);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Compatible - convert to Gemini format with signature
|
||||
parts.push({
|
||||
text: block.thinking,
|
||||
thought: true,
|
||||
thoughtSignature: block.signature
|
||||
});
|
||||
}
|
||||
// Unsigned thinking blocks are dropped upstream
|
||||
// Unsigned thinking blocks are dropped (existing behavior)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
removeTrailingThinkingBlocks,
|
||||
reorderAssistantContent,
|
||||
filterUnsignedThinkingBlocks,
|
||||
hasGeminiHistory,
|
||||
needsThinkingRecovery,
|
||||
closeToolLoopForThinking
|
||||
} from './thinking-utils.js';
|
||||
@@ -78,12 +79,19 @@ export function convertAnthropicToGoogle(anthropicRequest) {
|
||||
}
|
||||
|
||||
// Apply thinking recovery for Gemini thinking models when needed
|
||||
// This handles corrupted tool loops where thinking blocks are stripped
|
||||
// Claude models handle this differently and don't need this recovery
|
||||
// Gemini needs recovery for tool loops/interrupted tools (stripped thinking)
|
||||
let processedMessages = messages;
|
||||
|
||||
if (isGeminiModel && isThinking && needsThinkingRecovery(messages)) {
|
||||
logger.debug('[RequestConverter] Applying thinking recovery for Gemini');
|
||||
processedMessages = closeToolLoopForThinking(messages);
|
||||
processedMessages = closeToolLoopForThinking(messages, 'gemini');
|
||||
}
|
||||
|
||||
// For Claude: apply recovery only for cross-model (Gemini→Claude) switch
|
||||
// Detected by checking if history has Gemini-style tool_use with thoughtSignature
|
||||
if (isClaudeModel && isThinking && hasGeminiHistory(messages) && needsThinkingRecovery(messages)) {
|
||||
logger.debug('[RequestConverter] Applying thinking recovery for Claude (cross-model from Gemini)');
|
||||
processedMessages = closeToolLoopForThinking(messages, 'claude');
|
||||
}
|
||||
|
||||
// Convert messages to contents, then filter unsigned thinking blocks
|
||||
@@ -106,8 +114,10 @@ export function convertAnthropicToGoogle(anthropicRequest) {
|
||||
// SAFETY: Google API requires at least one part per content message
|
||||
// This happens when all thinking blocks are filtered out (unsigned)
|
||||
if (parts.length === 0) {
|
||||
// Use '.' instead of '' because claude models reject empty text parts.
|
||||
// A single period is invisible in practice but satisfies the API requirement.
|
||||
logger.warn('[RequestConverter] WARNING: Empty parts array after filtering, adding placeholder');
|
||||
parts.push({ text: '' });
|
||||
parts.push({ text: '.' });
|
||||
}
|
||||
|
||||
const content = {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
*/
|
||||
|
||||
import crypto from 'crypto';
|
||||
import { MIN_SIGNATURE_LENGTH } from '../constants.js';
|
||||
import { cacheSignature } from './signature-cache.js';
|
||||
import { MIN_SIGNATURE_LENGTH, getModelFamily } from '../constants.js';
|
||||
import { cacheSignature, cacheThinkingSignature } from './signature-cache.js';
|
||||
|
||||
/**
|
||||
* Convert Google Generative AI response to Anthropic Messages API format
|
||||
@@ -33,6 +33,12 @@ export function convertGoogleToAnthropic(googleResponse, model) {
|
||||
if (part.thought === true) {
|
||||
const signature = part.thoughtSignature || '';
|
||||
|
||||
// Cache thinking signature with model family for cross-model compatibility
|
||||
if (signature && signature.length >= MIN_SIGNATURE_LENGTH) {
|
||||
const modelFamily = getModelFamily(model);
|
||||
cacheThinkingSignature(signature, modelFamily);
|
||||
}
|
||||
|
||||
// Include thinking blocks in the response for Claude Code
|
||||
anthropicContent.push({
|
||||
type: 'thinking',
|
||||
|
||||
@@ -5,11 +5,15 @@
|
||||
* Gemini models require thoughtSignature on tool calls, but Claude Code
|
||||
* strips non-standard fields. This cache stores signatures by tool_use_id
|
||||
* so they can be restored in subsequent requests.
|
||||
*
|
||||
* Also caches thinking block signatures with model family for cross-model
|
||||
* compatibility checking.
|
||||
*/
|
||||
|
||||
import { GEMINI_SIGNATURE_CACHE_TTL_MS } from '../constants.js';
|
||||
import { GEMINI_SIGNATURE_CACHE_TTL_MS, MIN_SIGNATURE_LENGTH } from '../constants.js';
|
||||
|
||||
const signatureCache = new Map();
|
||||
const thinkingSignatureCache = new Map();
|
||||
|
||||
/**
|
||||
* Store a signature for a tool_use_id
|
||||
@@ -54,6 +58,11 @@ export function cleanupCache() {
|
||||
signatureCache.delete(key);
|
||||
}
|
||||
}
|
||||
for (const [key, entry] of thinkingSignatureCache) {
|
||||
if (now - entry.timestamp > GEMINI_SIGNATURE_CACHE_TTL_MS) {
|
||||
thinkingSignatureCache.delete(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -63,3 +72,43 @@ export function cleanupCache() {
|
||||
export function getCacheSize() {
|
||||
return signatureCache.size;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cache a thinking block signature with its model family
|
||||
* @param {string} signature - The thinking signature to cache
|
||||
* @param {string} modelFamily - The model family ('claude' or 'gemini')
|
||||
*/
|
||||
export function cacheThinkingSignature(signature, modelFamily) {
|
||||
if (!signature || signature.length < MIN_SIGNATURE_LENGTH) return;
|
||||
thinkingSignatureCache.set(signature, {
|
||||
modelFamily,
|
||||
timestamp: Date.now()
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the cached model family for a thinking signature
|
||||
* @param {string} signature - The signature to look up
|
||||
* @returns {string|null} 'claude', 'gemini', or null if not found/expired
|
||||
*/
|
||||
export function getCachedSignatureFamily(signature) {
|
||||
if (!signature) return null;
|
||||
const entry = thinkingSignatureCache.get(signature);
|
||||
if (!entry) return null;
|
||||
|
||||
// Check TTL
|
||||
if (Date.now() - entry.timestamp > GEMINI_SIGNATURE_CACHE_TTL_MS) {
|
||||
thinkingSignatureCache.delete(signature);
|
||||
return null;
|
||||
}
|
||||
|
||||
return entry.modelFamily;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current thinking signature cache size (for debugging)
|
||||
* @returns {number} Number of entries in the thinking signature cache
|
||||
*/
|
||||
export function getThinkingCacheSize() {
|
||||
return thinkingSignatureCache.size;
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
import { MIN_SIGNATURE_LENGTH } from '../constants.js';
|
||||
import { getCachedSignatureFamily } from './signature-cache.js';
|
||||
import { logger } from '../utils/logger.js';
|
||||
|
||||
/**
|
||||
@@ -26,6 +27,21 @@ export function hasValidSignature(part) {
|
||||
return typeof signature === 'string' && signature.length >= MIN_SIGNATURE_LENGTH;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if conversation history contains Gemini-style messages.
|
||||
* Gemini puts thoughtSignature on tool_use blocks, Claude puts signature on thinking blocks.
|
||||
* @param {Array<Object>} messages - Array of messages
|
||||
* @returns {boolean} True if any tool_use has thoughtSignature (Gemini pattern)
|
||||
*/
|
||||
export function hasGeminiHistory(messages) {
|
||||
return messages.some(msg =>
|
||||
Array.isArray(msg.content) &&
|
||||
msg.content.some(block =>
|
||||
block.type === 'tool_use' && block.thoughtSignature !== undefined
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitize a thinking part by keeping only allowed fields
|
||||
*/
|
||||
@@ -386,40 +402,83 @@ export function analyzeConversationState(messages) {
|
||||
|
||||
/**
|
||||
* Check if conversation needs thinking recovery.
|
||||
* Returns true when:
|
||||
* 1. We're in a tool loop but have no valid thinking blocks, OR
|
||||
* 2. We have an interrupted tool with no valid thinking blocks
|
||||
*
|
||||
* Recovery is only needed when:
|
||||
* 1. We're in a tool loop or have an interrupted tool, AND
|
||||
* 2. No valid thinking blocks exist in the current turn
|
||||
*
|
||||
* Cross-model signature compatibility is handled by stripInvalidThinkingBlocks
|
||||
* during recovery (not here).
|
||||
*
|
||||
* @param {Array<Object>} messages - Array of messages
|
||||
* @returns {boolean} True if thinking recovery is needed
|
||||
*/
|
||||
export function needsThinkingRecovery(messages) {
|
||||
const state = analyzeConversationState(messages);
|
||||
// Need recovery if (tool loop OR interrupted tool) AND no thinking
|
||||
return (state.inToolLoop || state.interruptedTool) && !state.turnHasThinking;
|
||||
|
||||
// Recovery is only needed in tool loops or interrupted tools
|
||||
if (!state.inToolLoop && !state.interruptedTool) return false;
|
||||
|
||||
// Need recovery if no valid thinking blocks exist
|
||||
return !state.turnHasThinking;
|
||||
}
|
||||
|
||||
/**
|
||||
* Strip all thinking blocks from messages.
|
||||
* Strip invalid or incompatible thinking blocks from messages.
|
||||
* Used before injecting synthetic messages for recovery.
|
||||
* Keeps valid thinking blocks to preserve context from previous turns.
|
||||
*
|
||||
* @param {Array<Object>} messages - Array of messages
|
||||
* @returns {Array<Object>} Messages with all thinking blocks removed
|
||||
* @param {string} targetFamily - Target model family ('claude' or 'gemini')
|
||||
* @returns {Array<Object>} Messages with invalid thinking blocks removed
|
||||
*/
|
||||
function stripAllThinkingBlocks(messages) {
|
||||
return messages.map(msg => {
|
||||
function stripInvalidThinkingBlocks(messages, targetFamily = null) {
|
||||
let strippedCount = 0;
|
||||
|
||||
const result = messages.map(msg => {
|
||||
const content = msg.content || msg.parts;
|
||||
if (!Array.isArray(content)) return msg;
|
||||
|
||||
const filtered = content.filter(block => !isThinkingPart(block));
|
||||
const filtered = content.filter(block => {
|
||||
// Keep non-thinking blocks
|
||||
if (!isThinkingPart(block)) return true;
|
||||
|
||||
// Check generic validity (has signature of sufficient length)
|
||||
if (!hasValidSignature(block)) {
|
||||
strippedCount++;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check family compatibility only for Gemini targets
|
||||
// Claude can validate its own signatures, so we don't drop for Claude
|
||||
if (targetFamily === 'gemini') {
|
||||
const signature = block.thought === true ? block.thoughtSignature : block.signature;
|
||||
const signatureFamily = getCachedSignatureFamily(signature);
|
||||
|
||||
// For Gemini: drop unknown or mismatched signatures
|
||||
if (!signatureFamily || signatureFamily !== targetFamily) {
|
||||
strippedCount++;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
// Use '.' instead of '' because claude models reject empty text parts
|
||||
if (msg.content) {
|
||||
return { ...msg, content: filtered.length > 0 ? filtered : [{ type: 'text', text: '' }] };
|
||||
return { ...msg, content: filtered.length > 0 ? filtered : [{ type: 'text', text: '.' }] };
|
||||
} else if (msg.parts) {
|
||||
return { ...msg, parts: filtered.length > 0 ? filtered : [{ text: '' }] };
|
||||
return { ...msg, parts: filtered.length > 0 ? filtered : [{ text: '.' }] };
|
||||
}
|
||||
return msg;
|
||||
});
|
||||
|
||||
if (strippedCount > 0) {
|
||||
logger.debug(`[ThinkingUtils] Stripped ${strippedCount} invalid/incompatible thinking block(s)`);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -432,16 +491,17 @@ function stripAllThinkingBlocks(messages) {
|
||||
* loop and allow the model to continue.
|
||||
*
|
||||
* @param {Array<Object>} messages - Array of messages
|
||||
* @param {string} targetFamily - Target model family ('claude' or 'gemini')
|
||||
* @returns {Array<Object>} Modified messages with synthetic messages injected
|
||||
*/
|
||||
export function closeToolLoopForThinking(messages) {
|
||||
export function closeToolLoopForThinking(messages, targetFamily = null) {
|
||||
const state = analyzeConversationState(messages);
|
||||
|
||||
// Handle neither tool loop nor interrupted tool
|
||||
if (!state.inToolLoop && !state.interruptedTool) return messages;
|
||||
|
||||
// Strip all thinking blocks
|
||||
let modified = stripAllThinkingBlocks(messages);
|
||||
// Strip only invalid/incompatible thinking blocks (keep valid ones)
|
||||
let modified = stripInvalidThinkingBlocks(messages, targetFamily);
|
||||
|
||||
if (state.interruptedTool) {
|
||||
// For interrupted tools: just strip thinking and add a synthetic assistant message
|
||||
@@ -457,7 +517,7 @@ export function closeToolLoopForThinking(messages) {
|
||||
});
|
||||
|
||||
logger.debug('[ThinkingUtils] Applied thinking recovery for interrupted tool');
|
||||
} else {
|
||||
} else if (state.inToolLoop) {
|
||||
// For tool loops: add synthetic messages to close the loop
|
||||
const syntheticText = state.toolResultCount === 1
|
||||
? '[Tool execution completed.]'
|
||||
|
||||
22
src/index.js
22
src/index.js
@@ -12,6 +12,7 @@ import os from 'os';
|
||||
// Parse command line arguments
|
||||
const args = process.argv.slice(2);
|
||||
const isDebug = args.includes('--debug') || process.env.DEBUG === 'true';
|
||||
const isFallbackEnabled = args.includes('--fallback') || process.env.FALLBACK === 'true';
|
||||
|
||||
// Initialize logger
|
||||
logger.setDebug(isDebug);
|
||||
@@ -20,6 +21,13 @@ if (isDebug) {
|
||||
logger.debug('Debug mode enabled');
|
||||
}
|
||||
|
||||
if (isFallbackEnabled) {
|
||||
logger.info('Model fallback mode enabled');
|
||||
}
|
||||
|
||||
// Export fallback flag for server to use
|
||||
export const FALLBACK_ENABLED = isFallbackEnabled;
|
||||
|
||||
const PORT = process.env.PORT || DEFAULT_PORT;
|
||||
|
||||
// Home directory for account storage
|
||||
@@ -40,14 +48,22 @@ app.listen(PORT, () => {
|
||||
if (!isDebug) {
|
||||
controlSection += '║ --debug Enable debug logging ║\n';
|
||||
}
|
||||
if (!isFallbackEnabled) {
|
||||
controlSection += '║ --fallback Enable model fallback on quota exhaust ║\n';
|
||||
}
|
||||
controlSection += '║ Ctrl+C Stop server ║';
|
||||
|
||||
// Build status section if debug mode is active
|
||||
// Build status section if any modes are active
|
||||
let statusSection = '';
|
||||
if (isDebug) {
|
||||
if (isDebug || isFallbackEnabled) {
|
||||
statusSection = '║ ║\n';
|
||||
statusSection += '║ Active Modes: ║\n';
|
||||
statusSection += '║ ✓ Debug mode enabled ║\n';
|
||||
if (isDebug) {
|
||||
statusSection += '║ ✓ Debug mode enabled ║\n';
|
||||
}
|
||||
if (isFallbackEnabled) {
|
||||
statusSection += '║ ✓ Model fallback enabled ║\n';
|
||||
}
|
||||
}
|
||||
|
||||
logger.log(`
|
||||
|
||||
@@ -13,6 +13,10 @@ import { AccountManager } from './account-manager/index.js';
|
||||
import { formatDuration } from './utils/helpers.js';
|
||||
import { logger } from './utils/logger.js';
|
||||
|
||||
// Parse fallback flag directly from command line args to avoid circular dependency
|
||||
const args = process.argv.slice(2);
|
||||
const FALLBACK_ENABLED = args.includes('--fallback') || process.env.FALLBACK === 'true';
|
||||
|
||||
const app = express();
|
||||
|
||||
// Initialize account manager (will be fully initialized on first request or startup)
|
||||
@@ -595,7 +599,7 @@ app.post('/v1/messages', async (req, res) => {
|
||||
|
||||
try {
|
||||
// Use the streaming generator with account manager
|
||||
for await (const event of sendMessageStream(request, accountManager)) {
|
||||
for await (const event of sendMessageStream(request, accountManager, FALLBACK_ENABLED)) {
|
||||
res.write(`event: ${event.type}\ndata: ${JSON.stringify(event)}\n\n`);
|
||||
// Flush after each event for real-time streaming
|
||||
if (res.flush) res.flush();
|
||||
@@ -616,7 +620,7 @@ app.post('/v1/messages', async (req, res) => {
|
||||
|
||||
} else {
|
||||
// Handle non-streaming response
|
||||
const response = await sendMessage(request, accountManager);
|
||||
const response = await sendMessage(request, accountManager, FALLBACK_ENABLED);
|
||||
res.json(response);
|
||||
}
|
||||
|
||||
|
||||
511
tests/test-cross-model-thinking.cjs
Normal file
511
tests/test-cross-model-thinking.cjs
Normal file
@@ -0,0 +1,511 @@
|
||||
/**
|
||||
* Cross-Model Thinking Signature Test
|
||||
*
|
||||
* Tests that switching between Claude and Gemini models mid-conversation
|
||||
* properly handles incompatible thinking signatures.
|
||||
*
|
||||
* Scenarios tested:
|
||||
* 1. Claude → Gemini: Claude thinking signatures should be dropped
|
||||
* 2. Gemini → Claude: Gemini thinking signatures should be dropped
|
||||
* 3. Both should still work without errors (thinking recovery kicks in)
|
||||
*/
|
||||
const { streamRequest, nonStreamRequest, analyzeContent, commonTools } = require('./helpers/http-client.cjs');
|
||||
const { getModelConfig } = require('./helpers/test-models.cjs');
|
||||
|
||||
const tools = [commonTools.executeCommand];
|
||||
|
||||
// Test models
|
||||
const CLAUDE_MODEL = 'claude-sonnet-4-5-thinking';
|
||||
const GEMINI_MODEL = 'gemini-3-flash';
|
||||
|
||||
async function testClaudeToGemini() {
|
||||
console.log('='.repeat(60));
|
||||
console.log('TEST: Claude → Gemini Cross-Model Switch');
|
||||
console.log('Simulates starting with Claude, then switching to Gemini');
|
||||
console.log('='.repeat(60));
|
||||
console.log('');
|
||||
|
||||
const claudeConfig = getModelConfig('claude');
|
||||
const geminiConfig = getModelConfig('gemini');
|
||||
|
||||
// TURN 1: Get response from Claude with thinking + tool use
|
||||
console.log('TURN 1: Request to Claude (get thinking signature)');
|
||||
console.log('-'.repeat(40));
|
||||
|
||||
const turn1Messages = [
|
||||
{ role: 'user', content: 'Run the command "ls -la" to list files.' }
|
||||
];
|
||||
|
||||
const turn1Result = await streamRequest({
|
||||
model: CLAUDE_MODEL,
|
||||
max_tokens: claudeConfig.max_tokens,
|
||||
stream: true,
|
||||
tools,
|
||||
thinking: claudeConfig.thinking,
|
||||
messages: turn1Messages
|
||||
});
|
||||
|
||||
const turn1Content = analyzeContent(turn1Result.content);
|
||||
console.log(` Thinking: ${turn1Content.hasThinking ? 'YES' : 'NO'}`);
|
||||
console.log(` Signature: ${turn1Content.hasSignature ? 'YES' : 'NO'}`);
|
||||
console.log(` Tool Use: ${turn1Content.hasToolUse ? 'YES' : 'NO'}`);
|
||||
|
||||
if (!turn1Content.hasToolUse) {
|
||||
console.log(' SKIP: No tool use in turn 1');
|
||||
return { passed: false, skipped: true };
|
||||
}
|
||||
|
||||
// Extract thinking and tool_use for the assistant message
|
||||
const assistantContent = [];
|
||||
if (turn1Content.hasThinking && turn1Content.thinking[0]) {
|
||||
assistantContent.push({
|
||||
type: 'thinking',
|
||||
thinking: turn1Content.thinking[0].thinking,
|
||||
signature: turn1Content.thinking[0].signature || ''
|
||||
});
|
||||
}
|
||||
if (turn1Content.hasText && turn1Content.text[0]) {
|
||||
assistantContent.push({
|
||||
type: 'text',
|
||||
text: turn1Content.text[0].text
|
||||
});
|
||||
}
|
||||
for (const tool of turn1Content.toolUse) {
|
||||
assistantContent.push({
|
||||
type: 'tool_use',
|
||||
id: tool.id,
|
||||
name: tool.name,
|
||||
input: tool.input
|
||||
});
|
||||
}
|
||||
|
||||
const signatureLength = turn1Content.thinking[0]?.signature?.length || 0;
|
||||
console.log(` Claude signature length: ${signatureLength}`);
|
||||
|
||||
// TURN 2: Switch to Gemini with Claude's thinking signature in history
|
||||
console.log('\nTURN 2: Request to Gemini (with Claude thinking in history)');
|
||||
console.log('-'.repeat(40));
|
||||
|
||||
const turn2Messages = [
|
||||
{ role: 'user', content: 'Run the command "ls -la" to list files.' },
|
||||
{ role: 'assistant', content: assistantContent },
|
||||
{
|
||||
role: 'user',
|
||||
content: [{
|
||||
type: 'tool_result',
|
||||
tool_use_id: turn1Content.toolUse[0].id,
|
||||
content: 'total 16\ndrwxr-xr-x 5 user staff 160 Jan 1 12:00 .\ndrwxr-xr-x 3 user staff 96 Jan 1 12:00 ..\n-rw-r--r-- 1 user staff 100 Jan 1 12:00 file.txt'
|
||||
}]
|
||||
}
|
||||
];
|
||||
|
||||
try {
|
||||
const turn2Result = await streamRequest({
|
||||
model: GEMINI_MODEL,
|
||||
max_tokens: geminiConfig.max_tokens,
|
||||
stream: true,
|
||||
tools,
|
||||
thinking: geminiConfig.thinking,
|
||||
messages: turn2Messages
|
||||
});
|
||||
|
||||
const turn2Content = analyzeContent(turn2Result.content);
|
||||
console.log(` Response received: YES`);
|
||||
console.log(` Thinking: ${turn2Content.hasThinking ? 'YES' : 'NO'}`);
|
||||
console.log(` Text: ${turn2Content.hasText ? 'YES' : 'NO'}`);
|
||||
console.log(` Error: NO`);
|
||||
|
||||
// Success if we got any response without error
|
||||
const passed = turn2Content.hasText || turn2Content.hasThinking || turn2Content.hasToolUse;
|
||||
console.log(` Result: ${passed ? 'PASS' : 'FAIL'}`);
|
||||
return { passed };
|
||||
} catch (error) {
|
||||
console.log(` Error: ${error.message}`);
|
||||
console.log(` Result: FAIL`);
|
||||
return { passed: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async function testGeminiToClaude() {
|
||||
console.log('\n' + '='.repeat(60));
|
||||
console.log('TEST: Gemini → Claude Cross-Model Switch');
|
||||
console.log('Simulates starting with Gemini, then switching to Claude');
|
||||
console.log('='.repeat(60));
|
||||
console.log('');
|
||||
|
||||
const claudeConfig = getModelConfig('claude');
|
||||
const geminiConfig = getModelConfig('gemini');
|
||||
|
||||
// TURN 1: Get response from Gemini with thinking + tool use
|
||||
console.log('TURN 1: Request to Gemini (get thinking signature)');
|
||||
console.log('-'.repeat(40));
|
||||
|
||||
const turn1Messages = [
|
||||
{ role: 'user', content: 'Run the command "pwd" to show current directory.' }
|
||||
];
|
||||
|
||||
const turn1Result = await streamRequest({
|
||||
model: GEMINI_MODEL,
|
||||
max_tokens: geminiConfig.max_tokens,
|
||||
stream: true,
|
||||
tools,
|
||||
thinking: geminiConfig.thinking,
|
||||
messages: turn1Messages
|
||||
});
|
||||
|
||||
const turn1Content = analyzeContent(turn1Result.content);
|
||||
console.log(` Thinking: ${turn1Content.hasThinking ? 'YES' : 'NO'}`);
|
||||
console.log(` Signature: ${turn1Content.hasSignature ? 'YES' : 'NO'}`);
|
||||
console.log(` Tool Use: ${turn1Content.hasToolUse ? 'YES' : 'NO'}`);
|
||||
|
||||
if (!turn1Content.hasToolUse) {
|
||||
console.log(' SKIP: No tool use in turn 1');
|
||||
return { passed: false, skipped: true };
|
||||
}
|
||||
|
||||
// Extract content for the assistant message
|
||||
const assistantContent = [];
|
||||
if (turn1Content.hasThinking && turn1Content.thinking[0]) {
|
||||
assistantContent.push({
|
||||
type: 'thinking',
|
||||
thinking: turn1Content.thinking[0].thinking,
|
||||
signature: turn1Content.thinking[0].signature || ''
|
||||
});
|
||||
}
|
||||
if (turn1Content.hasText && turn1Content.text[0]) {
|
||||
assistantContent.push({
|
||||
type: 'text',
|
||||
text: turn1Content.text[0].text
|
||||
});
|
||||
}
|
||||
for (const tool of turn1Content.toolUse) {
|
||||
const toolBlock = {
|
||||
type: 'tool_use',
|
||||
id: tool.id,
|
||||
name: tool.name,
|
||||
input: tool.input
|
||||
};
|
||||
// Include thoughtSignature if present (Gemini puts it on tool_use)
|
||||
if (tool.thoughtSignature) {
|
||||
toolBlock.thoughtSignature = tool.thoughtSignature;
|
||||
}
|
||||
assistantContent.push(toolBlock);
|
||||
}
|
||||
|
||||
const thinkingSigLength = turn1Content.thinking[0]?.signature?.length || 0;
|
||||
const toolUseSigLength = turn1Content.toolUse[0]?.thoughtSignature?.length || 0;
|
||||
console.log(` Gemini thinking signature length: ${thinkingSigLength}`);
|
||||
console.log(` Gemini tool_use signature length: ${toolUseSigLength}`);
|
||||
|
||||
// TURN 2: Switch to Claude with Gemini's thinking signature in history
|
||||
console.log('\nTURN 2: Request to Claude (with Gemini thinking in history)');
|
||||
console.log('-'.repeat(40));
|
||||
console.log(` Assistant content being sent: ${JSON.stringify(assistantContent).substring(0, 400)}`);
|
||||
|
||||
const turn2Messages = [
|
||||
{ role: 'user', content: 'Run the command "pwd" to show current directory.' },
|
||||
{ role: 'assistant', content: assistantContent },
|
||||
{
|
||||
role: 'user',
|
||||
content: [{
|
||||
type: 'tool_result',
|
||||
tool_use_id: turn1Content.toolUse[0].id,
|
||||
content: '/home/user/projects'
|
||||
}]
|
||||
}
|
||||
];
|
||||
|
||||
try {
|
||||
const turn2Result = await streamRequest({
|
||||
model: CLAUDE_MODEL,
|
||||
max_tokens: claudeConfig.max_tokens,
|
||||
stream: true,
|
||||
tools,
|
||||
thinking: claudeConfig.thinking,
|
||||
messages: turn2Messages
|
||||
});
|
||||
|
||||
const turn2Content = analyzeContent(turn2Result.content);
|
||||
console.log(` Response received: YES`);
|
||||
console.log(` Stop reason: ${turn2Result.stop_reason}`);
|
||||
console.log(` Thinking: ${turn2Content.hasThinking ? 'YES' : 'NO'}`);
|
||||
console.log(` Text: ${turn2Content.hasText ? 'YES' : 'NO'}`);
|
||||
console.log(` Tool Use: ${turn2Content.hasToolUse ? 'YES' : 'NO'}`);
|
||||
console.log(` Raw content: ${JSON.stringify(turn2Result.content).substring(0, 300)}`);
|
||||
console.log(` Error: NO`);
|
||||
|
||||
// Success if we got any response without error
|
||||
const passed = turn2Content.hasText || turn2Content.hasThinking || turn2Content.hasToolUse;
|
||||
console.log(` Result: ${passed ? 'PASS' : 'FAIL'}`);
|
||||
return { passed };
|
||||
} catch (error) {
|
||||
console.log(` Error: ${error.message}`);
|
||||
console.log(` Result: FAIL`);
|
||||
return { passed: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async function testSameModelContinuation() {
|
||||
console.log('\n' + '='.repeat(60));
|
||||
console.log('TEST: Same Model Continuation - Claude (Control Test)');
|
||||
console.log('Verifies same-model multi-turn still works');
|
||||
console.log('='.repeat(60));
|
||||
console.log('');
|
||||
|
||||
const claudeConfig = getModelConfig('claude');
|
||||
|
||||
// TURN 1: Get response from Claude
|
||||
console.log('TURN 1: Request to Claude');
|
||||
console.log('-'.repeat(40));
|
||||
|
||||
const turn1Messages = [
|
||||
{ role: 'user', content: 'Run "echo hello" command.' }
|
||||
];
|
||||
|
||||
const turn1Result = await streamRequest({
|
||||
model: CLAUDE_MODEL,
|
||||
max_tokens: claudeConfig.max_tokens,
|
||||
stream: true,
|
||||
tools,
|
||||
thinking: claudeConfig.thinking,
|
||||
messages: turn1Messages
|
||||
});
|
||||
|
||||
const turn1Content = analyzeContent(turn1Result.content);
|
||||
console.log(` Thinking: ${turn1Content.hasThinking ? 'YES' : 'NO'}`);
|
||||
console.log(` Signature: ${turn1Content.hasSignature ? 'YES' : 'NO'}`);
|
||||
console.log(` Tool Use: ${turn1Content.hasToolUse ? 'YES' : 'NO'}`);
|
||||
|
||||
if (!turn1Content.hasToolUse) {
|
||||
console.log(' SKIP: No tool use in turn 1');
|
||||
return { passed: false, skipped: true };
|
||||
}
|
||||
|
||||
// Build assistant message
|
||||
const assistantContent = [];
|
||||
if (turn1Content.hasThinking && turn1Content.thinking[0]) {
|
||||
assistantContent.push({
|
||||
type: 'thinking',
|
||||
thinking: turn1Content.thinking[0].thinking,
|
||||
signature: turn1Content.thinking[0].signature || ''
|
||||
});
|
||||
}
|
||||
if (turn1Content.hasText && turn1Content.text[0]) {
|
||||
assistantContent.push({
|
||||
type: 'text',
|
||||
text: turn1Content.text[0].text
|
||||
});
|
||||
}
|
||||
for (const tool of turn1Content.toolUse) {
|
||||
assistantContent.push({
|
||||
type: 'tool_use',
|
||||
id: tool.id,
|
||||
name: tool.name,
|
||||
input: tool.input
|
||||
});
|
||||
}
|
||||
|
||||
// TURN 2: Continue with same model
|
||||
console.log('\nTURN 2: Continue with Claude (same model)');
|
||||
console.log('-'.repeat(40));
|
||||
|
||||
const turn2Messages = [
|
||||
{ role: 'user', content: 'Run "echo hello" command.' },
|
||||
{ role: 'assistant', content: assistantContent },
|
||||
{
|
||||
role: 'user',
|
||||
content: [{
|
||||
type: 'tool_result',
|
||||
tool_use_id: turn1Content.toolUse[0].id,
|
||||
content: 'hello'
|
||||
}]
|
||||
}
|
||||
];
|
||||
|
||||
try {
|
||||
const turn2Result = await streamRequest({
|
||||
model: CLAUDE_MODEL,
|
||||
max_tokens: claudeConfig.max_tokens,
|
||||
stream: true,
|
||||
tools,
|
||||
thinking: claudeConfig.thinking,
|
||||
messages: turn2Messages
|
||||
});
|
||||
|
||||
const turn2Content = analyzeContent(turn2Result.content);
|
||||
console.log(` Response received: YES`);
|
||||
console.log(` Thinking: ${turn2Content.hasThinking ? 'YES' : 'NO'}`);
|
||||
console.log(` Signature: ${turn2Content.hasSignature ? 'YES' : 'NO'}`);
|
||||
console.log(` Text: ${turn2Content.hasText ? 'YES' : 'NO'}`);
|
||||
console.log(` Error: NO`);
|
||||
|
||||
// For same model, we should preserve thinking with valid signature
|
||||
const passed = turn2Content.hasText || turn2Content.hasThinking;
|
||||
console.log(` Result: ${passed ? 'PASS' : 'FAIL'}`);
|
||||
return { passed };
|
||||
} catch (error) {
|
||||
console.log(` Error: ${error.message}`);
|
||||
console.log(` Result: FAIL`);
|
||||
return { passed: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async function testSameModelContinuationGemini() {
|
||||
console.log('\n' + '='.repeat(60));
|
||||
console.log('TEST: Same Model Continuation - Gemini (Control Test)');
|
||||
console.log('Verifies same-model multi-turn still works for Gemini');
|
||||
console.log('='.repeat(60));
|
||||
console.log('');
|
||||
|
||||
const geminiConfig = getModelConfig('gemini');
|
||||
|
||||
// TURN 1: Get response from Gemini
|
||||
console.log('TURN 1: Request to Gemini');
|
||||
console.log('-'.repeat(40));
|
||||
|
||||
const turn1Messages = [
|
||||
{ role: 'user', content: 'Run "echo world" command.' }
|
||||
];
|
||||
|
||||
const turn1Result = await streamRequest({
|
||||
model: GEMINI_MODEL,
|
||||
max_tokens: geminiConfig.max_tokens,
|
||||
stream: true,
|
||||
tools,
|
||||
thinking: geminiConfig.thinking,
|
||||
messages: turn1Messages
|
||||
});
|
||||
|
||||
const turn1Content = analyzeContent(turn1Result.content);
|
||||
console.log(` Thinking: ${turn1Content.hasThinking ? 'YES' : 'NO'}`);
|
||||
console.log(` Signature: ${turn1Content.hasSignature ? 'YES' : 'NO'}`);
|
||||
console.log(` Tool Use: ${turn1Content.hasToolUse ? 'YES' : 'NO'}`);
|
||||
|
||||
if (!turn1Content.hasToolUse) {
|
||||
console.log(' SKIP: No tool use in turn 1');
|
||||
return { passed: false, skipped: true };
|
||||
}
|
||||
|
||||
// Build assistant message
|
||||
const assistantContent = [];
|
||||
if (turn1Content.hasThinking && turn1Content.thinking[0]) {
|
||||
assistantContent.push({
|
||||
type: 'thinking',
|
||||
thinking: turn1Content.thinking[0].thinking,
|
||||
signature: turn1Content.thinking[0].signature || ''
|
||||
});
|
||||
}
|
||||
if (turn1Content.hasText && turn1Content.text[0]) {
|
||||
assistantContent.push({
|
||||
type: 'text',
|
||||
text: turn1Content.text[0].text
|
||||
});
|
||||
}
|
||||
for (const tool of turn1Content.toolUse) {
|
||||
const toolBlock = {
|
||||
type: 'tool_use',
|
||||
id: tool.id,
|
||||
name: tool.name,
|
||||
input: tool.input
|
||||
};
|
||||
// Include thoughtSignature if present (Gemini puts it on tool_use)
|
||||
if (tool.thoughtSignature) {
|
||||
toolBlock.thoughtSignature = tool.thoughtSignature;
|
||||
}
|
||||
assistantContent.push(toolBlock);
|
||||
}
|
||||
|
||||
// TURN 2: Continue with same model
|
||||
console.log('\nTURN 2: Continue with Gemini (same model)');
|
||||
console.log('-'.repeat(40));
|
||||
|
||||
const turn2Messages = [
|
||||
{ role: 'user', content: 'Run "echo world" command.' },
|
||||
{ role: 'assistant', content: assistantContent },
|
||||
{
|
||||
role: 'user',
|
||||
content: [{
|
||||
type: 'tool_result',
|
||||
tool_use_id: turn1Content.toolUse[0].id,
|
||||
content: 'world'
|
||||
}]
|
||||
}
|
||||
];
|
||||
|
||||
try {
|
||||
const turn2Result = await streamRequest({
|
||||
model: GEMINI_MODEL,
|
||||
max_tokens: geminiConfig.max_tokens,
|
||||
stream: true,
|
||||
tools,
|
||||
thinking: geminiConfig.thinking,
|
||||
messages: turn2Messages
|
||||
});
|
||||
|
||||
const turn2Content = analyzeContent(turn2Result.content);
|
||||
console.log(` Response received: YES`);
|
||||
console.log(` Thinking: ${turn2Content.hasThinking ? 'YES' : 'NO'}`);
|
||||
console.log(` Signature: ${turn2Content.hasSignature ? 'YES' : 'NO'}`);
|
||||
console.log(` Text: ${turn2Content.hasText ? 'YES' : 'NO'}`);
|
||||
console.log(` Error: NO`);
|
||||
|
||||
// For same model, we should get a response
|
||||
const passed = turn2Content.hasText || turn2Content.hasThinking;
|
||||
console.log(` Result: ${passed ? 'PASS' : 'FAIL'}`);
|
||||
return { passed };
|
||||
} catch (error) {
|
||||
console.log(` Error: ${error.message}`);
|
||||
console.log(` Result: FAIL`);
|
||||
return { passed: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log('\n');
|
||||
console.log('╔' + '═'.repeat(58) + '╗');
|
||||
console.log('║' + ' CROSS-MODEL THINKING SIGNATURE TEST SUITE '.padEnd(58) + '║');
|
||||
console.log('║' + ' Tests switching between Claude and Gemini '.padEnd(58) + '║');
|
||||
console.log('╚' + '═'.repeat(58) + '╝');
|
||||
console.log('\n');
|
||||
|
||||
const results = [];
|
||||
|
||||
// Test 1: Claude → Gemini
|
||||
const claudeToGemini = await testClaudeToGemini();
|
||||
results.push({ name: 'Claude → Gemini', ...claudeToGemini });
|
||||
|
||||
// Test 2: Gemini → Claude
|
||||
const geminiToClaude = await testGeminiToClaude();
|
||||
results.push({ name: 'Gemini → Claude', ...geminiToClaude });
|
||||
|
||||
// Test 3: Same model Claude (control)
|
||||
const sameModelClaude = await testSameModelContinuation();
|
||||
results.push({ name: 'Same Model (Claude → Claude)', ...sameModelClaude });
|
||||
|
||||
// Test 4: Same model Gemini (control)
|
||||
const sameModelGemini = await testSameModelContinuationGemini();
|
||||
results.push({ name: 'Same Model (Gemini → Gemini)', ...sameModelGemini });
|
||||
|
||||
// Summary
|
||||
console.log('\n' + '='.repeat(60));
|
||||
console.log('SUMMARY');
|
||||
console.log('='.repeat(60));
|
||||
|
||||
let allPassed = true;
|
||||
for (const result of results) {
|
||||
const status = result.skipped ? 'SKIP' : (result.passed ? 'PASS' : 'FAIL');
|
||||
console.log(` [${status}] ${result.name}`);
|
||||
if (!result.passed && !result.skipped) allPassed = false;
|
||||
}
|
||||
|
||||
console.log('\n' + '='.repeat(60));
|
||||
console.log(`FINAL RESULT: ${allPassed ? 'ALL TESTS PASSED' : 'SOME TESTS FAILED'}`);
|
||||
console.log('='.repeat(60));
|
||||
|
||||
process.exit(allPassed ? 0 : 1);
|
||||
}
|
||||
|
||||
main().catch(err => {
|
||||
console.error('Test error:', err);
|
||||
process.exit(1);
|
||||
});
|
||||
Reference in New Issue
Block a user