@swarmclawai/swarmclaw 1.2.4 → 1.2.5

package/src/lib/server/protocols/protocol-normalization.ts

@@ -29,7 +29,7 @@ import type {
   ProtocolSwarmConfig,
   ProtocolTemplate,
 } from '@/types'
-import { loadProtocolRun } from '@/lib/server/storage'
+import { loadProtocolRun } from '@/lib/server/protocols/protocol-run-repository'
 import { normalizeStepOutputs } from '@/lib/server/protocols/step-outputs'
 import { cleanText, uniqueIds } from '@/lib/server/protocols/protocol-types'
 

package/src/lib/server/protocols/protocol-queries.ts

@@ -10,15 +10,20 @@ import type {
   ProtocolTemplate,
 } from '@/types'
 import {
-  loadChatrooms,
+  loadChatroom,
+  loadChatroomMany,
+} from '@/lib/server/chatrooms/chatroom-repository'
+import {
   loadMission,
+} from '@/lib/server/missions/mission-repository'
+import {
   loadProtocolRun,
   loadProtocolRuns,
-  loadTask,
   deleteProtocolRun,
   deleteProtocolRunEvent,
-  upsertChatroom,
-} from '@/lib/server/storage'
+} from '@/lib/server/protocols/protocol-run-repository'
+import { loadTask } from '@/lib/server/tasks/task-repository'
+import { upsertChatroom } from '@/lib/server/chatrooms/chatroom-repository'
 import { notify } from '@/lib/server/ws-hub'
 import type { ProtocolRunDetail } from '@/lib/server/protocols/protocol-types'
 import { loadProtocolRunById, normalizeProtocolRun } from '@/lib/server/protocols/protocol-normalization'
