@swarmclawai/swarmclaw 1.0.7 → 1.0.8

package/README.md

@@ -17,13 +17,12 @@ Extension tutorial: https://swarmclaw.ai/docs/extension-tutorial
 
 ## Release Notes
 
-### v1.0.7 Highlights
+### v1.0.8 Highlights
 
-- **Connector inbox + isolation**: external connector conversations now live in a dedicated Inbox with owner routing, allow/deny controls, pairing management, sender avatars, and strict sender-scoped memory.
-- **Schedules as an operations surface**: schedules now use explicit session routing, archive/cancel cascades, `cancelled` task outcomes, and a proper `Live / Archived / Runs` console instead of a simple list.
-- **Delegation, not orchestration**: orchestration is no longer a special product/runtime concept. Agents either delegate or they do not, and background AI work now uses the current agent/session model config rather than a separate orchestration engine.
-- **Tools + extensions cutover**: built-in capabilities are native tools, external add-ons are extensions, and persisted agent/session data now stores canonical `tools` + `extensions` fields only.
-- Breaking change: agent and session records now persist `tools` and `extensions` only. The legacy `plugins` field is no longer part of the runtime data model.
+- **Learned skills and self-healing**: SwarmClaw now keeps agent-scoped learned skills and shadow revisions so repeated successes and repeated external integration failures can harden into reusable local behavior without silently mutating the shared skill library.
+- **Direct chat stability**: chat-origin runs now stop after the visible answer instead of enqueueing hidden follow-up loops, leaked control tokens such as `NO_MESSAGE` stay out of the user transcript, and repeated internal reruns no longer replace the reply the user already saw.
+- **OpenClaw and Ollama route hardening**: agent thread sessions now repair stale credential/endpoint resolution more aggressively, including Ollama Cloud vs local endpoint selection and OpenClaw gateway fallback behavior.
+- **Operator UX fixes**: new agents appear in the list immediately, gateway-disconnected chat CTAs now route to the current agent's settings instead of global settings, setup-wizard flicker after access-key login is gone, and screenshot-heavy tool runs no longer render duplicate previews in chat.
 
 ## What SwarmClaw Focuses On
 
@@ -100,6 +99,7 @@ Then open `http://localhost:3456`.
 - Or open **Skills** and use **Draft From Current Chat**.
 - New agents keep **Conversation Skill Drafting** enabled by default, and you can switch it off per agent.
 - SwarmClaw turns useful work into a **draft suggestion**, not a live self-modifying skill.
+- Learned skills stay **user/agent scoped** by default. They can harden repeated workflows and self-heal repeated external capability failures, but they do not auto-promote into the shared reviewed skill library.
 - Review the suggested name, rationale, summary, and transcript snippet.
 - Approve it to save it into the normal skill library, or dismiss it.
 - Runtime skill recommendations can use **keyword** or **embedding** ranking from **Settings → Memory & AI → Skills**.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Self-hosted AI runtime for OpenClaw, delegation, autonomy, runtime skills, crypto wallets, and chat platform connectors.",
   "license": "MIT",
   "publishConfig": {

package/src/app/api/learned-skills/route.ts

@@ -0,0 +1,24 @@
+import { NextResponse } from 'next/server'
+
+import { listLearnedSkills } from '@/lib/server/skills/learned-skills'
+
+export const dynamic = 'force-dynamic'
+
+export async function GET(req: Request) {
+  const url = new URL(req.url)
+  const agentId = url.searchParams.get('agentId') || undefined
+  const sessionId = url.searchParams.get('sessionId') || undefined
+  const lifecycle = url.searchParams.get('lifecycle') || undefined
+
+  return NextResponse.json(listLearnedSkills({
+    agentId,
+    sessionId,
+    lifecycle: lifecycle === 'candidate'
+      || lifecycle === 'active'
+      || lifecycle === 'shadow'
+      || lifecycle === 'demoted'
+      || lifecycle === 'review_ready'
+      ? lifecycle
+      : undefined,
+  }))
+}

package/src/cli/index.js

@@ -571,6 +571,13 @@ const COMMAND_GROUPS = [
       cmd('openclaw-device', 'GET', '/setup/openclaw-device', 'Show the local OpenClaw device ID'),
     ],
   },
