@swarmclawai/swarmclaw 0.6.3 → 0.6.6

package/src/lib/server/connectors/whatsapp-text.ts

@@ -0,0 +1,26 @@
+import removeMarkdown from 'remove-markdown'
+
+export function stripMarkdownForPlainChat(raw: string): string {
+  const source = String(raw || '').replace(/\r\n?/g, '\n')
+  if (!source) return ''
+
+  let text = removeMarkdown(source, {
+    gfm: true,
+    useImgAltText: true,
+    replaceLinksWithURL: true,
+    separateLinksAndTexts: ': ',
+  })
+
+  // Collapse duplicate "url: url" patterns when link label already equals URL.
+  text = text.replace(/(https?:\/\/[^\s]+): \1/g, '$1')
+  text = text.replace(/\n{3,}/g, '\n\n')
+  return text.trim()
+}
+
+/**
+ * Convert markdown-heavy model output into WhatsApp-friendly plain text.
+ * Uses a markdown parser package instead of ad-hoc regex-only stripping.
+ */
+export function formatTextForWhatsApp(raw: string): string {
+  return stripMarkdownForPlainChat(raw)
+}

package/src/lib/server/connectors/whatsapp.ts

@@ -12,6 +12,7 @@ import type { Connector } from '@/types'
 import type { PlatformConnector, ConnectorInstance, InboundMessage } from './types'
 import { saveInboundMediaBuffer, mimeFromPath, isImageMime, isAudioMime } from './media'
 import { isNoMessage } from './manager'
+import { formatTextForWhatsApp } from './whatsapp-text'
 
 import { DATA_DIR } from '../data-dir'
 
