@swarmclawai/swarmclaw 1.2.3 → 1.2.5

package/src/lib/server/capability-router.ts

@@ -1,6 +1,7 @@
 import type { AppSettings } from '@/types'
 import { dedup } from '@/lib/shared-utils'
-import { getToolsForCapability, matchToolCapabilitiesForMessage, TOOL_CAPABILITY } from './tool-planning'
+import { getToolsForCapability, TOOL_CAPABILITY } from './tool-planning'
+import type { MessageClassification } from '@/lib/server/chat-execution/message-classifier'
 
 export type TaskIntent =
   | 'coding'
@@ -25,38 +26,10 @@ function findFirstUrl(text: string): string | undefined {
   return m?.[0]
 }
 
-function containsAny(text: string, terms: string[]): boolean {
-  return terms.some((term) => text.includes(term))
-}
-
 function dedupe(values: string[]): string[] {
   return dedup(values.filter(Boolean))
 }
 
-function isMonitoringOrCurrentEventsRequest(text: string): boolean {
-  const normalized = text.toLowerCase()
-  if (!normalized.trim()) return false
-  return containsAny(normalized, [
-    'latest',
-    'news',
-    'headline',
-    'current event',
-    'recent update',
-    'recent updates',
-    'update me',
-    'updates',
-    'breaking',
-    'developments',
-    'keep watching',
-    'watch for',
-    'watching for',
-    'monitor',
-    'track',
-    'follow the situation',
-    'tell me if anything changes',
-  ])
-}
-
 function preferredToolsForCapabilities(enabledExtensions: string[], capabilities: string[], fallback: string[] = []): string[] {
   const preferred = capabilities.flatMap((capability) => getToolsForCapability(enabledExtensions, capability))
   return dedupe(preferred.length > 0 ? preferred : fallback)
@@ -90,68 +63,36 @@ export function routeTaskIntent(
   message: string,
   enabledExtensions: string[],
   settings?: AppSettings | null,
+  classification?: MessageClassification | null,
 ): CapabilityRoutingDecision {
-  const text = (message || '').toLowerCase()
   const url = findFirstUrl(message || '')
   const delegateOrder = normalizeDelegateOrder(settings?.autonomyPreferredDelegates)
-  const matchedCapabilities = matchToolCapabilitiesForMessage(enabledExtensions, message)
-  const wantsVoiceNote = matchedCapabilities.has(TOOL_CAPABILITY.deliveryVoiceNote)
-  const wantsScreenshots = matchedCapabilities.has(TOOL_CAPABILITY.browserCapture)
-  const wantsMediaDelivery = matchedCapabilities.has(TOOL_CAPABILITY.deliveryMedia)
-  const wantsChannelDelivery = matchedCapabilities.has(TOOL_CAPABILITY.deliveryMessage)
-  const researchLike = matchedCapabilities.has(TOOL_CAPABILITY.researchSearch)
-    || matchedCapabilities.has(TOOL_CAPABILITY.researchFetch)
-    || isMonitoringOrCurrentEventsRequest(text)
-    || !!url
+  const intent = classification?.taskIntent || 'general'
+  const confidence = classification?.confidence ?? 0
+  const wantsVoiceDelivery = classification?.wantsVoiceDelivery === true
+  const wantsScreenshots = classification?.wantsScreenshots === true
+  const wantsOutboundDelivery = classification?.wantsOutboundDelivery === true
 
-  const coding = containsAny(text, [
-    'build',
-    'implement',
-    'create app',
-    'refactor',
-    'fix bug',
-    'write code',
-    'codebase',
-    'typescript',
-    'javascript',
-    'react',
-    'next.js',
-    'unit test',
-    'run tests',
-    'compile',
-    'npm ',
-    'pnpm ',
-    'yarn ',
-  ])
-  if (coding) {
+  if (intent === 'coding') {
     return {
       intent: 'coding',
-      confidence: 0.9,
+      confidence,
       preferredTools: ['claude_code', 'codex_cli', 'opencode_cli', 'shell', 'files', 'edit_file'],
       preferredDelegates: delegateOrder,
       primaryUrl: url,
     }
   }
 
-  const outreach = containsAny(text, [
-    'send update',
-    'message',
-    'whatsapp',
-    'telegram',
-    'slack',
-    'discord',
-    'notify',
-    'broadcast',
-  ]) || (!researchLike && (wantsVoiceNote || wantsMediaDelivery || wantsChannelDelivery))
-  if (outreach) {
+  if (intent === 'outreach') {
     return {
       intent: 'outreach',
-      confidence: 0.8,
+      confidence,
       preferredTools: preferredToolsForCapabilities(
         enabledExtensions,
         [
-          TOOL_CAPABILITY.deliveryVoiceNote,
-          TOOL_CAPABILITY.deliveryMedia,
+          ...(wantsVoiceDelivery ? [TOOL_CAPABILITY.deliveryVoiceNote] : []),
+          ...(wantsScreenshots ? [TOOL_CAPABILITY.deliveryMedia] : []),
+          ...(wantsOutboundDelivery || wantsVoiceDelivery ? [TOOL_CAPABILITY.deliveryMessage] : []),
           TOOL_CAPABILITY.deliveryMessage,
         ],
         ['connector_message_tool', 'manage_connectors', 'manage_sessions'],
@@ -161,35 +102,20 @@ export function routeTaskIntent(
     }
   }
 
-  const scheduling = containsAny(text, [
-    'schedule',
-    'every day',
-    'every week',
-    'cron',
-    'recurring',
-    'remind',
-    'follow up tomorrow',
-  ]) && !researchLike
-  if (scheduling) {
+  if (intent === 'scheduling') {
     return {
       intent: 'scheduling',
-      confidence: 0.75,
+      confidence,
       preferredTools: ['manage_schedules', 'manage_tasks'],
       preferredDelegates: delegateOrder,
       primaryUrl: url,
     }
   }
 
-  const browsing = !!url && (
-    matchedCapabilities.has(TOOL_CAPABILITY.browserNavigate)
-    || matchedCapabilities.has(TOOL_CAPABILITY.browserCapture)
-    || getToolsForCapability(enabledExtensions, TOOL_CAPABILITY.browserNavigate).length > 0
-    || getToolsForCapability(enabledExtensions, TOOL_CAPABILITY.browserCapture).length > 0
-  )
-  if (browsing) {
+  if (intent === 'browsing') {
     return {
       intent: 'browsing',
-      confidence: 0.7,
+      confidence,
       preferredTools: preferredToolsForCapabilities(
         enabledExtensions,
         [
@@ -204,22 +130,21 @@ export function routeTaskIntent(
     }
   }
 
-  const research = researchLike
-  if (research) {
+  if (intent === 'research') {
     const preferred = preferredToolsForCapabilities(
       enabledExtensions,
       [
         TOOL_CAPABILITY.researchSearch,
         TOOL_CAPABILITY.researchFetch,
         ...(wantsScreenshots ? [TOOL_CAPABILITY.browserCapture] : []),
-        ...(wantsVoiceNote ? [TOOL_CAPABILITY.deliveryVoiceNote] : []),
-        ...(wantsMediaDelivery || wantsChannelDelivery ? [TOOL_CAPABILITY.deliveryMedia, TOOL_CAPABILITY.deliveryMessage] : []),
+        ...(wantsVoiceDelivery ? [TOOL_CAPABILITY.deliveryVoiceNote] : []),
+        ...(wantsOutboundDelivery ? [TOOL_CAPABILITY.deliveryMedia, TOOL_CAPABILITY.deliveryMessage] : []),
       ],
       ['web_search', 'web_fetch', 'browser'],
     )
     return {
       intent: 'research',
-      confidence: 0.7,
+      confidence,
       preferredTools: preferred,
       preferredDelegates: delegateOrder,
       primaryUrl: url,
@@ -228,7 +153,7 @@ export function routeTaskIntent(
 
   return {
     intent: 'general',
-    confidence: 0.5,
+    confidence,
     preferredTools: [],
     preferredDelegates: delegateOrder,
     primaryUrl: url,

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

@@ -398,21 +398,6 @@ export function findFirstUrl(text: string): string | null {
   return match?.[0] || null
 }
 
-export function isMemoryListIntent(message: string): boolean {
-  const text = message.toLowerCase()
-  if (!/\bmemory|memories|remember\b/.test(text)) return false
-  if (/\b(save|store|memorize|add to memory|write to memory|remember this)\b/.test(text)) return false
-  if (/\bmemory_tool\b/.test(text)) return true
-  return (
-    /\blist\b[\s\w]{0,24}\bmemories\b/.test(text)
-    || /\bshow\b[\s\w]{0,24}\bmemories\b/.test(text)
-    || /\bget\b[\s\w]{0,24}\bmemories\b/.test(text)
-    || /\bwhat\b[\s\w]{0,40}\bmemories\b/.test(text)
-    || /\bwhat do you remember\b/.test(text)
-    || /\brecall\b[\s\w]{0,24}\bmemories?\b/.test(text)
-  )
-}
-
 export function extractDelegationTask(message: string, toolName: string): string | null {
   if (!message.toLowerCase().includes(toolName.toLowerCase())) return null
   const patterns = [

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

@@ -1,9 +1,6 @@
 import type { MessageToolEvent } from '@/types'
 import { canonicalizeExtensionId } from '@/lib/server/tool-aliases'
 import { extractSuggestions } from '@/lib/server/suggestions'
-import {
-  looksLikeExternalWalletTask,
-} from '@/lib/server/chat-execution/stream-continuation'
 import type { MessageClassification } from '@/lib/server/chat-execution/message-classifier'
 import {
   buildSuccessfulMemoryMutationResponse,
@@ -82,7 +79,8 @@ export function shouldForceExternalServiceSummary(params: {
   toolEventCount: number
   classification?: MessageClassification | null
 }): boolean {
-  const walletDetected = params.classification ? params.classification.walletIntent !== 'none' : looksLikeExternalWalletTask(params.userMessage)
+  const walletDetected = params.classification?.walletIntent !== undefined
+    && params.classification.walletIntent !== 'none'
   if (!walletDetected) return false
   if (!params.hasToolCalls || params.toolEventCount === 0) return false
   const trimmed = params.finalResponse.trim()

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

@@ -34,8 +34,16 @@ import { isHeartbeatSource } from '@/lib/server/runtime/heartbeat-source'
 import { perf } from '@/lib/server/runtime/perf'
 import { getAgent } from '@/lib/server/agents/agent-repository'
 import { isDirectConnectorSession } from '@/lib/server/connectors/session-kind'
-import { getSession, getSessionMessages, saveSession } from '@/lib/server/sessions/session-repository'
+import { getSession, saveSession } from '@/lib/server/sessions/session-repository'
+import {
+  getMessages,
+  getMessageCount,
+  appendMessage,
+  replaceMessageAt,
+  replaceAllMessages,
+} from '@/lib/server/messages/message-repository'
 import { appendUsage } from '@/lib/server/usage/usage-repository'
+import { synchronizeWorkingStateForTurn } from '@/lib/server/working-state/service'
 import { notify } from '@/lib/server/ws-hub'
 
 import type { ExecuteChatTurnInput, ExecuteChatTurnResult } from './chat-execution-types'
@@ -193,7 +201,7 @@ export async function finalizeChatTurn(params: {
     const totalTokens = inputTokens + outputTokens
     if (totalTokens > 0) {
       const cost = estimateCost(sessionForRun.model, inputTokens, outputTokens)
-      const history = getSessionMessages(sessionId)
+      const history = getMessages(sessionId)
       const usageRecord: UsageRecord = {
         sessionId,
         messageIndex: history.length,
@@ -354,15 +362,17 @@ export async function finalizeChatTurn(params: {
   const current = getSession(sessionId)
   let assistantPersisted = false
   if (current) {
-    current.messages = Array.isArray(current.messages) ? current.messages : []
+    // Load messages from relational table (lazy-migrates from blob on first access)
+    const messages = getMessages(sessionId)
+    let messagesPruned = false
     if (!isDirectConnectorSession(current) && current.connectorContext) {
       current.connectorContext = undefined
     }
     const currentAgent = current.agentId ? getAgent(current.agentId) : null
-    pruneStreamingAssistantArtifacts(current.messages, {
+    if (pruneStreamingAssistantArtifacts(messages, {
       minIndex: runMessageStartIndex,
       minTime: runStartedAt,
-    })
+    })) messagesPruned = true
     const persistField = (key: string, value: unknown) => {
       const normalized = normalizeResumeId(value)
       if ((current as unknown as Record<string, unknown>)[key] !== normalized) {
@@ -392,6 +402,8 @@ export async function finalizeChatTurn(params: {
       }
     }
 
+    let persistedAssistantMsg: Message | null = null
+    let replacedLast = false
     if (shouldPersistAssistant) {
       const persistedKind = isHeartbeatRun ? 'heartbeat' : 'chat'
       const nowTs = Date.now()
@@ -410,7 +422,7 @@ export async function finalizeChatTurn(params: {
         runId: lifecycleRunId,
       })
       if (nextAssistantMessage) {
-        const previous = current.messages.at(-1)
+        const previous = messages.at(-1)
         const nextToolEvents = nextAssistantMessage.toolEvents || []
         const nextKind = nextAssistantMessage.kind || persistedKind
         if (shouldSuppressRedundantConnectorDeliveryFollowup({
@@ -433,11 +445,14 @@ export async function finalizeChatTurn(params: {
           nextKind,
           now: nowTs,
         })) {
-          current.messages[current.messages.length - 1] = nextAssistantMessage
+          messages[messages.length - 1] = nextAssistantMessage
           assistantPersisted = true
+          replacedLast = true
+          persistedAssistantMsg = nextAssistantMessage
         } else {
-          current.messages.push(nextAssistantMessage)
+          messages.push(nextAssistantMessage)
           assistantPersisted = true
+          persistedAssistantMsg = nextAssistantMessage
         }
         persistedResponseForHooks = nextAssistantMessage.text
         if (assistantPersisted) {
@@ -534,16 +549,28 @@ export async function finalizeChatTurn(params: {
       }
     }
     if (isHeartbeatRun && heartbeatClassification === 'suppress') {
-      pruneSuppressedHeartbeatStreamMessage(current.messages)
+      if (pruneSuppressedHeartbeatStreamMessage(messages)) messagesPruned = true
     }
 
     if (isHeartbeatRun) {
-      const pruned = pruneOldHeartbeatMessages(current.messages)
+      const pruned = pruneOldHeartbeatMessages(messages)
       if (pruned > 0) {
+        messagesPruned = true
         log.info('heartbeat', `Pruned ${pruned} old heartbeat message(s) from session ${sessionId}`)
       }
     }
 
+    // Persist messages: use O(1) append/replace when no pruning, O(n) replaceAll when pruned
+    if (messagesPruned) {
+      replaceAllMessages(sessionId, messages)
+    } else if (assistantPersisted && persistedAssistantMsg) {
+      if (replacedLast) {
+        replaceMessageAt(sessionId, getMessageCount(sessionId) - 1, persistedAssistantMsg)
+      } else {
+        appendMessage(sessionId, persistedAssistantMsg)
+      }
+    }
+
     try {
       await runCapabilityHook('afterChatTurn', {
         session: current,
@@ -563,8 +590,9 @@ export async function finalizeChatTurn(params: {
 
     refreshSessionIdentityState(current, currentAgent)
     let resolvedMissionId = mission?.id || current.missionId || null
+    let updatedMission = mission || null
     if (resolvedMissionId) {
-      const updatedMission = await applyMissionOutcomeForTurn({
+      updatedMission = await applyMissionOutcomeForTurn({
         session: current,
         missionId: resolvedMissionId,
         source,
@@ -579,6 +607,43 @@ export async function finalizeChatTurn(params: {
         current.missionId = updatedMission.id
       }
     }
+    const missionStateChanged = Boolean(
+      updatedMission
+      && (
+        updatedMission.id !== mission?.id
+        || updatedMission.updatedAt !== mission?.updatedAt
+        || updatedMission.status !== mission?.status
+        || updatedMission.phase !== mission?.phase
+        || updatedMission.currentStep !== mission?.currentStep
+        || updatedMission.waitState?.reason !== mission?.waitState?.reason
+      )
+    )
+    const shouldSyncWorkingState = (
+      (!isHeartbeatRun && (assistantPersisted || persistedToolEvents.length > 0 || Boolean(errorMessage)))
+      || (isHeartbeatRun && (persistedToolEvents.length > 0 || Boolean(errorMessage) || missionStateChanged))
+    )
+    if (shouldSyncWorkingState) {
+      try {
+        await synchronizeWorkingStateForTurn({
+          sessionId,
+          agentId: current.agentId || null,
+          mission: updatedMission,
+          message,
+          assistantText: hiddenControlOnly ? '' : textForPersistence,
+          error: errorMessage || null,
+          toolEvents: persistedToolEvents,
+          runId: lifecycleRunId,
+          source,
+        })
+      } catch (workingStateError: unknown) {
+        log.warn('chat-run', `Working-state sync failed for session ${sessionId}`, {
+          runId: lifecycleRunId,
+          error: typeof workingStateError === 'object' && workingStateError !== null && 'message' in workingStateError
+            ? (workingStateError as Error).message
+            : String(workingStateError),
+        })
+      }
+    }
     try {
       syncSessionArchiveMemory(current, { agent: currentAgent })
     } catch {
@@ -591,7 +656,7 @@ export async function finalizeChatTurn(params: {
       isHeartbeatRun,
       agentAutoDraftSetting: currentAgent?.autoDraftSkillSuggestions === true,
       toolEventCount: persistedToolEvents.length,
-      messageCount: current.messages.length,
+      messageCount: messages.length,
     })) {
       try {
         const { createSkillSuggestionFromSession } = await import('@/lib/server/skills/skill-suggestions')

package/src/lib/server/chat-execution/chat-turn-partial-persistence.ts

@@ -1,7 +1,7 @@
 import {
   getSession,
-  saveSession,
 } from '@/lib/server/sessions/session-repository'
+import { getMessages, replaceAllMessages } from '@/lib/server/messages/message-repository'
 import { notify } from '@/lib/server/ws-hub'
 import type { MessageToolEvent, SSEEvent } from '@/types'
 import { upsertStreamingAssistantArtifact } from '@/lib/chat/chat-streaming-state'
@@ -72,7 +72,7 @@ export function createPartialAssistantPersistence(input: {
     try {
       const current = getSession(prepared.sessionId)
       if (!current) return
-      current.messages = Array.isArray(current.messages) ? current.messages : []
+      const currentMessages = getMessages(prepared.sessionId)
       const partialMsg = await applyMessageLifecycleHooks({
         session: current,
         message: {
@@ -98,11 +98,11 @@ export function createPartialAssistantPersistence(input: {
       if (snapshotKey === lastPartialSnapshotKey) return
       lastPartialSnapshotKey = snapshotKey
       lastPartialSaveAt = Date.now()
-      upsertStreamingAssistantArtifact(current.messages, partialMsg, {
+      upsertStreamingAssistantArtifact(currentMessages, partialMsg, {
         minIndex: prepared.runMessageStartIndex,
         minTime: prepared.runStartedAt,
       })
-      saveSession(prepared.sessionId, current)
+      replaceAllMessages(prepared.sessionId, currentMessages)
       notify(`messages:${prepared.sessionId}`)
     } catch {
       // Partial persistence is best-effort.

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

@@ -1,5 +1,6 @@
 import { notify } from '@/lib/server/ws-hub'
 import { getSession, saveSession } from '@/lib/server/sessions/session-repository'
+import { appendMessage } from '@/lib/server/messages/message-repository'
 import type { MessageToolEvent, SSEEvent } from '@/types'
 import type { ExecuteChatTurnResult } from './chat-execution-types'
 import {
@@ -47,8 +48,7 @@ async function completeSyntheticAssistantTurn(params: {
       isSynthetic: true,
     })
     if (nextAssistantMessage) {
-      session.messages = Array.isArray(session.messages) ? session.messages : []
-      session.messages.push(nextAssistantMessage)
+      appendMessage(params.sessionId, nextAssistantMessage)
       session.lastActiveAt = Date.now()
       saveSession(params.sessionId, session)
       if (params.notifyMessages) notify(`messages:${params.sessionId}`)

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

@@ -2,13 +2,14 @@ import fs from 'fs'
 import os from 'os'
 
 import { getProvider } from '@/lib/providers'
-import type { Message, Session } from '@/types'
+import type { ExecutionBrief, Message, Session } from '@/types'
 import {
   decryptKey,
   loadCredentials,
 } from '@/lib/server/credentials/credential-repository'
 import { getAgent } from '@/lib/server/agents/agent-repository'
 import { getSession, saveSession } from '@/lib/server/sessions/session-repository'
+import { getMessages, getMessageCount, appendMessage } from '@/lib/server/messages/message-repository'
 import { loadSettings } from '@/lib/server/settings/settings-repository'
 import { loadSkills } from '@/lib/server/skills/skill-repository'
 import { resolveImagePath } from '@/lib/server/resolve-image'
@@ -45,7 +46,6 @@ import {
 import { normalizeProviderEndpoint, isLocalOpenClawEndpoint } from '@/lib/openclaw/openclaw-endpoint'
 import { NON_LANGGRAPH_PROVIDER_IDS } from '@/lib/provider-sets'
 import {
-  buildMissionContextBlock,
   resolveMissionForTurn,
 } from '@/lib/server/missions/mission-service'
 import {
@@ -69,7 +69,15 @@ import {
   resetSessionRuntime,
   resolveSessionResetPolicy,
 } from '@/lib/server/session-reset-policy'
+import {
+  buildExecutionBrief,
+  buildExecutionBriefContextBlock,
+} from '@/lib/server/execution-brief'
 import { checkAgentBudgetLimits } from '@/lib/server/cost'
+import {
+  classifyMessage,
+  toMessageSemanticsSummary,
+} from '@/lib/server/chat-execution/message-classifier'
 import {
   filterRuntimeCapabilityIds,
   getTodaySpendUsd,
@@ -408,13 +416,13 @@ function resolveApiKeyForSession(session: SessionWithCredentials, provider: Prov
     if (!session.credentialId) throw new Error('No API key configured for this session')
     const creds = loadCredentials()
     const cred = creds[session.credentialId]
-    if (!cred) throw new Error('API key not found. Please add one in Settings.')
+    if (!cred?.encryptedKey) throw new Error('API key not found. Please add one in Settings.')
     return decryptKey(cred.encryptedKey)
   }
   if (provider.optionalApiKey && session.credentialId) {
     const creds = loadCredentials()
     const cred = creds[session.credentialId]
-    if (cred) {
+    if (cred?.encryptedKey) {
       try { return decryptKey(cred.encryptedKey) } catch { return null }
     }
   }
@@ -445,7 +453,8 @@ export interface PreparedExecutableChatTurn {
   lifecycleRunId: string
   agentForSession: ReturnType<typeof getAgent>
   mission: Awaited<ReturnType<typeof resolveMissionForTurn>>
-  missionContextBlock?: string
+  executionBrief: ExecutionBrief
+  executionBriefContextBlock?: string
   extensionsForRun: string[]
   effectiveMessage: string
   providerType: string
@@ -492,9 +501,8 @@ export async function prepareChatTurn(input: ExecuteChatTurnInput): Promise<Prep
 
   const session = getSession(sessionId)
   if (!session) throw new Error(`Session not found: ${sessionId}`)
-  session.messages = Array.isArray(session.messages) ? session.messages : []
   const runStartedAt = Date.now()
-  const runMessageStartIndex = session.messages.length
+  const runMessageStartIndex = getMessageCount(sessionId)
 
   const appSettings = loadSettings()
   const lifecycleRunId = runId || `${sessionId}:${runStartedAt}`
@@ -542,7 +550,7 @@ export async function prepareChatTurn(input: ExecuteChatTurnInput): Promise<Prep
         {
           sessionId: session.id,
           session,
-          messageCount: Array.isArray(session.messages) ? session.messages.length : 0,
+          messageCount: getMessageCount(sessionId),
           durationMs: Date.now() - (session.createdAt || runStartedAt),
           reason: freshness.reason || 'session_reset',
         },
@@ -615,12 +623,16 @@ export async function prepareChatTurn(input: ExecuteChatTurnInput): Promise<Prep
   if (isHeartbeatRun && input.modelOverride) {
     sessionForRun = { ...sessionForRun, model: input.modelOverride }
   }
-  const missionContextBlock = buildMissionContextBlock(mission)
+  const executionBrief = buildExecutionBrief({
+    session: sessionForRun,
+    mission,
+  })
+  const executionBriefContextBlock = buildExecutionBriefContextBlock(executionBrief)
 
   if (extensionsForRun.length > 0) {
     const modelResolvePrompt = heartbeatLightContext
-      ? (joinSystemPromptBlocks(buildLightHeartbeatSystemPrompt(sessionForRun), missionContextBlock) || '')
-      : (joinSystemPromptBlocks(buildAgentSystemPrompt(sessionForRun), missionContextBlock) || '')
+      ? (joinSystemPromptBlocks(buildLightHeartbeatSystemPrompt(sessionForRun), executionBriefContextBlock) || '')
+      : (joinSystemPromptBlocks(buildAgentSystemPrompt(sessionForRun), executionBriefContextBlock) || '')
     const modelResolve = await runCapabilityBeforeModelResolve(
       {
         session: sessionForRun,
@@ -710,7 +722,17 @@ export async function prepareChatTurn(input: ExecuteChatTurnInput): Promise<Prep
 
   const shouldPersistUserMessage = shouldPersistInboundUserMessage(internal, source)
   if (shouldPersistUserMessage) {
-    const linkAnalysis = !internal ? await runLinkUnderstanding(message) : []
+    const [linkAnalysis, semantics] = await Promise.all([
+      !internal ? runLinkUnderstanding(message) : Promise.resolve([]),
+      classifyMessage({
+        sessionId,
+        agentId: session.agentId || null,
+        message,
+        history: getMessages(sessionId),
+      })
+        .then((classification) => toMessageSemanticsSummary(classification))
+        .catch(() => undefined),
+    ])
     const guardedUserText = guardUntrustedText({
       text: message,
       source,
@@ -727,13 +749,14 @@ export async function prepareChatTurn(input: ExecuteChatTurnInput): Promise<Prep
         imageUrl: imageUrl || undefined,
         attachedFiles: attachedFiles?.length ? attachedFiles : undefined,
         replyToId: input.replyToId || undefined,
+        ...(semantics ? { semantics } : {}),
       },
       enabledIds: extensionsForRun,
       phase: 'user',
       runId: lifecycleRunId,
     })
     if (nextUserMessage) {
-      session.messages.push(nextUserMessage)
+      appendMessage(sessionId, nextUserMessage)
       if (linkAnalysis.length > 0) {
         const linkAnalysisMessage = await applyMessageLifecycleHooks({
           session,
@@ -749,7 +772,7 @@ export async function prepareChatTurn(input: ExecuteChatTurnInput): Promise<Prep
           isSynthetic: true,
         })
         if (linkAnalysisMessage) {
-          session.messages.push(linkAnalysisMessage)
+          appendMessage(sessionId, linkAnalysisMessage)
         }
       }
       session.lastActiveAt = Date.now()
@@ -781,8 +804,8 @@ export async function prepareChatTurn(input: ExecuteChatTurnInput): Promise<Prep
     && !useLocalOpenClawNativeRuntime
 
   const systemPrompt = heartbeatLightContext
-    ? joinSystemPromptBlocks(buildLightHeartbeatSystemPrompt(sessionForRun), missionContextBlock)
-    : (hasExtensions ? undefined : joinSystemPromptBlocks(buildAgentSystemPrompt(sessionForRun), missionContextBlock))
+    ? joinSystemPromptBlocks(buildLightHeartbeatSystemPrompt(sessionForRun), executionBriefContextBlock)
+    : (hasExtensions ? undefined : joinSystemPromptBlocks(buildAgentSystemPrompt(sessionForRun), executionBriefContextBlock))
 
   return {
     kind: 'ready',
@@ -797,7 +820,8 @@ export async function prepareChatTurn(input: ExecuteChatTurnInput): Promise<Prep
     lifecycleRunId,
     agentForSession,
     mission,
-    missionContextBlock: missionContextBlock || undefined,
+    executionBrief,
+    executionBriefContextBlock: executionBriefContextBlock || undefined,
     extensionsForRun,
     effectiveMessage,
     providerType,

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

@@ -74,7 +74,8 @@ export async function executePreparedChatTurn(params: {
     resolvedImagePath,
     heartbeatLightContext,
     isAutoRunNoHistory,
-    missionContextBlock,
+    executionBrief,
+    executionBriefContextBlock,
   } = prepared
 
   const emit = partialPersistence.emit
@@ -144,7 +145,8 @@ export async function executePreparedChatTurn(params: {
         attachedFiles,
         apiKey,
         systemPrompt,
-        extraSystemContext: missionContextBlock ? [missionContextBlock] : undefined,
+        executionBrief,
+        extraSystemContext: [executionBriefContextBlock].filter((value): value is string => typeof value === 'string' && value.trim().length > 0),
         write: (raw) => parseAndEmit(raw),
         history: heartbeatHistory ?? applyContextClearBoundary(getSessionMessages(sessionId)),
         signal: abortController.signal,