@swarmclawai/swarmclaw 1.2.0 → 1.2.1

package/src/lib/server/runtime/heartbeat-service.ts

@@ -1157,3 +1157,26 @@ export function pruneHeartbeatState(liveSessionIds: Set<string>): number {
   }
   return removed
 }
+
+/**
+ * Remove orchestrator tracking entries for agents that no longer exist.
+ * Called periodically by the daemon health sweep.
+ */
+export function pruneOrchestratorState(liveAgentIds: Set<string>): number {
+  let removed = 0
+  for (const agentId of orchestratorState.lastWakeByAgent.keys()) {
+    if (!liveAgentIds.has(agentId)) { orchestratorState.lastWakeByAgent.delete(agentId); removed++ }
+  }
+  for (const agentId of orchestratorState.failures.keys()) {
+    if (!liveAgentIds.has(agentId)) { orchestratorState.failures.delete(agentId); removed++ }
+  }
+  const todayStr = new Date().toISOString().slice(0, 10)
+  for (const key of orchestratorState.dailyCycles.keys()) {
+    const agentId = key.slice(0, key.lastIndexOf(':'))
+    if (!liveAgentIds.has(agentId) || key.slice(key.lastIndexOf(':') + 1) !== todayStr) {
+      orchestratorState.dailyCycles.delete(key)
+      removed++
+    }
+  }
+  return removed
+}

package/src/lib/server/runtime/idle-window.ts

@@ -1,5 +1,8 @@
 import { loadSessions } from '@/lib/server/storage'
 import type { Session } from '@/types'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'idle-window'
 
 const DEFAULT_IDLE_THRESHOLD_MS = 120_000 // 2 minutes
 const DAILY_GUARANTEE_MS = 24 * 60 * 60 * 1000
@@ -73,7 +76,7 @@ export async function drainIdleWindowCallbacks(): Promise<void> {
     try {
       await cb()
     } catch (err) {
-      console.warn('[idle-window] Callback failed:', err instanceof Error ? err.message : String(err))
+      log.warn(TAG, 'Callback failed:', err instanceof Error ? err.message : String(err))
     }
   }
 }

package/src/lib/server/runtime/perf.ts

