@qvac/harness 0.4.0 → 0.5.0

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

@@ -1,6 +1,7 @@
 import type { AbortSignal } from 'bare-abort-controller';
 export { closePythonWorker as closeOfficeWorker } from '../tools/exec/adapters/python/worker/client.ts';
-export declare function extractOfficeText(bytes: Uint8Array, fileName: string, options?: {
+export interface OfficeExtractOptions {
     readonly signal?: AbortSignal | undefined;
     readonly mimeType?: string | undefined;
-}): Promise<string>;
+}
+export declare function extractOfficeText(bytes: Uint8Array, fileName: string, options?: OfficeExtractOptions): Promise<string>;

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

@@ -1,7 +1,8 @@
 import type { AbortSignal } from 'bare-abort-controller';
-export declare function extractWithPython(bytes: Uint8Array, fileName: string, { format, packages, source, signal }: {
+export interface PythonExtractOptions {
     readonly format: string;
     readonly packages: readonly string[];
     readonly source: string;
     readonly signal?: AbortSignal | undefined;
-}): Promise<string>;
+}
+export declare function extractWithPython(bytes: Uint8Array, fileName: string, { format, packages, source, signal }: PythonExtractOptions): Promise<string>;

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

@@ -22,8 +22,9 @@ export async function extractWithPython(bytes, fileName, { format, packages, sou
         outputs: ['extracted.txt'],
         signal
     });
