fix(m161): 收更新键/按钮/矮窗口/启动错误/导入结果五笔债

① update.auto_check / update.channel 登记进 core setting schema（1.6.0） - 新增 setting/keys/update.rs（两键 + UPDATE_CHANNELS，只允许 stable）； SettingSchema 加 with_all 供域键表批量登记。 - 新增 setting/update_prefs.rs：cache/update/prefs.json → launcher.json 的一次性迁移。四条硬约束：源指纹闸门（幂等）、不丢 false、新值胜出、旧文件改名 .migrated 后不再被读；主配置不可写时不动旧文件。收据 config/update-prefs-migration.json。 - presenter Runtime 建会话时迁一次并把结局留在 migration()；prefs 字段换成 auto_check + 每次派发从主配置读 channel（不再硬编码 Channel::Stable）。保留旧字段 auto_check 的真实来源（原有测试 cases 会断言）。 - CLI config get/set/dump 先跑同一次迁移（幂等），输出里给 migration 段与收据路径。 ② presenter/dto/events.rs 的「本次会话不再弹提示条」注释改成真实语义（记的是版本号：同版本压住、更高版本照弹、手动检查清掉）。 ③ 检查/下载进行中按钮禁用：pages/update/busy.rs 的 busy/can_check/can_apply；设置页两颗按钮改画禁用（不是消失），app 层 on_update_action 再挡一道（忙碌时 CheckNow/Apply 不派发）；新增两条用例（含「忙完恢回可点」）。 ④ 内容库低高度：content_layout::MIN_BODY_HEIGHT=460 + BodyMode（按固定件+三整行算出来，用例守着算式）；frame::body_height 从 Ui::metrics 算正文可用高，pages::Model 带 window_height。 ≥460 列表自己滚；<460 主列整列一个滚动条、列表按自然高度铺开。 ⑤ 启动错误文案本地化：presenter 删掉 launch_summary / 「启动失败：」前缀 / 五条中文阶段前缀，改发 LaunchFailureView{stage,detail}；LaunchFinished 改带 exit_code/uptime_ms/failure， Toast 由 app 层按 i18n key 现求（与 install_cancelled 同构）。InstancesFailed 拆成 InstancesFailedStage（列表单行）+ LaunchStageFailed（详情/Toast 全文）。 ⑥ 导入结果块：ImportReportView 加 failure_stage（NotStarted/RolledBack/RollbackIncomplete，由 core 的 rollback 机器位推出）；标题、图标、底色三处分档，预检失败不再说「已回滚」。顺带：六处注释/文档漂移（update.rs 的分工表与偏好落点、pack 的「已整包回滚」、 build_request 的 Errors、settings/update 的按钮禁用说明等），以及为守 400 行把 update/cli-config/core-keys/presenter-dto/presenter-launch/i18n-golden 里贴线或越线的文件按模块拆开（纯搬移，行为不变）。
2026-11-07 15:02:13 +08:00
1 parent b2d9f3927f
commit 03741ecd2d
@@ -17,16 +17,22 @@ use unlucky_core::game::{self, VersionJson};
 use unlucky_core::launch::adapter::{
    self, AdapterOptions, AdapterWarning, LibraryInput, SnapshotInput,
 };
-use unlucky_core::launch::request::{JavaSelection, LaunchRequest, MemoryOptions};
+use unlucky_core::launch::request::{LaunchRequest, MemoryOptions};
 use unlucky_core::launch::time::{format_rfc3339_millis, now};
 use unlucky_core::launch::tree_kill;
 use unlucky_core::launch::{Launcher, LauncherConfig};
-use unlucky_core::platform::paths::ProcessEnv;

-use crate::dto::{InstanceId, InstanceRuntime, LaunchFinished, LaunchStage, LogOutcome, Progress};
+use crate::dto::{
+    InstanceId, InstanceRuntime, LaunchFailureStage, LaunchFailureView, LaunchFinished,
+    LaunchStage, LogOutcome, Progress,
+};

 use super::env::HostEnv;
-use super::job::{launch_summary, HostTask, JobSender};
+
+mod java;
+
+use super::job::{HostTask, JobSender};
+pub use java::pick_java;

 /// 启动器名（与 CLI `meta::LAUNCHER_NAME` 同值）。
 pub const LAUNCHER_NAME: &str = "Unlucky Launcher";
@@ -44,104 +50,38 @@ pub struct LaunchTarget {
    pub account: Option<String>,
 }