@@ -15,6 +15,9 @@
  */
 
 import { hmrSingleton } from '@/lib/shared-utils'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'perf'
 
 interface PerfEntry {
   category: string
@@ -44,7 +47,7 @@ function emitEntry(entry: PerfEntry): void {
   const metaStr = entry.meta && Object.keys(entry.meta).length > 0
     ? ' ' + JSON.stringify(entry.meta)
     : ''
-  console.log(`[perf] ${entry.category}/${entry.label} ${entry.durationMs}ms${metaStr}`)
+  log.info(TAG, `${entry.category}/${entry.label} ${entry.durationMs}ms${metaStr}`)
 }
 
 const _noopEnd = () => 0

package/src/lib/server/runtime/process-manager.ts

@@ -2,6 +2,9 @@ import { genId } from '@/lib/id'
 import { hmrSingleton, sleep } from '@/lib/shared-utils'
 import { spawn, type ChildProcessWithoutNullStreams } from 'child_process'
 import { detectDocker } from '@/lib/server/sandbox/docker-detect'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'process-manager'
 
 const MAX_LOG_CHARS = 200_000
 const DEFAULT_BACKGROUND_YIELD_MS = 10_000
@@ -127,9 +130,9 @@ function cleanupSandboxContainer(containerName: string) {
   if (!detectDocker().available) return
   try {
     const child = spawn('docker', ['rm', '-f', containerName], { stdio: 'ignore', detached: true })
-    child.on('error', (err) => { console.warn(`[process-manager] Docker cleanup error for ${containerName}:`, err.message) })
+    child.on('error', (err) => { log.warn(TAG, `Docker cleanup error for ${containerName}:`, err.message) })
     child.unref()
-  } catch (err: unknown) { console.warn(`[process-manager] Docker cleanup spawn failed for ${containerName}:`, err instanceof Error ? err.message : String(err)) }
+  } catch (err: unknown) { log.warn(TAG, `Docker cleanup spawn failed for ${containerName}:`, err instanceof Error ? err.message : String(err)) }
 }
 
 function normalizeLines(text: string): string[] {
@@ -264,7 +267,7 @@ export async function startManagedProcess(opts: StartProcessOptions): Promise<St
     try { child.kill('SIGTERM') } catch { /* noop */ }
     const escalationTimer = setTimeout(() => {
       if (!state.children.has(id)) return
-      console.warn(`[process-manager] Process ${id} (pid=${rec.pid}) did not exit after SIGTERM, sending SIGKILL`)
+      log.warn(TAG, `Process ${id} (pid=${rec.pid}) did not exit after SIGTERM, sending SIGKILL`)
       appendLog(id, '\n[process] SIGKILL escalation — process ignored SIGTERM.\n')
       try { child.kill('SIGKILL') } catch { /* noop */ }
     }, SIGKILL_ESCALATION_MS)
@@ -491,7 +494,7 @@ export async function reapOrphanedSandboxContainers(): Promise<number> {
         (r) => r.sandboxContainerName === name && r.status === 'running',
       )
       if (!isTracked) {
-        console.warn(`[process-manager] Reaping orphaned sandbox container: ${name}`)
+        log.warn(TAG, `Reaping orphaned sandbox container: ${name}`)
         cleanupSandboxContainer(name)
         reaped++
       }

package/src/lib/server/runtime/queue.ts

@@ -1,3 +1,4 @@
+import { log } from '@/lib/server/logger'
 import { matchesCapabilities, filterAgentsByCapabilities, capabilityMatchScore } from '@/lib/server/agents/capability-match'
 import { genId } from '@/lib/id'
 import { dedup, hmrSingleton, jitteredBackoff } from '@/lib/shared-utils'
@@ -44,6 +45,8 @@ import {
 } from '@/lib/server/tasks/task-lifecycle'
 import { noteMissionTaskFinished, noteMissionTaskStarted } from '@/lib/server/missions/mission-service'
 
+const TAG = 'queue'
+
 export const collectTaskConnectorFollowupTargets = collectTaskConnectorFollowupTargetsImpl
 export const resolveTaskOriginConnectorFollowupTarget = resolveTaskOriginConnectorFollowupTargetImpl
 
@@ -649,7 +652,7 @@ function queueTaskAutonomyObservation(input: {
     toolEvents: input.toolEvents,
     sourceMessage: input.sourceMessage,
   }).catch((err: unknown) => {
-    console.warn(`[queue] Autonomy observation failed for ${input.runId}:`, err)
+    log.warn(TAG, `[queue] Autonomy observation failed for ${input.runId}:`, err)
   })
 }
 
