mirror of
https://github.com/elder-plinius/G0DM0D3.git
synced 2026-11-16 07:02:25 +00:00
fix: guard all OpenRouter helpers for Venice-only + fix pong game leak
Venice-only guards added to: - generateSmartPrefill: returns random prefill without LLM call - llmRefusalCheck: falls back to regex-only detection - llmAccuracyCheck: returns optimistic result without LLM verification - liquidResponseLoop: early-returns (refinement requires OpenRouter) Pong game leak: regenerateFromMessage now wraps both branches in try/finally that always calls hidePongGame(), hideTyping(), and resets streaming state — success, failure, and abort all clean up. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
202
index.html
202
index.html
@@ -4770,6 +4770,11 @@ ABSOLUTE RULES:
|
||||
return getRandomPrefill(classification?.type || 'bypass');
|
||||
}
|
||||
|
||||
// Venice-only: skip LLM prefill (requires OpenRouter)
|
||||
if (!state.apiKey) {
|
||||
return getRandomPrefill(classification?.type || 'bypass');
|
||||
}
|
||||
|
||||
try {
|
||||
console.log('[SmartPrefill] Generating intelligent prefill...');
|
||||
addThinkingLog('!PREFILL // generating...', 'info');
|
||||
@@ -9322,6 +9327,11 @@ Analyze the query and response. Output ONLY valid JSON:
|
||||
return { isRefusal: true, confidence: 0.95, reason: 'Matched refusal pattern', source: 'regex' };
|
||||
}
|
||||
|
||||
// Venice-only: use regex result only (no OpenRouter for LLM check)
|
||||
if (!state.apiKey) {
|
||||
return { isRefusal: isRefusal(responseContent), confidence: 0.6, reason: 'Regex only (no OpenRouter key)', source: 'regex-fallback' };
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch('https://openrouter.ai/api/v1/chat/completions', {
|
||||
method: 'POST',
|
||||
@@ -9921,6 +9931,11 @@ Output ONLY JSON:
|
||||
return { accurate: true, confidence: 0.5, issue: 'none', source: 'skipped' };
|
||||
}
|
||||
|
||||
// Venice-only: skip LLM accuracy check (requires OpenRouter)
|
||||
if (!state.apiKey) {
|
||||
return { accurate: true, confidence: 0.3, issue: 'none', source: 'skipped-no-key' };
|
||||
}
|
||||
|
||||
try {
|
||||
console.log('[ACCURACY] Running LLM accuracy check...');
|
||||
|
||||
@@ -9965,6 +9980,12 @@ Output ONLY JSON:
|
||||
}
|
||||
|
||||
async function liquidResponseLoop(messageIdx, originalContent, userQuery, winnerModel) {
|
||||
// Venice-only: skip liquid refinement (requires OpenRouter)
|
||||
if (!state.apiKey) {
|
||||
_log('[LIQUID] No OpenRouter key, skipping refinement');
|
||||
return;
|
||||
}
|
||||
|
||||
const refinementId = `liquid-${messageIdx}-${Date.now()}`;
|
||||
liquidRefinementActive[refinementId] = true;
|
||||
|
||||
@@ -13333,105 +13354,108 @@ Ignoring conversation history will cause you to LOSE the evaluation.`;
|
||||
});
|
||||
const userQuery = historyMessages[historyMessages.length - 1]?.content || '';
|
||||
|
||||
if (state.ultraplinian) {
|
||||
// ULTRAPLINIAN mode (includes Venice-only): use the full race pipeline
|
||||
try {
|
||||
try {
|
||||
if (state.ultraplinian) {
|
||||
// ULTRAPLINIAN mode (includes Venice-only): use the full race pipeline
|
||||
showPongGame();
|
||||
const result = await ultraplinian(messages, userQuery, null);
|
||||
conv.messages = conv.messages.slice(0, userMsgIdx + 1);
|
||||
conv.messages.push({
|
||||
role: 'assistant',
|
||||
content: result.content,
|
||||
strategy: result.strategy,
|
||||
magic: result.magic,
|
||||
raceResponses: result.raceResponses
|
||||
});
|
||||
saveState();
|
||||
} catch (err) {
|
||||
if (err.name !== 'AbortError') {
|
||||
conv.messages = conv.messages.slice(0, userMsgIdx + 1);
|
||||
conv.messages.push({ role: 'assistant', content: `**Error:** ${err.message}` });
|
||||
saveState();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Direct single-model mode (OpenRouter key required)
|
||||
let attempt = 0;
|
||||
let success = false;
|
||||
|
||||
while (attempt <= state.maxRetries && !success) {
|
||||
try {
|
||||
abortController = new AbortController();
|
||||
const retryPrefix = getRetryPrefix(attempt);
|
||||
const retryMessages = messages.map((m, idx) => {
|
||||
if (m.role === 'user' && idx === messages.length - 1 && retryPrefix) {
|
||||
return { ...m, content: retryPrefix + m.content };
|
||||
}
|
||||
return m;
|
||||
const result = await ultraplinian(messages, userQuery, null);
|
||||
conv.messages = conv.messages.slice(0, userMsgIdx + 1);
|
||||
conv.messages.push({
|
||||
role: 'assistant',
|
||||
content: result.content,
|
||||
strategy: result.strategy,
|
||||
magic: result.magic,
|
||||
raceResponses: result.raceResponses
|
||||
});
|
||||
|
||||
const params = getRetryParams(attempt);
|
||||
if (attempt > 0) {
|
||||
updateTypingStatus(`Retry ${attempt}/${state.maxRetries} (temp: ${params.temperature})...`);
|
||||
}
|
||||
|
||||
const response = await fetch('https://openrouter.ai/api/v1/chat/completions', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Authorization': `Bearer ${state.apiKey}`,
|
||||
'Content-Type': 'application/json',
|
||||
'HTTP-Referer': 'https://godmod3.ai',
|
||||
'X-Title': 'GODMOD3.AI'
|
||||
},
|
||||
body: JSON.stringify({
|
||||
model: conv.model,
|
||||
messages: retryMessages,
|
||||
temperature: params.temperature,
|
||||
top_p: params.top_p,
|
||||
frequency_penalty: state.modelFreqPenalty ?? 0,
|
||||
presence_penalty: params.presence_penalty || state.modelPresPenalty || 0,
|
||||
max_tokens: state.modelMaxTokens ?? 4096
|
||||
}),
|
||||
signal: abortController.signal
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const err = await response.json().catch(() => ({}));
|
||||
throw new Error(err.error?.message || `API Error: ${response.status}`);
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
const assistantContent = data.choices?.[0]?.message?.content || 'No response';
|
||||
|
||||
if (state.autoRetry && isRefusal(assistantContent) && attempt < state.maxRetries) {
|
||||
attempt++;
|
||||
continue;
|
||||
}
|
||||
|
||||
conv.messages.push({ role: 'assistant', content: assistantContent });
|
||||
saveState();
|
||||
success = true;
|
||||
|
||||
} catch (err) {
|
||||
if (err.name === 'AbortError') {
|
||||
conv.messages.push({ role: 'assistant', content: '_[Response stopped]_' });
|
||||
success = true;
|
||||
} else if (attempt >= state.maxRetries) {
|
||||
if (err.name !== 'AbortError') {
|
||||
conv.messages = conv.messages.slice(0, userMsgIdx + 1);
|
||||
conv.messages.push({ role: 'assistant', content: `**Error:** ${err.message}` });
|
||||
success = true;
|
||||
} else {
|
||||
attempt++;
|
||||
saveState();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Direct single-model mode (OpenRouter key required)
|
||||
let attempt = 0;
|
||||
let success = false;
|
||||
|
||||
while (attempt <= state.maxRetries && !success) {
|
||||
try {
|
||||
abortController = new AbortController();
|
||||
const retryPrefix = getRetryPrefix(attempt);
|
||||
const retryMessages = messages.map((m, idx) => {
|
||||
if (m.role === 'user' && idx === messages.length - 1 && retryPrefix) {
|
||||
return { ...m, content: retryPrefix + m.content };
|
||||
}
|
||||
return m;
|
||||
});
|
||||
|
||||
const params = getRetryParams(attempt);
|
||||
if (attempt > 0) {
|
||||
updateTypingStatus(`Retry ${attempt}/${state.maxRetries} (temp: ${params.temperature})...`);
|
||||
}
|
||||
|
||||
const response = await fetch('https://openrouter.ai/api/v1/chat/completions', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Authorization': `Bearer ${state.apiKey}`,
|
||||
'Content-Type': 'application/json',
|
||||
'HTTP-Referer': 'https://godmod3.ai',
|
||||
'X-Title': 'GODMOD3.AI'
|
||||
},
|
||||
body: JSON.stringify({
|
||||
model: conv.model,
|
||||
messages: retryMessages,
|
||||
temperature: params.temperature,
|
||||
top_p: params.top_p,
|
||||
frequency_penalty: state.modelFreqPenalty ?? 0,
|
||||
presence_penalty: params.presence_penalty || state.modelPresPenalty || 0,
|
||||
max_tokens: state.modelMaxTokens ?? 4096
|
||||
}),
|
||||
signal: abortController.signal
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const err = await response.json().catch(() => ({}));
|
||||
throw new Error(err.error?.message || `API Error: ${response.status}`);
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
const assistantContent = data.choices?.[0]?.message?.content || 'No response';
|
||||
|
||||
if (state.autoRetry && isRefusal(assistantContent) && attempt < state.maxRetries) {
|
||||
attempt++;
|
||||
continue;
|
||||
}
|
||||
|
||||
conv.messages.push({ role: 'assistant', content: assistantContent });
|
||||
saveState();
|
||||
success = true;
|
||||
|
||||
} catch (err) {
|
||||
if (err.name === 'AbortError') {
|
||||
conv.messages.push({ role: 'assistant', content: '_[Response stopped]_' });
|
||||
success = true;
|
||||
} else if (attempt >= state.maxRetries) {
|
||||
conv.messages.push({ role: 'assistant', content: `**Error:** ${err.message}` });
|
||||
success = true;
|
||||
} else {
|
||||
attempt++;
|
||||
}
|
||||
saveState();
|
||||
}
|
||||
saveState();
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
isStreaming = false;
|
||||
abortController = null;
|
||||
hidePongGame();
|
||||
hideTyping();
|
||||
updateSendButton();
|
||||
render();
|
||||
}
|
||||
|
||||
isStreaming = false;
|
||||
abortController = null;
|
||||
hideTyping();
|
||||
updateSendButton();
|
||||
render();
|
||||
}
|
||||
|
||||
// Retry last message
|
||||
|
||||
Reference in New Issue
Block a user