@qvac/harness 0.3.1 → 0.3.3

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

@@ -1,5 +1,13 @@
 import Channel from 'bare-channel';
 import safetyCatch from 'safety-catch';
+export function spawnInlineThread(source, data) {
+    const Thread = Bare.Thread;
+    const thread = new Thread('inline-thread.js', {
+        data,
+        source: `const data = Bare.Thread.self.data\n${source}`
+    });
+    return () => thread.join();
+}
 export function spawnPythonWorker(entry, data) {
     const channel = new Channel();
     const thread = new Bare.Thread(entry, { data: { handle: channel.handle, ...data } });

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

@@ -11,3 +11,4 @@ export type 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

@@ -43,3 +43,11 @@ 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.js

@@ -4,6 +4,7 @@ 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 { 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';
 import { createShellAdapter } from './exec/adapters/shell/shell-adapter.js';
 import { routeObsidianCommand } from './exec/obsidian/route.js';
@@ -82,6 +83,34 @@ function checkFileArgs(args, python) {
 function truncateLabel(text) {
     return text.length > 120 ? `${text.slice(0, 120)}…` : text;
 }
+const CONNECT_ANSWER_MS = 60_000;
+function connectAsker(askUser) {
+    return async (host) => {
+        let timer;
+        const late = new Promise((resolve) => {
+            timer = setTimeout(() => resolve(null), CONNECT_ANSWER_MS);
+        });
+        try {
+            const answer = await Promise.race([
+                askUser({
+                    question: `This Python run wants to connect to ${host}, which its approved code does not name. Allow it for this run?`,
+                    options: ['Allow', 'Deny']
+                }),
+                late
+            ]);
+            return /^allow/i.test((answer ?? '').trim());
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    };
+}
+function networkPrefix(source) {
+    const hosts = namedHosts(source);
+    if (hosts.length === 0)
+        return ' · network: no host named in the code';
+    return ` · network: ${hosts.join(', ')}`;
+}
 function packageSuffix(args) {
     if (!Array.isArray(args.packages) || args.packages.length === 0)
         return '';
@@ -428,7 +457,7 @@ export function createExecTool({ spawn, killProcess, loadPyodide, disablePyodide
                 return PACKAGES_NEED_PYTHON_ERROR;
             return checkFileArgs(rawArgs, python);
         },
-        resource(rawArgs) {
+        resource(rawArgs, ctx) {
             const args = withInferredLanguage(rawArgs, disablePyodide);
             const script = typeof args.script === 'string' ? args.script : '';
             if (script.trim() && !script.includes('\n')) {
@@ -438,8 +467,10 @@ export function createExecTool({ spawn, killProcess, loadPyodide, disablePyodide
             if (!command)
                 return null;
             const workdir = typeof args.workdir === 'string' && args.workdir.trim() ? args.workdir.trim() : null;
+            const source = unwrapPythonSource(command) ?? command;
+            const online = pythonNetwork && ctx?.sandboxMode !== true;
             const body = runsThroughPyodide(args.language, disablePyodide)
-                ? `python${packageSuffix(args)}${fileSuffix(args)}: ${(unwrapPythonSource(command) ?? command).slice(0, 120)}`
+                ? `python${online ? networkPrefix(source) : ''}${packageSuffix(args)}${fileSuffix(args)}: ${source.slice(0, 120)}`
                 : command;
             return {
                 kind: 'command',
@@ -515,7 +546,9 @@ export function createExecTool({ spawn, killProcess, loadPyodide, disablePyodide
                     turnImages: ctx?.turnImages,
                     runBudget: ctx?.runBudget,
                     sandboxMode: ctx?.sandboxMode,
-                    toolNames: ctx?.toolNames
+                    toolNames: ctx?.toolNames,
+                    approval: ctx?.approval,
+                    confirmConnect: ctx?.askUser ? connectAsker(ctx.askUser) : undefined
                 });
                 return await execution.run({
                     cwd,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qvac/harness",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "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": {
@@ -220,6 +220,10 @@
       "types": "./dist-lib/lib/tools/exec/adapters/python/guarded-fetch.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/guarded-fetch.js"
     },
+    "./lib/tools/exec/adapters/python/interrupt-timer.ts": {
+      "types": "./dist-lib/lib/tools/exec/adapters/python/interrupt-timer.d.ts",
+      "default": "./dist-lib/lib/tools/exec/adapters/python/interrupt-timer.js"
+    },
     "./lib/tools/exec/adapters/python/loader.ts": {
       "types": "./dist-lib/lib/tools/exec/adapters/python/loader.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/loader.js"
@@ -232,6 +236,10 @@
       "types": "./dist-lib/lib/tools/exec/adapters/python/module-distributions.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/module-distributions.js"
     },
+    "./lib/tools/exec/adapters/python/named-hosts.ts": {
+      "types": "./dist-lib/lib/tools/exec/adapters/python/named-hosts.d.ts",
+      "default": "./dist-lib/lib/tools/exec/adapters/python/named-hosts.js"
+    },
     "./lib/tools/exec/adapters/python/net-shim.ts": {
       "types": "./dist-lib/lib/tools/exec/adapters/python/net-shim.d.ts",
       "default": "./dist-lib/lib/tools/exec/adapters/python/net-shim.js"
@@ -686,10 +694,10 @@
     }
   },
   "dependencies": {
-    "@qvac/inference": "0.19.0",
+    "@qvac/inference": "0.20.0",
     "@qvac/langdetect-text": "0.1.2",
-    "@qvac/sdk": "0.19.0",
-    "@qvac/skills": "0.1.7",
+    "@qvac/sdk": "0.20.0",
+    "@qvac/skills": "0.1.9",
     "asenion": "^0.1.0",
     "b4a": "^1.8.1",
     "bare-abort-controller": "^1.1.2",
@@ -748,7 +756,9 @@
     "corestore": "^7.11.0",
     "holepunch-types": "^0.2.1",
     "hyperdrive": "^13.3.3",
+    "jsdom": "~30.0.1",
     "lunte": "^1.8.3",
+    "mermaid": "~11.16.1",
     "prettier": "^3.6.2",
     "prettier-config-holepunch": "^2.0.0",
     "prettytap": "^0.2.0",
@@ -761,8 +771,8 @@
     "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",
-    "@qvac/inference@0.19.0": "patches/@qvac%2Finference@0.19.0.patch",
-    "brittle@4.1.0": "patches/brittle@4.1.0.patch"
+    "brittle@4.1.0": "patches/brittle@4.1.0.patch",
+    "@qvac/inference@0.20.0": "patches/@qvac%2Finference@0.20.0.patch"
   },
   "repository": {
     "type": "git",
@@ -775,7 +785,6 @@
   },
   "homepage": "https://github.com/tetherto/qvac-harness",
   "overrides": {
-    "@qvac/asr-ggml": "0.4.2",
     "bare-runtime": "^1.30.0",
     "bare-module": "6.4.0",
     "bare-process": "4.4.1",

package/dist-lib/lib/capabilities/vision-history.d.ts

@@ -1,3 +0,0 @@
-import type { Message } from './completion.ts';
-export declare function projectVisionHistory(history: ReadonlyArray<Message>): Message[];
-export declare function visionHistoryCacheKey(cacheKey: string | undefined, history: ReadonlyArray<Message>): string | undefined;

package/dist-lib/lib/capabilities/vision-history.js

@@ -1,21 +0,0 @@
-const CACHE_VERSION = 'vision-history-v1';
-export function projectVisionHistory(history) {
-    return history.flatMap((message) => {
-        const attachments = message.attachments;
-        if (message.role !== 'user' || !attachments || attachments.length < 2)
-            return [message];
-        return attachments.map((attachment, index) => ({
-            ...message,
-            content: index === attachments.length - 1 ? message.content : '\n',
-            attachments: [attachment]
-        }));
-    });
-}
-export function visionHistoryCacheKey(cacheKey, history) {
-    if (!cacheKey || !history.some(hasMultipleImages))
-        return cacheKey;
-    return `${cacheKey}-${CACHE_VERSION}`;
-}
-function hasMultipleImages(message) {
-    return message.role === 'user' && (message.attachments?.length ?? 0) > 1;
-}