Revert "All the features"
This commit is contained in:
Spicy Marinara
GitHub
@@ -4,14 +4,7 @@
|
||||
*/
|
||||
|
||||
import { getContext } from '../../../../../../extensions.js';
|
||||
import {
|
||||
chat,
|
||||
user_avatar,
|
||||
setExtensionPrompt,
|
||||
extension_prompt_types,
|
||||
updateMessageBlock,
|
||||
generateRaw
|
||||
} from '../../../../../../../script.js';
|
||||
import { chat, user_avatar, setExtensionPrompt, extension_prompt_types, updateMessageBlock } from '../../../../../../../script.js';
|
||||
|
||||
// Core modules
|
||||
import {
|
||||
@@ -21,20 +14,20 @@ import {
|
||||
lastActionWasSwipe,
|
||||
isPlotProgression,
|
||||
setLastActionWasSwipe,
|
||||
setIsPlotProgression
|
||||
setIsPlotProgression,
|
||||
updateLastGeneratedData,
|
||||
updateCommittedTrackerData
|
||||
} from '../../core/state.js';
|
||||
import { saveChatData, loadChatData } from '../../core/persistence.js';
|
||||
|
||||
// Generation & Parsing
|
||||
import { parseResponse, parseUserStats, parseSkills, tryParseJSONResponse } from '../generation/parser.js';
|
||||
import { parseResponse, parseUserStats } from '../generation/parser.js';
|
||||
import { updateRPGData } from '../generation/apiClient.js';
|
||||
import { generateContextualSummary, DEFAULT_MESSAGE_INTERCEPTION_PROMPT } from '../generation/promptBuilder.js';
|
||||
|
||||
// Rendering
|
||||
import { renderUserStats } from '../rendering/userStats.js';
|
||||
import { renderInfoBox } from '../rendering/infoBox.js';
|
||||
import { renderThoughts, updateChatThoughts } from '../rendering/thoughts.js';
|
||||
import { renderSkills } from '../rendering/skills.js';
|
||||
import { renderInventory } from '../rendering/inventory.js';
|
||||
import { renderQuests } from '../rendering/quests.js';
|
||||
|
||||
@@ -62,10 +55,15 @@ export function commitTrackerData() {
|
||||
const swipeData = message.extra.rpg_companion_swipes[swipeId];
|
||||
|
||||
if (swipeData) {
|
||||
// console.log('[RPG Companion] Committing tracker data from assistant message at index', i, 'swipe', swipeId);
|
||||
committedTrackerData.userStats = swipeData.userStats || null;
|
||||
committedTrackerData.infoBox = swipeData.infoBox || null;
|
||||
committedTrackerData.characterThoughts = swipeData.characterThoughts || null;
|
||||
} else {
|
||||
// console.log('[RPG Companion] No swipe data found for swipe', swipeId);
|
||||
}
|
||||
} else {
|
||||
// console.log('[RPG Companion] No RPG data found in last assistant message');
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -77,19 +75,12 @@ export function commitTrackerData() {
|
||||
* Sets the flag to indicate this is NOT a swipe.
|
||||
* In separate mode with auto-update disabled, commits the displayed tracker data.
|
||||
*/
|
||||
export async function onMessageSent() {
|
||||
export function onMessageSent() {
|
||||
if (!extensionSettings.enabled) return;
|
||||
|
||||
// User sent a new message - NOT a swipe
|
||||
setLastActionWasSwipe(false);
|
||||
|
||||
// Optionally intercept and rewrite the user message via LLM
|
||||
if (extensionSettings.enableMessageInterception && extensionSettings.messageInterceptionActive !== false) {
|
||||
try {
|
||||
await interceptAndModifyUserMessage();
|
||||
} catch (error) {
|
||||
console.error('[RPG Companion] Message interception failed:', error);
|
||||
}
|
||||
}
|
||||
// console.log('[RPG Companion] 🟢 EVENT: onMessageSent - lastActionWasSwipe =', lastActionWasSwipe);
|
||||
|
||||
// In separate mode with auto-update disabled, commit displayed tracker when user sends a message
|
||||
if (extensionSettings.generationMode === 'separate' && !extensionSettings.autoUpdate) {
|
||||
@@ -99,89 +90,14 @@ export async function onMessageSent() {
|
||||
committedTrackerData.infoBox = lastGeneratedData.infoBox;
|
||||
committedTrackerData.characterThoughts = lastGeneratedData.characterThoughts;
|
||||
|
||||
// Save to chat metadata
|
||||
saveChatData();
|
||||
|
||||
// console.log('[RPG Companion] 💾 Committed displayed tracker on user message (auto-update disabled)');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Intercepts the last user message, asks the LLM to rewrite it using RPG state and recent chat,
|
||||
* and updates the chat/DOM with the modified content.
|
||||
*/
|
||||
async function interceptAndModifyUserMessage() {
|
||||
const context = getContext();
|
||||
const chatHistory = context.chat || chat;
|
||||
|
||||
if (!chatHistory || chatHistory.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const lastMessage = chatHistory[chatHistory.length - 1];
|
||||
if (!lastMessage || !lastMessage.is_user) {
|
||||
return; // Only rewrite user messages
|
||||
}
|
||||
|
||||
const originalText = lastMessage.mes || '';
|
||||
const stateJson = generateContextualSummary();
|
||||
const depth = extensionSettings.messageInterceptionContextDepth || extensionSettings.updateDepth || 4;
|
||||
const startIndex = Math.max(0, chatHistory.length - 1 - depth);
|
||||
const recentMessages = chatHistory.slice(startIndex, chatHistory.length - 1);
|
||||
|
||||
const recentContext = recentMessages
|
||||
.map((m) => {
|
||||
const role = m.is_system ? 'system' : m.is_user ? '{{user}}' : '{{char}}';
|
||||
const content = (m.mes || '').replace(/\s+/g, ' ').trim();
|
||||
return `- ${role}: ${content}`;
|
||||
})
|
||||
.join('\n');
|
||||
|
||||
const basePrompt =
|
||||
(extensionSettings.customMessageInterceptionPrompt || '').trim() ||
|
||||
DEFAULT_MESSAGE_INTERCEPTION_PROMPT;
|
||||
|
||||
const promptMessages = [
|
||||
{
|
||||
role: 'system',
|
||||
content: basePrompt
|
||||
},
|
||||
{
|
||||
role: 'system',
|
||||
content: `{{user}}'s persona definition:\n{{persona}}`
|
||||
},
|
||||
{
|
||||
role: 'system',
|
||||
content: `Current RPG state (JSON):\n${stateJson ? `\`\`\`json\n${stateJson}\n\`\`\`` : 'None'}`
|
||||
},
|
||||
{
|
||||
role: 'system',
|
||||
content: `Recent messages (newest last):\n${recentContext || 'None'}`
|
||||
},
|
||||
{
|
||||
role: 'user',
|
||||
content: `User draft message:\n${originalText}\n\nReturn only the modified message text.`
|
||||
}
|
||||
];
|
||||
|
||||
const response = await generateRaw({
|
||||
prompt: promptMessages,
|
||||
quietToLoud: false
|
||||
});
|
||||
|
||||
if (!response || typeof response !== 'string') {
|
||||
return;
|
||||
}
|
||||
|
||||
const cleaned = response.trim();
|
||||
if (!cleaned) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Update chat history and DOM
|
||||
lastMessage.mes = cleaned;
|
||||
const messageId = chatHistory.length - 1;
|
||||
updateMessageBlock(messageId, lastMessage, { rerenderMessage: true });
|
||||
}
|
||||
|
||||
/**
|
||||
* Event handler for when a message is generated.
|
||||
*/
|
||||
@@ -196,46 +112,22 @@ export async function onMessageReceived(data) {
|
||||
const lastMessage = chat[chat.length - 1];
|
||||
if (lastMessage && !lastMessage.is_user) {
|
||||
const responseText = lastMessage.mes;
|
||||
// console.log('[RPG Companion] Parsing together mode response:', responseText);
|
||||
|
||||
// Try JSON parsing first if structured data mode is enabled
|
||||
const jsonParsed = tryParseJSONResponse(responseText);
|
||||
|
||||
if (jsonParsed) {
|
||||
console.log('[RPG Companion] JSON parsing successful in together mode');
|
||||
// JSON data is already applied to extensionSettings by the parser
|
||||
// Just need to render and save
|
||||
renderUserStats();
|
||||
renderInfoBox();
|
||||
renderThoughts();
|
||||
renderInventory();
|
||||
renderQuests();
|
||||
renderSkills();
|
||||
saveChatData();
|
||||
return; // Skip legacy text parsing
|
||||
}
|
||||
|
||||
// JSON parsing failed - fall back to legacy text-based parsing
|
||||
console.warn('[RPG Companion] JSON parsing failed in together mode, attempting legacy text parsing...');
|
||||
const parsedData = parseResponse(responseText);
|
||||
|
||||
// Legacy text parsing does not produce structured characters; clear old state to avoid stale UI/state
|
||||
extensionSettings.charactersData = [];
|
||||
const parsedCharacterThoughts = parsedData.characterThoughts || '';
|
||||
// console.log('[RPG Companion] Parsed data:', parsedData);
|
||||
|
||||
// Update stored data
|
||||
if (parsedData.userStats) {
|
||||
lastGeneratedData.userStats = parsedData.userStats;
|
||||
parseUserStats(parsedData.userStats);
|
||||
}
|
||||
if (parsedData.skills) {
|
||||
parseSkills(parsedData.skills);
|
||||
}
|
||||
if (parsedData.infoBox) {
|
||||
lastGeneratedData.infoBox = parsedData.infoBox;
|
||||
}
|
||||
|
||||
// Response omitted characters section - clear any previous thoughts to reflect removal
|
||||
lastGeneratedData.characterThoughts = parsedCharacterThoughts;
|
||||
if (parsedData.characterThoughts) {
|
||||
lastGeneratedData.characterThoughts = parsedData.characterThoughts;
|
||||
}
|
||||
|
||||
// Store RPG data for this specific swipe in the message's extra field
|
||||
if (!lastMessage.extra) {
|
||||
@@ -249,14 +141,19 @@ export async function onMessageReceived(data) {
|
||||
lastMessage.extra.rpg_companion_swipes[currentSwipeId] = {
|
||||
userStats: parsedData.userStats,
|
||||
infoBox: parsedData.infoBox,
|
||||
characterThoughts: parsedCharacterThoughts
|
||||
characterThoughts: parsedData.characterThoughts
|
||||
};
|
||||
|
||||
// console.log('[RPG Companion] Stored RPG data for swipe', currentSwipeId);
|
||||
|
||||
// If there's no committed data yet (first time generating), automatically commit
|
||||
if (!committedTrackerData.userStats && !committedTrackerData.infoBox && !committedTrackerData.characterThoughts) {
|
||||
committedTrackerData.userStats = parsedData.userStats;
|
||||
committedTrackerData.infoBox = parsedData.infoBox;
|
||||
committedTrackerData.characterThoughts = parsedCharacterThoughts;
|
||||
committedTrackerData.characterThoughts = parsedData.characterThoughts;
|
||||
// console.log('[RPG Companion] 🔆 FIRST TIME: Auto-committed tracker data');
|
||||
} else {
|
||||
// console.log('[RPG Companion] Data will be committed when user replies');
|
||||
}
|
||||
|
||||
// Remove the tracker code blocks from the visible message
|
||||
@@ -290,6 +187,8 @@ export async function onMessageReceived(data) {
|
||||
const messageId = chat.length - 1;
|
||||
updateMessageBlock(messageId, lastMessage, { rerenderMessage: true });
|
||||
|
||||
// console.log('[RPG Companion] Cleaned message, removed tracker code blocks from DOM');
|
||||
|
||||
// Save to chat metadata
|
||||
saveChatData();
|
||||
}
|
||||
@@ -302,7 +201,9 @@ export async function onMessageReceived(data) {
|
||||
|
||||
// Reset the swipe flag after generation completes
|
||||
// This ensures that if the user swiped → auto-reply generated → flag is now cleared
|
||||
// so the next user message will be treated as a new message (not a swipe)
|
||||
if (lastActionWasSwipe) {
|
||||
// console.log('[RPG Companion] 🔄 Generation complete after swipe - resetting lastActionWasSwipe to false');
|
||||
setLastActionWasSwipe(false);
|
||||
}
|
||||
|
||||
@@ -310,6 +211,7 @@ export async function onMessageReceived(data) {
|
||||
// Note: No need to clear extension prompt since we used quiet_prompt option
|
||||
if (isPlotProgression) {
|
||||
setIsPlotProgression(false);
|
||||
// console.log('[RPG Companion] Plot progression generation completed');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -338,7 +240,6 @@ export function onCharacterChanged() {
|
||||
renderThoughts();
|
||||
renderInventory();
|
||||
renderQuests();
|
||||
renderSkills();
|
||||
|
||||
// Update chat thought overlays
|
||||
updateChatThoughts();
|
||||
@@ -353,6 +254,8 @@ export function onMessageSwiped(messageIndex) {
|
||||
return;
|
||||
}
|
||||
|
||||
// console.log('[RPG Companion] Message swiped at index:', messageIndex);
|
||||
|
||||
// Get the message that was swiped
|
||||
const message = chat[messageIndex];
|
||||
if (!message || message.is_user) {
|
||||
@@ -369,9 +272,16 @@ export function onMessageSwiped(messageIndex) {
|
||||
message.swipes[currentSwipeId].length > 0;
|
||||
|
||||
if (!isExistingSwipe) {
|
||||
// This is a NEW swipe that will trigger generation
|
||||
setLastActionWasSwipe(true);
|
||||
// console.log('[RPG Companion] 🔵 EVENT: onMessageSwiped (NEW generation) - lastActionWasSwipe =', lastActionWasSwipe);
|
||||
} else {
|
||||
// This is navigating to an EXISTING swipe - don't change the flag
|
||||
// console.log('[RPG Companion] 🔵 EVENT: onMessageSwiped (existing swipe navigation) - lastActionWasSwipe unchanged =', lastActionWasSwipe);
|
||||
}
|
||||
|
||||
// console.log('[RPG Companion] Loading data for swipe', currentSwipeId);
|
||||
|
||||
// Load RPG data for this swipe into lastGeneratedData (for display only)
|
||||
// This updates what the user sees, but does NOT commit it
|
||||
// Committed data will be updated when/if the user replies to this swipe
|
||||
@@ -387,6 +297,13 @@ export function onMessageSwiped(messageIndex) {
|
||||
if (swipeData.userStats) {
|
||||
parseUserStats(swipeData.userStats);
|
||||
}
|
||||
|
||||
// console.log('[RPG Companion] Loaded RPG data for swipe', currentSwipeId, '(display only, NOT committed)');
|
||||
// console.log('[RPG Companion] committedTrackerData unchanged - will be updated if user replies to this swipe');
|
||||
} else {
|
||||
// No data for this swipe - keep existing lastGeneratedData (don't clear it)
|
||||
// This ensures the display remains consistent and data is available for next commit
|
||||
// console.log('[RPG Companion] No RPG data for swipe', currentSwipeId, '- keeping existing lastGeneratedData');
|
||||
}
|
||||
|
||||
// Re-render the panels (display only - committedTrackerData unchanged)
|
||||
@@ -406,6 +323,7 @@ export function onMessageSwiped(messageIndex) {
|
||||
export function updatePersonaAvatar() {
|
||||
const portraitImg = document.querySelector('.rpg-user-portrait');
|
||||
if (!portraitImg) {
|
||||
// console.log('[RPG Companion] Portrait image element not found in DOM');
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -413,13 +331,23 @@ export function updatePersonaAvatar() {
|
||||
const context = getContext();
|
||||
const currentUserAvatar = context.user_avatar || user_avatar;
|
||||
|
||||
// console.log('[RPG Companion] Attempting to update persona avatar:', currentUserAvatar);
|
||||
|
||||
// Try to get a valid thumbnail URL using our safe helper
|
||||
if (currentUserAvatar) {
|
||||
const thumbnailUrl = getSafeThumbnailUrl('persona', currentUserAvatar);
|
||||
|
||||
if (thumbnailUrl) {
|
||||
// Only update the src if we got a valid URL
|
||||
portraitImg.src = thumbnailUrl;
|
||||
// console.log('[RPG Companion] Persona avatar updated successfully');
|
||||
} else {
|
||||
// Don't update the src if we couldn't get a valid URL
|
||||
// This prevents 400 errors and keeps the existing image
|
||||
// console.warn('[RPG Companion] Could not get valid thumbnail URL for persona avatar, keeping existing image');
|
||||
}
|
||||
} else {
|
||||
// console.log('[RPG Companion] No user avatar configured, keeping existing image');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -431,4 +359,6 @@ export function clearExtensionPrompts() {
|
||||
setExtensionPrompt('rpg-companion-example', '', extension_prompt_types.IN_CHAT, 0, false);
|
||||
setExtensionPrompt('rpg-companion-html', '', extension_prompt_types.IN_CHAT, 0, false);
|
||||
setExtensionPrompt('rpg-companion-context', '', extension_prompt_types.IN_CHAT, 1, false);
|
||||
// Note: rpg-companion-plot is not cleared here since it's passed via quiet_prompt option
|
||||
// console.log('[RPG Companion] Cleared all extension prompts');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user