@swarmclawai/swarmclaw 1.2.6 → 1.2.9

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

@@ -13,7 +13,6 @@ import {
 import { getExtensionManager } from '@/lib/server/extensions'
 import {
   getEnabledToolPlanningView,
-  getFirstToolForCapability,
   getToolsForCapability,
   TOOL_CAPABILITY,
 } from '@/lib/server/tool-planning'
@@ -23,7 +22,6 @@ import { routeTaskIntent } from '@/lib/server/capability-router'
 import type { MessageClassification } from '@/lib/server/chat-execution/message-classifier'
 import {
   isBroadGoal as classifiedIsBroadGoal,
-  hasWalletIntent as classifiedHasWalletIntent,
   isDeliverableTask as classifiedIsDeliverableTask,
 } from '@/lib/server/chat-execution/message-classifier'
 import { isCurrentThreadRecallRequest } from '@/lib/server/memory/memory-policy'
@@ -75,7 +73,6 @@ function buildExtensionCapabilityLines(enabledExtensions: string[], opts?: { del
 
 const DISPLAY_TOOL_ALIASES: Record<string, string[]> = {
   files: ['send_file'],
-  shell: ['sandbox_exec', 'sandbox_list_runtimes'],
 }
 
 function buildExactToolNameList(enabledExtensions: string[]): string[] {
@@ -113,7 +110,6 @@ export function buildToolDisciplineLines(enabledExtensions: string[]): string[]
   const planning = getEnabledToolPlanningView(enabledExtensions)
   const uniqueTools = buildExactToolNameList(enabledExtensions)
   if (uniqueTools.length === 0) return []
-  const walletTools = getToolsForCapability(enabledExtensions, TOOL_CAPABILITY.walletInspect)
   const httpTools = getToolsForCapability(enabledExtensions, 'network.http')
 
   const lines = [
@@ -158,16 +154,13 @@ export function buildToolDisciplineLines(enabledExtensions: string[]): string[]
     ...(researchSearchTools.length || researchFetchTools.length ? [...researchSearchTools, ...researchFetchTools] : []),
     ...httpTools,
     ...(uniqueTools.includes('shell') ? ['shell'] : []),
+    ...(uniqueTools.includes('execute') ? ['execute'] : []),
     ...(uniqueTools.includes('browser') ? ['browser'] : []),
   ]))
   if (alternateResearchTools.length >= 2) {
     lines.push(`If one research path is blocked, try another (${alternateResearchTools.map((toolName) => `\`${toolName}\``).join(', ')}) before giving up.`)
   }
 
-  if (walletTools.length && (uniqueTools.includes('browser') || httpTools.length > 0)) {
-    lines.push(`For wallet/trading tasks, inspect the wallet first with \`${walletTools[0]}\`. Use a bounded loop: verify, attempt one reversible step, then execute or state the blocker.`)
-  }
-
   if (uniqueTools.includes('manage_secrets')) {
     lines.push('Store secrets (passwords, API keys, tokens) with `manage_secrets` — never echo raw values in assistant text.')
   }
