opencode-navigator 0.22.0 → 0.23.0

package/dist/tui.js

@@ -1,9 +1,9 @@
-import {insert as _$insert,setProp as _$setProp,createElement as _$createElement,memo as _$memo,createComponent as _$createComponent,mergeProps as _$mergeProps,effect as _$effect,createTextNode as _$createTextNode,insertNode as _$insertNode,use as _$use,spread as _$spread,useTerminalDimensions,useTerminalDimensions as useTerminalDimensions2,useTerminalDimensions as useTerminalDimensions3,useTerminalDimensions as useTerminalDimensions4,useTerminalDimensions as useTerminalDimensions5,useTerminalDimensions as useTerminalDimensions6,useTerminalDimensions as useTerminalDimensions7,useTerminalDimensions as useTerminalDimensions8,useTerminalDimensions as useTerminalDimensions9} from "@opentui/solid"
+import {insert as _$insert,setProp as _$setProp,createElement as _$createElement,memo as _$memo,createComponent as _$createComponent,mergeProps as _$mergeProps,useRenderer,effect as _$effect,createTextNode as _$createTextNode,insertNode as _$insertNode,use as _$use,spread as _$spread,useTerminalDimensions,useTerminalDimensions as useTerminalDimensions2,useTerminalDimensions as useTerminalDimensions3,useTerminalDimensions as useTerminalDimensions4,useRenderer as useRenderer2,useTerminalDimensions as useTerminalDimensions5,useTerminalDimensions as useTerminalDimensions6,useTerminalDimensions as useTerminalDimensions7,useTerminalDimensions as useTerminalDimensions8,useTerminalDimensions as useTerminalDimensions9} from "@opentui/solid"
 
 
 
 
-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,createEffect as createEffect4,Show,splitProps as splitProps3,Suspense,lazy,createSignal as createSignal4,createSignal as createSignal5,onCleanup as onCleanup3,Show as Show2,batch,createSignal as createSignal7,createSignal as createSignal6,createEffect as createEffect5,createSignal as createSignal8,onCleanup as onCleanup4,createSignal as createSignal9,createSignal as createSignal10,Suspense as Suspense2,lazy as lazy2,Index,onCleanup as onCleanup5,createSignal as createSignal11,onCleanup as onCleanup6,createEffect as createEffect7,onCleanup as onCleanup8,batch as batch2,createEffect as createEffect6,createMemo,createSignal as createSignal12,onCleanup as onCleanup7,onMount,For as For2,For as For3,Show as Show3,createMemo as createMemo2,Show as Show4,createSignal as createSignal13,onCleanup as onCleanup9,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 Show6,createEffect as createEffect8,createSignal as createSignal14,onCleanup as onCleanup10,Show as Show5,For as For6,For as For9,createEffect as createEffect9,createMemo as createMemo5,onCleanup as onCleanup11,createEffect as createEffect10,createMemo as createMemo6,untrack as untrack2,Suspense as Suspense3,lazy as lazy3,onCleanup as onCleanup12,createEffect as createEffect11,onCleanup as onCleanup13,createSignal as createSignal15,createMemo as createMemo7,createSignal as createSignal16,lazy as lazy4,Show as Show9,For as For10,Show as Show8,Show as Show7,createEffect as createEffect12,onCleanup as onCleanup14,onMount as onMount4,onCleanup as onCleanup15,onMount as onMount5,For as For11,createSignal as createSignal17,createSignal as createSignal18,Show as Show10,createSignal as createSignal20,createSignal as createSignal19,onCleanup as onCleanup16,For as For12,Show as Show13,createMemo as createMemo9,createComputed,createMemo as createMemo8,createSignal as createSignal21,untrack as untrack3,Show as Show11,createComputed as createComputed2,untrack as untrack4,Show as Show12,createSignal as createSignal23,createEffect as createEffect13,createSignal as createSignal22,on,createMemo as createMemo11,createSignal as createSignal26,createMemo as createMemo10,For as For13,Show as Show17,Show as Show14,Show as Show15,createSignal as createSignal24,createContext as createContext3,useContext as useContext3,Show as Show16,createSignal as createSignal25,onCleanup as onCleanup17,Show as Show23,createSignal as createSignal27,untrack as untrack5,createSignal as createSignal28,createSignal as createSignal29,createEffect as createEffect14,For as For15,Show as Show18,For as For14,Show as Show19,Show as Show20,Show as Show21,Show as Show22,For as For16,Show as Show25,createMemo as createMemo13,Show as Show24,createMemo as createMemo12,createSignal as createSignal30,createContext as createContext4,useContext as useContext4,Show as Show26,Suspense as Suspense4,createEffect as createEffect15,onCleanup as onCleanup18,untrack as untrack6,For as For22,Match,Switch,createMemo as createMemo19,onCleanup as onCleanup24,For as For17,Show as Show27,createMemo as createMemo15,createSignal as createSignal32,createEffect as createEffect16,createMemo as createMemo14,onCleanup as onCleanup19,untrack as untrack7,createEffect as createEffect17,createSignal as createSignal31,onCleanup as onCleanup20,For as For18,Show as Show29,createSignal as createSignal33,createEffect as createEffect18,createMemo as createMemo16,onCleanup as onCleanup21,untrack as untrack8,Show as Show28,For as For20,Show as Show32,createEffect as createEffect19,createMemo as createMemo17,createSignal as createSignal34,onCleanup as onCleanup22,untrack as untrack9,For as For19,Show as Show31,Show as Show30,Show as Show36,createEffect as createEffect20,createMemo as createMemo18,createSignal as createSignal35,onCleanup as onCleanup23,untrack as untrack10,For as For21,Show as Show34,Show as Show33,Show as Show35,createEffect as createEffect21,createMemo as createMemo20,onCleanup as onCleanup25,untrack as untrack11,Show as Show37,createMemo as createMemo21,onCleanup as onCleanup26,createEffect as createEffect22,createMemo as createMemo22,on as on2,onCleanup as onCleanup27,createSignal as createSignal36,onCleanup as onCleanup28,onMount as onMount6} from "solid-js"
+import {createSignal as createSignal2,createSignal,createEffect,onCleanup,createContext,useContext,createContext as createContext2,createSignal as createSignal3,onCleanup as onCleanup2,useContext as useContext2,createEffect as createEffect2,splitProps,untrack,splitProps as splitProps2,For,createEffect as createEffect3,onCleanup as onCleanup3,createEffect as createEffect4,Show,splitProps as splitProps3,Suspense,lazy,createSignal as createSignal4,createSignal as createSignal5,onCleanup as onCleanup4,Show as Show2,batch,createSignal as createSignal7,createSignal as createSignal6,createEffect as createEffect5,createSignal as createSignal8,onCleanup as onCleanup5,createSignal as createSignal9,createSignal as createSignal10,Suspense as Suspense2,lazy as lazy2,Index,onCleanup as onCleanup6,createSignal as createSignal11,onCleanup as onCleanup7,createEffect as createEffect7,onCleanup as onCleanup9,batch as batch2,createEffect as createEffect6,createMemo,createSignal as createSignal12,onCleanup as onCleanup8,onMount,For as For2,For as For3,Show as Show3,createMemo as createMemo2,Show as Show4,createSignal as createSignal13,onCleanup as onCleanup10,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 Show6,createEffect as createEffect8,createSignal as createSignal14,onCleanup as onCleanup11,Show as Show5,For as For6,For as For9,createEffect as createEffect9,createMemo as createMemo5,onCleanup as onCleanup12,createEffect as createEffect10,createMemo as createMemo6,untrack as untrack2,Suspense as Suspense3,lazy as lazy3,onCleanup as onCleanup13,createEffect as createEffect11,onCleanup as onCleanup14,createSignal as createSignal15,createMemo as createMemo7,createSignal as createSignal16,lazy as lazy4,Show as Show9,For as For10,Show as Show8,Show as Show7,createEffect as createEffect12,onCleanup as onCleanup15,onMount as onMount4,onCleanup as onCleanup16,onMount as onMount5,For as For11,createSignal as createSignal17,createSignal as createSignal18,Show as Show10,createSignal as createSignal20,createSignal as createSignal19,onCleanup as onCleanup17,For as For12,Show as Show13,createMemo as createMemo9,createComputed,createMemo as createMemo8,createSignal as createSignal21,untrack as untrack3,Show as Show11,createComputed as createComputed2,untrack as untrack4,Show as Show12,createSignal as createSignal23,createEffect as createEffect13,createSignal as createSignal22,on,createMemo as createMemo11,createSignal as createSignal26,createMemo as createMemo10,For as For13,Show as Show17,Show as Show14,Show as Show15,createSignal as createSignal24,createContext as createContext3,useContext as useContext3,Show as Show16,createSignal as createSignal25,onCleanup as onCleanup18,Show as Show23,createSignal as createSignal27,untrack as untrack5,createSignal as createSignal28,createSignal as createSignal29,createEffect as createEffect14,For as For15,Show as Show18,For as For14,createSignal as createSignal30,Show as Show19,Show as Show20,Show as Show21,Show as Show22,For as For16,Show as Show25,createMemo as createMemo13,Show as Show24,createMemo as createMemo12,createSignal as createSignal31,createContext as createContext4,useContext as useContext4,Show as Show26,Suspense as Suspense4,createEffect as createEffect15,onCleanup as onCleanup19,untrack as untrack6,For as For22,Match,Switch,createMemo as createMemo19,onCleanup as onCleanup25,For as For17,Show as Show27,createMemo as createMemo15,createSignal as createSignal33,createEffect as createEffect16,createMemo as createMemo14,onCleanup as onCleanup20,untrack as untrack7,createEffect as createEffect17,createSignal as createSignal32,onCleanup as onCleanup21,For as For18,Show as Show29,createSignal as createSignal34,createEffect as createEffect18,createMemo as createMemo16,onCleanup as onCleanup22,untrack as untrack8,Show as Show28,For as For20,Show as Show32,createEffect as createEffect19,createMemo as createMemo17,createSignal as createSignal35,onCleanup as onCleanup23,untrack as untrack9,For as For19,Show as Show31,Show as Show30,Show as Show36,createEffect as createEffect20,createMemo as createMemo18,createSignal as createSignal36,onCleanup as onCleanup24,untrack as untrack10,For as For21,Show as Show34,Show as Show33,Show as Show35,createEffect as createEffect21,createMemo as createMemo20,onCleanup as onCleanup26,untrack as untrack11,Show as Show37,createMemo as createMemo21,onCleanup as onCleanup27,createEffect as createEffect22,createMemo as createMemo22,on as on2,onCleanup as onCleanup28,createRoot,createSignal as createSignal37,getOwner,createSignal as createSignal38,onCleanup as onCleanup29,onMount as onMount6} from "solid-js"
 var SIDEBAR_SECTIONS=["limits","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"
@@ -230,7 +230,7 @@ return
 const error=status.error
 return typeof error==="string"?error:undefined
 }