+  {
+    name: 'learned-skills',
+    description: 'Inspect agent-scoped learned skills',
+    commands: [
+      cmd('list', 'GET', '/learned-skills', 'List learned skills'),
+    ],
+  },
   {
     name: 'skills',
     description: 'Manage reusable skills',

package/src/components/agents/agent-chat-list.tsx

@@ -6,6 +6,7 @@ import { useChatStore } from '@/stores/use-chat-store'
 import { useChatroomStore } from '@/stores/use-chatroom-store'
 import { useNow } from '@/hooks/use-now'
 import { useMountedRef } from '@/hooks/use-mounted-ref'
+import { useWs } from '@/hooks/use-ws'
 import { useNavigate } from '@/lib/app/navigation'
 import { api } from '@/lib/app/api-client'
 import { ConfirmDialog } from '@/components/shared/confirm-dialog'
@@ -86,6 +87,7 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
   }, [])
 
   useEffect(() => { loadAgents() }, [loadAgents])
+  useWs('agents', loadAgents, 30_000)
 
   useEffect(() => {
     return () => {

package/src/components/agents/agent-list.tsx

@@ -8,6 +8,7 @@ import { useApprovalStore } from '@/stores/use-approval-store'
 import { Skeleton } from '@/components/shared/skeleton'
 import { EmptyState } from '@/components/shared/empty-state'
 import { getEnabledCapabilityIds } from '@/lib/capability-selection'
+import { useWs } from '@/hooks/use-ws'
 
 interface Props {
   inSidebar?: boolean
@@ -47,7 +48,8 @@ export function AgentList({ inSidebar }: Props) {
   }, [updateSettings])
 
   const [loaded, setLoaded] = useState(Object.keys(agents).length > 0)
-  useEffect(() => { loadAgents().then(() => setLoaded(true)) }, [])
+  useEffect(() => { loadAgents().then(() => setLoaded(true)) }, [loadAgents])
+  useWs('agents', loadAgents, 30_000)
 
   // Compute which agents are "running" (have active sessions)
   const runningAgentIds = useMemo(() => {

package/src/components/agents/agent-sheet.tsx

@@ -42,6 +42,7 @@ const AUTO_SYNC_MODEL_PROVIDER_IDS = new Set<ProviderType>([
   'fireworks',
   'ollama',
 ])
+const CONNECTION_TEST_TIMEOUT_MS = 40_000
 
 type SafeAgentWallet = Omit<AgentWallet, 'encryptedPrivateKey'> & {
   balanceAtomic?: string
@@ -156,6 +157,7 @@ export function AgentSheet() {
   const setEditingId = useAppStore((s) => s.setEditingAgentId)
   const agents = useAppStore((s) => s.agents)
   const loadAgents = useAppStore((s) => s.loadAgents)
+  const updateAgentInStore = useAppStore((s) => s.updateAgentInStore)
   const activeSessionId = useAppStore(selectActiveSessionId)
   const currentSession = useAppStore((s) => {
     const id = selectActiveSessionId(s)
@@ -697,11 +699,13 @@ export function AgentSheet() {
       monthlyBudget: parsedMonthlyBudget && parsedMonthlyBudget > 0 ? parsedMonthlyBudget : null,
       budgetAction: budgetEnabled ? budgetAction : undefined,
     }
+    const savedAgent = editing
+      ? await updateAgent(editing.id, data)
+      : await createAgent(data)
+    updateAgentInStore(savedAgent)
     if (editing) {
-      await updateAgent(editing.id, data)
       toast.success('Agent saved')
     } else {
-      await createAgent(data)
       toast.success('Agent created')
     }
     await loadAgents()
@@ -806,6 +810,8 @@ export function AgentSheet() {
         credentialId,
         endpoint: apiEndpoint,
         model,
+      }, {
+        timeoutMs: CONNECTION_TEST_TIMEOUT_MS,
       })
       if (result.deviceId) setTestDeviceId(result.deviceId)
       if (result.ok) {

package/src/components/chat/message-list.tsx

@@ -838,7 +838,7 @@ export function MessageList({ messages, streaming, connectorFilter = null, loadi
           )}
         </div>
       </div>
-      {showGatewayOverlay && <GatewayDisconnectOverlay />}
+      {showGatewayOverlay && <GatewayDisconnectOverlay agentId={agent?.id || null} />}
       {showScrollToBottom && (
         <button
           onClick={handleScrollToBottom}

package/src/components/chat/tool-events-section.test.ts

@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+import { collectCollapsedMedia } from './tool-events-section'
+
+describe('collectCollapsedMedia', () => {
+  const screenshotEvent = {
+    id: 'tool-1',
+    name: 'browser',
+    input: '{"action":"screenshot"}',
+    output: '![Screenshot](/api/uploads/screenshot-123.png)',
+    status: 'done' as const,
+  }
+
+  it('collects explicit screenshot media when enabled', () => {
+    const media = collectCollapsedMedia([screenshotEvent], { showCollapsedMedia: true })
+
+    assert.deepEqual(media?.images, ['/api/uploads/screenshot-123.png'])
+  })
+
+  it('skips collapsed media previews when disabled', () => {
+    const media = collectCollapsedMedia([screenshotEvent], { showCollapsedMedia: false })
+
+    assert.equal(media, null)
+  })
+})

package/src/components/chat/tool-events-section.tsx

@@ -95,7 +95,33 @@ const ToolSummaryRow = memo(function ToolSummaryRow({ event, caption }: { event:
   )
 })
 
-export const ToolEventsSection = memo(function ToolEventsSection({ toolEvents }: { toolEvents: ToolEvent[] }) {
+export function collectCollapsedMedia(toolEvents: ToolEvent[], opts?: { expanded?: boolean; showCollapsedMedia?: boolean }) {
+  if (opts?.expanded || opts?.showCollapsedMedia === false) return null
+  const seen = new Set<string>()
+  const images: string[] = []
+  const videos: string[] = []
+  const pdfs: { name: string; url: string }[] = []
+  const files: { name: string; url: string }[] = []
+  for (const ev of toolEvents) {
+    if (!ev.output) continue
+    if (!isExplicitScreenshot(ev.name, ev.input)) continue
+    const media = extractMedia(ev.output)
+    for (const url of media.images) { if (!seen.has(url)) { seen.add(url); images.push(url) } }
+    for (const url of media.videos) { if (!seen.has(url)) { seen.add(url); videos.push(url) } }
+    for (const pdf of media.pdfs) { if (!seen.has(pdf.url)) { seen.add(pdf.url); pdfs.push(pdf) } }
+    for (const file of media.files) { if (!seen.has(file.url)) { seen.add(file.url); files.push(file) } }
+  }
+  if (!images.length && !videos.length && !pdfs.length && !files.length) return null
+  return { images, videos, pdfs, files }
+}
+
+export const ToolEventsSection = memo(function ToolEventsSection({
+  toolEvents,
+  showCollapsedMedia = false,
+}: {
+  toolEvents: ToolEvent[]
+  showCollapsedMedia?: boolean
+}) {
   const [expanded, setExpanded] = useState(false)
   const summary = useMemo(() => {
     let running = 0
@@ -125,24 +151,8 @@ export const ToolEventsSection = memo(function ToolEventsSection({ toolEvents }:
   }, [spotlightEvent, toolEvents])
 
   const collapsedMedia = useMemo(() => {
-    if (expanded) return null
-    const seen = new Set<string>()
-    const images: string[] = []
-    const videos: string[] = []
-    const pdfs: { name: string; url: string }[] = []
-    const files: { name: string; url: string }[] = []
-    for (const ev of toolEvents) {
-      if (!ev.output) continue
-      if (!isExplicitScreenshot(ev.name, ev.input)) continue
-      const media = extractMedia(ev.output)
-      for (const url of media.images) { if (!seen.has(url)) { seen.add(url); images.push(url) } }
-      for (const url of media.videos) { if (!seen.has(url)) { seen.add(url); videos.push(url) } }
-      for (const pdf of media.pdfs) { if (!seen.has(pdf.url)) { seen.add(pdf.url); pdfs.push(pdf) } }
-      for (const file of media.files) { if (!seen.has(file.url)) { seen.add(file.url); files.push(file) } }
-    }
-    if (!images.length && !videos.length && !pdfs.length && !files.length) return null
-    return { images, videos, pdfs, files }
-  }, [expanded, toolEvents])
+    return collectCollapsedMedia(toolEvents, { expanded, showCollapsedMedia })
+  }, [expanded, showCollapsedMedia, toolEvents])
 
   return (
     <div className="max-w-[85%] md:max-w-[72%] mb-2" data-testid="tool-activity">

package/src/components/layout/dashboard-shell.tsx

@@ -38,6 +38,7 @@ export function DashboardShell({ children }: { children: React.ReactNode }) {
     authenticated,
     setAuthenticated,
     currentUser,
+    userReady,
     setupDone,
     agentReady
   } = useAppBootstrap()
@@ -78,7 +79,9 @@ export function DashboardShell({ children }: { children: React.ReactNode }) {
     ? 'Restoring local session'
     : !authChecked
       ? 'Checking access'
-      : authenticated && currentUser && setupDone === null
+      : authenticated && !userReady
+        ? 'Restoring profile'
+        : authenticated && setupDone === null
         ? 'Loading setup state'
         : authenticated && currentUser && !agentReady
           ? 'Restoring agent workspace'
@@ -109,15 +112,16 @@ export function DashboardShell({ children }: { children: React.ReactNode }) {
     if (!hydrated || !authChecked) return
     if (isAuthPage) {
       // Reverse redirect: already authenticated with user → leave auth pages
-      if (authenticated && currentUser && setupDone !== false) {
+      if (authenticated && userReady && currentUser && setupDone !== false) {
         router.replace('/home')
       }
       return
     }
     if (!authenticated) { router.replace('/login'); return }
-    if (!currentUser) { router.replace('/setup'); return }
+    if (!userReady) return
     if (setupDone === false) { router.replace('/setup'); return }
-  }, [hydrated, authChecked, authenticated, currentUser, setupDone, router, isAuthPage])
+    if (!currentUser) { router.replace('/setup'); return }
+  }, [hydrated, authChecked, authenticated, currentUser, setupDone, router, isAuthPage, userReady])
 
   // Star notification (one-time)
   useEffect(() => {
@@ -235,7 +239,7 @@ export function DashboardShell({ children }: { children: React.ReactNode }) {
   }
 
   // Redirect happens in effect above; show loader while waiting
-  if (!authenticated || !currentUser || setupDone === null || !agentReady || setupDone === false) {
+  if (!authenticated || !userReady || !currentUser || setupDone === null || !agentReady || setupDone === false) {
     return (
       <FullScreenLoader
         stage={bootStage}

package/src/components/settings/gateway-disconnect-overlay.tsx

@@ -49,9 +49,15 @@ export function useGatewayStatus() {
   return status
 }
 
-export function GatewayDisconnectOverlay() {
+interface GatewayDisconnectOverlayProps {
+  agentId?: string | null
+}
+
+export function GatewayDisconnectOverlay({ agentId = null }: GatewayDisconnectOverlayProps) {
   const navigateTo = useNavigate()
   const setSidebarOpen = useAppStore((s) => s.setSidebarOpen)
+  const setAgentSheetOpen = useAppStore((s) => s.setAgentSheetOpen)
+  const setEditingAgentId = useAppStore((s) => s.setEditingAgentId)
 
   return (
     <div className="absolute inset-0 z-10 flex items-center justify-center bg-bg/60 backdrop-blur-sm">
@@ -67,13 +73,18 @@ export function GatewayDisconnectOverlay() {
         </div>
         <button
           onClick={() => {
+            if (agentId) {
+              setEditingAgentId(agentId)
+              setAgentSheetOpen(true)
+              return
+            }
             navigateTo('settings')
             setSidebarOpen(true)
           }}
           className="px-5 py-2 rounded-[10px] border-none bg-accent-bright text-white text-[13px] font-600 cursor-pointer transition-all hover:brightness-110"
           style={{ fontFamily: 'inherit' }}
         >
-          Connect Gateway
+          {agentId ? 'Open Agent Settings' : 'Open Settings'}
         </button>
       </div>
     </div>

package/src/components/shared/bottom-sheet.tsx

@@ -40,7 +40,7 @@ export function BottomSheet({ open, onClose, children, wide, title, description
               </DialogPrimitive.Description>
             ) : null}
             <DialogPrimitive.Close
-              className="absolute right-4 top-3.5 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 sm:right-5 sm:top-5"
+              className="absolute right-4 top-3.5 inline-flex h-9 w-9 cursor-pointer 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 sm:right-5 sm:top-5"
             >
               <XIcon className="size-4" />
               <span className="sr-only">Close</span>

package/src/components/ui/dialog.tsx

@@ -71,7 +71,7 @@ function DialogContent({
         {showCloseButton && (
           <DialogPrimitive.Close
             data-slot="dialog-close"
-            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"
+            className="absolute top-4 right-4 inline-flex h-9 w-9 cursor-pointer 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/ui/sheet.tsx

@@ -76,7 +76,7 @@ function SheetContent({
       >
         {children}
         {showCloseButton && (
-          <SheetPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-secondary 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">
+          <SheetPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 cursor-pointer rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none">
             <XIcon className="size-4" />
             <span className="sr-only">Close</span>
           </SheetPrimitive.Close>

package/src/hooks/use-app-bootstrap.ts

@@ -29,6 +29,7 @@ export function useAppBootstrap() {
   const [authChecked, setAuthChecked] = useState(false)
   const [authenticated, setAuthenticated] = useState(false)
   const [setupDone, setSetupDone] = useState<boolean | null>(null)
+  const [userReady, setUserReady] = useState(false)
   const [agentReady, setAgentReady] = useState(false)
   const mountedRef = useMountedRef()
 
@@ -86,21 +87,6 @@ export function useAppBootstrap() {
     }
   }, [mountedRef])
 
-  const syncUserFromServer = useCallback(async () => {
-    if (currentUser) return
-    try {
-      const settings = await api<{ userName?: string }>('GET', '/settings', undefined, {
-        timeoutMs: POST_AUTH_BOOTSTRAP_TIMEOUT_MS,
-        retries: 0,
-      })
-      if (settings.userName) {
-        setUser(settings.userName)
-      }
-    } catch (err) {
-      console.warn('Failed to sync user from server:', err)
-    }
-  }, [currentUser, setUser])
-
   useEffect(() => {
     hydrate()
   }, [hydrate])
@@ -119,20 +105,48 @@ export function useAppBootstrap() {
     if (hydrated) checkAuth()
   }, [hydrated, checkAuth])
 
+  useEffect(() => {
+    if (!authenticated) {
+      setUserReady(false)
+      setAgentReady(false)
+      return
+    }
+    let cancelled = false
+    ;(async () => {
+      if (currentUser) {
+        if (!cancelled && mountedRef.current) setUserReady(true)
+        return
+      }
+      try {
+        const settings = await api<{ userName?: string }>('GET', '/settings', undefined, {
+          timeoutMs: POST_AUTH_BOOTSTRAP_TIMEOUT_MS,
+          retries: 0,
+        })
+        if (settings.userName) {
+          setUser(settings.userName)
+        }
+      } catch (err) {
+        console.warn('Failed to sync user from server:', err)
+      } finally {
+        if (!cancelled && mountedRef.current) setUserReady(true)
+      }
+    })()
+    return () => { cancelled = true }
+  }, [authenticated, currentUser, mountedRef, setUser])
+
   useEffect(() => {
     if (!authenticated) return
     connectWs()
-    syncUserFromServer()
     loadNetworkInfo()
     loadSettings()
     loadSessions()
     return () => { disconnectWs() }
-  }, [authenticated, loadNetworkInfo, loadSessions, loadSettings, syncUserFromServer])
+  }, [authenticated, loadNetworkInfo, loadSessions, loadSettings])
 
   useWs('sessions', loadSessions, 15000)
 
   useEffect(() => {
-    if (!authenticated || !currentUser) return
+    if (!authenticated || !userReady || !currentUser) return
     let cancelled = false
     ;(async () => {
       try {
@@ -159,10 +173,10 @@ export function useAppBootstrap() {
       if (!cancelled && mountedRef.current) setAgentReady(true)
     })()
     return () => { cancelled = true }
-  }, [authenticated, currentUser, mountedRef])
+  }, [authenticated, currentUser, mountedRef, userReady])
 
   useEffect(() => {
-    if (!authenticated || !currentUser) return
+    if (!authenticated || !userReady) return
     let cancelled = false
     ;(async () => {
       try {
@@ -190,7 +204,7 @@ export function useAppBootstrap() {
       }
     })()
     return () => { cancelled = true }
-  }, [authenticated, currentUser, mountedRef])
+  }, [authenticated, mountedRef, userReady])
 
   return {
     hydrated,
@@ -198,6 +212,7 @@ export function useAppBootstrap() {
     authenticated,
     setAuthenticated,
     currentUser,
+    userReady,
     setupDone,
     setSetupDone,
     agentReady

package/src/lib/server/agents/agent-runtime-config.test.ts

@@ -139,3 +139,30 @@ test('applyResolvedRoute copies gateway, endpoint, and fallback credentials onto
     gatewayProfileId: 'gateway-1',
   })
 })
+
+test('resolveAgentRouteCandidatesWithProfiles repairs a stale Ollama credential reference when only one provider credential exists', async () => {
+  const storage = await import('@/lib/server/storage')
+  const now = Date.now()
+  storage.saveCredentials({
+    'cred-ollama-cloud': {
+      id: 'cred-ollama-cloud',
+      provider: 'ollama',
+      name: 'Ollama Cloud',
+      encryptedKey: storage.encryptKey('ollama-cloud-key'),
+      createdAt: now,
+    },
+  })
+
+  const [route] = resolveAgentRouteCandidatesWithProfiles(makeAgent({
+    provider: 'ollama',
+    model: 'glm-5:cloud',
+    credentialId: 'stale-ollama-cred',
+    apiEndpoint: null,
+  }), [])
+
+  assert.ok(route)
+  assert.equal(route.provider, 'ollama')
+  assert.equal(route.model, 'glm-5:cloud')
+  assert.equal(route.credentialId, 'cred-ollama-cloud')
+  assert.equal(route.apiEndpoint, 'https://ollama.com')
+})

package/src/lib/server/agents/agent-runtime-config.ts

@@ -6,7 +6,7 @@ import type {
   ProviderType,
 } from '@/types'
 import { deriveOpenClawWsUrl, normalizeProviderEndpoint } from '@/lib/openclaw/openclaw-endpoint'
-import { getProvider } from '@/lib/providers'
+import { resolveProviderApiEndpoint, resolveProviderCredentialId } from '@/lib/server/provider-endpoint'
 import { loadGatewayProfiles } from '@/lib/server/storage'
 import { isProviderCoolingDown } from '@/lib/server/provider-health'
 
@@ -250,12 +250,6 @@ function dedupeCredentialIds(primary: string | null | undefined, candidates: str
   return result
 }
 
-function resolveProviderDefaultEndpoint(provider: string): string | null {
-  const info = getProvider(provider)
-  if (!info?.defaultEndpoint) return null
-  return normalizeProviderEndpoint(provider, info.defaultEndpoint) || info.defaultEndpoint.replace(/\/+$/, '')
-}
-
 function buildRouteFromSeed(
   seed: RouteSeed,
   gatewayProfiles: GatewayProfile[],
@@ -276,13 +270,20 @@ function buildRouteFromSeed(
   const gatewayProfileId = gatewayProfile?.id ?? seed.gatewayProfileId ?? agentGatewayProfileId ?? null
 
   const providerFromGateway = gatewayProfile?.provider === 'openclaw' ? 'openclaw' : provider
-  const explicitEndpoint = seed.apiEndpoint ?? gatewayProfile?.endpoint ?? null
-  const apiEndpoint = normalizeProviderEndpoint(providerFromGateway, explicitEndpoint)
-    ?? resolveProviderDefaultEndpoint(providerFromGateway)
   const model = (seed.model || '').trim() || (providerFromGateway === 'openclaw' ? DEFAULT_OPENCLAW_MODEL : '')
   if (!providerFromGateway || !model) return null
 
-  const credentialId = seed.credentialId ?? gatewayProfile?.credentialId ?? null
+  const credentialId = resolveProviderCredentialId({
+    provider: providerFromGateway,
+    credentialId: seed.credentialId ?? gatewayProfile?.credentialId ?? null,
+  })
+  const explicitEndpoint = seed.apiEndpoint ?? gatewayProfile?.endpoint ?? null
+  const apiEndpoint = resolveProviderApiEndpoint({
+    provider: providerFromGateway,
+    model,
+    credentialId,
+    apiEndpoint: explicitEndpoint,
+  })
   return {
     id: seed.id,
     label: seed.label?.trim() || (gatewayProfile?.name || `${providerFromGateway}:${model}`),

package/src/lib/server/agents/agent-thread-session.test.ts

@@ -86,7 +86,6 @@ describe('ensureAgentThreadSession', () => {
     assert.equal(output.session.memoryScopeMode, 'agent')
     assert.equal(output.session.memoryTierPreference, 'blended')
     assert.equal(output.session.projectId, 'proj-1')
-    assert.deepEqual(output.session.plugins, ['memory', 'web_search'])
   })
 
   it('does not create a new shortcut chat when the agent is disabled', () => {
@@ -238,4 +237,80 @@ describe('ensureAgentThreadSession', () => {
 
     assert.equal(output.connectorContext, null)
   })
+
+  it('repairs an existing Ollama Cloud thread session away from a stale local endpoint', () => {
+    const output = runWithTempDataDir(`
+      const storageMod = await import('@/lib/server/storage')
+      const storage = storageMod.default || storageMod['module.exports'] || storageMod
+      const helperMod = await import('@/lib/server/agents/agent-thread-session')
+      const ensureAgentThreadSession = helperMod.ensureAgentThreadSession
+        || helperMod.default?.ensureAgentThreadSession
+        || helperMod['module.exports']?.ensureAgentThreadSession
+
+      const now = Date.now()
+      storage.saveCredentials({
+        'cred-ollama-cloud': {
+          id: 'cred-ollama-cloud',
+          provider: 'ollama',
+          name: 'Ollama Cloud',
+          encryptedKey: storage.encryptKey('ollama-cloud-key'),
+          createdAt: now,
+        },
+      })
+      storage.saveAgents({
+        hal: {
+          id: 'hal',
+          name: 'Hal2k',
+          provider: 'ollama',
+          model: 'glm-5:cloud',
+          credentialId: 'cred-ollama-cloud',
+          apiEndpoint: null,
+          fallbackCredentialIds: [],
+          heartbeatEnabled: true,
+          heartbeatIntervalSec: 600,
+          threadSessionId: 'agent-chat-hal-existing',
+          createdAt: now,
+          updatedAt: now,
+        },
+      })
+      storage.saveSessions({
+        'agent-chat-hal-existing': {
+          id: 'agent-chat-hal-existing',
+          name: 'Hal2k',
+          cwd: process.env.WORKSPACE_DIR,
+          user: 'default',
+          provider: 'ollama',
+          model: 'glm-5:cloud',
+          credentialId: 'cred-ollama-cloud',
+          apiEndpoint: 'http://localhost:11434',
+          claudeSessionId: null,
+          codexThreadId: null,
+          opencodeSessionId: null,
+          delegateResumeIds: { claudeCode: null, codex: null, opencode: null, gemini: null },
+          messages: [],
+          createdAt: now,
+          lastActiveAt: now,
+          sessionType: 'human',
+          agentId: 'hal',
+          shortcutForAgentId: 'hal',
+        },
+      })
+
+      const session = ensureAgentThreadSession('hal')
+      const persisted = storage.loadSessions()[session.id]
+      const healedAgent = storage.loadAgents().hal
+
+      console.log(JSON.stringify({
+        sessionId: session.id,
+        apiEndpoint: persisted.apiEndpoint || null,
+        credentialId: persisted.credentialId || null,
+        agentCredentialId: healedAgent?.credentialId || null,
+      }))
+    `)
+
+    assert.equal(output.sessionId, 'agent-chat-hal-existing')
+    assert.equal(output.credentialId, 'cred-ollama-cloud')
+    assert.equal(output.agentCredentialId, 'cred-ollama-cloud')
+    assert.equal(output.apiEndpoint, 'https://ollama.com')
+  })
 })