retold-data-service 2.0.17 → 2.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "retold-data-service",
-    "version": "2.0.17",
+    "version": "2.0.19",
     "description": "Serve up a whole model!",
     "main": "source/Retold-Data-Service.js",
     "bin": {
@@ -72,7 +72,7 @@
         "meadow": "^2.0.33",
         "meadow-connection-mysql": "^1.0.14",
         "meadow-endpoints": "^4.0.14",
-        "meadow-integration": "^1.0.14",
+        "meadow-integration": "^1.0.16",
         "meadow-migrationmanager": "^0.0.4",
         "orator": "^6.0.4",
         "orator-http-proxy": "^1.0.5",

package/source/services/Retold-Data-Service-MeadowEndpoints.js

@@ -137,6 +137,8 @@ class RetoldDataServiceMeadowEndpoints extends libFableServiceProviderBase
 		{
 			let tmpDALEntityName = tmpEntityList[i];
 
+			let tmpRoutesAlreadyConnected = this._MeadowEndpoints.hasOwnProperty(tmpDALEntityName);
+
 			if (this._DAL.hasOwnProperty(tmpDALEntityName))
 			{
 				this.fable.log.warn(`Entity [${tmpDALEntityName}] already exists in the DAL (from another model); overwriting.`);
@@ -152,8 +154,16 @@ class RetoldDataServiceMeadowEndpoints extends libFableServiceProviderBase
 				this._DAL[tmpDALEntityName].setProvider(tmpStorageProvider);
 				this.fable.log.info(`...initializing the ${tmpDALEntityName} Meadow Endpoints`);
 				this._MeadowEndpoints[tmpDALEntityName] = libMeadowEndpoints.new(this._DAL[tmpDALEntityName]);
-				this.fable.log.info(`...mapping the ${tmpDALEntityName} Meadow Endpoints to Orator`);
-				this._MeadowEndpoints[tmpDALEntityName].connectRoutes(this.fable.OratorServiceServer);
+
+				if (!tmpRoutesAlreadyConnected)
+				{
+					this.fable.log.info(`...mapping the ${tmpDALEntityName} Meadow Endpoints to Orator`);
+					this._MeadowEndpoints[tmpDALEntityName].connectRoutes(this.fable.OratorServiceServer);
+				}
+				else
+				{
+					this.fable.log.info(`...routes for ${tmpDALEntityName} already registered; skipping connectRoutes.`);
+				}
 			}
 			catch (pError)
 			{

package/source/services/data-cloner/DataCloner-Command-Schema.js

@@ -274,10 +274,11 @@ module.exports = (pDataClonerService, pOratorServiceServer) =>
 				// Extract the entity name from the URL for error tracking
 				let tmpEntityHint = pURL.split('/')[0].replace(/s$/, '');
 
-				// Use the longer timeout for MAX(column) queries only
-				let tmpIsMaxRequest = (pURL.indexOf('/Max/') > -1);
+				// Use the longer timeout for Max and Count queries (which can be
+				// slow on large tables with millions of rows)
+				let tmpIsHeavyQuery = (pURL.indexOf('/Max/') > -1) || (pURL.match(/\/Count(\/|$)/) !== null);
 				let tmpPreviousTimeout = libHttps.globalAgent.options.timeout;
-				libHttps.globalAgent.options.timeout = tmpIsMaxRequest
+				libHttps.globalAgent.options.timeout = tmpIsHeavyQuery
 					? tmpFable.MeadowCloneRestClient.maxRequestTimeout
 					: tmpFable.MeadowCloneRestClient.requestTimeout;
 

package/source/services/data-cloner/DataCloner-Command-Sync.js

@@ -207,6 +207,13 @@ module.exports = (pDataClonerService, pOratorServiceServer) =>
 				let tmpSnap = { Status: tmpP.Status, Total: tmpP.Total || 0, Synced: tmpP.Synced || 0, Errors: tmpP.Errors || 0 };
 				if (tmpP.ErrorMessage) tmpSnap.ErrorMessage = tmpP.ErrorMessage;
 
+				// Include per-record breakdown fields if available (set after entity sync completes)
+				if (tmpP.hasOwnProperty('New')) tmpSnap.New = tmpP.New;
+				if (tmpP.hasOwnProperty('Updated')) tmpSnap.Updated = tmpP.Updated;
+				if (tmpP.hasOwnProperty('Unchanged')) tmpSnap.Unchanged = tmpP.Unchanged;
+				if (tmpP.hasOwnProperty('Deleted')) tmpSnap.Deleted = tmpP.Deleted;
+				if (tmpP.hasOwnProperty('ServerTotal')) tmpSnap.ServerTotal = tmpP.ServerTotal;
+
 				if ((tmpP.Status === 'Syncing' || tmpP.Status === 'Pending') && tmpFable.MeadowSync && tmpFable.MeadowSync.MeadowSyncEntities)
 				{
 					let tmpSyncEntity = tmpFable.MeadowSync.MeadowSyncEntities[tmpName];
@@ -300,9 +307,15 @@ module.exports = (pDataClonerService, pOratorServiceServer) =>
 				// Check for pre-count phase
 				if (tmpCloneState.SyncPhase === 'counting')
 				{
-					let tmpPC = tmpCloneState.PreCountProgress || { Counted: 0, TotalTables: 0 };
+					let tmpPC = tmpCloneState.PreCountProgress || { Counted: 0, TotalTables: 0, Tables: [] };
 					tmpMessage = `Analyzing tables: counted ${tmpPC.Counted} / ${tmpPC.TotalTables}...`;
 
+					let tmpCountElapsed = null;
+					if (tmpPC.StartTime)
+					{
+						tmpCountElapsed = fFormatDuration(Date.now() - tmpPC.StartTime);
+					}
+
 					pResponse.send(200,
 						{
 							Phase: tmpPhase,
@@ -315,10 +328,10 @@ module.exports = (pDataClonerService, pOratorServiceServer) =>
 							TotalTables: tmpPC.TotalTables,
 							TotalSynced: 0,
 							TotalRecords: 0,
-							Elapsed: null,
+							Elapsed: tmpCountElapsed,
 							SyncMode: tmpCloneState.SyncMode,
 							ETA: null,
-							PreCountGrandTotal: 0,
+							PreCountGrandTotal: tmpCloneState.PreCountGrandTotal || 0,
 							PreCountProgress: tmpPC,
 							ThroughputSamples: []
 						});

package/source/services/data-cloner/DataCloner-ProviderRegistry.js

@@ -10,7 +10,7 @@ const _ProviderRegistry = {
 	SQLite: { moduleName: 'meadow-connection-sqlite', serviceName: 'MeadowSQLiteProvider', configKey: 'SQLite' },
 	MySQL: { moduleName: 'meadow-connection-mysql', serviceName: 'MeadowMySQLProvider', configKey: 'MySQL' },
 	MSSQL: { moduleName: 'meadow-connection-mssql', serviceName: 'MeadowMSSQLProvider', configKey: 'MSSQL' },
-	PostgreSQL: { moduleName: 'meadow-connection-postgresql', serviceName: 'MeadowConnectionPostgreSQL', configKey: 'PostgreSQL' },
+	PostgreSQL: { moduleName: 'meadow-connection-postgresql', serviceName: 'MeadowPostgreSQLProvider', configKey: 'PostgreSQL' },
 	Solr: { moduleName: 'meadow-connection-solr', serviceName: 'MeadowConnectionSolr', configKey: 'Solr' },
 	MongoDB: { moduleName: 'meadow-connection-mongodb', serviceName: 'MeadowConnectionMongoDB', configKey: 'MongoDB' },
 	RocksDB: { moduleName: 'meadow-connection-rocksdb', serviceName: 'MeadowConnectionRocksDB', configKey: 'RocksDB' },

package/source/services/data-cloner/Retold-Data-Service-DataCloner.js

@@ -642,7 +642,12 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 	preCountTables(pTables, fCallback)
 	{
 		this._cloneState.SyncPhase = 'counting';
-		this._cloneState.PreCountProgress = { Counted: 0, TotalTables: pTables.length };
+		this._cloneState.PreCountProgress = {
+			Counted: 0,
+			TotalTables: pTables.length,
+			StartTime: Date.now(),
+			Tables: []
+		};
 		this._cloneState.PreCountGrandTotal = 0;
 
 		this.fable.log.info(`Data Cloner: Pre-counting records for ${pTables.length} tables...`);
@@ -656,6 +661,7 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 					return fNext();
 				}
 
+				let tmpTableStartTime = Date.now();
 				let tmpCountURL = `${pTableName}s/Count`;
 				this.fable.MeadowCloneRestClient.getJSON(tmpCountURL,
 					(pError, pResponse, pBody) =>
@@ -669,7 +675,14 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 						{
 							this._cloneState.SyncProgress[pTableName].Total = tmpCount;
 						}
+						let tmpElapsedMs = Date.now() - tmpTableStartTime;
 						this._cloneState.PreCountProgress.Counted++;
+						this._cloneState.PreCountProgress.Tables.push({
+							Name: pTableName,
+							Count: tmpCount,
+							ElapsedMs: tmpElapsedMs,
+							Error: pError ? true : false
+						});
 						this._cloneState.PreCountGrandTotal += tmpCount;
 						return fNext();
 					});
@@ -866,15 +879,42 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 				if (this._cloneState.SyncLogFileLogger)
 				{
 					let tmpLogPath = this._cloneState.SyncLogFilePath || '';
-					this._cloneState.SyncLogFileLogger.flushBufferToLogFile(() =>
+					let tmpLogger = this._cloneState.SyncLogFileLogger;
+
+					// Log before closing so the message is captured in the file
+					this.fable.log.info(`Data Cloner: Log file closing — ${tmpLogPath}`);
+
+					// Remove the logger from fable.log stream arrays so no writes
+					// are dispatched to it after the underlying stream is closed.
+					let tmpStreamArrays = [
+						'logStreams', 'logStreamsTrace', 'logStreamsDebug',
+						'logStreamsInfo', 'logStreamsWarn', 'logStreamsError', 'logStreamsFatal'
+					];
+					for (let s = 0; s < tmpStreamArrays.length; s++)
 					{
-						this._cloneState.SyncLogFileLogger.closeWriter(() =>
+						let tmpArr = this.fable.log[tmpStreamArrays[s]];
+						if (Array.isArray(tmpArr))
 						{
-							this.fable.log.info(`Data Cloner: Log file closed — ${tmpLogPath}`);
-						});
-					});
+							let tmpIdx = tmpArr.indexOf(tmpLogger);
+							if (tmpIdx > -1) tmpArr.splice(tmpIdx, 1);
+						}
+					}
+
 					this._cloneState.SyncLogFileLogger = null;
 					this._cloneState.SyncLogFilePath = null;
+
+					// Now flush and close safely — no more writes can reach this stream
+					try
+					{
+						tmpLogger.flushBufferToLogFile(() =>
+						{
+							tmpLogger.closeWriter(() => {});
+						});
+					}
+					catch (pCloseErr)
+					{
+						// Ignore close errors
+					}
 				}
 
 				return;
@@ -915,7 +955,7 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 					{
 						let tmpResults = tmpSyncEntity.syncResults;
 						tmpProgress.New = tmpResults.Created || 0;
-						tmpProgress.Updated = 0;
+						tmpProgress.Updated = tmpResults.Updated || 0;
 						tmpProgress.Unchanged = tmpResults.LocalRecordCount || 0;
 						tmpProgress.Deleted = tmpResults.Deleted || 0;
 						tmpProgress.ServerTotal = tmpResults.ServerRecordCount || 0;

package/source/services/data-cloner/pict-app/Pict-Application-DataCloner.js

@@ -73,7 +73,8 @@ class DataClonerApplication extends libPictApplication
 				'solrHost', 'solrPort', 'solrCore', 'solrPath',
 				'mongodbHost', 'mongodbPort', 'mongodbUser', 'mongodbPassword', 'mongodbDatabase', 'mongodbConnectionLimit',
 				'rocksdbFolder',
-				'bibliographFolder'
+				'bibliographFolder',
+				'syncMaxRecords'
 			]
 		};
 

package/source/services/data-cloner/pict-app/providers/Pict-Provider-DataCloner.js

@@ -447,7 +447,10 @@ class DataClonerProvider extends libPictProvider
 			}
 			if (pData.PreCountProgress && pData.PreCountProgress.Counted < pData.PreCountProgress.TotalTables)
 			{
-				tmpMetaParts.push('<span class="live-status-meta-item">counting: ' + pData.PreCountProgress.Counted + ' / ' + pData.PreCountProgress.TotalTables + '</span>');
+				let tmpCountedSoFar = pData.PreCountGrandTotal > 0
+					? ' (' + pData.PreCountGrandTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + ' records found)'
+					: '';
+				tmpMetaParts.push('<span class="live-status-meta-item">counting: ' + pData.PreCountProgress.Counted + ' / ' + pData.PreCountProgress.TotalTables + ' tables' + tmpCountedSoFar + '</span>');
 			}
 			if (pData.Errors > 0)
 			{
@@ -466,7 +469,12 @@ class DataClonerProvider extends libPictProvider
 
 		// Update progress bar
 		let tmpPct = 0;
-		if (pData.Phase === 'syncing' && pData.PreCountGrandTotal > 0 && pData.TotalSynced > 0)
+		if (pData.Phase === 'syncing' && pData.PreCountProgress && pData.PreCountProgress.Counted < pData.PreCountProgress.TotalTables)
+		{
+			// During counting phase, show table counting progress
+			tmpPct = Math.min((pData.PreCountProgress.Counted / pData.PreCountProgress.TotalTables) * 100, 99);
+		}
+		else if (pData.Phase === 'syncing' && pData.PreCountGrandTotal > 0 && pData.TotalSynced > 0)
 		{
 			tmpPct = Math.min((pData.TotalSynced / pData.PreCountGrandTotal) * 100, 99.9);
 		}
@@ -489,11 +497,40 @@ class DataClonerProvider extends libPictProvider
 		}
 		tmpProgressFill.style.width = Math.min(100, Math.round(tmpPct)) + '%';
 
+		// Auto-expand the detail view when sync starts so users see counting progress
+		if ((pData.Phase === 'syncing' || pData.Phase === 'stopping') && !this.pict.AppData.DataCloner.StatusDetailExpanded)
+		{
+			let tmpLayoutView = this.pict.views['DataCloner-Layout'];
+			if (tmpLayoutView && typeof tmpLayoutView.toggleStatusDetail === 'function')
+			{
+				tmpLayoutView.toggleStatusDetail();
+			}
+		}
+
 		// If the detail view is expanded, re-render it with fresh data
 		if (this.pict.AppData.DataCloner.StatusDetailExpanded)
 		{
 			this.renderStatusDetail();
 		}
+
+		// Auto-fetch the sync report when we detect a completed sync but haven't loaded the report yet
+		if (pData.Phase === 'complete' && !this.pict.AppData.DataCloner.LastReport)
+		{
+			let tmpSelf = this;
+			this.api('GET', '/clone/sync/report')
+				.then(function(pReportData)
+				{
+					if (pReportData && pReportData.ReportVersion)
+					{
+						tmpSelf.pict.AppData.DataCloner.LastReport = pReportData;
+						if (tmpSelf.pict.AppData.DataCloner.StatusDetailExpanded)
+						{
+							tmpSelf.renderStatusDetail();
+						}
+					}
+				})
+				.catch(function() { /* ignore fetch errors */ });
+		}
 	}
 
 	// ================================================================
