@swarmclawai/swarmclaw 0.9.1 → 0.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Self-hosted AI agent orchestration dashboard — manage LLM providers, orchestrate agent swarms, schedule tasks, and bridge agents to chat platforms.",
   "license": "MIT",
   "publishConfig": {

package/src/app/agents/page.tsx

@@ -6,6 +6,7 @@ import { useAppStore } from '@/stores/use-app-store'
 import { useMediaQuery } from '@/hooks/use-media-query'
 import { getViewPath } from '@/lib/app/navigation'
 import { AgentChatList } from '@/components/agents/agent-chat-list'
+import { PageLoader } from '@/components/ui/page-loader'
 
 export default function AgentsPage() {
   const isDesktop = useMediaQuery('(min-width: 768px)')
@@ -30,5 +31,5 @@ export default function AgentsPage() {
   if (!isDesktop) return <AgentChatList />
 
   // Brief flash while redirecting, or no agents exist yet
-  return null
+  return <PageLoader />
 }

package/src/app/globals.css

@@ -287,6 +287,34 @@ textarea:hover::-webkit-scrollbar { width: 6px; }
   to { opacity: 1; transform: translateY(0); }
 }
 
+/* ===== SwarmClaw Loader Keyframes ===== */
+@keyframes sc-orbit {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+@keyframes sc-ring {
+  from { transform: rotate(0deg) scale(1); }
+  50% { transform: rotate(180deg) scale(1.02); }
+  to { transform: rotate(360deg) scale(1); }
+}
+@keyframes sc-breathe {
+  0%, 100% { transform: scale(1); opacity: 0.9; }
+  50% { transform: scale(1.06); opacity: 1; }
+}
+@keyframes sc-glow {
+  0%, 100% { opacity: 0.5; transform: scale(0.9); }
+  50% { opacity: 1; transform: scale(1.1); }
+}
+@keyframes sc-text-fade {
+  0% { opacity: 0.6; }
+  100% { opacity: 1; }
+}
+@keyframes sc-progress {
+  0% { width: 0; margin-left: 0; }
+  50% { width: 70%; margin-left: 15%; }
+  100% { width: 0; margin-left: 100%; }
+}
+
 /* Heartbeat float animation */
 @keyframes heartbeat-float {
   0% { opacity: 1; transform: translateY(0) scale(1); }

package/src/app/home/page.tsx

@@ -16,6 +16,7 @@ import { timeAgo, timeUntil } from '@/lib/time-format'
 import type { Agent, Session, ActivityEntry, BoardTask, AppNotification } from '@/types'
 import { HintTip } from '@/components/shared/hint-tip'
 import { MainContent } from '@/components/layout/main-content'
+import { PageLoader } from '@/components/ui/page-loader'
 import { SectionHeader } from '@/components/ui/section-header'
 import { StatCard } from '@/components/ui/stat-card'
 
@@ -77,6 +78,7 @@ export default function HomePage() {
   const [todayCost, setTodayCost] = useState(0)
   const [costTrend, setCostTrend] = useState<{ cost: number; bucket: string }[]>([])
   const [localhostBrowser, setLocalhostBrowser] = useState(false)
+  const [pageReady, setPageReady] = useState(false)
   const mountedRef = useMountedRef()
 
   useEffect(() => {
@@ -155,6 +157,7 @@ export default function HomePage() {
         setTodayCost(todayPt?.cost || 0)
       })
       .catch(() => {})
+      .finally(() => { if (!cancelled && mountedRef.current) setPageReady(true) })
     return () => {
       cancelled = true
       window.clearTimeout(connectorTimer)
@@ -188,6 +191,14 @@ export default function HomePage() {
     }
   }
 
+  if (!pageReady) {
+    return (
+      <MainContent>
+        <PageLoader label="Loading dashboard..." />
+      </MainContent>
+    )
+  }
+
   return (
     <MainContent>
       <div className="flex-1 overflow-y-auto">

package/src/app/settings/page.tsx

@@ -4,6 +4,7 @@ import { useEffect, useState, useRef, useCallback, useMemo } from 'react'
 import type { ReactNode } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
 import { MainContent } from '@/components/layout/main-content'
+import { PageLoader } from '@/components/ui/page-loader'
 import { inputClass } from '@/views/settings/utils'
 import { UserPreferencesSection } from '@/views/settings/section-user-preferences'
 import { ThemeSection } from '@/views/settings/section-theme'
@@ -84,6 +85,7 @@ export default function SettingsRoute() {
   const loadSecrets = useAppStore((s) => s.loadSecrets)
   const loadAgents = useAppStore((s) => s.loadAgents)
   const credentials = useAppStore((s) => s.credentials)
+  const [pageReady, setPageReady] = useState(false)
   const [activeTab, setActiveTabRaw] = useState('general')
   const contentRef = useRef<HTMLDivElement>(null)
   const sectionRefs = useRef<Record<string, HTMLDivElement | null>>({})
@@ -98,11 +100,8 @@ export default function SettingsRoute() {
   }, [])
 
   useEffect(() => {
-    loadProviders()
-    loadCredentials()
-    loadSettings()
-    loadSecrets()
-    loadAgents()
+    Promise.all([loadProviders(), loadCredentials(), loadSettings(), loadSecrets(), loadAgents()])
+      .finally(() => setPageReady(true))
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
@@ -298,6 +297,14 @@ export default function SettingsRoute() {
 
   const visibleSections = sectionsByTab.get(activeTab) || []
 
+  if (!pageReady) {
+    return (
+      <MainContent>
+        <PageLoader label="Loading settings..." />
+      </MainContent>
+    )
+  }
+
   return (
     <MainContent>
       <div className="flex-1 flex h-full min-w-0">

package/src/components/connectors/connector-list.tsx

@@ -14,6 +14,7 @@ import {
   resolveConnectorPlatformMeta,
 } from '@/components/shared/connector-platform-icon'
 import { AgentAvatar } from '@/components/agents/agent-avatar'
+import { PageLoader } from '@/components/ui/page-loader'
 import { StatusDot } from '@/components/ui/status-dot'
 
 function relativeTime(ts: number): string {
@@ -158,11 +159,7 @@ export function ConnectorList({ inSidebar }: { inSidebar?: boolean }) {
   }
 
   if (!loaded) {
-    return (
-      <div className="flex-1 flex flex-col items-center justify-center px-6 py-12 text-center">
-        <p className="text-[13px] text-text-3">Loading connectors...</p>
-      </div>
-    )
+    return <PageLoader label="Loading connectors..." />
   }
 
   if (!list.length) {

package/src/components/logs/log-list.tsx

@@ -5,6 +5,7 @@ import { api } from '@/lib/app/api-client'
 import { useWs } from '@/hooks/use-ws'
 import { useAppStore } from '@/stores/use-app-store'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
+import { PageLoader } from '@/components/ui/page-loader'
 import { safeStorageGetJson, safeStorageSet } from '@/lib/app/safe-storage'
 
 interface LogEntry {
@@ -135,11 +136,7 @@ export function LogList() {
   }
 
   if (loading) {
-    return (
-      <div className="flex-1 flex items-center justify-center text-text-3 text-[13px]">
-        Loading logs...
-      </div>
-    )
+    return <PageLoader label="Loading logs..." />
   }
 
   const agentList = Object.values(agents)

package/src/components/providers/provider-list.tsx

@@ -8,6 +8,7 @@ import { useWs } from '@/hooks/use-ws'
 import { api } from '@/lib/app/api-client'
 import type { Credential, GatewayProfile } from '@/types'
 import { dedup } from '@/lib/shared-utils'
+import { PageLoader } from '@/components/ui/page-loader'
 import { StatusDot } from '@/components/ui/status-dot'
 
 interface OpenClawDeployDraft {
@@ -254,11 +255,7 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
   }, {})
 
   if (!loaded) {
-    return (
-      <div className={`flex-1 flex items-center justify-center ${inSidebar ? 'px-3 pb-4' : 'px-5'}`}>
-        <p className="text-[13px] text-text-3">Loading providers...</p>
-      </div>
-    )
+    return <PageLoader label="Loading providers..." />
   }
 
   return (

package/src/components/runs/run-list.tsx

@@ -6,6 +6,7 @@ import { useNow } from '@/hooks/use-now'
 import { useWs } from '@/hooks/use-ws'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
 import type { SessionRunRecord, SessionRunStatus } from '@/types'
+import { PageLoader } from '@/components/ui/page-loader'
 import { formatElapsed } from '@/lib/format-display'
 
 const STATUS_COLORS: Record<SessionRunStatus, { bg: string; text: string }> = {
@@ -55,12 +56,7 @@ export function RunList() {
   const filtered = statusFilter ? runs.filter((r) => r.status === statusFilter) : runs
 
   if (loading) {
-    return (
-      <div className="flex-1 flex items-center justify-center text-text-3 text-[13px]">
-        <span className="w-4 h-4 rounded-full border-2 border-text-3/20 border-t-text-3/60 animate-spin mr-2" />
-        Loading runs...
-      </div>
-    )
+    return <PageLoader label="Loading runs..." />
   }
 
   return (

package/src/components/schedules/schedule-list.tsx

@@ -5,6 +5,7 @@ import { useAppStore } from '@/stores/use-app-store'
 import { ScheduleCard } from './schedule-card'
 import { SCHEDULE_TEMPLATES, FEATURED_TEMPLATE_IDS } from '@/lib/schedules/schedule-templates'
 import { Newspaper, HeartPulse, PenLine, FileText } from 'lucide-react'
+import { PageLoader } from '@/components/ui/page-loader'
 import { SearchInput } from '@/components/ui/search-input'
 import { Button } from '@/components/ui/button'
 
@@ -27,8 +28,9 @@ export function ScheduleList({ inSidebar }: Props) {
   const setTemplatePrefill = useAppStore((s) => s.setScheduleTemplatePrefill)
   const activeProjectFilter = useAppStore((s) => s.activeProjectFilter)
   const [search, setSearch] = useState('')
+  const [loaded, setLoaded] = useState(false)
 
-  useEffect(() => { loadSchedules() }, [])
+  useEffect(() => { loadSchedules().finally(() => setLoaded(true)) }, [])
 
   const filtered = useMemo(() => {
     return Object.values(schedules)
@@ -40,6 +42,10 @@ export function ScheduleList({ inSidebar }: Props) {
       .sort((a, b) => b.createdAt - a.createdAt)
   }, [schedules, search, activeProjectFilter])
 
+  if (!loaded) {
+    return <PageLoader label="Loading schedules..." />
+  }
+
   if (!filtered.length && !search) {
     return (
       <div className="flex-1 flex flex-col items-center justify-center gap-4 text-text-3 p-8 text-center">

package/src/components/ui/full-screen-loader.tsx

@@ -130,35 +130,6 @@ export function FullScreenLoader(props: {
         </div>
       ) : null}
 
-      {/* Loading animation keyframes */}
-      <style>{`
-        @keyframes sc-orbit {
-          from { transform: rotate(0deg); }
-          to { transform: rotate(360deg); }
-        }
-        @keyframes sc-ring {
-          from { transform: rotate(0deg) scale(1); }
-          50% { transform: rotate(180deg) scale(1.02); }
-          to { transform: rotate(360deg) scale(1); }
-        }
-        @keyframes sc-breathe {
-          0%, 100% { transform: scale(1); opacity: 0.9; }
-          50% { transform: scale(1.06); opacity: 1; }
-        }
-        @keyframes sc-glow {
-          0%, 100% { opacity: 0.5; transform: scale(0.9); }
-          50% { opacity: 1; transform: scale(1.1); }
-        }
-        @keyframes sc-text-fade {
-          0% { opacity: 0.6; }
-          100% { opacity: 1; }
-        }
-        @keyframes sc-progress {
-          0% { width: 0; margin-left: 0; }
-          50% { width: 70%; margin-left: 15%; }
-          100% { width: 0; margin-left: 100%; }
-        }
-      `}</style>
     </div>
   )
 }

package/src/components/ui/page-loader.tsx

@@ -0,0 +1,69 @@
+/**
+ * Lightweight page-level loader — smaller sibling of FullScreenLoader.
+ * 3 orbiting dots, subtle glow ring, optional label.
+ * 150ms CSS animation-delay prevents flicker on fast loads.
+ */
+export function PageLoader({ label }: { label?: string }) {
+  return (
+    <div
+      className="flex-1 flex flex-col items-center justify-center select-none"
+      style={{
+        opacity: 0,
+        animation: 'fade-up 0.4s var(--ease-spring) 0.15s both',
+      }}
+    >
+      {/* Orbital ring */}
+      <div className="relative w-[64px] h-[64px] mb-5">
+        {/* Glow pulse */}
+        <div
+          className="absolute inset-[-12px] rounded-full"
+          style={{
+            background: 'radial-gradient(circle, rgba(99,102,241,0.06) 0%, transparent 70%)',
+            animation: 'sc-glow 2.5s ease-in-out infinite',
+          }}
+        />
+
+        {/* Ring */}
+        <div
+          className="absolute inset-0 rounded-full border border-white/[0.05]"
+          style={{ animation: 'sc-ring 3s linear infinite' }}
+        />
+
+        {/* 3 orbiting dots */}
+        {[0, 1, 2].map((i) => (
+          <div
+            key={i}
+            className="absolute inset-0"
+            style={{
+              animation: 'sc-orbit 2.4s cubic-bezier(0.4, 0, 0.2, 1) infinite',
+              animationDelay: `${i * -0.8}s`,
+            }}
+          >
+            <div
+              className="absolute top-0 left-1/2 -translate-x-1/2 -translate-y-1/2 rounded-full"
+              style={{
+                width: i === 0 ? 6 : 5,
+                height: i === 0 ? 6 : 5,
+                background: i === 0 ? '#818CF8' : `rgba(129, 140, 248, ${0.6 - i * 0.15})`,
+                boxShadow: i === 0 ? '0 0 10px rgba(99,102,241,0.4)' : 'none',
+              }}
+            />
+          </div>
+        ))}
+      </div>
+
+      {/* Shimmer bar */}
+      <div className="w-[60px] h-[2px] rounded-full bg-white/[0.05] overflow-hidden">
+        <div
+          className="h-full rounded-full bg-accent-bright/50"
+          style={{ animation: 'sc-progress 1.5s ease-in-out infinite' }}
+        />
+      </div>
+
+      {/* Optional label */}
+      {label && (
+        <p className="mt-3 text-[12px] text-text-3/60">{label}</p>
+      )}
+    </div>
+  )
+}

package/src/lib/runtime/runtime-loop.ts

@@ -21,6 +21,10 @@ export const CLAUDE_CODE_TIMEOUT_SEC_MIN = 5
 export const CLAUDE_CODE_TIMEOUT_SEC_MAX = 7200
 export const CLI_PROCESS_TIMEOUT_SEC_MIN = 10
 export const CLI_PROCESS_TIMEOUT_SEC_MAX = 7200
+export const STREAM_IDLE_STALL_SEC_MIN = 30
+export const STREAM_IDLE_STALL_SEC_MAX = 600
+export const REQUIRED_TOOL_KICKOFF_SEC_MIN = 10
+export const REQUIRED_TOOL_KICKOFF_SEC_MAX = 120
 
 export const DEFAULT_AGENT_LOOP_RECURSION_LIMIT = 300
 export const DEFAULT_ORCHESTRATOR_LOOP_RECURSION_LIMIT = 80
@@ -30,9 +34,11 @@ export const DEFAULT_ONGOING_LOOP_MAX_RUNTIME_MINUTES = 60
 export const DEFAULT_DELEGATION_MAX_DEPTH = 3
 
 // Tool/process timeouts
-export const DEFAULT_SHELL_COMMAND_TIMEOUT_SEC = 30
+export const DEFAULT_SHELL_COMMAND_TIMEOUT_SEC = 120
 export const DEFAULT_CLAUDE_CODE_TIMEOUT_SEC = 1800
 export const DEFAULT_CLI_PROCESS_TIMEOUT_SEC = 1800
+export const DEFAULT_STREAM_IDLE_STALL_SEC = 180
+export const DEFAULT_REQUIRED_TOOL_KICKOFF_SEC = 45
 
 function parseIntSetting(value: unknown, fallback: number, min: number, max: number): number {
   const parsed = typeof value === 'number'
@@ -55,6 +61,8 @@ export interface NormalizedRuntimeSettingFields {
   shellCommandTimeoutSec: number
   claudeCodeTimeoutSec: number
   cliProcessTimeoutSec: number
+  streamIdleStallSec: number
+  requiredToolKickoffSec: number
 }
 
 export function normalizeRuntimeSettingFields(settings: Record<string, unknown>): NormalizedRuntimeSettingFields {
@@ -114,5 +122,17 @@ export function normalizeRuntimeSettingFields(settings: Record<string, unknown>)
       CLI_PROCESS_TIMEOUT_SEC_MIN,
       CLI_PROCESS_TIMEOUT_SEC_MAX,
     ),
+    streamIdleStallSec: parseIntSetting(
+      settings.streamIdleStallSec,
+      DEFAULT_STREAM_IDLE_STALL_SEC,
+      STREAM_IDLE_STALL_SEC_MIN,
+      STREAM_IDLE_STALL_SEC_MAX,
+    ),
+    requiredToolKickoffSec: parseIntSetting(
+      settings.requiredToolKickoffSec,
+      DEFAULT_REQUIRED_TOOL_KICKOFF_SEC,
+      REQUIRED_TOOL_KICKOFF_SEC_MIN,
+      REQUIRED_TOOL_KICKOFF_SEC_MAX,
+    ),
   }
 }

package/src/lib/server/chat-execution/chat-execution-utils.test.ts

@@ -10,6 +10,7 @@ import {
   getToolEventsSnapshotKey,
   hasPersistableAssistantPayload,
   parseUsdLimit,
+  pruneOldHeartbeatMessages,
   shouldAutoRouteHeartbeatAlerts,
   shouldPersistInboundUserMessage,
   shouldReplaceRecentAssistantMessage,
@@ -82,11 +83,12 @@ describe('shouldPersistInboundUserMessage', () => {
     assert.equal(shouldPersistInboundUserMessage(false, 'connector'), true)
   })
 
-  it('returns true for internal eval messages', () => {
+  it('returns true for internal eval and subagent messages', () => {
     assert.equal(shouldPersistInboundUserMessage(true, 'eval'), true)
+    assert.equal(shouldPersistInboundUserMessage(true, 'subagent'), true)
   })
 
-  it('returns false for internal non-eval messages', () => {
+  it('returns false for other internal messages', () => {
     assert.equal(shouldPersistInboundUserMessage(true, 'heartbeat'), false)
     assert.equal(shouldPersistInboundUserMessage(true, 'chat'), false)
     assert.equal(shouldPersistInboundUserMessage(true, 'daemon'), false)
@@ -477,3 +479,58 @@ describe('estimateConversationTone', () => {
     assert.equal(estimateConversationTone(''), 'neutral')
   })
 })
+
+// ---------------------------------------------------------------------------
+// pruneOldHeartbeatMessages
+// ---------------------------------------------------------------------------
+describe('pruneOldHeartbeatMessages', () => {
+  it('removes old heartbeat messages keeping only the most recent 2', () => {
+    const messages: Message[] = [
+      { role: 'user', text: 'hi', time: 1 },
+      { role: 'assistant', text: 'alert 1', time: 2, kind: 'heartbeat' },
+      { role: 'assistant', text: 'alert 2', time: 3, kind: 'heartbeat' },
+      { role: 'assistant', text: 'real reply', time: 4, kind: 'chat' },
+      { role: 'assistant', text: 'alert 3', time: 5, kind: 'heartbeat' },
+      { role: 'assistant', text: 'alert 4', time: 6, kind: 'heartbeat' },
+    ]
+    const removed = pruneOldHeartbeatMessages(messages)
+    assert.equal(removed, 2)
+    assert.equal(messages.length, 4)
+    // Only the last 2 heartbeat messages remain
+    const heartbeats = messages.filter((m) => m.kind === 'heartbeat')
+    assert.equal(heartbeats.length, 2)
+    assert.equal(heartbeats[0].text, 'alert 3')
+    assert.equal(heartbeats[1].text, 'alert 4')
+  })
+
+  it('does not remove anything when count is at or below maxKeep', () => {
+    const messages: Message[] = [
+      { role: 'assistant', text: 'alert 1', time: 1, kind: 'heartbeat' },
+      { role: 'user', text: 'hi', time: 2 },
+      { role: 'assistant', text: 'alert 2', time: 3, kind: 'heartbeat' },
+    ]
+    assert.equal(pruneOldHeartbeatMessages(messages), 0)
+    assert.equal(messages.length, 3)
+  })
+
+  it('respects custom maxKeep value', () => {
+    const messages: Message[] = [
+      { role: 'assistant', text: 'hb1', time: 1, kind: 'heartbeat' },
+      { role: 'assistant', text: 'hb2', time: 2, kind: 'heartbeat' },
+      { role: 'assistant', text: 'hb3', time: 3, kind: 'heartbeat' },
+    ]
+    assert.equal(pruneOldHeartbeatMessages(messages, 1), 2)
+    assert.equal(messages.length, 1)
+    assert.equal(messages[0].text, 'hb3')
+  })
+
+  it('does not touch non-heartbeat messages', () => {
+    const messages: Message[] = [
+      { role: 'user', text: 'a', time: 1 },
+      { role: 'assistant', text: 'b', time: 2, kind: 'chat' },
+      { role: 'assistant', text: 'c', time: 3 },
+    ]
+    assert.equal(pruneOldHeartbeatMessages(messages), 0)
+    assert.equal(messages.length, 3)
+  })
+})

package/src/lib/server/chat-execution/chat-execution-utils.ts

@@ -40,7 +40,7 @@ export function shouldAutoRouteHeartbeatAlerts(config?: {
 
 export function shouldPersistInboundUserMessage(internal: boolean, source: string): boolean {
   if (!internal) return true
-  return source === 'eval'
+  return source === 'eval' || source === 'subagent'
 }
 
 function escapeRegExp(value: string): string {
@@ -522,6 +522,30 @@ export function classifyHeartbeatResponse(text: string, ackMaxChars: number, had
   return stripped.length < cleaned.length ? 'strip' : 'keep'
 }
 
+/**
+ * Prune old heartbeat messages from the transcript to prevent context bloat.
+ * Keeps only the most recent `maxKeep` heartbeat assistant messages.
+ * Returns the number of messages removed.
+ */
+export function pruneOldHeartbeatMessages(messages: Message[], maxKeep = 2): number {
+  const heartbeatIndices: number[] = []
+  for (let i = 0; i < messages.length; i++) {
+    if (messages[i].role === 'assistant' && messages[i].kind === 'heartbeat') {
+      heartbeatIndices.push(i)
+    }
+  }
+  if (heartbeatIndices.length <= maxKeep) return 0
+  const toRemove = new Set(heartbeatIndices.slice(0, heartbeatIndices.length - maxKeep))
+  let removed = 0
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (toRemove.has(i)) {
+      messages.splice(i, 1)
+      removed++
+    }
+  }
+  return removed
+}
+
 export function estimateConversationTone(text: string): string {
   const t = text || ''
   if (/```/.test(t) || /\b(function|const|let|var|import|export|class|interface|async|await|return)\b/.test(t)) return 'technical'

package/src/lib/server/chat-execution/chat-execution.ts

@@ -48,6 +48,7 @@ import {
   getTodaySpendUsd,
   classifyHeartbeatResponse,
   estimateConversationTone,
+  pruneOldHeartbeatMessages,
 } from '@/lib/server/chat-execution/chat-execution-utils'
 import { runPostLlmToolRouting } from '@/lib/server/chat-execution/chat-turn-tool-routing'
 import {
@@ -129,7 +130,7 @@ export interface ExecuteChatTurnInput {
   signal?: AbortSignal
   onEvent?: (event: SSEEvent) => void
   modelOverride?: string
-  heartbeatConfig?: { ackMaxChars: number; showOk: boolean; showAlerts: boolean; target: string | null }
+  heartbeatConfig?: { ackMaxChars: number; showOk: boolean; showAlerts: boolean; target: string | null; lightContext?: boolean }
   replyToId?: string
 }
 
@@ -429,6 +430,29 @@ function syncSessionFromAgent(sessionId: string): void {
   }
 }
 
+/**
+ * Build a minimal system prompt for lightweight heartbeat context.
+ * Strips conversation history, skills, tool discipline, and workspace context.
+ * Keeps identity, datetime, and heartbeat guidance for correct routing.
+ */
+function buildLightHeartbeatSystemPrompt(session: Session): string | undefined {
+  if (!session.agentId) return undefined
+  const agents = loadAgents()
+  const agent = agents[session.agentId]
+  if (!agent) return undefined
+
+  const parts: string[] = []
+  parts.push(`## Identity\nName: ${agent.name}`)
+  if (agent.description) parts.push(`Description: ${agent.description}`)
+  parts.push(buildCurrentDateTimePromptContext())
+  if (agent.soul) parts.push(`## Soul\n${agent.soul.slice(0, 300)}`)
+  parts.push([
+    '## Heartbeats',
+    'You run on an autonomous heartbeat. If you receive a heartbeat poll and nothing needs attention, reply exactly: HEARTBEAT_OK',
+  ].join('\n'))
+  return parts.join('\n\n')
+}
+
 function buildAgentSystemPrompt(session: Session): string | undefined {
   if (!session.agentId) return undefined
   const agents = loadAgents()
@@ -601,6 +625,7 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
   )
   const isHeartbeatRun = isInternalHeartbeatRun(internal, source)
   const isAutonomousInternalRun = internal && source !== 'chat'
+  const heartbeatLightContext = isHeartbeatRun && !!input.heartbeatConfig?.lightContext
   const isAutoRunNoHistory = isHeartbeatRun
   const heartbeatStatusOnly = false
   if (shouldApplySessionFreshnessReset(source)) {
@@ -803,7 +828,10 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
   // including identity, soul, skills, tool discipline, and execution policy.
   // Only build the standalone system prompt for the direct-provider (no LangGraph) path
   // to avoid duplicating tool discipline, operating guidance, and capability sections.
-  const systemPrompt = hasPlugins ? undefined : buildAgentSystemPrompt(session)
+  // lightContext mode uses a minimal prompt for both paths to reduce token cost.
+  const systemPrompt = heartbeatLightContext
+    ? buildLightHeartbeatSystemPrompt(session)
+    : (hasPlugins ? undefined : buildAgentSystemPrompt(session))
   const toolEvents: MessageToolEvent[] = []
   const streamErrors: string[] = []
   const accumulatedUsage = { inputTokens: 0, outputTokens: 0, estimatedCost: 0 }
@@ -967,8 +995,9 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
     // Heartbeat runs get a small tail of recent messages so the agent can see
     // prior findings and avoid repeating the same searches. Full history is
     // skipped to avoid blowing the context window on long-lived sessions.
+    // lightContext mode skips history entirely for maximum token savings.
     const heartbeatHistory = isAutoRunNoHistory
-      ? getSessionMessages(sessionId).slice(-6)
+      ? (heartbeatLightContext ? [] : getSessionMessages(sessionId).slice(-6))
       : undefined
 
     console.log(`[chat-execution] provider=${providerType}, hasPlugins=${hasPlugins}, localOpenClawNative=${useLocalOpenClawNativeRuntime}, imagePath=${resolvedImagePath || 'none'}, attachedFiles=${attachedFiles?.length || 0}, plugins=${enabledSessionPlugins.length}`)
@@ -988,7 +1017,7 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
       fullResponse = result.finalResponse || result.fullText
     } else {
       const directHistorySnapshot = isAutoRunNoHistory
-        ? getSessionMessages(sessionId).slice(-6)
+        ? (heartbeatLightContext ? [] : getSessionMessages(sessionId).slice(-6))
         : applyContextClearBoundary(getSessionMessages(sessionId))
       responseCacheInput = {
         provider: providerType,
@@ -1186,6 +1215,7 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
         && (Date.now() - prevSentAt) < 24 * 60 * 60 * 1000
       if (isDuplicate) {
         heartbeatClassification = 'suppress'
+        log.info('heartbeat', `Duplicate heartbeat suppressed for session ${sessionId} (same text within 24h)`)
       }
     }
   }
@@ -1332,6 +1362,15 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
       pruneSuppressedHeartbeatStreamMessage(current.messages)
     }
 
+    // P1: Prune old heartbeat messages to prevent context bloat.
+    // Long-running agents accumulate ~48 no-op messages/day; keep only the most recent 2.
+    if (isHeartbeatRun) {
+      const pruned = pruneOldHeartbeatMessages(current.messages)
+      if (pruned > 0) {
+        log.info('heartbeat', `Pruned ${pruned} old heartbeat message(s) from session ${sessionId}`)
+      }
+    }
+
     // Fire afterChatTurn hook for all enabled plugins (memory auto-save, logging, etc.)
     try {
       await getPluginManager().runHook('afterChatTurn', {