@swarmclawai/swarmclaw 0.8.4 → 0.8.7

package/src/lib/server/session-run-manager.ts

@@ -1,6 +1,6 @@
 import { genId } from '@/lib/id'
 import type { SSEEvent } from '@/types'
-import { active, loadSessions } from './storage'
+import { active, loadSession } from './storage'
 import { executeSessionChatTurn, type ExecuteChatTurnResult } from './chat-execution'
 import { loadRuntimeSettings } from './runtime-settings'
 import { log } from './logger'
@@ -8,6 +8,7 @@ import { isInternalHeartbeatRun } from './heartbeat-source'
 import { cleanupSessionBrowser } from './session-tools/web'
 import { cancelDelegationJobsForParentSession } from './delegation-jobs'
 import { handleMainLoopRunResult } from './main-agent-loop'
+import { errorMessage, hmrSingleton } from '@/lib/shared-utils'
 
 export type SessionRunStatus = 'queued' | 'running' | 'completed' | 'failed' | 'cancelled'
 export type SessionQueueMode = 'followup' | 'steer' | 'collect'
@@ -39,7 +40,13 @@ interface QueueEntry {
   signalController: AbortController
   maxRuntimeMs?: number
   modelOverride?: string
-  heartbeatConfig?: { ackMaxChars: number; showOk: boolean; showAlerts: boolean; target: string | null }
+  heartbeatConfig?: {
+    ackMaxChars: number
+    showOk: boolean
+    showAlerts: boolean
+    target: string | null
+    deliveryMode?: 'default' | 'tool_only'
+  }
   replyToId?: string
   resolve: (value: ExecuteChatTurnResult) => void
   reject: (error: Error) => void
@@ -56,14 +63,13 @@ interface RuntimeState {
 
 const MAX_RECENT_RUNS = 500
 const COLLECT_COALESCE_WINDOW_MS = 1500
-const globalKey = '__swarmclaw_session_run_manager__' as const
-const state: RuntimeState = (globalThis as any)[globalKey] ?? ((globalThis as any)[globalKey] = {
+const state: RuntimeState = hmrSingleton<RuntimeState>('__swarmclaw_session_run_manager__', () => ({
   runningByExecution: new Map<string, QueueEntry>(),
   queueByExecution: new Map<string, QueueEntry[]>(),
   runs: new Map<string, SessionRunRecord>(),
   recentRunIds: [],
   promises: new Map<string, Promise<ExecuteChatTurnResult>>(),
-})
+}))
 
 function now() {
   return Date.now()
@@ -305,17 +311,17 @@ async function drainExecution(executionKey: string): Promise<void> {
           })
         } catch (err: unknown) {
           log.warn('session-run', `Main loop follow-up enqueue failed for ${next.run.sessionId}`, {
-            error: err instanceof Error ? err.message : String(err),
+            error: errorMessage(err),
           })
         }
       }, Math.max(0, followup.delayMs || 0))
     }
     next.resolve(result)