-    if (result.exitCode !== 0)
+    if (result.exitCode !== 0) {
         throw new Error(`${fileName}: ${result.stderr.trim()}`);
+    }
     const output = result.files?.get('extracted.txt');
     if (!output) {
         throw new Error(result.rejected?.[0]?.reason ?? `${format} extraction produced no text file`);

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

@@ -16,7 +16,8 @@ export interface SystemPromptParts {
 }
 export declare function systemPromptParts({ bio, toolNames, skillsSection }: SystemPromptInput): SystemPromptParts;
 export declare function buildSystemPrompt(input: SystemPromptInput): string;
-export declare function skillsPromptSection(activeSkills: ReadonlyArray<{
-    name: string;
-    description: string;
-}>): string | null;
+export interface PromptSkill {
+    readonly name: string;
+    readonly description: string;
+}
+export declare function skillsPromptSection(activeSkills: ReadonlyArray<PromptSkill>): string | null;

package/dist-lib/lib/prompt.js

@@ -34,8 +34,9 @@ export function annotateLastUserTime(turns, now) {
     const result = [...turns];
     for (let i = result.length - 1; i >= 0; i--) {
         const turn = result[i];
-        if (!turn || turn.role !== 'user')
+        if (!turn || turn.role !== 'user') {
             continue;
+        }
         result[i] = { ...turn, content: `${currentTimeAnnotation(now)}\n\n${turn.content}` };
         break;
     }
@@ -43,12 +44,15 @@ export function annotateLastUserTime(turns, now) {
 }
 function buildGuidelines(active) {
     const lines = [...BASE_GUIDELINES];
-    if (active.size > 0)
+    if (active.size > 0) {
         lines.push(...TOOL_GUIDELINES);
-    if (active.has('exec'))
+    }
+    if (active.has('exec')) {
         lines.push(EXEC_FILE_GUIDELINE, EXEC_ATTACHED_IMAGE_GUIDELINE);
-    if (active.has('skill'))
+    }
+    if (active.has('skill')) {
         lines.push(...SKILL_GUIDELINES);
+    }
     if (active.has('web_search') || active.has('web_fetch')) {
         lines.push(CITATION_GUIDELINE);
     }

package/dist-lib/lib/queue.js

@@ -16,12 +16,14 @@ export function pushQueue({ highWaterMark = 0 } = {}) {
             return items.length;
         },
         push(item) {
-            if (ended)
+            if (ended) {
                 return Promise.resolve();
+            }
             items.push(item);
             wakeConsumer();
-            if (highWaterMark <= 0 || items.length < highWaterMark)
+            if (highWaterMark <= 0 || items.length < highWaterMark) {
                 return Promise.resolve();
+            }
             drain ??= Promise.withResolvers();
             return drain.promise;
         },
@@ -33,13 +35,16 @@ export function pushQueue({ highWaterMark = 0 } = {}) {
         async *[Symbol.asyncIterator]() {
             while (true) {
                 while (items.length) {
-                    const item = items.shift();
-                    if (highWaterMark > 0 && items.length < highWaterMark)
+                    const item = items[0];
+                    items.shift();
+                    if (highWaterMark > 0 && items.length < highWaterMark) {
                         wakeProducer();
+                    }
                     yield item;
                 }
-                if (ended)
+                if (ended) {
                     return;
+                }
                 wake = Promise.withResolvers();
                 await wake.promise;
             }

package/dist-lib/lib/resolution-detector.js

@@ -1,3 +1,4 @@
+import { errorMessage, isRecord } from './guards.js';
 import { hlog } from './log.js';
 function readValue(value, key) {
     if (value === null)
@@ -12,29 +13,34 @@ function readString(value, key) {
 }
 function readCandidates(err) {
     const found = readValue(err, 'candidates');
-    if (!Array.isArray(found))
+    if (!Array.isArray(found)) {
         return undefined;
+    }
     return found.map((candidate) => readString(candidate, 'href') ?? String(candidate));
 }
 export function resolutionDetail(err) {
     const detail = {};
     const code = readString(err, 'code');
-    if (code !== null)
+    if (code !== null) {
         detail.code = code;
+    }
     const specifier = readString(err, 'specifier');
-    if (specifier !== null)
+    if (specifier !== null) {
         detail.specifier = specifier;
+    }
     const referrer = readString(readValue(err, 'referrer'), 'href');
-    if (referrer !== null)
+    if (referrer !== null) {
         detail.referrer = referrer;
+    }
     const candidates = readCandidates(err);
-    if (candidates !== undefined)
+    if (candidates !== undefined) {
         detail.candidates = candidates;
+    }
     return detail;
 }
 function readCache(meta) {
     const cache = readValue(meta, 'cache');
-    return typeof cache === 'object' && cache !== null ? cache : null;
+    return isRecord(cache) ? cache : null;
 }
 export function isReferrerLost(referrer, parent, cache) {
     if (referrer !== null && referrer !== undefined)
@@ -48,23 +54,27 @@ export function resolutionFailure(specifier, parent, err) {
         specifier,
         parent,
         ...resolutionDetail(err),
-        err: err instanceof Error ? err.message : String(err)
+        err: errorMessage(err)
     };
 }
 let uninstall = null;
 export function installResolutionDetector(meta) {
     const cacheRecord = readCache(meta);
-    if (cacheRecord === null)
+    if (cacheRecord === null) {
         return noop;
-    if (uninstall !== null)
+    }
+    if (uninstall !== null) {
         return noop;
+    }
     const self = Reflect.get(cacheRecord, meta.url);
     const Module = readValue(self, 'constructor');
-    if (typeof Module !== 'function')
+    if (typeof Module !== 'function') {
         return noop;
+    }
     const resolve = readValue(Module, 'resolve');
-    if (typeof resolve !== 'function')
+    if (typeof resolve !== 'function') {
         return noop;
+    }
     const startedAt = Date.now();
     const original = resolve.bind(Module);
     const wrapped = (specifier, parentURL, opts = {}) => {

package/dist-lib/lib/rpc-session.js

@@ -14,7 +14,8 @@ export function settleOnClose(hrpc) {
     };
     session._stream.on('error', (err) => dead(err));
     session._stream.on('close', () => dead(null));
-    if (session._stream.destroyed)
+    if (session._stream.destroyed) {
         dead(null);
+    }
     return hrpc;
 }

package/dist-lib/lib/sdk-loader.js

@@ -1,3 +1,4 @@
+import { errorMessage } from './guards.js';
 import { retryMemo } from './helpers/retry-memo.js';
 import { hlog } from './log.js';
 const defaultImports = {
@@ -15,7 +16,7 @@ function register(registry, name, plugin) {
     catch (err) {
         hlog('plugin registration skipped', {
             plugin: name,
-            err: err instanceof Error ? err.message : String(err)
+            err: errorMessage(err)
         });
     }
 }

package/dist-lib/lib/sdk-storage.js

@@ -14,10 +14,12 @@ export function configureSdkStorage(storage, channels = {}) {
     writeFileSync(configPath, `${JSON.stringify({ cacheDirectory: storage.models }, null, 2)}\n`);
     const openclCacheDir = join(storage.home, 'opencl-cache');
     mkdirSync(openclCacheDir, { recursive: true });
-    if (argv)
+    if (argv) {
         argv[0] = storage.home;
-    else
+    }
+    else {
         env[SDK_HOME_ENV] = storage.home;
+    }
     env[SDK_CONFIG_PATH_ENV] = configPath;
     env[OPENCL_CACHE_DIR_ENV] = openclCacheDir;
     return configPath;

package/dist-lib/lib/serve.js

@@ -1,4 +1,5 @@
 import { AbortController } from 'bare-abort-controller';
+import b4a from 'b4a';
 import fs from 'fs';
 import { settleOnClose } from './rpc-session.js';
 import { pipeline, Readable } from 'streamx';
@@ -7,7 +8,7 @@ import HRPC from '../spec/hrpc/index.js';
 import { isCapability } from './capabilities/invoke.js';
 import { CUSTOM_TASK_TYPES } from './models/model-catalog.js';
 import { unsupportedKvCacheDeletion } from './capabilities/kv-cache.js';
-import { errorMessage } from './error-fields.js';
+import { errorMessage } from './guards.js';
 import { hlog } from './log.js';
 import { pushQueue } from './queue.js';
 import { TextCoalescer } from './helpers/text-coalescer.js';
@@ -45,6 +46,10 @@ export function serveHarness(stream, harness) {
             await harness.setSkillSettings?.(entries ?? []);
             return { ok: true };
         },
+        setModelIdleTimeout: async ({ ms }) => {
+            await harness.setModelIdleTimeout?.(ms);
+            return { ok: true };
+        },
         listManagedSkills: async () => ({
             skills: (await harness.listManagedSkills?.()) ?? []
         }),
@@ -55,8 +60,9 @@ export function serveHarness(stream, harness) {
                 : { found: false, content: '', origin: '' };
         },
         writeSkillFile: async ({ name, content }) => {
-            if (!harness.writeSkillFile)
+            if (!harness.writeSkillFile) {
                 return { ok: false };
+            }
             return harness.writeSkillFile(name, content);
         },
         copySkillForEdit: async ({ name }) => ({
@@ -66,17 +72,21 @@ export function serveHarness(stream, harness) {
             removed: (await harness.deleteOverlaySkill?.(name))?.removed ?? false
         }),
         setCustomModels: async ({ models }) => {
-            await harness.setCustomModels?.((models ?? []).flatMap(({ name, src, projectionSrc, taskType, expectedSize }) => {
+            await harness.setCustomModels?.((models ?? []).flatMap((model) => {
+                const { name, src, projectionSrc, taskType, expectedSize, label, contextLength } = model;
                 const known = CUSTOM_TASK_TYPES.find((task) => task === taskType);
-                if (taskType && !known)
+                if (taskType && !known) {
                     return [];
+                }
                 return [
                     {
                         name,
                         src,
                         projectionSrc: projectionSrc ?? undefined,
                         taskType: known,
-                        expectedSize: expectedSize || undefined
+                        expectedSize: expectedSize || undefined,
+                        label: label || undefined,
+                        contextLength: contextLength || undefined
                     }
                 ];
             }));
@@ -107,15 +117,17 @@ export function serveHarness(stream, harness) {
             return packVectors(await harness.embed({ model, texts: texts ?? [] }));
         },
         transcribe: async ({ model, audio }) => {
-            if (!harness.transcribe)
+            if (!harness.transcribe) {
                 throw new Error('harness does not support transcribe');
+            }
             return {
-                text: await harness.transcribe({ model: model ?? '', audio: audio ?? Buffer.alloc(0) })
+                text: await harness.transcribe({ model: model ?? '', audio: audio ?? b4a.alloc(0) })
             };
         },
         detectLanguage: async ({ text, topK }) => {
-            if (!harness.detectLanguage)
+            if (!harness.detectLanguage) {
                 throw new Error('harness does not support detectLanguage');
+            }
             const languages = await harness.detectLanguage({
                 text: text ?? '',
                 topK: topK ?? undefined
@@ -129,13 +141,15 @@ export function serveHarness(stream, harness) {
         },
         speakStream: speakStream(harness),
         getEmbeddingDevice: async () => {
-            if (!harness.getEmbeddingDevice)
+            if (!harness.getEmbeddingDevice) {
                 throw unsupportedEmbeddingDeviceControl();
+            }
             return { device: await harness.getEmbeddingDevice() };
         },
         setEmbeddingDevice: async ({ device }) => {
-            if (!harness.setEmbeddingDevice)
+            if (!harness.setEmbeddingDevice) {
                 throw unsupportedEmbeddingDeviceControl();
+            }
             await harness.setEmbeddingDevice(device);
             return { ok: true };
         },
@@ -150,7 +164,7 @@ export function serveHarness(stream, harness) {
         }),
         listModels: async (req) => ({
             models: (await harness.list?.({
-                type: (req?.type || undefined),
+                type: req?.type || undefined,
                 cachedOnly: req?.cachedOnly ?? undefined,
                 fullRegistry: req?.fullRegistry ?? undefined
             })) ?? []
@@ -165,13 +179,15 @@ export function serveHarness(stream, harness) {
             models: (await harness.infraModels?.(profile ?? '')) ?? []
         }),
         capability: async () => {
-            if (!harness.capability)
+            if (!harness.capability) {
                 throw new Error('harness does not support capability');
+            }
             return harness.capability();
         },
         warmModel: async ({ model, agent }) => {
-            if (!harness.warmModel)
+            if (!harness.warmModel) {
                 throw new Error('harness does not support warmModel');
+            }
             await harness.warmModel({ model, agent: agent ?? {} });
             return { ok: true };
         },
@@ -199,19 +215,15 @@ function toWireSkill(skill) {
         allowList: skill.allowList,
         platforms: skill.platform,
         status: skill.status,
-        ...(skill.requires
-            ? {
-                requirements: {
-                    binaries,
-                    credentials: skill.requires.credentials ?? []
-                }
-            }
-            : {}),
-        ...(skill.install ? { install: skill.install } : {}),
-        ...(skill.setup ? { setup: skill.setup, ...(setupV2 ? { setupV2 } : {}) } : {}),
-        ...(skill.stub !== undefined ? { stub: skill.stub } : {}),
-        ...(skill.minCapabilityProfile ? { minCapabilityProfile: skill.minCapabilityProfile } : {}),
-        ...(skill.emoji ? { emoji: skill.emoji } : {})
+        requirements: skill.requires
+            ? { binaries, credentials: skill.requires.credentials ?? [] }
+            : undefined,
+        install: skill.install || undefined,
+        setup: skill.setup || undefined,
+        setupV2,
+        stub: skill.stub,
+        minCapabilityProfile: skill.minCapabilityProfile || undefined,
+        emoji: skill.emoji || undefined
     };
 }
 function unsupportedEmbeddingDeviceControl() {
@@ -246,8 +258,9 @@ function modelEvents(harness) {
             catalogChanged,
             ...loaded.map((entry) => `${entry.model}:${entry.refs}`)
         ].join('\0');
-        if (key === last)
+        if (key === last) {
             return;
+        }
         last = key;
         const frame = {
             status: state.status,
@@ -285,16 +298,18 @@ function modelEvents(harness) {
 }
 function speakStream(harness) {
     return async function* (duplex) {
-        if (!harness.speakStream)
+        if (!harness.speakStream) {
             throw new Error('harness does not support speakStream');
+        }
         const text = pushQueue();
         const end = () => text.end();
         duplex.on('close', end);
         duplex.on('end', end);
         duplex.readStream?.on('close', end);
         duplex.on('data', (frame) => {
-            if (frame.text)
+            if (frame.text) {
                 text.push(frame.text);
+            }
         });
         for await (const chunk of harness.speakStream({ model: '', text })) {
             yield { audio: chunk.audio, sampleRate: chunk.sampleRate };
@@ -302,13 +317,15 @@ function speakStream(harness) {
     };
 }
 function runFrame(harness, frame, context) {
-    if (frame.type !== 'invoke')
+    if (frame.type !== 'invoke') {
         return harness.completion(context);
+    }
     if (!harness.invoke)
         throw new Error('harness does not support invoke');
     const capability = frame.capability ?? '';
-    if (!isCapability(capability))
+    if (!isCapability(capability)) {
         throw new Error(`unknown capability: ${capability}`);
+    }
     return harness.invoke({
         capability,
         args: frame.arguments ?? {},
@@ -334,26 +351,31 @@ function completion(harness) {
         let started = false;
         const gone = () => {
             controller.abort('client gone');
-            for (const resolve of pending.values())
+            for (const resolve of pending.values()) {
                 resolve(false);
+            }
             pending.clear();
             for (const { reject, staged } of pendingAttach.values()) {
                 void fs.promises.unlink(staged).catch(noop);
                 reject(new Error('client gone'));
             }
             pendingAttach.clear();
-            for (const { reject } of pendingFetch.values())
+            for (const { reject } of pendingFetch.values()) {
                 reject(new Error('client gone'));
+            }
             pendingFetch.clear();
-            for (const { reject } of pendingRag.values())
+            for (const { reject } of pendingRag.values()) {
                 reject(new Error('client gone'));
+            }
             pendingRag.clear();
-            for (const { resolve } of pendingQuestion.values())
+            for (const { resolve } of pendingQuestion.values()) {
                 resolve(null);
+            }
             pendingQuestion.clear();
             for (const { reject, path } of pendingDrive.values()) {
-                if (path)
+                if (path) {
                     void fs.promises.unlink(path).catch(noop);
+                }
                 reject(new Error('client gone'));
             }
             pendingDrive.clear();
@@ -364,35 +386,43 @@ function completion(harness) {
         duplex.readStream?.on('close', gone);
         duplex.on('data', (frame) => {
             if (frame.type === 'decision') {
-                if (typeof frame.callId !== 'string')
+                if (typeof frame.callId !== 'string') {
                     return;
+                }
                 pending.get(frame.callId)?.(frame.approved === true);
                 pending.delete(frame.callId);
                 return;
             }
             if (frame.type === 'attach-result') {
-                if (typeof frame.callId !== 'string')
+                if (typeof frame.callId !== 'string') {
                     return;
+                }
                 const waiter = pendingAttach.get(frame.callId);
                 pendingAttach.delete(frame.callId);
-                if (!waiter)
+                if (!waiter) {
                     return;
+                }
                 void fs.promises.unlink(waiter.staged).catch(noop);
-                if (frame.attachment)
+                if (frame.attachment) {
                     waiter.resolve(frame.attachment);
-                else
+                }
+                else {
                     waiter.reject(new Error(frame.message || 'the host failed to store the attachment'));
+                }
                 return;
             }
             if (frame.type === 'fetch-result') {
-                if (typeof frame.callId !== 'string')
+                if (typeof frame.callId !== 'string') {
                     return;
+                }
                 const waiter = pendingFetch.get(frame.callId);
                 pendingFetch.delete(frame.callId);
-                if (!waiter)
+                if (!waiter) {
                     return;
-                if (frame.message)
+                }
+                if (frame.message) {
                     return waiter.reject(new Error(frame.message));
+                }
                 const staged = frame.path;
                 const { fileName, mimeType, attachmentId, size } = frame;
                 if (frame.meta === true) {
@@ -403,8 +433,9 @@ function completion(harness) {
                         byteLength: typeof size === 'number' ? size : 0
                     });
                 }
-                if (!staged)
+                if (!staged) {
                     return waiter.resolve(null);
+                }
                 fs.promises.readFile(staged).then((bytes) => waiter.resolve({
                     id: attachmentId ?? '',
                     fileName: fileName ?? '',
@@ -415,42 +446,52 @@ function completion(harness) {
                 return;
             }
             if (frame.type === 'rag-result') {
-                if (typeof frame.callId !== 'string')
+                if (typeof frame.callId !== 'string') {
                     return;
+                }
                 const waiter = pendingRag.get(frame.callId);
                 pendingRag.delete(frame.callId);
-                if (!waiter)
+                if (!waiter) {
                     return;
-                if (frame.message)
+                }
+                if (frame.message) {
                     return waiter.reject(new Error(frame.message));
+                }
                 waiter.resolve(frame.result ?? { enabled: false, indexEmpty: true, hasKnowledge: false, hits: [] });
             }
             if (frame.type === 'question-result') {
-                if (typeof frame.callId !== 'string')
+                if (typeof frame.callId !== 'string') {
                     return;
+                }
                 const waiter = pendingQuestion.get(frame.callId);
                 pendingQuestion.delete(frame.callId);
-                if (!waiter)
+                if (!waiter) {
                     return;
-                if (frame.message)
+                }
+                if (frame.message) {
                     hlog('question failed', { callId: frame.callId, message: frame.message });
+                }
                 waiter.resolve(frame.answer || null);
                 return;
             }
             if (frame.type === 'drive-result') {
-                if (typeof frame.callId !== 'string')
+                if (typeof frame.callId !== 'string') {
                     return;
+                }
                 const waiter = pendingDrive.get(frame.callId);
                 pendingDrive.delete(frame.callId);
-                if (!waiter)
+                if (!waiter) {
                     return;
-                if (frame.message)
+                }
+                if (frame.message) {
                     return waiter.reject(new Error(frame.message));
-                waiter.resolve((frame.payload ?? {}));
+                }
+                waiter.resolve(frame.payload ?? {});
                 return;
             }
-            if (started || (frame.type !== 'start' && frame.type !== 'invoke'))
+            if (started || (frame.type !== 'start' && frame.type !== 'invoke')) {
                 return;
+            }
             started = true;
             const context = {
                 model: frame.model ?? '',
@@ -463,9 +504,9 @@ function completion(harness) {
                 messages: (frame.messages ?? []).map(({ role, content, attachments }) => ({
                     role,
                     content,
-                    ...(attachments?.length
-                        ? { attachments: attachments.map(({ path: file }) => ({ path: file })) }
-                        : {})
+                    attachments: attachments?.length
+                        ? attachments.map(({ path: file }) => ({ path: file }))
+                        : undefined
                 })),
                 toolConfigs: frame.toolConfigs ?? undefined,
                 grantedDirs: frame.grantedDirs ?? undefined,
@@ -483,7 +524,7 @@ function completion(harness) {
                             pendingDrive.set(callId, {
                                 resolve,
                                 reject,
-                                ...(request.op === 'write' ? { path: request.path } : {})
+                                path: request.op === 'write' ? request.path : undefined
                             });
                             events.push({ type: 'drive-ask', callId, op: request.op, payload: request });
                         })
@@ -532,7 +573,7 @@ function completion(harness) {
                             type: 'fetch-ask',
                             callId,
                             attachmentId,
-                            ...(meta === true ? { meta: true } : {})
+                            meta: meta === true ? true : undefined
                         });
                     }),
                 ragSearch: ({ query, limit }) => controller.signal.aborted
@@ -627,6 +668,13 @@ function downloadStream(harness, req) {
             pendingProgress = null;
             lastProgressAt = at;
         };
+        const queueProgress = (wire) => {
+            const now = Date.now();
+            pendingProgress = wire;
+            if (lastProgressAt === 0 || now - lastProgressAt >= DOWNLOAD_PROGRESS_INTERVAL_MS) {
+                flushProgress(now);
+            }
+        };
         try {
             for await (const event of harness.download({
                 model: req.model,
@@ -636,11 +684,7 @@ function downloadStream(harness, req) {
             })) {
                 const wire = toDownloadWire(event);
                 if (wire.type === 'progress') {
-                    const now = Date.now();
-                    pendingProgress = wire;
-                    if (lastProgressAt === 0 || now - lastProgressAt >= DOWNLOAD_PROGRESS_INTERVAL_MS) {
-                        flushProgress(now);
-                    }
+                    queueProgress(wire);
                     continue;
                 }
                 flushProgress();