@qvac/harness 0.2.4 → 0.2.5

package/dist/prebuilds-manifest.json

@@ -272,6 +272,14 @@
       "win32-arm64",
       "win32-x64"
     ],
+    "bare-tty/node_modules/bare-signals": [
+      "darwin-arm64",
+      "darwin-x64",
+      "linux-arm64",
+      "linux-x64",
+      "win32-arm64",
+      "win32-x64"
+    ],
     "bare-tty": [
       "darwin-arm64",
       "darwin-x64",

package/dist-lib/index.d.ts

@@ -63,6 +63,7 @@ export interface MusicModelOptions extends MusicModelStages {
 }
 export interface HarnessOptions {
     tools?: ToolDefinition[];
+    gpuStats?: unknown;
     sdkLoader?: SdkLoader;
     skillsDir?: string;
     projectionModel?: string | Record<string, string>;
@@ -131,6 +132,7 @@ export declare class Harness extends ReadyResource {
     private readonly _kvCacheK?;
     private readonly _kvCacheV?;
     private readonly _transcriptionDevice?;
+    private readonly _gpuStats?;
     private _allSkills;
     private _credentialStore?;
     private _credentials;
@@ -143,7 +145,7 @@ export declare class Harness extends ReadyResource {
     private _capability;
     private _capabilityInflight;
     private readonly _modelFaults;
-    constructor({ tools, sdkLoader, skillsDir, projectionModel, imageModel, imageClamps, musicModel, musicClamps, llmDevice, llmGpuLayers, contextSize, kvCacheK, kvCacheV, embedDevice, embedGpuLayers, embedBatchSize, transcriptionDevice, credentialStore, platform }?: HarnessOptions);
+    constructor({ tools, sdkLoader, skillsDir, projectionModel, imageModel, imageClamps, musicModel, musicClamps, llmDevice, llmGpuLayers, contextSize, kvCacheK, kvCacheV, embedDevice, embedGpuLayers, embedBatchSize, transcriptionDevice, credentialStore, platform, gpuStats }?: HarnessOptions);
     _open(): Promise<void>;
     get suspended(): boolean;
     get skillNames(): string[];

package/dist-lib/index.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import { platform, totalmem } from 'os';
 import process from 'process';
 import ReadyResource from 'ready-resource';
-import { readSystemStats } from '#hw-gpu-stats';
+import { probeGpuStats } from "./lib/hardware/gpu-probe.js";
 import { probeCapabilityProfile } from "./lib/hardware/capability-probe.js";
 import { closePythonWorker } from "./lib/tools/exec/adapters/python/worker/client.js";
 import { completion } from "./lib/capabilities/completion.js";
@@ -103,6 +103,7 @@ export class Harness extends ReadyResource {
     _kvCacheK;
     _kvCacheV;
     _transcriptionDevice;
+    _gpuStats;
     _allSkills;
     _credentialStore;
     _credentials = new Map();
@@ -115,10 +116,11 @@ export class Harness extends ReadyResource {
     _capability = null;
     _capabilityInflight = null;
     _modelFaults = new Map();
-    constructor({ tools = [], sdkLoader, skillsDir, projectionModel, imageModel, imageClamps, musicModel, musicClamps, llmDevice, llmGpuLayers, contextSize, kvCacheK, kvCacheV, embedDevice, embedGpuLayers, embedBatchSize, transcriptionDevice, credentialStore, platform } = {}) {
+    constructor({ tools = [], sdkLoader, skillsDir, projectionModel, imageModel, imageClamps, musicModel, musicClamps, llmDevice, llmGpuLayers, contextSize, kvCacheK, kvCacheV, embedDevice, embedGpuLayers, embedBatchSize, transcriptionDevice, credentialStore, platform, gpuStats } = {}) {
         super();
         this._sdk = sdkLoader ?? createSdkLoader();
         this._llmDevice = llmDevice;
+        this._gpuStats = gpuStats;
         this._llmGpuLayers = llmGpuLayers;
         this._contextSize = contextSize;
         this._kvCacheK = kvCacheK;
@@ -898,7 +900,7 @@ export class Harness extends ReadyResource {
                     return null;
                 }
             },
-            readGpuStats: () => readSystemStats()
+            readGpuStats: () => (this._gpuStats !== undefined ? this._gpuStats : probeGpuStats())
         };
         this._capabilityInflight = probeCapabilityProfile(reads)
             .then((capability) => {

package/dist-lib/lib/hardware/capability-probe.d.ts

@@ -4,6 +4,6 @@ export interface PlatformReads {
     platform(): string;
     readFile(path: string): Promise<string | null>;
     run(command: string): Promise<string | null>;
-    readGpuStats(): unknown;
+    readGpuStats(): unknown | Promise<unknown>;
 }
 export declare function probeCapabilityProfile(reads: PlatformReads): Promise<CapabilityInfo>;

package/dist-lib/lib/hardware/capability-probe.js

@@ -49,7 +49,7 @@ async function probeSysfs(reads) {
 }
 async function probeDesktop(reads) {
     const ram = reads.totalmem();
-    const addon = probeWithAddon(reads.readGpuStats(), ram);
+    const addon = probeWithAddon(await reads.readGpuStats(), ram);
     if (addon && addon.source === 'vram')
         return addon;
     const nvidia = await reads.run('nvidia-smi --query-gpu=memory.total --format=csv,noheader,nounits');

package/dist-lib/lib/hardware/gpu-probe-entry.d.ts

@@ -0,0 +1 @@
+export {};

package/dist-lib/lib/hardware/gpu-probe-entry.js

@@ -0,0 +1,2 @@
+import { runGpuProbeIfRequested } from "./gpu-probe.js";
+runGpuProbeIfRequested();

package/dist-lib/lib/hardware/gpu-probe.d.ts

@@ -0,0 +1,8 @@
+export interface GpuProbeResult {
+    readonly ok: boolean;
+    readonly stats: unknown;
+}
+export declare function runGpuProbeIfRequested(): void;
+export declare function parseGpuProbeOutput(output: string): unknown;
+export declare function spawnGpuProbe(entry?: string): Promise<GpuProbeResult>;
+export declare function probeGpuStats(): Promise<unknown>;

package/dist-lib/lib/hardware/gpu-probe.js

@@ -0,0 +1,54 @@
+import { spawn } from 'child_process';
+import os from 'os';
+import { readSystemStats } from '#hw-gpu-stats';
+const FLAG = '--gpu-probe';
+const TIMEOUT_MS = 5000;
+export function runGpuProbeIfRequested() {
+    if (!Bare.argv.includes(FLAG))
+        return;
+    console.log(JSON.stringify(readSystemStats()));
+    queueMicrotask(() => Bare.exit(0));
+}
+export function parseGpuProbeOutput(output) {
+    const line = output.trim().split('\n').at(-1) ?? '';
+    if (line.length === 0)
+        return null;
+    try {
+        const parsed = JSON.parse(line);
+        return typeof parsed === 'object' ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+export function spawnGpuProbe(entry = Bare.argv[1]) {
+    return new Promise((resolve) => {
+        const child = spawn(Bare.argv[0], [entry, FLAG], {
+            stdio: ['ignore', 'pipe', 'pipe', 'pipe']
+        });
+        let output = '';
+        const timer = setTimeout(() => {
+            child.kill();
+            resolve({ ok: false, stats: null });
+        }, TIMEOUT_MS);
+        child.stdout?.on('data', (chunk) => {
+            output += Buffer.from(chunk).toString();
+        });
+        child.stderr?.on('data', () => { });
+        child.on('error', () => {
+            clearTimeout(timer);
+            resolve({ ok: false, stats: null });
+        });
+        child.on('exit', (code) => {
+            clearTimeout(timer);
+            resolve(code === 0 ? { ok: true, stats: parseGpuProbeOutput(output) } : { ok: false, stats: null });
+        });
+    });
+}
+export async function probeGpuStats() {
+    const platform = os.platform();
+    if (typeof Bare === 'undefined' || (platform !== 'linux' && platform !== 'win32')) {
+        return readSystemStats();
+    }
+    return (await spawnGpuProbe()).stats;
+}

package/dist-lib/lib/hardware/gpu-stats.bare.d.ts

@@ -1 +1 @@
-export declare function readSystemStats(): unknown;
+export { readSystemStats } from './gpu-stats.native.cjs';

package/dist-lib/lib/hardware/gpu-stats.bare.js

@@ -1,24 +1 @@
-import os from 'os';
-import GPUInfo from 'bare-gpu-info';
-export function readSystemStats() {
-    try {
-        const info = new GPUInfo();
-        try {
-            const devices = [];
-            for (const gpu of info) {
-                if (typeof gpu.memory !== 'number' || !gpu.name)
-                    continue;
-                devices.push({ name: gpu.name, videoMemoryBytes: gpu.memory });
-            }
-            if (devices.length === 0)
-                return null;
-            return { memory: { totalBytes: os.totalmem() }, gpu: { devices } };
-        }
-        finally {
-            info.destroy();
-        }
-    }
-    catch {
-        return null;
-    }
-}
+export { readSystemStats } from './gpu-stats.native.cjs';

package/dist-lib/lib/hardware/gpu-stats.native.cjs

@@ -0,0 +1,27 @@
+const os = require('os')
+
+// loaded on first read: the addon drags the graphics stack (and on Linux a
+// second LLVM) into whichever process imports it
+let GPUInfo
+
+// Shaped for probeWithAddon (gpu-probe-addon.ts): the probe only wants each
+// device's name and VRAM total, plus system RAM to catch integrated-GPU lies.
+exports.readSystemStats = function readSystemStats() {
+  try {
+    GPUInfo ??= require('bare-gpu-info')
+    const info = new GPUInfo()
+    try {
+      const devices = []
+      for (const gpu of info) {
+        if (typeof gpu.memory !== 'number' || !gpu.name) continue
+        devices.push({ name: gpu.name, videoMemoryBytes: gpu.memory })
+      }
+      if (devices.length === 0) return null
+      return { memory: { totalBytes: os.totalmem() }, gpu: { devices } }
+    } finally {
+      info.destroy()
+    }
+  } catch {
+    return null
+  }
+}

package/dist-lib/lib/hardware/gpu-stats.native.d.cts

@@ -0,0 +1 @@
+export function readSystemStats(): unknown

package/dist-lib/lib/spawn.d.ts

@@ -24,6 +24,7 @@ export interface HarnessLlmConfig {
 export interface HarnessChildOptions {
     runner: StowRunner;
     skillsDir?: string;
+    gpuStats?: unknown;
     wheelsDir?: string;
     sdkStorage?: SdkStorage;
     embedDevice?: EmbedDevice;
@@ -46,6 +47,7 @@ export interface HarnessChildOptions {
 export declare function harnessChild(entry: string, opts: HarnessChildOptions): ChildSpec<RemoteHarness>;
 export interface SpawnHarnessOptions {
     entry: string;
+    gpuStats?: unknown;
     skillsDir?: string;
     wheelsDir?: string;
     sdkStorage: SdkStorage;

package/dist-lib/lib/spawn.js

@@ -5,7 +5,7 @@ import { createEmbedConfig } from "./models/embed-config.js";
 export function harnessChild(entry, opts) {
     if (opts.logger)
         setHarnessLog(true);
-    const { runner, skillsDir, wheelsDir, sdkStorage, embedDevice, embedGpuLayers, embedBatchSize, imageModel, imageClamps, musicModel, musicClamps, llm, onIpc, logger = null, ...spec } = opts;
+    const { runner, skillsDir, gpuStats, wheelsDir, sdkStorage, embedDevice, embedGpuLayers, embedBatchSize, imageModel, imageClamps, musicModel, musicClamps, llm, onIpc, logger = null, ...spec } = opts;
     const embedConfig = createEmbedConfig({
         device: embedDevice,
         gpuLayers: embedGpuLayers,
@@ -24,7 +24,8 @@ export function harnessChild(entry, opts) {
             llm ? JSON.stringify(llm) : '',
             musicModel ? JSON.stringify(musicModel) : '',
             musicClamps ? JSON.stringify(musicClamps) : '',
-            wheelsDir ?? ''
+            wheelsDir ?? '',
+            gpuStats === undefined ? '' : JSON.stringify(gpuStats)
         ],
         logger,
         create: (ipc) => {
@@ -55,7 +56,8 @@ export function spawnHarness(opts) {
             opts.llm ? JSON.stringify(opts.llm) : '',
             opts.musicModel ? JSON.stringify(opts.musicModel) : '',
             opts.musicClamps ? JSON.stringify(opts.musicClamps) : '',
-            opts.wheelsDir ?? ''
+            opts.wheelsDir ?? '',
+            opts.gpuStats === undefined ? '' : JSON.stringify(opts.gpuStats)
         ]);
         sidecar.stdout.on('data', (data) => logger?.info('harness', data.toString().trimEnd()));
         sidecar.stderr.on('data', (data) => logger?.warn('harness', data.toString().trimEnd()));

package/dist-lib/lib/tools/exec/adapters/python/loader.d.ts

@@ -4,8 +4,14 @@ type NodeShapedProcess = typeof process & {
     binding(name: string): Record<string, unknown>;
 };
 export declare function nodeShapedProcess(base: typeof process): NodeShapedProcess;
-export declare function pyodideLoadOptions(): {
-    packageCacheDir: string;
-} | undefined;
+declare const silentStdio: {
+    stdin: () => null;
+    stdout: (_msg: string) => void;
+    stderr: (_msg: string) => void;
+};
+export declare function pyodideLoadOptions(): PyodideLoadOptions;
+type PyodideLoadOptions = typeof silentStdio & {
+    packageCacheDir?: string;
+};
 export declare const defaultLoad: LoadPyodideFn;
 export {};

package/dist-lib/lib/tools/exec/adapters/python/loader.js

@@ -74,11 +74,16 @@ async function shapeBareGlobals() {
         g.performance = { now: () => Date.now() - origin, timeOrigin: origin };
     }
 }
+const silentStdio = {
+    stdin: () => null,
+    stdout: (_msg) => { },
+    stderr: (_msg) => { }
+};
 export function pyodideLoadOptions() {
     const cacheDir = process.env.QVAC_PYODIDE_CACHE_DIR;
     if (!cacheDir)
-        return undefined;
-    return { packageCacheDir: cacheDir };
+        return { ...silentStdio };
+    return { ...silentStdio, packageCacheDir: cacheDir };
 }
 export const defaultLoad = async () => {
     if (typeof globalThis.Bare !== 'undefined')
@@ -86,9 +91,7 @@ export const defaultLoad = async () => {
     const moduleName = 'pyodide';
     const { loadPyodide } = (await import(__rewriteRelativeImportExtension(moduleName)));
     const options = pyodideLoadOptions();
-    if (options) {
+    if (options.packageCacheDir)
         seedPackageCache(options.packageCacheDir);
-        return (await loadPyodide(options));
-    }
-    return (await loadPyodide());
+    return (await loadPyodide(options));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qvac/harness",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "type": "module",
   "description": "An AI harness implementing generate(context) via @qvac/sdk. Knows nothing about workbench, hyperdb, or chunks — just inference in, events out.",
   "exports": {

package/worker/harness-sidecar.mjs

@@ -3,7 +3,9 @@
 // [5] imageModel JSON, [6] imageClamps JSON,
 // [7] '1' to enable harness logging (written to `harness.log`, beside assistant.log),
 // [8] llm config JSON (llmDevice/llmGpuLayers/contextSize/kvCacheK/kvCacheV),
-// [9] musicModel JSON, [10] musicClamps JSON, [11] vendored python wheels dir.
+// [9] musicModel JSON, [10] musicClamps JSON, [11] vendored python wheels dir,
+// [12] host-supplied GPU stats JSON.
+import '../dist-lib/lib/hardware/gpu-probe-entry.js'
 import FileLog from 'bare-file-logger'
 import fs from 'fs'
 import { dirname, join } from 'path'
@@ -104,6 +106,7 @@ export default async function start(ipc, ready) {
   const llmConfig = Bare.argv[8] ? JSON.parse(Bare.argv[8]) : {}
   const musicModel = Bare.argv[9] ? JSON.parse(Bare.argv[9]) : undefined
   const musicClamps = Bare.argv[10] ? JSON.parse(Bare.argv[10]) : undefined
+  const gpuStats = Bare.argv[12] ? JSON.parse(Bare.argv[12]) : undefined
   // Only the host knows where the shipped wheels landed.
   if (Bare.argv[11]) process.env.QVAC_PYTHON_WHEELS_DIR = Bare.argv[11]
 
@@ -152,6 +155,7 @@ export default async function start(ipc, ready) {
     )
   }
   harness = new Harness({
+    gpuStats,
     tools,
     skillsDir,
     imageModel,

package/worker/stow-entry.mjs

@@ -1,23 +1,7 @@
 /* global Bare */
-// What bare-stow generates as a bundle's `__main__.mjs`, as a plain file.
-//
-// A stow bundle is two halves: the JS inlined into it, and the native addons
-// offloaded beside it, because dlopen cannot read a path inside a bundle. The
-// tarball carries dist/prebuilds-manifest.json naming those addons, not the
-// addons themselves, so whoever spawns the bundle has to put them back from
-// their own node_modules — and then the two halves come from different
-// installs. @qvac/core 0.1.2 shipped that way and hung on boot: a bare-pipe one
-// patch release ahead of the JS calling it, no error, no exit.
-//
-// Nothing needs a bundle to spawn this. Run under `bare` from inside
-// node_modules, every addon already sits beside the JS that calls it, out of
-// one install, so they cannot disagree. The bundle stays published for hosts
-// that relocate the code out of node_modules — a packaged desktop or mobile
-// app, which stow their own entries anyway — and this is for everyone else.
-//
-// The protocol is bare-stow's own published export and the host end is
-// unchanged: bare-supervisor's sidecar runner wraps this exactly as it wraps
-// a bundle.
+// bare-stow's generated bundle shim (lib/shim.js) as a plain file, so the
+// sidecar can be spawned without stowing one.
+import '../dist-lib/lib/hardware/gpu-probe-entry.js'
 import protocol from 'bare-stow/protocol'
 
 const ipc = protocol.attach(Bare.IPC)