Skip to content

Self-improving AI Employees for everyone

fix(skills): cross-folder icon resolution, card overflow, toggle prefetch

trohitgbf6a7e927d34
diff --git a/client/src/components/parameterPanel/MasterSkillEditor.tsx b/client/src/components/parameterPanel/MasterSkillEditor.tsx
index f11c4f45..6c94b4af 100644
--- a/client/src/components/parameterPanel/MasterSkillEditor.tsx
+++ b/client/src/components/parameterPanel/MasterSkillEditor.tsx
@@ -263,6 +263,34 @@ const MasterSkillEditor: React.FC<MasterSkillEditorProps> = ({
fetchSkillContent(selectedSkillName);
}, [selectedSkillName, isCreatingNew, fetchSkillContent, getCachedSkillContent, availableSkills]);
+ // Background prefetch: as soon as the folder's skills are known,
+ // queue up `get_skill_content` for each in parallel so the per-skill
+ // round-trip is already cached when the user clicks a checkbox.
+ // Without this, the first toggle of each skill awaits the WS call
+ // inside handleToggleSkill, which the user perceives as "slow toggle"
+ // -- the checkbox visually lags by the network round-trip.
+ // queryClient.prefetchQuery is a no-op when the data is already
+ // cached, so subsequent panel opens are free.
+ useEffect(() => {
+ if (availableSkills.length === 0) return;
+ for (const skill of availableSkills) {
+ if (skill.isUserSkill) continue;
+ if (getCachedSkillContent(skill.skillName) !== undefined) continue;
+ queryClient.prefetchQuery({
+ queryKey: ['skillContent', skill.skillName],
+ queryFn: async () => {
+ const response = await sendRequest<{
+ instructions: string;
+ success: boolean;
+ error?: string;
+ }>('get_skill_content', { skill_name: skill.skillName });
+ return (response?.success && response.instructions) || '';
+ },
+ staleTime: Infinity,
+ });
+ }
+ }, [availableSkills, queryClient, sendRequest, getCachedSkillContent]);
+
// When selecting a user skill, load its data into pendingSkillData for editing
useEffect(() => {
if (isCreatingNew || !selectedSkillName) {
diff --git a/client/src/components/parameterPanel/MiddleSection.tsx b/client/src/components/parameterPanel/MiddleSection.tsx
index c5ddd069..4a5519e0 100644
--- a/client/src/components/parameterPanel/MiddleSection.tsx
+++ b/client/src/components/parameterPanel/MiddleSection.tsx
@@ -359,7 +359,7 @@ const MiddleSection: React.FC<MiddleSectionProps> = ({
})),
});
- const skillMetadataByName = useMemo<Record<string, AvailableSkill>>(() => {
+ const folderSkillMetadataByName = useMemo<Record<string, AvailableSkill>>(() => {
const out: Record<string, AvailableSkill> = {};
for (const q of folderSkillsQueries) {
for (const s of q.data ?? []) out[s.skillName] = s;
@@ -367,6 +367,55 @@ const MiddleSection: React.FC<MiddleSectionProps> = ({
return out;
}, [folderSkillsQueries]);
+ // Names of currently-enabled skills inside connected Master Skill
+ // nodes that are NOT covered by the folder-scoped query above (e.g.
+ // a skill the user enabled when the masterSkill was on folder A but
+ // then moved to folder B). Backend `lookup_skill_metadata` queries
+ // the global registry by name so we can resolve their metadata
+ // regardless of folder.
+ const orphanSkillNames = useMemo<string[]>(() => {
+ const names = new Set<string>();
+ for (const id of masterSkillEdgeSources) {
+ const cfg = (masterSkillParams[id]?.skills_config ?? {}) as Record<string, any>;
+ for (const [skillName, c] of Object.entries(cfg)) {
+ if (c?.enabled && !folderSkillMetadataByName[skillName]) {
+ names.add(skillName);
+ }
+ }
+ }
+ return Array.from(names).sort();
+ }, [masterSkillEdgeSources, masterSkillParams, folderSkillMetadataByName]);
+
+ const orphanSkillsQuery = useQuery<Record<string, AvailableSkill>, Error>({
+ queryKey: ['skillMetadataLookup', orphanSkillNames.join(',')],
+ queryFn: async () => {
+ const response = await sendRequest<{
+ success: boolean;
+ skills?: Array<{ name: string; description: string; metadata?: Record<string, any> }>;
+ }>('lookup_skill_metadata', { names: orphanSkillNames });
+ if (!response?.success || !response.skills) return {};
+ const out: Record<string, AvailableSkill> = {};
+ for (const s of response.skills) {
+ out[s.name] = {
+ type: s.name,
+ skillName: s.name,
+ displayName: s.name,
+ icon: s.metadata?.icon ?? '',
+ color: s.metadata?.color ?? dracula.purple,
+ description: s.description ?? '',
+ };
+ }
+ return out;
+ },
+ enabled: orphanSkillNames.length > 0,
+ staleTime: STALE_TIME.MEDIUM,
+ });
+
+ const skillMetadataByName = useMemo<Record<string, AvailableSkill>>(
+ () => ({ ...folderSkillMetadataByName, ...(orphanSkillsQuery.data ?? {}) }),
+ [folderSkillMetadataByName, orphanSkillsQuery.data],
+ );
+
const connectedSkills = useMemo<ConnectedSkill[]>(() => {
const nodes = currentWorkflow?.nodes || [];
const skills: ConnectedSkill[] = [];
@@ -818,11 +867,11 @@ const MiddleSection: React.FC<MiddleSectionProps> = ({
className="h-5 w-5 text-lg"
/>
</div>
- <div className="min-w-0 flex-1">
- <div className="mb-0.5 text-sm font-semibold text-foreground">
+ <div className="min-w-0 flex-1 overflow-hidden">
+ <div className="mb-0.5 truncate text-sm font-semibold text-foreground">
{skill.name}
</div>
- <div className="line-clamp-2 text-xs text-muted-foreground">
+ <div className="line-clamp-2 break-words text-xs text-muted-foreground">
{skill.description}
</div>
</div>
diff --git a/server/routers/websocket.py b/server/routers/websocket.py
index 5e35de01..a8598e70 100644
--- a/server/routers/websocket.py
+++ b/server/routers/websocket.py
@@ -14,7 +14,7 @@ import time
import asyncio
import uuid
import weakref
-from typing import Dict, Any, Callable, Awaitable, Optional, Set
+from typing import Dict, Any, Callable, Awaitable, List, Optional, Set
from datetime import datetime
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
@@ -2621,6 +2621,44 @@ async def handle_scan_skill_folder(data: Dict[str, Any], websocket: WebSocket) -
return {"success": True, "skills": skills, "folder": folder}
+@ws_handler()
+async def handle_lookup_skill_metadata(
+ data: Dict[str, Any], websocket: WebSocket
+) -> Dict[str, Any]:
+ """Look up SKILL.md metadata for a list of skill names across every
+ folder (and the user-skills DB).
+
+ The Master Skill editor lets users keep a skill enabled even after
+ switching the node's `skill_folder`, so the AI agent's Connected
+ Skills panel needs to resolve metadata for skills outside the
+ currently-selected folder. `scan_skill_folder` is folder-scoped;
+ this handler is name-scoped and queries the shared registry.
+ """
+ from services.skill_loader import get_skill_loader
+
+ names = data.get("names") or []
+ if not isinstance(names, list):
+ return {"success": False, "error": "names must be a list", "skills": []}
+
+ skill_loader = get_skill_loader()
+ # Ensure the registry is hydrated -- skip the DB pass since we only
+ # need the filesystem-derived metadata for the icon/color/desc fields.
+ if not skill_loader._registry:
+ skill_loader.scan_skills()
+
+ skills: List[Dict[str, Any]] = []
+ for name in names:
+ meta = skill_loader._registry.get(name)
+ if meta:
+ skills.append({
+ "name": meta.name,
+ "description": meta.description,
+ "metadata": meta.metadata,
+ })
+
+ return {"success": True, "skills": skills}
+
+
@ws_handler()
async def handle_get_user_skills(data: Dict[str, Any], websocket: WebSocket) -> Dict[str, Any]:
"""Get all user-created skills."""
@@ -3385,6 +3423,7 @@ MESSAGE_HANDLERS: Dict[str, MessageHandler] = {
"save_skill_content": handle_save_skill_content,
"scan_skill_folder": handle_scan_skill_folder,
"list_skill_folders": handle_list_skill_folders,
+ "lookup_skill_metadata": handle_lookup_skill_metadata,
# Memory and Skill Clear/Reset
"clear_memory": handle_clear_memory,