opencode-navigator 0.25.0 → 0.27.0

package/dist/tui.js

@@ -3,7 +3,6 @@ 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,onCleanup as onCleanup2,useContext as useContext2,createEffect as createEffect2,splitProps,untrack,splitProps as splitProps2,For,createEffect as createEffect3,onCleanup as onCleanup3,Show,createEffect as createEffect4,Show as Show2,splitProps as splitProps3,createEffect as createEffect5,createSignal as createSignal4,onCleanup as onCleanup4,onMount,Suspense,lazy,createSignal as createSignal5,createSignal as createSignal6,onCleanup as onCleanup5,Show as Show3,batch,createSignal as createSignal8,createSignal as createSignal7,createEffect as createEffect6,createSignal as createSignal9,onCleanup as onCleanup6,createSignal as createSignal10,createSignal as createSignal11,Suspense as Suspense2,lazy as lazy2,Index,onCleanup as onCleanup7,createSignal as createSignal12,onCleanup as onCleanup8,createEffect as createEffect8,onCleanup as onCleanup10,batch as batch2,createEffect as createEffect7,createMemo,createSignal as createSignal13,onCleanup as onCleanup9,onMount as onMount2,For as For2,For as For3,Show as Show4,createMemo as createMemo2,Suspense as Suspense3,lazy as lazy3,For as For6,createMemo as createMemo4,onMount as onMount4,For as For5,createMemo as createMemo3,onMount as onMount3,Show as Show6,createEffect as createEffect9,createSignal as createSignal14,onCleanup as onCleanup11,Show as Show5,For as For4,For as For7,createEffect as createEffect10,createMemo as createMemo5,onCleanup as onCleanup12,createEffect as createEffect11,createMemo as createMemo6,untrack as untrack2,Suspense as Suspense4,lazy as lazy4,onCleanup as onCleanup13,createEffect as createEffect12,onCleanup as onCleanup14,createSignal as createSignal15,createMemo as createMemo7,createSignal as createSignal16,createSignal as createSignal17,lazy as lazy5,Show as Show9,For as For8,Show as Show8,Show as Show7,createEffect as createEffect13,onCleanup as onCleanup15,onMount as onMount5,onCleanup as onCleanup16,onMount as onMount6,For as For9,createSignal as createSignal18,createSignal as createSignal19,onCleanup as onCleanup17,createSignal as createSignal20,Show as Show10,createSignal as createSignal22,createSignal as createSignal21,onCleanup as onCleanup18,For as For10,Show as Show13,createMemo as createMemo9,createComputed,createMemo as createMemo8,createSignal as createSignal23,untrack as untrack3,Show as Show11,createComputed as createComputed2,untrack as untrack4,Show as Show12,createSignal as createSignal25,createEffect as createEffect14,createSignal as createSignal24,on,createMemo as createMemo11,createSignal as createSignal28,createMemo as createMemo10,For as For11,Show as Show17,Show as Show14,Show as Show15,createSignal as createSignal26,createContext as createContext3,useContext as useContext3,Show as Show16,createSignal as createSignal27,onCleanup as onCleanup19,Show as Show23,createSignal as createSignal29,untrack as untrack5,createSignal as createSignal30,createSignal as createSignal31,createEffect as createEffect15,For as For13,Show as Show18,For as For12,createSignal as createSignal32,Show as Show19,Show as Show20,Show as Show21,Show as Show22,For as For14,Show as Show25,createMemo as createMemo13,Show as Show24,createMemo as createMemo12,createSignal as createSignal33,createContext as createContext4,useContext as useContext4,Show as Show26,Suspense as Suspense5,createEffect as createEffect16,onCleanup as onCleanup20,untrack as untrack6,For as For20,Match,Switch,createMemo as createMemo19,onCleanup as onCleanup26,For as For15,Show as Show28,createMemo as createMemo15,createSignal as createSignal35,createEffect as createEffect17,createMemo as createMemo14,onCleanup as onCleanup21,untrack as untrack7,Show as Show27,createEffect as createEffect18,createSignal as createSignal34,onCleanup as onCleanup22,For as For16,Show as Show30,createSignal as createSignal36,createEffect as createEffect19,createMemo as createMemo16,onCleanup as onCleanup23,untrack as untrack8,Show as Show29,For as For18,Show as Show33,createEffect as createEffect20,createMemo as createMemo17,createSignal as createSignal37,onCleanup as onCleanup24,untrack as untrack9,For as For17,Show as Show32,Show as Show31,Show as Show38,createEffect as createEffect21,createMemo as createMemo18,createSignal as createSignal38,onCleanup as onCleanup25,untrack as untrack10,Show as Show34,For as For19,Show as Show36,Show as Show35,Show as Show37,createEffect as createEffect22,createMemo as createMemo20,onCleanup as onCleanup27,untrack as untrack11,Show as Show39,createMemo as createMemo21,onCleanup as onCleanup28,createEffect as createEffect23,createMemo as createMemo22,on as on2,onCleanup as onCleanup29,createRoot,createSignal as createSignal39,getOwner,createSignal as createSignal40,onCleanup as onCleanup30,onMount as onMount7} 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"
@@ -85,6 +84,7 @@ const session=sessionID?api.state.session.get(sessionID):undefined
 const directory=session?.directory??api.state.path.directory
 const workspace=session?.workspaceID
 return{key:JSON.stringify([directory,workspace??null]),routing:{directory,...workspace&&{workspace}}}}
