@swarmclawai/swarmclaw 1.9.28 → 1.9.29

package/README.md

@@ -151,15 +151,14 @@ clawhub install swarmclaw
 
 [Browse on ClawHub](https://clawhub.ai/skills/swarmclaw)
 
-## v1.9.28 Highlights
+## v1.9.29 Highlights
 
-Issue-fix release for installed CLI groups, email bridge TLS handling, built-in model overrides, and Windows desktop native modules.
+Issue-fix release for Edit Agent tooltips, installed package builds, and structured dream output on local Ollama models.
 
-- **Installed CLI groups.** Global npm installs route legacy API-backed group commands through the bundled TS runtime when installed under `node_modules`, avoiding Node 22.6+/25 type-stripping failures.
-- **Email bridge TLS resilience.** The email connector logs IMAP socket errors without crashing the daemon and supports `tlsRejectUnauthorized=false` for local self-signed IMAP/SMTP servers.
-- **Provider model override persistence.** Built-in provider live model saves now reload array-valued overrides instead of falling back to catalog defaults.
-- **Windows desktop native modules.** Desktop packaging syncs rebuilt Electron-native modules into traced `.next/node_modules` aliases so packaged Windows installs start against the correct ABI.
-- **Regression coverage.** CLI, email, provider route, and Electron after-pack tests cover the reported failure modes.
+- **Edit Agent tooltips.** Help tips in the Edit Agent sheet now render above modal layers instead of being hidden behind the dialog.
+- **Installed package builds.** The npm package now ships the Dagre type declarations needed by `swarmclaw server --build`.
+- **Local Ollama dream output.** Structured dream/reflection calls request Ollama JSON mode and validate balanced JSON before writing memories.
+- **Regression coverage.** CLI/package, model-build, and dream-parser tests cover the reported failure modes.
 
 ## Hosted Deploys
 
@@ -411,6 +410,15 @@ Operational docs: https://swarmclaw.ai/docs/observability
 
 ## Releases
 
+### v1.9.29 Highlights
+
+Issue-fix release for Edit Agent tooltips, installed package builds, and structured dream output on local Ollama models.
+
+- **Edit Agent tooltips.** Help tips in the Edit Agent sheet now render above modal layers instead of being hidden behind the dialog.
+- **Installed package builds.** The npm package now ships the Dagre type declarations needed by `swarmclaw server --build`.
+- **Local Ollama dream output.** Structured dream/reflection calls request Ollama JSON mode and validate balanced JSON before writing memories.
+- **Regression coverage.** CLI/package, model-build, and dream-parser tests cover the reported failure modes.
+
 ### v1.9.28 Highlights
 
 Issue-fix release for installed CLI groups, email bridge TLS handling, built-in model overrides, and Windows desktop native modules.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.9.28",
+  "version": "1.9.29",
   "description": "Build and run autonomous AI agents with OpenClaw, Hermes, multiple model providers, orchestration, delegation, memory, skills, schedules, and chat connectors.",
   "main": "electron-dist/main.js",
   "license": "MIT",
@@ -88,7 +88,7 @@
     "test:cli": "node --test src/cli/*.test.js bin/*.test.js scripts/electron-after-pack.test.mjs scripts/electron-signing-config.test.mjs scripts/ensure-sandbox-browser-image.test.mjs scripts/postinstall.test.mjs scripts/run-next-build.test.mjs scripts/run-next-typegen.test.mjs",
     "test:setup": "tsx --test src/app/api/setup/check-provider/route.test.ts src/lib/server/provider-model-discovery.test.ts src/components/auth/setup-wizard/utils.test.ts src/components/auth/setup-wizard/types.test.ts src/hooks/setup-done-detection.test.ts src/lib/setup-defaults.test.ts src/lib/server/storage-auth.test.ts src/lib/server/storage-auth-docker.test.ts",
     "test:openclaw": "tsx --test src/lib/openclaw/openclaw-agent-id.test.ts src/lib/openclaw/openclaw-endpoint.test.ts src/lib/server/agents/agent-runtime-config.test.ts src/lib/server/build-llm.test.ts src/lib/server/connectors/connector-routing.test.ts src/lib/server/connectors/openclaw.test.ts src/lib/server/connectors/swarmdock.test.ts src/lib/server/gateway/protocol.test.ts src/lib/server/gateways/gateway-topology.test.ts src/lib/server/llm-response-cache.test.ts src/lib/server/mcp-conformance.test.ts src/lib/server/openclaw/agent-resolver.test.ts src/lib/server/openclaw/deploy.test.ts src/lib/server/openclaw/skills-normalize.test.ts src/lib/server/session-tools/openclaw-nodes.test.ts src/lib/server/session-tools/swarmdock.test.ts src/lib/server/tasks/task-quality-gate.test.ts src/lib/server/tasks/task-validation.test.ts src/lib/server/tool-capability-policy.test.ts src/lib/providers/openai.test.ts src/lib/providers/openclaw-exports.test.ts src/app/api/gateways/topology-route.test.ts src/app/api/openclaw/dashboard-url/route.test.ts",
-    "test:runtime": "tsx --test src/lib/a2a/agent-card.test.ts src/lib/agent-planning-mode.test.ts src/lib/agent-config-history.test.ts src/lib/strip-internal-metadata.test.ts src/lib/provider-sets.test.ts src/lib/providers/opencode-cli.test.ts src/lib/providers/cli-provider-metadata.test.ts src/lib/providers/cli-utils.test.ts src/lib/providers/generic-cli.test.ts src/lib/server/agents/delegation-advisory.test.ts src/lib/server/agents/agent-runtime-config.test.ts src/lib/server/cli-provider-readiness.test.ts src/lib/server/provider-health.test.ts src/lib/server/provider-diagnostics.test.ts src/lib/server/mcp-gateway-runtime.test.ts src/lib/server/mcp-connection-pool.test.ts src/lib/server/knowledge-sources.test.ts src/lib/server/extension-managed-resources.test.ts src/lib/server/eval/baseline.test.ts src/lib/server/eval/environment-plan.test.ts src/lib/server/chat-execution/chat-execution-grounding.test.ts src/lib/server/chat-execution/chat-turn-preparation.test.ts src/lib/server/chat-execution/iteration-timers.test.ts src/lib/server/chat-execution/post-stream-finalization.test.ts src/lib/server/chat-execution/prompt-sections.planning-mode.test.ts src/lib/server/chat-execution/reasoning-tag-scrubber.test.ts src/lib/server/chats/clear-undo-snapshots.test.ts src/lib/server/chats/session-context-pack.test.ts src/lib/server/connectors/email.test.ts src/lib/server/connectors/slack.test.ts src/lib/server/protocols/protocol-service.test.ts src/lib/server/runtime/run-ledger.test.ts src/lib/server/runtime/queue-retry-policy.test.ts src/lib/server/runs/run-brief.test.ts src/lib/server/runs/run-handoff.test.ts src/lib/server/operations/operation-pulse.test.ts src/lib/server/schedules/schedule-history.test.ts src/lib/server/schedules/schedule-timing.test.ts src/lib/server/schedules/schedule-preview.test.ts src/lib/quality/release-readiness.test.ts src/lib/quality/architecture-health.test.ts src/lib/server/artifacts/artifact-resolver.test.ts src/lib/server/observability/otel-config.test.ts src/lib/server/safe-parse-body.test.ts src/lib/server/missions/mission-templates.test.ts src/lib/server/sharing/share-link-repository.test.ts src/lib/server/sharing/share-resolver.test.ts src/lib/server/tasks/task-execution-workspace.test.ts src/lib/server/tasks/task-execution-policy.test.ts src/lib/server/tasks/task-handoff.test.ts src/lib/server/tasks/task-service.test.ts src/lib/server/session-tools/execute.test.ts src/lib/server/session-tools/manage-tasks.test.ts src/lib/server/session-tools/web-crawl.test.ts src/lib/app/view-constants.test.ts src/lib/quality/quality-summary.test.ts src/app/api/approvals/route.test.ts src/app/api/agents/agents-route.test.ts src/app/api/tasks/tasks-route.test.ts src/app/api/tasks/task-workspace-route.test.ts src/app/api/chats/chat-route.test.ts src/app/api/chats/clear-route.test.ts src/app/api/chats/compact-route.test.ts src/app/api/chats/context-pack-route.test.ts src/app/api/chats/context-status-route.test.ts src/app/api/config-versions/config-versions-route.test.ts src/app/api/runs/run-handoff-route.test.ts src/app/api/connectors/connector-doctor-route.test.ts src/app/api/extensions/managed-resources/route.test.ts src/app/api/gateways/control-route.test.ts src/app/api/healthz/route.test.ts src/app/api/logs/route.test.ts src/app/api/portability/export/route.test.ts src/app/api/portability/import/route.test.ts src/app/api/providers/[id]/route.test.ts src/app/api/schedules/preview/route.test.ts src/app/api/schedules/schedule-history-route.test.ts src/app/api/tts/route.test.ts",
+    "test:runtime": "tsx --test src/lib/a2a/agent-card.test.ts src/lib/agent-planning-mode.test.ts src/lib/agent-config-history.test.ts src/lib/strip-internal-metadata.test.ts src/lib/provider-sets.test.ts src/lib/providers/opencode-cli.test.ts src/lib/providers/cli-provider-metadata.test.ts src/lib/providers/cli-utils.test.ts src/lib/providers/generic-cli.test.ts src/lib/server/agents/delegation-advisory.test.ts src/lib/server/agents/agent-runtime-config.test.ts src/lib/server/cli-provider-readiness.test.ts src/lib/server/provider-health.test.ts src/lib/server/provider-diagnostics.test.ts src/lib/server/mcp-gateway-runtime.test.ts src/lib/server/mcp-connection-pool.test.ts src/lib/server/knowledge-sources.test.ts src/lib/server/memory/dream-service.test.ts src/lib/server/extension-managed-resources.test.ts src/lib/server/eval/baseline.test.ts src/lib/server/eval/environment-plan.test.ts src/lib/server/chat-execution/chat-execution-grounding.test.ts src/lib/server/chat-execution/chat-turn-preparation.test.ts src/lib/server/chat-execution/iteration-timers.test.ts src/lib/server/chat-execution/post-stream-finalization.test.ts src/lib/server/chat-execution/prompt-sections.planning-mode.test.ts src/lib/server/chat-execution/reasoning-tag-scrubber.test.ts src/lib/server/chats/clear-undo-snapshots.test.ts src/lib/server/chats/session-context-pack.test.ts src/lib/server/connectors/email.test.ts src/lib/server/connectors/slack.test.ts src/lib/server/protocols/protocol-service.test.ts src/lib/server/runtime/run-ledger.test.ts src/lib/server/runtime/queue-retry-policy.test.ts src/lib/server/runs/run-brief.test.ts src/lib/server/runs/run-handoff.test.ts src/lib/server/operations/operation-pulse.test.ts src/lib/server/schedules/schedule-history.test.ts src/lib/server/schedules/schedule-timing.test.ts src/lib/server/schedules/schedule-preview.test.ts src/lib/quality/release-readiness.test.ts src/lib/quality/architecture-health.test.ts src/lib/server/artifacts/artifact-resolver.test.ts src/lib/server/observability/otel-config.test.ts src/lib/server/safe-parse-body.test.ts src/lib/server/missions/mission-templates.test.ts src/lib/server/sharing/share-link-repository.test.ts src/lib/server/sharing/share-resolver.test.ts src/lib/server/tasks/task-execution-workspace.test.ts src/lib/server/tasks/task-execution-policy.test.ts src/lib/server/tasks/task-handoff.test.ts src/lib/server/tasks/task-service.test.ts src/lib/server/session-tools/execute.test.ts src/lib/server/session-tools/manage-tasks.test.ts src/lib/server/session-tools/web-crawl.test.ts src/lib/app/view-constants.test.ts src/lib/quality/quality-summary.test.ts src/app/api/approvals/route.test.ts src/app/api/agents/agents-route.test.ts src/app/api/tasks/tasks-route.test.ts src/app/api/tasks/task-workspace-route.test.ts src/app/api/chats/chat-route.test.ts src/app/api/chats/clear-route.test.ts src/app/api/chats/compact-route.test.ts src/app/api/chats/context-pack-route.test.ts src/app/api/chats/context-status-route.test.ts src/app/api/config-versions/config-versions-route.test.ts src/app/api/runs/run-handoff-route.test.ts src/app/api/connectors/connector-doctor-route.test.ts src/app/api/extensions/managed-resources/route.test.ts src/app/api/gateways/control-route.test.ts src/app/api/healthz/route.test.ts src/app/api/logs/route.test.ts src/app/api/portability/export/route.test.ts src/app/api/portability/import/route.test.ts src/app/api/providers/[id]/route.test.ts src/app/api/schedules/preview/route.test.ts src/app/api/schedules/schedule-history-route.test.ts src/app/api/tts/route.test.ts",
     "test:builder": "tsx --test src/features/protocols/builder/utils/nodes-to-template.test.ts src/features/protocols/builder/utils/template-to-nodes.test.ts src/features/protocols/builder/validators/dag-validator.test.ts",
     "test:e2e": "node --import tsx scripts/browser-e2e-smoke.ts",
     "test:mcp:conformance": "node --import tsx ./scripts/mcp-conformance-check.ts",
@@ -119,6 +119,7 @@
     "@tailwindcss/postcss": "^4",
     "@tanstack/react-query": "^5.91.0",
     "@types/better-sqlite3": "^7.6.13",
+    "@types/dagre": "^0.7.54",
     "@types/mailparser": "^3.4.6",
     "@types/node": "^20",
     "@types/nodemailer": "^7.0.11",
@@ -179,7 +180,6 @@
   },
   "devDependencies": {
     "@electron/rebuild": "^3.7.2",
-    "@types/dagre": "^0.7.54",
     "electron": "^33.3.0",
     "electron-builder": "^25.1.8",
     "eslint": "^9",

package/src/cli/binary.test.js

@@ -199,6 +199,12 @@ test('binary -v alias output matches package version', () => {
   assert.equal(result.stdout.trim(), `${PACKAGE_JSON.name} ${PACKAGE_JSON.version}`)
 })
 
+test('package ships dagre type declarations required by installed builds', () => {
+  assert.equal(PACKAGE_JSON.dependencies.dagre, '^0.8.5')
+  assert.equal(PACKAGE_JSON.dependencies['@types/dagre'], '^0.7.54')
+  assert.equal(PACKAGE_JSON.devDependencies?.['@types/dagre'], undefined)
+})
+
 test('legacy TS launcher falls back to tsx import when strip-types is unavailable', () => {
   const cliPath = path.join(APP_ROOT, 'src', 'cli', 'index.ts')
   const args = buildLegacyTsCliArgs(cliPath, ['runs', 'list'], {

package/src/components/ui/tooltip.tsx

@@ -42,7 +42,7 @@ function TooltipContent({
         data-slot="tooltip-content"
         sideOffset={sideOffset}
         className={cn(
-          "bg-foreground text-background animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance",
+          "bg-foreground text-background animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[1300] w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance",
           className
         )}
         {...props}

package/src/lib/server/build-llm.test.ts

@@ -250,6 +250,47 @@ test('buildChatModel disables parallel_tool_calls for Ollama local to avoid dupl
   assert.equal(llm.clientConfig?.baseURL, 'http://localhost:11434/v1')
 })
 
+test('buildChatModel passes JSON format mode only to local Ollama structured calls', () => {
+  const local = buildChatModel({
+    provider: 'ollama',
+    model: 'gemma4:e4b',
+    ollamaMode: 'local',
+    apiKey: null,
+    responseFormat: 'json_object',
+  }) as ChatOpenAI & { modelKwargs?: Record<string, unknown> }
+
+  assert.equal(local.modelKwargs?.parallel_tool_calls, false)
+  assert.equal(local.modelKwargs?.format, 'json')
+
+  saveCredentials({
+    'cred-ollama-cloud-json': {
+      id: 'cred-ollama-cloud-json',
+      provider: 'ollama',
+      name: 'Ollama Cloud',
+      encryptedKey: encryptKey('ollama-cloud-key'),
+      createdAt: Date.now(),
+    },
+  } as Record<string, {
+    id: string
+    provider: string
+    name: string
+    encryptedKey: string
+    createdAt: number
+  }>)
+
+  const cloud = buildChatModel({
+    provider: 'ollama',
+    model: 'glm-5:cloud',
+    ollamaMode: 'cloud',
+    apiKey: null,
+    credentialId: 'cred-ollama-cloud-json',
+    responseFormat: 'json_object',
+  }) as ChatOpenAI & { modelKwargs?: Record<string, unknown> }
+
+  assert.equal(cloud.modelKwargs?.parallel_tool_calls, false)
+  assert.equal(cloud.modelKwargs?.format, undefined)
+})
+
 test('buildChatModel uses a reasoning_content-preserving bridge for DeepSeek', () => {
   const llm = buildChatModel({
     provider: 'deepseek',

package/src/lib/server/build-llm.ts

@@ -18,6 +18,7 @@ const OLLAMA_CLOUD_URL = 'https://ollama.com/v1'
 const OLLAMA_LOCAL_URL = 'http://localhost:11434/v1'
 export const OPENAI_COMPAT_MODEL_TIMEOUT_MS = 180_000
 export const OPENAI_COMPAT_MODEL_MAX_RETRIES = 2
+export type GenerationResponseFormat = 'json_object'
 
 export interface GenerationModelPreference {
   provider?: string | null
@@ -27,6 +28,7 @@ export interface GenerationModelPreference {
   apiEndpoint?: string | null
   gatewayProfileId?: string | null
   thinkingLevel?: 'minimal' | 'low' | 'medium' | 'high' | null
+  responseFormat?: GenerationResponseFormat | null
 }
 
 interface ResolvedGenerationModelConfig {
@@ -36,6 +38,7 @@ interface ResolvedGenerationModelConfig {
   apiKey: string | null
   apiEndpoint: string | null
   thinkingLevel?: 'minimal' | 'low' | 'medium' | 'high'
+  responseFormat?: GenerationResponseFormat
 }
 
 type OpenAiReasoningEffort = 'low' | 'medium' | 'high'
@@ -43,6 +46,7 @@ type ChatOpenAiConfig = ConstructorParameters<typeof ChatOpenAI>[0] & {
   modelKwargs?: {
     reasoning_effort?: OpenAiReasoningEffort
     parallel_tool_calls?: boolean
+    format?: 'json'
   }
   configuration?: {
     baseURL?: string
@@ -68,8 +72,9 @@ export function buildChatModel(opts: {
   credentialId?: string | null
   apiEndpoint?: string | null
   thinkingLevel?: 'minimal' | 'low' | 'medium' | 'high'
+  responseFormat?: GenerationResponseFormat
 }) {
-  const { provider, model, ollamaMode, apiKey, credentialId, apiEndpoint, thinkingLevel } = opts
+  const { provider, model, ollamaMode, apiKey, credentialId, apiEndpoint, thinkingLevel, responseFormat } = opts
   const resolvedCredentialId = resolveProviderCredentialId({ provider, ollamaMode: ollamaMode ?? null, credentialId })
   const resolvedApiKey = apiKey ?? resolveApiKeyFromCredential(resolvedCredentialId)
   const providers = getProviderList()
@@ -118,7 +123,10 @@ export function buildChatModel(opts: {
       timeout: OPENAI_COMPAT_MODEL_TIMEOUT_MS,
       maxRetries: OPENAI_COMPAT_MODEL_MAX_RETRIES,
       configuration: { baseURL },
-      modelKwargs: { parallel_tool_calls: false },
+      modelKwargs: {
+        parallel_tool_calls: false,
+        ...(responseFormat === 'json_object' && !runtime.useCloud ? { format: 'json' as const } : {}),
+      },
     })
   }
 
@@ -222,6 +230,7 @@ function resolvePreferredGenerationConfig(
       apiKey,
       apiEndpoint,
       thinkingLevel: candidate.thinkingLevel || undefined,
+      responseFormat: candidate.responseFormat || undefined,
     }
   }
   return null
@@ -232,6 +241,7 @@ export function resolveGenerationModelConfig(options?: {
   sessionId?: string | null
   agentId?: string | null
   excludeProviders?: string[]
+  responseFormat?: GenerationResponseFormat
 }): ResolvedGenerationModelConfig {
   const providers = getProviderList()
   const excludeProviders = new Set((options?.excludeProviders || []).map((value) => normalizePreferenceValue(value)).filter(Boolean))
@@ -252,7 +262,9 @@ export function resolveGenerationModelConfig(options?: {
     ...getAgentGenerationPreferences(sessionAgent),
     ...getAgentGenerationPreferences(directAgent),
   ], excludeProviders)
-  if (resolved) return resolved
+  if (resolved) return options?.responseFormat
+    ? { ...resolved, responseFormat: options.responseFormat }
+    : resolved
 
   const sessionLabel = options?.sessionId ? `session "${options.sessionId}"` : null
   const agentLabel = options?.agentId ? `agent "${options.agentId}"` : null
@@ -271,6 +283,7 @@ export async function buildLLM(options?: {
   sessionId?: string | null
   agentId?: string | null
   excludeProviders?: string[]
+  responseFormat?: GenerationResponseFormat
 }) {
   const resolved = resolveGenerationModelConfig(options)
   return {

package/src/lib/server/memory/dream-service.test.ts

@@ -0,0 +1,42 @@
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+import { parseTier2DreamResponseText } from './dream-service'
+
+describe('parseTier2DreamResponseText', () => {
+  it('parses a plain structured dream response', () => {
+    const parsed = parseTier2DreamResponseText(JSON.stringify({
+      consolidations: [{
+        sourceIds: ['mem-1', 'mem-2'],
+        title: 'Shared pattern',
+        content: 'Both memories describe the same workflow.',
+      }],
+      reflections: [{ title: 'Focus', content: 'The agent prefers short release loops.' }],
+      flagged: [{ memoryId: 'mem-3', reason: 'Contradicts the current release process.' }],
+    }))
+
+    assert.deepEqual(parsed?.consolidations?.[0]?.sourceIds, ['mem-1', 'mem-2'])
+    assert.equal(parsed?.reflections?.[0]?.title, 'Focus')
+    assert.equal(parsed?.flagged?.[0]?.memoryId, 'mem-3')
+  })
+
+  it('extracts fenced JSON with nested braces inside strings', () => {
+    const parsed = parseTier2DreamResponseText([
+      '```json',
+      '{',
+      '  "consolidations": [{',
+      '    "sourceIds": ["mem-1"],',
+      '    "title": "Payload shape",',
+      '    "content": "The JSON example was {\\"ok\\":true} and should stay intact."',
+      '  }]',
+      '}',
+      '```',
+    ].join('\n'))
+
+    assert.equal(parsed?.consolidations?.[0]?.content, 'The JSON example was {"ok":true} and should stay intact.')
+  })
+
+  it('rejects malformed or schema-incompatible responses', () => {
+    assert.equal(parseTier2DreamResponseText('no json here'), null)
+    assert.equal(parseTier2DreamResponseText('{"consolidations":[{"sourceIds":[123],"title":"Bad","content":"Bad"}]}'), null)
+  })
+})

package/src/lib/server/memory/dream-service.ts

@@ -1,9 +1,10 @@
 import crypto from 'crypto'
+import { z } from 'zod'
 import type { DreamCycle, DreamCycleResult, DreamConfig, DreamTrigger, Agent } from '@/types'
 import { DEFAULT_DREAM_CONFIG } from '@/types/dream'
 import { getMemoryDb } from '@/lib/server/memory/memory-db'
 import { saveDreamCycle } from '@/lib/server/memory/dream-cycles'
-import { errorMessage, safeJsonParse } from '@/lib/shared-utils'
+import { errorMessage } from '@/lib/shared-utils'
 import { log } from '@/lib/server/logger'
 
 const TAG = 'dream-service'
@@ -102,6 +103,70 @@ interface Tier2Response {
   flagged?: Tier2Flagged[]
 }
 
+const Tier2ResponseSchema = z.object({
+  consolidations: z.array(z.object({
+    sourceIds: z.array(z.string()),
+    title: z.string(),
+    content: z.string(),
+  })).optional(),
+  reflections: z.array(z.object({
+    title: z.string(),
+    content: z.string(),
+  })).optional(),
+  flagged: z.array(z.object({
+    memoryId: z.string(),
+    reason: z.string(),
+  })).optional(),
+}).passthrough()
+
+function findBalancedJsonObjectEnd(text: string, start: number): number {
+  let depth = 0
+  let inString = false
+  let escaped = false
+
+  for (let index = start; index < text.length; index += 1) {
+    const char = text[index]
+    if (inString) {
+      if (escaped) escaped = false
+      else if (char === '\\') escaped = true
+      else if (char === '"') inString = false
+      continue
+    }
+    if (char === '"') {
+      inString = true
+      continue
+    }
+    if (char === '{') depth += 1
+    else if (char === '}') depth -= 1
+    if (depth === 0) return index + 1
+  }
+  return -1
+}
+
+function extractFirstBalancedJsonObject(text: string): string | null {
+  const source = String(text || '')
+  for (let index = 0; index < source.length; index += 1) {
+    if (source[index] !== '{') continue
+    const end = findBalancedJsonObjectEnd(source, index)
+    if (end === -1) return null
+    return source.slice(index, end)
+  }
+  return null
+}
+
+export function parseTier2DreamResponseText(text: string): Tier2Response | null {
+  const jsonText = extractFirstBalancedJsonObject(text)
+  if (!jsonText) return null
+  let raw: unknown
+  try {
+    raw = JSON.parse(jsonText)
+  } catch {
+    return null
+  }
+  const parsed = Tier2ResponseSchema.safeParse(raw)
+  return parsed.success ? parsed.data : null
+}
+
 export async function runTier2Dream(
   agentId: string,
   config: DreamConfig,
@@ -149,7 +214,7 @@ ${memoryLines.join('\n')}`
 
   try {
     const { buildLLM } = await import('@/lib/server/build-llm')
-    const { llm } = await buildLLM({ agentId })
+    const { llm } = await buildLLM({ agentId, responseFormat: 'json_object' })
     const { HumanMessage } = await import('@langchain/core/messages')
 
     const response = await llm.invoke([new HumanMessage(prompt)])
@@ -159,9 +224,10 @@ ${memoryLines.join('\n')}`
         ? response.content.map((b) => ('text' in b && typeof b.text === 'string' ? b.text : '')).join('')
         : ''
 
-    // Extract JSON from response (handle markdown code blocks)
-    const jsonMatch = text.match(/\{[\s\S]*\}/)
-    const parsed = safeJsonParse<Tier2Response>(jsonMatch?.[0] ?? '', {})
+    const parsed = parseTier2DreamResponseText(text) ?? {}
+    if (!parsed.consolidations && !parsed.reflections && !parsed.flagged) {
+      errors.push('Tier 2 dream response was not valid structured JSON.')
+    }
 
     // Process consolidations
     if (Array.isArray(parsed.consolidations)) {