diff --git a/renderers/angular/src/v0_8/components/audio.spec.ts b/renderers/angular/src/v0_8/components/audio.spec.ts
index 634827cb1..21c6eb0f0 100644
--- a/renderers/angular/src/v0_8/components/audio.spec.ts
+++ b/renderers/angular/src/v0_8/components/audio.spec.ts
@@ -18,7 +18,6 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {AudioPlayer} from './audio';
 import type {AudioPlayerNode} from '../types';
 import {Theme} from '../rendering/theming';
-import {ChangeDetectionStrategy} from '@angular/core';
 import {MessageProcessor} from '../data/processor';
 import {Catalog} from '../rendering/catalog';
 
@@ -53,11 +52,7 @@ describe('AudioPlayer Component', () => {
         {provide: Theme, useValue: mockTheme},
         {provide: Catalog, useValue: {}},
       ],
-    })
-      .overrideComponent(AudioPlayer, {
-        set: {changeDetection: ChangeDetectionStrategy.Default},
-      })
-      .compileComponents();
+    }).compileComponents();
 
     fixture = TestBed.createComponent(AudioPlayer);
     component = fixture.componentInstance;
diff --git a/renderers/angular/src/v0_8/components/button.ts b/renderers/angular/src/v0_8/components/button.ts
index 0ff926a8b..35b9e47fe 100644
--- a/renderers/angular/src/v0_8/components/button.ts
+++ b/renderers/angular/src/v0_8/components/button.ts
@@ -22,7 +22,7 @@ import {Renderer} from '../rendering/renderer';
 @Component({
   selector: 'a2ui-button',
   imports: [Renderer],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
     <button
       [class]="theme.components.Button"
diff --git a/renderers/angular/src/v0_8/components/card.spec.ts b/renderers/angular/src/v0_8/components/card.spec.ts
index 42fd4f895..41e0ac9d0 100644
--- a/renderers/angular/src/v0_8/components/card.spec.ts
+++ b/renderers/angular/src/v0_8/components/card.spec.ts
@@ -20,7 +20,7 @@ import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
 import type {CardNode} from '../types';
-import {Directive, Input, ChangeDetectionStrategy} from '@angular/core';
+import {Directive, Input} from '@angular/core';
 
 @Directive({
   selector: '[a2ui-renderer]',
@@ -65,7 +65,6 @@ describe('Card Component', () => {
     })
       .overrideComponent(Card, {
         set: {
-          changeDetection: ChangeDetectionStrategy.Default,
           imports: [MockRenderer],
         },
       })
diff --git a/renderers/angular/src/v0_8/components/column.spec.ts b/renderers/angular/src/v0_8/components/column.spec.ts
index 9e954d5c1..00c64f668 100644
--- a/renderers/angular/src/v0_8/components/column.spec.ts
+++ b/renderers/angular/src/v0_8/components/column.spec.ts
@@ -20,7 +20,7 @@ import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
 import type {ColumnNode} from '../types';
-import {Directive, Input, ChangeDetectionStrategy} from '@angular/core';
+import {Directive, Input} from '@angular/core';
 
 @Directive({
   selector: '[a2ui-renderer]',
@@ -64,7 +64,6 @@ describe('Column Component', () => {
     })
       .overrideComponent(Column, {
         set: {
-          changeDetection: ChangeDetectionStrategy.Default,
           imports: [MockRenderer],
         },
       })
diff --git a/renderers/angular/src/v0_8/components/column.ts b/renderers/angular/src/v0_8/components/column.ts
index a8b2b99c7..2cfca4941 100644
--- a/renderers/angular/src/v0_8/components/column.ts
+++ b/renderers/angular/src/v0_8/components/column.ts
@@ -22,7 +22,7 @@ import {Renderer} from '../rendering/renderer';
 @Component({
   selector: 'a2ui-column',
   imports: [Renderer],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: flex;
diff --git a/renderers/angular/src/v0_8/components/datetime-input.spec.ts b/renderers/angular/src/v0_8/components/datetime-input.spec.ts
index 205efec48..1460e3e63 100644
--- a/renderers/angular/src/v0_8/components/datetime-input.spec.ts
+++ b/renderers/angular/src/v0_8/components/datetime-input.spec.ts
@@ -18,7 +18,6 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {DateTimeInput} from './datetime-input';
 import type {A2UIClientEventMessage, DateTimeInputNode} from '../types';
 import {Theme} from '../rendering/theming';
-import {ChangeDetectionStrategy} from '@angular/core';
 import {MessageProcessor} from '../data/processor';
 import {Catalog} from '../rendering/catalog';
 
@@ -57,11 +56,7 @@ describe('DateTimeInput Component', () => {
         {provide: Theme, useValue: mockTheme},
         {provide: Catalog, useValue: {}},
       ],
-    })
-      .overrideComponent(DateTimeInput, {
-        set: {changeDetection: ChangeDetectionStrategy.Default},
-      })
-      .compileComponents();
+    }).compileComponents();
 
     fixture = TestBed.createComponent(DateTimeInput);
     component = fixture.componentInstance;
diff --git a/renderers/angular/src/v0_8/components/icon.ts b/renderers/angular/src/v0_8/components/icon.ts
index 245134910..a8ef1b783 100644
--- a/renderers/angular/src/v0_8/components/icon.ts
+++ b/renderers/angular/src/v0_8/components/icon.ts
@@ -24,7 +24,7 @@ import type {IconNode, StringValue} from '../types';
     'aria-hidden': 'true',
     tabindex: '-1',
   },
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: block;
diff --git a/renderers/angular/src/v0_8/components/image.ts b/renderers/angular/src/v0_8/components/image.ts
index de633740e..29eb988ef 100644
--- a/renderers/angular/src/v0_8/components/image.ts
+++ b/renderers/angular/src/v0_8/components/image.ts
@@ -22,7 +22,7 @@ import {DynamicComponent} from '../rendering/dynamic-component';
 
 @Component({
   selector: 'a2ui-image',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: block;
diff --git a/renderers/angular/src/v0_8/components/list.spec.ts b/renderers/angular/src/v0_8/components/list.spec.ts
index cd79042a0..e52e0bafd 100644
--- a/renderers/angular/src/v0_8/components/list.spec.ts
+++ b/renderers/angular/src/v0_8/components/list.spec.ts
@@ -20,7 +20,7 @@ import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
 import type {ListNode} from '../types';
-import {Directive, Input, ChangeDetectionStrategy} from '@angular/core';
+import {Directive, Input} from '@angular/core';
 import {By} from '@angular/platform-browser';
 
 @Directive({
@@ -65,7 +65,6 @@ describe('List Component', () => {
     })
       .overrideComponent(List, {
         set: {
-          changeDetection: ChangeDetectionStrategy.Default,
           imports: [MockRenderer],
         },
       })
diff --git a/renderers/angular/src/v0_8/components/list.ts b/renderers/angular/src/v0_8/components/list.ts
index c0ad5f01a..14645d742 100644
--- a/renderers/angular/src/v0_8/components/list.ts
+++ b/renderers/angular/src/v0_8/components/list.ts
@@ -22,7 +22,7 @@ import {Renderer} from '../rendering/renderer';
 @Component({
   selector: 'a2ui-list',
   imports: [Renderer],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     '[attr.direction]': 'direction()',
   },
diff --git a/renderers/angular/src/v0_8/components/modal.spec.ts b/renderers/angular/src/v0_8/components/modal.spec.ts
index 8f354a2cf..e19318064 100644
--- a/renderers/angular/src/v0_8/components/modal.spec.ts
+++ b/renderers/angular/src/v0_8/components/modal.spec.ts
@@ -20,7 +20,7 @@ import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
 import type {AnyComponentNode} from '../types';
-import {Directive, Input, ChangeDetectionStrategy} from '@angular/core';
+import {Directive, Input} from '@angular/core';
 import {By} from '@angular/platform-browser';
 
 @Directive({
@@ -72,7 +72,6 @@ describe('Modal Component', () => {
     })
       .overrideComponent(Modal, {
         set: {
-          changeDetection: ChangeDetectionStrategy.Default,
           imports: [MockRenderer],
         },
       })
diff --git a/renderers/angular/src/v0_8/components/multiple-choice.spec.ts b/renderers/angular/src/v0_8/components/multiple-choice.spec.ts
index 68465d6f9..643ae2bff 100644
--- a/renderers/angular/src/v0_8/components/multiple-choice.spec.ts
+++ b/renderers/angular/src/v0_8/components/multiple-choice.spec.ts
@@ -20,7 +20,6 @@ import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
 import {By} from '@angular/platform-browser';
-import {ChangeDetectionStrategy} from '@angular/core';
 
 describe('MultipleChoice Component', () => {
   let component: MultipleChoice;
@@ -57,13 +56,7 @@ describe('MultipleChoice Component', () => {
         {provide: Theme, useValue: mockTheme},
         {provide: Catalog, useValue: {}},
       ],
-    })
-      .overrideComponent(MultipleChoice, {
-        set: {
-          changeDetection: ChangeDetectionStrategy.Default,
-        },
-      })
-      .compileComponents();
+    }).compileComponents();
 
     fixture = TestBed.createComponent(MultipleChoice);
     component = fixture.componentInstance;
diff --git a/renderers/angular/src/v0_8/components/row.spec.ts b/renderers/angular/src/v0_8/components/row.spec.ts
index dd30d6bbd..522200898 100644
--- a/renderers/angular/src/v0_8/components/row.spec.ts
+++ b/renderers/angular/src/v0_8/components/row.spec.ts
@@ -20,7 +20,7 @@ import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
 import type {RowNode} from '../types';
-import {Directive, Input, ChangeDetectionStrategy} from '@angular/core';
+import {Directive, Input} from '@angular/core';
 
 @Directive({
   selector: '[a2ui-renderer]',
@@ -64,7 +64,6 @@ describe('Row Component', () => {
     })
       .overrideComponent(Row, {
         set: {
-          changeDetection: ChangeDetectionStrategy.Default,
           imports: [MockRenderer],
         },
       })
diff --git a/renderers/angular/src/v0_8/components/row.ts b/renderers/angular/src/v0_8/components/row.ts
index e4348f747..12377c044 100644
--- a/renderers/angular/src/v0_8/components/row.ts
+++ b/renderers/angular/src/v0_8/components/row.ts
@@ -22,7 +22,7 @@ import type {AnyComponentNode, ResolvedRow, RowNode} from '../types';
 @Component({
   selector: 'a2ui-row',
   imports: [Renderer],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     '[attr.alignment]': 'alignment()',
     '[attr.distribution]': 'distribution()',
diff --git a/renderers/angular/src/v0_8/components/slider.spec.ts b/renderers/angular/src/v0_8/components/slider.spec.ts
index 9548c8c81..a35441da6 100644
--- a/renderers/angular/src/v0_8/components/slider.spec.ts
+++ b/renderers/angular/src/v0_8/components/slider.spec.ts
@@ -20,7 +20,6 @@ import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
 import {By} from '@angular/platform-browser';
-import {ChangeDetectionStrategy} from '@angular/core';
 
 describe('Slider Component', () => {
   let component: Slider;
@@ -52,13 +51,7 @@ describe('Slider Component', () => {
         {provide: Theme, useValue: mockTheme},
         {provide: Catalog, useValue: {}},
       ],
-    })
-      .overrideComponent(Slider, {
-        set: {
-          changeDetection: ChangeDetectionStrategy.Default,
-        },
-      })
-      .compileComponents();
+    }).compileComponents();
 
     fixture = TestBed.createComponent(Slider);
     component = fixture.componentInstance;
diff --git a/renderers/angular/src/v0_8/components/surface.spec.ts b/renderers/angular/src/v0_8/components/surface.spec.ts
index aedf7be6a..a8e3e511f 100644
--- a/renderers/angular/src/v0_8/components/surface.spec.ts
+++ b/renderers/angular/src/v0_8/components/surface.spec.ts
@@ -18,7 +18,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {Surface} from './surface';
 import {MessageProcessor} from '../data/processor';
 import type {AnyComponentNode, Surface as SurfaceType} from '../types';
-import {Directive, Input, ChangeDetectionStrategy} from '@angular/core';
+import {Directive, Input} from '@angular/core';
 
 @Directive({
   selector: '[a2ui-renderer]',
@@ -61,7 +61,6 @@ describe('Surface Component', () => {
     })
       .overrideComponent(Surface, {
         set: {
-          changeDetection: ChangeDetectionStrategy.Default,
           imports: [MockRenderer],
         },
       })
diff --git a/renderers/angular/src/v0_8/components/tabs.spec.ts b/renderers/angular/src/v0_8/components/tabs.spec.ts
index e2cf583c5..50886c4d3 100644
--- a/renderers/angular/src/v0_8/components/tabs.spec.ts
+++ b/renderers/angular/src/v0_8/components/tabs.spec.ts
@@ -19,7 +19,7 @@ import {Tabs} from './tabs';
 import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
-import {Directive, Input, ChangeDetectionStrategy} from '@angular/core';
+import {Directive, Input} from '@angular/core';
 import {By} from '@angular/platform-browser';
 
 @Directive({
@@ -77,7 +77,6 @@ describe('Tabs Component', () => {
     })
       .overrideComponent(Tabs, {
         set: {
-          changeDetection: ChangeDetectionStrategy.Default,
           imports: [MockRenderer],
         },
       })
diff --git a/renderers/angular/src/v0_8/components/text-field.spec.ts b/renderers/angular/src/v0_8/components/text-field.spec.ts
index ed39e5ce9..3dcda5d1c 100644
--- a/renderers/angular/src/v0_8/components/text-field.spec.ts
+++ b/renderers/angular/src/v0_8/components/text-field.spec.ts
@@ -20,7 +20,6 @@ import {MessageProcessor} from '../data/processor';
 import {Theme} from '../rendering/theming';
 import {Catalog} from '../rendering/catalog';
 import {By} from '@angular/platform-browser';
-import {ChangeDetectionStrategy} from '@angular/core';
 
 describe('TextField Component', () => {
   let component: TextField;
@@ -52,13 +51,7 @@ describe('TextField Component', () => {
         {provide: Theme, useValue: mockTheme},
         {provide: Catalog, useValue: {}},
       ],
-    })
-      .overrideComponent(TextField, {
-        set: {
-          changeDetection: ChangeDetectionStrategy.Default,
-        },
-      })
-      .compileComponents();
+    }).compileComponents();
 
     fixture = TestBed.createComponent(TextField);
     component = fixture.componentInstance;
diff --git a/renderers/angular/src/v0_8/components/text.spec.ts b/renderers/angular/src/v0_8/components/text.spec.ts
index 9e864e421..295b68519 100644
--- a/renderers/angular/src/v0_8/components/text.spec.ts
+++ b/renderers/angular/src/v0_8/components/text.spec.ts
@@ -54,7 +54,7 @@ describe('Text Component', () => {
         {provide: MarkdownRenderer, useValue: mockMarkdownRenderer},
       ],
     })
-      // Text component uses ChangeDetectionStrategy.Eager originally!
+      // Text component uses ChangeDetectionStrategy.OnPush originally!
       .compileComponents();
 
     fixture = TestBed.createComponent(Text);
diff --git a/renderers/angular/src/v0_8/components/text.ts b/renderers/angular/src/v0_8/components/text.ts
index 4682044fb..3a981dddc 100644
--- a/renderers/angular/src/v0_8/components/text.ts
+++ b/renderers/angular/src/v0_8/components/text.ts
@@ -41,7 +41,7 @@ interface HintedStyles {
 
 @Component({
   selector: 'a2ui-text',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
     <section
       [class]="classes()"
diff --git a/renderers/angular/src/v0_8/components/video.spec.ts b/renderers/angular/src/v0_8/components/video.spec.ts
index dce45f6c6..9df8a0e18 100644
--- a/renderers/angular/src/v0_8/components/video.spec.ts
+++ b/renderers/angular/src/v0_8/components/video.spec.ts
@@ -18,7 +18,6 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {Video} from './video';
 import type {VideoNode} from '../types';
 import {Theme} from '../rendering/theming';
-import {ChangeDetectionStrategy} from '@angular/core';
 import {MessageProcessor} from '../data/processor';
 import {Catalog} from '../rendering/catalog';
 
@@ -54,11 +53,7 @@ describe('Video Component', () => {
         {provide: Theme, useValue: mockTheme},
         {provide: Catalog, useValue: {}},
       ],
-    })
-      .overrideComponent(Video, {
-        set: {changeDetection: ChangeDetectionStrategy.Default},
-      })
-      .compileComponents();
+    }).compileComponents();
 
     fixture = TestBed.createComponent(Video);
     component = fixture.componentInstance;
diff --git a/renderers/angular/src/v0_8/components/video.ts b/renderers/angular/src/v0_8/components/video.ts
index 3e85ba31d..7cc6ec581 100644
--- a/renderers/angular/src/v0_8/components/video.ts
+++ b/renderers/angular/src/v0_8/components/video.ts
@@ -20,7 +20,7 @@ import type {StringValue, VideoNode} from '../types';
 
 @Component({
   selector: 'a2ui-video',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
     @let resolvedUrl = this.resolvedUrl();
 
diff --git a/renderers/web_core/src/v0_8/data/guards.test.ts b/renderers/web_core/src/v0_8/data/guards.test.ts
index 739bcffde..4e3b6f58e 100644
--- a/renderers/web_core/src/v0_8/data/guards.test.ts
+++ b/renderers/web_core/src/v0_8/data/guards.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import assert from 'node:assert';
+import * as assert from 'node:assert';
 import {describe, it} from 'node:test';
 import * as guards from './guards.js';
 
diff --git a/renderers/web_core/src/v0_8/data/model-processor.test.ts b/renderers/web_core/src/v0_8/data/model-processor.test.ts
index 87f1672ad..f3e48450f 100644
--- a/renderers/web_core/src/v0_8/data/model-processor.test.ts
+++ b/renderers/web_core/src/v0_8/data/model-processor.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import assert from 'node:assert';
+import * as assert from 'node:assert';
 import {describe, it, beforeEach} from 'node:test';
 import {A2uiMessageProcessor} from './model-processor.js';
 import {TextNode, RowNode} from '../types/types.js';
@@ -38,7 +38,7 @@ describe('A2uiMessageProcessor', () => {
     ]);
 
     const surfaces = processor.getSurfaces();
-    const surface = surfaces.get('s1');
+    const surface = surfaces.get('s1')!;
     assert.ok(surface);
     assert.strictEqual(surface.rootComponentId, 'root');
     assert.deepStrictEqual(surface.styles, {font: 'Arial'});
@@ -69,10 +69,10 @@ describe('A2uiMessageProcessor', () => {
       },
     ]);
 
-    const surface = processor.getSurfaces().get('s1');
+    const surface = processor.getSurfaces().get('s1')!;
     assert.ok(surface);
     assert.ok(surface.componentTree);
-    const root = surface.componentTree as TextNode;
+    const root = surface.componentTree! as TextNode;
     assert.strictEqual(root.id, 'root');
     assert.strictEqual(root.type, 'Text');
     // The property preserves the literal wrapper
diff --git a/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-chat-canvas.ts b/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-chat-canvas.ts
index 191e8650b..11434364a 100644
--- a/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-chat-canvas.ts
+++ b/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-chat-canvas.ts
@@ -36,7 +36,7 @@ import {CanvasService} from './services/canvas-service';
   templateUrl: './a2a-chat-canvas.html',
   styleUrl: './a2a-chat-canvas.scss',
   imports: [Canvas, Chat],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class A2aChatCanvas {
   readonly emptyHistoryTemplate = input<TemplateRef<unknown>>();
diff --git a/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-renderer/a2a-renderer.ts b/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-renderer/a2a-renderer.ts
index 0cc7486b1..1042b2f34 100644
--- a/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-renderer/a2a-renderer.ts
+++ b/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-renderer/a2a-renderer.ts
@@ -28,7 +28,7 @@ import {ChangeDetectionStrategy, Component, inject, input, resource} from '@angu
   templateUrl: './a2a-renderer.html',
   styleUrl: './a2a-renderer.scss',
   imports: [NgComponentOutlet],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class A2aRenderer {
   /** The UiMessageContent to be rendered. */
diff --git a/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-renderer/catalog/a2ui-data-part/a2ui-data-part.ts b/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-renderer/catalog/a2ui-data-part/a2ui-data-part.ts
index 04efa9040..b1bb080f9 100644
--- a/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-renderer/catalog/a2ui-data-part/a2ui-data-part.ts
+++ b/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2a-renderer/catalog/a2ui-data-part/a2ui-data-part.ts
@@ -32,7 +32,7 @@ import {ChangeDetectionStrategy, Component, computed, inject, input} from '@angu
   templateUrl: './a2ui-data-part.html',
   styleUrl: './a2ui-data-part.scss',
   imports: [Surface],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class A2uiDataPart implements RendererComponent {
   /** The UiMessageContent containing the A2A data part with the embedded A2UI message. */
diff --git a/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2ui-catalog/canvas/canvas.ts b/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2ui-catalog/canvas/canvas.ts
index 3e050ccf2..6b5de0160 100644
--- a/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2ui-catalog/canvas/canvas.ts
+++ b/samples/client/angular/projects/a2a-chat-canvas/src/lib/a2ui-catalog/canvas/canvas.ts
@@ -31,7 +31,7 @@ import {MatCard, MatCardContent} from '@angular/material/card';
   templateUrl: './canvas.html',
   styleUrl: './canvas.scss',
   imports: [MatButton, MatCard, MatCardContent],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class Canvas extends DynamicComponent<Types.CustomNode> implements OnInit {
   /** Service for managing the canvas state. */
diff --git a/samples/client/angular/projects/gallery/src/app/app.ts b/samples/client/angular/projects/gallery/src/app/app.ts
index 04734cde4..5ac1df930 100644
--- a/samples/client/angular/projects/gallery/src/app/app.ts
+++ b/samples/client/angular/projects/gallery/src/app/app.ts
@@ -23,7 +23,7 @@ import {GalleryComponent} from './features/gallery/gallery.component';
   templateUrl: './app.html',
   styleUrl: './app.css',
   imports: [LibraryComponent, GalleryComponent],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class App {
   readonly currentView = signal<'library' | 'gallery'>('library');
diff --git a/samples/client/angular/projects/gallery/src/app/features/gallery/gallery.component.ts b/samples/client/angular/projects/gallery/src/app/features/gallery/gallery.component.ts
index 54971b39b..131eb13c1 100644
--- a/samples/client/angular/projects/gallery/src/app/features/gallery/gallery.component.ts
+++ b/samples/client/angular/projects/gallery/src/app/features/gallery/gallery.component.ts
@@ -31,7 +31,7 @@ interface GallerySample {
   imports: [CommonModule, Surface],
   templateUrl: './gallery.html',
   styleUrl: './gallery.css',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class GalleryComponent {
   @ViewChild('dialog') dialog!: ElementRef<HTMLDialogElement>;
diff --git a/samples/client/angular/projects/gallery/src/app/features/library/library.component.ts b/samples/client/angular/projects/gallery/src/app/features/library/library.component.ts
index d1fdc914f..d25919b85 100644
--- a/samples/client/angular/projects/gallery/src/app/features/library/library.component.ts
+++ b/samples/client/angular/projects/gallery/src/app/features/library/library.component.ts
@@ -23,7 +23,7 @@ import * as Types from '@a2ui/web_core/types/types';
   imports: [Surface],
   templateUrl: './library.html',
   styleUrl: './library.css',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class LibraryComponent {
   @ViewChild('dialog') dialog!: ElementRef<HTMLDialogElement>;
diff --git a/samples/client/angular/projects/mcp_calculator/src/app/app.ts b/samples/client/angular/projects/mcp_calculator/src/app/app.ts
index 2ff7ad0cc..42c7130da 100644
--- a/samples/client/angular/projects/mcp_calculator/src/app/app.ts
+++ b/samples/client/angular/projects/mcp_calculator/src/app/app.ts
@@ -25,7 +25,7 @@ import {MatButtonModule} from '@angular/material/button';
   styleUrl: './app.scss',
   imports: [A2aChatCanvas, MatButtonModule],
 
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class App {
   protected readonly agentName = signal('MCP Calculator');
diff --git a/samples/client/angular/projects/orchestrator/src/a2ui-catalog/chart.ts b/samples/client/angular/projects/orchestrator/src/a2ui-catalog/chart.ts
index 8e2a6313e..02aad8d67 100644
--- a/samples/client/angular/projects/orchestrator/src/a2ui-catalog/chart.ts
+++ b/samples/client/angular/projects/orchestrator/src/a2ui-catalog/chart.ts
@@ -44,7 +44,7 @@ ChartJS.register(ChartDataLabels);
 @Component({
   selector: 'a2ui-chart',
   imports: [BaseChartDirective, MatIconButton, MatIcon],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: block;
diff --git a/samples/client/angular/projects/orchestrator/src/a2ui-catalog/google-map.ts b/samples/client/angular/projects/orchestrator/src/a2ui-catalog/google-map.ts
index 0759ac120..569a87346 100644
--- a/samples/client/angular/projects/orchestrator/src/a2ui-catalog/google-map.ts
+++ b/samples/client/angular/projects/orchestrator/src/a2ui-catalog/google-map.ts
@@ -38,7 +38,7 @@ export interface CustomProperties {
 @Component({
   selector: 'a2ui-map',
   imports: [GoogleMapsModule, MatIconButton, MatIcon],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: block;
diff --git a/samples/client/angular/projects/orchestrator/src/app/app.ts b/samples/client/angular/projects/orchestrator/src/app/app.ts
index 30784d1fc..47d11171c 100644
--- a/samples/client/angular/projects/orchestrator/src/app/app.ts
+++ b/samples/client/angular/projects/orchestrator/src/app/app.ts
@@ -35,7 +35,7 @@ import {demoMessageDecorator} from '../message-decorator/demo-message-decorator'
   templateUrl: './app.html',
   styleUrl: './app.scss',
   imports: [A2aChatCanvas, RouterOutlet, MatButtonModule],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class App implements OnInit {
   protected demoMessageDecorator = demoMessageDecorator;
diff --git a/samples/client/angular/projects/orchestrator/src/message-decorator/demo-message-decorator.ts b/samples/client/angular/projects/orchestrator/src/message-decorator/demo-message-decorator.ts
index 3ca8da42a..07c205c08 100644
--- a/samples/client/angular/projects/orchestrator/src/message-decorator/demo-message-decorator.ts
+++ b/samples/client/angular/projects/orchestrator/src/message-decorator/demo-message-decorator.ts
@@ -29,7 +29,7 @@ import {MatIcon} from '@angular/material/icon';
   styleUrl: './demo-message-decorator.scss',
   templateUrl: './demo-message-decorator.html',
   imports: [MatIcon, MatIconButton, NgTemplateOutlet],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DemoMessageDecoratorComponent implements MessageDecoratorComponent {
   readonly message = input.required<UiMessage>();
diff --git a/samples/client/angular/projects/restaurant/src/app/app.ts b/samples/client/angular/projects/restaurant/src/app/app.ts
index 3a5f0b421..0aa5947dc 100644
--- a/samples/client/angular/projects/restaurant/src/app/app.ts
+++ b/samples/client/angular/projects/restaurant/src/app/app.ts
@@ -24,7 +24,7 @@ import {Client} from './client';
   templateUrl: './app.html',
   styleUrl: 'app.css',
   imports: [SurfaceComponent],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class App {
   protected client = inject(Client);
diff --git a/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/canvas.ts b/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/canvas.ts
index b41a851c6..5d70ad03b 100644
--- a/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/canvas.ts
+++ b/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/canvas.ts
@@ -21,7 +21,7 @@ import {CanvasService} from '@a2a_chat_canvas/services/canvas-service';
 
 @Component({
   selector: 'a2ui-canvas',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: block;
diff --git a/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/chart.ts b/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/chart.ts
index b637053ae..01fa5b957 100644
--- a/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/chart.ts
+++ b/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/chart.ts
@@ -34,7 +34,7 @@ import {BaseChartDirective} from 'ng2-charts';
 @Component({
   selector: 'a2ui-chart',
   imports: [BaseChartDirective, MatIconButton, MatIcon],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: block;
diff --git a/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/google-map.ts b/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/google-map.ts
index 0759ac120..569a87346 100644
--- a/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/google-map.ts
+++ b/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/google-map.ts
@@ -38,7 +38,7 @@ export interface CustomProperties {
 @Component({
   selector: 'a2ui-map',
   imports: [GoogleMapsModule, MatIconButton, MatIcon],
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: block;
diff --git a/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/youtube.ts b/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/youtube.ts
index f0fa50d2a..d7d6b739b 100644
--- a/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/youtube.ts
+++ b/samples/client/angular/projects/rizzcharts/src/a2ui-catalog/youtube.ts
@@ -22,7 +22,7 @@ import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
 
 @Component({
   selector: 'a2ui-youtube',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
   styles: `
     :host {
       display: block;
diff --git a/samples/client/angular/projects/rizzcharts/src/app/app.ts b/samples/client/angular/projects/rizzcharts/src/app/app.ts
index abf3be519..991366344 100644
--- a/samples/client/angular/projects/rizzcharts/src/app/app.ts
+++ b/samples/client/angular/projects/rizzcharts/src/app/app.ts
@@ -37,7 +37,7 @@ import {A2aService} from '@rizzcharts/services/a2a_service';
   imports: [A2aChatCanvas, RouterOutlet, Toolbar, MatButtonModule],
   templateUrl: './app.html',
   styleUrl: './app.scss',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class App implements OnInit {
   protected readonly agentName = signal('');
diff --git a/samples/client/angular/projects/rizzcharts/src/components/toolbar/toolbar.ts b/samples/client/angular/projects/rizzcharts/src/components/toolbar/toolbar.ts
index e0ead1854..bd2d0cbb6 100644
--- a/samples/client/angular/projects/rizzcharts/src/components/toolbar/toolbar.ts
+++ b/samples/client/angular/projects/rizzcharts/src/components/toolbar/toolbar.ts
@@ -38,7 +38,7 @@ import {FormsModule} from '@angular/forms';
   ],
   templateUrl: './toolbar.html',
   styleUrl: './toolbar.scss',
-  changeDetection: ChangeDetectionStrategy.Eager,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class Toolbar {
   catalogService = inject(CatalogService);