@qvac/harness 0.6.0 → 0.7.0

package/dist-lib/lib/tools/exec/adapters/python/worker/serve.js

@@ -0,0 +1,90 @@
+import { parentPort, workerData } from 'worker_threads';
+import { errorMessage, isRecord } from '../../../../../guards.js';
+import { setHarnessLog, setHarnessLogSink } from '../../../../../log.js';
+import { performRun } from '../run-session.js';
+import { asHostMessage, toWireResult } from './protocol.js';
+function narrowThreadData(data) {
+    if (isRecord(data) && 'sab' in data) {
+        const sab = data.sab;
+        const log = 'log' in data && data.log === true;
+        if (sab instanceof SharedArrayBuffer) {
+            return { sab, log };
+        }
+    }
+    throw new Error('python worker started without { sab } worker data');
+}
+function openPort() {
+    const parent = parentPort;
+    if (!parent) {
+        throw new Error('python worker entry loaded on the main thread');
+    }
+    const queued = [];
+    const waiting = [];
+    parent.on('message', (value) => {
+        const next = waiting.shift();
+        if (next) {
+            next(value);
+        }
+        else {
+            queued.push(value);
+        }
+    });
+    return {
+        port: {
+            read() {
+                if (queued.length > 0) {
+                    return Promise.resolve(queued.shift());
+                }
+                return new Promise((resolve) => waiting.push(resolve));
+            },
+            write: (message) => parent.postMessage(message),
+            close: () => parent.close()
+        },
+        ...narrowThreadData(workerData)
+    };
+}
+async function serveRuns(port, py) {
+    for (;;) {
+        const message = asHostMessage(await port.read());
+        if (!message || message.type === 'close') {
+            break;
+        }
+        if (message.type === 'connect-answer') {
+            continue;
+        }
+        let closing = false;
+        const askConnect = async (host) => {
+            if (closing)
+                return false;
+            port.write({ type: 'connect-ask', host });
+            const answer = asHostMessage(await port.read());
+            if (answer?.type === 'connect-answer') {
+                return answer.allowed;
+            }
+            closing = true;
+            return false;
+        };
+        const { result, evict } = await performRun(py, message.spec, { askConnect });
+        port.write({ type: 'result', id: message.id, result: toWireResult(result), evict });
+        if (evict || closing) {
+            break;
+        }
+    }
+}
+export async function serve(load) {
+    const { port, sab, log } = openPort();
+    setHarnessLog(log);
+    setHarnessLogSink((message) => port.write({ type: 'log', message }));
+    try {
+        const py = await load();
+        py.setInterruptBuffer(new Uint8Array(sab));
+        port.write({ type: 'ready' });
+        await serveRuns(port, py);
+    }
+    catch (error) {
+        port.write({ type: 'boot-error', message: errorMessage(error) });
+    }
+    finally {
+        port.close();
+    }
+}

package/dist-lib/lib/tools/exec/adapters/python/worker/{spawn-node.d.ts → spawn.d.ts}

@@ -11,4 +11,3 @@ export interface WorkerData {
     readonly log: boolean;
 }
 export declare function spawnPythonWorker(entry: string, data: WorkerData): WorkerLink;
-export declare function spawnInlineThread(source: string, data: object): () => void;

package/dist-lib/lib/tools/exec/adapters/python/worker/{spawn-node.js → spawn.js}

@@ -48,11 +48,3 @@ export function spawnPythonWorker(entry, data) {
         unref: () => worker.unref()
     };
 }
-export function spawnInlineThread(source, data) {
-    const worker = new Worker(`const data = require('worker_threads').workerData\n${source}`, {
-        eval: true,
-        workerData: data
-    });
-    worker.unref();
-    return () => { };
-}

package/dist-lib/lib/tools/exec/bare-runtime.d.ts

@@ -0,0 +1,2 @@
+import type { ShellRuntime } from './adapters/shell/shell-adapter.ts';
+export declare function bareRuntime(): Promise<Required<ShellRuntime>>;

package/dist-lib/lib/tools/exec/bare-runtime.js

@@ -0,0 +1,10 @@
+import { spawnEnv } from '../../helpers/spawn-path.js';
+export async function bareRuntime() {
+    const [{ spawn }, { default: process }] = await Promise.all([
+        import('bare-subprocess'),
+        import('bare-process')
+    ]);
+    const rawSpawn = spawn;
+    const spawnFn = (command, opts = {}) => rawSpawn(command, { ...opts, env: spawnEnv(process.env, process.platform, opts.env) });
+    return { spawn: spawnFn, killProcess: process.kill.bind(process) };
+}