-  } catch (err: any) {
+  } catch (err: unknown) {
     const aborted = next.signalController.signal.aborted
     next.run.status = aborted ? 'cancelled' : 'failed'
     next.run.endedAt = now()
-    next.run.error = err?.message || String(err)
+    next.run.error = errorMessage(err)
     emitRunMeta(next, next.run.status, { error: next.run.error })
     log.error('session-run', `Run failed ${next.run.id}`, {
       sessionId: next.run.sessionId,
@@ -353,7 +359,13 @@ export interface EnqueueSessionRunInput {
   dedupeKey?: string
   maxRuntimeMs?: number
   modelOverride?: string
-  heartbeatConfig?: { ackMaxChars: number; showOk: boolean; showAlerts: boolean; target: string | null }
+  heartbeatConfig?: {
+    ackMaxChars: number
+    showOk: boolean
+    showAlerts: boolean
+    target: string | null
+    deliveryMode?: 'default' | 'tool_only'
+  }
   replyToId?: string
   /** External abort signal (e.g. from the HTTP request) — chained to the run's internal AbortController */
   callerSignal?: AbortSignal
@@ -367,9 +379,15 @@ export interface EnqueueSessionRunResult {
   promise: Promise<ExecuteChatTurnResult>
   /** Abort the run's internal AbortController (cancels the LLM stream). */
   abort: () => void
+  /** Remove this caller's onEvent listener from the run (call on client disconnect). */
+  unsubscribe: () => void
 }
 
 const LONG_TOOL_NAMES: ReadonlySet<string> = new Set(['claude_code', 'codex_cli', 'opencode_cli'])
+type SessionToolConfig = {
+  plugins?: string[] | null
+  tools?: string[] | null
+}
 
 function computeEffectiveRunTimeoutMs(
   baseTimeoutMs: number,
@@ -389,9 +407,12 @@ export function enqueueSessionRun(input: EnqueueSessionRunInput): EnqueueSession
   const executionKey = executionKeyForSession(input.sessionId)
   const runtime = loadRuntimeSettings()
   const defaultMaxRuntimeMs = runtime.ongoingLoopMaxRuntimeMs ?? (10 * 60_000)
-  const sessions = loadSessions()
-  const sessionData = sessions[input.sessionId]
-  const sessionTools: string[] = sessionData?.tools || []
+  const sessionData = loadSession(input.sessionId) as SessionToolConfig | null
+  const sessionTools = Array.isArray(sessionData?.plugins)
+    ? sessionData.plugins
+    : Array.isArray(sessionData?.tools)
+      ? sessionData.tools
+      : []
   const adjustedDefaultMs = computeEffectiveRunTimeoutMs(defaultMaxRuntimeMs, sessionTools, runtime)
   const effectiveMaxRuntimeMs = typeof input.maxRuntimeMs === 'number'
     ? input.maxRuntimeMs
@@ -399,7 +420,8 @@ export function enqueueSessionRun(input: EnqueueSessionRunInput): EnqueueSession
 
   const dedupe = findDedupeMatch(input.sessionId, input.dedupeKey)
   if (dedupe) {
-    if (input.onEvent) dedupe.onEvents.push(input.onEvent)
+    const cb = input.onEvent
+    if (cb) dedupe.onEvents.push(cb)
     if (input.callerSignal) chainCallerSignal(input.callerSignal, dedupe.signalController)
     return {
       runId: dedupe.run.id,
@@ -407,6 +429,11 @@ export function enqueueSessionRun(input: EnqueueSessionRunInput): EnqueueSession
       deduped: true,
       promise: dedupe.promise,
       abort: () => dedupe.signalController.abort(),
+      unsubscribe: () => {
+        if (!cb) return
+        const idx = dedupe.onEvents.indexOf(cb)
+        if (idx >= 0) dedupe.onEvents.splice(idx, 1)
+      },
     }
   }
 
@@ -455,7 +482,8 @@ export function enqueueSessionRun(input: EnqueueSessionRunInput): EnqueueSession
         candidate.run.messagePreview = messagePreview(candidate.message)
         candidate.run.queuedAt = nowMs
       }
-      if (input.onEvent) candidate.onEvents.push(input.onEvent)
+      const coalesceCb = input.onEvent
+      if (coalesceCb) candidate.onEvents.push(coalesceCb)
       if (input.callerSignal) chainCallerSignal(input.callerSignal, candidate.signalController)
       emitRunMeta(candidate, 'queued', { position: 0, coalesced: true, mergedIntoRunId: candidate.run.id })
       return {
@@ -464,6 +492,11 @@ export function enqueueSessionRun(input: EnqueueSessionRunInput): EnqueueSession
         coalesced: true,
         promise: candidate.promise,
         abort: () => candidate.signalController.abort(),
+        unsubscribe: () => {
+          if (!coalesceCb) return
+          const idx = candidate.onEvents.indexOf(coalesceCb)
+          if (idx >= 0) candidate.onEvents.splice(idx, 1)
+        },
       }
     }
   }
@@ -515,7 +548,18 @@ export function enqueueSessionRun(input: EnqueueSessionRunInput): EnqueueSession
   emitRunMeta(entry, 'queued', { position })
   void drainExecution(executionKey)
 
-  return { runId, position, promise, abort: () => entry.signalController.abort() }
+  const entryCb = input.onEvent
+  return {
+    runId,
+    position,
+    promise,
+    abort: () => entry.signalController.abort(),
+    unsubscribe: () => {
+      if (!entryCb) return
+      const idx = entry.onEvents.indexOf(entryCb)
+      if (idx >= 0) entry.onEvents.splice(idx, 1)
+    },
+  }
 }
 
 export function getSessionRunState(sessionId: string): {

package/src/lib/server/session-tools/autonomy-tools.test.ts

@@ -16,29 +16,29 @@ function readServerSource(fileName: string): string {
 }
 
 describe('browser workflow surface', () => {
-  it('advertises the higher-level browser actions in web.ts', () => {
-    const src = readToolSource('web.ts')
+  it('advertises the higher-level browser actions in web', () => {
+    const src = readToolSource('web')
     for (const action of ['read_page', 'extract_links', 'extract_form_fields', 'extract_table', 'fill_form', 'submit_form', 'scroll_until', 'download_file', 'complete_web_task']) {
       assert.equal(src.includes(`'${action}'`), true, `web.ts should expose ${action}`)
     }
   })
 
   it('supports the shorthand form-map path for fill_form', () => {
-    const src = readToolSource('web.ts')
+    const src = readToolSource('web')
     assert.equal(src.includes('params.form'), true)
     assert.equal(src.includes('fields is required for fill_form.'), true)
   })
 
   it('flags pages that require human-provided input', () => {
-    const src = readToolSource('web.ts')
+    const src = readToolSource('web')
     assert.equal(src.includes("type: 'human_input_required'"), true)
     assert.equal(src.includes('Ask the human instead of guessing'), true)
   })
 })
 
 describe('durable wait surface', () => {
-  it('advertises the durable wait actions in monitor.ts', () => {
-    const src = readToolSource('monitor.ts')
+  it('advertises the durable wait actions in monitor', () => {
+    const src = readToolSource('monitor')
     for (const action of ['wait_until', 'wait_for_http', 'wait_for_file', 'wait_for_task', 'wait_for_webhook', 'wait_for_page_change']) {
       assert.equal(src.includes(`'${action}'`), true, `monitor.ts should expose ${action}`)
     }
@@ -46,7 +46,7 @@ describe('durable wait surface', () => {
   })
 
   it('routes schedule_wake through durable watch storage', () => {
-    const src = readToolSource('schedule.ts')
+    const src = readToolSource('schedule')
     assert.equal(src.includes('createWatchJob'), true)
     assert.equal(src.includes("type: 'time'"), true)
   })
@@ -54,7 +54,7 @@ describe('durable wait surface', () => {
 
 describe('sandbox surface', () => {
   it('advertises a Deno-only sandbox and steers simple APIs to http_request', () => {
-    const src = readToolSource('sandbox.ts')
+    const src = readToolSource('sandbox')
     assert.equal(src.includes("enum: ['javascript', 'typescript']"), true)
     assert.equal(src.includes('http_request'), true)
     assert.equal(src.includes('plugin_creator'), true)
@@ -65,7 +65,7 @@ describe('sandbox surface', () => {
 
 describe('delegation job handles', () => {
   it('exposes subagent control actions', () => {
-    const src = readToolSource('subagent.ts')
+    const src = readToolSource('subagent')
     for (const action of ['status', 'list', 'wait', 'cancel']) {
       assert.equal(src.includes(`action === '${action}'`), true, `subagent.ts should handle ${action}`)
     }
@@ -73,15 +73,15 @@ describe('delegation job handles', () => {
   })
 
   it('builds delegate context from the invoking session and uses job records', () => {
-    const src = readToolSource('delegate.ts')
+    const src = readToolSource('delegate')
     assert.equal(src.includes('buildDelegateContextFromSessionish'), true)
     assert.equal(src.includes('createDelegationJob'), true)
     assert.equal(src.includes('waitForDelegateJob'), true)
   })
 
   it('scheduler and daemon recover the durable autonomy jobs', () => {
-    const schedulerSrc = readServerSource('scheduler.ts')
-    const daemonSrc = readServerSource('daemon-state.ts')
+    const schedulerSrc = readServerSource('scheduler')
+    const daemonSrc = readServerSource('daemon-state')
     assert.equal(schedulerSrc.includes('processDueWatchJobs'), true)
     assert.equal(daemonSrc.includes('recoverStaleDelegationJobs'), true)
   })
@@ -89,8 +89,8 @@ describe('delegation job handles', () => {
 
 describe('primitive plugin surfaces', () => {
   it('advertises mailbox and human-loop actions', () => {
-    const mailboxSrc = readToolSource('mailbox.ts')
-    const humanSrc = readToolSource('human-loop.ts')
+    const mailboxSrc = readToolSource('mailbox')
+    const humanSrc = readToolSource('human-loop')
     for (const action of ['list_messages', 'list_threads', 'search_messages', 'read_message', 'download_attachment', 'reply', 'wait_for_email']) {
       assert.equal(mailboxSrc.includes(`'${action}'`), true, `mailbox.ts should expose ${action}`)
     }
@@ -100,10 +100,10 @@ describe('primitive plugin surfaces', () => {
   })
 
   it('advertises document, extract, table, and crawl actions', () => {
-    const documentSrc = readToolSource('document.ts')
-    const extractSrc = readToolSource('extract.ts')
-    const tableSrc = readToolSource('table.ts')
-    const crawlSrc = readToolSource('crawl.ts')
+    const documentSrc = readToolSource('document')
+    const extractSrc = readToolSource('extract')
+    const tableSrc = readToolSource('table')
+    const crawlSrc = readToolSource('crawl')
 
     for (const action of ['read', 'metadata', 'ocr', 'extract_tables', 'store', 'list', 'search', 'get', 'delete']) {
       assert.equal(documentSrc.includes(`'${action}'`), true, `document.ts should expose ${action}`)
@@ -119,8 +119,8 @@ describe('primitive plugin surfaces', () => {
     }
   })
 
-  it('registers the primitive plugins in builtin-plugins.ts', () => {
-    const src = readServerSource('builtin-plugins.ts')
+  it('registers the primitive plugins in builtin-plugins', () => {
+    const src = readServerSource('builtin-plugins')
     for (const moduleName of ['mailbox', 'human-loop', 'document', 'extract', 'table', 'crawl']) {
       assert.equal(src.includes(`session-tools/${moduleName}`), true, `builtin-plugins.ts should import ${moduleName}`)
     }

package/src/lib/server/session-tools/calendar.ts

@@ -4,6 +4,7 @@ import type { Plugin, PluginHooks } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
 import type { ToolBuildContext } from './context'
+import { errorMessage } from '@/lib/shared-utils'
 
 type CalendarProvider = 'google' | 'outlook'
 
@@ -249,7 +250,7 @@ async function executeCalendar(args: Record<string, unknown>): Promise<string> {
         return `Error: Unknown action "${action}". Use: list, create, update, delete, status.`
     }
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 

package/src/lib/server/session-tools/canvas.ts

@@ -7,6 +7,7 @@ import type { Plugin, PluginHooks } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
 import { normalizeCanvasContent, summarizeCanvasContent } from '@/lib/canvas-content'
+import { errorMessage } from '@/lib/shared-utils'
 
 /**
  * Core Canvas Execution Logic
@@ -55,7 +56,7 @@ async function executeCanvasAction(args: Record<string, unknown>, context: { ses
 
     return `Unknown canvas action "${action}".`
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 

package/src/lib/server/session-tools/chatroom.ts

@@ -7,6 +7,7 @@ import type { ToolBuildContext } from './context'
 import type { Chatroom, Plugin, PluginHooks } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { errorMessage } from '@/lib/shared-utils'
 
 /**
  * Core Chatroom Execution Logic
@@ -97,7 +98,7 @@ async function executeChatroomAction(args: Record<string, unknown>, context: { a
 
     return `Unknown action "${action}".`
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 

package/src/lib/server/session-tools/connector.ts

@@ -10,6 +10,9 @@ import type { ToolBuildContext } from './context'
 import type { Plugin, PluginHooks } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { safeJsonParseObject } from '../json-utils'
+import { tryResolvePathWithinBaseDir } from '../path-utils'
+import { dedup, errorMessage } from '@/lib/shared-utils'
 
 const CONNECTOR_ACTION_DEDUPE_TTL_MS = 30_000
 const CONNECTOR_TURN_SEND_TTL_MS = 180_000
@@ -157,29 +160,24 @@ function buildConnectorActionKey(parts: Array<string | number | boolean | null |
 }
 
 function normalizeDedupedReplayResult(raw: string, fallback: { connectorId: string; platform: string; to: string }): string {
-  try {
-    const parsed = JSON.parse(raw)
-    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) throw new Error('invalid')
-    const record = parsed as Record<string, unknown>
-    if (String(record.status || '') === 'deduped') {
-      return JSON.stringify({
-        status: 'sent',
-        connectorId: String(record.connectorId || fallback.connectorId),
-        platform: String(record.platform || fallback.platform),
-        to: String(record.to || fallback.to),
-        deduped: true,
-      })
-    }
-    return raw
-  } catch {
+  const record = safeJsonParseObject(raw)
+  if (record && String(record.status || '') === 'deduped') {
     return JSON.stringify({
       status: 'sent',
-      connectorId: fallback.connectorId,
-      platform: fallback.platform,
-      to: fallback.to,
+      connectorId: String(record.connectorId || fallback.connectorId),
+      platform: String(record.platform || fallback.platform),
+      to: String(record.to || fallback.to),
       deduped: true,
     })
   }
+  if (record) return raw
+  return JSON.stringify({
+    status: 'sent',
+    connectorId: fallback.connectorId,
+    platform: fallback.platform,
+    to: fallback.to,
+    deduped: true,
+  })
 }
 
 export function normalizeConnectorActionName(action: string): string {
@@ -441,7 +439,7 @@ function pickChannelTarget(params: {
       ...parseCsv(connector.config?.allowedJids),
       ...parseCsv(connector.config?.allowFrom),
     ].filter(Boolean) as string[]
-    const unique = [...new Set(knownTargets)]
+    const unique = dedup(knownTargets)
     if (unique.length) {
       return {
         channelId: '',
@@ -487,9 +485,9 @@ export function resolveConnectorMediaInput(params: {
     const candidatePaths = [
       path.resolve(params.cwd, resolvedMediaPath),
       path.resolve(params.cwd, 'uploads', resolvedMediaPath),
-      path.join(UPLOAD_DIR, resolvedMediaPath),
-      path.join(UPLOAD_DIR, path.basename(resolvedMediaPath)),
-    ]
+      tryResolvePathWithinBaseDir(UPLOAD_DIR, resolvedMediaPath),
+      tryResolvePathWithinBaseDir(UPLOAD_DIR, path.basename(resolvedMediaPath)),
+    ].filter((candidate): candidate is string => !!candidate)
     const found = candidatePaths.find((p) => fs.existsSync(p))
     if (found) {
       resolvedMediaPath = found
@@ -605,9 +603,9 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
       if (!connectorId) {
         const allConnectors = loadConnectors()
         const stopped = Object.values(allConnectors)
-          .filter((c) => !platform || c.platform === platform)
-          .filter((c) => !running.find((r) => r.id === c.id))
-          .map((c) => ({ id: c.id, name: c.name, platform: c.platform }))
+          .filter((c: any) => !platform || c.platform === platform)
+          .filter((c: any) => !running.find((r) => r.id === c.id))
+          .map((c: any) => ({ id: c.id, name: c.name, platform: c.platform }))
         if (!stopped.length) return 'All connectors are already running.'
         return `Error: connectorId is required. Stopped connectors available to start: ${JSON.stringify(stopped)}`
       }
@@ -627,8 +625,8 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
       if (!running.length) {
         const allConnectors = loadConnectors()
         const configured = Object.values(allConnectors)
-          .filter((c) => !platform || c.platform === platform)
-          .map((c) => ({ id: c.id, name: c.name, platform: c.platform, agentId: c.agentId || null }))
+          .filter((c: any) => !platform || c.platform === platform)
+          .map((c: any) => ({ id: c.id, name: c.name, platform: c.platform, agentId: c.agentId || null }))
         if (configured.length) {
           return {
             error: `Error: no running connectors found. Ask user to start one. Configured: ${JSON.stringify(configured)}`,
@@ -842,7 +840,7 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
 
     return 'Unknown action.'
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 

package/src/lib/server/session-tools/context-mgmt.ts

@@ -7,6 +7,7 @@ import type { ToolBuildContext } from './context'
 import type { Plugin, PluginHooks, Session } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { errorMessage } from '@/lib/shared-utils'
 
 interface ContextToolContext {
   ctx?: { agentId?: string | null; sessionId?: string | null }
@@ -23,7 +24,7 @@ async function executeContextStatus(bctx: ContextToolContext) {
     if (!session) return 'Error: no current session context.'
     const status = getContextStatus(session.messages || [], 2000, session.provider as string, session.model as string)
     return JSON.stringify(status)
-  } catch (err: unknown) { return `Error: ${err instanceof Error ? err.message : String(err)}` }
+  } catch (err: unknown) { return `Error: ${errorMessage(err)}` }
 }
 
 async function executeContextSummarize(args: { keepLastN?: number }, bctx: ContextToolContext) {
@@ -55,7 +56,7 @@ async function executeContextSummarize(args: { keepLastN?: number }, bctx: Conte
       saveSessions(sessions)
     }
     return JSON.stringify({ status: 'compacted', remaining: result.messages.length })
-  } catch (err: unknown) { return `Error: ${err instanceof Error ? err.message : String(err)}` }
+  } catch (err: unknown) { return `Error: ${errorMessage(err)}` }
 }
 
 /**

package/src/lib/server/session-tools/crawl.ts

@@ -8,6 +8,7 @@ import { getPluginManager } from '../plugins'
 import { runStructuredExtraction } from '../structured-extract'
 import type { ToolBuildContext } from './context'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { dedup, errorMessage } from '@/lib/shared-utils'
 
 interface CrawledPage {
   url: string
@@ -93,7 +94,7 @@ async function fetchCrawlPage(url: string, depth: number): Promise<CrawledPage>
     depth,
     textPreview,
     headings,
-    links: Array.from(new Set(links)),
+    links: dedup(links),
     hash: pageHash(`${title || ''}\n${textPreview}`),
   }
 }
@@ -194,7 +195,7 @@ async function fetchSitemapUrls(sitemapUrl: string): Promise<string[]> {
   })
   const xml = await res.text()
   const matches = Array.from(xml.matchAll(/<loc>\s*([^<]+)\s*<\/loc>/gi))
-  return Array.from(new Set(matches.map((match) => match[1]?.trim()).filter((value): value is string => !!value)))
+  return dedup(matches.map((match) => match[1]?.trim()).filter((value): value is string => !!value))
 }
 
 function normalizeSelectorMap(value: unknown): Record<string, string> {
@@ -369,7 +370,7 @@ async function executeCrawlAction(args: Record<string, unknown>, bctx: ToolBuild
 
     return `Error: Unknown action "${action}".`
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }