@qvac/sdk 0.9.2 → 0.10.0

package/dist/server/rpc/handlers/load-model/download-stats.js

@@ -7,10 +7,11 @@ function createStatsCollector() {
         maxBytesDownloaded: 0,
         startTimeMs: nowMs(),
         cacheHit: undefined,
+        sharedTransfer: false,
         checksumValidationTimeMsTotal: 0,
     };
 }
-function createHooks(collector) {
+function createStatsHooks(collector) {
     return {
         markCacheHit: () => {
             if (collector.cacheHit === undefined) {
@@ -21,6 +22,9 @@ function createHooks(collector) {
         markCacheMiss: () => {
             collector.cacheHit = false;
         },
+        markSharedTransfer: () => {
+            collector.sharedTransfer = true;
+        },
         addChecksumValidationTimeMs: (durationMs) => {
             collector.checksumValidationTimeMsTotal += durationMs;
         },
@@ -30,7 +34,7 @@ function wrapProgressCallback(collector, originalCallback) {
     return (progress) => {
         // Don't track bytes for cache hits (they're not real network transfer)
         if (collector.cacheHit !== true) {
-            const downloaded = progress.onnxInfo?.overallDownloaded ??
+            const downloaded = progress.fileSetInfo?.overallDownloaded ??
                 progress.shardInfo?.overallDownloaded ??
                 progress.downloaded ??
                 0;
@@ -43,6 +47,9 @@ function computeStats(collector) {
     const downloadTimeMs = nowMs() - collector.startTimeMs;
     const totalBytesDownloaded = collector.maxBytesDownloaded;
     const stats = {};
+    if (collector.sharedTransfer) {
+        stats.sharedTransfer = true;
+    }
     if (collector.cacheHit !== undefined) {
         stats.cacheHit = collector.cacheHit;
     }
@@ -52,6 +59,12 @@ function computeStats(collector) {
     if (collector.cacheHit === true) {
         return Object.keys(stats).length > 0 ? stats : undefined;
     }
+    if (collector.sharedTransfer) {
+        if (downloadTimeMs > 0) {
+            stats.downloadTimeMs = downloadTimeMs;
+        }
+        return Object.keys(stats).length > 0 ? stats : undefined;
+    }
     if (totalBytesDownloaded > 0) {
         stats.downloadTimeMs = downloadTimeMs;
         stats.totalBytesDownloaded = totalBytesDownloaded;
@@ -61,27 +74,55 @@ function computeStats(collector) {
     }
     return Object.keys(stats).length > 0 ? stats : undefined;
 }
-export async function downloadModelFromHttpWithStats(url, progressCallback) {
+export async function downloadModelFromHttpWithStats(url, progressCallback, downloadHooks) {
     const collector = createStatsCollector();
-    const hooks = createHooks(collector);
+    const hooks = { ...downloadHooks, ...createStatsHooks(collector) };
     const wrappedCallback = wrapProgressCallback(collector, progressCallback);
     const path = await downloadModelFromHttp(url, wrappedCallback, hooks);
     const stats = computeStats(collector);
     return stats ? { path, stats } : { path };
 }
-export async function downloadModelFromRegistryWithStats(registryPath, registrySource, progressCallback, expectedChecksum) {
+export async function downloadModelFromRegistryWithStats(registryPath, registrySource, progressCallback, expectedChecksum, downloadHooks) {
     const collector = createStatsCollector();
-    const hooks = createHooks(collector);
+    const hooks = { ...downloadHooks, ...createStatsHooks(collector) };
     const wrappedCallback = wrapProgressCallback(collector, progressCallback);
     const path = await downloadModelFromRegistry(registryPath, registrySource, wrappedCallback, expectedChecksum, hooks);
     const stats = computeStats(collector);
     return stats ? { path, stats } : { path };
 }
-export async function downloadModelFromHyperdriveWithStats(hyperdriveKey, modelFileName, seed, progressCallback) {
+export async function downloadModelFromHyperdriveWithStats(hyperdriveKey, modelFileName, seed, progressCallback, downloadHooks) {
     const collector = createStatsCollector();
-    const hooks = createHooks(collector);
+    const hooks = { ...downloadHooks, ...createStatsHooks(collector) };
     const wrappedCallback = wrapProgressCallback(collector, progressCallback);
     const path = await downloadModelFromHyperdrive(hyperdriveKey, modelFileName, seed, wrappedCallback, hooks);
     const stats = computeStats(collector);
     return stats ? { path, stats } : { path };
 }
+export function mergeDownloadStats(results) {
+    const stats = results
+        .map((r) => r.downloadStats)
+        .filter((s) => s !== undefined);
+    if (stats.length === 0)
+        return undefined;
+    const downloadTimeMs = Math.max(...stats.map((s) => s.downloadTimeMs ?? 0));
+    const totalBytesDownloaded = stats.reduce((sum, s) => sum + (s.totalBytesDownloaded ?? 0), 0);
+    const checksumValidationTimeMs = stats.reduce((sum, s) => sum + (s.checksumValidationTimeMs ?? 0), 0);
+    const cacheHitValues = stats
+        .map((s) => s.cacheHit)
+        .filter((v) => v !== undefined);
+    const merged = {};
+    if (downloadTimeMs > 0)
+        merged.downloadTimeMs = downloadTimeMs;
+    if (totalBytesDownloaded > 0)
+        merged.totalBytesDownloaded = totalBytesDownloaded;
+    if (downloadTimeMs > 0 && totalBytesDownloaded > 0) {
+        merged.downloadSpeedBps = (totalBytesDownloaded * 1000) / downloadTimeMs;
+    }
+    if (checksumValidationTimeMs > 0)
+        merged.checksumValidationTimeMs = checksumValidationTimeMs;
+    if (cacheHitValues.length > 0)
+        merged.cacheHit = cacheHitValues.every(Boolean);
+    if (stats.some((s) => s.sharedTransfer))
+        merged.sharedTransfer = true;
+    return Object.keys(merged).length > 0 ? merged : undefined;
+}

package/dist/server/rpc/handlers/load-model/handler.js

@@ -1,9 +1,10 @@
 import { normalizeModelType, PROFILING_KEY, OPERATION_EVENT_KEY, } from "../../../../schemas/index.js";
 import { loadModel } from "../../../bare/ops/load-model.js";
-import { resolveModelPath, resolveModelPathWithStats, } from "./resolve.js";
+import { createResolveSession } from "./resolve-session.js";
 import { nowMs, generateProfileId } from "../../../../profiling/clock.js";
 import { getModelEntry, updateModelConfig, } from "../../../bare/registry/model-registry.js";
 import { generateShortHash, canonicalConfigString, transformConfigForReload, } from "../../../utils/index.js";
+import { buildDownloadProfilingFields } from "./types.js";
 import { ConfigReloadNotSupportedError, ModelTypeMismatchError, ModelIsDelegatedError, ModelNotFoundError, ModelLoadFailedError, PluginLoadConfigValidationFailedError, PluginNotFoundError, } from "../../../../utils/errors-server.js";
 import { getServerLogger } from "../../../../logging/index.js";
 import { getPlugin } from "../../../plugins/index.js";
@@ -34,37 +35,39 @@ export async function handleLoadModel(request, progressCallback) {
         }
         resolvedModelConfig = parseResult.data;
         const totalLoadStart = profilingEnabled ? nowMs() : 0;
-        let resolveResult;
+        const session = createResolveSession({
+            progressCallback,
+            seed,
+            profilingEnabled,
+        });
+        const primaryResolve = session.resolvePrimaryModelPath(modelSrc);
         let resolvedModelPath;
-        if (profilingEnabled) {
-            resolveResult = await resolveModelPathWithStats(modelSrc, progressCallback, seed);
-            resolvedModelPath = resolveResult.path;
+        let pluginResolveResult;
+        try {
+            const pluginResolve = plugin.resolveConfig
+                ? Promise.resolve().then(() => plugin.resolveConfig(resolvedModelConfig, session.createResolveContext(modelSrc, canonicalModelType, modelName)))
+                : undefined;
+            [resolvedModelPath, pluginResolveResult] = pluginResolve
+                ? await Promise.all([primaryResolve, pluginResolve])
+                : [await primaryResolve, undefined];
         }
-        else {
-            resolvedModelPath = await resolveModelPath(modelSrc, progressCallback, seed);
-        }
-        let pluginArtifacts = {};
-        if (plugin.resolveConfig) {
-            const ctx = {
-                resolveModelPath: (src) => resolveModelPath(src, progressCallback, seed),
-                modelSrc,
-                modelType: canonicalModelType,
-                ...(modelName !== undefined && { modelName }),
-            };
-            const result = await plugin.resolveConfig(resolvedModelConfig, ctx);
-            resolvedModelConfig = result.config;
-            if (result.artifacts) {
-                pluginArtifacts = result.artifacts;
-            }
+        catch (error) {
+            session.cancelAll();
+            throw error;
         }
         const configStr = canonicalConfigString(request.modelConfig);
         const modelHashInput = `${request.modelType}:${modelSrc}:${configStr}`;
         const modelId = generateShortHash(modelHashInput);
+        let pluginArtifacts = {};
+        if (pluginResolveResult) {
+            resolvedModelConfig = pluginResolveResult.config;
+            if (pluginResolveResult.artifacts) {
+                pluginArtifacts = pluginResolveResult.artifacts;
+            }
+        }
         if ("modelPath" in pluginArtifacts) {
-            logger.warn("Plugin returned 'modelPath' artifact which was overridden by core");
+            throw new ModelLoadFailedError("Plugin returned reserved key \"modelPath\" in artifacts; primary model resolution is core-owned");
         }
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { modelPath: _, ...artifacts } = pluginArtifacts;
         if (!resolvedModelPath) {
             throw new ModelLoadFailedError("modelPath resolution failed");
         }
@@ -76,7 +79,7 @@ export async function handleLoadModel(request, progressCallback) {
                 modelType: canonicalModelType,
                 modelConfig: resolvedModelConfig,
             },
-            artifacts: Object.keys(artifacts).length > 0 ? artifacts : undefined,
+            artifacts: Object.keys(pluginArtifacts).length > 0 ? pluginArtifacts : undefined,
             modelName,
         }, profilingEnabled ? { collectTiming: true } : undefined);
         const response = {
@@ -87,38 +90,16 @@ export async function handleLoadModel(request, progressCallback) {
         if (profilingEnabled) {
             const totalLoadTimeMs = nowMs() - totalLoadStart;
             const profileId = profilingMeta?.id ?? generateProfileId();
-            const gauges = {
-                totalLoadTime: totalLoadTimeMs,
-            };
+            const resolveResult = session.getAggregateResult();
+            const { gauges, tags } = buildDownloadProfilingFields(resolveResult?.downloadStats, resolveResult?.sourceType);
+            gauges["totalLoadTime"] = totalLoadTimeMs;
             if (loadResult.timing?.modelInitializationTimeMs !== undefined) {
                 gauges["modelInitializationTime"] =
                     loadResult.timing.modelInitializationTimeMs;
             }
-            if (resolveResult?.downloadStats) {
-                const ds = resolveResult.downloadStats;
-                if (ds.downloadTimeMs !== undefined) {
-                    gauges["downloadTime"] = ds.downloadTimeMs;
-                }
-                if (ds.totalBytesDownloaded !== undefined) {
-                    gauges["totalBytesDownloaded"] = ds.totalBytesDownloaded;
-                }
-                if (ds.downloadSpeedBps !== undefined) {
-                    gauges["downloadSpeedBps"] = ds.downloadSpeedBps;
-                }
-                if (ds.checksumValidationTimeMs !== undefined) {
-                    gauges["checksumValidationTime"] = ds.checksumValidationTimeMs;
-                }
-            }
-            const tags = {};
             if (canonicalModelType) {
                 tags["modelType"] = canonicalModelType;
             }
-            if (resolveResult?.sourceType) {
-                tags["sourceType"] = resolveResult.sourceType;
-            }
-            if (resolveResult?.downloadStats?.cacheHit !== undefined) {
-                tags["cacheHit"] = resolveResult.downloadStats.cacheHit ? "true" : "false";
-            }
             const operationEvent = {
                 op: "loadModel",
                 kind: "handler",

package/dist/server/rpc/handlers/load-model/http.d.ts

@@ -1,4 +1,4 @@
 import type { ModelProgressUpdate } from "../../../../schemas/index";
-import type { DownloadMetricsHooks } from "./types";
-export declare function downloadModelFromHttp(url: string, progressCallback?: (progress: ModelProgressUpdate) => void, hooks?: DownloadMetricsHooks): Promise<string>;
+import type { DownloadHooks } from "./types";
+export declare function downloadModelFromHttp(url: string, progressCallback?: (progress: ModelProgressUpdate) => void, hooks?: DownloadHooks): Promise<string>;
 //# sourceMappingURL=http.d.ts.map

package/dist/server/rpc/handlers/load-model/http.js

@@ -2,11 +2,10 @@ import fs, { promises as fsPromises } from "bare-fs";
 import path from "bare-path";
 import { Readable } from "bare-stream";
 import fetch from "bare-fetch";
-import { AbortController } from "bare-abort-controller";
 import { withTimeout } from "../../../../utils/withTimeout.js";
 import { getModelsCacheDir, getShardedModelCacheDir, generateShortHash, detectShardedModel, parsePatternBasedShardUrl, extractTensorsFromShards, calculatePercentage, isArchiveUrl, sanitizePathComponent, extractAndValidateShardedArchive, validateShardedModelCache, checkAllShardsExist, generateShardFilenames, hasValidGGUFHeader, } from "../../../utils/index.js";
 import { getSDKConfig } from "../../../bare/registry/config-registry.js";
-import { getActiveDownload, registerDownload, unregisterDownload, createHttpDownloadKey, shouldClearCache, clearClearCacheFlag, } from "./download-manager.js";
+import { createHttpDownloadKey, startOrJoinDownload, applyJoinedDownloadStats, } from "./download-manager.js";
 import { DownloadCancelledError, HTTPError, NoResponseBodyError, PartialDownloadOfflineError, ResponseBodyNotReadableError, } from "../../../../utils/errors-server.js";
 import { getServerLogger } from "../../../../logging/index.js";
 const logger = getServerLogger();
@@ -200,7 +199,7 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
             await new Promise((resolve, reject) => {
                 // Handle abort signal
                 const abortHandler = () => {
-                    const error = new Error("Download cancelled");
+                    const error = new DownloadCancelledError();
                     body.destroy();
                     writeStream.destroy();
                     reject(error);
@@ -324,51 +323,20 @@ export async function downloadModelFromHttp(url, progressCallback, hooks) {
         return downloadShardedModelFromHttp(url, progressCallback, hooks);
     }
     const downloadKey = createHttpDownloadKey(url);
-    const existing = getActiveDownload(downloadKey);
-    if (existing) {
-        logger.info(`📥 Reusing existing download for: ${downloadKey}`);
-        hooks?.markCacheMiss();
-        return existing.promise;
-    }
+    hooks?.onDownloadKey?.(downloadKey);
     const cacheDir = getModelsCacheDir();
     const sourceHash = generateShortHash(url);
     const modelPath = `${cacheDir}/${sourceHash}_${filename}`;
-    // Create managed download with AbortController
-    const abortController = new AbortController();
-    const downloadPromise = (async () => {
+    const result = startOrJoinDownload(downloadKey, async (ctx) => {
         try {
             // Check if already cached
-            const cachedPath = await validateCachedFile(modelPath, url, abortController.signal);
+            const cachedPath = await validateCachedFile(modelPath, url, ctx.signal);
             if (cachedPath) {
-                hooks?.markCacheHit();
-                if (progressCallback) {
-                    try {
-                        const stats = await fsPromises.stat(cachedPath);
-                        progressCallback({
-                            type: "modelProgress",
-                            downloaded: stats.size,
-                            total: stats.size,
-                            percentage: 100,
-                            downloadKey,
-                        });
-                    }
-                    catch (error) {
-                        logger.debug("Failed to get file stats for progress callback", {
-                            path: cachedPath,
-                            error,
-                        });
-                    }
-                }
-                return cachedPath;
-            }
-            // Download the file
-            hooks?.markCacheMiss();
-            await performHttpDownload(url, modelPath, downloadKey, progressCallback, abortController.signal);
-            // Send final 100% progress update
-            if (progressCallback) {
+                hooks?.markCacheHit?.();
+                ctx.setCacheHit(true);
                 try {
-                    const stats = await fsPromises.stat(modelPath);
-                    progressCallback({
+                    const stats = await fsPromises.stat(cachedPath);
+                    ctx.broadcastProgress({
                         type: "modelProgress",
                         downloaded: stats.size,
                         total: stats.size,
@@ -377,19 +345,40 @@ export async function downloadModelFromHttp(url, progressCallback, hooks) {
                     });
                 }
                 catch (error) {
-                    logger.debug("Failed to get file stats for final progress update", {
-                        path: modelPath,
+                    logger.debug("Failed to get file stats for progress callback", {
+                        path: cachedPath,
                         error,
                     });
                 }
+                return cachedPath;
+            }
+            // Download the file
+            hooks?.markCacheMiss?.();
+            ctx.setCacheHit(false);
+            await performHttpDownload(url, modelPath, downloadKey, ctx.broadcastProgress, ctx.signal);
+            try {
+                const stats = await fsPromises.stat(modelPath);
+                ctx.broadcastProgress({
+                    type: "modelProgress",
+                    downloaded: stats.size,
+                    total: stats.size,
+                    percentage: 100,
+                    downloadKey,
+                });
+            }
+            catch (error) {
+                logger.debug("Failed to get file stats for final progress update", {
+                    path: modelPath,
+                    error,
+                });
             }
             return modelPath;
         }
         catch (error) {
             logger.error("❌ Error downloading model:", error instanceof Error ? error.message : String(error));
             // Check if we should delete the partial file (clearCache was requested)
-            if (error instanceof Error && error.message === "Download cancelled") {
-                if (shouldClearCache(downloadKey)) {
+            if (error instanceof DownloadCancelledError) {
+                if (ctx.shouldClearCache()) {
                     logger.info("🗑️ Clearing cache - deleting partial file");
                     try {
                         await fsPromises.unlink(modelPath);
@@ -405,45 +394,22 @@ export async function downloadModelFromHttp(url, progressCallback, hooks) {
                 else {
                     logger.info("📥 Download paused - partial file preserved for resume");
                 }
-                clearClearCacheFlag(downloadKey);
             }
             const errorToThrow = error instanceof Error ? error : new Error(String(error));
             throw errorToThrow;
         }
-        finally {
-            // Cleanup from download manager
-            unregisterDownload(downloadKey);
-        }
-    })();
-    // Register download
-    const downloadEntry = {
-        key: downloadKey,
-        promise: downloadPromise,
-        abortController,
-        startTime: Date.now(),
-        type: "http",
-        url,
-        modelPath,
-        ...(progressCallback && { onProgress: progressCallback }),
-    };
-    registerDownload(downloadKey, downloadEntry);
-    return downloadPromise;
+    }, progressCallback);
+    return applyJoinedDownloadStats(result, hooks);
 }
 async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
     const config = getSDKConfig();
     const concurrency = config.httpDownloadConcurrency ?? DEFAULT_CONCURRENCY;
     const { shardUrls: shardInfos, cacheKey } = parsePatternBasedShardUrl(shardUrl);
     const downloadKey = `http-sharded:${cacheKey}`;
+    hooks?.onDownloadKey?.(downloadKey);
     logger.info(`📥 HTTP sharded download: ${shardInfos.length} shards detected from ${shardUrl}`);
-    const existing = getActiveDownload(downloadKey);
-    if (existing) {
-        logger.info(`📥 Reusing existing sharded download for: ${downloadKey}`);
-        hooks?.markCacheMiss();
-        return existing.promise;
-    }
-    const abortController = new AbortController();
     const shardDir = getShardedModelCacheDir(cacheKey);
-    const downloadPromise = (async () => {
+    const result = startOrJoinDownload(downloadKey, async (ctx) => {
         try {
             const shardStates = await Promise.all(shardInfos.map(async (shard, index) => {
                 const shardPath = path.join(shardDir, shard.filename);
@@ -451,7 +417,7 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
                 try {
                     const response = await fetch(shard.url, {
                         method: "HEAD",
-                        signal: abortController.signal,
+                        signal: ctx.signal,
                     });
                     expectedSize = parseInt(response.headers.get("content-length") || "0");
                 }
@@ -460,7 +426,6 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
                         url: shard.url,
                         error,
                     });
-                    // expectedSize remains 0, progress percentage will be 0
                 }
                 return {
                     index,
@@ -474,7 +439,7 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
             const overallTotal = shardStates.reduce((sum, s) => sum + s.expectedSize, 0);
             logger.info(`📏 Total size: ${overallTotal} bytes (${(overallTotal / 1024 / 1024).toFixed(2)} MB)`);
             const cacheChecks = await Promise.all(shardStates.map(async (state) => {
-                const cached = await validateCachedFile(state.shardPath, state.shard.url, abortController.signal);
+                const cached = await validateCachedFile(state.shardPath, state.shard.url, ctx.signal);
                 return { state, isCached: cached !== null };
             }));
             const shardsToDownload = cacheChecks
@@ -488,20 +453,22 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
             }
             logger.info(`📥 ${shardsToDownload.length} of ${shardInfos.length} shards need downloading`);
             if (shardsToDownload.length === 0) {
-                hooks?.markCacheHit();
+                hooks?.markCacheHit?.();
+                ctx.setCacheHit(true);
             }
             else {
-                hooks?.markCacheMiss();
+                hooks?.markCacheMiss?.();
+                ctx.setCacheHit(false);
             }
-            await downloadShardsWithConcurrency(shardsToDownload, shardStates, concurrency, abortController.signal, downloadKey, overallTotal, progressCallback);
+            await downloadShardsWithConcurrency(shardsToDownload, shardStates, concurrency, ctx.signal, downloadKey, overallTotal, ctx.broadcastProgress);
             logger.info(`✅ All ${shardInfos.length} shards downloaded successfully`);
             await extractTensorsFromShards(shardDir, shardInfos[0].filename);
             return path.join(shardDir, shardInfos[0].filename);
         }
         catch (error) {
             logger.error("❌ Error during sharded download:", error instanceof Error ? error.message : String(error));
-            if (error instanceof Error && error.message === "Download cancelled") {
-                if (shouldClearCache(downloadKey)) {
+            if (error instanceof DownloadCancelledError) {
+                if (ctx.shouldClearCache()) {
                     logger.info("🗑️ Clearing cache - deleting partial shard files");
                     try {
                         await fsPromises.rm(shardDir, { recursive: true, force: true });
@@ -517,50 +484,33 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
             }
             throw error;
         }
-        finally {
-            unregisterDownload(downloadKey);
-            clearClearCacheFlag(downloadKey);
-        }
-    })();
-    registerDownload(downloadKey, {
-        key: downloadKey,
-        promise: downloadPromise,
-        abortController,
-        startTime: Date.now(),
-        type: "http",
-        url: shardUrl,
-        modelPath: shardDir,
-    });
-    return downloadPromise;
+    }, progressCallback);
+    return applyJoinedDownloadStats(result, hooks);
 }
 async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hooks) {
     const filename = extractFilenameFromUrl(archiveUrl);
     const sourceHash = generateShortHash(archiveUrl);
     const downloadKey = `http-archive:${sourceHash}`;
+    hooks?.onDownloadKey?.(downloadKey);
     logger.info(`📦 HTTP archive download: ${filename}`);
-    const existing = getActiveDownload(downloadKey);
-    if (existing) {
-        logger.info(`📥 Reusing existing archive download for: ${downloadKey}`);
-        hooks?.markCacheMiss();
-        return existing.promise;
-    }
-    const abortController = new AbortController();
     const extractDir = getShardedModelCacheDir(sourceHash);
     const archivePath = path.join(extractDir, `${sourceHash}_${filename}`);
-    const downloadPromise = (async () => {
+    const result = startOrJoinDownload(downloadKey, async (ctx) => {
         try {
             await fsPromises.mkdir(extractDir, { recursive: true });
             const files = await fsPromises.readdir(extractDir);
             const shardedFile = files.find((f) => detectShardedModel(String(f)).isSharded);
             if (!shardedFile) {
-                hooks?.markCacheMiss();
+                hooks?.markCacheMiss?.();
+                ctx.setCacheHit(false);
                 return downloadAndExtractArchive();
             }
             const shardFilename = String(shardedFile);
             const allShardsExist = await checkAllShardsExist(extractDir, shardFilename);
             if (!allShardsExist) {
                 logger.warn(`⚠️ Incomplete shards found, re-downloading archive`);
-                hooks?.markCacheMiss();
+                hooks?.markCacheMiss?.();
+                ctx.setCacheHit(false);
                 return downloadAndExtractArchive();
             }
             const shardFilenames = generateShardFilenames(shardFilename);
@@ -568,53 +518,67 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
             const isComplete = await validateShardedModelCache(extractDir, shardFilename);
             if (isComplete) {
                 logger.info(`✅ Archive already extracted: ${extractDir}`);
-                hooks?.markCacheHit();
-                if (progressCallback) {
-                    progressCallback({
-                        type: "modelProgress",
-                        downloaded: 1,
-                        total: 1,
-                        percentage: 100,
-                        downloadKey,
-                    });
-                }
+                hooks?.markCacheHit?.();
+                ctx.setCacheHit(true);
+                ctx.broadcastProgress({
+                    type: "modelProgress",
+                    downloaded: 1,
+                    total: 1,
+                    percentage: 100,
+                    downloadKey,
+                });
                 return firstShard;
             }
             logger.info(`📝 All shards present but tensors.txt missing, extracting tensors...`);
             try {
                 await extractTensorsFromShards(extractDir, shardFilename);
                 logger.info(`✅ Tensors extracted successfully`);
-                hooks?.markCacheHit();
-                if (progressCallback) {
-                    progressCallback({
-                        type: "modelProgress",
-                        downloaded: 1,
-                        total: 1,
-                        percentage: 100,
-                        downloadKey,
-                    });
-                }
+                hooks?.markCacheHit?.();
+                ctx.setCacheHit(true);
+                ctx.broadcastProgress({
+                    type: "modelProgress",
+                    downloaded: 1,
+                    total: 1,
+                    percentage: 100,
+                    downloadKey,
+                });
                 return firstShard;
             }
             catch (error) {
                 logger.warn(`Failed to extract tensors, will re-download archive`, {
                     error,
                 });
-                hooks?.markCacheMiss();
+                hooks?.markCacheMiss?.();
+                ctx.setCacheHit(false);
                 return downloadAndExtractArchive();
             }
         }
         catch (error) {
             logger.error("❌ Error downloading/extracting archive:", error);
+            if (error instanceof DownloadCancelledError) {
+                if (ctx.shouldClearCache()) {
+                    logger.info("🗑️ Clearing cache - deleting archive extract directory");
+                    try {
+                        await fsPromises.rm(extractDir, {
+                            recursive: true,
+                            force: true,
+                        });
+                        logger.info(`✅ Deleted extract directory: ${extractDir}`);
+                    }
+                    catch (cleanupError) {
+                        logger.debug("Failed to delete extract directory during cleanup", {
+                            path: extractDir,
+                            error: cleanupError,
+                        });
+                    }
+                }
+            }
             throw error;
         }
-        finally {
-            unregisterDownload(downloadKey);
-        }
         async function downloadAndExtractArchive() {
-            await performHttpDownload(archiveUrl, archivePath, downloadKey, progressCallback, abortController.signal);
+            await performHttpDownload(archiveUrl, archivePath, downloadKey, ctx.broadcastProgress, ctx.signal);
             logger.info(`✅ Archive downloaded, extracting to: ${extractDir}`);
-            const firstShardPath = await extractAndValidateShardedArchive(archivePath, extractDir, abortController.signal);
+            const firstShardPath = await extractAndValidateShardedArchive(archivePath, extractDir, ctx.signal);
             try {
                 await fsPromises.unlink(archivePath);
                 logger.info(`🗑️ Cleaned up archive file: ${archivePath}`);
@@ -627,17 +591,8 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
             }
             return firstShardPath;
         }
-    })();
-    registerDownload(downloadKey, {
-        key: downloadKey,
-        promise: downloadPromise,
-        abortController,
-        startTime: Date.now(),
-        type: "http",
-        url: archiveUrl,
-        modelPath: archivePath,
-    });
-    return downloadPromise;
+    }, progressCallback);
+    return applyJoinedDownloadStats(result, hooks);
 }
 async function downloadShardsWithConcurrency(shardsToDownload, allShards, concurrency, signal, downloadKey, overallTotal, progressCallback) {
     const queue = [...shardsToDownload];

package/dist/server/rpc/handlers/load-model/hyperdrive.d.ts

@@ -1,5 +1,5 @@
 import type { ModelProgressUpdate } from "../../../../schemas/index";
-import type { DownloadMetricsHooks } from "./types";
+import type { DownloadHooks } from "./types";
 export declare function deleteCorestoreDirectory(corestoreDir: string): Promise<void>;
-export declare function downloadModelFromHyperdrive(hyperdriveKey: string, modelFileName: string, seed?: boolean, progressCallback?: (progress: ModelProgressUpdate) => void, hooks?: DownloadMetricsHooks, expectedChecksum?: string): Promise<string>;
+export declare function downloadModelFromHyperdrive(hyperdriveKey: string, modelFileName: string, seed?: boolean, progressCallback?: (progress: ModelProgressUpdate) => void, hooks?: DownloadHooks, expectedChecksum?: string): Promise<string>;
 //# sourceMappingURL=hyperdrive.d.ts.map