@@ -67,15 +68,17 @@ const whatsapp: PlatformConnector = {
       hasCredentials: hasStoredCreds(authDir),
       async sendMessage(channelId, text, options) {
         if (!sock) throw new Error('WhatsApp connector is not connected')
+        const normalizedText = formatTextForWhatsApp(text || '')
+        const normalizedCaption = formatTextForWhatsApp(options?.caption || normalizedText)
         // Local file path takes priority
         if (options?.mediaPath) {
           if (!fs.existsSync(options.mediaPath)) throw new Error(`File not found: ${options.mediaPath}`)
           const buf = fs.readFileSync(options.mediaPath)
           const mime = options.mimeType || mimeFromPath(options.mediaPath)
-          const caption = options.caption || text || undefined
+          const caption = normalizedCaption || undefined
           const fName = options.fileName || path.basename(options.mediaPath)
           let sent
-          if (isImageMime(mime)) {
+          if (isImageMime(mime) || mime.startsWith('video/')) {
             try {
               sent = await sock.sendMessage(channelId, { image: buf, caption, mimetype: mime })
             } catch (err: unknown) {
@@ -94,7 +97,7 @@ const whatsapp: PlatformConnector = {
         if (options?.imageUrl) {
           const sent = await sock.sendMessage(channelId, {
             image: { url: options.imageUrl },
-            caption: options.caption || text || undefined,
+            caption: normalizedCaption || undefined,
           })
           if (sent?.key?.id) sentMessageIds.add(sent.key.id)
           return { messageId: sent?.key?.id || undefined }
@@ -104,13 +107,13 @@ const whatsapp: PlatformConnector = {
             document: { url: options.fileUrl },
             fileName: options.fileName || 'attachment',
             mimetype: options.mimeType || 'application/octet-stream',
-            caption: options.caption || text || undefined,
+            caption: normalizedCaption || undefined,
           })
           if (sent?.key?.id) sentMessageIds.add(sent.key.id)
           return { messageId: sent?.key?.id || undefined }
         }
 
-        const payload = text || options?.caption || ''
+        const payload = normalizedText || normalizedCaption || ''
         const chunks = payload.length <= 4096 ? [payload] : (payload.match(/[\s\S]{1,4000}/g) || [payload])
         let lastMessageId: string | undefined
         for (const chunk of chunks) {

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

@@ -124,7 +124,12 @@ async function executeSubTaskViaCli(agent: Agent, task: string, parentSessionId:
   }
   ss(sessions)
 
-  const result = await callProvider(agent, agent.systemPrompt, [{ role: 'user', text: task }])
+  // Build system prompt with identity
+  const subPromptParts: string[] = []
+  subPromptParts.push(`## My Identity\nMy name is ${agent.name}.${agent.description ? ' ' + agent.description : ''} I should always refer to myself by this name.`)
+  if (agent.soul) subPromptParts.push(agent.soul)
+  if (agent.systemPrompt) subPromptParts.push(agent.systemPrompt)
+  const result = await callProvider(agent, subPromptParts.join('\n\n'), [{ role: 'user', text: task }])
 
   const s2 = ls()
   if (s2[childId]) {
@@ -348,9 +353,14 @@ export async function executeLangGraphOrchestrator(
     apiKey: engine.apiKey,
     apiEndpoint: engine.apiEndpoint,
   })
-  // Build system message: [userPrompt] \n\n [soul] \n\n [systemPrompt] \n\n [orchestrator context]
+  // Build system message: [identity] \n\n [userPrompt] \n\n [soul] \n\n [systemPrompt] \n\n [orchestrator context]
   const settings = loadSettings()
   const promptParts: string[] = []
+  // Identity block
+  const orchIdentity = [`## My Identity`, `My name is ${orchestrator.name}.`]
+  if (orchestrator.description) orchIdentity.push(orchestrator.description)
+  orchIdentity.push('I should always refer to myself by this name.')
+  promptParts.push(orchIdentity.join(' '))
   if (settings.userPrompt) promptParts.push(settings.userPrompt)
   promptParts.push(buildCurrentDateTimePromptContext())
   if (orchestrator.soul) promptParts.push(orchestrator.soul)

package/src/lib/server/orchestrator.ts

@@ -296,7 +296,12 @@ async function executeSubTask(
   saveSessions(sessions)
 
   const history = [{ role: 'user', text: task }]
-  const result = await callProvider(agent, agent.systemPrompt, history)
+  // Build system prompt with identity so the agent knows who it is
+  const promptParts: string[] = []
+  promptParts.push(`## My Identity\nMy name is ${agent.name}.${agent.description ? ' ' + agent.description : ''} I should always refer to myself by this name.`)
+  if (agent.soul) promptParts.push(agent.soul)
+  if (agent.systemPrompt) promptParts.push(agent.systemPrompt)
+  const result = await callProvider(agent, promptParts.join('\n\n'), history)
 
   childSession.messages.push({ role: 'user', text: task, time: Date.now() })
   childSession.messages.push({ role: 'assistant', text: result, time: Date.now() })

package/src/lib/server/queue-followups.test.ts

@@ -0,0 +1,224 @@
+import { describe, it } from 'node:test'
+import assert from 'node:assert/strict'
+import type { BoardTask } from '@/types'
+import { resolveTaskOriginConnectorFollowupTarget } from './queue'
+
+function makeTask(partial?: Partial<BoardTask> & { createdInSessionId?: string | null }): BoardTask {
+  const now = Date.now()
+  return {
+    id: 'task-1',
+    title: 'Test task',
+    description: 'desc',
+    status: 'queued',
+    agentId: 'agent-a',
+    createdAt: now,
+    updatedAt: now,
+    ...(partial || {}),
+  } as BoardTask
+}
+
+type SessionFixtureMap = Record<string, {
+  messages: Array<{
+    role: string
+    text?: string
+    source?: {
+      connectorId?: string
+      channelId?: string
+    }
+  }>
+}>
+
+describe('resolveTaskOriginConnectorFollowupTarget', () => {
+  it('uses connector source channel from origin session and normalizes WhatsApp numbers', () => {
+    const task = makeTask({ createdInSessionId: 'session-1' })
+    const sessions = {
+      'session-1': {
+        messages: [
+          { role: 'assistant', text: 'ok' },
+          {
+            role: 'user',
+            text: 'please update me',
+            source: {
+              connectorId: 'conn-wa',
+              channelId: '+44 7700 900123',
+            },
+          },
+        ],
+      },
+    }
+    const connectors = {
+      'conn-wa': {
+        id: 'conn-wa',
+        platform: 'whatsapp',
+        agentId: 'agent-a',
+        config: {},
+      },
+    }
+    const running = [
+      {
+        id: 'conn-wa',
+        platform: 'whatsapp',
+        agentId: 'agent-a',
+        supportsSend: true,
+        configuredTargets: [],
+        recentChannelId: '185200000000000@lid',
+      },
+    ]
+
+    const target = resolveTaskOriginConnectorFollowupTarget({
+      task,
+      sessions: sessions as SessionFixtureMap,
+      connectors,
+      running,
+    })
+
+    assert.deepEqual(target, {
+      connectorId: 'conn-wa',
+      channelId: '447700900123@s.whatsapp.net',
+    })
+  })
+
+  it('falls back to runtime recent channel when source channel is unavailable', () => {
+    const task = makeTask({ createdInSessionId: 'session-1' })
+    const sessions = {
+      'session-1': {
+        messages: [
+          {
+            role: 'user',
+            text: 'run this later',
+            source: {
+              connectorId: 'conn-telegram',
+            },
+          },
+        ],
+      },
+    }
+    const connectors = {
+      'conn-telegram': {
+        id: 'conn-telegram',
+        platform: 'telegram',
+        agentId: 'agent-a',
+        config: {},
+      },
+    }
+    const running = [
+      {
+        id: 'conn-telegram',
+        platform: 'telegram',
+        agentId: 'agent-a',
+        supportsSend: true,
+        configuredTargets: [],
+        recentChannelId: 'tg-chat-42',
+      },
+    ]
+
+    const target = resolveTaskOriginConnectorFollowupTarget({
+      task,
+      sessions: sessions as SessionFixtureMap,
+      connectors,
+      running,
+    })
+
+    assert.deepEqual(target, {
+      connectorId: 'conn-telegram',
+      channelId: 'tg-chat-42',
+    })
+  })
+
+  it('returns null when the source connector belongs to a different agent', () => {
+    const task = makeTask({ createdInSessionId: 'session-1' })
+    const sessions = {
+      'session-1': {
+        messages: [
+          {
+            role: 'user',
+            text: 'do it',
+            source: {
+              connectorId: 'conn-wa',
+              channelId: '+15551230000',
+            },
+          },
+        ],
+      },
+    }
+    const connectors = {
+      'conn-wa': {
+        id: 'conn-wa',
+        platform: 'whatsapp',
+        agentId: 'different-agent',
+        config: {},
+      },
+    }
+    const running = [
+      {
+        id: 'conn-wa',
+        platform: 'whatsapp',
+        agentId: 'different-agent',
+        supportsSend: true,
+        configuredTargets: [],
+        recentChannelId: null,
+      },
+    ]
+
+    const target = resolveTaskOriginConnectorFollowupTarget({
+      task,
+      sessions: sessions as SessionFixtureMap,
+      connectors,
+      running,
+    })
+
+    assert.equal(target, null)
+  })
+
+  it('allows delegated tasks to follow up via the delegating agent connector', () => {
+    const task = makeTask({
+      agentId: 'worker-agent',
+      delegatedByAgentId: 'delegator-agent',
+      createdInSessionId: 'session-1',
+    })
+    const sessions = {
+      'session-1': {
+        messages: [
+          {
+            role: 'user',
+            text: 'run and update me here',
+            source: {
+              connectorId: 'conn-wa',
+              channelId: '+44 7700 900123',
+            },
+          },
+        ],
+      },
+    }
+    const connectors = {
+      'conn-wa': {
+        id: 'conn-wa',
+        platform: 'whatsapp',
+        agentId: 'delegator-agent',
+        config: {},
+      },
+    }
+    const running = [
+      {
+        id: 'conn-wa',
+        platform: 'whatsapp',
+        agentId: 'delegator-agent',
+        supportsSend: true,
+        configuredTargets: [],
+        recentChannelId: null,
+      },
+    ]
+
+    const target = resolveTaskOriginConnectorFollowupTarget({
+      task,
+      sessions: sessions as SessionFixtureMap,
+      connectors,
+      running,
+    })
+
+    assert.deepEqual(target, {
+      connectorId: 'conn-wa',
+      channelId: '447700900123@s.whatsapp.net',
+    })
+  })
+})