@@ -211,25 +204,6 @@ export function shouldForceAttachmentFollowthrough(params: {
   return decision.preferredTools.some((toolName) => extensionIdMatches(params.enabledExtensions, toolName))
 }
 
-export function buildExternalWalletExecutionBlock(enabledExtensions: string[]): string {
-  const hasExecutionContext = Boolean(
-    getFirstToolForCapability(enabledExtensions, TOOL_CAPABILITY.walletInspect)
-    || getFirstToolForCapability(enabledExtensions, 'network.http')
-    || getEnabledDisplayTool(enabledExtensions, 'browser')
-    || getEnabledDisplayTool(enabledExtensions, 'manage_capabilities'),
-  )
-  if (!hasExecutionContext) return ''
-  const lines = [
-    '## External Service Execution',
-    'Define a stop condition before exploring: either complete one concrete reversible action, or identify the exact blocker with evidence.',
-    'A prose sentence saying approval is needed is not enough. When the next step is a wallet signature or transaction, trigger the actual wallet approval request through the tool.',
-    'After one or two discovery bursts, stop exploring and summarize the blocker if execution still depends on a missing capability such as injected wallet signing, external credentials, or unavailable approvals.',
-    'Do not mutate already confirmed identifiers unless newer tool evidence proves the earlier value was wrong.',
-    'Never claim success on a trading or dApp task unless you either completed the reversible step with tool evidence or clearly stated the final missing step.',
-  ]
-  return lines.join('\n')
-}
-
 export async function buildForcedExternalServiceSummary(params: {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   llm: { invoke: (messages: any[]) => Promise<{ content: unknown }> }
@@ -330,6 +304,7 @@ export function buildAgenticExecutionPolicy(opts: {
   const hasManageSessions = opts.enabledExtensions.some((toolId) => (canonicalizeExtensionId(toolId) || toolId) === 'manage_sessions')
   const hasManageTasks = opts.enabledExtensions.some((toolId) => (canonicalizeExtensionId(toolId) || toolId) === 'manage_tasks')
   const hasManageSkills = opts.enabledExtensions.some((toolId) => (canonicalizeExtensionId(toolId) || toolId) === 'manage_skills')
+  const lightweightDirectChat = opts.classification?.isLightweightDirectChat === true && !opts.isDirectConnectorSession
   const hasDelegationTools = opts.enabledExtensions.some((toolId) => {
     const canonical = canonicalizeExtensionId(toolId) || toolId
     return canonical === 'delegate' || canonical === 'spawn_subagent'
@@ -359,6 +334,15 @@ export function buildAgenticExecutionPolicy(opts: {
       : 'Loop: BOUNDED — execute multiple steps but finish within recursion budget.',
   )
 
+  if (lightweightDirectChat) {
+    parts.push(
+      '## Lightweight Chat',
+      'This turn is a lightweight direct chat. Reply naturally and briefly.',
+      'Do not delegate, create tasks, outline a workflow, or narrate tools unless the user adds a concrete task that actually requires that escalation.',
+      'For greetings, acknowledgements, and simple social questions, a short human-sounding answer is sufficient.',
+    )
+  }
+
   if (hasTooling) {
     parts.push(
       '## Routing Matrix',
@@ -444,6 +428,9 @@ export function buildAgenticExecutionPolicy(opts: {
     ]),
     'Keep responses concise. Bullet points over prose. After file operations, confirm the result briefly (path and status) without echoing the full file contents.',
     'Do not end every reply with a question. Only ask when a specific missing detail blocks progress. When a task is done, state the result and stop.',
+    ...(lightweightDirectChat
+      ? ['For this turn, prefer 1-3 short sentences over bullets, planning, or process narration.']
+      : []),
     opts.responseStyle === 'concise'
       ? `IMPORTANT: Be extremely concise.${opts.responseMaxChars ? ` Keep responses under ${opts.responseMaxChars} characters.` : ' Target under 500 characters.'} Lead with the answer, skip preamble.`
       : opts.responseStyle === 'detailed'
@@ -458,10 +445,6 @@ export function buildAgenticExecutionPolicy(opts: {
   // Situational blocks — skipped in minimal mode
   if (!isMinimal) {
     if (opts.userMessage && classifiedIsBroadGoal(opts.classification ?? null, opts.userMessage)) parts.push(GOAL_DECOMPOSITION_BLOCK)
-    if (opts.userMessage && classifiedHasWalletIntent(opts.classification ?? null, opts.userMessage)) {
-      const externalExecutionBlock = buildExternalWalletExecutionBlock(opts.enabledExtensions)
-      if (externalExecutionBlock) parts.push(externalExecutionBlock)
-    }
     if (opts.userMessage && classifiedIsDeliverableTask(opts.classification ?? null, opts.userMessage) && opts.enabledExtensions.some((toolId) => toolId === 'files' || toolId === 'edit_file')) {
       parts.push(OPEN_ENDED_REVISION_BLOCK)
     }

package/src/lib/server/chat-execution/prompt-mode.test.ts

@@ -0,0 +1,24 @@
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+
+import { resolvePromptMode } from '@/lib/server/chat-execution/prompt-mode'
+
+describe('resolvePromptMode', () => {
+  it('returns full for root sessions by default', () => {
+    assert.equal(resolvePromptMode({ id: 'root' } as never), 'full')
+  })
+
+  it('prefers minimal mode for lightweight direct-chat turns', () => {
+    assert.equal(
+      resolvePromptMode({ id: 'root' } as never, { preferMinimalPrompt: true }),
+      'minimal',
+    )
+  })
+
+  it('keeps delegated child sessions in minimal mode', () => {
+    assert.equal(
+      resolvePromptMode({ id: 'child', parentSessionId: 'parent' } as never, { preferMinimalPrompt: false }),
+      'minimal',
+    )
+  })
+})

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

@@ -20,7 +20,11 @@ export type PromptMode = 'full' | 'minimal' | 'none'
  *   proactive memory, thinking guidance
  * - `none` — reserved for bare identity (light heartbeat path)
  */
-export function resolvePromptMode(session: Session): PromptMode {
+export function resolvePromptMode(
+  session: Session,
+  options?: { preferMinimalPrompt?: boolean },
+): PromptMode {
   if (session.parentSessionId) return 'minimal'
+  if (options?.preferMinimalPrompt) return 'minimal'
   return 'full'
 }

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

@@ -310,7 +310,6 @@ export async function buildSituationalSection(
     return buildSituationalAwarenessBlock({
       agentId: session.agentId,
       sessionId: session.id,
-      missionId: session.missionId || null,
     }) || null
   } catch { return null }
 }

package/src/lib/server/chat-execution/situational-awareness.test.ts

@@ -5,12 +5,12 @@ import {
   timeAgo,
   type SituationalAwarenessData,
 } from '@/lib/server/chat-execution/situational-awareness'
-import type { BoardTask, Mission, Schedule, SupervisorIncident, SessionRunRecord } from '@/types'
+import type { BoardTask, Schedule, SupervisorIncident, SessionRunRecord } from '@/types'
 
 const NOW = 1_710_500_000_000 // fixed timestamp for deterministic tests
 
 function emptyData(): SituationalAwarenessData {
-  return { tasks: [], schedules: [], failedRuns: [], incidents: [], mission: null, now: NOW }
+  return { tasks: [], schedules: [], failedRuns: [], incidents: [], now: NOW }
 }
 
 function makeTask(overrides: Partial<BoardTask> & { id: string; title: string; status: string; agentId: string }): BoardTask {
@@ -192,58 +192,6 @@ describe('formatSituationalAwareness', () => {
     assert.equal(failureLines.length, 2)
   })
 
-  it('builds mission section for active mission', () => {
-    const data = emptyData()
-    data.mission = {
-      id: 'm1',
-      source: 'user' as const,
-      objective: 'Implement user auth flow',
-      status: 'active',
-      phase: 'dispatching',
-      createdAt: NOW,
-      updatedAt: NOW,
-    } as unknown as Mission
-
-    const result = formatSituationalAwareness(data)
-
-    assert.ok(result.includes('### Current Mission'))
-    assert.ok(result.includes('Implement user auth flow'))
-    assert.ok(result.includes('Status: active'))
-    assert.ok(result.includes('Phase: dispatching'))
-  })
-
-  it('omits mission section for completed missions', () => {
-    const data = emptyData()
-    data.mission = {
-      id: 'm1',
-      source: 'user' as const,
-      objective: 'Done task',
-      status: 'completed',
-      phase: 'completed',
-      createdAt: NOW,
-      updatedAt: NOW,
-    } as unknown as Mission
-
-    const result = formatSituationalAwareness(data)
-    assert.ok(!result.includes('### Current Mission'))
-  })
-
-  it('omits mission section for failed missions', () => {
-    const data = emptyData()
-    data.mission = {
-      id: 'm1',
-      source: 'user' as const,
-      objective: 'Failed task',
-      status: 'failed',
-      phase: 'failed',
-      createdAt: NOW,
-      updatedAt: NOW,
-    } as unknown as Mission
-
-    const result = formatSituationalAwareness(data)
-    assert.ok(!result.includes('### Current Mission'))
-  })
-
   it('produces all sections within token budget', () => {
     const data = emptyData()
     for (let i = 0; i < 5; i++) {
@@ -265,15 +213,6 @@ describe('formatSituationalAwareness', () => {
       }))
     }
     data.failedRuns.push(makeRun({ id: 'r1', sessionId: 'sess-1', endedAt: NOW - 3_600_000, error: 'Test failure' }))
-    data.mission = {
-      id: 'm1',
-      source: 'user' as const,
-      objective: 'Test mission objective',
-      status: 'active',
-      phase: 'executing',
-      createdAt: NOW,
-      updatedAt: NOW,
-    } as unknown as Mission
 
     const result = formatSituationalAwareness(data)
 
@@ -281,7 +220,6 @@ describe('formatSituationalAwareness', () => {
     assert.ok(result.includes('### Active Tasks'))
     assert.ok(result.includes('### Recent Failures'))
     assert.ok(result.includes('### My Schedule'))
-    assert.ok(result.includes('### Current Mission'))
     assert.ok(result.length <= 3200, `Block is ${result.length} chars, should be <= 3200`)
   })
 
@@ -299,15 +237,6 @@ describe('formatSituationalAwareness', () => {
     for (let i = 0; i < 3; i++) {
       data.schedules.push(makeSchedule({ id: `s${i}`, name: 'S'.repeat(60), agentId: 'a1', nextRunAt: NOW + 3_600_000, frequency: 'daily' }))
     }
-    data.mission = {
-      id: 'm1',
-      source: 'user' as const,
-      objective: 'O'.repeat(100),
-      status: 'active',
-      phase: 'executing',
-      createdAt: NOW,
-      updatedAt: NOW,
-    } as unknown as Mission
 
     const result = formatSituationalAwareness(data)
 

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

@@ -2,17 +2,15 @@ import { listAgentIncidents } from '@/lib/server/autonomy/supervisor-incident-re
 import { listAgents } from '@/lib/server/agents/agent-repository'
 import { loadChatrooms } from '@/lib/server/chatrooms/chatroom-repository'
 import { loadConnectors } from '@/lib/server/connectors/connector-repository'
-import { loadMission } from '@/lib/server/missions/mission-repository'
 import { loadSchedules } from '@/lib/server/schedules/schedule-repository'
 import { loadTasks } from '@/lib/server/tasks/task-repository'
 import { loadUsage } from '@/lib/server/usage/usage-repository'
 import { listPersistedRuns } from '@/lib/server/runtime/run-ledger'
-import type { BoardTask, Mission, Schedule, SupervisorIncident, SessionRunRecord } from '@/types'
+import type { BoardTask, Schedule, SupervisorIncident, SessionRunRecord } from '@/types'
 
 export interface SituationalAwarenessInput {
   agentId: string
   sessionId: string
-  missionId?: string | null
 }
 
 /** Pre-loaded data passed to the pure formatter. Exported for testing. */
@@ -21,7 +19,6 @@ export interface SituationalAwarenessData {
   schedules: Schedule[]
   failedRuns: SessionRunRecord[]
   incidents: SupervisorIncident[]
-  mission: Mission | null
   now: number
 }
 
@@ -170,33 +167,11 @@ function buildFailuresSection(failures: FailureEntry[], now: number): string | n
   return lines.join('\n')
 }
 
-export function buildGoalAncestrySection(missionId: string | null | undefined): string | null {
-  if (!missionId) return null
-  const chain: string[] = []
-  let currentId: string | null = missionId
-  const visited = new Set<string>()
-  while (currentId && chain.length < 10) {
-    if (visited.has(currentId)) break
-    visited.add(currentId)
-    const mission = loadMission(currentId)
-    if (!mission) break
-    chain.unshift(mission.objective.slice(0, 80))
-    currentId = mission.parentMissionId || null
-  }
-  if (chain.length <= 1) return null
-  return `### Goal Ancestry\n${chain.map((obj, i) => `${'  '.repeat(i)}${i === chain.length - 1 ? '→' : '↓'} ${obj}`).join('\n')}`
-}
-
-function buildMissionSection(mission: Mission | null): string | null {
-  if (!mission) return null
-  if (mission.status === 'completed' || mission.status === 'failed' || mission.status === 'cancelled') return null
-  return `### Current Mission\nObjective: ${mission.objective.slice(0, 100)} | Status: ${mission.status} | Phase: ${mission.phase}`
-}
 
 // --- pure formatter (testable) ---
 
 export function formatSituationalAwareness(data: SituationalAwarenessData): string {
-  const { tasks, schedules, failedRuns, incidents, mission, now } = data
+  const { tasks, schedules, failedRuns, incidents, now } = data
 
   const filteredTasks = tasks
     .filter((t) => ACTIVE_TASK_STATUSES.has(t.status))
@@ -245,13 +220,6 @@ export function formatSituationalAwareness(data: SituationalAwarenessData): stri
     charCount += schedulesSection.length
   }
 
-  // Priority 4: Mission
-  const missionSection = buildMissionSection(mission)
-  if (missionSection && charCount + missionSection.length + header.length < MAX_CHARS) {
-    sections.push(missionSection)
-    charCount += missionSection.length
-  }
-
   if (sections.length === 0) return ''
 
   return [header, ...sections].join('\n\n')
@@ -343,7 +311,7 @@ function computeTodaySpend(sinceTs: number): number {
 // --- main builder (loads data, calls formatter) ---
 
 export function buildSituationalAwarenessBlock(input: SituationalAwarenessInput): string {
-  const { agentId, sessionId, missionId } = input
+  const { agentId, sessionId } = input
   const now = Date.now()
 
   const allTasks = loadTasks() as Record<string, BoardTask>
@@ -356,7 +324,5 @@ export function buildSituationalAwarenessBlock(input: SituationalAwarenessInput)
 
   const incidents = listAgentIncidents(agentId)
 
-  const mission = missionId ? loadMission(missionId) : null
-
-  return formatSituationalAwareness({ tasks, schedules, failedRuns, incidents, mission, now })
+  return formatSituationalAwareness({ tasks, schedules, failedRuns, incidents, now })
 }

package/src/lib/server/chat-execution/stream-agent-chat.test.ts

@@ -6,10 +6,8 @@ import type { MessageToolEvent } from '@/types'
 import { buildSuccessfulMemoryMutationResponse } from '@/lib/server/chat-execution/memory-mutation-tools'
 import {
   buildToolAvailabilityLines,
-  buildExternalWalletExecutionBlock,
   buildToolDisciplineLines,
   getExplicitRequiredToolNames,
-  isWalletSimulationResult,
   looksLikeOpenEndedDeliverableTask,
   pruneIncompleteToolEvents,
   resolveExclusiveMemoryWriteTerminalAllowance,
@@ -35,8 +33,6 @@ import {
   parseClassificationResponse,
   isDeliverableTask,
   isBroadGoal,
-  hasWalletIntent,
-  hasTransactionalWalletIntent,
   hasHumanSignals,
   hasSignificantEvent,
   isResearchSynthesis,
@@ -65,14 +61,13 @@ const streamContinuationSource = _readSibling('stream-continuation.ts')
 const streamSources = `${streamAgentChatSource}\n${streamContinuationSource}`
 
 describe('buildToolDisciplineLines', () => {
-  it('lists exact callable tool names for extension families like sandbox and browser', () => {
+  it('lists exact callable tool names for legacy sandbox aliases and browser', () => {
     const lines = buildToolAvailabilityLines(['sandbox', 'browser', 'manage_schedules'])
 
     assert.equal(lines[0], 'Tool names are case-sensitive. Call tools exactly as listed.')
     assert.ok(lines.includes('- `browser`'))
+    assert.ok(lines.includes('- `execute`'))
     assert.ok(lines.includes('- `manage_schedules`'))
-    assert.ok(lines.includes('- `sandbox_exec`'))
-    assert.ok(lines.includes('- `sandbox_list_runtimes`'))
   })
 
   it('tells the agent to use direct platform tools when manage_platform is absent', () => {
@@ -123,14 +118,6 @@ describe('buildToolDisciplineLines', () => {
     assert.ok(lines.some((line) => line.includes('Store secrets (passwords, API keys, tokens) with `manage_secrets`')))
   })
 
-  it('adds bounded execution guidance for wallet-connected external-service tasks', () => {
-    const lines = buildToolDisciplineLines(['wallet', 'browser', 'http_request', 'manage_capabilities'])
-
-    assert.ok(lines.some((line) => line.includes('inspect the wallet first with `wallet_tool`')))
-    assert.ok(lines.some((line) => line.includes('Use a bounded loop: verify, attempt one reversible step, then execute or state the blocker.')))
-    assert.ok(lines.some((line) => line.includes('stop venue-shopping') && line.includes('call_contract')))
-  })
-
   it('includes concrete local coding tool guidance when coding tools are already available', () => {
     const lines = buildToolDisciplineLines(['files', 'shell', 'delegate'])
 
@@ -174,14 +161,6 @@ describe('buildToolDisciplineLines', () => {
     assert.deepEqual(required, [])
   })
 
-  it('does not force wallet tools based on keyword matching', () => {
-    const required = getExplicitRequiredToolNames(
-      'Use the available wallets and figure out how to trade on Hyperliquid.',
-      ['wallet', 'browser', 'http_request'],
-    )
-    assert.deepEqual(required, [])
-  })
-
   it('treats explicit curl or terminal execution requests as shell requirements when shell is enabled', () => {
     const required = getExplicitRequiredToolNames(
       'Yeah, do the curl. Curl request.',
@@ -292,41 +271,6 @@ describe('buildToolDisciplineLines', () => {
   })
 })
 
-describe('buildExternalWalletExecutionBlock', () => {
-  it('omits extension-specific tool names when wallet/network capabilities are unavailable', () => {
-    const block = buildExternalWalletExecutionBlock(['files'])
-
-    assert.equal(block, '')
-  })
-
-  it('uses only enabled wallet-related tools in the external execution block', () => {
-    const block = buildExternalWalletExecutionBlock(['wallet', 'http_request', 'manage_capabilities'])
-
-    assert.ok(block.includes('## External Service Execution'))
-    assert.ok(!block.includes('`browser`'))
-    assert.ok(!block.includes('`wallet_tool`'))
-    assert.ok(!block.includes('`manage_capabilities`'))
-    assert.ok(block.includes('Define a stop condition before exploring'))
-  })
-})
-
-describe('isWalletSimulationResult', () => {
-  it('detects simulated wallet transaction outputs and ignores other tool outputs', () => {
-    assert.equal(
-      isWalletSimulationResult('wallet_tool', '{"status":"simulated","action":"simulate_transaction"}'),
-      true,
-    )
-    assert.equal(
-      isWalletSimulationResult('wallet_tool', '{"status":"broadcast","action":"send_transaction"}'),
-      false,
-    )
-    assert.equal(
-      isWalletSimulationResult('http_request', '{"status":"simulated"}'),
-      false,
-    )
-  })
-})
-
 describe('shouldSkipToolSummaryForShortResponse', () => {
   it('skips forced tool-summary continuation for short responses after pure use_skill calls', () => {
     assert.equal(
@@ -766,7 +710,7 @@ describe('shouldForceExternalServiceSummary', () => {
   it('forces a summary when an external-service run ends with an unfinished exploration sentence', () => {
     assert.equal(
       shouldForceExternalServiceSummary({
-        userMessage: 'Try to trade on Hyperliquid with the available wallet and stop at the blocker.',
+        userMessage: 'Try to interact with the Hyperliquid API and stop at the blocker.',
         finalResponse: 'This is promising - Hyperliquid runs on Arbitrum! Let me verify this and check if I can access their interface:',
         hasToolCalls: true,
         toolEventCount: 6,
@@ -778,8 +722,8 @@ describe('shouldForceExternalServiceSummary', () => {
   it('does not force a summary when the final response already states the blocker', () => {
     assert.equal(
       shouldForceExternalServiceSummary({
-        userMessage: 'Try to trade on Hyperliquid with the available wallet and stop at the blocker.',
-        finalResponse: 'Last reversible step: I verified the funded Arbitrum wallet and opened the site. Exact blocker: this runtime cannot complete a WalletConnect signature prompt.',
+        userMessage: 'Try to interact with the Hyperliquid API and stop at the blocker.',
+        finalResponse: 'Last reversible step: I verified the funded Arbitrum account and opened the site. Exact blocker: this runtime cannot complete a signature prompt.',
         hasToolCalls: true,
         toolEventCount: 6,
       }),
@@ -790,7 +734,6 @@ describe('shouldForceExternalServiceSummary', () => {
 
 describe('shouldForceExternalExecutionFollowthrough', () => {
   const researchToolEvents = [
-    { name: 'wallet_tool', input: '{"action":"balance","chain":"ethereum"}', output: '{"status":"ok"}' },
     { name: 'http_request', input: '{"method":"GET","url":"https://example.com/quote"}', output: '{"status":200}' },
     { name: 'web', input: '{"action":"open","url":"https://example.com/swap"}', output: '{"status":"ok"}' },
     { name: 'browser', input: '{"action":"read_page"}', output: '{"title":"Swap"}' },
@@ -827,7 +770,6 @@ describe('shouldForceExternalExecutionFollowthrough', () => {
         finalResponse: 'Let me try another aggregator before proceeding.',
         hasToolCalls: true,
         toolEvents: [
-          { name: 'wallet_tool', input: '{"action":"balance","chain":"ethereum"}', output: '{"status":"ok"}' },
           { name: 'http_request', input: '{"method":"GET","url":"https://api.0x.org/swap/v1/quote"}', output: '{"status":404}' },
           { name: 'http_request', input: '{"method":"GET","url":"https://apiv5.paraswap.io/prices"}', output: '{"status":400}' },
           { name: 'http_request', input: '{"method":"POST","url":"https://api.odos.xyz/sor/quote/v2"}', output: '{"status":200}' },
@@ -837,31 +779,13 @@ describe('shouldForceExternalExecutionFollowthrough', () => {
     )
   })
 
-  it('does not force a followthrough after a wallet approval boundary is reached', () => {
-    assert.equal(
-      shouldForceExternalExecutionFollowthrough({
-        userMessage: 'Do one tiny live swap on Arbitrum and stop at the first approval boundary.',
-        finalResponse: 'Current status: approval required for the exact-input token approval.',
-        hasToolCalls: true,
-        toolEvents: [
-          ...researchToolEvents,
-          {
-            name: 'wallet_tool',
-            input: '{"action":"send_transaction","chain":"ethereum"}',
-            output: '{"type":"extension_wallet_action_request","status":"pending"}',
-          },
-        ],
-      }),
-      false,
-    )
-  })
 })
 
 describe('shouldForceExternalExecutionKickoffFollowthrough', () => {
   it('forces a bounded continuation when an execution task stops at an intent-only kickoff', () => {
     assert.equal(
       shouldForceExternalExecutionKickoffFollowthrough({
-        userMessage: 'Try buy one NFT on Arbitrum and show me what happened.',
+        userMessage: 'Try to interact with the NFT marketplace API and show me what happened.',
         finalResponse: 'Let me try to interact directly with the NFT contract and see if I can mint one:',
         hasToolCalls: false,
         toolEvents: [],
@@ -873,8 +797,8 @@ describe('shouldForceExternalExecutionKickoffFollowthrough', () => {
   it('does not force kickoff when the model already surfaced a real blocker or asked a blocking question', () => {
     assert.equal(
       shouldForceExternalExecutionKickoffFollowthrough({
-        userMessage: 'Try buy one NFT on Arbitrum and show me what happened.',
-        finalResponse: 'Exact blocker: this wallet cannot complete the required signature in the current runtime.',
+        userMessage: 'Try to interact with the NFT marketplace API and show me what happened.',
+        finalResponse: 'Exact blocker: this runtime cannot complete the required signature step.',
         hasToolCalls: false,
         toolEvents: [],
       }),
@@ -882,7 +806,7 @@ describe('shouldForceExternalExecutionKickoffFollowthrough', () => {
     )
     assert.equal(
       shouldForceExternalExecutionKickoffFollowthrough({
-        userMessage: 'Try buy one NFT on Arbitrum and show me what happened.',
+        userMessage: 'Try to interact with the NFT marketplace API and show me what happened.',
         finalResponse: 'Which collection do you want me to target?',
         hasToolCalls: false,
         toolEvents: [],
@@ -1033,7 +957,7 @@ describe('shouldForceDeliverableFollowthrough', () => {
           { name: 'web', input: '{"action":"fetch","url":"https://example.com/topic"}', output: '<html>topic</html>' },
         ],
         history: [
-          { role: 'user', text: 'Research 3 topics, take screenshots, write markdown and PDF files, then build a site for each topic.' },
+          { role: 'user', text: 'Research 3 topics, take screenshots, write markdown and PDF files, then build a site for each topic.', time: Date.now() },
         ],
       }),
       true,
@@ -1224,7 +1148,6 @@ describe('parseClassificationResponse', () => {
     const result = parseClassificationResponse(JSON.stringify({
       isDeliverableTask: true,
       isBroadGoal: false,
-      walletIntent: 'none',
       hasHumanSignals: false,
       hasSignificantEvent: false,
       isResearchSynthesis: true,
@@ -1234,14 +1157,13 @@ describe('parseClassificationResponse', () => {
     assert.ok(result)
     assert.equal(result.isDeliverableTask, true)
     assert.equal(result.isBroadGoal, false)
-    assert.equal(result.walletIntent, 'none')
     assert.equal(result.isResearchSynthesis, true)
     assert.deepEqual(result.explicitToolRequests, ['web'])
     assert.equal(result.confidence, 0.9)
   })
 
   it('extracts JSON from markdown code block', () => {
-    const text = '```json\n{"isDeliverableTask":false,"isBroadGoal":false,"walletIntent":"none","hasHumanSignals":false,"hasSignificantEvent":false,"isResearchSynthesis":false,"explicitToolRequests":[],"confidence":0.8}\n```'
+    const text = '```json\n{"isDeliverableTask":false,"isBroadGoal":false,"hasHumanSignals":false,"hasSignificantEvent":false,"isResearchSynthesis":false,"explicitToolRequests":[],"confidence":0.8}\n```'
     const result = parseClassificationResponse(text)
     assert.ok(result)
     assert.equal(result.isDeliverableTask, false)
@@ -1258,26 +1180,13 @@ describe('parseClassificationResponse', () => {
     assert.equal(result, null)
   })
 
-  it('rejects invalid walletIntent values', () => {
-    const result = parseClassificationResponse(JSON.stringify({
-      isDeliverableTask: false,
-      isBroadGoal: false,
-      walletIntent: 'invalid',
-      hasHumanSignals: false,
-      hasSignificantEvent: false,
-      isResearchSynthesis: false,
-      explicitToolRequests: [],
-      confidence: 0.5,
-    }))
-    assert.equal(result, null)
-  })
 })
 
 describe('message classifier adapter functions', () => {
   const deliverableClassification: MessageClassification = {
+    taskIntent: 'general',
     isDeliverableTask: true,
     isBroadGoal: true,
-    walletIntent: 'none',
     hasHumanSignals: false,
     hasSignificantEvent: false,
     isResearchSynthesis: false,
@@ -1285,21 +1194,10 @@ describe('message classifier adapter functions', () => {
     confidence: 0.95,
   }
 
-  const walletClassification: MessageClassification = {
-    isDeliverableTask: false,
-    isBroadGoal: false,
-    walletIntent: 'transactional',
-    hasHumanSignals: false,
-    hasSignificantEvent: false,
-    isResearchSynthesis: false,
-    explicitToolRequests: [],
-    confidence: 0.9,
-  }
-
   const humanSignalClassification: MessageClassification = {
+    taskIntent: 'general',
     isDeliverableTask: false,
     isBroadGoal: false,
-    walletIntent: 'none',
     hasHumanSignals: true,
     hasSignificantEvent: true,
     isResearchSynthesis: false,
@@ -1324,17 +1222,6 @@ describe('message classifier adapter functions', () => {
     assert.equal(isBroadGoal({ ...deliverableClassification, isBroadGoal: false }, 'short'), false)
   })
 
-  it('hasWalletIntent uses classification', () => {
-    assert.equal(hasWalletIntent(walletClassification, 'swap ETH for USDC'), true)
-    assert.equal(hasWalletIntent({ ...walletClassification, walletIntent: 'none' }, 'swap ETH for USDC'), false)
-  })
-
-  it('hasTransactionalWalletIntent distinguishes read_only from transactional', () => {
-    assert.equal(hasTransactionalWalletIntent(walletClassification, 'anything'), true)
-    assert.equal(hasTransactionalWalletIntent({ ...walletClassification, walletIntent: 'read_only' }, 'anything'), false)
-    assert.equal(hasTransactionalWalletIntent({ ...walletClassification, walletIntent: 'none' }, 'anything'), false)
-  })
-
   it('hasHumanSignals uses classification', () => {
     assert.equal(hasHumanSignals(humanSignalClassification, 'anything'), true)
     assert.equal(hasHumanSignals({ ...humanSignalClassification, hasHumanSignals: false }, 'anything'), false)