+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,Show,createEffect as createEffect4,Show as Show2,splitProps as splitProps3,createEffect as createEffect5,createSignal as createSignal4,onCleanup as onCleanup4,onMount,Suspense,lazy,batch,createSignal as createSignal5,createSignal as createSignal6,onCleanup as onCleanup5,Show as Show3,batch as batch2,createSignal as createSignal8,createSignal as createSignal7,createEffect as createEffect6,createSignal as createSignal9,onCleanup as onCleanup6,createSignal as createSignal10,createSignal as createSignal11,Suspense as Suspense2,lazy as lazy2,Index,onCleanup as onCleanup7,createEffect as createEffect8,onCleanup as onCleanup10,batch as batch3,createEffect as createEffect7,createMemo,createSignal as createSignal13,onCleanup as onCleanup9,onMount as onMount2,createSignal as createSignal12,onCleanup as onCleanup8,For as For2,For as For3,Show as Show4,createMemo as createMemo2,Suspense as Suspense3,lazy as lazy3,For as For6,createMemo as createMemo4,onMount as onMount4,For as For5,createMemo as createMemo3,onMount as onMount3,Show as Show6,createEffect as createEffect9,createSignal as createSignal14,onCleanup as onCleanup11,Show as Show5,For as For4,For as For7,createEffect as createEffect10,createMemo as createMemo5,onCleanup as onCleanup12,createEffect as createEffect11,createMemo as createMemo6,untrack as untrack2,Suspense as Suspense4,lazy as lazy4,onCleanup as onCleanup13,createEffect as createEffect12,onCleanup as onCleanup14,createSignal as createSignal15,createMemo as createMemo7,createSignal as createSignal16,createSignal as createSignal17,lazy as lazy5,Show as Show9,For as For8,Show as Show8,Show as Show7,createEffect as createEffect13,onCleanup as onCleanup15,onMount as onMount5,onCleanup as onCleanup16,onMount as onMount6,For as For9,createSignal as createSignal18,createSignal as createSignal19,onCleanup as onCleanup17,createSignal as createSignal20,Show as Show10,createSignal as createSignal22,createSignal as createSignal21,onCleanup as onCleanup18,For as For10,Show as Show13,createMemo as createMemo9,createComputed,createMemo as createMemo8,createSignal as createSignal23,untrack as untrack3,Show as Show11,createComputed as createComputed2,untrack as untrack4,Show as Show12,createSignal as createSignal25,createEffect as createEffect14,createSignal as createSignal24,on,createMemo as createMemo11,createSignal as createSignal28,createMemo as createMemo10,For as For11,Show as Show17,Show as Show14,Show as Show15,createSignal as createSignal26,createContext as createContext3,useContext as useContext3,Show as Show16,createSignal as createSignal27,onCleanup as onCleanup19,Show as Show23,createSignal as createSignal29,untrack as untrack5,createSignal as createSignal30,createSignal as createSignal31,createEffect as createEffect15,For as For13,Show as Show18,For as For12,createSignal as createSignal32,Show as Show19,Show as Show20,Show as Show21,Show as Show22,createSignal as createSignal33,createEffect as createEffect16,createMemo as createMemo12,on as on2,onCleanup as onCleanup20,For as For14,Show as Show25,createMemo as createMemo14,Show as Show24,createMemo as createMemo13,createSignal as createSignal34,createContext as createContext4,useContext as useContext4,Show as Show26,Suspense as Suspense5,createEffect as createEffect17,onCleanup as onCleanup21,untrack as untrack6,For as For20,Match,Switch,createMemo as createMemo20,onCleanup as onCleanup27,For as For15,Show as Show28,createMemo as createMemo16,createSignal as createSignal36,createEffect as createEffect18,createMemo as createMemo15,onCleanup as onCleanup22,untrack as untrack7,Show as Show27,createEffect as createEffect19,createSignal as createSignal35,onCleanup as onCleanup23,For as For16,Show as Show30,createSignal as createSignal37,createEffect as createEffect20,createMemo as createMemo17,onCleanup as onCleanup24,untrack as untrack8,Show as Show29,For as For18,Show as Show33,createEffect as createEffect21,createMemo as createMemo18,createSignal as createSignal38,onCleanup as onCleanup25,untrack as untrack9,For as For17,Show as Show32,Show as Show31,Show as Show38,createEffect as createEffect22,createMemo as createMemo19,createSignal as createSignal39,onCleanup as onCleanup26,untrack as untrack10,Show as Show34,For as For19,Show as Show36,Show as Show35,Show as Show37,createEffect as createEffect23,createMemo as createMemo21,onCleanup as onCleanup28,untrack as untrack11,Show as Show39,createMemo as createMemo22,onCleanup as onCleanup29,createRoot,createSignal as createSignal40,getOwner,createSignal as createSignal41,onCleanup as onCleanup30,onMount as onMount7} from "solid-js"
 function mcpToggleAction(status){if(status==="pending")
 return
 return status==="connected"?"disconnect":"connect"
@@ -179,10 +179,14 @@ setStates((values)=>({...values,[target]:{status:"error",error:requestError(caus
 return{state,start,abort,abortAll}}
 function wait(delay,signal){return new Promise((resolve,reject)=>{if(signal?.aborted)
 return reject(signal.reason??new DOMException("Aborted","AbortError"))
-const timer=setTimeout(resolve,delay)
-signal?.addEventListener("abort",()=>{clearTimeout(timer)
-reject(signal.reason??new DOMException("Aborted","AbortError"))
-},{once:true})
+const abort=()=>{clearTimeout(timer)
+signal?.removeEventListener("abort",abort)
+reject(signal?.reason??new DOMException("Aborted","AbortError"))
+}
+const timer=setTimeout(()=>{signal?.removeEventListener("abort",abort)
+resolve()
+},delay)
+signal?.addEventListener("abort",abort,{once:true})
 })
 }
 async function retryBackgroundRefresh(refresh,options={}){const delays=options.delays??[250,1000]
@@ -212,6 +216,8 @@ const rightRank=BUCKET_RANK[right.bucket]??1
 return leftRank-rightRank||left.bucket.localeCompare(right.bucket)||left.name.localeCompare(right.name)
 })
 }
+function serverKey(current,name){return JSON.stringify([current.key,name])
+}
 function bulkDescription(operation,action){if(operation.action==="preset")
 return `apply ${operation.preset} MCP preset`
 if(operation.group)
@@ -224,12 +230,8 @@ return Object.keys(presets).sort((left,right)=>left.localeCompare(right)).find((
 return Object.keys(states).length===items.length&&items.every((item)=>item.status==="connected"&&states[item.name]==="enabled"||item.status==="disabled"&&states[item.name]==="disabled")
 })
 }
-function statusError(status){if(!status||typeof status!=="object"||!("error" in status))
-return
-const error=status.error
-return typeof error==="string"?error:undefined
-}
-function createMcpController(api,persist,preferences,source){const [snapshots,setSnapshots]=createSignal2({})
+function createMcpModel(options,persist,preferences){const{source}=options
+const [snapshots,setSnapshots]=createSignal2({})
 const [mutationCounts,setMutationCounts]=createSignal2({})
 const [bulkStates,setBulkStates]=createSignal2({})
 const [selectedPresets,setSelectedPresets]=createSignal2({})
@@ -239,8 +241,8 @@ const mutationRetries=new Map
 const bulkGenerations=new Map
 const bulkRetries=new Map
 const selectedPresetStates=new Map
-const requests=createRequestState(api.lifecycle?.signal)
-const serverRequests=createRequestState(api.lifecycle?.signal)
+const requests=createRequestState(options.signal)
+const serverRequests=createRequestState(options.signal)
 let activation=0
 let activeTarget
 function changeMutationCount(current,offset){setMutationCounts((values)=>{const next=Math.max(0,(values[current.key]??0) + offset)
@@ -264,10 +266,7 @@ serverRequests.abortAll()
 refreshing.clear()
 activeTarget=current.key
 }
-function target(){const location=currentLocation(api)
-return{key:location.key,scope:preferencesScope({directory:location.routing.directory,worktree:api.state.path.worktree}),routing:location.routing
-}}
-function serverKey(current,name){return JSON.stringify([current.key,name])
+function target(){return options.target()
 }
 function mutating(current=target()){return(mutationCounts()[current.key]??0)>0
 }
@@ -302,7 +301,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 source?source.list(current):snapshots()[current.key]??api.state.mcp()
+function list(current=target()){return options.cache==="source"?source.list(current):snapshots()[current.key]??source.list(current)
 }
 async function refresh(current=target(),force=false){const pending=refreshing.get(current.key)
 if(pending&&!force)
@@ -310,7 +309,7 @@ return pending
 const requestState=requests.start(current.key,"refresh MCP servers",current.key in snapshots(),force)
 if(!requestState)
 return pending
-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())
+const request=source.refresh(current,force,requestState.signal).then((items)=>{if(options.cache==="model"&&requestState.isCurrent())
 setSnapshots((value)=>({...value,[current.key]:items}))
 if(requestState.isCurrent())
 reconcileSelectedPreset(current,items)
@@ -333,7 +332,7 @@ const requestState=serverRequests.start(key,operation,false)
 if(!requestState)
 return mutations.get(key)
 changeMutationCount(current,1)
-const request=(action==="disconnect"?api.client.mcp.disconnect({name,...current.routing},{throwOnError:true,signal:requestState.signal}):api.client.mcp.connect({name,...current.routing},{throwOnError:true,signal:requestState.signal})).then(()=>{requestState.succeed()
+const request=options.change(current,name,action,requestState.signal).then(()=>{requestState.succeed()
 mutationRetries.delete(key)
 clearBulkFailure(current,name)
 }).catch((error)=>{requestState.fail(error)
@@ -381,14 +380,14 @@ if(desired==="disabled"&&action==="disconnect"){await changeServer(current,item.
 }
 if(desired==="enabled"&&action==="connect"){await changeServer(current,item.name,"connect","restore MCP preference",false)
 }}))
-const failed=api.lifecycle?.signal.aborted?[]:results.flatMap((result,index)=>result.status==="rejected"&&!isAbortError(result.reason)?[items[index].name]:[])
-if(failed.length>0){api.ui.toast({variant:"warning",title:"MCP preferences",message:`Could not restore: ${failed.join(", ")}`,duration:4000
+const failed=options.signal?.aborted?[]:results.flatMap((result,index)=>result.status==="rejected"&&!isAbortError(result.reason)?[items[index].name]:[])
+if(failed.length>0){options.notifications.show({variant:"warning",title:"MCP preferences",message:`Could not restore: ${failed.join(", ")}`
 })
 }
 if(generation===activation&&target().key===current.key)
 await refresh(current,true)
 }
-function reconnect(current=target()){return retryBackgroundRefresh(()=>activate(current),{signal:api.lifecycle?.signal})
+function reconnect(current=target()){return retryBackgroundRefresh(()=>activate(current),{signal:options.signal})
 }
 function bulkState(current=target()){return bulkStates()[current.key]??{action:"connect",status:"idle",completed:0,total:0,failed:[]
 }}
@@ -426,7 +425,7 @@ setBulkStates((values)=>({...values,[current.key]:{...operation,status:failed.le
 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
+options.notifications.show({variant:"warning",title:"MCP servers",message:`Could not ${action}: ${failed.join(", ")}`
 })
 }}
 return{list,refresh,reconnect,activate,deactivate(current){if(activeTarget!==current.key)
@@ -493,6 +492,14 @@ return
 const changes=bulkRetries.get(current.key)??[]
 return changeMany({action:state.action,...state.preset&&{preset:state.preset},...state.group&&{group:state.group}},changes,current)
 }}}
+function createMcpController(api,persist,preferences,source){return createMcpModel({target(){const location=currentLocation(api)
+return{...location,scope:preferencesScope({directory:location.routing.directory,worktree:api.state.path.worktree})
+}},signal:api.lifecycle?.signal,notifications:{show:(input)=>api.ui.toast({...input,duration:4000})},cache:source?"source":"model",source:source??{list:()=>api.state.mcp(),async refresh(target,_force,signal){const result=await api.client.mcp.status(target.routing,{throwOnError:true,signal})
+return Object.entries(result.data??{}).map(([name,status])=>({name,status:status.status,error:"error" in status?status.error:undefined
+})).sort((left,right)=>left.name.localeCompare(right.name))
+}},async change(target,name,action,signal){await api.client.mcp[action]({name,...target.routing},{throwOnError:true,signal})
+}},persist,preferences)
+}
 
 
 
@@ -1191,12 +1198,16 @@ _$insert(_el$,_$createComponent(Suspense,{get children(){return _$createComponen
 return _el$
 })()
 }
+var ICON_CHOICE_IDS=["plus","check","circle","star","pin","bolt","book","search","code","terminal","gear","shield","lock","unlock","eye","clock","refresh","history","copy","export","edit","fork","list","play","pause","stop","rocket","bug","beaker","wand","cloud","server","folder","file","heart","lightbulb","arrow-up","arrow-down","warning","close"]
+var choices=new Set(ICON_CHOICE_IDS)
+function iconChoiceLabel(id){return id.replaceAll("-"," ")
+}
 var glyphs={plus:["\uEA60","+"],check:["\uEAB2","v"],circle:["\uEAEE","o"],star:["\uEA6A","*"],pin:["\uEBAB","^"],bolt:["\uEA86","!"],book:["\uEAA4","B"],search:["\uEA6D","?"],code:["\uEAC4","#"],terminal:["\uEA85",">"],gear:["\uEB51","G"],shield:["\uEBB3","S"],lock:["\uEA75","L"],unlock:["\uEB74","U"],eye:["\uEA70","E"],clock:["\uEA82","T"],refresh:["\uEAF5","R"],history:["\uEA82","H"],copy:["\uEBCC","C"],export:["\uEBAC","X"],edit:["\uEA73","/"],fork:["\uEB9E","F"],list:["\uEBEB","="],play:["\uEB2C",">"],pause:["\uEAD1","|"],stop:["\uEAD7","s"],rocket:["\uEB44","r"],bug:["\uEAAF","b"],beaker:["\uEA79","t"],wand:["\uEAB6","w"],cloud:["\uEABA","c"],server:["\uEB50","s"],folder:["\uEA83","D"],file:["\uEA7B","f"],heart:["\uEB05","h"],lightbulb:["\uEA61","i"],"arrow-up":["\uEAA1","^"],"arrow-down":["\uEA9A","v"],warning:["\uEA6C","!"],close:["\uEA76","x"]
 }
-var terminalIconIDs=Object.keys(glyphs)
+var terminalIconIDs=[...ICON_CHOICE_IDS]
 function terminalIcon(id,style){return(glyphs[id]??glyphs.bolt)[style==="nerd"?0:1]
 }
-function terminalIconLabel(id){return id.replaceAll("-"," ")
+function terminalIconLabel(id){return iconChoiceLabel(id)
 }
 function McpErrorDialog(props){return _$createComponent(SelectionMenu,{get api(){return props.api
 },get title(){return `MCP error \xB7 ${props.name}`
@@ -1205,6 +1216,9 @@ function McpErrorDialog(props){return _$createComponent(SelectionMenu,{get api()
 },onSelect:()=>{}})
 }
 
+function builtInPreferences(defaults){return{behavior:{toggleKey:defaults.toggleKey,focusKey:defaults.focusKey,searchKey:defaults.searchKey,persistMcp:defaults.persistMcp,limitsRefreshMinutes:defaults.limitsRefreshMinutes,startInChat:defaults.startInChat,showSessionTitle:defaults.showSessionTitle,showSessionDate:defaults.showSessionDate,cornerFont:defaults.cornerFont,lspIconStyle:defaults.lspIconStyle,rowDensity:defaults.rowDensity,toolbarOverflow:defaults.toolbarOverflow,sectionItemLimits:defaults.sectionItemLimits,quickActionOrder:defaults.quickActionOrder,quickActionVisibility:defaults.quickActionVisibility
+},layout:{sections:defaults.sections,expanded:DEFAULT_SECTION_EXPANSION,order:defaults.sectionOrder??[...SIDEBAR_SECTIONS]
+},desiredMcpStates:{}}}
 function codexBindingKey(target){return JSON.stringify([target.providerID,target.connectionID?{connectionID:target.connectionID}:null])
 }
 function legacyKey(key){try{const value=JSON.parse(key)
@@ -1329,6 +1343,83 @@ function serializePortableSettings(layout,mcp,behavior){return `${JSON.stringify
   }, undefined, 2)}
 `
 }
+function normalizePresetName(value){const name=value.trim()
+if(!name)
+throw new Error("Enter a preset name")
+if(name.length>64)
+throw new Error("Preset names can contain at most 64 characters")
+return name
+}
+function createPreferencePresetActions(input){return{saveLayoutPreset(value){input.load()
+const name=normalizePresetName(value)
+if(Object.keys(input.layoutPresets()).some((candidate)=>candidate.toLocaleLowerCase()===name.toLocaleLowerCase()))
+throw new Error("A preset with this name already exists")
+if(Object.keys(input.layoutPresets()).length>=50)
+throw new Error("You can save at most 50 layout presets")
+const layout=input.currentLayoutPreset()
+input.persistLayoutPresets({...input.layoutPresets(),[name]:layout},{name,layout})
+return name
+},updateLayoutPreset(name){if(!input.layoutPresets()[name])
+return false
+const layout=input.currentLayoutPreset()
+input.persistLayoutPresets({...input.layoutPresets(),[name]:layout},{name,layout})
+return true
+},renameLayoutPreset(current,value){const name=normalizePresetName(value)
+const preset=input.layoutPresets()[current]
+if(!preset)
+throw new Error("Layout preset no longer exists")
+if(name.toLocaleLowerCase()!==current.toLocaleLowerCase()&&Object.keys(input.layoutPresets()).some((candidate)=>candidate.toLocaleLowerCase()===name.toLocaleLowerCase()))
+throw new Error("A preset with this name already exists")
+const next={...input.layoutPresets()}
+delete next[current]
+next[name]=preset
+input.persistLayoutPresets(next,{name,layout:preset,previousName:current})
+return name
+},deleteLayoutPreset(name){if(!input.layoutPresets()[name])
+return false
+const next={...input.layoutPresets()}
+delete next[name]
+input.persistLayoutPresets(next,{name})
+return true
+},saveMcpPreset(value,states){input.requireHydration()
+if(Object.keys(states).length===0)
+throw new Error("There are no MCP servers to save")
+const name=normalizePresetName(value)
+if(Object.keys(input.mcpPresets()).some((candidate)=>candidate.toLocaleLowerCase()===name.toLocaleLowerCase()))
+throw new Error("A preset with this name already exists")
+if(Object.keys(input.mcpPresets()).length>=50)
+throw new Error("You can save at most 50 MCP presets")
+const preset={...states}
+input.persistMcpPresets({...input.mcpPresets(),[name]:preset},{operation:"save",name,states:preset})
+return name
+},updateMcpPreset(name,states){input.requireHydration()
+if(!input.mcpPresets()[name])
+return false
+if(Object.keys(states).length===0)
+throw new Error("There are no MCP servers to save")
+const preset={...states}
+input.persistMcpPresets({...input.mcpPresets(),[name]:preset},{operation:"update",name,states:preset})
+return true
+},renameMcpPreset(current,value){input.requireHydration()
+const name=normalizePresetName(value)
+const preset=input.mcpPresets()[current]
+if(!preset)
+throw new Error("MCP preset no longer exists")
+if(name.toLocaleLowerCase()!==current.toLocaleLowerCase()&&Object.keys(input.mcpPresets()).some((candidate)=>candidate.toLocaleLowerCase()===name.toLocaleLowerCase()))
+throw new Error("A preset with this name already exists")
+const next={...input.mcpPresets()}
+delete next[current]
+next[name]=preset
+input.persistMcpPresets(next,{operation:"rename",name,previousName:current})
+return name
+},deleteMcpPreset(name){input.requireHydration()
+if(!input.mcpPresets()[name])
+return false
+const next={...input.mcpPresets()}
+delete next[name]
+input.persistMcpPresets(next,{operation:"delete",name})
+return true
+}}}
 function toolbarPinKey(pin){return pin.kind==="action"?`action:${pin.id}`:`skill:${pin.location}`
 }
 function identifier(value){return typeof value==="string"&&/^[a-z][a-z\d-]{0,47}$/u.test(value)
@@ -1565,14 +1656,6 @@ order=[...layer.layout.order]
 Object.assign(desiredMcpStates,layer.desiredMcpStates)
 }
 return{behavior,layout:{sections,expanded,order},desiredMcpStates}}
-import {randomUUID} from "crypto"
-import {link,mkdir,readFile,readdir,rename,rm,unlink,writeFile,readFile as readFile2} from "fs/promises"
-import {join,dirname,join as join2,join as join3} from "path"
-var LOCK_TIMEOUT_MS=3000
-function errno(error,code){return error instanceof Error&&"code" in error&&error.code===code
-}
-function delay(milliseconds){return new Promise((resolve)=>setTimeout(resolve,milliseconds))
-}
 function parseSkillConfirmations(value){if(!Array.isArray(value))
 return []
 return [...new Set(value.filter((item)=>typeof item==="string"&&item.length>0))].sort()
@@ -1604,7 +1687,7 @@ behavior.quickActionVisibility=quickActionVisibility
 const mcpUpdate={...update.mcp?.states,...update.mcp?.name&&update.mcp.state&&{[update.mcp.name]:update.mcp.state}}
 const mcp=parseDesiredMcpStates({...!update.clearMcp&&existing.mcp,...mcpUpdate
 })
-const scope={...Object.keys(behavior).length>0&&{behavior},...(update.layout||!update.clearLayout&&existing.layout)&&{layout:parseSectionLayout(update.layout??existing.layout)
+const scope={...Object.keys(behavior).length>0&&{behavior},...(update.layout??(!update.clearLayout&&existing.layout))&&{layout:parseSectionLayout(update.layout??existing.layout)
 },...Object.keys(mcp).length>0&&{mcp}}
 const worktrees={...current.worktrees}
 if(target.kind==="worktree"){if(isEmptyScope(scope))
@@ -1719,143 +1802,8 @@ return{global:target.kind==="global"?scope:current.global,worktrees,user:{...ski
 },...pendingResetAttempt&&{pendingResetAttempt},...typeof (update.user?.autoApprovePermissions??current.user.autoApprovePermissions)==="boolean"&&{autoApprovePermissions:update.user?.autoApprovePermissions??current.user.autoApprovePermissions
 }}}}
 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")
-const lock=join(directory,"preferences.lock")
-let writes=Promise.resolve()
-async function readLockOwner(){const source=await readFile(lock,"utf8").catch((error)=>{if(errno(error,"ENOENT"))
-return
-throw error
-})
-if(source===undefined)
-return
-try{const value=JSON.parse(source)
-if(typeof value.token!=="string"||typeof value.pid!=="number")
-return
-return{token:value.token,pid:value.pid}} catch{return
-}}
-function processIsAlive(pid){try{process.kill(pid,0)
-return true
-} catch(error){return !errno(error,"ESRCH")
-}}
-async function moveLockToTombstone(suffix){const tombstone=`${lock}.${suffix}.${randomUUID()}`
-try{await rename(lock,tombstone)
-} catch(error){if(errno(error,"ENOENT"))
-return false
-throw error
-}
-await rm(tombstone,{recursive:true,force:true})
-return true
-}
-async function liveRecoveryMarkers(prefix="preferences.lock.recover."){const entries=await readdir(directory)
-const markers=[]
-for(const entry of entries){if(!entry.startsWith(prefix)||entry.endsWith(".candidate"))
-continue
-const path=join(directory,entry)
-const markerOwner=await readFile(path,"utf8").then((source)=>JSON.parse(source)).catch(()=>{})
-if(typeof markerOwner?.pid==="number"&&processIsAlive(markerOwner.pid))
-markers.push(path)
-else
-await unlink(path).catch((error)=>{if(!errno(error,"ENOENT"))
-throw error
-})
-}
-return markers.sort()
-}
-async function reapStaleLock(owner){const token=Buffer.from(owner.token).toString("base64url")
-const prefix=`preferences.lock.recover.${token}.`
-const recovery=join(directory,`${prefix}${Date.now().toString().padStart(13, "0")}.${process.pid}.${randomUUID()}`)
-const markers=await liveRecoveryMarkers(prefix)
-if(markers.length>0)
-return false
-const candidate=`${recovery}.candidate`
-await writeFile(candidate,JSON.stringify({token:owner.token,pid:process.pid}),{flag:"wx",mode:384})
-try{await rename(candidate,recovery)
-await delay(10)
-const liveMarkers=await liveRecoveryMarkers(prefix)
-if(liveMarkers[0]!==recovery)
-return false
-const current=await readLockOwner()
-if(current?.token!==owner.token||processIsAlive(current.pid))
-return false
-return moveLockToTombstone("stale")
-} finally{await unlink(candidate).catch((error)=>{if(!errno(error,"ENOENT"))
-throw error
-})
-await unlink(recovery).catch((error)=>{if(!errno(error,"ENOENT"))
-throw error
-})
-}}
-async function tryAcquireLock(){const token=randomUUID()
-const candidate=`${lock}.${token}.candidate`
-await writeFile(candidate,JSON.stringify({token,pid:process.pid}),{flag:"wx",mode:384})
-try{try{await link(candidate,lock)
-} catch(error){if(!errno(error,"EEXIST"))
-throw error
-const owner=await readLockOwner()
-if(!owner||processIsAlive(owner.pid))
-return
-await reapStaleLock(owner)
-return
-}
-while(true){const markers=await liveRecoveryMarkers()
-if(markers.length===0)
-break
-await delay(10)
-}
-const currentOwner=await readLockOwner()
-if(currentOwner?.token!==token)
-return
-return async ()=>{const current=await readLockOwner()
-if(current?.token!==token)
-throw new Error("Refusing to release a preferences lock owned by another process")
-await moveLockToTombstone("released")
-}} finally{await unlink(candidate).catch((error)=>{if(!errno(error,"ENOENT"))
-throw error
-})
-}}
-async function acquireLock(){await mkdir(directory,{recursive:true,mode:448})
-const deadline=Date.now() + LOCK_TIMEOUT_MS
-while(true){const release=await tryAcquireLock()
-if(release)
-return release
-if(Date.now()>=deadline)
-throw new Error(`Timed out waiting for preferences lock: ${lock}`)
-await delay(10)
-}}
-async function withLock(operation){const release=await acquireLock()
-try{return await operation()
-} finally{await release()
-}}
-async function read(){const source=await readFile(file,"utf8").catch((error)=>{if(errno(error,"ENOENT"))
-return
-throw error
-})
-if(source===undefined)
-return
-try{return parsePreferencesDocument(JSON.parse(source))
-} catch(error){if(error instanceof SyntaxError)
-throw new Error(`Malformed preferences JSON: ${file}`,{cause:error})
-throw error
-}}
-async function write(value){const temporary=`${file}.${process.pid}.${randomUUID()}.tmp`
-try{await writeFile(temporary,`${JSON.stringify(value)}
-`,{mode:384})
-await rename(temporary,file)
-} finally{await unlink(temporary).catch((error)=>{if(!errno(error,"ENOENT"))
-throw error
-})
-}}
-function enqueue(operation){const result=writes.then(operation)
-writes=result.catch(()=>{})
-return result
+function skillKey(skill){return skill.location
 }
-return{load(){return withLock(async ()=>await read()??emptyPreferencesDocument())
-},update(update){return enqueue(()=>withLock(async ()=>{const current=await read()??emptyPreferencesDocument()
-await write(applyPreferencesUpdate(current,update))
-}))
-},async flush(){await writes
-}}}
 function swap(items,first,second){const value=items[first]
 items[first]=items[second]
 items[second]=value
@@ -1869,9 +1817,8 @@ return{behavior:scope.behavior,layout:scope.layout,desiredMcpStates:scope.mcp
 }}
 function mergeSessionLayout(base,session){const order=session.order??base?.order
 return{sections:{...base?.sections,...session.sections},expanded:{...base?.expanded,...session.expanded},...order&&{order:[...order]}}}
-function createPreferencesController(api,defaults,store,configured={}){const builtIns={behavior:{toggleKey:defaults.toggleKey,focusKey:defaults.focusKey,searchKey:defaults.searchKey,persistMcp:defaults.persistMcp,limitsRefreshMinutes:defaults.limitsRefreshMinutes,startInChat:defaults.startInChat,showSessionTitle:defaults.showSessionTitle,showSessionDate:defaults.showSessionDate,cornerFont:defaults.cornerFont,lspIconStyle:defaults.lspIconStyle,rowDensity:defaults.rowDensity,toolbarOverflow:defaults.toolbarOverflow,sectionItemLimits:defaults.sectionItemLimits,quickActionOrder:defaults.quickActionOrder,quickActionVisibility:defaults.quickActionVisibility
-},layout:{sections:defaults.sections,expanded:DEFAULT_SECTION_EXPANSION,order:defaults.sectionOrder??[...SIDEBAR_SECTIONS]
-},desiredMcpStates:{}}
+function createPreferencesModel(ports,defaults,store,configuredInput={}){let configured=configuredInput
+const builtIns=builtInPreferences(defaults)
 const [resolved,setResolved]=createSignal5(resolvePreferences({builtIns,pluginOptions:configured}))
 const [skippedSkills,setSkippedSkills]=createSignal5(new Set)
 const [onboardingCompleted,setOnboardingCompleted]=createSignal5(false)
@@ -1901,17 +1848,15 @@ let mcpPresetReconciliation=Promise.resolve()
 let updateRevision=0
 let reloading
 let isPersistenceWarningShown=false
-function skillKey(skill){return skill.location
-}
 function showPersistenceWarning(cause){if(isPersistenceWarningShown)
 return
 isPersistenceWarningShown=true
-api.ui.toast({variant:"warning",title:"Navigator settings",message:cause instanceof Error?cause.message:"Navigator settings could not be saved",duration:4000
+ports.notifications.show({variant:"warning",title:"Navigator settings",message:cause instanceof Error?cause.message:"Navigator settings could not be saved"
 })
 }
 function persist(request){request.catch(showPersistenceWarning)
 }
-function validKey(value){try{return api.keymap?.parseKeySequence?api.keymap.parseKeySequence(value).length>0:Boolean(value.trim())
+function validKey(value){try{return ports.validKey(value)
 } catch{return false
 }}
 function resolveTarget(target,session=true){const worktree=target.kind==="worktree"?document.worktrees[target.key]:undefined
@@ -1937,13 +1882,16 @@ 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,behavior:scope?.behavior})
 }
-function update(change){updateRevision++
+function update(change,wait=false){updateRevision++
 document=applyPreferencesUpdate(document,change)
-if(isHydrated)
-persist(store.update(change))
-else
+let request
+if(isHydrated){request=store.update(change)
+persist(request)
+} else
 pendingUpdates.push(change)
 refreshResolved()
+if(wait)
+return request??Promise.resolve()
 }
 function applyDocument(value){document=value
 setSkippedSkills(new Set(value.user.skippedSkillConfirmations))
@@ -2014,13 +1962,6 @@ function setSessionLayout(layout){setTargetSessionLayout(activeTarget(),layout)
 }
 function setSelectedSessionLayout(layout,replace=false){setTargetSessionLayout(selectedTarget(),layout,replace)
 }
-function normalizePresetName(value){const name=value.trim()
-if(!name)
-throw new Error("Enter a preset name")
-if(name.length>64)
-throw new Error("Preset names can contain at most 64 characters")
-return name
-}
 function currentLayoutPreset(){const layout=selectedLayoutResolved().layout
 return{sections:{...layout.sections},expanded:{...layout.expanded},order:[...layout.order]
 }}
@@ -2044,7 +1985,7 @@ isApplied=!name
 else if(mcpPreset.operation==="rename"){isApplied=name===mcpPreset.name&&(mcpPreset.previousName===mcpPreset.name||!actual[mcpPreset.previousName])
 } else{isApplied=Boolean(name)&&Object.keys(actual[name]).length===Object.keys(mcpPreset.states).length&&Object.entries(mcpPreset.states).every(([server,state])=>actual[name][server]===state)
 }
-if(!isApplied){api.ui.toast({variant:"warning",title:"MCP presets",message:"Preset changed in another OpenCode instance; reloaded saved presets",duration:4000
+if(!isApplied){ports.notifications.show({variant:"warning",title:"MCP presets",message:"Preset changed in another OpenCode instance; reloaded saved presets"
 })
 }}).catch(showPersistenceWarning)
 }
@@ -2080,13 +2021,14 @@ return
 setAutoApprovePermissions(value)
 update({user:{autoApprovePermissions:value}})
 }
+function codexBindingUpdate(providerID,connectionID,accountID){setCodexAccountBindings((bindings)=>changeCodexBinding(bindings,{providerID,connectionID},accountID))
+return{user:{codexAccountBinding:{providerID,connectionID,accountID}}}}
 function changeCodexConnectionBinding(providerID,connectionID,accountID){if(!isHydrated){load().then(()=>changeCodexConnectionBinding(providerID,connectionID,accountID))
 return
 }
 if(!providerID)
 return
-setCodexAccountBindings((bindings)=>changeCodexBinding(bindings,{providerID,connectionID},accountID))
-update({user:{codexAccountBinding:{providerID,connectionID,accountID}}})
+update(codexBindingUpdate(providerID,connectionID,accountID))
 }
 function toggleFavoriteMcpServer(name){if(!isHydrated){load().then(()=>toggleFavoriteMcpServer(name))
 return
@@ -2112,10 +2054,18 @@ next.add(id)
 setFavoriteQuickActions(next)
 update({user:{favoriteQuickAction:{id,favorite:next.has(id)}}})
 }
-return{sections:()=>resolved().layout.sections,toolbarPins(){revision()
+return{setConfiguredDefaults(next){batch(()=>{configured=next
+setLayoutPresets({...configured.layoutPresets,...document.user.layoutPresets})
+setMcpPresets({...configured.mcpPresets,...document.user.mcpPresets})
+setMcpServerGroups({...configured.mcpServerGroups,...document.user.mcpServerGroups})
+refreshResolved()
+})
+},sections:()=>resolved().layout.sections,toolbarPins(){revision()
 return document.user.toolbarPins??[]
 },changeToolbarPin(change){requireHydration()
 update({user:{toolbarPin:change}})
+},saveToolbarPin(change){requireHydration()
+return update({user:{toolbarPin:change}},true)
 },expanded:()=>resolved().layout.expanded,sectionOrder:()=>resolved().layout.order,toggleKey:()=>resolved().behavior.toggleKey,focusKey:()=>resolved().behavior.focusKey,searchKey:()=>resolved().behavior.searchKey,persistMcp:()=>resolved().behavior.persistMcp,limitsRefreshMinutes:()=>resolved().behavior.limitsRefreshMinutes,showSessionTitle:()=>resolved().behavior.showSessionTitle,showSessionDate:()=>resolved().behavior.showSessionDate,startInChatForScope:(scope)=>{revision()
 return resolveTarget(targetForScope(scope),false).behavior.startInChat
 },cornerFont:()=>resolved().behavior.cornerFont,lspIconStyle:()=>resolved().behavior.lspIconStyle,rowDensity:()=>resolved().behavior.rowDensity,toolbarOverflow:()=>resolved().behavior.toolbarOverflow,selectedToolbarOverflow:()=>selectedResolved().behavior.toolbarOverflow,toggleToolbarOverflow(){load()
@@ -2169,7 +2119,16 @@ throw new Error("MCP preset no longer exists")
 update({user:{workspaceProfile:{layout,mcp}}})
 },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,autoApprovePermissions,setAutoApprovePermissions:changeAutoApprovePermissions,codexAccountForModel:(providerID,modelID)=>codexBindingAccount(codexAccountBindings(),{providerID},modelID),setCodexAccountBinding:(providerID,_modelID,accountID)=>changeCodexConnectionBinding(providerID,undefined,accountID),codexAccountForConnection:(providerID,connectionID,modelID)=>codexBindingAccount(codexAccountBindings(),{providerID,connectionID},modelID),setCodexConnectionBinding:changeCodexConnectionBinding,pendingResetAttempt,async beginResetAttempt(attempt){await load()
+},skillGroups,setSkillGroup:changeSkillGroup,autoApprovePermissions,setAutoApprovePermissions:changeAutoApprovePermissions,codexAccountForModel:(providerID,modelID)=>codexBindingAccount(codexAccountBindings(),{providerID},modelID),setCodexAccountBinding:(providerID,_modelID,accountID)=>changeCodexConnectionBinding(providerID,undefined,accountID),codexAccountForConnection:(providerID,connectionID,modelID)=>codexBindingAccount(codexAccountBindings(),{providerID,connectionID},modelID),setCodexConnectionBinding:changeCodexConnectionBinding,async saveCodexConnectionBinding(providerID,connectionID,accountID){requireHydration()
+if(!providerID||!accountID)
+throw new Error("A provider and verified account are required")
+updateRevision++
+const request=store.update({user:{codexAccountBinding:{providerID,connectionID,accountID}}})
+persist(request)
+await request
+document=applyPreferencesUpdate(document,codexBindingUpdate(providerID,connectionID,accountID))
+refreshResolved()
+},pendingResetAttempt,async beginResetAttempt(attempt){await load()
 await store.update({user:{pendingResetAttempt:attempt}})
 const current=await store.load()
 setPendingResetAttempt(current.user.pendingResetAttempt)
@@ -2222,6 +2181,9 @@ setSessionLayout({order})
 },toggleSelectedSection(name){load()
 const layout=resolveTarget(selectedTarget()).layout
 setSelectedSessionLayout({sections:{[name]:!layout.sections[name]}})
+},toggleSelectedSectionExpanded(name){load()
+const layout=resolveTarget(selectedTarget()).layout
+setSelectedSessionLayout({expanded:{[name]:!layout.expanded[name]}})
 },moveSelectedSection(name,direction){load()
 const layout=resolveTarget(selectedTarget()).layout
 const order=[...layout.order]
@@ -2234,76 +2196,8 @@ setSelectedSessionLayout({order})
 },previewLayoutPreset(preset){return layoutPresetPreview(selectedLayoutResolved().layout,preset)
 },applyLayoutPreset(preset){load()
 setSelectedSessionLayout(layoutPresetPreview(selectedLayoutResolved().layout,preset).next,true)
-},saveLayoutPreset(value){load()
-const name=normalizePresetName(value)
-if(Object.keys(layoutPresets()).some((candidate)=>candidate.toLocaleLowerCase()===name.toLocaleLowerCase())){throw new Error("A preset with this name already exists")
-}
-if(Object.keys(layoutPresets()).length>=50)
-throw new Error("You can save at most 50 layout presets")
-const layout=currentLayoutPreset()
-persistLayoutPresets({...layoutPresets(),[name]:layout},{name,layout})
-return name
-},updateLayoutPreset(name){if(!layoutPresets()[name])
-return false
-const layout=currentLayoutPreset()
-persistLayoutPresets({...layoutPresets(),[name]:layout},{name,layout})
-return true
-},renameLayoutPreset(current,value){const name=normalizePresetName(value)
-const preset=layoutPresets()[current]
-if(!preset)
-throw new Error("Layout preset no longer exists")
-if(name.toLocaleLowerCase()!==current.toLocaleLowerCase()&&Object.keys(layoutPresets()).some((candidate)=>candidate.toLocaleLowerCase()===name.toLocaleLowerCase())){throw new Error("A preset with this name already exists")
-}
-const next={...layoutPresets()}
-delete next[current]
-next[name]=preset
-persistLayoutPresets(next,{name,layout:preset,previousName:current})
-return name
-},deleteLayoutPreset(name){if(!layoutPresets()[name])
-return false
-const next={...layoutPresets()}
-delete next[name]
-persistLayoutPresets(next,{name})
-return true
-},saveMcpPreset(value,states){requireHydration()
-if(Object.keys(states).length===0)
-throw new Error("There are no MCP servers to save")
-const name=normalizePresetName(value)
-if(Object.keys(mcpPresets()).some((candidate)=>candidate.toLocaleLowerCase()===name.toLocaleLowerCase())){throw new Error("A preset with this name already exists")
-}
-if(Object.keys(mcpPresets()).length>=50)
-throw new Error("You can save at most 50 MCP presets")
-const preset={...states}
-persistMcpPresets({...mcpPresets(),[name]:preset},{operation:"save",name,states:preset})
-return name
-},updateMcpPreset(name,states){requireHydration()
-if(!mcpPresets()[name])
-return false
-if(Object.keys(states).length===0)
-throw new Error("There are no MCP servers to save")
-const preset={...states}
-persistMcpPresets({...mcpPresets(),[name]:preset},{operation:"update",name,states:preset})
-return true
-},renameMcpPreset(current,value){requireHydration()
-const name=normalizePresetName(value)
-const preset=mcpPresets()[current]
-if(!preset)
-throw new Error("MCP preset no longer exists")
-if(name.toLocaleLowerCase()!==current.toLocaleLowerCase()&&Object.keys(mcpPresets()).some((candidate)=>candidate.toLocaleLowerCase()===name.toLocaleLowerCase())){throw new Error("A preset with this name already exists")
-}
-const next={...mcpPresets()}
-delete next[current]
-next[name]=preset
-persistMcpPresets(next,{operation:"rename",name,previousName:current})
-return name
-},deleteMcpPreset(name){requireHydration()
-if(!mcpPresets()[name])
-return false
-const next={...mcpPresets()}
-delete next[name]
-persistMcpPresets(next,{operation:"delete",name})
-return true
-},async saveLayoutAsDefault(){await load()
+},...createPreferencePresetActions({load,requireHydration,layoutPresets,mcpPresets,currentLayoutPreset,persistLayoutPresets,persistMcpPresets
+}),async saveLayoutAsDefault(){await load()
 const target=selectedTarget()
 const layout=resolveTarget(target).layout
 updateRevision++
@@ -2366,6 +2260,9 @@ update({target:targetForScope(scope),mcp:{name,state}})
 },setDesiredMcpStates(scope,states){load()
 update({target:targetForScope(scope),mcp:{states}})
 }}}
+function createPreferencesController(api,defaults,store,configured={}){return createPreferencesModel({notifications:{show:(input)=>api.ui.toast({...input,duration:4000})},validKey:(value)=>api.keymap?.parseKeySequence?api.keymap.parseKeySequence(value).length>0:Boolean(value.trim())
+},defaults,store,configured)
+}
 function record2(value){if(!value||typeof value!=="object"||Array.isArray(value))
 return
 return value
@@ -2400,17 +2297,173 @@ function legacyDefaults(config){const{sections,sectionOrder,...behavior}=config
 return{behavior,layout:{sections,expanded:{},...sectionOrder&&{order:sectionOrder}}}}
 function configuredDefaultsFromPluginOptions(options){return mergeConfiguredDefaults(legacyDefaults(pluginConfig(options)),parseConfiguredDefaults(options??{}))
 }
-
-function createSkillController(api,source){const [skills,setSkills]=createSignal6({})
-const refreshing=new Map
-const targets=new Map
-const requests=createRequestState(api.lifecycle.signal)
-const promptRequests=createRequestState(api.lifecycle.signal)
-let activeTarget
+import {randomUUID} from "crypto"
+import {link,mkdir,readFile,readdir,rename,rm,unlink,writeFile,readFile as readFile2} from "fs/promises"
+import {join,dirname,join as join2,join as join3} from "path"
+var LOCK_TIMEOUT_MS=3000
+function errno(error,code){return error instanceof Error&&"code" in error&&error.code===code
+}
+function delay(milliseconds){return new Promise((resolve)=>setTimeout(resolve,milliseconds))
+}
+function createPreferencesStore(stateDirectory){const directory=join(stateDirectory,LEGACY_PLUGIN_ID)
+const file=join(directory,"preferences.json")
+const lock=join(directory,"preferences.lock")
+let writes=Promise.resolve()
+async function readLockOwner(){const source=await readFile(lock,"utf8").catch((error)=>{if(errno(error,"ENOENT"))
+return
+throw error
+})
+if(source===undefined)
+return
+try{const value=JSON.parse(source)
+if(typeof value.token!=="string"||typeof value.pid!=="number")
+return
+return{token:value.token,pid:value.pid}} catch{return
+}}
+function processIsAlive(pid){try{process.kill(pid,0)
+return true
+} catch(error){return !errno(error,"ESRCH")
+}}
+async function moveLockToTombstone(suffix){const tombstone=`${lock}.${suffix}.${randomUUID()}`
+try{await rename(lock,tombstone)
+} catch(error){if(errno(error,"ENOENT"))
+return false
+throw error
+}
+await rm(tombstone,{recursive:true,force:true})
+return true
+}
+async function liveRecoveryMarkers(prefix="preferences.lock.recover."){const entries=await readdir(directory)
+const markers=[]
+for(const entry of entries){if(!entry.startsWith(prefix)||entry.endsWith(".candidate"))
+continue
+const path=join(directory,entry)
+const markerOwner=await readFile(path,"utf8").then((source)=>JSON.parse(source)).catch(()=>{})
+if(typeof markerOwner?.pid==="number"&&processIsAlive(markerOwner.pid))
+markers.push(path)
+else
+await unlink(path).catch((error)=>{if(!errno(error,"ENOENT"))
+throw error
+})
+}
+return markers.sort()
+}
+async function reapStaleLock(owner){const token=Buffer.from(owner.token).toString("base64url")
+const prefix=`preferences.lock.recover.${token}.`
+const recovery=join(directory,`${prefix}${Date.now().toString().padStart(13, "0")}.${process.pid}.${randomUUID()}`)
+const markers=await liveRecoveryMarkers(prefix)
+if(markers.length>0)
+return false
+const candidate=`${recovery}.candidate`
+await writeFile(candidate,JSON.stringify({token:owner.token,pid:process.pid}),{flag:"wx",mode:384})
+try{await rename(candidate,recovery)
+await delay(10)
+const liveMarkers=await liveRecoveryMarkers(prefix)
+if(liveMarkers[0]!==recovery)
+return false
+const current=await readLockOwner()
+if(current?.token!==owner.token||processIsAlive(current.pid))
+return false
+return moveLockToTombstone("stale")
+} finally{await unlink(candidate).catch((error)=>{if(!errno(error,"ENOENT"))
+throw error
+})
+await unlink(recovery).catch((error)=>{if(!errno(error,"ENOENT"))
+throw error
+})
+}}
+async function tryAcquireLock(deadline){const token=randomUUID()
+const candidate=`${lock}.${token}.candidate`
+let acquired=false
+let handedOff=false
+await writeFile(candidate,JSON.stringify({token,pid:process.pid}),{flag:"wx",mode:384})
+try{try{await link(candidate,lock)
+acquired=true
+} catch(error){if(!errno(error,"EEXIST"))
+throw error
+const owner=await readLockOwner()
+if(!owner||processIsAlive(owner.pid))
+return
+await reapStaleLock(owner)
+return
+}
+while(true){const markers=await liveRecoveryMarkers()
+if(markers.length===0)
+break
+if(Date.now()>=deadline)
+return
+await delay(10)
+}
+const currentOwner=await readLockOwner()
+if(currentOwner?.token!==token)
+return
+handedOff=true
+return async ()=>{const current=await readLockOwner()
+if(current?.token!==token)
+throw new Error("Refusing to release a preferences lock owned by another process")
+await moveLockToTombstone("released")
+}} finally{if(acquired&&!handedOff){const current=await readLockOwner()
+if(current?.token===token)
+await moveLockToTombstone("released")
+}
+await unlink(candidate).catch((error)=>{if(!errno(error,"ENOENT"))
+throw error
+})
+}}
+async function acquireLock(){await mkdir(directory,{recursive:true,mode:448})
+const deadline=Date.now() + LOCK_TIMEOUT_MS
+while(true){const release=await tryAcquireLock(deadline)
+if(release)
+return release
+if(Date.now()>=deadline)
+throw new Error(`Timed out waiting for preferences lock: ${lock}`)
+await delay(10)
+}}
+async function withLock(operation){const release=await acquireLock()
+try{return await operation()
+} finally{await release()
+}}
+async function read(){const source=await readFile(file,"utf8").catch((error)=>{if(errno(error,"ENOENT"))
+return
+throw error
+})
+if(source===undefined)
+return
+try{return parsePreferencesDocument(JSON.parse(source))
+} catch(error){if(error instanceof SyntaxError)
+throw new Error(`Malformed preferences JSON: ${file}`,{cause:error})
+throw error
+}}
+async function write(value){const temporary=`${file}.${process.pid}.${randomUUID()}.tmp`
+try{await writeFile(temporary,`${JSON.stringify(value)}
+`,{mode:384})
+await rename(temporary,file)
+} finally{await unlink(temporary).catch((error)=>{if(!errno(error,"ENOENT"))
+throw error
+})
+}}
+function enqueue(operation){const result=writes.then(operation)
+writes=result.catch(()=>{})
+return result
+}
+return{load(){return withLock(async ()=>await read()??emptyPreferencesDocument())
+},update(update){return enqueue(()=>withLock(async ()=>{const current=await read()??emptyPreferencesDocument()
+await write(applyPreferencesUpdate(current,update))
+}))
+},async flush(){await writes
+}}}
+
+function createSkillModel(options){const{source,lifecycle}=options
+const [skills,setSkills]=createSignal6({})
+const refreshing=new Map
+const targets=new Map
+const requests=createRequestState(lifecycle.signal)
+const promptRequests=createRequestState(lifecycle.signal)
+let activeTarget
 let leases=new Set
-function target(){return currentLocation(api)
+function target(){return options.target()
 }
-function list(current=target()){return source?source.list(current):skills()[current.key]??[]
+function list(current=target()){return options.cache==="source"?source.list(current):skills()[current.key]??[]
 }
 function error(current=target()){return requests.state(current.key).error?.message
 }
@@ -2421,8 +2474,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=(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())
+const request=source.refresh(current,force,requestState.signal).then((data)=>{const items=[...data].sort((a,b)=>a.name.localeCompare(b.name))
+if(options.cache==="model"&&requestState.isCurrent())
 setSkills((value)=>({...value,[current.key]:items}))
 requestState.succeed()
 return items
@@ -2435,9 +2488,9 @@ refreshing.delete(current.key)
 refreshing.set(current.key,request)
 return request
 }
-const unsubscribe=api.event.on("server.connected",()=>{for(const current of targets.values()){retryBackgroundRefresh(()=>refresh(current),{signal:api.lifecycle.signal}).catch(()=>{})
+const unsubscribe=options.onReconnect(()=>{for(const current of targets.values()){retryBackgroundRefresh(()=>refresh(current),{signal:lifecycle.signal}).catch(()=>{})
 }})
-api.lifecycle.onDispose(unsubscribe)
+lifecycle.onDispose(unsubscribe)
 return{list,error,refresh,target,state(current=target()){return requests.state(current.key)
 },retry(current=target()){return refresh(current,true)
 },activate(current=target()){targets.set(current.key,current)
@@ -2463,15 +2516,24 @@ throw new DOMException("Sidebar context changed","AbortError")
 const request=promptRequests.start(current.key,"insert skill",false,true)
 if(!request)
 return false
-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})
+try{const result=selected?await source.use(current,selected,request.signal):await options.useNamed?.(current,name,request.signal)
 if(!request.isCurrent())
 return false
 request.succeed()
-return result.data
+return result??false
 } catch(error_){request.fail(error_)
 throw error_
 } finally{request.finish()
 }}}}
+function createSkillController(api,source){const useNamed=async (target,name,signal)=>{const result=await api.client.tui.appendPrompt({...target.routing,text:`/${name} `},{throwOnError:true,signal})
+return result.data??false
+}
+return createSkillModel({lifecycle:api.lifecycle,target:()=>currentLocation(api),cache:source?"source":"model",source:source??{list:()=>[],async refresh(target,_force,signal){const result=await api.client.app.skills(target.routing,{throwOnError:true,signal})
+return result.data??[]
+},use:(target,skill,signal)=>useNamed(target,skill.name,signal)
+},onReconnect:(listener)=>api.event.on("server.connected",listener),useNamed
+})
+}
 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)
@@ -2725,34 +2787,40 @@ return "Skill source changed"
 return "Multiple sources share this skill name"
 return
 }
-function activateSkill(input){input={...input,skill:{...input.skill
-}}
+function createSkillActivation(input){const 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))
-input.api.ui.toast({variant:"error",title:"Skills",message:String(error),duration:5000
-})
-}
-function check(){if(!current())
+function check(){if(!input.current()||target.key!==input.controller.target().key)
 throw new DOMException("Skill target changed; choose it again","AbortError")
-const reason=skillUnavailable(input.controller,input.skill)
+const reason=skillUnavailable(input.controller,skill)
 if(reason)
 throw new Error(reason)
 }
-async function insert(skip=false){try{check()
+return{skill,check,shouldConfirm:()=>input.access.shouldConfirmSkill(skill),async run(skip=false){check()
 if(skip)
-input.access.skipSkillConfirmation(input.skill)
+input.access.skipSkillConfirmation(skill)
 input.beforeInsert?.()
-if(await input.controller.use(target,input.skill.name,input.skill))
-await input.access.recordSkillUse?.(input.skill)
+const inserted=await input.controller.use(target,skill.name,skill)
+if(inserted)
+await input.access.recordSkillUse?.(skill)
+return inserted
+}}}
+function activateSkill(input){input={...input,skill:{...input.skill
+}}
+const route=JSON.stringify(input.api.route.current)
+const activation=createSkillActivation({...input,current:()=>route===JSON.stringify(input.api.route.current)
+})
+const report=(error)=>{if(!isAbortError(error))
+input.api.ui.toast({variant:"error",title:"Skills",message:String(error),duration:5000
+})
+}
+async function insert(skip=false){try{await activation.run(skip)
 } catch(error){report(error)
 }}
-try{check()
+try{activation.check()
 } catch(error){report(error)
 return
 }
-if(!input.access.shouldConfirmSkill(input.skill)){insert()
+if(!activation.shouldConfirm()){insert()
 return
 }
 input.dialogs.open(()=>_$createComponent(SkillDialog,{get api(){return input.api
@@ -2775,7 +2843,7 @@ return value
 }
 function changed(){setRevision((value)=>value + 1)
 }
-return{observeStatus(key,sessionID,status,at=now()){const value=state(key)
+return{observeStatus(key,sessionID,status,at=now(),nativeStart){const value=state(key)
 const run=value.active.get(sessionID)
 const isKnown=value.known.has(sessionID)
 value.known.add(sessionID)
@@ -2783,10 +2851,17 @@ if(status.type==="idle"){if(!run)
 return
 value.active.delete(sessionID)
 value.recent=[{...run,finishedAt:Math.max(at,run.startedAt),outcome:run.outcome??"finished"},...value.recent].sort((a,b)=>b.finishedAt-a.finishedAt||a.sessionID.localeCompare(b.sessionID)).slice(0,10)
-} else{if(run)
+} else{const exact=typeof nativeStart==="number"&&Number.isFinite(nativeStart)&&nativeStart>0&&nativeStart<=at?nativeStart:undefined
+if(run){if(exact===undefined||run.nativeStartedAt!==undefined&&exact<=run.nativeStartedAt)
+return
+const next=exact>run.startedAt?{sessionID}:run
+value.active.set(sessionID,{...next,startedAt:exact,nativeStartedAt:exact,startedBeforeObservation:false
+})
+changed()
 return
+}
 value.recent=value.recent.filter((item)=>item.sessionID!==sessionID)
-value.active.set(sessionID,{sessionID,startedAt:at,startedBeforeObservation:!isKnown})
+value.active.set(sessionID,{sessionID,startedAt:exact??at,startedBeforeObservation:exact===undefined&&!isKnown,...exact!==undefined&&{nativeStartedAt:exact}})
 }
 changed()
 },observeError(key,sessionID,error,at=now()){if(!sessionID)
@@ -2798,7 +2873,7 @@ return
 const isCancelled=error?.name==="MessageAbortedError"
 const data=error&&"data" in error?error.data:undefined
 const fallbackMessage=isCancelled?"Session aborted":"Session error"
-const message=data&&"message" in data&&typeof data.message==="string"?data.message:fallbackMessage
+const message=data&&typeof data==="object"&&"message" in data&&typeof data.message==="string"?data.message:fallbackMessage
 const next={...run,startedAt:Math.min(run.startedAt,at),outcome:isCancelled?"cancelled":"error",errorMessage:message
 }
 if(value.active.has(sessionID))
@@ -2821,7 +2896,7 @@ 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 source=options.source
+function createSubagentModel(options){const source=options.source
 const now=options.now??Date.now
 const history=createSubagentHistory({now})
 const [children,setChildren]=createSignal8({})
@@ -2832,14 +2907,13 @@ const [unavailable,setUnavailable]=createSignal8({})
 const targets=new Map
 const remoteFailures=new Map
 const remoteRetryAt=new Map
-const requests=createRequestState(api.lifecycle.signal)
+const requests=createRequestState(options.lifecycle.signal)
 let activeTarget
+let leases=new Set
 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
-return{key:JSON.stringify([parentID,directory,workspace??null]),parentID,routing:{directory,...workspace&&{workspace}}}}
+const snapshots=()=>options.cache==="source"?Object.fromEntries([...targets].map(([key,current])=>[key,source.list(current.parentID)])):children()
+function target(parentID){return options.target(parentID)
+}
 function applySession(items,parentID,mutation){const next=items.filter((item)=>item.id!==(mutation.type==="upsert"?mutation.info.id:mutation.sessionID))
 if(mutation.type==="upsert"&&mutation.info.parentID===parentID)
 next.push(mutation.info)
@@ -2854,18 +2928,19 @@ history.remove(key,sessionID)
 }
 for(const journal of journals)
 journal.sessions.push(mutation)
-if(!source)
+if(options.cache==="model")
 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}
+function recordStatus(input){const mutation={...input,at:now(),startedAt:source?.startedAt?.(input.sessionID),observed:new Set
+}
 for(const journal of journals)
 journal.statuses.push(mutation)
-batch(()=>{for(const [key,items] of Object.entries(snapshots())){if(items.every((item)=>item.id!==mutation.sessionID))
+batch2(()=>{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)
+history.observeStatus(key,mutation.sessionID,mutation.status,mutation.at,mutation.startedAt)
 mutation.observed.add(key)
 }
-if(!source)
+if(options.cache==="model")
 setStatuses((current)=>Object.fromEntries(Object.entries(current).map(([key,value])=>[key,applyStatus(value,mutation)])))
 })
 }
@@ -2891,14 +2966,13 @@ if(!requestState){journals.delete(journal)
 return pending
 }
 const signal=AbortSignal.any([requestState.signal,AbortSignal.timeout(5000)])
-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??[]
+const request=options.snapshot(current,signal).then(async (snapshot)=>{let nextChildren=snapshot.sessions
 for(const mutation of journal.sessions)
 nextChildren=applySession(nextChildren,current.parentID,mutation)
-let nextStatuses={...statusResult.data}
+let nextStatuses={...snapshot.statuses}
 const missing={}
-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}}))
+const remoteStatuses=options.remoteStatus?await Promise.all(nextChildren.map(async (session)=>{const key=JSON.stringify([current.key,session.id])
+return(remoteRetryAt.get(key)??0)<=now()?options.remoteStatus(session,requestState.signal):{sessionID:session.id,failed:true,cooldown:true,status:undefined}})):[]
 if(!requestState.isCurrent())
 return
 for(const result of remoteStatuses){if(!result)
@@ -2924,17 +2998,17 @@ for(const mutation of journal.sessions)
 nextChildren=applySession(nextChildren,current.parentID,mutation)
 for(const mutation of journal.statuses)
 nextStatuses=applyStatus(nextStatuses,mutation)
-if(requestState.isCurrent()){batch(()=>{for(const session of nextChildren){const mutations=journal.statuses.filter((mutation)=>mutation.sessionID===session.id)
+if(requestState.isCurrent()){batch2(()=>{for(const session of nextChildren){const mutations=journal.statuses.filter((mutation)=>mutation.sessionID===session.id)
 if(mutations.length>0){for(const mutation of mutations){if(!mutation.observed.has(current.key))
-history.observeStatus(current.key,session.id,mutation.status,mutation.at)
+history.observeStatus(current.key,session.id,mutation.status,mutation.at,mutation.startedAt)
 }} else if(!missing[session.id]){const status=nextStatuses[session.id]??{type:"idle"}
 nextStatuses[session.id]=status
-history.observeStatus(current.key,session.id,status)
+history.observeStatus(current.key,session.id,status,now(),source?.startedAt?.(session.id))
 }
 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)
 }}
-if(!source){setChildren((value)=>({...value,[current.key]:nextChildren}))
+if(options.cache==="model"){setChildren((value)=>({...value,[current.key]:nextChildren}))
 setStatuses((value)=>({...value,[current.key]:nextStatuses}))
 }
 setUnavailable((value)=>({...value,[current.key]:missing}))
@@ -2954,8 +3028,8 @@ return request
 function refresh(parentID,force=false){return refreshTarget(target(parentID),force)
 }
 function list(parentID){const current=target(parentID)
-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))
+const currentStatuses=options.cache==="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:source.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]
 }))
 }
@@ -2965,14 +3039,25 @@ return history.recent(current.key).flatMap((run)=>{const session=sessions.get(ru
 return session?[{session,status:{type:"idle"},run,unavailable:false}]:[]
 })
 }
-const unsubscribe=[api.event.on("session.created",(event)=>recordSession({type:"upsert",info:event.properties.info})),api.event.on("session.updated",(event)=>recordSession({type:"upsert",info:event.properties.info})),api.event.on("session.deleted",(event)=>{recordSession({type:"remove",sessionID:event.properties.sessionID})
-recordStatus({sessionID:event.properties.sessionID,status:{type:"idle"}})
-}),api.event.on("session.status",(event)=>recordStatus(event.properties)),api.event.on("session.error",(event)=>recordError(event.properties)),api.event.on("session.idle",(event)=>recordStatus({sessionID:event.properties.sessionID,status:{type:"idle"}})),api.event.on("server.connected",()=>{const current=activeTarget?targets.get(activeTarget):undefined
+const unsubscribe=options.subscribe((event)=>{switch(event.type){case "upsert":{recordSession(event)
+break
+}
+case "remove":{recordSession(event)
+recordStatus({sessionID:event.sessionID,status:{type:"idle"}})
+break
+}
+case "status":{recordStatus(event)
+break
+}
+case "error":{recordError(event)
+break
+}
+case "reconnect":{const current=activeTarget?targets.get(activeTarget):undefined
 if(current)
-retryBackgroundRefresh(()=>refreshTarget(current),{signal:api.lifecycle.signal}).catch(()=>{})
-})]
-api.lifecycle.onDispose(()=>{for(const dispose of unsubscribe)
-dispose()
+retryBackgroundRefresh(()=>refreshTarget(current),{signal:options.lifecycle.signal}).catch(()=>{})
+break
+}}})
+options.lifecycle.onDispose(()=>{unsubscribe()
 if(pollTimer)
 clearTimeout(pollTimer)
 })
@@ -2985,15 +3070,18 @@ clearTimeout(pollTimer)
 requests.abortAll()
 refreshing.clear()
 activeTarget=current.key
-const poll=()=>{if(activeTarget!==current.key||api.lifecycle.signal.aborted)
+leases=new Set
+const poll=()=>{if(activeTarget!==current.key||options.lifecycle.signal.aborted)
 return
 refreshTarget(current).catch(()=>{})
 pollTimer=setTimeout(poll,POLL_INTERVAL_MS)
 }
-if(!source)
+if(options.cache==="model")
 pollTimer=setTimeout(poll,POLL_INTERVAL_MS)
 }
-return()=>{if(activeTarget!==current.key)
+const lease=Symbol(current.key)
+leases.add(lease)
+return()=>{if(activeTarget!==current.key||!leases.delete(lease)||leases.size>0)
 return
 activeTarget=undefined
 if(pollTimer)
@@ -3001,7 +3089,7 @@ clearTimeout(pollTimer)
 pollTimer=undefined
 requests.abortAll()
 refreshing.clear()
-}},open(sessionID){api.route.navigate("session",{sessionID})
+}},open(sessionID){options.open(sessionID)
 }}}
 async function fetchDevTeamStatus(session,signal){const metadata=session.metadata
 const devTeam=metadata&&typeof metadata.devTeam==="object"?metadata.devTeam:undefined
@@ -3022,10 +3110,26 @@ return{sessionID:session.id,failed:true}
 const status=statuses[session.id]
 if(status!==undefined&&(!status||typeof status!=="object"||!("type" in status)||!["idle","busy","retry"].includes(String(status.type))))
 return{sessionID:session.id,failed:true}
-if(status&&typeof status==="object"&&"type" in status&&status.type==="retry"&&(!("next" in status)||typeof status.next!=="number"||!Number.isFinite(status.next)||!("attempt" in status)||typeof status.attempt!=="number"||!("message" in status)||typeof status.message!=="string")){return{sessionID:session.id,failed:true}}
+if(status&&typeof status==="object"&&"type" in status&&status.type==="retry"&&(!("next" in status)||typeof status.next!=="number"||!Number.isFinite(status.next)||!("attempt" in status)||typeof status.attempt!=="number"||!("message" in status)||typeof status.message!=="string"))
+return{sessionID:session.id,failed:true}
 return{sessionID:session.id,status}} catch{if(signal.aborted)
 return
 return{sessionID:session.id,failed:true}}}
+function createSubagentController(api,options={}){const source=options.source
+return createSubagentModel({now:options.now,lifecycle:api.lifecycle,cache:source?"source":"model",source:source??{list:()=>[],status:(id)=>api.state.session.status(id)??{type:"idle"},refresh:async ()=>{}},target(parentID){const parent=api.state.session.get(parentID)
+const directory=parent?.directory??api.state.path.directory
+const workspace=parent?.workspaceID
+return{key:JSON.stringify([parentID,directory,workspace??null]),parentID,routing:{directory,...workspace&&{workspace}}}},async snapshot(target,signal){if(source){await source.refresh(target.parentID,signal)
+const sessions=source.list(target.parentID)
+return{sessions,statuses:Object.fromEntries(sessions.map((session)=>[session.id,source.status(session.id)]))
+}}
+const [children,statuses]=await Promise.all([api.client.session.children({sessionID:target.parentID,...target.routing},{throwOnError:true,signal}),api.client.session.status(target.routing,{throwOnError:true,signal})])
+return{sessions:children.data??[],statuses:statuses.data??{}}},remoteStatus:source?undefined:fetchDevTeamStatus,subscribe(listener){const unsubscribe=[api.event.on("session.created",(event)=>listener({type:"upsert",info:event.properties.info})),api.event.on("session.updated",(event)=>listener({type:"upsert",info:event.properties.info})),api.event.on("session.deleted",(event)=>listener({type:"remove",sessionID:event.properties.sessionID})),api.event.on("session.status",(event)=>listener({type:"status",...event.properties})),api.event.on("session.error",(event)=>listener({type:"error",...event.properties})),api.event.on("session.idle",(event)=>listener({type:"status",sessionID:event.properties.sessionID,status:{type:"idle"}})),api.event.on("server.connected",()=>listener({type:"reconnect"}))]
+return()=>{for(const dispose of unsubscribe)
+dispose()
+}},open:(sessionID)=>api.route.navigate("session",{sessionID})
+})
+}
 
 function filterSubagentView(rows,mode,query){const needle=query.trim().toLocaleLowerCase()
 return rows.filter((row)=>{if(mode==="active"&&row.group!=="Active")
@@ -3063,30 +3167,32 @@ onCleanup6(()=>clearInterval(timer))
 return now
 }
 
-function createTodoController(api){const [sessions,setSessions]=createSignal10({})
+function createTodoModel(options){const [sessions,setSessions]=createSignal10({})
 const refreshing=new Map
 const revisions=new Map
-const requests=createRequestState(api.lifecycle.signal)
+const requests=createRequestState(options.lifecycle.signal)
 let activeTarget
-function target(sessionID){const session=api.state.session.get(sessionID)
-const directory=session?.directory??api.state.path.directory
-const workspace=session?.workspaceID
-return{key:JSON.stringify([sessionID,directory,workspace??null]),sessionID,routing:{directory,...workspace&&{workspace}}}}
+let leases=new Set
+function target(sessionID){return options.target(sessionID)
+}
 function set(current,todos){setSessions((value)=>({...value,[current.key]:todos}))
 }
 function list(sessionID){const current=target(sessionID)
-return sessions()[current.key]??api.state.session.todo(sessionID)
+return options.cache==="source"?options.source.list(sessionID):sessions()[current.key]??options.source.list(sessionID)
 }
-async function refresh(sessionID,force=false){const current=target(sessionID)
+function refresh(sessionID,force=false){if(options.lifecycle.signal.aborted)
+return Promise.resolve([])
+const current=target(sessionID)
 const pending=refreshing.get(current.key)
 if(pending&&!force)
 return pending
-const revision=revisions.get(sessionID)??0
-const requestState=requests.start(current.key,"refresh todos",current.key in sessions(),force)
+const revision=revisions.get(current.key)??0
+const requestState=requests.start(current.key,"refresh todos",current.key in sessions()||Boolean(options.hasValue?.(sessionID)),force)
 if(!requestState)
 return pending
-const request=api.client.session.todo({sessionID,...current.routing},{throwOnError:true,signal:requestState.signal}).then((result)=>{const todos=result.data??[]
-if(requestState.isCurrent()&&(revisions.get(sessionID)??0)===revision)
+const request=Promise.try(()=>options.source.refresh(sessionID,requestState.signal)).then((todos)=>{if(!requestState.isCurrent())
+return []
+if(options.cache==="model"&&(revisions.get(current.key)??0)===revision)
 set(current,todos)
 requestState.succeed()
 return todos
@@ -3099,50 +3205,134 @@ refreshing.delete(current.key)
 refreshing.set(current.key,request)
 return request
 }
-const unsubscribe=api.event.on("todo.updated",(event)=>{const sessionID=event.properties.sessionID
-revisions.set(sessionID,(revisions.get(sessionID)??0) + 1)
-set(target(sessionID),event.properties.todos)
+const unsubscribe=options.source.subscribe?.((sessionID,todos)=>{const current=target(sessionID)
+revisions.set(current.key,(revisions.get(current.key)??0) + 1)
+set(current,todos)
+})
+if(unsubscribe)
+options.lifecycle.onDispose(unsubscribe)
+return{target,list,refresh,state(sessionID){return requests.state(target(sessionID).key)
+},retry(sessionID){return refresh(sessionID,true)
+},activate(sessionID){const key=target(sessionID).key
+if(activeTarget!==key){requests.abortAll()
+refreshing.clear()
+activeTarget=key
+leases=new Set
+}
+const lease=Symbol(key)
+leases.add(lease)
+return()=>{if(activeTarget!==key||!leases.delete(lease)||leases.size>0)
+return
+activeTarget=undefined
+requests.abortAll()
+refreshing.clear()
+}}}}
+function createTodoController(api){const target=(sessionID)=>{const session=api.state.session.get(sessionID)
+const directory=session?.directory??api.state.path.directory
+const workspace=session?.workspaceID
+return{key:JSON.stringify([sessionID,directory,workspace??null]),sessionID,routing:{directory,...workspace&&{workspace}}}}
+return createTodoModel({lifecycle:api.lifecycle,target,cache:"model",source:{list:(sessionID)=>api.state.session.todo(sessionID),async refresh(sessionID,signal){const result=await api.client.session.todo({sessionID,...target(sessionID).routing},{throwOnError:true,signal})
+return result.data??[]
+},subscribe:(listener)=>api.event.on("todo.updated",(event)=>listener(event.properties.sessionID,event.properties.todos))
+}})
+}
+
+function buildTodoView(todos,mode){const active=[...todos.filter((item)=>item.status==="in_progress"),...todos.filter((item)=>item.status==="pending")]
+const completed=todos.filter((item)=>item.status==="completed")
+const cancelled=todos.filter((item)=>item.status==="cancelled")
+const other=todos.filter((item)=>!["in_progress","pending","completed","cancelled"].includes(item.status))
+const groups=[{title:"Active",items:mode==="finished"?[]:active},{title:"Completed",items:mode==="active"?[]:completed},{title:"Cancelled",items:mode==="active"?[]:cancelled},{title:"Other",items:mode==="all"?other:[]}].filter((group)=>group.items.length)
+return{groups,rows:groups.flatMap((group)=>group.items.map((item)=>({item,group:group.title}))),counts:{all:todos.length,active:active.length,finished:completed.length + cancelled.length,completed:completed.length
+}}}
+
+
+
+
+
+var HelpView=lazy2(async ()=>{const path=import.meta.url.includes("/dist/tui.js")?"./sidebar-shortcuts.js":"../../../sidebar-shortcuts"
+const module=await import(path)
+return{default:module.KeyboardHelpDialog
+}})
+function KeyboardHelpDialog(props){return(()=>{var _el$=_$createElement("box")
+_$insert(_el$,_$createComponent(Suspense2,{get children(){return _$createComponent(HelpView,props)
+}}))
+return _el$
+})()
+}
+function openKeyboardHelp(api,iconStyle=()=>"nerd",multilineCorners=()=>true,shortcuts=[]){createDialogStack(api,iconStyle,()=>true,multilineCorners).open(()=>_$createComponent(KeyboardHelpDialog,{api,shortcuts
+}))
+}
+
+
+
+
+
+
+
+
+
+
+
+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]
+}))
+function quickActionRequiresSession(command){return command!=="session.list"&&command!=="session.new"&&command!=="permission.mode"
+}
+function orderQuickActionIds(order,favorites){return [...order.filter((id)=>favorites.has(id)),...order.filter((id)=>!favorites.has(id))]
+}
+var SEARCH_GROUPS=["Skills","Subagents","MCP","Actions"]
+var SEARCH_SECTIONS={Skills:"skills",Subagents:"subagents",MCP:"mcp",Actions:"quick_actions"
+}
+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:[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,input.mcpErrorMode==="details"?undefined: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,...input.mcpErrorMode==="details"&&item.error&&{information:{title:`MCP \xB7 ${item.name}`,body:`Status: ${item.status}
+
+${item.error}`}}})),...orderQuickActionIds(input.actionOrder,input.favoriteQuickActions??new Set).flatMap((id)=>{const action=QUICK_ACTIONS.find((item)=>item.command===id)
+return action?[{id:`action:${id}`,group:"Actions",title:input.actionLabel?.(action)??action.label,description:id,command:id,disabled:input.actionDisabledReason?.(action)??(quickActionRequiresSession(action.command)&&!input.hasSession?"Requires an open session":undefined)
+}]:[]
+})]
+return [...new Map(results.map((item)=>[item.id,item])).values()]
+}
+function fuzzyScore(needle,value){const text=value.toLocaleLowerCase()
+const position=text.indexOf(needle)
+if(text===needle)
+return 2000
+if(position===0)
+return 1500
+if(position!==-1)
+return 1000-position
+let cursor=0
+let gaps=0
+for(const char of needle){const index=text.indexOf(char,cursor)
+if(index===-1)
+return -1
+gaps += index-cursor
+cursor=index + char.length
+}
+return Math.max(0,500-gaps)
+}
+function searchResults(candidates,query){const terms=query.trim().toLocaleLowerCase().split(/\s+/).filter(Boolean)
+const scored=candidates.flatMap((item,index)=>{let score=0
+for(const term of terms){const title=fuzzyScore(term,item.title)
+const detail=fuzzyScore(term,`${item.description} ${item.keywords ?? ""}`)
+if(title<0&&detail<0)
+return []
+score += Math.max(title>=0?title:-Infinity,detail>=0?detail-250:-Infinity)
+}
+return [{item,score,index}]
 })
-api.lifecycle.onDispose(unsubscribe)
-return{target,list,refresh,state(sessionID){return requests.state(target(sessionID).key)
-},retry(sessionID){return refresh(sessionID,true)
-},activate(sessionID){const key=target(sessionID).key
-if(activeTarget!==key){requests.abortAll()
-refreshing.clear()
-activeTarget=key
+scored.sort((a,b)=>SEARCH_GROUPS.indexOf(a.item.group)-SEARCH_GROUPS.indexOf(b.item.group)||b.score-a.score||a.index-b.index)
+return scored.map(({item})=>item)
 }
-return()=>{if(activeTarget!==key)
-return
-activeTarget=undefined
-requests.abortAll()
-refreshing.clear()
-}}}}
-
-function buildTodoView(todos,mode){const active=[...todos.filter((item)=>item.status==="in_progress"),...todos.filter((item)=>item.status==="pending")]
-const completed=todos.filter((item)=>item.status==="completed")
-const cancelled=todos.filter((item)=>item.status==="cancelled")
-const other=todos.filter((item)=>!["in_progress","pending","completed","cancelled"].includes(item.status))
-const groups=[{title:"Active",items:mode==="finished"?[]:active},{title:"Completed",items:mode==="active"?[]:completed},{title:"Cancelled",items:mode==="active"?[]:cancelled},{title:"Other",items:mode==="all"?other:[]}].filter((group)=>group.items.length)
-return{groups,rows:groups.flatMap((group)=>group.items.map((item)=>({item,group:group.title}))),counts:{all:todos.length,active:active.length,finished:completed.length + cancelled.length,completed:completed.length
-}}}
-
-
-
+function searchContext(api){const route=api.route.current
+const sessionID=route.name==="session"&&"params" in route&&typeof route.params?.sessionID==="string"?route.params.sessionID:undefined
+const location=currentLocation(api)
+return{sessionID,location,key:JSON.stringify([route.name,sessionID??null,location.key])}}
 
 
-var HelpView=lazy2(async ()=>{const path=import.meta.url.includes("/dist/tui.js")?"./sidebar-shortcuts.js":"../../../sidebar-shortcuts"
-const module=await import(path)
-return{default:module.KeyboardHelpDialog
-}})
-function KeyboardHelpDialog(props){return(()=>{var _el$=_$createElement("box")
-_$insert(_el$,_$createComponent(Suspense2,{get children(){return _$createComponent(HelpView,props)
-}}))
-return _el$
-})()
-}
-function openKeyboardHelp(api,iconStyle=()=>"nerd",multilineCorners=()=>true,shortcuts=[]){createDialogStack(api,iconStyle,()=>true,multilineCorners).open(()=>_$createComponent(KeyboardHelpDialog,{api,shortcuts
-}))
-}
 
 
 
@@ -3170,11 +3360,6 @@ function supportsTitleVisibility(api){return hostCapabilities(api).titleVisibili
 }
 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]
-}))
-function quickActionRequiresSession(command){return command!=="session.list"&&command!=="session.new"&&command!=="permission.mode"
-}
 function quickActionLabel(api,action){if(action.command!=="permission.mode")
 return action.label
 const command=api.keymap.getCommands?.({visibility:"registered"}).find((candidate)=>candidate.name===action.command)
@@ -3186,8 +3371,6 @@ if(unsubscribe)
 onCleanup8(unsubscribe)
 return revision
 }
-function orderQuickActionIds(order,favorites){return [...order.filter((id)=>favorites.has(id)),...order.filter((id)=>!favorites.has(id))]
-}
 function quickActionDisabledReason(api,action){const route=api.route.current
 if(quickActionRequiresSession(action.command)&&route.name!=="session")
 return "Requires an open session"
@@ -3225,69 +3408,6 @@ return mode?"on":"off"
 }
 return sources.get(api)?.(id)
 }
-var SEARCH_GROUPS=["Skills","Subagents","MCP","Actions"]
-var SEARCH_SECTIONS={Skills:"skills",Subagents:"subagents",MCP:"mcp",Actions:"quick_actions"
-}
-function searchContext(api){const route=api.route.current
-const sessionID=route.name==="session"&&"params" in route&&typeof route.params?.sessionID==="string"?route.params.sessionID:undefined
-const location=currentLocation(api)
-return{sessionID,location,key:JSON.stringify([route.name,sessionID??null,location.key])}}
-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:[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)
-return action?[{id:`action:${id}`,group:"Actions",title:input.actionLabel?.(action)??action.label,description:id,command:id,disabled:input.actionDisabledReason?.(action)??(quickActionRequiresSession(action.command)&&!input.hasSession?"Requires an open session":undefined)
-}]:[]
-})]
-return [...new Map(results.map((item)=>[item.id,item])).values()]
-}
-function fuzzyScore(needle,value){const text=value.toLocaleLowerCase()
-const position=text.indexOf(needle)
-if(text===needle)
-return 2000
-if(position===0)
-return 1500
-if(position!==-1)
-return 1000-position
-let cursor=0
-let gaps=0
-for(const char of needle){const index=text.indexOf(char,cursor)
-if(index===-1)
-return -1
-gaps += index-cursor
-cursor=index + char.length
-}
-return Math.max(0,500-gaps)
-}
-function searchResults(candidates,query){const terms=query.trim().toLocaleLowerCase().split(/\s+/).filter(Boolean)
-const scored=candidates.flatMap((item,index)=>{let score=0
-for(const term of terms){const title=fuzzyScore(term,item.title)
-const detail=fuzzyScore(term,`${item.description} ${item.keywords ?? ""}`)
-if(title<0&&detail<0)
-return []
-score += Math.max(title>=0?title:-Infinity,detail>=0?detail-250:-Infinity)
-}
-return [{item,score,index}]
-})
-scored.sort((a,b)=>SEARCH_GROUPS.indexOf(a.item.group)-SEARCH_GROUPS.indexOf(b.item.group)||b.score-a.score||a.index-b.index)
-return scored.map(({item})=>item)
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
 function mixColor(from,to,amount){return RGBA3.fromValues(from.r + (to.r-from.r)*amount,from.g + (to.g-from.g)*amount,from.b + (to.b-from.b)*amount)
 }
 function createSearchDialogController(props){const context=searchContext(props.api)
@@ -3373,7 +3493,7 @@ function selectTab(tab){if(tab!==activeTab()){tabViews.set(activeTab(),{selected
 })
 const saved=tabViews.get(tab)
 pendingScroll=saved?.scrollTop??0
-batch2(()=>{setActiveTab(tab)
+batch3(()=>{setActiveTab(tab)
 setSelectedID(saved?.selectedID)
 })
 }
@@ -3678,14 +3798,17 @@ clearTimeout(timer)
 return _$createElement("box")
 }
 
-function createMcpPresetPreview(controller,preferences,name){const target=controller.target()
+var alwaysCurrent=()=>true
+function createMcpPresetPreview(controller,preferences,name,isCurrent=alwaysCurrent){const target=controller.target()
 const valid=()=>{const current=controller.target()
-return current.key===target.key&&current.scope===target.scope
+return isCurrent()&&current.key===target.key&&current.scope===target.scope
 }
 const preset=createMemo2(()=>preferences.mcpPresets()[name])
-const preview=createMemo2(()=>mcpPresetPreview(controller.list(target),preset()??{}))
+const preview=createMemo2(()=>mcpPresetPreview(valid()?controller.list(target):[],preset()??{}))
 const state=createMemo2(()=>controller.state(target))
-const blocked=createMemo2(()=>{if(!preset())
+const blocked=createMemo2(()=>{if(!valid())
+return "Session or server changed; reopen the preview."
+if(!preset())
 return "Preset no longer exists."
 if(controller.mutating(target))
 return "Wait for the current MCP operation to finish."
@@ -4375,7 +4498,7 @@ return _$createElement("box")
 
 function UpgradeNotesBinding(props){let pending
 let disposed=false
-onMount6(async ()=>{const previous=await props.preferences.claimNavigatorUpgrade(props.version)
+async function load(){const previous=await props.preferences.claimNavigatorUpgrade(props.version)
 if(!previous||disposed)
 return
 try{let show=function(){if(disposed||props.api.lifecycle.signal?.aborted)
@@ -4395,7 +4518,8 @@ const entries=changesSince(await (props.read??readBundledChangelog)(),previous,p
 if(entries.length===0||disposed)
 return
 show()
-} catch{}})
+} catch{}}
+onMount6(()=>void load().catch(()=>{}))
 onCleanup16(()=>{disposed=true
 clearTimeout(pending)
 })
@@ -5606,6 +5730,8 @@ return _$createComponent(SectionWithHeaderAction,{get api(){return props.api
 
 
 
+var CHATGPT_METHODS=new Set(["chatgpt-browser","chatgpt-headless"]);
+
 
 
 
@@ -5663,6 +5789,36 @@ return _$createComponent(SectionWithHeaderAction,{get api(){return props.api
 
 
 
+
+var scheduleInterval=(callback,milliseconds)=>{const timer=setInterval(callback,milliseconds)
+return()=>clearInterval(timer)
+}
+function createLimitsRefresh(options,schedule=scheduleInterval){let disposed=false
+const selectedKey=createMemo12(()=>JSON.stringify(options.selectedModel?.()))
+const targetKey=createMemo12(()=>JSON.stringify(options.controller.current().model))
+const interval=createMemo12(()=>(parseLimitsRefreshMinutes(options.refreshMinutes?.())??DEFAULT_LIMITS_REFRESH_MINUTES)*60000)
+createEffect16(on2(selectedKey,()=>{const model=options.selectedModel?.()
+if(model&&options.accountSource)
+options.accountSource.refresh(model).catch(()=>{})
+}))
+createEffect16(on2(targetKey,()=>{const{model,adapter}=options.controller.current()
+if(model&&adapter)
+options.controller.refresh()
+}))
+async function refresh(){if(disposed)
+return
+const target=targetKey()
+const model=options.selectedModel?.()
+if(model&&options.accountSource)
+await options.accountSource.refresh(model)
+if(!disposed&&target===targetKey())
+await options.controller.refresh()
+}
+createEffect16(on2(interval,(milliseconds)=>{onCleanup20(schedule(()=>void refresh().catch(()=>{}),milliseconds))
+}))
+onCleanup20(()=>{disposed=true
+})
+}
 
 
 
@@ -5716,12 +5872,12 @@ function QuickActionRow(props){const{api,interaction
 const icons=useIcons()
 const toolbar=useToolbar()
 const theme=()=>api.theme.current
-const [width,setWidth]=createSignal33(0)
-const shortcut=createMemo12(()=>{const bindings=api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
+const [width,setWidth]=createSignal34(0)
+const shortcut=createMemo13(()=>{const bindings=api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
 })
 return api.keys.formatBindings(bindings.get(props.action.command))
 })
-const visibleShortcut=createMemo12(()=>{const value=shortcut()
+const visibleShortcut=createMemo13(()=>{const value=shortcut()
 return value&&width()>=Bun.stringWidth(props.action.label) + Bun.stringWidth(value) + (toolbar?11:8)?value:undefined
 })
 function run(){if(props.action.command==="session.new"&&props.onNewSession?.())
@@ -5785,7 +5941,7 @@ return _el$4
 }})
 }
 function QuickActionsSection(props){const commandRevision=createQuickActionRevision(props.api)
-const actions=createMemo13(()=>{commandRevision()
+const actions=createMemo14(()=>{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)
 }]:[]
@@ -5869,13 +6025,13 @@ item.activate(event)
 
 
 function SidebarToggleBinding(props){const shortcuts=createSidebarShortcutMode(props.api)
-createEffect16(()=>{const key=props.preferences.toggleKey()
+createEffect17(()=>{const key=props.preferences.toggleKey()
 untrack6(()=>shortcuts.bind(key))
 })
-createEffect16(()=>{if(shortcuts.active()&&(props.api.route.current.name!=="session"||props.api.ui.dialog.open||props.api.mode.current()==="modal"))
+createEffect17(()=>{if(shortcuts.active()&&(props.api.route.current.name!=="session"||props.api.ui.dialog.open||props.api.mode.current()==="modal"))
 untrack6(shortcuts.cancel)
 })
-onCleanup20(shortcuts.dispose)
+onCleanup21(shortcuts.dispose)
 return(()=>{var _el$=_$createElement("box")
 _$setProp(_el$,"position","absolute")
 _$setProp(_el$,"top",0)
@@ -5897,11 +6053,11 @@ const unregisterCommands=props.api.keymap.registerLayer({commands:[...commands,.
 })=>({name:name.replace(PLUGIN_ID,()=>LEGACY_PLUGIN_ID),run,enabled
 }))]
 })
-onCleanup20(unregisterCommands)
-createEffect16(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
+onCleanup21(unregisterCommands)
+createEffect17(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
 }]
 })
-onCleanup20(unregister)
+onCleanup21(unregister)
 })
 return _$createElement("box")
 }
@@ -5953,6 +6109,26 @@ rows.push(visible)
 }
 return{columns,overflow,rows,...widths&&{sizes}}}
 
+var PRIVATE_KEYS=new Set(["favoriteSkills","favoriteMcpServers","favoriteQuickActions","skillGroups","recentSkills","recentQuickActions","skippedSkillConfirmations","onboardingCompleted","codexAccountBindings","pendingResetAttempt","lastNavigatorVersion","previousNavigatorVersion","worktrees","user"]);
+function createPinnedToolbarModel(ports){function view(pin){const action=pin.kind==="action"?ports.action(pin.id):undefined
+const skill=pin.kind==="skill"?ports.skill(pin):undefined
+return{label:action?.label??(pin.kind==="skill"?pin.name:pin.id),stateLabel:action?.stateLabel,icons:toolbarPinIcons(pin,action?.state),text:pin.text,reason:action?.reason??skill?.reason
+}}
+function run(key){const pin=ports.pins().find((item)=>toolbarPinKey(item)===key)
+if(!pin)
+return
+const item=view(pin)
+if(item.reason){ports.unavailable(item.label,item.reason)
+return
+}
+if(pin.kind==="action"){ports.runAction(pin.id)
+return
+}
+const skill=ports.skill(pin).skill
+if(skill)
+ports.runSkill(skill)
+}
+return{pins:ports.pins,view,run}}
 function toolbarPinWidth(pin){const states=Object.keys({...pin.stateIcons,...pin.stateIconLists})
 const count=Math.max(toolbarPinIcons(pin).length,...states.map((state)=>toolbarPinIcons(pin,state).length))
 const iconsWidth=Math.max(0,count*2-1)
@@ -5961,49 +6137,34 @@ return 2 + Math.max(1,iconsWidth + (count&&pin.text?1:0) + Bun.stringWidth(pin.t
 function createToolbarModel(props){const icons=useIcons()
 const revision=createQuickActionRevision(props.api)
 const pins=()=>props.preferences.toolbarPins?.()??[]
-const needsSkills=createMemo14(()=>pins().some((pin)=>pin.kind==="skill"))
-const target=createMemo14(()=>props.skills.target())
-createEffect17(()=>{if(!needsSkills())
+const needsSkills=createMemo15(()=>pins().some((pin)=>pin.kind==="skill"))
+const target=createMemo15(()=>props.skills.target())
+createEffect18(()=>{if(!needsSkills())
 return
 const current=target()
 const release=untrack7(()=>props.skills.activate(current))
-onCleanup21(release)
+onCleanup22(release)
 untrack7(()=>{props.skills.refresh(current).catch(()=>{})
 })
 })
-function view(pin){revision()
-if(pin.kind==="action"){const action=QUICK_ACTIONS.find((item)=>item.command===pin.id)
-const state=quickActionState(props.api,pin.id)
-const stateLabel=quickActionStates(props.api,pin.id).find((item)=>item.id===state)?.label
-return{label:quickActionLabel(props.api,action),stateLabel,icons:toolbarPinIcons(pin,state),text:pin.text,reason:quickActionDisabledReason(props.api,action)
-}}
-const skill=props.skills.list(target()).find((item)=>item.location===pin.location&&item.name===pin.name)
+const model=createPinnedToolbarModel({pins,action(id){revision()
+const action=QUICK_ACTIONS.find((item)=>item.command===id)
+const state=quickActionState(props.api,id)
+return{label:quickActionLabel(props.api,action),state,stateLabel:quickActionStates(props.api,id).find((item)=>item.id===state)?.label,reason:quickActionDisabledReason(props.api,action)
+}},skill(pin){const skill=props.skills.list(target()).find((item)=>item.location===pin.location&&item.name===pin.name)
 const request=props.skills.state(target())
 const unavailable=request.status==="loading"?"Loading Skills":"Skill is unavailable in this workspace"
-return{label:pin.name,icons:toolbarPinIcons(pin),text:pin.text,stateLabel:undefined,reason:request.error?.message??(skill?skillUnavailable(props.skills,skill):unavailable)
-}}
-function run(key){const pin=pins().find((item)=>toolbarPinKey(item)===key)
-if(!pin)
-return
-const item=view(pin)
-if(item.reason){props.api.ui.toast({variant:"warning",title:item.label,message:item.reason})
-return
-}
-if(pin.kind==="action"){if(pin.id==="session.new"&&props.onNewSession?.())
+return{skill,reason:request.error?.message??(skill?skillUnavailable(props.skills,skill):unavailable)}},unavailable:(title,message)=>props.api.ui.toast({variant:"warning",title,message}),runAction(id){if(id==="session.new"&&props.onNewSession?.())
 return
-const result=props.interaction.dispatchFromReturnTarget(pin.id)
+const result=props.interaction.dispatchFromReturnTarget(id)
 if(!result.ok)
-props.api.ui.toast({variant:"warning",title:item.label,message:`Command is ${result.reason}`})
-return
-}
-const skill=props.skills.list(target()).find((candidate)=>candidate.location===pin.location&&candidate.name===pin.name)
-if(!skill)
-return
-const route=JSON.stringify(props.api.route.current)
+props.api.ui.toast({variant:"warning",title:quickActionLabel(props.api,QUICK_ACTIONS.find((item)=>item.command===id)),message:`Command is ${result.reason}`
+})
+},runSkill(skill){const route=JSON.stringify(props.api.route.current)
 const dialogs=createDialogStack(props.api,icons.style,()=>route===JSON.stringify(props.api.route.current),icons.multilineCorners)
 activateSkill({api:props.api,controller:props.skills,access:props.preferences,skill,dialogs})
-}
-return{pins,view,run,width:toolbarPinWidth}}
+}})
+return{...model,width:toolbarPinWidth}}
 
 
 
@@ -6013,13 +6174,13 @@ return{pins,view,run,width:toolbarPinWidth}}
 
 function ToolbarButton(props){const icons=useIcons()
 const foreground=()=>props.reason?props.api.theme.current.textMuted:item.foregroundColor()
-const [hovered,setHovered]=createSignal34(false)
+const [hovered,setHovered]=createSignal35(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")
 const content=()=>[props.icons.map((icon)=>terminalIcon(icon,icons.style())).join(" "),props.text].filter(Boolean).join(" ")
-createEffect18(()=>props.onDetails(props.id,item.focused()||hovered()))
-onCleanup22(()=>props.onDetails(props.id,false))
+createEffect19(()=>props.onDetails(props.id,item.focused()||hovered()))
+onCleanup23(()=>props.onDetails(props.id,false))
 return _$createComponent(Show27,{get when(){return _$memo(()=>!!(props.width===3&&props.icons.length===1))()&&!props.text
 },get fallback(){return _$createComponent(SelectionBox,{get id(){return props.id
 },ref(r$){var _ref$2=item.ref
@@ -6060,17 +6221,17 @@ setHovered(false)
 }
 function SidebarToolbar(props){const model=createToolbarModel(props)
 const icons=useIcons()
-const [width,setWidth]=createSignal35(3)
-const [detail,setDetail]=createSignal35()
-const keys=createMemo15(()=>model.pins().map((pin)=>toolbarPinKey(pin)))
-const widths=createMemo15(()=>new Map(model.pins().map((pin)=>[toolbarPinKey(pin),model.width(pin)])))
-const layout=createMemo15(()=>toolbarLayout(keys(),width(),props.preferences.toolbarOverflow?.()??"menu",widths()))
-const rows=createMemo15(()=>layout().rows.map((_,index)=>index))
-const byKey=createMemo15(()=>new Map(model.pins().map((pin)=>[toolbarPinKey(pin),pin])))
+const [width,setWidth]=createSignal36(3)
+const [detail,setDetail]=createSignal36()
+const keys=createMemo16(()=>model.pins().map((pin)=>toolbarPinKey(pin)))
+const widths=createMemo16(()=>new Map(model.pins().map((pin)=>[toolbarPinKey(pin),model.width(pin)])))
+const layout=createMemo16(()=>toolbarLayout(keys(),width(),props.preferences.toolbarOverflow?.()??"menu",widths()))
+const rows=createMemo16(()=>layout().rows.map((_,index)=>index))
+const byKey=createMemo16(()=>new Map(model.pins().map((pin)=>[toolbarPinKey(pin),pin])))
 const view=(key)=>{const pin=byKey().get(key)
 return pin&&model.view(pin)
 }
-const details=createMemo15(()=>{if(detail()==="toolbar:more")
+const details=createMemo16(()=>{if(detail()==="toolbar:more")
 return "More pinned actions and Skills"
 const item=view(detail()??"")
 return item?[item.label,item.stateLabel,item.reason].filter(Boolean).join(" \xB7 "):undefined
@@ -6143,18 +6304,18 @@ return _el$
 
 
 
-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)))
+function createSkillSectionModel(props,query){const target=createMemo17(()=>props.controller.target())
+const recent=createMemo17(()=>new Map((props.preferences.recentSkills?.()??[]).map((location,index)=>[location,index])))
+const groups=createMemo17(()=>props.preferences.skillGroups?.()??{})
+const grouped=createMemo17(()=>Object.keys(groups()).length>0)
+const list=createMemo17(()=>buildSkillGroupedView(props.controller.list(target()),props.preferences.favoriteSkills?.()??new Set,groups(),recent()))
+const filtered=createMemo17(()=>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=createMemo16(()=>props.controller.state(target()))
-createEffect19(()=>{const current=target()
+const state=createMemo17(()=>props.controller.state(target()))
+createEffect20(()=>{const current=target()
 const deactivate=untrack8(()=>props.controller.activate?.(current)??(()=>{}))
-onCleanup23(deactivate)
+onCleanup24(deactivate)
 untrack8(()=>void props.controller.refresh(current).catch(()=>{}))
 })
 async function useSkill(item){try{const isInserted=await props.controller.use(target(),item.name)
@@ -6215,7 +6376,7 @@ return _el$
 }
 function SkillsSection(props){const dialogs=useDialogs(props.api)
 const toolbar=useToolbar()
-const [query,setQuery]=createSignal36("")
+const [query,setQuery]=createSignal37("")
 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"
@@ -6292,34 +6453,34 @@ 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]=createSignal37("")
-const [mode,setMode]=createSignal37("all")
-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)
-createEffect20(()=>{targetKey()
+function createSubagentSectionModel(props){const list=createMemo18(()=>props.controller.list(props.sessionID))
+const recent=createMemo18(()=>props.controller.recent?.(props.sessionID)??[])
+const rows=createMemo18(()=>buildSubagentView(list(),recent()))
+const [query,setQuery]=createSignal38("")
+const [mode,setMode]=createSignal38("all")
+const counts=createMemo18(()=>countSubagentView(rows(),query()))
+const tabs=createMemo18(()=>["all","active","recent",...counts().errors>0?["errors"]:[]])
+const filtered=createMemo18(()=>filterSubagentView(rows(),mode(),query()))
+const parentID=createMemo18(()=>props.api.state?.session?.get(props.sessionID)?.parentID)
+const targetKey=createMemo18(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
+createEffect21(()=>{targetKey()
 setQuery("")
 setMode("all")
 })
-createEffect20(()=>{if(mode()!=="all"&&counts()[mode()]===0)
+createEffect21(()=>{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=createMemo17(()=>props.preferences.expanded().subagents&&visibility.visible().some((item)=>item.status.type!=="idle")?targetKey():undefined)
+const clockKey=createMemo18(()=>props.preferences.expanded().subagents&&visibility.visible().some((item)=>item.status.type!=="idle")?targetKey():undefined)
 const now=createSubagentClock(clockKey)
-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))
-createEffect20(()=>{const sessionID=props.sessionID
+const byId=createMemo18(()=>new Map(visibility.visible().map((item)=>[item.session.id,item])))
+const ids=createMemo18(()=>visibility.visible().map((item)=>item.session.id))
+const state=createMemo18(()=>props.controller.state(props.sessionID))
+createEffect21(()=>{const sessionID=props.sessionID
 targetKey()
 const deactivate=untrack9(()=>props.controller.activate?.(sessionID)??(()=>{}))
-onCleanup24(deactivate)
+onCleanup25(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
@@ -6706,28 +6867,28 @@ return _el$2
 return _el$
 }})
 }
-function TodoSection(props){const list=createMemo18(()=>props.controller.list(props.sessionID))
+function TodoSection(props){const list=createMemo19(()=>props.controller.list(props.sessionID))
 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 setup=()=>("setup" in props.controller)?props.controller.setup:undefined
 const setupState=()=>setup()?.state(props.sessionID)
-const [mode,setMode]=createSignal38("all")
-const targetKey=createMemo18(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
-createEffect21(()=>{targetKey()
+const [mode,setMode]=createSignal39("all")
+const targetKey=createMemo19(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
+createEffect22(()=>{targetKey()
 setMode("all")
 })
-const view=createMemo18(()=>buildTodoView(list(),mode()))
+const view=createMemo19(()=>buildTodoView(list(),mode()))
 const visibility=createListVisibility({items:()=>view().rows,limit:()=>props.preferences.sectionItemLimit?.("todo")??0,resetKey:()=>JSON.stringify([targetKey(),mode()])
 })
-const state=createMemo18(()=>props.controller.state(props.sessionID))
-createEffect21(()=>{const sessionID=props.sessionID
+const state=createMemo19(()=>props.controller.state(props.sessionID))
+createEffect22(()=>{const sessionID=props.sessionID
 targetKey()
 if(unavailable())
 return
 const deactivate=untrack10(()=>props.controller.activate?.(sessionID)??(()=>{}))
-onCleanup25(deactivate)
+onCleanup26(deactivate)
 untrack10(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 untrack10(()=>void setup()?.refresh(sessionID).catch(()=>{}))
 })
@@ -6796,8 +6957,8 @@ 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)))
-onCleanup26(()=>props.interaction.setContentRoot(undefined))
+const visibleSections=createMemo20(()=>props.preferences.sectionOrder().filter((section)=>sections()[section]&&supportsSidebarSection(props.api,section)))
+onCleanup27(()=>props.interaction.setContentRoot(undefined))
 return _$createComponent(ToolbarProvider,{get api(){return props.api
 },get preferences(){return props.preferences
 },get skills(){return props.skills
@@ -6848,8 +7009,8 @@ return _el$
 }
 
 
-function McpPersistence(props){const persist=createMemo20(()=>props.controller.persist())
-createEffect22(()=>{if(!props.api.state.ready)
+function McpPersistence(props){const persist=createMemo21(()=>props.controller.persist())
+createEffect23(()=>{if(!props.api.state.ready)
 return
 persist()
 const route=props.api.route.current
@@ -6857,12 +7018,12 @@ const params="params" in route?route.params:undefined
 if(typeof params?.sessionID!=="string")
 return
 const current=props.controller.target()
-onCleanup27(()=>props.controller.deactivate(current))
+onCleanup28(()=>props.controller.deactivate(current))
 untrack11(()=>void props.controller.activate(current).catch(()=>{}))
 })
 return _$createElement("box")
 }
-function PreferencesPersistence(props){createEffect22(()=>{const location=currentLocation(props.api)
+function PreferencesPersistence(props){createEffect23(()=>{const location=currentLocation(props.api)
 untrack11(()=>props.controller.setActiveScope(preferencesScope({directory:location.routing.directory,worktree:props.api.state.path.worktree
 })))
 props.controller.load()
@@ -6870,7 +7031,7 @@ props.controller.load()
 return _$createElement("box")
 }
 function FirstRunWizardPersistence(props){let isChecked=false
-createEffect22(()=>{if(isChecked)
+createEffect23(()=>{if(isChecked)
 return
 isChecked=true
 showFirstRunWizard(props.api,props.preferences).catch(()=>{})
@@ -6888,7 +7049,7 @@ return _$createElement("box")
 
 function SidebarTitle(props){const icons=useIcons()
 const theme=()=>props.api.theme.current
-const created=createMemo21(()=>{const value=props.api.state.session.get(props.sessionID)?.time?.created
+const created=createMemo22(()=>{const value=props.api.state.session.get(props.sessionID)?.time?.created
 return value===undefined?undefined:`Created ${new Date(value).toLocaleDateString("en", {
       dateStyle: "medium"
     })}`
@@ -6897,7 +7058,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")
-onCleanup28(()=>props.interaction.setTitleRoot(undefined))
+onCleanup29(()=>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$)
@@ -6957,40 +7118,10 @@ const [user,project]=await Promise.all([safe(userPath?readSource(userPath,()=>re
 return mergeConfiguredDefaults(configuredDefaultsFromPluginOptions(options),user,project)
 }
 
-
-var scheduleInterval=(callback,milliseconds)=>{const timer=setInterval(callback,milliseconds)
-return()=>clearInterval(timer)
-}
-function createLimitsRefresh(options,schedule=scheduleInterval){let disposed=false
-const selectedKey=createMemo22(()=>JSON.stringify(options.selectedModel?.()))
-const targetKey=createMemo22(()=>JSON.stringify(options.controller.current().model))
-const interval=createMemo22(()=>(parseLimitsRefreshMinutes(options.refreshMinutes?.())??DEFAULT_LIMITS_REFRESH_MINUTES)*60000)
-createEffect23(on2(selectedKey,()=>{const model=options.selectedModel?.()
-if(model&&options.accountSource)
-options.accountSource.refresh(model).catch(()=>{})
-}))
-createEffect23(on2(targetKey,()=>{const{model,adapter}=options.controller.current()
-if(model&&adapter)
-options.controller.refresh()
-}))
-async function refresh(){if(disposed)
-return
-const target=targetKey()
-const model=options.selectedModel?.()
-if(model&&options.accountSource)
-await options.accountSource.refresh(model)
-if(!disposed&&target===targetKey())
-await options.controller.refresh()
-}
-createEffect23(on2(interval,(milliseconds)=>{onCleanup29(schedule(()=>void refresh().catch(()=>{}),milliseconds))
-}))
-onCleanup29(()=>{disposed=true
-})
-}
 function LimitsPersistence(props){createLimitsRefresh(props)
 return _$createElement("box")
 }
-function bindNavigatorAbout(api,status,updates,notes){const dispose=registerNavigatorAboutServices(api,{navigatorVersion:"0.25.0",openCodeVersion:api.app.version,checkState:()=>status.navigatorCheckState?.()??{status:"idle"},checking:()=>status.navigatorCheckState?.().status==="checking",updating:updates.navigatorUpdating,installed:updates.navigatorInstalled,check:()=>status.refreshNavigator?.()??Promise.resolve("unavailable"),update(dialogs){const target=status.navigatorUpdate()
+function bindNavigatorAbout(api,status,updates,notes){const dispose=registerNavigatorAboutServices(api,{navigatorVersion:"0.27.0",openCodeVersion:api.app.version,checkState:()=>status.navigatorCheckState?.()??{status:"idle"},checking:()=>status.navigatorCheckState?.().status==="checking",updating:updates.navigatorUpdating,installed:updates.navigatorInstalled,check:()=>status.refreshNavigator?.()??Promise.resolve("unavailable"),update(dialogs){const target=status.navigatorUpdate()
 if(target)
 updates.navigator(target,dialogs)
 },changelog:async ()=>notes.parseChangelog(await notes.readBundledChangelog())
@@ -7013,11 +7144,11 @@ const candidates=context.data.location.skill.list({directory})?.filter((skill)=>
 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})
+await context.client.experimental.session.skill({sessionID:route.sessionID,id},{signal:options.signal})
 return{data:true}}},mcp:{async status(input,options={}){const response=await context.client.mcp.list(location(input),{signal:options.signal})
 const data=Object.fromEntries(response.data.map((server)=>[server.name,server.status]))
-return{data}},async connect(input,options={}){await context.client.mcp.connect({server:input.name,...location(input)},{signal:options.signal})
-return{data:undefined}},async disconnect(input,options={}){await context.client.mcp.disconnect({server:input.name,...location(input)},{signal:options.signal})
+return{data}},async connect(input,options={}){await context.client.experimental.mcp.connect({server:input.name,...location(input)},{signal:options.signal})
+return{data:undefined}},async disconnect(input,options={}){await context.client.experimental.mcp.disconnect({server:input.name,...location(input)},{signal:options.signal})
 return{data:undefined}}}}}}
 var TERMINAL_EVENTS=new Set(["session.execution.succeeded","session.execution.failed","session.execution.interrupted"])
 function executionStatus(name,event){const sessionID=event.data.sessionID
@@ -7037,7 +7168,7 @@ 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"]
+return ["session.execution.failed","session.execution.interrupted"]
 if(name==="mcp.tools.changed")
 return ["mcp.status.changed","mcp.resources.changed"]
 if(["session.created","session.deleted","server.connected","installation.update-available"].includes(name))
@@ -7082,7 +7213,7 @@ if(name==="session.deleted"){emit({sessionID})
 return
 }
 if(name==="session.error"){const error=data.error
-emit({sessionID,error:error&&{name:error.type??"Error",data:{message:error.message??"Session error"}}})
+emit({sessionID,error:event.type==="session.execution.interrupted"?{name:"MessageAbortedError",data:{message:"Session aborted"}}:error&&{name:error.type??"Error",data:{message:error.message??"Session error"}}})
 return
 }
 const info=context.data.session.get(sessionID)
@@ -7126,7 +7257,7 @@ context.keymap.dispatch(command.id)
 context.renderer.keyInput.on("keypress",onKeypress)
 const keymap={registerLayer(layer){const id=++sequence
 const owner=getOwner()
-const [active,setActive]=createSignal39(true)
+const [active,setActive]=createSignal40(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)
 }))
 }
@@ -7171,7 +7302,7 @@ cleanups.clear()
 context.renderer.keyInput.off("keypress",onKeypress)
 }}}
 
-function createV2SessionAdapter(context){const [retryDetails,setRetryDetails]=createSignal40({})
+function createV2SessionAdapter(context){const [retryDetails,setRetryDetails]=createSignal41({})
 const projections=new WeakMap
 function normalize(info){const directory=info.location.directory
 const workspaceID=context.location?.directory===directory?context.location.workspaceID:undefined
@@ -7243,7 +7374,7 @@ function DialogPrompt(props){return _$createComponent(SingleLinePrompt,_$mergePr
 function DialogConfirm(props){let active=true
 onCleanup30(()=>{active=false
 })
-onMount7(async ()=>{const confirmed=await context.ui.dialog.confirm({title:props.title,message:props.message
+async function confirm(){const confirmed=await context.ui.dialog.confirm({title:props.title,message:props.message
 })
 if(!active)
 return
@@ -7251,6 +7382,10 @@ if(confirmed)
 props.onConfirm?.()
 else
 props.onCancel?.()
+}
+onMount7(()=>{confirm().catch(()=>{if(active)
+props.onCancel?.()
+})
 })
 return _$createElement("box")
 }
@@ -7334,48 +7469,18 @@ return parseTodos(item.state.input.todos)
 }}
 return []
 }
-function createNativeTodoController(context,api){const requests=createRequestState(api.lifecycle.signal)
-const pending=new Map
-let activeTarget
-function target(sessionID){const session=api.state.session.get(sessionID)
+function createNativeTodoController(context,api){function target(sessionID){const session=api.state.session.get(sessionID)
 const directory=session?.directory??api.state.path.directory
 const workspace=session?.workspaceID
 return{key:JSON.stringify([sessionID,directory,workspace??null]),sessionID,routing:{directory,...workspace&&{workspace}}}}
 function list(sessionID){return nativeTodos(context.data.session.message.list(sessionID),context.data.session.get(sessionID)?.revert?.messageID)
 }
-function refresh(sessionID,force=false){if(api.lifecycle.signal.aborted)
-return Promise.resolve([])
-const current=target(sessionID)
-const existing=pending.get(current.key)
-if(existing&&!force)
-return existing
-const requestState=requests.start(current.key,"refresh native todos",context.data.session.message.list(sessionID).length>0,force)
-if(!requestState)
-return existing
-const request=Promise.try(()=>Promise.all([context.data.session.sync(sessionID),context.data.session.message.sync(sessionID)])).then(()=>{if(!requestState.isCurrent())
-return []
-requestState.succeed()
+return{source:"native",...createTodoModel({lifecycle:api.lifecycle,target,cache:"source",hasValue:(sessionID)=>context.data.session.message.list(sessionID).length>0,source:{list,async refresh(sessionID,signal){signal.throwIfAborted()
+await Promise.all([context.data.session.sync(sessionID),context.data.session.message.sync(sessionID)])
+signal.throwIfAborted()
 return list(sessionID)
-}).catch((error)=>{requestState.fail(error)
-throw error
-}).finally(()=>{requestState.finish()
-if(pending.get(current.key)===request)
-pending.delete(current.key)
-})
-pending.set(current.key,request)
-return request
-}
-return{source:"native",target,list,refresh,state:(sessionID)=>requests.state(target(sessionID).key),retry:(sessionID)=>refresh(sessionID,true),activate(sessionID){const key=target(sessionID).key
-if(activeTarget!==key){requests.abortAll()
-pending.clear()
-activeTarget=key
-}
-return()=>{if(activeTarget!==key)
-return
-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)
@@ -7384,9 +7489,9 @@ collection.invalidate(ref)
 await collection.sync(ref)
 signal.throwIfAborted()
 }
-function createV2McpSource(context){const collection=context.data.location.mcp.server
+function createNativeMcpSource(data){const collection=()=>data().location.mcp.server
 const projections=new WeakMap
-const list=(target)=>(collection.list(collectionLocation(target))??[]).map((server)=>{let item=projections.get(server)
+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
@@ -7396,12 +7501,17 @@ projections.set(server,item)
 }
 return item
 })
-return{list,async refresh(target,force,signal){await syncCollection(collection,target,force,signal)
+return{list,async refresh(target,force,signal){const current=collection()
+await syncCollection(current,target,force,signal)
+if(collection()!==current)
+throw new DOMException("OpenCode connection changed","AbortError")
 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)
+function createV2McpSource(context){return createNativeMcpSource(()=>context.data)
+}
+function createNativeSkillSource(input){const projections=new WeakMap
+const collection=()=>input.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
@@ -7412,28 +7522,49 @@ projections.set(skill,item)
 }
 return item
 })
-return{list,async refresh(target,force,signal){await syncCollection(collection,target,force,signal)
+return{list,async refresh(target,force,signal){const current=collection()
+await syncCollection(current,target,force,signal)
+if(collection()!==current)
+throw new DOMException("OpenCode connection changed","AbortError")
 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)
+if(!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
+return input.use(target,actual,signal)
 }}}
-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()
+function createV2SkillSource(context){return createNativeSkillSource({data:()=>context.data,async use(target,skill,signal){const route=context.ui.router.current()
+const session=route.type==="session"&&context.data.session.get(route.sessionID)
+if(route.type!=="session"||!session||session.location.directory!==target.routing.directory||!skill.id)
+throw new Error("Skill target changed; select the source again")
+await context.client.experimental.session.skill({sessionID:route.sessionID,id:skill.id},{signal})
+return !signal.aborted
+}})
+}
+function createNativeSubagentSource(input){return{list:(parentID)=>input.sessions().list().filter((item)=>item.parentID===parentID).flatMap((item)=>{const projected=input.project(item)
+return projected?[projected]:[]
+}),status:input.status,startedAt(id){const sessions=input.sessions()
+if(sessions.status(id)!=="running")
+return
+const time=sessions.get(id)?.time
+if(!time?.busy||time.idle!==undefined&&time.idle>=time.busy)
+return
+return time.busy
+},async refresh(parentID,signal){signal.throwIfAborted()
+const client=input.client()
+const sessions=input.sessions()
 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)))
+do{const page=await client.session.list(cursor?{cursor,limit:100}:{parentID,limit:100},{signal})
+signal.throwIfAborted()
+if(input.client()!==client||input.sessions()!==sessions)
+throw new DOMException("Subagent connection changed","AbortError")
+await Promise.all(page.data.filter((item)=>!sessions.get(item.id)).map((item)=>sessions.sync(item.id)))
 cursor=page.cursor.next??undefined
 signal.throwIfAborted()
 } while(cursor)
 }}}
+function createV2SubagentSource(context,api){return createNativeSubagentSource({sessions:()=>context.data.session,client:()=>context.client,project:(info)=>api.state.session.get(info.id),status:(id)=>api.state.session.status(id)??{type:"idle"}})
+}
 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"
@@ -7455,7 +7586,7 @@ const limitsPath=import.meta.url.includes("/dist/tui.js")?"./provider-limits.js"
 const limitsModule=await import(limitsPath)
 const LimitsSection=limitsModule.ProviderLimitsSection
 const{controller:limits,codex,accountSource,selectModel,modelSelection
-}=limitsModule.createProviderQuotaIntegration(api,preferences,"0.25.0",hostContext)
+}=limitsModule.createProviderQuotaIntegration(api,preferences,"0.27.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)
@@ -7484,7 +7615,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.25.0"
+}),_$createComponent(UpgradeNotesBinding,{api,preferences,version:"0.27.0"
 }),_$createComponent(McpPersistence,{api,controller:mcp
 })]
 }})
@@ -7518,13 +7649,13 @@ return result.data?.type==="text"?result.data.content:undefined
 const updateServices=await loadNavigatorUpdates()
 const{createVersionStatus,createVersionUpdateActions,createOpenCodeV1VersionUpdater
 }=updateServices
-const versionStatus=createVersionStatus(api,"0.25.0")
-const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.25.0"))
+const versionStatus=createVersionStatus(api,"0.27.0")
+const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.27.0"))
 bindNavigatorAbout(api,versionStatus,versionUpdates,updateServices)
 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.25.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.27.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }})
 }})
@@ -7541,8 +7672,8 @@ return new TextDecoder().decode(await context.client.file.read({location:context
 const updateServices=await loadNavigatorUpdates()
 const{createVersionStatus,createVersionUpdateActions,createOpenCodeV2VersionUpdater
 }=updateServices
-const versionStatus=createVersionStatus(adapter.api,"0.25.0")
-const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.25.0"))
+const versionStatus=createVersionStatus(adapter.api,"0.27.0")
+const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.27.0"))
 bindNavigatorAbout(adapter.api,versionStatus,versionUpdates,updateServices)
 const disposeFooter=context.ui.slot({append:"sidebar.footer",render:()=>_$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
@@ -7550,7 +7681,7 @@ const disposeFooter=context.ui.slot({append:"sidebar.footer",render:()=>_$create
 _$setProp(_el$,"flexDirection","row")
 _$setProp(_el$,"justifyContent","space-between")
 _$insert(_el$,_$createComponent(VersionSummary,{get api(){return adapter.api
-},navigatorVersion:"0.25.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.27.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }}),null)
 _$insert(_el$,_$createComponent(SettingsFooterButton,{get api(){return adapter.api