@swarmclawai/swarmclaw 1.9.34 → 1.9.37

package/src/lib/server/messages/message-repository.test.ts

@@ -68,3 +68,125 @@ test('appendMessage notifies both generic and per-session message topics', () =>
   assert.deepEqual(output.genericTopics, ['messages'])
   assert.deepEqual(output.sessionTopics, ['messages:sess-notify'])
 })
+
+test('lazy migration compacts legacy session message blobs after table persistence', () => {
+  const output = runWithTempDataDir<{
+    returnedTexts: string[]
+    secondReadTexts: string[]
+    blobMessageCount: number
+    messageCount: number
+    lastMessageText: string | null
+  }>(`
+    const storageMod = await import('@/lib/server/storage')
+    const repoMod = await import('@/lib/server/messages/message-repository')
+    const storage = storageMod.default || storageMod
+    const repo = repoMod.default || repoMod
+
+    storage.saveSessions({
+      'sess-legacy-blob': {
+        id: 'sess-legacy-blob',
+        name: 'Legacy blob session',
+        cwd: process.env.WORKSPACE_DIR,
+        user: 'tester',
+        provider: 'openai',
+        model: 'gpt-5',
+        claudeSessionId: null,
+        codexThreadId: null,
+        opencodeSessionId: null,
+        delegateResumeIds: { claudeCode: null, codex: null, opencode: null, gemini: null },
+        messages: [
+          { role: 'user', text: 'first legacy prompt', time: 1 },
+          { role: 'assistant', text: 'first legacy reply', time: 2 },
+          { role: 'user', text: 'second legacy prompt', time: 3 },
+        ],
+        createdAt: Date.now(),
+        lastActiveAt: Date.now(),
+      },
+    })
+
+    const returned = repo.getMessages('sess-legacy-blob')
+    const secondRead = repo.getMessages('sess-legacy-blob')
+    const stored = storage.loadSessions()['sess-legacy-blob']
+
+    console.log(JSON.stringify({
+      returnedTexts: returned.map((message) => message.text),
+      secondReadTexts: secondRead.map((message) => message.text),
+      blobMessageCount: Array.isArray(stored.messages) ? stored.messages.length : -1,
+      messageCount: stored.messageCount,
+      lastMessageText: stored.lastMessageSummary?.text || null,
+    }))
+  `, { prefix: 'swarmclaw-message-repo-compact-' })
+
+  assert.deepEqual(output.returnedTexts, [
+    'first legacy prompt',
+    'first legacy reply',
+    'second legacy prompt',
+  ])
+  assert.deepEqual(output.secondReadTexts, output.returnedTexts)
+  assert.equal(output.blobMessageCount, 0)
+  assert.equal(output.messageCount, 3)
+  assert.equal(output.lastMessageText, 'second legacy prompt')
+})
+
+test('bulk migration reports compaction for table-backed legacy blobs', () => {
+  const output = runWithTempDataDir<{
+    result: {
+      migrated: number
+      compacted: number
+      skipped: number
+      total: number
+    }
+    blobMessageCount: number
+    messageCount: number
+  }>(`
+    const storageMod = await import('@/lib/server/storage')
+    const repoMod = await import('@/lib/server/messages/message-repository')
+    const storage = storageMod.default || storageMod
+    const repo = repoMod.default || repoMod
+
+    const messages = [
+      { role: 'user', text: 'stale blob prompt', time: 10 },
+      { role: 'assistant', text: 'stale blob reply', time: 20 },
+    ]
+
+    storage.saveSessions({
+      'sess-table-backed-blob': {
+        id: 'sess-table-backed-blob',
+        name: 'Table backed blob session',
+        cwd: process.env.WORKSPACE_DIR,
+        user: 'tester',
+        provider: 'openai',
+        model: 'gpt-5',
+        claudeSessionId: null,
+        codexThreadId: null,
+        opencodeSessionId: null,
+        delegateResumeIds: { claudeCode: null, codex: null, opencode: null, gemini: null },
+        messages,
+        createdAt: Date.now(),
+        lastActiveAt: Date.now(),
+      },
+    })
+
+    const db = storage.getDb()
+    const insert = db.prepare('INSERT INTO session_messages (session_id, seq, data) VALUES (?, ?, ?)')
+    messages.forEach((message, index) => {
+      insert.run('sess-table-backed-blob', index, JSON.stringify(message))
+    })
+
+    const result = repo.migrateAllSessions()
+    const stored = storage.loadSessions()['sess-table-backed-blob']
+
+    console.log(JSON.stringify({
+      result,
+      blobMessageCount: Array.isArray(stored.messages) ? stored.messages.length : -1,
+      messageCount: stored.messageCount,
+    }))
+  `, { prefix: 'swarmclaw-message-repo-migrate-report-' })
+
+  assert.equal(output.result.migrated, 0)
+  assert.equal(output.result.compacted, 1)
+  assert.equal(output.result.skipped, 1)
+  assert.equal(output.result.total, 1)
+  assert.equal(output.blobMessageCount, 0)
+  assert.equal(output.messageCount, 2)
+})

