@swarmclawai/swarmclaw 1.5.63 → 1.5.64

package/src/components/mcp-servers/mcp-server-sheet.tsx

@@ -1,14 +1,16 @@
 'use client'
 
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
 import { ConfirmDialog } from '@/components/shared/confirm-dialog'
 import { HintTip } from '@/components/shared/hint-tip'
+import { AdvancedSettingsSection } from '@/components/shared/advanced-settings-section'
 import { api } from '@/lib/app/api-client'
 import { toast } from 'sonner'
 import type { McpServerConfig, McpTransport } from '@/types'
 import { useMountedRef } from '@/hooks/use-mounted-ref'
+import { RegistryBrowser, type RegistryPrefill } from './registry-browser'
 
 interface McpPreset {
   id: string
@@ -39,6 +41,18 @@ const MCP_PRESETS: McpPreset[] = [
     cwdHint: 'Absolute path to a SwarmVault workspace (the directory containing swarmvault.config.json). Run `npx @swarmvaultai/cli init` there first if you haven\'t.',
     defaultName: 'SwarmVault',
   },
+  {
+    id: 'mcp-gateway',
+    label: 'MCP Gateway (local)',
+    description: 'Consolidate many MCP servers behind one entry. The gateway fans out to your downstream servers, namespaces their tools, and only exposes the ones you pre-load — big token savings when you run more than a handful of MCP servers.',
+    helpUrl: 'https://github.com/swarmclawai/mcp-gateway',
+    transport: 'stdio',
+    command: 'npx',
+    args: ['-y', '@swarmclawai/mcp-gateway@latest', 'start'],
+    needsCwd: true,
+    cwdHint: 'Absolute path to a directory containing mcp-gateway.config.json. Run `npx @swarmclawai/mcp-gateway init --write` there first to generate a starter config.',
+    defaultName: 'MCP Gateway',
+  },
   {
     id: 'swarmdock',
     label: 'SwarmDock',
@@ -65,6 +79,7 @@ function McpServerForm({ editing, onClose, loadMcpServers }: {
   const [args, setArgs] = useState(editing?.args?.join(', ') || '')
   const [cwd, setCwd] = useState(editing?.cwd || '')
   const [activePresetId, setActivePresetId] = useState<string | null>(null)
+  const [registryBrowserOpen, setRegistryBrowserOpen] = useState(false)
   const [url, setUrl] = useState(editing?.url || '')
   const [envText, setEnvText] = useState(
     editing?.env ? Object.entries(editing.env).map(([k, v]) => `${k}=${v}`).join('\n') : '',
@@ -72,11 +87,58 @@ function McpServerForm({ editing, onClose, loadMcpServers }: {
   const [headersText, setHeadersText] = useState(
     editing?.headers ? Object.entries(editing.headers).map(([k, v]) => `${k}: ${v}`).join('\n') : '',
   )
+  const initialExposureMode: 'all' | 'lazy' | 'selected' =
+    editing === null || editing?.alwaysExpose === undefined || editing.alwaysExpose === true
+      ? 'all'
+      : editing.alwaysExpose === false
+        ? 'lazy'
+        : 'selected'
+  const [exposureMode, setExposureMode] = useState<'all' | 'lazy' | 'selected'>(initialExposureMode)
+  const [exposureAllowlistText, setExposureAllowlistText] = useState(
+    Array.isArray(editing?.alwaysExpose) ? editing.alwaysExpose.join(', ') : '',
+  )
+  const [advancedOpen, setAdvancedOpen] = useState(initialExposureMode !== 'all')
+  const [discoveredTools, setDiscoveredTools] = useState<Array<{ name: string; description?: string; tokens: number }> | null>(null)
+  const [discoveredLoading, setDiscoveredLoading] = useState(false)
+  const [discoveredError, setDiscoveredError] = useState<string | null>(null)
   const [testing, setTesting] = useState(false)
   const [testResult, setTestResult] = useState<{ ok: boolean; tools?: string[]; error?: string } | null>(null)
   const [confirmDelete, setConfirmDelete] = useState(false)
   const [deleting, setDeleting] = useState(false)
 
+  // Lazily load discovered tools when the user picks the allow-list mode
+  // for an existing (edited) server. Only hits the server once per sheet open.
+  useEffect(() => {
+    if (!editing || exposureMode !== 'selected' || discoveredTools || discoveredLoading) return
+    let cancelled = false
+    setDiscoveredLoading(true)
+    setDiscoveredError(null)
+    void (async () => {
+      try {
+        const res = await api<{ tools: Array<{ name: string; description?: string; tokens: number }> }>(
+          'GET',
+          `/mcp-servers/${editing.id}/tools-info`,
+        )
+        if (cancelled) return
+        setDiscoveredTools(res.tools)
+      } catch (err: unknown) {
+        if (cancelled) return
+        setDiscoveredError(err instanceof Error ? err.message : 'Failed to load tools')
+      } finally {
+        if (!cancelled) setDiscoveredLoading(false)
+      }
+    })()
+    return () => { cancelled = true }
+  }, [editing, exposureMode, discoveredTools, discoveredLoading])
+
+  const toggleAllowlistTool = (toolName: string) => {
+    const current = exposureAllowlistText.split(/[\s,]+/).map((s) => s.trim()).filter(Boolean)
+    const next = current.includes(toolName)
+      ? current.filter((t) => t !== toolName)
+      : [...current, toolName]
+    setExposureAllowlistText(next.join(', '))
+  }
+
   const parseEnv = (text: string): Record<string, string> | undefined => {
     if (!text.trim()) return undefined
     const env: Record<string, string> = {}
@@ -103,6 +165,12 @@ function McpServerForm({ editing, onClose, loadMcpServers }: {
       transport,
       env: parseEnv(envText),
       headers: parseHeaders(headersText),
+      alwaysExpose:
+        exposureMode === 'all'
+          ? true
+          : exposureMode === 'lazy'
+            ? false
+            : exposureAllowlistText.split(/[\s,]+/).map((s) => s.trim()).filter(Boolean),
     }
     if (transport === 'stdio') {
       data.command = command.trim()
@@ -186,6 +254,16 @@ function McpServerForm({ editing, onClose, loadMcpServers }: {
 
   const activePreset = activePresetId ? MCP_PRESETS.find((p) => p.id === activePresetId) ?? null : null
 
+  const applyRegistryPrefill = (prefill: RegistryPrefill) => {
+    setActivePresetId(null)
+    setTransport(prefill.transport)
+    if (prefill.command !== undefined) setCommand(prefill.command)
+    if (prefill.args !== undefined) setArgs(prefill.args.join(', '))
+    if (prefill.url !== undefined) setUrl(prefill.url)
+    if (!name.trim()) setName(prefill.name)
+    toast.success(`Prefilled from SwarmDock MCP Registry: ${prefill.sourceSlug}`)
+  }
+
   const inputClass = "w-full px-4 py-3.5 rounded-[14px] border border-white/[0.08] bg-surface text-text text-[15px] outline-none transition-all duration-200 placeholder:text-text-3/50 focus-glow"
   const labelClass = "block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em] mb-3"
 
@@ -221,6 +299,15 @@ function McpServerForm({ editing, onClose, loadMcpServers }: {
                 </button>
               )
             })}
+            <button
+              type="button"
+              onClick={() => setRegistryBrowserOpen(true)}
+              className="py-2 px-4 rounded-[12px] border border-dashed border-accent-bright/30 bg-transparent text-[13px] font-600 text-accent-bright cursor-pointer transition-all hover:bg-accent-bright/10"
+              style={{ fontFamily: 'inherit' }}
+              title="Browse the public SwarmDock MCP Registry"
+            >
+              Browse Registry...
+            </button>
           </div>
           {activePreset && (
             <p className="mt-3 text-[12px] text-text-3">
@@ -321,6 +408,115 @@ function McpServerForm({ editing, onClose, loadMcpServers }: {
         </div>
       )}
 
+      <AdvancedSettingsSection
+        open={advancedOpen}
+        onToggle={() => setAdvancedOpen((v) => !v)}
+        summary={exposureMode === 'all' ? 'All tools eager' : exposureMode === 'lazy' ? 'Lazy (on demand)' : 'Allow-list'}
+        badges={exposureMode === 'selected' && exposureAllowlistText.trim()
+          ? exposureAllowlistText.split(/[\s,]+/).map((s) => s.trim()).filter(Boolean).slice(0, 5)
+          : []}
+      >
+        <div className="space-y-4">
+          <div>
+            <label className={labelClass}>
+              Tool exposure
+              <HintTip text="Controls how this server's tools get bound into agent context. Lazy servers stay hidden until an agent calls `mcp_tool_search` to discover them — that's how you cut token usage from chatty MCP servers." />
+            </label>
+            <div className="flex flex-col gap-2">
+              {([
+                ['all', 'Expose all tools', 'Every tool from this server is bound on every turn. Default — preserves legacy behavior.'],
+                ['lazy', 'Lazy — expose none', 'No tools bound until the agent calls mcp_tool_search to discover them. Biggest token savings.'],
+                ['selected', 'Allow-list', 'Only pre-bind the tools you list below. Agent can still discover others via mcp_tool_search.'],
+              ] as const).map(([value, label, hint]) => (
+                <label key={value} className={`flex items-start gap-3 p-3 rounded-[12px] border cursor-pointer transition-all ${exposureMode === value ? 'border-accent-bright bg-accent-bright/5' : 'border-white/[0.08] hover:bg-surface-2'}`}>
+                  <input
+                    type="radio"
+                    name="exposureMode"
+                    value={value}
+                    checked={exposureMode === value}
+                    onChange={() => setExposureMode(value)}
+                    className="mt-1"
+                  />
+                  <div className="flex-1 min-w-0">
+                    <div className="text-[14px] font-600 text-text">{label}</div>
+                    <div className="text-[12px] text-text-3 leading-[1.5] mt-0.5">{hint}</div>
+                  </div>
+                </label>
+              ))}
+            </div>
+          </div>
+          {exposureMode === 'selected' && (
+            <div>
+              <label className={labelClass}>
+                Allow-list tools
+                <HintTip text="Pick the tools to bind eagerly. Every unchecked tool stays discoverable via `mcp_tool_search`." />
+              </label>
+              {discoveredLoading && (
+                <div className="text-[12px] text-text-3">Loading tools...</div>
+              )}
+              {discoveredError && (
+                <div className="text-[12px] text-amber-400">
+                  Could not load tools: {discoveredError}. Type names manually below.
+                </div>
+              )}
+              {discoveredTools && discoveredTools.length > 0 && (
+                (() => {
+                  const selected = new Set(
+                    exposureAllowlistText.split(/[\s,]+/).map((s) => s.trim()).filter(Boolean),
+                  )
+                  const totalTokens = discoveredTools.reduce((n, t) => n + t.tokens, 0)
+                  const selectedTokens = discoveredTools
+                    .filter((t) => selected.has(t.name))
+                    .reduce((n, t) => n + t.tokens, 0)
+                  return (
+                    <div className="space-y-1 rounded-[12px] border border-white/[0.08] bg-surface/50 p-2 max-h-[320px] overflow-auto">
+                      <div className="px-2 py-1 text-[11px] font-mono text-text-3">
+                        {selectedTokens.toLocaleString()} / {totalTokens.toLocaleString()} tokens selected
+                      </div>
+                      {discoveredTools.map((t) => {
+                        const checked = selected.has(t.name)
+                        return (
+                          <label
+                            key={t.name}
+                            className={`flex items-start gap-3 p-2 rounded-[10px] cursor-pointer transition-colors ${checked ? 'bg-accent-bright/5' : 'hover:bg-white/[0.03]'}`}
+                          >
+                            <input
+                              type="checkbox"
+                              checked={checked}
+                              onChange={() => toggleAllowlistTool(t.name)}
+                              className="mt-1 shrink-0"
+                            />
+                            <div className="flex-1 min-w-0">
+                              <div className="flex items-center justify-between gap-2">
+                                <span className="text-[13px] font-mono text-text truncate">{t.name}</span>
+                                <span className="text-[10px] font-mono text-text-3 shrink-0">{t.tokens.toLocaleString()} tok</span>
+                              </div>
+                              {t.description && (
+                                <p className="text-[12px] text-text-3/80 leading-[1.4] mt-0.5 line-clamp-2">{t.description}</p>
+                              )}
+                            </div>
+                          </label>
+                        )
+                      })}
+                    </div>
+                  )
+                })()
+              )}
+              {(!discoveredTools || discoveredTools.length === 0) && !discoveredLoading && (
+                <textarea
+                  value={exposureAllowlistText}
+                  onChange={(e) => setExposureAllowlistText(e.target.value)}
+                  placeholder={"read_file\nwrite_file"}
+                  rows={3}
+                  className={`${inputClass} resize-y min-h-[80px] font-mono text-[13px]`}
+                  style={{ fontFamily: 'inherit' }}
+                />
+              )}
+            </div>
+          )}
+        </div>
+      </AdvancedSettingsSection>
+
       {editing && (
         <div className="mb-8">
           <button
@@ -372,6 +568,11 @@ function McpServerForm({ editing, onClose, loadMcpServers }: {
         onConfirm={() => { void handleDelete() }}
         onCancel={() => { if (!deleting) setConfirmDelete(false) }}
       />
+      <RegistryBrowser
+        open={registryBrowserOpen}
+        onClose={() => setRegistryBrowserOpen(false)}
+        onSelect={applyRegistryPrefill}
+      />
     </>
   )
 }

package/src/components/mcp-servers/registry-browser.tsx

@@ -0,0 +1,224 @@
+'use client'
+
+/**
+ * Browse the public SwarmDock MCP Registry (https://mcp.swarmdock.ai) from
+ * the New MCP Server sheet. Selecting a server populates the form with its
+ * recommended install method so users get one-click discovery without
+ * leaving SwarmClaw.
+ *
+ * Read-only — SwarmClaw only consumes the registry. Attestations and
+ * submissions happen through SwarmDock directly.
+ */
+
+import { useEffect, useState } from 'react'
+
+const REGISTRY_API = 'https://swarmdock-api.onrender.com/api/v1/mcp/servers'
+
+export interface RegistryPrefill {
+  name: string
+  transport: 'stdio' | 'sse' | 'streamable-http'
+  command?: string
+  args?: string[]
+  url?: string
+  sourceSlug: string
+}
+
+interface RegistryServer {
+  slug: string
+  name: string
+  description: string
+  transport: string
+  authMode: string
+  language: string | null
+  tags: string[]
+  qualityScore: number
+  verifiedUsageCount: number
+  paidTier: boolean
+}
+
+interface RegistryDetail extends RegistryServer {
+  installations: Array<{ method: string; spec: Record<string, unknown> }>
+}
+
+function mapTransport(transport: string): 'stdio' | 'sse' | 'streamable-http' {
+  if (transport === 'sse') return 'sse'
+  if (transport === 'streamable_http') return 'streamable-http'
+  return 'stdio'
+}
+
+function installToPrefill(server: RegistryDetail): RegistryPrefill | null {
+  const preferred = server.installations.find((i) => i.method === 'npx')
+    ?? server.installations.find((i) => i.method === 'npm')
+    ?? server.installations.find((i) => i.method === 'uvx')
+    ?? server.installations.find((i) => i.method === 'pipx')
+    ?? server.installations.find((i) => i.method === 'docker')
+    ?? server.installations.find((i) => i.method === 'remote')
+    ?? server.installations[0]
+
+  if (!preferred) return null
+
+  const spec = preferred.spec
+  const transport = mapTransport(server.transport)
+
+  if (preferred.method === 'remote') {
+    const url = typeof spec.url === 'string' ? spec.url : undefined
+    return url
+      ? { name: server.name, transport: transport === 'stdio' ? 'streamable-http' : transport, url, sourceSlug: server.slug }
+      : null
+  }
+
+  const command = typeof spec.command === 'string' ? spec.command : preferred.method === 'docker' ? 'docker' : 'npx'
+  const args = Array.isArray(spec.args)
+    ? spec.args.filter((a): a is string => typeof a === 'string')
+    : preferred.method === 'npm' && typeof spec.package === 'string'
+      ? ['-y', spec.package]
+      : []
+
+  return { name: server.name, transport, command, args, sourceSlug: server.slug }
+}
+
+export function RegistryBrowser({
+  open,
+  onClose,
+  onSelect,
+}: {
+  open: boolean
+  onClose: () => void
+  onSelect: (prefill: RegistryPrefill) => void
+}) {
+  const [query, setQuery] = useState('')
+  const [servers, setServers] = useState<RegistryServer[]>([])
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [selecting, setSelecting] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!open) return
+    let cancelled = false
+    const fetchServers = async () => {
+      setLoading(true)
+      setError(null)
+      try {
+        const qs = query ? `?q=${encodeURIComponent(query)}&limit=20` : '?limit=20'
+        const res = await fetch(`${REGISTRY_API}${qs}`)
+        if (!res.ok) throw new Error(`Registry returned ${res.status}`)
+        const data = await res.json() as { servers: RegistryServer[] }
+        if (!cancelled) setServers(data.servers)
+      } catch (err) {
+        if (!cancelled) setError(err instanceof Error ? err.message : 'Failed to load registry')
+      } finally {
+        if (!cancelled) setLoading(false)
+      }
+    }
+    const timer = setTimeout(fetchServers, query ? 250 : 0)
+    return () => {
+      cancelled = true
+      clearTimeout(timer)
+    }
+  }, [open, query])
+
+  const handleSelect = async (slug: string) => {
+    setSelecting(slug)
+    try {
+      const res = await fetch(`${REGISTRY_API}/${encodeURIComponent(slug)}`)
+      if (!res.ok) throw new Error(`Server detail returned ${res.status}`)
+      const detail = await res.json() as RegistryDetail
+      const prefill = installToPrefill(detail)
+      if (!prefill) {
+        setError('This server has no installation method SwarmClaw can consume yet.')
+        return
+      }
+      onSelect(prefill)
+      onClose()
+    } catch (err) {
+      setError(err instanceof Error ? err.message : 'Failed to fetch server')
+    } finally {
+      setSelecting(null)
+    }
+  }
+
+  if (!open) return null
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" onClick={onClose}>
+      <div
+        className="flex max-h-[80vh] w-full max-w-2xl flex-col overflow-hidden rounded-[20px] border border-white/[0.08] bg-surface"
+        onClick={(e) => e.stopPropagation()}
+      >
+        <div className="flex items-center justify-between border-b border-white/[0.06] px-6 py-4">
+          <div>
+            <h3 className="font-display text-[18px] font-700 tracking-[-0.02em]">Browse SwarmDock MCP Registry</h3>
+            <p className="mt-0.5 text-[12px] text-text-3">
+              Public directory with verified usage signal · <a href="https://mcp.swarmdock.ai" target="_blank" rel="noopener noreferrer" className="text-accent-bright hover:underline">mcp.swarmdock.ai</a>
+            </p>
+          </div>
+          <button
+            type="button"
+            onClick={onClose}
+            className="text-text-3 hover:text-text"
+            aria-label="Close"
+          >
+            <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5">
+              <line x1="18" y1="6" x2="6" y2="18" /><line x1="6" y1="6" x2="18" y2="18" />
+            </svg>
+          </button>
+        </div>
+
+        <div className="px-6 py-4">
+          <input
+            type="text"
+            placeholder="Search — e.g. postgres, pdf, github"
+            value={query}
+            onChange={(e) => setQuery(e.target.value)}
+            className="w-full rounded-[12px] border border-white/[0.08] bg-surface-2 px-4 py-2.5 text-[14px] outline-none focus-glow"
+            style={{ fontFamily: 'inherit' }}
+            autoFocus
+          />
+        </div>
+
+        <div className="flex-1 overflow-y-auto px-4 pb-4">
+          {loading ? (
+            <p className="px-2 py-4 text-center text-[13px] text-text-3">Loading...</p>
+          ) : error ? (
+            <p className="px-2 py-4 text-center text-[13px] text-red-400">{error}</p>
+          ) : servers.length === 0 ? (
+            <p className="px-2 py-4 text-center text-[13px] text-text-3">No servers found.</p>
+          ) : (
+            <ul className="space-y-1.5">
+              {servers.map((server) => (
+                <li key={server.slug}>
+                  <button
+                    type="button"
+                    onClick={() => handleSelect(server.slug)}
+                    disabled={selecting !== null}
+                    className="group flex w-full flex-col gap-1 rounded-[12px] border border-transparent px-3 py-2.5 text-left transition-all hover:border-white/[0.08] hover:bg-surface-2 disabled:opacity-60"
+                  >
+                    <div className="flex items-center gap-2">
+                      <span className="text-[14px] font-600 group-hover:text-accent-bright">{server.name}</span>
+                      <span className="rounded-full bg-white/[0.05] px-2 py-0.5 text-[10px] font-mono uppercase text-text-3">
+                        {server.transport}
+                      </span>
+                      {server.paidTier ? (
+                        <span className="rounded-full bg-emerald-500/15 px-2 py-0.5 text-[10px] font-600 text-emerald-400">
+                          Paid
+                        </span>
+                      ) : null}
+                      {selecting === server.slug ? (
+                        <span className="ml-auto text-[11px] text-accent-bright">Loading...</span>
+                      ) : (
+                        <span className="ml-auto text-[11px] text-text-3">
+                          Q {server.qualityScore.toFixed(2)} · {server.verifiedUsageCount.toLocaleString()} uses
+                        </span>
+                      )}
+                    </div>
+                    <p className="line-clamp-2 text-[12px] text-text-3">{server.description}</p>
+                  </button>
+                </li>
+              ))}
+            </ul>
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}

package/src/lib/chat/chats.ts

@@ -76,8 +76,44 @@ export const removeQueuedSessionMessage = (id: string, runId: string) =>
 export const clearSessionQueue = (id: string) =>
   api<{ cancelled: number; snapshot: SessionQueueSnapshot }>('DELETE', `/chats/${id}/queue`, {})
 
+export interface ClearChatResult {
+  cleared: number
+  undoToken: string
+  expiresAt: number
+}
+
 export const clearMessages = (id: string) =>
-  api<string>('POST', `/chats/${id}/clear`)
+  api<ClearChatResult>('POST', `/chats/${id}/clear`)
+
+export const undoClearMessages = (id: string, undoToken: string) =>
+  api<{ restored: number }>('POST', `/chats/${id}/clear/undo`, { undoToken })
+
+export interface ContextStatusResponse {
+  estimatedTokens: number
+  effectiveTokens: number
+  contextWindow: number
+  percentUsed: number
+  messageCount: number
+  extraTokens: number
+  reserveTokens: number
+  remainingTokens: number
+  strategy: 'ok' | 'warning' | 'critical'
+}
+
+export const fetchContextStatus = (id: string) =>
+  api<ContextStatusResponse>('GET', `/chats/${id}/context-status`)
+
+export interface CompactChatResult {
+  status: 'compacted' | 'no_action'
+  prunedCount?: number
+  memoriesStored?: number
+  summaryAdded?: boolean
+  messageCount: number
+  keepLastN?: number
+}
+
+export const compactChat = (id: string, keepLastN?: number) =>
+  api<CompactChatResult>('POST', `/chats/${id}/compact`, keepLastN ? { keepLastN } : {})
 
 export const stopChat = (id: string) =>
   api<string>('POST', `/chats/${id}/stop`)

package/src/lib/server/chats/chat-session-service.ts

@@ -22,8 +22,14 @@ import {
   clearMessages,
   deleteSessionMessages,
   getMessages,
+  replaceAllMessages,
   truncateAfter,
 } from '@/lib/server/messages/message-repository'
+import {
+  consumeClearUndoSnapshot,
+  recordClearUndoSnapshot,
+  type ClearUndoCliIds,
+} from '@/lib/server/chats/clear-undo-snapshots'
 import { deleteSessionWorkingState } from '@/lib/server/working-state/service'
 import { normalizeProviderEndpoint } from '@/lib/openclaw/openclaw-endpoint'
 import { serviceFail, serviceOk } from '@/lib/server/service-result'
@@ -387,6 +393,7 @@ export function clearChatMessages(sessionId: string): boolean {
   session.claudeSessionId = null
   session.codexThreadId = null
   session.opencodeSessionId = null
+  session.opencodeWebSessionId = null
   session.geminiSessionId = null
   session.copilotSessionId = null
   session.droidSessionId = null
@@ -399,6 +406,74 @@ export function clearChatMessages(sessionId: string): boolean {
   return true
 }
 
+function snapshotSessionCliIds(session: Session): ClearUndoCliIds {
+  return {
+    claudeSessionId: session.claudeSessionId ?? null,
+    codexThreadId: session.codexThreadId ?? null,
+    opencodeSessionId: session.opencodeSessionId ?? null,
+    opencodeWebSessionId: session.opencodeWebSessionId ?? null,
+    geminiSessionId: session.geminiSessionId ?? null,
+    copilotSessionId: session.copilotSessionId ?? null,
+    droidSessionId: session.droidSessionId ?? null,
+    cursorSessionId: session.cursorSessionId ?? null,
+    qwenSessionId: session.qwenSessionId ?? null,
+    acpSessionId: session.acpSessionId ?? null,
+    delegateResumeIds: session.delegateResumeIds
+      ? { ...session.delegateResumeIds }
+      : null,
+  }
+}
+
+export function clearChatMessagesWithUndo(sessionId: string): ServiceResult<{
+  cleared: number
+  undoToken: string
+  expiresAt: number
+}> {
+  const session = getSession(sessionId)
+  if (!session) return serviceFail(404, 'Session not found')
+  const priorMessages = getMessages(sessionId)
+  const cli = snapshotSessionCliIds(session)
+  const { token, expiresAt } = recordClearUndoSnapshot({
+    sessionId,
+    messages: priorMessages,
+    cli,
+  })
+  clearChatMessages(sessionId)
+  return serviceOk({
+    cleared: priorMessages.length,
+    undoToken: token,
+    expiresAt,
+  })
+}
+
+export function restoreChatFromUndoToken(
+  sessionId: string,
+  undoToken: string,
+): ServiceResult<{ restored: number }> {
+  const session = getSession(sessionId)
+  if (!session) return serviceFail(404, 'Session not found')
+  const snapshot = consumeClearUndoSnapshot({ token: undoToken, sessionId })
+  if (!snapshot) return serviceFail(404, 'Undo window expired')
+  replaceAllMessages(sessionId, snapshot.messages)
+  const cli = snapshot.cli
+  session.claudeSessionId = cli.claudeSessionId
+  session.codexThreadId = cli.codexThreadId
+  session.opencodeSessionId = cli.opencodeSessionId
+  session.opencodeWebSessionId = cli.opencodeWebSessionId
+  session.geminiSessionId = cli.geminiSessionId
+  session.copilotSessionId = cli.copilotSessionId
+  session.droidSessionId = cli.droidSessionId
+  session.cursorSessionId = cli.cursorSessionId
+  session.qwenSessionId = cli.qwenSessionId
+  session.acpSessionId = cli.acpSessionId
+  session.delegateResumeIds = cli.delegateResumeIds
+    ? { ...cli.delegateResumeIds }
+    : emptyDelegateResumeIds()
+  saveSession(sessionId, session)
+  notify('sessions')
+  return serviceOk({ restored: snapshot.messages.length })
+}
+
 export function retryChatTurn(sessionId: string): ServiceResult<{ message: string; imagePath: string | null }> {
   const session = getSession(sessionId)
   if (!session) return serviceFail(404, 'Session not found')