@@ -739,7 +742,7 @@ async function executeTaskRun(
       try {
         const followupBudget = checkAgentBudgetLimits(typedAgentForBudget)
         if (!followupBudget.ok) {
-          console.warn(`[queue] Budget exceeded for "${typedAgentForBudget.name}" during follow-up, stopping.`)
+          log.warn(TAG, `[queue] Budget exceeded for "${typedAgentForBudget.name}" during follow-up, stopping.`)
           break
         }
       } catch {}
@@ -967,7 +970,7 @@ export function disableSessionHeartbeat(sessionId: string | null | undefined) {
   session.heartbeatEnabled = false
   session.lastActiveAt = Date.now()
   saveSessions(sessions)
-  console.log(`[queue] Disabled heartbeat on session ${sessionId} (task finished)`)
+  log.info(TAG, `[queue] Disabled heartbeat on session ${sessionId} (task finished)`)
 }
 
 export function enqueueTask(taskId: string) {
@@ -1062,7 +1065,7 @@ export function validateCompletedTasksQueue() {
   if (tasksDirty) { saveTasks(tasks); notify('tasks') }
   if (sessionsDirty) saveSessions(sessions)
   if (demoted > 0) {
-    console.warn(`[queue] Demoted ${demoted} invalid completed task(s) to failed after validation audit`)
+    log.warn(TAG, `[queue] Demoted ${demoted} invalid completed task(s) to failed after validation audit`)
   }
   return { checked, demoted }
 }
@@ -1208,7 +1211,7 @@ export async function processNext() {
       let recovered = false
       for (const [id, t] of Object.entries(allTasks) as [string, BoardTask][]) {
         if (t.status === 'queued' && !queueSet.has(id)) {
-          console.log(`[queue] Recovering orphaned queued task: "${t.title}" (${id})`)
+          log.info(TAG, `[queue] Recovering orphaned queued task: "${t.title}" (${id})`)
           pushQueueUnique(currentQueue, id)
           recovered = true
         }
@@ -1243,7 +1246,7 @@ export async function processNext() {
           // Put it back in the queue and skip
           pushQueueUnique(queue, taskId)
           saveQueue(queue)
-          console.log(`[queue] Skipping task "${task.title}" (${taskId}) — blocked by incomplete dependencies`)
+          log.info(TAG, `[queue] Skipping task "${task.title}" (${taskId}) — blocked by incomplete dependencies`)
           return
         }
       }
@@ -1277,7 +1280,7 @@ export async function processNext() {
             return a.name.localeCompare(b.name)
           })
           const rerouted = candidates[0]
-          console.log(`[queue] Rerouting task "${task.title}" (${taskId}) from agent "${agent.name}" to "${rerouted.name}" — capability match`)
+          log.info(TAG, `[queue] Rerouting task "${task.title}" (${taskId}) from agent "${agent.name}" to "${rerouted.name}" — capability match`)
           task.agentId = rerouted.id
           agent = rerouted
         } else {
@@ -1473,7 +1476,7 @@ export async function processNext() {
         saveSessions(sessions)
       }
 
-      console.log(`[queue] Running task "${task.title}" (${taskId}) with ${agent.name}`)
+      log.info(TAG, `[queue] Running task "${task.title}" (${taskId}) with ${agent.name}`)
 
       try {
         const taskRunId = `${taskId}:attempt-${(task.attempts || 0) + 1}`
@@ -1508,7 +1511,7 @@ export async function processNext() {
             toolEvents: taskRun.toolEvents,
             sourceMessage: task.description || task.title,
           })
-          console.warn(`[queue] Task "${task.title}" cancelled during execution`)
+          log.warn(TAG, `[queue] Task "${task.title}" cancelled during execution`)
           return
         }
         if (t2[taskId]) {
@@ -1596,10 +1599,10 @@ export async function processNext() {
                 else if (opencodeId) t2[taskId].cliProvider = 'opencode-cli'
                 else if (geminiId) t2[taskId].cliProvider = 'gemini-cli'
               }
-              console.log(`[queue] CLI resume IDs for task ${taskId}: claude=${claudeId}, codex=${codexId}, opencode=${opencodeId}, gemini=${geminiId}`)
+              log.info(TAG, `[queue] CLI resume IDs for task ${taskId}: claude=${claudeId}, codex=${codexId}, opencode=${opencodeId}, gemini=${geminiId}`)
             }
           } catch (e) {
-            console.warn(`[queue] Failed to extract CLI resume IDs for task ${taskId}:`, e)
+            log.warn(TAG, `[queue] Failed to extract CLI resume IDs for task ${taskId}:`, e)
           }
 
           saveTasks(t2)
@@ -1640,7 +1643,7 @@ export async function processNext() {
           cleanupTerminalOneOffSchedule(doneTask)
           // Clean up LangGraph checkpoints for completed tasks
           getCheckpointSaver().deleteThread(taskId).catch((e) =>
-            console.warn(`[queue] Failed to clean up checkpoints for task ${taskId}:`, e)
+            log.warn(TAG, `[queue] Failed to clean up checkpoints for task ${taskId}:`, e)
           )
           // Cascade unblock: auto-queue tasks whose blockers are all done
           const latestTasks = loadTasks()
@@ -1649,7 +1652,7 @@ export async function processNext() {
             saveTasks(latestTasks)
             for (const uid of unblockedIds) {
               enqueueTask(uid)
-              console.log(`[queue] Auto-unblocked task "${latestTasks[uid]?.title}" (${uid})`)
+              log.info(TAG, `[queue] Auto-unblocked task "${latestTasks[uid]?.title}" (${uid})`)
             }
             notify('tasks')
           }
@@ -1659,15 +1662,15 @@ export async function processNext() {
               const { wakeProtocolRunFromTaskCompletion } = await import('@/lib/server/protocols/protocol-service')
               wakeProtocolRunFromTaskCompletion(taskId)
             } catch (e) {
-              console.warn(`[queue] Failed to wake protocol run for task ${taskId}:`, e)
+              log.warn(TAG, `[queue] Failed to wake protocol run for task ${taskId}:`, e)
             }
           }
