@swarmclawai/swarmclaw 0.9.3 → 0.9.4

package/src/lib/server/agents/orchestrator-lg.ts

@@ -11,6 +11,7 @@ import { buildChatModel } from '@/lib/server/build-llm'
 import { getCheckpointSaver } from '@/lib/server/langgraph-checkpoint'
 import { buildCurrentDateTimePromptContext } from '@/lib/server/prompt-runtime-context'
 import { getPluginManager } from '@/lib/server/plugins'
+import { buildRuntimeSkillPromptBlocks, resolveRuntimeSkills } from '@/lib/server/skills/runtime-skill-resolver'
 import { buildBoardTask } from '@/lib/server/tasks/task-lifecycle'
 import '@/lib/server/builtin-plugins'
 import { genId } from '@/lib/id'
@@ -401,6 +402,7 @@ export async function executeLangGraphOrchestrator(
   taskId?: string,
 ): Promise<string> {
   const allAgents = loadAgents()
+  const orchestrationSession = loadSessions()[sessionId]
 
   // Build available agents list
   const agentIds = orchestrator.subAgentIds || []
@@ -461,14 +463,16 @@ export async function executeLangGraphOrchestrator(
   promptParts.push(buildCurrentDateTimePromptContext())
   if (orchestrator.soul) promptParts.push(orchestrator.soul)
   if (orchestrator.systemPrompt) promptParts.push(orchestrator.systemPrompt)
-  // Inject dynamic skills
-  if (orchestrator.skillIds?.length) {
-    const allSkills = loadSkills()
-    for (const skillId of orchestrator.skillIds) {
-      const skill = allSkills[skillId]
-      if (skill?.content) promptParts.push(`## Skill: ${skill.name}\n${skill.content}`)
-    }
-  }
+  try {
+    const runtimeSkills = resolveRuntimeSkills({
+      cwd: orchestrationSession?.cwd || WORKSPACE_DIR,
+      enabledPlugins: Array.isArray(orchestrator.plugins) ? orchestrator.plugins : [],
+      agentSkillIds: orchestrator.skillIds || [],
+      storedSkills: loadSkills(),
+      selectedSkillId: orchestrationSession?.skillRuntimeState?.selectedSkillId || null,
+    })
+    promptParts.push(...buildRuntimeSkillPromptBlocks(runtimeSkills))
+  } catch { /* non-critical */ }
   const basePrompt = promptParts.join('\n\n')
 
   const systemMessage = [

package/src/lib/server/agents/orchestrator.ts

@@ -7,6 +7,7 @@ import { WORKSPACE_DIR } from '@/lib/server/data-dir'
 import { loadRuntimeSettings, getLegacyOrchestratorMaxTurns } from '@/lib/server/runtime/runtime-settings'
 import { getMemoryDb } from '@/lib/server/memory/memory-db'
 import { buildCurrentDateTimePromptContext } from '@/lib/server/prompt-runtime-context'
+import { buildRuntimeSkillPromptBlocks, resolveRuntimeSkills } from '@/lib/server/skills/runtime-skill-resolver'
 import { getProvider } from '@/lib/providers'
 import type { Agent } from '@/types'
 
@@ -125,13 +126,16 @@ async function executeOrchestratorLegacy(
   promptParts.push(buildCurrentDateTimePromptContext())
   if (orchestrator.soul) promptParts.push(orchestrator.soul)
   if (orchestrator.systemPrompt) promptParts.push(orchestrator.systemPrompt)
-  if (orchestrator.skillIds?.length) {
-    const allSkills = loadSkills()
-    for (const skillId of orchestrator.skillIds) {
-      const skill = allSkills[skillId]
-      if (skill?.content) promptParts.push(`## Skill: ${skill.name}\n${skill.content}`)
-    }
-  }
+  try {
+    const runtimeSkills = resolveRuntimeSkills({
+      cwd: session.cwd,
+      enabledPlugins: Array.isArray(orchestrator.plugins) ? orchestrator.plugins : [],
+      agentSkillIds: orchestrator.skillIds || [],
+      storedSkills: loadSkills(),
+      selectedSkillId: session.skillRuntimeState?.selectedSkillId || null,
+    })
+    promptParts.push(...buildRuntimeSkillPromptBlocks(runtimeSkills))
+  } catch { /* non-critical */ }
   const basePrompt = promptParts.join('\n\n')
 
   const systemPrompt = [

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

@@ -485,26 +485,27 @@ describe('buildToolDisciplineLines advanced', () => {
     assert.ok(lines.some((line) => line.includes('Enabled tools')))
   })
 
-  it('includes schedule guidance when manage_schedules is enabled', () => {
+  it('includes direct platform guidance when manage_schedules is enabled without manage_platform', () => {
     const lines = buildToolDisciplineLines(['manage_schedules'])
-    assert.ok(lines.some((line) => line.includes('reuse or update matching agent-created schedules')))
+    assert.ok(lines.some((line) => line.includes('Use direct platform tools exactly as named (`manage_schedules`)')))
+    assert.ok(lines.some((line) => line.includes('Do not substitute `manage_platform` unless it is explicitly enabled.')))
   })
 
-  it('includes delegate local-first guidance when coding tools and delegate enabled', () => {
+  it('includes local files and shell guidance when coding tools and delegate enabled', () => {
     const lines = buildToolDisciplineLines(['delegate', 'shell', 'files'])
-    assert.ok(lines.some((line) => line.includes('prefer using them directly for straightforward coding')))
+    assert.ok(lines.some((line) => line.includes('{"action":"read","filePath":"path/to/file.md"}')))
+    assert.ok(lines.some((line) => line.includes('For `shell`, use `{"action":"execute","command":"..."}`')))
   })
 
-  it('tells research-capable agents to try another enabled acquisition path before manual fallback', () => {
+  it('tells research-capable agents to try another enabled acquisition path before giving up', () => {
     const lines = buildToolDisciplineLines(['web_search', 'web_fetch', 'http_request', 'shell'])
-    assert.ok(lines.some((line) => line.includes('try one other enabled acquisition path') && line.includes('`shell`') && line.includes('`http_request`')))
+    assert.ok(lines.some((line) => line.includes('If one research path is blocked, try another') && line.includes('`shell`') && line.includes('`http_request`')))
   })
 
-  it('adds direct drafting/file-save/swarm-id guidance when those tools are enabled', () => {
+  it('adds direct email and file action guidance when those tools are enabled', () => {
     const lines = buildToolDisciplineLines(['files', 'email', 'spawn_subagent'])
-    assert.ok(lines.some((line) => line.includes('draft, outline, critique, or revise email copy')))
-    assert.ok(lines.some((line) => line.includes('actual file-writing tool call')))
-    assert.ok(lines.some((line) => line.includes('returned `swarmId`')))
+    assert.ok(lines.some((line) => line.includes('For `email`, send mail with `{"action":"send","to":"user@example.com","subject":"...","body":"..."}`')))
+    assert.ok(lines.some((line) => line.includes('{"action":"write","files":[{"path":"path/to/file.md","content":"..."}]}')))
   })
 })
 

package/src/lib/server/chat-execution/chat-execution-session-sync.test.ts

@@ -84,6 +84,13 @@ test('executeSessionChatTurn syncs updated agent runtime fields onto its thread
     })
 
     const session = ensureAgentThreadSession('molly')
+    const sessionsBefore = storage.loadSessions()
+    sessionsBefore[session.id].connectorContext = {
+      connectorId: 'conn-stale',
+      channelId: 'stale-channel',
+      senderId: 'stale-user',
+    }
+    storage.saveSessions(sessionsBefore)
     const agents = storage.loadAgents()
     agents.molly.provider = 'test-provider'
     agents.molly.model = 'unit'
@@ -93,7 +100,7 @@ test('executeSessionChatTurn syncs updated agent runtime fields onto its thread
     agents.molly.updatedAt = now + 1
     storage.saveAgents(agents)
 
-    const result = await executeSessionChatTurn({
+    await executeSessionChatTurn({
       sessionId: session.id,
       message: 'hello',
       runId: 'run-session-sync',
@@ -101,19 +108,125 @@ test('executeSessionChatTurn syncs updated agent runtime fields onto its thread
 
     const persisted = storage.loadSession(session.id)
     console.log(JSON.stringify({
-      text: result.text || null,
       provider: persisted?.provider || null,
       model: persisted?.model || null,
       plugins: persisted?.plugins || [],
       heartbeatEnabled: persisted?.heartbeatEnabled ?? null,
       heartbeatIntervalSec: persisted?.heartbeatIntervalSec ?? null,
+      connectorContext: persisted?.connectorContext || null,
     }))
   `)
 
-  assert.equal(output.text, 'synced')
   assert.equal(output.provider, 'test-provider')
   assert.equal(output.model, 'unit')
   assert.deepEqual(output.plugins, [])
   assert.equal(output.heartbeatEnabled, true)
   assert.equal(output.heartbeatIntervalSec, 90)
+  assert.equal(output.connectorContext, null)
+})
+
+test('executeSessionChatTurn keeps tool-only heartbeats off the visible main-thread history and clears stale connector state', () => {
+  const output = runWithTempDataDir(`
+    const storageMod = await import('@/lib/server/storage')
+    const providersMod = await import('@/lib/providers/index')
+    const execMod = await import('@/lib/server/chat-execution/chat-execution')
+    const storage = storageMod.default || storageMod['module.exports'] || storageMod
+    const executeSessionChatTurn = execMod.executeSessionChatTurn
+      || execMod.default?.executeSessionChatTurn
+      || execMod['module.exports']?.executeSessionChatTurn
+    const providers = providersMod.PROVIDERS
+      || providersMod.default?.PROVIDERS
+      || providersMod['module.exports']?.PROVIDERS
+
+    providers['test-provider'] = {
+      id: 'test-provider',
+      name: 'Test Provider',
+      models: ['unit'],
+      requiresApiKey: false,
+      requiresEndpoint: false,
+      handler: {
+        async streamChat(opts) {
+          opts.write('data: ' + JSON.stringify({ t: 'r', text: 'Sent the ferry status to WhatsApp.' }) + '\\n')
+          return ''
+        },
+      },
+    }
+
+    const now = Date.now()
+    storage.saveAgents({
+      hal: {
+        id: 'hal',
+        name: 'Hal2k',
+        description: 'Heartbeat hygiene test',
+        provider: 'test-provider',
+        model: 'unit',
+        credentialId: null,
+        apiEndpoint: null,
+        fallbackCredentialIds: [],
+        disabled: false,
+        heartbeatEnabled: true,
+        heartbeatIntervalSec: 60,
+        plugins: [],
+        threadSessionId: 'agent_thread',
+        createdAt: now,
+        updatedAt: now,
+      },
+    })
+    storage.saveSessions({
+      agent_thread: {
+        id: 'agent_thread',
+        name: 'Hal2k',
+        cwd: process.env.WORKSPACE_DIR,
+        user: 'default',
+        provider: 'test-provider',
+        model: 'unit',
+        claudeSessionId: null,
+        codexThreadId: null,
+        opencodeSessionId: null,
+        delegateResumeIds: { claudeCode: null, codex: null, opencode: null, gemini: null },
+        messages: [
+          { role: 'user', text: 'seed user message', time: now - 1000 },
+        ],
+        createdAt: now,
+        lastActiveAt: now,
+        sessionType: 'human',
+        agentId: 'hal',
+        shortcutForAgentId: 'hal',
+        plugins: [],
+        connectorContext: {
+          connectorId: 'conn-stale',
+          channelId: 'wrong-chat',
+          senderId: 'wrong-user',
+        },
+      },
+    })
+
+    await executeSessionChatTurn({
+      sessionId: 'agent_thread',
+      message: 'AGENT_HEARTBEAT_WAKE\\nInternal connector follow-up only',
+      internal: true,
+      source: 'heartbeat-wake',
+      heartbeatConfig: {
+        ackMaxChars: 300,
+        showOk: false,
+        showAlerts: true,
+        target: null,
+        deliveryMode: 'tool_only',
+      },
+      runId: 'run-heartbeat-tool-only',
+    })
+
+    const persisted = storage.loadSession('agent_thread')
+    console.log(JSON.stringify({
+      connectorContext: persisted?.connectorContext || null,
+      messageCount: persisted?.messages?.length || 0,
+      lastMessageText: persisted?.messages?.at(-1)?.text || null,
+      heartbeatKinds: (persisted?.messages || []).filter((entry) => entry.kind === 'heartbeat').length,
+    }))
+  `)
+
+  assert.equal(output.connectorContext, null)
+  assert.equal(output.messageCount, 1)
+  assert.equal(output.lastMessageText, 'seed user message')
+  assert.equal(output.heartbeatKinds, 0)
 })

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,
@@ -67,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'
 
@@ -109,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
 }
@@ -130,7 +150,14 @@ export interface ExecuteChatTurnInput {
   signal?: AbortSignal
   onEvent?: (event: SSEEvent) => void
   modelOverride?: string
-  heartbeatConfig?: { ackMaxChars: number; showOk: boolean; showAlerts: boolean; target: string | null; lightContext?: boolean }
+  heartbeatConfig?: {
+    ackMaxChars: number
+    showOk: boolean
+    showAlerts: boolean
+    target: string | null
+    lightContext?: boolean
+    deliveryMode?: 'default' | 'tool_only'
+  }
   replyToId?: string
 }
 
@@ -422,6 +449,10 @@ function syncSessionFromAgent(sessionId: string): void {
       session.openclawAgentId = desiredOpenClawAgentId
       changed = true
     }
+    if (session.connectorContext) {
+      session.connectorContext = undefined
+      changed = true
+    }
   }
 
   if (changed) {
@@ -496,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 {
@@ -1228,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
@@ -1236,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,
@@ -1309,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)
@@ -1339,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
           }

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

@@ -12,6 +12,7 @@ import {
   looksLikeOpenEndedDeliverableTask,
   resolveContinuationAssistantText,
   resolveFinalStreamResponseText,
+  shouldSkipToolSummaryForShortResponse,
   shouldForceAttachmentFollowthrough,
   shouldForceRecoverableToolErrorFollowthrough,
   shouldTerminateOnSuccessfulMemoryMutation,
@@ -52,72 +53,66 @@ describe('buildToolDisciplineLines', () => {
     assert.ok(lines.every((line) => !line.includes('Do not substitute `manage_platform`')))
   })
 
-  it('includes concrete files-tool examples for revision work', () => {
+  it('includes concrete files-tool examples for file work', () => {
     const lines = buildToolDisciplineLines(['files'])
 
     assert.ok(lines.some((line) => line.includes('{"action":"read","filePath":"path/to/file.md"}')))
-    assert.ok(lines.some((line) => line.includes('exactly N bullet points')))
-    assert.ok(lines.some((line) => line.includes('Lower-priority logistics belong in FYI')))
+    assert.ok(lines.some((line) => line.includes('{"action":"list","dirPath":"."}')))
+    assert.ok(lines.some((line) => line.includes('{"action":"write","files":[{"path":"path/to/file.md","content":"..."}]}')))
   })
 
-  it('adds schedule reuse and stop guidance when schedule tools are enabled', () => {
+  it('tells the agent to use direct schedule tools when manage_platform is absent', () => {
     const lines = buildToolDisciplineLines(['manage_schedules', 'schedule_wake'])
 
-    assert.ok(lines.some((line) => line.includes('reuse or update matching agent-created schedules')))
-    assert.ok(lines.some((line) => line.includes('pause or delete every matching schedule you created in this chat')))
-    assert.ok(lines.some((line) => line.includes('prefer `schedule_wake` over creating a recurring schedule')))
+    assert.ok(lines.some((line) => line.includes('Use direct platform tools exactly as named (`manage_schedules`)')))
+    assert.ok(lines.some((line) => line.includes('Do not substitute `manage_platform` unless it is explicitly enabled.')))
   })
 
-  it('warns browser tasks to use literal urls and the supported form schema', () => {
+  it('warns browser-capable sessions to use current supported tool inputs and sequencing', () => {
     const lines = buildToolDisciplineLines(['web_search', 'web_fetch', 'browser', 'manage_connectors', 'http_request', 'email', 'ask_human', 'manage_secrets'])
 
     assert.ok(lines.some((line) => line.includes('Do not invent placeholder URLs')))
     assert.ok(lines.some((line) => line.includes('A shorthand `form` object keyed by input id/name also works')))
-    assert.ok(lines.some((line) => line.includes('prefer `fill_form` and `submit_form`')))
     assert.ok(lines.some((line) => line.includes('For current events, breaking news, or "latest" requests, start with `web_search`')))
     assert.ok(lines.some((line) => line.includes('Use `browser` when the user asks for screenshots')))
-    assert.ok(lines.some((line) => line.includes('do not capture screenshots') && line.includes('`browser`')))
     assert.ok(lines.some((line) => line.includes('connector_message_tool') && line.includes('list_running')))
     assert.ok(lines.some((line) => line.includes('connector/channel setup is missing')))
-    assert.ok(lines.some((line) => line.includes('capture the artifact first with `browser`') && line.includes('`connector_message_tool`')))
     assert.ok(lines.some((line) => line.includes('Keep JSON request bodies as raw JSON strings')))
-    assert.ok(lines.some((line) => line.includes('try one other enabled acquisition path') && line.includes('`http_request`') && line.includes('`browser`')))
-    assert.ok(lines.some((line) => line.includes('browser or web timeout is not final')))
+    assert.ok(lines.some((line) => line.includes('gather sources first, then capture')))
+    assert.ok(lines.some((line) => line.includes('If one research path is blocked, try another') && line.includes('`http_request`') && line.includes('`browser`')))
     assert.ok(lines.some((line) => line.includes('{"action":"send","to":"user@example.com","subject":"...","body":"..."}')))
     assert.ok(lines.some((line) => line.includes('do not guess or keep re-submitting blank forms')))
-    assert.ok(lines.some((line) => line.includes('store it with `manage_secrets`') && line.includes('do not echo the raw value')))
-    assert.ok(lines.some((line) => line.includes('Use `manage_secrets` only for sensitive credentials or tokens')))
+    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 available wallet first with `wallet_tool`')))
-    assert.ok(lines.some((line) => line.includes('use a bounded loop') && line.includes('Do not keep browsing once the blocker is clear')))
-    assert.ok(lines.some((line) => line.includes('do not shop across venues indefinitely')))
-    assert.ok(lines.some((line) => line.includes('If a direct tool for the job is already enabled in this session, call that tool immediately')))
+    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('tells agents to stay local when coding tools are already available', () => {
+  it('includes concrete local coding tool guidance when coding tools are already available', () => {
     const lines = buildToolDisciplineLines(['files', 'shell', 'delegate'])
 
-    assert.ok(lines.some((line) => line.includes('prefer using them directly for straightforward coding and verification')))
+    assert.ok(lines.some((line) => line.includes('{"action":"read","filePath":"path/to/file.md"}')))
+    assert.ok(lines.some((line) => line.includes('For `shell`, use `{"action":"execute","command":"..."}`')))
   })
 
-  it('adds explicit human-loop mailbox sequencing guidance when ask_human is enabled', () => {
+  it('adds explicit ask_human request and wait guidance when ask_human is enabled', () => {
     const lines = buildToolDisciplineLines(['browser', 'ask_human'])
 
-    assert.ok(lines.some((line) => line.includes('request_input') && line.includes('wait_for_reply') && line.includes('list_mailbox')))
-    assert.ok(lines.some((line) => line.includes('omit `envelopeId` to ack the newest unread human reply')))
-    assert.ok(lines.some((line) => line.includes('Do not loop on `status` without a `watchJobId`')))
+    assert.ok(lines.some((line) => line.includes('request_input') && line.includes('wait_for_reply') && line.includes('correlationId')))
+    assert.ok(lines.some((line) => line.includes('do not guess or keep re-submitting blank forms')))
   })
 
-  it('tells agents to draft email content directly and to use real file writes for named artifacts', () => {
+  it('tells agents how to send email and write files when those tools are enabled', () => {
     const lines = buildToolDisciplineLines(['files', 'email', 'spawn_subagent'])
 
-    assert.ok(lines.some((line) => line.includes('draft, outline, critique, or revise email copy')))
-    assert.ok(lines.some((line) => line.includes('make your first concrete step an actual file-writing tool call')))
-    assert.ok(lines.some((line) => line.includes('capture the returned `swarmId`')))
+    assert.ok(lines.some((line) => line.includes('For `email`, send mail with `{"action":"send","to":"user@example.com","subject":"...","body":"..."}`')))
+    assert.ok(lines.some((line) => line.includes('If delivery depends on SMTP setup, check `{"action":"status"}` before claiming success.')))
+    assert.ok(lines.some((line) => line.includes('{"action":"write","files":[{"path":"path/to/file.md","content":"..."}]}')))
   })
 
   it('does not force capability-inferred tools — trusts the LLM to select tools', () => {
@@ -183,7 +178,7 @@ describe('buildToolDisciplineLines', () => {
     assert.ok(streamAgentChatSource.includes('If a task explicitly names an enabled tool, use that tool before declaring success.'))
     assert.ok(streamAgentChatSource.includes('collect required human input through the tool'))
     assert.ok(streamAgentChatSource.includes('## Attachments'))
-    assert.ok(streamAgentChatSource.includes('Do not claim you cannot use images, attachments, or external tools when those capabilities are available in this session.'))
+    assert.ok(streamSources.includes('Do not claim that you cannot use images, attachments, or external tools when they are available in this session.'))
     assert.ok(streamSources.includes('You have not yet completed the required explicit tool step(s):'))
     assert.ok(streamSources.includes('attachment_followthrough'))
     assert.ok(streamSources.includes('unfinished_tool_followthrough'))
@@ -264,6 +259,46 @@ describe('isWalletSimulationResult', () => {
   })
 })
 
+describe('shouldSkipToolSummaryForShortResponse', () => {
+  it('skips forced tool-summary continuation for short responses after pure use_skill calls', () => {
+    assert.equal(
+      shouldSkipToolSummaryForShortResponse({
+        fullText: 'HAL2K_RELEASE_LIVE_OK',
+        toolEvents: [
+          { name: 'use_skill', input: '{"action":"list"}', output: '{"ok":true}' },
+          { name: 'use_skill', input: '{"action":"load"}', output: '{"loaded":true}' },
+        ],
+      }),
+      true,
+    )
+  })
+
+  it('does not skip tool-summary continuation when substantive tools also ran', () => {
+    assert.equal(
+      shouldSkipToolSummaryForShortResponse({
+        fullText: 'Done.',
+        toolEvents: [
+          { name: 'use_skill', input: '{"action":"load"}', output: '{"loaded":true}' },
+          { name: 'web', input: '{"q":"latest"}', output: 'results' },
+        ],
+      }),
+      false,
+    )
+  })
+
+  it('does not skip tool-summary continuation for empty text', () => {
+    assert.equal(
+      shouldSkipToolSummaryForShortResponse({
+        fullText: '',
+        toolEvents: [
+          { name: 'use_skill', input: '{"action":"load"}', output: '{"loaded":true}' },
+        ],
+      }),
+      false,
+    )
+  })
+})
+
 describe('looksLikeOpenEndedDeliverableTask', () => {
   it('detects open-ended deliverable prompts', () => {
     assert.equal(