opencode-navigator 0.18.1 → 0.19.0

package/dist/tui.js

@@ -2,7 +2,7 @@ import {insert as _$insert,setProp as _$setProp,createElement as _$createElement
 
 
 
-import {createSignal as createSignal2,createSignal,createEffect,onCleanup,createContext,useContext,createContext as createContext2,createSignal as createSignal3,useContext as useContext2,createEffect as createEffect2,splitProps,untrack,splitProps as splitProps2,For,createEffect as createEffect3,onCleanup as onCleanup2,Show,splitProps as splitProps3,createSignal as createSignal4,createSignal as createSignal5,createSignal as createSignal6,onCleanup as onCleanup3,batch,createSignal as createSignal8,createSignal as createSignal7,createEffect as createEffect4,createSignal as createSignal9,onCleanup as onCleanup4,createSignal as createSignal10,createSignal as createSignal11,Index,createSignal as createSignal12,onCleanup as onCleanup5,createEffect as createEffect6,onCleanup as onCleanup7,batch as batch2,createEffect as createEffect5,createMemo,createSignal as createSignal13,onCleanup as onCleanup6,onMount,For as For2,For as For3,Show as Show2,createMemo as createMemo2,Show as Show3,createSignal as createSignal14,onCleanup as onCleanup8,For as For4,For as For5,For as For8,createMemo as createMemo4,onMount as onMount3,For as For7,createMemo as createMemo3,onMount as onMount2,Show as Show5,createEffect as createEffect7,createSignal as createSignal15,onCleanup as onCleanup9,Show as Show4,For as For6,For as For9,createEffect as createEffect8,createMemo as createMemo5,onCleanup as onCleanup10,For as For10,createEffect as createEffect9,createMemo as createMemo8,onCleanup as onCleanup11,onMount as onMount4,createMemo as createMemo6,createMemo as createMemo7,Show as Show6,onCleanup as onCleanup12,createSignal as createSignal16,createEffect as createEffect10,onCleanup as onCleanup13,onMount as onMount5,onCleanup as onCleanup14,onMount as onMount6,For as For11,createSignal as createSignal17,createSignal as createSignal18,Show as Show7,createSignal as createSignal20,createSignal as createSignal19,onCleanup as onCleanup15,For as For12,Show as Show10,createMemo as createMemo10,createComputed,createMemo as createMemo9,createSignal as createSignal21,untrack as untrack2,Show as Show8,createComputed as createComputed2,untrack as untrack3,Show as Show9,createEffect as createEffect11,createSignal as createSignal22,createMemo as createMemo12,createSignal as createSignal24,createMemo as createMemo11,For as For13,Show as Show13,Show as Show11,Show as Show12,createSignal as createSignal23,onCleanup as onCleanup16,For as For14,Show as Show15,createMemo as createMemo14,Show as Show14,createMemo as createMemo13,createSignal as createSignal25,createEffect as createEffect12,onCleanup as onCleanup17,For as For19,Match,Switch,createMemo as createMemo18,onCleanup as onCleanup21,For as For15,Show as Show16,createSignal as createSignal26,createEffect as createEffect13,createMemo as createMemo15,onCleanup as onCleanup18,untrack as untrack4,For as For17,Show as Show19,createEffect as createEffect14,createMemo as createMemo16,createSignal as createSignal27,onCleanup as onCleanup19,untrack as untrack5,For as For16,Show as Show18,Show as Show17,Show as Show23,createEffect as createEffect15,createMemo as createMemo17,createSignal as createSignal28,onCleanup as onCleanup20,untrack as untrack6,For as For18,Show as Show21,Show as Show20,Show as Show22,createEffect as createEffect16,createMemo as createMemo19,onCleanup as onCleanup22,untrack as untrack7,Show as Show24,createMemo as createMemo20,onCleanup as onCleanup23,createSignal as createSignal29,onCleanup as onCleanup24,onMount as onMount7} from "solid-js"
+import {createSignal as createSignal2,createSignal,createEffect,onCleanup,createContext,useContext,createContext as createContext2,createSignal as createSignal3,useContext as useContext2,createEffect as createEffect2,splitProps,untrack,splitProps as splitProps2,For,createEffect as createEffect3,onCleanup as onCleanup2,Show,splitProps as splitProps3,createSignal as createSignal4,createSignal as createSignal5,createSignal as createSignal6,onCleanup as onCleanup3,batch,createSignal as createSignal8,createSignal as createSignal7,createEffect as createEffect4,createSignal as createSignal9,onCleanup as onCleanup4,createSignal as createSignal10,createSignal as createSignal11,Index,createSignal as createSignal12,onCleanup as onCleanup5,createEffect as createEffect6,onCleanup as onCleanup7,batch as batch2,createEffect as createEffect5,createMemo,createSignal as createSignal13,onCleanup as onCleanup6,onMount,For as For2,For as For3,Show as Show2,createMemo as createMemo2,Show as Show3,createSignal as createSignal14,onCleanup as onCleanup8,For as For4,For as For5,For as For8,createMemo as createMemo4,onMount as onMount3,For as For7,createMemo as createMemo3,onMount as onMount2,Show as Show5,createEffect as createEffect7,createSignal as createSignal15,onCleanup as onCleanup9,Show as Show4,For as For6,For as For9,createEffect as createEffect8,createMemo as createMemo5,onCleanup as onCleanup10,createEffect as createEffect9,createMemo as createMemo6,untrack as untrack2,For as For10,createEffect as createEffect10,createMemo as createMemo9,onCleanup as onCleanup11,onMount as onMount4,createMemo as createMemo7,createMemo as createMemo8,Show as Show6,onCleanup as onCleanup12,createSignal as createSignal16,createEffect as createEffect11,onCleanup as onCleanup13,onMount as onMount5,onCleanup as onCleanup14,onMount as onMount6,For as For11,createSignal as createSignal17,createSignal as createSignal18,Show as Show7,createSignal as createSignal20,createSignal as createSignal19,onCleanup as onCleanup15,For as For12,Show as Show10,createMemo as createMemo11,createComputed,createMemo as createMemo10,createSignal as createSignal21,untrack as untrack3,Show as Show8,createComputed as createComputed2,untrack as untrack4,Show as Show9,createEffect as createEffect12,createSignal as createSignal22,createMemo as createMemo13,createSignal as createSignal24,createMemo as createMemo12,For as For13,Show as Show14,Show as Show11,Show as Show12,Show as Show13,createSignal as createSignal23,onCleanup as onCleanup16,For as For14,Show as Show16,createMemo as createMemo15,Show as Show15,createMemo as createMemo14,createSignal as createSignal25,createEffect as createEffect13,onCleanup as onCleanup17,For as For19,Match,Switch,createMemo as createMemo19,onCleanup as onCleanup21,For as For15,Show as Show17,createSignal as createSignal26,createEffect as createEffect14,createMemo as createMemo16,onCleanup as onCleanup18,untrack as untrack5,For as For17,Show as Show20,createEffect as createEffect15,createMemo as createMemo17,createSignal as createSignal27,onCleanup as onCleanup19,untrack as untrack6,For as For16,Show as Show19,Show as Show18,Show as Show24,createEffect as createEffect16,createMemo as createMemo18,createSignal as createSignal28,onCleanup as onCleanup20,untrack as untrack7,For as For18,Show as Show22,Show as Show21,Show as Show23,createEffect as createEffect17,createMemo as createMemo20,onCleanup as onCleanup22,untrack as untrack8,Show as Show25,createMemo as createMemo21,onCleanup as onCleanup23,createSignal as createSignal29,onCleanup as onCleanup24,onMount as onMount7} from "solid-js"
 var SIDEBAR_SECTIONS=["todo","subagents","skills","quick_actions","lsp","mcp"]
 var QUICK_ACTION_IDS=["session.rename","session.timeline","session.copy","session.export","session.compact","session.list","session.new","session.fork","messages.copy","session.first","session.last","session.messages_last_user","session.message.next","session.message.previous","permission.mode"]
 function preferencesScope(path){return path.worktree||path.directory||"global"
@@ -189,6 +189,23 @@ function mcpToggleAction2(status){if(status==="pending")
 return
 return status==="connected"?"disconnect":"connect"
 }
+var BUCKET_RANK={Favorites:0,Ungrouped:2}
+function mcpGroupToggleAction(items){if(items.some((item)=>mcpToggleAction2(item.status)==="connect"))
+return "connect"
+return items.some((item)=>mcpToggleAction2(item.status)==="disconnect")?"disconnect":undefined
+}
+function buildMcpGroupedView(items,favorites,assignments){return items.map((item)=>({...item,assignedGroup:assignments[item.name],bucket:favorites.has(item.name)?"Favorites":assignments[item.name]??"Ungrouped"
+})).sort((left,right)=>{const leftRank=BUCKET_RANK[left.bucket]??1
+const rightRank=BUCKET_RANK[right.bucket]??1
+return leftRank-rightRank||left.bucket.localeCompare(right.bucket)||left.name.localeCompare(right.name)
+})
+}
+function bulkDescription(operation,action){if(operation.action==="preset")
+return `apply ${operation.preset} MCP preset`
+if(operation.group)
+return `${action} ${operation.group} MCP group`
+return `${action} all MCP servers`
+}
 function matchingMcpPreset(items,presets){if(items.length===0)
 return
 return Object.keys(presets).sort((left,right)=>left.localeCompare(right)).find((name)=>{const states=presets[name]
@@ -377,8 +394,7 @@ const failed=[]
 const retry=[]
 await Promise.all(changes.map(async ({name,action})=>{if(operation.action!=="preset")
 save(current,name,action==="disconnect")
-try{const description=operation.action==="preset"?`apply ${operation.preset} MCP preset`:`${action} all MCP servers`
-await changeServer(current,name,action,description,false)
+try{await changeServer(current,name,action,bulkDescription(operation,action),false)
 } catch(error){if(!isAbortError(error)){failed.push(name)
 retry.push({name,action})
 }} finally{setBulkStates((values)=>{if(bulkGenerations.get(current.key)!==generation)
@@ -396,7 +412,9 @@ await refresh(current,true).catch(()=>{})
 failed.sort((left,right)=>left.localeCompare(right))
 setBulkStates((values)=>({...values,[current.key]:{...operation,status:failed.length>0?"error":"ready",completed:changes.length,total:changes.length,failed
 }}))
-if(failed.length>0&&activeTarget===current.key){const action=operation.action==="preset"?`apply ${operation.preset}`:operation.action
+if(failed.length>0&&activeTarget===current.key){let action=operation.action==="preset"?`apply ${operation.preset}`:operation.action
+if(operation.group)
+action += ` ${operation.group}`
 api.ui.toast({variant:"warning",title:"MCP servers",message:`Could not ${action}: ${failed.join(", ")}`,duration:4000
 })
 }}
@@ -445,19 +463,25 @@ return changeMany({action:"connect"},list(current).filter((item)=>mcpToggleActio
 return
 resetSelectedPreset(current)
 return changeMany({action:"disconnect"},list(current).filter((item)=>mcpToggleAction2(item.status)==="disconnect").map((item)=>({name:item.name,action:"disconnect"})),current)
+},toggleGroup(group,names,current=target()){if(target().key!==current.key||mutating(current)||bulkState(current).status==="running")
+return
+const selected=new Set(names)
+const items=list(current).filter((item)=>selected.has(item.name))
+const action=mcpGroupToggleAction(items)
+if(!action)
+return
+resetSelectedPreset(current)
+if(action==="connect"){for(const item of items)
+if(item.status==="connected")
+save(current,item.name,false)
+}
+return changeMany({action,group},items.filter((item)=>mcpToggleAction2(item.status)===action).map((item)=>({name:item.name,action})),current)
 },retryBulk(current=target()){const state=bulkState(current)
 if(state.status!=="error"||state.failed.length===0)
 return
 const changes=bulkRetries.get(current.key)??[]
-return changeMany({action:state.action,...state.preset&&{preset:state.preset}},changes,current)
+return changeMany({action:state.action,...state.preset&&{preset:state.preset},...state.group&&{group:state.group}},changes,current)
 }}}
-var BUCKET_RANK={Favorites:0,Ungrouped:2}
-function buildMcpGroupedView(items,favorites,assignments){return items.map((item)=>({...item,assignedGroup:assignments[item.name],bucket:favorites.has(item.name)?"Favorites":assignments[item.name]??"Ungrouped"
-})).sort((left,right)=>{const leftRank=BUCKET_RANK[left.bucket]??1
-const rightRank=BUCKET_RANK[right.bucket]??1
-return leftRank-rightRank||left.bucket.localeCompare(right.bucket)||left.name.localeCompare(right.name)
-})
-}
 
 
 
@@ -1036,6 +1060,17 @@ function McpErrorDialog(props){return _$createComponent(PresetMenu,{get api(){re
 },onSelect:()=>{}})
 }
 
+function assignGroup(groups,key,value){const next={...groups}
+if(!key)
+return next
+const group=value?.trim().slice(0,64)
+if(!group){delete next[key]
+return next
+}
+const canonical=Object.values(next).find((item)=>item.toLocaleLowerCase()===group.toLocaleLowerCase())
+next[key]=canonical??group
+return next
+}
 var PORTABLE_SETTINGS_FORMAT="opencode-navigator/settings"
 function object(value,path){if(!value||typeof value!=="object"||Array.isArray(value))
 throw new Error(`${path} must be an object`)
@@ -1178,6 +1213,7 @@ return Object.fromEntries(Object.entries(input).flatMap(([server,rawGroup])=>{co
 return server.trim()&&group?[[server,group]]:[]
 }))
 }
+var parseSkillGroups=parseMcpServerGroups
 function parseWorkspaceProfiles(value){return Object.fromEntries(Object.entries(record(value)??{}).flatMap(([layout,rawMcp])=>{const layoutName=layout.trim().slice(0,64)
 const mcpName=typeof rawMcp==="string"?rawMcp.trim().slice(0,64):""
 return layoutName&&mcpName?[[layoutName,mcpName]]:[]
@@ -1211,11 +1247,12 @@ const favoriteQuickActions=parseFavoriteQuickActions(userInput?.favoriteQuickAct
 const recentSkills=parseRecentSkills(userInput?.recentSkills)
 const recentQuickActions=parseRecentQuickActions(userInput?.recentQuickActions)
 const mcpServerGroups=parseMcpServerGroups(userInput?.mcpServerGroups)
+const skillGroups=parseSkillGroups(userInput?.skillGroups)
 const workspaceProfiles=parseWorkspaceProfiles(userInput?.workspaceProfiles)
 return{global:{...Object.keys(behavior).length>0&&{behavior},...layout&&{layout},...Object.keys(globalMcp).length>0&&{mcp:globalMcp}},worktrees,user:{...skippedSkillConfirmations&&{skippedSkillConfirmations},...typeof userInput?.onboardingCompleted==="boolean"&&{onboardingCompleted:userInput.onboardingCompleted
 },...typeof userInput?.lastNavigatorVersion==="string"&&{lastNavigatorVersion:userInput.lastNavigatorVersion
 },...typeof userInput?.previousNavigatorVersion==="string"&&{previousNavigatorVersion:userInput.previousNavigatorVersion
-},...Object.keys(layoutPresets).length>0&&{layoutPresets},...Object.keys(mcpPresets).length>0&&{mcpPresets},...favoriteSkills&&{favoriteSkills},...favoriteMcpServers?.length&&{favoriteMcpServers},...favoriteQuickActions.length>0&&{favoriteQuickActions},...recentSkills.length>0&&{recentSkills},...recentQuickActions.length>0&&{recentQuickActions},...Object.keys(mcpServerGroups).length>0&&{mcpServerGroups},...Object.keys(workspaceProfiles).length>0&&{workspaceProfiles}}}}
+},...Object.keys(layoutPresets).length>0&&{layoutPresets},...Object.keys(mcpPresets).length>0&&{mcpPresets},...favoriteSkills&&{favoriteSkills},...favoriteMcpServers?.length&&{favoriteMcpServers},...favoriteQuickActions.length>0&&{favoriteQuickActions},...recentSkills.length>0&&{recentSkills},...recentQuickActions.length>0&&{recentQuickActions},...Object.keys(mcpServerGroups).length>0&&{mcpServerGroups},...Object.keys(skillGroups).length>0&&{skillGroups},...Object.keys(workspaceProfiles).length>0&&{workspaceProfiles}}}}
 function parseValues(value){if(!value)
 return{}
 return{behavior:parsePluginSettings(value.behavior),layout:{sections:parseSectionPreferences(value.layout?.sections),expanded:parseSectionPreferences(value.layout?.expanded),...parseSectionOrder(value.layout?.order)&&{order:parseSectionOrder(value.layout?.order)}},desiredMcpStates:parseDesiredMcpStates(value.desiredMcpStates)
@@ -1360,14 +1397,8 @@ favoriteQuickActions.delete(quickActionFavorite.id)
 }
 const recentSkills=parseRecentSkills([...update.user?.recentSkill?[update.user.recentSkill]:[],...current.user.recentSkills??[]])
 const recentQuickActions=parseRecentQuickActions([...update.user?.recentQuickAction?[update.user.recentQuickAction]:[],...current.user.recentQuickActions??[]])
-const mcpServerGroups={...current.user.mcpServerGroups}
-const groupUpdate=update.user?.mcpServerGroup
-if(groupUpdate?.name){const group=groupUpdate.group?.trim().slice(0,64)
-if(group){const canonical=Object.values(mcpServerGroups).find((value)=>value.toLocaleLowerCase()===group.toLocaleLowerCase())
-mcpServerGroups[groupUpdate.name]=canonical??group
-} else
-delete mcpServerGroups[groupUpdate.name]
-}
+const mcpServerGroups=assignGroup(current.user.mcpServerGroups,update.user?.mcpServerGroup?.name,update.user?.mcpServerGroup?.group)
+const skillGroups=assignGroup(current.user.skillGroups,update.user?.skillGroup?.location,update.user?.skillGroup?.group)
 const favoriteSkills=update.user?.favoriteSkills?parseSkillConfirmations(update.user.favoriteSkills):[...current.user.favoriteSkills??[]]
 const favoriteSkill=update.user?.favoriteSkill
 if(favoriteSkill?.location){const index=favoriteSkills.indexOf(favoriteSkill.location)
@@ -1383,7 +1414,7 @@ return{global:target.kind==="global"?scope:current.global,worktrees,user:{...ski
 },...(update.user?.previousNavigatorVersion??current.user.previousNavigatorVersion)&&{previousNavigatorVersion:update.user?.previousNavigatorVersion??current.user.previousNavigatorVersion
 },...Object.keys(parsedLayoutPresets).length>0&&{layoutPresets:parsedLayoutPresets},...Object.keys(parsedMcpPresets).length>0&&{mcpPresets:parsedMcpPresets},...Object.keys(workspaceProfiles).length>0&&{workspaceProfiles:parseWorkspaceProfiles(workspaceProfiles)
 },...favoriteSkills.length>0&&{favoriteSkills},...favoriteMcpServers.size>0&&{favoriteMcpServers:[...favoriteMcpServers].sort()},...favoriteQuickActions.size>0&&{favoriteQuickActions:parseFavoriteQuickActions([...favoriteQuickActions])
-},...recentSkills.length>0&&{recentSkills},...recentQuickActions.length>0&&{recentQuickActions},...Object.keys(mcpServerGroups).length>0&&{mcpServerGroups:parseMcpServerGroups(mcpServerGroups)}}}}
+},...recentSkills.length>0&&{recentSkills},...recentQuickActions.length>0&&{recentQuickActions},...Object.keys(mcpServerGroups).length>0&&{mcpServerGroups:parseMcpServerGroups(mcpServerGroups)},...Object.keys(skillGroups).length>0&&{skillGroups:parseSkillGroups(skillGroups)}}}}
 function targetForLegacyScope(scope){return scope==="global"?{kind:"global"}:{kind:"worktree",key:scope}}
 function createPreferencesStore(stateDirectory){const directory=join(stateDirectory,LEGACY_PLUGIN_ID)
 const file=join(directory,"preferences.json")
@@ -1551,6 +1582,7 @@ const [favoriteQuickActions,setFavoriteQuickActions]=createSignal4(new Set)
 const [recentSkills,setRecentSkills]=createSignal4([])
 const [recentQuickActions,setRecentQuickActions]=createSignal4([])
 const [mcpServerGroups,setMcpServerGroups]=createSignal4(configured.mcpServerGroups??{})
+const [skillGroups,setSkillGroups]=createSignal4({})
 const [ready,setReady]=createSignal4(false)
 const [revision,setRevision]=createSignal4(0)
 const sessionLayouts=new Map
@@ -1560,6 +1592,8 @@ let isHydrated=false
 let hydration
 let mcpPresetRevision=0
 let mcpPresetReconciliation=Promise.resolve()
+let updateRevision=0
+let reloading
 let isPersistenceWarningShown=false
 function skillKey(skill){return skill.location
 }
@@ -1597,13 +1631,29 @@ return{...configured.workspaceProfiles,...document.user.workspaceProfiles}}
 function scopeSnapshot(target=selectedTarget()){const scope=target.kind==="global"?document.global:document.worktrees[target.key]
 return JSON.stringify({layout:scope?.layout,mcp:scope?.mcp})
 }
-function update(change){document=applyPreferencesUpdate(document,change)
+function update(change){updateRevision++
+document=applyPreferencesUpdate(document,change)
 if(isHydrated)
 persist(store.update(change))
 else
 pendingUpdates.push(change)
 refreshResolved()
 }
+function applyDocument(value){document=value
+setSkippedSkills(new Set(value.user.skippedSkillConfirmations))
+setOnboardingCompleted(value.user.onboardingCompleted===true)
+setLayoutPresets({...configured.layoutPresets,...value.user.layoutPresets})
+setMcpPresets({...configured.mcpPresets,...value.user.mcpPresets})
+setFavoriteSkills(new Set(value.user.favoriteSkills))
+setFavoriteMcpServers(new Set(value.user.favoriteMcpServers))
+setFavoriteQuickActions(new Set(value.user.favoriteQuickActions))
+setRecentSkills(value.user.recentSkills??[])
+setRecentQuickActions(value.user.recentQuickActions??[])
+setMcpServerGroups({...configured.mcpServerGroups,...value.user.mcpServerGroups})
+setSkillGroups(value.user.skillGroups??{})
+setReady(true)
+refreshResolved()
+}
 function load(){if(isHydrated)
 return Promise.resolve()
 if(hydration)
@@ -1618,21 +1668,28 @@ const queued=[...pendingUpdates]
 pendingUpdates.length=0
 for(const change of queued)
 persist(store.update(change))
-setSkippedSkills(new Set(document.user.skippedSkillConfirmations))
-setOnboardingCompleted(document.user.onboardingCompleted===true)
-setLayoutPresets({...configured.layoutPresets,...document.user.layoutPresets})
-setMcpPresets({...configured.mcpPresets,...document.user.mcpPresets})
-setFavoriteSkills(new Set(document.user.favoriteSkills))
-setFavoriteMcpServers(new Set(document.user.favoriteMcpServers))
-setFavoriteQuickActions(new Set(document.user.favoriteQuickActions))
-setRecentSkills(document.user.recentSkills??[])
-setRecentQuickActions(document.user.recentQuickActions??[])
-setMcpServerGroups({...configured.mcpServerGroups,...document.user.mcpServerGroups})
-setReady(true)
-refreshResolved()
+applyDocument(document)
 })
 return hydration
 }
+async function reloadFromFile(){if(reloading)
+return reloading
+const request=(async ()=>{await load()
+while(true){const observedRevision=updateRevision
+await store.flush()
+await mcpPresetReconciliation
+const latest=await store.load()
+if(observedRevision!==updateRevision)
+continue
+sessionLayouts.clear()
+applyDocument(latest)
+return
+}})()
+reloading=request
+try{await request
+} finally{if(reloading===request)
+reloading=undefined
+}}
 function setKey(value,name){load()
 const next=value.trim()
 if(!validKey(next))
@@ -1698,6 +1755,14 @@ next.add(key)
 setFavoriteSkills(next)
 update({user:{favoriteSkill:{location:key,favorite:next.has(key)}}})
 }
+function changeSkillGroup(location,value){if(!location)
+return
+if(!isHydrated){load().then(()=>changeSkillGroup(location,value))
+return
+}
+setSkillGroups(assignGroup(skillGroups(),location,value))
+update({user:{skillGroup:{location,group:value}}})
+}
 function toggleFavoriteMcpServer(name){if(!isHydrated){load().then(()=>toggleFavoriteMcpServer(name))
 return
 }
@@ -1755,6 +1820,7 @@ const target=selectedTarget()
 if(preview.target!==targetKey(target))
 throw new Error("Preference scope changed; reopen the import preview")
 const change={target,expectedScope:preview.expectedScope,...preview.settings.layout&&{layout:preview.settings.layout,clearLayout:true},...preview.settings.mcp&&{mcp:{states:preview.settings.mcp},clearMcp:true}}
+updateRevision++
 await store.update(change)
 document=await store.load()
 sessionLayouts.delete(targetKey(target))
@@ -1765,15 +1831,9 @@ throw new Error("Layout preset no longer exists")
 if(mcp&&!mcpPresets()[mcp])
 throw new Error("MCP preset no longer exists")
 update({user:{workspaceProfile:{layout,mcp}}})
-},favoriteSkills,favoriteMcpServers,favoriteQuickActions,toggleFavoriteMcpServer,toggleFavoriteQuickAction,recentSkills,recentQuickActions,mcpServerGroups,setMcpServerGroup(name,value){const group=value?.trim().slice(0,64)
-const next={...mcpServerGroups()}
-if(group){const canonical=Object.values(next).find((item)=>item.toLocaleLowerCase()===group.toLocaleLowerCase())
-next[name]=canonical??group
-} else
-delete next[name]
-setMcpServerGroups(next)
-update({user:{mcpServerGroup:{name,group}}})
-},async recordSkillUse(skill){await load()
+},favoriteSkills,favoriteMcpServers,favoriteQuickActions,toggleFavoriteMcpServer,toggleFavoriteQuickAction,recentSkills,recentQuickActions,mcpServerGroups,setMcpServerGroup(name,value){setMcpServerGroups(assignGroup(mcpServerGroups(),name,value))
+update({user:{mcpServerGroup:{name,group:value}}})
+},skillGroups,setSkillGroup:changeSkillGroup,async recordSkillUse(skill){await load()
 if(!skill.location)
 return
 setRecentSkills(parseRecentSkills([skill.location,...recentSkills()]))
@@ -1795,7 +1855,7 @@ setRevision((value)=>value + 1)
 },async flush(){await hydration
 await store.flush()
 await mcpPresetReconciliation
-},async claimNavigatorUpgrade(version){await load()
+},reloadFromFile,async claimNavigatorUpgrade(version){await load()
 const previous=document.user.lastNavigatorVersion
 if(previous===version)
 return
@@ -1904,6 +1964,7 @@ return true
 },async saveLayoutAsDefault(){await load()
 const target=selectedTarget()
 const layout=resolveTarget(target).layout
+updateRevision++
 document=applyPreferencesUpdate(document,{target,layout})
 await store.update({target,layout})
 refreshResolved()
@@ -2063,6 +2124,12 @@ return result.data
 throw error_
 } finally{request.finish()
 }}}}
+var BUCKET_RANK2={Favorites:0,Ungrouped:2}
+function buildSkillGroupedView(items,favorites,groups,recent){return items.map((item)=>({...item,assignedGroup:groups[item.location],bucket:favorites.has(item.location)?"Favorites":groups[item.location]??"Ungrouped"
+})).sort((left,right)=>{const rank=(BUCKET_RANK2[left.bucket]??1)-(BUCKET_RANK2[right.bucket]??1)
+return rank||left.bucket.localeCompare(right.bucket)||(left.bucket==="Favorites"?0:(recent.get(left.location)??Infinity)-(recent.get(right.location)??Infinity))||left.name.localeCompare(right.name)
+})
+}
 
 
 
@@ -2738,7 +2805,7 @@ return{groups,rows:groups.flatMap((group)=>group.items.map((item)=>({item,group:
 
 function KeyboardHelpDialog(props){const icons=useIcons()
 const theme=()=>props.api.theme.current
-const hints=()=>[`${icons.key("up")}/k and ${icons.key("down")}/j move \xB7 ${icons.key("enter")} activates`,`${icons.key("enter")} on a filter starts typing \xB7 ${icons.key("esc")} returns`,`Todo: ${icons.key("enter")} on All / Active / Finished changes the view`,"Show all / Show less expands or limits the filtered list",`Skills: ${icons.icon("info")} opens source \xB7 ${icons.icon("recent")} marks recent skills`,"Navigator Settings: Ctrl+,",`Search Everything: shortcut in Settings ${icons.icon("right")} Behavior`,`Search: type \xB7 ${icons.key("up/down")} results \xB7 ${icons.key("tab/shift+tab")} tabs \xB7 ${icons.key("enter")} run`,`${icons.key("esc")} leaves the sidebar \xB7 ${icons.key("?")} opens this help`]
+const hints=()=>[`${icons.key("up")}/k and ${icons.key("down")}/j move \xB7 ${icons.key("enter")} activates`,`${icons.key("enter")} on a filter starts typing \xB7 ${icons.key("esc")} returns`,`Todo: ${icons.key("enter")} on All / Active / Finished changes the view`,`MCP: ${icons.key("enter")} toggles a group`,"Show all / Show less expands or limits the filtered list",`Skills: ${icons.icon("info")} opens source \xB7 ${icons.icon("recent")} marks recent skills`,"Navigator Settings: Ctrl+,",`Search Everything: shortcut in Settings ${icons.icon("right")} Behavior`,`Search: type \xB7 ${icons.key("up/down")} results \xB7 ${icons.key("tab/shift+tab")} tabs \xB7 ${icons.key("enter")} run`,`${icons.key("esc")} leaves the sidebar \xB7 ${icons.key("?")} opens this help`]
 return _$createComponent(DialogSurface,{get api(){return props.api
 },get children(){return [(()=>{var _el$=_$createElement("text"),_el$2=_$createTextNode(` Navigator keyboard help`)
 _$insertNode(_el$,_el$2)
@@ -2806,7 +2873,7 @@ return{sessionID,location,key:JSON.stringify([route.name,sessionID??null,locatio
 function buildSearchCandidates(input){const recent=new Map(input.recentSkills.map((location,index)=>[location,index]))
 const skills=[...input.skills].sort((a,b)=>Number(input.favoriteSkills.has(b.location))-Number(input.favoriteSkills.has(a.location))||(recent.get(a.location)??Infinity)-(recent.get(b.location)??Infinity)||a.name.localeCompare(b.name))
 const mcp=[...input.mcp].sort((a,b)=>Number(input.favoriteMcp.has(b.name))-Number(input.favoriteMcp.has(a.name))||a.name.localeCompare(b.name))
-const results=[...skills.map((skill)=>({id:`skill:${skill.location || skill.name}`,group:"Skills",title:skill.name,description:skill.description?.trim()||skill.location,keywords:skill.location,skill
+const results=[...skills.map((skill)=>({id:`skill:${skill.location || skill.name}`,group:"Skills",title:skill.name,description:[input.skillGroups?.[skill.location],skill.description?.trim()||skill.location].filter(Boolean).join(" \xB7 "),keywords:`${skill.location} ${input.skillGroups?.[skill.location] ?? ""}`,skill
 })),...input.subagents.map((item)=>({id:`subagent:${item.session.id}`,group:"Subagents",title:item.session.title,description:[item.run?.outcome??item.status.type,item.run?.errorMessage].filter(Boolean).join(" \xB7 "),keywords:item.session.id,sessionID:item.session.id
 })),...mcp.map((item)=>({id:`mcp:${item.name}`,group:"MCP",title:item.name,description:[input.mcpGroups?.[item.name],mcpToggleAction2(item.status)==="disconnect"?"Disconnect":"Connect",item.status,item.error].filter(Boolean).join(" \xB7 "),keywords:input.mcpGroups?.[item.name],disabled:input.mcpBusy||!mcpToggleAction2(item.status)?"MCP operation in progress":undefined,server:item.name
 })),...orderQuickActionIds(input.actionOrder,input.favoriteQuickActions??new Set).flatMap((id)=>{const action=QUICK_ACTIONS.find((item)=>item.command===id)
@@ -2889,7 +2956,7 @@ let isDisposed=false
 let refreshGeneration=0
 const sameContext=()=>searchContext(props.api).key===context.key
 const candidates=createMemo(()=>{commandRevision()
-return buildSearchCandidates({skills:props.skills.list(skillTarget),subagents:context.sessionID?buildSubagentView(props.subagents.list(context.sessionID),props.subagents.recent(context.sessionID)):[],mcp:props.mcp.list(mcpTarget),actionOrder:props.preferences.quickActionOrder?.()??QUICK_ACTION_IDS,favoriteQuickActions:props.preferences.favoriteQuickActions?.()??new Set,favoriteSkills:props.preferences.favoriteSkills(),recentSkills:props.preferences.recentSkills(),favoriteMcp:props.preferences.favoriteMcpServers(),mcpGroups:props.preferences.mcpServerGroups?.()??{},hasSession:Boolean(context.sessionID),mcpBusy:props.mcp.mutating(mcpTarget)||props.mcp.bulkState(mcpTarget).status==="running",actionDisabledReason:(action)=>quickActionDisabledReason(props.api,action),actionLabel:(action)=>quickActionLabel(props.api,action)
+return buildSearchCandidates({skills:props.skills.list(skillTarget),subagents:context.sessionID?buildSubagentView(props.subagents.list(context.sessionID),props.subagents.recent(context.sessionID)):[],mcp:props.mcp.list(mcpTarget),actionOrder:props.preferences.quickActionOrder?.()??QUICK_ACTION_IDS,favoriteQuickActions:props.preferences.favoriteQuickActions?.()??new Set,favoriteSkills:props.preferences.favoriteSkills(),skillGroups:props.preferences.skillGroups?.()??{},recentSkills:props.preferences.recentSkills(),favoriteMcp:props.preferences.favoriteMcpServers(),mcpGroups:props.preferences.mcpServerGroups?.()??{},hasSession:Boolean(context.sessionID),mcpBusy:props.mcp.mutating(mcpTarget)||props.mcp.bulkState(mcpTarget).status==="running",actionDisabledReason:(action)=>quickActionDisabledReason(props.api,action),actionLabel:(action)=>quickActionLabel(props.api,action)
 })
 })
 const matches=createMemo(()=>searchResults(candidates(),query()))
@@ -3942,42 +4009,7 @@ reportMcpApplyError(props.api,request)
 }
 
 
-function McpGroupAssignmentDialog(props){const dialogs=useDialogs(props.api)
-const options=()=>{const assigned=props.preferences.mcpServerGroups?.()[props.server]
-const groups=[...new Set(Object.values(props.preferences.mcpServerGroups?.()??{}))].sort((a,b)=>a.localeCompare(b))
-return [...groups.map((group)=>({title:group,value:`:${group}`,description:group===assigned?"Current":"Existing group"
-})),{title:"Create new group",value:"+",description:"Type a name"
-},{title:"Ungrouped",value:":",description:assigned?"Remove assignment":"No group"
-}]
-}
-return _$createComponent(PresetMenu,{get api(){return props.api
-},get title(){return `Group for ${props.server}`
-},get options(){return options()
-},onSelect:(option)=>{if(option.value!=="+"){props.preferences.setMcpServerGroup?.(props.server,option.value.slice(1)||undefined)
-dialogs.back()
-return
-}
-dialogs.prompt({title:`New group for ${props.server}`,value:"",onConfirm(value){if(!value.trim())
-throw new Error("Group name is required")
-props.preferences.setMcpServerGroup?.(props.server,value)
-dialogs.back()
-dialogs.back()
-}})
-}})
-}
-function McpGroupsDialog(props){const dialogs=useDialogs(props.api)
-const options=()=>{const live=new Set(props.mcp.list(props.mcp.target()).map((item)=>item.name))
-return [...new Set([...live,...Object.keys(props.preferences.mcpServerGroups?.()??{})])].sort((a,b)=>a.localeCompare(b)).map((name)=>({title:name,value:name,description:[props.preferences.mcpServerGroups?.()[name]??"Ungrouped",!live.has(name)&&"not in workspace"].filter(Boolean).join(" \xB7 ")
-}))
-}
-return _$createComponent(PresetMenu,{get api(){return props.api
-},title:"MCP groups \xB7 user-wide",get options(){return options()
-},onSelect:(option)=>dialogs.open(()=>_$createComponent(McpGroupAssignmentDialog,{get api(){return props.api
-},get preferences(){return props.preferences
-},get server(){return option.value
-}}))
-})
-}
+
 
 
 
@@ -4054,139 +4086,8 @@ dialogs.open(()=>_$createComponent(PresetMenu,{api,title:"MCP presets",get optio
 
 
 
-function QuickActionsDialog(props){const order=props.preferences.selectedQuickActionOrder
-const dialogs=useDialogs(props.api)
-const scroll=useDialogScroll()
-const [selected,setSelected]=useDialogState("selection",order()[0])
-const actions=createMemo5(()=>order().map((id)=>({...QUICK_ACTIONS.find((action)=>action.command===id)
-})))
-const theme=()=>props.api.theme.current
-const icons=useIcons()
-const dimensions=useTerminalDimensions5()
-let body
-function move(offset){const index=order().indexOf(selected())
-setSelected(order()[(index + offset + order().length)%order().length])
-}
-const prefix=`${PLUGIN_ID}.quick-actions-settings`
-createEffect8(()=>{order()
-const id=selected()
-queueMicrotask(()=>{if(body&&!body.isDestroyed)
-body.scrollChildIntoView(`${prefix}.${id}`)
-})
-})
-const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,commands:[{name:`${prefix}.previous`,run:()=>move(-1)
-},{name:`${prefix}.next`,run:()=>move(1)
-},{name:`${prefix}.toggle`,run:()=>props.preferences.toggleQuickAction(selected())
-},{name:`${prefix}.up`,run:()=>props.preferences.moveQuickAction(selected(),-1)
-},{name:`${prefix}.down`,run:()=>props.preferences.moveQuickAction(selected(),1)
-},{name:`${prefix}.back`,run:dialogs.back
-}],bindings:[{key:"up",cmd:`${prefix}.previous`
-},{key:"down",cmd:`${prefix}.next`
-},{key:"return",cmd:`${prefix}.toggle`
-},{key:"space",cmd:`${prefix}.toggle`
-},{key:"left",cmd:`${prefix}.up`
-},{key:"right",cmd:`${prefix}.down`
-},{key:"shift+up",cmd:`${prefix}.up`
-},{key:"shift+down",cmd:`${prefix}.down`
-},{key:"escape",cmd:`${prefix}.back`
-}]
-})
-onCleanup10(unregister)
-return _$createComponent(DialogSurface,{get api(){return props.api
-},id:prefix,lift:true,get children(){return [(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` Quick actions`),_el$4=_$createElement("text"),_el$5=_$createTextNode(` Back (`),_el$6=_$createTextNode(`)`)
-_$insertNode(_el$,_el$2)
-_$insertNode(_el$,_el$4)
-_$setProp(_el$,"flexDirection","row")
-_$setProp(_el$,"justifyContent","space-between")
-_$insertNode(_el$2,_el$3)
-_$insert(_el$2,()=>icons.icon("actions"),_el$3)
-_$insertNode(_el$4,_el$5)
-_$insertNode(_el$4,_el$6)
-_$setProp(_el$4,"onMouseUp",(event)=>{event.stopPropagation()
-dialogs.back()
-})
-_$insert(_el$4,()=>icons.icon("left"),_el$5)
-_$insert(_el$4,()=>icons.key("esc"),_el$6)
-_$effect((_p$)=>{var _v$=TextAttributes14.BOLD,_v$2=theme().text,_v$3=theme().textMuted
-_v$!==_p$.e&&(_p$.e=_$setProp(_el$2,"attributes",_v$,_p$.e))
-_v$2!==_p$.t&&(_p$.t=_$setProp(_el$2,"fg",_v$2,_p$.t))
-_v$3!==_p$.a&&(_p$.a=_$setProp(_el$4,"fg",_v$3,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
-return _el$
-})(),(()=>{var _el$7=_$createElement("text"),_el$8=_$createTextNode(`Scope: `),_el$9=_$createTextNode(`. Changes save immediately.`)
-_$insertNode(_el$7,_el$8)
-_$insertNode(_el$7,_el$9)
-_$setProp(_el$7,"wrapMode","word")
-_$insert(_el$7,()=>props.preferences.preferenceScopeLabel(),_el$9)
-_$effect((_$p)=>_$setProp(_el$7,"fg",theme().textMuted,_$p))
-return _el$7
-})(),(()=>{var _el$0=_$createElement("scrollbox"),_el$1=_$createElement("box")
-_$insertNode(_el$0,_el$1)
-_$use((node)=>{body=node
-scroll.ref(node)
-},_el$0)
-_$setProp(_el$0,"scrollX",false)
-_$setProp(_el$1,"gap",1)
-_$insert(_el$1,_$createComponent(For9,{get each(){return actions()
-},children:(action,index)=>_$createComponent(SelectionBox,{get id(){return `${prefix}.${action.command}`
-},flexDirection:"row",gap:1,paddingLeft:1,paddingRight:1,get backgroundColor(){return _$memo(()=>selected()===action.command)()?theme().backgroundElement:undefined
-},onMouseOver:()=>setSelected(action.command),onMouseDown:()=>{setSelected(action.command)
-props.preferences.toggleQuickAction(action.command)
-},get children(){return [(()=>{var _el$16=_$createElement("text"),_el$17=_$createTextNode(` `),_el$18=_$createTextNode(`. `),_el$19=_$createTextNode(` `)
-_$insertNode(_el$16,_el$17)
-_$insertNode(_el$16,_el$18)
-_$insertNode(_el$16,_el$19)
-_$setProp(_el$16,"flexGrow",1)
-_$insert(_el$16,()=>icons.icon(props.preferences.selectedQuickActionVisible(action.command)?"checked":"unchecked"),_el$17)
-_$insert(_el$16,()=>index() + 1,_el$18)
-_$insert(_el$16,()=>icons.action(action.command),_el$19)
-_$insert(_el$16,()=>action.label,null)
-_$effect((_$p)=>_$setProp(_el$16,"fg",theme().text,_$p))
-return _el$16
-})(),(()=>{var _el$20=_$createElement("text")
-_$setProp(_el$20,"onMouseDown",(event)=>{event.stopPropagation()
-setSelected(action.command)
-props.preferences.moveQuickAction(action.command,-1)
-})
-_$insert(_el$20,()=>icons.icon("up"))
-_$effect((_$p)=>_$setProp(_el$20,"fg",theme().accent,_$p))
-return _el$20
-})(),(()=>{var _el$21=_$createElement("text")
-_$setProp(_el$21,"onMouseDown",(event)=>{event.stopPropagation()
-setSelected(action.command)
-props.preferences.moveQuickAction(action.command,1)
-})
-_$insert(_el$21,()=>icons.icon("down"))
-_$effect((_$p)=>_$setProp(_el$21,"fg",theme().accent,_$p))
-return _el$21
-})()]
-}})
-}))
-_$effect((_p$)=>{var{restore:_v$4,save:_v$5}=scroll,_v$6=Math.min(actions().length*2-1,Math.max(3,Math.floor(dimensions().height*0.75)-8))
-_v$4!==_p$.e&&(_p$.e=_$setProp(_el$0,"renderBefore",_v$4,_p$.e))
-_v$5!==_p$.t&&(_p$.t=_$setProp(_el$0,"renderAfter",_v$5,_p$.t))
-_v$6!==_p$.a&&(_p$.a=_$setProp(_el$0,"height",_v$6,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
-return _el$0
-})(),(()=>{var _el$10=_$createElement("text"),_el$11=_$createTextNode(` navigate \xB7 `),_el$12=_$createTextNode(` toggle \xB7 `),_el$13=_$createTextNode(` or `),_el$15=_$createTextNode(` reorder`)
-_$insertNode(_el$10,_el$11)
-_$insertNode(_el$10,_el$12)
-_$insertNode(_el$10,_el$13)
-_$insertNode(_el$10,_el$15)
-_$setProp(_el$10,"wrapMode","word")
-_$insert(_el$10,()=>icons.key("up/down"),_el$11)
-_$insert(_el$10,()=>icons.key("enter"),_el$12)
-_$insert(_el$10,()=>icons.key("left/right"),_el$13)
-_$insert(_el$10,()=>icons.key("shift+up/down"),_el$15)
-_$effect((_$p)=>_$setProp(_el$10,"fg",theme().textMuted,_$p))
-return _el$10
-})()]
-}})
-}
+
+
 
 
 
@@ -4265,7 +4166,7 @@ return [{title:`${icons.icon(title ? "checked" : "unchecked")} Session title`,va
 }]
 }
 function createSettingsGroups(api,preferences,icons){const supportedSections=()=>SIDEBAR_SECTIONS.filter((name)=>supportsSidebarSection(api,name))
-const groups=createMemo6(()=>[{id:"scope",tab:"Scope",title:"Preference scope",options:[{title:`${icons.icon(preferences.preferenceScope() === "global" ? "radioOn" : "radioOff")} Global`,value:"scope:global",description:"applies to every worktree"
+const groups=createMemo7(()=>[{id:"scope",tab:"Scope",title:"Preference scope",options:[{title:`${icons.icon(preferences.preferenceScope() === "global" ? "radioOn" : "radioOff")} Global`,value:"scope:global",description:"applies to every worktree"
 },{title:`${icons.icon(preferences.preferenceScope() === "worktree" ? "radioOn" : "radioOff")} Current worktree`,value:"scope:worktree",description:preferences.canUseWorktreeScope()?preferences.preferenceScopeLabel():"unavailable outside a worktree"
 }]
 },{id:"presets",tab:"Presets",title:"Layout presets",options:[...Object.keys(preferences.layoutPresets()).sort((left,right)=>left.localeCompare(right)).map((name)=>({title:`${icons.icon("presets")} ${name}`,value:`preset:custom:${encodeURIComponent(name)}`,description:preferences.workspaceProfiles?.()[name]?`profile \xB7 ${preferences.workspaceProfiles()[name]}`:"enter to apply or edit"
@@ -4286,6 +4187,7 @@ return{title:`${icons.icon(preferences.selectedSections()[section.name] ? "check
 },{id:"defaults",tab:"Defaults",title:"Defaults & help",options:[{title:`${icons.icon("save")} Save current layout as default`,value:"save_layout",description:`${supportedSections().filter((name) => preferences.selectedSections()[name]).length} visible \xB7 ${supportedSections().filter((name) => preferences.selectedExpanded()[name]).length} expanded`
 },{title:`${icons.icon("export")} Copy portable settings`,value:"export_settings",description:"versioned layout and MCP JSON"
 },{title:`${icons.icon("add")} Import portable settings\u2026`,value:"import_settings",description:"preview pasted JSON before applying"
+},{title:`${icons.icon("retry")} Reload settings from file`,value:"reload_settings",description:"sync saved changes from other OpenCode sessions"
 },{title:`${icons.icon("reset")} Restore configured layout`,value:"reset_sections",description:"visibility and expansion"
 },{title:`${icons.icon("reset")} Restore configured behavior`,value:"reset_settings",description:"startup, MCP memory, icons, shortcuts, limits, actions"
 },{title:`${icons.icon("reset")} Clear remembered MCP states`,value:"reset_mcp",description:`scope: ${preferences.preferenceScopeLabel()}`
@@ -4293,17 +4195,21 @@ return{title:`${icons.icon(preferences.selectedSections()[section.name] ? "check
 },{title:`${icons.icon("help")} Open quick setup guide`,value:"wizard",description:"tips and section settings"
 }]
 }])
-const orderedGroups=createMemo6(()=>["sections","scope","presets","behavior","defaults"].map((id)=>groups().find((group)=>group.id===id)))
+const orderedGroups=createMemo7(()=>["sections","scope","presets","behavior","defaults"].map((id)=>groups().find((group)=>group.id===id)))
 return orderedGroups
 }
-function registerSettingsKeymap(input){return input.api.keymap.registerLayer({mode:"modal",priority:1000,commands:[{name:`${PLUGIN_ID}.settings.previous`,run:()=>input.move(-1)},{name:`${PLUGIN_ID}.settings.next`,run:()=>input.move(1)},{name:`${PLUGIN_ID}.settings.select`,run:()=>input.select()},{name:`${PLUGIN_ID}.settings.mcp-groups`,run:()=>{if(input.activeGroup()==="sections"&&input.options()[input.active()]?.value==="mcp")
+function registerSettingsKeymap(input){return input.api.keymap.registerLayer({mode:"modal",priority:1000,commands:[{name:`${PLUGIN_ID}.settings.previous`,run:()=>input.move(-1)},{name:`${PLUGIN_ID}.settings.next`,run:()=>input.move(1)},{name:`${PLUGIN_ID}.settings.select`,run:()=>input.select()},{name:`${PLUGIN_ID}.settings.groups`,run:()=>{if(input.activeGroup()!=="sections")
+return
+if(input.options()[input.active()]?.value==="mcp")
 input.openMcpGroups()
+if(input.options()[input.active()]?.value==="skills")
+input.openSkillGroups()
 }},{name:`${PLUGIN_ID}.settings.quick-actions`,run:()=>{if(input.activeGroup()==="sections"&&input.options()[input.active()]?.value==="quick_actions")
 input.openQuickActions()
 }},{name:`${PLUGIN_ID}.settings.item-limit`,run:()=>{const section=input.options()[input.active()]?.value
 if(input.activeGroup()==="sections"&&SIDEBAR_SECTIONS.includes(section))
 input.openLimitPrompt(section)
-}},{name:`${PLUGIN_ID}.settings.previous-tab`,run:()=>input.switchGroup(-1)},{name:`${PLUGIN_ID}.settings.next-tab`,run:()=>input.switchGroup(1)},{name:`${PLUGIN_ID}.settings.move-up`,run:()=>input.reorder(input.options()[input.active()]?.value,-1)},{name:`${PLUGIN_ID}.settings.move-down`,run:()=>input.reorder(input.options()[input.active()]?.value,1)}],bindings:[{key:"up",cmd:`${PLUGIN_ID}.settings.previous`},{key:"down",cmd:`${PLUGIN_ID}.settings.next`},{key:"tab",cmd:`${PLUGIN_ID}.settings.next-tab`},{key:"shift+tab",cmd:`${PLUGIN_ID}.settings.previous-tab`},{key:"space",cmd:`${PLUGIN_ID}.settings.select`},{key:"return",cmd:`${PLUGIN_ID}.settings.select`},{key:"l",cmd:`${PLUGIN_ID}.settings.item-limit`},{key:"a",cmd:`${PLUGIN_ID}.settings.quick-actions`},{key:"g",cmd:`${PLUGIN_ID}.settings.mcp-groups`},{key:"left",cmd:`${PLUGIN_ID}.settings.move-up`},{key:"right",cmd:`${PLUGIN_ID}.settings.move-down`},{key:"shift+up",cmd:`${PLUGIN_ID}.settings.move-up`},{key:"shift+down",cmd:`${PLUGIN_ID}.settings.move-down`}]
+}},{name:`${PLUGIN_ID}.settings.previous-tab`,run:()=>input.switchGroup(-1)},{name:`${PLUGIN_ID}.settings.next-tab`,run:()=>input.switchGroup(1)},{name:`${PLUGIN_ID}.settings.move-up`,run:()=>input.reorder(input.options()[input.active()]?.value,-1)},{name:`${PLUGIN_ID}.settings.move-down`,run:()=>input.reorder(input.options()[input.active()]?.value,1)}],bindings:[{key:"up",cmd:`${PLUGIN_ID}.settings.previous`},{key:"down",cmd:`${PLUGIN_ID}.settings.next`},{key:"tab",cmd:`${PLUGIN_ID}.settings.next-tab`},{key:"shift+tab",cmd:`${PLUGIN_ID}.settings.previous-tab`},{key:"space",cmd:`${PLUGIN_ID}.settings.select`},{key:"return",cmd:`${PLUGIN_ID}.settings.select`},{key:"l",cmd:`${PLUGIN_ID}.settings.item-limit`},{key:"a",cmd:`${PLUGIN_ID}.settings.quick-actions`},{key:"g",cmd:`${PLUGIN_ID}.settings.groups`},{key:"left",cmd:`${PLUGIN_ID}.settings.move-up`},{key:"right",cmd:`${PLUGIN_ID}.settings.move-down`},{key:"shift+up",cmd:`${PLUGIN_ID}.settings.move-up`},{key:"shift+down",cmd:`${PLUGIN_ID}.settings.move-down`}]
 })
 }
 
@@ -4315,7 +4221,7 @@ input.openLimitPrompt(section)
 
 
 var RESET_ALL="__reset_all__"
-function TrustedSkillsDialog(props){const options=createMemo7(()=>{const locations=props.preferences.trustedSkillLocations()
+function TrustedSkillsDialog(props){const options=createMemo8(()=>{const locations=props.preferences.trustedSkillLocations()
 if(locations.length===0)
 return [{title:"Every skill requires confirmation",value:"empty",description:"No trusted skills",icon:"info"
 }]
@@ -4331,7 +4237,8 @@ else if(option.value!=="empty")
 props.preferences.revokeSkillConfirmation(option.value)
 }})
 }
-function createSettingsSelection(input){function openLimitPrompt(section){const index=input.options().findIndex((option)=>option.value===section)
+function createSettingsSelection(input){const dialogClosed=()=>("open" in input.api.ui.dialog)&&!input.api.ui.dialog.open
+function openLimitPrompt(section){const index=input.options().findIndex((option)=>option.value===section)
 if(index!==-1)
 input.setActive(index)
 input.dialogs.prompt({title:`${SECTION_DEFINITIONS.find((item) => item.name === section).label} item limit`,description:()=>(()=>{var _el$=_$createElement("text")
@@ -4418,6 +4325,11 @@ break
 case "import_settings":{importSettings()
 break
 }
+case "reload_settings":{input.preferences.reloadFromFile().then(()=>input.api.ui.toast({variant:"success",title:"Navigator settings",message:"Saved settings reloaded",duration:3000
+})).catch((error)=>input.api.ui.toast({variant:"error",title:"Navigator settings",message:error instanceof Error?error.message:"Could not reload saved settings",duration:5000
+}))
+break
+}
 case "reset_sections":{input.preferences.resetSections()
 break
 }
@@ -4470,19 +4382,51 @@ break
 default:{input.preferences.toggleSelectedSection(value)
 }}}
 function openQuickActions(){input.setActive(input.options().findIndex((option)=>option.value==="quick_actions"))
+const path=import.meta.url.includes("/dist/tui.js")?"./quick-actions-settings.js":"../ui/quick-actions-dialog"
+import(path).then((module)=>{if(dialogClosed())
+return
+const{QuickActionsDialog
+}=module
 input.dialogs.open(()=>_$createComponent(QuickActionsDialog,{get api(){return input.api
 },get preferences(){return input.preferences
 }}))
+}).catch((error)=>{input.api.ui.toast({variant:"error",title:"Quick actions",message:String(error),duration:4000
+})
+})
 }
 function openMcpGroups(){if(!input.mcp)
 return
 input.setActive(input.options().findIndex((option)=>option.value==="mcp"))
+const path=import.meta.url.includes("/dist/tui.js")?"./mcp-groups.js":"../ui/mcp-groups-dialog"
+import(path).then((module)=>{if(dialogClosed())
+return
+const{McpGroupsDialog
+}=module
 input.dialogs.open(()=>_$createComponent(McpGroupsDialog,{get api(){return input.api
 },get preferences(){return input.preferences
 },get mcp(){return input.mcp
 }}))
+}).catch((error)=>{input.api.ui.toast({variant:"error",title:"MCP groups",message:String(error),duration:4000
+})
+})
+}
+function openSkillGroups(){if(!input.skills)
+return
+input.setActive(input.options().findIndex((option)=>option.value==="skills"))
+const path=import.meta.url.includes("/dist/tui.js")?"./skill-groups.js":"../ui/skill-groups-dialog"
+import(path).then((module)=>{if(dialogClosed())
+return
+const{SkillGroupsDialog
+}=module
+input.dialogs.open(()=>_$createComponent(SkillGroupsDialog,{get api(){return input.api
+},get preferences(){return input.preferences
+},get skills(){return input.skills
+}}))
+}).catch((error)=>{input.api.ui.toast({variant:"error",title:"Skill groups",message:String(error),duration:4000
+})
+})
 }
-return{openLimitPrompt,openMcpGroups,openQuickActions,select
+return{openLimitPrompt,openMcpGroups,openSkillGroups,openQuickActions,select
 }}
 function createSettingsDialogController(props){let body
 const theme=()=>props.api.theme.current
@@ -4490,21 +4434,21 @@ const icons=useIcons()
 const dialogs=useDialogs(props.api)
 const scroll=useDialogScroll()
 const dimensions=useTerminalDimensions6()
-const bodyHeight=createMemo8(()=>Math.max(4,Math.floor(dimensions().height*0.75)-10))
+const bodyHeight=createMemo9(()=>Math.max(4,Math.floor(dimensions().height*0.75)-10))
 const orderedGroups=createSettingsGroups(props.api,props.preferences,icons)
 const initialGroup=orderedGroups().find((group)=>group.options.some((option)=>option.value===props.activeValue))
 const [activeGroup,setActiveGroup]=useDialogState("tab",initialGroup?.id??orderedGroups()[0].id)
-const options=createMemo8(()=>orderedGroups().find((group)=>group.id===activeGroup())?.options??[])
+const options=createMemo9(()=>orderedGroups().find((group)=>group.id===activeGroup())?.options??[])
 const optionId=(value)=>`${PLUGIN_ID}.settings.${value}`
 const initialActive=options().findIndex((option)=>option.value===props.activeValue)
 const [active,setActive]=useDialogState("selection",Math.max(0,initialActive))
-createEffect9(()=>{if(active()>=options().length)
+createEffect10(()=>{if(active()>=options().length)
 setActive(Math.max(0,options().length-1))
 })
-const contentHeight=createMemo8(()=>Math.min(bodyHeight(),Math.max(1,options().length*2-1)))
-const footerHint=createMemo8(()=>{const common=`${icons.key("tab")} switch \xB7 ${icons.key("up/down")} navigate`
+const contentHeight=createMemo9(()=>Math.min(bodyHeight(),Math.max(1,options().length*2-1)))
+const footerHint=createMemo9(()=>{const common=`${icons.key("tab")} switch \xB7 ${icons.key("up/down")} navigate`
 if(activeGroup()==="sections")
-return `${common} \xB7 ${icons.key("enter")} toggle \xB7 l item limit${options()[active()]?.value === "quick_actions" ? " \xB7 a actions" : ""}${options()[active()]?.value === "mcp" ? " \xB7 g groups" : ""} \xB7 ${icons.key("left/right")} or ${icons.key("shift+up/down")} reorder`
+return `${common} \xB7 ${icons.key("enter")} toggle \xB7 l item limit${options()[active()]?.value === "quick_actions" ? " \xB7 a actions" : ""}${["mcp", "skills"].includes(options()[active()]?.value ?? "") ? " \xB7 g groups" : ""} \xB7 ${icons.key("left/right")} or ${icons.key("shift+up/down")} reorder`
 if(activeGroup()==="presets")
 return `${common} \xB7 ${icons.key("enter")} manage`
 if(activeGroup()==="behavior")
@@ -4545,12 +4489,12 @@ body?.scrollChildIntoView(optionId(value))
 }
 const presetActions=createLayoutPresetActions({api:props.api,preferences:props.preferences,mcp:props.mcp,dialogs
 })
-const selection=createSettingsSelection({api:props.api,preferences:props.preferences,mcp:props.mcp,dialogs,options,active,setActive,openPreset:presetActions.open,promptPreset:presetActions.prompt
+const selection=createSettingsSelection({api:props.api,preferences:props.preferences,mcp:props.mcp,skills:props.skills,dialogs,options,active,setActive,openPreset:presetActions.open,promptPreset:presetActions.prompt
 })
-const unregister=registerSettingsKeymap({api:props.api,active,activeGroup,options,move,switchGroup,reorder,select:selection.select,openQuickActions:selection.openQuickActions,openMcpGroups:selection.openMcpGroups,openLimitPrompt:selection.openLimitPrompt
+const unregister=registerSettingsKeymap({api:props.api,active,activeGroup,options,move,switchGroup,reorder,select:selection.select,openQuickActions:selection.openQuickActions,openMcpGroups:selection.openMcpGroups,openSkillGroups:selection.openSkillGroups,openLimitPrompt:selection.openLimitPrompt
 })
 onCleanup11(unregister)
-return{active,activeGroup,contentHeight,dialogs,footerHint,icons,openLimitPrompt:selection.openLimitPrompt,openQuickActions:selection.openQuickActions,openMcpGroups:selection.openMcpGroups,options,optionId,orderedGroups,reorder,select:selection.select,setActive,setActiveGroup,setBody(node){body=node
+return{active,activeGroup,contentHeight,dialogs,footerHint,icons,openLimitPrompt:selection.openLimitPrompt,openQuickActions:selection.openQuickActions,openMcpGroups:selection.openMcpGroups,openSkillGroups:selection.openSkillGroups,options,optionId,orderedGroups,reorder,select:selection.select,setActive,setActiveGroup,setBody(node){body=node
 scroll.ref(node)
 },restoreScroll:scroll.restore,saveScroll:scroll.save,theme
 }}
@@ -4606,11 +4550,14 @@ _$insert(_el$4,()=>model.icons.icon("actions"),_el$5)
 _$effect((_$p)=>_$setProp(_el$4,"fg",model.theme().accent,_$p))
 return _el$4
 }}),_el$8)
-_$insert(_el$3,_$createComponent(Show6,{get when(){return props.option.value==="mcp"
+_$insert(_el$3,_$createComponent(Show6,{get when(){return props.option.value==="mcp"||props.option.value==="skills"
 },get children(){var _el$6=_$createElement("text"),_el$7=_$createTextNode(` Groups`)
 _$insertNode(_el$6,_el$7)
 _$setProp(_el$6,"onMouseDown",(event)=>event.stopPropagation())
 _$setProp(_el$6,"onMouseUp",(event)=>{event.stopPropagation()
+if(props.option.value==="skills")
+model.openSkillGroups()
+else
 model.openMcpGroups()
 })
 _$insert(_el$6,()=>model.icons.icon("sections"),_el$7)
@@ -4712,12 +4659,12 @@ return _el$0
 })()]
 }})
 }
-function openSettings(api,preferences,activeValue,mcp){createDialogStack(api,preferences.lspIconStyle,()=>true,preferences.cornerFont).open(()=>_$createComponent(SettingsDialog,{api,preferences,mcp,activeValue
+function openSettings(api,preferences,activeValue,mcp,skills){createDialogStack(api,preferences.lspIconStyle,()=>true,preferences.cornerFont).open(()=>_$createComponent(SettingsDialog,{api,preferences,mcp,skills,activeValue
 }),"xlarge")
 }
 
 
-function SettingsBinding(props){const unregister=props.api.keymap.registerLayer({mode:"base",commands:[{name:`${PLUGIN_ID}.settings`,title:"Navigator settings",category:"Navigator",namespace:"palette",enabled:()=>["home","session"].includes(props.api.route.current.name),run:()=>openSettings(props.api,props.preferences,undefined,props.mcp)
+function SettingsBinding(props){const unregister=props.api.keymap.registerLayer({mode:"base",commands:[{name:`${PLUGIN_ID}.settings`,title:"Navigator settings",category:"Navigator",namespace:"palette",enabled:()=>["home","session"].includes(props.api.route.current.name),run:()=>openSettings(props.api,props.preferences,undefined,props.mcp,props.skills)
 }],bindings:[{key:{name:",",ctrl:true
 },cmd:`${PLUGIN_ID}.settings`
 }]
@@ -4734,7 +4681,7 @@ const theme=()=>props.api.theme.current
 return _$createComponent(IconControl,{id:`${PLUGIN_ID}.settings.footer`,get icon(){return icons.icon("settings")
 },get foregroundColor(){return _$memo(()=>!!hovered())()?theme().text:theme().textMuted
 },get backgroundColor(){return _$memo(()=>!!hovered())()?theme().backgroundElement:theme().backgroundPanel
-},onMouseOver:()=>setHovered(true),onMouseOut:()=>setHovered(false),onMouseUp:()=>openSettings(props.api,props.preferences,undefined,props.mcp)
+},onMouseOver:()=>setHovered(true),onMouseOut:()=>setHovered(false),onMouseUp:()=>openSettings(props.api,props.preferences,undefined,props.mcp,props.skills)
 })
 }
 import {realpathSync} from "fs"
@@ -4800,7 +4747,7 @@ queueMicrotask(()=>void props.controller.start())
 })
 onCleanup13(unregister)
 } else
-createEffect10(()=>{if(!props.controller.enabled())
+createEffect11(()=>{if(!props.controller.enabled())
 return
 const unregister=props.api.keymap.registerLayer({mode:"global",priority:2001,commands:[{name:"session.new",title:"New session",category:"Session",namespace:"palette",enabled:props.controller.enabled,run:()=>void props.controller.start()
 }]
@@ -5449,16 +5396,16 @@ return _el$3
 function createListVisibility(options){const [expanded,setExpanded]=createSignal21(false)
 let previousKey
 let previousLimit
-const canToggle=createMemo9(()=>options.limit()>0&&options.items().length>options.limit())
+const canToggle=createMemo10(()=>options.limit()>0&&options.items().length>options.limit())
 createComputed(()=>{const key=options.resetKey()
 const limit=options.limit()
 const isToggle=canToggle()
 if(key!==previousKey||limit!==previousLimit||!isToggle)
-untrack2(()=>setExpanded(false))
+untrack3(()=>setExpanded(false))
 previousKey=key
 previousLimit=limit
 })
-const visible=createMemo9(()=>!canToggle()||expanded()?options.items():options.items().slice(0,options.limit()))
+const visible=createMemo10(()=>!canToggle()||expanded()?options.items():options.items().slice(0,options.limit()))
 return{visible,expanded,canToggle,hiddenCount:()=>options.items().length-visible().length,showAll:()=>setExpanded(canToggle()),showLess:()=>setExpanded(false)
 }}
 
@@ -5473,7 +5420,7 @@ return{visible,expanded,canToggle,hiddenCount:()=>options.items().length-visible
 function ListVisibilityControl(props){const icons=useIcons()
 const id=`${PLUGIN_ID}.list.${props.section}`
 createComputed2(()=>{const isVisible=props.visibility.canToggle()
-untrack3(()=>{if(!isVisible&&props.interaction?.selectedId()===id){props.interaction.select(`${PLUGIN_ID}.section.${props.section}`)
+untrack4(()=>{if(!isVisible&&props.interaction?.selectedId()===id){props.interaction.select(`${PLUGIN_ID}.section.${props.section}`)
 }})
 })
 const item=useSidebarItem(props.api,props.interaction,{id,position:()=>({section:props.navigationSection,row:props.row,column:0
@@ -5537,7 +5484,7 @@ const item=useSidebarItem(props.api,props.interaction,{id:props.sectionId??`sect
 const action=props.headerAction?useSidebarItem(props.api,props.interaction,{id:props.headerAction.id,position:()=>({section:props.navigationSection??0,row:0,column:1
 }),disabled:props.headerAction.disabled,activate:props.headerAction.onActivate
 },()=>theme().accent,"control"):undefined
-createEffect11(()=>{props.headerAction?.label()
+createEffect12(()=>{props.headerAction?.label()
 setActionWidth(undefined)
 })
 const actionLabel=()=>{const label=props.headerAction?.label()??""
@@ -5614,11 +5561,11 @@ return _el$
 })()
 }
 var SectionWithHeaderAction=Section;
-function LspSection(props){const list=createMemo10(()=>[...props.api.state.lsp()].sort((a,b)=>Number(b.status==="error")-Number(a.status==="error")||a.id.localeCompare(b.id)||a.root.localeCompare(b.root)))
+function LspSection(props){const list=createMemo11(()=>[...props.api.state.lsp()].sort((a,b)=>Number(b.status==="error")-Number(a.status==="error")||a.id.localeCompare(b.id)||a.root.localeCompare(b.root)))
 const visibility=createListVisibility({items:list,limit:()=>props.preferences.sectionItemLimit?.("lsp")??0,resetKey:()=>currentLocation(props.api).key
 })
-const connected=createMemo10(()=>list().filter((item)=>item.status==="connected").length)
-const disabled=createMemo10(()=>props.api.state.config.lsp===false)
+const connected=createMemo11(()=>list().filter((item)=>item.status==="connected").length)
+const disabled=createMemo11(()=>props.api.state.config.lsp===false)
 const navigationSection=()=>props.navigationSection??5
 return _$createComponent(Section,{get api(){return props.api
 },get interaction(){return props.interaction
@@ -5657,28 +5604,31 @@ return _el$
 
 
 
-function createMcpSectionModel(props,query){const target=createMemo11(()=>props.controller.target())
-const favorites=createMemo11(()=>props.preferences.favoriteMcpServers?.()??new Set)
-const groups=createMemo11(()=>props.preferences.mcpServerGroups?.()??{})
-const grouped=createMemo11(()=>Object.keys(groups()).length>0)
-const list=createMemo11(()=>buildMcpGroupedView(props.controller.list(target()),favorites(),groups()))
-const filtered=createMemo11(()=>list().filter((item)=>matchesFilter(query(),`${item.name} ${item.assignedGroup ?? ""}`)))
+function createMcpSectionModel(props,query){const target=createMemo12(()=>props.controller.target())
+const favorites=createMemo12(()=>props.preferences.favoriteMcpServers?.()??new Set)
+const groups=createMemo12(()=>props.preferences.mcpServerGroups?.()??{})
+const grouped=createMemo12(()=>Object.keys(groups()).length>0)
+const list=createMemo12(()=>buildMcpGroupedView(props.controller.list(target()),favorites(),groups()))
+const groupItems=(bucket)=>list().filter((item)=>item.bucket===bucket)
+const filtered=createMemo12(()=>list().filter((item)=>matchesFilter(query(),`${item.name} ${item.assignedGroup ?? ""}`)))
 const visibility=createListVisibility({items:filtered,limit:()=>props.preferences.sectionItemLimit?.("mcp")??0,resetKey:()=>JSON.stringify([target().key,query()])
 })
-const active=createMemo11(()=>list().filter((item)=>item.status==="connected").length)
-const state=createMemo11(()=>props.controller.state(target()))
-const bulk=createMemo11(()=>props.controller.bulkState?.(target())??{action:"connect",status:"idle",completed:0,total:0,failed:[]
+const active=createMemo12(()=>list().filter((item)=>item.status==="connected").length)
+const state=createMemo12(()=>props.controller.state(target()))
+const bulk=createMemo12(()=>props.controller.bulkState?.(target())??{action:"connect",status:"idle",completed:0,total:0,failed:[]
 })
-const bulkRunning=createMemo11(()=>bulk().status==="running")
-const mutationRunning=createMemo11(()=>props.controller.mutating?.(target()))
-const connectable=createMemo11(()=>list().filter((item)=>mcpToggleAction2(item.status)==="connect").length)
-const disconnectable=createMemo11(()=>list().filter((item)=>mcpToggleAction2(item.status)==="disconnect").length)
-const errors=createMemo11(()=>list().filter((item)=>item.status==="failed"||item.status==="needs_auth"||item.status==="needs_client_registration").length)
-const presetName=createMemo11(()=>{const presets=props.preferences.mcpPresets?.()??{}
+const bulkRunning=createMemo12(()=>bulk().status==="running")
+const mutationRunning=createMemo12(()=>props.controller.mutating?.(target()))
+const connectable=createMemo12(()=>list().filter((item)=>mcpToggleAction2(item.status)==="connect").length)
+const disconnectable=createMemo12(()=>list().filter((item)=>mcpToggleAction2(item.status)==="disconnect").length)
+const errors=createMemo12(()=>list().filter((item)=>item.status==="failed"||item.status==="needs_auth"||item.status==="needs_client_registration").length)
+const presetName=createMemo12(()=>{const presets=props.preferences.mcpPresets?.()??{}
 const selected=props.controller.selectedPreset?.(target())
 return selected&&Object.hasOwn(presets,selected)?selected:matchingMcpPreset(list(),presets)
 })
-return{target,favorites,groups,grouped,list,filtered,visibility,active,state,bulk,bulkRunning,mutationRunning,connectable,disconnectable,errors,presetName
+return{target,favorites,groups,grouped,list,groupNames(bucket){return groupItems(bucket).map((item)=>item.name)
+},groupAction(bucket){return mcpGroupToggleAction(groupItems(bucket))
+},filtered,visibility,active,state,bulk,bulkRunning,mutationRunning,connectable,disconnectable,errors,presetName
 }}
 
 
@@ -5691,6 +5641,15 @@ return{target,favorites,groups,grouped,list,filtered,visibility,active,state,bul
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -5709,6 +5668,93 @@ _$effect((_$p)=>_$setProp(_el$,"fg",item.foregroundColor(),_$p))
 return _el$
 }})
 }
+function McpBulkControls(props){const icons=useIcons()
+const model=props.model
+const progress=()=>{const state=model.bulk()
+if(state.action==="preset")
+return `Applying ${state.preset}`
+return state.action==="connect"?"Connecting":"Disconnecting"
+}
+return [(()=>{var _el$=_$createElement("box")
+_$setProp(_el$,"flexDirection","row")
+_$setProp(_el$,"gap",1)
+_$insert(_el$,_$createComponent(McpBulkAction,{get api(){return props.api
+},get interaction(){return props.interaction
+},id:`${PLUGIN_ID}.mcp.connect-all`,get position(){return{section:props.navigationSection,row:2,column:0
+}},get label(){return `${icons.icon("connected")} Connect all`
+},get disabled(){return model.bulkRunning()||model.mutationRunning()||model.connectable()===0
+},onActivate:()=>void props.controller.connectAll(model.target())
+}),null)
+_$insert(_el$,_$createComponent(McpBulkAction,{get api(){return props.api
+},get interaction(){return props.interaction
+},id:`${PLUGIN_ID}.mcp.disconnect-all`,get position(){return{section:props.navigationSection,row:2,column:1
+}},get label(){return `${icons.icon("disconnected")} Disconnect all`
+},get disabled(){return model.bulkRunning()||model.mutationRunning()||model.disconnectable()===0
+},onActivate:()=>void props.controller.disconnectAll(model.target())
+}),null)
+_$effect((_$p)=>_$setProp(_el$,"paddingBottom",model.bulkRunning()||model.bulk().status==="error"?1:0,_$p))
+return _el$
+})(),_$createComponent(Show11,{get when(){return model.bulkRunning()
+},get children(){var _el$2=_$createElement("text"),_el$3=_$createTextNode(` `),_el$4=_$createTextNode(`/`),_el$5=_$createTextNode(`\u2026`)
+_$insertNode(_el$2,_el$3)
+_$insertNode(_el$2,_el$4)
+_$insertNode(_el$2,_el$5)
+_$insert(_el$2,progress,_el$3)
+_$insert(_el$2,()=>model.bulk().completed,_el$4)
+_$insert(_el$2,()=>model.bulk().total,_el$5)
+_$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
+return _el$2
+}}),_$createComponent(Show11,{get when(){return model.bulk().status==="error"
+},get children(){return _$createComponent(McpBulkAction,{get api(){return props.api
+},get interaction(){return props.interaction
+},id:`${PLUGIN_ID}.mcp.retry-all`,get position(){return{section:props.navigationSection,row:3,column:0
+}},get label(){return `${icons.icon("retry")} Retry ${model.bulk().failed.length} failed`
+},disabled:false,onActivate:()=>void props.controller.retryBulk(model.target())
+})
+}})]
+}
+
+
+
+
+
+
+
+
+function McpGroupHeader(props){const icons=useIcons()
+const theme=()=>props.api.theme.current
+const id=()=>`${PLUGIN_ID}.mcp.group.${props.bucket}`
+const item=useSidebarItem(props.api,props.interaction,{id:id(),position:()=>props.position,disabled:()=>props.disabled||!props.action,activate:props.onToggle
+})
+return _$createComponent(SelectionBox,{ref:(node)=>item.ref(node),get id(){return id()
+},height:1,get marginTop(){return props.marginTop
+},flexDirection:"row",justifyContent:"space-between",gap:1,get backgroundColor(){return item.backgroundColor()
+},get onMouseOver(){return item.onMouseOver
+},get onMouseOut(){return item.onMouseOut
+},onMouseUp:(event)=>{event.stopPropagation()
+item.activate(event)
+},get children(){return [(()=>{var _el$=_$createElement("text"),_el$2=_$createTextNode(` (`),_el$3=_$createTextNode(`)`)
+_$insertNode(_el$,_el$2)
+_$insertNode(_el$,_el$3)
+_$setProp(_el$,"flexGrow",1)
+_$setProp(_el$,"minWidth",0)
+_$setProp(_el$,"wrapMode","none")
+_$setProp(_el$,"truncate",true)
+_$insert(_el$,()=>props.bucket,_el$2)
+_$insert(_el$,()=>props.count,_el$3)
+_$effect((_$p)=>_$setProp(_el$,"fg",item.focused()?item.foregroundColor():theme().textMuted,_$p))
+return _el$
+})(),(()=>{var _el$4=_$createElement("text")
+_$setProp(_el$4,"flexShrink",0)
+_$setProp(_el$4,"wrapMode","none")
+_$insert(_el$4,(()=>{var _c$=_$memo(()=>!!props.action)
+return()=>_c$()?`${icons.icon(props.action === "connect" ? "connected" : "disconnected")} ${props.action === "connect" ? "Connect" : "Disconnect"}`:""
+})())
+_$effect((_$p)=>_$setProp(_el$4,"fg",item.focused()?item.foregroundColor():props.disabled?theme().textMuted:theme().accent,_$p))
+return _el$4
+})()]
+}})
+}
 
 
 
@@ -5741,7 +5787,7 @@ return status==="connected"?"connected":"disconnected"
 function RequestErrorRow(props){const icons=useIcons()
 const item=useSidebarItem(props.api,props.interaction,{id:props.id,position:()=>props.position,disabled:()=>!props.state.error?.retryable||props.state.status==="loading"||props.state.status==="refreshing",activate:props.onRetry
 })
-return _$createComponent(Show11,{get when(){return props.state.error
+return _$createComponent(Show12,{get when(){return props.state.error
 },children:(error)=>_$createComponent(SelectionBox,{ref:(node)=>item.ref(node),get id(){return props.id
 },flexDirection:"row",gap:1,paddingLeft:1,paddingRight:1,get backgroundColor(){return item.backgroundColor()
 },get onMouseOver(){return item.onMouseOver
@@ -5756,7 +5802,7 @@ _$insert(_el$,()=>icons.icon("error"),_el$2)
 _$insert(_el$,()=>error().message,null)
 _$effect((_$p)=>_$setProp(_el$,"fg",item.focused()?item.foregroundColor():props.api.theme.current.error,_$p))
 return _el$
-})(),_$createComponent(Show11,{get when(){return error().retryable
+})(),_$createComponent(Show12,{get when(){return error().retryable
 },get children(){var _el$3=_$createElement("text"),_el$4=_$createTextNode(` Retry`)
 _$insertNode(_el$3,_el$4)
 _$setProp(_el$3,"flexShrink",0)
@@ -5771,7 +5817,7 @@ function SectionRequestBody(props){const icons=useIcons()
 const pending=()=>props.state.status==="loading"
 return(()=>{var _el$5=_$createElement("box")
 _$insert(_el$5,_$createComponent(RequestErrorRow,props),null)
-_$insert(_el$5,_$createComponent(Show11,{get when(){return _$memo(()=>!!pending())()&&!props.hasItems
+_$insert(_el$5,_$createComponent(Show12,{get when(){return _$memo(()=>!!pending())()&&!props.hasItems
 },get children(){var _el$6=_$createElement("text"),_el$7=_$createTextNode(` `)
 _$insertNode(_el$6,_el$7)
 _$insert(_el$6,()=>icons.icon("pending"),_el$7)
@@ -5779,10 +5825,10 @@ _$insert(_el$6,()=>props.loading,null)
 _$effect((_$p)=>_$setProp(_el$6,"fg",props.api.theme.current.textMuted,_$p))
 return _el$6
 }}),null)
-_$insert(_el$5,_$createComponent(Show11,{get when(){return props.hasItems
+_$insert(_el$5,_$createComponent(Show12,{get when(){return props.hasItems
 },get children(){return props.children
 }}),null)
-_$insert(_el$5,_$createComponent(Show11,{get when(){return _$memo(()=>!!((props.state.status==="ready"||props.state.status==="refreshing")&&!props.hasItems))()&&!props.state.error
+_$insert(_el$5,_$createComponent(Show12,{get when(){return _$memo(()=>!!((props.state.status==="ready"||props.state.status==="refreshing")&&!props.hasItems))()&&!props.state.error
 },get children(){var _el$8=_$createElement("text"),_el$9=_$createTextNode(` `)
 _$insertNode(_el$8,_el$9)
 _$insert(_el$8,()=>icons.icon("info"),_el$9)
@@ -5938,7 +5984,7 @@ return _p$
 },{e:undefined,t:undefined,a:undefined,o:undefined,i:undefined,n:undefined,s:undefined,h:undefined
 })
 return _el$2
-})(),_$createComponent(Show12,{get when(){return props.query
+})(),_$createComponent(Show13,{get when(){return props.query
 },get children(){var _el$3=_$createElement("text")
 _$setProp(_el$3,"flexShrink",0)
 _$setProp(_el$3,"onMouseDown",()=>props.onInput(""))
@@ -5958,82 +6004,47 @@ _$effect((_$p)=>_$setProp(_el$,"gap",props.density==="comfortable"?1:0,_$p))
 return _el$
 })()
 }
-function McpSectionContent(props){const icons=useIcons()
-const model=props.model
+function McpSectionContent(props){const model=props.model
 return _$createComponent(SectionRequestBody,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.retry.mcp`,get position(){return{section:props.navigationSection,row:1,column:0
 }},get state(){return model.state()
 },get hasItems(){return model.list().length>0
-},empty:"No MCP servers",loading:"Loading MCP servers\u2026",onRetry:()=>void props.controller.retry(model.target()),get children(){var _el$=_$createElement("box"),_el$2=_$createElement("box")
-_$insertNode(_el$,_el$2)
-_$setProp(_el$2,"flexDirection","row")
-_$setProp(_el$2,"gap",1)
-_$insert(_el$2,_$createComponent(McpBulkAction,{get api(){return props.api
+},empty:"No MCP servers",loading:"Loading MCP servers\u2026",onRetry:()=>void props.controller.retry(model.target()),get children(){var _el$=_$createElement("box")
+_$insert(_el$,_$createComponent(McpBulkControls,{get api(){return props.api
 },get interaction(){return props.interaction
-},id:`${PLUGIN_ID}.mcp.connect-all`,get position(){return{section:props.navigationSection,row:2,column:0
-}},get label(){return `${icons.icon("connected")} Connect all`
-},get disabled(){return model.bulkRunning()||model.mutationRunning()||model.connectable()===0
-},onActivate:()=>void props.controller.connectAll(model.target())
-}),null)
-_$insert(_el$2,_$createComponent(McpBulkAction,{get api(){return props.api
-},get interaction(){return props.interaction
-},id:`${PLUGIN_ID}.mcp.disconnect-all`,get position(){return{section:props.navigationSection,row:2,column:1
-}},get label(){return `${icons.icon("disconnected")} Disconnect all`
-},get disabled(){return model.bulkRunning()||model.mutationRunning()||model.disconnectable()===0
-},onActivate:()=>void props.controller.disconnectAll(model.target())
+},get controller(){return props.controller
+},get navigationSection(){return props.navigationSection
+},model
 }),null)
-_$insert(_el$,_$createComponent(Show13,{get when(){return model.bulkRunning()
-},get children(){var _el$3=_$createElement("text"),_el$4=_$createTextNode(` `),_el$5=_$createTextNode(`/`),_el$6=_$createTextNode(`\u2026`)
-_$insertNode(_el$3,_el$4)
-_$insertNode(_el$3,_el$5)
-_$insertNode(_el$3,_el$6)
-_$insert(_el$3,(()=>{var _c$=_$memo(()=>model.bulk().action==="connect")
-return()=>_c$()?"Connecting":_$memo(()=>model.bulk().action==="disconnect")()?"Disconnecting":`Applying ${model.bulk().preset}`
-})(),_el$4)
-_$insert(_el$3,()=>model.bulk().completed,_el$5)
-_$insert(_el$3,()=>model.bulk().total,_el$6)
-_$effect((_$p)=>_$setProp(_el$3,"fg",props.api.theme.current.textMuted,_$p))
-return _el$3
-}}),null)
-_$insert(_el$,_$createComponent(Show13,{get when(){return model.bulk().status==="error"
-},get children(){return _$createComponent(McpBulkAction,{get api(){return props.api
-},get interaction(){return props.interaction
-},id:`${PLUGIN_ID}.mcp.retry-all`,get position(){return{section:props.navigationSection,row:3,column:0
-}},get label(){return `${icons.icon("retry")} Retry ${model.bulk().failed.length} failed`
-},disabled:false,onActivate:()=>void props.controller.retryBulk(model.target())
-})
-}}),null)
 _$insert(_el$,_$createComponent(SectionFilter,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.filter.mcp`,get position(){return{section:props.navigationSection,row:4,column:0
 }},get query(){return props.query
 },placeholder:"Filter MCP...",get onInput(){return props.onQuery
 }}),null)
-_$insert(_el$,_$createComponent(Show13,{get when(){return model.filtered().length>0
-},get fallback(){return(()=>{var _el$7=_$createElement("text")
-_$insertNode(_el$7,_$createTextNode(`No matching MCP servers`))
-_$effect((_$p)=>_$setProp(_el$7,"fg",props.api.theme.current.textMuted,_$p))
-return _el$7
+_$insert(_el$,_$createComponent(Show14,{get when(){return model.filtered().length>0
+},get fallback(){return(()=>{var _el$2=_$createElement("text")
+_$insertNode(_el$2,_$createTextNode(`No matching MCP servers`))
+_$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
+return _el$2
 })()
 },get children(){return [_$createComponent(SidebarRowList,{get density(){return props.preferences.rowDensity?.()??"compact"
 },get children(){return _$createComponent(For13,{get each(){return model.visibility.visible()
-},children:(item,index)=>[_$createComponent(Show13,{get when(){return _$memo(()=>!!model.grouped())()&&(index()===0||model.visibility.visible()[index()-1]?.bucket!==item.bucket)
-},get children(){var _el$9=_$createElement("text")
-_$setProp(_el$9,"height",1)
-_$setProp(_el$9,"wrapMode","none")
-_$setProp(_el$9,"truncate",true)
-_$insert(_el$9,()=>item.bucket)
-_$effect((_p$)=>{var _v$=index()>0?1:0,_v$2=props.api.theme.current.textMuted
-_v$!==_p$.e&&(_p$.e=_$setProp(_el$9,"marginTop",_v$,_p$.e))
-_v$2!==_p$.t&&(_p$.t=_$setProp(_el$9,"fg",_v$2,_p$.t))
-return _p$
-},{e:undefined,t:undefined
+},children:(item,index)=>[_$createComponent(Show14,{get when(){return _$memo(()=>!!model.grouped())()&&(index()===0||model.visibility.visible()[index()-1]?.bucket!==item.bucket)
+},get children(){return _$createComponent(McpGroupHeader,{get api(){return props.api
+},get interaction(){return props.interaction
+},get bucket(){return item.bucket
+},get count(){return model.groupNames(item.bucket).length
+},get action(){return model.groupAction(item.bucket)
+},get disabled(){return model.bulkRunning()||model.mutationRunning()
+},get marginTop(){return index()>0?1:0
+},get position(){return{section:props.navigationSection,row:9 + index()*3,column:0
+}},onToggle:()=>void props.controller.toggleGroup(item.bucket,model.groupNames(item.bucket),model.target())
 })
-return _el$9
 }}),_$createComponent(McpRow,{get api(){return props.api
 },get interaction(){return props.interaction
-},item,get position(){return{section:props.navigationSection,row:10 + index()*2,column:0
+},item,get position(){return{section:props.navigationSection,row:10 + index()*3,column:0
 }},get state(){return props.controller.serverState(item.name,model.target())
 },get disabled(){return model.bulkRunning()
 },onToggle:()=>void props.controller.toggle(item.name).catch(()=>{}),onRetry:()=>void props.controller.retryServer(item.name,model.target())?.catch(()=>{}),get favorite(){return model.favorites().has(item.name)
@@ -6045,11 +6056,10 @@ return _el$9
 }}),_$createComponent(ListVisibilityControl,{get api(){return props.api
 },get interaction(){return props.interaction
 },section:"mcp",get navigationSection(){return props.navigationSection
-},get row(){return 10 + model.visibility.visible().length*2
+},get row(){return 10 + model.visibility.visible().length*3
 },get visibility(){return model.visibility
 }})]
 }}),null)
-_$effect((_$p)=>_$setProp(_el$2,"paddingBottom",model.bulkRunning()||model.bulk().status==="error"?1:0,_$p))
 return _el$
 }})
 }
@@ -6057,7 +6067,7 @@ function McpSection(props){const icons=useIcons()
 const [query,setQuery]=createSignal24("")
 const model=createMcpSectionModel(props,query)
 const navigationSection=()=>props.navigationSection??6
-const summary=createMemo12(()=>`${model.active()}/${model.list().length}${model.errors() ? ` \xB7 ${model.errors()} ${icons.icon("error")}` : ""}`)
+const summary=createMemo13(()=>`${model.active()}/${model.list().length}${model.errors() ? ` \xB7 ${model.errors()} ${icons.icon("error")}` : ""}`)
 return _$createComponent(SectionWithHeaderAction,{get api(){return props.api
 },get interaction(){return props.interaction
 },sectionId:`${PLUGIN_ID}.section.mcp`,get navigationSection(){return navigationSection()
@@ -6092,11 +6102,11 @@ return _$createComponent(SectionWithHeaderAction,{get api(){return props.api
 function QuickActionRow(props){const icons=useIcons()
 const theme=()=>props.api.theme.current
 const [width,setWidth]=createSignal25(0)
-const shortcut=createMemo13(()=>{const bindings=props.api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
+const shortcut=createMemo14(()=>{const bindings=props.api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
 })
 return props.api.keys.formatBindings(bindings.get(props.action.command))
 })
-const visibleShortcut=createMemo13(()=>{const value=shortcut()
+const visibleShortcut=createMemo14(()=>{const value=shortcut()
 return value&&width()>=Bun.stringWidth(props.action.label) + Bun.stringWidth(value) + 9?value:undefined
 })
 function run(){if(props.action.command==="session.new"&&props.onNewSession?.())
@@ -6123,7 +6133,9 @@ return _$createComponent(ListRow,{ref:(node)=>row.ref(node),get id(){return id()
 },get backgroundColor(){return row.backgroundColor()
 },get onMouseOver(){return row.onMouseOver
 },get onMouseOut(){return row.onMouseOut
-},onMouseUp:(event)=>row.activate(event),get leading(){return(()=>{var _el$=_$createElement("text")
+},onMouseUp:(event)=>{event.stopPropagation()
+row.activate(event)
+},get leading(){return(()=>{var _el$=_$createElement("text")
 _$setProp(_el$,"flexShrink",0)
 _$insert(_el$,()=>icons.action(props.action.command))
 _$effect((_$p)=>_$setProp(_el$,"fg",props.disabled?theme().textMuted:row.focused()?row.foregroundColor():theme().accent,_$p))
@@ -6137,7 +6149,7 @@ _$insert(_el$2,()=>props.action.label)
 _$effect((_$p)=>_$setProp(_el$2,"fg",row.foregroundColor(),_$p))
 return _el$2
 })()
-},get metadata(){return _$createComponent(Show14,{get when(){return visibleShortcut()
+},get metadata(){return _$createComponent(Show15,{get when(){return visibleShortcut()
 },children:(value)=>(()=>{var _el$3=_$createElement("text")
 _$setProp(_el$3,"flexShrink",0)
 _$setProp(_el$3,"wrapMode","none")
@@ -6146,7 +6158,7 @@ _$effect((_$p)=>_$setProp(_el$3,"fg",row.focused()?row.foregroundColor():theme()
 return _el$3
 })()
 })
-},get details(){return _$createComponent(Show14,{get when(){return props.disabled
+},get details(){return _$createComponent(Show15,{get when(){return props.disabled
 },children:(reason)=>(()=>{var _el$4=_$createElement("text")
 _$setProp(_el$4,"wrapMode","word")
 _$insert(_el$4,reason)
@@ -6165,7 +6177,7 @@ return _el$4
 }})
 }
 function QuickActionsSection(props){const commandRevision=createQuickActionRevision(props.api)
-const actions=createMemo14(()=>{commandRevision()
+const actions=createMemo15(()=>{commandRevision()
 return orderQuickActionIds(props.preferences.quickActionOrder?.()??QUICK_ACTIONS.map((action)=>action.command),props.preferences.favoriteQuickActions?.()??new Set).flatMap((id)=>{const action=QUICK_ACTIONS.find((candidate)=>candidate.command===id)
 return action&&props.preferences.quickActionVisible?.(id)!==false?[{...action,label:quickActionLabel(props.api,action),disabled:quickActionDisabledReason(props.api,action)
 }]:[]
@@ -6180,7 +6192,7 @@ return _$createComponent(Section,{get api(){return props.api
 },title:"QUICK ACTIONS",section:"quick_actions",get summary(){return String(actions().length)
 },get open(){return props.preferences.expanded().quick_actions
 },onToggle:()=>props.preferences.toggleSectionExpanded("quick_actions"),get children(){return [_$createComponent(SidebarRowList,{get density(){return props.preferences.rowDensity?.()??"compact"
-},get children(){return [_$createComponent(Show15,{get when(){return actions().length===0
+},get children(){return [_$createComponent(Show16,{get when(){return actions().length===0
 },get children(){var _el$=_$createElement("text")
 _$insertNode(_el$,_$createTextNode(`No quick actions selected`))
 _$effect((_$p)=>_$setProp(_el$,"fg",props.api.theme.current.textMuted,_$p))
@@ -6297,7 +6309,7 @@ unregisterBinding=undefined
 unregisterCommands()
 }}}
 function SidebarToggleBinding(props){const shortcuts=createSidebarShortcutMode(props.api)
-createEffect12(()=>shortcuts.bind(props.preferences.toggleKey()))
+createEffect13(()=>shortcuts.bind(props.preferences.toggleKey()))
 onCleanup17(shortcuts.dispose)
 return _$createElement("box")
 }
@@ -6307,7 +6319,7 @@ const unregisterCommands=props.api.keymap.registerLayer({commands:[...commands,.
 }))]
 })
 onCleanup17(unregisterCommands)
-createEffect12(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
+createEffect13(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
 }]
 })
 onCleanup17(unregister)
@@ -6332,22 +6344,19 @@ return _$createElement("box")
 
 
 
-function createSkillSectionModel(props,query){const target=createMemo15(()=>props.controller.target())
-const recent=createMemo15(()=>new Map((props.preferences.recentSkills?.()??[]).map((location,index)=>[location,index])))
-const list=createMemo15(()=>{const favorites=props.preferences.favoriteSkills?.()??new Set
-return [...props.controller.list(target())].sort((left,right)=>{const isLeftFavorite=favorites.has(left.location)
-const isRightFavorite=favorites.has(right.location)
-return Number(isRightFavorite)-Number(isLeftFavorite)||(isLeftFavorite?0:(recent().get(left.location)??Infinity)-(recent().get(right.location)??Infinity))||left.name.localeCompare(right.name)
-}).map((item)=>({...item}))
-})
-const filtered=createMemo15(()=>list().filter((item)=>matchesFilter(query(),item.name,item.description)))
+function createSkillSectionModel(props,query){const target=createMemo16(()=>props.controller.target())
+const recent=createMemo16(()=>new Map((props.preferences.recentSkills?.()??[]).map((location,index)=>[location,index])))
+const groups=createMemo16(()=>props.preferences.skillGroups?.()??{})
+const grouped=createMemo16(()=>Object.keys(groups()).length>0)
+const list=createMemo16(()=>buildSkillGroupedView(props.controller.list(target()),props.preferences.favoriteSkills?.()??new Set,groups(),recent()))
+const filtered=createMemo16(()=>list().filter((item)=>matchesFilter(query(),item.name,item.description,item.assignedGroup)))
 const visibility=createListVisibility({items:filtered,limit:()=>props.preferences.sectionItemLimit?.("skills")??0,resetKey:()=>JSON.stringify([target().key,query()])
 })
-const state=createMemo15(()=>props.controller.state(target()))
-createEffect13(()=>{const current=target()
-const deactivate=untrack4(()=>props.controller.activate?.(current)??(()=>{}))
+const state=createMemo16(()=>props.controller.state(target()))
+createEffect14(()=>{const current=target()
+const deactivate=untrack5(()=>props.controller.activate?.(current)??(()=>{}))
 onCleanup18(deactivate)
-untrack4(()=>void props.controller.refresh(current).catch(()=>{}))
+untrack5(()=>void props.controller.refresh(current).catch(()=>{}))
 })
 async function useSkill(item){try{const isInserted=await props.controller.use(target(),item.name)
 if(isInserted)
@@ -6357,11 +6366,13 @@ return
 props.api.ui.toast({variant:"error",title:"Skills",message:error instanceof Error?error.message:`Failed to insert /${item.name}`,duration:5000
 })
 }}
-function skillGroup(item){if(props.preferences.isFavoriteSkill?.(item))
+function skillGroup(item){if(grouped())
+return item.bucket
+if(props.preferences.isFavoriteSkill?.(item))
 return "favorite"
 return recent().has(item.location)?"recent":"other"
 }
-return{target,recent,list,filtered,visibility,state,useSkill,skillGroup}}
+return{target,recent,grouped,list,filtered,visibility,state,useSkill,skillGroup}}
 
 
 
@@ -6443,7 +6454,7 @@ _$insert(_el$,_$createComponent(SectionFilter,{get api(){return props.api
 }},get query(){return query()
 },placeholder:"Filter skills...",onInput:setQuery
 }),null)
-_$insert(_el$,_$createComponent(Show16,{get when(){return model.filtered().length>0
+_$insert(_el$,_$createComponent(Show17,{get when(){return model.filtered().length>0
 },get fallback(){return(()=>{var _el$2=_$createElement("text")
 _$insertNode(_el$2,_$createTextNode(`No matching skills`))
 _$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
@@ -6451,20 +6462,33 @@ return _el$2
 })()
 },get children(){return [_$createComponent(SidebarRowList,{get density(){return props.preferences.rowDensity?.()??"compact"
 },get children(){return _$createComponent(For15,{get each(){return model.visibility.visible()
-},children:(item,index)=>_$createComponent(SkillRow,{get api(){return props.api
+},children:(item,index)=>[_$createComponent(Show17,{get when(){return _$memo(()=>!!model.grouped())()&&(index()===0||model.visibility.visible()[index()-1]?.bucket!==item.bucket)
+},get children(){var _el$4=_$createElement("text")
+_$setProp(_el$4,"height",1)
+_$setProp(_el$4,"wrapMode","none")
+_$setProp(_el$4,"truncate",true)
+_$insert(_el$4,()=>item.bucket)
+_$effect((_p$)=>{var _v$=index()>0?1:0,_v$2=props.api.theme.current.textMuted
+_v$!==_p$.e&&(_p$.e=_$setProp(_el$4,"marginTop",_v$,_p$.e))
+_v$2!==_p$.t&&(_p$.t=_$setProp(_el$4,"fg",_v$2,_p$.t))
+return _p$
+},{e:undefined,t:undefined
+})
+return _el$4
+}}),_$createComponent(SkillRow,{get api(){return props.api
 },get interaction(){return props.interaction
-},item,get position(){return{section:navigationSection(),row:10 + index(),column:0
+},item,get position(){return{section:navigationSection(),row:10 + index()*(model.grouped()?2:1),column:0
 }},onUse:()=>selectSkill(item),get recent(){return model.recent().has(item.location)
 },get favorite(){return props.preferences.isFavoriteSkill?.(item)??false
 },get favoriteDisabled(){return props.preferences.ready?.()===false
-},get separator(){return _$memo(()=>index()>0)()&&model.skillGroup(model.visibility.visible()[index()-1])!==model.skillGroup(item)
+},get separator(){return _$memo(()=>!!(!model.grouped()&&index()>0))()&&model.skillGroup(model.visibility.visible()[index()-1])!==model.skillGroup(item)
 },onToggleFavorite:()=>props.preferences.toggleFavoriteSkill?.(item)
-})
+})]
 })
 }}),_$createComponent(ListVisibilityControl,{get api(){return props.api
 },get interaction(){return props.interaction
 },section:"skills",get navigationSection(){return navigationSection()
-},get row(){return 10 + model.visibility.visible().length
+},get row(){return 10 + model.visibility.visible().length*(model.grouped()?2:1)
 },get visibility(){return model.visibility
 }})]
 }}),null)
@@ -6482,35 +6506,35 @@ return _el$
 
 
 
-function createSubagentSectionModel(props){const list=createMemo16(()=>props.controller.list(props.sessionID))
-const recent=createMemo16(()=>props.controller.recent?.(props.sessionID)??[])
-const rows=createMemo16(()=>buildSubagentView(list(),recent()))
+function createSubagentSectionModel(props){const list=createMemo17(()=>props.controller.list(props.sessionID))
+const recent=createMemo17(()=>props.controller.recent?.(props.sessionID)??[])
+const rows=createMemo17(()=>buildSubagentView(list(),recent()))
 const [query,setQuery]=createSignal27("")
 const [mode,setMode]=createSignal27("all")
-const counts=createMemo16(()=>countSubagentView(rows(),query()))
-const tabs=createMemo16(()=>["all","active","recent",...counts().errors>0?["errors"]:[]])
-const filtered=createMemo16(()=>filterSubagentView(rows(),mode(),query()))
-const parentID=createMemo16(()=>props.api.state?.session?.get(props.sessionID)?.parentID)
-const targetKey=createMemo16(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
-createEffect14(()=>{targetKey()
+const counts=createMemo17(()=>countSubagentView(rows(),query()))
+const tabs=createMemo17(()=>["all","active","recent",...counts().errors>0?["errors"]:[]])
+const filtered=createMemo17(()=>filterSubagentView(rows(),mode(),query()))
+const parentID=createMemo17(()=>props.api.state?.session?.get(props.sessionID)?.parentID)
+const targetKey=createMemo17(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
+createEffect15(()=>{targetKey()
 setQuery("")
 setMode("all")
 })
-createEffect14(()=>{if(mode()!=="all"&&counts()[mode()]===0)
+createEffect15(()=>{if(mode()!=="all"&&counts()[mode()]===0)
 setMode("all")
 })
 const visibility=createListVisibility({items:filtered,limit:()=>props.preferences.sectionItemLimit?.("subagents")??0,resetKey:()=>JSON.stringify([targetKey(),query(),mode()])
 })
-const clockKey=createMemo16(()=>props.preferences.expanded().subagents&&visibility.visible().some((item)=>item.status.type!=="idle")?targetKey():undefined)
+const clockKey=createMemo17(()=>props.preferences.expanded().subagents&&visibility.visible().some((item)=>item.status.type!=="idle")?targetKey():undefined)
 const now=createSubagentClock(clockKey)
-const byId=createMemo16(()=>new Map(visibility.visible().map((item)=>[item.session.id,item])))
-const ids=createMemo16(()=>visibility.visible().map((item)=>item.session.id))
-const state=createMemo16(()=>props.controller.state(props.sessionID))
-createEffect14(()=>{const sessionID=props.sessionID
+const byId=createMemo17(()=>new Map(visibility.visible().map((item)=>[item.session.id,item])))
+const ids=createMemo17(()=>visibility.visible().map((item)=>item.session.id))
+const state=createMemo17(()=>props.controller.state(props.sessionID))
+createEffect15(()=>{const sessionID=props.sessionID
 targetKey()
-const deactivate=untrack5(()=>props.controller.activate?.(sessionID)??(()=>{}))
+const deactivate=untrack6(()=>props.controller.activate?.(sessionID)??(()=>{}))
 onCleanup19(deactivate)
-untrack5(()=>void props.controller.refresh(sessionID).catch(()=>{}))
+untrack6(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 })
 return{list,recent,rows,query,setQuery,mode,setMode,counts,tabs,filtered,parentID,visibility,now,byId,ids,state
 }}
@@ -6565,7 +6589,7 @@ return()=>_c$()?`${props.item.run.startedBeforeObservation ? `${icons.icon("rece
 _$effect((_$p)=>_$setProp(_el$3,"fg",row.focused()?row.foregroundColor():theme().textMuted,_$p))
 return _el$3
 })()
-},get details(){return [_$createComponent(Show17,{get when(){return props.item.run?.errorMessage
+},get details(){return [_$createComponent(Show18,{get when(){return props.item.run?.errorMessage
 },get children(){var _el$4=_$createElement("text"),_el$5=_$createTextNode(`: `)
 _$insertNode(_el$4,_el$5)
 _$setProp(_el$4,"wrapMode","word")
@@ -6573,12 +6597,12 @@ _$insert(_el$4,()=>cancelled()?"Cancelled":"Error",_el$5)
 _$insert(_el$4,()=>props.item.run?.errorMessage,null)
 _$effect((_$p)=>_$setProp(_el$4,"fg",row.focused()?row.foregroundColor():failed()?theme().error:theme().textMuted,_$p))
 return _el$4
-}}),_$createComponent(Show17,{get when(){return props.item.unavailable
+}}),_$createComponent(Show18,{get when(){return props.item.unavailable
 },get children(){var _el$6=_$createElement("text")
 _$insertNode(_el$6,_$createTextNode(`Worker status unavailable`))
 _$effect((_$p)=>_$setProp(_el$6,"fg",theme().warning,_$p))
 return _el$6
-}}),_$createComponent(Show17,{get when(){return _$memo(()=>props.item.status.type==="retry")()?props.item.status:undefined
+}}),_$createComponent(Show18,{get when(){return _$memo(()=>props.item.status.type==="retry")()?props.item.status:undefined
 },children:(status)=>(()=>{var _el$0=_$createElement("text"),_el$1=_$createTextNode(`Retry #`),_el$10=_$createTextNode(` \xB7 `),_el$11=_$createTextNode(`s \xB7 `)
 _$insertNode(_el$0,_el$1)
 _$insertNode(_el$0,_el$10)
@@ -6590,7 +6614,7 @@ _$insert(_el$0,()=>status().message,null)
 _$effect((_$p)=>_$setProp(_el$0,"fg",row.focused()?row.foregroundColor():theme().warning,_$p))
 return _el$0
 })()
-}),_$createComponent(Show17,{get when(){return _$memo(()=>!!idle())()&&!props.item.run?.errorMessage
+}),_$createComponent(Show18,{get when(){return _$memo(()=>!!idle())()&&!props.item.run?.errorMessage
 },get children(){var _el$8=_$createElement("text")
 _$insertNode(_el$8,_$createTextNode(`Finished`))
 _$effect((_$p)=>_$setProp(_el$8,"fg",theme().textMuted,_$p))
@@ -6604,7 +6628,7 @@ function SubagentList(props){return _$createComponent(SidebarRowList,{get densit
 const item=()=>props.itemById(id)??initial
 const startsGroup=()=>index()===0||props.visible[index()-1]?.group!==item().group
 return(()=>{var _el$=_$createElement("box")
-_$insert(_el$,_$createComponent(Show18,{get when(){return startsGroup()
+_$insert(_el$,_$createComponent(Show19,{get when(){return startsGroup()
 },get children(){var _el$2=_$createElement("text"),_el$3=_$createElement("b")
 _$insertNode(_el$2,_el$3)
 _$insert(_el$3,()=>item().group)
@@ -6632,7 +6656,7 @@ return _$createComponent(Section,{get api(){return props.api
 },sectionId:`${PLUGIN_ID}.section.subagents`,get navigationSection(){return navigationSection()
 },title:"SUBAGENTS",section:"subagents",get summary(){return `${model.list().length} active \xB7 ${model.recent().length} recent`
 },get open(){return props.preferences.expanded().subagents
-},onToggle:()=>props.preferences.toggleSectionExpanded("subagents"),get children(){return [_$createComponent(Show19,{get when(){return model.parentID()
+},onToggle:()=>props.preferences.toggleSectionExpanded("subagents"),get children(){return [_$createComponent(Show20,{get when(){return model.parentID()
 },children:(id)=>_$createComponent(McpBulkAction,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.subagents.parent`,get position(){return{section:navigationSection(),row:1,column:0
@@ -6666,7 +6690,7 @@ _$insert(_el$2,_$createComponent(For17,{get each(){return model.tabs()
 },onActivate:()=>model.setMode(value)
 })
 }))
-_$insert(_el$,_$createComponent(Show19,{get when(){return model.filtered().length===0
+_$insert(_el$,_$createComponent(Show20,{get when(){return model.filtered().length===0
 },get children(){var _el$3=_$createElement("text")
 _$insertNode(_el$3,_$createTextNode(`No matching subagents`))
 _$effect((_$p)=>_$setProp(_el$3,"fg",props.api.theme.current.textMuted,_$p))
@@ -6747,7 +6771,7 @@ _$insert(_el$2,()=>icons.icon(done()?"done":active()?"busy":cancelled()?"close":
 _$setProp(_el$3,"flexGrow",1)
 _$setProp(_el$3,"wrapMode","word")
 _$insert(_el$3,()=>props.item.content)
-_$insert(_el$,_$createComponent(Show20,{get when(){return props.item.priority==="high"||props.item.priority==="medium"||props.item.priority==="low"
+_$insert(_el$,_$createComponent(Show21,{get when(){return props.item.priority==="high"||props.item.priority==="medium"||props.item.priority==="low"
 },get children(){var _el$4=_$createElement("text"),_el$5=_$createElement("b"),_el$6=_$createTextNode(` `)
 _$insertNode(_el$4,_el$5)
 _$setProp(_el$4,"width",2)
@@ -6783,7 +6807,7 @@ _$insert(_el$2,_$createComponent(For18,{each:["all","active","finished"],childre
 },onActivate:()=>props.setMode(value)
 })
 }))
-_$insert(_el$,_$createComponent(Show21,{get when(){return props.view.rows.length>0
+_$insert(_el$,_$createComponent(Show22,{get when(){return props.view.rows.length>0
 },get fallback(){return _$createComponent(EmptyTodo,{get api(){return props.api
 },get mode(){return props.mode
 }})
@@ -6791,7 +6815,7 @@ _$insert(_el$,_$createComponent(Show21,{get when(){return props.view.rows.length
 },get children(){return _$createComponent(For18,{get each(){return props.visibility.visible()
 },children:(row,index)=>{const startsGroup=()=>index()===0||props.visibility.visible()[index()-1].group!==row.group
 return(()=>{var _el$3=_$createElement("box")
-_$insert(_el$3,_$createComponent(Show21,{get when(){return startsGroup()
+_$insert(_el$3,_$createComponent(Show22,{get when(){return startsGroup()
 },get children(){var _el$4=_$createElement("text"),_el$5=_$createElement("b")
 _$insertNode(_el$4,_el$5)
 _$insert(_el$5,()=>row.group)
@@ -6829,7 +6853,7 @@ return _el$6
 
 
 function TodoGuidanceControl(props){const state=()=>props.controller.guidance(props.sessionID)
-return _$createComponent(Show22,{get when(){return state().available
+return _$createComponent(Show23,{get when(){return state().available
 },get children(){var _el$=_$createElement("box")
 _$insert(_el$,_$createComponent(SectionTab,{get api(){return props.api
 },get interaction(){return props.interaction
@@ -6839,7 +6863,7 @@ _$insert(_el$,_$createComponent(SectionTab,{get api(){return props.api
 },get disabled(){return state().saving
 },onActivate:()=>void props.controller.setGuidance(props.sessionID,!state().enabled)
 }),null)
-_$insert(_el$,_$createComponent(Show22,{get when(){return state().error
+_$insert(_el$,_$createComponent(Show23,{get when(){return state().error
 },children:(message)=>(()=>{var _el$2=_$createElement("text")
 _$setProp(_el$2,"wrapMode","word")
 _$insert(_el$2,message)
@@ -6850,26 +6874,26 @@ return _el$2
 return _el$
 }})
 }
-function TodoSection(props){const list=createMemo17(()=>props.controller.list(props.sessionID))
+function TodoSection(props){const list=createMemo18(()=>props.controller.list(props.sessionID))
 const icons=useIcons()
 const unavailable=()=>hostCapabilityUnavailable(props.api,"todo")
 const managed=()=>("guidance" in props.controller)?props.controller:undefined
 const [mode,setMode]=createSignal28("all")
-const targetKey=createMemo17(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
-createEffect15(()=>{targetKey()
+const targetKey=createMemo18(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
+createEffect16(()=>{targetKey()
 setMode("all")
 })
-const view=createMemo17(()=>buildTodoView(list(),mode()))
+const view=createMemo18(()=>buildTodoView(list(),mode()))
 const visibility=createListVisibility({items:()=>view().rows,limit:()=>props.preferences.sectionItemLimit?.("todo")??0,resetKey:()=>JSON.stringify([targetKey(),mode()])
 })
-const state=createMemo17(()=>props.controller.state(props.sessionID))
-createEffect15(()=>{const sessionID=props.sessionID
+const state=createMemo18(()=>props.controller.state(props.sessionID))
+createEffect16(()=>{const sessionID=props.sessionID
 targetKey()
 if(unavailable())
 return
-const deactivate=untrack6(()=>props.controller.activate?.(sessionID)??(()=>{}))
+const deactivate=untrack7(()=>props.controller.activate?.(sessionID)??(()=>{}))
 onCleanup20(deactivate)
-untrack6(()=>void props.controller.refresh(sessionID).catch(()=>{}))
+untrack7(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 })
 const navigationSection=()=>props.navigationSection??1
 return _$createComponent(Section,{get api(){return props.api
@@ -6877,10 +6901,10 @@ return _$createComponent(Section,{get api(){return props.api
 },sectionId:`${PLUGIN_ID}.section.todo`,get navigationSection(){return navigationSection()
 },title:"TODO",section:"todo",get summary(){return _$memo(()=>!!(unavailable()||managed()?.missing(props.sessionID)))()?"\u2014":`${view().counts.completed}/${list().length}`
 },get open(){return props.preferences.expanded().todo
-},onToggle:()=>props.preferences.toggleSectionExpanded("todo"),get children(){return _$createComponent(Show23,{get when(){return unavailable()
+},onToggle:()=>props.preferences.toggleSectionExpanded("todo"),get children(){return _$createComponent(Show24,{get when(){return unavailable()
 },get fallback(){return(()=>{var _el$=_$createElement("box")
 _$setProp(_el$,"gap",1)
-_$insert(_el$,_$createComponent(Show23,{get when(){return managed()?.guidance(props.sessionID).available
+_$insert(_el$,_$createComponent(Show24,{get when(){return managed()?.guidance(props.sessionID).available
 },get children(){return _$createComponent(TodoGuidanceControl,{get api(){return props.api
 },get controller(){return managed()
 },get sessionID(){return props.sessionID
@@ -6888,7 +6912,7 @@ _$insert(_el$,_$createComponent(Show23,{get when(){return managed()?.guidance(pr
 },get navigationSection(){return navigationSection()
 }})
 }}),null)
-_$insert(_el$,_$createComponent(Show23,{get when(){return managed()?.missing(props.sessionID)
+_$insert(_el$,_$createComponent(Show24,{get when(){return managed()?.missing(props.sessionID)
 },get fallback(){return _$createComponent(SectionRequestBody,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.retry.todo`,get position(){return{section:navigationSection(),row:1,column:0
@@ -6924,7 +6948,7 @@ return _el$4
 }})
 }
 function SidebarContent(props){const sections=props.preferences.sections
-const visibleSections=createMemo18(()=>props.preferences.sectionOrder().filter((section)=>sections()[section]&&supportsSidebarSection(props.api,section)))
+const visibleSections=createMemo19(()=>props.preferences.sectionOrder().filter((section)=>sections()[section]&&supportsSidebarSection(props.api,section)))
 onCleanup21(()=>props.interaction.setContentRoot(undefined))
 return(()=>{var _el$=_$createElement("box")
 _$use((node)=>props.interaction.setContentRoot(node),_el$)
@@ -6971,8 +6995,8 @@ return _el$
 }
 
 
-function McpPersistence(props){const persist=createMemo19(()=>props.controller.persist())
-createEffect16(()=>{if(!props.api.state.ready)
+function McpPersistence(props){const persist=createMemo20(()=>props.controller.persist())
+createEffect17(()=>{if(!props.api.state.ready)
 return
 persist()
 const route=props.api.route.current
@@ -6981,19 +7005,19 @@ if(typeof params?.sessionID!=="string")
 return
 const current=props.controller.target()
 onCleanup22(()=>props.controller.deactivate(current))
-untrack7(()=>void props.controller.activate(current).catch(()=>{}))
+untrack8(()=>void props.controller.activate(current).catch(()=>{}))
 })
 return _$createElement("box")
 }
-function PreferencesPersistence(props){createEffect16(()=>{const location=currentLocation(props.api)
-untrack7(()=>props.controller.setActiveScope(preferencesScope({directory:location.routing.directory,worktree:props.api.state.path.worktree
+function PreferencesPersistence(props){createEffect17(()=>{const location=currentLocation(props.api)
+untrack8(()=>props.controller.setActiveScope(preferencesScope({directory:location.routing.directory,worktree:props.api.state.path.worktree
 })))
 props.controller.load()
 })
 return _$createElement("box")
 }
 function FirstRunWizardPersistence(props){let isChecked=false
-createEffect16(()=>{if(isChecked)
+createEffect17(()=>{if(isChecked)
 return
 isChecked=true
 showFirstRunWizard(props.api,props.preferences).catch(()=>{})
@@ -7011,14 +7035,14 @@ return _$createElement("box")
 
 function SidebarTitle(props){const icons=useIcons()
 const theme=()=>props.api.theme.current
-const created=createMemo20(()=>{const value=props.api.state.session.get(props.sessionID)?.time?.created
+const created=createMemo21(()=>{const value=props.api.state.session.get(props.sessionID)?.time?.created
 return value===undefined?undefined:`Created ${new Date(value).toLocaleDateString("en", {
       dateStyle: "medium"
     })}`
 })
 const settingsId=`${PLUGIN_ID}.settings`
 const settings=useSidebarItem(props.api,props.interaction,{id:settingsId,position:{section:0,row:0,column:0
-},activate:()=>openSettings(props.api,props.preferences,undefined,props.mcp)
+},activate:()=>openSettings(props.api,props.preferences,undefined,props.mcp,props.skills)
 },()=>theme().textMuted,"control")
 onCleanup23(()=>props.interaction.setTitleRoot(undefined))
 return(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("box"),_el$3=_$createElement("box")
@@ -7031,7 +7055,7 @@ _$setProp(_el$2,"flexDirection","row")
 _$setProp(_el$2,"justifyContent","space-between")
 _$setProp(_el$2,"gap",1)
 _$setProp(_el$3,"flexGrow",1)
-_$insert(_el$3,_$createComponent(Show24,{get when(){return props.preferences.showSessionTitle()
+_$insert(_el$3,_$createComponent(Show25,{get when(){return props.preferences.showSessionTitle()
 },get children(){var _el$4=_$createElement("text"),_el$5=_$createElement("b")
 _$insertNode(_el$4,_el$5)
 _$setProp(_el$4,"wrapMode","word")
@@ -7039,7 +7063,7 @@ _$insert(_el$5,()=>props.title)
 _$effect((_$p)=>_$setProp(_el$4,"fg",theme().text,_$p))
 return _el$4
 }}),null)
-_$insert(_el$3,_$createComponent(Show24,{get when(){return _$memo(()=>!!props.preferences.showSessionDate())()&&created()
+_$insert(_el$3,_$createComponent(Show25,{get when(){return _$memo(()=>!!props.preferences.showSessionDate())()&&created()
 },children:(value)=>(()=>{var _el$6=_$createElement("text")
 _$insert(_el$6,value)
 _$effect((_$p)=>_$setProp(_el$6,"fg",theme().textMuted,_$p))
@@ -7161,6 +7185,8 @@ unsubscribe()
 }}}}
 
 
+var SETTINGS_COMMAND="opencode.settings"
+var PERMISSIONS_ACTION="permission.mode"
 function belongsTo2(renderable,ancestor){if(!renderable||!ancestor)
 return false
 for(let current=renderable;current; current=current.parent){if(current===ancestor)
@@ -7215,11 +7241,11 @@ setRevision((value)=>value + 1)
 return()=>{if(!layers.delete(id))
 return
 setRevision((value)=>value + 1)
-}},dispatchCommand(name,options){const command=context.keymap.commands().find((candidate)=>candidate.id===name)
+}},dispatchCommand(name,options){const command=context.keymap.commands().find((candidate)=>candidate.id===(name===PERMISSIONS_ACTION?SETTINGS_COMMAND:name))
 if(command){if(!enabled(command.enabled))
 return{ok:false,reason:"disabled",command
 }
-context.keymap.dispatch(name,typeof options?.payload==="string"?options.payload:undefined)
+context.keymap.dispatch(command.id,typeof options?.payload==="string"?options.payload:undefined)
 return{ok:true,command
 }}
 const fallback=legacyCommand(name)
@@ -7228,12 +7254,18 @@ return{ok:false,reason:"not-found"
 }
 run(fallback)
 return{ok:true,command:fallback
-}},getCommands(){return context.keymap.commands().flatMap((command)=>{if(!command.id)
+}},getCommands(){const commands=context.keymap.commands()
+const result=commands.flatMap((command)=>{if(!command.id)
 return []
 const name=command.id
 return [{...command,name,run:()=>context.keymap.dispatch(name)
 }]
 })
+const settings=commands.find((command)=>command.id===SETTINGS_COMMAND)
+if(settings)
+result.push({...settings,id:PERMISSIONS_ACTION,name:PERMISSIONS_ACTION,title:"Permissions settings",run:()=>context.keymap.dispatch(SETTINGS_COMMAND)
+})
+return result
 },getCommandBindings(input){return new Map(input.commands.map((name)=>[name,[...context.keymap.shortcuts(name)]]))
 },parseKeySequence(value){return value.trim()?value.trim().split(/\s+/u):[]
 }}
@@ -7449,20 +7481,20 @@ api.lifecycle.onDispose(unsubscribeConnected)
 api.slots.register({order:100,slots:{app(){return _$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
 },get children(){return [_$createComponent(PreferencesPersistence,{api,controller:preferences
-}),_$createComponent(SettingsBinding,{api,preferences,mcp
+}),_$createComponent(SettingsBinding,{api,preferences,mcp,skills
 }),_$createComponent(SidebarToggleBinding,{api,preferences
 }),_$createComponent(SidebarFocusBinding,{api,preferences,interaction
 }),_$createComponent(SearchBinding,{api,preferences,get onNewSession(){return startup.handleNewSession
 },interaction,skills,subagents,mcp
 }),_$createComponent(FirstRunWizardPersistence,{api,preferences
 }),_$createComponent(StartupSessionBinding,{api,controller:startup
-}),_$createComponent(UpgradeNotesBinding,{api,preferences,version:"0.18.1"
+}),_$createComponent(UpgradeNotesBinding,{api,preferences,version:"0.19.0"
 }),_$createComponent(McpPersistence,{api,controller:mcp
 })]
 }})
 },sidebar_title(_context,props){return _$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
-},get children(){return _$createComponent(SidebarTitle,{api,preferences,mcp,interaction,get sessionID(){return props.session_id
+},get children(){return _$createComponent(SidebarTitle,{api,preferences,mcp,skills,interaction,get sessionID(){return props.session_id
 },get title(){return props.title
 }})
 }})
@@ -7473,7 +7505,7 @@ api.slots.register({order:100,slots:{app(){return _$createComponent(IconProvider
 }})
 }})
 }}})
-return{mcp,preferences
+return{mcp,skills,preferences
 }}
 var setupOpenCodeV1=async (api,options,meta)=>{const{preferences
 }=await setupNavigator(api,options,async ()=>{if(!api.client?.file?.read||!api.state.path.worktree)
@@ -7486,12 +7518,12 @@ throw result.error
 }
 return result.data?.type==="text"?result.data.content:undefined
 })
-const versionStatus=createVersionStatus(api,"0.18.1")
-const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.18.1"))
+const versionStatus=createVersionStatus(api,"0.19.0")
+const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.19.0"))
 api.slots.register({order:90,slots:{sidebar_footer(_context,props){return _$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
 },get children(){return _$createComponent(VersionFooter,{api,get sessionID(){return props.session_id
-},navigatorVersion:"0.18.1",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.19.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }})
 }})
@@ -7499,25 +7531,25 @@ api.slots.register({order:90,slots:{sidebar_footer(_context,props){return _$crea
 }
 var setupOpenCodeV2=async (context)=>{const adapter=createOpenCodeV2Api(context)
 const todo=createNavigatorTodoController(context,adapter.api)
-const{mcp,preferences
+const{mcp,skills,preferences
 }=await setupNavigator(adapter.api,context.options,async ()=>{if(!context.client.file?.read)
 return
 return new TextDecoder().decode(await context.client.file.read({location:context.location,path:".opencode/navigator.json"
 }))
 },todo)
-const versionStatus=createVersionStatus(adapter.api,"0.18.1")
-const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.18.1"))
+const versionStatus=createVersionStatus(adapter.api,"0.19.0")
+const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.19.0"))
 const disposeFooter=context.ui.slot({append:"sidebar.footer",render:()=>_$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
 },get children(){var _el$=_$createElement("box")
 _$setProp(_el$,"flexDirection","row")
 _$setProp(_el$,"justifyContent","space-between")
 _$insert(_el$,_$createComponent(VersionSummary,{get api(){return adapter.api
-},navigatorVersion:"0.18.1",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.19.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }}),null)
 _$insert(_el$,_$createComponent(SettingsFooterButton,{get api(){return adapter.api
-},preferences,mcp
+},preferences,mcp,skills
 }),null)
 return _el$
 }})
@@ -7528,5 +7560,5 @@ await adapter.dispose()
 var plugin={id:PLUGIN_ID,tui:setupOpenCodeV1,setup:setupOpenCodeV2
 }
 var plugin_default=plugin
-export{DEFAULT_SECTION_EXPANSION,FOCUS_COMMAND,FirstRunWizard,KeyboardHelpDialog,LspBadge,McpSection,QUICK_ACTIONS,Section,SectionFilter,SettingsDialog,SidebarFocusBinding,SidebarToggleBinding,SkillsSection,createMcpController,createPreferencesController,createSidebarInteraction,createSkillController,createSubagentController,createTodoController,plugin_default as default,isEffectivelyVisible,lspIcon,matchesFilter,openFirstRunWizard,openKeyboardHelp,openSettings,showFirstRunWizard
+export{DEFAULT_SECTION_EXPANSION,DialogSurface,FOCUS_COMMAND,FirstRunWizard,KeyboardHelpDialog,LspBadge,McpSection,PresetMenu,QUICK_ACTIONS,Section,SectionFilter,SelectionBox,SettingsDialog,SidebarFocusBinding,SidebarToggleBinding,SkillsSection,createDialogStack,createMcpController,createPreferencesController,createSidebarInteraction,createSkillController,createSubagentController,createTodoController,plugin_default as default,isEffectivelyVisible,lspIcon,matchesFilter,openFirstRunWizard,openKeyboardHelp,openSettings,showFirstRunWizard,useDialogScroll,useDialogState,useDialogs,useIcons
 }