@swarmclawai/swarmclaw 1.2.0 → 1.2.2

package/src/lib/server/agents/main-loop-state-repository.ts

@@ -0,0 +1,38 @@
+import { perf } from '@/lib/server/runtime/perf'
+import {
+  deletePersistedMainLoopState as deleteStoredMainLoopState,
+  loadPersistedMainLoopState as loadStoredMainLoopState,
+  upsertPersistedMainLoopState as upsertStoredMainLoopState,
+} from '@/lib/server/storage'
+
+export type PersistedMainLoopState = Record<string, unknown>
+
+export function loadPersistedMainLoopState(sessionId: string): PersistedMainLoopState | null {
+  return perf.measureSync(
+    'repository',
+    'main-loop-state.get',
+    () => loadStoredMainLoopState(sessionId) as PersistedMainLoopState | null,
+    { sessionId },
+  )
+}
+
+export function upsertPersistedMainLoopState(
+  sessionId: string,
+  value: PersistedMainLoopState,
+): void {
+  perf.measureSync(
+    'repository',
+    'main-loop-state.upsert',
+    () => upsertStoredMainLoopState(sessionId, value),
+    { sessionId },
+  )
+}
+
+export function deletePersistedMainLoopState(sessionId: string): void {
+  perf.measureSync(
+    'repository',
+    'main-loop-state.delete',
+    () => deleteStoredMainLoopState(sessionId),
+    { sessionId },
+  )
+}

package/src/lib/server/agents/subagent-runtime.ts

@@ -8,7 +8,7 @@
 
 import { genId } from '@/lib/id'
 import { DEFAULT_DELEGATION_MAX_DEPTH } from '@/lib/runtime/runtime-loop'
-import { loadAgents, loadSessions, saveSessions } from '@/lib/server/storage'
+import { loadAgents } from '@/lib/server/agents/agent-repository'
 import { enqueueSessionRun, type EnqueueSessionRunResult } from '@/lib/server/runtime/session-run-manager'
 import { loadRuntimeSettings } from '@/lib/server/runtime/runtime-settings'
 import { applyResolvedRoute, resolvePrimaryAgentRoute } from '@/lib/server/agents/agent-runtime-config'
@@ -48,6 +48,7 @@ import { debug } from '@/lib/server/debug'
 import { logExecution } from '@/lib/server/execution-log'
 import { enqueueSystemEvent } from '@/lib/server/runtime/system-events'
 import { getEnabledCapabilityIds, splitCapabilityIds } from '@/lib/capability-selection'
+import { getSession, loadSessions, saveSession } from '@/lib/server/sessions/session-repository'
 
 // ---------------------------------------------------------------------------
 // Types
@@ -276,7 +277,7 @@ async function spawnSubagentImpl(
     browserProfileId,
   }
   sessions[sid] = applyResolvedRoute(nextSession, resolvePrimaryAgentRoute(agent))
