Improve init visibility with step counter and download substage

Author: kexuejin

crabshell-gui/src-tauri/src/main.rs

@@ -594,7 +594,7 @@ fn parse_progress(output: &str) -> Option<HardeningProgress> {
             .unwrap_or("dependency");
         return Some(HardeningProgress {
             stage: "init".to_string(),
-            substage: None,
+            substage: Some("toolchain.download".to_string()),
             progress: 3,
             message: format!("Downloading dependency: {file_name}"),
         });
@@ -614,7 +614,7 @@ fn parse_progress(output: &str) -> Option<HardeningProgress> {
         }
         return Some(HardeningProgress {
             stage: "init".to_string(),
-            substage: None,
+            substage: Some("toolchain.download".to_string()),
             progress,
             message: format!("Downloading {file_name} ({progress}%)"),
         });
@@ -623,7 +623,7 @@ fn parse_progress(output: &str) -> Option<HardeningProgress> {
     if output.contains("[toolchain] download-retry") {
         return Some(HardeningProgress {
             stage: "init".to_string(),
-            substage: None,
+            substage: Some("toolchain.download".to_string()),
             progress: 6,
             message: "Network unstable, retrying dependency download...".to_string(),
         });
@@ -636,7 +636,7 @@ fn parse_progress(output: &str) -> Option<HardeningProgress> {
             .unwrap_or("dependency");
         return Some(HardeningProgress {
             stage: "init".to_string(),
-            substage: None,
+            substage: Some("toolchain.download".to_string()),
             progress: 30,
             message: format!("Dependency ready: {file_name}"),
         });
@@ -785,4 +785,33 @@ mod tests {
         assert_eq!(progress.progress, 90);
         assert_eq!(progress.message, "Signing package");
     }
+
+    #[test]
+    fn parse_progress_maps_toolchain_download_start_to_substage() {
+        let line = "[toolchain] download-start commandlinetools.zip 12345";
+        let progress = super::parse_progress(line).expect("progress should parse");
+        assert_eq!(progress.stage, "init");
+        assert_eq!(progress.substage.as_deref(), Some("toolchain.download"));
+    }
+
+    #[test]
+    fn parse_progress_maps_toolchain_download_progress_to_substage() {
+        let line = "[toolchain] download-progress commandlinetools.zip 37%";
+        let progress = super::parse_progress(line).expect("progress should parse");
+        assert_eq!(progress.stage, "init");
+        assert_eq!(progress.substage.as_deref(), Some("toolchain.download"));
+    }
+
+    #[test]
+    fn parse_progress_maps_toolchain_download_retry_and_done_to_substage() {
+        let retry = "[toolchain] download-retry commandlinetools.zip";
+        let retry_progress = super::parse_progress(retry).expect("retry should parse");
+        assert_eq!(retry_progress.stage, "init");
+        assert_eq!(retry_progress.substage.as_deref(), Some("toolchain.download"));
+
+        let done = "[toolchain] download-done commandlinetools.zip";
+        let done_progress = super::parse_progress(done).expect("done should parse");
+        assert_eq!(done_progress.stage, "init");
+        assert_eq!(done_progress.substage.as_deref(), Some("toolchain.download"));
+    }
 }

crabshell-gui/src/renderer/App.tsx

@@ -81,12 +81,31 @@ const SUBSTAGE_TRANSLATION_KEYS: Record<string, string> = {
   'manifest.cache-hit': 'progress.substage.manifestCacheHit',
   'manifest.cache-store': 'progress.substage.manifestCacheStore',
   'manifest.done': 'progress.substage.manifestDone',
+  'toolchain.download': 'progress.substage.toolchainDownload',
   'toolchain.reuse': 'progress.substage.toolchainReuse',
   'toolchain.build': 'progress.substage.toolchainBuild',
   'rules.resolve': 'progress.substage.rulesResolve',
   'signing.resolve': 'progress.substage.signingResolve',
 };
 
+const INIT_SUBSTAGE_STEP_INDEX: Record<string, number> = {
+  'env.runtime': 1,
+  'env.java': 2,
+  'config.load': 3,
+  'paths.resolve': 4,
+  'keys.prepare': 5,
+  'manifest.prepare': 6,
+  'manifest.cache-hit': 7,
+  'manifest.cache-store': 7,
+  'manifest.done': 8,
+  'toolchain.download': 9,
+  'toolchain.reuse': 10,
+  'toolchain.build': 10,
+  'rules.resolve': 11,
+  'signing.resolve': 12,
+};
+const INIT_SUBSTAGE_TOTAL_STEPS = 12;
+
 const formatSubstageFallback = (substage: string) =>
   substage
     .replace(/-/g, ' ')
@@ -172,6 +191,22 @@ const App: React.FC = () => {
     return t('app.stageOnly', { stage: stageLabel });
   }, [progress.stage, stageLabel, substageLabel, t]);
 
+  const initStepText = useMemo(() => {
+    if (progress.stage !== 'init' || !progress.substage) {
+      return '';
+    }
+
+    const currentStep = INIT_SUBSTAGE_STEP_INDEX[progress.substage];
+    if (!currentStep) {
+      return '';
+    }
+
+    return t('app.initStepCounter', {
+      current: currentStep,
+      total: INIT_SUBSTAGE_TOTAL_STEPS,
+    });
+  }, [progress.stage, progress.substage, t]);
+
   const etaText = useMemo(() => {
     if (!isProcessing || !runStartedAt || progress.stage !== 'init') {
       return '';
@@ -544,7 +579,7 @@ const App: React.FC = () => {
           </Typography>
           {stageContextText ? (
             <Typography variant="caption" sx={{ color: '#334155', mb: 0.5, display: 'block' }}>
-              {etaText ? `${stageContextText} · ${etaText}` : stageContextText}
+              {[stageContextText, initStepText, etaText].filter(Boolean).join(' · ')}
             </Typography>
           ) : null}
           <LinearProgress

crabshell-gui/src/renderer/i18n.ts

@@ -15,6 +15,7 @@ const resources = {
         statusLoading: '{{message}}',
         stageOnly: 'Stage: {{stage}}',
         stageWithSubstage: 'Stage: {{stage}} / {{substage}}',
+        initStepCounter: 'Init steps: {{current}}/{{total}}',
         etaSeconds: '~{{seconds}}s remaining',
       },
       messages: {
@@ -101,6 +102,7 @@ const resources = {
           manifestCacheHit: 'Manifest cache hit',
           manifestCacheStore: 'Manifest cache update',
           manifestDone: 'Manifest patch complete',
+          toolchainDownload: 'Toolchain download',
           toolchainReuse: 'Reuse existing artifacts',
           toolchainBuild: 'Build toolchain',
           rulesResolve: 'Runtime rules resolve',
@@ -120,6 +122,7 @@ const resources = {
         statusLoading: '{{message}}',
         stageOnly: '阶段：{{stage}}',
         stageWithSubstage: '阶段：{{stage}} / {{substage}}',
+        initStepCounter: '初始化步骤：{{current}}/{{total}}',
         etaSeconds: '预计剩余 ~{{seconds}} 秒',
       },
       messages: {
@@ -206,6 +209,7 @@ const resources = {
           manifestCacheHit: '清单缓存命中',
           manifestCacheStore: '清单缓存更新',
           manifestDone: '清单补丁完成',
+          toolchainDownload: '工具链下载',
           toolchainReuse: '复用现有构建产物',
           toolchainBuild: '构建工具链',
           rulesResolve: '运行时规则解析',