@swarmclawai/swarmclaw 0.9.2 → 0.9.4

package/README.md

@@ -64,7 +64,7 @@ The OpenClaw Control Plane in SwarmClaw adds:
 - Gateway import/export JSON, clone flows, and richer external runtime fleet visibility
 - Agent and route-target preferences for steering work toward OpenClaw gateways by tags or use case (`local-dev`, `single-vps`, `private-tailnet`, `browser-heavy`, `team-control`)
 
-The Agent Inspector Panel lets you edit OpenClaw files (`SOUL.md`, `IDENTITY.md`, `USER.md`), tune personality/system behavior, and manage OpenClaw-compatible skills. SwarmClaw also supports importing OpenClaw `SKILL.md` files from URL.
+The Agent Inspector Panel lets you edit OpenClaw files (`SOUL.md`, `IDENTITY.md`, `USER.md`), tune personality/system behavior, and manage OpenClaw-compatible skills. Skills are now discoverable by default, pinned skills stay always-on for an agent, and executable `SKILL.md` metadata can drive on-demand runtime skill selection. SwarmClaw also supports importing OpenClaw `SKILL.md` files from URL.
 
 To connect an agent to an OpenClaw gateway:
 
@@ -155,7 +155,7 @@ curl -fsSL https://raw.githubusercontent.com/swarmclawai/swarmclaw/main/install.
 The installer resolves the latest stable release tag and installs that version by default.
 It also builds the production bundle so `npm run start` is ready immediately after install.
 No Deno install is required; local sandbox execution is Docker-first with automatic host Node fallback.
-To pin a version: `SWARMCLAW_VERSION=v0.9.0 curl ... | bash`
+To pin a version: `SWARMCLAW_VERSION=v0.9.4 curl ... | bash`
 
 Or run locally from the repo (friendly for non-technical users):
 
@@ -248,7 +248,7 @@ Notes:
 - **Connector bridge** - Discord, Slack, Telegram, WhatsApp, Teams, Matrix, OpenClaw, and others
 - **Memory + knowledge** - hybrid search, memory graph, shared knowledge store, and auto-journaling
 - **Operational guardrails** - capability policy, cost tracking, provider health, and credential failover
-- **Extensibility** - plugin hooks/tools/UI extensions plus reusable skills
+- **Extensibility** - plugin hooks/tools/UI extensions plus reusable skills with discovery-by-default runtime selection
 
 For the full feature matrix and per-capability details, see:
 - https://swarmclaw.ai/docs
@@ -364,6 +364,8 @@ Connector ingress now also supports optional pairing/allowlist policy:
 - `/think` command can set connector thread thinking level (`low`, `medium`, `high`)
 - Session overrides also support per-thread `/reply`, `/scope`, `/thread`, `/provider`, `/model`, `/idle`, `/maxage`, and `/reset` controls
 
+Direct connector sessions are now the only source of routable connector state. Main agent threads no longer inherit outbound connector targets from mirrored history, and tool-only heartbeats stay out of visible main-thread history.
+
 ## Agent Tools
 
 Agents can use the following tools when enabled:
@@ -727,15 +729,15 @@ On `v*` tags, GitHub Actions will:
 2. Create a GitHub Release
 3. Build and publish Docker images to `ghcr.io/swarmclawai/swarmclaw` (`:vX.Y.Z`, `:latest`, `:sha-*`)
 
-#### v0.9.0 Release Readiness Notes
+#### v0.9.4 Release Readiness Notes
 
-Before shipping `v0.9.0`, confirm the following user-facing changes are reflected in docs:
+Before shipping `v0.9.4`, confirm the following user-facing changes are reflected in docs:
 
