@qvac/harness 0.6.0 → 0.7.1

package/dist-lib/lib/models/model-catalog.js

@@ -1,8 +1,8 @@
 import { AUDIOGEN_ACESTEP_5HZ_LM_0_6B_Q8_0, AUDIOGEN_ACESTEP_V15_SFT_Q8_0, AUDIOGEN_ACESTEP_V15_TURBO_Q4_K_M, AUDIOGEN_ACESTEP_V15_TURBO_Q8_0, AUDIOGEN_QWEN3_EMBEDDING_0_6B_Q8_0, AUDIOGEN_VAE_BF16, EMBEDDINGGEMMA_300M_Q4_0, FLUX_2_KLEIN_4B_Q4_0, FLUX_2_KLEIN_4B_VAE, HEALTHCARE_1_7B_MEDICAL_Q4_K_M, HEALTHCARE_4B_MEDICAL_Q4_K_M, MMPROJ_QWEN3_5_2B_MULTIMODAL_Q8_0, MMPROJ_QWEN3_5_4B_MULTIMODAL_Q8_0, MMPROJ_QWEN3_5_9B_MULTIMODAL_F16, MMPROJ_QWEN3_6_27B_MULTIMODAL_F16, MMPROJ_QWEN3_6_35B_A3B_MULTIMODAL_F16, MMPROJ_QWEN3_8_27B_MULTIMODAL_F16, QWEN3_5_2B_MULTIMODAL_Q4_K_M, QWEN3_5_4B_MULTIMODAL_Q4_K_M, QWEN3_5_9B_MULTIMODAL_Q4_K_M, PARAKEET_TDT_0_6B_V3_Q8_0, QWEN3_4B_Q4_K_M, QWEN3_6_27B_MULTIMODAL_Q4_K_XL, QWEN3_6_35B_A3B_MULTIMODAL_Q4_K_M, QWEN3_8_27B_MULTIMODAL_UD_Q4_K_XL, SD_V2_1_1B_Q8_0, SDXL_BASE_1_0_3B_Q4_0, TTS_MULTILINGUAL_SUPERTONIC3_Q4_0, TTS_MULTILINGUAL_SUPERTONIC3_Q8_0 } from '@qvac/sdk/models';
 import { detectToolDialect } from './tool-dialect.js';
 import { defaultTtsModelName } from './tts-model-default.js';
