diff --git a/.claude/scheduled_tasks.lock b/.claude/scheduled_tasks.lock
new file mode 100644
index 000000000..2ec5924b9
--- /dev/null
+++ b/.claude/scheduled_tasks.lock
@@ -0,0 +1 @@
+{"sessionId":"81531199-6279-44a0-bdfa-491d0e341724","pid":71323,"acquiredAt":1775602708358}
\ No newline at end of file
diff --git a/apps/cockpit/src/lib/content-bundle.ts b/apps/cockpit/src/lib/content-bundle.ts
index cb1622371..c017f9401 100644
--- a/apps/cockpit/src/lib/content-bundle.ts
+++ b/apps/cockpit/src/lib/content-bundle.ts
@@ -45,7 +45,8 @@ export function resolveRuntimeUrl(options: {
     return null;
   }
 
-  const baseUrl = process.env['NEXT_PUBLIC_COCKPIT_RUNTIME_BASE_URL'];
+  const baseUrl = process.env['NEXT_PUBLIC_COCKPIT_RUNTIME_BASE_URL']
+    ?? 'https://examples.cacheplane.ai';
 
   if (baseUrl && runtimeUrl) {
     return `${baseUrl}/${runtimeUrl}`;
diff --git a/apps/website/content/AGENTS.md.template b/apps/website/content/AGENTS.md.template
index dc39a0471..d9a5d9a3a 100644
--- a/apps/website/content/AGENTS.md.template
+++ b/apps/website/content/AGENTS.md.template
@@ -41,4 +41,4 @@ Add to ~/.claude/settings.json:
 {"mcpServers":{"angular-agent":{"command":"npx","args":["@cacheplane/angular-mcp"]}}}
 
 ## Version check
-If this file is stale, fetch the latest: https://stream-resource.dev/llms-full.txt
+If this file is stale, fetch the latest: https://cacheplane.ai/llms-full.txt
diff --git a/apps/website/content/CLAUDE.md.template b/apps/website/content/CLAUDE.md.template
index dc39a0471..d9a5d9a3a 100644
--- a/apps/website/content/CLAUDE.md.template
+++ b/apps/website/content/CLAUDE.md.template
@@ -41,4 +41,4 @@ Add to ~/.claude/settings.json:
 {"mcpServers":{"angular-agent":{"command":"npx","args":["@cacheplane/angular-mcp"]}}}
 
 ## Version check
-If this file is stale, fetch the latest: https://stream-resource.dev/llms-full.txt
+If this file is stale, fetch the latest: https://cacheplane.ai/llms-full.txt
diff --git a/apps/website/src/components/landing/SocialProof.tsx b/apps/website/src/components/landing/SocialProof.tsx
index 72becc7cb..ca7294db1 100644
--- a/apps/website/src/components/landing/SocialProof.tsx
+++ b/apps/website/src/components/landing/SocialProof.tsx
@@ -2,14 +2,6 @@
 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',
@@ -22,11 +14,7 @@ const COMPANIES = [
   'Cisco',
   'Workday',
   'ServiceNow',
-<<<<<<< HEAD
   'Monday',
-=======
-  'Monday.com',
->>>>>>> origin/main
 ];
 
 /** Duplicate for seamless infinite scroll */
@@ -34,11 +22,7 @@ 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 }}
@@ -49,20 +33,12 @@ 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>
@@ -70,21 +46,14 @@ 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 */}
@@ -96,19 +65,6 @@ export function SocialProof() {
           <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 */}
-          <div style={{
-            position: 'absolute', left: 0, top: 0, bottom: 0, width: 60, zIndex: 1,
-            background: 'linear-gradient(to right, rgba(244,240,255,0.95), transparent)',
-            pointerEvents: 'none',
-          }} />
-          <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',
           }} />
 
@@ -118,22 +74,16 @@ 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,
@@ -144,16 +94,6 @@ export function SocialProof() {
                   userSelect: 'none',
                   lineHeight: 1,
                   padding: '4px 0',
-=======
-                  fontFamily: 'var(--font-garamond,"EB Garamond",Georgia,serif)',
-                  fontSize: 'clamp(14px, 1.1vw, 17px)',
-                  fontWeight: 700,
-                  color: tokens.colors.textMuted,
-                  whiteSpace: 'nowrap',
-                  opacity: 0.6,
-                  letterSpacing: '0.02em',
-                  userSelect: 'none',
->>>>>>> origin/main
                 }}
               >
                 {company}
