From e977788110cde2f3a0a6f3704f15b5d5c821d773 Mon Sep 17 00:00:00 2001
From: kodinkat <me@karlkatewu.com>
Date: Mon, 11 May 2026 14:25:43 +0100
Subject: [PATCH] Add activity log support to migration settings and import
 process

- Introduced a new setting to include activity logs during export and import operations.
- Updated the admin interface to allow users to enable or disable activity log inclusion.
- Enhanced the import process to handle activity log rows, ensuring they are imported correctly when the setting is enabled.
- Refactored related classes and methods to accommodate the new functionality, including adjustments to the REST API responses to include activity log counts.
- Updated version number to 1.1 to reflect the addition of this feature.
---
 admin/admin-menu-and-tabs.php                 |   3 +-
 admin/class-dt-migration-import-ajax.php      |  24 ++++
 admin/class-dt-migration-tab-import.php       | 115 +++++++++++++++++-
 admin/class-dt-migration-tab-settings.php     |  16 +++
 includes/class-dt-migration-export-file.php   |  80 ++++++++++--
 includes/class-dt-migration-import-engine.php | 111 +++++++++++++++--
 rest-api/rest-api.php                         |  86 +++++++++++--
 7 files changed, 409 insertions(+), 26 deletions(-)

diff --git a/admin/admin-menu-and-tabs.php b/admin/admin-menu-and-tabs.php
index 7554b40..eaa028a 100644
--- a/admin/admin-menu-and-tabs.php
+++ b/admin/admin-menu-and-tabs.php
@@ -136,7 +136,8 @@ public static function get_post_type_label( string $post_type ): string {
      */
     public static function get_settings(): array {
         $defaults = [
-            'enabled'       => false,
+            'enabled'               => false,
+            'include_activity_log'  => false,
             // Legacy option; UI no longer exposes a single "mode". Capabilities API reports both channels.
             'mode'          => 'api',
             'allowed_items' => [
diff --git a/admin/class-dt-migration-import-ajax.php b/admin/class-dt-migration-import-ajax.php
index 4e910ba..d71d1ef 100644
--- a/admin/class-dt-migration-import-ajax.php
+++ b/admin/class-dt-migration-import-ajax.php
@@ -304,6 +304,18 @@ public function handle_import_batch() : void {
                 $batch_result['errors'] = array_merge( $batch_result['errors'] ?? [], $pum_result['errors'] );
             }
 
+            if ( ! empty( $settings['include_activity_log'] ) ) {
+                $activity_rows = $rbody['activity_log'] ?? [];
+                $act_result    = Disciple_Tools_Migration_Import_Engine::import_activity_log_for_posts(
+                    is_array( $activity_rows ) ? $activity_rows : [],
+                    $batch_post_ids,
+                    $post_type
+                );
+                if ( ! empty( $act_result['errors'] ) ) {
+                    $batch_result['errors'] = array_merge( $batch_result['errors'] ?? [], $act_result['errors'] );
+                }
+            }
+
             wp_send_json_success( [
                 'done'          => ! $has_more,
                 'phase'         => 'records',
@@ -486,6 +498,18 @@ private function handle_file_mode_batch( string $step, array $settings ) : void
                 $batch_result['errors'] = array_merge( $batch_result['errors'] ?? [], $pum_result['errors'] );
             }
 
+            if ( ! empty( $settings['include_activity_log'] ) ) {
+                $activity_rows = $payload['activity_log'][ $post_type ] ?? [];
+                $act_result    = Disciple_Tools_Migration_Import_Engine::import_activity_log_for_posts(
+                    is_array( $activity_rows ) ? $activity_rows : [],
+                    $slice_post_ids,
+                    $post_type
+                );
+                if ( ! empty( $act_result['errors'] ) ) {
+                    $batch_result['errors'] = array_merge( $batch_result['errors'] ?? [], $act_result['errors'] );
+                }
+            }
+
             wp_send_json_success( [
                 'done'            => ! $has_more,
                 'phase'           => 'records',
diff --git a/admin/class-dt-migration-tab-import.php b/admin/class-dt-migration-tab-import.php
index edd6505..0a18c78 100644
--- a/admin/class-dt-migration-tab-import.php
+++ b/admin/class-dt-migration-tab-import.php
@@ -49,6 +49,13 @@ class Disciple_Tools_Migration_Tab_Import {
      */
     private $import_preview_user_count = 0;
 
+    /**
+     * Whether the previewed export includes activity log rows (source package / Server A).
+     *
+     * @var bool
+     */
+    private $import_preview_export_include_activity_log = false;
+
     /**
      * Which import UI produced the current preview: 'api' or 'file'.
      *
@@ -322,6 +329,7 @@ class="dt-migration-setting-checkbox"
                                             <td><?php echo esc_html( $row['notes'] ); ?></td>
                                         </tr>
                                     <?php endforeach; ?>
+                                    <?php $this->render_import_preview_activity_settings_row(); ?>
                                     </tbody>
                                 </table>
 
@@ -336,6 +344,7 @@ class="dt-migration-setting-checkbox"
                                         <th><?php esc_html_e( 'Tiles', 'disciple-tools-migration' ); ?></th>
                                         <th><?php esc_html_e( 'Fields', 'disciple-tools-migration' ); ?></th>
                                         <th><?php esc_html_e( 'Records', 'disciple-tools-migration' ); ?></th>
+                                        <th><?php esc_html_e( 'Activity log', 'disciple-tools-migration' ); ?></th>
                                     </tr>
                                     </thead>
                                     <tbody>
@@ -360,12 +369,27 @@ class="dt-migration-record-checkbox"
                                             <td><?php echo isset( $summary['tiles'] ) ? intval( $summary['tiles'] ) : 0; ?></td>
                                             <td><?php echo isset( $summary['fields'] ) ? intval( $summary['fields'] ) : 0; ?></td>
                                             <td><?php echo esc_html( (string) (int) $record_count ); ?></td>
+                                            <td>
+                                                <?php
+                                                if ( $this->import_preview_export_include_activity_log ) {
+                                                    $ac = isset( $record_data['activity_log_count'] ) ? (int) $record_data['activity_log_count'] : 0;
+                                                    echo esc_html( number_format_i18n( $ac ) );
+                                                } else {
+                                                    echo '<span aria-hidden="true">&mdash;</span>';
+                                                }
+                                                ?>
+                                            </td>
                                         </tr>
                                         <?php
                                     }
                                     ?>
                                     </tbody>
                                 </table>
+                                <?php if ( $this->import_preview_export_include_activity_log && empty( $settings['include_activity_log'] ) ) : ?>
+                                    <p class="description" style="margin-top: 8px;">
+                                        <?php esc_html_e( 'Activity log is disabled on this site (Migration → Settings), so historical entries will not be restored during import until you enable that option.', 'disciple-tools-migration' ); ?>
+                                    </p>
+                                <?php endif; ?>
 
                                 <p style="margin-top: 16px;">
                                     <button type="button" class="button dt-migration-run-preflight" data-import-channel="api">
@@ -458,6 +482,7 @@ class="dt-migration-record-checkbox"
                                             <td><?php echo esc_html( $row['notes'] ); ?></td>
                                         </tr>
                                     <?php endforeach; ?>
+                                    <?php $this->render_import_preview_activity_settings_row(); ?>
                                     </tbody>
                                 </table>
                                 <table class="widefat striped dt-migration-records-table">
@@ -468,6 +493,7 @@ class="dt-migration-record-checkbox"
                                         <th><?php esc_html_e( 'Tiles', 'disciple-tools-migration' ); ?></th>
                                         <th><?php esc_html_e( 'Fields', 'disciple-tools-migration' ); ?></th>
                                         <th><?php esc_html_e( 'Records', 'disciple-tools-migration' ); ?></th>
+                                        <th><?php esc_html_e( 'Activity log', 'disciple-tools-migration' ); ?></th>
                                     </tr>
                                     </thead>
                                     <tbody>
@@ -486,10 +512,26 @@ class="dt-migration-record-checkbox"
                                             <td><?php echo isset( $summary['tiles'] ) ? intval( $summary['tiles'] ) : 0; ?></td>
                                             <td><?php echo isset( $summary['fields'] ) ? intval( $summary['fields'] ) : 0; ?></td>
                                             <td><?php echo esc_html( (string) (int) $record_count ); ?></td>
+                                            <td>
+                                                <?php
+                                                if ( $this->import_preview_export_include_activity_log ) {
+                                                    $ac = isset( $record_data['activity_log_count'] ) ? (int) $record_data['activity_log_count'] : 0;
+                                                    echo esc_html( number_format_i18n( $ac ) );
+                                                } else {
+                                                    echo '<span aria-hidden="true">&mdash;</span>';
+                                                }
+                                                ?>
+                                            </td>
                                         </tr>
                                     <?php } ?>
                                     </tbody>
                                 </table>
+                                <?php if ( $this->import_preview_export_include_activity_log && empty( $settings['include_activity_log'] ) ) : ?>
+                                    <p class="description" style="margin-top: 8px;">
+                                        <?php esc_html_e( 'Activity log is disabled on this site (Migration → Settings), so historical entries will not be restored during import until you enable that option.', 'disciple-tools-migration' ); ?>
+                                    </p>
+                                <?php endif; ?>
+
                                 <p style="margin-top: 16px;">
                                     <button type="button" class="button dt-migration-run-preflight" data-import-channel="file">
                                         <?php esc_html_e( 'Run preflight', 'disciple-tools-migration' ); ?>
@@ -737,6 +779,7 @@ private function process_form_fields( array $settings ) : void {
 
             // Store allowed_items from export response for use in preview tables.
             $this->export_allowed_items = $export_body['settings']['allowed_items'] ?? [];
+            $this->import_preview_export_include_activity_log = ! empty( $export_body['settings']['include_activity_log'] );
 
             $preview = [];
             foreach ( $post_types as $post_type => $config ) {
@@ -850,6 +893,7 @@ private function process_form_fields( array $settings ) : void {
         // Always clear previous preview when re-submitting the form.
         $this->settings_preview           = null;
         $this->import_preview_user_count = 0;
+        $this->import_preview_export_include_activity_log = false;
         $this->import_preview_channel     = null;
         $this->records_preview            = null;
         $this->export_allowed_items       = null;
@@ -987,6 +1031,7 @@ private function build_file_preview_state_from_payload( array $payload ) : void
         $tiles_all     = $dt_settings['dt_tiles_settings']['values'] ?? [];
         $fields_all    = $dt_settings['dt_fields_settings']['values'] ?? [];
         $this->export_allowed_items = $payload['settings']['allowed_items'] ?? [];
+        $this->import_preview_export_include_activity_log = ! empty( $payload['settings']['include_activity_log'] );
         $sys_users     = $payload['export']['system_users']['users'] ?? [];
         $this->import_preview_user_count = is_array( $sys_users ) ? count( $sys_users ) : 0;
 
@@ -999,10 +1044,21 @@ private function build_file_preview_state_from_payload( array $payload ) : void
         }
         $this->settings_preview = $preview;
 
-        $records_raw = $payload['records'] ?? [];
+        $records_raw  = $payload['records'] ?? [];
+        $activity_raw = $payload['activity_log'] ?? [];
         $this->records_preview = [];
         foreach ( $records_raw as $post_type => $recs ) {
-            $this->records_preview[ $post_type ] = [ 'count' => is_array( $recs ) ? count( $recs ) : 0 ];
+            $activity_n = 0;
+            if ( $this->import_preview_export_include_activity_log && isset( $activity_raw[ $post_type ] ) && is_array( $activity_raw[ $post_type ] ) ) {
+                $activity_n = count( $activity_raw[ $post_type ] );
+            }
+            $row = [
+                'count' => is_array( $recs ) ? count( $recs ) : 0,
+            ];
+            if ( $this->import_preview_export_include_activity_log ) {
+                $row['activity_log_count'] = $activity_n;
+            }
+            $this->records_preview[ $post_type ] = $row;
         }
 
         $this->import_preview_channel = 'file';
@@ -1114,4 +1170,59 @@ private function render_past_file_jobs_table( array $settings ) : void {
         </table>
         <?php
     }
+
+    /**
+     * Sums activity_log_count values from a records preview payload.
+     *
+     * @param array<string, array<string, mixed>> $records_preview
+     */
+    private function sum_preview_activity_log_counts( array $records_preview ) : int {
+        $total = 0;
+        foreach ( $records_preview as $row ) {
+            if ( is_array( $row ) && isset( $row['activity_log_count'] ) ) {
+                $total += (int) $row['activity_log_count'];
+            }
+        }
+        return $total;
+    }
+
+    /**
+     * Extra settings-table row describing activity log presence in the previewed export.
+     */
+    private function render_import_preview_activity_settings_row() : void {
+        $records_preview = is_array( $this->records_preview ) ? $this->records_preview : [];
+        $activity_total  = $this->sum_preview_activity_log_counts( $records_preview );
+        ?>
+        <tr class="dt-migration-activity-log-preview-row">
+            <td><span aria-hidden="true">&mdash;</span></td>
+            <td><?php esc_html_e( 'Activity log (with records)', 'disciple-tools-migration' ); ?></td>
+            <td>
+                <?php
+                echo $this->import_preview_export_include_activity_log
+                    ? esc_html__( 'In export', 'disciple-tools-migration' )
+                    : esc_html__( 'Not included', 'disciple-tools-migration' );
+                ?>
+            </td>
+            <td>
+                <?php
+                if ( $this->import_preview_export_include_activity_log ) {
+                    if ( $activity_total > 0 ) {
+                        echo esc_html(
+                            sprintf(
+                                /* translators: %s: formatted number of activity log entries */
+                                __( '%s activity entries in this preview (counts per post type are below).', 'disciple-tools-migration' ),
+                                number_format_i18n( $activity_total )
+                            )
+                        );
+                    } else {
+                        esc_html_e( 'The source included activity in exports, but there are no rows for the post types shown below.', 'disciple-tools-migration' );
+                    }
+                } else {
+                    esc_html_e( 'The source did not include activity history in this package.', 'disciple-tools-migration' );
+                }
+                ?>
+            </td>
+        </tr>
+        <?php
+    }
 }
\ No newline at end of file
diff --git a/admin/class-dt-migration-tab-settings.php b/admin/class-dt-migration-tab-settings.php
index 909086a..7166174 100644
--- a/admin/class-dt-migration-tab-settings.php
+++ b/admin/class-dt-migration-tab-settings.php
@@ -138,6 +138,20 @@ public function main_column( array $settings ) {
                     </fieldset>
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <?php esc_html_e( 'Activity log', 'disciple-tools-migration' ); ?>
+                </td>
+                <td>
+                    <label>
+                        <input type="checkbox" name="dt_migration_include_activity_log" value="1" <?php checked( ! empty( $settings['include_activity_log'] ) ); ?> />
+                        <?php esc_html_e( 'Include activity history when exporting records, and restore it when importing (per batch).', 'disciple-tools-migration' ); ?>
+                    </label>
+                    <p class="description">
+                        <?php esc_html_e( 'When importing, existing activity rows for the affected records are removed and replaced with the export. Leave off for smaller exports or if you do not need historical activity on the target site.', 'disciple-tools-migration' ); ?>
+                    </p>
+                </td>
+            </tr>
             <tr>
                 <th colspan="2" scope="colgroup">
                     <?php esc_html_e( 'File import jobs', 'disciple-tools-migration' ); ?>
@@ -198,6 +212,8 @@ public function process_form_fields(): void {
 
         $settings['enabled'] = isset( $post_vars['dt_migration_enabled'] ) && '1' === (string) $post_vars['dt_migration_enabled'];
 
+        $settings['include_activity_log'] = isset( $post_vars['dt_migration_include_activity_log'] ) && '1' === (string) $post_vars['dt_migration_include_activity_log'];
+
         $allowed = $post_vars['dt_migration_allowed_items'] ?? [];
 
         $settings['allowed_items']['general_settings'] = ! empty( $allowed['general_settings'] );
diff --git a/includes/class-dt-migration-export-file.php b/includes/class-dt-migration-export-file.php
index 585fc70..6513e6c 100644
--- a/includes/class-dt-migration-export-file.php
+++ b/includes/class-dt-migration-export-file.php
@@ -11,7 +11,7 @@
  */
 class Disciple_Tools_Migration_Export_File {
 
-    const EXPORT_VERSION = '1.0';
+    const EXPORT_VERSION = '1.1';
 
     /**
      * Builds a full export payload (settings + records) for file download.
@@ -37,9 +37,11 @@ public static function build_export( array $record_options = [] ) : array {
             $export_block['system_users'] = Disciple_Tools_Migration_System_Users::build_export_payload();
         }
 
-        $records         = [];
-        $post_user_meta  = [];
-        $allowed_records = $allowed['records'] ?? [];
+        $records          = [];
+        $post_user_meta   = [];
+        $activity_log     = [];
+        $allowed_records  = $allowed['records'] ?? [];
+        $export_activity  = ! empty( $settings['include_activity_log'] );
         if ( ! empty( $allowed_records ) && is_array( $allowed_records ) ) {
             foreach ( $allowed_records as $post_type => $enabled ) {
                 if ( ! $enabled ) {
@@ -53,6 +55,9 @@ public static function build_export( array $record_options = [] ) : array {
                 $ids                       = self::get_record_ids( $post_type, $limit, $min_id, $max_id );
                 $records[ $post_type ]     = self::fetch_records_for_ids( $post_type, $ids );
                 $post_user_meta[ $post_type ] = self::fetch_post_user_meta( $ids );
+                if ( $export_activity ) {
+                    $activity_log[ $post_type ] = self::fetch_activity_log_for_posts( $post_type, $ids );
+                }
             }
         }
 
@@ -61,13 +66,15 @@ public static function build_export( array $record_options = [] ) : array {
             'type'     => 'file',
             'site_meta' => $site_meta,
             'settings' => [
-                'enabled'       => ! empty( $settings['enabled'] ),
-                'mode'          => 'file',
-                'allowed_items' => $allowed,
+                'enabled'                => ! empty( $settings['enabled'] ),
+                'include_activity_log'  => ! empty( $settings['include_activity_log'] ),
+                'mode'                  => 'file',
+                'allowed_items'         => $allowed,
             ],
             'export'         => $export_block,
             'records'        => $records,
             'post_user_meta' => $post_user_meta,
+            'activity_log'   => $activity_log,
         ];
     }
 
@@ -169,6 +176,65 @@ static function ( array $row ) : array {
         );
     }
 
+    /**
+     * Dumps wp_dt_activity_log rows for the given post type and post IDs (histid omitted).
+     *
+     * @param string $post_type Post type slug (object_type in the log).
+     * @param int[]  $post_ids
+     * @return array<int, array<string, mixed>>
+     */
+    public static function fetch_activity_log_for_posts( string $post_type, array $post_ids ) : array {
+        if ( '' === $post_type || empty( $post_ids ) ) {
+            return [];
+        }
+        global $wpdb;
+        $table = isset( $wpdb->dt_activity_log ) ? $wpdb->dt_activity_log : $wpdb->prefix . 'dt_activity_log';
+
+        $post_ids = array_values( array_map( 'intval', $post_ids ) );
+        $placeholders = implode( ',', array_fill( 0, count( $post_ids ), '%d' ) );
+
+        // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+        $rows = $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT user_caps, action, object_type, object_subtype, object_name, object_id, user_id, hist_ip, hist_time, object_note, meta_id, meta_key, meta_value, meta_parent, old_value, field_type
+                 FROM {$table}
+                 WHERE object_type = %s AND object_id IN ( $placeholders )
+                 ORDER BY hist_time ASC, histid ASC",
+                array_merge( [ $post_type ], $post_ids )
+            ),
+            ARRAY_A
+        );
+        // phpcs:enable
+
+        if ( ! is_array( $rows ) ) {
+            return [];
+        }
+
+        return array_map(
+            static function ( array $row ) : array {
+                return [
+                    'user_caps'      => (string) ( $row['user_caps'] ?? 'guest' ),
+                    'action'         => (string) ( $row['action'] ?? '' ),
+                    'object_type'    => (string) ( $row['object_type'] ?? '' ),
+                    'object_subtype' => (string) ( $row['object_subtype'] ?? '' ),
+                    'object_name'    => (string) ( $row['object_name'] ?? '' ),
+                    'object_id'      => (int) ( $row['object_id'] ?? 0 ),
+                    'user_id'        => (int) ( $row['user_id'] ?? 0 ),
+                    'hist_ip'        => isset( $row['hist_ip'] ) ? (string) $row['hist_ip'] : '127.0.0.1',
+                    'hist_time'      => (int) ( $row['hist_time'] ?? 0 ),
+                    'object_note'    => (string) ( $row['object_note'] ?? '' ),
+                    'meta_id'        => (int) ( $row['meta_id'] ?? 0 ),
+                    'meta_key'       => (string) ( $row['meta_key'] ?? '' ),
+                    'meta_value'     => (string) ( $row['meta_value'] ?? '' ),
+                    'meta_parent'    => (int) ( $row['meta_parent'] ?? 0 ),
+                    'old_value'      => (string) ( $row['old_value'] ?? '' ),
+                    'field_type'     => (string) ( $row['field_type'] ?? '' ),
+                ];
+            },
+            $rows
+        );
+    }
+
     /**
      * Gets post IDs for a post type with optional limit and ID range.
      * Always ORDER BY ID ASC.
diff --git a/includes/class-dt-migration-import-engine.php b/includes/class-dt-migration-import-engine.php
index 3a2d6ef..d4358f3 100644
--- a/includes/class-dt-migration-import-engine.php
+++ b/includes/class-dt-migration-import-engine.php
@@ -814,13 +814,6 @@ public static function apply_deferred_group_connections() : array {
         return self::apply_all_deferred_connections();
     }
 
-    /**
-     * Deletes all posts of a given post type.
-     *
-     * @param string $post_type
-     *
-     * @return int Number deleted, or -1 on error.
-     */
     /**
      * Imports per-user private meta (dt_post_user_meta) for a slice of post IDs.
      *
@@ -898,6 +891,110 @@ public static function import_post_user_meta_for_posts( array $rows, array $post
         return $result;
     }
 
+    /**
+     * Imports activity log rows for a slice of post IDs (wp_dt_activity_log).
+     *
+     * Replace semantics: deletes existing log rows for the given object_type and in-scope
+     * object_ids, then inserts export rows with user_id remapped when greater than zero and new histid.
+     * user_caps and hist_ip are taken from the export (historical record).
+     *
+     * @param array<int, array<string, mixed>> $rows
+     * @param int[]                           $post_ids_in_scope
+     * @param string                          $post_type Object type stored in the log.
+     * @return array{ inserted: int, errors: string[] }
+     */
+    public static function import_activity_log_for_posts( array $rows, array $post_ids_in_scope, string $post_type ) : array {
+        $result = [ 'inserted' => 0, 'errors' => [] ];
+
+        if ( '' === $post_type ) {
+            return $result;
+        }
+
+        $post_ids = array_values( array_unique( array_filter( array_map( 'intval', $post_ids_in_scope ) ) ) );
+        if ( empty( $post_ids ) ) {
+            return $result;
+        }
+
+        global $wpdb;
+        $table = isset( $wpdb->dt_activity_log ) ? $wpdb->dt_activity_log : $wpdb->prefix . 'dt_activity_log';
+        $placeholders = implode( ',', array_fill( 0, count( $post_ids ), '%d' ) );
+        // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+        $wpdb->query(
+            $wpdb->prepare(
+                "DELETE FROM {$table} WHERE object_type = %s AND object_id IN ( $placeholders )",
+                array_merge( [ $post_type ], $post_ids )
+            )
+        );
+        // phpcs:enable
+
+        if ( empty( $rows ) ) {
+            return $result;
+        }
+
+        $scope = array_flip( $post_ids );
+        foreach ( $rows as $row ) {
+            if ( ! is_array( $row ) ) {
+                continue;
+            }
+            $pid = isset( $row['object_id'] ) ? (int) $row['object_id'] : 0;
+            if ( $pid <= 0 || ! isset( $scope[ $pid ] ) ) {
+                continue;
+            }
+            $obj_type = isset( $row['object_type'] ) ? (string) $row['object_type'] : '';
+            if ( $obj_type !== $post_type ) {
+                continue;
+            }
+
+            $source_uid = isset( $row['user_id'] ) ? (int) $row['user_id'] : 0;
+            $target_uid = 0;
+            if ( $source_uid > 0 ) {
+                $target_uid = Disciple_Tools_Migration_System_Users::remap_user_id( $source_uid );
+                if ( $target_uid <= 0 || ! get_user_by( 'id', $target_uid ) ) {
+                    $result['errors'][] = sprintf(
+                        /* translators: 1: post ID, 2: source user ID */
+                        __( 'Skipped activity log row (post #%1$d): no target user for source user %2$d.', 'disciple-tools-migration' ),
+                        $pid,
+                        $source_uid
+                    );
+                    continue;
+                }
+            }
+
+            $ok = $wpdb->insert(
+                $table,
+                [
+                    'user_caps'      => (string) ( $row['user_caps'] ?? 'guest' ),
+                    'action'         => (string) ( $row['action'] ?? '' ),
+                    'object_type'    => $post_type,
+                    'object_subtype' => (string) ( $row['object_subtype'] ?? '' ),
+                    'object_name'    => (string) ( $row['object_name'] ?? '' ),
+                    'object_id'      => $pid,
+                    'user_id'        => $target_uid,
+                    'hist_ip'        => isset( $row['hist_ip'] ) ? (string) $row['hist_ip'] : '127.0.0.1',
+                    'hist_time'      => isset( $row['hist_time'] ) ? (int) $row['hist_time'] : 0,
+                    'object_note'    => (string) ( $row['object_note'] ?? '' ),
+                    'meta_id'        => isset( $row['meta_id'] ) ? (int) $row['meta_id'] : 0,
+                    'meta_key'       => (string) ( $row['meta_key'] ?? '' ),
+                    'meta_value'     => (string) ( $row['meta_value'] ?? '' ),
+                    'meta_parent'    => isset( $row['meta_parent'] ) ? (int) $row['meta_parent'] : 0,
+                    'old_value'      => (string) ( $row['old_value'] ?? '' ),
+                    'field_type'     => (string) ( $row['field_type'] ?? '' ),
+                ]
+            );
+            if ( $ok ) {
+                ++$result['inserted'];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes all posts of a given post type.
+     *
+     * @param string $post_type Post type slug.
+     * @return int Number deleted.
+     */
     public static function delete_posts_by_type( string $post_type ) : int {
         $query = new WP_Query(
             [
diff --git a/rest-api/rest-api.php b/rest-api/rest-api.php
index 238500b..eef4f19 100644
--- a/rest-api/rest-api.php
+++ b/rest-api/rest-api.php
@@ -119,6 +119,7 @@ public function capabilities( WP_REST_Request $request ) : WP_REST_Response {
             'enabled'            => ! empty( $settings['enabled'] ),
             // Both API and file export/import are always available; legacy stored settings may still contain mode.
             'mode'               => 'both',
+            'include_activity_log' => ! empty( $settings['include_activity_log'] ),
             'allowed_items'      => $settings['allowed_items'] ?? [],
             'site_meta'          => $this->get_site_meta(),
             'plugin_capabilities' => [
@@ -232,9 +233,10 @@ public function export( WP_REST_Request $request ) : WP_REST_Response {
         $response = [
             'site_meta' => $site_meta,
             'settings'  => [
-                'enabled'       => ! empty( $settings['enabled'] ),
-                'mode'          => 'both',
-                'allowed_items' => $allowed,
+                'enabled'               => ! empty( $settings['enabled'] ),
+                'include_activity_log'  => ! empty( $settings['include_activity_log'] ),
+                'mode'                  => 'both',
+                'allowed_items'         => $allowed,
             ],
             'export'    => $export_out,
             'request'   => $body,
@@ -291,6 +293,14 @@ public function records_preview( WP_REST_Request $request ) : WP_REST_Response {
             }
         }
 
+        if ( ! empty( $settings['include_activity_log'] ) && ! empty( $records ) ) {
+            $activity_totals = $this->get_activity_log_counts_for_post_types( array_keys( $records ) );
+            foreach ( $records as $post_type => &$data ) {
+                $data['activity_log_count'] = (int) ( $activity_totals[ $post_type ] ?? 0 );
+            }
+            unset( $data );
+        }
+
         $response = [
             'site_meta' => $this->get_site_meta(),
             'records'   => $records,
@@ -300,6 +310,57 @@ public function records_preview( WP_REST_Request $request ) : WP_REST_Response {
         return new WP_REST_Response( $response, 200 );
     }
 
+    /**
+     * Counts wp_dt_activity_log rows per object_type for the given post types.
+     *
+     * @param string[] $post_types
+     * @return array<string, int>
+     */
+    protected function get_activity_log_counts_for_post_types( array $post_types ) : array {
+        $post_types = array_values(
+            array_unique(
+                array_filter(
+                    array_map(
+                        static function ( $pt ) {
+                            return is_string( $pt ) ? sanitize_key( $pt ) : '';
+                        },
+                        $post_types
+                    )
+                )
+            )
+        );
+        if ( empty( $post_types ) ) {
+            return [];
+        }
+
+        global $wpdb;
+        $table        = isset( $wpdb->dt_activity_log ) ? $wpdb->dt_activity_log : $wpdb->prefix . 'dt_activity_log';
+        $placeholders = implode( ',', array_fill( 0, count( $post_types ), '%s' ) );
+
+        // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+        $rows = $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT object_type, COUNT(*) AS cnt FROM {$table} WHERE object_type IN ( $placeholders ) GROUP BY object_type",
+                $post_types
+            ),
+            ARRAY_A
+        );
+        // phpcs:enable
+
+        if ( ! is_array( $rows ) ) {
+            return [];
+        }
+
+        $out = [];
+        foreach ( $rows as $row ) {
+            if ( ! empty( $row['object_type'] ) ) {
+                $out[ (string) $row['object_type'] ] = (int) ( $row['cnt'] ?? 0 );
+            }
+        }
+
+        return $out;
+    }
+
     /**
      * Returns post types allowed for record export based on migration settings.
      *
@@ -387,14 +448,21 @@ public function records_batch( WP_REST_Request $request ) : WP_REST_Response {
             ? Disciple_Tools_Migration_Export_File::fetch_post_user_meta( array_map( 'intval', $ids ) )
             : [];
 
+        $settings = class_exists( 'Disciple_Tools_Migration_Menu' ) ? Disciple_Tools_Migration_Menu::get_settings() : [];
+        $activity_log = [];
+        if ( ! empty( $settings['include_activity_log'] ) && class_exists( 'Disciple_Tools_Migration_Export_File' ) ) {
+            $activity_log = Disciple_Tools_Migration_Export_File::fetch_activity_log_for_posts( $post_type, array_map( 'intval', $ids ) );
+        }
+
         return new WP_REST_Response(
             [
-                'records'        => $records,
-                'post_user_meta' => $post_user_meta,
-                'total'          => $total,
-                'offset'         => $offset,
-                'limit'          => $limit,
-                'has_more'       => ( $offset + count( $records ) ) < $total,
+                'records'         => $records,
+                'post_user_meta'  => $post_user_meta,
+                'activity_log'    => $activity_log,
+                'total'           => $total,
+                'offset'          => $offset,
+                'limit'           => $limit,
+                'has_more'        => ( $offset + count( $records ) ) < $total,
             ],
             200
         );