-import { CAPABILITY_PROFILE_ORDER, QWEN_35_2B, QWEN_35_4B, QWEN_35_9B, QWEN_36_27B, QWEN_36_35B_A3B, QWEN_38_27B, MEDPSY_1_7B, MEDPSY_4B, isCapabilityProfile, meetsMinCapabilityProfile, modelNameToCapabilityProfile, capabilityProfileToModelName, isMultimodalLlm, AGENT_MODEL_NAMES, modelDisplayName, capabilityProfileModelLabel, DEFAULT_IMAGE_MODEL_CHOICE, IMAGE_CHOICE_CATALOG } from './model-catalog-constants.js';
-export { CAPABILITY_PROFILE_ORDER, QWEN_35_2B, QWEN_35_4B, QWEN_35_9B, QWEN_36_27B, QWEN_36_35B_A3B, QWEN_38_27B, MEDPSY_1_7B, MEDPSY_4B, isCapabilityProfile, meetsMinCapabilityProfile, modelNameToCapabilityProfile, capabilityProfileToModelName, isMultimodalLlm, AGENT_MODEL_NAMES, modelDisplayName, capabilityProfileModelLabel, DEFAULT_IMAGE_MODEL_CHOICE, IMAGE_CHOICE_CATALOG };
+import { CAPABILITY_PROFILE_ORDER, QWEN_35_2B, QWEN_35_4B, QWEN_35_9B, QWEN_36_27B, QWEN_36_35B_A3B, QWEN_38_27B, MEDPSY_1_7B, MEDPSY_4B, isCapabilityProfile, meetsMinCapabilityProfile, modelNameToCapabilityProfile, capabilityProfileToModelName, isMultimodalLlm, AGENT_MODEL_NAMES, modelDisplayName, capabilityProfileModelLabel, DEFAULT_IMAGE_MODEL_CHOICE, IMAGE_CHOICE_CATALOG, isMobilePlatform, runnableModelName } from './model-catalog-constants.js';
+export { CAPABILITY_PROFILE_ORDER, QWEN_35_2B, QWEN_35_4B, QWEN_35_9B, QWEN_36_27B, QWEN_36_35B_A3B, QWEN_38_27B, MEDPSY_1_7B, MEDPSY_4B, isCapabilityProfile, meetsMinCapabilityProfile, modelNameToCapabilityProfile, capabilityProfileToModelName, isMultimodalLlm, AGENT_MODEL_NAMES, modelDisplayName, capabilityProfileModelLabel, DEFAULT_IMAGE_MODEL_CHOICE, IMAGE_CHOICE_CATALOG, isMobilePlatform, runnableModelName };
 export const LLM_CATALOG = [
     {
         name: QWEN_35_2B,
@@ -165,8 +165,8 @@ export function diffusionDownloadMetadata(model, addon) {
         assetSizes
     };
 }
-import { DEFAULT_MUSIC_MODEL_CHOICE } from './music-catalog.js';
-export { DEFAULT_MUSIC_MODEL_CHOICE };
+import { DEFAULT_MUSIC_MODEL_CHOICE, isMusicModelChoice, musicModelChoiceFrom } from './music-catalog.js';
+export { DEFAULT_MUSIC_MODEL_CHOICE, isMusicModelChoice, musicModelChoiceFrom };
 const MUSIC_GENERATION_SKILL = 'music-generation';
 export const AUDIOGEN_CATALOG = [
     {
@@ -251,18 +251,26 @@ export function skillModelsForAgent(agent) {
         const choice = agent.imageModelChoice ?? DEFAULT_IMAGE_MODEL_CHOICE;
         const entry = DIFFUSION_CATALOG.find((candidate) => candidate.choice === choice);
         if (entry) {
-            models.push({ name: entry.name, addon: entry.model.addon });
+            models.push({ name: entry.name, addon: entry.model.addon, use: 'image' });
         }
     }
     if (agentHasSkill(agent, MUSIC_GENERATION_SKILL)) {
         const choice = agent.musicModelChoice ?? DEFAULT_MUSIC_MODEL_CHOICE;
         const entry = AUDIOGEN_CATALOG.find((candidate) => candidate.choice === choice);
         if (entry) {
-            models.push({ name: entry.name, addon: entry.dit.addon });
+            models.push({ name: entry.name, addon: entry.dit.addon, use: 'music' });
         }
     }
     return models;
 }
+export function modelsForAgent(agent, host) {
+    const skills = skillModelsForAgent(agent);
+    if (!agent.modelName) {
+        return skills;
+    }
+    const name = runnableModelName(agent.modelName, host);
+    return [{ name, addon: 'llm', use: 'chat' }, ...skills];
+}
 export function diffusionSizeBytes(entry) {
     return diffusionAssets(entry).reduce((sum, asset) => sum + asset.expectedSize, 0);
 }

package/dist-lib/lib/models/model-handle.d.ts

@@ -5,13 +5,17 @@ export interface ModelResource {
 }
 export interface ModelHandleOptions {
     load(): Promise<ModelResource>;
+    onLoaded?(): void;
+    onFailed?(err: unknown): void;
 }
 export declare class ModelHandle {
     private readonly _load;
     private readonly _peek;
+    private readonly _onLoaded;
+    private readonly _onFailed;
     private _tracked;
     private _loading;
-    constructor({ load }: ModelHandleOptions);
+    constructor({ load, onLoaded, onFailed }: ModelHandleOptions);
     load(): Promise<ModelResource>;
     get loading(): boolean;
     peek(): Promise<ModelResource> | null;

package/dist-lib/lib/models/model-handle.js

@@ -2,12 +2,16 @@ import { retryMemo } from '../helpers/retry-memo.js';
 export class ModelHandle {
     _load;
     _peek;
+    _onLoaded;
+    _onFailed;
     _tracked = null;
     _loading = false;
-    constructor({ load }) {
+    constructor({ load, onLoaded, onFailed }) {
         const memo = retryMemo(load);
         this._load = memo;
         this._peek = memo.peek;
+        this._onLoaded = onLoaded;
+        this._onFailed = onFailed;
         this.load().catch(noop);
     }
     load() {
@@ -15,12 +19,13 @@ export class ModelHandle {
         if (attempt !== this._tracked) {
             this._tracked = attempt;
             this._loading = true;
-            const settled = () => {
+            const settle = (report) => {
                 if (this._tracked === attempt) {
                     this._loading = false;
+                    report();
                 }
             };
-            attempt.then(settled, settled);
+            attempt.then(() => settle(() => this._onLoaded?.()), (err) => settle(() => this._onFailed?.(err)));
         }
         return attempt;
     }

package/dist-lib/lib/models/model-list.d.ts

@@ -1,5 +1,6 @@
 import type * as QvacSdk from '@qvac/sdk';
 import type { ModelAddon, ModelRegistrySdk } from './model-source.ts';
+import { type ModelTaskType } from './model-task.ts';
 export type ModelType = ModelAddon;
 export interface StaticCatalogEntry {
     readonly name: string;
@@ -15,11 +16,14 @@ export interface ModelInfo {
     registrySource: string;
     isCached: boolean;
     isLoaded: boolean;
+    isLoading: boolean;
     supportsImages: boolean;
     expectedSize: number;
     actualSize?: number;
     label?: string;
+    taskType: ModelTaskType;
 }
+export type CatalogRow = Omit<ModelInfo, 'isLoading'>;
 export interface ListModelsOptions {
     type?: ModelType;
     cachedOnly?: boolean;
@@ -43,11 +47,11 @@ export interface ListModelsRuntime {
     cache?: ModelStatusCache | undefined;
     projectionFor?: ((name: string) => string | undefined) | undefined;
 }
-export declare function listModels(sdk: ModelListSdk, { type, cachedOnly, fullRegistry }?: ListModelsOptions, { cache, projectionFor }?: ListModelsRuntime): Promise<ModelInfo[]>;
+export declare function listModels(sdk: ModelListSdk, { type, cachedOnly, fullRegistry }?: ListModelsOptions, { cache, projectionFor }?: ListModelsRuntime): Promise<CatalogRow[]>;
 export interface CustomModelRowsContext {
     readonly modelsDir?: string;
     readonly loaded: ReadonlySet<string>;
 }
-export declare function customModelRows({ type, cachedOnly }: ListModelsOptions, { modelsDir, loaded }: CustomModelRowsContext): Promise<ModelInfo[]>;
-export declare function mergeCustomRows(catalog: ReadonlyArray<ModelInfo>, custom: ReadonlyArray<ModelInfo>): ModelInfo[];
+export declare function customModelRows({ type, cachedOnly }: ListModelsOptions, { modelsDir, loaded }: CustomModelRowsContext): Promise<CatalogRow[]>;
+export declare function mergeCustomRows(catalog: ReadonlyArray<CatalogRow>, custom: ReadonlyArray<CatalogRow>): CatalogRow[];
 export {};

package/dist-lib/lib/models/model-list.js

@@ -1,3 +1,4 @@
+import { addonTaskType } from './model-task.js';
 import { isCustomModelCached } from './custom-model-cache.js';
 import { companionRegistryPaths, curatedListables, customModels, musicListables } from './model-catalog.js';
 export const MODEL_STATUS_TTL_MS = 30_000;
@@ -42,7 +43,8 @@ async function musicRows(hydrate) {
             isCached: status.isCached && companionsCached,
             isLoaded: status.isLoaded,
             supportsImages: false,
-            expectedSize: listable.expectedSize
+            expectedSize: listable.expectedSize,
+            taskType: addonTaskType('audiogen')
         });
     }
     return rows;
@@ -93,7 +95,8 @@ export async function listModels(sdk, { type, cachedOnly, fullRegistry } = {}, {
                 isLoaded: status.isLoaded,
                 supportsImages: seesImages(listable.name, listable.asset.addon),
                 expectedSize: status.expectedSize ?? listable.asset.expectedSize,
-                actualSize: status.actualSize
+                actualSize: status.actualSize,
+                taskType: addonTaskType(listable.asset.addon)
             };
         });
         const music = !type || type === 'audiogen' ? await musicRows(hydrate) : [];
@@ -121,7 +124,8 @@ export async function listModels(sdk, { type, cachedOnly, fullRegistry } = {}, {
             isLoaded: status.isLoaded,
             supportsImages: seesImages(entry.name, entry.addon),
             expectedSize: status.expectedSize ?? entry.expectedSize,
-            actualSize: status.actualSize
+            actualSize: status.actualSize,
+            taskType: addonTaskType(entry.addon)
         };
     });
     return cachedOnly ? rows.filter((row) => row.isCached) : rows;
@@ -139,7 +143,8 @@ export async function customModelRows({ type, cachedOnly }, { modelsDir, loaded
             isLoaded: loaded.has(entry.name),
             supportsImages: addon === 'llm' && Boolean(entry.projectionSrc),
             expectedSize: entry.expectedSize ?? 0,
-            label: entry.label
+            label: entry.label,
+            taskType: addonTaskType(addon)
         };
     }));
     return cachedOnly ? rows.filter((row) => row.isCached) : rows;

package/dist-lib/lib/models/model-pool.d.ts

@@ -5,8 +5,9 @@ import { type ModelAddon } from './model-source.ts';
 import type { GpuFaultState } from './sdk-faults.ts';
 type SdkModule = typeof import('@qvac/sdk');
 export interface ModelState {
-    status: 'loading' | 'downloading' | 'downloaded' | 'ready' | 'unloading' | 'unloaded';
+    status: 'loading' | 'downloading' | 'downloaded' | 'ready' | 'error' | 'unloading' | 'unloaded';
     model: string;
+    catalogChanged?: boolean;
     [key: string]: unknown;
 }
 export type NotifyFn = (state: ModelState) => void;
@@ -78,6 +79,8 @@ type PoolLike = ModelPuddle;
 export declare function modelOf(key: string): string;
 export declare function releaseModel(pool: PoolLike, key: string): void;
 export declare function loadedModels(pool: PoolLike): LoadedModel[];
+export declare function settledModels(pool: PoolLike): string[];
+export declare function loadingModels(pool: PoolLike): string[];
 export interface ResidentLease {
     model: string;
     modelId: string;

package/dist-lib/lib/models/model-pool.js

@@ -10,6 +10,7 @@ import { hlog } from '../log.js';
 import { RUNAWAY_STOP_SEQUENCES } from '../helpers/control-tokens.js';
 import { raceTimeout } from '../helpers/race-timeout.js';
 import { resolveModelSrc } from './model-source.js';
+import { errorMessage } from '../guards.js';
 export function createLoadTracker() {
     const inflight = new Set();
     let draining = null;
@@ -101,6 +102,34 @@ export function loadedModels(pool) {
     }
     return out;
 }
+export function settledModels(pool) {
+    const out = [];
+    for (const entry of pool.resources.values()) {
+        if (entry.value.peek() !== null && !entry.value.loading) {
+            out.push(modelOf(entry.id));
+        }
+    }
+    return out;
+}
+export function loadingModels(pool) {
+    const out = [];
+    for (const entry of pool.resources.values()) {
+        if (entry.value.loading) {
+            out.push(modelOf(entry.id));
+        }
+    }
+    return out;
+}
+function reportedHandle(notify, model, load) {
+    return new ModelHandle({
+        load: () => {
+            notify({ status: 'loading', model, catalogChanged: true });
+            return load();
+        },
+        onLoaded: () => notify({ status: 'ready', model, catalogChanged: true }),
+        onFailed: (err) => notify({ status: 'error', model, message: errorMessage(err), catalogChanged: true })
+    });
+}
 export async function leaseResidentModel(pool, wanted = () => true) {
     for (const entry of pool.resources.values()) {
         const key = entry.id;
@@ -292,7 +321,6 @@ export function loadClockGuard(model, sdk, { now = () => Date.now(), monoMs = mo
 export function createModelPool(loadSdk, notify, { deviceConfig = {}, loads = createLoadTracker() } = {}) {
     const load = async (model, opts) => {
         const sdk = await loadSdk();
-        notify({ status: 'loading', model });
         const modelSrc = await resolveModelSrc(sdk, model);
         const resolved = resolveLoadOptions(opts, deviceConfig);
         const ctxSize = resolved.ctxSize || defaultContextSize(modelSrc, customContextLength(model));
@@ -332,11 +360,10 @@ export function createModelPool(loadSdk, notify, { deviceConfig = {}, loads = cr
             onProgress: (progress) => notify(progressState(model, progress))
         })));
         hlog('llm loaded', { model, loadMs: Date.now() - loadStarted });
-        notify({ status: 'ready', model });
         return { model, modelId, ctxSize };
     };
     return new ModelPuddle({
-        open: (key, model = key, opts = {}) => new ModelHandle({ load: () => load(model, opts) }),
+        open: (key, model = key, opts = {}) => reportedHandle(notify, model, () => load(model, opts)),
         gc: unloadOnGc(loadSdk, notify),
         ...NO_IDLE_GC
     });
@@ -344,7 +371,6 @@ export function createModelPool(loadSdk, notify, { deviceConfig = {}, loads = cr
 export function createEmbedPool(loadSdk, notify, { faults, batchSize = DEFAULT_EMBED_BATCH_SIZE, openclCacheDir, loads = createLoadTracker() }) {
     const load = async (model) => {
         const sdk = await loadSdk();
-        notify({ status: 'loading', model });
         const modelSrc = await resolveModelSrc(sdk, model, 'embeddings');
         const openclCache = faults.device !== 'cpu' && openclCacheDir ? openclCacheDir() : undefined;
         const modelId = await loadClockGuard(model, sdk).race(loads.track(sdk.loadModel({
@@ -358,11 +384,10 @@ export function createEmbedPool(loadSdk, notify, { faults, batchSize = DEFAULT_E
             },
             onProgress: (progress) => notify(progressState(model, progress))
         })));
-        notify({ status: 'ready', model });
         return { model, modelId };
     };
     return new ModelPuddle({
-        open: (key, model = key) => new ModelHandle({ load: () => load(model) }),
+        open: (key, model = key) => reportedHandle(notify, model, () => load(model)),
         gc: unloadOnGc(loadSdk, notify),
         ...NO_IDLE_GC
     });
@@ -372,7 +397,6 @@ export function createVoicePool(loadSdk, notify, { modelType, addon, modelConfig
     let gpuRefused = false;
     const load = async (model) => {
         const sdk = await loadSdk();
-        notify({ status: 'loading', model });
         const modelSrc = await resolveModelSrc(sdk, model, addon);
         const attempt = () => {
             const config = gpuRefused ? { ...modelConfig, useGPU: false } : modelConfig;
@@ -391,11 +415,10 @@ export function createVoicePool(loadSdk, notify, { modelType, addon, modelConfig
             gpuRefused = true;
             return attempt();
         }));
-        notify({ status: 'ready', model });
         return { model, modelId };
     };
     return new ModelPuddle({
-        open: (key, model = key) => new ModelHandle({ load: () => load(model) }),
+        open: (key, model = key) => reportedHandle(notify, model, () => load(model)),
         gc: unloadOnGc(loadSdk, notify),
         ...NO_IDLE_GC
     });
@@ -423,7 +446,7 @@ function unloadOnGc(loadSdk, notify) {
             catch {
                 continue;
             }
-            notify({ status: 'unloaded', model });
+            notify({ status: 'unloaded', model, catalogChanged: true });
         }
     };
 }

package/dist-lib/lib/models/model-task.d.ts

@@ -0,0 +1,3 @@
+import type { ModelAddon } from './model-source.ts';
+export type ModelTaskType = 'llm' | 'embeddings' | 'speech-to-text' | 'text-to-speech' | 'image-generation' | 'audio-generation' | 'translation' | 'text-recognition' | 'other';
+export declare function addonTaskType(addon: ModelAddon): ModelTaskType;

package/dist-lib/lib/models/model-task.js

@@ -0,0 +1,14 @@
+const ADDON_TASK_TYPES = {
+    llm: 'llm',
+    embeddings: 'embeddings',
+    whisper: 'speech-to-text',
+    parakeet: 'speech-to-text',
+    tts: 'text-to-speech',
+    diffusion: 'image-generation',
+    audiogen: 'audio-generation',
+    nmt: 'translation',
+    ocr: 'text-recognition'
+};
+export function addonTaskType(addon) {
+    return ADDON_TASK_TYPES[addon] ?? 'other';
+}

package/dist-lib/lib/models/music-catalog.d.ts

@@ -10,3 +10,5 @@ export interface MusicChoiceEntry {
     readonly notes: string;
 }
 export declare const MUSIC_CHOICE_CATALOG: ReadonlyArray<MusicChoiceEntry>;
+export declare function musicModelChoiceFrom(settings: unknown): MusicModelChoice | undefined;
+export declare function isMusicModelChoice(value: unknown): value is MusicModelChoice;

package/dist-lib/lib/models/music-catalog.js

@@ -24,3 +24,12 @@ export const MUSIC_CHOICE_CATALOG = [
         notes: 'Fine-tuned quality. Wants a desktop GPU.'
     }
 ];
+export function musicModelChoiceFrom(settings) {
+    if (!settings || typeof settings !== 'object' || !('modelChoice' in settings)) {
+        return undefined;
+    }
+    return isMusicModelChoice(settings.modelChoice) ? settings.modelChoice : undefined;
+}
+export function isMusicModelChoice(value) {
+    return MUSIC_MODEL_CHOICES.some((choice) => choice === value);
+}

package/dist-lib/lib/office/index.d.ts

@@ -1,5 +1,5 @@
 import type { AbortSignal } from 'bare-abort-controller';
-export { closePythonWorker as closeOfficeWorker } from '../tools/exec/adapters/python/worker/client.ts';
+export { closePythonWorker as closeOfficeWorker } from '../tools/exec/adapters/python/worker/active.ts';
 export interface OfficeExtractOptions {
     readonly signal?: AbortSignal | undefined;
     readonly mimeType?: string | undefined;

package/dist-lib/lib/office/index.js

@@ -3,7 +3,7 @@ import { extractDocxText } from '../docx/index.js';
 import { extractWithPython } from './python.js';
 import { XLSX_EXTRACT } from './xlsx.js';
 import { PPTX_EXTRACT } from './pptx.js';
-export { closePythonWorker as closeOfficeWorker } from '../tools/exec/adapters/python/worker/client.js';
+export { closePythonWorker as closeOfficeWorker } from '../tools/exec/adapters/python/worker/active.js';
 const OFFICE_MIME_EXTENSIONS = {
     'application/vnd.openxmlformats-officedocument.wordprocessingml.document': '.docx',
     'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': '.xlsx',

package/dist-lib/lib/office/python.js

@@ -10,8 +10,7 @@ export async function extractWithPython(bytes, fileName, { format, packages, sou
     const dir = wheelsDir();
     const manifest = vendoredManifest(dir);
     const install = planVendoredInstall(packages, { dir, manifest });
-    if (!dir ||
-        !manifest ||
+    if (!manifest ||
         !install ||
         !['micropip', ...install.packages].every((name) => Object.keys(manifest.files).some((file) => file.replaceAll('_', '-').startsWith(`${name}-`) && fs.existsSync(`${dir}/${file}`)))) {
         throw new Error(`bundled ${format} extraction packages are unavailable`);

package/dist-lib/lib/serve.js

@@ -270,7 +270,7 @@ function modelEvents(harness) {
             catalogChanged,
             ...loaded.map((entry) => `${entry.model}:${entry.refs}`)
         ].join('\0');
-        if (key === last) {
+        if (key === last && !catalogChanged) {
             return;
         }
         last = key;

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

@@ -0,0 +1,10 @@
+export interface DeadlineData {
+    readonly state: SharedArrayBuffer;
+    readonly interrupt: SharedArrayBuffer;
+    readonly ms: number;
+}
+export declare const ARMED = 0;
+export declare const DISARMED = 1;
+export declare const FIRED = 2;
+export declare const SIGINT = 2;
+export declare const RESEND_MS = 100;

package/dist-lib/lib/tools/exec/adapters/python/deadline-state.js

@@ -0,0 +1,5 @@
+export const ARMED = 0;
+export const DISARMED = 1;
+export const FIRED = 2;
+export const SIGINT = 2;
+export const RESEND_MS = 100;

package/dist-lib/lib/tools/exec/adapters/python/interrupt-timer.js

@@ -1,28 +1,21 @@
-import { spawnInlineThread } from '#pyodide-worker-spawn';
-const ARMED = 0;
-const DISARMED = 1;
-const FIRED = 2;
-const SIGINT = 2;
-const RESEND_MS = 100;
-const SOURCE = `
-const state = new Int32Array(data.state)
-const interrupt = new Uint8Array(data.interrupt)
-Atomics.wait(state, 0, ${ARMED}, data.ms)
-if (Atomics.compareExchange(state, 0, ${ARMED}, ${FIRED}) === ${ARMED}) {
-  do Atomics.store(interrupt, 0, ${SIGINT})
-  while (Atomics.wait(state, 0, ${FIRED}, ${RESEND_MS}) === 'timed-out')
-}
-`;
+import { fileURLToPath } from 'url';
+import { Worker } from 'worker_threads';
+import { errorMessage } from '../../../../guards.js';
+import { hlog } from '../../../../log.js';
+import { DISARMED, FIRED } from './deadline-state.js';
 export function startInterruptTimer(ms) {
     const state = new Int32Array(new SharedArrayBuffer(4));
     const interrupt = new Uint8Array(new SharedArrayBuffer(1));
-    const reap = spawnInlineThread(SOURCE, { state: state.buffer, interrupt: interrupt.buffer, ms });
+    const workerData = { state: state.buffer, interrupt: interrupt.buffer, ms };
+    const entry = fileURLToPath(import.meta.resolve('#pyodide-interrupt-deadline'));
+    new Worker(entry, { workerData })
+        .on('error', (error) => hlog('python: interrupt deadline failed', { err: errorMessage(error) }))
+        .unref();
     return {
         interrupt,
         disarm() {
             const fired = Atomics.exchange(state, 0, DISARMED) === FIRED;
             Atomics.notify(state, 0);
-            reap();
             return fired;
         }
     };

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

@@ -1,14 +1,8 @@
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-};
 import b4a from 'b4a';
 import { constants as fsConstants } from 'fs';
+import path from 'path';
 import process from 'process';
+import { fileURLToPath } from 'url';
 import { createGuardedFetch } from './guarded-fetch.js';
 import { seedPackageCache } from './wheels.js';
 class B4aTextDecoder {
@@ -95,15 +89,25 @@ export function pyodideLoadOptions() {
     }
     return { ...silentStdio, packageCacheDir: cacheDir };
 }
+function pyodideIndexURL() {
+    import.meta.asset('pyodide/python_stdlib.zip');
+    import.meta.asset('pyodide/pyodide-lock.json');
+    return path.dirname(fileURLToPath(import.meta.asset('pyodide/pyodide.asm.wasm'))) + '/';
+}
 export const defaultLoad = async () => {
     if (typeof globalThis.Bare !== 'undefined') {
         await shapeBareGlobals();
     }
-    const moduleName = 'pyodide';
-    const { loadPyodide } = await import(__rewriteRelativeImportExtension(moduleName));
+    const { loadPyodide } = await import('pyodide');
+    const { default: createPyodideModule } = await import('pyodide/pyodide.asm.mjs');
     const options = pyodideLoadOptions();
     if (options.packageCacheDir) {
         seedPackageCache(options.packageCacheDir);
     }
-    return (await loadPyodide(options));
+    const indexURL = pyodideIndexURL();
+    return (await loadPyodide({
+        ...options,
+        indexURL,
+        createPyodideModule
+    }));
 };

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

@@ -1,12 +1,11 @@
 import { AbortController } from 'bare-abort-controller';
-import process from 'process';
 import ScopeLock from 'scope-lock';
 import { errorMessage } from '../../../../guards.js';
 import { AbortedError, raceAbort } from '../../../../helpers/race-abort.js';
 import { hlog } from '../../../../log.js';
 import { MAX_OUTPUT_CHARS } from '../../runner.js';
 import { startInterruptTimer } from './interrupt-timer.js';
-import { defaultLoad, pyodideLoadOptions } from './loader.js';
+import { pyodideLoadOptions } from './loader.js';
 import { isPyodideFatal, performRun } from './run-session.js';
 import { runPythonInWorker } from './worker/client.js';
 export { pyodideLoadOptions };
@@ -98,11 +97,6 @@ async function runInProcess(load, spec, options) {
         stop.abort(undefined);
     }
 }
-function workerAvailable() {
-    if (process.env.QVAC_PYODIDE_WORKER_ENTRY)
-        return true;
-    return !import.meta.url.includes('.bundle/');
-}
 export async function runPython(code, options = {}) {
     if (options.signal?.aborted)
         throw new AbortedError();
@@ -126,14 +120,6 @@ export async function runPython(code, options = {}) {
             askConnect: options.askConnect
         });
     }
-    if (!workerAvailable()) {
-        hlog('python: worker entry unavailable in this bundle; running in-process');
-        return runInProcess(defaultLoad, spec, {
-            timeoutMs,
-            signal: options.signal,
-            askConnect: options.askConnect
-        });
-    }
     await runLock.lock();
     try {
         if (options.signal?.aborted) {

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

@@ -12,6 +12,7 @@ export declare function pinned(spec: string): string;
 export declare function pipMessage(targets: readonly string[] | null, { sandbox }?: {
     sandbox?: boolean | undefined;
 }): string;
+export declare function sandboxInstallError(command: string, declared: readonly string[] | undefined): string | null;
 export interface PipFromSourceHintOptions {
     readonly packages?: readonly string[] | undefined;
     readonly sandbox?: boolean;

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

@@ -242,6 +242,16 @@ export function pipMessage(targets, { sandbox = false } = {}) {
     const declare = specs ? `packages: ${JSON.stringify(specs)}` : 'the PyPI names in packages';
     return `pip is not available. Call exec with language "python", ${declare} and the Python source in command. Installing and running are the same one call.`;
 }
+export function sandboxInstallError(command, declared) {
+    const install = pipInstallTargets(command)?.map(pinned) ?? null;
+    const packages = [...new Set([...(declared ?? []), ...(install ?? [])])];
+    if (packages.length === 0 || planVendoredInstall(packages)) {
+        return null;
+    }
+    return install
+        ? pipMessage(install, { sandbox: true })
+        : 'sandbox mode: installing packages reaches the network';
+}
 const PIP_CALL = /\b(?:subprocess\.\w+|os\.(?:system|popen)|Popen|check_(?:output|call))\s*\(/;
 const STRING_LITERAL = /"([^"\n]*)"|'([^'\n]*)'/g;
 function pipLineTargets(line) {
@@ -1279,8 +1289,9 @@ export function createPythonAdapter(disabled, loadPyodide, network = false) {
                     const packages = install
                         ? [...new Set([...(prepared.packages ?? []), ...install])]
                         : prepared.packages;
-                    if (sandbox && install && !planVendoredInstall(packages ?? [])) {
-                        return fail(pipMessage(install, { sandbox: true }));
+                    const refusal = sandbox ? sandboxInstallError(command, prepared.packages) : null;
+                    if (refusal) {
+                        return fail(refusal);
                     }
                     const result = await runPython(install ? 'pass' : source, {
                         timeoutMs: options.timeoutMs,

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

@@ -28,8 +28,8 @@ interface WheelFs {
         exists: boolean;
     };
 }
-export declare function wheelsDir(): string | undefined;
-export declare function vendoredManifest(dir?: string | undefined): WheelManifest | null;
+export declare function wheelsDir(): string;
+export declare function vendoredManifest(dir?: string): WheelManifest | null;
 export declare function normalizeDistribution(name: string): string;
 export interface VendoredOptions {
     readonly dir?: string | undefined;
@@ -38,5 +38,5 @@ export interface VendoredOptions {
 export declare function vendoredSpec(distribution: string, opts?: VendoredOptions): string | null;
 export declare function planVendoredInstall(specs: readonly string[], opts?: VendoredOptions): VendoredInstall | null;
 export declare function stageVendoredWheels(target: WheelFs, install: VendoredInstall): string[];
-export declare function seedPackageCache(cacheDir: string, dir?: string | undefined): void;
+export declare function seedPackageCache(cacheDir: string, dir?: string): void;
 export {};

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

@@ -16,20 +16,9 @@ const ManifestSchema = z.object({
 });
 const STAGE_DIR = '/qvac-wheels';
 export function wheelsDir() {
-    const fromHost = process.env.QVAC_PYTHON_WHEELS_DIR;
-    if (fromHost) {
-        return fromHost;
-    }
-    const root = new URL('../../../../../', import.meta.url);
-    const source = new URL(root.pathname.endsWith('/dist-lib/') ? '../wheels' : 'wheels', root);
-    if (source.href.includes('.bundle/')) {
-        return undefined;
-    }
-    return fileURLToPath(source.href);
+    return process.env.QVAC_PYTHON_WHEELS_DIR || fileURLToPath(import.meta.asset('#pyodide-wheels'));
 }
 export function vendoredManifest(dir = wheelsDir()) {
-    if (!dir)
-        return null;
     const file = `${dir}/manifest.json`;
     if (!fs.existsSync(file)) {
         hlog('python: no vendored wheels', { dir });
@@ -70,7 +59,7 @@ export function vendoredSpec(distribution, opts = {}) {
 export function planVendoredInstall(specs, opts = {}) {
     const dir = opts.dir ?? wheelsDir();
     const manifest = opts.manifest === undefined ? vendoredManifest(dir) : opts.manifest;
-    if (!manifest || !dir || specs.length === 0) {
+    if (!manifest || specs.length === 0) {
         return null;
     }
     const wheels = new Set();
@@ -108,7 +97,7 @@ export function stageVendoredWheels(target, install) {
 }
 export function seedPackageCache(cacheDir, dir = wheelsDir()) {
     const manifest = vendoredManifest(dir);
-    if (!manifest || !dir) {
+    if (!manifest) {
         return;
     }
     fs.mkdirSync(cacheDir, { recursive: true });