|
|
@@ -80,7 +80,7 @@
|
|
|
|
<form id="message-form">
|
|
|
|
<form id="message-form">
|
|
|
|
<label for="message" id="message-label">Skriv ett meddelande</label>
|
|
|
|
<label for="message" id="message-label">Skriv ett meddelande</label>
|
|
|
|
<textarea id="message" name="message" maxlength="4000" aria-describedby="message-help" autocomplete="off"></textarea>
|
|
|
|
<textarea id="message" name="message" maxlength="4000" aria-describedby="message-help" autocomplete="off"></textarea>
|
|
|
|
<div id="message-tools"><button type="submit" id="send-message">Skicka</button> <button type="button" id="microphone" aria-pressed="false" aria-describedby="voice-status">Starta mikrofon</button></div>
|
|
|
|
<div id="message-tools"><button type="submit" id="send-message">Skicka</button> <button type="button" id="microphone" aria-pressed="false" aria-describedby="voice-status">Starta mikrofon</button> <button type="button" id="redo-action" disabled>Gör om senaste</button> <button type="button" id="dry-run-action" disabled>Torrkör senaste</button></div>
|
|
|
|
<span id="message-help" class="sr-only">Tryck på Skicka eller Enter för att skicka. Tryck Skift och Enter för ny rad.</span>
|
|
|
|
<span id="message-help" class="sr-only">Tryck på Skicka eller Enter för att skicka. Tryck Skift och Enter för ny rad.</span>
|
|
|
|
</form>
|
|
|
|
</form>
|
|
|
|
<p id="voice-status" role="status" aria-live="polite"></p>
|
|
|
|
<p id="voice-status" role="status" aria-live="polite"></p>
|
|
|
@@ -136,6 +136,7 @@
|
|
|
|
let submitBusy = false;
|
|
|
|
let submitBusy = false;
|
|
|
|
let pendingDialogue = null;
|
|
|
|
let pendingDialogue = null;
|
|
|
|
let latestAssistantText = '';
|
|
|
|
let latestAssistantText = '';
|
|
|
|
|
|
|
|
let latestPlayerAction = '';
|
|
|
|
let latestAssistantVoice = {role: 'narrator', voiceIdentity: 'neutral'};
|
|
|
|
let latestAssistantVoice = {role: 'narrator', voiceIdentity: 'neutral'};
|
|
|
|
let speechRecoveryElement = null;
|
|
|
|
let speechRecoveryElement = null;
|
|
|
|
const voiceSettingsKey = 'ai-spel.voice-settings.v2';
|
|
|
|
const voiceSettingsKey = 'ai-spel.voice-settings.v2';
|
|
|
@@ -449,6 +450,7 @@
|
|
|
|
: next === 'world-draft'
|
|
|
|
: next === 'world-draft'
|
|
|
|
? 'Ändra startförslaget eller skriv “godkänn”'
|
|
|
|
? 'Ändra startförslaget eller skriv “godkänn”'
|
|
|
|
: 'Skriv vad du vill göra eller fråga';
|
|
|
|
: 'Skriv vad du vill göra eller fråga';
|
|
|
|
|
|
|
|
refreshActionTools();
|
|
|
|
messageField.focus();
|
|
|
|
messageField.focus();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
function showAuth() {
|
|
|
|
function showAuth() {
|
|
|
@@ -683,7 +685,9 @@
|
|
|
|
const lines = await request('/api/dialogue');
|
|
|
|
const lines = await request('/api/dialogue');
|
|
|
|
transcript.replaceChildren();
|
|
|
|
transcript.replaceChildren();
|
|
|
|
latestAssistantText = '';
|
|
|
|
latestAssistantText = '';
|
|
|
|
|
|
|
|
latestPlayerAction = [...lines].reverse().find(line => line.role === 'user')?.content || '';
|
|
|
|
for (const line of lines) appendLine(line.role === 'user' ? 'user' : 'assistant', line.content, {speaker: line.speaker, speak: false});
|
|
|
|
for (const line of lines) appendLine(line.role === 'user' ? 'user' : 'assistant', line.content, {speaker: line.speaker, speak: false});
|
|
|
|
|
|
|
|
refreshActionTools();
|
|
|
|
if (lines.length > 0 && latestAssistantText && location.pathname !== '/admin') {
|
|
|
|
if (lines.length > 0 && latestAssistantText && location.pathname !== '/admin') {
|
|
|
|
voiceController?.speak(latestAssistantText, {role: 'narrator', voiceIdentity: 'neutral'});
|
|
|
|
voiceController?.speak(latestAssistantText, {role: 'narrator', voiceIdentity: 'neutral'});
|
|
|
|
} else if (lines.length === 0 && gameState?.world) {
|
|
|
|
} else if (lines.length === 0 && gameState?.world) {
|
|
|
@@ -904,7 +908,12 @@
|
|
|
|
messageField.disabled = false;
|
|
|
|
messageField.disabled = false;
|
|
|
|
messageField.focus();
|
|
|
|
messageField.focus();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
async function handleGameMessage(message) {
|
|
|
|
function refreshActionTools() {
|
|
|
|
|
|
|
|
const enabled = stage === 'game' && Boolean(latestPlayerAction) && !submitBusy;
|
|
|
|
|
|
|
|
document.querySelector('#redo-action').disabled = !enabled;
|
|
|
|
|
|
|
|
document.querySelector('#dry-run-action').disabled = !enabled;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
async function handleGameMessage(message, actionMode = 'normal') {
|
|
|
|
if (/^logga ut[.!]?$/i.test(message.trim())) {
|
|
|
|
if (/^logga ut[.!]?$/i.test(message.trim())) {
|
|
|
|
appendLine('user', message);
|
|
|
|
appendLine('user', message);
|
|
|
|
await handleLogout();
|
|
|
|
await handleLogout();
|
|
|
@@ -924,12 +933,13 @@
|
|
|
|
else await proposeWorld(message);
|
|
|
|
else await proposeWorld(message);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (await handlePlayerMessageCommand(message)) return;
|
|
|
|
if (actionMode === 'normal' && await handlePlayerMessageCommand(message)) return;
|
|
|
|
const idempotencyKey = pendingDialogue?.message === message
|
|
|
|
if (actionMode === 'normal') latestPlayerAction = message;
|
|
|
|
|
|
|
|
const idempotencyKey = actionMode === 'normal' && pendingDialogue?.message === message
|
|
|
|
? pendingDialogue.idempotencyKey
|
|
|
|
? pendingDialogue.idempotencyKey
|
|
|
|
: crypto.randomUUID();
|
|
|
|
: crypto.randomUUID();
|
|
|
|
pendingDialogue = {message, idempotencyKey};
|
|
|
|
if (actionMode === 'normal') pendingDialogue = {message, idempotencyKey};
|
|
|
|
appendLine('user', message);
|
|
|
|
appendLine('user', message, actionMode === 'dry_run' ? {speaker: 'Torrkörning'} : actionMode === 'redo' ? {speaker: 'Gör om'} : {});
|
|
|
|
messageField.disabled = true;
|
|
|
|
messageField.disabled = true;
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
let result;
|
|
|
|
let result;
|
|
|
@@ -938,7 +948,7 @@
|
|
|
|
result = await request('/api/dialogue', {
|
|
|
|
result = await request('/api/dialogue', {
|
|
|
|
method: 'POST',
|
|
|
|
method: 'POST',
|
|
|
|
headers: {'content-type': 'application/json'},
|
|
|
|
headers: {'content-type': 'application/json'},
|
|
|
|
body: JSON.stringify({message, expected_world_version: gameState.world.version, idempotency_key: idempotencyKey}),
|
|
|
|
body: JSON.stringify({message, expected_world_version: gameState.world.version, idempotency_key: idempotencyKey, forget_previous_turn: actionMode !== 'normal', dry_run: actionMode === 'dry_run'}),
|
|
|
|
});
|
|
|
|
});
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
} catch (error) {
|
|
|
|
} catch (error) {
|
|
|
@@ -947,22 +957,27 @@
|
|
|
|
if (!gameState.world) throw new Error('world_not_available');
|
|
|
|
if (!gameState.world) throw new Error('world_not_available');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
gameState.world.version = result.world_version;
|
|
|
|
if (result.status !== 'dry_run') {
|
|
|
|
gameState.world.world_time = result.world_time;
|
|
|
|
gameState.world.version = result.world_version;
|
|
|
|
pendingDialogue = null;
|
|
|
|
gameState.world.world_time = result.world_time;
|
|
|
|
if (result.intent === 'move' || result.intent === 'meet') {
|
|
|
|
pendingDialogue = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (result.status !== 'dry_run' && (result.intent === 'move' || result.intent === 'meet')) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
const refreshed = await request('/api/world');
|
|
|
|
const refreshed = await request('/api/world');
|
|
|
|
if (refreshed.world) gameState = refreshed;
|
|
|
|
if (refreshed.world) gameState = refreshed;
|
|
|
|
} catch (_) { /* The committed dialogue stays successful if this optional view refresh fails. */ }
|
|
|
|
} catch (_) { /* The committed dialogue stays successful if this optional view refresh fails. */ }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const speakingNpc = ['speak', 'meet'].includes(result.intent) ? gameState.world.npc : null;
|
|
|
|
const speakingNpc = result.status !== 'dry_run' && ['speak', 'meet'].includes(result.intent) ? gameState.world.npc : null;
|
|
|
|
for (const ruleName of result.debug_rules_created || []) {
|
|
|
|
for (const ruleName of result.debug_rules_created || []) {
|
|
|
|
appendLine('assistant', ruleName, {speaker: 'Nya regler', speak: false});
|
|
|
|
appendLine('assistant', ruleName, {speaker: 'Nya regler', speak: false});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
appendLine('assistant', result.reply, speakingNpc
|
|
|
|
appendLine('assistant', result.reply, result.status === 'dry_run'
|
|
|
|
|
|
|
|
? {speaker: 'Torrkörning', voice: {role: 'narrator', voiceIdentity: 'neutral'}}
|
|
|
|
|
|
|
|
: speakingNpc
|
|
|
|
? {speaker: speakingNpc.name, voice: {characterId: speakingNpc.id, voiceIdentity: speakingNpc.voice_identity}}
|
|
|
|
? {speaker: speakingNpc.name, voice: {characterId: speakingNpc.id, voiceIdentity: speakingNpc.voice_identity}}
|
|
|
|
: {speaker: 'Berättaren', voice: {role: 'narrator', voiceIdentity: 'neutral'}});
|
|
|
|
: {speaker: 'Berättaren', voice: {role: 'narrator', voiceIdentity: 'neutral'}});
|
|
|
|
|
|
|
|
refreshActionTools();
|
|
|
|
} catch (error) {
|
|
|
|
} catch (error) {
|
|
|
|
messageField.value = message;
|
|
|
|
messageField.value = message;
|
|
|
|
appendLine('assistant', `${explainDialogueError(error)} Ditt meddelande ligger kvar i inmatningen.`);
|
|
|
|
appendLine('assistant', `${explainDialogueError(error)} Ditt meddelande ligger kvar i inmatningen.`);
|
|
|
@@ -987,11 +1002,11 @@
|
|
|
|
if (location.pathname !== '/admin') voiceController.speak(status.textContent, {role: 'narrator', voiceIdentity: 'neutral'});
|
|
|
|
if (location.pathname !== '/admin') voiceController.speak(status.textContent, {role: 'narrator', voiceIdentity: 'neutral'});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
async function submitMessage(input, source = 'text') {
|
|
|
|
async function submitMessage(input, source = 'text', actionMode = 'normal') {
|
|
|
|
if (submitBusy || messageField.disabled) return;
|
|
|
|
if (submitBusy || messageField.disabled) return;
|
|
|
|
const message = String(input || '').trim();
|
|
|
|
const message = String(input || '').trim();
|
|
|
|
if (!message) return;
|
|
|
|
if (!message) return;
|
|
|
|
if (handleVoiceCommand(message, source)) { messageField.value = ''; return; }
|
|
|
|
if (actionMode === 'normal' && handleVoiceCommand(message, source)) { messageField.value = ''; return; }
|
|
|
|
submitBusy = true;
|
|
|
|
submitBusy = true;
|
|
|
|
refreshMicrophone();
|
|
|
|
refreshMicrophone();
|
|
|
|
voiceController.stopListening();
|
|
|
|
voiceController.stopListening();
|
|
|
@@ -1003,11 +1018,12 @@
|
|
|
|
messageField.value = '';
|
|
|
|
messageField.value = '';
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
if (stage === 'biography') await handleBiography(message);
|
|
|
|
if (stage === 'biography') await handleBiography(message);
|
|
|
|
else await handleGameMessage(message);
|
|
|
|
else await handleGameMessage(message, actionMode);
|
|
|
|
} catch (error) {
|
|
|
|
} catch (error) {
|
|
|
|
appendLine('assistant', `Det gick inte att genomföra begäran: ${error.message}`);
|
|
|
|
appendLine('assistant', `Det gick inte att genomföra begäran: ${error.message}`);
|
|
|
|
} finally {
|
|
|
|
} finally {
|
|
|
|
submitBusy = false;
|
|
|
|
submitBusy = false;
|
|
|
|
|
|
|
|
refreshActionTools();
|
|
|
|
refreshMicrophone();
|
|
|
|
refreshMicrophone();
|
|
|
|
if (currentAccount?.is_admin) await refreshDecisionTrace();
|
|
|
|
if (currentAccount?.is_admin) await refreshDecisionTrace();
|
|
|
|
if (!play.hidden && !messageField.disabled) messageField.focus();
|
|
|
|
if (!play.hidden && !messageField.disabled) messageField.focus();
|
|
|
@@ -1098,6 +1114,12 @@
|
|
|
|
event.preventDefault();
|
|
|
|
event.preventDefault();
|
|
|
|
await submitMessage(messageField.value);
|
|
|
|
await submitMessage(messageField.value);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
document.querySelector('#redo-action').addEventListener('click', () => {
|
|
|
|
|
|
|
|
if (latestPlayerAction) submitMessage(latestPlayerAction, 'button', 'redo');
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
document.querySelector('#dry-run-action').addEventListener('click', () => {
|
|
|
|
|
|
|
|
if (latestPlayerAction) submitMessage(latestPlayerAction, 'button', 'dry_run');
|
|
|
|
|
|
|
|
});
|
|
|
|
document.querySelectorAll('[data-admin-view]').forEach(button => button.addEventListener('click', async () => {
|
|
|
|
document.querySelectorAll('[data-admin-view]').forEach(button => button.addEventListener('click', async () => {
|
|
|
|
adminContent.setAttribute('aria-busy', 'true');
|
|
|
|
adminContent.setAttribute('aria-busy', 'true');
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|