@@ -169,11 +109,7 @@ 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/apps/website/src/components/shared/Footer.tsx b/apps/website/src/components/shared/Footer.tsx
index d26c3646a..551b45da9 100644
--- a/apps/website/src/components/shared/Footer.tsx
+++ b/apps/website/src/components/shared/Footer.tsx
@@ -110,7 +110,7 @@ export function Footer() {
             <NewsletterForm />
             {/* Social links */}
             <div className="flex items-center gap-4">
-              <a href="https://github.com/cacheplane/stream-resource"
+              <a href="https://github.com/cacheplane/angular"
                 target="_blank"
                 rel="noopener noreferrer"
                 className="transition-colors"
@@ -156,7 +156,7 @@ export function Footer() {
               onMouseLeave={(e) => (e.currentTarget.style.color = tokens.colors.textSecondary)}>
               Pricing
             </Link>
-            <a href="https://github.com/cacheplane/stream-resource"
+            <a href="https://github.com/cacheplane/angular"
               target="_blank" rel="noopener noreferrer"
               className="transition-colors" style={{ color: tokens.colors.textSecondary }}
               onMouseEnter={(e) => (e.currentTarget.style.color = tokens.colors.accent)}
diff --git a/apps/website/src/components/shared/Nav.tsx b/apps/website/src/components/shared/Nav.tsx
index 813e8cd1e..daffb7965 100644
--- a/apps/website/src/components/shared/Nav.tsx
+++ b/apps/website/src/components/shared/Nav.tsx
@@ -74,7 +74,7 @@ export function Nav() {
               {l.label}
             </Link>
           ))}
-          <a href="https://github.com/cacheplane/stream-resource"
+          <a href="https://github.com/cacheplane/angular"
             target="_blank"
             rel="noopener noreferrer"
             className="transition-colors"
@@ -125,7 +125,7 @@ export function Nav() {
             </Link>
           ))}
           <div className="flex items-center gap-4 pt-2">
-            <a href="https://github.com/cacheplane/stream-resource"
+            <a href="https://github.com/cacheplane/angular"
               target="_blank"
               rel="noopener noreferrer"
               style={{ color: tokens.colors.textSecondary }}
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 3ff2c423f..699ec60fb 100644
--- a/cockpit/deep-agents/filesystem/angular/src/app/filesystem.component.ts
+++ b/cockpit/deep-agents/filesystem/angular/src/app/filesystem.component.ts
@@ -1,15 +1,7 @@
 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.
@@ -38,11 +30,7 @@ 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"
@@ -82,15 +70,6 @@ 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 5d88d8986..1ee2de46a 100644
--- a/cockpit/deep-agents/planning/angular/src/app/planning.component.ts
+++ b/cockpit/deep-agents/planning/angular/src/app/planning.component.ts
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { Component, computed } from '@angular/core';
 import { ChatComponent } from '@cacheplane/chat';
 import { agent } from '@cacheplane/angular';
@@ -24,21 +23,11 @@ interface PlanStep {
  * - `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';
-import { agent } from '@cacheplane/angular';
-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" />
@@ -98,20 +87,4 @@ export class PlanningComponent {
         : 'pending') as PlanStep['status'],
     }));
   });
-=======
-  template: `<chat [ref]="stream" [views]="ui" [store]="uiStore" class="block h-screen" />`,
-})
-export class PlanningComponent {
-  protected readonly stream = agent({
-    apiUrl: environment.langGraphApiUrl,
-    assistantId: environment.planningAssistantId,
-  });
-
-  readonly ui = views({
-    'plan-checklist': PlanChecklistComponent,
-    'checkbox-row': CheckboxRowComponent,
-  });
-
-  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 30770e0e4..b0133086b 100644
--- a/cockpit/deep-agents/planning/angular/src/environments/environment.development.ts
+++ b/cockpit/deep-agents/planning/angular/src/environments/environment.development.ts
@@ -8,8 +8,4 @@ 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 f1522f78d..d0950d618 100644
--- a/cockpit/deep-agents/planning/angular/src/environments/environment.ts
+++ b/cockpit/deep-agents/planning/angular/src/environments/environment.ts
@@ -8,8 +8,4 @@ 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 0f7e3f855..1f349ca8b 100644
--- a/cockpit/deep-agents/sandboxes/angular/src/app/sandboxes.component.ts
+++ b/cockpit/deep-agents/sandboxes/angular/src/app/sandboxes.component.ts
@@ -1,15 +1,7 @@
 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.
@@ -36,11 +28,7 @@ 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"
@@ -76,15 +64,6 @@ 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 dccd87516..71c3cb577 100644
--- a/cockpit/deep-agents/skills/angular/src/app/skills.component.ts
+++ b/cockpit/deep-agents/skills/angular/src/app/skills.component.ts
@@ -1,16 +1,7 @@
 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.
@@ -38,11 +29,7 @@ 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"
@@ -83,16 +70,6 @@ export class SkillsComponent {
     assistantId: environment.streamingAssistantId,
   });
 
-<<<<<<< HEAD
-=======
-  readonly ui = views({
-    'calculator-result': CalculatorResultComponent,
-    'word-count-result': WordCountResultComponent,
-  });
-
-  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 2d3d8987a..f5a63e1be 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,15 +1,7 @@
 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.
@@ -45,11 +37,7 @@ 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"
@@ -104,15 +92,6 @@ 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 54eae9fac..b6683d5b5 100644
--- a/cockpit/langgraph/interrupts/angular/src/app/interrupts.component.ts
+++ b/cockpit/langgraph/interrupts/angular/src/app/interrupts.component.ts
@@ -1,16 +1,8 @@
 // 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()`.
@@ -30,11 +22,7 @@ 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)" />
@@ -44,15 +32,6 @@ 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/examples/chat-agent/.env.example b/examples/chat-agent/.env.example
index c1c4fd226..b434ee7d4 100644
--- a/examples/chat-agent/.env.example
+++ b/examples/chat-agent/.env.example
@@ -2,4 +2,4 @@ OPENAI_API_KEY=your-openai-api-key-here
 OPENAI_MODEL=gpt-5-mini
 LANGSMITH_API_KEY=your-langsmith-api-key-here
 LANGSMITH_TRACING=false
