Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1444f202c6 | ||
|
|
f464bd5490 | ||
|
|
3cf91781f5 | ||
|
|
b57c4c075f | ||
|
|
bb317a9366 | ||
|
|
d8f8300ab9 |
@@ -10,3 +10,5 @@
|
|||||||
- Helm charts are published to `harbor.k3s.k0.nu/ai-spel`; Argo CD uses the existing `ai-spel` project and namespace.
|
- Helm charts are published to `harbor.k3s.k0.nu/ai-spel`; Argo CD uses the existing `ai-spel` project and namespace.
|
||||||
- Player-facing speech uses the local Piper WebAssembly adapter when the player has activated audio. The separate `ai-spel-static` Nginx service serves pinned Swedish Piper models and ONNX/Piper runtime files from same-origin `/static/piper-wasm-v1/` URLs with immutable caching. Game text is synthesized on-device and must never be sent to a TTS provider.
|
- Player-facing speech uses the local Piper WebAssembly adapter when the player has activated audio. The separate `ai-spel-static` Nginx service serves pinned Swedish Piper models and ONNX/Piper runtime files from same-origin `/static/piper-wasm-v1/` URLs with immutable caching. Game text is synthesized on-device and must never be sent to a TTS provider.
|
||||||
- This pipeline bundles only the Piper worker/client glue. Model/runtime downloads, image builds, and deployment belong to `ai-spel/ai-spel-static` and the existing `large` runner. Never build or run these assets locally.
|
- This pipeline bundles only the Piper worker/client glue. Model/runtime downloads, image builds, and deployment belong to `ai-spel/ai-spel-static` and the existing `large` runner. Never build or run these assets locally.
|
||||||
|
- Browser local AI loads its client adapter, Wllama runtime, WebAssembly, Gemma model, manifest, YAML prompt, and license resources only from the same-origin `/static/wllama-gemma3-v2/` path owned by `ai-spel/ai-spel-static`. Do not add browser CDN, npm, or model-hub fallbacks. The player must be shown and accept applicable model terms before the model downloads or runs. Acceptance, model failure, or local-AI opt-out must never block play. Incompatible asset changes require a new immutable static path and a coordinated frontend release.
|
||||||
|
- Local model output is advisory only. Preserve the original player input, send local hints only as untrusted context to Rust, and label offline replies as unsaved. Local diagnostic logging is opt-in, browser-local, exportable/deletable, and expires after 30 days.
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ After login, character creation and play use one dialogue history and one text i
|
|||||||
|
|
||||||
During play the UI has no persistent location, task, inventory, economy, status, or purchase panels. The player asks for information or writes an action in the same input. Rust validates state changes; the AI can only propose a typed intent. A direct request to travel may establish a new place and an encounter when Rust commits that movement.
|
During play the UI has no persistent location, task, inventory, economy, status, or purchase panels. The player asks for information or writes an action in the same input. Rust validates state changes; the AI can only propose a typed intent. A direct request to travel may establish a new place and an encounter when Rust commits that movement.
|
||||||
|
|
||||||
The dialogue also offers **Gör om senaste** and **Torrkör senaste**. Both resend the latest player action while leaving the previous dialogue turn out of the AI conversation context. “Gör om” processes a fresh, normal turn. “Torrkör” calls the narrator and evaluates already-approved stored Luau rules, then rolls back the complete game transaction; it does not save the player turn, AI trace, rule, event, ownership, or world progress. A rule that would need to be newly generated is reported as not evaluated, because a dry run never stores newly generated rules.
|
The dialogue also offers **Gör om senaste** and **Torrkör senaste**. Both resend the latest player action while leaving the previous dialogue turn out of the AI conversation context. “Gör om” processes a fresh, normal turn. “Torrkör” calls the narrator, generates and validates a temporary Luau rule when needed, and evaluates either that temporary rule or an approved stored rule. It rolls back the complete game transaction and does not save the player turn, AI trace, generated rule, event, ownership, or world progress. The reply identifies which rule was evaluated and marks a temporary rule as such.
|
||||||
|
|
||||||
If the player asks to find or approach someone and no NPC is present, the direct dialogue scene may propose one person and an opening line. Rust creates that NPC only for the explicit request and commits the first exchange idempotently; a later turn continues the saved conversation. Clear requests about the current location are answered from its saved facts without asking the player to restate what they want to inspect.
|
If the player asks to find or approach someone and no NPC is present, the direct dialogue scene may propose one person and an opening line. Rust creates that NPC only for the explicit request and commits the first exchange idempotently; a later turn continues the saved conversation. Clear requests about the current location are answered from its saved facts without asking the player to restate what they want to inspect.
|
||||||
|
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: ai-spel-frontend
|
name: ai-spel-frontend
|
||||||
description: Static web frontend for the Swedish life simulator
|
description: Static web frontend for the Swedish life simulator
|
||||||
type: application
|
type: application
|
||||||
version: 0.1.64
|
version: 0.1.67
|
||||||
appVersion: "0.1.64"
|
appVersion: "0.1.67"
|
||||||
+103
-6
@@ -17,6 +17,7 @@
|
|||||||
#dialogue li { margin-block: 1rem; white-space: pre-wrap; overflow-wrap: anywhere; }
|
#dialogue li { margin-block: 1rem; white-space: pre-wrap; overflow-wrap: anywhere; }
|
||||||
#dialogue li[data-role="user"] { font-weight: 650; }
|
#dialogue li[data-role="user"] { font-weight: 650; }
|
||||||
#dialogue li[data-role="assistant"] { padding-inline-start: .75rem; border-inline-start: .2rem solid currentColor; }
|
#dialogue li[data-role="assistant"] { padding-inline-start: .75rem; border-inline-start: .2rem solid currentColor; }
|
||||||
|
#dialogue li[data-role="system"] { padding-inline-start: .75rem; border-inline-start: .2rem dashed currentColor; font-size: .92em; }
|
||||||
#message { width: 100%; min-height: 3.5rem; box-sizing: border-box; }
|
#message { width: 100%; min-height: 3.5rem; box-sizing: border-box; }
|
||||||
#message-tools { display: flex; flex-wrap: wrap; align-items: center; gap: .5rem; }
|
#message-tools { display: flex; flex-wrap: wrap; align-items: center; gap: .5rem; }
|
||||||
#voice-status { min-height: 1.5em; }
|
#voice-status { min-height: 1.5em; }
|
||||||
@@ -115,6 +116,7 @@
|
|||||||
<footer id="version-footer">Frontend <span id="frontend-version">__FRONTEND_VERSION__</span> · Statik <span id="static-version">hämtar version…</span> · API <span id="api-version">hämtar version…</span></footer>
|
<footer id="version-footer">Frontend <span id="frontend-version">__FRONTEND_VERSION__</span> · Statik <span id="static-version">hämtar version…</span> · API <span id="api-version">hämtar version…</span></footer>
|
||||||
<script src="/piper-runtime.js?v=__FRONTEND_VERSION__"></script>
|
<script src="/piper-runtime.js?v=__FRONTEND_VERSION__"></script>
|
||||||
<script src="/voice.js?v=__FRONTEND_VERSION__"></script>
|
<script src="/voice.js?v=__FRONTEND_VERSION__"></script>
|
||||||
|
<script src="/static/wllama-gemma3-v2/local-ai.js"></script>
|
||||||
<script>
|
<script>
|
||||||
const auth = document.querySelector('#auth');
|
const auth = document.querySelector('#auth');
|
||||||
const play = document.querySelector('#play');
|
const play = document.querySelector('#play');
|
||||||
@@ -161,6 +163,7 @@
|
|||||||
line.dataset.role = role;
|
line.dataset.role = role;
|
||||||
line.textContent = `${options.speaker || (role === 'user' ? 'Du' : 'Berättelsen')}: ${content}`;
|
line.textContent = `${options.speaker || (role === 'user' ? 'Du' : 'Berättelsen')}: ${content}`;
|
||||||
transcript.append(line);
|
transcript.append(line);
|
||||||
|
if (role === 'user' || role === 'assistant') window.localGameAI?.record({type: 'dialogue', role, content});
|
||||||
line.scrollIntoView({block: 'end'});
|
line.scrollIntoView({block: 'end'});
|
||||||
if (role === 'assistant') {
|
if (role === 'assistant') {
|
||||||
latestAssistantText = content;
|
latestAssistantText = content;
|
||||||
@@ -171,6 +174,24 @@
|
|||||||
}
|
}
|
||||||
return line;
|
return line;
|
||||||
}
|
}
|
||||||
|
let activityStatusLine = null;
|
||||||
|
function setActivityStatus(message) {
|
||||||
|
if (!message) return;
|
||||||
|
if (!activityStatusLine?.isConnected) {
|
||||||
|
activityStatusLine = document.createElement('li');
|
||||||
|
activityStatusLine.dataset.role = 'system';
|
||||||
|
activityStatusLine.dataset.activityStatus = 'true';
|
||||||
|
activityStatusLine.setAttribute('role', 'status');
|
||||||
|
activityStatusLine.setAttribute('aria-live', 'polite');
|
||||||
|
transcript.append(activityStatusLine);
|
||||||
|
}
|
||||||
|
activityStatusLine.textContent = `Berättelsen: ${message}`;
|
||||||
|
activityStatusLine.scrollIntoView({block: 'end'});
|
||||||
|
}
|
||||||
|
function clearActivityStatus() {
|
||||||
|
activityStatusLine?.remove();
|
||||||
|
activityStatusLine = null;
|
||||||
|
}
|
||||||
function biographyContextText(context) {
|
function biographyContextText(context) {
|
||||||
if (!context || typeof context !== 'object') return '';
|
if (!context || typeof context !== 'object') return '';
|
||||||
const details = [];
|
const details = [];
|
||||||
@@ -205,6 +226,32 @@
|
|||||||
const authVoiceStatus = document.querySelector('#auth-voice-status');
|
const authVoiceStatus = document.querySelector('#auth-voice-status');
|
||||||
if (authVoiceStatus && !auth.hidden && message) authVoiceStatus.textContent = message;
|
if (authVoiceStatus && !auth.hidden && message) authVoiceStatus.textContent = message;
|
||||||
}
|
}
|
||||||
|
window.addEventListener('local-ai-status', event => {
|
||||||
|
if (!currentAccount || currentAccount.is_admin || play.hidden) return;
|
||||||
|
const detail = typeof event.detail === 'string' ? {text: event.detail} : event.detail;
|
||||||
|
const statusAttribute = detail.type === 'activity' ? 'data-local-ai-activity' : 'data-local-ai-status';
|
||||||
|
let statusLine = transcript.querySelector(`li[${statusAttribute}]`);
|
||||||
|
if (!statusLine) {
|
||||||
|
statusLine = appendLine(detail.type === 'terms-required' ? 'assistant' : 'system', detail.text || '', {
|
||||||
|
speaker: 'Lokal AI', speak: detail.type === 'terms-required',
|
||||||
|
});
|
||||||
|
statusLine.setAttribute(statusAttribute, 'true');
|
||||||
|
statusLine.setAttribute('role', 'status');
|
||||||
|
statusLine.setAttribute('aria-live', 'polite');
|
||||||
|
}
|
||||||
|
statusLine.replaceChildren(document.createTextNode(`Lokal AI: ${detail.text || ''}`));
|
||||||
|
if (detail.type === 'terms-required') {
|
||||||
|
statusLine.append(document.createTextNode(' Läs dokumenten: '));
|
||||||
|
for (const [label, url] of [['Spelvillkor för Gemma', detail.user_terms], ['Gemma-villkor', detail.terms], ['policy för förbjuden användning', detail.policy], ['modellinformation', detail.notice]]) {
|
||||||
|
if (!url) continue;
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = url; link.target = '_blank'; link.rel = 'noopener noreferrer';
|
||||||
|
link.textContent = label;
|
||||||
|
statusLine.append(link, document.createTextNode('. '));
|
||||||
|
}
|
||||||
|
statusLine.append(document.createElement('br'), document.createTextNode(detail.command || ''));
|
||||||
|
}
|
||||||
|
});
|
||||||
function updateSpeechProgress(message = '') {
|
function updateSpeechProgress(message = '') {
|
||||||
const container = document.querySelector('#speech-progress-container');
|
const container = document.querySelector('#speech-progress-container');
|
||||||
const progress = document.querySelector('#speech-progress');
|
const progress = document.querySelector('#speech-progress');
|
||||||
@@ -645,15 +692,17 @@
|
|||||||
stage = 'world-start';
|
stage = 'world-start';
|
||||||
messageField.disabled = true;
|
messageField.disabled = true;
|
||||||
appendLine('user', message);
|
appendLine('user', message);
|
||||||
appendLine('assistant', 'Jag tar fram ett förslag på startplats och startläge…');
|
setActivityStatus('Berättaren ber AI ta fram ett förslag på startvärld och en plats som passar din biografi.');
|
||||||
try {
|
try {
|
||||||
const proposal = await request('/api/world/draft', {
|
const proposal = await request('/api/world/draft', {
|
||||||
method: 'POST', headers: {'content-type': 'application/json'},
|
method: 'POST', headers: {'content-type': 'application/json'},
|
||||||
body: JSON.stringify({input: message, current_draft: worldDraft}),
|
body: JSON.stringify({input: message, current_draft: worldDraft}),
|
||||||
});
|
});
|
||||||
worldDraft = proposal.draft;
|
worldDraft = proposal.draft;
|
||||||
|
clearActivityStatus();
|
||||||
appendLine('assistant', `${proposal.message}\n\nVärld: ${worldDraft.name}\nStartplats: ${worldDraft.location_name}. ${worldDraft.location_description}\nStartbelopp: ${worldDraft.starting_balance_sek} kronor. ${worldDraft.offer_name} kostar ${worldDraft.offer_price_sek} kronor.\n\nSkriv ändringar eller “godkänn”.`);
|
appendLine('assistant', `${proposal.message}\n\nVärld: ${worldDraft.name}\nStartplats: ${worldDraft.location_name}. ${worldDraft.location_description}\nStartbelopp: ${worldDraft.starting_balance_sek} kronor. ${worldDraft.offer_name} kostar ${worldDraft.offer_price_sek} kronor.\n\nSkriv ändringar eller “godkänn”.`);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
clearActivityStatus();
|
||||||
appendLine('assistant', `Förslaget kunde inte tas fram: ${error.message}. Skriv “försök igen” när du vill försöka på nytt.`);
|
appendLine('assistant', `Förslaget kunde inte tas fram: ${error.message}. Skriv “försök igen” när du vill försöka på nytt.`);
|
||||||
}
|
}
|
||||||
setStage('world-draft');
|
setStage('world-draft');
|
||||||
@@ -667,6 +716,7 @@
|
|||||||
}
|
}
|
||||||
appendLine('user', message);
|
appendLine('user', message);
|
||||||
messageField.disabled = true;
|
messageField.disabled = true;
|
||||||
|
setActivityStatus('Sparar det godkända världsförslaget och skapar din startposition.');
|
||||||
try {
|
try {
|
||||||
gameState = await request('/api/world/start', {
|
gameState = await request('/api/world/start', {
|
||||||
method: 'POST', headers: {'content-type': 'application/json'}, body: JSON.stringify(worldDraft),
|
method: 'POST', headers: {'content-type': 'application/json'}, body: JSON.stringify(worldDraft),
|
||||||
@@ -674,8 +724,10 @@
|
|||||||
worldDraft = null;
|
worldDraft = null;
|
||||||
await loadSavedDialogue();
|
await loadSavedDialogue();
|
||||||
setStage('game');
|
setStage('game');
|
||||||
|
clearActivityStatus();
|
||||||
appendLine('assistant', 'Du kan fråga om platsen, dina saker eller din ekonomi, vänta, handla, prata med någon som finns här eller skriva vart du vill gå.');
|
appendLine('assistant', 'Du kan fråga om platsen, dina saker eller din ekonomi, vänta, handla, prata med någon som finns här eller skriva vart du vill gå.');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
clearActivityStatus();
|
||||||
appendLine('assistant', `Världsförslaget kunde inte sparas: ${error.message}. Förslaget finns kvar så att du kan försöka igen.`);
|
appendLine('assistant', `Världsförslaget kunde inte sparas: ${error.message}. Förslaget finns kvar så att du kan försöka igen.`);
|
||||||
}
|
}
|
||||||
messageField.disabled = false;
|
messageField.disabled = false;
|
||||||
@@ -686,7 +738,7 @@
|
|||||||
transcript.replaceChildren();
|
transcript.replaceChildren();
|
||||||
latestAssistantText = '';
|
latestAssistantText = '';
|
||||||
latestPlayerAction = [...lines].reverse().find(line => line.role === 'user')?.content || '';
|
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' : line.role === 'system' ? 'system' : 'assistant', line.content, {speaker: line.speaker, speak: false});
|
||||||
refreshActionTools();
|
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'});
|
||||||
@@ -699,6 +751,7 @@
|
|||||||
currentAccount = await request('/api/me');
|
currentAccount = await request('/api/me');
|
||||||
gameState = await request('/api/world');
|
gameState = await request('/api/world');
|
||||||
showPlay();
|
showPlay();
|
||||||
|
if (!currentAccount.is_admin) window.localGameAI?.start(currentAccount.id);
|
||||||
if (!gameState.character) {
|
if (!gameState.character) {
|
||||||
transcript.replaceChildren();
|
transcript.replaceChildren();
|
||||||
appendInitialPrompt();
|
appendInitialPrompt();
|
||||||
@@ -791,10 +844,13 @@
|
|||||||
|
|
||||||
for (const interaction of orderedInteractions) {
|
for (const interaction of orderedInteractions) {
|
||||||
const external = interaction.external_call || {};
|
const external = interaction.external_call || {};
|
||||||
addStep('ai', `${interaction.prompt_id} · v${interaction.prompt_version} · ${interaction.outcome}`,
|
const isCompaction = interaction.prompt_id === 'dialogue-context-compaction';
|
||||||
|
addStep('ai', `${isCompaction ? 'Kontextkomprimering' : interaction.prompt_id} · v${interaction.prompt_version} · ${interaction.outcome}`,
|
||||||
{prompt_yaml: interaction.prompt_yaml, rendered_messages: interaction.rendered_messages, provider: external.service, model: external.model, thinking_effort: external.thinking_effort, provider_request: external.request},
|
{prompt_yaml: interaction.prompt_yaml, rendered_messages: interaction.rendered_messages, provider: external.service, model: external.model, thinking_effort: external.thinking_effort, provider_request: external.request},
|
||||||
{response: interaction.response, outcome: interaction.outcome, provider_status: external.response_status, provider_response: external.response_body, provider_error: external.error, duration_ms: external.duration_ms, rust_interpretation_and_validation: interaction.metadata},
|
{response: interaction.response, outcome: interaction.outcome, provider_status: external.response_status, provider_response: external.response_body, provider_error: external.error, duration_ms: external.duration_ms, rust_interpretation_and_validation: interaction.metadata},
|
||||||
'AI-förslag och providertrafik. Förslaget är inte i sig ett fastställt världsfaktum.');
|
isCompaction
|
||||||
|
? 'Äldre privat dialog kondenseras; kontrollera källhändelser, prompt, modellsvar, sammanfattningshash och sparad sekvens. Sammanfattningen är inte kanonisk världssanning.'
|
||||||
|
: 'AI-förslag och providertrafik. Förslaget är inte i sig ett fastställt världsfaktum.');
|
||||||
const metadata = interaction.metadata || {};
|
const metadata = interaction.metadata || {};
|
||||||
if (metadata.validation_inputs || metadata.validation_results || metadata.decision?.includes?.('rule')) {
|
if (metadata.validation_inputs || metadata.validation_results || metadata.decision?.includes?.('rule')) {
|
||||||
addStep('luau', `Regelutkast och tester · ${metadata.rule_key || metadata.activity_key || interaction.prompt_id}`,
|
addStep('luau', `Regelutkast och tester · ${metadata.rule_key || metadata.activity_key || interaction.prompt_id}`,
|
||||||
@@ -862,6 +918,7 @@
|
|||||||
presenceTimer = null;
|
presenceTimer = null;
|
||||||
playerMessagesPrimed = false;
|
playerMessagesPrimed = false;
|
||||||
seenPlayerMessageIds.clear();
|
seenPlayerMessageIds.clear();
|
||||||
|
window.localGameAI?.stop();
|
||||||
await request('/api/logout', {method: 'POST'});
|
await request('/api/logout', {method: 'POST'});
|
||||||
if (location.pathname !== '/admin') appendLine('assistant', 'Du har loggat ut. Logga in igen för att fortsätta spela.');
|
if (location.pathname !== '/admin') appendLine('assistant', 'Du har loggat ut. Logga in igen för att fortsätta spela.');
|
||||||
characterDraft = null;
|
characterDraft = null;
|
||||||
@@ -894,6 +951,7 @@
|
|||||||
}
|
}
|
||||||
appendLine('user', message);
|
appendLine('user', message);
|
||||||
messageField.disabled = true;
|
messageField.disabled = true;
|
||||||
|
setActivityStatus('Berättaren ber AI skapa eller uppdatera ett biografiförslag utifrån det du skrev.');
|
||||||
try {
|
try {
|
||||||
const proposal = await request('/api/character/draft', {
|
const proposal = await request('/api/character/draft', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -901,8 +959,10 @@
|
|||||||
body: JSON.stringify({input: message, current_draft: characterDraft}),
|
body: JSON.stringify({input: message, current_draft: characterDraft}),
|
||||||
});
|
});
|
||||||
characterDraft = proposal.draft;
|
characterDraft = proposal.draft;
|
||||||
|
clearActivityStatus();
|
||||||
appendLine('assistant', `${proposal.message}\n\nFörslag: ${characterDraft.name}, ${characterDraft.age} år.\n${characterDraft.biography}${biographyContextText(characterDraft.life_context)}\n\nSkriv ändringar eller “godkänn”.`);
|
appendLine('assistant', `${proposal.message}\n\nFörslag: ${characterDraft.name}, ${characterDraft.age} år.\n${characterDraft.biography}${biographyContextText(characterDraft.life_context)}\n\nSkriv ändringar eller “godkänn”.`);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
clearActivityStatus();
|
||||||
appendLine('assistant', `Jag kunde inte ta fram ett biografiförslag: ${error.message}. Försök igen när tjänsten svarar.`);
|
appendLine('assistant', `Jag kunde inte ta fram ett biografiförslag: ${error.message}. Försök igen när tjänsten svarar.`);
|
||||||
}
|
}
|
||||||
messageField.disabled = false;
|
messageField.disabled = false;
|
||||||
@@ -914,6 +974,12 @@
|
|||||||
document.querySelector('#dry-run-action').disabled = !enabled;
|
document.querySelector('#dry-run-action').disabled = !enabled;
|
||||||
}
|
}
|
||||||
async function handleGameMessage(message, actionMode = 'normal') {
|
async function handleGameMessage(message, actionMode = 'normal') {
|
||||||
|
if (actionMode === 'normal' && /^lokal ai(?:\s|$)/i.test(message.trim())) {
|
||||||
|
const response = await window.localGameAI?.settings(message);
|
||||||
|
appendLine('user', message);
|
||||||
|
appendLine('assistant', response || 'Kommandon: “lokal ai villkor”, “lokal ai godkänn villkor”, “lokal ai avvisa villkor”, “lokal ai på/av”, “lokal ai loggar på/av”, “lokal ai exportera loggar” och “lokal ai radera loggar”.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (/^logga ut[.!]?$/i.test(message.trim())) {
|
if (/^logga ut[.!]?$/i.test(message.trim())) {
|
||||||
appendLine('user', message);
|
appendLine('user', message);
|
||||||
await handleLogout();
|
await handleLogout();
|
||||||
@@ -941,14 +1007,32 @@
|
|||||||
if (actionMode === 'normal') pendingDialogue = {message, idempotencyKey};
|
if (actionMode === 'normal') pendingDialogue = {message, idempotencyKey};
|
||||||
appendLine('user', message, actionMode === 'dry_run' ? {speaker: 'Torrkörning'} : actionMode === 'redo' ? {speaker: 'Gör om'} : {});
|
appendLine('user', message, actionMode === 'dry_run' ? {speaker: 'Torrkörning'} : actionMode === 'redo' ? {speaker: 'Gör om'} : {});
|
||||||
messageField.disabled = true;
|
messageField.disabled = true;
|
||||||
|
setActivityStatus(actionMode === 'dry_run'
|
||||||
|
? 'Torrkör handlingen utan att spara eller göra framsteg.'
|
||||||
|
: actionMode === 'redo'
|
||||||
|
? 'Gör om den senaste handlingen med aktuella regler.'
|
||||||
|
: 'Berättaren arbetar med din avsikt. Den avgör om en plats, scen eller person behöver etableras och fortsätter sedan berättelsen.');
|
||||||
try {
|
try {
|
||||||
|
let clientAssistance = null;
|
||||||
|
if (actionMode === 'normal' && currentAccount && !currentAccount.is_admin && window.localGameAI) {
|
||||||
|
try {
|
||||||
|
const history = [...transcript.querySelectorAll('li')].map(line => line.textContent).filter(Boolean);
|
||||||
|
const assisted = await window.localGameAI.assist(message, history, gameState?.world || {});
|
||||||
|
clientAssistance = {
|
||||||
|
intent_hint: String(assisted.intent_hint || '').slice(0, 500),
|
||||||
|
warning: String(assisted.warning || '').slice(0, 500),
|
||||||
|
excerpts: Array.isArray(assisted.excerpts) ? assisted.excerpts.filter(item => typeof item === 'string' && item.length <= 500 && history.some(line => line.includes(item))).slice(0, 3) : [],
|
||||||
|
};
|
||||||
|
if (clientAssistance.warning) appendLine('system', `Lokal textkontroll: ${clientAssistance.warning}`, {speaker: 'Lokal AI', speak: false});
|
||||||
|
} catch (_) { /* Local assistance is optional; the original input always proceeds. */ }
|
||||||
|
}
|
||||||
let result;
|
let result;
|
||||||
for (let attempt = 0; attempt < 2; attempt += 1) {
|
for (let attempt = 0; attempt < 2; attempt += 1) {
|
||||||
try {
|
try {
|
||||||
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, forget_previous_turn: actionMode !== 'normal', dry_run: actionMode === 'dry_run'}),
|
body: JSON.stringify({message, expected_world_version: gameState.world.version, idempotency_key: idempotencyKey, forget_previous_turn: actionMode !== 'normal', dry_run: actionMode === 'dry_run', client_assistance: clientAssistance}),
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -968,7 +1052,11 @@
|
|||||||
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. */ }
|
||||||
}
|
}
|
||||||
|
clearActivityStatus();
|
||||||
const speakingNpc = result.status !== 'dry_run' && ['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 change of result.world_changes || []) {
|
||||||
|
appendLine('system', change, {speaker: 'Världsändring', speak: false});
|
||||||
|
}
|
||||||
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});
|
||||||
}
|
}
|
||||||
@@ -977,10 +1065,19 @@
|
|||||||
: speakingNpc
|
: 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'}});
|
||||||
|
if (result.context_compaction?.notice) {
|
||||||
|
appendLine('system', result.context_compaction.notice, {speaker: 'Kontext', speak: false});
|
||||||
|
}
|
||||||
refreshActionTools();
|
refreshActionTools();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
clearActivityStatus();
|
||||||
messageField.value = message;
|
messageField.value = message;
|
||||||
appendLine('assistant', `${explainDialogueError(error)} Ditt meddelande ligger kvar i inmatningen.`);
|
try {
|
||||||
|
const history = [...transcript.querySelectorAll('li')].map(line => line.textContent).filter(Boolean);
|
||||||
|
const localReply = await window.localGameAI?.offline(message, history, gameState?.world || {});
|
||||||
|
if (localReply) appendLine('assistant', `Lokalt, osparat förslag: ${localReply}`, {speaker: 'Lokal hjälp'});
|
||||||
|
else appendLine('assistant', `${explainDialogueError(error)} Ditt meddelande ligger kvar i inmatningen.`);
|
||||||
|
} catch (_) { appendLine('assistant', `${explainDialogueError(error)} Ditt meddelande ligger kvar i inmatningen.`); }
|
||||||
}
|
}
|
||||||
messageField.disabled = false;
|
messageField.disabled = false;
|
||||||
messageField.focus();
|
messageField.focus();
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ self.fetch = async (resource, options) => {
|
|||||||
const requestedUrl = resource instanceof Request ? resource.url : String(resource);
|
const requestedUrl = resource instanceof Request ? resource.url : String(resource);
|
||||||
const localModelUrl = localPiperModelUrl(requestedUrl, self.location.origin);
|
const localModelUrl = localPiperModelUrl(requestedUrl, self.location.origin);
|
||||||
if (!localModelUrl) {
|
if (!localModelUrl) {
|
||||||
|
const requestUrl = new URL(requestedUrl, self.location.origin);
|
||||||
|
if (requestUrl.origin !== self.location.origin) throw new Error(`External Piper asset blocked: ${requestUrl.origin}`);
|
||||||
const runtimeAsset = requestedUrl.includes('/static/piper-wasm-v1/onnx/');
|
const runtimeAsset = requestedUrl.includes('/static/piper-wasm-v1/onnx/');
|
||||||
const runtimeFile = runtimeAsset ? new URL(requestedUrl, self.location.origin).pathname.split('/').pop() : undefined;
|
const runtimeFile = runtimeAsset ? new URL(requestedUrl, self.location.origin).pathname.split('/').pop() : undefined;
|
||||||
if (activeRequestId && runtimeAsset) {
|
if (activeRequestId && runtimeAsset) {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ test -s index.html
|
|||||||
grep -q '<html lang="sv">' index.html
|
grep -q '<html lang="sv">' index.html
|
||||||
grep -q 'id="frontend-version">__FRONTEND_VERSION__' index.html
|
grep -q 'id="frontend-version">__FRONTEND_VERSION__' index.html
|
||||||
grep -q '<script src="/voice.js?v=__FRONTEND_VERSION__"></script>' index.html
|
grep -q '<script src="/voice.js?v=__FRONTEND_VERSION__"></script>' index.html
|
||||||
|
grep -q '<script src="/static/wllama-gemma3-v2/local-ai.js"></script>' index.html
|
||||||
grep -q '<script src="/piper-runtime.js?v=__FRONTEND_VERSION__"></script>' index.html
|
grep -q '<script src="/piper-runtime.js?v=__FRONTEND_VERSION__"></script>' index.html
|
||||||
grep -q 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0' nginx/default.conf
|
grep -q 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0' nginx/default.conf
|
||||||
grep -q 'Cross-Origin-Embedder-Policy "require-corp"' nginx/default.conf
|
grep -q 'Cross-Origin-Embedder-Policy "require-corp"' nginx/default.conf
|
||||||
@@ -46,6 +47,12 @@ grep -q 'WebKit versions before Safari 27' voice.js
|
|||||||
grep -q "voiceIdentity: speakingNpc.voice_identity" index.html
|
grep -q "voiceIdentity: speakingNpc.voice_identity" index.html
|
||||||
grep -q "role: 'narrator', voiceIdentity: 'neutral'" index.html
|
grep -q "role: 'narrator', voiceIdentity: 'neutral'" index.html
|
||||||
grep -q 'COPY voice.js /usr/share/nginx/html/voice.js' Dockerfile
|
grep -q 'COPY voice.js /usr/share/nginx/html/voice.js' Dockerfile
|
||||||
|
grep -Fq 'localGameAI?.start(currentAccount.id)' index.html
|
||||||
|
grep -q "type === 'terms-required'" index.html
|
||||||
|
grep -q 'Gemma-villkor' index.html
|
||||||
|
grep -q 'lokal ai godkänn villkor' index.html
|
||||||
|
grep -q 'lokal ai avvisa villkor' index.html
|
||||||
|
grep -q 'client_assistance: clientAssistance' index.html
|
||||||
grep -q 'COPY public/piper-runtime.js /usr/share/nginx/html/piper-runtime.js' Dockerfile
|
grep -q 'COPY public/piper-runtime.js /usr/share/nginx/html/piper-runtime.js' Dockerfile
|
||||||
grep -q 'COPY public/tts/piper-wasm-v1/' Dockerfile
|
grep -q 'COPY public/tts/piper-wasm-v1/' Dockerfile
|
||||||
grep -q 'build:piper' .gitea/workflows/publish.yaml
|
grep -q 'build:piper' .gitea/workflows/publish.yaml
|
||||||
@@ -55,6 +62,7 @@ grep -q "new Worker(workerUrl, {type: 'module'})" piper-runtime.js
|
|||||||
grep -q 'worker.js?v=' piper-runtime.js
|
grep -q 'worker.js?v=' piper-runtime.js
|
||||||
grep -q 'worker.onmessageerror' piper-runtime.js
|
grep -q 'worker.onmessageerror' piper-runtime.js
|
||||||
grep -q 'localPiperModelUrl' piper-worker.js
|
grep -q 'localPiperModelUrl' piper-worker.js
|
||||||
|
grep -q 'External Piper asset blocked' piper-worker.js
|
||||||
grep -q 'trackDownloadProgress' piper-worker.js
|
grep -q 'trackDownloadProgress' piper-worker.js
|
||||||
grep -q 'new ReadableStream' piper-download-progress.mjs
|
grep -q 'new ReadableStream' piper-download-progress.mjs
|
||||||
grep -q 'createOnnxWasmPaths(self.location.origin)' piper-worker.js
|
grep -q 'createOnnxWasmPaths(self.location.origin)' piper-worker.js
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
const assert = require('node:assert/strict');
|
||||||
|
const fs = require('node:fs');
|
||||||
|
const path = require('node:path');
|
||||||
|
const test = require('node:test');
|
||||||
|
|
||||||
|
const source = fs.readFileSync(path.join(__dirname, '..', 'index.html'), 'utf8');
|
||||||
|
|
||||||
|
test('player sees an accessible live activity line during world and character proposals', () => {
|
||||||
|
assert.match(source, /function setActivityStatus\(message\)/);
|
||||||
|
assert.match(source, /setAttribute\('aria-live', 'polite'\)/);
|
||||||
|
assert.match(source, /AI ta fram ett förslag på startvärld och en plats/);
|
||||||
|
assert.match(source, /AI skapa eller uppdatera ett biografiförslag/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('dialogue processing explains that scene, place, or person establishment is being considered', () => {
|
||||||
|
assert.match(source, /Berättaren arbetar med din avsikt\. Den avgör om en plats, scen eller person behöver etableras/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('local AI activity is shown separately from general narrator processing', () => {
|
||||||
|
assert.match(source, /detail\.type === 'activity' \? 'data-local-ai-activity'/);
|
||||||
|
assert.match(source, /Lokal AI: \$\{detail\.text \|\| ''\}/);
|
||||||
|
assert.match(source, /clearActivityStatus\(\);/);
|
||||||
|
});
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
const assert = require('node:assert/strict');
|
||||||
|
const fs = require('node:fs');
|
||||||
|
const path = require('node:path');
|
||||||
|
const test = require('node:test');
|
||||||
|
|
||||||
|
const page = fs.readFileSync(path.join(__dirname, '..', 'index.html'), 'utf8');
|
||||||
|
|
||||||
|
test('local AI adapter comes from the static service and starts after authenticated game entry', () => {
|
||||||
|
assert.match(page, /<script src="\/static\/wllama-gemma3-v2\/local-ai\.js"><\/script>/);
|
||||||
|
assert.match(page, /showPlay\(\);\s*if \(!currentAccount\.is_admin\) window\.localGameAI\?\.start\(currentAccount\.id\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Gemma license links are shown in the accessible game dialogue and consent can be withdrawn', () => {
|
||||||
|
assert.match(page, /type === 'terms-required'/);
|
||||||
|
assert.match(page, /Gemma-villkor/);
|
||||||
|
assert.match(page, /Spelvillkor för Gemma/);
|
||||||
|
assert.match(page, /policy för förbjuden användning/);
|
||||||
|
assert.match(page, /lokal ai godkänn villkor/);
|
||||||
|
assert.match(page, /lokal ai avvisa villkor/);
|
||||||
|
assert.match(page, /window\.localGameAI\?\.stop\(\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('local assistance remains advisory and preserves the normal dialogue request path', () => {
|
||||||
|
assert.match(page, /client_assistance: clientAssistance/);
|
||||||
|
assert.match(page, /Local assistance is optional; the original input always proceeds/);
|
||||||
|
assert.match(page, /request\('\/api\/dialogue'/);
|
||||||
|
assert.match(page, /Lokalt, osparat förslag:/);
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user