@@ -77,8 +82,7 @@ export function deleteProtocolRunById(runId: string): boolean {
 
   // Archive transcript chatroom
   if (run.transcriptChatroomId) {
-    const chatrooms = loadChatrooms()
-    const transcript = chatrooms[run.transcriptChatroomId]
+    const transcript = loadChatroom(run.transcriptChatroomId)
     if (transcript) {
       upsertChatroom(transcript.id, { ...transcript, archivedAt: transcript.archivedAt || Date.now() })
     }
@@ -97,7 +101,9 @@ export function deleteProtocolRunById(runId: string): boolean {
 export function getProtocolRunDetail(runId: string): ProtocolRunDetail | null {
   const run = loadProtocolRunById(runId)
   if (!run) return null
-  const chatrooms = loadChatrooms()
+  const chatrooms = loadChatroomMany(
+    [run.transcriptChatroomId, run.parentChatroomId].filter((value): value is string => Boolean(value)),
+  )
   return {
     run,
     template: loadTemplate(run.templateId),

package/src/lib/server/protocols/protocol-run-lifecycle.ts

@@ -14,13 +14,10 @@ import type {
   Schedule,
 } from '@/types'
 import { computeStepReadiness } from '@/lib/server/protocols/dag-scheduler'
-import {
-  loadAgents,
-  loadChatrooms,
-  loadProtocolRuns,
-  loadTask,
-  upsertChatroom,
-} from '@/lib/server/storage'
+import { getAgents } from '@/lib/server/agents/agent-repository'
+import { patchChatroom, upsertChatroom } from '@/lib/server/chatrooms/chatroom-repository'
+import { loadProtocolRuns } from '@/lib/server/protocols/protocol-run-repository'
+import { loadTask } from '@/lib/server/tasks/task-repository'
 import { errorMessage, hmrSingleton } from '@/lib/shared-utils'
 import { requestMissionTick } from '@/lib/server/missions/mission-service'
 import { cleanText, isDiscussionStepKind, now, uniqueIds } from '@/lib/server/protocols/protocol-types'
@@ -35,6 +32,7 @@ import {
   persistRun,
   updateRun,
 } from '@/lib/server/protocols/protocol-agent-turn'
+import { claimSwarmWorkItem, syncSwarmClaimCompletion } from '@/lib/server/protocols/protocol-swarm'
 import {
   completeProtocolRun,
   currentStep,
@@ -42,7 +40,6 @@ import {
   syncProtocolParentFromChildRun,
 } from '@/lib/server/protocols/protocol-step-helpers'
 import { stepProtocolRun } from '@/lib/server/protocols/protocol-step-processors'
-import { syncSwarmClaimCompletion } from '@/lib/server/protocols/protocol-swarm'
 
 // ---- Singletons ----
 
@@ -197,8 +194,8 @@ export function ensureProtocolEngineRecovered(deps?: ProtocolRunDeps): void {
 // ---- Create/Run/Action (G18) ----
 
 export function createProtocolRun(input: CreateProtocolRunInput, deps?: ProtocolRunDeps): ProtocolRun {
-  const agents = loadAgents()
   const participantAgentIds = uniqueIds(input.participantAgentIds, 64)
+  const agents = getAgents(participantAgentIds)
   if (participantAgentIds.length === 0) {
     throw new Error('Structured sessions require at least one participant.')
   }
@@ -330,8 +327,8 @@ export async function runProtocolRun(runId: string, deps?: ProtocolRunDeps): Pro
         appendProtocolEvent(run.id, { type: 'failed', summary: `Exceeded maximum step iterations (${MAX_STEP_ITERATIONS}).` }, deps)
         break
       }
-      // Yield to the event loop so the server can process other HTTP requests
-      await new Promise((resolve) => setTimeout(resolve, 0))
+      // Yield between steps so I/O, HTTP responses, and timers can run.
+      await new Promise(r => setTimeout(r, 0))
       const latest = loadProtocolRunById(run.id)
       if (!latest) return null
       if (latest.status === 'paused' || latest.status === 'cancelled' || latest.status === 'archived' || latest.status === 'completed') {
@@ -397,7 +394,6 @@ export async function runProtocolRun(runId: string, deps?: ProtocolRunDeps): Pro
 }
 
 export function performProtocolRunAction(runId: string, input: ProtocolRunActionInput): ProtocolRun | null {
-  const { claimSwarmWorkItem } = require('@/lib/server/protocols/protocol-swarm') as typeof import('@/lib/server/protocols/protocol-swarm')
   const run = loadProtocolRunById(runId)
   if (!run) return null
   const action = input.action
@@ -437,20 +433,20 @@ export function performProtocolRunAction(runId: string, input: ProtocolRunAction
     return updated
   }
   if (action === 'archive') {
+    const archivedAt = Date.now()
     const updated = updateRun(runId, (current) => ({
       ...current,
       status: 'archived',
-      archivedAt: current.archivedAt || Date.now(),
-      updatedAt: Date.now(),
+      archivedAt: current.archivedAt || archivedAt,
+      updatedAt: archivedAt,
     }))
     if (updated) {
       if (updated.transcriptChatroomId) {
-        const chatrooms = loadChatrooms()
-        const transcript = chatrooms[updated.transcriptChatroomId]
-        if (transcript) {
-          transcript.archivedAt = Date.now()
-          upsertChatroom(transcript.id, transcript)
-        }
+        patchChatroom(updated.transcriptChatroomId, (current) => (
+          current
+            ? { ...current, archivedAt: current.archivedAt || archivedAt }
+            : null
+        ))
       }
       appendProtocolEvent(runId, {
         type: 'archived',

package/src/lib/server/protocols/protocol-run-repository.ts

@@ -0,0 +1,81 @@
+import type { ProtocolRun, ProtocolRunEvent } from '@/types'
+
+import {
+  deleteProtocolRun as deleteStoredProtocolRun,
+  deleteProtocolRunEvent as deleteStoredProtocolRunEvent,
+  loadProtocolRun as loadStoredProtocolRun,
+  loadProtocolRunEvent as loadStoredProtocolRunEvent,
+  loadProtocolRunEvents as loadStoredProtocolRunEvents,
+  loadProtocolRunEventsByRunId as loadStoredProtocolRunEventsByRunId,
+  loadProtocolRuns as loadStoredProtocolRuns,
+  patchProtocolRun as patchStoredProtocolRun,
+  saveProtocolRunEvents as saveStoredProtocolRunEvents,
+  saveProtocolRuns as saveStoredProtocolRuns,
+  upsertProtocolRun as upsertStoredProtocolRun,
+  upsertProtocolRunEvent as upsertStoredProtocolRunEvent,
+  upsertProtocolRunEvents as upsertStoredProtocolRunEvents,
+} from '@/lib/server/storage'
+import { createRecordRepository } from '@/lib/server/persistence/repository-utils'
+
+export const protocolRunRepository = createRecordRepository<ProtocolRun>(
+  'protocol-runs',
+  {
+    get(id) {
+      return loadStoredProtocolRun(id) as ProtocolRun | null
+    },
+    list() {
+      return loadStoredProtocolRuns() as Record<string, ProtocolRun>
+    },
+    upsert(id, value) {
+      upsertStoredProtocolRun(id, value as ProtocolRun)
+    },
+    replace(data) {
+      saveStoredProtocolRuns(data as Record<string, ProtocolRun>)
+    },
+    patch(id, updater) {
+      return patchStoredProtocolRun(id, updater as (current: ProtocolRun | null) => ProtocolRun | null) as ProtocolRun | null
+    },
+    delete(id) {
+      deleteStoredProtocolRun(id)
+    },
+  },
+)
+
+export const protocolRunEventRepository = createRecordRepository<ProtocolRunEvent>(
+  'protocol-run-events',
+  {
+    get(id) {
+      return loadStoredProtocolRunEvent(id) as ProtocolRunEvent | null
+    },
+    list() {
+      return loadStoredProtocolRunEvents() as Record<string, ProtocolRunEvent>
+    },
+    upsert(id, value) {
+      upsertStoredProtocolRunEvent(id, value as ProtocolRunEvent)
+    },
+    upsertMany(entries) {
+      upsertStoredProtocolRunEvents(entries as Array<[string, ProtocolRunEvent]>)
+    },
+    replace(data) {
+      saveStoredProtocolRunEvents(data as Record<string, ProtocolRunEvent>)
+    },
+    delete(id) {
+      deleteStoredProtocolRunEvent(id)
+    },
+  },
+)
+
+export const loadProtocolRuns = () => protocolRunRepository.list()
+export const loadProtocolRun = (id: string) => protocolRunRepository.get(id)
+export const saveProtocolRuns = (items: Record<string, ProtocolRun | Record<string, unknown>>) => protocolRunRepository.replace(items as Record<string, ProtocolRun>)
+export const upsertProtocolRun = (id: string, value: ProtocolRun | Record<string, unknown>) => protocolRunRepository.upsert(id, value as ProtocolRun)
+export const patchProtocolRun = (id: string, updater: (current: ProtocolRun | null) => ProtocolRun | null) => protocolRunRepository.patch(id, updater)
+export const deleteProtocolRun = (id: string) => protocolRunRepository.delete(id)
+
+export const loadProtocolRunEvents = () => protocolRunEventRepository.list()
+export const loadProtocolRunEvent = (id: string) => protocolRunEventRepository.get(id)
+export const saveProtocolRunEvents = (items: Record<string, ProtocolRunEvent | Record<string, unknown>>) => protocolRunEventRepository.replace(items as Record<string, ProtocolRunEvent>)
+export const upsertProtocolRunEvent = (id: string, value: ProtocolRunEvent | Record<string, unknown>) => protocolRunEventRepository.upsert(id, value as ProtocolRunEvent)
+export const upsertProtocolRunEvents = (entries: Array<[string, ProtocolRunEvent | Record<string, unknown>]>) => protocolRunEventRepository.upsertMany(entries as Array<[string, ProtocolRunEvent]>)
+export const deleteProtocolRunEvent = (id: string) => protocolRunEventRepository.delete(id)
+export const loadProtocolRunEventsByRunId = (runId: string) => loadStoredProtocolRunEventsByRunId(runId)

package/src/lib/server/protocols/protocol-step-processors.ts

@@ -12,15 +12,18 @@ import type {
   ProtocolRunPhaseState,
   ProtocolStepDefinition,
 } from '@/types'
-import {
-  loadAgents,
-  upsertTask,
-} from '@/lib/server/storage'
+import { errorMessage } from '@/lib/shared-utils'
+import { getAgents } from '@/lib/server/agents/agent-repository'
+import { upsertTask } from '@/lib/server/tasks/task-repository'
 import { notify } from '@/lib/server/ws-hub'
 import { ensureMissionForTask } from '@/lib/server/missions/mission-service'
 import { enqueueTask } from '@/lib/server/runtime/queue'
 import { cleanText, isDiscussionStepKind, now, uniqueIds } from '@/lib/server/protocols/protocol-types'
 import type { ProtocolRunDeps } from '@/lib/server/protocols/protocol-types'
+import type * as ProtocolRunLifecycle from '@/lib/server/protocols/protocol-run-lifecycle'
+import { processForEachStep } from '@/lib/server/protocols/protocol-foreach'
+import { processSubflowStep } from '@/lib/server/protocols/protocol-subflow'
+import { processSwarmStep } from '@/lib/server/protocols/protocol-swarm'
 import { findRunStep } from '@/lib/server/protocols/protocol-normalization'
 import {
   appendProtocolEvent,
@@ -28,7 +31,6 @@ import {
   buildPhasePrompt,
   chooseFacilitator,
   createArtifact,
-  createTranscriptRoom,
   defaultExecuteAgentTurn,
   defaultExtractActionItems,
   persistRun,
@@ -91,6 +93,7 @@ export async function collectResponses(
   let current = run
   const responded = new Set(current.phaseState?.respondedAgentIds || [])
   const cachedResponses = Array.isArray(current.phaseState?.responses) ? [...current.phaseState.responses] : []
+  const participantAgents = getAgents(current.participantAgentIds)
 
   for (const agentId of current.participantAgentIds) {
     if (responded.has(agentId)) continue
@@ -104,8 +107,7 @@ export async function collectResponses(
         prompt: buildPhasePrompt(current, phase, agentId),
       })
     } catch (err: unknown) {
-      const { errorMessage: getErrorMessage } = require('@/lib/shared-utils') as typeof import('@/lib/shared-utils')
-      const errMsg = cleanText(getErrorMessage(err), 200) || 'unknown error'
+      const errMsg = cleanText(errorMessage(err), 200) || 'unknown error'
       appendProtocolEvent(current.id, {
         type: 'warning',
         phaseId: phase.id,
@@ -128,10 +130,9 @@ export async function collectResponses(
       updatedAt: now(deps),
     })
     if (appendImmediately && current.transcriptChatroomId) {
-      const agents = loadAgents()
       appendTranscriptMessage(current.transcriptChatroomId, {
         senderId: agentId,
-        senderName: agents[agentId]?.name || agentId,
+        senderName: participantAgents[agentId]?.name || agentId,
         role: 'assistant',
         text: response.text,
         mentions: [],
@@ -142,17 +143,16 @@ export async function collectResponses(
         type: 'participant_response',
         phaseId: phase.id,
         agentId,
-        summary: `Captured a response from ${agents[agentId]?.name || agentId}.`,
+        summary: `Captured a response from ${participantAgents[agentId]?.name || agentId}.`,
       }, deps)
     }
   }
 
   if (!appendImmediately && current.transcriptChatroomId && current.phaseState?.appendedToTranscript !== true) {
-    const agents = loadAgents()
     for (const response of cachedResponses) {
       appendTranscriptMessage(current.transcriptChatroomId, {
         senderId: response.agentId,
-        senderName: agents[response.agentId]?.name || response.agentId,
+        senderName: participantAgents[response.agentId]?.name || response.agentId,
         role: 'assistant',
         text: response.text,
         mentions: [],
@@ -163,7 +163,7 @@ export async function collectResponses(
         type: 'participant_response',
         phaseId: phase.id,
         agentId: response.agentId,
-        summary: `Captured an independent response from ${agents[response.agentId]?.name || response.agentId}.`,
+        summary: `Captured an independent response from ${participantAgents[response.agentId]?.name || response.agentId}.`,
       }, deps)
     }
     current = persistRun({
@@ -199,7 +199,7 @@ export async function processFacilitatorArtifactPhase(
     prompt: buildPhasePrompt(run, phase, facilitatorId),
   })
   const artifact = createArtifact(run, phase, kind, phase.label, result.text, deps)
-  const agents = loadAgents()
+  const agents = getAgents([facilitatorId])
   if (run.transcriptChatroomId) {
     appendTranscriptMessage(run.transcriptChatroomId, {
       senderId: facilitatorId,
@@ -221,8 +221,11 @@ export async function processEmitTasksPhase(run: ProtocolRun, phase: ProtocolPha
   if (!artifact) return finishPhase(run, phase, deps)
   const extractActionItems = deps?.extractActionItems || defaultExtractActionItems
   const extracted = await extractActionItems({ run, phase, artifact })
-  const agents = loadAgents()
   const fallbackAssignee = chooseFacilitator(run) || run.participantAgentIds[0] || ''
+  const agents = getAgents(uniqueIds([
+    fallbackAssignee,
+    ...extracted.map((item) => item.agentId || ''),
+  ], 64))
   const createdTaskIds: string[] = []
   const linkedMissionId = typeof run.missionId === 'string' ? run.missionId : null
   const taskProjectId = run.config?.taskProjectId || null
@@ -396,6 +399,8 @@ function buildJoinArtifactContent(branches: ProtocolRunParallelBranchState[]): s
 }
 
 export async function processParallelStep(run: ProtocolRun, step: ProtocolStepDefinition, deps?: ProtocolRunDeps): Promise<ProtocolRun> {
+  // Lazy import to avoid circular dependency
+  const { createProtocolRun, requestProtocolRunExecution } = require('@/lib/server/protocols/protocol-run-lifecycle') as typeof ProtocolRunLifecycle
   const parallel = step.parallel
   if (!parallel?.branches?.length) {
     throw new Error(`Parallel step "${step.label}" is missing branches.`)
@@ -417,10 +422,6 @@ export async function processParallelStep(run: ProtocolRun, step: ProtocolStepDe
     data: { joinStepId, branchCount: parallel.branches.length },
   }, deps)
 
-  // Lazy import to avoid circular dependency
-  const { createProtocolRun } = require('@/lib/server/protocols/protocol-run-lifecycle') as typeof import('@/lib/server/protocols/protocol-run-lifecycle')
-  const { requestProtocolRunExecution } = require('@/lib/server/protocols/protocol-run-lifecycle') as typeof import('@/lib/server/protocols/protocol-run-lifecycle')
-
   for (const branch of parallel.branches) {
     const participantAgentIds = uniqueIds(
       Array.isArray(branch.participantAgentIds) && branch.participantAgentIds.length > 0
@@ -706,18 +707,9 @@ export async function stepProtocolRun(run: ProtocolRun, deps?: ProtocolRunDeps):
   if (step.kind === 'repeat') return processRepeatStep(run, step, deps)
   if (step.kind === 'parallel') return processParallelStep(run, step, deps)
   if (step.kind === 'join') return processJoinStep(run, step, deps)
-  if (step.kind === 'for_each') {
-    const { processForEachStep } = require('@/lib/server/protocols/protocol-foreach') as typeof import('@/lib/server/protocols/protocol-foreach')
-    return processForEachStep(run, step, deps)
-  }
-  if (step.kind === 'subflow') {
-    const { processSubflowStep } = require('@/lib/server/protocols/protocol-subflow') as typeof import('@/lib/server/protocols/protocol-subflow')
-    return processSubflowStep(run, step, deps)
-  }
-  if (step.kind === 'swarm_claim') {
-    const { processSwarmStep } = require('@/lib/server/protocols/protocol-swarm') as typeof import('@/lib/server/protocols/protocol-swarm')
-    return processSwarmStep(run, step, deps)
-  }
+  if (step.kind === 'for_each') return processForEachStep(run, step, deps)
+  if (step.kind === 'subflow') return processSubflowStep(run, step, deps)
+  if (step.kind === 'swarm_claim') return processSwarmStep(run, step, deps)
   if (step.kind === 'complete') {
     const started = beginStep(run, step, deps)
     const finished = finishStep(started, step, null, deps)

package/src/lib/server/protocols/protocol-swarm.ts

@@ -10,14 +10,12 @@ import type {
   ProtocolStepDefinition,
   ProtocolSwarmConfig,
 } from '@/types'
-import {
-  loadProtocolRuns,
-  loadTask,
-  upsertTask,
-} from '@/lib/server/storage'
+import { loadProtocolRuns } from '@/lib/server/protocols/protocol-run-repository'
+import { loadTask, upsertTask } from '@/lib/server/tasks/task-repository'
 import { notify } from '@/lib/server/ws-hub'
 import { enqueueTask } from '@/lib/server/runtime/queue'
-import { cleanText, now } from '@/lib/server/protocols/protocol-types'
+import type * as ProtocolRunLifecycle from '@/lib/server/protocols/protocol-run-lifecycle'
+import { now } from '@/lib/server/protocols/protocol-types'
 import type { ProtocolRunDeps } from '@/lib/server/protocols/protocol-types'
 import { findRunStep, loadProtocolRunById, normalizeProtocolRun } from '@/lib/server/protocols/protocol-normalization'
 import {
@@ -237,7 +235,8 @@ export function claimSwarmWorkItem(
 }
 
 export function syncSwarmClaimCompletion(taskId: string, deps?: ProtocolRunDeps): void {
-  const { requestProtocolRunExecution } = require('@/lib/server/protocols/protocol-run-lifecycle') as typeof import('@/lib/server/protocols/protocol-run-lifecycle')
+  // Lazy import to avoid circular dependency
+  const { requestProtocolRunExecution } = require('@/lib/server/protocols/protocol-run-lifecycle') as typeof ProtocolRunLifecycle
   const task = loadTask(taskId)
   if (!task?.protocolRunId) return
   const run = loadProtocolRunById(task.protocolRunId)
@@ -302,7 +301,8 @@ export function syncSwarmClaimCompletion(taskId: string, deps?: ProtocolRunDeps)
 }
 
 export function checkSwarmTimeouts(deps?: ProtocolRunDeps): void {
-  const { requestProtocolRunExecution } = require('@/lib/server/protocols/protocol-run-lifecycle') as typeof import('@/lib/server/protocols/protocol-run-lifecycle')
+  // Lazy import to avoid circular dependency
+  const { requestProtocolRunExecution } = require('@/lib/server/protocols/protocol-run-lifecycle') as typeof ProtocolRunLifecycle
   const runs = Object.values(loadProtocolRuns()).map(normalizeProtocolRun)
   const timestamp = now(deps)
   for (const run of runs) {

package/src/lib/server/protocols/protocol-template-repository.ts

@@ -0,0 +1,42 @@
+import type { ProtocolTemplate } from '@/types'
+
+import {
+  deleteProtocolTemplate as deleteStoredProtocolTemplate,
+  loadProtocolTemplate as loadStoredProtocolTemplate,
+  loadProtocolTemplates as loadStoredProtocolTemplates,
+  patchProtocolTemplate as patchStoredProtocolTemplate,
+  saveProtocolTemplates as saveStoredProtocolTemplates,
+  upsertProtocolTemplate as upsertStoredProtocolTemplate,
+} from '@/lib/server/storage'
+import { createRecordRepository } from '@/lib/server/persistence/repository-utils'
+
+export const protocolTemplateRepository = createRecordRepository<ProtocolTemplate>(
+  'protocol-templates',
+  {
+    get(id) {
+      return loadStoredProtocolTemplate(id) as ProtocolTemplate | null
+    },
+    list() {
+      return loadStoredProtocolTemplates() as Record<string, ProtocolTemplate>
+    },
+    upsert(id, value) {
+      upsertStoredProtocolTemplate(id, value as ProtocolTemplate)
+    },
+    replace(data) {
+      saveStoredProtocolTemplates(data as Record<string, ProtocolTemplate>)
+    },
+    patch(id, updater) {
+      return patchStoredProtocolTemplate(id, updater as (current: ProtocolTemplate | null) => ProtocolTemplate | null) as ProtocolTemplate | null
+    },
+    delete(id) {
+      deleteStoredProtocolTemplate(id)
+    },
+  },
+)
+
+export const loadProtocolTemplates = () => protocolTemplateRepository.list()
+export const loadProtocolTemplate = (id: string) => protocolTemplateRepository.get(id)
+export const saveProtocolTemplates = (items: Record<string, ProtocolTemplate | Record<string, unknown>>) => protocolTemplateRepository.replace(items as Record<string, ProtocolTemplate>)
+export const upsertProtocolTemplate = (id: string, value: ProtocolTemplate | Record<string, unknown>) => protocolTemplateRepository.upsert(id, value as ProtocolTemplate)
+export const patchProtocolTemplate = (id: string, updater: (current: ProtocolTemplate | null) => ProtocolTemplate | null) => protocolTemplateRepository.patch(id, updater)
+export const deleteProtocolTemplate = (id: string) => protocolTemplateRepository.delete(id)

package/src/lib/server/protocols/protocol-templates.ts

@@ -9,11 +9,13 @@ import {
   loadProtocolTemplate,
   loadProtocolTemplates,
   patchProtocolTemplate,
+  upsertProtocolTemplate,
+} from '@/lib/server/protocols/protocol-template-repository'
+import {
   releaseRuntimeLock,
   renewRuntimeLock,
   tryAcquireRuntimeLock,
-  upsertProtocolTemplate,
-} from '@/lib/server/storage'
+} from '@/lib/server/runtime/runtime-lock-repository'
 import { notify } from '@/lib/server/ws-hub'
 import { cleanText, now, PROTOCOL_LOCK_TTL_MS, uniqueIds } from '@/lib/server/protocols/protocol-types'
 import type { ProtocolRunDeps, UpsertProtocolTemplateInput } from '@/lib/server/protocols/protocol-types'

package/src/lib/server/protocols/protocol-types.ts

@@ -3,7 +3,10 @@
  * Groups G1 + G2 from protocol-service.ts
  */
 import type {
+  BoardTask,
+  Chatroom,
   MessageToolEvent,
+  Mission,
   ProtocolBranchCase,
   ProtocolPhaseDefinition,
   ProtocolRepeatConfig,
@@ -26,10 +29,10 @@ export const AGENT_TURN_TIMEOUT_MS = 90_000
 export interface ProtocolRunDetail {
   run: ProtocolRun
   template: ProtocolTemplate | null
-  transcript: import('@/types').Chatroom | null
-  parentChatroom: import('@/types').Chatroom | null
-  linkedMission: ReturnType<typeof import('@/lib/server/storage').loadMission>
-  linkedTask: ReturnType<typeof import('@/lib/server/storage').loadTask>
+  transcript: Chatroom | null
+  parentChatroom: Chatroom | null
+  linkedMission: Mission | null
+  linkedTask: BoardTask | null
   events: ProtocolRunEvent[]
 }
 
@@ -115,9 +118,9 @@ export function now(deps?: ProtocolRunDeps): number {
   return deps?.now ? deps.now() : Date.now()
 }
 
-export function cleanText(value: unknown, max = 1200): string {
-  return typeof value === 'string' ? value.replace(/\s+/g, ' ').trim().slice(0, max) : ''
-}
+import { cleanText } from '@/lib/server/text-normalization'
+
+export { cleanText }
 
 export function uniqueIds(values: unknown, maxItems = 64): string[] {
   const source = Array.isArray(values) ? values : []

package/src/lib/server/provider-endpoint.ts

@@ -1,7 +1,8 @@
 import { normalizeProviderEndpoint } from '@/lib/openclaw/openclaw-endpoint'
 import { getProvider } from '@/lib/providers'
+import { loadCredential } from '@/lib/server/credentials/credential-repository'
+import { listCredentialIdsByProvider, resolveCredentialSecret } from '@/lib/server/credentials/credential-service'
 import { resolveOllamaRuntimeConfig } from '@/lib/server/ollama-runtime'
-import { decryptKey, loadCredentials } from '@/lib/server/storage'
 
 function clean(value: string | null | undefined): string | null {
   if (typeof value !== 'string') return null
@@ -16,14 +17,14 @@ export function resolveProviderCredentialId(input: {
 }): string | null {
   const normalizedId = clean(input.credentialId)
   if (!normalizedId) return null
-  const credentials = loadCredentials()
-  if (normalizedId && credentials[normalizedId]) return normalizedId
+  if (loadCredential(normalizedId)) return normalizedId
 
   const provider = clean(input.provider)
   if (!provider) return normalizedId
 
-  const matchingEntries = Object.entries(credentials)
-    .filter(([, credential]) => credential?.provider === provider)
+  const matchingEntries = listCredentialIdsByProvider(provider)
+    .map((id) => [id, loadCredential(id)] as const)
+    .filter(([, credential]) => Boolean(credential))
 
   if (provider === 'ollama' && clean(input.ollamaMode) === 'cloud' && matchingEntries.length > 0) {
     return [...matchingEntries]
@@ -43,13 +44,7 @@ export function resolveProviderCredentialId(input: {
 function resolveCredentialApiKey(credentialId?: string | null): string | null {
   const normalized = resolveProviderCredentialId({ credentialId })
   if (!normalized) return null
-  const credential = loadCredentials()[normalized]
-  if (!credential?.encryptedKey) return null
-  try {
-    return decryptKey(credential.encryptedKey)
-  } catch {
-    return null
-  }
+  return resolveCredentialSecret(normalized)
 }
 
 export function resolveProviderApiEndpoint(input: {

package/src/lib/server/provider-model-discovery.ts

@@ -3,7 +3,7 @@ import { hmrSingleton } from '@/lib/shared-utils'
 import { getProviderList } from '@/lib/providers'
 import { isOllamaCloudEndpoint, resolveStoredOllamaMode } from '@/lib/ollama-mode'
 import { OPENAI_COMPATIBLE_DEFAULTS } from '@/lib/server/provider-health'
-import { decryptKey, loadCredentials } from '@/lib/server/storage'
+import { resolveCredentialSecret } from '@/lib/server/credentials/credential-service'
 import type { ProviderInfo, ProviderModelDiscoveryResult } from '@/types'
 
 type DiscoveryStrategy = 'openai-compatible' | 'anthropic' | 'google' | 'ollama' | 'openclaw'
@@ -192,16 +192,7 @@ export function parseErrorMessage(text: string, fallback: string): string {
 }
 
 function resolveCredentialApiKey(credentialId: string | null | undefined): string | null {
-  const id = clean(credentialId)
-  if (!id) return null
-  try {
-    const credentials = loadCredentials()
-    const credential = credentials[id]
-    if (!credential?.encryptedKey) return null
-    return decryptKey(credential.encryptedKey)
-  } catch {
-    return null
-  }
+  return resolveCredentialSecret(credentialId)
 }
 
 function hashApiKey(apiKey: string | null): string {

package/src/lib/server/query-expansion.ts

@@ -1,4 +1,6 @@
-import { loadAgents, loadSettings, loadCredentials, decryptKey } from './storage'
+import { getAgent } from './agents/agent-repository'
+import { resolveCredentialSecret } from './credentials/credential-service'
+import { loadSettings } from './settings/settings-repository'
 import { getProvider } from '../providers'
 import { log } from '@/lib/server/logger'
 
@@ -9,18 +11,15 @@ const TAG = 'query-expansion'
  * to improve vector database recall (OpenClaw-style).
  */
 export async function expandQuery(query: string): Promise<string[]> {
-  const agents = loadAgents()
   const settings = loadSettings()
   const defaultAgentId = typeof settings.defaultAgentId === 'string' ? settings.defaultAgentId : ''
-  const defaultAgent = defaultAgentId ? agents[defaultAgentId] : null
+  const defaultAgent = defaultAgentId ? getAgent(defaultAgentId) : null
   if (!defaultAgent) return [query]
 
   const providerEntry = getProvider(defaultAgent.provider)
   if (!providerEntry?.handler?.streamChat) return [query]
 
-  const creds = loadCredentials()
-  const cred = creds[defaultAgent.credentialId || '']
-  const apiKey = cred ? decryptKey(cred.encryptedKey) : undefined
+  const apiKey = resolveCredentialSecret(defaultAgent.credentialId) || undefined
 
   const systemPrompt = `You are a search query expansion assistant.
 Given a user's question, generate 3 different semantic search queries that would help find the answer in a vector database.