package/dist-lib/lib/tools/exec.d.ts

@@ -1,7 +1,6 @@
 import type { ToolDefinition } from '../capabilities/completion.ts';
 import type { ExecError } from './exec/adapters/python/output-policy.ts';
 import type { LoadPyodideFn } from './exec/adapters/python/pyodide.ts';
-import { type ShellRuntime } from './exec/adapters/shell/shell-adapter.ts';
 import { type KillProcess, type SpawnFn } from './exec/runner.ts';
 import { type Realpath } from './fs/scope.ts';
 import type { CredentialStoreFn } from './skills/auth-resolver.ts';
@@ -19,7 +18,6 @@ export interface ExecToolOptions {
     readonly deniedRoots?: readonly string[];
     readonly skillsDir?: string;
 }
-export declare function bareRuntime(): Promise<Required<ShellRuntime>>;
 export interface ScriptRun {
     args: Record<string, unknown>;
     trusted: boolean;

package/dist-lib/lib/tools/exec.js

@@ -1,8 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { AbortedError } from '../helpers/race-abort.js';
-import { spawnEnv } from '../helpers/spawn-path.js';
-import { checkPdfBuildSource, checkBareLengthArgs, checkPptxBuildSource, checkPythonSource, checkUnstagedRead, createPythonAdapter, isPythonLanguage, parseInputs, parseOutputs, parsePackages, parseWorkdir, pinned, runsThroughPyodide, unwrapPythonSource } from './exec/adapters/python/python-adapter.js';
+import { checkPdfBuildSource, checkBareLengthArgs, checkPptxBuildSource, checkPythonSource, checkUnstagedRead, createPythonAdapter, isPythonLanguage, parseInputs, parseOutputs, parsePackages, parseWorkdir, pinned, runsThroughPyodide, sandboxInstallError, unwrapPythonSource } from './exec/adapters/python/python-adapter.js';
 import { pythonCreateEffect } from './exec/adapters/python/create-effect.js';
 import { namedHosts } from './exec/adapters/python/named-hosts.js';
 import { pythonReachesNetwork } from './exec/adapters/python/net-shim.js';
@@ -12,6 +11,7 @@ import { MAX_OUTPUT_CHARS_LIMIT } from './exec/runner.js';
 import { bareBin, firstCommandToken, sanitizeCommand } from './exec/scope.js';
 import { FILES_NEED_PYTHON_ERROR, isPythonSourceShaped, PACKAGES_NEED_PYTHON_ERROR, pythonRedirectError, startsLikePython, videoToolError } from './exec/shell-guidance.js';
 import { shellArgv } from './exec/shell-argv.js';
+import { bareRuntime } from './exec/bare-runtime.js';
 import { canonicalDenyRoots, defaultRealpath, hostPath, resolveKey } from './fs/scope.js';
 import { unquoteArg } from './model-args.js';
 import { settingsEnv } from './skills/skill-settings.js';
@@ -48,15 +48,6 @@ function shellEffect(command, toolOps) {
     }
     return matched.every((op) => op.annotation(argv) === 'read') ? 'read' : 'write';
 }
