@qvac/sdk 0.11.0 → 0.12.1

package/dist/expo/plugins/withMobileBundle.js

@@ -1,15 +1,13 @@
 import configPlugins from "@expo/config-plugins";
-import { execSync } from "child_process";
 import * as fs from "fs";
 import * as path from "path";
+import { bundleSdk, verifyBundle, hasErrors, formatVerifyBundleResult } from "../../commands/index.js";
+import { CONFIG_CANDIDATES } from "../../client/config-loader/resolve-config.node.js";
 import { resolveSDKPackageDir } from "./resolve-sdk-package-dir.js";
+import { getProjectRootFromMod } from "./get-project-root.js";
+import { findInAncestorNodeModules } from "./find-in-ancestor-node-modules.js";
 import { BundleVerificationFailedError } from "../../utils/errors-client.js";
 const { withDangerousMod } = configPlugins;
-const CONFIG_CANDIDATES = [
-    "qvac.config.json",
-    "qvac.config.js",
-    "qvac.config.mjs",
-];
 /** Modules to defer from mobile bundles (not available at bundle time) */
 const DEFERRED_MODULES = ["expo-file-system", "react-native-bare-kit"];
 const MOBILE_HOSTS = [
@@ -21,17 +19,14 @@ const MOBILE_HOSTS = [
 /**
  * Expo plugin: bundle, verify, then copy the mobile worker bundle.
  *
- * Flow: `bundle sdk` -> assert `qvac/worker.bundle.js` exists ->
- * `verify bundle` -> copy to `<sdkPackageDir>/dist/worker.mobile.bundle.js`.
- * Requires a local `@qvac/cli` install. Uses `qvac.config.*` if present.
+ * Flow: bundleSdk -> verifyBundle -> copy to `<sdkPackageDir>/dist/worker.mobile.bundle.js`.
+ * Uses `qvac.config.*` if present.
  */
 function withMobileBundle(config) {
-    function buildMobileBundle(config) {
-        const projectRoot = config.modRequest.projectRoot;
+    async function buildMobileBundle(config) {
+        const projectRoot = getProjectRootFromMod(config);
         const sdkPackage = resolveSDKPackageDir(projectRoot);
         const outputPath = path.join(sdkPackage.dir, "dist", "worker.mobile.bundle.js");
-        // Generate bundle via qvac CLI
-        // (uses qvac.config.* if exists, else includes all built-in plugins)
         const configPath = findConfigFile(projectRoot);
         if (configPath) {
             console.log(`🕚 QVAC: Found ${path.basename(configPath)}, generating tree-shaken bundle...`);
@@ -43,15 +38,9 @@ function withMobileBundle(config) {
             ...DEFERRED_MODULES,
             `${sdkPackage.name}/worker.mobile.bundle`,
         ];
-        runBundler(projectRoot, sdkPackage.dir, configPath, deferredModules);
-        // Copy the generated bundle to SDK location
+        await runBundler(projectRoot, sdkPackage.dir, configPath, deferredModules);
         const generatedBundle = path.join(projectRoot, "qvac", "worker.bundle.js");
-        if (!fs.existsSync(generatedBundle)) {
-            throw new Error(`QVAC: Bundle generation failed — ${generatedBundle} not found. ` +
-                `Check qvac CLI output above for errors.`);
-        }
-        // Verify before copying so the dist artifact only updates on success.
-        runVerifier(projectRoot, generatedBundle, configPath);
+        await runVerifier(projectRoot, generatedBundle, configPath);
         fs.copyFileSync(generatedBundle, outputPath);
         console.log("🫡 QVAC: Mobile bundle generated and verified");
         return config;
@@ -70,83 +59,42 @@ function findConfigFile(projectRoot) {
     }
     return null;
 }
-/**
- * Resolves the qvac CLI command.
- *
- * Prefers local @qvac/cli installation for version consistency,
- * falls back to npx for convenience when CLI is not installed.
- */
-export function resolveCliCommand(projectRoot) {
-    const cliPath = path.join(projectRoot, "node_modules", "@qvac", "cli", "dist", "index.js");
-    if (fs.existsSync(cliPath)) {
-        return `node "${cliPath}"`;
-    }
-    console.log("⚠️ QVAC: @qvac/cli not found in node_modules, falling back to npx");
-    console.log("   Tip: Add @qvac/cli as a dependency for consistent versioning");
-    return "npx --package=@qvac/cli qvac";
-}
-/** Builds the `qvac verify bundle` command string (pure helper for tests). */
-export function buildVerifyBundleCommand(opts) {
-    const hostFlags = opts.hosts.map((h) => `--host ${h}`).join(" ");
-    const configFlag = opts.configPath ? ` --config "${opts.configPath}"` : "";
-    return `${opts.cliCommand} verify bundle --addons-source "${opts.bundlePath}" ${hostFlags}${configFlag}`;
-}
-/**
- * Runs `qvac verify bundle` against the freshly generated worker bundle.
- * Passes the discovered `qvac.config.*` so the CLI reads `bareRuntimeVersion`
- * and pins ABI checks deterministically. Without a config, the CLI falls back
- * to auto-detecting Bare runtime from `node_modules` (`bare-runtime`, then
- * `bare`); ABI checks stay strict when that lookup succeeds, and only skip
- * (with an `unknown-runtime-version` warning) when neither is installed.
- */
-function runVerifier(projectRoot, generatedBundle, configPath) {
-    const cliCommand = resolveCliCommand(projectRoot);
+async function runVerifier(projectRoot, generatedBundle, configPath) {
     if (!configPath) {
         console.log("⚠️ QVAC: no qvac.config.* found — Bare runtime will be auto-detected " +
             "from node_modules (bare-runtime, then bare). Add qvac.config.json " +
-            'with `bareRuntimeVersion` to pin ABI checks deterministically.');
+            "with `bareRuntimeVersion` to pin ABI checks deterministically.");
     }
-    const verifyCommand = buildVerifyBundleCommand({
-        cliCommand,
-        bundlePath: generatedBundle,
+    const result = await verifyBundle({
+        projectRoot,
+        addonsSource: generatedBundle,
         hosts: MOBILE_HOSTS,
         ...(configPath ? { configPath } : {}),
     });
-    try {
-        execSync(verifyCommand, { stdio: "inherit", cwd: projectRoot });
-    }
-    catch (error) {
-        throw new BundleVerificationFailedError(generatedBundle, error);
+    if (hasErrors(result)) {
+        throw new BundleVerificationFailedError(generatedBundle, new Error(formatVerifyBundleResult(result)));
     }
 }
-/** Runs qvac CLI with mobile-specific options */
-function runBundler(projectRoot, qvacSdkPath, configPath, deferredModules) {
-    // Patch bare-kit linkers to use addons manifest
+async function runBundler(projectRoot, qvacSdkPath, configPath, deferredModules) {
     patchBareKitLinkers(projectRoot, qvacSdkPath);
-    const hostFlags = MOBILE_HOSTS.map((h) => `--host ${h}`).join(" ");
-    const deferFlags = deferredModules.map((m) => `--defer "${m}"`).join(" ");
-    const configFlag = configPath ? `--config "${configPath}"` : "";
-    const sdkPathFlag = `--sdk-path "${qvacSdkPath}"`;
-    const cliCommand = resolveCliCommand(projectRoot);
-    try {
-        execSync(`${cliCommand} bundle sdk ${sdkPathFlag} ${configFlag} ${hostFlags} ${deferFlags} --quiet`, { stdio: "inherit", cwd: projectRoot });
-    }
-    catch (error) {
-        console.error("❌ QVAC: Failed to generate bundle:", error);
-        throw error;
-    }
+    await bundleSdk({
+        projectRoot,
+        sdkPath: qvacSdkPath,
+        ...(configPath ? { configPath } : {}),
+        hosts: MOBILE_HOSTS,
+        defer: deferredModules,
+        quiet: true,
+    });
 }
 /**
  * Patches react-native-bare-kit linkers to use the addons manifest.
- *
- * Copies the manifest-aware link.mjs files over the originals so that
- * bare-link only links the native addons actually required by the bundle.
- * This reduces app size by excluding unused native addon binaries.
  */
 function patchBareKitLinkers(projectRoot, qvacSdkPath) {
-    const bareKitPath = path.join(projectRoot, "node_modules", "react-native-bare-kit");
-    if (!fs.existsSync(bareKitPath)) {
-        console.log("⚠️ QVAC: react-native-bare-kit not found, skipping linker patch");
+    const bareKitPath = findInAncestorNodeModules(projectRoot, "react-native-bare-kit");
+    if (bareKitPath === null) {
+        console.warn("⚠️ QVAC: react-native-bare-kit not found in any ancestor node_modules, " +
+            "skipping linker patch. The bundle will link all native addons " +
+            "rather than only those required by your bundle.");
         return;
     }
     const patchesDir = path.join(qvacSdkPath, "expo", "plugins", "patches");
@@ -154,7 +102,6 @@ function patchBareKitLinkers(projectRoot, qvacSdkPath) {
         console.log(`⚠️ QVAC: patches directory not found (${patchesDir}), skipping linker patch`);
         return;
     }
-    // Patch Android linker
     const androidPatch = path.join(patchesDir, "android-link.mjs");
     const androidTarget = path.join(bareKitPath, "android", "link.mjs");
     if (fs.existsSync(androidPatch)) {
@@ -164,7 +111,6 @@ function patchBareKitLinkers(projectRoot, qvacSdkPath) {
     else {
         console.log(`⚠️ QVAC: Android linker patch not found (${androidPatch})`);
     }
-    // Patch iOS linker
     const iosPatch = path.join(patchesDir, "ios-link.mjs");
     const iosTarget = path.join(bareKitPath, "ios", "link.mjs");
     if (fs.existsSync(iosPatch)) {

package/dist/index.d.ts

@@ -1,14 +1,16 @@
 import "#polyfill-bare-globals";
-export { completion, deleteCache, loadModel, downloadAsset, heartbeat, startQVACProvider, stopQVACProvider, unloadModel, transcribe, transcribeStream, embed, finetune, translate, cancel, ragChunk, ragIngest, ragSaveEmbeddings, ragSearch, ragDeleteEmbeddings, ragReindex, ragListWorkspaces, ragCloseWorkspace, ragDeleteWorkspace, textToSpeech, textToSpeechStream, getModelInfo, getLoadedModelInfo, loggingStream, ocr, invokePlugin, invokePluginStream, diffusion, type DiffusionProgressTick, upscale, modelRegistryList, modelRegistrySearch, modelRegistryGetModel, type ModelRegistrySearchParams, suspend, resume, state, type FinetuneHandle, } from "./client/api/index";
+export { completion, deleteCache, loadModel, downloadAsset, heartbeat, startQVACProvider, stopQVACProvider, unloadModel, transcribe, transcribeStream, embed, finetune, translate, cancel, ragChunk, ragIngest, ragSaveEmbeddings, ragSearch, ragDeleteEmbeddings, ragReindex, ragListWorkspaces, ragCloseWorkspace, ragDeleteWorkspace, textToSpeech, textToSpeechStream, getModelInfo, getLoadedModelInfo, loggingStream, ocr, invokePlugin, invokePluginStream, diffusion, type DiffusionProgressTick, classify, video, type VideoProgressTick, upscale, modelRegistryList, modelRegistrySearch, modelRegistryGetModel, type ModelRegistrySearchParams, suspend, resume, state, vla, vlaHparams, vlaPreprocessImage, vlaPadState, VLA_DEFAULT_IMAGE_SIZE, type FinetuneHandle, } from "./client/api/index";
 export { close } from "./client/index";
-export { type LifecycleState, type ModelProgressUpdate, type LoadModelOptions, type LoadCustomPluginModelOptions, type DownloadAssetOptions, type Tool, type ToolCall, type ToolCallWithCall, type ToolCallError, type ToolCallEvent, type CompletionEvent, type CompletionFinal, type CompletionRun, type CompletionStats, type EmbedStats, VERBOSITY, type Attachment, type TranscribeStreamSession, type TranscribeStreamMetadataSession, type TranscribeStreamConversationSession, type TranscribeStreamEvent, type VadStateEvent, type EndOfTurnEvent, type TranscribeSegment, type TextToSpeechStreamSession, type TextToSpeechStreamResponse, type TextToSpeechStreamClientParams, type CompletionParams, type ToolDialect, type RagSearchResult, type RagSaveEmbeddingsResult, type RagReindexResult, type RagEmbeddedDoc, type RagDoc, type RagWorkspaceInfo, type RagCloseWorkspaceParams, type RagDeleteWorkspaceParams, type RagIngestStage, type RagReindexStage, type RagSaveStage, SDK_CLIENT_ERROR_CODES, SDK_SERVER_ERROR_CODES, type QvacConfig, type ModelInfo, type GetModelInfoParams, type GetLoadedModelInfoParams, type LoadedModelInfo, type LoadedInstance, type CacheFileInfo, toolSchema, TOOLS_MODE, type ToolsMode, type McpClient, type McpClientInput, type OCRClientParams, type OCRTextBlock, type OCROptions, type DiffusionClientParams, type DiffusionStreamResponse, type DiffusionStats, type UpscaleClientParams, type UpscaleStreamResponse, type UpscaleStats, definePlugin, defineHandler, defineDuplexHandler, type QvacPlugin, type CreateModelParams, type PluginModelResult, type ModelRegistryEntry, type ModelRegistryEntryAddon, PLUGIN_LLM, PLUGIN_EMBEDDING, PLUGIN_WHISPER, PLUGIN_NMT, PLUGIN_TTS, PLUGIN_OCR, PLUGIN_DIFFUSION, SDK_DEFAULT_PLUGINS, type BuiltinPlugin, type ProfilerMode, type FinetuneValidation, type FinetuneRunParams, type FinetuneGetStateParams, type FinetuneStopParams, type FinetuneParams, type FinetuneStatus, type FinetuneProgress, type FinetuneStats, type FinetuneResult, } from "./schemas/index";
+export { plugins } from "./client/plugins-factory";
+export { type LifecycleState, type ModelProgressUpdate, type LoadModelOptions, type LoadCustomPluginModelOptions, type DownloadAssetOptions, type Tool, type ToolCall, type ToolCallWithCall, type ToolCallError, type ToolCallEvent, type CompletionEvent, type CompletionFinal, type CompletionRun, type CompletionStats, type EmbedStats, VERBOSITY, type Attachment, type TranscribeStreamSession, type TranscribeStreamMetadataSession, type TranscribeStreamConversationSession, type TranscribeStreamEvent, type VadStateEvent, type EndOfTurnEvent, type TranscribeSegment, type TextToSpeechStreamSession, type TextToSpeechStreamResponse, type TextToSpeechStreamClientParams, type CompletionParams, type ToolDialect, type RagSearchResult, type RagSaveEmbeddingsResult, type RagReindexResult, type RagEmbeddedDoc, type RagDoc, type RagWorkspaceInfo, type RagCloseWorkspaceParams, type RagDeleteWorkspaceParams, type RagIngestStage, type RagReindexStage, type RagSaveStage, SDK_CLIENT_ERROR_CODES, SDK_SERVER_ERROR_CODES, RAG_ERROR_CODES, type QvacConfig, type ModelInfo, type GetModelInfoParams, type GetLoadedModelInfoParams, type LoadedModelInfo, type LoadedInstance, type CacheFileInfo, toolSchema, TOOLS_MODE, type ToolsMode, type McpClient, type McpClientInput, type OCRClientParams, type OCRTextBlock, type OCROptions, type ClassifyClientParams, type ClassificationResult, type DiffusionClientParams, type DiffusionStreamResponse, type DiffusionStats, type VideoClientParams, type VideoStreamResponse, type VideoStats, type UpscaleClientParams, type UpscaleStreamResponse, type UpscaleStats, type VlaConfig, type VlaClientRunParams, type VlaClientRunResult, type VlaHparams, type VlaStats, definePlugin, defineHandler, defineDuplexHandler, type QvacPlugin, type CreateModelParams, type PluginModelResult, type ModelRegistryEntry, type ModelRegistryEntryAddon, PLUGIN_LLM, PLUGIN_EMBEDDING, PLUGIN_WHISPER, PLUGIN_NMT, PLUGIN_TTS, PLUGIN_OCR, PLUGIN_DIFFUSION, PLUGIN_VLA, PLUGIN_CLASSIFICATION, SDK_DEFAULT_PLUGINS, type BuiltinPlugin, type ProfilerMode, type FinetuneValidation, type FinetuneRunParams, type FinetuneGetStateParams, type FinetuneStopParams, type FinetuneParams, type FinetuneStatus, type FinetuneProgress, type FinetuneStats, type FinetuneResult, } from "./schemas/index";
 export { type ToolInput, type ToolHandler } from "./utils/tool-helpers";
 export { MODEL_TYPES, ModelType } from "./schemas/index";
 export * from "./models/registry/index";
 export { SUPPORTED_AUDIO_FORMATS } from "./constants/audio";
 export { InferenceCancelledError } from "./utils/errors-server";
 export type { InferenceCancelledPartial } from "./utils/errors-server";
-export { RequestIdConflictError, RequestNotFoundError, RequestRejectedByPolicyError, } from "./utils/errors-server";
+export { ContextOverflowError, RequestIdConflictError, RequestNotFoundError, RequestRejectedByPolicyError, } from "./utils/errors-server";
+export { WorkerCrashedError, WorkerShutdownError, } from "./utils/errors-client";
 export { getLogger, SDK_LOG_ID } from "./logging/index";
 export type { Logger, LogTransport, LoggerOptions } from "./logging/index";
 export { profiler } from "./profiling/index";

package/dist/index.js

@@ -1,8 +1,9 @@
 import "#polyfill-bare-globals";
 // Public API exports only
-export { completion, deleteCache, loadModel, downloadAsset, heartbeat, startQVACProvider, stopQVACProvider, unloadModel, transcribe, transcribeStream, embed, finetune, translate, cancel, ragChunk, ragIngest, ragSaveEmbeddings, ragSearch, ragDeleteEmbeddings, ragReindex, ragListWorkspaces, ragCloseWorkspace, ragDeleteWorkspace, textToSpeech, textToSpeechStream, getModelInfo, getLoadedModelInfo, loggingStream, ocr, invokePlugin, invokePluginStream, diffusion, upscale, modelRegistryList, modelRegistrySearch, modelRegistryGetModel, suspend, resume, state, } from "./client/api/index.js";
+export { completion, deleteCache, loadModel, downloadAsset, heartbeat, startQVACProvider, stopQVACProvider, unloadModel, transcribe, transcribeStream, embed, finetune, translate, cancel, ragChunk, ragIngest, ragSaveEmbeddings, ragSearch, ragDeleteEmbeddings, ragReindex, ragListWorkspaces, ragCloseWorkspace, ragDeleteWorkspace, textToSpeech, textToSpeechStream, getModelInfo, getLoadedModelInfo, loggingStream, ocr, invokePlugin, invokePluginStream, diffusion, classify, video, upscale, modelRegistryList, modelRegistrySearch, modelRegistryGetModel, suspend, resume, state, vla, vlaHparams, vlaPreprocessImage, vlaPadState, VLA_DEFAULT_IMAGE_SIZE, } from "./client/api/index.js";
 export { close } from "./client/index.js";
-export { VERBOSITY, SDK_CLIENT_ERROR_CODES, SDK_SERVER_ERROR_CODES, toolSchema, TOOLS_MODE, definePlugin, defineHandler, defineDuplexHandler, PLUGIN_LLM, PLUGIN_EMBEDDING, PLUGIN_WHISPER, PLUGIN_NMT, PLUGIN_TTS, PLUGIN_OCR, PLUGIN_DIFFUSION, SDK_DEFAULT_PLUGINS, } from "./schemas/index.js";
+export { plugins } from "./client/plugins-factory.js";
+export { VERBOSITY, SDK_CLIENT_ERROR_CODES, SDK_SERVER_ERROR_CODES, RAG_ERROR_CODES, toolSchema, TOOLS_MODE, definePlugin, defineHandler, defineDuplexHandler, PLUGIN_LLM, PLUGIN_EMBEDDING, PLUGIN_WHISPER, PLUGIN_NMT, PLUGIN_TTS, PLUGIN_OCR, PLUGIN_DIFFUSION, PLUGIN_VLA, PLUGIN_CLASSIFICATION, SDK_DEFAULT_PLUGINS, } from "./schemas/index.js";
 export {} from "./utils/tool-helpers.js";
 // Model types - canonical naming with backward-compatible aliases
 export { MODEL_TYPES, ModelType } from "./schemas/index.js";
@@ -28,7 +29,12 @@ export { SUPPORTED_AUDIO_FORMATS } from "./constants/audio.js";
 // `err instanceof <Class>` works on the consumer side, not just on
 // the worker side.
 export { InferenceCancelledError } from "./utils/errors-server.js";
-export { RequestIdConflictError, RequestNotFoundError, RequestRejectedByPolicyError, } from "./utils/errors-server.js";
+export { ContextOverflowError, RequestIdConflictError, RequestNotFoundError, RequestRejectedByPolicyError, } from "./utils/errors-server.js";
+// `WorkerCrashedError` and `WorkerShutdownError` are thrown by the
+// rpc-client life-signal race when the bare worker exits unexpectedly
+// or close()/process-exit teardown runs while a caller is in flight.
+// Exported so consumers can pattern-match with `instanceof`.
+export { WorkerCrashedError, WorkerShutdownError, } from "./utils/errors-client.js";
 // Logging exports
 export { getLogger, SDK_LOG_ID } from "./logging/index.js";
 // Profiler exports