-function createMcpController(api,persist,preferences){const [snapshots,setSnapshots]=createSignal2({})
+function createMcpController(api,persist,preferences,source){const [snapshots,setSnapshots]=createSignal2({})
 const [mutationCounts,setMutationCounts]=createSignal2({})
 const [bulkStates,setBulkStates]=createSignal2({})
 const [selectedPresets,setSelectedPresets]=createSignal2({})
@@ -303,7 +303,7 @@ const failed=state.failed.filter((candidate)=>candidate!==name)
 bulkRetries.set(current.key,(bulkRetries.get(current.key)??[]).filter((candidate)=>candidate.name!==name))
 return{...values,[current.key]:{...state,status:failed.length>0?"error":"ready",failed}}})
 }
-function list(current=target()){return snapshots()[current.key]??api.state.mcp()
+function list(current=target()){return source?source.list(current):snapshots()[current.key]??api.state.mcp()
 }
 async function refresh(current=target(),force=false){const pending=refreshing.get(current.key)
 if(pending&&!force)
@@ -311,8 +311,7 @@ return pending
 const requestState=requests.start(current.key,"refresh MCP servers",current.key in snapshots(),force)
 if(!requestState)
 return pending
-const request=api.client.mcp.status(current.routing,{throwOnError:true,signal:requestState.signal}).then((result)=>{const items=Object.entries(result.data??{}).map(([name,status])=>({name,status:status.status,error:statusError(status)})).sort((a,b)=>a.name.localeCompare(b.name))
-if(requestState.isCurrent())
+const request=(source?source.refresh(current,force,requestState.signal):api.client.mcp.status(current.routing,{throwOnError:true,signal:requestState.signal}).then((result)=>Object.entries(result.data??{}).map(([name,status])=>({name,status:status.status,error:statusError(status)})).sort((a,b)=>a.name.localeCompare(b.name)))).then((items)=>{if(!source&&requestState.isCurrent())
 setSnapshots((value)=>({...value,[current.key]:items}))
 if(requestState.isCurrent())
 reconcileSelectedPreset(current,items)
@@ -684,6 +683,7 @@ return _$createComponent(DialogContext.Provider,{get value(){return props.scope
 }})
 }
 
+
 function useDialogs(api){const scope=useContext2(DialogContext)
 const icons=useIcons()
 if(scope?.api===api)
@@ -700,17 +700,31 @@ const state=createSignal3(initial)
 scope.frame.state.set(key,state)
 return state
 }
-function useDialogScroll(key="scroll"){const [position,setPosition]=useDialogState(key,0)
+function useDialogScroll(key="scroll"){const renderer=useRenderer()
+const [position,setPosition]=useDialogState(key,0)
 let body
 let isPending=true
-return{ref(node){body=node
-},restore(){if(!isPending||!body)
+function restore(){if(!isPending||!body||body.isDestroyed)
+return
+if(position()>0&&body.scrollHeight===0)
 return
 isPending=false
 body.scrollTo(position())
-},save(){if(body&&!body.isDestroyed)
+}
+function save(){if(!isPending&&body&&!body.isDestroyed)
 setPosition(body.scrollTop)
-}}}
+}
+const frame=()=>{restore()
+save()
+}
+renderer.on("frame",frame)
+onCleanup2(()=>{save()
+renderer.off("frame",frame)
+})
+return{ref(node){body=node
+renderer.requestRender()
+},restore,save
+}}
 
 
 
@@ -951,7 +965,7 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"space",cmd:`${prefix}.select`
 }]
 })
-onCleanup2(unregister)
+onCleanup3(unregister)
 return _$createComponent(DialogSurface,{get api(){return props.api
 },get lift(){return props.lift
 },get children(){return [(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` `),_el$4=_$createElement("text")
@@ -991,9 +1005,9 @@ _$insert(_el$1,(()=>{var _c$=_$memo(()=>!!option.icon)
 return()=>_c$()?`${icons.icon(option.icon)} `:""
 })(),null)
 _$insert(_el$1,()=>option.title,null)
-_$effect((_p$)=>{var _v$8=active()===index()?TextAttributes2.BOLD:undefined,_v$9=theme().text
-_v$8!==_p$.e&&(_p$.e=_$setProp(_el$1,"attributes",_v$8,_p$.e))
-_v$9!==_p$.t&&(_p$.t=_$setProp(_el$1,"fg",_v$9,_p$.t))
+_$effect((_p$)=>{var _v$5=active()===index()?TextAttributes2.BOLD:undefined,_v$6=theme().text
+_v$5!==_p$.e&&(_p$.e=_$setProp(_el$1,"attributes",_v$5,_p$.e))
+_v$6!==_p$.t&&(_p$.t=_$setProp(_el$1,"fg",_v$6,_p$.t))
 return _p$
 },{e:undefined,t:undefined
 })
@@ -1006,13 +1020,7 @@ return _el$10
 })()]
 }})
 }))
