Merge remote-tracking branch 'origin/main' into fold-integration

# Conflicts:
#	scripts/scan_packages_baseline.json

studio/frontend/src/components/assistant-ui/model-selector/model-update-action.tsx

@@ -42,10 +42,8 @@ export function ModelUpdateAction({
 }: ModelUpdateActionProps) {
   const [open, setOpen] = useState(false);
 
-  // The update is a managed download (it surfaces in the global Downloads panel
-  // with progress + cancel). When this exact repo+variant finishes, refresh the
-  // caller so the "update available" cue clears once the new revision is on
-  // disk. A ref keeps the subscription stable across renders without resubscribing.
+  // Refresh the caller when this repo+variant's download finishes so the "update available" cue
+  // clears. A ref keeps the subscription stable across renders.
   const onUpdatedRef = useRef(onUpdated);
   onUpdatedRef.current = onUpdated;
   useEffect(() => {
@@ -60,9 +58,8 @@ export function ModelUpdateAction({
   }, [repoId, variant]);
 
   const handleConfirm = useCallback(() => {
-    // Start the background re-download and close the dialog immediately; the
-    // Downloads panel owns progress + cancel from here. Only a failure to START
-    // surfaces a toast — a failed download reports itself in the panel.
+    // Start the re-download and close the dialog; the Downloads panel owns progress + cancel.
+    // Only a failure to START toasts (a failed download shows in the panel).
     void Promise.resolve()
       .then(onConfirm)
       .catch((err) => {

studio/frontend/src/components/assistant-ui/model-selector/pickers.tsx

@@ -1505,11 +1505,8 @@ export function HubModelPicker({
   catalog?: CatalogGroup[];
 }) {
   const gpu = useGpuInfo();
-  // The currently-loaded/running model id. We read params.checkpoint from the
-  // runtime store (backend-mirrored from /api/inference/status.active_model, see
-  // chat-runtime-store) rather than the dropdown `isSelected` highlight (which is
-  // just `value === repo_id` and can reflect a staged, not-yet-loaded pick). Used
-  // to disable the cached-row update action for the model that's live in memory.
+  // Live model id from the runtime store (backend-mirrored active_model), not the dropdown
+  // highlight which can be a staged pick. Disables the update action for it.
   const loadedModelId = useChatRuntimeStore((s) => s.params.checkpoint);
   // Last-loaded timestamps power the "Recent" sort (vs "Downloaded" = file date).
   const loadTimes = useModelLoadTimes(value);
@@ -1849,11 +1846,8 @@ export function HubModelPicker({
     refreshLocalModelsList();
   }, [hfToken, refreshLocalModelsList]);
 
-  // Updates run as MANAGED downloads (they show in the global Downloads panel
-  // with manifest-based progress + a working Cancel), instead of a blocking
-  // call. The worker re-resolves `main` and pulls only changed blobs, so the
-  // cached copy stays usable until the new revision lands. The row's
-  // ModelUpdateAction refreshes the list when this repo+variant completes.
+  // Updates run as managed downloads (Downloads panel: progress + Cancel), not a blocking
+  // call. The worker pulls only changed blobs, so the cached copy stays usable until done.
   const startManagedUpdate = useCallback((repoId: string, variant: string, expectedBytes: number) => {
     return downloadManager
       .requestStart({

studio/frontend/src/components/floating-monitor.tsx

@@ -27,9 +27,11 @@ function usageTextClass(percent: number): string {
   return "text-primary";
 }
 
-function formatGb(value: number): string {
+function formatGiB(value: number): string {
+  // RAM/VRAM come from the backend in binary units (bytes / 1024**3), matching
+  // nvidia-smi and PyTorch, so label the readout GiB rather than GB.
   const digits = value >= 10 ? 1 : 2;
-  return `${value.toFixed(digits)} GB`;
+  return `${value.toFixed(digits)} GiB`;
 }
 
 export function FloatingMonitor() {
@@ -116,7 +118,7 @@ export function FloatingMonitor() {
               </span>
             </div>
             <div className="text-xs text-muted-foreground font-mono tabular-nums">
-              {formatGb(ramUsed)} / {formatGb(ramTotal)}
+              {formatGiB(ramUsed)} / {formatGiB(ramTotal)}
             </div>
             <Progress
               value={ramPercent}
@@ -144,7 +146,7 @@ export function FloatingMonitor() {
                 </span>
               </div>
               <div className="text-xs text-muted-foreground font-mono tabular-nums">
-                {formatGb(vramUsed)} / {formatGb(vramTotal)}
+                {formatGiB(vramUsed)} / {formatGiB(vramTotal)}
               </div>
               <Progress
                 value={vramPercent}