@swarmclawai/swarmclaw 1.3.3 → 1.3.4

package/README.md

@@ -204,6 +204,10 @@ Read the full setup guide in [`SWARMDOCK.md`](./SWARMDOCK.md), browse the public
 
 ## Release Notes
 
+### v1.3.4 Highlights
+
+- **Bug fix — custom provider loading under Turbopack (#32)**: converted all CommonJS `require()` calls across the codebase to ES module imports, fixing "Unknown provider: custom-\<id\>" errors and other potential Turbopack compatibility issues. Affected modules: providers, provider health, subagent swarm, prompt builder, chat finalization, CLI utils, and OpenClaw connectors. Thanks to @psywolf85 for the initial fix.
+
 ### v1.3.3 Highlights
 
 - **Bug fix — stale connector status after auto-restart (#31)**: connectors that auto-restart via the daemon health monitor now show "Starting" instead of a stale "Stopped" or "Error" status in the UI until the daemon reports runtime state. Added `starting` to the `ConnectorStatus` type and updated both the connector list and detail views.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Self-hosted AI runtime for OpenClaw, delegation, autonomy, runtime skills, crypto wallets, and chat platform connectors.",
   "license": "MIT",
   "publishConfig": {

package/src/lib/providers/cli-utils.ts

@@ -8,6 +8,7 @@
 
 import fs from 'fs'
 import os from 'os'
+import { findBinaryOnPath } from '../server/session-tools/context'
 import path from 'path'
 import { spawnSync, type ChildProcess } from 'child_process'
 import { log } from '../server/logger'
@@ -63,10 +64,8 @@ function getNvmBinaryPaths(name: string): string[] {
  * then falls back to known paths + nvm paths.
  */
 export function resolveCliBinary(name: string, extraPaths?: string[]): string | null {
-  // Lazy import to avoid circular dependency at module load
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const { findBinaryOnPath } = require('../server/session-tools/context')
-  const fromPath = findBinaryOnPath(name) as string | null
+  const fromPath = findBinaryOnPath(name)
+
   if (fromPath) return fromPath
 
   const paths = [

package/src/lib/providers/index.ts

@@ -11,6 +11,8 @@ import { errorMessage, sleep, jitteredBackoff } from '@/lib/shared-utils'
 import { classifyProviderError } from './error-classification'
 import { log } from '@/lib/server/logger'
 import type { ProviderInfo, ProviderConfig as CustomProviderConfig, ProviderType, ProviderId } from '../../types'
+import { loadProviderConfigs, loadModelOverrides, loadStoredItem, loadCredentials, decryptKey } from '@/lib/server/storage'
+import { getExtensionManager } from '@/lib/server/extensions'
 
 const TAG = 'providers'
 
@@ -289,8 +291,6 @@ export const PROVIDERS: Record<string, BuiltinProviderConfig> = {
 /** Merge built-in providers with custom providers from storage */
 function getCustomProviders(): Record<string, CustomProviderConfig> {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { loadProviderConfigs } = require('../server/storage') as typeof import('@/lib/server/storage')
     const configs = loadProviderConfigs() as Record<string, CustomProviderConfig>
     return Object.fromEntries(
       Object.entries(configs).filter(([, config]) => config?.type === 'custom'),
@@ -303,8 +303,6 @@ function getCustomProviders(): Record<string, CustomProviderConfig> {
 
 function getModelOverrides(): Record<string, string[]> {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { loadModelOverrides } = require('../server/storage') as typeof import('@/lib/server/storage')
     return loadModelOverrides()
   } catch {
     return {}
@@ -342,17 +340,15 @@ export function getProviderList(): ProviderInfo[] {
 
   let extensionProviders: ProviderInfo[] = []
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { getExtensionManager } = require('../server/extensions')
-    extensionProviders = getExtensionManager().getProviders().map((p: Record<string, unknown>) => ({
-      id: String(p.id) as ProviderId,
-      name: String(p.name),
-      models: p.models as string[],
-      defaultModels: p.models as string[],
-      supportsModelDiscovery: Boolean(p.supportsModelDiscovery),
-      requiresApiKey: Boolean(p.requiresApiKey),
-      requiresEndpoint: Boolean(p.requiresEndpoint),
-      defaultEndpoint: p.defaultEndpoint as string | undefined,
+    extensionProviders = getExtensionManager().getProviders().map((p) => ({
+      id: p.id as ProviderId,
+      name: p.name,
+      models: p.models,
+      defaultModels: p.models,
+      supportsModelDiscovery: false,
+      requiresApiKey: p.requiresApiKey,
+      requiresEndpoint: p.requiresEndpoint,
+      defaultEndpoint: p.defaultEndpoint,
     }))
   } catch { /* ignore if running somewhere extensions aren't available */ }
 
@@ -391,8 +387,6 @@ export function getProvider(id: string): BuiltinProviderConfig | null {
   // Fallback: direct single-item DB lookup for custom-* providers
   if (id.startsWith('custom-') && !custom) {
     try {
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const { loadStoredItem } = require('../server/storage') as typeof import('@/lib/server/storage')
       const directConfig = loadStoredItem('provider_configs', id) as CustomProviderConfig | null
       if (directConfig?.type === 'custom' && directConfig.isEnabled) {
         log.info(TAG, `Resolved custom provider '${id}' via direct DB lookup (batch load missed it)`)
@@ -405,10 +399,8 @@ export function getProvider(id: string): BuiltinProviderConfig | null {
 
   // Check Extension Providers
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { getExtensionManager } = require('../server/extensions')
     const extensionProviders = getExtensionManager().getProviders()
-    const found = extensionProviders.find((p: Record<string, unknown>) => p.id === id)
+    const found = extensionProviders.find((p) => p.id === id)
     if (found) {
       return {
         id: found.id as ProviderId,
@@ -455,8 +447,6 @@ export async function streamChatWithFailover(
       let apiKey: string | null = opts.apiKey || null
       if (credId && i > 0) {
         // Need to decrypt fallback credential
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        const { loadCredentials, decryptKey } = require('../server/storage') as typeof import('@/lib/server/storage')
         const creds = loadCredentials()
         const cred = creds[credId]
         if (cred?.encryptedKey) {

package/src/lib/providers/openclaw.ts

@@ -8,6 +8,7 @@ import type { Agent } from '@/types'
 import { deriveOpenClawWsUrl } from '@/lib/openclaw/openclaw-endpoint'
 import { normalizeOpenClawAgentId } from '@/lib/openclaw/openclaw-agent-id'
 import { loadAgents } from '../server/storage'
+import { getSharedDeviceToken } from '../server/openclaw/sync'
 import {
   resolveOpenClawGatewayAgentIdFromList,
   type OpenClawGatewayAgentSummary,
@@ -74,8 +75,6 @@ function tryLoadIdentityFile(filePath: string): DeviceIdentity | null {
 function loadOrCreateDeviceIdentity(): DeviceIdentity {
   // 0. Check shared device token for cross-synced identity
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { getSharedDeviceToken } = require('../server/openclaw/sync')
     const sharedToken = getSharedDeviceToken()
     if (sharedToken) {
       // Shared token exists — the connector has already paired.

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

@@ -17,6 +17,7 @@ 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 { upsertStoredItem, loadStoredItem, loadCollection } from '../storage'
 import {
   spawnSubagent,
   type SubagentContext,
@@ -159,8 +160,6 @@ function notifySwarmChanged() {
 
 function persistSwarmSnapshot(swarm: SwarmHandle): void {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { upsertStoredItem } = require('../storage')
     upsertStoredItem('swarm_snapshots', swarm.swarmId, {
       swarmId: swarm.swarmId,
       parentSessionId: swarm.parentSessionId,
@@ -549,8 +548,6 @@ export function getSwarmSnapshot(swarmId: string): SwarmSnapshot | null {
   if (swarm) return buildSwarmSnapshot(swarm)
   // Fallback to persisted store for swarms from previous process lifetimes
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { loadStoredItem } = require('../storage')
     const persisted = loadStoredItem('swarm_snapshots', swarmId)
     return persisted ? (persisted as SwarmSnapshot) : null
   } catch { return null }
@@ -640,9 +637,7 @@ function buildSwarmSnapshot(swarm: SwarmHandle): SwarmSnapshot {
  */
 export function restoreSwarmRegistry(): number {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { loadCollection, upsertStoredItem } = require('../storage')
-    const persisted = loadCollection('swarm_snapshots') as Record<string, SwarmSnapshot>
+    const persisted = loadCollection('swarm_snapshots') as unknown as Record<string, SwarmSnapshot>
     let lost = 0
     for (const [id, record] of Object.entries(persisted)) {
       if (swarmRegistry.has(id)) continue

package/src/lib/server/chat-execution/chat-turn-finalization.ts

@@ -1,4 +1,5 @@
 import type { Message, MessageToolEvent, SSEEvent, Session, UsageRecord } from '@/types'
+import { sendConnectorMessage } from '../connectors/manager'
 import { applyExactOutputContract, classifyExactOutputContract, type ExactOutputContract } from '@/lib/server/chat-execution/exact-output-contract'
 import { stripMainLoopMetaForPersistence } from '@/lib/server/agents/main-agent-loop'
 import { shouldSuppressHiddenControlText, stripHiddenControlTokens } from '@/lib/server/agents/assistant-control'
@@ -478,8 +479,6 @@ export async function finalizeChatTurn(params: {
           && heartbeatConfig.target !== 'none'
         ) {
           try {
-            // eslint-disable-next-line @typescript-eslint/no-require-imports
-            const { sendConnectorMessage } = require('../connectors/manager')
             let connectorId: string | undefined
             let channelId: string | undefined
             if (heartbeatConfig.target === 'last') {
@@ -527,9 +526,7 @@ export async function finalizeChatTurn(params: {
             : ''
           if (!recentInbound && channelId) {
             try {
-              // eslint-disable-next-line @typescript-eslint/no-require-imports
-              const { sendConnectorMessage: sendMsg } = require('../connectors/manager')
-              sendMsg({ connectorId: connectorId || undefined, channelId, text: nextAssistantMessage.text }).catch((err: unknown) => {
+              sendConnectorMessage({ connectorId: connectorId || undefined, channelId, text: nextAssistantMessage.text }).catch((err: unknown) => {
                 log.warn('connector', 'Auto-route connector delivery failed', {
                   connectorId,
                   channelId,

package/src/lib/server/chat-execution/prompt-builder.ts

@@ -11,6 +11,8 @@ import {
   collectCapabilityOperatingGuidance,
 } from '@/lib/server/native-capabilities'
 import { getExtensionManager } from '@/lib/server/extensions'
+import { loadAgents } from '../storage'
+import { resolveTeam } from '../agents/team-resolution'
 import {
   getEnabledToolPlanningView,
   getToolsForCapability,
@@ -44,12 +46,8 @@ function buildExtensionCapabilityLines(enabledExtensions: string[], opts?: { del
       // CLI team hint — if teammates run CLI providers, mention their strengths
       if (opts.agentId) {
         try {
-          // eslint-disable-next-line @typescript-eslint/no-require-imports
-          const { loadAgents } = require('../storage')
-          // eslint-disable-next-line @typescript-eslint/no-require-imports
-          const { resolveTeam } = require('../agents/team-resolution')
-          const agents = loadAgents() as Record<string, Record<string, unknown>>
-          const team = resolveTeam(opts.agentId, agents)
+          const agents = loadAgents()
+          const team = resolveTeam(opts.agentId, agents as Record<string, import('@/types').Agent>)
           if (team.mode === 'team') {
             const cliTeammates: string[] = []
             const allMembers = [...(team.coordinator ? [team.coordinator] : []), ...team.peers, ...team.directReports]

package/src/lib/server/connectors/openclaw.ts

@@ -13,6 +13,7 @@ import {
   type GatewayResponseFrame,
 } from '../gateway/protocol'
 import { log } from '@/lib/server/logger'
+import { setSharedDeviceToken } from '../openclaw/sync'
 
 const TAG = 'openclaw'
 
@@ -830,8 +831,6 @@ const openclaw: PlatformConnector = {
       // Cross-sync device token for provider identity resolution
       if (normalized) {
         try {
-          // eslint-disable-next-line @typescript-eslint/no-require-imports
-          const { setSharedDeviceToken } = require('../openclaw/sync')
           setSharedDeviceToken(normalized)
         } catch { /* openclaw-sync not available */ }
       }

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

@@ -1,5 +1,6 @@
 import { spawnSync } from 'child_process'
 import { errorMessage, hmrSingleton, jitteredBackoff } from '@/lib/shared-utils'
+import { upsertStoredItem, loadCollection } from './storage'
 
 type DelegateTool = 'delegate_to_claude_code' | 'delegate_to_codex_cli' | 'delegate_to_opencode_cli' | 'delegate_to_gemini_cli'
 
@@ -70,8 +71,6 @@ export function markProviderFailure(providerId: string, error: string, credentia
     cooldownUntil: now + cooldownMsForFailures(failures),
   })
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { upsertStoredItem } = require('./storage')
     upsertStoredItem('provider_health', key, states.get(key)!)
   } catch {}
 }
@@ -88,8 +87,6 @@ export function markProviderSuccess(providerId: string, credentialId?: string |
     cooldownUntil: undefined,
   })
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { upsertStoredItem } = require('./storage')
     upsertStoredItem('provider_health', key, states.get(key)!)
   } catch {}
 }
@@ -187,9 +184,7 @@ export function getProviderHealthSnapshot(): Record<string, ProviderHealthState
 
 export function restoreProviderHealthState(): number {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { loadCollection } = require('./storage')
-    const persisted = loadCollection('provider_health') as Record<string, ProviderHealthState>
+    const persisted = loadCollection('provider_health') as unknown as Record<string, ProviderHealthState>
     let restored = 0
     for (const [id, record] of Object.entries(persisted)) {
       if (states.has(id)) continue

package/src/lib/server/storage.ts

@@ -242,7 +242,7 @@ function loadCollectionWithNormalizationState(table: string): {
   return { result, normalizedCount }
 }
 
-function loadCollection(table: string): Record<string, StoredObject> {
+export function loadCollection(table: string): Record<string, StoredObject> {
   const { result, normalizedCount } = loadCollectionWithNormalizationState(table)
   if (normalizedCount > 0) saveCollection(table, result)
   return result