@swarmclawai/swarmclaw 1.5.63 → 1.5.65

package/README.md

@@ -399,6 +399,34 @@ Operational docs: https://swarmclaw.ai/docs/observability
 
 ## Releases
 
+### v1.5.65 Highlights
+
+Follow-up hardening on the v1.5.64 work after live-testing the chat-header flows, the MCP connection pool, and the MCP Registry browser. Six concrete bugs fixed in the clear/undo, MCP pool eviction, and registry-browser code paths.
+
+- **`clearChatMessages` now resets `opencodeWebSessionId` too.** The snapshot/undo pair already captured and restored it, but `clear` itself left the stale identifier in place — so a fresh opencode-web turn would resume the conversation the user intended to drop. Paired with a matching default in `storage-normalization.ts` so older session records load with `opencodeWebSessionId: null` instead of `undefined`. Regression covered by `clear-route.test.ts`.
+- **Undo toast no longer writes to the wrong chat.** If the user navigated away after clicking Clear, clicking Undo in the toast would inject restored messages into whatever chat was currently open. `chat-area.tsx` now gates the `setMessages` calls on `selectActiveSessionId === targetSessionId`; same guard added to the compact-complete path.
+- **Background MCP status probes no longer evict the connection pool.** Visiting `/mcp-servers` auto-called `POST /api/mcp-servers/:id/test` for every server, which force-disconnected pooled clients that running agents were using mid-turn. Eviction is now gated behind `?reset=1`, which only the explicit **Re-test** button sends. Regression added to `src/app/api/mcp-servers/route.test.ts`.
+- **SwarmDock MCP Registry browser actually works now.** The upstream `swarmdock-api.onrender.com` endpoint emits no CORS headers, so the in-browser `RegistryBrowser` component always failed with `Failed to fetch`. Added `GET /api/mcp-registry` and `GET /api/mcp-registry/:slug` as server-side proxies and rewired the component to call them. Verified in Chrome: 20 servers load, selecting one prefills the New MCP Server sheet with its recommended install command.
+- **`mcp-registry` CLI group.** New commands `swarmclaw mcp-registry search` and `swarmclaw mcp-registry get <slug>` so CLI workflows can pull from the same proxy.
+- **Prior release's MCP tool-evict-on-transport-failure fix** (cherry-picked from user's local branch): connection-class errors from downstream MCP tools now evict the pool entry for the originating server, so the next turn reconnects fresh instead of retrying through a half-broken transport.
+
+### v1.5.64 Highlights
+
+Two themes this release. First, **context-window management reaches the chat UI**: a live token-usage meter in every chat header, a one-click LLM-backed compaction that keeps the session alive without nuking history, and a redesigned clear flow with a 30-second undo that restores both transcripts and CLI resume IDs. Second, **MCP token spend is now controllable**: per-server `alwaysExpose` policy, per-agent eager-tool overrides, an in-session `mcp_tool_search` promoter, a long-lived connection pool, a token-cost endpoint per server, and a built-in browser for the public SwarmDock MCP registry.
+
+- **Context meter in the chat header.** New `ContextMeterBadge` (`src/components/chat/context-meter-badge.tsx`) renders a live chip showing `N% · Mk` next to the chat title, driven by `GET /api/chats/:id/context-status`. Color thresholds at 70% (amber) and 90% (red). Clicking the chip opens a popover with the full breakdown (used / remaining / messages) plus Compact and Clear buttons. The button row explicitly states: *"Long-term memory, skills, and facts are preserved. Clear only affects this chat transcript."* — so users stop fearing Clear.
+- **User-invokable `/compact` via the popover.** New `POST /api/chats/:id/compact` runs `summarizeAndCompact` with the session's own provider/model via `buildChatModel` as the summarizer. The existing hierarchical-summary pipeline in `context-manager.ts` does the work: tool failures, file ops, and adaptive chunking are all preserved. Accepts `keepLastN` in the body (2-200, default 10). Returns `status: 'no_action' | 'compacted'` plus counts. The popover gates the button below 3 messages so users don't waste LLM calls on trivially short transcripts.
+- **Clear with 30-second undo.** `POST /api/chats/:id/clear` now returns `{ cleared, undoToken, expiresAt }`, and a new `POST /api/chats/:id/clear/undo` restores the snapshot. The undo snapshot (messages + every CLI session ID including `claudeSessionId`, `codexThreadId`, `opencodeSessionId`, `opencodeWebSessionId`, `geminiSessionId`, `copilotSessionId`, `droidSessionId`, `cursorSessionId`, `qwenSessionId`, `acpSessionId`, and `delegateResumeIds`) lives in an HMR-safe in-memory store (`src/lib/server/chats/clear-undo-snapshots.ts`) with a 30-second TTL, 200-entry cap, session-scoped lookups, and single-use tokens. The chat UI wires this to a sonner toast with an Undo action; restoring fires a "Chat restored." confirmation toast.
+- **`alwaysExpose` policy for MCP servers** (`McpServerConfig.alwaysExpose: boolean | string[]`, default `true` for back-compat). Set `false` on a chatty server (e.g. a Playwright MCP with 40 tools that cost thousands of tokens per turn) and the agent binds nothing up front — it can still discover and promote specific tools via the new `mcp_tool_search` meta-tool. Set an allowlist `['query_resources', 'fetch_url']` to eagerly bind a curated subset.
+- **Per-agent `mcpEagerTools` override** (`Agent.mcpEagerTools?: string[]`) lets you force-expose specific tool names for a specific agent regardless of the server's `alwaysExpose`. Precedence: per-agent allowlist > server `alwaysExpose` > session promotions.
+- **`mcp_tool_search` meta-tool** (`src/lib/server/mcp-gateway-runtime.ts`). When a server's tools are lazy, the agent gets a single `mcp_tool_search({ query, limit? })` tool that searches the process-wide discovery cache (bare name substring + description keywords) and promotes matches for the current session. The next turn binds the promoted names for real. `SessionToolPromoter` state is keyed by session ID and HMR-safe. Behavior mirrors `@swarmclawai/mcp-gateway`'s router so users who split MCP fan-out across SwarmClaw and the gateway get consistent semantics.
+- **Long-lived MCP connection pool** (`src/lib/server/mcp-connection-pool.ts`). A single client/transport per server lives for the process lifetime instead of reconnecting every turn. Config-fingerprint tracking rotates stale entries automatically; the `/test` endpoint evicts explicitly so a config change takes effect immediately. Saves ~100-500ms × (servers × turns) per chat. HMR-safe via `hmrSingleton` so dev reloads don't leak child processes.
+- **Token-cost discovery endpoint** (`GET /api/mcp-servers/:id/tools-info`). Connects, lists tools, and reports per-tool schema tokens plus aggregates — using the same `chars / 3.5` formula as `@swarmclawai/mcp-gateway` so numbers line up side by side. Surfaces inside `mcp-server-list.tsx` so you can see which server is the costliest before an agent even runs.
+- **SwarmDock MCP Registry browser** (`src/components/mcp-servers/registry-browser.tsx`). Opens from the New MCP Server sheet and browses the public registry at `https://swarmdock-api.onrender.com/api/v1/mcp/servers`. Selecting a server populates the form with its recommended install command — one-click discovery without leaving SwarmClaw. A new `MCP Gateway (local)` preset is also bundled so users can bootstrap `@swarmclawai/mcp-gateway` in one tap.
+- **4 new CLI commands.** `swarmclaw chats context-status <id>`, `swarmclaw chats compact <id>`, `swarmclaw chats clear-undo <id>`, and the existing `chats clear` now returns the undo token so CLI scripts can build their own clear+undo workflows.
+- **Back-compat normalization.** Existing MCP servers load with `alwaysExpose: true` (historical behavior — every tool bound every turn) via `storage-normalization.ts`. No user action required to upgrade.
+- **Full regression coverage.** New tests: `clear-undo-snapshots.test.ts` (5 cases — TTL, single-use, session isolation, CLI-id preservation, expiry sweep), `clear-route.test.ts` (clear → undo → double-undo 404 → missing-session 404 round-trip), `compact-route.test.ts` (no-action path + 404), `context-status-route.test.ts`, plus `mcp-connection-pool.test.ts` and `mcp-gateway-runtime.test.ts`. `test:runtime` runs 100 tests across 13 suites.
+
 ### v1.5.63 Highlights
 
 Chatroom fix from @borislavnnikolov: CLI-backed agents (codex-cli, copilot-cli, gemini-cli, and the rest of the `NON_LANGGRAPH_PROVIDER_IDS` set) now work correctly as chatroom members instead of falling through a LangGraph path they cannot run. With the execution path fixed, the worker-only membership blocks are lifted too, so any non-trashed agent can be added to a room.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.5.63",
