@swarmclawai/swarmclaw 0.7.2 → 0.7.4

package/src/components/ui/dialog.tsx

@@ -39,7 +39,7 @@ function DialogOverlay({
     <DialogPrimitive.Overlay
       data-slot="dialog-overlay"
       className={cn(
-        "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
+        "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/72 backdrop-blur-md",
         className
       )}
       {...props}
@@ -71,7 +71,7 @@ function DialogContent({
         {showCloseButton && (
           <DialogPrimitive.Close
             data-slot="dialog-close"
-            className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
+            className="absolute top-4 right-4 inline-flex h-9 w-9 items-center justify-center rounded-[12px] border border-white/[0.06] bg-white/[0.03] text-text-3 transition-all hover:bg-white/[0.06] hover:text-text-2 focus:outline-none focus:ring-2 focus:ring-accent-bright/30 disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
           >
             <XIcon />
             <span className="sr-only">Close</span>

package/src/components/usage/metrics-dashboard.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useState, useCallback } from 'react'
+import { useEffect, useState, useCallback, useMemo } from 'react'
 import {
   LineChart, Line, BarChart, Bar, Cell,
   XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, Legend,
@@ -158,6 +158,14 @@ export function MetricsDashboard() {
   useWs('tasks', loadTaskMetrics, 15_000)
 
   const completionRate = computeCompletionRate(tasks)
+  const pendingApprovals = useMemo(
+    () => Object.values(tasks).filter((task) => !!task.pendingApproval).length,
+    [tasks],
+  )
+  const failedTasks = useMemo(
+    () => Object.values(tasks).filter((task) => task.status === 'failed').length,
+    [tasks],
+  )
 
   const timeSeriesFormatted = (data?.timeSeries ?? []).map((pt) => ({
     ...pt,
@@ -202,6 +210,57 @@ export function MetricsDashboard() {
     labelStyle: { color: 'var(--color-text-2)' },
   }
 
+  const insightCards = useMemo(() => {
+    const series = data?.timeSeries ?? []
+    const latest = series[series.length - 1]
+    const previous = series.slice(0, -1)
+    const baselineCost = previous.length > 0
+      ? previous.reduce((sum, point) => sum + point.cost, 0) / previous.length
+      : 0
+    const costDeltaPct = latest && baselineCost > 0
+      ? Math.round(((latest.cost - baselineCost) / baselineCost) * 100)
+      : null
+
+    const providerHealthEntries = Object.entries(data?.providerHealth ?? {})
+      .filter(([, health]) => health.totalRequests > 0)
+      .sort(([, a], [, b]) => b.errorRate - a.errorRate)
+    const riskiestProvider = providerHealthEntries[0]
+
+    const topCostAgent = Object.values(data?.byAgent ?? {})
+      .sort((a, b) => b.cost - a.cost)[0]
+
+    return [
+      {
+        label: 'Cost Pulse',
+        value: latest
+          ? `${formatCost(latest.cost)}${costDeltaPct !== null ? ` · ${costDeltaPct >= 0 ? '+' : ''}${costDeltaPct}%` : ''}`
+          : 'No recent spend',
+        hint: latest ? `Latest bucket vs ${previous.length > 0 ? 'range average' : 'current range'}` : 'Waiting for usage data',
+        tone: costDeltaPct !== null && costDeltaPct > 40 ? 'text-red-400' : 'text-text',
+      },
+      {
+        label: 'Provider Risk',
+        value: riskiestProvider
+          ? `${riskiestProvider[0]} · ${(riskiestProvider[1].errorRate * 100).toFixed(1)}%`
+          : 'No provider issues',
+        hint: riskiestProvider ? `${riskiestProvider[1].totalRequests} requests in range` : 'No provider health records yet',
+        tone: riskiestProvider && riskiestProvider[1].errorRate > 0.1 ? 'text-red-400' : 'text-emerald-400',
+      },
+      {
+        label: 'Top Spend Agent',
+        value: topCostAgent ? `${topCostAgent.name} · ${formatCost(topCostAgent.cost)}` : 'No agent activity',
+        hint: topCostAgent ? `${formatTokens(topCostAgent.tokens)} tokens` : 'No per-agent usage in range',
+        tone: 'text-sky-400',
+      },
+      {
+        label: 'Workflow Friction',
+        value: `${pendingApprovals} approvals · ${failedTasks} failed`,
+        hint: pendingApprovals + failedTasks > 0 ? 'Operational overhead from live work' : 'No obvious workflow friction',
+        tone: pendingApprovals + failedTasks > 0 ? 'text-amber-400' : 'text-emerald-400',
+      },
+    ]
+  }, [data, failedTasks, pendingApprovals])
+
   return (
     <div className="flex-1 flex flex-col h-full overflow-y-auto">
       <div className="px-8 pt-6 pb-4 shrink-0" style={{ animation: 'fade-up 0.5s var(--ease-spring)' }}>
@@ -246,6 +305,20 @@ export function MetricsDashboard() {
             <StatCard label="Completion Rate" value={`${completionRate}%`} index={3} />
           </div>
 
+          <div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-4 gap-4">
+            {insightCards.map((card, index) => (
+              <div
+                key={card.label}
+                className="bg-surface-2 rounded-[12px] p-4 border border-white/[0.04] hover:bg-surface transition-all"
+                style={{ animation: 'spring-in 0.6s var(--ease-spring) both', animationDelay: `${0.12 + index * 0.04}s` }}
+              >
+                <p className="text-[11px] font-700 uppercase tracking-[0.08em] text-text-3/60 mb-2">{card.label}</p>
+                <p className={`text-[15px] font-700 leading-tight ${card.tone}`}>{card.value}</p>
+                <p className="text-[11px] text-text-3/55 mt-2 leading-relaxed">{card.hint}</p>
+              </div>
+            ))}
+          </div>
+
           {/* Token usage over time */}
           <div style={{ animation: 'fade-up 0.6s var(--ease-spring) 0.2s both' }}>
             <ChartCard title="Token Usage Over Time">

package/src/components/wallets/wallet-approval-dialog.tsx

@@ -2,6 +2,7 @@
 
 import { useState, useCallback } from 'react'
 import { api } from '@/lib/api-client'
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'
 import type { WalletTransaction } from '@/types'
 
 interface WalletApprovalDialogProps {
@@ -35,65 +36,69 @@ export function WalletApprovalDialog({ transaction, walletAddress, onClose, onRe
   const amountSol = transaction.amountLamports / 1e9
 
   return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center">
-      <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" onClick={onClose} />
-      <div className="relative w-full max-w-md rounded-[16px] border border-white/[0.08] bg-surface-1 shadow-2xl p-6 space-y-5">
-        <div className="flex items-center gap-2">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" className="text-amber-400">
-            <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" />
-            <line x1="12" y1="9" x2="12" y2="13" /><line x1="12" y1="17" x2="12.01" y2="17" />
-          </svg>
-          <h3 className="font-display text-[15px] font-600 text-text-1">Transaction Approval</h3>
-        </div>
+    <Dialog open onOpenChange={(nextOpen) => { if (!nextOpen) onClose() }}>
+      <DialogContent className="sm:max-w-[460px] rounded-[20px] border-white/[0.08] bg-surface/95 p-0 shadow-[0_24px_80px_rgba(0,0,0,0.6)]">
+        <div className="p-6 space-y-5">
+          <DialogHeader className="text-left">
+            <div className="flex items-center gap-2">
+              <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" className="text-amber-400">
+                <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" />
+                <line x1="12" y1="9" x2="12" y2="13" /><line x1="12" y1="17" x2="12.01" y2="17" />
+              </svg>
+              <DialogTitle className="font-display text-[16px] font-700 tracking-[-0.02em] text-text-1">
+                Transaction Approval
+              </DialogTitle>
+            </div>
+            <DialogDescription className="text-[12px] leading-relaxed text-text-3">
+              Crypto transactions are irreversible. Verify the recipient address carefully before approving.
+            </DialogDescription>
+          </DialogHeader>
 
-        <div className="p-4 rounded-[12px] bg-black/20 border border-white/[0.06] space-y-3">
-          <div className="flex items-center justify-between">
-            <span className="text-[11px] text-text-3/70 uppercase tracking-wide">Amount</span>
-            <span className="text-[16px] font-600 text-text-1">{amountSol.toFixed(4)} SOL</span>
-          </div>
-          <div>
-            <span className="text-[11px] text-text-3/70 uppercase tracking-wide block mb-1">From</span>
-            <code className="text-[10px] text-text-3 font-mono break-all">{walletAddress}</code>
-          </div>
-          <div>
-            <span className="text-[11px] text-text-3/70 uppercase tracking-wide block mb-1">To</span>
-            <code className="text-[10px] text-text-3 font-mono break-all">{transaction.toAddress}</code>
-          </div>
-          {transaction.memo && (
+          <div className="rounded-[14px] border border-white/[0.06] bg-black/20 p-4 space-y-3">
+            <div className="flex items-center justify-between">
+              <span className="text-[11px] uppercase tracking-wide text-text-3/70">Amount</span>
+              <span className="text-[16px] font-600 text-text-1">{amountSol.toFixed(4)} SOL</span>
+            </div>
             <div>
-              <span className="text-[11px] text-text-3/70 uppercase tracking-wide block mb-1">Reason</span>
-              <p className="text-[12px] text-text-2">{transaction.memo}</p>
+              <span className="mb-1 block text-[11px] uppercase tracking-wide text-text-3/70">From</span>
+              <code className="text-[10px] text-text-3 font-mono break-all">{walletAddress}</code>
             </div>
-          )}
-        </div>
-
-        <p className="text-[11px] text-amber-400/80">
-          Crypto transactions are irreversible. Verify the recipient address carefully.
-        </p>
+            <div>
+              <span className="mb-1 block text-[11px] uppercase tracking-wide text-text-3/70">To</span>
+              <code className="text-[10px] text-text-3 font-mono break-all">{transaction.toAddress}</code>
+            </div>
+            {transaction.memo && (
+              <div>
+                <span className="mb-1 block text-[11px] uppercase tracking-wide text-text-3/70">Reason</span>
+                <p className="text-[12px] text-text-2">{transaction.memo}</p>
+              </div>
+            )}
+          </div>
 
-        {error && <p className="text-[11px] text-red-400">{error}</p>}
+          {error && <p className="text-[11px] text-red-400">{error}</p>}
 
-        <div className="flex gap-3">
-          <button
-            type="button"
-            onClick={() => handleDecision('deny')}
-            disabled={submitting}
-            className="flex-1 px-4 py-2.5 rounded-[10px] border border-white/[0.08] bg-surface text-text-3 text-[12px] font-600 hover:text-red-400 hover:border-red-400/30 transition-colors cursor-pointer disabled:opacity-50"
-            style={{ fontFamily: 'inherit' }}
-          >
-            Deny
-          </button>
-          <button
-            type="button"
-            onClick={() => handleDecision('approve')}
-            disabled={submitting}
-            className="flex-1 px-4 py-2.5 rounded-[10px] bg-accent text-white text-[12px] font-600 hover:brightness-110 transition-all cursor-pointer disabled:opacity-50"
-            style={{ fontFamily: 'inherit' }}
-          >
-            {submitting ? 'Processing...' : 'Approve & Send'}
-          </button>
+          <DialogFooter>
+            <button
+              type="button"
+              onClick={() => handleDecision('deny')}
+              disabled={submitting}
+              className="flex-1 rounded-[12px] border border-white/[0.08] bg-surface px-4 py-2.5 text-[12px] font-600 text-text-3 transition-colors hover:border-red-400/30 hover:text-red-400 disabled:opacity-50"
+              style={{ fontFamily: 'inherit' }}
+            >
+              Deny
+            </button>
+            <button
+              type="button"
+              onClick={() => handleDecision('approve')}
+              disabled={submitting}
+              className="flex-1 rounded-[12px] bg-accent px-4 py-2.5 text-[12px] font-600 text-white transition-all hover:brightness-110 disabled:opacity-50"
+              style={{ fontFamily: 'inherit' }}
+            >
+              {submitting ? 'Processing...' : 'Approve & Send'}
+            </button>
+          </DialogFooter>
         </div>
-      </div>
-    </div>
+      </DialogContent>
+    </Dialog>
   )
 }

package/src/components/wallets/wallet-panel.tsx

@@ -70,11 +70,7 @@ export function WalletPanel() {
       const data = await api<Record<string, SafeWallet>>('GET', '/wallets')
       setWallets(data)
 
-      // Auto-select wallet for target agent
-      if (walletPanelAgentId) {
-        const match = Object.values(data).find((w) => w.agentId === walletPanelAgentId)
-        if (match) setSelectedWalletId(match.id)
-      } else if (!selectedWalletId && Object.keys(data).length > 0) {
+      if (!walletPanelAgentId && !selectedWalletId && Object.keys(data).length > 0) {
         setSelectedWalletId(Object.keys(data)[0])
       }
     } catch { /* ignore */ }
@@ -85,6 +81,22 @@ export function WalletPanel() {
   useEffect(() => { loadWallets() }, [loadWallets])
   useWs('wallets', loadWallets, 15000)
 
+  useEffect(() => {
+    if (!walletPanelAgentId) return
+    const match = Object.values(wallets).find((wallet) => wallet.agentId === walletPanelAgentId)
+    if (match) {
+      setSelectedWalletId(match.id)
+      setShowCreateForm(false)
+      setCreateError('')
+      return
+    }
+    if (!agents[walletPanelAgentId]) return
+    setSelectedWalletId(null)
+    setShowCreateForm(true)
+    setCreateAgentId(walletPanelAgentId)
+    setCreateError('')
+  }, [agents, walletPanelAgentId, wallets])
+
   // Load detail when wallet selected
   const selectedWallet = selectedWalletId ? wallets[selectedWalletId] : null
 

package/src/components/webhooks/webhook-sheet.tsx

@@ -64,8 +64,8 @@ export function WebhookSheet() {
 
   const editing = editingId ? (webhooks[editingId] as Webhook | undefined) : null
   const endpoint = editing ? webhookUrl(editing.id) : ''
-  const orchestrators = useMemo(
-    () => Object.values(agents).filter((a) => a.isOrchestrator),
+  const eligibleAgents = useMemo(
+    () => Object.values(agents),
     [agents]
   )
 
@@ -127,7 +127,7 @@ export function WebhookSheet() {
 
   const handleSave = async () => {
     if (!agentId) {
-      setError('An orchestrator agent is required.')
+      setError('Choose an eligible agent to handle this webhook.')
       return
     }
 
@@ -185,7 +185,7 @@ export function WebhookSheet() {
           <h2 className="font-display text-[24px] font-700 tracking-[-0.02em] mb-1">
             {editing ? 'Edit Webhook' : 'New Webhook'}
           </h2>
-          <p className="text-[13px] text-text-3">Create an inbound endpoint that triggers an orchestrator</p>
+          <p className="text-[13px] text-text-3">Create an inbound endpoint that launches an agent workflow</p>
         </div>
 
         {editing && (
@@ -294,15 +294,15 @@ export function WebhookSheet() {
         </div>
 
         <div>
-          <label className="block font-display text-[11px] font-600 text-text-3 uppercase tracking-[0.08em] mb-2">Route to Orchestrator</label>
+          <label className="block font-display text-[11px] font-600 text-text-3 uppercase tracking-[0.08em] mb-2">Route to Agent</label>
           <select
             value={agentId}
             onChange={(e) => setAgentId(e.target.value)}
             className={`${inputClass} appearance-none cursor-pointer`}
             style={{ fontFamily: 'inherit' }}
           >
-            <option value="">Select orchestrator...</option>
-            {orchestrators.map((agent) => (
+            <option value="">Select agent...</option>
+            {eligibleAgents.map((agent) => (
               <option key={agent.id} value={agent.id}>{agent.name}</option>
             ))}
           </select>

package/src/lib/auth.ts

@@ -0,0 +1,17 @@
+export const AUTH_COOKIE_NAME = 'sc_auth'
+
+export function getCookieValue(cookieHeader: string | null | undefined, name: string): string {
+  if (!cookieHeader) return ''
+  const parts = cookieHeader.split(';')
+  for (const part of parts) {
+    const [rawKey, ...rest] = part.split('=')
+    if (!rawKey || rest.length === 0) continue
+    if (rawKey.trim() !== name) continue
+    try {
+      return decodeURIComponent(rest.join('=').trim())
+    } catch {
+      return rest.join('=').trim()
+    }
+  }
+  return ''
+}

package/src/lib/chat-streaming-state.test.ts

@@ -0,0 +1,108 @@
+import { describe, it } from 'node:test'
+import assert from 'node:assert/strict'
+import type { Message } from '@/types'
+import {
+  mergeCompletedAssistantMessage,
+  messagesDiffer,
+  pruneStreamingAssistantArtifacts,
+  shouldHidePersistedStreamingAssistantMessage,
+  upsertStreamingAssistantArtifact,
+} from './chat-streaming-state'
+
+describe('chat-streaming-state', () => {
+  it('hides persisted streaming assistant artifacts while a local stream bubble is active', () => {
+    const message: Message = {
+      role: 'assistant',
+      text: 'partial',
+      time: 1,
+      streaming: true,
+    }
+
+    assert.equal(
+      shouldHidePersistedStreamingAssistantMessage(message, { localStreaming: true, displayText: 'live text' }),
+      true,
+    )
+    assert.equal(
+      shouldHidePersistedStreamingAssistantMessage(message, { localStreaming: true, displayText: '' }),
+      true,
+    )
+  })
+
+  it('replaces trailing streaming assistant messages with the completed assistant message', () => {
+    const messages: Message[] = [
+      { role: 'user', text: 'hello', time: 1 },
+      { role: 'assistant', text: 'partial 1', time: 2, streaming: true },
+      { role: 'assistant', text: 'partial 2', time: 3, streaming: true },
+    ]
+    const completed: Message = { role: 'assistant', text: 'final', time: 4 }
+
+    assert.deepEqual(mergeCompletedAssistantMessage(messages, completed), [
+      { role: 'user', text: 'hello', time: 1 },
+      { role: 'assistant', text: 'final', time: 4 },
+    ])
+  })
+
+  it('prunes stale streaming artifacts without touching later system messages', () => {
+    const messages: Message[] = [
+      { role: 'user', text: 'hello', time: 1 },
+      { role: 'assistant', text: 'partial', time: 10, streaming: true },
+      { role: 'assistant', text: 'approval card', time: 11, kind: 'system' },
+      { role: 'assistant', text: 'older partial', time: 12, streaming: true },
+      { role: 'assistant', text: 'previous run', time: 2, streaming: true },
+    ]
+
+    const changed = pruneStreamingAssistantArtifacts(messages, { minIndex: 1, minTime: 10 })
+
+    assert.equal(changed, true)
+    assert.deepEqual(messages, [
+      { role: 'user', text: 'hello', time: 1 },
+      { role: 'assistant', text: 'approval card', time: 11, kind: 'system' },
+      { role: 'assistant', text: 'previous run', time: 2, streaming: true },
+    ])
+  })
+
+  it('replaces the current run partial with the latest artifact after system messages', () => {
+    const messages: Message[] = [
+      { role: 'user', text: 'hello', time: 1 },
+      { role: 'assistant', text: 'partial', time: 10, streaming: true },
+      { role: 'assistant', text: 'approval card', time: 11, kind: 'system' },
+    ]
+
+    upsertStreamingAssistantArtifact(
+      messages,
+      { role: 'assistant', text: 'latest partial', time: 12, streaming: true },
+      { minIndex: 1, minTime: 10 },
+    )
+
+    assert.deepEqual(messages, [
+      { role: 'user', text: 'hello', time: 1 },
+      { role: 'assistant', text: 'approval card', time: 11, kind: 'system' },
+      { role: 'assistant', text: 'latest partial', time: 12, streaming: true },
+    ])
+  })
+
+  it('reuses the previous assistant slot when the server already persisted the same final text', () => {
+    const messages: Message[] = [
+      { role: 'user', text: 'hello', time: 1 },
+      { role: 'assistant', text: 'final', time: 2, kind: 'chat' },
+    ]
+    const completed: Message = { role: 'assistant', text: 'final', time: 3, kind: 'chat' }
+
+    assert.deepEqual(mergeCompletedAssistantMessage(messages, completed), [
+      { role: 'user', text: 'hello', time: 1 },
+      { role: 'assistant', text: 'final', time: 2, kind: 'chat' },
+    ])
+  })
+
+  it('detects same-length message updates during reconciliation', () => {
+    const previous: Message[] = [
+      { role: 'assistant', text: 'partial', time: 1, streaming: true },
+    ]
+    const next: Message[] = [
+      { role: 'assistant', text: 'final', time: 2, kind: 'chat' },
+    ]
+
+    assert.equal(messagesDiffer(next, previous), true)
+    assert.equal(messagesDiffer(next, next), false)
+  })
+})

package/src/lib/chat-streaming-state.ts

@@ -0,0 +1,108 @@
+import type { Message } from '@/types'
+
+interface StreamingArtifactWindow {
+  minIndex?: number
+  minTime?: number
+}
+
+function isStreamingAssistantMessage(
+  message: Message,
+  index: number,
+  opts: StreamingArtifactWindow,
+): boolean {
+  if (message.role !== 'assistant' || message.streaming !== true) return false
+  if (typeof opts.minIndex === 'number' && index < opts.minIndex) return false
+  if (typeof opts.minTime === 'number') {
+    if (typeof message.time !== 'number' || message.time < opts.minTime) return false
+  }
+  return true
+}
+
+export function shouldHidePersistedStreamingAssistantMessage(
+  message: Message,
+  opts: { localStreaming: boolean; displayText: string },
+): boolean {
+  return (
+    opts.localStreaming
+    && message.role === 'assistant'
+    && message.streaming === true
+  )
+}
+
+export function pruneStreamingAssistantArtifacts(
+  messages: Message[],
+  opts: StreamingArtifactWindow = {},
+): boolean {
+  const kept = messages.filter((message, index) => !isStreamingAssistantMessage(message, index, opts))
+  if (kept.length === messages.length) return false
+  messages.splice(0, messages.length, ...kept)
+  return true
+}
+
+export function upsertStreamingAssistantArtifact(
+  messages: Message[],
+  assistantMessage: Message,
+  opts: StreamingArtifactWindow = {},
+): boolean {
+  if (assistantMessage.role !== 'assistant' || assistantMessage.streaming !== true) {
+    throw new Error('upsertStreamingAssistantArtifact requires an assistant streaming message')
+  }
+  pruneStreamingAssistantArtifacts(messages, opts)
+  messages.push(assistantMessage)
+  return true
+}
+
+export function mergeCompletedAssistantMessage(messages: Message[], assistantMessage: Message): Message[] {
+  let end = messages.length
+  while (end > 0) {
+    const candidate = messages[end - 1]
+    if (candidate.role !== 'assistant' || candidate.streaming !== true) break
+    end -= 1
+  }
+  const base = messages.slice(0, end)
+  const last = base[base.length - 1]
+  if (
+    last
+    && last.role === 'assistant'
+    && (last.kind || 'chat') === (assistantMessage.kind || 'chat')
+    && last.text.trim() === assistantMessage.text.trim()
+  ) {
+    return [
+      ...base.slice(0, -1),
+      {
+        ...last,
+        ...assistantMessage,
+        time: last.time,
+      },
+    ]
+  }
+  return [...base, assistantMessage]
+}
+
+export function messageReconciliationKey(message: Message): string {
+  return JSON.stringify([
+    message.role,
+    message.kind || '',
+    message.text,
+    message.streaming === true,
+    message.replyToId || '',
+    message.bookmarked === true,
+    message.suggestions?.join('\u241f') || '',
+    (message.toolEvents || []).map((event) => [
+      event.name,
+      event.input,
+      event.output || '',
+      event.error === true,
+    ]),
+  ])
+}
+
+export function messagesDiffer(nextMessages: Message[], currentMessages: Message[]): boolean {
+  if (nextMessages.length !== currentMessages.length) return true
+  for (let i = 0; i < nextMessages.length; i += 1) {
+    if (messageReconciliationKey(nextMessages[i]) !== messageReconciliationKey(currentMessages[i])) {
+      return true
+    }
+  }
+  return false
+}

package/src/lib/heartbeat-defaults.ts

@@ -0,0 +1,48 @@
+export const DEFAULT_HEARTBEAT_INTERVAL_SEC = 1800
+export const DEFAULT_HEARTBEAT_ACK_MAX_CHARS = 300
+export const DEFAULT_HEARTBEAT_SHOW_OK = false
+export const DEFAULT_HEARTBEAT_SHOW_ALERTS = true
+
+function parseIntSetting(value: unknown, fallback: number, min: number, max: number): number {
+  const parsed = typeof value === 'number'
+    ? value
+    : typeof value === 'string'
+      ? Number.parseInt(value, 10)
+      : Number.NaN
+  if (!Number.isFinite(parsed)) return fallback
+  return Math.max(min, Math.min(max, Math.trunc(parsed)))
+}
+
+function parseBoolSetting(value: unknown, fallback: boolean): boolean {
+  if (typeof value === 'boolean') return value
+  if (typeof value === 'string') {
+    const normalized = value.trim().toLowerCase()
+    if (['1', 'true', 'yes', 'on'].includes(normalized)) return true
+    if (['0', 'false', 'no', 'off'].includes(normalized)) return false
+  }
+  return fallback
+}
+
+export interface NormalizedHeartbeatSettingFields {
+  heartbeatIntervalSec: number
+  heartbeatAckMaxChars: number
+  heartbeatShowOk: boolean
+  heartbeatShowAlerts: boolean
+  heartbeatTarget: string | null
+  heartbeatPrompt: string | null
+}
+
+export function normalizeHeartbeatSettingFields(settings: Record<string, unknown>): NormalizedHeartbeatSettingFields {
+  return {
+    heartbeatIntervalSec: parseIntSetting(settings.heartbeatIntervalSec, DEFAULT_HEARTBEAT_INTERVAL_SEC, 0, 86_400),
+    heartbeatAckMaxChars: parseIntSetting(settings.heartbeatAckMaxChars, DEFAULT_HEARTBEAT_ACK_MAX_CHARS, 0, 8_000),
+    heartbeatShowOk: parseBoolSetting(settings.heartbeatShowOk, DEFAULT_HEARTBEAT_SHOW_OK),
+    heartbeatShowAlerts: parseBoolSetting(settings.heartbeatShowAlerts, DEFAULT_HEARTBEAT_SHOW_ALERTS),
+    heartbeatTarget: typeof settings.heartbeatTarget === 'string' && settings.heartbeatTarget.trim()
+      ? settings.heartbeatTarget.trim()
+      : null,
+    heartbeatPrompt: typeof settings.heartbeatPrompt === 'string' && settings.heartbeatPrompt.trim()
+      ? settings.heartbeatPrompt.trim()
+      : null,
+  }
+}