mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Keep an active voice session through engine switches
The page creates the voice once; each engine attachment only gives it that scene's action runner, pointer canvas and annotation events. Calls made during a switch wait for the incoming engine and are refused with ENGINE_SWITCHING when none attaches in time; results name the engine that answered, and the session hears engine-changed after a switch. The analyst's follow-up memory and layer enable times outlive one engine's runner. scripts/qa-voice-engine-switch.mjs drives a fake microphone and Realtime transport through the switches.
This commit is contained in:
1 parent
35ed499ae4
commit
05578c61b9
13 files changed
+998
-139
No files matched your search
+22
-16
@@ -644,8 +644,11 @@ export async function selectAnalystRows(
|
||||
* Create an engine bound to live providers. All spatial/text/number logic is
|
||||
* in the pure helpers above; this closure only sequences and remembers.
|
||||
*/
|
||||
export function createAnalystEngine(providers) {
|
||||
let lastResult = null;
|
||||
export function createAnalystEngine(providers, { memory = null } = {}) {
|
||||
// The follow-up memory. A caller may own it (`memory`, an object whose
|
||||
// `lastResult` this engine reads and writes) so a replacement engine over
|
||||
// another globe keeps the last answer; otherwise it is this engine's.
|
||||
memory ??= { lastResult: null };
|
||||
|
||||
/**
|
||||
* Run one query.
|
||||
@@ -666,7 +669,7 @@ export function createAnalystEngine(providers) {
|
||||
) {
|
||||
const cancelled = () =>
|
||||
refusal('CANCELLED', 'This query was superseded.', { cancelled: true });
|
||||
if (spec.followUp && !lastResult)
|
||||
if (spec.followUp && !memory.lastResult)
|
||||
return refusal(
|
||||
'NO_RESULT_CONTEXT',
|
||||
'There is no previous answer to follow up on. Ask the full question.',
|
||||
@@ -677,7 +680,7 @@ export function createAnalystEngine(providers) {
|
||||
// must be that set: "those hospitals" after an aircraft answer is a new
|
||||
// question, never a filter over the old aircraft.
|
||||
if (followUp && Array.isArray(spec.layers) && spec.layers.length) {
|
||||
const remembered = new Set(lastResult.layerKeys);
|
||||
const remembered = new Set(memory.lastResult.layerKeys);
|
||||
const named = new Set(spec.layers);
|
||||
const same =
|
||||
remembered.size === named.size &&
|
||||
@@ -685,16 +688,16 @@ export function createAnalystEngine(providers) {
|
||||
if (!same)
|
||||
return refusal(
|
||||
'FOLLOW_UP_MISMATCH',
|
||||
`The last answer was about ${lastResult.layerKeys.join(', ')}, not ${spec.layers.join(', ')}. Ask again without followUp.`,
|
||||
`The last answer was about ${memory.lastResult.layerKeys.join(', ')}, not ${spec.layers.join(', ')}. Ask again without followUp.`,
|
||||
{
|
||||
layers: [...spec.layers],
|
||||
remembered: [...lastResult.layerKeys],
|
||||
remembered: [...memory.lastResult.layerKeys],
|
||||
coverage: { layersQueried: [], scope: 'none' },
|
||||
},
|
||||
);
|
||||
}
|
||||
const layers = followUp
|
||||
? lastResult.layerKeys
|
||||
? memory.lastResult.layerKeys
|
||||
: Array.isArray(spec.layers) && spec.layers.length
|
||||
? spec.layers
|
||||
: ['flights'];
|
||||
@@ -729,10 +732,11 @@ export function createAnalystEngine(providers) {
|
||||
let queriedSnapshots;
|
||||
let unanswered = [];
|
||||
if (followUp) {
|
||||
groups = lastResult.matched;
|
||||
layersQueried = lastResult.coverage.layersQueried;
|
||||
queriedSnapshots = lastResult.coverage.feedProvenance?.layers || [];
|
||||
unanswered = [...(lastResult.unanswered || [])];
|
||||
groups = memory.lastResult.matched;
|
||||
layersQueried = memory.lastResult.coverage.layersQueried;
|
||||
queriedSnapshots =
|
||||
memory.lastResult.coverage.feedProvenance?.layers || [];
|
||||
unanswered = [...(memory.lastResult.unanswered || [])];
|
||||
} else {
|
||||
groups = [];
|
||||
layersQueried = [];
|
||||
@@ -816,9 +820,11 @@ export function createAnalystEngine(providers) {
|
||||
|
||||
// 2) Spatial scope
|
||||
const rememberedScope =
|
||||
followUp && !spec.scope ? lastResult.scopePresentation || null : null;
|
||||
followUp && !spec.scope
|
||||
? memory.lastResult.scopePresentation || null
|
||||
: null;
|
||||
const rememberedDistanceOf =
|
||||
followUp && !spec.scope ? lastResult.distanceOf || null : null;
|
||||
followUp && !spec.scope ? memory.lastResult.distanceOf || null : null;
|
||||
let resolvedScope = null;
|
||||
let scopeNote = rememberedScope?.coverage || 'anywhere';
|
||||
let scopeSource = rememberedScope?.source || null;
|
||||
@@ -1018,7 +1024,7 @@ export function createAnalystEngine(providers) {
|
||||
: null;
|
||||
if (!isCurrent()) return cancelled();
|
||||
const committedCoverage = memoryOverride?.coverage || result.coverage;
|
||||
lastResult = {
|
||||
memory.lastResult = {
|
||||
matched: memoryOverride?.matched || selection.matched,
|
||||
distanceOf: memoryOverride?.distanceOf || rememberedDistanceOf,
|
||||
layerKeys: [...(memoryOverride?.layerKeys || layers)],
|
||||
@@ -1042,10 +1048,10 @@ export function createAnalystEngine(providers) {
|
||||
return {
|
||||
query,
|
||||
reset() {
|
||||
lastResult = null;
|
||||
memory.lastResult = null;
|
||||
},
|
||||
hasMemory() {
|
||||
return Boolean(lastResult);
|
||||
return Boolean(memory.lastResult);
|
||||
},
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user