@swarmclawai/swarmclaw 0.8.4 → 0.8.7

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

@@ -7,6 +7,7 @@ import type { Plugin, PluginHooks } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
 import { canonicalizePluginId } from '../tool-aliases'
+import { errorMessage, sleep } from '@/lib/shared-utils'
 import {
   appendDelegationCheckpoint,
   cancelDelegationJob,
@@ -87,9 +88,6 @@ function _computeDelegationDepth(
   return depth
 }
 
-function sleep(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
 
 function buildDelegateContextFromSessionish(session: unknown): DelegateContext {
   const record = session && typeof session === 'object' ? session as Record<string, unknown> : {}
@@ -560,7 +558,7 @@ async function executeDelegateAction(args: Record<string, unknown>, bctx: Delega
       return { backend, result }
     })
     .catch((err: unknown) => {
-      const message = err instanceof Error ? err.message : String(err)
+      const message = errorMessage(err)
       const latest = getDelegationJob(job.id)
       if (latest?.status === 'cancelled') return { backend: requestedBackend, result: `Error: ${message}` }
       appendDelegationCheckpoint(job.id, `Delegate crashed on ${requestedBackend}: ${message}`, 'failed')
@@ -697,7 +695,7 @@ async function runCodexDelegate(binary: string, task: string, resume: boolean, r
       child.stdin?.end()
     })
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 
@@ -774,7 +772,7 @@ async function runOpenCodeDelegate(binary: string, task: string, resume: boolean
       })
     })
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 
@@ -855,7 +853,7 @@ async function runGeminiDelegate(binary: string, task: string, resume: boolean,
       })
     })
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 
@@ -913,7 +911,7 @@ async function runClaudeDelegate(binary: string, task: string, resume: boolean,
       child.stdin?.write(task)
       child.stdin?.end()
     })
-  } 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/discovery-approvals.test.ts

