mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Merge main into PR #621 (ChatGPT OAuth for Realtime voice)
Resolve conflicts with the voice-core captions, panel resize and MCP panel key changes by keeping both sides.
This commit is contained in:
commit
fb1596d2f1
244 files changed
+40846
-1558
No files matched your search
@@ -3704,6 +3704,50 @@ test('a genuinely different refused call still gets its own output', async () =>
|
||||
assert.deepEqual(outputs, ['call_one', 'call_two'], 'each distinct call is answered');
|
||||
});
|
||||
|
||||
test('a claimed Space hold barges in on the assistant; a short tap never does', (t) => {
|
||||
const f = createPushToTalkFixture(t);
|
||||
const canvas = pushToTalkTarget({ tagName: 'CANVAS', id: 'world-overlay-canvas', tabIndex: 0 });
|
||||
let bargeIns = 0;
|
||||
f.controller._turns.bargeIn = () => {
|
||||
bargeIns += 1;
|
||||
return true;
|
||||
};
|
||||
// First hold starts the push-to-talk session; nothing to interrupt yet.
|
||||
f.key('keydown', canvas);
|
||||
f.advance(PUSH_TO_TALK_HOLD_DELAY_MS);
|
||||
f.key('keyup', canvas);
|
||||
assert.equal(bargeIns, 0);
|
||||
// A short tap during the reply stays a tap.
|
||||
f.key('keydown', canvas);
|
||||
f.advance(PUSH_TO_TALK_HOLD_DELAY_MS - 1);
|
||||
f.key('keyup', canvas);
|
||||
assert.equal(bargeIns, 0);
|
||||
// Only the 500 ms claim interrupts, and the microphone opens as before.
|
||||
f.key('keydown', canvas);
|
||||
f.advance(PUSH_TO_TALK_HOLD_DELAY_MS);
|
||||
assert.equal(bargeIns, 1);
|
||||
assert.equal(f.microphone.enabled, true);
|
||||
f.key('keyup', canvas);
|
||||
// Radio's claim is read before Radio is paused, and a held handoff is
|
||||
// never interrupted.
|
||||
const order = [];
|
||||
const input = f.controller._input;
|
||||
input.mayClaimSpeaker = () => {
|
||||
order.push('claim');
|
||||
return false;
|
||||
};
|
||||
const pause = input.pauseRadioForVoice;
|
||||
input.pauseRadioForVoice = (...args) => {
|
||||
order.push('pause');
|
||||
return pause(...args);
|
||||
};
|
||||
f.key('keydown', canvas);
|
||||
f.advance(PUSH_TO_TALK_HOLD_DELAY_MS);
|
||||
assert.deepEqual(order.slice(0, 2), ['claim', 'pause']);
|
||||
assert.equal(bargeIns, 1, 'no barge-in while Radio holds the speaker');
|
||||
f.key('keyup', canvas);
|
||||
});
|
||||
|
||||
const testPlaceSearch = () => createStandalonePlaceSearch({ resolveApiKey: () => globalThis.window?.__GOOGLE_MAPS_API_KEY__ });
|
||||
function createGevActionRunner(options) { return createActionRunner({ placeSearch: testPlaceSearch(), ...options }); }
|
||||
function controlRadio(viewer, manager, args, options) { return runControlRadio(viewer, manager, args, { placeSearch: testPlaceSearch(), ...options }); }
|
||||
@@ -3714,6 +3758,16 @@ test('voice runs app actions itself and other tools through the catalog', async
|
||||
actions.push([name, args]);
|
||||
return { ok: true, action: name };
|
||||
};
|
||||
const resets = [];
|
||||
const disposals = [];
|
||||
runner.resetConversation = (...args) => {
|
||||
resets.push(args);
|
||||
return 'reset';
|
||||
};
|
||||
runner.dispose = (...args) => {
|
||||
disposals.push(args);
|
||||
return 'disposed';
|
||||
};
|
||||
const calls = [];
|
||||
let loads = 0;
|
||||
const catalog = {
|
||||
@@ -3745,5 +3799,9 @@ test('voice runs app actions itself and other tools through the catalog', async
|
||||
actions.map(([name]) => name),
|
||||
['zoom_to_globe', 'not_a_tool'],
|
||||
);
|
||||
assert.equal(run.resetConversation('stopped'), 'reset');
|
||||
assert.equal(run.dispose('removed'), 'disposed');
|
||||
assert.deepEqual(resets, [['stopped']]);
|
||||
assert.deepEqual(disposals, [['removed']]);
|
||||
assert.equal(withToolCatalog(runner, undefined), runner);
|
||||
});
|
||||
Reference in new issue
Block a user