@swarmclawai/swarmclaw 0.9.2 → 0.9.4

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

@@ -10,6 +10,7 @@ import {
   getToolEventsSnapshotKey,
   hasPersistableAssistantPayload,
   parseUsdLimit,
+  pruneOldHeartbeatMessages,
   shouldAutoRouteHeartbeatAlerts,
   shouldPersistInboundUserMessage,
   shouldReplaceRecentAssistantMessage,
@@ -478,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

@@ -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

@@ -29,6 +29,7 @@ import { applyResolvedRoute, resolvePrimaryAgentRoute } from '@/lib/server/agent
 import { resolveSessionToolPolicy } from '@/lib/server/tool-capability-policy'
 import { buildCurrentDateTimePromptContext } from '@/lib/server/prompt-runtime-context'
 import { buildWorkspaceContext } from '@/lib/server/workspace-context'
+import { buildRuntimeSkillPromptBlocks, resolveRuntimeSkills } from '@/lib/server/skills/runtime-skill-resolver'
 import { resolveImagePath } from '@/lib/server/resolve-image'
 import {
   applyContextClearBoundary,
@@ -48,6 +49,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 {
@@ -66,6 +68,7 @@ import { evaluateSessionFreshness, resetSessionRuntime, resolveSessionResetPolic
 import { pruneStreamingAssistantArtifacts, upsertStreamingAssistantArtifact } from '@/lib/chat/chat-streaming-state'
 import { shouldSuppressHiddenControlText, stripHiddenControlTokens } from '@/lib/server/agents/assistant-control'
 import { buildAgentDisabledMessage, isAgentDisabled } from '@/lib/server/agents/agent-availability'
+import { isDirectConnectorSession } from '@/lib/server/connectors/session-kind'
 import { errorMessage as toErrorMessage } from '@/lib/shared-utils'
 import { listUniversalToolAccessPluginIds } from '@/lib/server/universal-tool-access'
 
@@ -108,6 +111,24 @@ export function buildEnabledToolsAutonomyGuidance(): string[] {
   ]
 }
 
+function resolveHeartbeatLastConnectorTarget(session: Session | null | undefined): {
+  connectorId?: string
+  channelId: string
+} | null {
+  if (!isDirectConnectorSession(session)) return null
+  const connectorId = typeof session?.connectorContext?.connectorId === 'string'
+    ? session.connectorContext.connectorId.trim()
+    : ''
+  const channelId = typeof session?.connectorContext?.channelId === 'string'
+    ? session.connectorContext.channelId.trim()
+    : ''
+  if (!channelId) return null
+  return {
+    connectorId: connectorId || undefined,
+    channelId,
+  }
+}
+
 interface SessionWithCredentials {
   credentialId?: string | null
 }
@@ -129,7 +150,14 @@ 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
+    deliveryMode?: 'default' | 'tool_only'
+  }
   replyToId?: string
 }
 
@@ -421,6 +449,10 @@ function syncSessionFromAgent(sessionId: string): void {
       session.openclawAgentId = desiredOpenClawAgentId
       changed = true
     }
+    if (session.connectorContext) {
+      session.connectorContext = undefined
+      changed = true
+    }
   }
 
   if (changed) {
@@ -429,6 +461,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()
@@ -472,13 +527,16 @@ function buildAgentSystemPrompt(session: Session): string | undefined {
   if (agent.systemPrompt) parts.push(`## System Prompt\n${agent.systemPrompt}`)
 
   // 5. Skills (SwarmClaw Core)
-  if (agent.skillIds?.length) {
-    const allSkills = loadSkills()
-    for (const skillId of agent.skillIds) {
-      const skill = allSkills[skillId]
-      if (skill?.content) parts.push(`## Skill: ${skill.name}\n${skill.content}`)
-    }
-  }
+  try {
+    const runtimeSkills = resolveRuntimeSkills({
+      cwd: session.cwd,
+      enabledPlugins,
+      agentSkillIds: agent.skillIds || [],
+      storedSkills: loadSkills(),
+      selectedSkillId: session.skillRuntimeState?.selectedSkillId || null,
+    })
+    parts.push(...buildRuntimeSkillPromptBlocks(runtimeSkills))
+  } catch { /* non-critical */ }
 
   // 5b. Workspace context files (HEARTBEAT.md, IDENTITY.md, AGENTS.md, etc.)
   try {
@@ -601,6 +659,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 +862,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 +1029,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 +1051,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 +1249,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)`)
       }
     }
   }
@@ -1198,6 +1262,7 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
   const shouldPersistAssistant = !hiddenControlOnly
     && hasPersistableAssistantPayload(persistedText, thinkingText, persistedToolEvents)
     && heartbeatClassification !== 'suppress'
+    && !(isHeartbeatRun && heartbeatConfig?.deliveryMode === 'tool_only' && !isDirectConnectorSession(session))
 
   const normalizeResumeId = (value: unknown): string | null =>
     typeof value === 'string' && value.trim() ? value.trim() : null
@@ -1206,6 +1271,9 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
   const current = fresh[sessionId]
   if (current) {
     current.messages = Array.isArray(current.messages) ? current.messages : []
+    if (!isDirectConnectorSession(current) && current.connectorContext) {
+      current.connectorContext = undefined
+    }
     const currentAgent = current.agentId ? loadAgents()[current.agentId] : null
     pruneStreamingAssistantArtifacts(current.messages, {
       minIndex: runMessageStartIndex,
@@ -1279,18 +1347,22 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
       }
 
       // Target routing for non-suppressed heartbeat alerts
-      if (isHeartbeatRun && heartbeatConfig?.target && heartbeatConfig.target !== 'none' && heartbeatConfig.showAlerts !== false) {
+      if (
+        isHeartbeatRun
+        && shouldAutoRouteHeartbeatAlerts(heartbeatConfig)
+        && heartbeatConfig?.target
+        && heartbeatConfig.target !== 'none'
+      ) {
         try {
           // eslint-disable-next-line @typescript-eslint/no-require-imports
-          const { listRunningConnectors, sendConnectorMessage } = require('../connectors/manager')
+          const { sendConnectorMessage } = require('../connectors/manager')
           let connectorId: string | undefined
           let channelId: string | undefined
           if (heartbeatConfig.target === 'last') {
-            const running = listRunningConnectors()
-            const first = running.find((c: { recentChannelId?: string }) => c.recentChannelId)
-            if (first) {
-              connectorId = first.id
-              channelId = first.recentChannelId
+            const lastTarget = resolveHeartbeatLastConnectorTarget(current)
+            if (lastTarget) {
+              connectorId = lastTarget.connectorId
+              channelId = lastTarget.channelId
             }
           } else if (heartbeatConfig.target.includes(':')) {
             const [cId, chId] = heartbeatConfig.target.split(':', 2)
@@ -1309,19 +1381,25 @@ export async function executeSessionChatTurn(input: ExecuteChatTurnInput): Promi
 
       // Auto-discover connectors linked to this agent when no explicit target is set
       // Skip if a real inbound message was handled recently — the agent just responded to it
-      if (isHeartbeatRun && !heartbeatConfig?.target && heartbeatConfig?.showAlerts !== false && session.agentId) {
-        const recentInbound = session.connectorContext?.lastInboundAt
-          && (Date.now() - session.connectorContext.lastInboundAt) < 60_000
-        if (!recentInbound) {
+      if (
+        isHeartbeatRun
+        && shouldAutoRouteHeartbeatAlerts(heartbeatConfig)
+        && !heartbeatConfig?.target
+        && isDirectConnectorSession(current)
+      ) {
+        const recentInbound = current.connectorContext?.lastInboundAt
+          && (Date.now() - current.connectorContext.lastInboundAt) < 60_000
+        const connectorId = typeof current.connectorContext?.connectorId === 'string'
+          ? current.connectorContext.connectorId.trim()
+          : ''
+        const channelId = typeof current.connectorContext?.channelId === 'string'
+          ? current.connectorContext.channelId.trim()
+          : ''
+        if (!recentInbound && channelId) {
           try {
             // eslint-disable-next-line @typescript-eslint/no-require-imports
-            const { listRunningConnectors: listRunning, sendConnectorMessage: sendMsg } = require('../connectors/manager')
-            const agentConnectors = listRunning().filter((c: { agentId: string | null; recentChannelId: string | null; supportsSend: boolean }) =>
-              c.agentId === session.agentId && c.recentChannelId && c.supportsSend
-            )
-            for (const conn of agentConnectors) {
-              sendMsg({ connectorId: conn.id, channelId: conn.recentChannelId, text: persistedText }).catch(() => {})
-            }
+            const { sendConnectorMessage: sendMsg } = require('../connectors/manager')
+            sendMsg({ connectorId: connectorId || undefined, channelId, text: persistedText }).catch(() => {})
           } catch {
             // Best effort — connector manager may not be loaded
           }
@@ -1332,6 +1410,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', {

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

@@ -1,14 +1,11 @@
 import type { MessageToolEvent } from '@/types'
 import { canonicalizePluginId } from '@/lib/server/tool-aliases'
 import { extractSuggestions } from '@/lib/server/suggestions'
-import { isDirectMemoryWriteRequest } from '@/lib/server/memory/memory-policy'
 import {
-  isBroadGoal,
   looksLikeExternalWalletTask,
-  looksLikeOpenEndedDeliverableTask,
 } from '@/lib/server/chat-execution/stream-continuation'
 
-const EXPLICIT_ARTIFACT_OUTPUT_RE = /\b(?:save|write|output|export)\b[^.!?\n]{0,80}\b(?:to|as|at|in)\b[^.!?\n]{0,60}(\/[^\s,'"]+\.(?:md|txt|html?|json|csv|ya?ml|xml|pdf|png|jpe?g|webp|gif|svg|zip|py|ts|tsx|js|jsx|mjs|cjs|sql|sh)|~\/[^\s,'"]+\.(?:md|txt|html?|json|csv|ya?ml|xml|pdf|png|jpe?g|webp|gif|svg|zip|py|ts|tsx|js|jsx|mjs|cjs|sql|sh)|\.\/[^\s,'"]+\.(?:md|txt|html?|json|csv|ya?ml|xml|pdf|png|jpe?g|webp|gif|svg|zip|py|ts|tsx|js|jsx|mjs|cjs|sql|sh)|[a-z0-9._/-]+\.(?:md|txt|html?|json|csv|ya?ml|xml|pdf|png|jpe?g|webp|gif|svg|zip|py|ts|tsx|js|jsx|mjs|cjs|sql|sh)\b)/i
+const EXPLICIT_ARTIFACT_OUTPUT_RE = /\b(?:save|write|output|export|create|generate)\b[^.!?\n]{0,80}\b(?:to|as|at|in)\b[^.!?\n]{0,60}(\/[^\s,'"]+\.(?:md|txt|html?|json|csv|ya?ml|xml|pdf|png|jpe?g|webp|gif|svg|zip|py|ts|tsx|js|jsx|mjs|cjs|sql|sh)|~\/[^\s,'"]+\.(?:md|txt|html?|json|csv|ya?ml|xml|pdf|png|jpe?g|webp|gif|svg|zip|py|ts|tsx|js|jsx|mjs|cjs|sql|sh)|\.\/[^\s,'"]+\.(?:md|txt|html?|json|csv|ya?ml|xml|pdf|png|jpe?g|webp|gif|svg|zip|py|ts|tsx|js|jsx|mjs|cjs|sql|sh)|[a-z0-9._/-]+\.(?:md|txt|html?|json|csv|ya?ml|xml|pdf|png|jpe?g|webp|gif|svg|zip|py|ts|tsx|js|jsx|mjs|cjs|sql|sh)\b)/i
 
 export function isLikelyToolErrorOutput(output: string): boolean {
   const trimmed = String(output || '').trim()
@@ -168,37 +165,3 @@ export function compactThreadRecallText(text: string, maxChars = 180): string {
   return compact.length > maxChars ? `${compact.slice(0, maxChars - 3)}...` : compact
 }
 
-const DIRECT_MEMORY_WRITE_CONFIRMATION_ONLY_RE = /\b(?:then|and then|after that)?\s*(?:confirm|recap|repeat|summarize|tell me|say)\b[\s\S]{0,120}\b(?:stored|saved|updated|remembered|wrote|write)\b/i
-const DIRECT_MEMORY_WRITE_EXTRA_ACTION_RE = /\b(?:then|and then|after that|also)\b[\s\S]{0,160}\b(?:write|create|send|email|message|delegate|research|search|browse|open|edit|build|schedule|plan|review|analy[sz]e)\b/i
-
-export function isNarrowDirectMemoryWriteTurn(message: string): boolean {
-  const trimmed = String(message || '').trim()
-  if (!trimmed || !isDirectMemoryWriteRequest(trimmed)) return false
-  if (looksLikeOpenEndedDeliverableTask(trimmed)) return false
-  if (DIRECT_MEMORY_WRITE_EXTRA_ACTION_RE.test(trimmed) && !DIRECT_MEMORY_WRITE_CONFIRMATION_ONLY_RE.test(trimmed)) {
-    return false
-  }
-  return !isBroadGoal(trimmed) || DIRECT_MEMORY_WRITE_CONFIRMATION_ONLY_RE.test(trimmed) || !/[?]$/.test(trimmed)
-}
-
-const CURRENT_THREAD_RECALL_BLOCKED_TOOL_IDS = new Set([
-  'memory',
-  'manage_sessions',
-  'web',
-  'context_mgmt',
-])
-
-export function shouldAllowToolForCurrentThreadRecall(toolName: string): boolean {
-  const canonicalToolName = canonicalizePluginId(toolName) || toolName.trim().toLowerCase()
-  return !CURRENT_THREAD_RECALL_BLOCKED_TOOL_IDS.has(canonicalToolName)
-}
-
-const DIRECT_MEMORY_WRITE_ALLOWED_TOOL_IDS = new Set([
-  'memory_store',
-  'memory_update',
-])
-
-export function shouldAllowToolForDirectMemoryWrite(toolName: string): boolean {
-  const rawToolName = toolName.trim().toLowerCase()
-  return DIRECT_MEMORY_WRITE_ALLOWED_TOOL_IDS.has(rawToolName)
-}