From 383dfcf91898f4591e4128bd7fc43b111fc73983 Mon Sep 17 00:00:00 2001 From: Brian Love Date: Tue, 7 Apr 2026 16:29:30 -0700 Subject: [PATCH 1/2] fix: cockpit iframe fallback URL + remove stale stream-resource references --- apps/cockpit/src/lib/content-bundle.ts | 2 +- apps/website/content/AGENTS.md.template | 2 +- apps/website/content/CLAUDE.md.template | 2 +- apps/website/src/components/shared/Footer.tsx | 4 ++-- apps/website/src/components/shared/Nav.tsx | 4 ++-- examples/chat-agent/.env.example | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/cockpit/src/lib/content-bundle.ts b/apps/cockpit/src/lib/content-bundle.ts index cb1622371..80c80a75b 100644 --- a/apps/cockpit/src/lib/content-bundle.ts +++ b/apps/cockpit/src/lib/content-bundle.ts @@ -45,7 +45,7 @@ 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/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() { {/* Social links */}
- (e.currentTarget.style.color = tokens.colors.textSecondary)}> Pricing - (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} ))} - ))}
- Date: Tue, 7 Apr 2026 16:33:24 -0700 Subject: [PATCH 2/2] fix: resolve merge conflict markers from PR #57 squash merge --- .claude/scheduled_tasks.lock | 1 + apps/cockpit/src/lib/content-bundle.ts | 3 +- .../src/components/landing/SocialProof.tsx | 64 ------------------- .../angular/src/app/filesystem.component.ts | 21 ------ .../angular/src/app/planning.component.ts | 27 -------- .../environments/environment.development.ts | 4 -- .../angular/src/environments/environment.ts | 4 -- .../angular/src/app/sandboxes.component.ts | 21 ------ .../angular/src/app/skills.component.ts | 23 ------- .../src/app/durable-execution.component.ts | 21 ------ .../angular/src/app/interrupts.component.ts | 21 ------ .../lib/compositions/chat/chat.component.ts | 28 -------- .../chat-messages/chat-messages.component.ts | 60 ----------------- libs/chat/src/lib/provide-chat.ts | 8 --- libs/chat/src/public-api.ts | 3 - 15 files changed, 3 insertions(+), 306 deletions(-) create mode 100644 .claude/scheduled_tasks.lock 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 80c80a75b..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'] || 'https://examples.cacheplane.ai'; + 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/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
-======= -
->>>>>>> origin/main >>>>>> 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

@@ -70,21 +46,14 @@ export function SocialProof() { {/* Scrolling logo strip */}
>>>>>> 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() {
- {/* Fade edges */} -
-
>>>>>> 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) => ( >>>>>> 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/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: `
-<<<<<<< HEAD -======= - ->>>>>>> origin/main