+  "version": "1.5.65",
   "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",
@@ -80,7 +80,7 @@
     "test:cli": "node --test src/cli/*.test.js bin/*.test.js 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/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/openclaw-exports.test.ts src/app/api/openclaw/dashboard-url/route.test.ts",
-    "test:runtime": "tsx --test src/lib/server/knowledge-sources.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/connectors/email.test.ts src/lib/server/protocols/protocol-service.test.ts src/lib/server/runtime/run-ledger.test.ts src/lib/server/observability/otel-config.test.ts src/lib/server/safe-parse-body.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/chats/chat-route.test.ts src/app/api/connectors/connector-doctor-route.test.ts src/app/api/healthz/route.test.ts src/app/api/logs/route.test.ts src/app/api/tts/route.test.ts",
+    "test:runtime": "tsx --test 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/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/chats/clear-undo-snapshots.test.ts src/lib/server/connectors/email.test.ts src/lib/server/protocols/protocol-service.test.ts src/lib/server/runtime/run-ledger.test.ts src/lib/server/observability/otel-config.test.ts src/lib/server/safe-parse-body.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/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-status-route.test.ts src/app/api/connectors/connector-doctor-route.test.ts src/app/api/healthz/route.test.ts src/app/api/logs/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": "tsx .workbench/browser-e2e/run.ts",
     "test:mcp:conformance": "node --import tsx ./scripts/mcp-conformance-check.ts",