package/src/lib/server/messages/message-repository.ts

@@ -86,6 +86,38 @@ function summarizeForMeta(message: Message): Message {
   }
 }
 
+function getLastAssistantAt(messages: Message[]): number | null {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i].role === 'assistant' && typeof messages[i].time === 'number') {
+      return messages[i].time
+    }
+  }
+  return null
+}
+
+function compactDeprecatedBlobMessages(
+  sessionId: string,
+  persistedCount: number,
+  lastMsg: Message | null,
+  lastAssistantAt: number | null,
+): boolean {
+  let compacted = false
+  patchSession(sessionId, (current) => {
+    if (!current) return null
+    const blobCount = Array.isArray(current.messages) ? current.messages.length : 0
+    if (blobCount === 0) return current
+    if (persistedCount < blobCount) return current
+
+    current.messages = []
+    current.messageCount = persistedCount
+    current.lastMessageSummary = lastMsg ? summarizeForMeta(lastMsg) : null
+    if (lastAssistantAt !== null) current.lastAssistantAt = lastAssistantAt
+    compacted = true
+    return current
+  })
+  return compacted
+}
+
 // ---------------------------------------------------------------------------
 // Session metadata sync — keeps messageCount / lastMessageSummary on the blob
 // ---------------------------------------------------------------------------
@@ -139,18 +171,14 @@ function lazyMigrateSession(sessionId: string): Message[] | null {
       ins.run(sessionId, i, JSON.stringify(messages[i]))
     }
 
-    // Compute metadata on the blob (keep messages intact for backward compat)
+    // Compute metadata before compacting deprecated blob storage.
     const lastMsg = messages[messages.length - 1]
-    let lastAssistantAt: number | null = null
-    for (let i = messages.length - 1; i >= 0; i--) {
-      if (messages[i].role === 'assistant' && typeof messages[i].time === 'number') {
-        lastAssistantAt = messages[i].time
-        break
-      }
-    }
+    const lastAssistantAt = getLastAssistantAt(messages)
+    const persistedCount = rowCount(sessionId)
 
     patchSession(sessionId, (current) => {
       if (!current) return null
+      current.messages = persistedCount >= messages.length ? [] : current.messages
       current.messageCount = messages.length
       current.lastMessageSummary = lastMsg ? summarizeForMeta(lastMsg) : null
       if (lastAssistantAt !== null && typeof current.lastAssistantAt !== 'number') {
@@ -183,6 +211,7 @@ export function getMessages(sessionId: string): Message[] {
       const m = parseMsg(row.data)
       if (m) out.push(m)
     }
+    compactDeprecatedBlobMessages(sessionId, out.length, out[out.length - 1] || null, getLastAssistantAt(out))
     return out
   }, { sessionId })
 }
