Updates
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import { Agent } from './qvac-master.js';
|
||||
import { Agent, assertSdkVersion } from './qvac-master.js';
|
||||
|
||||
try {
|
||||
const sdkVersion = assertSdkVersion();
|
||||
const resources = await Agent.engine.resources();
|
||||
const hasGpu = Array.isArray(resources.gpus) && resources.gpus.length > 0;
|
||||
console.log(JSON.stringify({
|
||||
@@ -9,6 +10,7 @@ try {
|
||||
backendHints: resources.drivers || {},
|
||||
gpus: resources.gpus || [],
|
||||
vramBytes: resources.vramBytes || 0,
|
||||
sdkVersion,
|
||||
}, null, 2));
|
||||
if (!hasGpu) {
|
||||
console.error('gpu-doctor: QVAC did not observe a usable GPU; Jarvis will refuse CPU inference');
|
||||
|
||||
+4
-3
@@ -3,6 +3,7 @@ import { HarnessBridge } from './harness-bridge.js';
|
||||
import { ComputerUseSession } from '../computer-use/session.js';
|
||||
import { VoiceStateMachine } from './voice-state.js';
|
||||
import { QvacScheduler } from './qvac-scheduler.js';
|
||||
import { cancelQvac, resumeQvac, suspendQvac } from './qvac-master.js';
|
||||
|
||||
export class JarvisDaemon extends EventEmitter {
|
||||
constructor() {
|
||||
@@ -17,8 +18,8 @@ export class JarvisDaemon extends EventEmitter {
|
||||
}
|
||||
|
||||
setState(state) { this.state = state; this.emit('StateChanged', state); }
|
||||
arm() { this.voice.wake(); this.setState('LISTENING'); }
|
||||
sleep() { this.voice.sleep(); this.setState('SLEEPING'); }
|
||||
async arm() { await resumeQvac().catch(() => {}); this.voice.wake(); this.setState('LISTENING'); }
|
||||
async sleep() { this.voice.sleep(); this.setState('SLEEPING'); await suspendQvac().catch((error) => this.emit('Error', 'QVAC_SUSPEND', error.message)); }
|
||||
say(text) { this.emit('Reply', String(text)); }
|
||||
async ask(text) {
|
||||
this.voice.utterance(); this.setState('THINKING');
|
||||
@@ -29,7 +30,7 @@ export class JarvisDaemon extends EventEmitter {
|
||||
this.emit('Error', 'QVAC', error.message); this.voice.cancel(); this.setState('ARMED'); throw error;
|
||||
}
|
||||
}
|
||||
cancel() { this.harness.cancel(); this.scheduler.cancelQueued((job) => job.lane === 'voice'); this.computer.revoke(); this.voice.cancel(); this.setState('ARMED'); }
|
||||
cancel() { this.harness.cancel(); this.scheduler.cancelQueued((job) => job.lane === 'voice'); this.computer.revoke(); this.voice.cancel(); this.setState('ARMED'); cancelQvac().catch((error) => this.emit('Error', 'QVAC_CANCEL', error.message)); }
|
||||
computerGrant(persist = false) { const result = this.computer.grant({ persist }); this.emit('ComputerStep', JSON.stringify({ action: 'grant', ...result })); return result; }
|
||||
computerRevoke() { this.computer.revoke(); this.emit('ComputerStep', JSON.stringify({ action: 'revoke' })); }
|
||||
async close() { this.computerRevoke(); await this.harness.close(); }
|
||||
|
||||
@@ -16,9 +16,18 @@ export const QVAC_MASTER = Object.freeze({
|
||||
gpuLayers: 99,
|
||||
});
|
||||
|
||||
export function assertSdkVersion() {
|
||||
const sdkPackage = require(path.join(harnessPath, 'node_modules/@qvac/sdk/package.json'));
|
||||
if (!/^0\.19\./.test(sdkPackage.version)) {
|
||||
throw new Error(`Jarvis requires vendored @qvac/sdk in the 0.19.x series; found ${sdkPackage.version}`);
|
||||
}
|
||||
return sdkPackage.version;
|
||||
}
|
||||
|
||||
export async function acquireQvac() {
|
||||
ownerCount += 1;
|
||||
if (!loadPromise) {
|
||||
assertSdkVersion();
|
||||
const resources = await Agent.engine.resources();
|
||||
const gpuVisible = (resources.gpus?.length || 0) > 0 ||
|
||||
Boolean(resources.drivers?.vulkan || resources.drivers?.cuda || resources.drivers?.opencl || resources.gpu);
|
||||
@@ -54,6 +63,28 @@ export async function closeQvac() {
|
||||
await Agent.engine.close();
|
||||
}
|
||||
|
||||
export async function cancelQvac() {
|
||||
await Agent.engine.cancel();
|
||||
}
|
||||
|
||||
export async function suspendQvac() {
|
||||
const sdk = await Agent.engine.ensureInit();
|
||||
if (typeof sdk.suspend !== 'function') throw new Error('QVAC runtime does not expose suspend()');
|
||||
await sdk.suspend();
|
||||
}
|
||||
|
||||
export async function resumeQvac() {
|
||||
const sdk = await Agent.engine.ensureInit();
|
||||
if (typeof sdk.resume !== 'function') throw new Error('QVAC runtime does not expose resume()');
|
||||
await sdk.resume();
|
||||
}
|
||||
|
||||
export async function qvacRuntimeState() {
|
||||
const sdk = await Agent.engine.ensureInit();
|
||||
if (typeof sdk.state !== 'function') return 'unknown';
|
||||
return sdk.state();
|
||||
}
|
||||
|
||||
export function qvacStatus() {
|
||||
return { ...QVAC_MASTER, owners: ownerCount, loaded: Agent.engine.getLoaded() };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user