Sync csa branch with main

.github/workflows/build.yaml

@@ -33,7 +33,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     build_linux_gcc_debug:
@@ -522,7 +522,7 @@ jobs:
 
         env:
             TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
-            
+
         if: github.actor != 'restyled-io[bot]' && github.actor != 'dependabot[bot]' && inputs.run-codeql != true
         # Use namespace to get more disk space and slightly better performance (Compile and unit tests
         # are CPU bound)

.github/workflows/chef.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     chef_linux_all_devices:

.github/workflows/cirque.yaml

@@ -28,8 +28,8 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
-    
+    CHIP_LOG_TIMESTAMPS: false
+
 jobs:
     cirque:
         name: Cirque
@@ -127,7 +127,7 @@ jobs:
                        git config --global --add safe.directory '*' \
                        && scripts/tests/cirque_tests.sh run_all_tests \
                       "
-                   
+
 
             - name: Uploading Binaries
               uses: actions/upload-artifact@v7

.github/workflows/darwin-tests.yaml

@@ -29,7 +29,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CHIP_NO_LOG_TIMESTAMPS: true
+  CHIP_LOG_TIMESTAMPS: false
 
 jobs:
   test_suites_chip_tool_darwin:

.github/workflows/darwin.yaml

@@ -31,13 +31,13 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     framework:
         name: Build framework
         if: github.actor != 'restyled-io[bot]'
-        
+
         strategy:
             matrix:
                 os: [ macos-26 ]

.github/workflows/example-tv-casting-darwin.yaml

@@ -31,7 +31,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     tv-casting-bridge:

.github/workflows/examples-ameba.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     ameba:

.github/workflows/examples-asr.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     asr:

.github/workflows/examples-bouffalolab.yaml

@@ -28,7 +28,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CHIP_NO_LOG_TIMESTAMPS: true
+  CHIP_LOG_TIMESTAMPS: false
 
 jobs:
   bouffalolab:

.github/workflows/examples-cc13xx_26xx.yaml

@@ -29,7 +29,7 @@ concurrency:
         'workflow_dispatch' && github.run_number) || github.sha }}
     cancel-in-progress: true
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     cc13xx_26xx:

.github/workflows/examples-cc32xx.yaml

@@ -28,7 +28,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     cc32xx:

.github/workflows/examples-efr32.yaml

@@ -27,7 +27,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CHIP_NO_LOG_TIMESTAMPS: true
+  CHIP_LOG_TIMESTAMPS: false
 
 jobs:
   efr32:

.github/workflows/examples-esp32.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     esp32:

.github/workflows/examples-infineon.yaml

@@ -28,7 +28,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     infineon:

.github/workflows/examples-linux-arm.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
     CHIP_PW_COMMAND_LAUNCHER: ccache
 
 jobs:

.github/workflows/examples-linux-imx.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     imx:

.github/workflows/examples-linux-standalone.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
     CHIP_PW_COMMAND_LAUNCHER: ccache
 
 jobs:

.github/workflows/examples-nrfconnect.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     nrfconnect:

.github/workflows/examples-nuttx.yaml

@@ -37,7 +37,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CHIP_NO_LOG_TIMESTAMPS: true
+  CHIP_LOG_TIMESTAMPS: false
 
 jobs:
   nuttx:

.github/workflows/examples-nxp.yaml

@@ -30,7 +30,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     FreeRTOS:

.github/workflows/examples-qpg.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     qpg:

.github/workflows/examples-realtek.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
      FreeRTOS:

.github/workflows/examples-stm32.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     stm32:

.github/workflows/examples-telink.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     zephyr_latest:

.github/workflows/examples-tizen.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     tizen:

.github/workflows/full-android.yaml

@@ -26,7 +26,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     full_android:

.github/workflows/fuzzing-build.yaml

@@ -23,7 +23,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     build_linux_fuzzing:

.github/workflows/java-tests.yaml

@@ -30,7 +30,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     java_tests_linux:

.github/workflows/qemu.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
 

.github/workflows/release_artifacts.yaml

@@ -22,7 +22,7 @@ on:
                 required: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     esp32:

.github/workflows/smoketest-android.yaml

@@ -24,7 +24,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     android:

.github/workflows/tests.yaml

@@ -40,7 +40,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     test_suites_linux:

.github/workflows/zap_regeneration.yaml

@@ -22,7 +22,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     zap_regeneration:

.github/workflows/zap_templates.yaml

@@ -27,7 +27,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CHIP_NO_LOG_TIMESTAMPS: true
+    CHIP_LOG_TIMESTAMPS: false
 
 jobs:
     zap_templates:

docs/guides/migrating_ember_cluster_to_code_driven.md

@@ -19,16 +19,44 @@ smaller pull requests. This approach significantly simplifies the review
 process, allowing reviewers to approve preliminary changes quickly. We recommend
 the following sequence of PRs:
 
--   [ ] **PR 1: File Renames Only.**
+-   [ ] **PR 1: File Renames and Moves Only.**
 
     -   If your migration involves renaming files, submit a PR containing _only_
-        the renames. A typical rename is from `<name>-server.cpp` to
-        `<Name>Cluster.cpp`.
-    -   **Note:** For backward compatibility with code generation, it is often
-        best to **not** rename the header file.
+        the renames and file moves. This helps to isolate structural changes
+        from logic changes, making the review process easier.
+
+    -   **`.cpp` file rename:**
+
+        -   Rename `<name>-server.cpp` to `<Name>Cluster.cpp`. This is often a
+            good starting point as much of the implementation can be reused.
+            Renaming allows `git diff` to track changes more effectively than a
+            delete/add operation.
+
+    -   **`.h` file renames and refactoring:**
+
+        -   The legacy header (`<name>-server.h`) often contains a mix of legacy
+            API functions, delegate classes, and other definitions. To maintain
+            backward compatibility while moving to a code-driven model, we
+            recommend the following:
+        -   Create a new `CodegenIntegration.h` header and move the
+            implementation portions of `<name>-server.h` into it. This new file
+            will be responsible for maintaining the legacy API integration logic
+            that interacts with the generated code.
+        -   If `<name>-server.h` contains delegate classes or other distinct
+            components (e.g., `class FooDelegate`), move them into their own
+            header files (e.g., `FooDelegate.h`). A good rule of thumb is that
+            `class Bar` should live in `Bar.h`.
+        -   After moving the implementation out of `<name>-server.h`, update
+            `<name>-server.h` itself to be a wrapper that simply includes the
+            new headers (`CodegenIntegration.h`, `FooDelegate.h`, etc.). This
+            preserves the include paths for existing code while allowing the
+            implementation to evolve.
+
     -   **Why:** This prevents `git diff` from becoming confused and showing the
         entire file as deleted and recreated, making the actual code changes
-        impossible to review.
+        impossible to review. Separating file moves from logic changes is a
+        critical step for an efficient code review.
+
     -   _This type of PR can be reviewed and merged very quickly._
 
 -   [ ] **PR 2: Code Movement Only.**