@@ -539,6 +576,59 @@ class DataClonerProvider extends libPictProvider
 			.catch(function() { /* ignore poll errors */ });
 	}
 
+	renderCountingPhaseDetail(pContainer, pPreCountProgress)
+	{
+		let tmpTables = pPreCountProgress.Tables || [];
+		let tmpCounted = pPreCountProgress.Counted || 0;
+		let tmpTotal = pPreCountProgress.TotalTables || 0;
+		let tmpRunningTotal = 0;
+
+		let tmpHtml = '<div class="status-detail-section">';
+		tmpHtml += '<div class="status-detail-section-title">Counting Records (' + tmpCounted + ' / ' + tmpTotal + ' tables)</div>';
+
+		if (tmpTables.length > 0)
+		{
+			tmpHtml += '<table class="precount-table">';
+			tmpHtml += '<thead><tr><th>Table</th><th style="text-align:right">Records</th><th style="text-align:right">Time</th></tr></thead>';
+			tmpHtml += '<tbody>';
+			for (let i = 0; i < tmpTables.length; i++)
+			{
+				let tmpT = tmpTables[i];
+				tmpRunningTotal += tmpT.Count;
+				let tmpCountFmt = this.formatNumber(tmpT.Count);
+				let tmpTimeFmt = tmpT.ElapsedMs < 1000
+					? tmpT.ElapsedMs + 'ms'
+					: (tmpT.ElapsedMs / 1000).toFixed(1) + 's';
+				let tmpRowClass = tmpT.Error ? ' class="precount-error"' : '';
+				tmpHtml += '<tr' + tmpRowClass + '>';
+				tmpHtml += '<td>' + this.escapeHtml(tmpT.Name) + '</td>';
+				tmpHtml += '<td style="text-align:right; font-variant-numeric:tabular-nums">' + tmpCountFmt + '</td>';
+				tmpHtml += '<td style="text-align:right; font-variant-numeric:tabular-nums; color:#888">' + tmpTimeFmt + '</td>';
+				tmpHtml += '</tr>';
+			}
+			tmpHtml += '</tbody>';
+			tmpHtml += '<tfoot><tr>';
+			tmpHtml += '<td><strong>Total</strong></td>';
+			tmpHtml += '<td style="text-align:right; font-variant-numeric:tabular-nums"><strong>' + this.formatNumber(tmpRunningTotal) + '</strong></td>';
+			tmpHtml += '<td></td>';
+			tmpHtml += '</tr></tfoot>';
+			tmpHtml += '</table>';
+		}
+
+		// Show pending indicator for remaining tables
+		let tmpRemaining = tmpTotal - tmpCounted;
+		if (tmpRemaining > 0)
+		{
+			tmpHtml += '<div class="precount-pending">';
+			tmpHtml += '<span class="precount-spinner"></span> ';
+			tmpHtml += tmpRemaining + ' table' + (tmpRemaining === 1 ? '' : 's') + ' remaining…';
+			tmpHtml += '</div>';
+		}
+
+		tmpHtml += '</div>';
+		pContainer.innerHTML = tmpHtml;
+	}
+
 	renderStatusDetail()
 	{
 		let tmpContainer = document.getElementById('DataCloner-StatusDetail-Container');
@@ -549,6 +639,19 @@ class DataClonerProvider extends libPictProvider
 		let tmpStatusData = tmpAppData.StatusDetailData;
 		let tmpReport = tmpAppData.LastReport;
 
+		// During the counting phase, show per-table counts as they arrive
+		if (tmpLiveStatus && tmpLiveStatus.PreCountProgress
+			&& tmpLiveStatus.PreCountProgress.Tables
+			&& tmpLiveStatus.Phase === 'syncing'
+			&& tmpLiveStatus.PreCountProgress.Counted < tmpLiveStatus.PreCountProgress.TotalTables)
+		{
+			this.renderCountingPhaseDetail(tmpContainer, tmpLiveStatus.PreCountProgress);
+			// Hide histogram during counting
+			let tmpHistContainer = document.getElementById('DataCloner-Throughput-Histogram');
+			if (tmpHistContainer) tmpHistContainer.style.display = 'none';
+			return;
+		}
+
 		// Determine data source: live during sync, report after sync
 		let tmpTables = {};
 		let tmpThroughputSamples = [];
@@ -575,6 +678,11 @@ class DataClonerProvider extends libPictProvider
 		else if (tmpStatusData && tmpStatusData.Tables)
 		{
 			tmpTables = tmpStatusData.Tables;
+			// Use throughput samples from live status if available (e.g. after page reload with completed sync)
+			if (tmpLiveStatus && tmpLiveStatus.ThroughputSamples)
+			{
+				tmpThroughputSamples = tmpLiveStatus.ThroughputSamples;
+			}
 		}
 
 		// Categorize tables

package/source/services/data-cloner/pict-app/views/PictView-DataCloner-Layout.js

@@ -339,6 +339,34 @@ select { background: #fff; width: 100%; padding: 8px 12px; border: 1px solid #cc
 	font-size: 0.78em; color: #888; margin-top: 4px; padding-left: 18px;
 	font-family: monospace; max-height: 80px; overflow-y: auto;
 }
+
+/* Pre-count Table */
+.precount-table {
+	width: 100%; border-collapse: collapse; font-size: 0.88em;
+}
+.precount-table thead th {
+	text-align: left; font-weight: 600; color: #555; font-size: 0.85em;
+	text-transform: uppercase; letter-spacing: 0.3px;
+	padding: 4px 8px 6px; border-bottom: 2px solid #e9ecef;
+}
+.precount-table tbody td {
+	padding: 4px 8px; border-bottom: 1px solid #f0f0f0;
+}
+.precount-table tbody tr:last-child td { border-bottom: 1px solid #e9ecef; }
+.precount-table tfoot td {
+	padding: 6px 8px 2px; font-size: 0.95em;
+}
+.precount-error td { color: #dc3545; }
+.precount-pending {
+	color: #888; font-size: 0.85em; font-style: italic; padding: 8px 0 2px;
+	display: flex; align-items: center; gap: 6px;
+}
+.precount-spinner {
+	display: inline-block; width: 12px; height: 12px;
+	border: 2px solid #ddd; border-top-color: #4a90d9;
+	border-radius: 50%; animation: precount-spin 0.8s linear infinite;
+}
+@keyframes precount-spin { to { transform: rotate(360deg); } }
 `,
 	Templates:
 	[

package/source/services/data-cloner/web/data-cloner.js

@@ -4892,7 +4892,7 @@
             StatusDetailTimer: null,
             StatusDetailData: null,
             LastLiveStatus: null,
-            PersistFields: ['serverURL', 'authMethod', 'authURI', 'checkURI', 'cookieName', 'cookieValueAddr', 'cookieValueTemplate', 'loginMarker', 'userName', 'password', 'schemaURL', 'pageSize', 'dateTimePrecisionMS', 'connProvider', 'sqliteFilePath', 'mysqlServer', 'mysqlPort', 'mysqlUser', 'mysqlPassword', 'mysqlDatabase', 'mysqlConnectionLimit', 'mssqlServer', 'mssqlPort', 'mssqlUser', 'mssqlPassword', 'mssqlDatabase', 'mssqlConnectionLimit', 'postgresqlHost', 'postgresqlPort', 'postgresqlUser', 'postgresqlPassword', 'postgresqlDatabase', 'postgresqlConnectionLimit', 'solrHost', 'solrPort', 'solrCore', 'solrPath', 'mongodbHost', 'mongodbPort', 'mongodbUser', 'mongodbPassword', 'mongodbDatabase', 'mongodbConnectionLimit', 'rocksdbFolder', 'bibliographFolder']
+            PersistFields: ['serverURL', 'authMethod', 'authURI', 'checkURI', 'cookieName', 'cookieValueAddr', 'cookieValueTemplate', 'loginMarker', 'userName', 'password', 'schemaURL', 'pageSize', 'dateTimePrecisionMS', 'connProvider', 'sqliteFilePath', 'mysqlServer', 'mysqlPort', 'mysqlUser', 'mysqlPassword', 'mysqlDatabase', 'mysqlConnectionLimit', 'mssqlServer', 'mssqlPort', 'mssqlUser', 'mssqlPassword', 'mssqlDatabase', 'mssqlConnectionLimit', 'postgresqlHost', 'postgresqlPort', 'postgresqlUser', 'postgresqlPassword', 'postgresqlDatabase', 'postgresqlConnectionLimit', 'solrHost', 'solrPort', 'solrCore', 'solrPath', 'mongodbHost', 'mongodbPort', 'mongodbUser', 'mongodbPassword', 'mongodbDatabase', 'mongodbConnectionLimit', 'rocksdbFolder', 'bibliographFolder', 'syncMaxRecords']
           };
 
           // Make pict available for inline onclick handlers
@@ -5287,7 +5287,8 @@
               tmpMetaParts.push('<span class="live-status-meta-item">' + tmpGrandTotal + ' records to sync</span>');
             }
             if (pData.PreCountProgress && pData.PreCountProgress.Counted < pData.PreCountProgress.TotalTables) {
-              tmpMetaParts.push('<span class="live-status-meta-item">counting: ' + pData.PreCountProgress.Counted + ' / ' + pData.PreCountProgress.TotalTables + '</span>');
+              let tmpCountedSoFar = pData.PreCountGrandTotal > 0 ? ' (' + pData.PreCountGrandTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + ' records found)' : '';
+              tmpMetaParts.push('<span class="live-status-meta-item">counting: ' + pData.PreCountProgress.Counted + ' / ' + pData.PreCountProgress.TotalTables + ' tables' + tmpCountedSoFar + '</span>');
             }
             if (pData.Errors > 0) {
               tmpMetaParts.push('<span class="live-status-meta-item" style="color:#dc3545"><strong>' + pData.Errors + '</strong> error' + (pData.Errors === 1 ? '' : 's') + '</span>');
@@ -5302,7 +5303,10 @@
 
           // Update progress bar
           let tmpPct = 0;
-          if (pData.Phase === 'syncing' && pData.PreCountGrandTotal > 0 && pData.TotalSynced > 0) {
+          if (pData.Phase === 'syncing' && pData.PreCountProgress && pData.PreCountProgress.Counted < pData.PreCountProgress.TotalTables) {
+            // During counting phase, show table counting progress
+            tmpPct = Math.min(pData.PreCountProgress.Counted / pData.PreCountProgress.TotalTables * 100, 99);
+          } else if (pData.Phase === 'syncing' && pData.PreCountGrandTotal > 0 && pData.TotalSynced > 0) {
             tmpPct = Math.min(pData.TotalSynced / pData.PreCountGrandTotal * 100, 99.9);
           } else if (pData.Phase === 'syncing' && pData.TotalTables > 0) {
             let tmpTablePct = pData.Completed / pData.TotalTables * 100;
@@ -5317,10 +5321,31 @@
           }
           tmpProgressFill.style.width = Math.min(100, Math.round(tmpPct)) + '%';
 
+          // Auto-expand the detail view when sync starts so users see counting progress
+          if ((pData.Phase === 'syncing' || pData.Phase === 'stopping') && !this.pict.AppData.DataCloner.StatusDetailExpanded) {
+            let tmpLayoutView = this.pict.views['DataCloner-Layout'];
+            if (tmpLayoutView && typeof tmpLayoutView.toggleStatusDetail === 'function') {
+              tmpLayoutView.toggleStatusDetail();
+            }
+          }
+
           // If the detail view is expanded, re-render it with fresh data
           if (this.pict.AppData.DataCloner.StatusDetailExpanded) {
             this.renderStatusDetail();
           }
+
+          // Auto-fetch the sync report when we detect a completed sync but haven't loaded the report yet
+          if (pData.Phase === 'complete' && !this.pict.AppData.DataCloner.LastReport) {
+            let tmpSelf = this;
+            this.api('GET', '/clone/sync/report').then(function (pReportData) {
+              if (pReportData && pReportData.ReportVersion) {
+                tmpSelf.pict.AppData.DataCloner.LastReport = pReportData;
+                if (tmpSelf.pict.AppData.DataCloner.StatusDetailExpanded) {
+                  tmpSelf.renderStatusDetail();
+                }
+              }
+            }).catch(function () {/* ignore fetch errors */});
+          }
         }
 
         // ================================================================
@@ -5357,6 +5382,49 @@
             tmpSelf.renderStatusDetail();
           }).catch(function () {/* ignore poll errors */});
         }
+        renderCountingPhaseDetail(pContainer, pPreCountProgress) {
+          let tmpTables = pPreCountProgress.Tables || [];
+          let tmpCounted = pPreCountProgress.Counted || 0;
+          let tmpTotal = pPreCountProgress.TotalTables || 0;
+          let tmpRunningTotal = 0;
+          let tmpHtml = '<div class="status-detail-section">';
+          tmpHtml += '<div class="status-detail-section-title">Counting Records (' + tmpCounted + ' / ' + tmpTotal + ' tables)</div>';
+          if (tmpTables.length > 0) {
+            tmpHtml += '<table class="precount-table">';
+            tmpHtml += '<thead><tr><th>Table</th><th style="text-align:right">Records</th><th style="text-align:right">Time</th></tr></thead>';
+            tmpHtml += '<tbody>';
+            for (let i = 0; i < tmpTables.length; i++) {
+              let tmpT = tmpTables[i];
+              tmpRunningTotal += tmpT.Count;
+              let tmpCountFmt = this.formatNumber(tmpT.Count);
+              let tmpTimeFmt = tmpT.ElapsedMs < 1000 ? tmpT.ElapsedMs + 'ms' : (tmpT.ElapsedMs / 1000).toFixed(1) + 's';
+              let tmpRowClass = tmpT.Error ? ' class="precount-error"' : '';
+              tmpHtml += '<tr' + tmpRowClass + '>';
+              tmpHtml += '<td>' + this.escapeHtml(tmpT.Name) + '</td>';
+              tmpHtml += '<td style="text-align:right; font-variant-numeric:tabular-nums">' + tmpCountFmt + '</td>';
+              tmpHtml += '<td style="text-align:right; font-variant-numeric:tabular-nums; color:#888">' + tmpTimeFmt + '</td>';
+              tmpHtml += '</tr>';
+            }
+            tmpHtml += '</tbody>';
+            tmpHtml += '<tfoot><tr>';
+            tmpHtml += '<td><strong>Total</strong></td>';
+            tmpHtml += '<td style="text-align:right; font-variant-numeric:tabular-nums"><strong>' + this.formatNumber(tmpRunningTotal) + '</strong></td>';
+            tmpHtml += '<td></td>';
+            tmpHtml += '</tr></tfoot>';
+            tmpHtml += '</table>';
+          }
+
+          // Show pending indicator for remaining tables
+          let tmpRemaining = tmpTotal - tmpCounted;
+          if (tmpRemaining > 0) {
+            tmpHtml += '<div class="precount-pending">';
+            tmpHtml += '<span class="precount-spinner"></span> ';
+            tmpHtml += tmpRemaining + ' table' + (tmpRemaining === 1 ? '' : 's') + ' remaining…';
+            tmpHtml += '</div>';
+          }
+          tmpHtml += '</div>';
+          pContainer.innerHTML = tmpHtml;
+        }
         renderStatusDetail() {
           let tmpContainer = document.getElementById('DataCloner-StatusDetail-Container');
           if (!tmpContainer) return;
@@ -5365,6 +5433,15 @@
           let tmpStatusData = tmpAppData.StatusDetailData;
           let tmpReport = tmpAppData.LastReport;
 
+          // During the counting phase, show per-table counts as they arrive
+          if (tmpLiveStatus && tmpLiveStatus.PreCountProgress && tmpLiveStatus.PreCountProgress.Tables && tmpLiveStatus.Phase === 'syncing' && tmpLiveStatus.PreCountProgress.Counted < tmpLiveStatus.PreCountProgress.TotalTables) {
+            this.renderCountingPhaseDetail(tmpContainer, tmpLiveStatus.PreCountProgress);
+            // Hide histogram during counting
+            let tmpHistContainer = document.getElementById('DataCloner-Throughput-Histogram');
+            if (tmpHistContainer) tmpHistContainer.style.display = 'none';
+            return;
+          }
+
           // Determine data source: live during sync, report after sync
           let tmpTables = {};
           let tmpThroughputSamples = [];
@@ -5384,6 +5461,10 @@
             tmpEventLog = tmpReport.EventLog || [];
           } else if (tmpStatusData && tmpStatusData.Tables) {
             tmpTables = tmpStatusData.Tables;
+            // Use throughput samples from live status if available (e.g. after page reload with completed sync)
+            if (tmpLiveStatus && tmpLiveStatus.ThroughputSamples) {
+              tmpThroughputSamples = tmpLiveStatus.ThroughputSamples;
+            }
           }
 
           // Categorize tables
@@ -6892,6 +6973,34 @@ select { background: #fff; width: 100%; padding: 8px 12px; border: 1px solid #cc
 	font-size: 0.78em; color: #888; margin-top: 4px; padding-left: 18px;
 	font-family: monospace; max-height: 80px; overflow-y: auto;
 }
+
+/* Pre-count Table */
+.precount-table {
+	width: 100%; border-collapse: collapse; font-size: 0.88em;
+}
+.precount-table thead th {
+	text-align: left; font-weight: 600; color: #555; font-size: 0.85em;
+	text-transform: uppercase; letter-spacing: 0.3px;
+	padding: 4px 8px 6px; border-bottom: 2px solid #e9ecef;
+}
+.precount-table tbody td {
+	padding: 4px 8px; border-bottom: 1px solid #f0f0f0;
+}
+.precount-table tbody tr:last-child td { border-bottom: 1px solid #e9ecef; }
+.precount-table tfoot td {
+	padding: 6px 8px 2px; font-size: 0.95em;
+}
+.precount-error td { color: #dc3545; }
+.precount-pending {
+	color: #888; font-size: 0.85em; font-style: italic; padding: 8px 0 2px;
+	display: flex; align-items: center; gap: 6px;
+}
+.precount-spinner {
+	display: inline-block; width: 12px; height: 12px;
+	border: 2px solid #ddd; border-top-color: #4a90d9;
+	border-radius: 50%; animation: precount-spin 0.8s linear infinite;
+}
+@keyframes precount-spin { to { transform: rotate(360deg); } }
 `,
         Templates: [{
           Hash: 'DataCloner-Layout',