package/src/app/api/chats/[id]/clear/route.ts

@@ -1,9 +1,13 @@
 import { NextResponse } from 'next/server'
-import { clearChatMessages } from '@/lib/server/chats/chat-session-service'
+import { clearChatMessagesWithUndo } from '@/lib/server/chats/chat-session-service'
 import { notFound } from '@/lib/server/collection-helpers'
 
 export async function POST(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  if (!clearChatMessages(id)) return notFound()
-  return new NextResponse('OK')
+  const result = clearChatMessagesWithUndo(id)
+  if (!result.ok) {
+    if (result.status === 404) return notFound()
+    return NextResponse.json(result.payload, { status: result.status })
+  }
+  return NextResponse.json(result.payload)
 }

package/src/app/api/chats/[id]/clear/undo/route.ts

@@ -0,0 +1,23 @@
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import { restoreChatFromUndoToken } from '@/lib/server/chats/chat-session-service'
+import { badRequest, notFound } from '@/lib/server/collection-helpers'
+import { safeParseBody } from '@/lib/server/safe-parse-body'
+
+const BodySchema = z.object({
+  undoToken: z.string().min(1),
+})
+
+export async function POST(req: Request, { params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params
+  const parsed = await safeParseBody(req, BodySchema)
+  if (parsed.error) return parsed.error
+  const token = parsed.data.undoToken.trim()
+  if (!token) return badRequest('undoToken is required')
+  const result = restoreChatFromUndoToken(id, token)
+  if (!result.ok) {
+    if (result.status === 404) return notFound(result.payload.error)
+    return NextResponse.json(result.payload, { status: result.status })
+  }
+  return NextResponse.json(result.payload)
+}

package/src/app/api/chats/[id]/compact/route.ts

@@ -0,0 +1,72 @@
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import { HumanMessage } from '@langchain/core/messages'
+import { getSession } from '@/lib/server/sessions/session-repository'
+import { getMessages, replaceAllMessages } from '@/lib/server/messages/message-repository'
+import { summarizeAndCompact, type LLMSummarizer } from '@/lib/server/context-manager'
+import { buildChatModel } from '@/lib/server/build-llm'
+import { notFound } from '@/lib/server/collection-helpers'
+import { safeParseBody } from '@/lib/server/safe-parse-body'
+import { errorMessage } from '@/lib/shared-utils'
+
+const BodySchema = z.object({
+  keepLastN: z.number().int().min(2).max(200).optional(),
+}).partial()
+
+const DEFAULT_KEEP_LAST_N = 10
+
+export async function POST(req: Request, { params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params
+  const session = getSession(id)
+  if (!session) return notFound()
+
+  const parsed = await safeParseBody(req, BodySchema)
+  if (parsed.error) return parsed.error
+  const keepLastN = Math.max(2, Math.min(parsed.data.keepLastN ?? DEFAULT_KEEP_LAST_N, 200))
+
+  const messages = getMessages(id)
+  if (messages.length <= keepLastN) {
+    return NextResponse.json({
+      status: 'no_action',
+      messageCount: messages.length,
+      keepLastN,
+    })
+  }
+
+  const generateSummary: LLMSummarizer = async (prompt) => {
+    const llm = buildChatModel({
+      provider: session.provider,
+      model: session.model,
+      apiKey: null,
+      credentialId: session.credentialId ?? null,
+      apiEndpoint: session.apiEndpoint ?? null,
+    })
+    const res = await llm.invoke([new HumanMessage(prompt)])
+    return typeof res.content === 'string' ? res.content : ''
+  }
+
+  try {
+    const result = await summarizeAndCompact({
+      messages,
+      keepLastN,
+      agentId: session.agentId ?? null,
+      sessionId: id,
+      provider: session.provider as string,
+      model: session.model as string,
+      generateSummary,
+    })
+    replaceAllMessages(id, result.messages)
+    return NextResponse.json({
+      status: 'compacted',
+      prunedCount: result.prunedCount,
+      memoriesStored: result.memoriesStored,
+      summaryAdded: result.summaryAdded,
+      messageCount: result.messages.length,
+    })
+  } catch (err: unknown) {
+    return NextResponse.json(
+      { error: `Compaction failed: ${errorMessage(err)}` },
+      { status: 500 },
+    )
+  }
+}

package/src/app/api/chats/[id]/context-status/route.ts

@@ -0,0 +1,21 @@
+import { NextResponse } from 'next/server'
+import { getSession } from '@/lib/server/sessions/session-repository'
+import { getMessages } from '@/lib/server/messages/message-repository'
+import { getContextStatus } from '@/lib/server/context-manager'
+import { notFound } from '@/lib/server/collection-helpers'
+
+const SYSTEM_PROMPT_TOKEN_ESTIMATE = 2000
+
+export async function GET(_req: Request, { params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params
+  const session = getSession(id)
+  if (!session) return notFound()
+  const messages = getMessages(id)
+  const status = getContextStatus(
+    messages,
+    SYSTEM_PROMPT_TOKEN_ESTIMATE,
+    session.provider as string,
+    session.model as string,
+  )
+  return NextResponse.json(status)
+}

package/src/app/api/chats/clear-route.test.ts

@@ -0,0 +1,121 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+
+import { runWithTempDataDir } from '@/lib/server/test-utils/run-with-temp-data-dir'
+
+test('chat clear + undo round-trip restores messages and CLI session IDs', () => {
+  const output = runWithTempDataDir<{
+    clearStatus: number
+    clearPayload: { cleared: number; undoToken: string }
+    postClearCount: number
+    postClearClaudeSessionId: string | null
+    postClearOpencodeWebSessionId: string | null
+    undoStatus: number
+    undoPayload: { restored: number }
+    postUndoCount: number
+    postUndoClaudeSessionId: string | null
+    postUndoOpencodeWebSessionId: string | null
+    undoTwiceStatus: number
+    undoTwicePayload: { error?: string }
+    missingSessionStatus: number
+  }>(`
+    const storageMod = await import('./src/lib/server/storage')
+    const repoMod = await import('@/lib/server/messages/message-repository')
+    const clearRouteMod = await import('./src/app/api/chats/[id]/clear/route')
+    const undoRouteMod = await import('./src/app/api/chats/[id]/clear/undo/route')
+    const storage = storageMod.default || storageMod
+    const repo = repoMod.default || repoMod
+    const clearRoute = clearRouteMod.default || clearRouteMod
+    const undoRoute = undoRouteMod.default || undoRouteMod
+
+    const now = Date.now()
+    storage.saveSessions({
+      sess_clear_1: {
+        id: 'sess_clear_1',
+        name: 'Clear test',
+        cwd: process.env.WORKSPACE_DIR,
+        user: 'tester',
+        provider: 'openai',
+        model: 'gpt-5',
+        claudeSessionId: 'cs_preserved_abc',
+        codexThreadId: null,
+        opencodeWebSessionId: 'owb_preserved_xyz',
+        messages: [],
+        createdAt: now,
+        lastActiveAt: now,
+      },
+    })
+
+    repo.appendMessage('sess_clear_1', { role: 'user', text: 'first', time: now })
+    repo.appendMessage('sess_clear_1', { role: 'assistant', text: 'reply', time: now + 1 })
+    repo.appendMessage('sess_clear_1', { role: 'user', text: 'second', time: now + 2 })
+
+    const clearResponse = await clearRoute.POST(
+      new Request('http://local/api/chats/sess_clear_1/clear', { method: 'POST' }),
+      { params: Promise.resolve({ id: 'sess_clear_1' }) },
+    )
+    const clearPayload = await clearResponse.json()
+
+    const postClearCount = repo.getMessages('sess_clear_1').length
+    const postClearSession = storage.loadSession('sess_clear_1')
+
+    const undoResponse = await undoRoute.POST(
+      new Request('http://local/api/chats/sess_clear_1/clear/undo', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ undoToken: clearPayload.undoToken }),
+      }),
+      { params: Promise.resolve({ id: 'sess_clear_1' }) },
+    )
+    const undoPayload = await undoResponse.json()
+
+    const postUndoCount = repo.getMessages('sess_clear_1').length
+    const postUndoSession = storage.loadSession('sess_clear_1')
+
+    const undoTwiceResponse = await undoRoute.POST(
+      new Request('http://local/api/chats/sess_clear_1/clear/undo', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ undoToken: clearPayload.undoToken }),
+      }),
+      { params: Promise.resolve({ id: 'sess_clear_1' }) },
+    )
+    const undoTwicePayload = await undoTwiceResponse.json()
+
+    const missingResponse = await clearRoute.POST(
+      new Request('http://local/api/chats/not_a_real_session/clear', { method: 'POST' }),
+      { params: Promise.resolve({ id: 'not_a_real_session' }) },
+    )
+
+    console.log(JSON.stringify({
+      clearStatus: clearResponse.status,
+      clearPayload: { cleared: clearPayload.cleared, undoToken: clearPayload.undoToken },
+      postClearCount,
+      postClearClaudeSessionId: postClearSession?.claudeSessionId ?? null,
+      postClearOpencodeWebSessionId: postClearSession?.opencodeWebSessionId ?? null,
+      undoStatus: undoResponse.status,
+      undoPayload,
+      postUndoCount,
+      postUndoClaudeSessionId: postUndoSession?.claudeSessionId ?? null,
+      postUndoOpencodeWebSessionId: postUndoSession?.opencodeWebSessionId ?? null,
+      undoTwiceStatus: undoTwiceResponse.status,
+      undoTwicePayload,
+      missingSessionStatus: missingResponse.status,
+    }))
+  `, { prefix: 'swarmclaw-clear-undo-route-' })
+
+  assert.equal(output.clearStatus, 200)
+  assert.equal(output.clearPayload.cleared, 3)
+  assert.match(output.clearPayload.undoToken, /^undo_/)
+  assert.equal(output.postClearCount, 0)
+  assert.equal(output.postClearClaudeSessionId, null, 'CLI session should be nulled after clear')
+  assert.equal(output.postClearOpencodeWebSessionId, null, 'opencode-web session should be nulled after clear')
+  assert.equal(output.undoStatus, 200)
+  assert.equal(output.undoPayload.restored, 3)
+  assert.equal(output.postUndoCount, 3)
+  assert.equal(output.postUndoClaudeSessionId, 'cs_preserved_abc', 'CLI session ID should be restored by undo')
+  assert.equal(output.postUndoOpencodeWebSessionId, 'owb_preserved_xyz', 'opencode-web session ID should be restored by undo')
+  assert.equal(output.undoTwiceStatus, 404, 'undo token should be single-use')
+  assert.ok(output.undoTwicePayload.error)
+  assert.equal(output.missingSessionStatus, 404)
+})

package/src/app/api/chats/compact-route.test.ts

@@ -0,0 +1,70 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+
+import { runWithTempDataDir } from '@/lib/server/test-utils/run-with-temp-data-dir'
+
+test('POST /api/chats/[id]/compact returns no_action when transcript is smaller than keepLastN', () => {
+  const output = runWithTempDataDir<{
+    status: number
+    payload: { status?: string; messageCount?: number; keepLastN?: number }
+    missingStatus: number
+  }>(`
+    const storageMod = await import('./src/lib/server/storage')
+    const repoMod = await import('@/lib/server/messages/message-repository')
+    const routeMod = await import('./src/app/api/chats/[id]/compact/route')
+    const storage = storageMod.default || storageMod
+    const repo = repoMod.default || repoMod
+    const route = routeMod.default || routeMod
+
+    const now = Date.now()
+    storage.saveSessions({
+      sess_compact_1: {
+        id: 'sess_compact_1',
+        name: 'Compact test',
+        cwd: process.env.WORKSPACE_DIR,
+        user: 'tester',
+        provider: 'openai',
+        model: 'gpt-4o-mini',
+        claudeSessionId: null,
+        messages: [],
+        createdAt: now,
+        lastActiveAt: now,
+      },
+    })
+
+    // Only 2 messages — smaller than default keepLastN (10), so compact should no-op.
+    repo.appendMessage('sess_compact_1', { role: 'user', text: 'hi', time: now })
+    repo.appendMessage('sess_compact_1', { role: 'assistant', text: 'hello', time: now + 1 })
+
+    const response = await route.POST(
+      new Request('http://local/api/chats/sess_compact_1/compact', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({}),
+      }),
+      { params: Promise.resolve({ id: 'sess_compact_1' }) },
+    )
+    const payload = await response.json()
+
+    const missingResponse = await route.POST(
+      new Request('http://local/api/chats/missing/compact', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({}),
+      }),
+      { params: Promise.resolve({ id: 'missing' }) },
+    )
+
+    console.log(JSON.stringify({
+      status: response.status,
+      payload,
+      missingStatus: missingResponse.status,
+    }))
+  `, { prefix: 'swarmclaw-compact-route-' })
+
+  assert.equal(output.status, 200)
+  assert.equal(output.payload.status, 'no_action')
+  assert.equal(output.payload.messageCount, 2)
+  assert.equal(output.payload.keepLastN, 10)
+  assert.equal(output.missingStatus, 404)
+})

package/src/app/api/chats/context-status-route.test.ts

@@ -0,0 +1,68 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+
+import { runWithTempDataDir } from '@/lib/server/test-utils/run-with-temp-data-dir'
+
+test('GET /api/chats/[id]/context-status returns token usage summary', () => {
+  const output = runWithTempDataDir<{
+    status: number
+    hasContextWindow: boolean
+    percentUsed: number
+    messageCount: number
+    strategy: string
+    missingStatus: number
+  }>(`
+    const storageMod = await import('./src/lib/server/storage')
+    const repoMod = await import('@/lib/server/messages/message-repository')
+    const routeMod = await import('./src/app/api/chats/[id]/context-status/route')
+    const storage = storageMod.default || storageMod
+    const repo = repoMod.default || repoMod
+    const route = routeMod.default || routeMod
+
+    const now = Date.now()
+    storage.saveSessions({
+      sess_ctx_1: {
+        id: 'sess_ctx_1',
+        name: 'Context status test',
+        cwd: process.env.WORKSPACE_DIR,
+        user: 'tester',
+        provider: 'openai',
+        model: 'gpt-4o-mini',
+        claudeSessionId: null,
+        messages: [],
+        createdAt: now,
+        lastActiveAt: now,
+      },
+    })
+
+    repo.appendMessage('sess_ctx_1', { role: 'user', text: 'hello world', time: now })
+    repo.appendMessage('sess_ctx_1', { role: 'assistant', text: 'hi there, how can I help?', time: now + 1 })
+
+    const response = await route.GET(
+      new Request('http://local/api/chats/sess_ctx_1/context-status'),
+      { params: Promise.resolve({ id: 'sess_ctx_1' }) },
+    )
+    const payload = await response.json()
+
+    const missingResponse = await route.GET(
+      new Request('http://local/api/chats/missing/context-status'),
+      { params: Promise.resolve({ id: 'missing' }) },
+    )
+
+    console.log(JSON.stringify({
+      status: response.status,
+      hasContextWindow: typeof payload.contextWindow === 'number' && payload.contextWindow > 0,
+      percentUsed: payload.percentUsed,
+      messageCount: payload.messageCount,
+      strategy: payload.strategy,
+      missingStatus: missingResponse.status,
+    }))
+  `, { prefix: 'swarmclaw-context-status-route-' })
+
+  assert.equal(output.status, 200)
+  assert.equal(output.hasContextWindow, true)
+  assert.ok(output.percentUsed >= 0 && output.percentUsed <= 100)
+  assert.equal(output.messageCount, 2)
+  assert.ok(['ok', 'warning', 'critical'].includes(output.strategy))
+  assert.equal(output.missingStatus, 404)
+})

package/src/app/api/mcp-registry/[slug]/route.ts

@@ -0,0 +1,31 @@
+import { NextResponse } from 'next/server'
+
+const REGISTRY_API = 'https://swarmdock-api.onrender.com/api/v1/mcp/servers'
+
+export async function GET(_req: Request, { params }: { params: Promise<{ slug: string }> }) {
+  const { slug } = await params
+  if (!slug.trim()) {
+    return NextResponse.json({ error: 'slug is required' }, { status: 400 })
+  }
+  try {
+    const upstream = await fetch(`${REGISTRY_API}/${encodeURIComponent(slug)}`, {
+      headers: { accept: 'application/json' },
+    })
+    if (upstream.status === 404) {
+      return NextResponse.json({ error: 'Registry server not found' }, { status: 404 })
+    }
+    if (!upstream.ok) {
+      return NextResponse.json(
+        { error: `Server detail returned ${upstream.status}` },
+        { status: 502 },
+      )
+    }
+    const data = await upstream.json()
+    return NextResponse.json(data)
+  } catch (err: unknown) {
+    return NextResponse.json(
+      { error: err instanceof Error ? err.message : 'Registry unreachable' },
+      { status: 502 },
+    )
+  }
+}

package/src/app/api/mcp-registry/route.ts

@@ -0,0 +1,36 @@
+import { NextResponse } from 'next/server'
+
+// Server-side proxy for the public SwarmDock MCP Registry. The upstream API
+// does not emit CORS headers, so the RegistryBrowser component in the browser
+// cannot fetch it directly. This route forwards the search request and its
+// JSON response untouched.
+
+const REGISTRY_API = 'https://swarmdock-api.onrender.com/api/v1/mcp/servers'
+
+export async function GET(req: Request) {
+  const url = new URL(req.url)
+  const q = url.searchParams.get('q') ?? ''
+  const limitRaw = url.searchParams.get('limit') ?? '20'
+  const limit = Math.max(1, Math.min(Number.parseInt(limitRaw, 10) || 20, 50))
+  const qs = new URLSearchParams({ limit: String(limit) })
+  if (q.trim()) qs.set('q', q.trim())
+
+  try {
+    const upstream = await fetch(`${REGISTRY_API}?${qs.toString()}`, {
+      headers: { accept: 'application/json' },
+    })
+    if (!upstream.ok) {
+      return NextResponse.json(
+        { error: `Registry returned ${upstream.status}` },
+        { status: 502 },
+      )
+    }
+    const data = await upstream.json()
+    return NextResponse.json(data)
+  } catch (err: unknown) {
+    return NextResponse.json(
+      { error: err instanceof Error ? err.message : 'Registry unreachable' },
+      { status: 502 },
+    )
+  }
+}

package/src/app/api/mcp-servers/[id]/route.ts

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
 import { loadMcpServers, saveMcpServers, deleteMcpServer } from '@/lib/server/storage'
 import { mutateItem, deleteItem, notFound, type CollectionOps } from '@/lib/server/collection-helpers'
+import { evictMcpClient } from '@/lib/server/mcp-connection-pool'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const ops: CollectionOps<any> = { load: loadMcpServers, save: saveMcpServers, deleteFn: deleteMcpServer }
@@ -21,11 +22,15 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
     ...server, ...body, id, updatedAt: Date.now(),
   }))
   if (!result) return notFound()