-LANGSMITH_PROJECT=stream-resource-example
+LANGSMITH_PROJECT=cacheplane-example
diff --git a/libs/chat/src/lib/compositions/chat/chat.component.ts b/libs/chat/src/lib/compositions/chat/chat.component.ts
index 844d3038e..0e5aa4077 100644
--- a/libs/chat/src/lib/compositions/chat/chat.component.ts
+++ b/libs/chat/src/lib/compositions/chat/chat.component.ts
@@ -14,12 +14,6 @@ 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';
@@ -102,11 +96,7 @@ 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">
@@ -186,30 +176,12 @@ 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[]>([]);
-  readonly activeThreadId = input<string>('');
-  readonly threadSelected = output<string>();
-  readonly action = output<{ name: string; params: Record<string, unknown> }>();
-  readonly sidebarOpen = signal(false);
-
-  // Inject DI-provided registry as fallback
-  private readonly diViews = inject(VIEW_REGISTRY, { optional: true });
-
-  // Resolved registry: input takes precedence over DI
-  protected readonly resolvedViews = computed(() =>
-    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 57b2bfbd8..2ab8c405e 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,12 +9,6 @@ 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';
 
@@ -48,11 +42,7 @@ 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) {
@@ -63,69 +53,19 @@ export function getMessageType(message: BaseMessage): MessageTemplateType {
           [ngTemplateOutletContext]="{ $implicit: message, index: $index }"
         />
       }
-<<<<<<< HEAD
-=======
-
-      @if (renderRegistry() && getUiSpec(message); as spec) {
-        <div class="ml-10 mt-2">
-          <render-spec
-            [spec]="$any(spec)"
-            [registry]="renderRegistry()!"
-            [store]="store()"
-          />
-        </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 */
-  readonly renderRegistry = computed(() => {
-    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.
- * Checks the message's `ui` field and `additional_kwargs.ui` field.
- */
-export function getUiSpec(message: BaseMessage): unknown | null {
-  const msg = message as unknown as Record<string, unknown>;
-  if (msg['ui'] && isValidSpec(msg['ui'])) return msg['ui'];
-  const kwargs = msg['additional_kwargs'] as Record<string, unknown> | undefined;
-  if (kwargs?.['ui'] && isValidSpec(kwargs['ui'])) return kwargs['ui'];
-  return null;
-}
-
-function isValidSpec(value: unknown): boolean {
-  return typeof value === 'object'
-    && value !== null
-    && '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 391c06e66..9ce65b02c 100644
--- a/libs/chat/src/lib/provide-chat.ts
+++ b/libs/chat/src/lib/provide-chat.ts
@@ -1,18 +1,10 @@
 // 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"). */
diff --git a/libs/chat/src/public-api.ts b/libs/chat/src/public-api.ts
index 8faf6a48a..2abb86b00 100644
--- a/libs/chat/src/public-api.ts
+++ b/libs/chat/src/public-api.ts
@@ -56,8 +56,5 @@ export { views, withViews, withoutViews, toRenderRegistry } from '@cacheplane/re
 export type { ViewRegistry } from '@cacheplane/render';
 export { provideViews, VIEW_REGISTRY } from '@cacheplane/render';
 
-// Spec detection
-export { getUiSpec } from './lib/primitives/chat-messages/chat-messages.component';
-
 // Test utilities
 export { createMockAgentRef } from './lib/testing/mock-agent-ref';