mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Switching AI Provider in Settings opened from chat rebuilt the voice control, so Settings fell back to voice and the dock went idle, widening the wings. The switch now carries chat's Settings, or chat itself, to the new provider as it already carries the input mode; the conversation still starts fresh and focus stays on the provider choice. After a voice error, opening chat or closing the voice panel left the dock red on ERROR, because both stopped only an active session. They now also end a session left in error, which returns the dock to idle.
172 lines
5.4 KiB
JavaScript
172 lines
5.4 KiB
JavaScript
import { supportedVoiceProviders } from './providerCapabilities.js';
|
|
|
|
const STORAGE_KEY = 'gev.voice.provider';
|
|
|
|
export function readVoiceProvider(storage, supported = ['openai', 'gemini']) {
|
|
let saved;
|
|
try {
|
|
saved = (storage ?? globalThis.localStorage)?.getItem(STORAGE_KEY);
|
|
} catch {
|
|
/* Storage is optional. */
|
|
}
|
|
return supported.includes(saved)
|
|
? saved
|
|
: supported.includes('openai')
|
|
? 'openai'
|
|
: supported[0];
|
|
}
|
|
|
|
/** Keep one public controller identity while replacing each provider's lifetime. */
|
|
export function createProviderCommands(options, { bind, factories, storage }) {
|
|
const supportedProviders = supportedVoiceProviders(
|
|
options.supportedProviders ?? Object.keys(factories),
|
|
factories,
|
|
);
|
|
window.__gevVoiceCommands?.stop?.({ removeUi: true });
|
|
let provider = readVoiceProvider(storage, supportedProviders);
|
|
let current;
|
|
let disposed = false;
|
|
const lifetime = new AbortController();
|
|
let mountGeneration = 0;
|
|
let voiceEnabled = false;
|
|
const stored = () => {
|
|
try {
|
|
return storage ?? globalThis.localStorage;
|
|
} catch {
|
|
return null;
|
|
}
|
|
};
|
|
const stop = (settings = {}) => {
|
|
if (disposed) return;
|
|
voiceEnabled = false;
|
|
if (settings.removeUi) {
|
|
disposed = true;
|
|
options.signal?.removeEventListener('abort', destroy);
|
|
}
|
|
try {
|
|
current?.session.stop(settings);
|
|
} finally {
|
|
if (settings.removeUi) {
|
|
lifetime.abort();
|
|
options.runner.dispose?.();
|
|
}
|
|
}
|
|
};
|
|
const destroy = () => stop({ removeUi: true });
|
|
const selectProvider = (next) => {
|
|
if (disposed || !supportedProviders.includes(next) || next === provider)
|
|
return false;
|
|
const resume = voiceEnabled && current.session.isActive();
|
|
// Carry the input mode, never a held key, microphone or conversation.
|
|
const pushToTalk = Boolean(
|
|
current.session.adapter.getStartOptions?.().pushToTalk,
|
|
);
|
|
const textOnly = Boolean(
|
|
current.session.adapter.getStartOptions?.().textOnly,
|
|
);
|
|
// The panel stays where the user is: chat's Settings or chat itself.
|
|
const presentation = current.chatPresentation?.() ?? null;
|
|
const generation = ++mountGeneration;
|
|
voiceEnabled = false;
|
|
current.session.destroy();
|
|
// Disposal suppresses the retired adapter's idle event. Clear the shared
|
|
// conversation explicitly before the new mount can use these owners.
|
|
if (disposed || generation !== mountGeneration) return false;
|
|
options.pointer?.clear();
|
|
options.referents?.clear();
|
|
options.runner.resetConversation?.();
|
|
if (disposed || generation !== mountGeneration) return false;
|
|
provider = next;
|
|
try {
|
|
stored()?.setItem(STORAGE_KEY, provider);
|
|
} catch {
|
|
/* Storage is optional. */
|
|
}
|
|
mount(presentation);
|
|
if (resume && !disposed && provider === next)
|
|
void current.session.start({
|
|
pushToTalk,
|
|
...(textOnly ? { textOnly } : {}),
|
|
});
|
|
// The new control renders first; focus stays on the provider choice.
|
|
void current.ui?.focus?.(['provider'], { anyVisibility: true });
|
|
return true;
|
|
};
|
|
|
|
const handleSessionEvent = (event) => {
|
|
if (event?.type === 'state' && event.state === 'connecting')
|
|
voiceEnabled = true;
|
|
if (event?.type === 'state' && ['idle', 'error'].includes(event.state)) {
|
|
voiceEnabled = false;
|
|
}
|
|
// The host still observes the mounted provider's neutral session events.
|
|
options.onSessionEvent?.(event);
|
|
};
|
|
|
|
const sendTextCommand = (text) => {
|
|
if (disposed) return false;
|
|
return current.session.sendText(text);
|
|
};
|
|
|
|
const api = {
|
|
// The shared action surface is independent of an active voice connection.
|
|
runner: options.runner,
|
|
supportedProviders,
|
|
signal: lifetime.signal,
|
|
get provider() {
|
|
return provider;
|
|
},
|
|
get session() {
|
|
return current?.session;
|
|
},
|
|
get status() {
|
|
return current?.status ?? current?.session.state ?? 'idle';
|
|
},
|
|
get state() {
|
|
return current?.session.state ?? 'idle';
|
|
},
|
|
get disposed() {
|
|
return disposed;
|
|
},
|
|
start: (settings) => !disposed && current.session.start(settings),
|
|
stop,
|
|
destroy,
|
|
isActive: () => !disposed && current.session.isActive(),
|
|
sendTextCommand,
|
|
sendText: sendTextCommand,
|
|
notifyMapEvent: (event) => !disposed && current.session.sendMapEvent(event),
|
|
};
|
|
// Existing diagnostic and controller accessors continue to reflect the active provider.
|
|
const facade = new Proxy(api, {
|
|
get(target, name, receiver) {
|
|
if (Reflect.has(target, name)) return Reflect.get(target, name, receiver);
|
|
const value = current?.[name];
|
|
return typeof value === 'function' ? value.bind(current) : value;
|
|
},
|
|
});
|
|
function mount(presentation = null) {
|
|
voiceEnabled = false;
|
|
const generation = ++mountGeneration;
|
|
current = bind({
|
|
...options,
|
|
signal: lifetime.signal,
|
|
resetExisting: false,
|
|
disposeRunner: false,
|
|
provider,
|
|
supportedProviders,
|
|
onProviderChange: selectProvider,
|
|
onSessionEvent: (event) => {
|
|
if (!disposed && generation === mountGeneration)
|
|
handleSessionEvent(event);
|
|
},
|
|
createSession: factories[provider],
|
|
presentation,
|
|
});
|
|
window.__gevVoiceCommands = facade;
|
|
}
|
|
mount();
|
|
options.signal?.addEventListener('abort', destroy, { once: true });
|
|
if (options.signal?.aborted) destroy();
|
|
return facade;
|
|
}
|