@swarmclawai/swarmclaw 1.2.4 → 1.2.6

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,

package/src/lib/server/chat-execution/chat-turn-tool-routing.test.ts

@@ -439,6 +439,51 @@ describe('chat-turn-tool-routing', () => {
     assert.equal(result.calledNames.has('memory_search'), true)
   })
 
+  it('uses classifier-backed memory list fallback for broad memory inventory requests', async () => {
+    const invocations: Array<{ toolName: string; args: Record<string, unknown> }> = []
+    const result = await runPostLlmToolRouting({
+      session: {
+        cwd: process.cwd(),
+        tools: ['memory'],
+      },
+      sessionId: 'session-memory-list',
+      message: 'List everything you remember about me.',
+      effectiveMessage: 'List everything you remember about me.',
+      enabledExtensions: ['memory'],
+      toolPolicy: resolveSessionToolPolicy(['memory'], {}),
+      appSettings: {},
+      internal: false,
+      source: 'chat',
+      toolEvents: [],
+      emit: () => {},
+    }, '', undefined, {
+      classifyDirectMemoryIntent: async () => ({
+        action: 'list',
+        confidence: 0.91,
+      }),
+      invokeTool: async (_ctx, toolName, args, _failurePrefix, calledNames) => {
+        invocations.push({ toolName, args })
+        calledNames.add(toolName)
+        return {
+          invoked: true,
+          responseOverride: null,
+          toolOutputText: '[mem_1] favorite editor: Neovim\n[mem_2] timezone: Europe/Isle_of_Man',
+        }
+      },
+    })
+
+    assert.equal(invocations.length, 1)
+    assert.equal(invocations[0].toolName, 'memory_tool')
+    assert.deepEqual(invocations[0].args, {
+      action: 'list',
+      key: '',
+      scope: 'auto',
+    })
+    assert.equal(result.fullResponse, '[mem_1] favorite editor: Neovim\n[mem_2] timezone: Europe/Isle_of_Man')
+    assert.equal(result.errorMessage, undefined)
+    assert.equal(result.calledNames.has('memory_tool'), true)
+  })
+
   it('fails open when post-LLM memory classification times out', async () => {
     let invoked = false
     const started = Date.now()

package/src/lib/server/chat-execution/chat-turn-tool-routing.ts

@@ -22,6 +22,7 @@ import { log } from '@/lib/server/logger'
 import { rankDelegatesByHealth } from '@/lib/server/provider-health'
 import { routeTaskIntent, type CapabilityRoutingDecision } from '@/lib/server/capability-router'
 import { canonicalizeExtensionId, extensionIdMatches } from '@/lib/server/tool-aliases'
+import { classifyMessage, type MessageClassification } from '@/lib/server/chat-execution/message-classifier'
 import {
   buildDirectMemoryRecallResponse,
   classifyDirectMemoryIntent,
@@ -37,7 +38,6 @@ import {
   findFirstUrl,
   hasToolEnabled,
   hasDirectLocalCodingTools,
-  isMemoryListIntent,
   requestedToolNamesFromMessage,
   translateRequestedToolInvocation,
 } from '@/lib/server/chat-execution/chat-execution-utils'
@@ -61,6 +61,7 @@ export interface ToolRoutingContext {
   source: string
   toolEvents: MessageToolEvent[]
   emit: (ev: SSEEvent) => void
+  classification?: MessageClassification | null
 }
 
 export interface ToolRoutingResult {
@@ -126,6 +127,16 @@ async function resolveDirectMemoryIntentWithTimeout(
   }
 }
 
+async function resolveTurnClassification(ctx: ToolRoutingContext): Promise<MessageClassification | null> {
+  if (ctx.classification !== undefined) return ctx.classification ?? null
+  if (ctx.internal || ctx.source !== 'chat') return null
+  return classifyMessage({
+    sessionId: ctx.sessionId,
+    agentId: ctx.session.agentId || null,
+    message: ctx.message,
+  }).catch(() => null)
+}
+
 export async function runExclusiveDirectMemoryPreflight(
   ctx: ToolRoutingContext,
   hooks?: ToolRoutingHooks,
@@ -148,14 +159,18 @@ export async function runExclusiveDirectMemoryPreflight(
     ? 'memory_store'
     : directMemoryIntent.action === 'update'
       ? 'memory_update'
-      : 'memory_search'
+      : directMemoryIntent.action === 'list'
+        ? 'memory_tool'
+        : 'memory_search'
 
   const args: Record<string, unknown> = directMemoryIntent.action === 'recall'
     ? { query: directMemoryIntent.query, scope: 'auto' }
-    : {
-        value: directMemoryIntent.value,
-        ...(directMemoryIntent.title ? { title: directMemoryIntent.title } : {}),
-      }
+    : directMemoryIntent.action === 'list'
+      ? { action: 'list', key: '', scope: 'auto' }
+      : {
+          value: directMemoryIntent.value,
+          ...(directMemoryIntent.title ? { title: directMemoryIntent.title } : {}),
+        }
 
   const result = await invokeTool(
     ctx,
@@ -192,6 +207,15 @@ export async function runExclusiveDirectMemoryPreflight(
     }
   }
 
+  if (directMemoryIntent.action === 'list') {
+    return {
+      calledNames,
+      fullResponse: String(result.toolOutputText || '').trim() || 'No memories found.',
+      errorMessage: undefined,
+      missedRequestedTools: [],
+    }
+  }
+
   if (directMemoryIntent.action === 'recall') {
     const recallResponse = result.toolOutputText
       ? buildDirectMemoryRecallResponse(directMemoryIntent, result.toolOutputText)
@@ -494,12 +518,13 @@ export async function runPostLlmToolRouting(
   const unavailableRequestedTools = new Map<string, string>()
   let fullResponse = currentResponse
   let errorMessage = currentError
+  const classification = await resolveTurnClassification(ctx)
 
   const requestedToolNames = (!ctx.internal && ctx.source === 'chat')
     ? requestedToolNamesFromMessage(ctx.message)
     : []
   const routingDecision: CapabilityRoutingDecision | null = (!ctx.internal && ctx.source === 'chat')
-    ? routeTaskIntent(ctx.message, ctx.enabledExtensions, ctx.appSettings)
+    ? routeTaskIntent(ctx.message, ctx.enabledExtensions, ctx.appSettings, classification)
     : null
 
   // --- Forced connector_message_tool ---
@@ -609,6 +634,22 @@ export async function runPostLlmToolRouting(
     }
   }
 
+  if (directMemoryIntent?.action === 'list') {
+    const result = await invokeTool(
+      ctx,
+      'memory_tool',
+      { action: 'list', key: '', scope: 'auto' },
+      'Forced memory list invocation failed',
+      calledNames,
+    )
+    if (result.blockedReason) policyBlockedTools.set('memory_tool', result.blockedReason)
+    if (result.unavailableReason) unavailableRequestedTools.set('memory_tool', result.unavailableReason)
+    if (result.invoked) {
+      fullResponse = String(result.toolOutputText || '').trim() || 'No memories found.'
+      errorMessage = undefined
+    }
+  }
+
   // --- Auto-delegation for coding intent ---
   const hasDelegationCall = FORCED_DELEGATION_TOOLS.some((t) => calledNames.has(t))
   const enabledDelegates = enabledDelegationTools(ctx.session)
@@ -690,16 +731,6 @@ export async function runPostLlmToolRouting(
     }
   }
 
-  if (canAutoRoute && calledNames.size === 0 && hasToolEnabled(ctx.session, 'memory') && isMemoryListIntent(ctx.message)) {
-    const result = await invokeTool(
-      ctx, 'memory_tool',
-      { action: 'list', key: '', scope: 'auto' },
-      'Auto memory listing failed',
-      calledNames,
-    )
-    if (result.responseOverride) fullResponse = result.responseOverride
-  }
-
   const explicitArtifactTarget = extractExplicitArtifactTarget(ctx.message)
   const canAutoSaveArtifact = (!ctx.internal && ctx.source === 'chat')
     && !!explicitArtifactTarget

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

@@ -42,6 +42,8 @@ export interface ContinuationContext {
   sessionExtensions: string[]
   isConnectorSession: boolean
   isCoordinatorAgent: boolean
+  delegationEnabled: boolean
+  delegationPreferenceActive: boolean
   history: Message[]
   session: { cwd: string }
   write: (data: string) => void
@@ -279,6 +281,7 @@ function checkAttachmentFollowthrough(ctx: ContinuationContext): ContinuationDec
     enabledExtensions: ctx.sessionExtensions,
     hasToolCalls: ctx.state.hasToolCalls,
     hasAttachmentContext: ctx.hasAttachmentContext,
+    classification: ctx.classification,
   })) return null
   const count = ctx.limits.increment('attachment_followthrough')
   const { max } = ctx.limits.getStatus('attachment_followthrough')
@@ -335,7 +338,7 @@ function checkToolErrorFollowthrough(ctx: ContinuationContext): ContinuationDeci
 }
 
 function checkCoordinatorDelegation(ctx: ContinuationContext): ContinuationDecision | null {
-  if (!ctx.isCoordinatorAgent) return null
+  if (!ctx.delegationEnabled || !ctx.delegationPreferenceActive) return null
   if (!ctx.limits.canContinue('coordinator_delegation_nudge')) return null
   // Skip if already delegated
   const delegationTools = ['spawn_subagent', 'manage_protocols']

package/src/lib/server/chat-execution/direct-memory-intent.test.ts

@@ -46,6 +46,15 @@ describe('direct-memory-intent', () => {
     })
   })
 
+  it('parses a list classification payload', () => {
+    const parsed = parseDirectMemoryIntentResponse('{"action":"list","confidence":0.84}')
+
+    assert.deepEqual(parsed, {
+      action: 'list',
+      confidence: 0.84,
+    })
+  })
+
   it('parses exclusive completion for pure memory turns', () => {
     const parsed = parseDirectMemoryIntentResponse('{"action":"store","confidence":0.98,"title":"Launch marker","value":"My launch marker is ALPHA-9","acknowledgement":"I\\u2019ll remember that.","exclusiveCompletion":true}')