-/// 选中并用起来的 Java（`summary` 给 UI 一行提示）。
-pub struct JavaPick {
-    /// 交给 adapter 的选择
-    pub selection: JavaSelection,
-    /// 人读一行
-    pub summary: String,
-}
-
-/// 选一个能用的 Java：显式路径（实例 → 全局 `java.selected_path`）> 托管 > JAVA_HOME > PATH。
-///
-/// 显式路径**先探测**（`java -version`）：探测失败不报错，按版本要求的基准主版本兜底——
-/// 与自动挑的退路同一口径（启动路径不该因为探测不到就拒绝启动）。
-pub fn pick_java(env: &HostEnv, version_id: &str, explicit: Option<&std::path::Path>) -> JavaPick {
-    let store = env.store();
-    let required = unlucky_core::game::java::requirement_for_version(&env.game, version_id);
-    if let Some(path) = explicit {
-        let runtime = unlucky_core::game::java::probe::probe(
-            path,
-            unlucky_core::game::java::probe::JavaOrigin::Instance,
-        );
-        let major = runtime.major.unwrap_or(required.minimum);
-        return JavaPick {
-            selection: JavaSelection::new(runtime.binary.clone(), major, runtime.bits),
-            summary: format!(
-                "实例指定 Java {}（{}）",
-                runtime.version.clone().unwrap_or_else(|| major.to_string()),
-                path.display()
-            ),
-        };
-    }
-    let install_root = store
-        .doc()
-        .effective_str("java.installRoot")
-        .map(str::trim)
-        .filter(|text| !text.is_empty())
-        .map(PathBuf::from);
-    let roots = unlucky_core::game::java::location::scan_roots(
-        env.mode(),
-        &env.layout,
-        install_root.as_deref(),
-        env.platform,
-        &ProcessEnv,
-    );
-    let candidates = unlucky_core::game::java::candidates_in_roots(&roots);
-    let picked = unlucky_core::game::java::pick(&candidates, &required).cloned();
-    match picked {
-        Some(runtime) => {
-            let major = runtime
-                .major
-                .unwrap_or(unlucky_core::game::java::DEFAULT_MAJOR);
-            let summary = format!(
-                "Java {}（{}{}）",
-                runtime.version.clone().unwrap_or_else(|| major.to_string()),
-                runtime.origin.category(),
-                runtime
-                    .vendor
-                    .as_ref()
-                    .map(|vendor| format!(" · {vendor}"))
-                    .unwrap_or_default()
-            );
-            JavaPick {
-                selection: JavaSelection::new(runtime.binary, major, runtime.bits),
-                summary,
-            }
-        }
-        None => {
-            let binary = PathBuf::from(unlucky_core::game::java::java_binary_name());
-            let major = required.minimum;
-            JavaPick {
-                selection: JavaSelection::new(binary, major, 64),
-                summary: format!("PATH 上的 Java（未探测到版本，按 Java {major} 启动）"),
-            }
-        }
-    }
-}
-
 /// 装配 [`LaunchRequest`]（与 CLI `snapshot::prepare` 同序）。
 ///
 /// # Errors
 ///