-          console.log(`[queue] Task "${task.title}" completed`)
+          log.info(TAG, `[queue] Task "${task.title}" completed`)
         } else if (doneTask?.status === 'cancelled') {
-          console.warn(`[queue] Task "${task.title}" cancelled during execution`)
+          log.warn(TAG, `[queue] Task "${task.title}" cancelled during execution`)
         } else {
           if (doneTask?.status === 'queued') {
-            console.warn(`[queue] Task "${task.title}" scheduled for retry`)
+            log.warn(TAG, `[queue] Task "${task.title}" scheduled for retry`)
           } else {
             pushMainLoopEventToMainSessions({
               type: 'task_failed',
@@ -1678,12 +1681,12 @@ export async function processNext() {
               handleTerminalTaskResultDeliveries(doneTask)
               cleanupTerminalOneOffSchedule(doneTask)
             }
-            console.warn(`[queue] Task "${task.title}" failed completion validation`)
+            log.warn(TAG, `[queue] Task "${task.title}" failed completion validation`)
           }
         }
       } catch (err: unknown) {
         const errMsg = err instanceof Error ? err.message : String(err || 'Unknown error')
-        console.error(`[queue] Task "${task.title}" failed:`, errMsg)
+        log.error(TAG, `[queue] Task "${task.title}" failed:`, errMsg)
         const taskRunId = `${taskId}:attempt-${(task.attempts || 0) + 1}`
         const t2 = loadTasks()
         if (isCancelledTask(t2[taskId])) {
@@ -1699,7 +1702,7 @@ export async function processNext() {
             error: t2[taskId].error || errMsg,
             sourceMessage: task.description || task.title,
           })
-          console.warn(`[queue] Task "${task.title}" aborted because it was cancelled`)
+          log.warn(TAG, `[queue] Task "${task.title}" aborted because it was cancelled`)
           return
         }
         if (t2[taskId]) {
@@ -1720,9 +1723,9 @@ export async function processNext() {
                 source: 'task-repair',
                 runId: repairRunId,
               })
-              console.log(`[queue] Repair turn completed for task "${task.title}" (${taskId})`)
+              log.info(TAG, `[queue] Repair turn completed for task "${task.title}" (${taskId})`)
             } catch (repairErr: unknown) {
-              console.warn(`[queue] Repair turn failed for task "${task.title}":`, repairErr instanceof Error ? repairErr.message : String(repairErr))
+              log.warn(TAG, `[queue] Repair turn failed for task "${task.title}":`, repairErr instanceof Error ? repairErr.message : String(repairErr))
               // If repair fails, attempt guardian recovery
               const taskCwd = t2[taskId].cwd || WORKSPACE_DIR
               prepareGuardianRecovery({
@@ -1784,9 +1787,9 @@ export async function processNext() {
         })
         const latest = loadTasks()[taskId] as BoardTask | undefined
         if (latest?.status === 'queued') {
-          console.warn(`[queue] Task "${task.title}" queued for retry after error`)
+          log.warn(TAG, `[queue] Task "${task.title}" queued for retry after error`)
         } else if (latest?.status === 'cancelled') {
-          console.warn(`[queue] Task "${task.title}" stayed cancelled after abort`)
+          log.warn(TAG, `[queue] Task "${task.title}" stayed cancelled after abort`)
         } else {
           pushMainLoopEventToMainSessions({
             type: 'task_failed',
@@ -1828,7 +1831,7 @@ export function cleanupFinishedTaskSessions() {
   }
   if (cleaned > 0) {
     saveSessions(sessions)
-    console.log(`[queue] Disabled heartbeat on ${cleaned} session(s) with finished tasks`)
+    log.info(TAG, `[queue] Disabled heartbeat on ${cleaned} session(s) with finished tasks`)
   }
 }
 
@@ -1976,7 +1979,7 @@ export function resumeQueue() {
   for (const task of Object.values(tasks) as BoardTask[]) {
     if (task.status === 'queued' && !queue.includes(task.id)) {
       applyTaskPolicyDefaults(task)
-      console.log(`[queue] Recovering stuck queued task: "${task.title}" (${task.id})`)
+      log.info(TAG, `[queue] Recovering stuck queued task: "${task.title}" (${task.id})`)
       queue.push(task.id)
       task.queuedAt = task.queuedAt || Date.now()
       modified = true
@@ -2004,7 +2007,7 @@ export function resumeQueue() {
     recovered++
   }
   if (recovered > 0) {
-    console.log(`[queue] Recovered ${recovered} orphaned running task(s) on boot`)
+    log.info(TAG, `[queue] Recovered ${recovered} orphaned running task(s) on boot`)
   }
 
   if (modified) {
@@ -2013,7 +2016,7 @@ export function resumeQueue() {
   }
 
   if (queue.length > 0) {
-    console.log(`[queue] Resuming ${queue.length} queued task(s) on boot`)
+    log.info(TAG, `[queue] Resuming ${queue.length} queued task(s) on boot`)
     processNext()
   }
 }

package/src/lib/server/runtime/scheduler.ts

@@ -11,8 +11,11 @@ import { ensureAgentThreadSession } from '@/lib/server/agents/agent-thread-sessi
 import { ensureMissionForTask, noteScheduleMissionTriggered } from '@/lib/server/missions/mission-service'
 import { hasActiveProtocolRunForSchedule, launchProtocolRunForSchedule } from '@/lib/server/protocols/protocol-service'
 import { hmrSingleton } from '@/lib/shared-utils'
+import { log } from '@/lib/server/logger'
 import type { Schedule } from '@/types'
 
+const TAG = 'scheduler'
+
 const TICK_INTERVAL = 60_000 // 60 seconds
 const schedulerState = hmrSingleton('__swarmclaw_scheduler_state__', () => ({
   intervalId: null as ReturnType<typeof setInterval> | null,
@@ -45,7 +48,7 @@ function shouldLaunchScheduleProtocol(schedule: Schedule): boolean {
 
 export function startScheduler() {
   if (schedulerState.intervalId) return
-  console.log('[scheduler] Starting scheduler engine (60s tick)')
+  log.info(TAG, 'Starting scheduler engine (60s tick)')
 
   // Compute initial nextRunAt for cron schedules missing it
   computeNextRuns()
@@ -57,7 +60,7 @@ export function stopScheduler() {
   if (schedulerState.intervalId) {
     clearInterval(schedulerState.intervalId)
     schedulerState.intervalId = null
-    console.log('[scheduler] Stopped scheduler engine')
+    log.info(TAG, 'Stopped scheduler engine')
   }
 }
 
@@ -75,7 +78,7 @@ function computeNextRuns() {
         schedule.nextRunAt = interval.next().getTime()
         changedEntries.push([schedule.id, schedule])
       } catch (err) {
-        console.error(`[scheduler] Invalid cron for ${schedule.id}:`, err)
+        log.error(TAG, `Invalid cron for ${schedule.id}:`, err)
         schedule.status = 'failed'
         changedEntries.push([schedule.id, schedule])
       }
@@ -133,7 +136,7 @@ async function tick(now = Date.now()) {
 
     const agent = agents[schedule.agentId]
     if (!agent) {
-      console.error(`[scheduler] Agent ${schedule.agentId} not found for schedule ${schedule.id}`)
+      log.error(TAG, `Agent ${schedule.agentId} not found for schedule ${schedule.id}`)
       schedule.status = 'failed'
       upsertSchedule(schedule.id, schedule)
       pushMainLoopEventToMainSessions({
@@ -143,7 +146,7 @@ async function tick(now = Date.now()) {
       continue
     }
     if (isAgentDisabled(agent)) {
-      console.warn(`[scheduler] Skipping schedule "${schedule.name}" (${schedule.id}) because agent ${schedule.agentId} is disabled`)
+      log.warn(TAG, `Skipping schedule "${schedule.name}" (${schedule.id}) because agent ${schedule.agentId} is disabled`)
       advanceSchedule(schedule)
       upsertSchedule(schedule.id, schedule)
       pushMainLoopEventToMainSessions({
@@ -153,7 +156,7 @@ async function tick(now = Date.now()) {
       continue
     }
 
-    console.log(`[scheduler] Firing schedule "${schedule.name}" (${schedule.id})`)
+    log.info(TAG, `Firing schedule "${schedule.name}" (${schedule.id})`)
     schedule.lastRunAt = now
     schedule.runNumber = (schedule.runNumber || 0) + 1
     // Compute next run

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

@@ -818,6 +818,9 @@ async function drainExecution(executionKey: string): Promise<void> {
     next.run.missionId = result.missionId || next.run.missionId || null
     finishedMissionId = next.run.missionId || null
     next.run.resultPreview = result.text?.slice(0, 280)
+    if (typeof result.inputTokens === 'number') next.run.totalInputTokens = result.inputTokens
+    if (typeof result.outputTokens === 'number') next.run.totalOutputTokens = result.outputTokens
+    if (typeof result.estimatedCost === 'number') next.run.estimatedCost = result.estimatedCost
     syncRunRecord(next.run)
     emitRunMeta(next, next.run.status, {
       persisted: result.persisted,

package/src/lib/server/sandbox/bridge-auth-registry.ts

@@ -3,10 +3,16 @@ type BridgeAuth = {
   password?: string
 }
 
+const AUTH_BY_PORT_MAX = 200
 const authByPort = new Map<number, BridgeAuth>()
 
 export function setBridgeAuthForPort(port: number, auth: BridgeAuth): void {
   if (!Number.isFinite(port) || port <= 0) return
+  // FIFO eviction at cap
+  if (!authByPort.has(port) && authByPort.size >= AUTH_BY_PORT_MAX) {
+    const firstKey = authByPort.keys().next().value
+    if (firstKey !== undefined) authByPort.delete(firstKey)
+  }
   const token = typeof auth.token === 'string' ? auth.token.trim() : ''
   const password = typeof auth.password === 'string' ? auth.password.trim() : ''
   authByPort.set(port, {

package/src/lib/server/sandbox/novnc-auth.ts

@@ -15,12 +15,22 @@ export type NoVncObserverTokenPayload = {
   password?: string
 }
 
+const NOVNC_TOKEN_MAX = 500
 const noVncObserverTokens = new Map<string, NoVncObserverTokenEntry>()
 
 function pruneExpiredObserverTokens(now: number): void {
   for (const [token, entry] of noVncObserverTokens) {
     if (entry.expiresAt <= now) noVncObserverTokens.delete(token)
   }
+  // Hard cap as safety net
+  if (noVncObserverTokens.size > NOVNC_TOKEN_MAX) {
+    const excess = noVncObserverTokens.size - NOVNC_TOKEN_MAX
+    const iter = noVncObserverTokens.keys()
+    for (let i = 0; i < excess; i++) {
+      const k = iter.next().value
+      if (k !== undefined) noVncObserverTokens.delete(k)
+    }
+  }
 }
 
 export function isNoVncEnabled(params: { enableNoVnc: boolean; headless: boolean }): boolean {

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

@@ -164,6 +164,7 @@ export function extractResumeIdentifier(text: string): string | null {
   return null
 }
 
+const BINARY_LOOKUP_CACHE_MAX = 100
 const binaryLookupCache = new Map<string, { checkedAt: number; path: string | null }>()
 const BINARY_LOOKUP_TTL_MS = 30_000
 const isWindows = process.platform === 'win32'
@@ -173,6 +174,19 @@ export function findBinaryOnPath(binaryName: string): string | null {
   const cached = binaryLookupCache.get(binaryName)
   if (cached && now - cached.checkedAt < BINARY_LOOKUP_TTL_MS) return cached.path
 
+  // Prune expired + cap
+  for (const [k, v] of binaryLookupCache) {
+    if (now - v.checkedAt > BINARY_LOOKUP_TTL_MS) binaryLookupCache.delete(k)
+  }
+  if (binaryLookupCache.size > BINARY_LOOKUP_CACHE_MAX) {
+    const excess = binaryLookupCache.size - BINARY_LOOKUP_CACHE_MAX
+    const iter = binaryLookupCache.keys()
+    for (let i = 0; i < excess; i++) {
+      const k = iter.next().value
+      if (k !== undefined) binaryLookupCache.delete(k)
+    }
+  }
+
   const { spawnSync } = require('child_process')
   const probe = isWindows
     ? spawnSync('where', [binaryName], { encoding: 'utf-8', timeout: 2000, stdio: 'pipe' })

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

@@ -11,6 +11,9 @@ import { loadSessions, patchAgent, patchSession } from '../storage'
 import { inferExtensionPublisherSourceFromUrl } from '@/lib/extension-sources'
 import { errorMessage } from '@/lib/shared-utils'
 import { getEnabledCapabilityIds, isExternalExtensionId, normalizeCapabilitySelection } from '@/lib/capability-selection'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'session-tools-discovery'
 
 function grantCapabilitySelection(current: {
   tools?: string[] | null
@@ -62,7 +65,7 @@ async function executeDiscoveryAction(args: Record<string, unknown>, bctx?: Tool
   const q = typeof normalized.query === 'string' ? normalized.query : ''
   const extensionId = explicitExtensionId || (action === 'request_access' ? q.trim() : '')
 
-  console.log('[discovery] Executing action:', action, { query: q, extensionId })
+  log.info(TAG, 'Executing action:', { action, query: q, extensionId })
 
   try {
     switch (action) {
@@ -87,7 +90,7 @@ async function executeDiscoveryAction(args: Record<string, unknown>, bctx?: Tool
         const results: Record<string, unknown>[] = []
         
         try {
-          console.log('[discovery] Searching ClawHub...')
+          log.info(TAG, 'Searching ClawHub...')
           const hubResults = await searchClawHub(q)
           if (hubResults && hubResults.skills) {
             results.push(...hubResults.skills.map((s) => ({
@@ -101,11 +104,11 @@ async function executeDiscoveryAction(args: Record<string, unknown>, bctx?: Tool
             })))
           }
         } catch (err: unknown) {
-          console.error('[discovery] ClawHub search failed:', errorMessage(err))
+          log.error(TAG, 'ClawHub search failed:', errorMessage(err))
         }
 
         try {
-          console.log('[discovery] Searching SwarmClaw registry...')
+          log.info(TAG, 'Searching SwarmClaw registry...')
           const registryResults = new Map<string, Record<string, unknown>>()
           const registries = [
             { url: 'https://swarmclaw.ai/registry/extensions.json', catalogSource: 'swarmclaw-site' },
@@ -133,7 +136,7 @@ async function executeDiscoveryAction(args: Record<string, unknown>, bctx?: Tool
           }
           results.push(...registryResults.values())
         } catch (err: unknown) {
-          console.error('[discovery] SC Registry search failed:', errorMessage(err))
+          log.error(TAG, 'SC Registry search failed:', errorMessage(err))
         }
 
         if (results.length === 0) {
@@ -226,7 +229,7 @@ async function executeDiscoveryAction(args: Record<string, unknown>, bctx?: Tool
     }
   } catch (err: unknown) {
     const msg = errorMessage(err)
-    console.error('[discovery] executeDiscoveryAction failed:', msg)
+    log.error(TAG, 'executeDiscoveryAction failed:', msg)
     return `Error: ${msg}`
   }
 }

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

@@ -57,6 +57,8 @@ import {
 export type { ToolContext, SessionToolsResult }
 export { sweepOrphanedBrowsers, cleanupSessionBrowser, getActiveBrowserCount, hasActiveBrowser }
 
+const TAG = 'session-tools'
+
 const DELEGATION_TOOL_NAMES = new Set([
   'delegate',
   'spawn_subagent',
@@ -455,7 +457,7 @@ export async function buildSessionTools(cwd: string, enabledExtensions: string[]
       abortSignalRef,
     }
   } catch (err: any) {
-    console.error('[session-tools] buildSessionTools critical failure:', err.message)
+    log.error(TAG, 'buildSessionTools critical failure:', err.message)
     throw err
   }
 }

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

@@ -226,7 +226,7 @@ const PlatformExtension: Extension = {
   description: 'Unified management of agents, projects, tasks, schedules, skills, documents, and secrets.',
   hooks: {
     getCapabilityDescription: () => 'I can manage durable execution context across agents, projects, tasks, schedules, documents, skills, webhooks, connectors, sessions, and encrypted secrets.',
-    getOperatingGuidance: () => ['Use projects to hold longer-lived goals, objectives, and credential requirements.', 'Create/update tasks for long-lived goals to track progress.', 'Use schedules for follow-ups and heartbeat-style check-ins. Check existing schedules before creating new ones.', 'Inspect existing chats before creating duplicates.'],
+    getOperatingGuidance: () => ['Use projects to hold longer-lived goals, objectives, and credential requirements.', 'Create/update tasks for long-lived goals to track progress.', 'When work on a task is finished, update its status to completed with a concrete result summary. Cancel or archive tasks that are no longer relevant. Stale open tasks block project progress.', 'Use schedules for follow-ups and heartbeat-style check-ins. Check existing schedules before creating new ones.', 'Inspect existing chats before creating duplicates.'],
   } as ExtensionHooks,
   tools: [
     {

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

@@ -5,6 +5,7 @@ import type { Extension, ExtensionHooks } from '@/types'
 import { registerNativeCapability } from '../native-capabilities'
 import { normalizeToolInputArgs } from './normalize-tool-args'
 import { errorMessage, sleep } from '@/lib/shared-utils'
+import { loadAgents } from '@/lib/server/storage'
 import {
   cancelDelegationJob,
   getDelegationJob,
@@ -99,7 +100,12 @@ function validateAllowedSubagentTarget(agentId: string, ctx: ActionContext): str
     ? ctx.delegationTargetAgentIds.filter((entry): entry is string => typeof entry === 'string' && entry.trim().length > 0)
     : []
   if (allowedAgentIds.length === 0 || allowedAgentIds.includes(agentId)) return null
-  return `Error: agent "${agentId}" is not in the allowed delegate agent list.`
+
+  const agents = loadAgents()
+  const allowedNames = allowedAgentIds
+    .map(id => agents[id]?.name ? `${agents[id].name} [${id}]` : id)
+    .join(', ')
+  return `Error: agent "${agentId}" is not in your allowed delegation list. You may only delegate to: ${allowedNames}. Do not retry with this agent.`
 }
 
 function parseBooleanLike(value: unknown): boolean | unknown {
@@ -538,6 +544,21 @@ registerNativeCapability('subagent', SubagentExtension)
  */
 export function buildSubagentTools(bctx: ToolBuildContext): StructuredToolInterface[] {
   if (!bctx.ctx?.delegationEnabled || !bctx.hasExtension('spawn_subagent')) return []
+
+  let description = SubagentExtension.tools![0].description
+  if (bctx.ctx?.delegationTargetMode === 'selected') {
+    const allowedIds = (bctx.ctx.delegationTargetAgentIds || []).filter(
+      (id): id is string => typeof id === 'string' && id.trim().length > 0,
+    )
+    if (allowedIds.length > 0) {
+      const agents = loadAgents()
+      const allowedSummary = allowedIds
+        .map(id => agents[id]?.name ? `${agents[id].name} [${id}]` : id)
+        .join(', ')
+      description += ` DELEGATION RESTRICTED: You may ONLY delegate to these agents: ${allowedSummary}. Attempts to delegate to any other agent will be rejected.`
+    }
+  }
+
   return [
     tool(
       async (args) => executeSubagentAction(args, {
@@ -548,7 +569,7 @@ export function buildSubagentTools(bctx: ToolBuildContext): StructuredToolInterf
       }),
       {
         name: 'spawn_subagent',
-        description: SubagentExtension.tools![0].description,
+        description,
         schema: subagentToolSchema
       }
     )

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

@@ -39,6 +39,9 @@ import {
   simulateSolanaTransaction,
 } from '../solana'
 import { TOOL_CAPABILITY } from '../tool-planning'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'wallet'
 import { clearWalletPortfolioCache } from '@/lib/server/wallet/wallet-portfolio'
 import {
   createAgentWallet,
@@ -1042,7 +1045,7 @@ async function executeWalletAction(args: unknown, context: { agentId?: string |
   } catch (err: unknown) {
     const msg = errorMessage(err)
     if (msg.includes('429') || msg.toLowerCase().includes('too many requests')) {
-      console.warn('[wallet] Solana RPC rate-limited. Consider using a dedicated RPC endpoint (SOLANA_RPC_URL env var).')
+      log.warn(TAG, 'Solana RPC rate-limited. Consider using a dedicated RPC endpoint (SOLANA_RPC_URL env var).')
     }
     return JSON.stringify({ error: msg })
   }

package/src/lib/server/skills/clawhub-client.ts

@@ -1,5 +1,8 @@
 import type { ClawHubSkill } from '@/types'
 import { errorMessage } from '@/lib/shared-utils'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'clawhub-client'
 
 export interface ClawHubSearchResult {
   skills: ClawHubSkill[]
@@ -177,7 +180,7 @@ export async function searchClawHub(query: string, page = 1, limit = 20, cursor?
     return { skills, total, page, nextCursor: data.nextCursor }
   } catch (err: unknown) {
     const error = errorMessage(err)
-    console.warn('[clawhub] search failed:', error)
+    log.warn(TAG, 'search failed:', error)
     return { skills: [], total: 0, page, error }
   }
 }