fix(migration): Separate report counts by item type

- Show sessions, workspaces, and assistant directories separately.
- Exclude routine auxiliary paths from displayed skip counts.
- Derive historical counts from saved manifests without rerunning
  migration, and explicitly report unavailable breakdowns.
- Preserve actual warnings and distinguish staged from imported data.
- Add localized labels and regression coverage.

Author: wsp1911

scripts/data-migrator-report.test.mjs

@@ -0,0 +1,23 @@
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import { reportRows } from '../src/apps/data-migrator/ui/report.mjs';
+
+const text = { sessions: 'Sessions', workspaces: 'Workspaces', assistantDirectories: 'Assistants', imported: 'imported', staged: 'staged', skipped: 'skipped', itemCountsUnavailable: 'unavailable' };
+const report = { domainResults: [{ domain: 'workspace_sessions', state: 'verified', imported: 175, skipped: 173, warnings: [{ severity: 'info', code: 'session_path_not_migrated' }] }] };
+const counts = { sessions: { imported: 143, skipped: 0 }, workspaces: { imported: 30, skipped: 0 }, assistantDirectories: { imported: 2, skipped: 0 } };
+test('renders separate entity counts and hides auxiliary exclusions', () => {
+  assert.deepEqual(reportRows(report, counts, text), [
+    ['Sessions', '143 imported, 0 skipped'], ['Workspaces', '30 imported, 0 skipped'], ['Assistants', '2 imported, 0 skipped'],
+  ]);
+});
+test('retains real warnings and does not label staged data imported', () => {
+  const staged = structuredClone(report);
+  staged.domainResults[0].state = 'failed';
+  staged.domainResults[0].warnings.push({ severity: 'warning', code: 'session_source_skipped' });
+  const rows = reportRows(staged, counts, text);
+  assert.equal(rows[0][1], '143 staged, 0 skipped');
+  assert.deepEqual(rows.at(-1), ['workspace_sessions', 'session_source_skipped']);
+});
+test('missing historical manifest is explicit instead of inventing zero counts', () => {
+  assert.deepEqual(reportRows(report, null, text), [['Sessions', 'unavailable'], ['Workspaces', 'unavailable'], ['Assistants', 'unavailable']]);
+});

src/apps/data-migrator/AGENTS.md

@@ -34,6 +34,7 @@ cargo test -p openbitfun-data-migrator -p openbitfun-legacy-migration-adapters -
 cargo test -p openbitfun-legacy-migration --test migration_engine_contracts
 node --test scripts/data-migrator-tauri-build.test.mjs
 node --check src/apps/data-migrator/ui/app.js
