diff --git a/apps/website/src/components/landing/SocialProof.tsx b/apps/website/src/components/landing/SocialProof.tsx
index b6c81d76e..72becc7cb 100644
--- a/apps/website/src/components/landing/SocialProof.tsx
+++ b/apps/website/src/components/landing/SocialProof.tsx
@@ -2,11 +2,14 @@
 import { motion } from 'framer-motion';
 import { tokens } from '../../../lib/design-tokens';
 
+<<<<<<< HEAD
+=======
 /**
  * Companies displayed as social proof — sourced from the LangChain ecosystem.
  * These represent the types of companies building with LangChain/LangGraph,
  * the same ecosystem Angular Agent Framework serves.
  */
+>>>>>>> origin/main
 const COMPANIES = [
   'Klarna',
   'Elastic',
@@ -19,7 +22,11 @@ const COMPANIES = [
   'Cisco',
   'Workday',
   'ServiceNow',
+<<<<<<< HEAD
+  'Monday',
+=======
   'Monday.com',
+>>>>>>> origin/main
 ];
 
 /** Duplicate for seamless infinite scroll */
@@ -27,7 +34,11 @@ const SCROLL_ITEMS = [...COMPANIES, ...COMPANIES];
 
 export function SocialProof() {
   return (
+<<<<<<< HEAD
+    <section style={{ padding: '36px 0', overflow: 'hidden' }}>
+=======
     <section style={{ padding: '24px 0', overflow: 'hidden' }}>
+>>>>>>> origin/main
       <motion.div
         initial={{ opacity: 0 }}
         whileInView={{ opacity: 1 }}
@@ -38,12 +49,20 @@ export function SocialProof() {
         <p style={{
           textAlign: 'center',
           fontFamily: 'var(--font-mono,"JetBrains Mono",monospace)',
+<<<<<<< HEAD
+          fontSize: '0.62rem',
+=======
           fontSize: '0.6rem',
+>>>>>>> origin/main
           textTransform: 'uppercase',
           letterSpacing: '0.12em',
           fontWeight: 700,
           color: tokens.colors.textMuted,
+<<<<<<< HEAD
+          marginBottom: 22,
+=======
           marginBottom: 16,
+>>>>>>> origin/main
         }}>
           Built for teams shipping with LangChain
         </p>
@@ -51,14 +70,33 @@ export function SocialProof() {
         {/* Scrolling logo strip */}
         <div style={{
           position: 'relative',
+<<<<<<< HEAD
+          maxWidth: 1060,
+          margin: '0 auto',
+          borderRadius: 20,
+=======
           maxWidth: 900,
           margin: '0 auto',
           borderRadius: 16,
+>>>>>>> origin/main
           background: tokens.glass.bg,
           backdropFilter: `blur(${tokens.glass.blur})`,
           WebkitBackdropFilter: `blur(${tokens.glass.blur})`,
           border: `1px solid ${tokens.glass.border}`,
           overflow: 'hidden',
+<<<<<<< HEAD
+          padding: '32px 0',
+        }}>
+          {/* Fade edges */}
+          <div style={{
+            position: 'absolute', left: 0, top: 0, bottom: 0, width: 100, zIndex: 1,
+            background: 'linear-gradient(to right, rgba(248,249,252,0.9), transparent)',
+            pointerEvents: 'none',
+          }} />
+          <div style={{
+            position: 'absolute', right: 0, top: 0, bottom: 0, width: 100, zIndex: 1,
+            background: 'linear-gradient(to left, rgba(248,249,252,0.9), transparent)',
+=======
           padding: '16px 0',
         }}>
           {/* Fade edges */}
@@ -70,6 +108,7 @@ export function SocialProof() {
           <div style={{
             position: 'absolute', right: 0, top: 0, bottom: 0, width: 60, zIndex: 1,
             background: 'linear-gradient(to left, rgba(244,240,255,0.95), transparent)',
+>>>>>>> origin/main
             pointerEvents: 'none',
           }} />
 
@@ -79,14 +118,33 @@ export function SocialProof() {
             style={{
               display: 'flex',
               alignItems: 'center',
+<<<<<<< HEAD
+              gap: 72,
+              width: 'max-content',
+              paddingLeft: 48,
+              paddingRight: 48,
+=======
               gap: 48,
               width: 'max-content',
+>>>>>>> origin/main
             }}
           >
             {SCROLL_ITEMS.map((company, i) => (
               <span
                 key={`${company}-${i}`}
                 style={{
+<<<<<<< HEAD
+                  fontFamily: 'var(--font-inter, Inter, system-ui, sans-serif)',
+                  fontSize: 'clamp(20px, 1.6vw, 26px)',
+                  fontWeight: 800,
+                  color: tokens.colors.textPrimary,
+                  opacity: 0.18,
+                  whiteSpace: 'nowrap',
+                  letterSpacing: '-0.02em',
+                  userSelect: 'none',
+                  lineHeight: 1,
+                  padding: '4px 0',
+=======
                   fontFamily: 'var(--font-garamond,"EB Garamond",Georgia,serif)',
                   fontSize: 'clamp(14px, 1.1vw, 17px)',
                   fontWeight: 700,
@@ -95,6 +153,7 @@ export function SocialProof() {
                   opacity: 0.6,
                   letterSpacing: '0.02em',
                   userSelect: 'none',
+>>>>>>> origin/main
                 }}
               >
                 {company}
@@ -110,7 +169,11 @@ export function SocialProof() {
           100% { transform: translateX(-50%); }
         }
         .logo-scroll-track {
+<<<<<<< HEAD
+          animation: logo-scroll 35s linear infinite;
+=======
           animation: logo-scroll 30s linear infinite;
+>>>>>>> origin/main
         }
         .logo-scroll-track:hover {
           animation-play-state: paused;
diff --git a/cockpit/deep-agents/filesystem/angular/src/app/filesystem.component.ts b/cockpit/deep-agents/filesystem/angular/src/app/filesystem.component.ts
index 70f6eb4d4..3ff2c423f 100644
--- a/cockpit/deep-agents/filesystem/angular/src/app/filesystem.component.ts
+++ b/cockpit/deep-agents/filesystem/angular/src/app/filesystem.component.ts
@@ -1,9 +1,15 @@
 import { Component, computed } from '@angular/core';
+<<<<<<< HEAD
+import { ChatComponent } from '@cacheplane/chat';
+import { agent } from '@cacheplane/angular';
+import { environment } from '../environments/environment';
+=======
 import { ChatComponent, views } from '@cacheplane/chat';
 import { signalStateStore } from '@cacheplane/render';
 import { agent } from '@cacheplane/angular';
 import { environment } from '../environments/environment';
 import { FilePreviewComponent } from './views/file-preview.component';
+>>>>>>> origin/main
 
 /**
  * Represents a file operation extracted from agent tool calls.
@@ -32,7 +38,11 @@ interface FileOperation {
   imports: [ChatComponent],
   template: `
     <div class="flex h-screen">
+<<<<<<< HEAD
+      <chat [ref]="stream" class="flex-1 min-w-0" />
+=======
       <chat [ref]="stream" [views]="ui" [store]="uiStore" class="flex-1 min-w-0" />
+>>>>>>> origin/main
       <aside class="w-72 shrink-0 border-l overflow-y-auto p-4 space-y-2"
              style="border-color: var(--chat-border, #333); background: var(--chat-bg, #171717); color: var(--chat-text, #e0e0e0);">
         <h3 class="text-xs font-semibold uppercase tracking-wide"
@@ -72,12 +82,15 @@ export class FilesystemComponent {
     assistantId: environment.streamingAssistantId,
   });
 
+<<<<<<< HEAD
+=======
   readonly ui = views({
     'file-preview': FilePreviewComponent,
   });
 
   readonly uiStore = signalStateStore({});
 
+>>>>>>> origin/main
   /**
    * Reactive list of file operations derived from the message history.
    *
diff --git a/cockpit/deep-agents/planning/angular/src/app/planning.component.ts b/cockpit/deep-agents/planning/angular/src/app/planning.component.ts
index 669d7d2cf..5d88d8986 100644
--- a/cockpit/deep-agents/planning/angular/src/app/planning.component.ts
+++ b/cockpit/deep-agents/planning/angular/src/app/planning.component.ts
@@ -1,3 +1,30 @@
+<<<<<<< HEAD
+import { Component, computed } from '@angular/core';
+import { ChatComponent } from '@cacheplane/chat';
+import { agent } from '@cacheplane/angular';
+import { environment } from '../environments/environment';
+
+/**
+ * Represents a single step in an agent-generated plan.
+ */
+interface PlanStep {
+  title: string;
+  status: 'pending' | 'in_progress' | 'complete';
+}
+
+/**
+ * PlanningComponent demonstrates agent task decomposition.
+ *
+ * The agent receives a complex task, breaks it into ordered steps,
+ * and executes them sequentially. The sidebar displays a live checklist
+ * of plan steps derived from the `plan` array in the graph state.
+ *
+ * Key integration points:
+ * - `stream.value()` exposes the full graph state, including the `plan` array
+ * - `planSteps` is derived from `stream.value()` for reactive sidebar rendering
+ * - Step status icons update in real time as the agent progresses
+ */
+=======
 import { Component } from '@angular/core';
 import { ChatComponent, views } from '@cacheplane/chat';
 import { signalStateStore } from '@cacheplane/render';
@@ -6,10 +33,72 @@ import { environment } from '../environments/environment';
 import { PlanChecklistComponent } from './views/plan-checklist.component';
 import { CheckboxRowComponent } from './views/checkbox-row.component';
 
+>>>>>>> origin/main
 @Component({
   selector: 'app-planning',
   standalone: true,
   imports: [ChatComponent],
+<<<<<<< HEAD
+  template: `
+    <div class="flex h-screen">
+      <chat [ref]="stream" class="flex-1 min-w-0" />
+      <aside class="w-72 shrink-0 border-l overflow-y-auto p-4 space-y-2"
+             style="border-color: var(--chat-border, #333); background: var(--chat-bg, #171717); color: var(--chat-text, #e0e0e0);">
+        <h3 class="text-xs font-semibold uppercase tracking-wide"
+            style="color: var(--chat-text-muted, #777);">Plan</h3>
+        @if (planSteps().length === 0) {
+          <p class="text-sm italic" style="color: var(--chat-text-muted, #777);">No plan yet</p>
+        }
+        @for (step of planSteps(); track step.title) {
+          <div class="flex items-start gap-2 rounded-md px-2 py-1.5 text-sm"
+               style="background: var(--chat-bg-hover, #222);">
+            <span class="mt-0.5 shrink-0 text-base leading-none">
+              @if (step.status === 'complete') {
+                <span style="color: #22c55e;">&#10003;</span>
+              } @else if (step.status === 'in_progress') {
+                <span class="inline-block animate-spin" style="color: var(--chat-text-muted, #777);">&#9696;</span>
+              } @else {
+                <span style="color: var(--chat-border-light, #444);">&#9675;</span>
+              }
+            </span>
+            <span style="color: var(--chat-text, #e0e0e0);">{{ step.title }}</span>
+          </div>
+        }
+      </aside>
+    </div>
+  `,
+})
+export class PlanningComponent {
+  /**
+   * The streaming resource connected to the planning graph.
+   *
+   * The graph returns a `plan` array alongside messages in its state.
+   * Each plan entry has a `title` and `status` that drive the sidebar checklist.
+   */
+  protected readonly stream = agent({
+    apiUrl: environment.langGraphApiUrl,
+    assistantId: environment.streamingAssistantId,
+  });
+
+  /**
+   * Reactive list of plan steps derived from the graph state.
+   *
+   * The Python graph stores the plan as `state.plan` — an array of objects
+   * with `title` and `status` fields. This signal re-computes whenever
+   * the stream state changes.
+   */
+  protected readonly planSteps = computed<PlanStep[]>(() => {
+    const val = this.stream.value() as Record<string, unknown>;
+    const plan = val?.['plan'];
+    if (!Array.isArray(plan)) return [];
+    return plan.map((step: Record<string, unknown>) => ({
+      title: String(step['title'] ?? ''),
+      status: (['pending', 'in_progress', 'complete'].includes(step['status'] as string)
+        ? step['status']
+        : 'pending') as PlanStep['status'],
+    }));
+  });
+=======
   template: `<chat [ref]="stream" [views]="ui" [store]="uiStore" class="block h-screen" />`,
 })
 export class PlanningComponent {
@@ -24,4 +113,5 @@ export class PlanningComponent {
   });
 
   readonly uiStore = signalStateStore({});
+>>>>>>> origin/main
 }
diff --git a/cockpit/deep-agents/planning/angular/src/environments/environment.development.ts b/cockpit/deep-agents/planning/angular/src/environments/environment.development.ts
index b013bb6d3..30770e0e4 100644
--- a/cockpit/deep-agents/planning/angular/src/environments/environment.development.ts
+++ b/cockpit/deep-agents/planning/angular/src/environments/environment.development.ts
@@ -8,5 +8,8 @@ export const environment = {
   production: false,
   langGraphApiUrl: 'http://localhost:4310/api',
   streamingAssistantId: 'planning',
+<<<<<<< HEAD
+=======
   planningAssistantId: 'planning',
+>>>>>>> origin/main
 };
diff --git a/cockpit/deep-agents/planning/angular/src/environments/environment.ts b/cockpit/deep-agents/planning/angular/src/environments/environment.ts
index 0fbf05c5b..f1522f78d 100644
--- a/cockpit/deep-agents/planning/angular/src/environments/environment.ts
+++ b/cockpit/deep-agents/planning/angular/src/environments/environment.ts
@@ -8,5 +8,8 @@ export const environment = {
   production: true,
   langGraphApiUrl: '/api',
   streamingAssistantId: 'planning',
+<<<<<<< HEAD
+=======
   planningAssistantId: 'planning',
+>>>>>>> origin/main
 };
diff --git a/cockpit/deep-agents/sandboxes/angular/src/app/sandboxes.component.ts b/cockpit/deep-agents/sandboxes/angular/src/app/sandboxes.component.ts
index ff8b1b097..0f7e3f855 100644
--- a/cockpit/deep-agents/sandboxes/angular/src/app/sandboxes.component.ts
+++ b/cockpit/deep-agents/sandboxes/angular/src/app/sandboxes.component.ts
@@ -1,9 +1,15 @@
 import { Component, computed } from '@angular/core';
+<<<<<<< HEAD
+import { ChatComponent } from '@cacheplane/chat';
+import { agent } from '@cacheplane/angular';
+import { environment } from '../environments/environment';
+=======
 import { ChatComponent, views } from '@cacheplane/chat';
 import { signalStateStore } from '@cacheplane/render';
 import { agent } from '@cacheplane/angular';
 import { environment } from '../environments/environment';
 import { CodeExecutionComponent } from './views/code-execution.component';
+>>>>>>> origin/main
 
 /**
  * Represents a parsed code execution: the code that was run and its output.
@@ -30,7 +36,11 @@ interface CodeExecution {
   imports: [ChatComponent],
   template: `
     <div class="flex h-screen">
+<<<<<<< HEAD
+      <chat [ref]="stream" class="flex-1 min-w-0" />
+=======
       <chat [ref]="stream" [views]="ui" [store]="uiStore" class="flex-1 min-w-0" />
+>>>>>>> origin/main
       <aside class="w-80 shrink-0 border-l overflow-y-auto p-4 space-y-3"
              style="border-color: var(--chat-border, #333); background: var(--chat-bg, #171717); color: var(--chat-text, #e0e0e0);">
         <h3 class="text-xs font-semibold uppercase tracking-wide"
@@ -66,12 +76,15 @@ export class SandboxesComponent {
     assistantId: environment.streamingAssistantId,
   });
 
+<<<<<<< HEAD
+=======
   readonly ui = views({
     'code-execution': CodeExecutionComponent,
   });
 
   readonly uiStore = signalStateStore({});
 
+>>>>>>> origin/main
   /**
    * Derived signal: extracts code executions from the message stream.
    *
diff --git a/cockpit/deep-agents/skills/angular/src/app/skills.component.ts b/cockpit/deep-agents/skills/angular/src/app/skills.component.ts
index 7b436e164..dccd87516 100644
--- a/cockpit/deep-agents/skills/angular/src/app/skills.component.ts
+++ b/cockpit/deep-agents/skills/angular/src/app/skills.component.ts
@@ -1,10 +1,16 @@
 import { Component, computed } from '@angular/core';
+<<<<<<< HEAD
+import { ChatComponent } from '@cacheplane/chat';
+import { agent } from '@cacheplane/angular';
+import { environment } from '../environments/environment';
+=======
 import { ChatComponent, views } from '@cacheplane/chat';
 import { signalStateStore } from '@cacheplane/render';
 import { agent } from '@cacheplane/angular';
 import { environment } from '../environments/environment';
 import { CalculatorResultComponent } from './views/calculator-result.component';
 import { WordCountResultComponent } from './views/word-count-result.component';
+>>>>>>> origin/main
 
 /**
  * Represents a matched skill invocation: tool call paired with its result.
@@ -32,7 +38,11 @@ interface SkillInvocation {
   imports: [ChatComponent],
   template: `
     <div class="flex h-screen">
+<<<<<<< HEAD
+      <chat [ref]="stream" class="flex-1 min-w-0" />
+=======
       <chat [ref]="stream" [views]="ui" [store]="uiStore" class="flex-1 min-w-0" />
+>>>>>>> origin/main
       <aside class="w-72 shrink-0 border-l overflow-y-auto p-4 space-y-3"
              style="border-color: var(--chat-border, #333); background: var(--chat-bg, #171717); color: var(--chat-text, #e0e0e0);">
         <h3 class="text-xs font-semibold uppercase tracking-wide"
@@ -73,6 +83,8 @@ export class SkillsComponent {
     assistantId: environment.streamingAssistantId,
   });
 
+<<<<<<< HEAD
+=======
   readonly ui = views({
     'calculator-result': CalculatorResultComponent,
     'word-count-result': WordCountResultComponent,
@@ -80,6 +92,7 @@ export class SkillsComponent {
 
   readonly uiStore = signalStateStore({});
 
+>>>>>>> origin/main
   private readonly SKILL_NAMES = new Set(['calculator', 'word_count', 'summarize']);
 
   /**
diff --git a/cockpit/langgraph/durable-execution/angular/src/app/durable-execution.component.ts b/cockpit/langgraph/durable-execution/angular/src/app/durable-execution.component.ts
index 7efe8d46c..2d3d8987a 100644
--- a/cockpit/langgraph/durable-execution/angular/src/app/durable-execution.component.ts
+++ b/cockpit/langgraph/durable-execution/angular/src/app/durable-execution.component.ts
@@ -1,9 +1,15 @@
 import { Component, computed } from '@angular/core';
+<<<<<<< HEAD
+import { ChatComponent } from '@cacheplane/chat';
+import { agent } from '@cacheplane/angular';
+import { environment } from '../environments/environment';
+=======
 import { ChatComponent, views } from '@cacheplane/chat';
 import { signalStateStore } from '@cacheplane/render';
 import { agent } from '@cacheplane/angular';
 import { environment } from '../environments/environment';
 import { StepPipelineComponent } from './views/step-pipeline.component';
+>>>>>>> origin/main
 
 /**
  * Pipeline step definition for the vertical progress indicator.
@@ -39,7 +45,11 @@ const STEP_LABELS: Record<string, string> = {
   imports: [ChatComponent],
   template: `
     <div class="flex h-screen">
+<<<<<<< HEAD
+      <chat [ref]="stream" class="flex-1 min-w-0" />
+=======
       <chat [ref]="stream" [views]="ui" [store]="uiStore" class="flex-1 min-w-0" />
+>>>>>>> origin/main
       <aside class="w-64 shrink-0 border-l overflow-y-auto p-4"
              style="border-color: var(--chat-border, #333); background: var(--chat-bg, #171717); color: var(--chat-text, #e0e0e0);">
         <h3 class="text-xs font-semibold uppercase tracking-wide mb-6"
@@ -94,12 +104,15 @@ const STEP_LABELS: Record<string, string> = {
   `,
 })
 export class DurableExecutionComponent {
+<<<<<<< HEAD
+=======
   readonly ui = views({
     'step-pipeline': StepPipelineComponent,
   });
 
   readonly uiStore = signalStateStore({});
 
+>>>>>>> origin/main
   protected readonly stream = agent({
     apiUrl: environment.langGraphApiUrl,
     assistantId: environment.streamingAssistantId,
diff --git a/cockpit/langgraph/interrupts/angular/src/app/interrupts.component.ts b/cockpit/langgraph/interrupts/angular/src/app/interrupts.component.ts
index 6b4a99862..54eae9fac 100644
--- a/cockpit/langgraph/interrupts/angular/src/app/interrupts.component.ts
+++ b/cockpit/langgraph/interrupts/angular/src/app/interrupts.component.ts
@@ -1,10 +1,16 @@
 // SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
 import { Component } from '@angular/core';
+<<<<<<< HEAD
+import { ChatComponent, ChatInterruptPanelComponent, type InterruptAction } from '@cacheplane/chat';
+import { agent } from '@cacheplane/angular';
+import { environment } from '../environments/environment';
+=======
 import { ChatComponent, ChatInterruptPanelComponent, type InterruptAction, views } from '@cacheplane/chat';
 import { signalStateStore } from '@cacheplane/render';
 import { agent } from '@cacheplane/angular';
 import { environment } from '../environments/environment';
 import { ApprovalCardComponent } from './views/approval-card.component';
+>>>>>>> origin/main
 
 /**
  * InterruptsComponent demonstrates human-in-the-loop with `agent()`.
@@ -24,7 +30,11 @@ import { ApprovalCardComponent } from './views/approval-card.component';
   imports: [ChatComponent, ChatInterruptPanelComponent],
   template: `
     <div class="flex flex-col h-screen">
+<<<<<<< HEAD
+      <chat [ref]="stream" class="flex-1 min-w-0" />
+=======
       <chat [ref]="stream" [views]="ui" [store]="uiStore" class="flex-1 min-w-0" />
+>>>>>>> origin/main
       @if (stream.interrupt()) {
         <div class="p-4" style="border-top: 1px solid var(--chat-border, #333);">
           <chat-interrupt-panel [ref]="stream" (action)="onInterruptAction($event)" />
@@ -34,12 +44,15 @@ import { ApprovalCardComponent } from './views/approval-card.component';
   `,
 })
 export class InterruptsComponent {
+<<<<<<< HEAD
+=======
   readonly ui = views({
     'approval-card': ApprovalCardComponent,
   });
 
   readonly uiStore = signalStateStore({});
 
+>>>>>>> origin/main
   /**
    * The streaming resource with interrupt support.
    *
diff --git a/libs/chat/src/lib/compositions/chat/chat.component.ts b/libs/chat/src/lib/compositions/chat/chat.component.ts
index 4bee63c4f..844d3038e 100644
--- a/libs/chat/src/lib/compositions/chat/chat.component.ts
+++ b/libs/chat/src/lib/compositions/chat/chat.component.ts
@@ -14,9 +14,12 @@ import {
 } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import type { AgentRef } from '@cacheplane/angular';
+<<<<<<< HEAD
+=======
 import type { ViewRegistry } from '@cacheplane/render';
 import type { StateStore } from '@json-render/core';
 import { VIEW_REGISTRY } from '@cacheplane/render';
+>>>>>>> origin/main
 import { ChatMessagesComponent } from '../../primitives/chat-messages/chat-messages.component';
 import { MessageTemplateDirective } from '../../primitives/chat-messages/message-template.directive';
 import { ChatInputComponent } from '../../primitives/chat-input/chat-input.component';
@@ -99,7 +102,11 @@ import { CHAT_MARKDOWN_STYLES, renderMarkdown } from '../../styles/chat-markdown
               </div>
             }
 
+<<<<<<< HEAD
+            <chat-messages [ref]="ref()">
+=======
             <chat-messages [ref]="ref()" [views]="resolvedViews()" [store]="store()">
+>>>>>>> origin/main
               <!-- Human messages: right-aligned bubble -->
               <ng-template chatMessageTemplate="human" let-message>
                 <div class="flex justify-end">
@@ -179,6 +186,13 @@ export class ChatComponent {
   private readonly sanitizer = inject(DomSanitizer);
 
   readonly ref = input.required<AgentRef<any, any>>();
+<<<<<<< HEAD
+  readonly threads = input<Thread[]>([]);
+  readonly activeThreadId = input<string>('');
+  readonly threadSelected = output<string>();
+  readonly sidebarOpen = signal(false);
+
+=======
   readonly views = input<ViewRegistry | undefined>(undefined);
   readonly store = input<StateStore | undefined>(undefined);
   readonly threads = input<Thread[]>([]);
@@ -195,6 +209,7 @@ export class ChatComponent {
     this.views() ?? this.diViews ?? undefined
   );
 
+>>>>>>> origin/main
   readonly messageContent = messageContent;
 
   private readonly scrollContainer = viewChild<ElementRef<HTMLElement>>('scrollContainer');
diff --git a/libs/chat/src/lib/primitives/chat-messages/chat-messages.component.ts b/libs/chat/src/lib/primitives/chat-messages/chat-messages.component.ts
index b2ba08f55..57b2bfbd8 100644
--- a/libs/chat/src/lib/primitives/chat-messages/chat-messages.component.ts
+++ b/libs/chat/src/lib/primitives/chat-messages/chat-messages.component.ts
@@ -9,9 +9,12 @@ import {
 import { NgTemplateOutlet } from '@angular/common';
 import type { BaseMessage } from '@langchain/core/messages';
 import type { AgentRef } from '@cacheplane/angular';
+<<<<<<< HEAD
+=======
 import type { ViewRegistry } from '@cacheplane/render';
 import type { StateStore } from '@json-render/core';
 import { RenderSpecComponent, toRenderRegistry } from '@cacheplane/render';
+>>>>>>> origin/main
 import { MessageTemplateDirective } from './message-template.directive';
 import type { MessageTemplateType } from '../../chat.types';
 
@@ -45,7 +48,11 @@ export function getMessageType(message: BaseMessage): MessageTemplateType {
 @Component({
   selector: 'chat-messages',
   standalone: true,
+<<<<<<< HEAD
+  imports: [NgTemplateOutlet, MessageTemplateDirective],
+=======
   imports: [NgTemplateOutlet, MessageTemplateDirective, RenderSpecComponent],
+>>>>>>> origin/main
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
     @for (message of messages(); track $index) {
@@ -56,6 +63,8 @@ export function getMessageType(message: BaseMessage): MessageTemplateType {
           [ngTemplateOutletContext]="{ $implicit: message, index: $index }"
         />
       }
+<<<<<<< HEAD
+=======
 
       @if (renderRegistry() && getUiSpec(message); as spec) {
         <div class="ml-10 mt-2">
@@ -66,19 +75,25 @@ export function getMessageType(message: BaseMessage): MessageTemplateType {
           />
         </div>
       }
+>>>>>>> origin/main
     }
   `,
 })
 export class ChatMessagesComponent {
   readonly ref = input.required<AgentRef<any, any>>();
+<<<<<<< HEAD
+=======
   readonly views = input<ViewRegistry | undefined>(undefined);
   readonly store = input<StateStore | undefined>(undefined);
+>>>>>>> origin/main
 
   readonly messageTemplates = contentChildren(MessageTemplateDirective);
 
   readonly messages = computed(() => this.ref().messages());
 
   readonly getMessageType = getMessageType;
+<<<<<<< HEAD
+=======
   readonly getUiSpec = getUiSpec;
 
   /** Convert ViewRegistry to AngularRegistry for render-spec */
@@ -86,11 +101,14 @@ export class ChatMessagesComponent {
     const v = this.views();
     return v ? toRenderRegistry(v) : undefined;
   });
+>>>>>>> origin/main
 
   findTemplate(type: MessageTemplateType): MessageTemplateDirective | undefined {
     return this.messageTemplates().find(t => t.chatMessageTemplate() === type);
   }
 }
+<<<<<<< HEAD
+=======
 
 /**
  * Extracts a UI spec from a message if present.
@@ -110,3 +128,4 @@ function isValidSpec(value: unknown): boolean {
     && 'root' in (value as Record<string, unknown>)
     && 'elements' in (value as Record<string, unknown>);
 }
+>>>>>>> origin/main
diff --git a/libs/chat/src/lib/provide-chat.ts b/libs/chat/src/lib/provide-chat.ts
index a0d05b591..391c06e66 100644
--- a/libs/chat/src/lib/provide-chat.ts
+++ b/libs/chat/src/lib/provide-chat.ts
@@ -1,10 +1,18 @@
 // SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
 import { InjectionToken, makeEnvironmentProviders } from '@angular/core';
+<<<<<<< HEAD
+import type { AngularRegistry } from '@cacheplane/render';
+
+export interface ChatConfig {
+  /** Default render registry for generative UI components. */
+  renderRegistry?: AngularRegistry;
+=======
 import type { ViewRegistry } from '@cacheplane/render';
 
 export interface ChatConfig {
   /** View registry for generative UI rendering. */
   views?: ViewRegistry;
+>>>>>>> origin/main
   /** Override the default AI avatar label (default: "A"). */
   avatarLabel?: string;
   /** Override the default assistant display name (default: "Assistant"). */