@@ -35,8 +35,8 @@ function runWithTempDataDir(script: string) {
 describe('discovery approval flows', () => {
   it('request_tool_access creates a real approval and grants the tool when auto-approved', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const toolsMod = await import('./src/lib/server/session-tools/index.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const toolsMod = await import('./src/lib/server/session-tools/index')
       const storage = storageMod.default || storageMod
       const toolsApi = toolsMod.default || toolsMod
 
@@ -84,8 +84,8 @@ describe('discovery approval flows', () => {
 
   it('manage_capabilities request_access accepts query aliases for pluginId', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const toolsMod = await import('./src/lib/server/session-tools/index.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const toolsMod = await import('./src/lib/server/session-tools/index')
       const storage = storageMod.default || storageMod
       const toolsApi = toolsMod.default || toolsMod
 
@@ -130,8 +130,8 @@ describe('discovery approval flows', () => {
 
   it('manage_capabilities request_access tells the agent to call already-available alias tools directly', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const toolsMod = await import('./src/lib/server/session-tools/index.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const toolsMod = await import('./src/lib/server/session-tools/index')
       const storage = storageMod.default || storageMod
       const toolsApi = toolsMod.default || toolsMod
 
@@ -170,8 +170,8 @@ describe('discovery approval flows', () => {
 
   it('granting manage_schedules does not surface the manage_platform umbrella tool', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const toolsMod = await import('./src/lib/server/session-tools/index.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const toolsMod = await import('./src/lib/server/session-tools/index')
       const storage = storageMod.default || storageMod
       const toolsApi = toolsMod.default || toolsMod
 
@@ -210,8 +210,8 @@ describe('discovery approval flows', () => {
 
   it('session-granted builtins disabled by default still appear in the next turn tool list', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const toolsMod = await import('./src/lib/server/session-tools/index.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const toolsMod = await import('./src/lib/server/session-tools/index')
       const storage = storageMod.default || storageMod
       const toolsApi = toolsMod.default || toolsMod
 
@@ -249,8 +249,8 @@ describe('discovery approval flows', () => {
 
   it('discover reports session-granted builtin tools as available now', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const toolsMod = await import('./src/lib/server/session-tools/index.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const toolsMod = await import('./src/lib/server/session-tools/index')
       const storage = storageMod.default || storageMod
       const toolsApi = toolsMod.default || toolsMod
 
@@ -293,9 +293,9 @@ describe('discovery approval flows', () => {
 
   it('hydrates agent-approved tools into stale connector sessions on the next turn', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const toolsMod = await import('./src/lib/server/session-tools/index.ts')
-      const approvalsMod = await import('./src/lib/server/approvals.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const toolsMod = await import('./src/lib/server/session-tools/index')
+      const approvalsMod = await import('./src/lib/server/approvals')
       const storage = storageMod.default || storageMod
       const toolsApi = toolsMod.default || toolsMod
       const approvals = approvalsMod.default || approvalsMod

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

@@ -8,6 +8,7 @@ import { normalizeToolInputArgs } from './normalize-tool-args'
 import { pluginIdMatches } from '../tool-aliases'
 import { loadSessions } from '../storage'
 import { inferPluginPublisherSourceFromUrl } from '@/lib/plugin-sources'
+import { errorMessage } from '@/lib/shared-utils'
 
 function trimString(value: unknown): string {
   return typeof value === 'string' ? value.trim() : ''
@@ -91,7 +92,7 @@ async function executeDiscoveryAction(args: Record<string, unknown>, bctx?: Tool
             })))
           }
         } catch (err: unknown) {
-          console.error('[discovery] ClawHub search failed:', err instanceof Error ? err.message : String(err))
+          console.error('[discovery] ClawHub search failed:', errorMessage(err))
         }
 
         try {
@@ -123,7 +124,7 @@ async function executeDiscoveryAction(args: Record<string, unknown>, bctx?: Tool
           }
           results.push(...registryResults.values())
         } catch (err: unknown) {
-          console.error('[discovery] SC Registry search failed:', err instanceof Error ? err.message : String(err))
+          console.error('[discovery] SC Registry search failed:', errorMessage(err))
         }
 
         if (results.length === 0) {
@@ -214,7 +215,7 @@ async function executeDiscoveryAction(args: Record<string, unknown>, bctx?: Tool
         return `Error: Unknown action "${action}"`
     }
   } catch (err: unknown) {
-    const msg = err instanceof Error ? err.message : String(err)
+    const msg = errorMessage(err)
     console.error('[discovery] executeDiscoveryAction failed:', msg)
     return `Error: ${msg}`
   }

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

@@ -9,6 +9,7 @@ import { extractDocumentArtifact } from '../document-utils'
 import type { ToolBuildContext } from './context'
 import { findBinaryOnPath, safePath } from './context'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { errorMessage } from '@/lib/shared-utils'
 
 function parseMetadataInput(value: unknown): Record<string, unknown> {
   if (!value) return {}
@@ -219,7 +220,7 @@ async function executeDocumentAction(
 
     return `Error: 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/email.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'
 
 interface SmtpConfig {
   host: string
@@ -186,7 +187,7 @@ async function executeEmail(args: Record<string, unknown>): Promise<string> {
       const result = await sendSmtpEmail(cfg, recipients, subject, body, html)
       return `${result}\nTo: ${recipients.join(', ')}\nSubject: ${subject}`
     } catch (err: unknown) {
-      return `Error sending email: ${err instanceof Error ? err.message : String(err)}`
+      return `Error sending email: ${errorMessage(err)}`
     }
   }
 

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

@@ -7,6 +7,7 @@ import { runStructuredExtraction } from '../structured-extract'
 import type { ToolBuildContext } from './context'
 import { safePath } from './context'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { errorMessage } from '@/lib/shared-utils'
 
 function resolveSessionForExtraction(bctx: ToolBuildContext) {
   const session = bctx.resolveCurrentSession?.()
@@ -67,7 +68,7 @@ async function executeExtractAction(args: Record<string, unknown>, bctx: ToolBui
       raw: normalized.includeRaw === true ? result.raw : undefined,
     })
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 

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

@@ -10,6 +10,7 @@ import { safePath, truncate, listDirRecursive, MAX_FILE } from './context'
 import type { Plugin, PluginHooks } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { dedup, errorMessage } from '@/lib/shared-utils'
 
 function pickNonEmptyString(...values: unknown[]): string | undefined {
   for (const value of values) {
@@ -269,7 +270,7 @@ export async function executeFileAction(args: Record<string, unknown>, bctx: { c
         return `Error: Unknown action "${action}"`
     }
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 
@@ -382,7 +383,7 @@ export function findRecentSendFileFallbackPaths(cwd: string, maxAgeMs = 10 * 60
   const resolvedRoot = path.resolve(cwd)
   const candidates: string[] = []
   collectRecentFiles(resolvedRoot, resolvedRoot, maxAgeMs, candidates, 0)
-  return [...new Set(candidates)]
+  return dedup(candidates)
 }
 
 export function resolveSendFileSourcePath(cwd: string, rawPath: string): string {
@@ -445,7 +446,7 @@ async function executeSendFile(args: Record<string, unknown>, bctx: { cwd: strin
     if (errors.length === 0) return links.join('\n')
     return `${links.join('\n')}\n\nSkipped: ${errors.join('; ')}`
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 

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

@@ -6,6 +6,7 @@ import { withRetry } from '../tool-retry'
 import type { Plugin, PluginHooks } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { errorMessage } from '@/lib/shared-utils'
 
 interface HttpRequestArgs {
   method: string
@@ -58,7 +59,7 @@ async function executeHttpAction(args: HttpRequestArgs) {
       }
       return JSON.stringify({ status: res.status, statusText: res.statusText, headers: resHeaders, body: resBody })
     } catch (err: unknown) {
-      return JSON.stringify({ error: err instanceof Error ? err.message : String(err) })
+      return JSON.stringify({ error: errorMessage(err) })
     }
   }, requestArgs)
 }

package/src/lib/server/session-tools/human-loop.ts

@@ -8,6 +8,7 @@ import { ackMailboxEnvelope, listMailbox, sendMailboxEnvelope } from '../session
 import { loadApprovals } from '../storage'
 import { requestApprovalMaybeAutoApprove } from '../approvals'
 import { createWatchJob, getWatchJob } from '../watch-jobs'
+import { errorMessage } from '@/lib/shared-utils'
 
 async function executeHumanLoopAction(args: Record<string, unknown>, bctx: { sessionId?: string | null; agentId?: string | null }) {
   const normalized = normalizeToolInputArgs(args)
@@ -166,7 +167,7 @@ async function executeHumanLoopAction(args: Record<string, unknown>, bctx: { ses
 
     return `Error: 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/image-gen.ts

@@ -7,6 +7,7 @@ import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
 import { UPLOAD_DIR } from '../storage'
 import type { ToolBuildContext } from './context'
+import { errorMessage, sleep } from '@/lib/shared-utils'
 
 type ImageProvider = 'openai' | 'stability' | 'replicate' | 'fal' | 'together' | 'fireworks' | 'bfl' | 'custom'
 
@@ -87,7 +88,7 @@ async function generateReplicate(prompt: string, size: string, cfg: PluginConfig
   if (prediction.status !== 'succeeded' && prediction.status !== 'failed' && prediction.urls?.get) {
     const deadline = Date.now() + 120_000
     while (prediction.status !== 'succeeded' && prediction.status !== 'failed' && Date.now() < deadline) {
-      await new Promise((r) => setTimeout(r, 2000))
+      await sleep(2000)
       const pollRes = await fetch(prediction.urls.get, {
         headers: { Authorization: `Bearer ${cfg.apiKey}` },
         signal: AbortSignal.timeout(10_000),
@@ -174,7 +175,7 @@ async function generateBFL(prompt: string, size: string, cfg: PluginConfig): Pro
   // Poll for result
   const deadline = Date.now() + 120_000
   while (Date.now() < deadline) {
-    await new Promise((r) => setTimeout(r, 2000))
+    await sleep(2000)
     const pollRes = await fetch(pollingUrl, {
       headers: { 'x-key': cfg.apiKey },
       signal: AbortSignal.timeout(10_000),
@@ -270,7 +271,7 @@ async function executeImageGen(args: Record<string, unknown>): Promise<string> {
     const result = await generate(prompt, size, quality, cfg)
     return saveImageResult(result, prompt, filename)
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }
 

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

@@ -1,7 +1,8 @@
 import { z } from 'zod'
 import { tool, type StructuredToolInterface } from '@langchain/core/tools'
 import type { Session } from '@/types'
-import { loadApprovals, loadSettings, loadSessions, saveSessions, loadMcpServers } from '../storage'
+import { dedup, errorMessage } from '@/lib/shared-utils'
+import { loadApprovals, loadSettings, loadSession, loadMcpServers, patchSession } from '../storage'
 import { loadRuntimeSettings } from '../runtime-settings'
 import { log } from '../logger'
 import { resolveSessionToolPolicy } from '../tool-capability-policy'
@@ -80,23 +81,20 @@ export async function buildSessionTools(cwd: string, enabledPlugins: string[], c
     const cliProcessTimeoutMs = runtime.cliProcessTimeoutMs
     const appSettings = loadSettings()
     const grantedToolIds = approvedToolAccessIds(ctx)
-    const effectiveEnabledPlugins = Array.from(new Set([
+    const effectiveEnabledPlugins = dedup([
       ...(Array.isArray(enabledPlugins) ? enabledPlugins : []),
       ...grantedToolIds,
-    ]))
+    ])
     if (ctx?.sessionId && grantedToolIds.length > 0) {
-      const sessions = loadSessions()
-      const currentSession = sessions[ctx.sessionId]
-      if (currentSession) {
+      patchSession(ctx.sessionId, (currentSession) => {
+        if (!currentSession) return currentSession
         const currentPlugins = Array.isArray(currentSession.plugins) ? currentSession.plugins : []
-        const mergedPlugins = Array.from(new Set([...currentPlugins, ...grantedToolIds]))
-        if (mergedPlugins.length !== currentPlugins.length) {
-          currentSession.plugins = mergedPlugins
-          currentSession.updatedAt = Date.now()
-          sessions[ctx.sessionId] = currentSession
-          saveSessions(sessions)
-        }
-      }
+        const mergedPlugins = dedup([...currentPlugins, ...grantedToolIds])
+        if (mergedPlugins.length === currentPlugins.length) return currentSession
+        currentSession.plugins = mergedPlugins
+        currentSession.updatedAt = Date.now()
+        return currentSession
+      })
     }
     const toolPolicy = resolveSessionToolPolicy(effectiveEnabledPlugins, appSettings)
     const expandedEnabled = expandPluginIds(toolPolicy.enabledPlugins)
@@ -124,8 +122,7 @@ export async function buildSessionTools(cwd: string, enabledPlugins: string[], c
 
     const resolveCurrentSession = (): Session | null => {
       if (!ctx?.sessionId) return null
-      const sessions = loadSessions()
-      return sessions[ctx.sessionId] || null
+      return loadSession(ctx.sessionId)
     }
 
     const readStoredDelegateResumeId = (key: 'claudeCode' | 'codex' | 'opencode' | 'gemini'): string | null => {
@@ -138,19 +135,18 @@ export async function buildSessionTools(cwd: string, enabledPlugins: string[], c
     const persistDelegateResumeId = (key: 'claudeCode' | 'codex' | 'opencode' | 'gemini', resumeId: string | null | undefined): void => {
       const normalized = typeof resumeId === 'string' ? resumeId.trim() : ''
       if (!normalized || !ctx?.sessionId) return
-      const sessions = loadSessions()
-      const target = sessions[ctx.sessionId]
-      if (!target) return
-      const current = (target.delegateResumeIds && typeof target.delegateResumeIds === 'object')
-        ? target.delegateResumeIds
-        : {}
-      target.delegateResumeIds = {
-        ...current,
-        [key]: normalized,
-      }
-      target.updatedAt = Date.now()
-      sessions[ctx.sessionId] = target
-      saveSessions(sessions)
+      patchSession(ctx.sessionId, (target) => {
+        if (!target) return target
+        const current = (target.delegateResumeIds && typeof target.delegateResumeIds === 'object')
+          ? target.delegateResumeIds
+          : {}
+        target.delegateResumeIds = {
+          ...current,
+          [key]: normalized,
+        }
+        target.updatedAt = Date.now()
+        return target
+      })
     }
 
     const bctx: ToolBuildContext = {
@@ -266,7 +262,7 @@ export async function buildSessionTools(cwd: string, enabledPlugins: string[], c
         )
       }
     } catch (err: unknown) {
-      log.error('session-tools', 'Failed to load plugin tools', { error: err instanceof Error ? err.message : String(err) })
+      log.error('session-tools', 'Failed to load plugin tools', { error: errorMessage(err) })
     }
 
     // 3. MCP server tools

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

@@ -12,6 +12,7 @@ import {
   replyMailboxMessage,
 } from '../mailbox-utils'
 import { createWatchJob } from '../watch-jobs'
+import { errorMessage } from '@/lib/shared-utils'
 
 function parseMessageUid(value: unknown): number {
   const parsed = typeof value === 'number' ? value : typeof value === 'string' ? Number.parseInt(value, 10) : Number.NaN
@@ -191,7 +192,7 @@ async function executeMailboxAction(args: Record<string, unknown>, bctx: { cwd:
 
     return `Error: 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/manage-connectors.test.ts

@@ -35,8 +35,8 @@ function runWithTempDataDir(script: string) {
 describe('manage_connectors tool', () => {
   it('drops transient outbound-send args on create', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 
@@ -84,8 +84,8 @@ describe('manage_connectors tool', () => {
 
   it('ignores send-like update payloads instead of mutating connector routing state', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 

package/src/lib/server/session-tools/manage-schedules.test.ts

@@ -37,8 +37,8 @@ describe('manage_schedules tool', () => {
     const output = runWithTempDataDir(`
       import fs from 'node:fs'
       import path from 'node:path'
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 
@@ -93,8 +93,8 @@ describe('manage_schedules tool', () => {
 
   it('stores the current connector recipient on new schedules created from a connector session', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 
@@ -170,8 +170,8 @@ describe('manage_schedules tool', () => {
 
   it('rejects schedules whose referenced script path does not exist', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 
@@ -214,8 +214,8 @@ describe('manage_schedules tool', () => {
 
   it('reuses a same-session recurring reminder instead of creating a near-duplicate', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 
@@ -274,8 +274,8 @@ describe('manage_schedules tool', () => {
 
   it('pauses matching duplicate schedules together when an agent stops a reminder', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 
@@ -348,8 +348,8 @@ describe('manage_schedules tool', () => {
 
   it('deletes matching duplicate schedules together when an agent removes a reminder cluster', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 

package/src/lib/server/session-tools/manage-tasks-advanced.test.ts

@@ -35,8 +35,8 @@ function runWithTempDataDir(script: string) {
 
 /** Helper: seed agents + return manage_tasks / manage_projects tool invocation boilerplate. */
 const AGENT_SETUP = `
-  const storageMod = await import('./src/lib/server/storage.ts')
-  const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+  const storageMod = await import('./src/lib/server/storage')
+  const crudMod = await import('./src/lib/server/session-tools/crud')
   const storage = storageMod.default || storageMod
   const crud = crudMod.default || crudMod
 
@@ -76,7 +76,7 @@ const AGENT_SETUP = `
 
 /** Helper to import dequeueNextRunnableTask (CJS-compatible). */
 const QUEUE_IMPORT = `
-  const _queueMod = await import('./src/lib/server/queue.ts')
+  const _queueMod = await import('./src/lib/server/queue')
   const _queue = _queueMod.default || _queueMod
   const dequeueNextRunnableTask = _queue.dequeueNextRunnableTask
 `
@@ -782,8 +782,8 @@ describe('manage_tasks: fingerprint dedup', () => {
 
   it('29. different agents → not duplicates', () => {
     const output = runWithTempDataDir(`
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 

package/src/lib/server/session-tools/manage-tasks.test.ts

@@ -37,8 +37,8 @@ describe('manage_tasks tool', () => {
     const output = runWithTempDataDir(`
       import fs from 'node:fs'
       import path from 'node:path'
-      const storageMod = await import('./src/lib/server/storage.ts')
-      const crudMod = await import('./src/lib/server/session-tools/crud.ts')
+      const storageMod = await import('./src/lib/server/storage')
+      const crudMod = await import('./src/lib/server/session-tools/crud')
       const storage = storageMod.default || storageMod
       const crud = crudMod.default || crudMod
 

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

@@ -9,6 +9,7 @@ import { safePath, truncate } from './context'
 import { normalizeToolInputArgs } from './normalize-tool-args'
 import { cancelWatchJob, createWatchJob, getWatchJob, listWatchJobs } from '../watch-jobs'
 import { ensureSessionBrowserProfileId, loadBrowserSessionRecord } from '../browser-state'
+import { errorMessage } from '@/lib/shared-utils'
 
 type WatchKind = 'time' | 'http' | 'file' | 'task' | 'webhook' | 'page'
 
@@ -89,7 +90,7 @@ async function createDurableWatch(
 }
 
 function getErrorMessage(err: unknown): string {
-  return err instanceof Error ? err.message : String(err)
+  return errorMessage(err)
 }
 
 /**

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

@@ -9,6 +9,7 @@ import { loadSettings } from '../storage'
 import { resolveSessionToolPolicy } from '../tool-capability-policy'
 import { loadRuntimeSettings } from '../runtime-settings'
 import { expandPluginIds } from '../tool-aliases'
+import { dedup } from '@/lib/shared-utils'
 
 function parsePlatformData(value: unknown): Record<string, unknown> | null {
   if (!value) return null
@@ -146,7 +147,7 @@ export function normalizePlatformActionArgs(rawArgs: Record<string, unknown>): R
 }
 
 function uniqueStrings(values: Array<string | undefined>): string[] {
-  return [...new Set(values.filter((value): value is string => Boolean(value)))]
+  return dedup(values.filter((value): value is string => Boolean(value)))
 }
 
 function resolvePlatformResourceAccess(toolId: string, bctx: ToolBuildContext): { allowed: boolean; reason: string | null } {

package/src/lib/server/session-tools/plugin-creator.ts

@@ -7,6 +7,7 @@ import type { ToolBuildContext } from './context'
 import type { ApprovalRequest, Plugin, PluginHooks } from '@/types'
 import { getPluginManager } from '../plugins'
 import { normalizeToolInputArgs } from './normalize-tool-args'
+import { errorMessage } from '@/lib/shared-utils'
 
 const PLUGINS_DIR = path.join(DATA_DIR, 'plugins')
 
@@ -236,7 +237,7 @@ Key rules:
 
     return `Unknown action "${action}". Valid actions: get_spec, scaffold, read, edit, delete, install_dependencies`
   } catch (err: unknown) {
-    return `Error: ${err instanceof Error ? err.message : String(err)}`
+    return `Error: ${errorMessage(err)}`
   }
 }