+node --test scripts/data-migrator-report.test.mjs
 pnpm run theme:color-audit:all
 ```
 

src/apps/data-migrator/README.md

@@ -35,6 +35,11 @@ needed for migration. ARM Windows/Linux packages are not currently produced.
 5. Read the report. Sign in again or repair paths where indicated, close the
    tool, and open OpenBitFun yourself.
 
+The report lists Sessions, workspace records, and assistant directories separately.
+Expected auxiliary exclusions (such as request traces and lock files) do not
+contribute to these displayed counts. Historical runs use their saved manifests
+for the same breakdown; missing manifests are shown as unavailable.
+
 The UI uses the shared design-system tokens bundled offline, follows the system
 light/dark/high-contrast setting, and offers English, Simplified Chinese, and
 Traditional Chinese.

src/apps/data-migrator/src/app_state.rs

@@ -167,6 +167,7 @@ pub(crate) struct MigratorView {
     pub findings: Vec<ScanFinding>,
     pub plan: Option<MigrationPlan>,
     pub report: Option<MigrationRunReport>,
+    pub workspace_counts: Option<openbitfun_legacy_migration_adapters::WorkspaceReportCounts>,
     pub progress: Option<MigrationProgressEvent>,
     pub blockers: Vec<WriterProcess>,
     pub status: MigrationRunStatus,
@@ -794,6 +795,9 @@ fn validate_selection(selection: &MigrationSelection) -> Result<(), CommandError
 fn snapshot(session: &MigratorSession) -> MigratorView {
     let plan = session.plan.as_ref().map(redact_plan_for_ui);
     let report = session.report.as_ref().map(redact_report_for_ui);
+    let workspace_counts = session.report.as_ref().and_then(|report| {
+        openbitfun_legacy_migration_adapters::workspace_report_counts(&session.roots, report).ok()
+    });
     MigratorView {
         tool_version: env!("CARGO_PKG_VERSION").to_string(),
         locations: session.roots.clone(),
@@ -818,6 +822,7 @@ fn snapshot(session: &MigratorSession) -> MigratorView {
             ),
         plan,
         report,
+        workspace_counts,
         progress: session.progress.clone(),
         blockers: session.blockers.clone(),
         status: session.status,

src/apps/data-migrator/ui/app.js

@@ -1,4 +1,5 @@
 import { invoke } from './transport.js';
+import { reportRows } from './report.mjs';
 
 async function loadTranslations() {
   try {
@@ -98,10 +99,6 @@ function row(title, detail) {
   return item;
 }
 
-function transferLabel(result) {
-  return result.state === 'verified' ? text.imported : text.staged;
-}
-
 function groupLabel(id) {
   const labels = groups.find(([group]) => group === id)?.[1];
   return (labels?.[locale] || labels?.en || [id])[0];
@@ -202,11 +199,8 @@ function render(view) {
 
   const reportSummary = document.getElementById('report-summary');
   if (view.report) {
-    reportSummary.replaceChildren(...view.report.domainResults.flatMap((result) => [
-      row(result.domain, `${result.imported} ${transferLabel(result)}, ${result.skipped} ${text.skipped}, ${result.warnings.filter((item) => item.severity !== 'info').length} ${text.warnings}`),
-      ...[...new Set(result.warnings.filter((item) => item.severity !== 'info').map((item) => item.code))]
-        .map((code) => row(result.domain, text[code] || code)),
-    ]));
+    reportSummary.replaceChildren(...reportRows(view.report, view.workspaceCounts, text)
+      .map(([title, detail]) => row(title, detail)));
   }
   show('report-card', !view.running && (Boolean(view.report) || view.status === 'cancelled'));
   const canExportDiagnostics = ['failed_recoverable', 'failed_manual_action_required'].includes(view.status);

src/apps/data-migrator/ui/locales.json

@@ -1,5 +1,9 @@
 {
   "en": {
+    "sessions": "Sessions",
+    "workspaces": "Workspaces",
+    "assistantDirectories": "Assistant directories",
+    "itemCountsUnavailable": "Item counts are unavailable for this run.",
     "eyebrow": "OpenBitFun Data Migrator",
     "title": "Import data from BitFun",
     "intro": "A separate, offline tool. Choose what to import; your original BitFun data is preserved.",
@@ -76,6 +80,10 @@
     "extension_item_skipped": "Incomplete or unsupported extensions will be skipped; valid extensions can continue."
   },
   "zh-CN": {
+    "sessions": "会话",
+    "workspaces": "工作区",
+    "assistantDirectories": "助手目录",
+    "itemCountsUnavailable": "本次迁移的分类计数不可用。",
     "eyebrow": "OpenBitFun 独立数据迁移器",
     "title": "从 BitFun 导入数据",
     "intro": "独立运行，离线导入。选择需要迁移的内容，原始 BitFun 数据会被保留。",
@@ -152,6 +160,10 @@
     "extension_item_skipped": "将跳过不完整或不支持的扩展，其他有效扩展可继续迁移。"
   },
   "zh-TW": {
+    "sessions": "工作階段",
+    "workspaces": "工作區",
+    "assistantDirectories": "助理目錄",
+    "itemCountsUnavailable": "本次遷移的分類計數無法取得。",
     "eyebrow": "OpenBitFun 獨立資料遷移器",
     "title": "從 BitFun 匯入資料",
     "intro": "獨立執行，離線匯入。選擇需要遷移的內容，原始 BitFun 資料會被保留。",

src/apps/data-migrator/ui/report.mjs

@@ -0,0 +1,21 @@
+export function reportRows(report, workspaceCounts, text) {
+  return report.domainResults.flatMap((result) => {
+    const transferred = result.state === 'verified' ? text.imported : text.staged;
+    const warnings = result.warnings.filter((item) => item.severity !== 'info');
+    const rows = result.domain === 'workspace_sessions'
+      ? [
+        ['sessions', text.sessions],
+        ['workspaces', text.workspaces],
+        ['assistantDirectories', text.assistantDirectories],
+      ].map(([key, label]) => {
+        const counts = workspaceCounts?.[key];
+        return [label, counts
+          ? `${counts.imported} ${transferred}, ${counts.skipped} ${text.skipped}`
+          : text.itemCountsUnavailable];
+      })
+      : [[result.domain, `${result.imported} ${transferred}, ${result.skipped} ${text.skipped}, ${warnings.length} ${text.warnings}`]];
+    rows.push(...[...new Set(warnings.map((item) => item.code))]
+      .map((code) => [result.domain, text[code] || code]));
+    return rows;
+  });
+}

src/crates/services/legacy-migration-adapters/src/agent_coordination.rs

@@ -1478,6 +1478,11 @@ mod tests {
             .join(COORDINATION_RELATIVE_PATH)
             .is_file());
         assert!(deep.is_dir());
+        let counts = crate::workspace_report_counts(&roots, &report).unwrap();
+        assert_eq!(counts.sessions.imported, 2);
+        assert_eq!(counts.sessions.skipped, 0);
+        assert_eq!(counts.workspaces.imported, 1);
+        assert_eq!(counts.assistant_directories.imported, 1);
         let relative = deep.strip_prefix(&roots.legacy_home_root).unwrap();
         assert_eq!(
             fs::read(roots.target_home_root.join(relative).join("content.txt")).unwrap(),

src/crates/services/legacy-migration-adapters/src/lib.rs

@@ -12,6 +12,7 @@ mod remote_connect;
 mod remote_ssh;
 mod settings;
 mod workspace_sessions;
+pub use workspace_sessions::{workspace_report_counts, MigrationItemCounts, WorkspaceReportCounts};
 
 use openbitfun_legacy_migration::{
     DomainContext, DomainScan, LegacyDomainAdapter, LegacyMigrationResult, MigrationRoots,

src/crates/services/legacy-migration-adapters/src/workspace_sessions.rs

@@ -54,6 +54,83 @@ const SESSION_OWNED_DIRECTORIES: &[&str] = &["snapshots", "artifacts", "tool-res
 
 pub(crate) struct WorkspaceSessionsAdapter;
 
+#[derive(Debug, Clone, Default, Serialize)]
+pub struct MigrationItemCounts {
+    pub imported: u64,
+    pub skipped: u64,
+}
+
+#[derive(Debug, Clone, Default, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct WorkspaceReportCounts {
+    pub sessions: MigrationItemCounts,
+    pub workspaces: MigrationItemCounts,
+    pub assistant_directories: MigrationItemCounts,
+}
+
+/// Project both old and new run manifests into user-facing entity counts.
+/// Auxiliary exclusions remain in the original manifest, not in these totals.
+pub fn workspace_report_counts(
+    roots: &MigrationRoots,
+    report: &openbitfun_product_domains::legacy_migration::MigrationRunReport,
+) -> LegacyMigrationResult<WorkspaceReportCounts> {
+    uuid::Uuid::parse_str(&report.run_id)
+        .map_err(|_| LegacyMigrationError::InvalidRequest("invalid migration run id".into()))?;
+    let layout = openbitfun_legacy_migration::MigrationLayout::new(roots, &report.run_id);
+    let root = layout.stage_root().join("workspace-sessions");
+    let manifest: WorkspaceSessionsManifest =
+        read_bounded_json(&root, &root.join("manifest.json"))?;
+    let plan: openbitfun_product_domains::legacy_migration::MigrationPlan = layout
+        .read_json(&layout.plan_path())?
+        .ok_or_else(|| LegacyMigrationError::InvalidPlan("migration plan is missing".into()))?;
+    let counts = |actions: Vec<SessionImportAction>| MigrationItemCounts {
+        imported: actions
+            .iter()
+            .filter(|a| **a == SessionImportAction::Import)
+            .count() as u64,
+        skipped: actions
+            .iter()
+            .filter(|a| **a != SessionImportAction::Import)
+            .count() as u64,
+    };
+    let mut result = WorkspaceReportCounts {
+        sessions: counts(manifest.sessions.iter().map(|e| e.action).collect()),
+        workspaces: MigrationItemCounts {
+            imported: manifest.workspace_id_map.len() as u64,
+            skipped: 0,
+        },
+        assistant_directories: counts(
+            manifest
+                .assistant_workspaces
+                .iter()
+                .map(|e| e.action)
+                .collect(),
+        ),
+    };
+    let target_workspaces = plan
+        .conflicts
+        .iter()
+        .filter(|c| c.code == "workspace_target_wins")
+        .count() as u64;
+    result.workspaces.imported = result.workspaces.imported.saturating_sub(target_workspaces);
+    result.workspaces.skipped += target_workspaces;
+    if let Some(domain) = report
+        .domain_results
+        .iter()
+        .find(|r| r.domain == MigrationDomainId::WorkspaceSessions)
+    {
+        for diagnostic in &domain.warnings {
+            match diagnostic.code.as_str() {
+                "session_source_skipped" | "session_entry_skipped" => result.sessions.skipped += 1,
+                "workspace_item_skipped" => result.workspaces.skipped += 1,
+                "assistant_workspace_not_migrated" => result.assistant_directories.skipped += 1,
+                _ => {}
+            }
+        }
+    }
+    Ok(result)
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub(crate) enum SessionImportAction {