Merge branch 'main' into codex/fix-settings-script-path-picker

ui/flutter/lib/shared/widgets/app_loading_button.dart

@@ -30,7 +30,15 @@ class AppLoadingButton extends StatelessWidget {
     final palette = AppPalette.of(context);
     final replaceChild = loading && icon == null;
     final leading = loading && icon != null ? _LoadingIcon(variant: variant) : icon;
-    final effectiveChild = replaceChild ? _LoadingIcon(variant: variant) : child;
+    final effectiveChild = replaceChild
+        ? Stack(
+            alignment: Alignment.center,
+            children: [
+              ExcludeSemantics(child: Opacity(opacity: 0, child: child)),
+              Positioned.fill(child: _LoadingIcon(variant: variant)),
+            ],
+          )
+        : child;
     final content = leading == null
         ? effectiveChild
         : Row(

ui/flutter/lib/shared/widgets/app_number_input.dart

@@ -2,6 +2,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart' as shad;
 
+import '../theme/app_design_tokens.dart';
 import 'app_text_field.dart';
 
 /// A bounded numeric text field with the app's standard spinner controls.
@@ -91,6 +92,7 @@ class _AppNumberInputState extends State<AppNumberInput> {
           : TextInputType.number,
       inputFormatters: formatters,
       enabled: widget.enabled,
+      padding: AppDesignTokens.numberTextFieldPadding,
       features: [
         shad.InputFeature.spinner(
           step: widget.step,