@swarmclawai/swarmclaw 0.8.4 → 0.8.7

package/src/lib/server/openclaw-config-sync.ts

@@ -1,4 +1,5 @@
 import { ensureGatewayConnected } from './openclaw-gateway'
+import { errorMessage } from '@/lib/shared-utils'
 
 export interface ConfigIssue {
   id: string
@@ -98,7 +99,7 @@ export async function repairConfigIssue(issueId: string): Promise<{ ok: boolean;
           return { ok: false, error: `Unknown issue: ${issueId}` }
       }
     } catch (err: unknown) {
-      const msg = err instanceof Error ? err.message : String(err)
+      const msg = errorMessage(err)
       if (msg.includes('conflict') && attempt < MAX_RETRIES - 1) continue
       return { ok: false, error: msg }
     }

package/src/lib/server/openclaw-deploy.test.ts

@@ -6,7 +6,7 @@ import {
   getOpenClawLocalDeployStatus,
   getOpenClawRemoteDeployCollectionStatus,
   getOpenClawRemoteDeployStatus,
-} from './openclaw-deploy.ts'
+} from './openclaw-deploy'
 
 const GLOBAL_KEY = '__swarmclaw_openclaw_deploy__' as const
 const originalRuntimeState = (globalThis as typeof globalThis & { [GLOBAL_KEY]?: unknown })[GLOBAL_KEY]

package/src/lib/server/openclaw-deploy.ts

@@ -3,6 +3,7 @@ import { existsSync } from 'node:fs'
 import { promises as fs } from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
