Merge remote-tracking branch 'origin/main' into feat/pay-v2-integration

# Conflicts:
#	docs/index.html
#	server/cmd/server/main.go

client/lib/widgets/account_screens.dart

@@ -98,7 +98,7 @@ class PlansScreen extends ConsumerWidget {
     Widget body() => plansAsync.when(
           loading: () => const Center(child: Padding(padding: EdgeInsets.all(40), child: CircularProgressIndicator())),
           error: (_, __) => Center(
-              child: Padding(padding: const EdgeInsets.all(40), child: Text(t.lang == AppLang.zh ? '加载失败,请重试' : 'Failed to load, retry', style: PangolinText.body.copyWith(color: c.fg3)))),
+              child: Padding(padding: const EdgeInsets.all(40), child: Text(t.lang.loadFailedRetry, style: PangolinText.body.copyWith(color: c.fg3)))),
           data: (plans) => ListView(
             padding: const EdgeInsets.fromLTRB(20, 14, 20, 24),
             children: [
@@ -140,13 +140,8 @@ class DevicesScreen extends ConsumerWidget {
 
   // 相对时间(最后登录);null → 从未登录。
   String _rel(DateTime? ts) {
-    final zh = t.lang == AppLang.zh;
     if (ts == null) return t.devNeverLogin;
-    final d = DateTime.now().difference(ts.toLocal());
-    if (d.inMinutes < 1) return zh ? '刚刚' : 'just now';
-    if (d.inMinutes < 60) return zh ? '${d.inMinutes} 分钟前' : '${d.inMinutes} min ago';
-    if (d.inHours < 24) return zh ? '${d.inHours} 小时前' : '${d.inHours}h ago';
-    return zh ? '${d.inDays} 天前' : '${d.inDays}d ago';
+    return t.lang.relativeTime(DateTime.now().difference(ts.toLocal()));
   }
 
   @override
@@ -158,12 +153,12 @@ class DevicesScreen extends ConsumerWidget {
     Widget content() => devicesAsync.when(
           loading: () => const Center(child: Padding(padding: EdgeInsets.all(40), child: CircularProgressIndicator())),
           error: (_, __) => Center(
-              child: Padding(padding: const EdgeInsets.all(40), child: Text(t.lang == AppLang.zh ? '加载失败,请重试' : 'Failed to load, retry', style: PangolinText.body.copyWith(color: c.fg3)))),
+              child: Padding(padding: const EdgeInsets.all(40), child: Text(t.lang.loadFailedRetry, style: PangolinText.body.copyWith(color: c.fg3)))),
           data: (devices) => ListView(padding: const EdgeInsets.fromLTRB(20, 4, 20, 24), children: [
             Text(t.devicesSub, style: PangolinText.caption.copyWith(color: c.fg3, fontWeight: FontWeight.w400)),
             const SizedBox(height: 12),
             if (devices.isEmpty)
-              Text(t.lang == AppLang.zh ? '暂无已登录设备' : 'No devices yet',
+              Text(t.lang.noDevices,
                   style: PangolinText.sm.copyWith(color: c.fg3))
             else
               Container(

client/lib/widgets/ad_reward_dialog.dart

@@ -0,0 +1,156 @@
+// ad_reward_dialog.dart — 免费额度耗尽后的「加时」入口(占位广告流程 + 桌面升级提示)
+//
+// 移动端:弹占位广告(「广告播放中…」→ 3s 假播放 → 调 /v1/ads/unlock 加时 → 显示奖励)。
+// 桌面端(Windows/macOS):免费版硬 10 分钟/天不可延,无广告——弹「去移动端看广告或升级」。
+// 接真广告 SDK(AdMob 激励视频)时,只需把 onWatch 换成「真播完再回调」即可,UI 不变。
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../l10n/app_text.dart';
+import '../pangolin_theme.dart';
+import '../state/app_providers.dart';
+import '../state/quota_provider.dart';
+import 'pangolin_icons.dart';
+
+/// 展示加时流程。isDesktop=true 走升级提示(无广告),否则走占位广告加时。
+Future<void> showQuotaAdFlow(BuildContext context, WidgetRef ref, {required bool isDesktop}) async {
+  final t = ref.read(appTextProvider);
+  if (isDesktop) {
+    await showDialog<void>(context: context, builder: (_) => _DesktopUpgradeDialog(t: t));
+    return;
+  }
+  await showDialog<void>(
+    context: context,
+    barrierDismissible: false,
+    builder: (_) => _PlaceholderAdDialog(
+      t: t,
+      onWatch: () => ref.read(quotaProvider.notifier).watchAd(),
+    ),
+  );
+}
+
+/// 桌面版:免费硬 10 分钟不可延,提示去移动端加时或升级会员。
+class _DesktopUpgradeDialog extends StatelessWidget {
+  const _DesktopUpgradeDialog({required this.t});
+  final AppText t;
+
+  @override
+  Widget build(BuildContext context) {
+    final c = context.pangolin;
+    return AlertDialog(
+      backgroundColor: c.surface,
+      title: Text(t.quotaDesktopTitle,
+          style: PangolinText.body.copyWith(color: c.fg1, fontWeight: FontWeight.w700)),
+      content: Text(t.quotaDesktopBody, style: PangolinText.sm.copyWith(color: c.fg2)),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: Text(t.gotIt, style: PangolinText.sm.copyWith(color: c.accent, fontWeight: FontWeight.w700)),
+        ),
+      ],
+    );
+  }
+}
+
+enum _AdPhase { playing, done, failed }
+
+/// 移动端占位激励广告:播放中 → 加时成功/失败。成功后短暂展示奖励再自动关闭。
+class _PlaceholderAdDialog extends StatefulWidget {
+  const _PlaceholderAdDialog({required this.t, required this.onWatch});
+  final AppText t;
+  final Future<int?> Function() onWatch;
+
+  @override
+  State<_PlaceholderAdDialog> createState() => _PlaceholderAdDialogState();
+}
+
+class _PlaceholderAdDialogState extends State<_PlaceholderAdDialog> {
+  _AdPhase _phase = _AdPhase.playing;
+  int _granted = 0;
+  Timer? _closeTimer;
+
+  @override
+  void initState() {
+    super.initState();
+    _run();
+  }
+
+  Future<void> _run() async {
+    // 占位「播放」3s(接真 SDK 后由激励视频完成回调替代)。
+    await Future<void>.delayed(const Duration(seconds: 3));
+    if (!mounted) return;
+    final granted = await widget.onWatch();
+    if (!mounted) return;
+    setState(() {
+      if (granted != null && granted > 0) {
+        _phase = _AdPhase.done;
+        _granted = granted;
+      } else {
+        _phase = _AdPhase.failed;
+      }
+    });
+    if (_phase == _AdPhase.done) {
+      _closeTimer = Timer(const Duration(milliseconds: 1300), () {
+        if (mounted) Navigator.of(context).pop();
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _closeTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final c = context.pangolin;
+    final t = widget.t;
+
+    Widget body;
+    switch (_phase) {
+      case _AdPhase.playing:
+        body = Column(mainAxisSize: MainAxisSize.min, children: [
+          SizedBox(
+            width: 34,
+            height: 34,
+            child: CircularProgressIndicator(color: c.accent, strokeWidth: 3),
+          ),
+          const SizedBox(height: 16),
+          Text(t.adPlaying, style: PangolinText.sm.copyWith(color: c.fg2, fontWeight: FontWeight.w600)),
+        ]);
+      case _AdPhase.done:
+        body = Column(mainAxisSize: MainAxisSize.min, children: [
+          Icon(PangolinIcons.checkCircle, size: 40, color: c.success),
+          const SizedBox(height: 14),
+          Text(t.adRewarded(_granted),
+              style: PangolinText.body.copyWith(color: c.success, fontWeight: FontWeight.w700)),
+        ]);
+      case _AdPhase.failed:
+        body = Column(mainAxisSize: MainAxisSize.min, children: [
+          Icon(PangolinIcons.alertTriangle, size: 36, color: c.danger),
+          const SizedBox(height: 14),
+          Text(t.adFailed, style: PangolinText.sm.copyWith(color: c.fg2, fontWeight: FontWeight.w600)),
+          const SizedBox(height: 14),
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: Text(t.gotIt, style: PangolinText.sm.copyWith(color: c.accent, fontWeight: FontWeight.w700)),
+          ),
+        ]);
+    }
+
+    return Dialog(
+      backgroundColor: c.surface,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(PangolinRadius.lg)),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 28),
+        child: AnimatedSize(
+          duration: PangolinMotion.base,
+          child: body,
+        ),
+      ),
+    );
+  }
+}

client/lib/widgets/adaptive_menu.dart

@@ -167,7 +167,7 @@ class _MenuCard extends StatelessWidget {
       child: Material(
         color: c.surface,
         elevation: 6,
-        shadowColor: Colors.black26,
+        shadowColor: PangolinColors.sand950.withValues(alpha: 0.24), // 暖近黑阴影(§5;非冷黑 Colors.black26)
         clipBehavior: Clip.antiAlias,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(PangolinRadius.md),

client/lib/widgets/auth_screen.dart

@@ -39,7 +39,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen>
   bool _sent = false;
   bool _loading = false;
   bool _pwVisible = false;
-  String? _errorZh;
+  String? _error;
 
   final _email = TextEditingController();
   final _code = TextEditingController();
@@ -90,17 +90,17 @@ class _AuthScreenState extends ConsumerState<AuthScreen>
   // ── 认证操作（逻辑不变）──────────────────────────────────────────
 
   Future<void> _sendCode() async {
-    setState(() { _loading = true; _errorZh = null; });
+    setState(() { _loading = true; _error = null; });
     try {
       await _api.sendCode(_email.text.trim());
       if (mounted) setState(() { _sent = true; _loading = false; });
     } on AuthApiException catch (e) {
-      if (mounted) setState(() { _errorZh = e.messageZh; _loading = false; });
+      if (mounted) setState(() { _error = widget.t.lang == AppLang.zh ? e.messageZh : e.messageEn; _loading = false; });
     }
   }
 
   Future<void> _doRegister() async {
-    setState(() { _loading = true; _errorZh = null; });
+    setState(() { _loading = true; _error = null; });
     try {
       final device = (await ref.read(deviceIdentityProvider).meta()).toJson();
       final tokens = await _api.register(
@@ -113,12 +113,12 @@ class _AuthScreenState extends ConsumerState<AuthScreen>
       await ref.read(authProvider.notifier).saveTokens(tokens);
       if (mounted) widget.onDone();
     } on AuthApiException catch (e) {
-      if (mounted) setState(() { _errorZh = e.messageZh; _loading = false; });
+      if (mounted) setState(() { _error = widget.t.lang == AppLang.zh ? e.messageZh : e.messageEn; _loading = false; });
     }
   }
 
   Future<void> _doLogin() async {
-    setState(() { _loading = true; _errorZh = null; });
+    setState(() { _loading = true; _error = null; });
     try {
       final device = (await ref.read(deviceIdentityProvider).meta()).toJson();
       final tokens = await _api.login(
@@ -132,7 +132,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen>
       ref.read(deviceLimitProvider.notifier).state = tokens.deviceLimit;
       if (mounted) widget.onDone();
     } on AuthApiException catch (e) {
-      if (mounted) setState(() { _errorZh = e.messageZh; _loading = false; });
+      if (mounted) setState(() { _error = widget.t.lang == AppLang.zh ? e.messageZh : e.messageEn; _loading = false; });
     }
   }
 
@@ -167,7 +167,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen>
         _mode = m;
         _step = 0;
         _sent = false;
-        _errorZh = null;
+        _error = null;
       });
 
   // ── UI ──────────────────────────────────────────────────────
@@ -278,7 +278,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen>
         child: Column(children: [
           _segTabs(c, t),
           const SizedBox(height: 22),
-          if (_errorZh != null) ...[
+          if (_error != null) ...[
             Container(
               padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
               decoration: BoxDecoration(
@@ -289,7 +289,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen>
               child: Row(children: [
                 Icon(PangolinIcons.x, size: 16, color: c.danger),
                 const SizedBox(width: 8),
-                Expanded(child: Text(_errorZh!, style: PangolinText.sm.copyWith(color: c.danger))),
+                Expanded(child: Text(_error!, style: PangolinText.sm.copyWith(color: c.danger))),
               ]),
             ),
             const SizedBox(height: 14),
@@ -457,7 +457,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen>
               style: PangolinText.sm.copyWith(color: c.fg1, fontWeight: FontWeight.w600))),
           GestureDetector(
             onTap: () => setState(() => _step = 0),
-            child: Text(t.lang == AppLang.zh ? '改邮箱' : 'Change',
+            child: Text(t.lang.changeEmail,
                 style: PangolinText.caption.copyWith(color: c.accent, fontWeight: FontWeight.w600, fontSize: 13)),
           ),
         ]),

client/lib/widgets/connect_button.dart

@@ -24,11 +24,19 @@ class ConnectButton extends StatefulWidget {
     required this.secureLabel,
     this.elapsed = Duration.zero,
     this.size = 208,
+    this.enabled = true,
+    this.onDisabledTap,
   });
 
   final VpnPhase phase;
   final VoidCallback onTap;
 
+  /// 是否可点。免费额度耗尽时置 false → 灰化不可连,点击走 onDisabledTap。
+  final bool enabled;
+
+  /// 灰化态被点击的回调(如弹看广告加时/升级)。enabled=false 时生效。
+  final VoidCallback? onDisabledTap;
+
   /// off 态圆内文字(如「点击连接」/「CONNECT」)。
   final String offLabel;
 
@@ -55,18 +63,26 @@ class _ConnectButtonState extends State<ConnectButton> with SingleTickerProvider
   Widget build(BuildContext context) {
     final c = context.pangolin;
     final s = widget.phase;
+    // 免费额度耗尽:off 态灰化不可连(锁图标 + 柔和阴影),点击走 onDisabledTap。
+    final disabled = !widget.enabled && s == VpnPhase.off;
 
-    final Color fill = switch (s) {
-      VpnPhase.off => c.bgSubtle,
-      VpnPhase.connecting => c.accent,
-      VpnPhase.on => c.success,
-    };
-    final Color fg = s == VpnPhase.off ? c.accent : PangolinColors.white;
-    final IconData icon = switch (s) {
-      VpnPhase.off => PangolinIcons.power,
-      VpnPhase.connecting => PangolinIcons.loader,
-      VpnPhase.on => PangolinIcons.shieldCheck,
-    };
+    final Color fill = disabled
+        ? c.bgSubtle
+        : switch (s) {
+            VpnPhase.off => c.bgSubtle,
+            VpnPhase.connecting => c.accent,
+            VpnPhase.on => c.success,
+          };
+    final Color fg = disabled
+        ? c.fg3
+        : (s == VpnPhase.off ? c.accent : PangolinColors.white);
+    final IconData icon = disabled
+        ? PangolinIcons.lock
+        : switch (s) {
+            VpnPhase.off => PangolinIcons.power,
+            VpnPhase.connecting => PangolinIcons.loader,
+            VpnPhase.on => PangolinIcons.shieldCheck,
+          };
 
     // off 用柔和阴影;connecting/on 增加同色光晕环(box-shadow,不动背景计算)。
     final List<BoxShadow> glow = s == VpnPhase.off
@@ -84,7 +100,7 @@ class _ConnectButtonState extends State<ConnectButton> with SingleTickerProvider
       button: true,
       label: widget.offLabel,
       child: GestureDetector(
-        onTap: widget.onTap,
+        onTap: disabled ? widget.onDisabledTap : widget.onTap,
         child: AnimatedContainer(
           duration: PangolinMotion.slow,
           curve: PangolinMotion.easeOut,

client/lib/widgets/quota_card.dart

@@ -1,7 +1,10 @@
-// quota_card.dart — 免费版每日额度卡(纯展示)
+// quota_card.dart — 免费版每日额度卡
 //
-// 今日剩余分钟 + 进度条(≤3 分钟切 warning 色)+「看广告开始使用」;
-// 解锁后变绿「已解锁 · 今日可用」。状态由 quota_provider 注入,本地仅展示。
+// 三态展示(额度全账户共享):
+//   ① 连接中(countdown != null):显示剩余倒计时 mm:ss + 进度条随之收缩。
+//   ② 未连接·有余额:显示今日剩余分钟 + 进度条;移动端附「看广告加时」。
+//   ③ 未连接·已耗尽:显示「今日已用完」+ 移动端「看广告加时」/ 桌面「升级会员」。
+// 状态由 quota_provider(剩余)+ connection_provider(倒计时)注入,本地仅展示。
 import 'package:flutter/material.dart';
 
 import '../l10n/app_text.dart';
@@ -10,16 +13,55 @@ import '../state/quota_provider.dart';
 import 'pangolin_icons.dart';
 
 class QuotaCard extends StatelessWidget {
-  const QuotaCard({super.key, required this.quota, required this.t, required this.onWatchAd});
+  const QuotaCard({
+    super.key,
+    required this.quota,
+    required this.t,
+    required this.onWatchAd,
+    this.countdown,
+    this.isDesktop = false,
+  });
 
   final FreeQuotaState quota;
   final AppText t;
+
+  /// 额度耗尽时的加时入口(移动端占位广告 / 桌面升级提示)。
   final VoidCallback onWatchAd;
 
+  /// 连接期剩余倒计时;null = 未连接(展示今日剩余分钟)。
+  final Duration? countdown;
+
+  /// 桌面端(Windows/macOS):免费硬 10 分钟不可延,不显示看广告按钮。
+  final bool isDesktop;
+
+  static String _mmss(Duration d) {
+    final m = d.inMinutes.remainder(60).toString().padLeft(2, '0');
+    final s = d.inSeconds.remainder(60).toString().padLeft(2, '0');
+    return '$m:$s';
+  }
+
   @override
   Widget build(BuildContext context) {
     final c = context.pangolin;
-    final barColor = quota.isLow ? c.warning : c.accent;
+    final connected = countdown != null;
+    final exhausted = quota.isExhausted && !connected;
+
+    // 进度与主值:连接期用倒计时,未连接用剩余分钟。
+    final double progress;
+    final String label;
+    final String value;
+    if (connected) {
+      final totalSec = quota.totalMinutes * 60;
+      progress = totalSec == 0 ? 0 : (countdown!.inSeconds / totalSec).clamp(0.0, 1.0);
+      label = t.quotaLeftLabel;
+      value = _mmss(countdown!);
+    } else {
+      progress = quota.progress;
+      label = exhausted ? t.quotaUsedUp : t.quotaToday;
+      value = exhausted ? '' : '${quota.remainingMinutes} ${t.minutes}';
+    }
+    final low = connected ? countdown!.inMinutes < 3 : quota.isLow;
+    final barColor = exhausted ? c.danger : (low ? c.warning : c.accent);
 
     return Container(
       padding: const EdgeInsets.fromLTRB(14, 12, 14, 12),
@@ -33,23 +75,32 @@ class QuotaCard extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
           Row(children: [
-            Icon(PangolinIcons.clock, size: 15, color: c.accent),
+            Icon(PangolinIcons.clock, size: 15, color: exhausted ? c.danger : c.accent),
             const SizedBox(width: 7),
-            Text(t.quotaToday,
+            // 标签固定、绝不省略(此前用 Flexible 让「今日剩余」被挤成「今日…」)。
+            Text(label,
                 style: PangolinText.caption.copyWith(color: c.fg2, fontWeight: FontWeight.w600, fontSize: 12)),
-            const SizedBox(width: 7),
-            Text('${quota.remainingMinutes} ${t.minutes}',
-                style: PangolinText.mono.copyWith(color: c.fg1, fontSize: 14, fontWeight: FontWeight.w600)),
+            if (value.isNotEmpty) ...[
+              const SizedBox(width: 7),
+              // 数值可作为最后收缩项(极端窄屏/三位数分钟才会省略)。
+              Flexible(
+                child: Text(value,
+                    overflow: TextOverflow.ellipsis,
+                    style: PangolinText.mono.copyWith(color: c.fg1, fontSize: 14, fontWeight: FontWeight.w600)),
+              ),
+            ],
+            const SizedBox(width: 8),
             const Spacer(),
+            // 短标签「免费版」——每日额度由卡片本身表达,不再挤进右上角。
             Container(
               padding: const EdgeInsets.symmetric(horizontal: 9, vertical: 3),
               decoration: BoxDecoration(color: c.bgSubtle, borderRadius: BorderRadius.circular(PangolinRadius.full)),
-              child: Text(t.quotaFree,
+              child: Text(t.planFreeTag,
                   style: PangolinText.caption.copyWith(color: c.fg3, fontWeight: FontWeight.w600, fontSize: 10.5)),
             ),
           ]),
           const SizedBox(height: 9),
-          // 进度条:剩余比例;≤3 分钟切 warning 色(满宽轨道 + 比例填充)
+          // 进度条:剩余比例;≤3 分钟 warning、耗尽 danger(满宽轨道 + 比例填充)。
           ClipRRect(
             borderRadius: BorderRadius.circular(3),
             child: SizedBox(
@@ -58,7 +109,7 @@ class QuotaCard extends StatelessWidget {
                 Positioned.fill(child: ColoredBox(color: c.bgSubtle)),
                 FractionallySizedBox(
                   alignment: Alignment.centerLeft,
-                  widthFactor: quota.progress,
+                  widthFactor: progress,
                   child: AnimatedContainer(
                     duration: PangolinMotion.base,
                     curve: PangolinMotion.easeOut,
@@ -68,30 +119,25 @@ class QuotaCard extends StatelessWidget {
               ]),
             ),
           ),
-          const SizedBox(height: 11),
-          if (quota.adUnlocked)
-            SizedBox(
-              height: 38,
-              child: Center(
-                child: Row(mainAxisSize: MainAxisSize.min, children: [
-                  Icon(PangolinIcons.checkCircle, size: 16, color: c.success),
-                  const SizedBox(width: 7),
-                  Text(t.adUnlocked,
-                      style: PangolinText.sm.copyWith(color: c.success, fontWeight: FontWeight.w700, fontSize: 13)),
-                ]),
-              ),
-            )
-          else
-            _WatchAdButton(t: t, onTap: onWatchAd),
+          // 加时按钮:未连接时显示。移动端「看广告加时」;桌面仅耗尽时给「升级会员」。
+          if (!connected && (!isDesktop || exhausted)) ...[
+            const SizedBox(height: 11),
+            _ActionButton(
+              label: isDesktop ? t.upgrade : t.watchAdMore,
+              icon: isDesktop ? PangolinIcons.zap : PangolinIcons.playCircle,
+              onTap: onWatchAd,
+            ),
+          ],
         ],
       ),
     );
   }
 }
 
-class _WatchAdButton extends StatelessWidget {
-  const _WatchAdButton({required this.t, required this.onTap});
-  final AppText t;
+class _ActionButton extends StatelessWidget {
+  const _ActionButton({required this.label, required this.icon, required this.onTap});
+  final String label;
+  final IconData icon;
   final VoidCallback onTap;
 
   @override
@@ -107,9 +153,9 @@ class _WatchAdButton extends StatelessWidget {
           height: 38,
           child: Center(
             child: Row(mainAxisSize: MainAxisSize.min, children: [
-              Icon(PangolinIcons.playCircle, size: 16, color: c.accent),
+              Icon(icon, size: 16, color: c.accent),
               const SizedBox(width: 7),
-              Text(t.watchAd,
+              Text(label,
                   style: PangolinText.sm.copyWith(color: c.accent, fontWeight: FontWeight.w700, fontSize: 13)),
             ]),
           ),

client/lib/widgets/server_tile.dart

@@ -44,7 +44,7 @@ class ServerTile extends StatelessWidget {
   Widget build(BuildContext context) {
     final c = context.pangolin;
     final down = node.isDown; // 节点不可用(agent 离线):置灰 + 「不可用」+ 禁选。
-    final unavail = lang == AppLang.zh ? '不可用' : 'Unavailable';
+    final unavail = lang.unavailable;
     return InkWell(
       onTap: down ? null : onTap,
       child: Opacity(

client/lib/widgets/update_dialog.dart

@@ -0,0 +1,139 @@
+// update_dialog.dart — 「发现新版本」更新提示弹窗。
+//
+// 点「下载更新」走 App 内下载安装(core/update/app_updater.dart,带进度框,不再开
+// 浏览器);Android 装 APK、Windows 跑安装包、macOS 解压提示拖入、iOS 降级外链。
+// force_update=true 时不可关闭(无「稍后」按钮、点遮罩/返回也关不掉)。
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../core/update/app_updater.dart';
+import '../l10n/app_text.dart';
+import '../pangolin_theme.dart';
+import '../state/app_providers.dart';
+import '../state/update_provider.dart';
+import 'pangolin_icons.dart';
+
+/// 展示更新弹窗。调用方(设置页「检查更新」)在拿到 `info.hasUpdate == true` 时调用。
+Future<void> showUpdateDialog(BuildContext context, AppText t, AppUpdateInfo info) {
+  return showDialog<void>(
+    context: context,
+    barrierDismissible: !info.forceUpdate,
+    builder: (ctx) => PopScope(
+      canPop: !info.forceUpdate,
+      child: _UpdateDialog(t: t, info: info),
+    ),
+  );
+}
+
+class _UpdateDialog extends StatelessWidget {
+  const _UpdateDialog({required this.t, required this.info});
+  final AppText t;
+  final AppUpdateInfo info;
+
+  @override
+  Widget build(BuildContext context) {
+    final c = context.pangolin;
+    return AlertDialog(
+      backgroundColor: c.surface,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(PangolinRadius.xl)),
+      title: Row(children: [
+        Container(
+          width: 34,
+          height: 34,
+          decoration: BoxDecoration(color: c.accentSubtle, shape: BoxShape.circle),
+          child: Icon(PangolinIcons.zap, size: 18, color: c.accent),
+        ),
+        const SizedBox(width: 12),
+        Expanded(
+          child: Text(
+            t.updateAvailableTitle(info.latestVersion),
+            overflow: TextOverflow.ellipsis,
+            style: PangolinText.body.copyWith(color: c.fg1, fontWeight: FontWeight.w700),
+          ),
+        ),
+      ]),
+      content: SingleChildScrollView(
+        child: Text(
+          info.releaseNotes.isEmpty ? t.updateNotesFallback : info.releaseNotes,
+          style: PangolinText.sm.copyWith(color: c.fg2, height: 1.5),
+        ),
+      ),
+      actions: [
+        if (!info.forceUpdate)
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: Text(t.updateLater, style: PangolinText.sm.copyWith(color: c.fg2, fontWeight: FontWeight.w600)),
+          ),
+        TextButton(
+          onPressed: () {
+            // 先关本弹窗,用 Navigator 自身 context(关后仍挂载)启动 App 内下载
+            // (它自带进度框)。
+            final nav = Navigator.of(context);
+            nav.pop();
+            unawaited(startInAppUpdate(nav.context, t, info));
+          },
+          child: Text(t.updateDownload, style: PangolinText.sm.copyWith(color: c.accent, fontWeight: FontWeight.w700)),
+        ),
+      ],
+    );
+  }
+}
+
+/// jiu 式顶部更新横条(非强制更新用;强制更新仍走不可关闭弹窗 showUpdateDialog)。
+/// 「立即更新」App 内下载安装;「×」忽略此版本(banner 隐藏,更新版本会重现)。
+class UpdateBanner extends ConsumerWidget {
+  const UpdateBanner({super.key, required this.info});
+  final AppUpdateInfo info;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final c = context.pangolin;
+    final t = ref.watch(appTextProvider);
+    return Material(
+      color: c.accentSubtle,
+      child: SafeArea(
+        bottom: false,
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(14, 8, 6, 8),
+          child: Row(children: [
+            Icon(PangolinIcons.zap, size: 17, color: c.accent),
+            const SizedBox(width: 10),
+            Expanded(
+              child: Text(
+                t.updateAvailableTitle(info.latestVersion),
+                style: PangolinText.sm.copyWith(color: c.fg1, fontWeight: FontWeight.w700),
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+            const SizedBox(width: 8),
+            TextButton(
+              onPressed: () => unawaited(startInAppUpdate(context, t, info)),
+              style: TextButton.styleFrom(
+                backgroundColor: c.accent,
+                foregroundColor: c.fgOnAccent,
+                padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 6),
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(PangolinRadius.full)),
+                minimumSize: Size.zero,
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+              ),
+              child: Text(t.lang.updateNow,
+                  style: PangolinText.caption
+                      .copyWith(fontWeight: FontWeight.w700, fontSize: 12.5)),
+            ),
+            IconButton(
+              onPressed: () =>
+                  ref.read(dismissedUpdateVersionProvider.notifier).state = info.latestVersion,
+              icon: Icon(Icons.close, size: 18, color: c.fg3),
+              padding: EdgeInsets.zero,
+              constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
+              tooltip: t.updateLater,
+            ),
+          ]),
+        ),
+      ),
+    );
+  }
+}