-  saveSessions(sessions)
+  saveSession(sid, sessions[sid])
 
   log.info('subagent', 'Spawning', { agentId: agent.id, agentName: agent.name, depth: depth + 1, jobId: job.id, sessionId: sid })
   logExecution(sid, 'delegation_start', `Subagent spawning: ${agent.name}`, {
@@ -398,12 +399,13 @@ async function spawnSubagentImpl(
           `subagent:${job.id}`,
         )
       }
+      const completedSession = getSession(sid)
       await runCapabilityHook(
         'sessionEnd',
         {
           sessionId: sid,
-          session: loadSessions()[sid] || null,
-          messageCount: Array.isArray(loadSessions()[sid]?.messages) ? loadSessions()[sid].messages.length : 0,
+          session: completedSession,
+          messageCount: Array.isArray(completedSession?.messages) ? completedSession.messages.length : 0,
           durationMs: subagentResult.durationMs,
           reason: subagentResult.status,
         },
@@ -460,12 +462,13 @@ async function spawnSubagentImpl(
           `subagent:${job.id}`,
         )
       }
+      const failedSession = getSession(sid)
       await runCapabilityHook(
         'sessionEnd',
         {
           sessionId: sid,
-          session: loadSessions()[sid] || null,
-          messageCount: Array.isArray(loadSessions()[sid]?.messages) ? loadSessions()[sid].messages.length : 0,
+          session: failedSession,
+          messageCount: Array.isArray(failedSession?.messages) ? failedSession.messages.length : 0,
           durationMs: subagentResult.durationMs,
           reason: subagentResult.status,
         },

package/src/lib/server/agents/subagent-swarm.ts

@@ -13,22 +13,23 @@ import { genId } from '@/lib/id'
 import { errorMessage, hmrSingleton, sleep } from '@/lib/shared-utils'
 import { log } from '@/lib/server/logger'
 import { logExecution } from '@/lib/server/execution-log'
-import { logActivity } from '@/lib/server/storage'
+import { logActivity } from '@/lib/server/activity/activity-log'
 import { createNotification } from '@/lib/server/create-notification'
 import { notify } from '@/lib/server/ws-hub'
+import { loadAgents } from '@/lib/server/agents/agent-repository'
 import {
   spawnSubagent,
   type SubagentContext,
   type SubagentHandle,
   type SubagentResult,
 } from '@/lib/server/agents/subagent-runtime'
-import { loadAgents, loadSessions } from '@/lib/server/storage'
 import { getDelegationJob } from '@/lib/server/agents/delegation-jobs'
 import {
   getLineageNode,
   cancelLineageNode,
   type SubagentState,
 } from '@/lib/server/agents/subagent-lineage'
+import { loadSessions } from '@/lib/server/sessions/session-repository'
 import type { Agent } from '@/types'
 
 // ---------------------------------------------------------------------------

package/src/lib/server/agents/task-session.ts

@@ -1,9 +1,9 @@
 import { genId } from '@/lib/id'
-import { loadSessions, saveSessions } from '@/lib/server/storage'
 import { WORKSPACE_DIR } from '@/lib/server/data-dir'
 import type { Agent } from '@/types'
 import { getEnabledCapabilitySelection } from '@/lib/capability-selection'
 import { applyResolvedRoute, resolvePrimaryAgentRoute } from '@/lib/server/agents/agent-runtime-config'
+import { saveSession } from '@/lib/server/sessions/session-repository'
 
 export function createAgentTaskSession(
   agent: Agent,
@@ -15,7 +15,6 @@ export function createAgentTaskSession(
     preferredGatewayUseCase?: string | null
   } | null,
 ): string {
-  const sessions = loadSessions()
   const sessionId = genId()
   const preferredGatewayTags = Array.isArray(routePreferences?.preferredGatewayTags)
     ? routePreferences.preferredGatewayTags.filter((tag) => typeof tag === 'string' && tag.trim())
@@ -25,7 +24,7 @@ export function createAgentTaskSession(
     preferredGatewayUseCase: routePreferences?.preferredGatewayUseCase || null,
   })
 
-  sessions[sessionId] = applyResolvedRoute({
+  const session = applyResolvedRoute({
     id: sessionId,
     name: `[Task] ${agent.name}: ${task.slice(0, 40)}`,
     cwd: cwd || WORKSPACE_DIR,
@@ -57,6 +56,6 @@ export function createAgentTaskSession(
     heartbeatEnabled: false,
   }, resolvedRoute)
 
-  saveSessions(sessions)
+  saveSession(sessionId, session)
   return sessionId
 }

package/src/lib/server/approvals/approval-repository.ts

@@ -0,0 +1,30 @@
+import {
+  deleteApproval as deleteStoredApproval,
+  loadApprovals as loadStoredApprovals,
+  upsertApproval as upsertStoredApproval,
+} from '@/lib/server/storage'
+import { createRecordRepository } from '@/lib/server/persistence/repository-utils'
+import type { ApprovalRequest } from '@/types'
+
+export const approvalRepository = createRecordRepository<ApprovalRequest>(
+  'approvals',
+  {
+    get(id) {
+      return loadStoredApprovals()[id] || null
+    },
+    list() {
+      return loadStoredApprovals() as Record<string, ApprovalRequest>
+    },
+    upsert(id, value) {
+      upsertStoredApproval(id, value)
+    },
+    delete(id) {
+      deleteStoredApproval(id)
+    },
+  },
+)
+
+export const loadApprovals = () => approvalRepository.list()
+export const loadApproval = (id: string) => approvalRepository.get(id)
+export const upsertApproval = (id: string, value: ApprovalRequest | Record<string, unknown>) => approvalRepository.upsert(id, value as ApprovalRequest)
+export const deleteApproval = (id: string) => approvalRepository.delete(id)

package/src/lib/server/autonomy/supervisor-incident-repository.ts

@@ -0,0 +1,42 @@
+import type { SupervisorIncident } from '@/types'
+
+import {
+  loadSupervisorIncident as loadStoredSupervisorIncident,
+  loadSupervisorIncidents as loadStoredSupervisorIncidents,
+  saveSupervisorIncidents as saveStoredSupervisorIncidents,
+  upsertSupervisorIncident as upsertStoredSupervisorIncident,
+} from '@/lib/server/storage'
+import { createRecordRepository } from '@/lib/server/persistence/repository-utils'
+
+export const supervisorIncidentRepository = createRecordRepository<SupervisorIncident>(
+  'supervisor-incidents',
+  {
+    get(id) {
+      return loadStoredSupervisorIncident(id) as SupervisorIncident | null
+    },
+    list() {
+      return loadStoredSupervisorIncidents() as Record<string, SupervisorIncident>
+    },
+    upsert(id, value) {
+      upsertStoredSupervisorIncident(id, value as SupervisorIncident)
+    },
+    replace(data) {
+      saveStoredSupervisorIncidents(data as Record<string, SupervisorIncident>)
+    },
+  },
+)
+
+export const loadSupervisorIncidents = () => supervisorIncidentRepository.list()
+export const loadSupervisorIncident = (id: string) => supervisorIncidentRepository.get(id)
+export const saveSupervisorIncidents = (items: Record<string, SupervisorIncident | Record<string, unknown>>) => (
+  supervisorIncidentRepository.replace(items as Record<string, SupervisorIncident>)
+)
+export const upsertSupervisorIncident = (id: string, value: SupervisorIncident | Record<string, unknown>) => (
+  supervisorIncidentRepository.upsert(id, value as SupervisorIncident)
+)
+
+export function listAgentIncidents(agentId?: string): SupervisorIncident[] {
+  return Object.values(loadSupervisorIncidents())
+    .filter((incident) => !agentId || incident.agentId === agentId)
+    .sort((left, right) => right.createdAt - left.createdAt)
+}

package/src/lib/server/autonomy/supervisor-reflection.ts

@@ -34,6 +34,8 @@ import { logExecution } from '@/lib/server/execution-log'
 import { logActivity } from '@/lib/server/storage'
 import { createNotification } from '@/lib/server/create-notification'
 
+const TAG = 'supervisor-reflection'
+
 const MAIN_LOOP_META_LINE_RE = /\[(?:MAIN_LOOP_META|MAIN_LOOP_PLAN|MAIN_LOOP_REVIEW|AGENT_HEARTBEAT_META)\]\s*(\{[^\n]*\})?/i
 const DEFAULT_TRANSCRIPT_MESSAGES = 12
 const DEFAULT_SNIPPET_CHARS = 800
@@ -368,6 +370,17 @@ export function assessAutonomyRun(input: {
   if (strongest?.kind === 'budget_pressure' && strongest.severity === 'high') shouldBlock = true
   if (strongest?.kind === 'run_error' && (status === 'failed' || status === 'cancelled')) shouldBlock = true
 
+  // Block after 3+ no_progress or repeated_tool incidents within 30 minutes for the same session
+  if (!shouldBlock && strongest && (strongest.kind === 'no_progress' || strongest.kind === 'repeated_tool')) {
+    const existingIncidents = Object.values(loadSupervisorIncidents()) as SupervisorIncident[]
+    const recentSame = existingIncidents.filter((i) =>
+      i.sessionId === input.sessionId
+      && i.createdAt > Date.now() - 30 * 60_000
+      && (i.kind === 'no_progress' || i.kind === 'repeated_tool'),
+    )
+    if (recentSame.length >= 3) shouldBlock = true
+  }
+
   const seen = new Set<string>()
   const autoActions: AutonomyAssessment['autoActions'] = []
   for (const incident of incidents) {
@@ -1023,7 +1036,7 @@ export async function observeAutonomyRunOutcome(
   try {
     parsed = parseReflectionResponse(responseText)
   } catch {
-    console.warn(`[autonomy] Reflection parse failed for run ${input.runId}, skipping reflection`)
+    log.warn(TAG, `Reflection parse failed for run ${input.runId}, skipping reflection`)
     return { incidents, reflection: null }
   }
   if (parsed.skip) return { incidents, reflection: null }

package/src/lib/server/chat-execution/chat-execution-types.ts

@@ -0,0 +1,38 @@
+import type { MessageToolEvent, SSEEvent } from '@/types'
+
+export interface ExecuteChatTurnInput {
+  sessionId: string
+  message: string
+  missionId?: string | null
+  imagePath?: string
+  imageUrl?: string
+  attachedFiles?: string[]
+  internal?: boolean
+  source?: string
+  runId?: string
+  signal?: AbortSignal
+  onEvent?: (event: SSEEvent) => void
+  modelOverride?: string
+  heartbeatConfig?: {
+    ackMaxChars: number
+    showOk: boolean
+    showAlerts: boolean
+    target: string | null
+    lightContext?: boolean
+    deliveryMode?: 'default' | 'tool_only' | 'silent'
+  }
+  replyToId?: string
+}
+
+export interface ExecuteChatTurnResult {
+  runId?: string
+  sessionId: string
+  missionId?: string | null
+  text: string
+  persisted: boolean
+  toolEvents: MessageToolEvent[]
+  error?: string
+  inputTokens?: number
+  outputTokens?: number
+  estimatedCost?: number
+}

package/src/lib/server/chat-execution/chat-execution-utils.ts

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import type { Message, MessageToolEvent } from '@/types'
 import { dedup } from '@/lib/shared-utils'
-import { getUsageSpendSince } from '@/lib/server/storage'
+import { getUsageSpendSince } from '@/lib/server/usage/usage-repository'
 import { extensionIdMatches } from '@/lib/server/tool-aliases'
 import { buildToolEventAssistantSummary } from '@/lib/chat/tool-event-summary'
 import { looksLikePositiveConnectorDeliveryText } from '@/lib/server/chat-execution/chat-execution-connector-delivery'