+import { hmrSingleton, sleep } from '@/lib/shared-utils'
 import {
   getManagedProcess,
   killManagedProcess,
@@ -191,7 +192,7 @@ interface ExposureMeta {
 
 const DEFAULT_LOCAL_PORT = 18789
 const DEFAULT_REMOTE_PORT = 18789
-const GLOBAL_KEY = '__swarmclaw_openclaw_deploy__' as const
+const OC_DEPLOY_KEY = '__swarmclaw_openclaw_deploy__'
 
 const REMOTE_PROVIDER_META: Record<OpenClawRemoteDeployProvider, RemoteProviderMeta> = {
   hetzner: {
@@ -542,13 +543,11 @@ function normalizeRuntimeState(raw: unknown): DeployRuntimeState {
 }
 
 function getRuntimeState(): DeployRuntimeState {
-  const globalState = globalThis as typeof globalThis & { [GLOBAL_KEY]?: DeployRuntimeState }
-  if (!globalState[GLOBAL_KEY]) {
-    globalState[GLOBAL_KEY] = defaultRuntimeState()
-  } else {
-    globalState[GLOBAL_KEY] = normalizeRuntimeState(globalState[GLOBAL_KEY])
-  }
-  return globalState[GLOBAL_KEY] || defaultRuntimeState()
+  const raw = hmrSingleton<DeployRuntimeState>(OC_DEPLOY_KEY, defaultRuntimeState)
+  const normalized = normalizeRuntimeState(raw)
+  // Write back the normalized state so subsequent reads see it
+  ;(globalThis as Record<string, unknown>)[OC_DEPLOY_KEY] = normalized
+  return normalized
 }
 
 function shellEscape(value: string): string {
@@ -818,16 +817,13 @@ async function startRemoteCommand(params: {
   }
 }
 
-function wait(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
 
 async function waitForLocalRuntime(processId: string, attempts = 12): Promise<void> {
   for (let i = 0; i < attempts; i += 1) {
     const process = getManagedProcess(processId)
     if (!process || process.status !== 'running') break
     if ((process.log || '').toLowerCase().includes('listening')) return
-    await wait(500)
+    await sleep(500)
   }
 }
 

package/src/lib/server/openclaw-exec-config.ts

@@ -1,5 +1,6 @@
 import type { ExecApprovalConfig, ExecApprovalSnapshot } from '@/types'
 import { ensureGatewayConnected } from './openclaw-gateway'
+import { errorMessage } from '@/lib/shared-utils'
 
 const DEFAULT_CONFIG: ExecApprovalConfig = {
   security: 'deny',
@@ -39,7 +40,7 @@ export async function setExecConfig(
       }) as { hash?: string } | undefined
       return { ok: true, hash: result?.hash ?? '' }
     } catch (err: unknown) {
-      const msg = err instanceof Error ? err.message : String(err)
+      const msg = errorMessage(err)
       if (msg.includes('conflict') && attempt < 2) {
         // Re-fetch to get fresh hash
         const fresh = await getExecConfig()

package/src/lib/server/openclaw-gateway.ts

@@ -5,6 +5,7 @@ import { deriveOpenClawWsUrl } from '@/lib/openclaw-endpoint'
 import { loadAgents, loadCredentials, decryptKey } from './storage'
 import { notify, notifyWithPayload } from './ws-hub'
 import { getGatewayProfile, getGatewayProfiles, resolvePrimaryAgentRoute } from './agent-runtime-config'
+import { errorMessage, hmrSingleton } from '@/lib/shared-utils'
 
 // --- Types ---
 
@@ -18,18 +19,16 @@ type EventHandler = (payload: unknown) => void
 
 // --- Singleton (HMR-safe) ---
 
-const GK = '__swarmclaw_ocgateway__' as const
-
 interface GatewayState {
   instances: Map<string, OpenClawGateway>
   activeKey: string | null
 }
 
 function getState(): GatewayState {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const g = globalThis as any
-  if (!g[GK]) g[GK] = { instances: new Map<string, OpenClawGateway>(), activeKey: null }
-  return g[GK] as GatewayState
+  return hmrSingleton<GatewayState>('__swarmclaw_ocgateway__', () => ({
+    instances: new Map<string, OpenClawGateway>(),
+    activeKey: null,
+  }))
 }
 
 // --- Helper: resolve gateway config from first OpenClaw agent ---
@@ -190,7 +189,7 @@ export class OpenClawGateway {
 
       return true
     } catch (err: unknown) {
-      console.error('[openclaw-gateway] Connect error:', err instanceof Error ? err.message : String(err))
+      console.error('[openclaw-gateway] Connect error:', errorMessage(err))
       this.scheduleReconnect()
       return false
     }

package/src/lib/server/openclaw-skills-normalize.ts

@@ -1,4 +1,5 @@
 import type { OpenClawSkillEntry, SkillInstallOption, SkillRequirements } from '@/types'
+import { dedup } from '@/lib/shared-utils'
 
 interface GatewayConfigCheck {
   path?: string
@@ -38,7 +39,7 @@ interface GatewaySkillsStatusPayload {
 }
 
 function uniq(values: Array<string | undefined | null>): string[] {
-  return [...new Set(values.map((value) => (value ?? '').trim()).filter(Boolean))]
+  return dedup(values.map((value) => (value ?? '').trim()).filter(Boolean))
 }
 
 function normalizeSource(source: string | undefined): OpenClawSkillEntry['source'] {

package/src/lib/server/openclaw-sync.ts

@@ -3,7 +3,7 @@ import path from 'node:path'
 import crypto from 'node:crypto'
 import { DATA_DIR } from './data-dir'
 import { normalizeOpenClawAgentId } from '@/lib/openclaw-agent-id'
-import { loadSettings, loadAgents, saveAgents, loadSchedules, saveSchedules, loadCredentials, decryptKey, encryptKey } from './storage'
+import { loadSettings, loadAgents, upsertAgent, loadSchedules, upsertSchedules, loadCredentials, decryptKey, encryptKey } from './storage'
 import { getMemoryDb } from './memory-db'
 import type { AppSettings, MemoryEntry, Schedule } from '@/types'
 
@@ -239,8 +239,7 @@ export function pullAgentFromOpenClaw(agentId: string): { updated: string[] } {
 
   if (updated.length > 0) {
     agent.updatedAt = Date.now()
-    agents[agentId] = agent
-    saveAgents(agents)
+    upsertAgent(agentId, agent)
   }
 
   return { updated }
@@ -281,6 +280,7 @@ export function pullSchedulesFromOpenClaw(): { imported: number } {
   const schedules = loadSchedules() as Record<string, Schedule>
   const existingNames = new Set(Object.values(schedules).map((s) => `${s.name}|${s.cron}`))
   let imported = 0
+  const importedEntries: Array<[string, Schedule]> = []
 
   for (const job of raw) {
     if (!job.name || !job.cron) continue
@@ -288,7 +288,7 @@ export function pullSchedulesFromOpenClaw(): { imported: number } {
     if (existingNames.has(key)) continue
 
     const id = crypto.randomUUID()
-    schedules[id] = {
+    const schedule = {
       id,
       name: job.name,
       agentId: job.agentId || '',
@@ -298,11 +298,13 @@ export function pullSchedulesFromOpenClaw(): { imported: number } {
       status: 'active',
       createdAt: Date.now(),
     }
+    schedules[id] = schedule as any
+    importedEntries.push([id, schedule as any])
     existingNames.add(key)
     imported++
   }
 
-  if (imported > 0) saveSchedules(schedules)
+  if (importedEntries.length > 0) upsertSchedules(importedEntries)
   return { imported }
 }
 

package/src/lib/server/orchestrator-lg-structure.test.ts

@@ -0,0 +1,17 @@
+import assert from 'node:assert/strict'
+import fs from 'node:fs'
+import path from 'node:path'
+import test from 'node:test'
+
+const serverDir = path.resolve(path.dirname(new URL(import.meta.url).pathname))
+
+test('orchestrator runtime shares tool and graph builders between start and resume flows', () => {
+  const src = fs.readFileSync(path.join(serverDir, 'orchestrator-lg.ts'), 'utf-8')
+
+  assert.equal(src.includes('function createOrchestratorTools('), true)
+  assert.equal(src.includes('function compileOrchestratorGraph('), true)
+  assert.equal((src.match(/createOrchestratorTools\(/g) || []).length >= 3, true)
+  assert.equal((src.match(/compileOrchestratorGraph\(/g) || []).length >= 3, true)
+  assert.equal((src.match(/const createTaskTool = tool\(/g) || []).length, 1)
+  assert.equal((src.match(/const commentOnTaskTool = tool\(/g) || []).length, 1)
+})