-/// 版本 JSON 缺失/非法、继承链断裂、隔离派生失败时返回用户可读文案。
+/// 任一步失败都返回 [`LaunchFailureView`]：**阶段**（版本 JSON / 继承链 / 实例设置 / 隔离目录 /
+/// 账户）+ 那一步的原文。文案不在这一层拼（presenter 不依赖 `unlucky-i18n`）。
 pub fn build_request(
    env: &HostEnv,
    target: &LaunchTarget,
-) -> Result<(LaunchRequest, Vec<String>), String> {
+) -> Result<(LaunchRequest, Vec<String>), LaunchFailureView> {
    let version_id = target.version_id.clone();
    let manifest_path = env.game.version_json(&version_id);
-    let text = std::fs::read_to_string(&manifest_path)
-        .map_err(|error| format!("读版本 JSON 失败 {}：{error}", manifest_path.display()))?;
-    let manifest =
-        VersionJson::from_json_str(&text).map_err(|error| format!("版本 JSON 非法：{error}"))?;
+    let text = std::fs::read_to_string(&manifest_path).map_err(|error| {
+        LaunchFailureView::new(
+            LaunchFailureStage::VersionManifest,
+            format!("{}：{error}", manifest_path.display()),
+        )
+    })?;
+    let manifest = VersionJson::from_json_str(&text).map_err(|error| {
+        LaunchFailureView::new(
+            LaunchFailureStage::VersionManifest,
+            format!("{}：{error}", manifest_path.display()),
+        )
+    })?;
    let source = |id: &str| -> Option<VersionJson> {
        std::fs::read_to_string(env.game.version_json(id))
            .ok()
            .and_then(|text| VersionJson::from_json_str(&text).ok())
    };
-    let resolved =
-        game::resolve(&source, &manifest).map_err(|error| format!("解析继承链失败：{error}"))?;
+    let resolved = game::resolve(&source, &manifest).map_err(|error| {
+        LaunchFailureView::new(LaunchFailureStage::Inheritance, error.to_string())
+    })?;

    let environment = Environment::host();
    let expanded = resolved
@@ -252,12 +192,15 @@ pub fn build_request(
 }

 /// 派生运行目录（D20 覆盖链：实例 `isolation` > 全局 `instances.mode`）。
-fn run_dir(env: &HostEnv, target: &LaunchTarget) -> Result<PathBuf, String> {
+fn run_dir(env: &HostEnv, target: &LaunchTarget) -> Result<PathBuf, LaunchFailureView> {
    let global = super::game::global_mode(env);
-    let config = read_instance_config(&env.layout, &target.id)
-        .map_err(|error| format!("读实例设置失败：{error}"))?;
+    let config = read_instance_config(&env.layout, &target.id).map_err(|error| {
+        LaunchFailureView::new(LaunchFailureStage::InstanceConfig, error.to_string())
+    })?;
    let derivation = derive_game_dir(&env.game, &target.version_id, global, config.as_ref(), None)
-        .map_err(|error| format!("隔离目录派生失败：{error}"))?;
+        .map_err(|error| {
+            LaunchFailureView::new(LaunchFailureStage::Isolation, error.to_string())
+        })?;
    if let Some(mut config) = config {
        let at = format_rfc3339_millis(now());
        if observe_mode(&mut config, &env.game, &at, derivation.isolation).unwrap_or(false) {
@@ -282,12 +225,14 @@ pub fn start(env: HostEnv, tx: JobSender, target: LaunchTarget) {
        });
        let (request, warnings) = match build_request(&env, &target) {
            Ok(ok) => ok,
-            Err(reason) => {
+            Err(failure) => {
                let _ = tx.send(HostTask::LaunchEnd(Box::new(LaunchFinished {
                    id,
                    session: String::new(),
                    outcome: LogOutcome::Crashed,
-                    summary: format!("启动失败：{reason}"),
+                    exit_code: None,
+                    uptime_ms: 0,
+                    failure: Some(failure),
                })));
                return;
            }
@@ -309,7 +254,12 @@ pub fn start(env: HostEnv, tx: JobSender, target: LaunchTarget) {
                    id,
                    session: String::new(),
                    outcome: LogOutcome::Crashed,
-                    summary: format!("启动失败：{error}"),
+                    exit_code: None,
+                    uptime_ms: 0,
+                    failure: Some(LaunchFailureView::new(
+                        LaunchFailureStage::Spawn,
+                        error.to_string(),
+                    )),
                })));
                return;
            }
@@ -332,12 +282,10 @@ pub fn start(env: HostEnv, tx: JobSender, target: LaunchTarget) {
                    id,
                    session: session_id,
                    outcome,
-                    summary: format!(
-                        "{}（{}，{:.1}s）",
-                        launch_summary(outcome, Some(handle.exit.code)),
-                        handle.exit.exit_type.as_str(),
-                        handle.uptime_ms as f64 / 1000.0
-                    ),
+                    exit_code: Some(handle.exit.code),
+                    uptime_ms: handle.uptime_ms,
+                    // 跑起来再崩不算「装配失败」：结局由 `outcome` 表达，这里留 `None`。
+                    failure: None,
                })));
            }
            Err(error) => {
@@ -345,7 +293,12 @@ pub fn start(env: HostEnv, tx: JobSender, target: LaunchTarget) {
                    id,
                    session: session_id,
                    outcome: LogOutcome::SilentFail,
-                    summary: format!("启动收尾失败：{error}"),
+                    exit_code: None,
+                    uptime_ms: 0,
+                    failure: Some(LaunchFailureView::new(
+                        LaunchFailureStage::Spawn,
+                        error.to_string(),
+                    )),
                })));
            }
        }