+  // Connection pool caches by config fingerprint; evicting here is defense in
+  // depth — getOrConnectMcpClient also detects fingerprint mismatches.
+  await evictMcpClient(id)
   return NextResponse.json(result)
 }
 
 export async function DELETE(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
   if (!deleteItem(ops, id)) return notFound()
+  await evictMcpClient(id)
   return NextResponse.json({ deleted: id })
 }

package/src/app/api/mcp-servers/[id]/test/route.ts

@@ -2,14 +2,25 @@ import { NextResponse } from 'next/server'
 import { loadMcpServers } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 import { connectMcpServer, mcpToolsToLangChain, disconnectMcpServer } from '@/lib/server/mcp-client'
+import { evictMcpClient } from '@/lib/server/mcp-connection-pool'
 import { errorMessage } from '@/lib/shared-utils'
 
-export async function POST(_req: Request, { params }: { params: Promise<{ id: string }> }) {
+export async function POST(req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
   const servers = loadMcpServers()
   const server = servers[id]
   if (!server) return notFound()
 
+  // Only evict the pool when the caller explicitly asks for a reset (e.g. the
+  // "Re-test" button). Background probes from the server list view skip this
+  // so they don't disconnect pooled clients that running agents are using
+  // mid-turn. Pool eviction on config change is handled by the PUT route.
+  const url = new URL(req.url)
+  const reset = url.searchParams.get('reset') === '1' || url.searchParams.get('reset') === 'true'
+  if (reset) {
+    await evictMcpClient(id)
+  }
+
   try {
     const { client, transport } = await connectMcpServer(server)
     const tools = await mcpToolsToLangChain(client, server.name)