-1. Install docs make it explicit that global npm installs use `swarmclaw server`, and that package-manager installs plus the curl installer prepare the sandbox/browser runtime automatically when Docker is available.
-2. Sandbox docs say local `sandbox_exec` no longer requires Deno, defaults to sandbox-enabled agent configs, and falls back to host Node when Docker is unavailable.
-3. Release docs mention the OpenClaw-style sandbox/runtime refresh, heartbeat deferral improvements, and the HMR-safe live chat route fix.
-4. Site and README install/version strings are updated to `v0.9.0`, including pinned install snippets, release notes index text, and sidebar/footer labels.
-5. The release tag, npm package version, and generated GitHub release install snippet all agree on the non-prefixed npm version (`0.9.0`) versus the git tag (`v0.9.0`).
+1. Skills docs explain that local skills are discoverable by default, while `skillIds` now mean pinned always-on skills for an agent.
+2. Runtime-skill docs mention executable skill metadata, on-demand selection, and the `use_skill` / `manage_skills` flow instead of implying every discovered skill is inlined into the prompt.
+3. Connector/heartbeat docs mention that routable connector state is kept on direct connector sessions only, sender quiet-boundary memories are enforced before reply generation, and tool-only heartbeats no longer pollute visible main-thread history.
+4. Site and README install/version strings are updated to `v0.9.4`, including pinned install snippets, release notes index text, and sidebar/footer labels.
+5. The release tag, npm package version, and generated GitHub release install snippet all agree on the non-prefixed npm version (`0.9.4`) versus the git tag (`v0.9.4`).
 
 ## CLI
 

package/bundled-skills/google-workspace/SKILL.md

@@ -4,6 +4,8 @@ description: Use Google Workspace CLI (`gws`) for Drive, Docs, Sheets, Gmail, Ca
 homepage: https://github.com/googleworkspace/cli
 metadata:
   openclaw:
+    toolNames: [google_workspace, gws]
+    capabilities: [google-workspace, google-docs, google-drive, google-sheets, gmail, google-calendar, google-chat]
     requires:
       bins: [gws]
 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Self-hosted AI agent orchestration dashboard — manage LLM providers, orchestrate agent swarms, schedule tasks, and bridge agents to chat platforms.",
   "license": "MIT",
   "publishConfig": {

package/src/app/agents/page.tsx

@@ -6,6 +6,7 @@ import { useAppStore } from '@/stores/use-app-store'
 import { useMediaQuery } from '@/hooks/use-media-query'
 import { getViewPath } from '@/lib/app/navigation'
 import { AgentChatList } from '@/components/agents/agent-chat-list'
+import { PageLoader } from '@/components/ui/page-loader'
 
 export default function AgentsPage() {
   const isDesktop = useMediaQuery('(min-width: 768px)')
@@ -30,5 +31,5 @@ export default function AgentsPage() {
   if (!isDesktop) return <AgentChatList />
 
   // Brief flash while redirecting, or no agents exist yet
-  return null
+  return <PageLoader />
 }

package/src/app/api/chatrooms/[id]/chat/route.ts

@@ -189,7 +189,7 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
             syntheticSession.fallbackCredentialIds = route?.fallbackCredentialIds || syntheticSession.fallbackCredentialIds || []
             syntheticSession.gatewayProfileId = route?.gatewayProfileId ?? syntheticSession.gatewayProfileId ?? null
             syntheticSession.apiEndpoint = resolvedEndpoint
-            const agentSystemPrompt = buildAgentSystemPromptForChatroom(agent)
+            const agentSystemPrompt = buildAgentSystemPromptForChatroom(agent, syntheticSession.cwd)
             const chatroomContext = buildChatroomSystemPrompt(freshChatroom, agents, agent.id)
             const fullSystemPrompt = [agentSystemPrompt, chatroomContext].filter(Boolean).join('\n\n')
             const history = buildHistoryForAgent(freshChatroom, agent.id, imagePath, attachedFiles)

package/src/app/api/clawhub/install/route.ts

@@ -45,6 +45,8 @@ export async function POST(req: Request) {
     homepage: normalized.homepage,
     primaryEnv: normalized.primaryEnv,
     skillKey: normalized.skillKey,
+    toolNames: normalized.toolNames,
+    capabilities: normalized.capabilities,
     always: normalized.always,
     installOptions: normalized.installOptions,
     skillRequirements: normalized.skillRequirements,

package/src/app/api/skills/[id]/route.ts

@@ -37,11 +37,15 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
       homepage: normalized.homepage ?? null,
       primaryEnv: normalized.primaryEnv ?? null,
       skillKey: normalized.skillKey ?? null,
+      toolNames: normalized.toolNames,
+      capabilities: normalized.capabilities,
       always: typeof normalized.always === 'boolean' ? normalized.always : false,
       installOptions: normalized.installOptions,
       skillRequirements: normalized.skillRequirements,
       detectedEnvVars: normalized.detectedEnvVars,
       security: normalized.security,
+      invocation: normalized.invocation,
+      commandDispatch: normalized.commandDispatch,
       frontmatter: normalized.frontmatter,
       scope: updatedScope,
       agentIds: updatedAgentIds,

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

@@ -32,11 +32,15 @@ export async function POST(req: Request) {
     homepage: normalized.homepage,
     primaryEnv: normalized.primaryEnv,
     skillKey: normalized.skillKey,
+    toolNames: normalized.toolNames,
+    capabilities: normalized.capabilities,
     always: normalized.always,
     installOptions: normalized.installOptions,
     skillRequirements: normalized.skillRequirements,
     detectedEnvVars: normalized.detectedEnvVars,
     security: normalized.security,
+    invocation: normalized.invocation,
+    commandDispatch: normalized.commandDispatch,
     frontmatter: normalized.frontmatter,
     scope,
     agentIds,

package/src/app/globals.css

@@ -287,6 +287,34 @@ textarea:hover::-webkit-scrollbar { width: 6px; }
   to { opacity: 1; transform: translateY(0); }
 }
 
+/* ===== SwarmClaw Loader Keyframes ===== */
+@keyframes sc-orbit {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+@keyframes sc-ring {
+  from { transform: rotate(0deg) scale(1); }
+  50% { transform: rotate(180deg) scale(1.02); }
+  to { transform: rotate(360deg) scale(1); }
+}
+@keyframes sc-breathe {
+  0%, 100% { transform: scale(1); opacity: 0.9; }
+  50% { transform: scale(1.06); opacity: 1; }
+}
+@keyframes sc-glow {
+  0%, 100% { opacity: 0.5; transform: scale(0.9); }
+  50% { opacity: 1; transform: scale(1.1); }
+}
+@keyframes sc-text-fade {
+  0% { opacity: 0.6; }
+  100% { opacity: 1; }
+}
+@keyframes sc-progress {
+  0% { width: 0; margin-left: 0; }
+  50% { width: 70%; margin-left: 15%; }
+  100% { width: 0; margin-left: 100%; }
+}
+
 /* Heartbeat float animation */
 @keyframes heartbeat-float {
   0% { opacity: 1; transform: translateY(0) scale(1); }

package/src/app/home/page.tsx

@@ -16,6 +16,7 @@ import { timeAgo, timeUntil } from '@/lib/time-format'
 import type { Agent, Session, ActivityEntry, BoardTask, AppNotification } from '@/types'
 import { HintTip } from '@/components/shared/hint-tip'
 import { MainContent } from '@/components/layout/main-content'
+import { PageLoader } from '@/components/ui/page-loader'
 import { SectionHeader } from '@/components/ui/section-header'
 import { StatCard } from '@/components/ui/stat-card'
 
@@ -77,6 +78,7 @@ export default function HomePage() {
   const [todayCost, setTodayCost] = useState(0)
   const [costTrend, setCostTrend] = useState<{ cost: number; bucket: string }[]>([])
   const [localhostBrowser, setLocalhostBrowser] = useState(false)
+  const [pageReady, setPageReady] = useState(false)
   const mountedRef = useMountedRef()
 
   useEffect(() => {
@@ -155,6 +157,7 @@ export default function HomePage() {
         setTodayCost(todayPt?.cost || 0)
       })
       .catch(() => {})
+      .finally(() => { if (!cancelled && mountedRef.current) setPageReady(true) })
     return () => {
       cancelled = true
       window.clearTimeout(connectorTimer)
@@ -188,6 +191,14 @@ export default function HomePage() {
     }
   }
 
+  if (!pageReady) {
+    return (
+      <MainContent>
+        <PageLoader label="Loading dashboard..." />
+      </MainContent>
+    )
+  }
+
   return (
     <MainContent>
       <div className="flex-1 overflow-y-auto">

package/src/app/settings/page.tsx

@@ -4,6 +4,7 @@ import { useEffect, useState, useRef, useCallback, useMemo } from 'react'
 import type { ReactNode } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
 import { MainContent } from '@/components/layout/main-content'
+import { PageLoader } from '@/components/ui/page-loader'
 import { inputClass } from '@/views/settings/utils'
 import { UserPreferencesSection } from '@/views/settings/section-user-preferences'
 import { ThemeSection } from '@/views/settings/section-theme'
@@ -84,6 +85,7 @@ export default function SettingsRoute() {
   const loadSecrets = useAppStore((s) => s.loadSecrets)
   const loadAgents = useAppStore((s) => s.loadAgents)
   const credentials = useAppStore((s) => s.credentials)
+  const [pageReady, setPageReady] = useState(false)
   const [activeTab, setActiveTabRaw] = useState('general')
   const contentRef = useRef<HTMLDivElement>(null)
   const sectionRefs = useRef<Record<string, HTMLDivElement | null>>({})
@@ -98,11 +100,8 @@ export default function SettingsRoute() {
   }, [])
 
   useEffect(() => {
-    loadProviders()
-    loadCredentials()
-    loadSettings()
-    loadSecrets()
-    loadAgents()
+    Promise.all([loadProviders(), loadCredentials(), loadSettings(), loadSecrets(), loadAgents()])
+      .finally(() => setPageReady(true))
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
@@ -298,6 +297,14 @@ export default function SettingsRoute() {
 
   const visibleSections = sectionsByTab.get(activeTab) || []
 
+  if (!pageReady) {
+    return (
+      <MainContent>
+        <PageLoader label="Loading settings..." />
+      </MainContent>
+    )
+  }
+
   return (
     <MainContent>
       <div className="flex-1 flex h-full min-w-0">

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

@@ -2213,7 +2213,7 @@ export function AgentSheet() {
       <div ref={(node) => { sectionRefs.current.tools = node }}>
       <SectionCard
         title="Tools & Delegation"
-        description="Enable plugins, skills, MCP tools, and delegation behavior for this agent."
+        description="Enable plugins, pin preferred skills, connect MCP tools, and configure delegation behavior for this agent."
       >
       {/* Plugins — hidden for providers that manage capabilities outside LangGraph */}
       {!hasNativeCapabilities && (
@@ -2281,7 +2281,7 @@ export function AgentSheet() {
         <div className="mb-8">
           <div className="flex items-center justify-between mb-2">
             <label className="block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em]">
-              Skills <span className="normal-case tracking-normal font-normal text-text-3">(from ~/.claude/skills/)</span>
+              Pinned Claude Skills <span className="normal-case tracking-normal font-normal text-text-3">(from ~/.claude/skills/)</span>
             </label>
             <button
               onClick={loadClaudeSkills}
@@ -2297,7 +2297,7 @@ export function AgentSheet() {
               Refresh
             </button>
           </div>
-          <p className="text-[12px] text-text-3/60 mb-3">When delegated to, this agent will be instructed to use these skills.</p>
+          <p className="text-[12px] text-text-3/60 mb-3">Optional preference list. Pinned Claude skills are called out explicitly when this agent is delegated work.</p>
           {claudeSkills.length > 0 ? (
             <div className="flex flex-wrap gap-2">
               {claudeSkills.map((s) => {
@@ -2328,9 +2328,9 @@ export function AgentSheet() {
       {Object.keys(dynamicSkills).length > 0 && (
         <div className="mb-8">
           <label className="block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em] mb-2">
-            Custom Skills <span className="normal-case tracking-normal font-normal text-text-3">(from Skills manager)</span>
+            Pinned Skills <span className="normal-case tracking-normal font-normal text-text-3">(from Skills manager)</span>
           </label>
-          <p className="text-[12px] text-text-3/60 mb-3">Skill content is injected into the system prompt when this agent runs.</p>
+          <p className="text-[12px] text-text-3/60 mb-3">All ready local skills are discoverable by default. Pin skills here only when they should stay in this agent&apos;s prompt as always-on guidance.</p>
           <div className="flex flex-wrap gap-2">
             {Object.values(dynamicSkills).map((s) => {
               const active = skillIds.includes(s.id)

package/src/components/connectors/connector-list.tsx

@@ -14,6 +14,7 @@ import {
   resolveConnectorPlatformMeta,
 } from '@/components/shared/connector-platform-icon'
 import { AgentAvatar } from '@/components/agents/agent-avatar'
+import { PageLoader } from '@/components/ui/page-loader'
 import { StatusDot } from '@/components/ui/status-dot'
 
 function relativeTime(ts: number): string {
@@ -158,11 +159,7 @@ export function ConnectorList({ inSidebar }: { inSidebar?: boolean }) {
   }
 
   if (!loaded) {
-    return (
-      <div className="flex-1 flex flex-col items-center justify-center px-6 py-12 text-center">
-        <p className="text-[13px] text-text-3">Loading connectors...</p>
-      </div>
-    )
+    return <PageLoader label="Loading connectors..." />
   }
 
   if (!list.length) {

package/src/components/logs/log-list.tsx

@@ -5,6 +5,7 @@ import { api } from '@/lib/app/api-client'
 import { useWs } from '@/hooks/use-ws'
 import { useAppStore } from '@/stores/use-app-store'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
+import { PageLoader } from '@/components/ui/page-loader'
 import { safeStorageGetJson, safeStorageSet } from '@/lib/app/safe-storage'
 
 interface LogEntry {
@@ -135,11 +136,7 @@ export function LogList() {
   }
 
   if (loading) {
-    return (
-      <div className="flex-1 flex items-center justify-center text-text-3 text-[13px]">
-        Loading logs...
-      </div>
-    )
+    return <PageLoader label="Loading logs..." />
   }
 
   const agentList = Object.values(agents)

package/src/components/providers/provider-list.tsx

@@ -8,6 +8,7 @@ import { useWs } from '@/hooks/use-ws'
 import { api } from '@/lib/app/api-client'
 import type { Credential, GatewayProfile } from '@/types'
 import { dedup } from '@/lib/shared-utils'
+import { PageLoader } from '@/components/ui/page-loader'
 import { StatusDot } from '@/components/ui/status-dot'
 
 interface OpenClawDeployDraft {
@@ -254,11 +255,7 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
   }, {})
 
   if (!loaded) {
-    return (
-      <div className={`flex-1 flex items-center justify-center ${inSidebar ? 'px-3 pb-4' : 'px-5'}`}>
-        <p className="text-[13px] text-text-3">Loading providers...</p>
-      </div>
-    )
+    return <PageLoader label="Loading providers..." />
   }
 
   return (

package/src/components/runs/run-list.tsx

@@ -6,6 +6,7 @@ import { useNow } from '@/hooks/use-now'
 import { useWs } from '@/hooks/use-ws'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
 import type { SessionRunRecord, SessionRunStatus } from '@/types'
+import { PageLoader } from '@/components/ui/page-loader'
 import { formatElapsed } from '@/lib/format-display'
 
 const STATUS_COLORS: Record<SessionRunStatus, { bg: string; text: string }> = {
@@ -55,12 +56,7 @@ export function RunList() {
   const filtered = statusFilter ? runs.filter((r) => r.status === statusFilter) : runs
 
   if (loading) {
-    return (
-      <div className="flex-1 flex items-center justify-center text-text-3 text-[13px]">
-        <span className="w-4 h-4 rounded-full border-2 border-text-3/20 border-t-text-3/60 animate-spin mr-2" />
-        Loading runs...
-      </div>
-    )
+    return <PageLoader label="Loading runs..." />
   }
 
   return (

package/src/components/schedules/schedule-list.tsx

@@ -5,6 +5,7 @@ import { useAppStore } from '@/stores/use-app-store'
 import { ScheduleCard } from './schedule-card'
 import { SCHEDULE_TEMPLATES, FEATURED_TEMPLATE_IDS } from '@/lib/schedules/schedule-templates'
 import { Newspaper, HeartPulse, PenLine, FileText } from 'lucide-react'
+import { PageLoader } from '@/components/ui/page-loader'
 import { SearchInput } from '@/components/ui/search-input'
 import { Button } from '@/components/ui/button'
 
@@ -27,8 +28,9 @@ export function ScheduleList({ inSidebar }: Props) {
   const setTemplatePrefill = useAppStore((s) => s.setScheduleTemplatePrefill)
   const activeProjectFilter = useAppStore((s) => s.activeProjectFilter)
   const [search, setSearch] = useState('')
+  const [loaded, setLoaded] = useState(false)
 
-  useEffect(() => { loadSchedules() }, [])
+  useEffect(() => { loadSchedules().finally(() => setLoaded(true)) }, [])
 
   const filtered = useMemo(() => {
     return Object.values(schedules)
@@ -40,6 +42,10 @@ export function ScheduleList({ inSidebar }: Props) {
       .sort((a, b) => b.createdAt - a.createdAt)
   }, [schedules, search, activeProjectFilter])
 
+  if (!loaded) {
+    return <PageLoader label="Loading schedules..." />
+  }
+
   if (!filtered.length && !search) {
     return (
       <div className="flex-1 flex flex-col items-center justify-center gap-4 text-text-3 p-8 text-center">

package/src/components/ui/full-screen-loader.tsx

@@ -130,35 +130,6 @@ export function FullScreenLoader(props: {
         </div>
       ) : null}
 
-      {/* Loading animation keyframes */}
-      <style>{`
-        @keyframes sc-orbit {
-          from { transform: rotate(0deg); }
-          to { transform: rotate(360deg); }
-        }
-        @keyframes sc-ring {
-          from { transform: rotate(0deg) scale(1); }
-          50% { transform: rotate(180deg) scale(1.02); }
-          to { transform: rotate(360deg) scale(1); }
-        }
-        @keyframes sc-breathe {
-          0%, 100% { transform: scale(1); opacity: 0.9; }
-          50% { transform: scale(1.06); opacity: 1; }
-        }
-        @keyframes sc-glow {
-          0%, 100% { opacity: 0.5; transform: scale(0.9); }
-          50% { opacity: 1; transform: scale(1.1); }
-        }
-        @keyframes sc-text-fade {
-          0% { opacity: 0.6; }
-          100% { opacity: 1; }
-        }
-        @keyframes sc-progress {
-          0% { width: 0; margin-left: 0; }
-          50% { width: 70%; margin-left: 15%; }
-          100% { width: 0; margin-left: 100%; }
-        }
-      `}</style>
     </div>
   )
 }

package/src/components/ui/page-loader.tsx

@@ -0,0 +1,69 @@
+/**
+ * Lightweight page-level loader — smaller sibling of FullScreenLoader.
+ * 3 orbiting dots, subtle glow ring, optional label.
+ * 150ms CSS animation-delay prevents flicker on fast loads.
+ */
+export function PageLoader({ label }: { label?: string }) {
+  return (
+    <div
+      className="flex-1 flex flex-col items-center justify-center select-none"
+      style={{
+        opacity: 0,
+        animation: 'fade-up 0.4s var(--ease-spring) 0.15s both',
+      }}
+    >
+      {/* Orbital ring */}
+      <div className="relative w-[64px] h-[64px] mb-5">
+        {/* Glow pulse */}
+        <div
+          className="absolute inset-[-12px] rounded-full"
+          style={{
+            background: 'radial-gradient(circle, rgba(99,102,241,0.06) 0%, transparent 70%)',
+            animation: 'sc-glow 2.5s ease-in-out infinite',
+          }}
+        />
+
+        {/* Ring */}
+        <div
+          className="absolute inset-0 rounded-full border border-white/[0.05]"
+          style={{ animation: 'sc-ring 3s linear infinite' }}
+        />
+
+        {/* 3 orbiting dots */}
+        {[0, 1, 2].map((i) => (
+          <div
+            key={i}
+            className="absolute inset-0"
+            style={{
+              animation: 'sc-orbit 2.4s cubic-bezier(0.4, 0, 0.2, 1) infinite',
+              animationDelay: `${i * -0.8}s`,
+            }}
+          >
+            <div
+              className="absolute top-0 left-1/2 -translate-x-1/2 -translate-y-1/2 rounded-full"
+              style={{
+                width: i === 0 ? 6 : 5,
+                height: i === 0 ? 6 : 5,
+                background: i === 0 ? '#818CF8' : `rgba(129, 140, 248, ${0.6 - i * 0.15})`,
+                boxShadow: i === 0 ? '0 0 10px rgba(99,102,241,0.4)' : 'none',
+              }}
+            />
+          </div>
+        ))}
+      </div>
+
+      {/* Shimmer bar */}
+      <div className="w-[60px] h-[2px] rounded-full bg-white/[0.05] overflow-hidden">
+        <div
+          className="h-full rounded-full bg-accent-bright/50"
+          style={{ animation: 'sc-progress 1.5s ease-in-out infinite' }}
+        />
+      </div>
+
+      {/* Optional label */}
+      {label && (
+        <p className="mt-3 text-[12px] text-text-3/60">{label}</p>
+      )}
+    </div>
+  )
+}

package/src/lib/runtime/runtime-loop.ts

@@ -21,6 +21,10 @@ export const CLAUDE_CODE_TIMEOUT_SEC_MIN = 5
 export const CLAUDE_CODE_TIMEOUT_SEC_MAX = 7200
 export const CLI_PROCESS_TIMEOUT_SEC_MIN = 10
 export const CLI_PROCESS_TIMEOUT_SEC_MAX = 7200
+export const STREAM_IDLE_STALL_SEC_MIN = 30
+export const STREAM_IDLE_STALL_SEC_MAX = 600
+export const REQUIRED_TOOL_KICKOFF_SEC_MIN = 10
+export const REQUIRED_TOOL_KICKOFF_SEC_MAX = 120
 
 export const DEFAULT_AGENT_LOOP_RECURSION_LIMIT = 300
 export const DEFAULT_ORCHESTRATOR_LOOP_RECURSION_LIMIT = 80
@@ -30,9 +34,11 @@ export const DEFAULT_ONGOING_LOOP_MAX_RUNTIME_MINUTES = 60
 export const DEFAULT_DELEGATION_MAX_DEPTH = 3
 
 // Tool/process timeouts
-export const DEFAULT_SHELL_COMMAND_TIMEOUT_SEC = 30
+export const DEFAULT_SHELL_COMMAND_TIMEOUT_SEC = 120
 export const DEFAULT_CLAUDE_CODE_TIMEOUT_SEC = 1800
 export const DEFAULT_CLI_PROCESS_TIMEOUT_SEC = 1800
+export const DEFAULT_STREAM_IDLE_STALL_SEC = 180
+export const DEFAULT_REQUIRED_TOOL_KICKOFF_SEC = 45
 
 function parseIntSetting(value: unknown, fallback: number, min: number, max: number): number {
   const parsed = typeof value === 'number'
@@ -55,6 +61,8 @@ export interface NormalizedRuntimeSettingFields {
   shellCommandTimeoutSec: number
   claudeCodeTimeoutSec: number
   cliProcessTimeoutSec: number
+  streamIdleStallSec: number
+  requiredToolKickoffSec: number
 }
 
 export function normalizeRuntimeSettingFields(settings: Record<string, unknown>): NormalizedRuntimeSettingFields {
@@ -114,5 +122,17 @@ export function normalizeRuntimeSettingFields(settings: Record<string, unknown>)
       CLI_PROCESS_TIMEOUT_SEC_MIN,
       CLI_PROCESS_TIMEOUT_SEC_MAX,
     ),
+    streamIdleStallSec: parseIntSetting(
+      settings.streamIdleStallSec,
+      DEFAULT_STREAM_IDLE_STALL_SEC,
+      STREAM_IDLE_STALL_SEC_MIN,
+      STREAM_IDLE_STALL_SEC_MAX,
+    ),
+    requiredToolKickoffSec: parseIntSetting(
+      settings.requiredToolKickoffSec,
+      DEFAULT_REQUIRED_TOOL_KICKOFF_SEC,
+      REQUIRED_TOOL_KICKOFF_SEC_MIN,
+      REQUIRED_TOOL_KICKOFF_SEC_MAX,
+    ),
   }
 }

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

@@ -174,4 +174,68 @@ describe('ensureAgentThreadSession', () => {
 
     assert.equal(output.session.openclawAgentId, 'main')
   })
+
+  it('clears stale connector routing state from an existing agent shortcut session', () => {
+    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.saveAgents({
+        molly: {
+          id: 'molly',
+          name: 'Molly',
+          provider: 'openai',
+          model: 'gpt-test',
+          credentialId: null,
+          apiEndpoint: null,
+          fallbackCredentialIds: [],
+          heartbeatEnabled: true,
+          heartbeatIntervalSec: 600,
+          threadSessionId: 'agent-chat-molly-existing',
+          createdAt: now,
+          updatedAt: now,
+          plugins: ['memory'],
+        },
+      })
+      storage.saveSessions({
+        'agent-chat-molly-existing': {
+          id: 'agent-chat-molly-existing',
+          name: 'Molly',
+          cwd: process.env.WORKSPACE_DIR,
+          user: 'default',
+          provider: 'openai',
+          model: 'gpt-old',
+          claudeSessionId: null,
+          codexThreadId: null,
+          opencodeSessionId: null,
+          delegateResumeIds: { claudeCode: null, codex: null, opencode: null, gemini: null },
+          messages: [],
+          createdAt: now,
+          lastActiveAt: now,
+          sessionType: 'human',
+          agentId: 'molly',
+          plugins: ['memory'],
+          connectorContext: {
+            connectorId: 'conn-1',
+            channelId: 'wrong-chat',
+            senderId: 'wrong-user',
+          },
+        },
+      })
+
+      const session = ensureAgentThreadSession('molly')
+      const persisted = storage.loadSessions()[session.id]
+
+      console.log(JSON.stringify({
+        connectorContext: persisted.connectorContext || null,
+      }))
+    `)
+
+    assert.equal(output.connectorContext, null)
+  })
 })