-export async function bareRuntime() {
-    const [{ spawn }, { default: process }] = await Promise.all([
-        import('bare-subprocess'),
-        import('bare-process')
-    ]);
-    const rawSpawn = spawn;
-    const spawnFn = (command, opts = {}) => rawSpawn(command, { ...opts, env: spawnEnv(process.env, process.platform, opts.env) });
-    return { spawn: spawnFn, killProcess: process.kill.bind(process) };
-}
 function resolveExecution({ adapters, fallback }, args, ctx) {
     for (const adapter of adapters) {
         const plan = adapter.resolve(args, ctx);
@@ -468,6 +459,10 @@ export function createExecTool({ spawn, killProcess, loadPyodide, disablePyodide
                 if (packages && 'error' in packages) {
                     return packages.error;
                 }
+                const refusal = ctx?.sandboxMode === true ? sandboxInstallError(command, packages) : null;
+                if (refusal) {
+                    return refusal;
+                }
                 if (!scriptRun || !scriptRun.trusted) {
                     const sourceError = checkPythonSource(command);
                     if (sourceError) {

package/dist-lib/schema/harness.js

@@ -450,7 +450,8 @@ export function registerHarnessTypes(ns) {
         fields: [
             { name: 'capabilityProfile', type: '@harness/capability-profile', required: true },
             { name: 'recommendedModelName', type: 'string', required: true },
-            { name: 'memoryBudget', type: '@harness/memory-budget' }
+            { name: 'memoryBudget', type: '@harness/memory-budget' },
+            { name: 'mobile', type: 'bool' }
         ]
     });
     ns.register({

package/dist-lib/spec/hrpc/messages.js

@@ -1,12 +1,12 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 16
+// Schema Version: 17
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
 
 import { c } from 'hyperschema/runtime'
 
-const VERSION = 16
+const VERSION = 17
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -1919,12 +1919,12 @@ const encoding42 = {
   preencode(state, m) {
     encoding38.preencode(state, m.capabilityProfile)
     c.string.preencode(state, m.recommendedModelName)
-    state.end++ // max flag is 1 so always one byte
+    state.end++ // max flag is 2 so always one byte
 
     if (version >= 2 && m.memoryBudget) encoding42_2.preencode(state, m.memoryBudget)
   },
   encode(state, m) {
-    const flags = (version >= 2 && m.memoryBudget) ? 1 : 0
+    const flags = ((version >= 2 && m.memoryBudget) ? 1 : 0) | ((version >= 17 && m.mobile) ? 2 : 0)
 
     encoding38.encode(state, m.capabilityProfile)
     c.string.encode(state, m.recommendedModelName)
@@ -1940,7 +1940,8 @@ const encoding42 = {
     return {
       capabilityProfile: r0,
       recommendedModelName: r1,
-      memoryBudget: (version >= 2 && (flags & 1) !== 0) ? encoding42_2.decode(state) : null
+      memoryBudget: (version >= 2 && (flags & 1) !== 0) ? encoding42_2.decode(state) : null,
+      mobile: (version >= 17 && (flags & 2) !== 0)
     }
   }
 }

package/dist-lib/spec/hyperschema/index.js

@@ -1,12 +1,12 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 16
+// Schema Version: 17
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
 
 import { c } from 'hyperschema/runtime'
 
-const VERSION = 16
+const VERSION = 17
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -1919,12 +1919,12 @@ const encoding42 = {
   preencode(state, m) {
     encoding38.preencode(state, m.capabilityProfile)
     c.string.preencode(state, m.recommendedModelName)
-    state.end++ // max flag is 1 so always one byte
+    state.end++ // max flag is 2 so always one byte
 
     if (version >= 2 && m.memoryBudget) encoding42_2.preencode(state, m.memoryBudget)
   },
   encode(state, m) {
-    const flags = (version >= 2 && m.memoryBudget) ? 1 : 0
+    const flags = ((version >= 2 && m.memoryBudget) ? 1 : 0) | ((version >= 17 && m.mobile) ? 2 : 0)
 
     encoding38.encode(state, m.capabilityProfile)
     c.string.encode(state, m.recommendedModelName)
@@ -1940,7 +1940,8 @@ const encoding42 = {
     return {
       capabilityProfile: r0,
       recommendedModelName: r1,
-      memoryBudget: (version >= 2 && (flags & 1) !== 0) ? encoding42_2.decode(state) : null
+      memoryBudget: (version >= 2 && (flags & 1) !== 0) ? encoding42_2.decode(state) : null,
+      mobile: (version >= 17 && (flags & 2) !== 0)
     }
   }
 }

package/dist-lib/spec/hyperschema/schema.json

@@ -1,5 +1,5 @@
 {
-  "version": 16,
+  "version": 17,
   "schema": [
     {
       "name": "empty",
@@ -1580,6 +1580,11 @@
           "name": "memoryBudget",
           "type": "@harness/memory-budget",
           "version": 2
+        },
+        {
+          "name": "mobile",
+          "type": "bool",
+          "version": 17
         }
       ]
     },

package/dist-lib/spec/hyperschema/types.d.ts

@@ -1,5 +1,5 @@
 // This file is autogenerated by hyperschema-ts
-// Schema version: 16
+// Schema version: 17
 // Do not edit manually.
 
 export interface HarnessEmpty {
@@ -312,6 +312,7 @@ export interface HarnessCapabilityResponse {
   capabilityProfile: HarnessCapabilityProfile
   recommendedModelName: string
   memoryBudget?: HarnessMemoryBudget | null
+  mobile?: boolean
 }
 
 export interface HarnessTranscribeRequest {

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@qvac/harness",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "type": "module",
+  "engines": {
+    "bare": ">=1.34.0"
+  },
   "description": "An AI harness implementing generate(context) via @qvac/sdk. Knows nothing about workbench, hyperdb, or chunks — just inference in, events out.",
   "exports": {
     ".": {
@@ -182,7 +185,6 @@
       "types": "./dist-lib/schema/release-tags.d.ts",
       "default": "./dist-lib/schema/release-tags.js"
     },
-    "./dist/harness.cjs": "./dist/harness.cjs",
     "./worker/stow-entry.mjs": "./worker/stow-entry.mjs",
     "./lib/tools/catalog.ts": {
       "types": "./dist-lib/lib/tools/catalog.d.ts",
@@ -212,6 +214,10 @@
       "types": "./dist-lib/lib/tools/exec/adapters/python/create-effect.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/create-effect.js"
     },
+    "./lib/tools/exec/adapters/python/deadline-state.ts": {
+      "types": "./dist-lib/lib/tools/exec/adapters/python/deadline-state.d.ts",
+      "default": "./dist-lib/lib/tools/exec/adapters/python/deadline-state.js"
+    },
     "./lib/tools/exec/adapters/python/distributions.ts": {
       "types": "./dist-lib/lib/tools/exec/adapters/python/distributions.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/distributions.js"
@@ -264,6 +270,10 @@
       "types": "./dist-lib/lib/tools/exec/adapters/python/wheels.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/wheels.js"
     },
+    "./lib/tools/exec/adapters/python/worker/active.ts": {
+      "types": "./dist-lib/lib/tools/exec/adapters/python/worker/active.d.ts",
+      "default": "./dist-lib/lib/tools/exec/adapters/python/worker/active.js"
+    },
     "./lib/tools/exec/adapters/python/worker/client.ts": {
       "types": "./dist-lib/lib/tools/exec/adapters/python/worker/client.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/worker/client.js"
@@ -272,22 +282,30 @@
       "types": "./dist-lib/lib/tools/exec/adapters/python/worker/entry.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/worker/entry.js"
     },
+    "./lib/tools/exec/adapters/python/worker/interrupt-deadline.ts": {
+      "types": "./dist-lib/lib/tools/exec/adapters/python/worker/interrupt-deadline.d.ts",
+      "default": "./dist-lib/lib/tools/exec/adapters/python/worker/interrupt-deadline.js"
+    },
     "./lib/tools/exec/adapters/python/worker/protocol.ts": {
       "types": "./dist-lib/lib/tools/exec/adapters/python/worker/protocol.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/worker/protocol.js"
     },
-    "./lib/tools/exec/adapters/python/worker/spawn-bare.ts": {
-      "types": "./dist-lib/lib/tools/exec/adapters/python/worker/spawn-bare.d.ts",
-      "default": "./dist-lib/lib/tools/exec/adapters/python/worker/spawn-bare.js"
+    "./lib/tools/exec/adapters/python/worker/serve.ts": {
+      "types": "./dist-lib/lib/tools/exec/adapters/python/worker/serve.d.ts",
+      "default": "./dist-lib/lib/tools/exec/adapters/python/worker/serve.js"
     },
-    "./lib/tools/exec/adapters/python/worker/spawn-node.ts": {
-      "types": "./dist-lib/lib/tools/exec/adapters/python/worker/spawn-node.d.ts",
-      "default": "./dist-lib/lib/tools/exec/adapters/python/worker/spawn-node.js"
+    "./lib/tools/exec/adapters/python/worker/spawn.ts": {
+      "types": "./dist-lib/lib/tools/exec/adapters/python/worker/spawn.d.ts",
+      "default": "./dist-lib/lib/tools/exec/adapters/python/worker/spawn.js"
     },
     "./lib/tools/exec/adapters/shell/shell-adapter.ts": {
       "types": "./dist-lib/lib/tools/exec/adapters/shell/shell-adapter.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/shell/shell-adapter.js"
     },
+    "./lib/tools/exec/bare-runtime.ts": {
+      "types": "./dist-lib/lib/tools/exec/bare-runtime.d.ts",
+      "default": "./dist-lib/lib/tools/exec/bare-runtime.js"
+    },
     "./lib/tools/exec/obsidian/cli-process.ts": {
       "types": "./dist-lib/lib/tools/exec/obsidian/cli-process.d.ts",
       "default": "./dist-lib/lib/tools/exec/obsidian/cli-process.js"
@@ -607,7 +625,7 @@
     "skill-eval": "bare examples/skill-eval/run.ts",
     "translate-eval": "bare examples/translate-eval/run.ts",
     "model-residency": "bare examples/model-residency/run.ts",
-    "prepack": "node scripts/vendor-python-wheels.mjs && node scripts/build-lib.mjs && node scripts/build-bundle.mjs --minify",
+    "prepack": "node scripts/vendor-python-wheels.mjs && node scripts/build-lib.mjs",
     "vendor:wheels": "node scripts/vendor-python-wheels.mjs",
     "build:lib": "node scripts/build-lib.mjs",
     "test:addons": "node --test scripts/addon-externals.test.cjs"
@@ -672,9 +690,11 @@
       "bare": "./dist-lib/lib/audio-transcode-bare.js",
       "default": "./dist-lib/lib/audio-transcode-node.js"
     },
-    "#pyodide-worker-spawn": {
-      "bare": "./dist-lib/lib/tools/exec/adapters/python/worker/spawn-bare.js",
-      "default": "./dist-lib/lib/tools/exec/adapters/python/worker/spawn-node.js"
+    "#pyodide-worker-entry": "./dist-lib/lib/tools/exec/adapters/python/worker/entry.js",
+    "#pyodide-interrupt-deadline": "./dist-lib/lib/tools/exec/adapters/python/worker/interrupt-deadline.js",
+    "#pyodide-wheels": "./wheels/",
+    "worker_threads": {
+      "bare": "bare-worker"
     },
     "#sdk-config-loader": {
       "bare": "./dist-lib/lib/sdk-config-loader.bare.js",
@@ -716,12 +736,11 @@
     "bare-https": "^3.0.0",
     "bare-image-resample": "^1.0.2",
     "bare-media": "^2.10.0",
-    "bare-module": "6.4.0",
     "bare-net": "^2.3.2",
     "bare-os": "^3.9.1",
     "bare-path": "^3.0.1",
     "bare-process": "4.4.1",
-    "bare-sidecar": "^0.5.2",
+    "bare-sidecar": "0.5.7",
     "bare-storage": "^1.1.0",
     "bare-stow": "^0.1.4",
     "bare-stream": "^2.13.3",
@@ -730,6 +749,7 @@
     "bare-tls": "^3.1.7",
     "bare-tty": "^5.1.2",
     "bare-url": "^2.4.5",
+    "bare-worker": "^4.5.0",
     "compact-encoding": "^3.4.0",
     "hrpc": "^4.3.0",
     "hyperschema": "^1.23.0",
@@ -749,8 +769,7 @@
   },
   "devDependencies": {
     "bare-bundle": "^1.10.0",
-    "bare-module-lexer": "^1.6.3",
-    "bare-runtime": "^1.30.0",
+    "bare-runtime": "1.34.0",
     "bare-semver": "^1.1.0",
     "brittle": "^4.0.2",
     "brittle-jobs": "^0.2.1",
@@ -763,12 +782,10 @@
     "mermaid": "~11.16.1",
     "prettier": "^3.6.2",
     "prettier-config-holepunch": "^2.0.0",
-    "terser": "^5.51.2",
     "typescript": "^7.0.2"
   },
   "patchedDependencies": {
     "pyodide@314.0.2": "patches/pyodide@314.0.2.patch",
-    "bare-sidecar@0.5.4": "patches/bare-sidecar@0.5.4.patch",
     "localwatch@1.4.3": "patches/localwatch@1.4.3.patch",
     "hypercore-blob-server@1.15.0": "patches/hypercore-blob-server@1.15.0.patch",
     "bare-stow@0.1.5": "patches/bare-stow@0.1.5.patch",
@@ -785,8 +802,10 @@
   },
   "homepage": "https://github.com/tetherto/qvac-harness",
   "overrides": {
-    "bare-runtime": "^1.30.0",
-    "bare-module": "6.4.0",
+    "bare-sidecar": "0.5.7",
+    "bare-module-traverse": "~2.5.8",
+    "bare-thread": "^1.2.7",
+    "bare-runtime": "1.34.0",
     "bare-process": "4.4.1",
     "lodash": "4.18.1",
     "hyperschema": "^1.23.0",