@@ -338,10 +367,16 @@ export function deleteSessionMessages(sessionId: string): void {
 // Bulk migration (for CLI / admin endpoint)
 // ---------------------------------------------------------------------------
 
-export function migrateAllSessions(): { migrated: number; skipped: number; total: number } {
+export function migrateAllSessions(): {
+  migrated: number
+  compacted: number
+  skipped: number
+  total: number
+} {
   const db = getDb()
   const rows = db.prepare('SELECT id, data FROM sessions').all() as Array<{ id: string; data: string }>
   let migrated = 0
+  let compacted = 0
   let skipped = 0
 
   for (const row of rows) {
@@ -351,16 +386,37 @@ export function migrateAllSessions(): { migrated: number; skipped: number; total
         skipped++
         continue
       }
-      if (rowCount(row.id) > 0) {
+
+      const persistedCount = rowCount(row.id)
+      if (persistedCount > 0) {
+        const persistedRows = stmts().selectAll.all(row.id) as Array<{ data: string }>
+        const persistedMessages: Message[] = []
+        for (const persistedRow of persistedRows) {
+          const message = parseMsg(persistedRow.data)
+          if (message) persistedMessages.push(message)
+        }
+        if (compactDeprecatedBlobMessages(
+          row.id,
+          persistedCount,
+          persistedMessages[persistedMessages.length - 1] || null,
+          getLastAssistantAt(persistedMessages),
+        )) {
+          compacted++
+        }
         skipped++
         continue
       }
+
       lazyMigrateSession(row.id)
       migrated++
+      const stored = loadSession(row.id)
+      if (!Array.isArray(stored?.messages) || stored.messages.length === 0) {
+        compacted++
+      }
     } catch {
       skipped++
     }
   }
 
-  return { migrated, skipped, total: rows.length }
+  return { migrated, compacted, skipped, total: rows.length }
 }

package/src/lib/server/runtime/devserver-launch.ts

@@ -23,10 +23,10 @@ const NEXT_CONFIG_FILES = [
 ]
 
 function readPackageJson(dir: string): PackageJsonLike | null {
-  const pkgPath = path.join(dir, 'package.json')
-  if (!fs.existsSync(pkgPath)) return null
+  const pkgPath = path.join(/*turbopackIgnore: true*/ dir, 'package.json')
+  if (!fs.existsSync(/*turbopackIgnore: true*/ pkgPath)) return null
   try {
-    const parsed: unknown = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+    const parsed: unknown = JSON.parse(fs.readFileSync(/*turbopackIgnore: true*/ pkgPath, 'utf8'))
     return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
       ? parsed as PackageJsonLike
       : null
@@ -46,7 +46,10 @@ function hasNextScript(pkg: PackageJsonLike): boolean {
 }
 
 function hasNextConfig(dir: string): boolean {
-  return NEXT_CONFIG_FILES.some((file) => fs.existsSync(path.join(dir, file)))
+  return NEXT_CONFIG_FILES.some((file) => {
+    const configPath = path.join(/*turbopackIgnore: true*/ dir, file)
+    return fs.existsSync(/*turbopackIgnore: true*/ configPath)
+  })
 }
 
 function classifyPackageRoot(dir: string, pkg: PackageJsonLike): FrameworkKind {

package/src/lib/theme-mode.ts

@@ -0,0 +1,5 @@
+export type ThemeMode = 'light' | 'dark' | 'system'
+
+export function normalizeThemeMode(value: unknown): ThemeMode {
+  return value === 'light' || value === 'system' ? value : 'dark'
+}

package/src/types/app-settings.ts

@@ -1,5 +1,6 @@
 import type { SessionResetMode } from './session'
 import type { ExtensionManagedLocalFolderDeclaration } from './extension'
+import type { ThemeMode } from '@/lib/theme-mode'
 
 // --- App Settings ---
 export type LoopMode = 'bounded' | 'ongoing'
@@ -134,6 +135,7 @@ export interface AppSettings {
   defaultAgentId?: string | null
   // Theme
   themeHue?: string
+  themeMode?: ThemeMode
   // Web search provider
   webSearchProvider?: 'duckduckgo' | 'google' | 'bing' | 'searxng' | 'tavily' | 'brave' | 'exa'
   searxngUrl?: string

package/src/views/settings/section-theme.tsx

@@ -1,7 +1,10 @@
 'use client'
 
 import { useState } from 'react'
+import { Monitor, Moon, Sun } from 'lucide-react'
+import { useTheme } from 'next-themes'
 import { toast } from 'sonner'
+import { normalizeThemeMode, type ThemeMode } from '@/lib/theme-mode'
 import type { SettingsSectionProps } from './types'
 
 const PRESETS = [
@@ -13,12 +16,26 @@ const PRESETS = [
   { label: 'Rose', color: '#2e1a24' },
 ]
 
+const THEME_MODES: Array<{ id: ThemeMode; label: string; Icon: typeof Sun }> = [
+  { id: 'light', label: 'Light', Icon: Sun },
+  { id: 'dark', label: 'Dark', Icon: Moon },
+  { id: 'system', label: 'System', Icon: Monitor },
+]
+
 export function ThemeSection({ appSettings, patchSettings, inputClass }: SettingsSectionProps) {
+  const { setTheme } = useTheme()
   const currentHue = appSettings.themeHue || PRESETS[0].color
+  const currentMode = normalizeThemeMode(appSettings.themeMode)
   const [customHex, setCustomHex] = useState(
     PRESETS.some((p) => p.color === currentHue) ? '' : currentHue,
   )
 
+  const applyMode = (mode: ThemeMode) => {
+    setTheme(mode)
+    patchSettings({ themeMode: mode })
+    toast.success('Theme updated')
+  }
+
   const applyHue = (color: string) => {
     patchSettings({ themeHue: color })
     document.documentElement.style.setProperty('--neutral-tint', color)
@@ -38,9 +55,32 @@ export function ThemeSection({ appSettings, patchSettings, inputClass }: Setting
         Theme
       </h3>
       <p className="text-[12px] text-text-3 mb-5">
-        Shift the UI color palette. Pick a preset or enter a custom hex color.
+        Choose a color scheme and shift the UI palette with a preset or custom hex color.
       </p>
 
+      <div className="inline-grid grid-cols-3 rounded-[8px] border border-white/[0.08] bg-white/[0.03] p-1 mb-5">
+        {THEME_MODES.map(({ id, label, Icon }) => {
+          const isActive = currentMode === id
+          return (
+            <button
+              key={id}
+              type="button"
+              onClick={() => applyMode(id)}
+              aria-pressed={isActive}
+              className={`h-9 px-3 rounded-[6px] flex items-center justify-center gap-2 text-[12px] font-600 transition-colors ${
+                isActive
+                  ? 'bg-accent text-white'
+                  : 'text-text-3 hover:text-text hover:bg-white/[0.05]'
+              }`}
+              title={label}
+            >
+              <Icon className="w-4 h-4" aria-hidden="true" />
+              <span>{label}</span>
+            </button>
+          )
+        })}
+      </div>
+
       {/* Preset swatches */}
       <div className="flex flex-wrap gap-3 mb-4">
         {PRESETS.map((preset) => {