-_$effect((_p$)=>{var{restore:_v$5,save:_v$6}=scroll,_v$7=props.adaptive?Math.min(props.height??Math.min(props.options.length*3,15),Math.max(2,Math.floor(dimensions().height*0.75)-8)):props.height??Math.min(props.options.length*3,15)
-_v$5!==_p$.e&&(_p$.e=_$setProp(_el$5,"renderBefore",_v$5,_p$.e))
-_v$6!==_p$.t&&(_p$.t=_$setProp(_el$5,"renderAfter",_v$6,_p$.t))
-_v$7!==_p$.a&&(_p$.a=_$setProp(_el$5,"height",_v$7,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
+_$effect((_$p)=>_$setProp(_el$5,"height",props.adaptive?Math.min(props.height??Math.min(props.options.length*3,15),Math.max(2,Math.floor(dimensions().height*0.75)-8)):props.height??Math.min(props.options.length*3,15),_$p))
 return _el$5
 })(),(()=>{var _el$7=_$createElement("text"),_el$8=_$createTextNode(` navigate \xB7 `),_el$9=_$createTextNode(` select \xB7 `),_el$0=_$createTextNode(` close`)
 _$insertNode(_el$7,_el$8)
@@ -2283,7 +2291,7 @@ return{behavior,layout:{sections,expanded:{},...sectionOrder&&{order:sectionOrde
 function configuredDefaultsFromPluginOptions(options){return mergeConfiguredDefaults(legacyDefaults(pluginConfig(options)),parseConfiguredDefaults(options??{}))
 }
 
-function createSkillController(api){const [skills,setSkills]=createSignal5({})
+function createSkillController(api,source){const [skills,setSkills]=createSignal5({})
 const refreshing=new Map
 const targets=new Map
 const requests=createRequestState(api.lifecycle.signal)
@@ -2292,7 +2300,7 @@ let activeTarget
 let leases=new Set
 function target(){return currentLocation(api)
 }
-function list(current=target()){return skills()[current.key]??[]
+function list(current=target()){return source?source.list(current):skills()[current.key]??[]
 }
 function error(current=target()){return requests.state(current.key).error?.message
 }
@@ -2303,8 +2311,8 @@ targets.set(current.key,current)
 const requestState=requests.start(current.key,"refresh skills",current.key in skills(),force)
 if(!requestState)
 return pending
-const request=api.client.app.skills(current.routing,{throwOnError:true,signal:requestState.signal}).then((result)=>{const items=[...result.data??[]].sort((a,b)=>a.name.localeCompare(b.name))
-if(requestState.isCurrent())
+const request=(source?source.refresh(current,force,requestState.signal).then((data)=>({data})):api.client.app.skills(current.routing,{throwOnError:true,signal:requestState.signal})).then((result)=>{const items=[...result.data??[]].sort((a,b)=>a.name.localeCompare(b.name))
+if(!source&&requestState.isCurrent())
 setSkills((value)=>({...value,[current.key]:items}))
 requestState.succeed()
 return items
@@ -2340,12 +2348,12 @@ targets.delete(current.key)
 requests.abortAll()
 promptRequests.abortAll()
 refreshing.clear()
-}},async use(current,name){if(activeTarget&&activeTarget!==current.key||target().key!==current.key)
+}},async use(current,name,selected){if(activeTarget&&activeTarget!==current.key||target().key!==current.key)
 throw new DOMException("Sidebar context changed","AbortError")
 const request=promptRequests.start(current.key,"insert skill",false,true)
 if(!request)
 return false
-try{const result=await api.client.tui.appendPrompt({...current.routing,text:`/${name} `},{throwOnError:true,signal:request.signal})
+try{const result=source&&selected?{data:await source.use(current,selected,request.signal)}:await api.client.tui.appendPrompt({...current.routing,text:`/${name} `},{throwOnError:true,signal:request.signal})
 if(!request.isCurrent())
 return false
 request.succeed()
@@ -2578,7 +2586,7 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"return",cmd:`${PLUGIN_ID}.skill-dialog.submit`
 }]
 })
-onCleanup3(unregister)
+onCleanup4(unregister)
 return _$createComponent(DialogSurface,{get api(){return props.api
 },get children(){return [_$createComponent(SkillDialogHeader,{get api(){return props.api
 },get name(){return props.skill.name
@@ -2601,11 +2609,15 @@ return _$createComponent(DialogSurface,{get api(){return props.api
 function skillUnavailable(controller,skill){const list=controller.list()
 if(list.every((item)=>!(item.name===skill.name&&item.location===skill.location)))
 return "Skill is unavailable in this workspace"
-if(list.filter((item)=>item.name===skill.name).length!==1)
+if(skill.id){if(list.every((item)=>item.id!==skill.id||item.location!==skill.location))
+return "Skill source changed"
+} else if(list.filter((item)=>item.name===skill.name).length!==1)
 return "Multiple sources share this skill name"
 return
 }
-function activateSkill(input){const target=input.controller.target()
+function activateSkill(input){input={...input,skill:{...input.skill
+}}
+const target=input.controller.target()
 const route=JSON.stringify(input.api.route.current)
 const current=()=>target.key===input.controller.target().key&&route===JSON.stringify(input.api.route.current)
 const report=(error)=>{if(!isAbortError(error))
@@ -2622,7 +2634,7 @@ async function insert(skip=false){try{check()
 if(skip)
 input.access.skipSkillConfirmation(input.skill)
 input.beforeInsert?.()
-if(await input.controller.use(target,input.skill.name))
+if(await input.controller.use(target,input.skill.name,input.skill))
 await input.access.recordSkillUse?.(input.skill)
 } catch(error){report(error)
 }}
@@ -2699,7 +2711,8 @@ return targets.get(key)?.recent??[]
 var POLL_INTERVAL_MS=5000
 function activeStatus(status){return status?.type==="busy"||status?.type==="retry"
 }
-function createSubagentController(api,options={}){const now=options.now??Date.now
+function createSubagentController(api,options={}){const source=options.source
+const now=options.now??Date.now
 const history=createSubagentHistory({now})
 const [children,setChildren]=createSignal7({})
 const [statuses,setStatuses]=createSignal7({})
@@ -2712,6 +2725,7 @@ const remoteRetryAt=new Map
 const requests=createRequestState(api.lifecycle.signal)
 let activeTarget
 let pollTimer
+const snapshots=()=>source?Object.fromEntries([...targets].map(([key,current])=>[key,source.list(current.parentID)])):children()
 function target(parentID){const parent=api.state.session.get(parentID)
 const directory=parent?.directory??api.state.path.directory
 const workspace=parent?.workspaceID
@@ -2730,16 +2744,18 @@ history.remove(key,sessionID)
 }
 for(const journal of journals)
 journal.sessions.push(mutation)
+if(!source)
 setChildren((current)=>Object.fromEntries(Object.entries(current).map(([key,items])=>[key,applySession(items,targets.get(key).parentID,mutation)])))
 }
 function recordStatus(input){const mutation={...input,at:now(),observed:new Set}
 for(const journal of journals)
 journal.statuses.push(mutation)
-batch(()=>{for(const [key,items] of Object.entries(children())){if(items.every((item)=>item.id!==mutation.sessionID))
+batch(()=>{for(const [key,items] of Object.entries(snapshots())){if(items.every((item)=>item.id!==mutation.sessionID))
 continue
 history.observeStatus(key,mutation.sessionID,mutation.status,mutation.at)
 mutation.observed.add(key)
 }
+if(!source)
 setStatuses((current)=>Object.fromEntries(Object.entries(current).map(([key,value])=>[key,applyStatus(value,mutation)])))
 })
 }
@@ -2748,7 +2764,7 @@ return
 const mutation={sessionID:input.sessionID,error:input.error,at:now(),observed:new Set}
 for(const journal of journals)
 journal.errors.push(mutation)
-for(const [key,items] of Object.entries(children())){if(items.every((item)=>item.id!==mutation.sessionID))
+for(const [key,items] of Object.entries(snapshots())){if(items.every((item)=>item.id!==mutation.sessionID))
 continue
 history.observeError(key,mutation.sessionID,mutation.error,mutation.at)
 mutation.observed.add(key)
@@ -2765,12 +2781,13 @@ if(!requestState){journals.delete(journal)
 return pending
 }
 const signal=AbortSignal.any([requestState.signal,AbortSignal.timeout(5000)])
-const request=Promise.all([api.client.session.children({sessionID:current.parentID,...current.routing},{throwOnError:true,signal}),api.client.session.status(current.routing,{throwOnError:true,signal})]).then(async ([childResult,statusResult])=>{let nextChildren=childResult.data??[]
+const request=(source?source.refresh(current.parentID,signal).then(()=>[{data:source.list(current.parentID)},{data:Object.fromEntries(source.list(current.parentID).map((item)=>[item.id,source.status(item.id)]))
+}]):Promise.all([api.client.session.children({sessionID:current.parentID,...current.routing},{throwOnError:true,signal}),api.client.session.status(current.routing,{throwOnError:true,signal})])).then(async ([childResult,statusResult])=>{let nextChildren=childResult.data??[]
 for(const mutation of journal.sessions)
 nextChildren=applySession(nextChildren,current.parentID,mutation)
 let nextStatuses={...statusResult.data}
 const missing={}
-const remoteStatuses=await Promise.all(nextChildren.map((session)=>{const key=JSON.stringify([current.key,session.id])
+const remoteStatuses=source?[]:await Promise.all(nextChildren.map((session)=>{const key=JSON.stringify([current.key,session.id])
 return(remoteRetryAt.get(key)??0)<=now()?fetchDevTeamStatus(session,requestState.signal):{sessionID:session.id,failed:true,cooldown:true,status:undefined}}))
 if(!requestState.isCurrent())
 return
@@ -2807,8 +2824,9 @@ history.observeStatus(current.key,session.id,status)
 for(const mutation of journal.errors){if(mutation.sessionID===session.id&&!mutation.observed.has(current.key))
 history.observeError(current.key,session.id,mutation.error,mutation.at)
 }}
-setChildren((value)=>({...value,[current.key]:nextChildren}))
+if(!source){setChildren((value)=>({...value,[current.key]:nextChildren}))
 setStatuses((value)=>({...value,[current.key]:nextStatuses}))
+}
 setUnavailable((value)=>({...value,[current.key]:missing}))
 })
 }
@@ -2826,13 +2844,13 @@ return request
 function refresh(parentID,force=false){return refreshTarget(target(parentID),force)
 }
 function list(parentID){const current=target(parentID)
-const currentStatuses=statuses()[current.key]??{}
-return(children()[current.key]??[]).map((session)=>({session,status:currentStatuses[session.id]??(unavailable()[current.key]?.[session.id]?undefined:api.state.session.status(session.id))
+const currentStatuses=source?Object.fromEntries(source.list(parentID).map((item)=>[item.id,source.status(item.id)])):statuses()[current.key]??{}
+return(snapshots()[current.key]??[]).map((session)=>({session,status:currentStatuses[session.id]??(unavailable()[current.key]?.[session.id]?undefined:api.state.session.status(session.id))
 })).filter((item)=>activeStatus(item.status)).map((item)=>({...item,run:history.active(current.key,item.session.id),unavailable:unavailable()[current.key]?.[item.session.id]
 }))
 }
 function recent(parentID){const current=target(parentID)
-const sessions=new Map((children()[current.key]??[]).map((session)=>[session.id,session]))
+const sessions=new Map((snapshots()[current.key]??[]).map((session)=>[session.id,session]))
 return history.recent(current.key).flatMap((run)=>{const session=sessions.get(run.sessionID)
 return session?[{session,status:{type:"idle"},run,unavailable:false}]:[]
 })
@@ -2862,6 +2880,7 @@ return
 refreshTarget(current).catch(()=>{})
 pollTimer=setTimeout(poll,POLL_INTERVAL_MS)
 }
+if(!source)
 pollTimer=setTimeout(poll,POLL_INTERVAL_MS)
 }
 return()=>{if(activeTarget!==current.key)
@@ -2929,7 +2948,7 @@ createEffect5(()=>{if(key()===undefined)
 return
 setNow(Date.now())
 const timer=setInterval(()=>setNow(Date.now()),1000)
-onCleanup4(()=>clearInterval(timer))
+onCleanup5(()=>clearInterval(timer))
 })
 return now
 }
@@ -3026,6 +3045,21 @@ function openKeyboardHelp(api,iconStyle=()=>"nerd",multilineCorners=()=>true,sho
 
 
 
+var defaults={todo:true,lsp:true}
+var capabilities=new WeakMap
+function setHostCapabilities(api,value){capabilities.set(api,value)
+}
+function hostCapabilities(api){return capabilities.get(api)??defaults
+}
+function hostCapabilityUnavailable(api,section){return section==="todo"||section==="lsp"?hostCapabilities(api).unavailable?.[section]:undefined
+}
+function supportsSidebarSection(api,section){const current=hostCapabilities(api)
+return section!=="todo"&&section!=="lsp"?true:current[section]
+}
+function supportsTitleVisibility(api){return hostCapabilities(api).titleVisibility!==false
+}
+function supportsPermissionMode(api){return hostCapabilities(api).permissionMode!==false
+}
 var QUICK_ACTION_METADATA=[["\uEA73","Rename"],["\uEA82","Timeline"],["\uEBCC","Copy transcript"],["\uEBAC","Export"],["\uEAF5","Compact"],["\uEBEB","Switch session"],["\uEA60","New session"],["\uEB9E","Fork session"],["\uEBCC","Copy last response"],["\uEAA1","First message"],["\uEA9A","Last message"],["\uEA82","Last user message"],["\uEA9A","Next message"],["\uEAA1","Previous message"],["\uEBB3","Auto-approve permissions"]]
 var QUICK_ACTIONS=QUICK_ACTION_IDS.map((command,index)=>({command,icon:QUICK_ACTION_METADATA[index][0],label:QUICK_ACTION_METADATA[index][1]
 }))
@@ -3039,7 +3073,7 @@ return typeof command?.title==="string"?command.title:action.label
 function createQuickActionRevision(api){const [revision,setRevision]=createSignal11(0)
 const unsubscribe=api.keymap.on?.("state",()=>setRevision((value)=>value + 1))
 if(unsubscribe)
-onCleanup6(unsubscribe)
+onCleanup7(unsubscribe)
 return revision
 }
 function orderQuickActionIds(order,favorites){return [...order.filter((id)=>favorites.has(id)),...order.filter((id)=>!favorites.has(id))]
@@ -3052,7 +3086,7 @@ if(!getCommands)
 return
 const command=getCommands({visibility:"registered"}).find((candidate)=>candidate.name===action.command)
 if(!command)
-return "Unavailable in this OpenCode version"
+return hostCapabilities(api).commandsReachableOnly?"Unavailable in the current session":"Unavailable in this OpenCode version"
 const enabled=command.enabled
 if(enabled===false||typeof enabled==="function"&&!enabled())
 return "Unavailable in the current session"
@@ -3165,11 +3199,24 @@ const contrast=background.r*0.299 + background.g*0.587 + background.b*0.114>0.5?
 return{title:mixColor(parseColor2(theme().text),RGBA3.fromValues(contrast,contrast,contrast),0.45),description:mixColor(parseColor2(theme().textMuted),background,0.4)
 }})
 const dimensions=useTerminalDimensions5()
+const renderer=useRenderer2()
 let input
 let body
 let pendingScroll=scrollTop()
 let isDisposed=false
 let refreshGeneration=0
+const onFrame=()=>{if(!body||body.isDestroyed)
+return
+const position=pendingScroll
+pendingScroll=undefined
+if(typeof position==="number")
+body.scrollTo(position)
+else if(typeof position==="string")
+body.scrollChildIntoView(`${prefix}.${position}`)
+setScrollTop(body.scrollTop)
+}
+renderer.on("frame",onFrame)
+onCleanup8(()=>renderer.off("frame",onFrame))
 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(),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)
@@ -3275,10 +3322,10 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"ctrl+r",cmd:`${prefix}.retry`
 }]
 })
-onCleanup7(()=>{isDisposed=true
+onCleanup8(()=>{isDisposed=true
 unregister()
 })
-onCleanup7(props.skills.activate?.(skillTarget)??(()=>{}))
+onCleanup8(props.skills.activate?.(skillTarget)??(()=>{}))
 onMount(()=>{input?.focus()
 refresh().catch(report)
 })
@@ -3291,17 +3338,7 @@ return{active,activeTab,activate,allErrors,byID,dialogs,errors,icons,loading,mat
 pendingScroll=0
 setQueryValue(value)
 setSelectedID(undefined)
-},setSelectedID,renderBefore(){const position=pendingScroll
-pendingScroll=undefined
-if(!body||position===undefined)
-return
-if(typeof position==="number")
-body.scrollTo(position)
-else
-body.scrollChildIntoView(`${prefix}.${position}`)
-},renderAfter(){if(body)
-setScrollTop(body.scrollTop)
-},resultHeight:()=>Math.min(Math.max(3,Math.min(16,Math.floor(dimensions().height*0.5)-9)),Math.max(1,results().length*3 + errors().length*2)),theme
+},setSelectedID,resultHeight:()=>Math.min(Math.max(3,Math.min(16,Math.floor(dimensions().height*0.5)-9)),Math.max(1,results().length*3 + errors().length*2)),theme
 }}
 
 
@@ -3470,13 +3507,11 @@ return _el$8
 })
 })
 }}),null)
-_$effect((_p$)=>{var _v$=`${model.prefix}.results`,{renderBefore:_v$2,renderAfter:_v$3}=model,_v$4=model.resultHeight()
+_$effect((_p$)=>{var _v$=`${model.prefix}.results`,_v$2=model.resultHeight()
 _v$!==_p$.e&&(_p$.e=_$setProp(_el$,"id",_v$,_p$.e))
-_v$2!==_p$.t&&(_p$.t=_$setProp(_el$,"renderBefore",_v$2,_p$.t))
-_v$3!==_p$.a&&(_p$.a=_$setProp(_el$,"renderAfter",_v$3,_p$.a))
-_v$4!==_p$.o&&(_p$.o=_$setProp(_el$,"height",_v$4,_p$.o))
+_v$2!==_p$.t&&(_p$.t=_$setProp(_el$,"height",_v$2,_p$.t))
 return _p$
-},{e:undefined,t:undefined,a:undefined,o:undefined
+},{e:undefined,t:undefined
 })
 return _el$
 })()
@@ -3523,9 +3558,9 @@ createEffect7(()=>{const key=props.preferences.searchKey()
 const remove=props.api.keymap.registerLayer({mode:"base",bindings:[{key,cmd:SEARCH_COMMAND
 }]
 })
-onCleanup8(remove)
+onCleanup9(remove)
 })
-onCleanup8(()=>{isDisposed=true
+onCleanup9(()=>{isDisposed=true
 unregister()
 for(const timer of timers)
 clearTimeout(timer)
@@ -3562,21 +3597,6 @@ return value&&valid()&&!blocked()?controller.applyPreset(name,value,target):unde
 
 
 
-var defaults={todo:true,lsp:true}
-var capabilities=new WeakMap
-function setHostCapabilities(api,value){capabilities.set(api,value)
-}
-function hostCapabilities(api){return capabilities.get(api)??defaults
-}
-function hostCapabilityUnavailable(api,section){return section==="todo"||section==="lsp"?hostCapabilities(api).unavailable?.[section]:undefined
-}
-function supportsSidebarSection(api,section){const current=hostCapabilities(api)
-return section!=="todo"&&section!=="lsp"?true:current[section]
-}
-function supportsTitleVisibility(api){return hostCapabilities(api).titleVisibility!==false
-}
-function supportsPermissionMode(api){return hostCapabilities(api).permissionMode!==false
-}
 var ONBOARDING_STEPS=[{title:"A control center that stays compact",summary:"Navigator brings session state, search, and controls into OpenCode's existing sidebar.",icon:"help",features:[{icon:"sections",title:"Progressive disclosure",description:"Expand only the context you need right now."},{icon:"scope",title:"Current context",description:"Follow the active session, workspace, and worktree."},{icon:"actions",title:"Mouse and keyboard",description:"Use the same controls with either input method."}]
 },{title:"Stay oriented while agents work",summary:"Keep current work visible without turning the sidebar into another dashboard.",icon:"todo",features:[{icon:"todo",title:"Todo filters",description:"Separate active, finished, and cancelled work."},{icon:"subagents",title:"Live subagents",description:"See running, retrying, recent, and failed child sessions; open them directly."
 },{icon:"info",title:"Provider limits",description:"Link a matching Codex account for model quotas and confirmed banked resets."
@@ -3798,7 +3818,7 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"return",cmd:`${PLUGIN_ID}.wizard.select`
 }]
 })
-onCleanup9(unregister)
+onCleanup10(unregister)
 return _$createComponent(DialogSurface,{get api(){return props.api
 },get children(){return [(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` Navigator setup`),_el$4=_$createElement("text"),_el$5=_$createTextNode(`Step `),_el$6=_$createTextNode(`/`),_el$7=_$createTextNode(` \xB7 `)
 _$insertNode(_el$,_el$2)
@@ -3974,7 +3994,7 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"ctrl+r",cmd:`${prefix}.refresh`
 }]
 })
-onCleanup10(unregister)
+onCleanup11(unregister)
 createEffect8(()=>{if(!props.valid())
 dialogs.close()
 })
@@ -4014,13 +4034,7 @@ _$setProp(_el$5,"contentOptions",{minHeight:0
 })
 _$setProp(_el$6,"gap",1)
 _$insert(_el$6,()=>props.children)
-_$effect((_p$)=>{var{restore:_v$3,save:_v$4}=scroll,_v$5=Math.min(Math.max(2,Math.floor(dimensions().height*0.75)-14),Math.max(1,props.rowCount*3-1))
-_v$3!==_p$.e&&(_p$.e=_$setProp(_el$5,"renderBefore",_v$3,_p$.e))
-_v$4!==_p$.t&&(_p$.t=_$setProp(_el$5,"renderAfter",_v$4,_p$.t))
-_v$5!==_p$.a&&(_p$.a=_$setProp(_el$5,"height",_v$5,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
+_$effect((_$p)=>_$setProp(_el$5,"height",Math.min(Math.max(2,Math.floor(dimensions().height*0.75)-14),Math.max(1,props.rowCount*3-1)),_$p))
 return _el$5
 })(),_$createComponent(Show6,{get when(){return props.blocked||props.notice
 },get children(){var _el$7=_$createElement("box"),_el$8=_$createElement("text"),_el$9=_$createElement("text")
@@ -4034,9 +4048,9 @@ _$setProp(_el$9,"flexGrow",1)
 _$setProp(_el$9,"wrapMode","word")
 _$setProp(_el$9,"height",2)
 _$insert(_el$9,()=>props.blocked||props.notice)
-_$effect((_p$)=>{var _v$6=props.blocked?theme().warning:theme().accent,_v$7=props.blocked?theme().warning:theme().textMuted
-_v$6!==_p$.e&&(_p$.e=_$setProp(_el$8,"fg",_v$6,_p$.e))
-_v$7!==_p$.t&&(_p$.t=_$setProp(_el$9,"fg",_v$7,_p$.t))
+_$effect((_p$)=>{var _v$3=props.blocked?theme().warning:theme().accent,_v$4=props.blocked?theme().warning:theme().textMuted
+_v$3!==_p$.e&&(_p$.e=_$setProp(_el$8,"fg",_v$3,_p$.e))
+_v$4!==_p$.t&&(_p$.t=_$setProp(_el$9,"fg",_v$4,_p$.t))
 return _p$
 },{e:undefined,t:undefined
 })
@@ -4274,7 +4288,7 @@ function SettingsBinding(props){const unregister=props.api.keymap.registerLayer(
 },cmd:`${PLUGIN_ID}.settings`
 }]
 })
-onCleanup12(unregister)
+onCleanup13(unregister)
 return _$createElement("box")
 }
 
@@ -4302,7 +4316,7 @@ observed=current
 props.preferences.setAutoApprovePermissions(current)
 })
 if(unsubscribe)
-onCleanup13(unsubscribe)
+onCleanup14(unsubscribe)
 return _$createElement("box")
 }
 
@@ -4474,17 +4488,17 @@ function StartupSessionBinding(props){if(props.api.keymap.on){const unregister=p
 return
 queueMicrotask(()=>void props.controller.start())
 })
-onCleanup14(unregister)
+onCleanup15(unregister)
 } else
 createEffect12(()=>{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()
 }]
 })
-onCleanup14(unregister)
+onCleanup15(unregister)
 })
 onMount4(()=>void props.controller.initialize())
-onCleanup14(props.controller.dispose)
+onCleanup15(props.controller.dispose)
 return _$createElement("box")
 }
 function versionParts(value){const match=/^v?(\d+)\.(\d+)\.(\d+)(?:-([^+]+))?/.exec(value)
@@ -4618,7 +4632,7 @@ if(entries.length===0||disposed)
 return
 show()
 } catch{}})
-onCleanup15(()=>{disposed=true
+onCleanup16(()=>{disposed=true
 clearTimeout(pending)
 })
 return _$createElement("box")
@@ -5014,7 +5028,7 @@ const colors=()=>sidebarInteractiveColors(api.theme.current,{focused:focused(),h
 const ref=(renderable)=>{unregister?.()
 unregister=interaction?.register({...descriptor,renderable})
 }
-onCleanup16(()=>unregister?.())
+onCleanup17(()=>unregister?.())
 return{ref,disabled,focused,backgroundColor:()=>colors().backgroundColor,foregroundColor:()=>colors().foregroundColor,onMouseOver:()=>setHovered(true),onMouseOut:()=>setHovered(false),select(event){interaction?.mouseSelect(descriptor.id,event)
 },activate(event){if(interaction)
 return interaction.mouseActivate(descriptor.id,event)
@@ -5676,7 +5690,7 @@ props.interaction.leaveFilter(input)
 else
 input?.blur()
 }
-onCleanup17(()=>unregisterInput?.())
+onCleanup18(()=>unregisterInput?.())
 return _$createComponent(SelectionBox,{ref:(node)=>item.ref(node),get id(){return props.id
 },flexDirection:"row",gap:1,marginTop:1,marginBottom:1,paddingLeft:1,paddingRight:1,get backgroundColor(){return _$memo(()=>!!highlighted())()?theme().primary:item.backgroundColor()
 },get onMouseOver(){return item.onMouseOver
@@ -5886,6 +5900,7 @@ return _$createComponent(SectionWithHeaderAction,{get api(){return props.api
 
 
 
+
 
 
 var ToolbarContext=createContext4()
@@ -5924,7 +5939,7 @@ function QuickActionRow(props){const{api,interaction
 const icons=useIcons()
 const toolbar=useToolbar()
 const theme=()=>api.theme.current
-const [width,setWidth]=createSignal30(0)
+const [width,setWidth]=createSignal31(0)
 const shortcut=createMemo12(()=>{const bindings=api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
 })
 return api.keys.formatBindings(bindings.get(props.action.command))
@@ -6082,7 +6097,7 @@ untrack6(()=>shortcuts.bind(key))
 createEffect15(()=>{if(shortcuts.active()&&(props.api.route.current.name!=="session"||props.api.ui.dialog.open||props.api.mode.current()==="modal"))
 untrack6(shortcuts.cancel)
 })
-onCleanup18(shortcuts.dispose)
+onCleanup19(shortcuts.dispose)
 return(()=>{var _el$=_$createElement("box")
 _$setProp(_el$,"position","absolute")
 _$setProp(_el$,"top",0)
@@ -6104,11 +6119,11 @@ const unregisterCommands=props.api.keymap.registerLayer({commands:[...commands,.
 })=>({name:name.replace(PLUGIN_ID,()=>LEGACY_PLUGIN_ID),run,enabled
 }))]
 })
-onCleanup18(unregisterCommands)
+onCleanup19(unregisterCommands)
 createEffect15(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
 }]
 })
-onCleanup18(unregister)
+onCleanup19(unregister)
 })
 return _$createElement("box")
 }
@@ -6145,7 +6160,7 @@ createEffect16(()=>{if(!needsSkills())
 return
 const current=target()
 const release=untrack7(()=>props.skills.activate(current))
-onCleanup19(release)
+onCleanup20(release)
 untrack7(()=>{props.skills.refresh(current).catch(()=>{})
 })
 })
@@ -6186,12 +6201,12 @@ return{pins,view,run}}
 
 
 function ToolbarButton(props){const icons=useIcons()
-const [hovered,setHovered]=createSignal31(false)
+const [hovered,setHovered]=createSignal32(false)
 const item=useSidebarItem(props.api,props.interaction,{id:props.id,position:()=>({section:0,row:props.row + 1,column:props.column
 }),activate:props.onRun
 },()=>props.reason?props.api.theme.current.textMuted:props.api.theme.current.accent,"control")
 createEffect17(()=>props.onDetails(props.id,item.focused()||hovered()))
-onCleanup20(()=>props.onDetails(props.id,false))
+onCleanup21(()=>props.onDetails(props.id,false))
 return _$createComponent(IconControl,{get id(){return props.id
 },ref(r$){var _ref$=item.ref
 typeof _ref$==="function"?_ref$(r$):item.ref=r$
@@ -6207,8 +6222,8 @@ setHovered(false)
 }
 function SidebarToolbar(props){const model=createToolbarModel(props)
 const icons=useIcons()
-const [width,setWidth]=createSignal32(3)
-const [detail,setDetail]=createSignal32()
+const [width,setWidth]=createSignal33(3)
+const [detail,setDetail]=createSignal33()
 const keys=createMemo15(()=>model.pins().map((pin)=>toolbarPinKey(pin)))
 const layout=createMemo15(()=>toolbarLayout(keys(),width(),props.preferences.toolbarOverflow?.()??"menu"))
 const rows=createMemo15(()=>layout().rows.map((_,index)=>index))
@@ -6289,7 +6304,7 @@ const visibility=createListVisibility({items:filtered,limit:()=>props.preference
 const state=createMemo16(()=>props.controller.state(target()))
 createEffect18(()=>{const current=target()
 const deactivate=untrack8(()=>props.controller.activate?.(current)??(()=>{}))
-onCleanup21(deactivate)
+onCleanup22(deactivate)
 untrack8(()=>void props.controller.refresh(current).catch(()=>{}))
 })
 async function useSkill(item){try{const isInserted=await props.controller.use(target(),item.name)
@@ -6350,7 +6365,7 @@ return _el$
 }
 function SkillsSection(props){const dialogs=useDialogs(props.api)
 const toolbar=useToolbar()
-const [query,setQuery]=createSignal33("")
+const [query,setQuery]=createSignal34("")
 const model=createSkillSectionModel(props,query)
 const navigationSection=()=>props.navigationSection??3
 function selectSkill(item){activateSkill({api:props.api,controller:props.controller,access:props.preferences,dialogs,skill:item,onConfigure:toolbar?(navigation)=>toolbar.configure({kind:"skill",name:item.name,location:item.location,icon:"book"
@@ -6430,8 +6445,8 @@ return _el$
 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]=createSignal34("")
-const [mode,setMode]=createSignal34("all")
+const [query,setQuery]=createSignal35("")
+const [mode,setMode]=createSignal35("all")
 const counts=createMemo17(()=>countSubagentView(rows(),query()))
 const tabs=createMemo17(()=>["all","active","recent",...counts().errors>0?["errors"]:[]])
 const filtered=createMemo17(()=>filterSubagentView(rows(),mode(),query()))
@@ -6454,7 +6469,7 @@ const state=createMemo17(()=>props.controller.state(props.sessionID))
 createEffect19(()=>{const sessionID=props.sessionID
 targetKey()
 const deactivate=untrack9(()=>props.controller.activate?.(sessionID)??(()=>{}))
-onCleanup22(deactivate)
+onCleanup23(deactivate)
 untrack9(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 })
 return{list,recent,rows,query,setQuery,mode,setMode,counts,tabs,filtered,parentID,visibility,now,byId,ids,state
@@ -6823,7 +6838,7 @@ const icons=useIcons()
 const unavailable=()=>hostCapabilityUnavailable(props.api,"todo")
 const managed=()=>("guidance" in props.controller)?props.controller:undefined
 const native=()=>("source" in props.controller)&&props.controller.source==="native"
-const [mode,setMode]=createSignal35("all")
+const [mode,setMode]=createSignal36("all")
 const targetKey=createMemo18(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
 createEffect20(()=>{targetKey()
 setMode("all")
@@ -6837,7 +6852,7 @@ targetKey()
 if(unavailable())
 return
 const deactivate=untrack10(()=>props.controller.activate?.(sessionID)??(()=>{}))
-onCleanup23(deactivate)
+onCleanup24(deactivate)
 untrack10(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 })
 const navigationSection=()=>props.navigationSection??1
@@ -6901,7 +6916,7 @@ return _el$4
 }
 function SidebarContent(props){const sections=props.preferences.sections
 const visibleSections=createMemo19(()=>props.preferences.sectionOrder().filter((section)=>sections()[section]&&supportsSidebarSection(props.api,section)))
-onCleanup24(()=>props.interaction.setContentRoot(undefined))
+onCleanup25(()=>props.interaction.setContentRoot(undefined))
 return _$createComponent(ToolbarProvider,{get api(){return props.api
 },get preferences(){return props.preferences
 },get skills(){return props.skills
@@ -6961,7 +6976,7 @@ const params="params" in route?route.params:undefined
 if(typeof params?.sessionID!=="string")
 return
 const current=props.controller.target()
-onCleanup25(()=>props.controller.deactivate(current))
+onCleanup26(()=>props.controller.deactivate(current))
 untrack11(()=>void props.controller.activate(current).catch(()=>{}))
 })
 return _$createElement("box")
@@ -7001,7 +7016,7 @@ 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,props.skills)
 },()=>theme().textMuted,"control")
-onCleanup26(()=>props.interaction.setTitleRoot(undefined))
+onCleanup27(()=>props.interaction.setTitleRoot(undefined))
 return(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("box"),_el$3=_$createElement("box")
 _$insertNode(_el$,_el$2)
 _$use((node)=>props.interaction.setTitleRoot(node),_el$)
@@ -7086,9 +7101,9 @@ await options.accountSource.refresh(model)
 if(!disposed&&target===targetKey())
 await options.controller.refresh()
 }
-createEffect22(on2(interval,(milliseconds)=>{onCleanup27(schedule(()=>void refresh().catch(()=>{}),milliseconds))
+createEffect22(on2(interval,(milliseconds)=>{onCleanup28(schedule(()=>void refresh().catch(()=>{}),milliseconds))
 }))
-onCleanup27(()=>{disposed=true
+onCleanup28(()=>{disposed=true
 })
 }
 function LimitsPersistence(props){createLimitsRefresh(props)
@@ -7098,20 +7113,16 @@ import {homedir} from "os"
 
 function location(input){return input.directory?{location:{directory:input.directory}}:{}}
 function mcpItem(server){return{name:server.name,status:server.status.status,...server.status.error&&{error:server.status.error}}}
-function skillKey(directory,name){return `${directory}\x00${name}`
-}
-function createV2ClientAdapter(context){const skillIDs=new Map
-return{state:{mcp:()=>(context.data.location.mcp.server.list(context.location)??[]).map((server)=>mcpItem(server))
+function createV2ClientAdapter(context){return{state:{mcp:()=>(context.data.location.mcp.server.list(context.location)??[]).map((server)=>mcpItem(server))
 },client:{app:{async skills(input,options={}){const response=await context.client.skill.list(location(input),{signal:options.signal})
-const directory=input.directory??response.location.directory
-const data=response.data.map((skill)=>{skillIDs.set(skillKey(directory,skill.name),skill.id)
-return{name:skill.name,description:skill.description,location:skill.path,content:skill.content
-}})
+const data=response.data.map((skill)=>({name:skill.name,description:skill.description,location:skill.path,content:skill.content
+}))
 return{data}}},tui:{async appendPrompt(input,options={}){const route=context.ui.router.current()
 const name=/^\/([^\s]+)\s*$/u.exec(input.text)?.[1]
 const directory=input.directory??context.location?.directory??context.data.location.default().directory
 const session=route.type==="session"?context.data.session.get(route.sessionID):undefined
-const id=name?skillIDs.get(skillKey(directory,name)):undefined
+const candidates=context.data.location.skill.list({directory})?.filter((skill)=>skill.name===name)??[]
+const id=candidates.length===1?candidates[0].id:undefined
 if(route.type!=="session"||session?.location.directory!==directory||!id)
 return{data:false}
 await context.client.session.skill({sessionID:route.sessionID,id},{signal:options.signal})
@@ -7129,77 +7140,79 @@ if(name!=="session.status"&&(name!=="session.idle"||started))
 return
 const status=started?{type:"busy"}:{type:"idle"}
 return{sessionID,status,properties:{sessionID,...name==="session.status"&&{status}}}}
-var SESSION_UPDATE_EVENTS=new Set(["session.agent.selected","session.model.selected","session.moved","session.renamed","session.permissions","session.metadata.updated"])
-function createV2EventAdapter(context,sessions){return{on(name,handler){let active=true
-const unsubscribe=context.data.listen(({details})=>{const event=details
-const execution=executionStatus(name,event)
-if(execution){sessions.setStatus(execution.sessionID,execution.status)
-handler({type:name,properties:execution.properties
-})
-return
+var updates=["session.agent.selected","session.model.selected","session.moved","session.renamed","session.permissions","session.metadata.updated"]
+var executions=["session.execution.started","session.execution.succeeded","session.execution.failed","session.execution.interrupted"]
+function eventTypes(name){if(name==="session.updated")
+return updates
+if(name==="session.status")
+return ["session.status","session.retry.scheduled",...executions]
+if(name==="session.idle")
+return ["session.idle",...executions.slice(1)]
+if(name==="session.error")
+return ["session.execution.failed"]
+if(name==="mcp.tools.changed")
+return ["mcp.status.changed","mcp.resources.changed"]
+if(["session.created","session.deleted","server.connected","installation.update-available"].includes(name))
+return [name]
+return []
 }
-if(name==="server.connected"&&event.type==="server.connected"){handler({type:name,properties:{}})
-return
+function statusFor(name,event){if(name==="session.idle")
+return{type:"idle"}
+if(event.type==="session.retry.scheduled")
+return{type:"retry",attempt:Number(event.data.attempt),next:Number(event.data.at),message:event.data.error?.message??"Retrying"
 }
-if(name==="mcp.tools.changed"&&event.type.startsWith("mcp.")){handler({type:name,properties:event.data})
-return
+return event.data.status
 }
-if(name==="installation.update-available"&&event.type==="installation.update-available"){if(typeof event.data.version==="string"){handler({type:name,properties:{version:event.data.version}})
+function createV2EventAdapter(context,sessions){return{on(name,handler){let active=true
+const disposers=eventTypes(name).map((type)=>context.data.on(type,(value)=>{const event=value
+const data=event.data??{}
+const emit=(properties)=>{if(active)
+handler({type:name,properties})
 }
+const execution=executionStatus(name,{type:event.type,data})
+if(execution){sessions.setStatus(execution.sessionID,execution.status)
+emit(execution.properties)
 return
 }
-if(name==="session.deleted"&&event.type==="session.deleted"){handler({type:name,properties:{sessionID:event.data.sessionID}})
+if(name==="server.connected"||name==="mcp.tools.changed"){emit(data)
 return
 }
-if(name==="session.status"&&event.type==="session.status"){const sessionID=event.data.sessionID
-const status=event.data.status
-if(typeof sessionID!=="string"||!status||typeof status!=="object")
-return
-sessions.setStatus(sessionID,status)
-handler({type:name,properties:{sessionID,status}})
+if(name==="installation.update-available"){if(typeof data.version==="string")
+emit({version:data.version})
 return
 }
-if(name==="session.idle"&&event.type==="session.idle"){const sessionID=event.data.sessionID
+const sessionID=data.sessionID
 if(typeof sessionID!=="string")
 return
-sessions.setStatus(sessionID,{type:"idle"})
-handler({type:name,properties:{sessionID}})
-return
+if(name==="session.status"||name==="session.idle"){const status=statusFor(name,{type:event.type,data})
+if(status&&typeof status==="object"){sessions.setStatus(sessionID,status)
+emit(name==="session.idle"?{sessionID}:{sessionID,status})
 }
-if(name==="session.error"&&event.type==="session.execution.failed"){const error=event.data.error
-handler({type:name,properties:{sessionID:event.data.sessionID,error:error&&{name:error.type??"Error",data:{message:error.message??"Session error"}}}})
 return
 }
-const isCreated=name==="session.created"&&event.type==="session.created"
-const isUpdated=name==="session.updated"&&SESSION_UPDATE_EVENTS.has(event.type)
-if(!isCreated&&!isUpdated)
+if(name==="session.deleted"){emit({sessionID})
 return
-const sessionID=event.data.sessionID
-const info=typeof sessionID==="string"?context.data.session.get(sessionID):undefined
-if(info){handler({type:name,properties:{info:sessions.normalize(info)}})
+}
+if(name==="session.error"){const error=data.error
+emit({sessionID,error:error&&{name:error.type??"Error",data:{message:error.message??"Session error"}}})
 return
 }
-if(typeof sessionID!=="string")
+const info=context.data.session.get(sessionID)
+if(info){emit({info:sessions.project(info)})
 return
+}
 context.data.session.sync(sessionID).then(()=>{const synced=context.data.session.get(sessionID)
-if(active&&synced)
-handler({type:name,properties:{info:sessions.normalize(synced)}})
+if(synced)
+emit({info:sessions.project(synced)})
 }).catch(()=>{})
-})
+}))
 return()=>{active=false
-unsubscribe()
+for(const dispose of disposers)
+dispose()
 }}}}
 
-
 function enabled(value){return typeof value==="function"?value():value!==false
 }
-function belongsTo2(renderable,ancestor){if(!renderable||!ancestor)
-return false
-for(let current=renderable;current; current=current.parent){if(current===ancestor)
-return true
-}
-return false
-}
 function v2LayerCommands(id,layer,available,run,dispatch){const named=(layer.commands??[]).map((command)=>({id:command.name,bind:command.name==="session.new"?"<leader>n":undefined,title:command.title,description:command.desc,group:command.category,palette:command.namespace==="palette"?true:undefined,suggested:command.suggested,enabled:()=>available()&&enabled(command.enabled),run:(input,event)=>run(command,input,event)
 }))
 const bindings=(layer.bindings??[]).flatMap((binding,index)=>typeof binding.key==="string"?[{id:`${PLUGIN_ID}.v2-binding.${id}.${index}`,bind:binding.key,enabled:available,run:()=>dispatch(String(binding.cmd))
@@ -7208,98 +7221,112 @@ return [...named,...bindings]
 }
 var SETTINGS_COMMAND="opencode.settings"
 var PERMISSIONS_ACTION="permission.mode"
-function createV2Keymap(context){const [revision,setRevision]=createSignal36(0)
-const layers=new Map
+function createV2Keymap(context){const cleanups=new Set
 let sequence=0
-function layerActive(layer){const mode=layer.mode??"base"
-const target=layer.target
-return(mode==="global"||context.keymap.mode.current()===mode)&&enabled(layer.enabled)&&(!target||belongsTo2(context.renderer.currentFocusedRenderable,target))
-}
-function legacyCommand(name){return [...layers].sort(([leftID,left],[rightID,right])=>(right.priority??0)-(left.priority??0)||rightID-leftID).flatMap(([,layer])=>layerActive(layer)?[layer]:[]).flatMap((layer)=>layer.commands??[]).find((command)=>command.name===name&&enabled(command.enabled))
-}
-function run(command,input="",event){return command.run({keymap,event,focused:context.renderer.currentFocusedRenderable,target:context.renderer.currentFocusedRenderable,data:{},command,input,payload:undefined
+async function run(command,input="",event){await command.run({keymap,event,focused:context.renderer.currentFocusedRenderable,target:context.renderer.currentFocusedRenderable,data:{},command,input,payload:undefined
 })
 }
-async function runV2(command,input="",event){await run(command,input,event)
-}
 const onKeypress=(event)=>{if(event.name!==","||!event.ctrl||event.shift||event.meta||event.super||event.hyper)
 return
-const command=legacyCommand(`${PLUGIN_ID}.settings`)
-if(!command)
+const command=context.keymap.commands().find((item)=>item.id===`${PLUGIN_ID}.settings`)
+if(!command||!enabled(command.enabled))
 return
 event.preventDefault()
 event.stopPropagation()
-runV2(command,"",event)
+context.keymap.dispatch(command.id)
 }
 context.renderer.keyInput.on("keypress",onKeypress)
-function layerCommands([id,layer]){return v2LayerCommands(id,layer,()=>layerActive(layer),runV2,context.keymap.dispatch)
+const keymap={registerLayer(layer){const id=++sequence
+const owner=getOwner()
+const [active,setActive]=createSignal37(true)
+const install=()=>{context.keymap.layer(()=>({mode:typeof layer.mode==="string"?layer.mode:"base",priority:layer.priority,enabled:()=>active()&&enabled(layer.enabled),target:layer.target?()=>layer.target:undefined,commands:v2LayerCommands(id,layer,()=>true,run,context.keymap.dispatch)
+}))
 }
-function Bridge(){context.keymap.layer(()=>{revision()
-const current=[...layers].sort(([leftID,left],[rightID,right])=>(right.priority??0)-(left.priority??0)||rightID-leftID)
-const commands=current.flatMap((entry)=>layerCommands(entry))
-const bindings=commands.flatMap((command)=>command.id?[command.id]:[])
-return{mode:"global",priority:2000,commands,bindings
-}})
-return _$createElement("box")
+let release
+if(owner)
+release=createRoot((cleanup)=>{install()
+return cleanup
+},owner)
+else
+install()
+const dispose=()=>{setActive(false)
+release?.()
 }
-const keymap={registerLayer(layer){const id=++sequence
-layers.set(id,layer)
-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===PERMISSIONS_ACTION?SETTINGS_COMMAND:name))
-if(command){if(!enabled(command.enabled))
+cleanups.add(dispose)
+return()=>{cleanups.delete(dispose)
+dispose()
+}},dispatchCommand(name,options){const target=options?.focused??options?.target
+if(target?.parent&&!target.isDestroyed)
+target.focus()
+const command=context.keymap.commands().find((item)=>item.id===(name===PERMISSIONS_ACTION?SETTINGS_COMMAND:name))
+if(!command)
+return{ok:false,reason:"not-found"
+}
+if(!enabled(command.enabled))
 return{ok:false,reason:"disabled",command
 }
 context.keymap.dispatch(command.id,typeof options?.payload==="string"?options.payload:undefined)
 return{ok:true,command
-}}
-const fallback=legacyCommand(name)
-if(!fallback)
-return{ok:false,reason:"not-found"
-}
-run(fallback)
-return{ok:true,command:fallback
 }},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)
+const result=commands.flatMap((command)=>command.id?[{...command,name:command.id,run:()=>context.keymap.dispatch(command.id)
+}]:[])
+const settings=commands.find((item)=>item.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):[]
 }}
-return{keymap,Bridge,dispose:()=>{context.renderer.keyInput.off("keypress",onKeypress)
+return{keymap,dispose(){for(const cleanup of cleanups)
+cleanup()
+cleanups.clear()
+context.renderer.keyInput.off("keypress",onKeypress)
 }}}
-function createV2SessionAdapter(context){const statuses=new Map
+
+function createV2SessionAdapter(context){const [retryDetails,setRetryDetails]=createSignal38({})
+const projections=new WeakMap
 function normalize(info){const directory=info.location.directory
 const workspaceID=context.location?.directory===directory?context.location.workspaceID:undefined
 return{id:info.id,slug:info.id,projectID:info.projectID,...workspaceID&&{workspaceID},directory,...info.parentID&&{parentID:info.parentID},cost:Number(info.cost),tokens:info.tokens,title:info.title??"Untitled session",...info.agent&&{agent:info.agent},...info.model&&{model:info.model},version:context.app.version,metadata:info.metadata,time:{created:info.time.created,updated:info.time.updated,...info.time.archived&&{archived:info.time.archived}}}}
-function status(sessionID){const cached=statuses.get(sessionID)
-if(cached)
-return cached
-return context.data.session.status(sessionID)==="running"?{type:"busy"}:{type:"idle"}}
-return{normalize,setStatus(sessionID,value){statuses.set(sessionID,value)
+function status(sessionID){if(context.data.session.status(sessionID)!=="running")
+return{type:"idle"}
+const messages=context.data.session.message?.list?.(sessionID)??[]
+let message
+for(let index=messages.length-1;index>=0; index--){const candidate=messages[index]
+if(candidate.type==="assistant"&&!candidate.time.completed){message=candidate
+break
+}}
+if(message?.type==="assistant"&&message.retry)
+return{type:"retry",attempt:message.retry.attempt,next:message.retry.at,message:message.retry.error.message
+}
+return retryDetails()[sessionID]??{type:"busy"}}
+function project(info){let value=projections.get(info)
+if(!value){value=normalize(info)
+for(const key of ["id","slug","projectID","workspaceID","directory","parentID","cost","tokens","title","agent","model","version","metadata","time"])
+Object.defineProperty(value,key,{enumerable:true,get:()=>normalize(info)[key]})
+projections.set(info,value)
+}
+return value
+}
+return{normalize,project,status,setStatus(sessionID,value){setRetryDetails((current)=>{const next={...current}
+if(value.type==="retry")
+next[sessionID]=value
+else
+delete next[sessionID]
+return next
+})
 },state:{count:()=>context.data.session.list().length,get:(sessionID)=>{const value=context.data.session.get(sessionID)
-return value?normalize(value):undefined
+return value?project(value):undefined
 },todo:()=>[],status
 },client:{async create(input,options={}){const directory=input.directory??context.location?.directory??context.data.location.default().directory
 const session=await context.client.session.create({location:{directory}},{signal:options.signal})
 return{data:normalize(session)}},async children(input,options={}){const response=await context.client.session.list({parentID:input.sessionID,...input.directory&&{directory:input.directory}},{signal:options.signal})
 return{data:response.data.map((session)=>normalize(session))}},async status(_input,options={}){const active=await context.client.session.active({signal:options.signal})
-const data=Object.fromEntries(context.data.session.list().map((session)=>[session.id,statuses.get(session.id)??(active[session.id]?{type:"busy"}:{type:"idle"})]))
+const data=Object.fromEntries(context.data.session.list().map((session)=>[session.id,active[session.id]?retryDetails()[session.id]??{type:"busy"}:{type:"idle"}]))
 return{data}},async todo(){return{data:[]}}}}}
 
-
-function createV2Slots(context,keymap,onDispose){return{register(plugin){const slots=plugin.slots
-const cleanups=[context.ui.slot({append:"app",render:()=>[_$createComponent(keymap.Bridge,{}),_$memo(()=>slots.app?.(undefined,{}))]
+function createV2Slots(context,onDispose){return{register(plugin){const slots=plugin.slots
+const cleanups=[context.ui.slot({append:"app",render:()=>_$memo(()=>slots.app?.(undefined,{}))
 }),context.ui.slot({replace:"sidebar.content",render:(input)=>{const sessionID=input.sessionID
 return slots.sidebar_content?.(undefined,{session_id:sessionID
 })
@@ -7321,7 +7348,7 @@ return context.data.session.message.list(route.sessionID).some((message)=>(!reve
 
 function createV2UI(context){let dialogOpen=false
 function DialogPrompt(props){let active=true
-onCleanup28(()=>{active=false
+onCleanup29(()=>{active=false
 })
 onMount6(async ()=>{const value=await context.ui.dialog.prompt({title:props.title,placeholder:props.placeholder,value:props.value
 })
@@ -7335,7 +7362,7 @@ props.onConfirm?.(value)
 return _$createElement("box")
 }
 function DialogConfirm(props){let active=true
-onCleanup28(()=>{active=false
+onCleanup29(()=>{active=false
 })
 onMount6(async ()=>{const confirmed=await context.ui.dialog.confirm({title:props.title,message:props.message
 })
@@ -7397,10 +7424,10 @@ context.ui.router.navigate({type:"plugin",name,data:params})
 },client:{...remote.client,session:sessions.client
 },event:createV2EventAdapter(context,sessions),theme:{get current(){return legacyTheme(context.theme)
 },ready:true,mode:()=>context.themeMode
-},attention:context.attention,lifecycle:{signal:controller.signal,onDispose},slots:createV2Slots(context,keymap,(dispose)=>{onDispose(dispose)
+},attention:context.attention,lifecycle:{signal:controller.signal,onDispose},slots:createV2Slots(context,(dispose)=>{onDispose(dispose)
 })
 }
-setHostCapabilities(api,{todo:true,lsp:false,titleVisibility:false,permissionMode:false
+setHostCapabilities(api,{todo:true,lsp:false,titleVisibility:false,permissionMode:false,commandsReachableOnly:true
 })
 bindToolbarActionState(context,api)
 return{api,async dispose(){controller.abort()
@@ -7470,28 +7497,91 @@ activeTarget=undefined
 requests.abortAll()
 pending.clear()
 }}}}
+function collectionLocation(target){return{directory:target.routing.directory??"",...target.routing.workspace&&{workspaceID:target.routing.workspace}}}
+async function syncCollection(collection,target,force,signal){signal.throwIfAborted()
+const ref=collectionLocation(target)
+if(force)
+collection.invalidate(ref)
+await collection.sync(ref)
+signal.throwIfAborted()
+}
+function createV2McpSource(context){const collection=context.data.location.mcp.server
+const projections=new WeakMap
+const list=(target)=>(collection.list(collectionLocation(target))??[]).map((server)=>{let item=projections.get(server)
+if(!item){item={get name(){return server.name
+},get title(){return server.title
+},get status(){return server.status.status
+},get error(){return "error" in server.status?server.status.error:undefined
+}}
+projections.set(server,item)
+}
+return item
+})
+return{list,async refresh(target,force,signal){await syncCollection(collection,target,force,signal)
+return list(target)
+}}}
+function createV2SkillSource(context){const projections=new WeakMap
+const collection=context.data.location.skill
+const list=(target)=>(collection.list(collectionLocation(target))??[]).map((skill)=>{let item=projections.get(skill)
+if(!item){item={get id(){return skill.id
+},get name(){return skill.name
+},get description(){return skill.description
+},get location(){return skill.path
+},get content(){return skill.content
+}}
+projections.set(skill,item)
+}
+return item
+})
+return{list,async refresh(target,force,signal){await syncCollection(collection,target,force,signal)
+return list(target)
+},async use(target,skill,signal){signal.throwIfAborted()
+const route=context.ui.router.current()
+const session=route.type==="session"&&context.data.session.get(route.sessionID)
+const actual=list(target).find((item)=>item.id===skill.id&&item.location===skill.location)
+if(route.type!=="session"||!session||session.location.directory!==target.routing.directory||!actual?.id)
+throw new Error("Skill target changed; select the source again")
+await context.client.session.skill({sessionID:route.sessionID,id:actual.id},{signal})
+return !signal.aborted
+}}}
+function createV2SubagentSource(context,api){return{list:(parentID)=>context.data.session.list().filter((item)=>item.parentID===parentID).flatMap((item)=>{const value=api.state.session.get(item.id)
+return value?[value]:[]
+}),status:(id)=>api.state.session.status(id)??{type:"idle"},async refresh(parentID,signal){signal.throwIfAborted()
+let cursor
+do{const page=await context.client.session.list(cursor?{cursor,limit:100}:{parentID,limit:100},{signal
+})
+await Promise.all(page.data.filter((item)=>!context.data.session.get(item.id)).map((item)=>context.data.session.sync(item.id)))
+cursor=page.cursor.next??undefined
+signal.throwIfAborted()
+} while(cursor)
+}}}
+function createOpenCodeV2Sources(context,api){return{skills:createV2SkillSource(context),mcp:createV2McpSource(context),subagents:createV2SubagentSource(context,api)
+}}
 function loadNavigatorUpdates(){const path=import.meta.url.includes("/dist/tui.js")?"./navigator-updates.js":"../navigator-updates"
 return import(path)
 }
 async function setupNavigator(api,options,readProject,todoController,hostContext){const config=pluginConfig(undefined)
 const configured=await loadConfiguredDefaults(api,options,readProject)
 const todo=todoController??createTodoController(api)
-const subagents=createSubagentController(api)
-const skills=createSkillController(api)
+const nativeSources=hostContext&&createOpenCodeV2Sources(hostContext,api)
+const subagents=createSubagentController(api,{source:nativeSources?.subagents
+})
+const skills=createSkillController(api,nativeSources?.skills)
 const preferences=createPreferencesController(api,config,createPreferencesStore(api.state.path.state),configured)
 const limitsPath=import.meta.url.includes("/dist/tui.js")?"./provider-limits.js":"../provider-limits"
 const limitsModule=await import(limitsPath)
 const LimitsSection=limitsModule.ProviderLimitsSection
 const{controller:limits,codex,accountSource,selectModel,modelSelection
-}=limitsModule.createProviderQuotaIntegration(api,preferences,"0.22.0",hostContext)
-const mcp=createMcpController(api,preferences.persistMcp,preferences)
+}=limitsModule.createProviderQuotaIntegration(api,preferences,"0.23.0",hostContext)
+const mcp=createMcpController(api,preferences.persistMcp,preferences,nativeSources?.mcp)
 const interaction=createSidebarInteraction(api,()=>openKeyboardHelp(api,preferences.lspIconStyle,preferences.cornerFont,sidebarShortcutActions(api)))
 const startup=createStartupSessionController(api,preferences)
 api.lifecycle.onDispose(()=>preferences.flush())
 api.lifecycle.onDispose(()=>limits.dispose())
 api.lifecycle.onDispose(()=>accountSource?.dispose())
 api.lifecycle.onDispose(()=>interaction.dispose())
-const unsubscribeMcp=api.event.on("mcp.tools.changed",()=>{mcp.refresh().catch(()=>{})
+const unsubscribeMcp=api.event.on("mcp.tools.changed",()=>{if(!nativeSources)
+mcp.refresh().catch(()=>{})
 })
 const unsubscribeConnected=api.event.on("server.connected",()=>{if(!api.state.ready||!api.kv.ready)
 return
@@ -7511,7 +7601,7 @@ api.slots.register({order:100,slots:{app(){return _$createComponent(IconProvider
 },interaction,skills,subagents,mcp
 }),_$createComponent(FirstRunWizardPersistence,{api,preferences
 }),_$createComponent(StartupSessionBinding,{api,controller:startup
-}),_$createComponent(UpgradeNotesBinding,{api,preferences,version:"0.22.0"
+}),_$createComponent(UpgradeNotesBinding,{api,preferences,version:"0.23.0"
 }),_$createComponent(McpPersistence,{api,controller:mcp
 })]
 }})
@@ -7544,12 +7634,12 @@ return result.data?.type==="text"?result.data.content:undefined
 })
 const{createVersionStatus,createVersionUpdateActions,createOpenCodeV1VersionUpdater
 }=await loadNavigatorUpdates()
-const versionStatus=createVersionStatus(api,"0.22.0")
-const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.22.0"))
+const versionStatus=createVersionStatus(api,"0.23.0")
+const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.23.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.22.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.23.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }})
 }})
@@ -7565,15 +7655,15 @@ return new TextDecoder().decode(await context.client.file.read({location:context
 },todo,context)
 const{createVersionStatus,createVersionUpdateActions,createOpenCodeV2VersionUpdater
 }=await loadNavigatorUpdates()
-const versionStatus=createVersionStatus(adapter.api,"0.22.0")
-const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.22.0"))
+const versionStatus=createVersionStatus(adapter.api,"0.23.0")
+const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.23.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.22.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.23.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }}),null)
 _$insert(_el$,_$createComponent(SettingsFooterButton,{get api(){return adapter.api