opencode-navigator 0.21.8 → 0.23.0

package/dist/tui.js

@@ -1,9 +1,9 @@
-import {insert as _$insert,setProp as _$setProp,createElement as _$createElement,memo as _$memo,createComponent as _$createComponent,mergeProps as _$mergeProps,effect as _$effect,createTextNode as _$createTextNode,insertNode as _$insertNode,use as _$use,spread as _$spread,useTerminalDimensions,useTerminalDimensions as useTerminalDimensions2,useTerminalDimensions as useTerminalDimensions3,useTerminalDimensions as useTerminalDimensions4,useTerminalDimensions as useTerminalDimensions5,useTerminalDimensions as useTerminalDimensions6,useTerminalDimensions as useTerminalDimensions7} from "@opentui/solid"
+import {insert as _$insert,setProp as _$setProp,createElement as _$createElement,memo as _$memo,createComponent as _$createComponent,mergeProps as _$mergeProps,useRenderer,effect as _$effect,createTextNode as _$createTextNode,insertNode as _$insertNode,use as _$use,spread as _$spread,useTerminalDimensions,useTerminalDimensions as useTerminalDimensions2,useTerminalDimensions as useTerminalDimensions3,useTerminalDimensions as useTerminalDimensions4,useRenderer as useRenderer2,useTerminalDimensions as useTerminalDimensions5,useTerminalDimensions as useTerminalDimensions6,useTerminalDimensions as useTerminalDimensions7,useTerminalDimensions as useTerminalDimensions8,useTerminalDimensions as useTerminalDimensions9} from "@opentui/solid"
 
 
 
 
-import {createSignal as createSignal2,createSignal,createEffect,onCleanup,createContext,useContext,createContext as createContext2,createSignal as createSignal3,useContext as useContext2,createEffect as createEffect2,splitProps,untrack,splitProps as splitProps2,For,createEffect as createEffect3,onCleanup as onCleanup2,createEffect as createEffect4,Show,splitProps as splitProps3,createSignal as createSignal4,createSignal as createSignal5,createSignal as createSignal6,onCleanup as onCleanup3,batch,createSignal as createSignal8,createSignal as createSignal7,createEffect as createEffect5,createSignal as createSignal9,onCleanup as onCleanup4,createSignal as createSignal10,createSignal as createSignal11,Index,createSignal as createSignal12,onCleanup as onCleanup5,createEffect as createEffect7,onCleanup as onCleanup7,batch as batch2,createEffect as createEffect6,createMemo,createSignal as createSignal13,onCleanup as onCleanup6,onMount,For as For2,For as For3,Show as Show2,createMemo as createMemo2,Show as Show3,createSignal as createSignal14,onCleanup as onCleanup8,For as For4,For as For5,For as For8,createMemo as createMemo4,onMount as onMount3,For as For7,createMemo as createMemo3,onMount as onMount2,Show as Show5,createEffect as createEffect8,createSignal as createSignal15,onCleanup as onCleanup9,Show as Show4,For as For6,For as For9,createEffect as createEffect9,createMemo as createMemo5,onCleanup as onCleanup10,createEffect as createEffect10,createMemo as createMemo6,untrack as untrack2,For as For10,createEffect as createEffect11,createMemo as createMemo8,onCleanup as onCleanup11,onMount as onMount4,createMemo as createMemo7,Show as Show6,onCleanup as onCleanup12,createEffect as createEffect12,onCleanup as onCleanup13,createSignal as createSignal16,createMemo as createMemo9,createEffect as createEffect13,onCleanup as onCleanup14,onMount as onMount5,onCleanup as onCleanup15,onMount as onMount6,For as For11,createSignal as createSignal17,createSignal as createSignal18,Show as Show7,createSignal as createSignal20,createSignal as createSignal19,onCleanup as onCleanup16,For as For12,Show as Show10,createMemo as createMemo11,createComputed,createMemo as createMemo10,createSignal as createSignal21,untrack as untrack3,Show as Show8,createComputed as createComputed2,untrack as untrack4,Show as Show9,createSignal as createSignal23,createEffect as createEffect14,createSignal as createSignal22,on,createMemo as createMemo13,createSignal as createSignal26,createMemo as createMemo12,For as For13,Show as Show14,Show as Show11,Show as Show12,createSignal as createSignal24,createContext as createContext3,useContext as useContext3,Show as Show13,createSignal as createSignal25,onCleanup as onCleanup17,Show as Show20,createSignal as createSignal27,untrack as untrack5,createSignal as createSignal28,createSignal as createSignal29,createEffect as createEffect15,For as For15,Show as Show15,For as For14,Show as Show16,Show as Show17,Show as Show18,Show as Show19,For as For16,Show as Show22,createMemo as createMemo15,Show as Show21,createMemo as createMemo14,createSignal as createSignal30,createEffect as createEffect16,onCleanup as onCleanup18,For as For21,Match,Switch,createMemo as createMemo19,onCleanup as onCleanup22,For as For17,Show as Show23,createSignal as createSignal31,createEffect as createEffect17,createMemo as createMemo16,onCleanup as onCleanup19,untrack as untrack6,For as For19,Show as Show26,createEffect as createEffect18,createMemo as createMemo17,createSignal as createSignal32,onCleanup as onCleanup20,untrack as untrack7,For as For18,Show as Show25,Show as Show24,Show as Show30,createEffect as createEffect19,createMemo as createMemo18,createSignal as createSignal33,onCleanup as onCleanup21,untrack as untrack8,For as For20,Show as Show28,Show as Show27,Show as Show29,createEffect as createEffect20,createMemo as createMemo20,onCleanup as onCleanup23,untrack as untrack9,Show as Show31,createMemo as createMemo21,onCleanup as onCleanup24,createEffect as createEffect21,createMemo as createMemo22,on as on2,onCleanup as onCleanup25,createSignal as createSignal34,onCleanup as onCleanup26,onMount as onMount7} from "solid-js"
+import {createSignal as createSignal2,createSignal,createEffect,onCleanup,createContext,useContext,createContext as createContext2,createSignal as createSignal3,onCleanup as onCleanup2,useContext as useContext2,createEffect as createEffect2,splitProps,untrack,splitProps as splitProps2,For,createEffect as createEffect3,onCleanup as onCleanup3,createEffect as createEffect4,Show,splitProps as splitProps3,Suspense,lazy,createSignal as createSignal4,createSignal as createSignal5,onCleanup as onCleanup4,Show as Show2,batch,createSignal as createSignal7,createSignal as createSignal6,createEffect as createEffect5,createSignal as createSignal8,onCleanup as onCleanup5,createSignal as createSignal9,createSignal as createSignal10,Suspense as Suspense2,lazy as lazy2,Index,onCleanup as onCleanup6,createSignal as createSignal11,onCleanup as onCleanup7,createEffect as createEffect7,onCleanup as onCleanup9,batch as batch2,createEffect as createEffect6,createMemo,createSignal as createSignal12,onCleanup as onCleanup8,onMount,For as For2,For as For3,Show as Show3,createMemo as createMemo2,Show as Show4,createSignal as createSignal13,onCleanup as onCleanup10,For as For4,For as For5,For as For8,createMemo as createMemo4,onMount as onMount3,For as For7,createMemo as createMemo3,onMount as onMount2,Show as Show6,createEffect as createEffect8,createSignal as createSignal14,onCleanup as onCleanup11,Show as Show5,For as For6,For as For9,createEffect as createEffect9,createMemo as createMemo5,onCleanup as onCleanup12,createEffect as createEffect10,createMemo as createMemo6,untrack as untrack2,Suspense as Suspense3,lazy as lazy3,onCleanup as onCleanup13,createEffect as createEffect11,onCleanup as onCleanup14,createSignal as createSignal15,createMemo as createMemo7,createSignal as createSignal16,lazy as lazy4,Show as Show9,For as For10,Show as Show8,Show as Show7,createEffect as createEffect12,onCleanup as onCleanup15,onMount as onMount4,onCleanup as onCleanup16,onMount as onMount5,For as For11,createSignal as createSignal17,createSignal as createSignal18,Show as Show10,createSignal as createSignal20,createSignal as createSignal19,onCleanup as onCleanup17,For as For12,Show as Show13,createMemo as createMemo9,createComputed,createMemo as createMemo8,createSignal as createSignal21,untrack as untrack3,Show as Show11,createComputed as createComputed2,untrack as untrack4,Show as Show12,createSignal as createSignal23,createEffect as createEffect13,createSignal as createSignal22,on,createMemo as createMemo11,createSignal as createSignal26,createMemo as createMemo10,For as For13,Show as Show17,Show as Show14,Show as Show15,createSignal as createSignal24,createContext as createContext3,useContext as useContext3,Show as Show16,createSignal as createSignal25,onCleanup as onCleanup18,Show as Show23,createSignal as createSignal27,untrack as untrack5,createSignal as createSignal28,createSignal as createSignal29,createEffect as createEffect14,For as For15,Show as Show18,For as For14,createSignal as createSignal30,Show as Show19,Show as Show20,Show as Show21,Show as Show22,For as For16,Show as Show25,createMemo as createMemo13,Show as Show24,createMemo as createMemo12,createSignal as createSignal31,createContext as createContext4,useContext as useContext4,Show as Show26,Suspense as Suspense4,createEffect as createEffect15,onCleanup as onCleanup19,untrack as untrack6,For as For22,Match,Switch,createMemo as createMemo19,onCleanup as onCleanup25,For as For17,Show as Show27,createMemo as createMemo15,createSignal as createSignal33,createEffect as createEffect16,createMemo as createMemo14,onCleanup as onCleanup20,untrack as untrack7,createEffect as createEffect17,createSignal as createSignal32,onCleanup as onCleanup21,For as For18,Show as Show29,createSignal as createSignal34,createEffect as createEffect18,createMemo as createMemo16,onCleanup as onCleanup22,untrack as untrack8,Show as Show28,For as For20,Show as Show32,createEffect as createEffect19,createMemo as createMemo17,createSignal as createSignal35,onCleanup as onCleanup23,untrack as untrack9,For as For19,Show as Show31,Show as Show30,Show as Show36,createEffect as createEffect20,createMemo as createMemo18,createSignal as createSignal36,onCleanup as onCleanup24,untrack as untrack10,For as For21,Show as Show34,Show as Show33,Show as Show35,createEffect as createEffect21,createMemo as createMemo20,onCleanup as onCleanup26,untrack as untrack11,Show as Show37,createMemo as createMemo21,onCleanup as onCleanup27,createEffect as createEffect22,createMemo as createMemo22,on as on2,onCleanup as onCleanup28,createRoot,createSignal as createSignal37,getOwner,createSignal as createSignal38,onCleanup as onCleanup29,onMount as onMount6} from "solid-js"
 var SIDEBAR_SECTIONS=["limits","todo","subagents","skills","quick_actions","lsp","mcp"]
 var QUICK_ACTION_IDS=["session.rename","session.timeline","session.copy","session.export","session.compact","session.list","session.new","session.fork","messages.copy","session.first","session.last","session.messages_last_user","session.message.next","session.message.previous","permission.mode"]
 function preferencesScope(path){return path.worktree||path.directory||"global"
@@ -77,7 +77,7 @@ var FOCUS_COMMAND=`${PLUGIN_ID}.focus`
 var SEARCH_COMMAND=`${PLUGIN_ID}.search`
 var DEFAULT_SEARCH_KEY="ctrl+shift+k";
 function pluginConfig(options){const iconStyle=options?.icon_style==="nerd"||options?.icon_style==="text"?options.icon_style:options?.lsp_icon_style
-return{toggleKey:typeof options?.toggle_key==="string"&&options.toggle_key.trim()?options.toggle_key.trim():"ctrl+shift+b",focusKey:typeof options?.focus_key==="string"&&options.focus_key.trim()?options.focus_key.trim():"ctrl+shift+f",searchKey:typeof options?.search_key==="string"&&options.search_key.trim()?options.search_key.trim():DEFAULT_SEARCH_KEY,persistMcp:options?.persist_mcp!==false,limitsRefreshMinutes:parseLimitsRefreshMinutes(options?.limits_refresh_minutes)??DEFAULT_LIMITS_REFRESH_MINUTES,startInChat:options?.start_in_chat===true,showSessionTitle:options?.show_session_title!==false,showSessionDate:options?.show_session_date!==false,cornerFont:options?.corner_font!==false,sections:parseSectionVisibility(options?.sections),sectionOrder:parseSectionOrder(options?.section_order)??[...SIDEBAR_SECTIONS],lspIconStyle:iconStyle==="text"?"text":"nerd",rowDensity:options?.row_density==="comfortable"?"comfortable":"compact",sectionItemLimits:parseSectionItemLimits(options?.section_item_limits),quickActionOrder:parseQuickActionOrder(options?.quick_action_order)??[...QUICK_ACTION_IDS],quickActionVisibility:parseQuickActionVisibility(options?.quick_action_visibility)
+return{toggleKey:typeof options?.toggle_key==="string"&&options.toggle_key.trim()?options.toggle_key.trim():"ctrl+shift+b",focusKey:typeof options?.focus_key==="string"&&options.focus_key.trim()?options.focus_key.trim():"ctrl+shift+f",searchKey:typeof options?.search_key==="string"&&options.search_key.trim()?options.search_key.trim():DEFAULT_SEARCH_KEY,persistMcp:options?.persist_mcp!==false,limitsRefreshMinutes:parseLimitsRefreshMinutes(options?.limits_refresh_minutes)??DEFAULT_LIMITS_REFRESH_MINUTES,startInChat:options?.start_in_chat===true,showSessionTitle:options?.show_session_title!==false,showSessionDate:options?.show_session_date!==false,cornerFont:options?.corner_font!==false,sections:parseSectionVisibility(options?.sections),sectionOrder:parseSectionOrder(options?.section_order)??[...SIDEBAR_SECTIONS],lspIconStyle:iconStyle==="text"?"text":"nerd",rowDensity:options?.row_density==="comfortable"?"comfortable":"compact",toolbarOverflow:options?.toolbar_overflow==="wrap"?"wrap":"menu",sectionItemLimits:parseSectionItemLimits(options?.section_item_limits),quickActionOrder:parseQuickActionOrder(options?.quick_action_order)??[...QUICK_ACTION_IDS],quickActionVisibility:parseQuickActionVisibility(options?.quick_action_visibility)
 }}
 function currentLocation(api){const route=api.route.current
 const params="params" in route?route.params:undefined
@@ -230,7 +230,7 @@ return
 const error=status.error
 return typeof error==="string"?error:undefined
 }
-function createMcpController(api,persist,preferences){const [snapshots,setSnapshots]=createSignal2({})
+function createMcpController(api,persist,preferences,source){const [snapshots,setSnapshots]=createSignal2({})
 const [mutationCounts,setMutationCounts]=createSignal2({})
 const [bulkStates,setBulkStates]=createSignal2({})
 const [selectedPresets,setSelectedPresets]=createSignal2({})
@@ -303,7 +303,7 @@ const failed=state.failed.filter((candidate)=>candidate!==name)
 bulkRetries.set(current.key,(bulkRetries.get(current.key)??[]).filter((candidate)=>candidate.name!==name))
 return{...values,[current.key]:{...state,status:failed.length>0?"error":"ready",failed}}})
 }
-function list(current=target()){return snapshots()[current.key]??api.state.mcp()
+function list(current=target()){return source?source.list(current):snapshots()[current.key]??api.state.mcp()
 }
 async function refresh(current=target(),force=false){const pending=refreshing.get(current.key)
 if(pending&&!force)
@@ -311,8 +311,7 @@ return pending
 const requestState=requests.start(current.key,"refresh MCP servers",current.key in snapshots(),force)
 if(!requestState)
 return pending
-const request=api.client.mcp.status(current.routing,{throwOnError:true,signal:requestState.signal}).then((result)=>{const items=Object.entries(result.data??{}).map(([name,status])=>({name,status:status.status,error:statusError(status)})).sort((a,b)=>a.name.localeCompare(b.name))
-if(requestState.isCurrent())
+const request=(source?source.refresh(current,force,requestState.signal):api.client.mcp.status(current.routing,{throwOnError:true,signal:requestState.signal}).then((result)=>Object.entries(result.data??{}).map(([name,status])=>({name,status:status.status,error:statusError(status)})).sort((a,b)=>a.name.localeCompare(b.name)))).then((items)=>{if(!source&&requestState.isCurrent())
 setSnapshots((value)=>({...value,[current.key]:items}))
 if(requestState.isCurrent())
 reconcileSelectedPreset(current,items)
@@ -684,6 +683,7 @@ return _$createComponent(DialogContext.Provider,{get value(){return props.scope
 }})
 }
 
+
 function useDialogs(api){const scope=useContext2(DialogContext)
 const icons=useIcons()
 if(scope?.api===api)
@@ -700,17 +700,31 @@ const state=createSignal3(initial)
 scope.frame.state.set(key,state)
 return state
 }
-function useDialogScroll(key="scroll"){const [position,setPosition]=useDialogState(key,0)
+function useDialogScroll(key="scroll"){const renderer=useRenderer()
+const [position,setPosition]=useDialogState(key,0)
 let body
 let isPending=true
-return{ref(node){body=node
-},restore(){if(!isPending||!body)
+function restore(){if(!isPending||!body||body.isDestroyed)
+return
+if(position()>0&&body.scrollHeight===0)
 return
 isPending=false
 body.scrollTo(position())
-},save(){if(body&&!body.isDestroyed)
+}
+function save(){if(!isPending&&body&&!body.isDestroyed)
 setPosition(body.scrollTop)
-}}}
+}
+const frame=()=>{restore()
+save()
+}
+renderer.on("frame",frame)
+onCleanup2(()=>{save()
+renderer.off("frame",frame)
+})
+return{ref(node){body=node
+renderer.requestRender()
+},restore,save
+}}
 
 
 
@@ -724,8 +738,13 @@ setPosition(body.scrollTop)
 
 
 
-import {RGBA,TextAttributes,TextAttributes as TextAttributes2,TextAttributes as TextAttributes3,RGBA as RGBA2,parseColor,TextAttributes as TextAttributes6,TextAttributes as TextAttributes4,TextAttributes as TextAttributes5,TextAttributes as TextAttributes7,RGBA as RGBA3,parseColor as parseColor2,TextAttributes as TextAttributes8,TextAttributes as TextAttributes9,TextAttributes as TextAttributes12,TextAttributes as TextAttributes10,TextAttributes as TextAttributes11,TextAttributes as TextAttributes13,TextAttributes as TextAttributes14,TextAttributes as TextAttributes16,TextAttributes as TextAttributes15,TextAttributes as TextAttributes17,ScrollBoxRenderable,TextAttributes as TextAttributes18} from "@opentui/core"
+import {BoxRenderable,RGBA,TextAttributes,TextAttributes as TextAttributes2,TextAttributes as TextAttributes3,RGBA as RGBA2,parseColor,TextAttributes as TextAttributes4,TextAttributes as TextAttributes5,TextAttributes as TextAttributes6,TextAttributes as TextAttributes7,RGBA as RGBA3,parseColor as parseColor2,TextAttributes as TextAttributes8,TextAttributes as TextAttributes9,TextAttributes as TextAttributes12,TextAttributes as TextAttributes10,TextAttributes as TextAttributes11,TextAttributes as TextAttributes13,TextAttributes as TextAttributes14,TextAttributes as TextAttributes16,TextAttributes as TextAttributes15,TextAttributes as TextAttributes17,ScrollBoxRenderable,TextAttributes as TextAttributes18} from "@opentui/core"
 
+function selectionBackdrop(node){for(let parent=node.parent;parent; parent=parent.parent){if(parent instanceof BoxRenderable&&parent.backgroundColor.a>0)
+return parent.backgroundColor
+}
+return RGBA.fromValues(0,0,0,1)
+}
 function SelectionBox(props){const icons=useIcons()
 const [local,boxProps]=splitProps(props,["ref","iconOnly"])
 let node
@@ -743,11 +762,9 @@ const right=left + this.width-1
 const top=this.screenY
 const bottom=top + this.height-1
 const positions=this.height===1?[[left,top,"selectionLeft"],[right,top,"selectionRight"]]:[[left,top,"selectionTopLeft"],[right,top,"selectionTopRight"],[left,bottom,"selectionBottomLeft"],[right,bottom,"selectionBottomRight"]]
-const background=buffer.buffers.bg
+const backdrop=selectionBackdrop(this)
 for(const [x,y,icon] of positions){if(x<0||y<0||x>=buffer.width||y>=buffer.height)
 continue
-const offset=(y*buffer.width + x)*4
-const backdrop=new RGBA(background.slice(offset,offset + 4))
 if(!this.backgroundColor.equals(backdrop))
 corners.push({x,y,icon,backdrop
 })
@@ -921,9 +938,11 @@ return _el$
 
 
 
+
 function SelectionMenu(props){const icons=useIcons()
 const dialogs=useDialogs(props.api)
 const scroll=useDialogScroll()
+const dimensions=useTerminalDimensions2()
 const [active,setActive]=useDialogState("selection",0)
 const theme=()=>props.api.theme.current
 let body
@@ -946,8 +965,9 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"space",cmd:`${prefix}.select`
 }]
 })
-onCleanup2(unregister)
+onCleanup3(unregister)
 return _$createComponent(DialogSurface,{get api(){return props.api
+},get lift(){return props.lift
 },get children(){return [(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` `),_el$4=_$createElement("text")
 _$insertNode(_el$,_el$2)
 _$insertNode(_el$,_el$4)
@@ -985,9 +1005,9 @@ _$insert(_el$1,(()=>{var _c$=_$memo(()=>!!option.icon)
 return()=>_c$()?`${icons.icon(option.icon)} `:""
 })(),null)
 _$insert(_el$1,()=>option.title,null)
-_$effect((_p$)=>{var _v$8=active()===index()?TextAttributes2.BOLD:undefined,_v$9=theme().text
-_v$8!==_p$.e&&(_p$.e=_$setProp(_el$1,"attributes",_v$8,_p$.e))
-_v$9!==_p$.t&&(_p$.t=_$setProp(_el$1,"fg",_v$9,_p$.t))
+_$effect((_p$)=>{var _v$5=active()===index()?TextAttributes2.BOLD:undefined,_v$6=theme().text
+_v$5!==_p$.e&&(_p$.e=_$setProp(_el$1,"attributes",_v$5,_p$.e))
+_v$6!==_p$.t&&(_p$.t=_$setProp(_el$1,"fg",_v$6,_p$.t))
 return _p$
 },{e:undefined,t:undefined
 })
@@ -1000,13 +1020,7 @@ return _el$10
 })()]
 }})
 }))
-_$effect((_p$)=>{var{restore:_v$5,save:_v$6}=scroll,_v$7=props.height??Math.min(props.options.length*3,15)
-_v$5!==_p$.e&&(_p$.e=_$setProp(_el$5,"renderBefore",_v$5,_p$.e))
-_v$6!==_p$.t&&(_p$.t=_$setProp(_el$5,"renderAfter",_v$6,_p$.t))
-_v$7!==_p$.a&&(_p$.a=_$setProp(_el$5,"height",_v$7,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
+_$effect((_$p)=>_$setProp(_el$5,"height",props.adaptive?Math.min(props.height??Math.min(props.options.length*3,15),Math.max(2,Math.floor(dimensions().height*0.75)-8)):props.height??Math.min(props.options.length*3,15),_$p))
 return _el$5
 })(),(()=>{var _el$7=_$createElement("text"),_el$8=_$createTextNode(` navigate \xB7 `),_el$9=_$createTextNode(` select \xB7 `),_el$0=_$createTextNode(` close`)
 _$insertNode(_el$7,_el$8)
@@ -1085,6 +1099,27 @@ function subtleLineColor(background,border){const from=parseColor(background)
 const to=parseColor(border)
 return RGBA2.fromValues(from.r + (to.r-from.r)*0.45,from.g + (to.g-from.g)*0.45,from.b + (to.b-from.b)*0.45)
 }
+
+
+
+
+var PickerComponent=lazy(async ()=>{const path=import.meta.url.includes("/dist/tui.js")?"./icon-picker.js":"./icon-picker/icon-picker"
+const module=await import(path)
+return{default:module.IconPicker
+}})
+function IconPicker(props){return(()=>{var _el$=_$createElement("box")
+_$insert(_el$,_$createComponent(Suspense,{get children(){return _$createComponent(PickerComponent,props)
+}}))
+return _el$
+})()
+}
+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)
+function terminalIcon(id,style){return(glyphs[id]??glyphs.bolt)[style==="nerd"?0:1]
+}
+function terminalIconLabel(id){return id.replaceAll("-"," ")
+}
 function McpErrorDialog(props){return _$createComponent(SelectionMenu,{get api(){return props.api
 },get title(){return `MCP error \xB7 ${props.name}`
 },height:12,get options(){return [{title:`Status \xB7 ${props.status}`,value:"error",description:props.error,icon:"error"
@@ -1192,22 +1227,95 @@ throw new Error(`Expected format ${PORTABLE_SETTINGS_FORMAT}`)
 if(input.version!==1)
 throw new Error(`Unsupported settings version ${String(input.version)}`)
 const unsupported=[]
-unknownKeys(input,["format","version","layout","mcp"],"",unsupported)
+unknownKeys(input,["format","version","layout","mcp","behavior"],"",unsupported)
 const hasLayout=Object.hasOwn(input,"layout")
 const hasMcp=Object.hasOwn(input,"mcp")
-if(!hasLayout&&!hasMcp)
+const behavior={}
+if(input.behavior!==undefined){const raw=object(input.behavior,"/behavior")
+unknownKeys(raw,["toolbarOverflow"],"/behavior",unsupported)
+if(raw.toolbarOverflow!==undefined){if(raw.toolbarOverflow!=="menu"&&raw.toolbarOverflow!=="wrap")
+throw new Error("/behavior/toolbarOverflow must be menu or wrap")
+behavior.toolbarOverflow=raw.toolbarOverflow
+}}
+if(!hasLayout&&!hasMcp&&!behavior.toolbarOverflow)
 throw new Error("Settings JSON contains no supported settings")
-const settings={format:PORTABLE_SETTINGS_FORMAT,version:1,...hasLayout&&{layout:parseLayout(input.layout,unsupported)},...hasMcp&&{mcp:parseMcp(input.mcp)}}
+const settings={format:PORTABLE_SETTINGS_FORMAT,version:1,...hasLayout&&{layout:parseLayout(input.layout,unsupported)},...hasMcp&&{mcp:parseMcp(input.mcp)},...behavior.toolbarOverflow&&{behavior}}
 unsupported.sort()
 return{settings,unsupported}}
-function serializePortableSettings(layout,mcp){return `${JSON.stringify({
+function serializePortableSettings(layout,mcp,behavior){return `${JSON.stringify({
     format: PORTABLE_SETTINGS_FORMAT,
     version: 1,
     layout,
+    ...behavior && { behavior },
     mcp: Object.fromEntries(Object.entries(mcp).sort(([left], [right]) => left.localeCompare(right)))
   }, undefined, 2)}
 `
 }
+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)
+}
+function parsePin(value){if(!value||typeof value!=="object")
+return
+const input=value
+if(!identifier(input.icon))
+return
+const stateIcons=Object.fromEntries(Object.entries(input.stateIcons&&typeof input.stateIcons==="object"?input.stateIcons:{}).filter(([key,icon])=>identifier(key)&&identifier(icon)))
+const icons={icon:input.icon,...Object.keys(stateIcons).length>0&&{stateIcons}}
+if(input.kind==="action"&&QUICK_ACTION_IDS.includes(input.id))
+return{kind:"action",id:input.id,...icons}
+if(input.kind==="skill"&&typeof input.location==="string"&&input.location.trim()&&typeof input.name==="string"&&input.name.trim())
+return{kind:"skill",location:input.location,name:input.name.trim().slice(0,128),...icons}
+return
+}
+function parseToolbarPins(value){if(!Array.isArray(value))
+return []
+const keys=new Set
+return value.flatMap((candidate)=>{const pin=parsePin(candidate)
+if(!pin||keys.has(toolbarPinKey(pin))||keys.size>=100)
+return []
+keys.add(toolbarPinKey(pin))
+return [pin]
+})
+}
+function changeToolbarPins(current=[],change){const pins=parseToolbarPins(current)
+if(change.operation==="pin"){const pin=parsePin(change.pin)
+if(!pin)
+throw new Error("Invalid toolbar pin")
+if(pins.some((item)=>toolbarPinKey(item)===toolbarPinKey(pin)))
+throw new Error("This item is already pinned")
+if(pins.length>=100)
+throw new Error("You can pin at most 100 items")
+return [...pins,pin]
+}
+const index=pins.findIndex((pin)=>toolbarPinKey(pin)===change.key)
+if(index===-1){if(change.operation==="configure")
+throw new Error("Pin no longer exists; reopen the toolbar manager")
+return pins
+}
+if(change.operation==="configure"){if(change.expected&&change.expected!==JSON.stringify(pins[index]))
+throw new Error("Pin changed; reopen its configuration")
+const stateIcons={...pins[index].stateIcons}
+const changes=Object.entries(change.stateIcons??{})
+for(const [state,icon] of changes){if(!identifier(state)||icon!==null&&!identifier(icon))
+throw new Error("Invalid state icon")
+if(icon===null)
+delete stateIcons[state]
+else
+stateIcons[state]=icon
+}
+const pin=parsePin({...pins[index],icon:change.icon,stateIcons})
+if(!pin)
+throw new Error("Invalid toolbar icon")
+pins[index]=pin
+return pins
+}
+const [pin]=pins.splice(index,1)
+if(change.operation==="move"){const destination=pins.findIndex((item)=>toolbarPinKey(item)===change.before)
+pins.splice(destination===-1?pins.length:destination,0,pin)
+}
+return pins
+}
 function record(value){if(!value||typeof value!=="object"||Array.isArray(value))
 return
 return value
@@ -1216,7 +1324,8 @@ function parsePluginSettings(value){const input=record(value)
 if(!input)
 return{}
 return{...typeof input.toggleKey==="string"&&input.toggleKey.trim()&&{toggleKey:input.toggleKey.trim()},...typeof input.focusKey==="string"&&input.focusKey.trim()&&{focusKey:input.focusKey.trim()},...typeof input.searchKey==="string"&&input.searchKey.trim()&&{searchKey:input.searchKey.trim()},...typeof input.persistMcp==="boolean"&&{persistMcp:input.persistMcp},...parseLimitsRefreshMinutes(input.limitsRefreshMinutes)!==undefined&&{limitsRefreshMinutes:parseLimitsRefreshMinutes(input.limitsRefreshMinutes)
-},...typeof input.startInChat==="boolean"&&{startInChat:input.startInChat},...typeof input.showSessionTitle==="boolean"&&{showSessionTitle:input.showSessionTitle},...typeof input.showSessionDate==="boolean"&&{showSessionDate:input.showSessionDate},...typeof input.cornerFont==="boolean"&&{cornerFont:input.cornerFont},...(input.lspIconStyle==="nerd"||input.lspIconStyle==="text")&&{lspIconStyle:input.lspIconStyle},...(input.rowDensity==="compact"||input.rowDensity==="comfortable")&&{rowDensity:input.rowDensity
+},...typeof input.startInChat==="boolean"&&{startInChat:input.startInChat},...(input.toolbarOverflow==="menu"||input.toolbarOverflow==="wrap")&&{toolbarOverflow:input.toolbarOverflow
+},...typeof input.showSessionTitle==="boolean"&&{showSessionTitle:input.showSessionTitle},...typeof input.showSessionDate==="boolean"&&{showSessionDate:input.showSessionDate},...typeof input.cornerFont==="boolean"&&{cornerFont:input.cornerFont},...(input.lspIconStyle==="nerd"||input.lspIconStyle==="text")&&{lspIconStyle:input.lspIconStyle},...(input.rowDensity==="compact"||input.rowDensity==="comfortable")&&{rowDensity:input.rowDensity
 },...Object.keys(parseSectionItemLimits(input.sectionItemLimits)).length>0&&{sectionItemLimits:parseSectionItemLimits(input.sectionItemLimits)
 },...parseQuickActionOrder(input.quickActionOrder)&&{quickActionOrder:parseQuickActionOrder(input.quickActionOrder)
 },...Object.keys(parseQuickActionVisibility(input.quickActionVisibility)).length>0&&{quickActionVisibility:parseQuickActionVisibility(input.quickActionVisibility)
@@ -1322,7 +1431,8 @@ return{global:{...Object.keys(behavior).length>0&&{behavior},...layout&&{layout}
 },...typeof userInput?.lastNavigatorVersion==="string"&&{lastNavigatorVersion:userInput.lastNavigatorVersion
 },...typeof userInput?.previousNavigatorVersion==="string"&&{previousNavigatorVersion:userInput.previousNavigatorVersion
 },...Object.keys(layoutPresets).length>0&&{layoutPresets},...Object.keys(mcpPresets).length>0&&{mcpPresets},...favoriteSkills&&{favoriteSkills},...favoriteMcpServers?.length&&{favoriteMcpServers},...favoriteQuickActions.length>0&&{favoriteQuickActions},...recentSkills.length>0&&{recentSkills},...recentQuickActions.length>0&&{recentQuickActions},...Object.keys(mcpServerGroups).length>0&&{mcpServerGroups},...Object.keys(skillGroups).length>0&&{skillGroups},...Object.keys(codexAccountBindings).length>0&&{codexAccountBindings},...pendingResetAttempt&&{pendingResetAttempt},...typeof userInput?.autoApprovePermissions==="boolean"&&{autoApprovePermissions:userInput.autoApprovePermissions
-},...Object.keys(workspaceProfiles).length>0&&{workspaceProfiles}}}}
+},...Object.keys(workspaceProfiles).length>0&&{workspaceProfiles},...parseToolbarPins(userInput?.toolbarPins).length>0&&{toolbarPins:parseToolbarPins(userInput?.toolbarPins)
+}}}}
 function parseValues(value){if(!value)
 return{}
 return{behavior:parsePluginSettings(value.behavior),layout:{sections:parseSectionPreferences(value.layout?.sections),expanded:parseSectionPreferences(value.layout?.expanded),...parseSectionOrder(value.layout?.order)&&{order:parseSectionOrder(value.layout?.order)}},desiredMcpStates:parseDesiredMcpStates(value.desiredMcpStates)
@@ -1369,7 +1479,7 @@ delete profiles[layout]
 }}
 function applyPreferencesUpdate(current,update){const target=update.target??(update.mcp?.scope?targetForLegacyScope(update.mcp.scope):{kind:"global"})
 const existing=targetPreferences(current,target)
-if(update.expectedScope&&update.expectedScope!==JSON.stringify({layout:existing.layout,mcp:existing.mcp})){throw new Error("Settings changed after this preview; reopen the import preview")
+if(update.expectedScope&&update.expectedScope!==JSON.stringify({layout:existing.layout,mcp:existing.mcp,behavior:existing.behavior})){throw new Error("Settings changed after this preview; reopen the import preview")
 }
 const behavior={...!update.clearBehavior&&existing.behavior,...parsePluginSettings(update.behavior)
 }
@@ -1489,8 +1599,9 @@ favoriteSkills.splice(index,1)
 favoriteSkills.sort()
 }
 const onboardingCompleted=typeof update.user?.onboardingCompleted==="boolean"?update.user.onboardingCompleted:current.user.onboardingCompleted
+const toolbarPins=update.user?.toolbarPin?changeToolbarPins(current.user.toolbarPins,update.user.toolbarPin):current.user.toolbarPins
 return{global:target.kind==="global"?scope:current.global,worktrees,user:{...skippedSkillConfirmations.size>0&&{skippedSkillConfirmations:[...skippedSkillConfirmations].sort()
-},...typeof onboardingCompleted==="boolean"&&{onboardingCompleted},...(update.user?.lastNavigatorVersion??current.user.lastNavigatorVersion)&&{lastNavigatorVersion:update.user?.lastNavigatorVersion??current.user.lastNavigatorVersion
+},...typeof onboardingCompleted==="boolean"&&{onboardingCompleted},...toolbarPins?.length&&{toolbarPins},...(update.user?.lastNavigatorVersion??current.user.lastNavigatorVersion)&&{lastNavigatorVersion:update.user?.lastNavigatorVersion??current.user.lastNavigatorVersion
 },...(update.user?.previousNavigatorVersion??current.user.previousNavigatorVersion)&&{previousNavigatorVersion:update.user?.previousNavigatorVersion??current.user.previousNavigatorVersion
 },...Object.keys(parsedLayoutPresets).length>0&&{layoutPresets:parsedLayoutPresets},...Object.keys(parsedMcpPresets).length>0&&{mcpPresets:parsedMcpPresets},...Object.keys(workspaceProfiles).length>0&&{workspaceProfiles:parseWorkspaceProfiles(workspaceProfiles)
 },...favoriteSkills.length>0&&{favoriteSkills},...favoriteMcpServers.size>0&&{favoriteMcpServers:[...favoriteMcpServers].sort()},...favoriteQuickActions.size>0&&{favoriteQuickActions:parseFavoriteQuickActions([...favoriteQuickActions])
@@ -1648,7 +1759,7 @@ 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,sectionItemLimits:defaults.sectionItemLimits,quickActionOrder:defaults.quickActionOrder,quickActionVisibility:defaults.quickActionVisibility
+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:{}}
 const [resolved,setResolved]=createSignal4(resolvePreferences({builtIns,pluginOptions:configured}))
@@ -1714,7 +1825,7 @@ return resolveTarget(selectedTarget())
 function workspaceProfiles(){revision()
 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})
+return JSON.stringify({layout:scope?.layout,mcp:scope?.mcp,behavior:scope?.behavior})
 }
 function update(change){updateRevision++
 document=applyPreferencesUpdate(document,change)
@@ -1891,9 +2002,15 @@ next.add(id)
 setFavoriteQuickActions(next)
 update({user:{favoriteQuickAction:{id,favorite:next.has(id)}}})
 }
-return{sections:()=>resolved().layout.sections,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{sections:()=>resolved().layout.sections,toolbarPins(){revision()
+return document.user.toolbarPins??[]
+},changeToolbarPin(change){requireHydration()
+update({user:{toolbarPin:change}})
+},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,selectedToggleKey:()=>selectedResolved().behavior.toggleKey,selectedFocusKey:()=>selectedResolved().behavior.focusKey,selectedSearchKey:()=>selectedResolved().behavior.searchKey,selectedPersistMcp:()=>selectedResolved().behavior.persistMcp,selectedLimitsRefreshMinutes:()=>selectedResolved().behavior.limitsRefreshMinutes,setLimitsRefreshMinutes(value){if(parseLimitsRefreshMinutes(value)===undefined)
+},cornerFont:()=>resolved().behavior.cornerFont,lspIconStyle:()=>resolved().behavior.lspIconStyle,rowDensity:()=>resolved().behavior.rowDensity,toolbarOverflow:()=>resolved().behavior.toolbarOverflow,selectedToolbarOverflow:()=>selectedResolved().behavior.toolbarOverflow,toggleToolbarOverflow(){load()
+update({target:selectedTarget(),behavior:{toolbarOverflow:selectedResolved().behavior.toolbarOverflow==="menu"?"wrap":"menu"}})
+},selectedToggleKey:()=>selectedResolved().behavior.toggleKey,selectedFocusKey:()=>selectedResolved().behavior.focusKey,selectedSearchKey:()=>selectedResolved().behavior.searchKey,selectedPersistMcp:()=>selectedResolved().behavior.persistMcp,selectedLimitsRefreshMinutes:()=>selectedResolved().behavior.limitsRefreshMinutes,setLimitsRefreshMinutes(value){if(parseLimitsRefreshMinutes(value)===undefined)
 throw new Error("Enter whole minutes (at least 1 minute, within the supported timer range)")
 load()
 update({target:selectedTarget(),behavior:{limitsRefreshMinutes:value}})
@@ -1911,23 +2028,24 @@ update({target:selectedTarget(),behavior:{quickActionOrder:order}})
 throw new Error("Enter a non-negative whole number (0 for All)")
 load()
 update({target:selectedTarget(),behavior:{sectionItemLimits:{[section]:value}}})
-},selectedSections:()=>selectedLayoutResolved().layout.sections,selectedExpanded:()=>selectedLayoutResolved().layout.expanded,selectedSectionOrder:()=>selectedLayoutResolved().layout.order,layoutPresets,mcpPresets,workspaceProfiles,exportPortableSettings(){return serializePortableSettings(selectedLayoutResolved().layout,selectedResolved().desiredMcpStates)
+},selectedSections:()=>selectedLayoutResolved().layout.sections,selectedExpanded:()=>selectedLayoutResolved().layout.expanded,selectedSectionOrder:()=>selectedLayoutResolved().layout.order,layoutPresets,mcpPresets,workspaceProfiles,exportPortableSettings(){return serializePortableSettings(selectedLayoutResolved().layout,selectedResolved().desiredMcpStates,{toolbarOverflow:selectedResolved().behavior.toolbarOverflow
+})
 },previewPortableSettings(source){requireHydration()
 const parsed=parsePortableSettings(source)
 const target=selectedTarget()
 const current=selectedResolved()
 const scope=target.kind==="global"?document.global:document.worktrees[target.key]??{}
-const imported={...scope,...parsed.settings.layout&&{layout:parsed.settings.layout},...parsed.settings.mcp&&{mcp:parsed.settings.mcp}}
+const imported={...scope,...parsed.settings.behavior&&{behavior:{...scope.behavior,...parsed.settings.behavior}},...parsed.settings.layout&&{layout:parsed.settings.layout},...parsed.settings.mcp&&{mcp:parsed.settings.mcp}}
 const next=resolvePreferences({builtIns,pluginOptions:configured,global:values(target.kind==="global"?imported:document.global),worktree:target.kind==="worktree"?values(imported):undefined
 })
 const layoutChanged=Boolean(parsed.settings.layout&&JSON.stringify(next.layout)!==JSON.stringify(selectedLayoutResolved().layout))
 const mcpChanged=Boolean(parsed.settings.mcp&&JSON.stringify(next.desiredMcpStates)!==JSON.stringify(current.desiredMcpStates))
-return{...parsed,target:targetKey(target),expectedScope:scopeSnapshot(target),layoutChanged,mcpChanged
+return{...parsed,target:targetKey(target),expectedScope:scopeSnapshot(target),layoutChanged,mcpChanged,behaviorChanged:Boolean(parsed.settings.behavior&&next.behavior.toolbarOverflow!==current.behavior.toolbarOverflow)
 }},async applyPortableSettings(preview){await load()
 const target=selectedTarget()
 if(preview.target!==targetKey(target))
 throw new Error("Preference scope changed; reopen the import preview")
-const change={target,expectedScope:preview.expectedScope,...preview.settings.layout&&{layout:preview.settings.layout,clearLayout:true},...preview.settings.mcp&&{mcp:{states:preview.settings.mcp},clearMcp:true}}
+const change={target,expectedScope:preview.expectedScope,...preview.settings.behavior&&{behavior:preview.settings.behavior},...preview.settings.layout&&{layout:preview.settings.layout,clearLayout:true},...preview.settings.mcp&&{mcp:{states:preview.settings.mcp},clearMcp:true}}
 updateRevision++
 await store.update(change)
 document=await store.load()
@@ -2173,15 +2291,16 @@ return{behavior,layout:{sections,expanded:{},...sectionOrder&&{order:sectionOrde
 function configuredDefaultsFromPluginOptions(options){return mergeConfiguredDefaults(legacyDefaults(pluginConfig(options)),parseConfiguredDefaults(options??{}))
 }
 
-function createSkillController(api){const [skills,setSkills]=createSignal5({})
+function createSkillController(api,source){const [skills,setSkills]=createSignal5({})
 const refreshing=new Map
 const targets=new Map
 const requests=createRequestState(api.lifecycle.signal)
 const promptRequests=createRequestState(api.lifecycle.signal)
 let activeTarget
+let leases=new Set
 function target(){return currentLocation(api)
 }
-function list(current=target()){return skills()[current.key]??[]
+function list(current=target()){return source?source.list(current):skills()[current.key]??[]
 }
 function error(current=target()){return requests.state(current.key).error?.message
 }
@@ -2192,8 +2311,8 @@ targets.set(current.key,current)
 const requestState=requests.start(current.key,"refresh skills",current.key in skills(),force)
 if(!requestState)
 return pending
-const request=api.client.app.skills(current.routing,{throwOnError:true,signal:requestState.signal}).then((result)=>{const items=[...result.data??[]].sort((a,b)=>a.name.localeCompare(b.name))
-if(requestState.isCurrent())
+const request=(source?source.refresh(current,force,requestState.signal).then((data)=>({data})):api.client.app.skills(current.routing,{throwOnError:true,signal:requestState.signal})).then((result)=>{const items=[...result.data??[]].sort((a,b)=>a.name.localeCompare(b.name))
+if(!source&&requestState.isCurrent())
 setSkills((value)=>({...value,[current.key]:items}))
 requestState.succeed()
 return items
@@ -2216,19 +2335,25 @@ if(activeTarget!==current.key){requests.abortAll()
 promptRequests.abortAll()
 refreshing.clear()
 activeTarget=current.key
+leases=new Set
+targets.clear()
+targets.set(current.key,current)
 }
-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
+targets.delete(current.key)
 requests.abortAll()
 promptRequests.abortAll()
 refreshing.clear()
-}},async use(current,name){if(activeTarget&&activeTarget!==current.key)
+}},async use(current,name,selected){if(activeTarget&&activeTarget!==current.key||target().key!==current.key)
 throw new DOMException("Sidebar context changed","AbortError")
 const request=promptRequests.start(current.key,"insert skill",false,true)
 if(!request)
 return false
-try{const result=await api.client.tui.appendPrompt({...current.routing,text:`/${name} `},{throwOnError:true,signal:request.signal})
+try{const result=source&&selected?{data:await source.use(current,selected,request.signal)}:await api.client.tui.appendPrompt({...current.routing,text:`/${name} `},{throwOnError:true,signal:request.signal})
 if(!request.isCurrent())
 return false
 request.succeed()
@@ -2257,11 +2382,6 @@ return rank||left.bucket.localeCompare(right.bucket)||(left.bucket==="Favorites"
 
 
 
-
-
-
-
-
 function SkillConfirmation(props){const icons=useIcons()
 const theme=()=>props.api.theme.current
 return(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` Confirmation`),_el$4=_$createElement("box"),_el$5=_$createElement("text"),_el$6=_$createElement("text"),_el$8=_$createElement("text"),_el$9=_$createTextNode(`(`),_el$0=_$createTextNode(`)`),_el$1=_$createElement("box")
@@ -2326,7 +2446,7 @@ return _el$
 
 
 function SkillDetails(props){const icons=useIcons()
-const dimensions=useTerminalDimensions2()
+const dimensions=useTerminalDimensions3()
 const theme=()=>props.api.theme.current
 return(()=>{var _el$=_$createElement("scrollbox"),_el$2=_$createElement("box"),_el$3=_$createElement("box"),_el$4=_$createElement("text"),_el$5=_$createTextNode(` Description`),_el$6=_$createElement("text"),_el$7=_$createElement("box"),_el$8=_$createElement("text"),_el$9=_$createTextNode(` Source`),_el$0=_$createElement("text")
 _$insertNode(_el$,_el$2)
@@ -2365,11 +2485,67 @@ return _p$
 return _el$
 })()
 }
-function SkillDialog(props){const icons=useIcons()
-const dialogs=useDialogs(props.api)
-const [skipConfirmation,setSkipConfirmation]=createSignal6(false)
-const [active,setActive]=createSignal6("accept")
+
+
+
+
+
+
+
+
+
+
+function SkillDialogHeader(props){const icons=useIcons()
 const theme=()=>props.api.theme.current
+return(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` `),_el$4=_$createElement("box"),_el$5=_$createElement("text")
+_$insertNode(_el$,_el$2)
+_$insertNode(_el$,_el$4)
+_$setProp(_el$,"flexDirection","row")
+_$setProp(_el$,"justifyContent","space-between")
+_$setProp(_el$,"alignItems","center")
+_$insertNode(_el$2,_el$3)
+_$setProp(_el$2,"truncate",true)
+_$setProp(_el$2,"wrapMode","none")
+_$setProp(_el$2,"flexGrow",1)
+_$insert(_el$2,()=>icons.icon("skills"),_el$3)
+_$insert(_el$2,()=>props.name,null)
+_$insertNode(_el$4,_el$5)
+_$setProp(_el$4,"flexDirection","row")
+_$setProp(_el$4,"gap",1)
+_$setProp(_el$4,"alignItems","center")
+_$insert(_el$4,_$createComponent(Show2,{get when(){return props.onConfigure
+},get children(){return _$createComponent(IconControl,{get icon(){return terminalIcon("pin",icons.style())
+},get foregroundColor(){return _$memo(()=>props.active==="configure")()?theme().selectedListItemText:theme().textMuted
+},get backgroundColor(){return _$memo(()=>props.active==="configure")()?theme().primary:undefined
+},onMouseOver:()=>props.onActive("configure"),onMouseUp:()=>props.onConfigure?.()
+})
+}}),_el$5)
+_$insert(_el$4,_$createComponent(BookmarkControl,{get bookmarked(){return props.favorite
+},get backgroundColor(){return _$memo(()=>props.active==="favorite")()?theme().primary:undefined
+},get foregroundColor(){return _$memo(()=>!!props.favoriteDisabled)()?theme().textMuted:_$memo(()=>props.active==="favorite")()?theme().selectedListItemText:theme().warning
+},onMouseOver:()=>{if(!props.favoriteDisabled)
+props.onActive("favorite")
+},onMouseUp:()=>{if(!props.favoriteDisabled)
+props.onFavorite()
+}}),_el$5)
+_$setProp(_el$5,"onMouseDown",(event)=>event.stopPropagation())
+_$setProp(_el$5,"onMouseUp",(event)=>{event.stopPropagation()
+props.onCancel()
+})
+_$insert(_el$5,()=>icons.key("esc"))
+_$effect((_p$)=>{var _v$=TextAttributes6.BOLD,_v$2=theme().text,_v$3=theme().textMuted
+_v$!==_p$.e&&(_p$.e=_$setProp(_el$2,"attributes",_v$,_p$.e))
+_v$2!==_p$.t&&(_p$.t=_$setProp(_el$2,"fg",_v$2,_p$.t))
+_v$3!==_p$.a&&(_p$.a=_$setProp(_el$5,"fg",_v$3,_p$.a))
+return _p$
+},{e:undefined,t:undefined,a:undefined
+})
+return _el$
+})()
+}
+function SkillDialog(props){const dialogs=useDialogs(props.api)
+const [skipConfirmation,setSkipConfirmation]=useDialogState("skill-skip",false)
+const [active,setActive]=useDialogState("skill-action","accept")
 let body
 function accept(){const isSkip=skipConfirmation()
 dialogs.close()
@@ -2378,6 +2554,8 @@ props.onAccept(isSkip)
 function cancel(){dialogs.back()
 }
 function move(offset){const actions=props.favoriteDisabled?["accept","cancel"]:["accept","cancel","favorite"]
+if(props.onConfigure)
+actions.push("configure")
 const index=actions.indexOf(active())
 setActive(actions[(index + offset + actions.length)%actions.length])
 }
@@ -2385,11 +2563,13 @@ function submit(){if(active()==="accept")
 accept()
 else if(active()==="cancel")
 cancel()
+else if(active()==="configure")
+props.onConfigure?.(dialogs)
 else if(!props.favoriteDisabled)
 props.onToggleFavorite()
 }
 function confirmationAction(){const action=active()
-return action==="favorite"?undefined:action
+return action==="favorite"||action==="configure"?undefined:action
 }
 const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,commands:[{name:`${PLUGIN_ID}.skill-dialog.scroll-up`,run:()=>body?.scrollBy(-1)
 },{name:`${PLUGIN_ID}.skill-dialog.scroll-down`,run:()=>body?.scrollBy(1)
@@ -2406,43 +2586,17 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"return",cmd:`${PLUGIN_ID}.skill-dialog.submit`
 }]
 })
-onCleanup3(unregister)
+onCleanup4(unregister)
 return _$createComponent(DialogSurface,{get api(){return props.api
-},get children(){return [(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` `),_el$4=_$createElement("box"),_el$5=_$createElement("text")
-_$insertNode(_el$,_el$2)
-_$insertNode(_el$,_el$4)
-_$setProp(_el$,"flexDirection","row")
-_$setProp(_el$,"justifyContent","space-between")
-_$setProp(_el$,"alignItems","center")
-_$insertNode(_el$2,_el$3)
-_$insert(_el$2,()=>icons.icon("skills"),_el$3)
-_$insert(_el$2,()=>props.skill.name,null)
-_$insertNode(_el$4,_el$5)
-_$setProp(_el$4,"flexDirection","row")
-_$setProp(_el$4,"gap",1)
-_$setProp(_el$4,"alignItems","center")
-_$insert(_el$4,_$createComponent(BookmarkControl,{get bookmarked(){return props.favorite
-},get backgroundColor(){return _$memo(()=>active()==="favorite")()?theme().primary:undefined
-},get foregroundColor(){return _$memo(()=>!!props.favoriteDisabled)()?theme().textMuted:_$memo(()=>active()==="favorite")()?theme().selectedListItemText:theme().warning
-},onMouseOver:()=>{if(!props.favoriteDisabled)
-setActive("favorite")
-},onMouseUp:()=>{if(!props.favoriteDisabled)
-props.onToggleFavorite()
-}}),_el$5)
-_$setProp(_el$5,"onMouseDown",(event)=>event.stopPropagation())
-_$setProp(_el$5,"onMouseUp",(event)=>{event.stopPropagation()
-cancel()
-})
-_$insert(_el$5,()=>icons.key("esc"))
-_$effect((_p$)=>{var _v$=TextAttributes6.BOLD,_v$2=theme().text,_v$3=theme().textMuted
-_v$!==_p$.e&&(_p$.e=_$setProp(_el$2,"attributes",_v$,_p$.e))
-_v$2!==_p$.t&&(_p$.t=_$setProp(_el$2,"fg",_v$2,_p$.t))
-_v$3!==_p$.a&&(_p$.a=_$setProp(_el$5,"fg",_v$3,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
-return _el$
-})(),_$createComponent(SkillDetails,{get api(){return props.api
+},get children(){return [_$createComponent(SkillDialogHeader,{get api(){return props.api
+},get name(){return props.skill.name
+},get favorite(){return props.favorite
+},get favoriteDisabled(){return props.favoriteDisabled
+},get active(){return active()
+},onActive:setActive,get onFavorite(){return props.onToggleFavorite
+},get onConfigure(){return props.onConfigure?()=>props.onConfigure?.(dialogs):undefined
+},onCancel:cancel
+}),_$createComponent(SkillDetails,{get api(){return props.api
 },get skill(){return props.skill
 },ref:(node)=>body=node
 }),_$createComponent(SkillConfirmation,{get api(){return props.api
@@ -2452,10 +2606,57 @@ return _el$
 })]
 }})
 }
+function skillUnavailable(controller,skill){const list=controller.list()
+if(list.every((item)=>!(item.name===skill.name&&item.location===skill.location)))
+return "Skill is unavailable in this workspace"
+if(skill.id){if(list.every((item)=>item.id!==skill.id||item.location!==skill.location))
+return "Skill source changed"
+} else if(list.filter((item)=>item.name===skill.name).length!==1)
+return "Multiple sources share this skill name"
+return
+}
+function activateSkill(input){input={...input,skill:{...input.skill
+}}
+const target=input.controller.target()
+const route=JSON.stringify(input.api.route.current)
+const current=()=>target.key===input.controller.target().key&&route===JSON.stringify(input.api.route.current)
+const report=(error)=>{if(!isAbortError(error))
+input.api.ui.toast({variant:"error",title:"Skills",message:String(error),duration:5000
+})
+}
+function check(){if(!current())
+throw new DOMException("Skill target changed; choose it again","AbortError")
+const reason=skillUnavailable(input.controller,input.skill)
+if(reason)
+throw new Error(reason)
+}
+async function insert(skip=false){try{check()
+if(skip)
+input.access.skipSkillConfirmation(input.skill)
+input.beforeInsert?.()
+if(await input.controller.use(target,input.skill.name,input.skill))
+await input.access.recordSkillUse?.(input.skill)
+} catch(error){report(error)
+}}
+try{check()
+} catch(error){report(error)
+return
+}
+if(!input.access.shouldConfirmSkill(input.skill)){insert()
+return
+}
+input.dialogs.open(()=>_$createComponent(SkillDialog,{get api(){return input.api
+},get skill(){return input.skill
+},get favorite(){return input.access.isFavoriteSkill?.(input.skill)??false
+},get favoriteDisabled(){return input.access.ready?.()===false
+},onToggleFavorite:()=>input.access.toggleFavoriteSkill?.(input.skill),get onConfigure(){return input.onConfigure
+},onAccept:(skip)=>{insert(skip)
+}}))
+}
 
 
 function createSubagentHistory({now=Date.now}={}){const targets=new Map
-const [revision,setRevision]=createSignal7(0)
+const [revision,setRevision]=createSignal6(0)
 function state(key){let value=targets.get(key)
 if(!value){value={known:new Set,active:new Map,recent:[]}
 targets.set(key,value)
@@ -2510,19 +2711,21 @@ return targets.get(key)?.recent??[]
 var POLL_INTERVAL_MS=5000
 function activeStatus(status){return status?.type==="busy"||status?.type==="retry"
 }
-function createSubagentController(api,options={}){const now=options.now??Date.now
+function createSubagentController(api,options={}){const source=options.source
+const now=options.now??Date.now
 const history=createSubagentHistory({now})
-const [children,setChildren]=createSignal8({})
-const [statuses,setStatuses]=createSignal8({})
+const [children,setChildren]=createSignal7({})
+const [statuses,setStatuses]=createSignal7({})
 const refreshing=new Map
 const journals=new Set
-const [unavailable,setUnavailable]=createSignal8({})
+const [unavailable,setUnavailable]=createSignal7({})
 const targets=new Map
 const remoteFailures=new Map
 const remoteRetryAt=new Map
 const requests=createRequestState(api.lifecycle.signal)
 let activeTarget
 let pollTimer
+const snapshots=()=>source?Object.fromEntries([...targets].map(([key,current])=>[key,source.list(current.parentID)])):children()
 function target(parentID){const parent=api.state.session.get(parentID)
 const directory=parent?.directory??api.state.path.directory
 const workspace=parent?.workspaceID
@@ -2541,16 +2744,18 @@ history.remove(key,sessionID)
 }
 for(const journal of journals)
 journal.sessions.push(mutation)
+if(!source)
 setChildren((current)=>Object.fromEntries(Object.entries(current).map(([key,items])=>[key,applySession(items,targets.get(key).parentID,mutation)])))
 }
 function recordStatus(input){const mutation={...input,at:now(),observed:new Set}
 for(const journal of journals)
 journal.statuses.push(mutation)
-batch(()=>{for(const [key,items] of Object.entries(children())){if(items.every((item)=>item.id!==mutation.sessionID))
+batch(()=>{for(const [key,items] of Object.entries(snapshots())){if(items.every((item)=>item.id!==mutation.sessionID))
 continue
 history.observeStatus(key,mutation.sessionID,mutation.status,mutation.at)
 mutation.observed.add(key)
 }
+if(!source)
 setStatuses((current)=>Object.fromEntries(Object.entries(current).map(([key,value])=>[key,applyStatus(value,mutation)])))
 })
 }
@@ -2559,7 +2764,7 @@ return
 const mutation={sessionID:input.sessionID,error:input.error,at:now(),observed:new Set}
 for(const journal of journals)
 journal.errors.push(mutation)
-for(const [key,items] of Object.entries(children())){if(items.every((item)=>item.id!==mutation.sessionID))
+for(const [key,items] of Object.entries(snapshots())){if(items.every((item)=>item.id!==mutation.sessionID))
 continue
 history.observeError(key,mutation.sessionID,mutation.error,mutation.at)
 mutation.observed.add(key)
@@ -2576,12 +2781,13 @@ if(!requestState){journals.delete(journal)
 return pending
 }
 const signal=AbortSignal.any([requestState.signal,AbortSignal.timeout(5000)])
-const request=Promise.all([api.client.session.children({sessionID:current.parentID,...current.routing},{throwOnError:true,signal}),api.client.session.status(current.routing,{throwOnError:true,signal})]).then(async ([childResult,statusResult])=>{let nextChildren=childResult.data??[]
+const request=(source?source.refresh(current.parentID,signal).then(()=>[{data:source.list(current.parentID)},{data:Object.fromEntries(source.list(current.parentID).map((item)=>[item.id,source.status(item.id)]))
+}]):Promise.all([api.client.session.children({sessionID:current.parentID,...current.routing},{throwOnError:true,signal}),api.client.session.status(current.routing,{throwOnError:true,signal})])).then(async ([childResult,statusResult])=>{let nextChildren=childResult.data??[]
 for(const mutation of journal.sessions)
 nextChildren=applySession(nextChildren,current.parentID,mutation)
 let nextStatuses={...statusResult.data}
 const missing={}
-const remoteStatuses=await Promise.all(nextChildren.map((session)=>{const key=JSON.stringify([current.key,session.id])
+const remoteStatuses=source?[]:await Promise.all(nextChildren.map((session)=>{const key=JSON.stringify([current.key,session.id])
 return(remoteRetryAt.get(key)??0)<=now()?fetchDevTeamStatus(session,requestState.signal):{sessionID:session.id,failed:true,cooldown:true,status:undefined}}))
 if(!requestState.isCurrent())
 return
@@ -2618,8 +2824,9 @@ history.observeStatus(current.key,session.id,status)
 for(const mutation of journal.errors){if(mutation.sessionID===session.id&&!mutation.observed.has(current.key))
 history.observeError(current.key,session.id,mutation.error,mutation.at)
 }}
-setChildren((value)=>({...value,[current.key]:nextChildren}))
+if(!source){setChildren((value)=>({...value,[current.key]:nextChildren}))
 setStatuses((value)=>({...value,[current.key]:nextStatuses}))
+}
 setUnavailable((value)=>({...value,[current.key]:missing}))
 })
 }
@@ -2637,13 +2844,13 @@ return request
 function refresh(parentID,force=false){return refreshTarget(target(parentID),force)
 }
 function list(parentID){const current=target(parentID)
-const currentStatuses=statuses()[current.key]??{}
-return(children()[current.key]??[]).map((session)=>({session,status:currentStatuses[session.id]??(unavailable()[current.key]?.[session.id]?undefined:api.state.session.status(session.id))
+const currentStatuses=source?Object.fromEntries(source.list(parentID).map((item)=>[item.id,source.status(item.id)])):statuses()[current.key]??{}
+return(snapshots()[current.key]??[]).map((session)=>({session,status:currentStatuses[session.id]??(unavailable()[current.key]?.[session.id]?undefined:api.state.session.status(session.id))
 })).filter((item)=>activeStatus(item.status)).map((item)=>({...item,run:history.active(current.key,item.session.id),unavailable:unavailable()[current.key]?.[item.session.id]
 }))
 }
 function recent(parentID){const current=target(parentID)
-const sessions=new Map((children()[current.key]??[]).map((session)=>[session.id,session]))
+const sessions=new Map((snapshots()[current.key]??[]).map((session)=>[session.id,session]))
 return history.recent(current.key).flatMap((run)=>{const session=sessions.get(run.sessionID)
 return session?[{session,status:{type:"idle"},run,unavailable:false}]:[]
 })
@@ -2673,6 +2880,7 @@ return
 refreshTarget(current).catch(()=>{})
 pollTimer=setTimeout(poll,POLL_INTERVAL_MS)
 }
+if(!source)
 pollTimer=setTimeout(poll,POLL_INTERVAL_MS)
 }
 return()=>{if(activeTarget!==current.key)
@@ -2735,17 +2943,17 @@ else if(seconds>=60)
 value=`${Math.floor(seconds / 60)}m ${String(seconds % 60).padStart(2, "0")}s`
 return value
 }
-function createSubagentClock(key){const [now,setNow]=createSignal9(Date.now())
+function createSubagentClock(key){const [now,setNow]=createSignal8(Date.now())
 createEffect5(()=>{if(key()===undefined)
 return
 setNow(Date.now())
 const timer=setInterval(()=>setNow(Date.now()),1000)
-onCleanup4(()=>clearInterval(timer))
+onCleanup5(()=>clearInterval(timer))
 })
 return now
 }
 
-function createTodoController(api){const [sessions,setSessions]=createSignal10({})
+function createTodoController(api){const [sessions,setSessions]=createSignal9({})
 const refreshing=new Map
 const revisions=new Map
 const requests=createRequestState(api.lifecycle.signal)
@@ -2799,107 +3007,7 @@ activeTarget=undefined
 requests.abortAll()
 refreshing.clear()
 }}}}
-function normalizeTodoState(value){if(!value||typeof value!=="object")
-return{todos:[],guidance:false}
-const state=value
-const statuses=new Set(["pending","in_progress","completed","cancelled"])
-const priorities=new Set(["high","medium","low"])
-const todos=Array.isArray(state.todos)?state.todos.filter((item)=>item&&typeof item.content==="string"&&item.content.trim().length>0&&item.content.length<=512&&statuses.has(item.status)).slice(0,100).map((item)=>({content:item.content.trim(),status:item.status,...priorities.has(item.priority??"")&&{priority:item.priority}})):[]
-return{todos,guidance:state.guidance===true}}
-
-var item={type:"object",properties:{content:{type:"string",minLength:1,maxLength:512},status:{type:"string",enum:["pending","in_progress","completed","cancelled"]},priority:{type:"string",enum:["high","medium","low"]}},required:["content","status"],additionalProperties:false
-}
-var todos={type:"array",items:item,maxItems:100}
-var sessionID={type:"string",minLength:1}
-var output={type:"object",properties:{todos,guidance:{type:"boolean"}},required:["todos","guidance"],additionalProperties:false
-}
-var NavigatorTodoRpc={id:"opencode-navigator.todo",methods:{list:{input:{type:"object",properties:{sessionID},required:["sessionID"],additionalProperties:false},output
-},replace:{input:{type:"object",properties:{sessionID,todos},required:["sessionID","todos"],additionalProperties:false
-},output
-},guidance:{input:{type:"object",properties:{sessionID,enabled:{type:"boolean"}},required:["sessionID","enabled"],additionalProperties:false
-},output
-}},events:{updated:{schema:{type:"object",properties:{sessionID,todos,guidance:{type:"boolean"}},required:["sessionID","todos","guidance"],additionalProperties:false
-}}}};
-function isMissingServer(error){return typeof error==="object"&&error!==null&&"type" in error&&error.type==="rpc.unavailable"
-}
-function createNavigatorTodoController(context,api){const rpc=context.client.rpc(NavigatorTodoRpc)
-const [sessions,setSessions]=createSignal11({})
-const [saving,setSaving]=createSignal11({})
-const [errors,setErrors]=createSignal11({})
-const [missing,setMissing]=createSignal11({})
-const requests=createRequestState(api.lifecycle.signal)
-const refreshing=new Map
-const revisions=new Map
-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}}}
-function set(key,value){setSessions((current)=>({...current,[key]:normalizeTodoState(value)}))
-}
-function refresh(sessionID,force=false){const current=target(sessionID)
-const pending=refreshing.get(current.key)
-if(pending&&!force)
-return pending
-const revision=revisions.get(current.key)??0
-const requestState=requests.start(current.key,"refresh Navigator todos",current.key in sessions(),force)
-if(!requestState)
-return pending
-const request=rpc.list({sessionID},{location:current.routing,signal:requestState.signal}).then((value)=>{const state=normalizeTodoState(value)
-if(requestState.isCurrent()){setMissing((values)=>({...values,[current.key]:false}))
-if((revisions.get(current.key)??0)===revision)
-set(current.key,state)
-}
-requestState.succeed()
-return state
-}).catch((error)=>{if(requestState.isCurrent()&&!requestState.signal.aborted)
-setMissing((values)=>({...values,[current.key]:isMissingServer(error)}))
-requestState.fail(error)
-throw error
-}).finally(()=>{requestState.finish()
-if(refreshing.get(current.key)===request)
-refreshing.delete(current.key)
-})
-refreshing.set(current.key,request)
-return request
-}
-const unsubscribe=rpc.events.on("updated",(event)=>{const{sessionID}=event.data
-if(typeof sessionID!=="string")
-return
-const current=target(sessionID)
-if(event.location.directory!==current.routing.directory)
-return
-revisions.set(current.key,(revisions.get(current.key)??0) + 1)
-set(current.key,normalizeTodoState(event.data))
-})
-api.lifecycle.onDispose(unsubscribe)
-return{target,list(sessionID){return sessions()[target(sessionID).key]?.todos??[]
-},refresh,state(sessionID){return requests.state(target(sessionID).key)
-},missing(sessionID){return missing()[target(sessionID).key]??false
-},retry(sessionID){return refresh(sessionID,true)
-},guidance(sessionID){const key=target(sessionID).key
-return{enabled:sessions()[key]?.guidance??false,saving:saving()[key]??false,error:errors()[key],available:key in sessions()
-}},async setGuidance(sessionID,enabled){const current=target(sessionID)
-if(!(current.key in sessions())||saving()[current.key])
-return
-setSaving((value)=>({...value,[current.key]:true}))
-setErrors((value)=>({...value,[current.key]:undefined}))
-try{const state=await rpc.guidance({sessionID,enabled},{location:current.routing})
-revisions.set(current.key,(revisions.get(current.key)??0) + 1)
-set(current.key,normalizeTodoState(state))
-} catch(error){setErrors((value)=>({...value,[current.key]:error instanceof Error?error.message:String(error)}))
-} finally{setSaving((value)=>({...value,[current.key]:false}))
-}},activate(sessionID){const key=target(sessionID).key
-if(activeTarget!==key){requests.abortAll()
-refreshing.clear()
-activeTarget=key
-}
-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")
@@ -2912,38 +3020,46 @@ return{groups,rows:groups.flatMap((group)=>group.items.map((item)=>({item,group:
 
 
 
-
-
-
-
-function KeyboardHelpDialog(props){const icons=useIcons()
-const theme=()=>props.api.theme.current
-const hints=()=>[`${icons.key("up")}/k and ${icons.key("down")}/j move \xB7 ${icons.key("enter")} activates`,`${icons.key("enter")} on a filter starts typing \xB7 ${icons.key("esc")} returns`,`Todo: ${icons.key("enter")} on All / Active / Finished changes the view`,`MCP: ${icons.key("enter")} toggles a group`,"Show all / Show less expands or limits the filtered list",`Skills: ${icons.icon("info")} opens source \xB7 ${icons.icon("recent")} marks recent skills`,"Navigator Settings: Ctrl+,","Navigator shortcuts: c checks for updates \xB7 u updates Navigator after confirmation",`Search Everything: shortcut in Settings ${icons.icon("right")} Behavior`,`Search: type \xB7 ${icons.key("up/down")} results \xB7 ${icons.key("tab/shift+tab")} tabs \xB7 ${icons.key("enter")} run`,`${icons.key("esc")} leaves the sidebar \xB7 ${icons.key("?")} opens this help`]
-return _$createComponent(DialogSurface,{get api(){return props.api
-},get children(){return [(()=>{var _el$=_$createElement("text"),_el$2=_$createTextNode(` Navigator keyboard help`)
-_$insertNode(_el$,_el$2)
-_$insert(_el$,()=>icons.icon("help"),_el$2)
-_$effect((_p$)=>{var _v$=TextAttributes7.BOLD,_v$2=theme().text
-_v$!==_p$.e&&(_p$.e=_$setProp(_el$,"attributes",_v$,_p$.e))
-_v$2!==_p$.t&&(_p$.t=_$setProp(_el$,"fg",_v$2,_p$.t))
-return _p$
-},{e:undefined,t:undefined
-})
+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$
-})(),_$createComponent(Index,{get each(){return hints()
-},children:(hint)=>(()=>{var _el$3=_$createElement("text")
-_$setProp(_el$3,"wrapMode","word")
-_$insert(_el$3,hint)
-_$effect((_$p)=>_$setProp(_el$3,"fg",theme().textMuted,_$p))
-return _el$3
 })()
-})]
-}})
 }
-function openKeyboardHelp(api,iconStyle=()=>"nerd",multilineCorners=()=>true){createDialogStack(api,iconStyle,()=>true,multilineCorners).open(()=>_$createComponent(KeyboardHelpDialog,{api
+function openKeyboardHelp(api,iconStyle=()=>"nerd",multilineCorners=()=>true,shortcuts=[]){createDialogStack(api,iconStyle,()=>true,multilineCorners).open(()=>_$createComponent(KeyboardHelpDialog,{api,shortcuts
 }))
 }
 
+
+
+
+
+
+
+
+
+
+
+
+var defaults={todo:true,lsp:true}
+var capabilities=new WeakMap
+function setHostCapabilities(api,value){capabilities.set(api,value)
+}
+function hostCapabilities(api){return capabilities.get(api)??defaults
+}
+function hostCapabilityUnavailable(api,section){return section==="todo"||section==="lsp"?hostCapabilities(api).unavailable?.[section]:undefined
+}
+function supportsSidebarSection(api,section){const current=hostCapabilities(api)
+return section!=="todo"&&section!=="lsp"?true:current[section]
+}
+function supportsTitleVisibility(api){return hostCapabilities(api).titleVisibility!==false
+}
+function supportsPermissionMode(api){return hostCapabilities(api).permissionMode!==false
+}
 var QUICK_ACTION_METADATA=[["\uEA73","Rename"],["\uEA82","Timeline"],["\uEBCC","Copy transcript"],["\uEBAC","Export"],["\uEAF5","Compact"],["\uEBEB","Switch session"],["\uEA60","New session"],["\uEB9E","Fork session"],["\uEBCC","Copy last response"],["\uEAA1","First message"],["\uEA9A","Last message"],["\uEA82","Last user message"],["\uEA9A","Next message"],["\uEAA1","Previous message"],["\uEBB3","Auto-approve permissions"]]
 var QUICK_ACTIONS=QUICK_ACTION_IDS.map((command,index)=>({command,icon:QUICK_ACTION_METADATA[index][0],label:QUICK_ACTION_METADATA[index][1]
 }))
@@ -2954,10 +3070,10 @@ return action.label
 const command=api.keymap.getCommands?.({visibility:"registered"}).find((candidate)=>candidate.name===action.command)
 return typeof command?.title==="string"?command.title:action.label
 }
-function createQuickActionRevision(api){const [revision,setRevision]=createSignal12(0)
+function createQuickActionRevision(api){const [revision,setRevision]=createSignal11(0)
 const unsubscribe=api.keymap.on?.("state",()=>setRevision((value)=>value + 1))
 if(unsubscribe)
-onCleanup5(unsubscribe)
+onCleanup7(unsubscribe)
 return revision
 }
 function orderQuickActionIds(order,favorites){return [...order.filter((id)=>favorites.has(id)),...order.filter((id)=>!favorites.has(id))]
@@ -2970,12 +3086,35 @@ if(!getCommands)
 return
 const command=getCommands({visibility:"registered"}).find((candidate)=>candidate.name===action.command)
 if(!command)
-return "Unavailable in this OpenCode version"
+return hostCapabilities(api).commandsReachableOnly?"Unavailable in the current session":"Unavailable in this OpenCode version"
 const enabled=command.enabled
 if(enabled===false||typeof enabled==="function"&&!enabled())
 return "Unavailable in the current session"
 return
 }
+var sources=new WeakMap
+function setQuickActionStateSource(api,source){sources.set(api,source)
+}
+function currentPermissionMode(api){const title=api.keymap.getCommands?.({visibility:"registered"}).find((command)=>command.name==="permission.mode")?.title
+if(typeof title!=="string")
+return
+if(title.startsWith("Disable auto-approve permissions"))
+return true
+return title.startsWith("Enable auto-approve permissions")?false:undefined
+}
+function quickActionStates(api,id){if(id==="permission.mode"&&currentPermissionMode(api)!==undefined)
+return [{id:"on",label:"Auto-approve on"},{id:"off",label:"Auto-approve off"}]
+if(id==="session.compact"&&sources.has(api))
+return [{id:"idle",label:"Idle"},{id:"compacting",label:"Compacting"}]
+return []
+}
+function quickActionState(api,id){if(id==="permission.mode"){const mode=currentPermissionMode(api)
+if(mode===undefined)
+return
+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"
 }
@@ -3039,8 +3178,6 @@ 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)
@@ -3052,7 +3189,7 @@ const [selectedID,setSelectedID]=useDialogState("selection",undefined)
 const [views]=useDialogState("tab-views",new Map)
 const tabViews=views()
 const [scrollTop,setScrollTop]=useDialogState("scroll",0)
-const [refreshing,setRefreshing]=createSignal13(false)
+const [refreshing,setRefreshing]=createSignal12(false)
 const theme=()=>props.api.theme.current
 const icons=useIcons()
 const commandRevision=createQuickActionRevision(props.api)
@@ -3061,18 +3198,31 @@ const resultColors=createMemo(()=>{const background=parseColor2(theme().backgrou
 const contrast=background.r*0.299 + background.g*0.587 + background.b*0.114>0.5?0:1
 return{title:mixColor(parseColor2(theme().text),RGBA3.fromValues(contrast,contrast,contrast),0.45),description:mixColor(parseColor2(theme().textMuted),background,0.4)
 }})
-const dimensions=useTerminalDimensions3()
+const dimensions=useTerminalDimensions5()
+const renderer=useRenderer2()
 let input
 let body
 let pendingScroll=scrollTop()
 let isDisposed=false
 let refreshGeneration=0
-const sameContext=()=>searchContext(props.api).key===context.key
-const candidates=createMemo(()=>{commandRevision()
-return buildSearchCandidates({skills:props.skills.list(skillTarget),subagents:context.sessionID?buildSubagentView(props.subagents.list(context.sessionID),props.subagents.recent(context.sessionID)):[],mcp:props.mcp.list(mcpTarget),actionOrder:props.preferences.quickActionOrder?.()??QUICK_ACTION_IDS,favoriteQuickActions:props.preferences.favoriteQuickActions?.()??new Set,favoriteSkills:props.preferences.favoriteSkills(),skillGroups:props.preferences.skillGroups?.()??{},recentSkills:props.preferences.recentSkills(),favoriteMcp:props.preferences.favoriteMcpServers(),mcpGroups:props.preferences.mcpServerGroups?.()??{},hasSession:Boolean(context.sessionID),mcpBusy:props.mcp.mutating(mcpTarget)||props.mcp.bulkState(mcpTarget).status==="running",actionDisabledReason:(action)=>quickActionDisabledReason(props.api,action),actionLabel:(action)=>quickActionLabel(props.api,action)
-})
-})
-const matches=createMemo(()=>searchResults(candidates(),query()))
+const onFrame=()=>{if(!body||body.isDestroyed)
+return
+const position=pendingScroll
+pendingScroll=undefined
+if(typeof position==="number")
+body.scrollTo(position)
+else if(typeof position==="string")
+body.scrollChildIntoView(`${prefix}.${position}`)
+setScrollTop(body.scrollTop)
+}
+renderer.on("frame",onFrame)
+onCleanup8(()=>renderer.off("frame",onFrame))
+const sameContext=()=>searchContext(props.api).key===context.key
+const candidates=createMemo(()=>{commandRevision()
+return buildSearchCandidates({skills:props.skills.list(skillTarget),subagents:context.sessionID?buildSubagentView(props.subagents.list(context.sessionID),props.subagents.recent(context.sessionID)):[],mcp:props.mcp.list(mcpTarget),actionOrder:props.preferences.quickActionOrder?.()??QUICK_ACTION_IDS,favoriteQuickActions:props.preferences.favoriteQuickActions?.()??new Set,favoriteSkills:props.preferences.favoriteSkills(),skillGroups:props.preferences.skillGroups?.()??{},recentSkills:props.preferences.recentSkills(),favoriteMcp:props.preferences.favoriteMcpServers(),mcpGroups:props.preferences.mcpServerGroups?.()??{},hasSession:Boolean(context.sessionID),mcpBusy:props.mcp.mutating(mcpTarget)||props.mcp.bulkState(mcpTarget).status==="running",actionDisabledReason:(action)=>quickActionDisabledReason(props.api,action),actionLabel:(action)=>quickActionLabel(props.api,action)
+})
+})
+const matches=createMemo(()=>searchResults(candidates(),query()))
 const results=createMemo(()=>matches().filter((item)=>item.group===activeTab()))
 const queryScope=createMemo(()=>({query:query(),tab:activeTab()
 }))
@@ -3126,11 +3276,6 @@ return
 props.api.ui.toast({title:"Search Everything",variant:"error",message:cause instanceof Error?cause.message:"Action failed",duration:4000
 })
 }
-async function insertSkill(skill){if(!sameContext())
-return
-if(await props.skills.use(skillTarget,skill.name))
-await props.preferences.recordSkillUse(skill)
-}
 function activate(id=active()?.id){if(isDisposed||!sameContext())
 return
 const item=results().find((candidate)=>candidate.id===id)
@@ -3139,26 +3284,15 @@ return
 setSelectedID(item.id)
 if(body)
 setScrollTop(body.scrollTop)
-if(item.group==="Skills"&&props.preferences.shouldConfirmSkill(item.skill)){dialogs.open(()=>_$createComponent(SkillDialog,{get api(){return props.api
-},get skill(){return item.skill
-},get favorite(){return props.preferences.isFavoriteSkill?.(item.skill)??false
-},get favoriteDisabled(){return _$memo(()=>!!props.preferences.ready)()?!props.preferences.ready():false
-},onToggleFavorite:()=>props.preferences.toggleFavoriteSkill?.(item.skill),onAccept:(skip)=>{if(!sameContext())
-return
-if(skip)
-props.preferences.skipSkillConfirmation(item.skill)
-insertSkill(item.skill).catch(report)
-}}))
+if(item.group==="Skills"){activateSkill({api:props.api,controller:props.skills,access:props.preferences,dialogs,skill:item.skill,beforeInsert:dialogs.close
+})
 return
 }
 if(item.group==="MCP"){props.mcp.toggle(item.server).catch(report)
 return
 }
 dialogs.close()
-switch(item.group){case "Skills":{insertSkill(item.skill).catch(report)
-break
-}
-case "Subagents":{props.subagents.open(item.sessionID)
+switch(item.group){case "Subagents":{props.subagents.open(item.sessionID)
 break
 }
 case "Actions":{const target=props.returnTarget?.parent&&!props.returnTarget.isDestroyed?props.returnTarget:null
@@ -3188,9 +3322,10 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"ctrl+r",cmd:`${prefix}.retry`
 }]
 })
-onCleanup6(()=>{isDisposed=true
+onCleanup8(()=>{isDisposed=true
 unregister()
 })
+onCleanup8(props.skills.activate?.(skillTarget)??(()=>{}))
 onMount(()=>{input?.focus()
 refresh().catch(report)
 })
@@ -3203,17 +3338,7 @@ return{active,activeTab,activate,allErrors,byID,dialogs,errors,icons,loading,mat
 pendingScroll=0
 setQueryValue(value)
 setSelectedID(undefined)
-},setSelectedID,renderBefore(){const position=pendingScroll
-pendingScroll=undefined
-if(!body||position===undefined)
-return
-if(typeof position==="number")
-body.scrollTo(position)
-else
-body.scrollChildIntoView(`${prefix}.${position}`)
-},renderAfter(){if(body)
-setScrollTop(body.scrollTop)
-},resultHeight:()=>Math.min(Math.max(3,Math.min(16,Math.floor(dimensions().height*0.5)-9)),Math.max(1,results().length*3 + errors().length*2)),theme
+},setSelectedID,resultHeight:()=>Math.min(Math.max(3,Math.min(16,Math.floor(dimensions().height*0.5)-9)),Math.max(1,results().length*3 + errors().length*2)),theme
 }}
 
 
@@ -3367,7 +3492,7 @@ _$effect((_$p)=>_$setProp(_el$2,"fg",model.theme().error,_$p))
 return _el$2
 })()
 }),null)
-_$insert(_el$,_$createComponent(Show2,{get when(){return model.results().length
+_$insert(_el$,_$createComponent(Show3,{get when(){return model.results().length
 },get fallback(){return(()=>{var _el$8=_$createElement("text"),_el$9=_$createTextNode(` `)
 _$insertNode(_el$8,_el$9)
 _$insert(_el$8,()=>model.icons.icon(model.loading()?"pending":"search"),_el$9)
@@ -3375,20 +3500,18 @@ _$insert(_el$8,()=>model.loading()?"Loading sources\u2026":"No matching results"
 _$effect((_$p)=>_$setProp(_el$8,"fg",model.theme().textMuted,_$p))
 return _el$8
 })()
-},get children(){return _$createComponent(Show2,{keyed:true,get when(){return model.queryScope()
+},get children(){return _$createComponent(Show3,{keyed:true,get when(){return model.queryScope()
 },children:(_scope)=>_$createComponent(For3,{get each(){return model.results().map((item)=>item.id)
 },children:(id)=>_$createComponent(SearchResultRow,{model,id
 })
 })
 })
 }}),null)
-_$effect((_p$)=>{var _v$=`${model.prefix}.results`,{renderBefore:_v$2,renderAfter:_v$3}=model,_v$4=model.resultHeight()
+_$effect((_p$)=>{var _v$=`${model.prefix}.results`,_v$2=model.resultHeight()
 _v$!==_p$.e&&(_p$.e=_$setProp(_el$,"id",_v$,_p$.e))
-_v$2!==_p$.t&&(_p$.t=_$setProp(_el$,"renderBefore",_v$2,_p$.t))
-_v$3!==_p$.a&&(_p$.a=_$setProp(_el$,"renderAfter",_v$3,_p$.a))
-_v$4!==_p$.o&&(_p$.o=_$setProp(_el$,"height",_v$4,_p$.o))
+_v$2!==_p$.t&&(_p$.t=_$setProp(_el$,"height",_v$2,_p$.t))
 return _p$
-},{e:undefined,t:undefined,a:undefined,o:undefined
+},{e:undefined,t:undefined
 })
 return _el$
 })()
@@ -3435,9 +3558,9 @@ createEffect7(()=>{const key=props.preferences.searchKey()
 const remove=props.api.keymap.registerLayer({mode:"base",bindings:[{key,cmd:SEARCH_COMMAND
 }]
 })
-onCleanup7(remove)
+onCleanup9(remove)
 })
-onCleanup7(()=>{isDisposed=true
+onCleanup9(()=>{isDisposed=true
 unregister()
 for(const timer of timers)
 clearTimeout(timer)
@@ -3474,21 +3597,6 @@ return value&&valid()&&!blocked()?controller.applyPreset(name,value,target):unde
 
 
 
-var defaults={todo:true,lsp:true}
-var capabilities=new WeakMap
-function setHostCapabilities(api,value){capabilities.set(api,value)
-}
-function hostCapabilities(api){return capabilities.get(api)??defaults
-}
-function hostCapabilityUnavailable(api,section){return section==="todo"||section==="lsp"?hostCapabilities(api).unavailable?.[section]:undefined
-}
-function supportsSidebarSection(api,section){const current=hostCapabilities(api)
-return section!=="todo"&&section!=="lsp"?true:current[section]
-}
-function supportsTitleVisibility(api){return hostCapabilities(api).titleVisibility!==false
-}
-function supportsPermissionMode(api){return hostCapabilities(api).permissionMode!==false
-}
 var ONBOARDING_STEPS=[{title:"A control center that stays compact",summary:"Navigator brings session state, search, and controls into OpenCode's existing sidebar.",icon:"help",features:[{icon:"sections",title:"Progressive disclosure",description:"Expand only the context you need right now."},{icon:"scope",title:"Current context",description:"Follow the active session, workspace, and worktree."},{icon:"actions",title:"Mouse and keyboard",description:"Use the same controls with either input method."}]
 },{title:"Stay oriented while agents work",summary:"Keep current work visible without turning the sidebar into another dashboard.",icon:"todo",features:[{icon:"todo",title:"Todo filters",description:"Separate active, finished, and cancelled work."},{icon:"subagents",title:"Live subagents",description:"See running, retrying, recent, and failed child sessions; open them directly."
 },{icon:"info",title:"Provider limits",description:"Link a matching Codex account for model quotas and confirmed banked resets."
@@ -3668,8 +3776,8 @@ return _el$
 }
 function FirstRunWizard(props){const icons=useIcons()
 const dialogs=useDialogs(props.api)
-const [active,setActive]=createSignal14(0)
-const [step,setStep]=createSignal14(0)
+const [active,setActive]=createSignal13(0)
+const [step,setStep]=createSignal13(0)
 const theme=()=>props.api.theme.current
 const sections=SECTION_DEFINITIONS.filter((section)=>supportsSidebarSection(props.api,section.name))
 const finishIndex=sections.length
@@ -3710,7 +3818,7 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"return",cmd:`${PLUGIN_ID}.wizard.select`
 }]
 })
-onCleanup8(unregister)
+onCleanup10(unregister)
 return _$createComponent(DialogSurface,{get api(){return props.api
 },get children(){return [(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` Navigator setup`),_el$4=_$createElement("text"),_el$5=_$createTextNode(`Step `),_el$6=_$createTextNode(`/`),_el$7=_$createTextNode(` \xB7 `)
 _$insertNode(_el$,_el$2)
@@ -3737,7 +3845,7 @@ return _p$
 },{e:undefined,t:undefined,a:undefined
 })
 return _el$
-})(),_$createComponent(Show3,{get when(){return configuring()
+})(),_$createComponent(Show4,{get when(){return configuring()
 },get fallback(){return _$createComponent(OnboardingStep,{get api(){return props.api
 },get preferences(){return props.preferences
 },get step(){return ONBOARDING_STEPS[step()]
@@ -3794,7 +3902,7 @@ _$insertNode(_el$,_el$6)
 _$setProp(_el$,"flexDirection","row")
 _$setProp(_el$,"justifyContent","space-between")
 _$setProp(_el$2,"flexGrow",1)
-_$insert(_el$2,_$createComponent(Show4,{get when(){return props.onRefresh
+_$insert(_el$2,_$createComponent(Show5,{get when(){return props.onRefresh
 },get children(){var _el$3=_$createElement("text"),_el$4=_$createTextNode(` Refresh (`),_el$5=_$createTextNode(`)`)
 _$insertNode(_el$3,_el$4)
 _$insertNode(_el$3,_el$5)
@@ -3855,9 +3963,9 @@ return _el$
 function PresetPreviewFrame(props){const icons=useIcons()
 const dialogs=useDialogs(props.api)
 const theme=()=>props.api.theme.current
-const dimensions=useTerminalDimensions4()
+const dimensions=useTerminalDimensions6()
 const scroll=useDialogScroll()
-const [active,setActive]=createSignal15("apply")
+const [active,setActive]=createSignal14("apply")
 let body
 const prefix=`${PLUGIN_ID}.preset-preview`
 function activate(action){if(!props.valid()){dialogs.close()
@@ -3886,7 +3994,7 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 },{key:"ctrl+r",cmd:`${prefix}.refresh`
 }]
 })
-onCleanup9(unregister)
+onCleanup11(unregister)
 createEffect8(()=>{if(!props.valid())
 dialogs.close()
 })
@@ -3926,15 +4034,9 @@ _$setProp(_el$5,"contentOptions",{minHeight:0
 })
 _$setProp(_el$6,"gap",1)
 _$insert(_el$6,()=>props.children)
-_$effect((_p$)=>{var{restore:_v$3,save:_v$4}=scroll,_v$5=Math.min(Math.max(2,Math.floor(dimensions().height*0.75)-14),Math.max(1,props.rowCount*3-1))
-_v$3!==_p$.e&&(_p$.e=_$setProp(_el$5,"renderBefore",_v$3,_p$.e))
-_v$4!==_p$.t&&(_p$.t=_$setProp(_el$5,"renderAfter",_v$4,_p$.t))
-_v$5!==_p$.a&&(_p$.a=_$setProp(_el$5,"height",_v$5,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
+_$effect((_$p)=>_$setProp(_el$5,"height",Math.min(Math.max(2,Math.floor(dimensions().height*0.75)-14),Math.max(1,props.rowCount*3-1)),_$p))
 return _el$5
-})(),_$createComponent(Show5,{get when(){return props.blocked||props.notice
+})(),_$createComponent(Show6,{get when(){return props.blocked||props.notice
 },get children(){var _el$7=_$createElement("box"),_el$8=_$createElement("text"),_el$9=_$createElement("text")
 _$insertNode(_el$7,_el$8)
 _$insertNode(_el$7,_el$9)
@@ -3946,9 +4048,9 @@ _$setProp(_el$9,"flexGrow",1)
 _$setProp(_el$9,"wrapMode","word")
 _$setProp(_el$9,"height",2)
 _$insert(_el$9,()=>props.blocked||props.notice)
-_$effect((_p$)=>{var _v$6=props.blocked?theme().warning:theme().accent,_v$7=props.blocked?theme().warning:theme().textMuted
-_v$6!==_p$.e&&(_p$.e=_$setProp(_el$8,"fg",_v$6,_p$.e))
-_v$7!==_p$.t&&(_p$.t=_$setProp(_el$9,"fg",_v$7,_p$.t))
+_$effect((_p$)=>{var _v$3=props.blocked?theme().warning:theme().accent,_v$4=props.blocked?theme().warning:theme().textMuted
+_v$3!==_p$.e&&(_p$.e=_$setProp(_el$8,"fg",_v$3,_p$.e))
+_v$4!==_p$.t&&(_p$.t=_$setProp(_el$9,"fg",_v$4,_p$.t))
 return _p$
 },{e:undefined,t:undefined
 })
@@ -4146,78 +4248,159 @@ dialogs.open(()=>_$createComponent(SelectionMenu,{api,title:"MCP presets",get op
 
 
 
+var Content=lazy3(async ()=>{const path=import.meta.url.includes("/dist/")?"./sidebar-settings.js":"./settings-dialog-content"
+const module=await import(path)
+return{default:module.SettingsDialog
+}})
+function SettingsDialog(props){return(()=>{var _el$=_$createElement("box")
+_$insert(_el$,_$createComponent(Suspense3,{get children(){return _$createComponent(Content,props)
+}}))
+return _el$
+})()
+}
+function openSettings(api,preferences,activeValue,mcp,skills){createDialogStack(api,preferences.lspIconStyle,()=>true,preferences.cornerFont).open(()=>_$createComponent(SettingsDialog,{api,preferences,mcp,skills,activeValue
+}),"xlarge")
+}
 
 
+async function load(input){const path=import.meta.url.includes("/dist/")?"./toolbar-settings.js":"./open-toolbar"
+try{return await import(path)
+} catch(error){input.api.ui.toast({variant:"error",title:"Toolbar",message:String(error)})
+return
+}}
+async function openToolbarManager(input){const route=JSON.stringify(input.api.route.current)
+const target=input.skills?.target().key
+const wasOpen=input.api.ui.dialog.open
+const module=await load(input)
+if(route===JSON.stringify(input.api.route.current)&&target===input.skills?.target().key&&(!wasOpen||input.api.ui.dialog.open)&&!input.api.lifecycle?.signal?.aborted)
+module?.openToolbarManager(input)
+}
+async function openToolbarPin(input){const route=JSON.stringify(input.api.route.current)
+const target=input.skills?.target().key
+const wasOpen=input.api.ui.dialog.open
+const module=await load(input)
+if(route===JSON.stringify(input.api.route.current)&&target===input.skills?.target().key&&(!wasOpen||input.api.ui.dialog.open)&&!input.api.lifecycle?.signal?.aborted)
+module?.openToolbarPin(input)
+}
+function SettingsBinding(props){const unregister=props.api.keymap.registerLayer({mode:"base",commands:[{name:`${PLUGIN_ID}.settings`,title:"Navigator settings",category:"Navigator",namespace:"palette",enabled:()=>["home","session"].includes(props.api.route.current.name),run:()=>openSettings(props.api,props.preferences,undefined,props.mcp,props.skills)
+},{name:`${PLUGIN_ID}.toolbar`,title:"Manage pinned toolbar",category:"Navigator",namespace:"palette",enabled:()=>["home","session"].includes(props.api.route.current.name),run:()=>{openToolbarManager(props)
+}}],bindings:[{key:{name:",",ctrl:true
+},cmd:`${PLUGIN_ID}.settings`
+}]
+})
+onCleanup13(unregister)
+return _$createElement("box")
+}
 
 
+function PermissionModeBinding(props){let applying=false
+let observed
+createEffect11(()=>{if(!props.preferences.ready())
+return
+const preferred=props.preferences.autoApprovePermissions()
+const current=currentPermissionMode(props.api)
+observed=current
+if(preferred===undefined||current===undefined||current===preferred)
+return
+applying=true
+try{props.api.keymap.dispatchCommand("permission.mode")
+observed=currentPermissionMode(props.api)
+} finally{applying=false
+}})
+const unsubscribe=props.api.keymap.on?.("state",()=>{if(applying||!props.preferences.ready())
+return
+const current=currentPermissionMode(props.api)
+if(current===undefined||current===observed)
+return
+observed=current
+props.preferences.setAutoApprovePermissions(current)
+})
+if(unsubscribe)
+onCleanup14(unsubscribe)
+return _$createElement("box")
+}
 
 
 
+function SettingsFooterButton(props){const icons=useIcons()
+const [hovered,setHovered]=createSignal15(false)
+const theme=()=>props.api.theme.current
+return _$createComponent(IconControl,{id:`${PLUGIN_ID}.settings.footer`,get icon(){return icons.icon("settings")
+},get foregroundColor(){return _$memo(()=>!!hovered())()?theme().text:theme().textMuted
+},get backgroundColor(){return _$memo(()=>!!hovered())()?theme().backgroundElement:theme().backgroundPanel
+},onMouseOver:()=>setHovered(true),onMouseOut:()=>setHovered(false),onMouseUp:()=>openSettings(props.api,props.preferences,undefined,props.mcp,props.skills)
+})
+}
 
 
 
-function behaviorSettingsOptions(api,preferences,icons){const permission=preferences.autoApprovePermissions()
-const permissionDescription=permission?"on for new sessions":"off for new sessions"
-return [...supportsPermissionMode(api)?[{title:`${icons.icon(permission === true ? "checked" : "unchecked")} Default auto-approve permissions`,value:"auto_approve_permissions",description:permission===undefined?"follow OpenCode startup mode":permissionDescription
-}]:[],{title:`${icons.icon(preferences.selectedStartInChat() ? "checked" : "unchecked")} Start new sessions in chat`,value:"start_in_chat",description:preferences.selectedStartInChat()?"skip Home \xB7 on":"show Home \xB7 off"
-},{title:`${icons.icon(preferences.selectedPersistMcp() ? "checked" : "unchecked")} Remember MCP states`,value:"persist_mcp",description:preferences.selectedPersistMcp()?"on":"off"
-},{title:`${icons.icon("settings")} Icon style`,value:"lsp_icon_style",description:preferences.selectedLspIconStyle()==="nerd"?"Nerd Font":"Text fallback"
-},{title:`${icons.icon(preferences.selectedCornerFont() ? "checked" : "unchecked")} Multiline corner font`,value:"corner_font",description:preferences.selectedCornerFont()?"Installed":"Not installed \xB7 rectangular highlights"
-},{title:`${icons.icon("sections")} Row density`,value:"row_density",description:preferences.selectedRowDensity()==="compact"?"Compact":"Comfortable"
-},{title:`${icons.icon("sections")} Sidebar shortcut`,value:"toggle_key",description:preferences.selectedToggleKey()
-},{title:`${icons.icon("selected")} Focus shortcut`,value:"focus_key",description:preferences.selectedFocusKey()
-},{title:`${icons.icon("search")} Search Everything shortcut`,value:"search_key",description:preferences.selectedSearchKey?.()??DEFAULT_SEARCH_KEY
-},{title:`${icons.icon("retry")} Limits refresh interval`,value:"limits_refresh",description:`${preferences.selectedLimitsRefreshMinutes()} min \xB7 minimum 1 min`
-}]
-}
-function titleVisibilityOptions(api,preferences,icons){if(!supportsTitleVisibility(api))
-return []
-const title=preferences.selectedShowSessionTitle()
-const date=preferences.selectedShowSessionDate()
-return [{title:`${icons.icon(title ? "checked" : "unchecked")} Session title`,value:"session_title",description:title?"visible":"hidden"
-},{title:`${icons.icon(date ? "checked" : "unchecked")} Creation date`,value:"session_date",description:date?"visible":"hidden"
+var ACTIONS=[{key:"h",label:"Toggle sidebar",icon:"sections",group:"navigate",command:"session.sidebar.toggle",section:undefined
+},{key:"t",label:"Todo",icon:"todo",group:"navigate",command:`${PLUGIN_ID}.focus.todo`,section:"todo"},{key:"a",label:"Subagents",icon:"subagents",group:"navigate",command:`${PLUGIN_ID}.focus.subagents`,section:"subagents"
+},{key:"s",label:"Skills",icon:"skills",group:"navigate",command:`${PLUGIN_ID}.focus.skills`,section:"skills"
+},{key:"q",label:"Quick actions",icon:"actions",group:"navigate",command:`${PLUGIN_ID}.focus.quick_actions`,section:"quick_actions"
+},{key:"l",label:"LSP",icon:"lsp",group:"navigate",command:`${PLUGIN_ID}.focus.lsp`,section:"lsp"},{key:"m",label:"MCP",icon:"mcp",group:"navigate",command:`${PLUGIN_ID}.focus.mcp`,section:"mcp"},{key:"c",label:"Check update",icon:"search",group:"updates",command:`${PLUGIN_ID}.check-update`,section:undefined
+},{key:"u",label:"Update Navigator",icon:"update",group:"updates",command:`${PLUGIN_ID}.update-navigator`,section:undefined
 }]
+function sidebarShortcutActions(api){return ACTIONS.filter(({section})=>!section||supportsSidebarSection(api,section))
 }
-function createSettingsGroups(api,preferences,icons){const supportedSections=()=>SIDEBAR_SECTIONS.filter((name)=>supportsSidebarSection(api,name))
-const groups=createMemo7(()=>[{id:"scope",tab:"Scope",title:"Preference scope",options:[{title:`${icons.icon(preferences.preferenceScope() === "global" ? "radioOn" : "radioOff")} Global`,value:"scope:global",description:"applies to every worktree"
-},{title:`${icons.icon(preferences.preferenceScope() === "worktree" ? "radioOn" : "radioOff")} Current worktree`,value:"scope:worktree",description:preferences.canUseWorktreeScope()?preferences.preferenceScopeLabel():"unavailable outside a worktree"
-}]
-},{id:"presets",tab:"Presets",title:"Layout presets",options:[...Object.keys(preferences.layoutPresets()).sort((left,right)=>left.localeCompare(right)).map((name)=>({title:`${icons.icon("presets")} ${name}`,value:`preset:custom:${encodeURIComponent(name)}`,description:preferences.workspaceProfiles?.()[name]?`profile \xB7 ${preferences.workspaceProfiles()[name]}`:"enter to apply or edit"
-})),{title:`${icons.icon("add")} Save as\u2026`,value:"save_preset",description:"create a preset from the current layout"
-}]
-},{id:"sections",tab:"Sections",title:"Sections & order",options:[...titleVisibilityOptions(api,preferences,icons),...preferences.selectedSectionOrder().filter((name)=>supportsSidebarSection(api,name)).map((name,index)=>{const section=SECTION_DEFINITIONS.find((candidate)=>candidate.name===name)
-return{title:`${icons.icon(preferences.selectedSections()[section.name] ? "checked" : "unchecked")} ${index + 1}. ${icons.section(section.name)} ${section.label}`,value:section.name,description:preferences.selectedSections()[section.name]?"visible":"hidden"
-}})]
-},{id:"behavior",tab:"Behavior",title:"Behavior",options:behaviorSettingsOptions(api,preferences,icons)
-},{id:"defaults",tab:"Defaults",title:"Defaults & help",options:[{title:`${icons.icon("save")} Save current layout as default`,value:"save_layout",description:`${supportedSections().filter((name) => preferences.selectedSections()[name]).length} visible \xB7 ${supportedSections().filter((name) => preferences.selectedExpanded()[name]).length} expanded`
-},{title:`${icons.icon("export")} Copy portable settings`,value:"export_settings",description:"versioned layout and MCP JSON"
-},{title:`${icons.icon("add")} Import portable settings\u2026`,value:"import_settings",description:"preview pasted JSON before applying"
-},{title:`${icons.icon("retry")} Reload settings from file`,value:"reload_settings",description:"sync saved changes from other OpenCode sessions"
-},{title:`${icons.icon("reset")} Restore configured layout`,value:"reset_sections",description:"visibility and expansion"
-},{title:`${icons.icon("reset")} Restore configured behavior`,value:"reset_settings",description:"startup, MCP memory, icons, shortcuts, limits, actions"
-},{title:`${icons.icon("reset")} Clear remembered MCP states`,value:"reset_mcp",description:`scope: ${preferences.preferenceScopeLabel()}`
-},{title:`${icons.section("skills")} Manage trusted skills`,value:"trusted_skills",description:`${preferences.skippedSkillCount()} trusted`
-},{title:`${icons.icon("help")} Open quick setup guide`,value:"wizard",description:"tips and section settings"
-}]
-}])
-const orderedGroups=createMemo7(()=>["sections","scope","presets","behavior","defaults"].map((id)=>groups().find((group)=>group.id===id)))
-return orderedGroups
+var ENTRY_COMMAND=`${PLUGIN_ID}.sidebar-shortcuts.enter`
+var CANCEL_COMMAND=`${PLUGIN_ID}.sidebar-shortcuts.cancel`
+var MODE=`${PLUGIN_ID}.sidebar-shortcuts`
+var DEFAULT_TIMEOUT_MS=5000
+function createSidebarShortcutMode(api,options={}){const actions=sidebarShortcutActions(api)
+const [active,setActive]=createSignal16(false)
+const timeoutMs=options.timeoutMs??DEFAULT_TIMEOUT_MS
+let shortcutKey=""
+let unregisterBinding
+let unregisterMode
+let leaveMode
+let timeout
+let disposed=false
+function cancel(){if(timeout)
+clearTimeout(timeout)
+timeout=undefined
+unregisterMode?.()
+unregisterMode=undefined
+leaveMode?.()
+leaveMode=undefined
+setActive(false)
 }
-function registerSettingsKeymap(input){return input.api.keymap.registerLayer({mode:"modal",priority:1000,commands:[{name:`${PLUGIN_ID}.settings.previous`,run:()=>input.move(-1)},{name:`${PLUGIN_ID}.settings.next`,run:()=>input.move(1)},{name:`${PLUGIN_ID}.settings.select`,run:()=>input.select()},{name:`${PLUGIN_ID}.settings.groups`,run:()=>{if(input.activeGroup()!=="sections")
+function run(command){cancel()
+if(api.route.current.name!=="session"||api.ui?.dialog?.open)
 return
-if(input.options()[input.active()]?.value==="mcp")
-input.openMcpGroups()
-if(input.options()[input.active()]?.value==="skills")
-input.openSkillGroups()
-}},{name:`${PLUGIN_ID}.settings.quick-actions`,run:()=>{if(input.activeGroup()==="sections"&&input.options()[input.active()]?.value==="quick_actions")
-input.openQuickActions()
-}},{name:`${PLUGIN_ID}.settings.item-limit`,run:()=>{const section=input.options()[input.active()]?.value
-if(input.activeGroup()==="sections"&&SIDEBAR_SECTIONS.includes(section))
-input.openLimitPrompt(section)
-}},{name:`${PLUGIN_ID}.settings.previous-tab`,run:()=>input.switchGroup(-1)},{name:`${PLUGIN_ID}.settings.next-tab`,run:()=>input.switchGroup(1)},{name:`${PLUGIN_ID}.settings.move-up`,run:()=>input.reorder(input.options()[input.active()]?.value,-1)},{name:`${PLUGIN_ID}.settings.move-down`,run:()=>input.reorder(input.options()[input.active()]?.value,1)}],bindings:[{key:"up",cmd:`${PLUGIN_ID}.settings.previous`},{key:"down",cmd:`${PLUGIN_ID}.settings.next`},{key:"tab",cmd:`${PLUGIN_ID}.settings.next-tab`},{key:"shift+tab",cmd:`${PLUGIN_ID}.settings.previous-tab`},{key:"space",cmd:`${PLUGIN_ID}.settings.select`},{key:"return",cmd:`${PLUGIN_ID}.settings.select`},{key:"l",cmd:`${PLUGIN_ID}.settings.item-limit`},{key:"a",cmd:`${PLUGIN_ID}.settings.quick-actions`},{key:"g",cmd:`${PLUGIN_ID}.settings.groups`},{key:"left",cmd:`${PLUGIN_ID}.settings.move-up`},{key:"right",cmd:`${PLUGIN_ID}.settings.move-down`},{key:"shift+up",cmd:`${PLUGIN_ID}.settings.move-up`},{key:"shift+down",cmd:`${PLUGIN_ID}.settings.move-down`}]
+return api.keymap.dispatchCommand(command)
+}
+function enter(){if(disposed||api.route.current.name!=="session"||api.ui?.dialog?.open)
+return false
+cancel()
+unregisterMode=api.keymap.registerLayer({mode:MODE,priority:2000,commands:[{name:ENTRY_COMMAND,run:enter},{name:CANCEL_COMMAND,run:cancel},...actions.map(({key,command})=>({name:`${MODE}.${key}`,run:()=>run(command)
+}))],bindings:[{key:"escape",cmd:CANCEL_COMMAND},{key:shortcutKey,cmd:ENTRY_COMMAND},...actions.map(({key})=>({key,cmd:`${MODE}.${key}`}))]
 })
+leaveMode=api.mode.push(MODE)
+timeout=setTimeout(cancel,timeoutMs)
+setActive(true)
+return true
 }
+const unregisterCommands=api.keymap.registerLayer({mode:"base",commands:[{name:TOGGLE_COMMAND,title:"Toggle sidebar",category:"Navigator",namespace:"palette",enabled:()=>api.route.current.name==="session"&&!api.ui?.dialog?.open,run:()=>api.keymap.dispatchCommand("session.sidebar.toggle")
+},{name:`${LEGACY_PLUGIN_ID}.toggle`,run:()=>api.keymap.dispatchCommand("session.sidebar.toggle")
+},{name:ENTRY_COMMAND,enabled:()=>api.route.current.name==="session"&&!api.ui?.dialog?.open,run:enter
+}]
+})
+return{active,actions,bind(key){cancel()
+unregisterBinding?.()
+shortcutKey=key
+unregisterBinding=api.keymap.registerLayer({mode:"base",bindings:[{key,cmd:ENTRY_COMMAND}]
+})
+},enter,cancel,dispose(){disposed=true
+cancel()
+unregisterBinding?.()
+unregisterBinding=undefined
+unregisterCommands()
+}}}
 
+var SidebarShortcutHint=lazy4(()=>{const path=import.meta.url.includes("/dist/tui.js")?"./sidebar-shortcuts.js":"../../../sidebar-shortcuts"
+return import(path)
+});
 
 
 
@@ -4228,579 +4411,98 @@ input.openLimitPrompt(section)
 
 
 
-function openLimitsRefreshPrompt(api,preferences,dialogs){const scope=preferences.preferenceScopeLabel()
-dialogs.prompt({title:"Limits refresh interval",description:()=>(()=>{var _el$=_$createElement("text")
-_$insertNode(_el$,_$createTextNode(`Automatic refresh in minutes (minimum 1; default 5). Manual Refresh stays immediate.`))
-_$effect((_$p)=>_$setProp(_el$,"fg",api.theme.current.textMuted,_$p))
-return _el$
-})(),value:String(preferences.selectedLimitsRefreshMinutes()),onConfirm(value){if(preferences.preferenceScopeLabel()!==scope)
-throw new Error("Preference scope changed; reopen this setting")
-if(!/^\d+$/.test(value.trim()))
-throw new Error("Enter whole minutes (at least 1 minute)")
-preferences.setLimitsRefreshMinutes(Number(value))
-dialogs.back()
-}})
-}
-function createSettingsSelection(input){const dialogClosed=()=>("open" in input.api.ui.dialog)&&!input.api.ui.dialog.open
-function openLimitPrompt(section){const index=input.options().findIndex((option)=>option.value===section)
-if(index!==-1)
-input.setActive(index)
-input.dialogs.prompt({title:`${SECTION_DEFINITIONS.find((item) => item.name === section).label} item limit`,description:()=>(()=>{var _el$=_$createElement("text")
-_$insertNode(_el$,_$createTextNode(`Visible items before Show all. Enter 0 for All.`))
-_$effect((_$p)=>_$setProp(_el$,"fg",input.api.theme.current.textMuted,_$p))
-return _el$
-})(),value:String(input.preferences.selectedSectionItemLimit(section)),onConfirm(value){if(!/^\d+$/.test(value.trim()))
-throw new Error("Enter a non-negative whole number (0 for All)")
-input.preferences.setSectionItemLimit(section,Number(value))
-input.dialogs.back()
-}})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+import {realpathSync} from "fs"
+function routeKey(api){const route=api.route.current
+return `${route.name}:${"params" in route ? route.params?.sessionID ?? "" : ""}`
 }
-function openShortcut(value){const bindings={toggle_key:{title:"Sidebar shortcut",get:input.preferences.selectedToggleKey,set:input.preferences.setToggleKey
-},focus_key:{title:"Focus shortcut",get:input.preferences.selectedFocusKey,set:input.preferences.setFocusKey
-},search_key:{title:"Search Everything shortcut",get:input.preferences.selectedSearchKey,set:input.preferences.setSearchKey
+function sameLocation(left,right){function canonical(path){try{return realpathSync(path)
+} catch{return path
 }}
-const binding=bindings[value]
-input.dialogs.prompt({title:binding.title,description:()=>(()=>{var _el$3=_$createElement("text")
-_$insertNode(_el$3,_$createTextNode(`Use OpenCode key syntax, for example alt+s.`))
-_$effect((_$p)=>_$setProp(_el$3,"fg",input.api.theme.current.textMuted,_$p))
-return _el$3
-})(),value:binding.get(),onConfirm(key){binding.set(key)
-input.dialogs.back()
-}})
+return canonical(left.routing.directory)===canonical(right.routing.directory)&&left.routing.workspace===right.routing.workspace
 }
-function saveLayout(){input.preferences.saveLayoutAsDefault().then(()=>input.api.ui.toast({variant:"success",title:"Navigator settings",message:"Current layout saved as default",duration:3000
-})).catch((error)=>input.api.ui.toast({variant:"error",title:"Navigator settings",message:error instanceof Error?error.message:"Failed to save the default layout",duration:5000
-}))
+function createStartupSessionController(api,preferences){let initialized=false
+let pending=false
+let retry
+let disposed=false
+function enabled(){const location=currentLocation(api)
+return preferences.ready()&&!pending&&!api.ui.dialog.open&&preferences.startInChatForScope(location.routing.directory)
 }
-function exportSettings(){const copied=input.api.renderer.copyToClipboardOSC52(input.preferences.exportPortableSettings())
-input.api.ui.toast({variant:copied?"success":"warning",title:"Portable settings",message:copied?"Layout and MCP settings copied as JSON":"Terminal clipboard is unavailable",duration:4000
+async function start(){if(!enabled())
+return
+const location=currentLocation(api)
+const originalRoute=routeKey(api)
+pending=true
+try{const result=await api.client.session.create({directory:location.routing.directory,...location.routing.workspace&&{workspace:location.routing.workspace}},{signal:api.lifecycle.signal})
+if(result.error||!result.data)
+throw result.error??new Error("Session creation returned no session")
+if(!api.lifecycle.signal?.aborted&&routeKey(api)===originalRoute&&sameLocation(currentLocation(api),location)&&preferences.startInChatForScope(location.routing.directory)){api.route.navigate("session",{sessionID:result.data.id})
+}} catch(error){if(!api.lifecycle.signal?.aborted)
+api.ui.toast({variant:"error",title:"New session",message:error instanceof Error?error.message:"Could not create a session",duration:5000
 })
-}
-function importSettings(){const path=import.meta.url.includes("/dist/tui.js")?"./settings-import.js":"../ui/settings-import-dialog"
-import(path).then((module)=>{if(!dialogClosed())
-module.openSettingsImport(input)
-}).catch((error)=>input.api.ui.toast({variant:"error",title:"Portable settings",message:String(error)
-}))
-}
-function select(value=input.options()[input.active()]?.value){if(!value)
+} finally{pending=false
+}}
+async function initialize(){if(initialized)
+return
+initialized=true
+if(api.route.current.name!=="home")
+return
+const location=currentLocation(api)
+await preferences.load()
+if(api.route.current.name!=="home"||!sameLocation(currentLocation(api),location))
+return
+function tryStart(){if(disposed||api.route.current.name!=="home"||!sameLocation(currentLocation(api),location))
+return
+if(api.ui.dialog.open){retry=setTimeout(tryStart,200)
 return
-const index=input.options().findIndex((option)=>option.value===value)
-if(index!==-1)
-input.setActive(index)
-if(value==="scope:global"||value==="scope:worktree")
-input.preferences.setPreferenceScope(value==="scope:global"?"global":"worktree")
-else if(value.startsWith("preset:custom:"))
-input.openPreset(decodeURIComponent(value.slice("preset:custom:".length)))
-else
-switch(value){case "save_preset":{input.promptPreset()
-break
-}
-case "save_layout":{saveLayout()
-break
 }
-case "export_settings":{exportSettings()
-break
+start()
 }
-case "import_settings":{importSettings()
-break
+queueMicrotask(tryStart)
 }
-case "reload_settings":{input.preferences.reloadFromFile().then(()=>input.api.ui.toast({variant:"success",title:"Navigator settings",message:"Saved settings reloaded",duration:3000
-})).catch((error)=>input.api.ui.toast({variant:"error",title:"Navigator settings",message:error instanceof Error?error.message:"Could not reload saved settings",duration:5000
-}))
-break
+return{enabled,initialize,start,handleNewSession(){if(!enabled())
+return false
+start()
+return true
+},dispose(){disposed=true
+clearTimeout(retry)
+}}}
+
+
+function StartupSessionBinding(props){if(props.api.keymap.on){const unregister=props.api.keymap.on("dispatch",(event)=>{if(event.phase!=="binding-execute"||event.command!=="session.new")
+return
+queueMicrotask(()=>void props.controller.start())
+})
+onCleanup15(unregister)
+} else
+createEffect12(()=>{if(!props.controller.enabled())
+return
+const unregister=props.api.keymap.registerLayer({mode:"global",priority:2001,commands:[{name:"session.new",title:"New session",category:"Session",namespace:"palette",enabled:props.controller.enabled,run:()=>void props.controller.start()
+}]
+})
+onCleanup15(unregister)
+})
+onMount4(()=>void props.controller.initialize())
+onCleanup15(props.controller.dispose)
+return _$createElement("box")
 }
-case "reset_sections":{input.preferences.resetSections()
-break
-}
-case "session_title":{input.preferences.toggleSessionTitleVisibility()
-break
-}
-case "session_date":{input.preferences.toggleSessionDateVisibility()
-break
-}
-case "persist_mcp":{input.preferences.toggleMcpPersistence()
-break
-}
-case "limits_refresh":{openLimitsRefreshPrompt(input.api,input.preferences,input.dialogs)
-break
-}
-case "start_in_chat":{input.preferences.toggleStartInChat()
-break
-}
-case "auto_approve_permissions":{input.preferences.setAutoApprovePermissions(input.preferences.autoApprovePermissions()!==true)
-break
-}
-case "lsp_icon_style":{input.preferences.toggleLspIconStyle()
-break
-}
-case "corner_font":{input.preferences.toggleCornerFont()
-break
-}
-case "row_density":{input.preferences.toggleRowDensity()
-break
-}
-case "toggle_key":{openShortcut("toggle_key")
-break
-}
-case "focus_key":{openShortcut("focus_key")
-break
-}
-case "search_key":{openShortcut("search_key")
-break
-}
-case "reset_settings":{input.preferences.resetPluginSettings()
-break
-}
-case "reset_mcp":{input.preferences.resetMcpStates()
-break
-}
-case "trusted_skills":{const path=import.meta.url.includes("/dist/tui.js")?"./trusted-skills.js":"../ui/trusted-skills-dialog"
-import(path).then((module)=>{if(dialogClosed())
-return
-const{TrustedSkillsDialog
-}=module
-input.dialogs.open(()=>_$createComponent(TrustedSkillsDialog,{get api(){return input.api
-},get preferences(){return input.preferences
-}}))
-}).catch((error)=>input.api.ui.toast({variant:"error",title:"Trusted skills",message:String(error)
-}))
-break
-}
-case "wizard":{input.dialogs.open(()=>_$createComponent(FirstRunWizard,{get api(){return input.api
-},get preferences(){return input.preferences
-}}))
-break
-}
-default:{input.preferences.toggleSelectedSection(value)
-}}}
-function openQuickActions(){input.setActive(input.options().findIndex((option)=>option.value==="quick_actions"))
-const path=import.meta.url.includes("/dist/tui.js")?"./quick-actions-settings.js":"../ui/quick-actions-dialog"
-import(path).then((module)=>{if(dialogClosed())
-return
-const{QuickActionsDialog
-}=module
-input.dialogs.open(()=>_$createComponent(QuickActionsDialog,{get api(){return input.api
-},get preferences(){return input.preferences
-}}))
-}).catch((error)=>{input.api.ui.toast({variant:"error",title:"Quick actions",message:String(error),duration:4000
-})
-})
-}
-function openMcpGroups(){if(!input.mcp)
-return
-input.setActive(input.options().findIndex((option)=>option.value==="mcp"))
-const path=import.meta.url.includes("/dist/tui.js")?"./mcp-groups.js":"../ui/mcp-groups-dialog"
-import(path).then((module)=>{if(dialogClosed())
-return
-const{McpGroupsDialog
-}=module
-input.dialogs.open(()=>_$createComponent(McpGroupsDialog,{get api(){return input.api
-},get preferences(){return input.preferences
-},get mcp(){return input.mcp
-}}))
-}).catch((error)=>{input.api.ui.toast({variant:"error",title:"MCP groups",message:String(error),duration:4000
-})
-})
-}
-function openSkillGroups(){if(!input.skills)
-return
-input.setActive(input.options().findIndex((option)=>option.value==="skills"))
-const path=import.meta.url.includes("/dist/tui.js")?"./skill-groups.js":"../ui/skill-groups-dialog"
-import(path).then((module)=>{if(dialogClosed())
-return
-const{SkillGroupsDialog
-}=module
-input.dialogs.open(()=>_$createComponent(SkillGroupsDialog,{get api(){return input.api
-},get preferences(){return input.preferences
-},get skills(){return input.skills
-}}))
-}).catch((error)=>{input.api.ui.toast({variant:"error",title:"Skill groups",message:String(error),duration:4000
-})
-})
-}
-return{openLimitPrompt,openMcpGroups,openSkillGroups,openQuickActions,select
-}}
-function createSettingsDialogController(props){let body
-const theme=()=>props.api.theme.current
-const icons=useIcons()
-const dialogs=useDialogs(props.api)
-const scroll=useDialogScroll()
-const dimensions=useTerminalDimensions6()
-const bodyHeight=createMemo8(()=>Math.max(4,Math.floor(dimensions().height*0.75)-10))
-const orderedGroups=createSettingsGroups(props.api,props.preferences,icons)
-const initialGroup=orderedGroups().find((group)=>group.options.some((option)=>option.value===props.activeValue))
-const [activeGroup,setActiveGroup]=useDialogState("tab",initialGroup?.id??orderedGroups()[0].id)
-const options=createMemo8(()=>orderedGroups().find((group)=>group.id===activeGroup())?.options??[])
-const optionId=(value)=>`${PLUGIN_ID}.settings.${value}`
-const initialActive=options().findIndex((option)=>option.value===props.activeValue)
-const [active,setActive]=useDialogState("selection",Math.max(0,initialActive))
-createEffect11(()=>{if(active()>=options().length)
-setActive(Math.max(0,options().length-1))
-})
-const contentHeight=createMemo8(()=>Math.min(bodyHeight(),Math.max(1,options().length*2-1)))
-const footerHint=createMemo8(()=>{const common=`${icons.key("tab")} switch \xB7 ${icons.key("up/down")} navigate`
-if(activeGroup()==="sections")
-return `${common} \xB7 ${icons.key("enter")} toggle \xB7 l item limit${options()[active()]?.value === "quick_actions" ? " \xB7 a actions" : ""}${["mcp", "skills"].includes(options()[active()]?.value ?? "") ? " \xB7 g groups" : ""} \xB7 ${icons.key("left/right")} or ${icons.key("shift+up/down")} reorder`
-if(activeGroup()==="presets")
-return `${common} \xB7 ${icons.key("enter")} manage`
-if(activeGroup()==="behavior")
-return `${common} \xB7 ${icons.key("enter")} change`
-if(activeGroup()==="defaults")
-return `${common} \xB7 ${icons.key("enter")} run`
-return `${common} \xB7 ${icons.key("enter")} select`
-})
-onMount4(()=>{queueMicrotask(()=>{const option=options()[active()]
-if(option)
-body?.scrollChildIntoView(optionId(option.value))
-})
-})
-function move(offset){const next=(active() + offset + options().length)%options().length
-setActive(next)
-const option=options()[next]
-if(option)
-body?.scrollChildIntoView(optionId(option.value))
-}
-function switchGroup(offset){const index=orderedGroups().findIndex((group)=>group.id===activeGroup())
-const group=orderedGroups()[(index + offset + orderedGroups().length)%orderedGroups().length]
-setActiveGroup(group.id)
-setActive(0)
-queueMicrotask(()=>{const option=options()[0]
-if(option)
-body?.scrollChildIntoView(optionId(option.value))
-})
-}
-function reorder(value,direction){if(!value||!SIDEBAR_SECTIONS.includes(value))
-return
-props.preferences.moveSelectedSection(value,direction)
-queueMicrotask(()=>{const next=options().findIndex((candidate)=>candidate.value===value)
-if(next===-1)
-return
-setActive(next)
-body?.scrollChildIntoView(optionId(value))
-})
-}
-function runPresetAction(action,name){const path=import.meta.url.includes("/dist/tui.js")?"./layout-preset-actions.js":"./layout-preset-actions"
-import(path).then((module)=>{if("open" in props.api.ui.dialog&&!props.api.ui.dialog.open)
-return
-const factory=module.createLayoutPresetActions
-const actions=factory({api:props.api,preferences:props.preferences,mcp:props.mcp,dialogs
-})
-if(action==="open"&&name)
-actions.open(name)
-else
-actions.prompt()
-}).catch((error)=>props.api.ui.toast({variant:"error",title:"Layout presets",message:String(error)
-}))
-}
-const selection=createSettingsSelection({api:props.api,preferences:props.preferences,mcp:props.mcp,skills:props.skills,dialogs,options,active,setActive,openPreset:(name)=>runPresetAction("open",name),promptPreset:()=>runPresetAction("prompt")
-})
-const unregister=registerSettingsKeymap({api:props.api,active,activeGroup,options,move,switchGroup,reorder,select:selection.select,openQuickActions:selection.openQuickActions,openMcpGroups:selection.openMcpGroups,openSkillGroups:selection.openSkillGroups,openLimitPrompt:selection.openLimitPrompt
-})
-onCleanup11(unregister)
-return{active,activeGroup,contentHeight,dialogs,footerHint,icons,openLimitPrompt:selection.openLimitPrompt,openQuickActions:selection.openQuickActions,openMcpGroups:selection.openMcpGroups,openSkillGroups:selection.openSkillGroups,options,optionId,orderedGroups,reorder,select:selection.select,setActive,setActiveGroup,setBody(node){body=node
-scroll.ref(node)
-},restoreScroll:scroll.restore,saveScroll:scroll.save,theme
-}}
-
-
-
-
-
-
-
-
-
-
-function SettingsOptionRow(props){const model=props.controller
-const index=()=>model.options().findIndex((candidate)=>candidate.value===props.option.value)
-const selected=()=>model.active()===index()
-const section=()=>props.option.value
-return _$createComponent(SelectionBox,{get id(){return model.optionId(props.option.value)
-},flexDirection:"row",gap:2,paddingLeft:1,paddingRight:1,get backgroundColor(){return _$memo(()=>!!selected())()?model.theme().backgroundElement:undefined
-},onMouseOver:()=>model.setActive(index()),onMouseDown:(event)=>event.stopPropagation(),onMouseUp:(event)=>{event.stopPropagation()
-model.select(props.option.value)
-},get children(){return [(()=>{var _el$=_$createElement("text")
-_$setProp(_el$,"flexShrink",0)
-_$insert(_el$,()=>props.option.title)
-_$effect((_p$)=>{var _v$=selected()?TextAttributes15.BOLD:undefined,_v$2=model.theme().text
-_v$!==_p$.e&&(_p$.e=_$setProp(_el$,"attributes",_v$,_p$.e))
-_v$2!==_p$.t&&(_p$.t=_$setProp(_el$,"fg",_v$2,_p$.t))
-return _p$
-},{e:undefined,t:undefined
-})
-return _el$
-})(),(()=>{var _el$2=_$createElement("text")
-_$setProp(_el$2,"flexGrow",1)
-_$insert(_el$2,()=>props.option.description)
-_$effect((_$p)=>_$setProp(_el$2,"fg",model.theme().borderSubtle,_$p))
-return _el$2
-})(),_$createComponent(Show6,{get when(){return SIDEBAR_SECTIONS.includes(section())
-},get children(){var _el$3=_$createElement("box"),_el$8=_$createElement("text"),_el$9=_$createTextNode(` Items: `),_el$0=_$createElement("text"),_el$1=_$createElement("text")
-_$insertNode(_el$3,_el$8)
-_$insertNode(_el$3,_el$0)
-_$insertNode(_el$3,_el$1)
-_$setProp(_el$3,"flexDirection","row")
-_$setProp(_el$3,"flexShrink",0)
-_$setProp(_el$3,"gap",1)
-_$insert(_el$3,_$createComponent(Show6,{get when(){return props.option.value==="quick_actions"
-},get children(){var _el$4=_$createElement("text"),_el$5=_$createTextNode(` Actions`)
-_$insertNode(_el$4,_el$5)
-_$setProp(_el$4,"onMouseDown",(event)=>event.stopPropagation())
-_$setProp(_el$4,"onMouseUp",(event)=>{event.stopPropagation()
-model.openQuickActions()
-})
-_$insert(_el$4,()=>model.icons.icon("actions"),_el$5)
-_$effect((_$p)=>_$setProp(_el$4,"fg",model.theme().accent,_$p))
-return _el$4
-}}),_el$8)
-_$insert(_el$3,_$createComponent(Show6,{get when(){return props.option.value==="mcp"||props.option.value==="skills"
-},get children(){var _el$6=_$createElement("text"),_el$7=_$createTextNode(` Groups`)
-_$insertNode(_el$6,_el$7)
-_$setProp(_el$6,"onMouseDown",(event)=>event.stopPropagation())
-_$setProp(_el$6,"onMouseUp",(event)=>{event.stopPropagation()
-if(props.option.value==="skills")
-model.openSkillGroups()
-else
-model.openMcpGroups()
-})
-_$insert(_el$6,()=>model.icons.icon("sections"),_el$7)
-_$effect((_$p)=>_$setProp(_el$6,"fg",model.theme().accent,_$p))
-return _el$6
-}}),_el$8)
-_$insertNode(_el$8,_el$9)
-_$setProp(_el$8,"onMouseDown",(event)=>event.stopPropagation())
-_$setProp(_el$8,"onMouseUp",(event)=>{event.stopPropagation()
-model.openLimitPrompt(section())
-})
-_$insert(_el$8,()=>model.icons.icon("todo"),_el$9)
-_$insert(_el$8,()=>props.preferences.selectedSectionItemLimit?.(section())||"All",null)
-_$setProp(_el$0,"onMouseDown",(event)=>{event.stopPropagation()
-model.reorder(props.option.value,-1)
-})
-_$insert(_el$0,()=>model.icons.icon("up"))
-_$setProp(_el$1,"onMouseDown",(event)=>{event.stopPropagation()
-model.reorder(props.option.value,1)
-})
-_$insert(_el$1,()=>model.icons.icon("down"))
-_$effect((_p$)=>{var _v$3=model.theme().accent,_v$4=model.theme().accent,_v$5=model.theme().accent
-_v$3!==_p$.e&&(_p$.e=_$setProp(_el$8,"fg",_v$3,_p$.e))
-_v$4!==_p$.t&&(_p$.t=_$setProp(_el$0,"fg",_v$4,_p$.t))
-_v$5!==_p$.a&&(_p$.a=_$setProp(_el$1,"fg",_v$5,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
-return _el$3
-}})]
-}})
-}
-function SettingsDialog(props){const model=createSettingsDialogController(props)
-return _$createComponent(DialogSurface,{get api(){return props.api
-},get children(){return [(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("text"),_el$3=_$createTextNode(` Navigator settings`),_el$4=_$createElement("text")
-_$insertNode(_el$,_el$2)
-_$insertNode(_el$,_el$4)
-_$setProp(_el$,"flexDirection","row")
-_$setProp(_el$,"justifyContent","space-between")
-_$insertNode(_el$2,_el$3)
-_$insert(_el$2,()=>model.icons.icon("settings"),_el$3)
-_$setProp(_el$4,"onMouseDown",(event)=>event.stopPropagation())
-_$setProp(_el$4,"onMouseUp",(event)=>{event.stopPropagation()
-model.dialogs.back()
-})
-_$insert(_el$4,()=>model.icons.key("esc"))
-_$effect((_p$)=>{var _v$=TextAttributes16.BOLD,_v$2=model.theme().text,_v$3=model.theme().textMuted
-_v$!==_p$.e&&(_p$.e=_$setProp(_el$2,"attributes",_v$,_p$.e))
-_v$2!==_p$.t&&(_p$.t=_$setProp(_el$2,"fg",_v$2,_p$.t))
-_v$3!==_p$.a&&(_p$.a=_$setProp(_el$4,"fg",_v$3,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
-return _el$
-})(),(()=>{var _el$5=_$createElement("text")
-_$insertNode(_el$5,_$createTextNode(`Adjust sections and behavior. Changes apply immediately.`))
-_$effect((_$p)=>_$setProp(_el$5,"fg",model.theme().textMuted,_$p))
-return _el$5
-})(),(()=>{var _el$7=_$createElement("box")
-_$setProp(_el$7,"flexDirection","row")
-_$setProp(_el$7,"gap",1)
-_$insert(_el$7,_$createComponent(For10,{get each(){return model.orderedGroups()
-},children:(group)=>_$createComponent(Tab,{get api(){return props.api
-},get selected(){return model.activeGroup()===group.id
-},paddingLeft:1,paddingRight:1,onMouseDown:()=>{model.setActiveGroup(group.id)
-model.setActive(0)
-},get children(){return [_$memo(()=>model.icons.tab(group.id))," ",_$memo(()=>group.tab)]
-}})
-}))
-return _el$7
-})(),(()=>{var _el$8=_$createElement("scrollbox"),_el$9=_$createElement("box")
-_$insertNode(_el$8,_el$9)
-var _ref$=model.setBody
-typeof _ref$==="function"?_$use(_ref$,_el$8):model.setBody=_el$8
-_$setProp(_el$8,"id",`${PLUGIN_ID}.settings.body`)
-_$setProp(_el$8,"scrollX",false)
-_$setProp(_el$8,"verticalScrollbarOptions",{visible:true
-})
-_$setProp(_el$8,"horizontalScrollbarOptions",{visible:false
-})
-_$setProp(_el$9,"gap",1)
-_$insert(_el$9,_$createComponent(For10,{get each(){return model.options()
-},children:(option)=>_$createComponent(SettingsOptionRow,{get preferences(){return props.preferences
-},controller:model,option
-})
-}))
-_$effect((_p$)=>{var{restoreScroll:_v$4,saveScroll:_v$5}=model,_v$6=model.contentHeight()
-_v$4!==_p$.e&&(_p$.e=_$setProp(_el$8,"renderBefore",_v$4,_p$.e))
-_v$5!==_p$.t&&(_p$.t=_$setProp(_el$8,"renderAfter",_v$5,_p$.t))
-_v$6!==_p$.a&&(_p$.a=_$setProp(_el$8,"height",_v$6,_p$.a))
-return _p$
-},{e:undefined,t:undefined,a:undefined
-})
-return _el$8
-})(),(()=>{var _el$0=_$createElement("text")
-_$insert(_el$0,()=>model.footerHint())
-_$effect((_$p)=>_$setProp(_el$0,"fg",model.theme().textMuted,_$p))
-return _el$0
-})()]
-}})
-}
-function openSettings(api,preferences,activeValue,mcp,skills){createDialogStack(api,preferences.lspIconStyle,()=>true,preferences.cornerFont).open(()=>_$createComponent(SettingsDialog,{api,preferences,mcp,skills,activeValue
-}),"xlarge")
-}
-
-
-function SettingsBinding(props){const unregister=props.api.keymap.registerLayer({mode:"base",commands:[{name:`${PLUGIN_ID}.settings`,title:"Navigator settings",category:"Navigator",namespace:"palette",enabled:()=>["home","session"].includes(props.api.route.current.name),run:()=>openSettings(props.api,props.preferences,undefined,props.mcp,props.skills)
-}],bindings:[{key:{name:",",ctrl:true
-},cmd:`${PLUGIN_ID}.settings`
-}]
-})
-onCleanup12(unregister)
-return _$createElement("box")
-}
-
-
-function currentPermissionMode(api){const title=api.keymap.getCommands?.({visibility:"registered"
-}).find((command)=>command.name==="permission.mode")?.title
-if(typeof title!=="string")
-return
-if(title.startsWith("Disable auto-approve permissions"))
-return true
-return title.startsWith("Enable auto-approve permissions")?false:undefined
-}
-function PermissionModeBinding(props){let applying=false
-let observed
-createEffect12(()=>{if(!props.preferences.ready())
-return
-const preferred=props.preferences.autoApprovePermissions()
-const current=currentPermissionMode(props.api)
-observed=current
-if(preferred===undefined||current===undefined||current===preferred)
-return
-applying=true
-try{props.api.keymap.dispatchCommand("permission.mode")
-observed=currentPermissionMode(props.api)
-} finally{applying=false
-}})
-const unsubscribe=props.api.keymap.on?.("state",()=>{if(applying||!props.preferences.ready())
-return
-const current=currentPermissionMode(props.api)
-if(current===undefined||current===observed)
-return
-observed=current
-props.preferences.setAutoApprovePermissions(current)
-})
-if(unsubscribe)
-onCleanup13(unsubscribe)
-return _$createElement("box")
-}
-
-
-
-function SettingsFooterButton(props){const icons=useIcons()
-const [hovered,setHovered]=createSignal16(false)
-const theme=()=>props.api.theme.current
-return _$createComponent(IconControl,{id:`${PLUGIN_ID}.settings.footer`,get icon(){return icons.icon("settings")
-},get foregroundColor(){return _$memo(()=>!!hovered())()?theme().text:theme().textMuted
-},get backgroundColor(){return _$memo(()=>!!hovered())()?theme().backgroundElement:theme().backgroundPanel
-},onMouseOver:()=>setHovered(true),onMouseOut:()=>setHovered(false),onMouseUp:()=>openSettings(props.api,props.preferences,undefined,props.mcp,props.skills)
-})
-}
-
-
-import {realpathSync} from "fs"
-function routeKey(api){const route=api.route.current
-return `${route.name}:${"params" in route ? route.params?.sessionID ?? "" : ""}`
-}
-function sameLocation(left,right){function canonical(path){try{return realpathSync(path)
-} catch{return path
-}}
-return canonical(left.routing.directory)===canonical(right.routing.directory)&&left.routing.workspace===right.routing.workspace
-}
-function createStartupSessionController(api,preferences){let initialized=false
-let pending=false
-let retry
-let disposed=false
-function enabled(){const location=currentLocation(api)
-return preferences.ready()&&!pending&&!api.ui.dialog.open&&preferences.startInChatForScope(location.routing.directory)
-}
-async function start(){if(!enabled())
-return
-const location=currentLocation(api)
-const originalRoute=routeKey(api)
-pending=true
-try{const result=await api.client.session.create({directory:location.routing.directory,...location.routing.workspace&&{workspace:location.routing.workspace}},{signal:api.lifecycle.signal})
-if(result.error||!result.data)
-throw result.error??new Error("Session creation returned no session")
-if(!api.lifecycle.signal?.aborted&&routeKey(api)===originalRoute&&sameLocation(currentLocation(api),location)&&preferences.startInChatForScope(location.routing.directory)){api.route.navigate("session",{sessionID:result.data.id})
-}} catch(error){if(!api.lifecycle.signal?.aborted)
-api.ui.toast({variant:"error",title:"New session",message:error instanceof Error?error.message:"Could not create a session",duration:5000
-})
-} finally{pending=false
-}}
-async function initialize(){if(initialized)
-return
-initialized=true
-if(api.route.current.name!=="home")
-return
-const location=currentLocation(api)
-await preferences.load()
-if(api.route.current.name!=="home"||!sameLocation(currentLocation(api),location))
-return
-function tryStart(){if(disposed||api.route.current.name!=="home"||!sameLocation(currentLocation(api),location))
-return
-if(api.ui.dialog.open){retry=setTimeout(tryStart,200)
-return
-}
-start()
-}
-queueMicrotask(tryStart)
-}
-return{enabled,initialize,start,handleNewSession(){if(!enabled())
-return false
-start()
-return true
-},dispose(){disposed=true
-clearTimeout(retry)
-}}}
-
-
-function StartupSessionBinding(props){if(props.api.keymap.on){const unregister=props.api.keymap.on("dispatch",(event)=>{if(event.phase!=="binding-execute"||event.command!=="session.new")
-return
-queueMicrotask(()=>void props.controller.start())
-})
-onCleanup14(unregister)
-} else
-createEffect13(()=>{if(!props.controller.enabled())
-return
-const unregister=props.api.keymap.registerLayer({mode:"global",priority:2001,commands:[{name:"session.new",title:"New session",category:"Session",namespace:"palette",enabled:props.controller.enabled,run:()=>void props.controller.start()
-}]
-})
-onCleanup14(unregister)
-})
-onMount5(()=>void props.controller.initialize())
-onCleanup14(props.controller.dispose)
-return _$createElement("box")
-}
-function versionParts(value){const match=/^v?(\d+)\.(\d+)\.(\d+)(?:-([^+]+))?/.exec(value)
-return match?{numbers:match.slice(1,4).map(Number),prerelease:match[4]||undefined}:undefined
+function versionParts(value){const match=/^v?(\d+)\.(\d+)\.(\d+)(?:-([^+]+))?/.exec(value)
+return match?{numbers:match.slice(1,4).map(Number),prerelease:match[4]||undefined}:undefined
 }
 function isNewerVersion(latest,current){const next=versionParts(latest)
 const installed=versionParts(current)
@@ -4842,7 +4544,7 @@ return Bun.file(new URL("../../../../CHANGELOG.md",import.meta.url)).text()
 
 
 
-function UpgradeNotesDialog(props){const dimensions=useTerminalDimensions7()
+function UpgradeNotesDialog(props){const dimensions=useTerminalDimensions9()
 const dialogs=useDialogs(props.api)
 const icons=useIcons()
 const theme=()=>props.api.theme.current
@@ -4912,7 +4614,7 @@ return _el$8
 }
 function UpgradeNotesBinding(props){let pending
 let disposed=false
-onMount6(async ()=>{const previous=await props.preferences.claimNavigatorUpgrade(props.version)
+onMount5(async ()=>{const previous=await props.preferences.claimNavigatorUpgrade(props.version)
 if(!previous||disposed)
 return
 try{let show=function(){if(disposed||props.api.lifecycle.signal?.aborted)
@@ -4930,7 +4632,7 @@ if(entries.length===0||disposed)
 return
 show()
 } catch{}})
-onCleanup15(()=>{disposed=true
+onCleanup16(()=>{disposed=true
 clearTimeout(pending)
 })
 return _$createElement("box")
@@ -5326,7 +5028,7 @@ const colors=()=>sidebarInteractiveColors(api.theme.current,{focused:focused(),h
 const ref=(renderable)=>{unregister?.()
 unregister=interaction?.register({...descriptor,renderable})
 }
-onCleanup16(()=>unregister?.())
+onCleanup17(()=>unregister?.())
 return{ref,disabled,focused,backgroundColor:()=>colors().backgroundColor,foregroundColor:()=>colors().foregroundColor,onMouseOver:()=>setHovered(true),onMouseOut:()=>setHovered(false),select(event){interaction?.mouseSelect(descriptor.id,event)
 },activate(event){if(interaction)
 return interaction.mouseActivate(descriptor.id,event)
@@ -5362,7 +5064,7 @@ _$setProp(_el$2,"flexShrink",0)
 _$insert(_el$2,()=>lspIcon(props.id,props.iconStyle??icons.style()))
 _$effect((_$p)=>_$setProp(_el$2,"fg",item.foregroundColor(),_$p))
 return _el$2
-})(),_$createComponent(Show7,{get when(){return showName()
+})(),_$createComponent(Show10,{get when(){return showName()
 },get children(){var _el$3=_$createElement("text")
 _$setProp(_el$3,"flexShrink",0)
 _$setProp(_el$3,"wrapMode","none")
@@ -5383,7 +5085,7 @@ return _el$3
 function createListVisibility(options){const [expanded,setExpanded]=createSignal21(false)
 let previousKey
 let previousLimit
-const canToggle=createMemo10(()=>options.limit()>0&&options.items().length>options.limit())
+const canToggle=createMemo8(()=>options.limit()>0&&options.items().length>options.limit())
 createComputed(()=>{const key=options.resetKey()
 const limit=options.limit()
 const isToggle=canToggle()
@@ -5392,7 +5094,7 @@ untrack3(()=>setExpanded(false))
 previousKey=key
 previousLimit=limit
 })
-const visible=createMemo10(()=>!canToggle()||expanded()?options.items():options.items().slice(0,options.limit()))
+const visible=createMemo8(()=>!canToggle()||expanded()?options.items():options.items().slice(0,options.limit()))
 return{visible,expanded,canToggle,hiddenCount:()=>options.items().length-visible().length,showAll:()=>setExpanded(canToggle()),showLess:()=>setExpanded(false)
 }}
 
@@ -5417,7 +5119,7 @@ else
 props.visibility.showAll()
 queueMicrotask(()=>props.interaction?.select(id))
 }})
-return _$createComponent(Show8,{get when(){return props.visibility.canToggle()
+return _$createComponent(Show11,{get when(){return props.visibility.canToggle()
 },get children(){return _$createComponent(SelectionBox,{ref(r$){var _ref$=item.ref
 typeof _ref$==="function"?_ref$(r$):item.ref=r$
 },id,paddingLeft:1,paddingRight:1,get backgroundColor(){return item.backgroundColor()
@@ -5470,7 +5172,7 @@ return result + ellipsis
 function SectionHeaderControl(props){const [width,setWidth]=createSignal22()
 const control=useSidebarItem(props.api,props.interaction,{id:props.action.id,position:()=>props.position,disabled:props.action.disabled,activate:props.action.onActivate
 },()=>props.api.theme.current.accent,"control")
-createEffect14(on(()=>[props.action.label(),props.resetWidth],()=>setWidth(undefined)))
+createEffect13(on(()=>[props.action.label(),props.resetWidth],()=>setWidth(undefined)))
 const label=()=>width()===undefined||props.iconOnly?props.action.label():truncateEnd(props.action.label(),width()-2)
 return _$createComponent(SelectionBox,{ref:(node)=>control.ref(node),get id(){return props.action.id
 },get iconOnly(){return props.iconOnly
@@ -5534,7 +5236,7 @@ _$setProp(_el$7,"flexGrow",1)
 _$setProp(_el$7,"minWidth",0)
 _$setProp(_el$7,"justifyContent","flex-end")
 _$insert(_el$7,()=>props.headerControls,null)
-_$insert(_el$7,_$createComponent(Show9,{get when(){return props.headerAction
+_$insert(_el$7,_$createComponent(Show12,{get when(){return props.headerAction
 },children:(action)=>_$createComponent(SectionHeaderControl,{get api(){return props.api
 },get interaction(){return props.interaction
 },get action(){return action()
@@ -5542,7 +5244,7 @@ _$insert(_el$7,_$createComponent(Show9,{get when(){return props.headerAction
 },get position(){return{section:props.navigationSection??0,row:0,column:1
 }}})
 }),null)
-_$insert(_el$7,_$createComponent(Show9,{get when(){return props.summary
+_$insert(_el$7,_$createComponent(Show12,{get when(){return props.summary
 },get children(){var _el$8=_$createElement("text")
 _$setProp(_el$8,"wrapMode","none")
 _$setProp(_el$8,"truncate",true)
@@ -5559,25 +5261,25 @@ return _el$8
 return _el$7
 })()]
 }}),null)
-_$insert(_el$,_$createComponent(Show9,{get when(){return props.open
+_$insert(_el$,_$createComponent(Show12,{get when(){return props.open
 },get children(){return props.children
 }}),null)
 return _el$
 })()
 }
 var SectionWithHeaderAction=Section;
-function LspSection(props){const list=createMemo11(()=>[...props.api.state.lsp()].sort((a,b)=>Number(b.status==="error")-Number(a.status==="error")||a.id.localeCompare(b.id)||a.root.localeCompare(b.root)))
+function LspSection(props){const list=createMemo9(()=>[...props.api.state.lsp()].sort((a,b)=>Number(b.status==="error")-Number(a.status==="error")||a.id.localeCompare(b.id)||a.root.localeCompare(b.root)))
 const visibility=createListVisibility({items:list,limit:()=>props.preferences.sectionItemLimit?.("lsp")??0,resetKey:()=>currentLocation(props.api).key
 })
-const connected=createMemo11(()=>list().filter((item)=>item.status==="connected").length)
-const disabled=createMemo11(()=>props.api.state.config.lsp===false)
+const connected=createMemo9(()=>list().filter((item)=>item.status==="connected").length)
+const disabled=createMemo9(()=>props.api.state.config.lsp===false)
 const navigationSection=()=>props.navigationSection??5
 return _$createComponent(Section,{get api(){return props.api
 },get interaction(){return props.interaction
 },sectionId:`${PLUGIN_ID}.section.lsp`,get navigationSection(){return navigationSection()
 },title:"LSP",section:"lsp",get summary(){return `${connected()}/${list().length}`
 },get open(){return props.preferences.expanded().lsp
-},onToggle:()=>props.preferences.toggleSectionExpanded("lsp"),get children(){return [_$createComponent(Show10,{get when(){return list().length>0
+},onToggle:()=>props.preferences.toggleSectionExpanded("lsp"),get children(){return [_$createComponent(Show13,{get when(){return list().length>0
 },get fallback(){return(()=>{var _el$2=_$createElement("text")
 _$insert(_el$2,()=>disabled()?"LSP is disabled":"Activates as files are read")
 _$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
@@ -5609,25 +5311,25 @@ return _el$
 
 
 
-function createMcpSectionModel(props,query){const target=createMemo12(()=>props.controller.target())
-const favorites=createMemo12(()=>props.preferences.favoriteMcpServers?.()??new Set)
-const groups=createMemo12(()=>props.preferences.mcpServerGroups?.()??{})
-const grouped=createMemo12(()=>Object.keys(groups()).length>0)
-const list=createMemo12(()=>buildMcpGroupedView(props.controller.list(target()),favorites(),groups()))
+function createMcpSectionModel(props,query){const target=createMemo10(()=>props.controller.target())
+const favorites=createMemo10(()=>props.preferences.favoriteMcpServers?.()??new Set)
+const groups=createMemo10(()=>props.preferences.mcpServerGroups?.()??{})
+const grouped=createMemo10(()=>Object.keys(groups()).length>0)
+const list=createMemo10(()=>buildMcpGroupedView(props.controller.list(target()),favorites(),groups()))
 const groupItems=(bucket)=>list().filter((item)=>item.bucket===bucket)
-const filtered=createMemo12(()=>list().filter((item)=>matchesFilter(query(),`${item.name} ${item.assignedGroup ?? ""}`)))
+const filtered=createMemo10(()=>list().filter((item)=>matchesFilter(query(),`${item.name} ${item.assignedGroup ?? ""}`)))
 const visibility=createListVisibility({items:filtered,limit:()=>props.preferences.sectionItemLimit?.("mcp")??0,resetKey:()=>JSON.stringify([target().key,query()])
 })
-const active=createMemo12(()=>list().filter((item)=>item.status==="connected").length)
-const state=createMemo12(()=>props.controller.state(target()))
-const bulk=createMemo12(()=>props.controller.bulkState?.(target())??{action:"connect",status:"idle",completed:0,total:0,failed:[]
+const active=createMemo10(()=>list().filter((item)=>item.status==="connected").length)
+const state=createMemo10(()=>props.controller.state(target()))
+const bulk=createMemo10(()=>props.controller.bulkState?.(target())??{action:"connect",status:"idle",completed:0,total:0,failed:[]
 })
-const bulkRunning=createMemo12(()=>bulk().status==="running")
-const mutationRunning=createMemo12(()=>props.controller.mutating?.(target()))
-const connectable=createMemo12(()=>list().filter((item)=>mcpToggleAction2(item.status)==="connect").length)
-const disconnectable=createMemo12(()=>list().filter((item)=>mcpToggleAction2(item.status)==="disconnect").length)
-const errors=createMemo12(()=>list().filter((item)=>item.status==="failed"||item.status==="needs_auth"||item.status==="needs_client_registration").length)
-const presetName=createMemo12(()=>{const presets=props.preferences.mcpPresets?.()??{}
+const bulkRunning=createMemo10(()=>bulk().status==="running")
+const mutationRunning=createMemo10(()=>props.controller.mutating?.(target()))
+const connectable=createMemo10(()=>list().filter((item)=>mcpToggleAction2(item.status)==="connect").length)
+const disconnectable=createMemo10(()=>list().filter((item)=>mcpToggleAction2(item.status)==="disconnect").length)
+const errors=createMemo10(()=>list().filter((item)=>item.status==="failed"||item.status==="needs_auth"||item.status==="needs_client_registration").length)
+const presetName=createMemo10(()=>{const presets=props.preferences.mcpPresets?.()??{}
 const selected=props.controller.selectedPreset?.(target())
 return selected&&Object.hasOwn(presets,selected)?selected:matchingMcpPreset(list(),presets)
 })
@@ -5702,7 +5404,7 @@ _$insert(_el$,_$createComponent(McpBulkAction,{get api(){return props.api
 }),null)
 _$effect((_$p)=>_$setProp(_el$,"paddingBottom",model.bulkRunning()||model.bulk().status==="error"?1:0,_$p))
 return _el$
-})(),_$createComponent(Show11,{get when(){return model.bulkRunning()
+})(),_$createComponent(Show14,{get when(){return model.bulkRunning()
 },get children(){var _el$2=_$createElement("text"),_el$3=_$createTextNode(` `),_el$4=_$createTextNode(`/`),_el$5=_$createTextNode(`\u2026`)
 _$insertNode(_el$2,_el$3)
 _$insertNode(_el$2,_el$4)
@@ -5712,7 +5414,7 @@ _$insert(_el$2,()=>model.bulk().completed,_el$4)
 _$insert(_el$2,()=>model.bulk().total,_el$5)
 _$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
 return _el$2
-}}),_$createComponent(Show11,{get when(){return model.bulk().status==="error"
+}}),_$createComponent(Show14,{get when(){return model.bulk().status==="error"
 },get children(){return _$createComponent(McpBulkAction,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.mcp.retry-all`,get position(){return{section:props.navigationSection,row:3,column:0
@@ -5792,7 +5494,7 @@ return _el$4
 function RequestErrorRow(props){const icons=useIcons()
 const item=useSidebarItem(props.api,props.interaction,{id:props.id,position:()=>props.position,disabled:()=>!props.state.error?.retryable||props.state.status==="loading"||props.state.status==="refreshing",activate:props.onRetry
 })
-return _$createComponent(Show12,{get when(){return props.state.error
+return _$createComponent(Show15,{get when(){return props.state.error
 },children:(error)=>_$createComponent(SelectionBox,{ref:(node)=>item.ref(node),get id(){return props.id
 },flexDirection:"row",gap:1,paddingLeft:1,paddingRight:1,get backgroundColor(){return item.backgroundColor()
 },get onMouseOver(){return item.onMouseOver
@@ -5807,7 +5509,7 @@ _$insert(_el$,()=>icons.icon("error"),_el$2)
 _$insert(_el$,()=>error().message,null)
 _$effect((_$p)=>_$setProp(_el$,"fg",item.focused()?item.foregroundColor():props.api.theme.current.error,_$p))
 return _el$
-})(),_$createComponent(Show12,{get when(){return error().retryable
+})(),_$createComponent(Show15,{get when(){return error().retryable
 },get children(){var _el$3=_$createElement("text"),_el$4=_$createTextNode(` Retry`)
 _$insertNode(_el$3,_el$4)
 _$setProp(_el$3,"flexShrink",0)
@@ -5822,7 +5524,7 @@ function SectionRequestBody(props){const icons=useIcons()
 const pending=()=>props.state.status==="loading"
 return(()=>{var _el$5=_$createElement("box")
 _$insert(_el$5,_$createComponent(RequestErrorRow,props),null)
-_$insert(_el$5,_$createComponent(Show12,{get when(){return _$memo(()=>!!pending())()&&!props.hasItems
+_$insert(_el$5,_$createComponent(Show15,{get when(){return _$memo(()=>!!pending())()&&!props.hasItems
 },get children(){var _el$6=_$createElement("text"),_el$7=_$createTextNode(` `)
 _$insertNode(_el$6,_el$7)
 _$insert(_el$6,()=>icons.icon("pending"),_el$7)
@@ -5830,10 +5532,10 @@ _$insert(_el$6,()=>props.loading,null)
 _$effect((_$p)=>_$setProp(_el$6,"fg",props.api.theme.current.textMuted,_$p))
 return _el$6
 }}),null)
-_$insert(_el$5,_$createComponent(Show12,{get when(){return props.hasItems
+_$insert(_el$5,_$createComponent(Show15,{get when(){return props.hasItems
 },get children(){return props.children
 }}),null)
-_$insert(_el$5,_$createComponent(Show12,{get when(){return _$memo(()=>!!((props.state.status==="ready"||props.state.status==="refreshing")&&!props.hasItems))()&&!props.state.error
+_$insert(_el$5,_$createComponent(Show15,{get when(){return _$memo(()=>!!((props.state.status==="ready"||props.state.status==="refreshing")&&!props.hasItems))()&&!props.state.error
 },get children(){var _el$8=_$createElement("text"),_el$9=_$createTextNode(` `)
 _$insertNode(_el$8,_el$9)
 _$insert(_el$8,()=>icons.icon("info"),_el$9)
@@ -5988,7 +5690,7 @@ props.interaction.leaveFilter(input)
 else
 input?.blur()
 }
-onCleanup17(()=>unregisterInput?.())
+onCleanup18(()=>unregisterInput?.())
 return _$createComponent(SelectionBox,{ref:(node)=>item.ref(node),get id(){return props.id
 },flexDirection:"row",gap:1,marginTop:1,marginBottom:1,paddingLeft:1,paddingRight:1,get backgroundColor(){return _$memo(()=>!!highlighted())()?theme().primary:item.backgroundColor()
 },get onMouseOver(){return item.onMouseOver
@@ -6026,7 +5728,7 @@ return _p$
 },{e:undefined,t:undefined,a:undefined,o:undefined,i:undefined,n:undefined,s:undefined,h:undefined
 })
 return _el$2
-})(),_$createComponent(Show13,{get when(){return props.query
+})(),_$createComponent(Show16,{get when(){return props.query
 },get children(){var _el$3=_$createElement("text")
 _$setProp(_el$3,"flexShrink",0)
 _$setProp(_el$3,"onMouseDown",()=>props.onInput(""))
@@ -6055,7 +5757,7 @@ _$insert(_el$,_$createComponent(SectionFilter,{get api(){return props.api
 }},get query(){return props.query
 },placeholder:"Filter MCP...",get onInput(){return props.onQuery
 }}),null)
-_$insert(_el$,_$createComponent(Show14,{get when(){return model.filtered().length>0
+_$insert(_el$,_$createComponent(Show17,{get when(){return model.filtered().length>0
 },get fallback(){return(()=>{var _el$2=_$createElement("text")
 _$insertNode(_el$2,_$createTextNode(`No matching MCP servers`))
 _$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
@@ -6066,7 +5768,7 @@ return _el$2
 },get grouped(){return model.grouped
 },get density(){return props.preferences.rowDensity?.()??"compact"
 },get children(){return _$createComponent(For13,{get each(){return model.visibility.visible()
-},children:(item,index)=>[_$createComponent(Show14,{get when(){return _$memo(()=>!!model.grouped())()&&(index()===0||model.visibility.visible()[index()-1]?.bucket!==item.bucket)
+},children:(item,index)=>[_$createComponent(Show17,{get when(){return _$memo(()=>!!model.grouped())()&&(index()===0||model.visibility.visible()[index()-1]?.bucket!==item.bucket)
 },get children(){return _$createComponent(McpGroupHeader,{get api(){return props.api
 },get interaction(){return props.interaction
 },get bucket(){return item.bucket
@@ -6100,7 +5802,7 @@ function McpSection(props){const icons=useIcons()
 const [query,setQuery]=createSignal26("")
 const model=createMcpSectionModel(props,query)
 const navigationSection=()=>props.navigationSection??6
-const summary=createMemo13(()=>`${model.active()}/${model.list().length}${model.errors() ? ` \xB7 ${model.errors()} ${icons.icon("error")}` : ""}`)
+const summary=createMemo11(()=>`${model.active()}/${model.list().length}${model.errors() ? ` \xB7 ${model.errors()} ${icons.icon("error")}` : ""}`)
 return _$createComponent(SectionWithHeaderAction,{get api(){return props.api
 },get interaction(){return props.interaction
 },sectionId:`${PLUGIN_ID}.section.mcp`,get navigationSection(){return navigationSection()
@@ -6198,17 +5900,52 @@ return _$createComponent(SectionWithHeaderAction,{get api(){return props.api
 
 
 
+
+
+
+var ToolbarContext=createContext4()
+var useToolbar=()=>useContext4(ToolbarContext)
+function ToolbarProvider(props){const value={pinned:(pin)=>Boolean(props.preferences.toolbarPins?.().some((item)=>toolbarPinKey(item)===toolbarPinKey(pin))),configure:(pin,dialogs)=>{if(pin.kind==="skill"&&!pin.location){props.api.ui.toast({variant:"warning",title:"Toolbar",message:"This Skill has no host-provided source location"
+})
+return
+}
+openToolbarPin({api:props.api,preferences:props.preferences,skills:props.skills,pin,dialogs
+})
+}}
+return _$createComponent(ToolbarContext.Provider,{value,get children(){return props.children
+}})
+}
+
+function SidebarPinControl(props){const toolbar=useToolbar()
+const{api,interaction
+}=useSidebarList()
+const icons=useIcons()
+const item=useSidebarItem(api,interaction,{id:`${props.id}.pin`,position:()=>({...props.position,column:2
+}),activate:()=>toolbar?.configure(props.pin)
+},()=>toolbar?.pinned(props.pin)?api.theme.current.accent:api.theme.current.textMuted,"control")
+return _$createComponent(IconControl,{get id(){return `${props.id}.pin`
+},ref(r$){var _ref$=item.ref
+typeof _ref$==="function"?_ref$(r$):item.ref=r$
+},get icon(){return terminalIcon("pin",icons.style())
+},get backgroundColor(){return item.backgroundColor()
+},get foregroundColor(){return item.foregroundColor()
+},get onMouseOver(){return item.onMouseOver
+},get onMouseOut(){return item.onMouseOut
+},onMouseUp:(event)=>item.activate(event)
+})
+}
 function QuickActionRow(props){const{api,interaction
 }=useSidebarList()
 const icons=useIcons()
+const toolbar=useToolbar()
 const theme=()=>api.theme.current
-const [width,setWidth]=createSignal30(0)
-const shortcut=createMemo14(()=>{const bindings=api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
+const [width,setWidth]=createSignal31(0)
+const shortcut=createMemo12(()=>{const bindings=api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
 })
 return api.keys.formatBindings(bindings.get(props.action.command))
 })
-const visibleShortcut=createMemo14(()=>{const value=shortcut()
-return value&&width()>=Bun.stringWidth(props.action.label) + Bun.stringWidth(value) + 8?value:undefined
+const visibleShortcut=createMemo12(()=>{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?.())
 return
@@ -6246,7 +5983,7 @@ _$insert(_el$2,()=>props.action.label)
 _$effect((_$p)=>_$setProp(_el$2,"fg",row.foregroundColor(),_$p))
 return _el$2
 })()
-},get metadata(){return _$createComponent(Show21,{get when(){return visibleShortcut()
+},get metadata(){return _$createComponent(Show24,{get when(){return visibleShortcut()
 },children:(value)=>(()=>{var _el$3=_$createElement("text")
 _$setProp(_el$3,"flexShrink",0)
 _$setProp(_el$3,"wrapMode","none")
@@ -6255,7 +5992,12 @@ _$effect((_$p)=>_$setProp(_el$3,"fg",row.focused()?row.foregroundColor():theme()
 return _el$3
 })()
 })
-},get details(){return _$createComponent(Show21,{get when(){return props.disabled
+},get trailing(){return _$createComponent(Show24,{when:toolbar,get children(){return _$createComponent(SidebarPinControl,{get id(){return id()
+},get position(){return props.position
+},get pin(){return{kind:"action",id:props.action.command,icon:"bolt"
+}}})
+}})
+},get details(){return _$createComponent(Show24,{get when(){return props.disabled
 },children:(reason)=>(()=>{var _el$4=_$createElement("text")
 _$setProp(_el$4,"wrapMode","word")
 _$insert(_el$4,reason)
@@ -6266,7 +6008,7 @@ return _el$4
 }})
 }
 function QuickActionsSection(props){const commandRevision=createQuickActionRevision(props.api)
-const actions=createMemo15(()=>{commandRevision()
+const actions=createMemo13(()=>{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)
 }]:[]
@@ -6283,7 +6025,7 @@ return _$createComponent(Section,{get api(){return props.api
 },onToggle:()=>props.preferences.toggleSectionExpanded("quick_actions"),get children(){return [_$createComponent(SidebarRowList,{get api(){return props.api
 },get interaction(){return props.interaction
 },get density(){return props.preferences.rowDensity?.()??"compact"
-},get children(){return [_$createComponent(Show22,{get when(){return actions().length===0
+},get children(){return [_$createComponent(Show25,{get when(){return actions().length===0
 },get children(){var _el$=_$createElement("text")
 _$insertNode(_el$,_$createTextNode(`No quick actions selected`))
 _$effect((_$p)=>_$setProp(_el$,"fg",props.api.theme.current.textMuted,_$p))
@@ -6314,104 +6056,74 @@ function SectionBoundary(props){const dividerColor=()=>{const{backgroundPanel,bo
 return subtleLineColor(backgroundPanel,borderSubtle)
 }
 return(()=>{var _el$=_$createElement("box")
-_$spread(_el$,_$mergeProps(()=>props.divided?{border:["bottom"],borderColor:dividerColor(),paddingBottom:1
-}:{}),true)
-_$insert(_el$,()=>props.children)
-return _el$
-})()
-}
-
-
-function SectionTab(props){const item=useSidebarItem(props.api,props.interaction,{id:props.id,position:()=>props.position,disabled:()=>props.disabled===true,activate:props.onActivate
-})
-const focused=()=>item.focused()
-return _$createComponent(Tab,{get api(){return props.api
-},get selected(){return props.selected
-},get focused(){return _$memo(()=>!!!props.disabled)()&&focused()
-},get count(){return props.count
-},ref:(node)=>item.ref(node),get id(){return props.id
-},height:1,minWidth:0,paddingLeft:1,paddingRight:1,get backgroundColor(){return item.backgroundColor()
-},get foregroundColor(){return item.foregroundColor()
-},get onMouseOver(){return _$memo(()=>!!props.disabled)()?undefined:item.onMouseOver
-},get onMouseOut(){return _$memo(()=>!!props.disabled)()?undefined:item.onMouseOut
-},onMouseDown:(event)=>{if(!props.disabled)
-item.select(event)
-},onMouseUp:(event)=>{event.stopPropagation()
-if(!props.disabled)
-item.activate(event)
-},get children(){return props.label
-}})
-}
-
-
-var ENTRY_COMMAND=`${PLUGIN_ID}.sidebar-shortcuts.enter`
-var CANCEL_COMMAND=`${PLUGIN_ID}.sidebar-shortcuts.cancel`
-var MODE=`${PLUGIN_ID}.sidebar-shortcuts`
-var DEFAULT_TIMEOUT_MS=5000
-var ACTIONS=[{key:"h",hint:"toggle",command:"session.sidebar.toggle",section:undefined},{key:"t",hint:"todo",command:`${PLUGIN_ID}.focus.todo`,section:"todo"},{key:"a",hint:"agents",command:`${PLUGIN_ID}.focus.subagents`,section:"subagents"},{key:"s",hint:"skills",command:`${PLUGIN_ID}.focus.skills`,section:"skills"},{key:"q",hint:"actions",command:`${PLUGIN_ID}.focus.quick_actions`,section:"quick_actions"},{key:"l",hint:"LSP",command:`${PLUGIN_ID}.focus.lsp`,section:"lsp"},{key:"m",hint:"MCP",command:`${PLUGIN_ID}.focus.mcp`,section:"mcp"},{key:"c",hint:"check update",command:`${PLUGIN_ID}.check-update`,section:undefined},{key:"u",hint:"update",command:`${PLUGIN_ID}.update-navigator`,section:undefined}]
-function createSidebarShortcutMode(api,options={}){const actions=ACTIONS.filter(({section})=>!section||supportsSidebarSection(api,section))
-const hints=actions.map(({key,hint})=>`${key} ${hint}`).join(" | ")
-const timeoutMs=options.timeoutMs??DEFAULT_TIMEOUT_MS
-let shortcutKey=""
-let unregisterBinding
-let unregisterMode
-let leaveMode
-let timeout
-let disposed=false
-function cancel(){if(timeout)
-clearTimeout(timeout)
-timeout=undefined
-unregisterMode?.()
-unregisterMode=undefined
-leaveMode?.()
-leaveMode=undefined
-}
-function run(command){cancel()
-return api.keymap.dispatchCommand(command)
-}
-function enter(){if(disposed||api.route.current.name!=="session"||api.ui?.dialog?.open)
-return false
-cancel()
-unregisterMode=api.keymap.registerLayer({mode:MODE,priority:2000,commands:[{name:ENTRY_COMMAND,run:enter},{name:CANCEL_COMMAND,run:cancel},...actions.map(({key,command})=>({name:`${MODE}.${key}`,run:()=>run(command)
-}))],bindings:[{key:"escape",cmd:CANCEL_COMMAND},{key:shortcutKey,cmd:ENTRY_COMMAND},...actions.map(({key})=>({key,cmd:`${MODE}.${key}`}))]
-})
-leaveMode=api.mode.push(MODE)
-timeout=setTimeout(cancel,timeoutMs)
-api.ui?.toast?.({variant:"info",title:"Navigator shortcuts",message:`${hints} | Esc cancel`,duration:timeoutMs
+_$spread(_el$,_$mergeProps(()=>props.divided?{border:["bottom"],borderColor:dividerColor(),paddingBottom:1
+}:{}),true)
+_$insert(_el$,()=>props.children)
+return _el$
+})()
+}
+
+
+function SectionTab(props){const item=useSidebarItem(props.api,props.interaction,{id:props.id,position:()=>props.position,disabled:()=>props.disabled===true,activate:props.onActivate
 })
-return true
+const focused=()=>item.focused()
+return _$createComponent(Tab,{get api(){return props.api
+},get selected(){return props.selected
+},get focused(){return _$memo(()=>!!!props.disabled)()&&focused()
+},get count(){return props.count
+},ref:(node)=>item.ref(node),get id(){return props.id
+},height:1,minWidth:0,paddingLeft:1,paddingRight:1,get backgroundColor(){return item.backgroundColor()
+},get foregroundColor(){return item.foregroundColor()
+},get onMouseOver(){return _$memo(()=>!!props.disabled)()?undefined:item.onMouseOver
+},get onMouseOut(){return _$memo(()=>!!props.disabled)()?undefined:item.onMouseOut
+},onMouseDown:(event)=>{if(!props.disabled)
+item.select(event)
+},onMouseUp:(event)=>{event.stopPropagation()
+if(!props.disabled)
+item.activate(event)
+},get children(){return props.label
+}})
 }
-const unregisterCommands=api.keymap.registerLayer({mode:"base",commands:[{name:TOGGLE_COMMAND,title:"Toggle sidebar",category:"Navigator",namespace:"palette",enabled:()=>api.route.current.name==="session"&&!api.ui?.dialog?.open,run:()=>api.keymap.dispatchCommand("session.sidebar.toggle")
-},{name:`${LEGACY_PLUGIN_ID}.toggle`,run:()=>api.keymap.dispatchCommand("session.sidebar.toggle")
-},{name:ENTRY_COMMAND,enabled:()=>api.route.current.name==="session"&&!api.ui?.dialog?.open,run:enter
-}]
+
+
+
+
+
+
+function SidebarToggleBinding(props){const shortcuts=createSidebarShortcutMode(props.api)
+createEffect15(()=>{const key=props.preferences.toggleKey()
+untrack6(()=>shortcuts.bind(key))
 })
-return{active:()=>leaveMode!==undefined,bind(key){cancel()
-unregisterBinding?.()
-shortcutKey=key
-unregisterBinding=api.keymap.registerLayer({mode:"base",bindings:[{key,cmd:ENTRY_COMMAND}]
+createEffect15(()=>{if(shortcuts.active()&&(props.api.route.current.name!=="session"||props.api.ui.dialog.open||props.api.mode.current()==="modal"))
+untrack6(shortcuts.cancel)
 })
-},enter,cancel,dispose(){disposed=true
-cancel()
-unregisterBinding?.()
-unregisterBinding=undefined
-unregisterCommands()
-}}}
-function SidebarToggleBinding(props){const shortcuts=createSidebarShortcutMode(props.api)
-createEffect16(()=>shortcuts.bind(props.preferences.toggleKey()))
-onCleanup18(shortcuts.dispose)
-return _$createElement("box")
+onCleanup19(shortcuts.dispose)
+return(()=>{var _el$=_$createElement("box")
+_$setProp(_el$,"position","absolute")
+_$setProp(_el$,"top",0)
+_$setProp(_el$,"left",0)
+_$setProp(_el$,"width","100%")
+_$setProp(_el$,"height","100%")
+_$insert(_el$,_$createComponent(Show26,{get when(){return shortcuts.active()
+},get children(){return _$createComponent(Suspense4,{get children(){return _$createComponent(SidebarShortcutHint,{get api(){return props.api
+},get actions(){return shortcuts.actions
+}})
+}})
+}}))
+_$effect((_$p)=>_$setProp(_el$,"visible",shortcuts.active(),_$p))
+return _el$
+})()
 }
 function SidebarFocusBinding(props){const commands=props.interaction.baseCommands()
 const unregisterCommands=props.api.keymap.registerLayer({commands:[...commands,...commands.map(({name,run,enabled
 })=>({name:name.replace(PLUGIN_ID,()=>LEGACY_PLUGIN_ID),run,enabled
 }))]
 })
-onCleanup18(unregisterCommands)
-createEffect16(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
+onCleanup19(unregisterCommands)
+createEffect15(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
 }]
 })
-onCleanup18(unregister)
+onCleanup19(unregister)
 })
 return _$createElement("box")
 }
@@ -6431,6 +6143,154 @@ return _$createElement("box")
 
 
 
+function toolbarLayout(keys,width,mode){const columns=Math.max(1,Math.floor((Math.max(3,width) + 1) / 4))
+const shown=mode==="wrap"||keys.length<=columns?keys.length:Math.max(0,columns-1)
+const visible=keys.slice(0,shown)
+const overflow=keys.slice(shown)
+const controls=[...visible,...overflow.length>0?["toolbar:more"]:[]]
+return{columns,overflow,rows:Array.from({length:Math.ceil(controls.length / columns)},(_,row)=>controls.slice(row*columns,(row + 1)*columns))
+}}
+
+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())
+createEffect16(()=>{if(!needsSkills())
+return
+const current=target()
+const release=untrack7(()=>props.skills.activate(current))
+onCleanup20(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,icon:state?pin.stateIcons?.[state]??pin.icon:pin.icon,reason:quickActionDisabledReason(props.api,action)
+}}
+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,icon:pin.icon,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
+const result=props.interaction.dispatchFromReturnTarget(pin.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)
+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}}
+
+
+
+function ToolbarButton(props){const icons=useIcons()
+const [hovered,setHovered]=createSignal32(false)
+const item=useSidebarItem(props.api,props.interaction,{id:props.id,position:()=>({section:0,row:props.row + 1,column:props.column
+}),activate:props.onRun
+},()=>props.reason?props.api.theme.current.textMuted:props.api.theme.current.accent,"control")
+createEffect17(()=>props.onDetails(props.id,item.focused()||hovered()))
+onCleanup21(()=>props.onDetails(props.id,false))
+return _$createComponent(IconControl,{get id(){return props.id
+},ref(r$){var _ref$=item.ref
+typeof _ref$==="function"?_ref$(r$):item.ref=r$
+},get icon(){return terminalIcon(props.icon,icons.style())
+},get backgroundColor(){return item.backgroundColor()
+},get foregroundColor(){return _$memo(()=>!!props.reason)()?props.api.theme.current.textMuted:item.foregroundColor()
+},onMouseOver:()=>{item.onMouseOver()
+setHovered(true)
+},onMouseOut:()=>{item.onMouseOut()
+setHovered(false)
+},onMouseUp:(event)=>item.activate(event)
+})
+}
+function SidebarToolbar(props){const model=createToolbarModel(props)
+const icons=useIcons()
+const [width,setWidth]=createSignal33(3)
+const [detail,setDetail]=createSignal33()
+const keys=createMemo15(()=>model.pins().map((pin)=>toolbarPinKey(pin)))
+const layout=createMemo15(()=>toolbarLayout(keys(),width(),props.preferences.toolbarOverflow?.()??"menu"))
+const rows=createMemo15(()=>layout().rows.map((_,index)=>index))
+const byKey=createMemo15(()=>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")
+return "More pinned actions and Skills"
+const item=view(detail()??"")
+return item?[item.label,item.stateLabel,item.reason].filter(Boolean).join(" \xB7 "):undefined
+})
+function showMore(){const route=JSON.stringify(props.api.route.current)
+const dialogs=createDialogStack(props.api,icons.style,()=>route===JSON.stringify(props.api.route.current),icons.multilineCorners)
+dialogs.open(()=>_$createComponent(SelectionMenu,{get api(){return props.api
+},title:"More pinned buttons",height:16,get options(){return layout().overflow.flatMap((key)=>{const item=view(key)
+return item?[{title:item.label,value:key,description:item.reason??item.stateLabel??"Run pinned item"
+}]:[]
+})
+},onSelect:(option)=>{if(view(option.value)?.reason){model.run(option.value)
+return
+}
+dialogs.close()
+model.run(option.value)
+}}))
+}
+return _$createComponent(Show27,{get when(){return keys().length>0
+},get children(){var _el$=_$createElement("box")
+_$setProp(_el$,"id","opencode-navigator.toolbar")
+_$setProp(_el$,"onSizeChange",function(){setWidth(this.width)
+})
+_$insert(_el$,_$createComponent(For17,{get each(){return rows()
+},children:(row)=>(()=>{var _el$2=_$createElement("box")
+_$setProp(_el$2,"flexDirection","row")
+_$setProp(_el$2,"gap",1)
+_$insert(_el$2,_$createComponent(For17,{get each(){return layout().rows[row]
+},children:(key,column)=>_$createComponent(ToolbarButton,_$mergeProps(props,{id:`opencode-navigator.toolbar.${key}`,row,get column(){return column()
+},get label(){return view(key)?.label??"More"
+},get icon(){return key==="toolbar:more"?"list":view(key)?.icon??"bolt"
+},get reason(){return view(key)?.reason
+},onRun:()=>key==="toolbar:more"?showMore():model.run(key),onDetails:(_id,active)=>setDetail((current)=>active?key:current===key?undefined:current)
+}))
+}))
+return _el$2
+})()
+}),null)
+_$insert(_el$,_$createComponent(Show27,{get when(){return details()
+},children:(text)=>(()=>{var _el$3=_$createElement("text")
+_$setProp(_el$3,"height",1)
+_$setProp(_el$3,"truncate",true)
+_$setProp(_el$3,"wrapMode","none")
+_$insert(_el$3,text)
+_$effect((_$p)=>_$setProp(_el$3,"fg",props.api.theme.current.textMuted,_$p))
+return _el$3
+})()
+}),null)
+return _el$
+}})
+}
+
+
+
+
+
+
+
+
 
 
 function createSkillSectionModel(props,query){const target=createMemo16(()=>props.controller.target())
@@ -6442,10 +6302,10 @@ const filtered=createMemo16(()=>list().filter((item)=>matchesFilter(query(),item
 const visibility=createListVisibility({items:filtered,limit:()=>props.preferences.sectionItemLimit?.("skills")??0,resetKey:()=>JSON.stringify([target().key,query()])
 })
 const state=createMemo16(()=>props.controller.state(target()))
-createEffect17(()=>{const current=target()
-const deactivate=untrack6(()=>props.controller.activate?.(current)??(()=>{}))
-onCleanup19(deactivate)
-untrack6(()=>void props.controller.refresh(current).catch(()=>{}))
+createEffect18(()=>{const current=target()
+const deactivate=untrack8(()=>props.controller.activate?.(current)??(()=>{}))
+onCleanup22(deactivate)
+untrack8(()=>void props.controller.refresh(current).catch(()=>{}))
 })
 async function useSkill(item){try{const isInserted=await props.controller.use(target(),item.name)
 if(isInserted)
@@ -6468,9 +6328,11 @@ return{target,recent,grouped,list,filtered,visibility,state,useSkill,skillGroup}
 
 
 
+
 function SkillRow(props){const{api,interaction,grouped
 }=useSidebarList()
 const icons=useIcons()
+const toolbar=useToolbar()
 const id=()=>`${PLUGIN_ID}.skill.${props.item.location || props.item.name}`
 const row=useSidebarItem(api,interaction,{id:id(),position:()=>({...props.position,column:1
 }),activate:props.onUse
@@ -6494,24 +6356,21 @@ _$insert(_el$,()=>props.item.name,null)
 _$effect((_$p)=>_$setProp(_el$,"fg",row.foregroundColor(),_$p))
 return _el$
 })()
+},get trailing(){return _$createComponent(Show28,{when:toolbar,get children(){return _$createComponent(SidebarPinControl,{get id(){return id()
+},get position(){return props.position
+},get pin(){return{kind:"skill",name:props.item.name,location:props.item.location,icon:"book"
+}}})
+}})
 }})
 }
 function SkillsSection(props){const dialogs=useDialogs(props.api)
-const [query,setQuery]=createSignal31("")
+const toolbar=useToolbar()
+const [query,setQuery]=createSignal34("")
 const model=createSkillSectionModel(props,query)
 const navigationSection=()=>props.navigationSection??3
-function selectSkill(item){if(!props.preferences.shouldConfirmSkill(item)){model.useSkill(item)
-return
-}
-showSkillDetails(item)
-}
-function showSkillDetails(item){dialogs.open(()=>_$createComponent(SkillDialog,{get api(){return props.api
-},skill:item,get favorite(){return props.preferences.isFavoriteSkill?.(item)??false
-},get favoriteDisabled(){return props.preferences.ready?.()===false
-},onToggleFavorite:()=>props.preferences.toggleFavoriteSkill?.(item),onAccept:(skipConfirmation)=>{if(skipConfirmation)
-props.preferences.skipSkillConfirmation(item)
-model.useSkill(item)
-}}))
+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"
+},navigation):undefined
+})
 }
 return _$createComponent(Section,{get api(){return props.api
 },get interaction(){return props.interaction
@@ -6530,7 +6389,7 @@ _$insert(_el$,_$createComponent(SectionFilter,{get api(){return props.api
 }},get query(){return query()
 },placeholder:"Filter skills...",onInput:setQuery
 }),null)
-_$insert(_el$,_$createComponent(Show23,{get when(){return model.filtered().length>0
+_$insert(_el$,_$createComponent(Show29,{get when(){return model.filtered().length>0
 },get fallback(){return(()=>{var _el$2=_$createElement("text")
 _$insertNode(_el$2,_$createTextNode(`No matching skills`))
 _$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
@@ -6540,8 +6399,8 @@ return _el$2
 },get interaction(){return props.interaction
 },get grouped(){return model.grouped
 },get density(){return props.preferences.rowDensity?.()??"compact"
-},get children(){return _$createComponent(For17,{get each(){return model.visibility.visible()
-},children:(item,index)=>[_$createComponent(Show23,{get when(){return _$memo(()=>!!model.grouped())()&&(index()===0||model.visibility.visible()[index()-1]?.bucket!==item.bucket)
+},get children(){return _$createComponent(For18,{get each(){return model.visibility.visible()
+},children:(item,index)=>[_$createComponent(Show29,{get when(){return _$memo(()=>!!model.grouped())()&&(index()===0||model.visibility.visible()[index()-1]?.bucket!==item.bucket)
 },get children(){var _el$4=_$createElement("text")
 _$setProp(_el$4,"height",1)
 _$setProp(_el$4,"wrapMode","none")
@@ -6586,18 +6445,18 @@ 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]=createSignal32("")
-const [mode,setMode]=createSignal32("all")
+const [query,setQuery]=createSignal35("")
+const [mode,setMode]=createSignal35("all")
 const counts=createMemo17(()=>countSubagentView(rows(),query()))
 const tabs=createMemo17(()=>["all","active","recent",...counts().errors>0?["errors"]:[]])
 const filtered=createMemo17(()=>filterSubagentView(rows(),mode(),query()))
 const parentID=createMemo17(()=>props.api.state?.session?.get(props.sessionID)?.parentID)
 const targetKey=createMemo17(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
-createEffect18(()=>{targetKey()
+createEffect19(()=>{targetKey()
 setQuery("")
 setMode("all")
 })
-createEffect18(()=>{if(mode()!=="all"&&counts()[mode()]===0)
+createEffect19(()=>{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()])
@@ -6607,11 +6466,11 @@ 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))
-createEffect18(()=>{const sessionID=props.sessionID
+createEffect19(()=>{const sessionID=props.sessionID
 targetKey()
-const deactivate=untrack7(()=>props.controller.activate?.(sessionID)??(()=>{}))
-onCleanup20(deactivate)
-untrack7(()=>void props.controller.refresh(sessionID).catch(()=>{}))
+const deactivate=untrack9(()=>props.controller.activate?.(sessionID)??(()=>{}))
+onCleanup23(deactivate)
+untrack9(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 })
 return{list,recent,rows,query,setQuery,mode,setMode,counts,tabs,filtered,parentID,visibility,now,byId,ids,state
 }}
@@ -6668,7 +6527,7 @@ return()=>_c$()?`${props.item.run.startedBeforeObservation ? `${icons.icon("rece
 _$effect((_$p)=>_$setProp(_el$3,"fg",row.focused()?row.foregroundColor():theme().textMuted,_$p))
 return _el$3
 })()
-},get details(){return [_$createComponent(Show24,{get when(){return props.item.run?.errorMessage
+},get details(){return [_$createComponent(Show30,{get when(){return props.item.run?.errorMessage
 },get children(){var _el$4=_$createElement("text"),_el$5=_$createTextNode(`: `)
 _$insertNode(_el$4,_el$5)
 _$setProp(_el$4,"wrapMode","word")
@@ -6676,12 +6535,12 @@ _$insert(_el$4,()=>cancelled()?"Cancelled":"Error",_el$5)
 _$insert(_el$4,()=>props.item.run?.errorMessage,null)
 _$effect((_$p)=>_$setProp(_el$4,"fg",row.focused()?row.foregroundColor():failed()?theme().error:theme().textMuted,_$p))
 return _el$4
-}}),_$createComponent(Show24,{get when(){return props.item.unavailable
+}}),_$createComponent(Show30,{get when(){return props.item.unavailable
 },get children(){var _el$6=_$createElement("text")
 _$insertNode(_el$6,_$createTextNode(`Worker status unavailable`))
 _$effect((_$p)=>_$setProp(_el$6,"fg",theme().warning,_$p))
 return _el$6
-}}),_$createComponent(Show24,{get when(){return _$memo(()=>props.item.status.type==="retry")()?props.item.status:undefined
+}}),_$createComponent(Show30,{get when(){return _$memo(()=>props.item.status.type==="retry")()?props.item.status:undefined
 },children:(status)=>(()=>{var _el$0=_$createElement("text"),_el$1=_$createTextNode(`Retry #`),_el$10=_$createTextNode(` \xB7 `),_el$11=_$createTextNode(`s \xB7 `)
 _$insertNode(_el$0,_el$1)
 _$insertNode(_el$0,_el$10)
@@ -6693,7 +6552,7 @@ _$insert(_el$0,()=>status().message,null)
 _$effect((_$p)=>_$setProp(_el$0,"fg",row.focused()?row.foregroundColor():theme().warning,_$p))
 return _el$0
 })()
-}),_$createComponent(Show24,{get when(){return _$memo(()=>!!idle())()&&!props.item.run?.errorMessage
+}),_$createComponent(Show30,{get when(){return _$memo(()=>!!idle())()&&!props.item.run?.errorMessage
 },get children(){var _el$8=_$createElement("text")
 _$insertNode(_el$8,_$createTextNode(`Finished`))
 _$effect((_$p)=>_$setProp(_el$8,"fg",theme().textMuted,_$p))
@@ -6704,12 +6563,12 @@ return _el$8
 function SubagentList(props){return _$createComponent(SidebarRowList,{get api(){return props.api
 },get interaction(){return props.interaction
 },get density(){return props.density
-},get children(){return _$createComponent(For18,{get each(){return props.ids
+},get children(){return _$createComponent(For19,{get each(){return props.ids
 },children:(id,index)=>{const initial=props.itemById(id)
 const item=()=>props.itemById(id)??initial
 const startsGroup=()=>index()===0||props.visible[index()-1]?.group!==item().group
 return(()=>{var _el$=_$createElement("box")
-_$insert(_el$,_$createComponent(Show25,{get when(){return startsGroup()
+_$insert(_el$,_$createComponent(Show31,{get when(){return startsGroup()
 },get children(){var _el$2=_$createElement("text"),_el$3=_$createElement("b")
 _$insertNode(_el$2,_el$3)
 _$insert(_el$3,()=>item().group)
@@ -6735,7 +6594,7 @@ return _$createComponent(Section,{get api(){return props.api
 },sectionId:`${PLUGIN_ID}.section.subagents`,get navigationSection(){return navigationSection()
 },title:"SUBAGENTS",section:"subagents",get summary(){return `${model.list().length} active \xB7 ${model.recent().length} recent`
 },get open(){return props.preferences.expanded().subagents
-},onToggle:()=>props.preferences.toggleSectionExpanded("subagents"),get children(){return [_$createComponent(Show26,{get when(){return model.parentID()
+},onToggle:()=>props.preferences.toggleSectionExpanded("subagents"),get children(){return [_$createComponent(Show32,{get when(){return model.parentID()
 },children:(id)=>_$createComponent(McpBulkAction,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.subagents.parent`,get position(){return{section:navigationSection(),row:1,column:0
@@ -6758,7 +6617,7 @@ _$insert(_el$,_$createComponent(SectionFilter,{get api(){return props.api
 }}),_el$2)
 _$setProp(_el$2,"flexDirection","row")
 _$setProp(_el$2,"flexWrap","wrap")
-_$insert(_el$2,_$createComponent(For19,{get each(){return model.tabs()
+_$insert(_el$2,_$createComponent(For20,{get each(){return model.tabs()
 },children:(value,index)=>_$createComponent(SectionTab,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.subagents.filter.${value}`,get position(){return{section:navigationSection(),row:4,column:index()
@@ -6769,7 +6628,7 @@ _$insert(_el$2,_$createComponent(For19,{get each(){return model.tabs()
 },onActivate:()=>model.setMode(value)
 })
 }))
-_$insert(_el$,_$createComponent(Show26,{get when(){return model.filtered().length===0
+_$insert(_el$,_$createComponent(Show32,{get when(){return model.filtered().length===0
 },get children(){var _el$3=_$createElement("text")
 _$insertNode(_el$3,_$createTextNode(`No matching subagents`))
 _$effect((_$p)=>_$setProp(_el$3,"fg",props.api.theme.current.textMuted,_$p))
@@ -6810,6 +6669,23 @@ return _el$
 
 
 
+function NativeTodoNotice(props){const icons=useIcons()
+return(()=>{var _el$=_$createElement("text"),_el$2=_$createTextNode(` Native OpenCode Todo. Edit tasks through chat and todowrite.`)
+_$insertNode(_el$,_el$2)
+_$setProp(_el$,"wrapMode","word")
+_$insert(_el$,()=>icons.icon("info"),_el$2)
+_$insert(_el$,()=>props.empty?" OpenCode 2.1 enables the tool through experimental.todo.":"",null)
+_$effect((_$p)=>_$setProp(_el$,"fg",props.api.theme.current.textMuted,_$p))
+return _el$
+})()
+}
+
+
+
+
+
+
+
 
 
 
@@ -6853,7 +6729,7 @@ _$insert(_el$2,()=>icons.icon(done()?"done":active()?"busy":cancelled()?"close":
 _$setProp(_el$3,"flexGrow",1)
 _$setProp(_el$3,"wrapMode","word")
 _$insert(_el$3,()=>props.item.content)
-_$insert(_el$,_$createComponent(Show27,{get when(){return props.item.priority==="high"||props.item.priority==="medium"||props.item.priority==="low"
+_$insert(_el$,_$createComponent(Show33,{get when(){return props.item.priority==="high"||props.item.priority==="medium"||props.item.priority==="low"
 },get children(){var _el$4=_$createElement("text"),_el$5=_$createElement("b"),_el$6=_$createTextNode(` `)
 _$insertNode(_el$4,_el$5)
 _$setProp(_el$4,"width",2)
@@ -6880,7 +6756,7 @@ _$insertNode(_el$,_el$2)
 _$setProp(_el$,"gap",1)
 _$setProp(_el$2,"flexDirection","row")
 _$setProp(_el$2,"flexWrap","wrap")
-_$insert(_el$2,_$createComponent(For20,{each:["all","active","finished"],children:(value,index)=>_$createComponent(SectionTab,{get api(){return props.api
+_$insert(_el$2,_$createComponent(For21,{each:["all","active","finished"],children:(value,index)=>_$createComponent(SectionTab,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.todo.filter.${value}`,get position(){return{section:navigationSection(),row:tabsRow(),column:index()
 }},get label(){return value[0].toUpperCase() + value.slice(1)
@@ -6889,17 +6765,17 @@ _$insert(_el$2,_$createComponent(For20,{each:["all","active","finished"],childre
 },onActivate:()=>props.setMode(value)
 })
 }))
-_$insert(_el$,_$createComponent(Show28,{get when(){return props.view.rows.length>0
+_$insert(_el$,_$createComponent(Show34,{get when(){return props.view.rows.length>0
 },get fallback(){return _$createComponent(EmptyTodo,{get api(){return props.api
 },get mode(){return props.mode
 }})
 },get children(){return _$createComponent(SidebarRowList,{get api(){return props.api
 },get interaction(){return props.interaction
 },get density(){return props.density
-},get children(){return _$createComponent(For20,{get each(){return props.visibility.visible()
+},get children(){return _$createComponent(For21,{get each(){return props.visibility.visible()
 },children:(row,index)=>{const startsGroup=()=>index()===0||props.visibility.visible()[index()-1].group!==row.group
 return(()=>{var _el$3=_$createElement("box")
-_$insert(_el$3,_$createComponent(Show28,{get when(){return startsGroup()
+_$insert(_el$3,_$createComponent(Show34,{get when(){return startsGroup()
 },get children(){var _el$4=_$createElement("text"),_el$5=_$createElement("b")
 _$insertNode(_el$4,_el$5)
 _$insert(_el$5,()=>row.group)
@@ -6936,7 +6812,7 @@ return _el$6
 
 
 function TodoGuidanceControl(props){const state=()=>props.controller.guidance(props.sessionID)
-return _$createComponent(Show29,{get when(){return state().available
+return _$createComponent(Show35,{get when(){return state().available
 },get children(){var _el$=_$createElement("box")
 _$insert(_el$,_$createComponent(SectionTab,{get api(){return props.api
 },get interaction(){return props.interaction
@@ -6946,7 +6822,7 @@ _$insert(_el$,_$createComponent(SectionTab,{get api(){return props.api
 },get disabled(){return state().saving
 },onActivate:()=>void props.controller.setGuidance(props.sessionID,!state().enabled)
 }),null)
-_$insert(_el$,_$createComponent(Show29,{get when(){return state().error
+_$insert(_el$,_$createComponent(Show35,{get when(){return state().error
 },children:(message)=>(()=>{var _el$2=_$createElement("text")
 _$setProp(_el$2,"wrapMode","word")
 _$insert(_el$2,message)
@@ -6961,33 +6837,41 @@ function TodoSection(props){const list=createMemo18(()=>props.controller.list(pr
 const icons=useIcons()
 const unavailable=()=>hostCapabilityUnavailable(props.api,"todo")
 const managed=()=>("guidance" in props.controller)?props.controller:undefined
-const [mode,setMode]=createSignal33("all")
+const native=()=>("source" in props.controller)&&props.controller.source==="native"
+const [mode,setMode]=createSignal36("all")
 const targetKey=createMemo18(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
-createEffect19(()=>{targetKey()
+createEffect20(()=>{targetKey()
 setMode("all")
 })
 const view=createMemo18(()=>buildTodoView(list(),mode()))
 const visibility=createListVisibility({items:()=>view().rows,limit:()=>props.preferences.sectionItemLimit?.("todo")??0,resetKey:()=>JSON.stringify([targetKey(),mode()])
 })
 const state=createMemo18(()=>props.controller.state(props.sessionID))
-createEffect19(()=>{const sessionID=props.sessionID
+createEffect20(()=>{const sessionID=props.sessionID
 targetKey()
 if(unavailable())
 return
-const deactivate=untrack8(()=>props.controller.activate?.(sessionID)??(()=>{}))
-onCleanup21(deactivate)
-untrack8(()=>void props.controller.refresh(sessionID).catch(()=>{}))
+const deactivate=untrack10(()=>props.controller.activate?.(sessionID)??(()=>{}))
+onCleanup24(deactivate)
+untrack10(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 })
 const navigationSection=()=>props.navigationSection??1
 return _$createComponent(Section,{get api(){return props.api
 },get interaction(){return props.interaction
 },sectionId:`${PLUGIN_ID}.section.todo`,get navigationSection(){return navigationSection()
 },title:"TODO",section:"todo",get summary(){return _$memo(()=>!!(unavailable()||managed()?.missing(props.sessionID)))()?"\u2014":`${view().counts.completed}/${list().length}`
+},get headerAction(){return native()?{id:`${PLUGIN_ID}.todo.refresh`,label:()=>`${icons.icon("retry")} Refresh`,disabled:()=>state().status==="loading"||state().status==="refreshing",onActivate:()=>{props.controller.refresh(props.sessionID).catch(()=>{})
+}}:undefined
 },get open(){return props.preferences.expanded().todo
-},onToggle:()=>props.preferences.toggleSectionExpanded("todo"),get children(){return _$createComponent(Show30,{get when(){return unavailable()
+},onToggle:()=>props.preferences.toggleSectionExpanded("todo"),get children(){return _$createComponent(Show36,{get when(){return unavailable()
 },get fallback(){return(()=>{var _el$=_$createElement("box")
 _$setProp(_el$,"gap",1)
-_$insert(_el$,_$createComponent(Show30,{get when(){return managed()?.guidance(props.sessionID).available
+_$insert(_el$,_$createComponent(Show36,{get when(){return native()
+},get children(){return _$createComponent(NativeTodoNotice,{get api(){return props.api
+},get empty(){return list().length===0
+}})
+}}),null)
+_$insert(_el$,_$createComponent(Show36,{get when(){return managed()?.guidance(props.sessionID).available
 },get children(){return _$createComponent(TodoGuidanceControl,{get api(){return props.api
 },get controller(){return managed()
 },get sessionID(){return props.sessionID
@@ -6995,7 +6879,7 @@ _$insert(_el$,_$createComponent(Show30,{get when(){return managed()?.guidance(pr
 },get navigationSection(){return navigationSection()
 }})
 }}),null)
-_$insert(_el$,_$createComponent(Show30,{get when(){return managed()?.missing(props.sessionID)
+_$insert(_el$,_$createComponent(Show36,{get when(){return managed()?.missing(props.sessionID)
 },get fallback(){return _$createComponent(SectionRequestBody,{get api(){return props.api
 },get interaction(){return props.interaction
 },id:`${PLUGIN_ID}.retry.todo`,get position(){return{section:navigationSection(),row:1,column:0
@@ -7032,8 +6916,11 @@ 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)))
-onCleanup22(()=>props.interaction.setContentRoot(undefined))
-return(()=>{var _el$=_$createElement("box")
+onCleanup25(()=>props.interaction.setContentRoot(undefined))
+return _$createComponent(ToolbarProvider,{get api(){return props.api
+},get preferences(){return props.preferences
+},get skills(){return props.skills
+},get children(){var _el$=_$createElement("box")
 _$use((node)=>props.interaction.setContentRoot(node),_el$)
 _$setProp(_el$,"id",`${PLUGIN_ID}.root`)
 _$setProp(_el$,"focusable",true)
@@ -7044,7 +6931,8 @@ event.preventDefault()
 event.stopPropagation()
 props.interaction.leave()
 })
-_$insert(_el$,_$createComponent(For21,{get each(){return visibleSections()
+_$insert(_el$,_$createComponent(SidebarToolbar,props),null)
+_$insert(_el$,_$createComponent(For22,{get each(){return visibleSections()
 },children:(section,index)=>_$createComponent(SectionBoundary,{get api(){return props.api
 },get divided(){return index()<visibleSections().length-1
 },get children(){return _$createComponent(Switch,{get children(){return [_$createComponent(Match,{when:section==="limits",get children(){return props.limitsSection(index() + 1)
@@ -7067,7 +6955,7 @@ _$insert(_el$,_$createComponent(For21,{get each(){return visibleSections()
 }})]
 }})
 }})
-}))
+}),null)
 _$effect((_p$)=>{var _v$=props.interaction.syncFocus,_v$2=props.interaction.syncFocus
 _v$!==_p$.e&&(_p$.e=_$setProp(_el$,"on:focused",_v$,_p$.e))
 _v$2!==_p$.t&&(_p$.t=_$setProp(_el$,"on:blurred",_v$2,_p$.t))
@@ -7075,12 +6963,12 @@ return _p$
 },{e:undefined,t:undefined
 })
 return _el$
-})()
+}})
 }
 
 
 function McpPersistence(props){const persist=createMemo20(()=>props.controller.persist())
-createEffect20(()=>{if(!props.api.state.ready)
+createEffect21(()=>{if(!props.api.state.ready)
 return
 persist()
 const route=props.api.route.current
@@ -7088,20 +6976,20 @@ const params="params" in route?route.params:undefined
 if(typeof params?.sessionID!=="string")
 return
 const current=props.controller.target()
-onCleanup23(()=>props.controller.deactivate(current))
-untrack9(()=>void props.controller.activate(current).catch(()=>{}))
+onCleanup26(()=>props.controller.deactivate(current))
+untrack11(()=>void props.controller.activate(current).catch(()=>{}))
 })
 return _$createElement("box")
 }
-function PreferencesPersistence(props){createEffect20(()=>{const location=currentLocation(props.api)
-untrack9(()=>props.controller.setActiveScope(preferencesScope({directory:location.routing.directory,worktree:props.api.state.path.worktree
+function PreferencesPersistence(props){createEffect21(()=>{const location=currentLocation(props.api)
+untrack11(()=>props.controller.setActiveScope(preferencesScope({directory:location.routing.directory,worktree:props.api.state.path.worktree
 })))
 props.controller.load()
 })
 return _$createElement("box")
 }
 function FirstRunWizardPersistence(props){let isChecked=false
-createEffect20(()=>{if(isChecked)
+createEffect21(()=>{if(isChecked)
 return
 isChecked=true
 showFirstRunWizard(props.api,props.preferences).catch(()=>{})
@@ -7128,7 +7016,7 @@ const settingsId=`${PLUGIN_ID}.settings`
 const settings=useSidebarItem(props.api,props.interaction,{id:settingsId,position:{section:0,row:0,column:0
 },activate:()=>openSettings(props.api,props.preferences,undefined,props.mcp,props.skills)
 },()=>theme().textMuted,"control")
-onCleanup24(()=>props.interaction.setTitleRoot(undefined))
+onCleanup27(()=>props.interaction.setTitleRoot(undefined))
 return(()=>{var _el$=_$createElement("box"),_el$2=_$createElement("box"),_el$3=_$createElement("box")
 _$insertNode(_el$,_el$2)
 _$use((node)=>props.interaction.setTitleRoot(node),_el$)
@@ -7139,7 +7027,7 @@ _$setProp(_el$2,"flexDirection","row")
 _$setProp(_el$2,"justifyContent","space-between")
 _$setProp(_el$2,"gap",1)
 _$setProp(_el$3,"flexGrow",1)
-_$insert(_el$3,_$createComponent(Show31,{get when(){return props.preferences.showSessionTitle()
+_$insert(_el$3,_$createComponent(Show37,{get when(){return props.preferences.showSessionTitle()
 },get children(){var _el$4=_$createElement("text"),_el$5=_$createElement("b")
 _$insertNode(_el$4,_el$5)
 _$setProp(_el$4,"wrapMode","word")
@@ -7147,7 +7035,7 @@ _$insert(_el$5,()=>props.title)
 _$effect((_$p)=>_$setProp(_el$4,"fg",theme().text,_$p))
 return _el$4
 }}),null)
-_$insert(_el$3,_$createComponent(Show31,{get when(){return _$memo(()=>!!props.preferences.showSessionDate())()&&created()
+_$insert(_el$3,_$createComponent(Show37,{get when(){return _$memo(()=>!!props.preferences.showSessionDate())()&&created()
 },children:(value)=>(()=>{var _el$6=_$createElement("text")
 _$insert(_el$6,value)
 _$effect((_$p)=>_$setProp(_el$6,"fg",theme().textMuted,_$p))
@@ -7196,11 +7084,11 @@ function createLimitsRefresh(options,schedule=scheduleInterval){let disposed=fal
 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)
-createEffect21(on2(selectedKey,()=>{const model=options.selectedModel?.()
+createEffect22(on2(selectedKey,()=>{const model=options.selectedModel?.()
 if(model&&options.accountSource)
 options.accountSource.refresh(model).catch(()=>{})
 }))
-createEffect21(on2(targetKey,()=>{const{model,adapter}=options.controller.current()
+createEffect22(on2(targetKey,()=>{const{model,adapter}=options.controller.current()
 if(model&&adapter)
 options.controller.refresh()
 }))
@@ -7213,9 +7101,9 @@ await options.accountSource.refresh(model)
 if(!disposed&&target===targetKey())
 await options.controller.refresh()
 }
-createEffect21(on2(interval,(milliseconds)=>{onCleanup25(schedule(()=>void refresh().catch(()=>{}),milliseconds))
+createEffect22(on2(interval,(milliseconds)=>{onCleanup28(schedule(()=>void refresh().catch(()=>{}),milliseconds))
 }))
-onCleanup25(()=>{disposed=true
+onCleanup28(()=>{disposed=true
 })
 }
 function LimitsPersistence(props){createLimitsRefresh(props)
@@ -7225,20 +7113,16 @@ import {homedir} from "os"
 
 function location(input){return input.directory?{location:{directory:input.directory}}:{}}
 function mcpItem(server){return{name:server.name,status:server.status.status,...server.status.error&&{error:server.status.error}}}
-function skillKey(directory,name){return `${directory}\x00${name}`
-}
-function createV2ClientAdapter(context){const skillIDs=new Map
-return{state:{mcp:()=>(context.data.location.mcp.server.list(context.location)??[]).map((server)=>mcpItem(server))
+function createV2ClientAdapter(context){return{state:{mcp:()=>(context.data.location.mcp.server.list(context.location)??[]).map((server)=>mcpItem(server))
 },client:{app:{async skills(input,options={}){const response=await context.client.skill.list(location(input),{signal:options.signal})
-const directory=input.directory??response.location.directory
-const data=response.data.map((skill)=>{skillIDs.set(skillKey(directory,skill.name),skill.id)
-return{name:skill.name,description:skill.description,location:skill.path,content:skill.content
-}})
+const data=response.data.map((skill)=>({name:skill.name,description:skill.description,location:skill.path,content:skill.content
+}))
 return{data}}},tui:{async appendPrompt(input,options={}){const route=context.ui.router.current()
 const name=/^\/([^\s]+)\s*$/u.exec(input.text)?.[1]
 const directory=input.directory??context.location?.directory??context.data.location.default().directory
 const session=route.type==="session"?context.data.session.get(route.sessionID):undefined
-const id=name?skillIDs.get(skillKey(directory,name)):undefined
+const candidates=context.data.location.skill.list({directory})?.filter((skill)=>skill.name===name)??[]
+const id=candidates.length===1?candidates[0].id:undefined
 if(route.type!=="session"||session?.location.directory!==directory||!id)
 return{data:false}
 await context.client.session.skill({sessionID:route.sessionID,id},{signal:options.signal})
@@ -7247,170 +7131,202 @@ const data=Object.fromEntries(response.data.map((server)=>[server.name,server.st
 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:undefined}}}}}}
-var SESSION_UPDATE_EVENTS=new Set(["session.agent.selected","session.model.selected","session.moved","session.renamed","session.permissions"])
-function createV2EventAdapter(context,sessions){return{on(name,handler){let active=true
-const unsubscribe=context.data.listen(({details})=>{const event=details
-if(name==="server.connected"&&event.type==="server.connected"){handler({type:name,properties:{}})
-return
+var TERMINAL_EVENTS=new Set(["session.execution.succeeded","session.execution.failed","session.execution.interrupted"])
+function executionStatus(name,event){const sessionID=event.data.sessionID
+const started=event.type==="session.execution.started"
+if(typeof sessionID!=="string"||!started&&!TERMINAL_EVENTS.has(event.type))
+return
+if(name!=="session.status"&&(name!=="session.idle"||started))
+return
+const status=started?{type:"busy"}:{type:"idle"}
+return{sessionID,status,properties:{sessionID,...name==="session.status"&&{status}}}}
+var updates=["session.agent.selected","session.model.selected","session.moved","session.renamed","session.permissions","session.metadata.updated"]
+var executions=["session.execution.started","session.execution.succeeded","session.execution.failed","session.execution.interrupted"]
+function eventTypes(name){if(name==="session.updated")
+return updates
+if(name==="session.status")
+return ["session.status","session.retry.scheduled",...executions]
+if(name==="session.idle")
+return ["session.idle",...executions.slice(1)]
+if(name==="session.error")
+return ["session.execution.failed"]
+if(name==="mcp.tools.changed")
+return ["mcp.status.changed","mcp.resources.changed"]
+if(["session.created","session.deleted","server.connected","installation.update-available"].includes(name))
+return [name]
+return []
 }
-if(name==="mcp.tools.changed"&&event.type.startsWith("mcp.")){handler({type:name,properties:event.data})
-return
+function statusFor(name,event){if(name==="session.idle")
+return{type:"idle"}
+if(event.type==="session.retry.scheduled")
+return{type:"retry",attempt:Number(event.data.attempt),next:Number(event.data.at),message:event.data.error?.message??"Retrying"
 }
-if(name==="installation.update-available"&&event.type==="installation.update-available"){if(typeof event.data.version==="string"){handler({type:name,properties:{version:event.data.version}})
+return event.data.status
 }
-return
+function createV2EventAdapter(context,sessions){return{on(name,handler){let active=true
+const disposers=eventTypes(name).map((type)=>context.data.on(type,(value)=>{const event=value
+const data=event.data??{}
+const emit=(properties)=>{if(active)
+handler({type:name,properties})
 }
-if(name==="session.deleted"&&event.type==="session.deleted"){handler({type:name,properties:{sessionID:event.data.sessionID}})
+const execution=executionStatus(name,{type:event.type,data})
+if(execution){sessions.setStatus(execution.sessionID,execution.status)
+emit(execution.properties)
 return
 }
-if(name==="session.status"&&event.type==="session.status"){const sessionID=event.data.sessionID
-const status=event.data.status
-if(typeof sessionID!=="string"||!status||typeof status!=="object")
+if(name==="server.connected"||name==="mcp.tools.changed"){emit(data)
 return
-sessions.setStatus(sessionID,status)
-handler({type:name,properties:{sessionID,status}})
+}
+if(name==="installation.update-available"){if(typeof data.version==="string")
+emit({version:data.version})
 return
 }
-if(name==="session.idle"&&event.type==="session.idle"){const sessionID=event.data.sessionID
+const sessionID=data.sessionID
 if(typeof sessionID!=="string")
 return
-sessions.setStatus(sessionID,{type:"idle"})
-handler({type:name,properties:{sessionID}})
-return
+if(name==="session.status"||name==="session.idle"){const status=statusFor(name,{type:event.type,data})
+if(status&&typeof status==="object"){sessions.setStatus(sessionID,status)
+emit(name==="session.idle"?{sessionID}:{sessionID,status})
 }
-if(name==="session.error"&&event.type==="session.execution.failed"){const error=event.data.error
-handler({type:name,properties:{sessionID:event.data.sessionID,error:error&&{name:error.type??"Error",data:{message:error.message??"Session error"}}}})
 return
 }
-const isCreated=name==="session.created"&&event.type==="session.created"
-const isUpdated=name==="session.updated"&&SESSION_UPDATE_EVENTS.has(event.type)
-if(!isCreated&&!isUpdated)
+if(name==="session.deleted"){emit({sessionID})
 return
-const sessionID=event.data.sessionID
-const info=typeof sessionID==="string"?context.data.session.get(sessionID):undefined
-if(info){handler({type:name,properties:{info:sessions.normalize(info)}})
+}
+if(name==="session.error"){const error=data.error
+emit({sessionID,error:error&&{name:error.type??"Error",data:{message:error.message??"Session error"}}})
 return
 }
-if(typeof sessionID!=="string")
+const info=context.data.session.get(sessionID)
+if(info){emit({info:sessions.project(info)})
 return
+}
 context.data.session.sync(sessionID).then(()=>{const synced=context.data.session.get(sessionID)
-if(active&&synced)
-handler({type:name,properties:{info:sessions.normalize(synced)}})
+if(synced)
+emit({info:sessions.project(synced)})
 }).catch(()=>{})
-})
+}))
 return()=>{active=false
-unsubscribe()
+for(const dispose of disposers)
+dispose()
 }}}}
 
-
-var SETTINGS_COMMAND="opencode.settings"
-var PERMISSIONS_ACTION="permission.mode"
-function belongsTo2(renderable,ancestor){if(!renderable||!ancestor)
-return false
-for(let current=renderable;current; current=current.parent){if(current===ancestor)
-return true
-}
-return false
-}
 function enabled(value){return typeof value==="function"?value():value!==false
 }
-function createV2Keymap(context){const [revision,setRevision]=createSignal34(0)
-const layers=new Map
-let sequence=0
-function layerActive(layer){const mode=layer.mode??"base"
-const target=layer.target
-return(mode==="global"||context.keymap.mode.current()===mode)&&enabled(layer.enabled)&&(!target||belongsTo2(context.renderer.currentFocusedRenderable,target))
-}
-function legacyCommand(name){return [...layers].sort(([leftID,left],[rightID,right])=>(right.priority??0)-(left.priority??0)||rightID-leftID).flatMap(([,layer])=>layerActive(layer)?[layer]:[]).flatMap((layer)=>layer.commands??[]).find((command)=>command.name===name&&enabled(command.enabled))
+function v2LayerCommands(id,layer,available,run,dispatch){const named=(layer.commands??[]).map((command)=>({id:command.name,bind:command.name==="session.new"?"<leader>n":undefined,title:command.title,description:command.desc,group:command.category,palette:command.namespace==="palette"?true:undefined,suggested:command.suggested,enabled:()=>available()&&enabled(command.enabled),run:(input,event)=>run(command,input,event)
+}))
+const bindings=(layer.bindings??[]).flatMap((binding,index)=>typeof binding.key==="string"?[{id:`${PLUGIN_ID}.v2-binding.${id}.${index}`,bind:binding.key,enabled:available,run:()=>dispatch(String(binding.cmd))
+}]:[])
+return [...named,...bindings]
 }
-function run(command,input="",event){return command.run({keymap,event,focused:context.renderer.currentFocusedRenderable,target:context.renderer.currentFocusedRenderable,data:{},command,input,payload:undefined
+var SETTINGS_COMMAND="opencode.settings"
+var PERMISSIONS_ACTION="permission.mode"
+function createV2Keymap(context){const cleanups=new Set
+let sequence=0
+async function run(command,input="",event){await command.run({keymap,event,focused:context.renderer.currentFocusedRenderable,target:context.renderer.currentFocusedRenderable,data:{},command,input,payload:undefined
 })
 }
-async function runV2(command,input="",event){await run(command,input,event)
-}
 const onKeypress=(event)=>{if(event.name!==","||!event.ctrl||event.shift||event.meta||event.super||event.hyper)
 return
-const command=legacyCommand(`${PLUGIN_ID}.settings`)
-if(!command)
+const command=context.keymap.commands().find((item)=>item.id===`${PLUGIN_ID}.settings`)
+if(!command||!enabled(command.enabled))
 return
 event.preventDefault()
 event.stopPropagation()
-runV2(command,"",event)
+context.keymap.dispatch(command.id)
 }
 context.renderer.keyInput.on("keypress",onKeypress)
-function v2Commands(id,layer){const available=()=>layerActive(layer)
-const named=(layer.commands??[]).map((command)=>({id:command.name,bind:command.name==="session.new"?"<leader>n":undefined,title:command.title,description:command.desc,group:command.category,palette:command.namespace==="palette"?true:undefined,suggested:command.suggested,enabled:()=>available()&&enabled(command.enabled),run:(input,event)=>runV2(command,input,event)
+const keymap={registerLayer(layer){const id=++sequence
+const owner=getOwner()
+const [active,setActive]=createSignal37(true)
+const install=()=>{context.keymap.layer(()=>({mode:typeof layer.mode==="string"?layer.mode:"base",priority:layer.priority,enabled:()=>active()&&enabled(layer.enabled),target:layer.target?()=>layer.target:undefined,commands:v2LayerCommands(id,layer,()=>true,run,context.keymap.dispatch)
 }))
-const bindings=(layer.bindings??[]).flatMap((binding,index)=>typeof binding.key==="string"?[{id:`${PLUGIN_ID}.v2-binding.${id}.${index}`,bind:binding.key,enabled:available,run:()=>{context.keymap.dispatch(String(binding.cmd))
-}}]:[])
-return [...named,...bindings]
 }
-function Bridge(){context.keymap.layer(()=>{revision()
-const current=[...layers].sort(([leftID,left],[rightID,right])=>(right.priority??0)-(left.priority??0)||rightID-leftID)
-const commands=current.flatMap(([id,layer])=>v2Commands(id,layer))
-const bindings=commands.flatMap((command)=>command.id?[command.id]:[])
-return{mode:"global",priority:2000,commands,bindings
-}})
-return _$createElement("box")
+let release
+if(owner)
+release=createRoot((cleanup)=>{install()
+return cleanup
+},owner)
+else
+install()
+const dispose=()=>{setActive(false)
+release?.()
 }
-const keymap={registerLayer(layer){const id=++sequence
-layers.set(id,layer)
-setRevision((value)=>value + 1)
-return()=>{if(!layers.delete(id))
-return
-setRevision((value)=>value + 1)
-}},dispatchCommand(name,options){const command=context.keymap.commands().find((candidate)=>candidate.id===(name===PERMISSIONS_ACTION?SETTINGS_COMMAND:name))
-if(command){if(!enabled(command.enabled))
+cleanups.add(dispose)
+return()=>{cleanups.delete(dispose)
+dispose()
+}},dispatchCommand(name,options){const target=options?.focused??options?.target
+if(target?.parent&&!target.isDestroyed)
+target.focus()
+const command=context.keymap.commands().find((item)=>item.id===(name===PERMISSIONS_ACTION?SETTINGS_COMMAND:name))
+if(!command)
+return{ok:false,reason:"not-found"
+}
+if(!enabled(command.enabled))
 return{ok:false,reason:"disabled",command
 }
 context.keymap.dispatch(command.id,typeof options?.payload==="string"?options.payload:undefined)
 return{ok:true,command
-}}
-const fallback=legacyCommand(name)
-if(!fallback)
-return{ok:false,reason:"not-found"
-}
-run(fallback)
-return{ok:true,command:fallback
 }},getCommands(){const commands=context.keymap.commands()
-const result=commands.flatMap((command)=>{if(!command.id)
-return []
-const name=command.id
-return [{...command,name,run:()=>context.keymap.dispatch(name)
-}]
-})
-const settings=commands.find((command)=>command.id===SETTINGS_COMMAND)
+const result=commands.flatMap((command)=>command.id?[{...command,name:command.id,run:()=>context.keymap.dispatch(command.id)
+}]:[])
+const settings=commands.find((item)=>item.id===SETTINGS_COMMAND)
 if(settings)
 result.push({...settings,id:PERMISSIONS_ACTION,name:PERMISSIONS_ACTION,title:"Permissions settings",run:()=>context.keymap.dispatch(SETTINGS_COMMAND)
 })
 return result
 },getCommandBindings(input){return new Map(input.commands.map((name)=>[name,[...context.keymap.shortcuts(name)]]))
-},parseKeySequence(value){return value.trim()?value.trim().split(/\s+/u):[]
 }}
-return{keymap,Bridge,dispose:()=>{context.renderer.keyInput.off("keypress",onKeypress)
+return{keymap,dispose(){for(const cleanup of cleanups)
+cleanup()
+cleanups.clear()
+context.renderer.keyInput.off("keypress",onKeypress)
 }}}
-function createV2SessionAdapter(context){const statuses=new Map
+
+function createV2SessionAdapter(context){const [retryDetails,setRetryDetails]=createSignal38({})
+const projections=new WeakMap
 function normalize(info){const directory=info.location.directory
 const workspaceID=context.location?.directory===directory?context.location.workspaceID:undefined
 return{id:info.id,slug:info.id,projectID:info.projectID,...workspaceID&&{workspaceID},directory,...info.parentID&&{parentID:info.parentID},cost:Number(info.cost),tokens:info.tokens,title:info.title??"Untitled session",...info.agent&&{agent:info.agent},...info.model&&{model:info.model},version:context.app.version,metadata:info.metadata,time:{created:info.time.created,updated:info.time.updated,...info.time.archived&&{archived:info.time.archived}}}}
-function status(sessionID){const cached=statuses.get(sessionID)
-if(cached)
-return cached
-return context.data.session.status(sessionID)==="running"?{type:"busy"}:{type:"idle"}}
-return{normalize,setStatus(sessionID,value){statuses.set(sessionID,value)
+function status(sessionID){if(context.data.session.status(sessionID)!=="running")
+return{type:"idle"}
+const messages=context.data.session.message?.list?.(sessionID)??[]
+let message
+for(let index=messages.length-1;index>=0; index--){const candidate=messages[index]
+if(candidate.type==="assistant"&&!candidate.time.completed){message=candidate
+break
+}}
+if(message?.type==="assistant"&&message.retry)
+return{type:"retry",attempt:message.retry.attempt,next:message.retry.at,message:message.retry.error.message
+}
+return retryDetails()[sessionID]??{type:"busy"}}
+function project(info){let value=projections.get(info)
+if(!value){value=normalize(info)
+for(const key of ["id","slug","projectID","workspaceID","directory","parentID","cost","tokens","title","agent","model","version","metadata","time"])
+Object.defineProperty(value,key,{enumerable:true,get:()=>normalize(info)[key]})
+projections.set(info,value)
+}
+return value
+}
+return{normalize,project,status,setStatus(sessionID,value){setRetryDetails((current)=>{const next={...current}
+if(value.type==="retry")
+next[sessionID]=value
+else
+delete next[sessionID]
+return next
+})
 },state:{count:()=>context.data.session.list().length,get:(sessionID)=>{const value=context.data.session.get(sessionID)
-return value?normalize(value):undefined
+return value?project(value):undefined
 },todo:()=>[],status
 },client:{async create(input,options={}){const directory=input.directory??context.location?.directory??context.data.location.default().directory
 const session=await context.client.session.create({location:{directory}},{signal:options.signal})
 return{data:normalize(session)}},async children(input,options={}){const response=await context.client.session.list({parentID:input.sessionID,...input.directory&&{directory:input.directory}},{signal:options.signal})
 return{data:response.data.map((session)=>normalize(session))}},async status(_input,options={}){const active=await context.client.session.active({signal:options.signal})
-const data=Object.fromEntries(context.data.session.list().map((session)=>[session.id,statuses.get(session.id)??(active[session.id]?{type:"busy"}:{type:"idle"})]))
+const data=Object.fromEntries(context.data.session.list().map((session)=>[session.id,active[session.id]?retryDetails()[session.id]??{type:"busy"}:{type:"idle"}]))
 return{data}},async todo(){return{data:[]}}}}}
 
-
-function createV2Slots(context,keymap,onDispose){return{register(plugin){const slots=plugin.slots
-const cleanups=[context.ui.slot({append:"app",render:()=>[_$createComponent(keymap.Bridge,{}),_$memo(()=>slots.app?.(undefined,{}))]
+function createV2Slots(context,onDispose){return{register(plugin){const slots=plugin.slots
+const cleanups=[context.ui.slot({append:"app",render:()=>_$memo(()=>slots.app?.(undefined,{}))
 }),context.ui.slot({replace:"sidebar.content",render:(input)=>{const sessionID=input.sessionID
 return slots.sidebar_content?.(undefined,{session_id:sessionID
 })
@@ -7421,13 +7337,20 @@ return "opencode-navigator"
 }}}
 function legacyTheme(theme){return{primary:theme.hue.interactive[200],secondary:theme.categorical[0]?.[200]??theme.hue.accent[200],accent:theme.hue.accent[200],error:theme.text.feedback.error.base,warning:theme.text.feedback.warning.base,success:theme.text.feedback.success.base,info:theme.text.feedback.info.base,text:theme.text.base,textMuted:theme.text.muted,selectedListItemText:theme.text.action.primary.focused,background:theme.background.base,backgroundPanel:theme.background.raised.base,backgroundElement:theme.background.raised.high,backgroundMenu:theme.background.raised.max,border:theme.border.base,borderActive:theme.scrollbar.base,borderSubtle:theme.hue.neutral[500],diffAdded:theme.diff.text.added,diffRemoved:theme.diff.text.removed,diffContext:theme.diff.text.context,diffHunkHeader:theme.diff.text.hunkHeader,diffHighlightAdded:theme.diff.highlight.added,diffHighlightRemoved:theme.diff.highlight.removed,diffAddedBg:theme.diff.background.added,diffRemovedBg:theme.diff.background.removed,diffContextBg:theme.diff.background.context,diffLineNumber:theme.diff.lineNumber.text,diffAddedLineNumberBg:theme.diff.lineNumber.background.added,diffRemovedLineNumberBg:theme.diff.lineNumber.background.removed,markdownText:theme.markdown.text,markdownHeading:theme.markdown.heading,markdownLink:theme.markdown.link,markdownLinkText:theme.markdown.linkText,markdownCode:theme.markdown.code,markdownBlockQuote:theme.markdown.blockQuote,markdownEmph:theme.markdown.emphasis,markdownStrong:theme.markdown.strong,markdownHorizontalRule:theme.markdown.horizontalRule,markdownListItem:theme.markdown.listItem,markdownListEnumeration:theme.markdown.listEnumeration,markdownImage:theme.markdown.image,markdownImageText:theme.markdown.imageText,markdownCodeBlock:theme.markdown.codeBlock,syntaxComment:theme.syntax.comment,syntaxKeyword:theme.syntax.keyword,syntaxFunction:theme.syntax.function,syntaxVariable:theme.syntax.variable,syntaxString:theme.syntax.string,syntaxNumber:theme.syntax.number,syntaxType:theme.syntax.type,syntaxOperator:theme.syntax.operator,syntaxPunctuation:theme.syntax.punctuation,thinkingOpacity:0.6
 }}
+function bindToolbarActionState(context,api){setQuickActionStateSource(api,(id)=>{const route=context.ui.router.current()
+if(id!=="session.compact"||route.type!=="session")
+return
+const revert=context.data.session.get(route.sessionID)?.revert?.messageID
+return context.data.session.message.list(route.sessionID).some((message)=>(!revert||message.id<revert)&&message.type==="compaction"&&message.status==="running")?"compacting":"idle"
+})
+}
 
 
 function createV2UI(context){let dialogOpen=false
 function DialogPrompt(props){let active=true
-onCleanup26(()=>{active=false
+onCleanup29(()=>{active=false
 })
-onMount7(async ()=>{const value=await context.ui.dialog.prompt({title:props.title,placeholder:props.placeholder,value:props.value
+onMount6(async ()=>{const value=await context.ui.dialog.prompt({title:props.title,placeholder:props.placeholder,value:props.value
 })
 if(!active)
 return
@@ -7439,9 +7362,9 @@ props.onConfirm?.(value)
 return _$createElement("box")
 }
 function DialogConfirm(props){let active=true
-onCleanup26(()=>{active=false
+onCleanup29(()=>{active=false
 })
-onMount7(async ()=>{const confirmed=await context.ui.dialog.confirm({title:props.title,message:props.message
+onMount6(async ()=>{const confirmed=await context.ui.dialog.confirm({title:props.title,message:props.message
 })
 if(!active)
 return
@@ -7501,38 +7424,164 @@ context.ui.router.navigate({type:"plugin",name,data:params})
 },client:{...remote.client,session:sessions.client
 },event:createV2EventAdapter(context,sessions),theme:{get current(){return legacyTheme(context.theme)
 },ready:true,mode:()=>context.themeMode
-},attention:context.attention,lifecycle:{signal:controller.signal,onDispose},slots:createV2Slots(context,keymap,(dispose)=>{onDispose(dispose)
+},attention:context.attention,lifecycle:{signal:controller.signal,onDispose},slots:createV2Slots(context,(dispose)=>{onDispose(dispose)
 })
 }
-setHostCapabilities(api,{todo:true,lsp:false,titleVisibility:false,permissionMode:false
+setHostCapabilities(api,{todo:true,lsp:false,titleVisibility:false,permissionMode:false,commandsReachableOnly:true
 })
+bindToolbarActionState(context,api)
 return{api,async dispose(){controller.abort()
 for(let index=disposers.length-1;index>=0; index--)
 await disposers[index]()
 disposers.length=0
 }}}
+var statuses=new Set(["pending","in_progress","completed","cancelled"])
+function parseTodos(value){if(!Array.isArray(value))
+return []
+return value.flatMap((item)=>{if(!item||typeof item!=="object"||!("content" in item)||typeof item.content!=="string"||!item.content)
+return []
+const status="status" in item&&typeof item.status==="string"&&statuses.has(item.status)?item.status:"pending"
+return [{content:item.content,status}]
+})
+}
+function nativeTodos(messages,boundary){const boundaryIndex=boundary?messages.findIndex((message)=>message.id===boundary):-1
+const end=boundaryIndex===-1?messages.length:boundaryIndex
+for(let index=end-1;index>=0; index--){const message=messages[index]
+if(message.type!=="assistant")
+continue
+for(let part=message.content.length-1;part>=0; part--){const item=message.content[part]
+if(item.type==="tool"&&item.name==="todowrite"&&item.state.status==="completed")
+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)
+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 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)
+if(force)
+collection.invalidate(ref)
+await collection.sync(ref)
+signal.throwIfAborted()
+}
+function createV2McpSource(context){const collection=context.data.location.mcp.server
+const projections=new WeakMap
+const list=(target)=>(collection.list(collectionLocation(target))??[]).map((server)=>{let item=projections.get(server)
+if(!item){item={get name(){return server.name
+},get title(){return server.title
+},get status(){return server.status.status
+},get error(){return "error" in server.status?server.status.error:undefined
+}}
+projections.set(server,item)
+}
+return item
+})
+return{list,async refresh(target,force,signal){await syncCollection(collection,target,force,signal)
+return list(target)
+}}}
+function createV2SkillSource(context){const projections=new WeakMap
+const collection=context.data.location.skill
+const list=(target)=>(collection.list(collectionLocation(target))??[]).map((skill)=>{let item=projections.get(skill)
+if(!item){item={get id(){return skill.id
+},get name(){return skill.name
+},get description(){return skill.description
+},get location(){return skill.path
+},get content(){return skill.content
+}}
+projections.set(skill,item)
+}
+return item
+})
+return{list,async refresh(target,force,signal){await syncCollection(collection,target,force,signal)
+return list(target)
+},async use(target,skill,signal){signal.throwIfAborted()
+const route=context.ui.router.current()
+const session=route.type==="session"&&context.data.session.get(route.sessionID)
+const actual=list(target).find((item)=>item.id===skill.id&&item.location===skill.location)
+if(route.type!=="session"||!session||session.location.directory!==target.routing.directory||!actual?.id)
+throw new Error("Skill target changed; select the source again")
+await context.client.session.skill({sessionID:route.sessionID,id:actual.id},{signal})
+return !signal.aborted
+}}}
+function createV2SubagentSource(context,api){return{list:(parentID)=>context.data.session.list().filter((item)=>item.parentID===parentID).flatMap((item)=>{const value=api.state.session.get(item.id)
+return value?[value]:[]
+}),status:(id)=>api.state.session.status(id)??{type:"idle"},async refresh(parentID,signal){signal.throwIfAborted()
+let cursor
+do{const page=await context.client.session.list(cursor?{cursor,limit:100}:{parentID,limit:100},{signal
+})
+await Promise.all(page.data.filter((item)=>!context.data.session.get(item.id)).map((item)=>context.data.session.sync(item.id)))
+cursor=page.cursor.next??undefined
+signal.throwIfAborted()
+} while(cursor)
+}}}
+function createOpenCodeV2Sources(context,api){return{skills:createV2SkillSource(context),mcp:createV2McpSource(context),subagents:createV2SubagentSource(context,api)
+}}
 function loadNavigatorUpdates(){const path=import.meta.url.includes("/dist/tui.js")?"./navigator-updates.js":"../navigator-updates"
 return import(path)
 }
-async function setupNavigator(api,options,readProject,managedTodo,hostContext){const config=pluginConfig(undefined)
+async function setupNavigator(api,options,readProject,todoController,hostContext){const config=pluginConfig(undefined)
 const configured=await loadConfiguredDefaults(api,options,readProject)
-const todo=managedTodo??createTodoController(api)
-const subagents=createSubagentController(api)
-const skills=createSkillController(api)
+const todo=todoController??createTodoController(api)
+const nativeSources=hostContext&&createOpenCodeV2Sources(hostContext,api)
+const subagents=createSubagentController(api,{source:nativeSources?.subagents
+})
+const skills=createSkillController(api,nativeSources?.skills)
 const preferences=createPreferencesController(api,config,createPreferencesStore(api.state.path.state),configured)
 const limitsPath=import.meta.url.includes("/dist/tui.js")?"./provider-limits.js":"../provider-limits"
 const limitsModule=await import(limitsPath)
 const LimitsSection=limitsModule.ProviderLimitsSection
 const{controller:limits,codex,accountSource,selectModel,modelSelection
-}=limitsModule.createProviderQuotaIntegration(api,preferences,"0.21.8",hostContext)
-const mcp=createMcpController(api,preferences.persistMcp,preferences)
-const interaction=createSidebarInteraction(api,()=>openKeyboardHelp(api,preferences.lspIconStyle,preferences.cornerFont))
+}=limitsModule.createProviderQuotaIntegration(api,preferences,"0.23.0",hostContext)
+const mcp=createMcpController(api,preferences.persistMcp,preferences,nativeSources?.mcp)
+const interaction=createSidebarInteraction(api,()=>openKeyboardHelp(api,preferences.lspIconStyle,preferences.cornerFont,sidebarShortcutActions(api)))
 const startup=createStartupSessionController(api,preferences)
 api.lifecycle.onDispose(()=>preferences.flush())
 api.lifecycle.onDispose(()=>limits.dispose())
 api.lifecycle.onDispose(()=>accountSource?.dispose())
 api.lifecycle.onDispose(()=>interaction.dispose())
-const unsubscribeMcp=api.event.on("mcp.tools.changed",()=>{mcp.refresh().catch(()=>{})
+const unsubscribeMcp=api.event.on("mcp.tools.changed",()=>{if(!nativeSources)
+mcp.refresh().catch(()=>{})
 })
 const unsubscribeConnected=api.event.on("server.connected",()=>{if(!api.state.ready||!api.kv.ready)
 return
@@ -7552,7 +7601,7 @@ api.slots.register({order:100,slots:{app(){return _$createComponent(IconProvider
 },interaction,skills,subagents,mcp
 }),_$createComponent(FirstRunWizardPersistence,{api,preferences
 }),_$createComponent(StartupSessionBinding,{api,controller:startup
-}),_$createComponent(UpgradeNotesBinding,{api,preferences,version:"0.21.8"
+}),_$createComponent(UpgradeNotesBinding,{api,preferences,version:"0.23.0"
 }),_$createComponent(McpPersistence,{api,controller:mcp
 })]
 }})
@@ -7585,19 +7634,19 @@ return result.data?.type==="text"?result.data.content:undefined
 })
 const{createVersionStatus,createVersionUpdateActions,createOpenCodeV1VersionUpdater
 }=await loadNavigatorUpdates()
-const versionStatus=createVersionStatus(api,"0.21.8")
-const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.21.8"))
+const versionStatus=createVersionStatus(api,"0.23.0")
+const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.23.0"))
 api.slots.register({order:90,slots:{sidebar_footer(_context,props){return _$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
 },get children(){return _$createComponent(VersionFooter,{api,get sessionID(){return props.session_id
-},navigatorVersion:"0.21.8",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.23.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }})
 }})
 }}})
 }
 var setupOpenCodeV2=async (context)=>{const adapter=createOpenCodeV2Api(context)
-const todo=createNavigatorTodoController(context,adapter.api)
+const todo=createNativeTodoController(context,adapter.api)
 const{mcp,skills,preferences
 }=await setupNavigator(adapter.api,context.options,async ()=>{if(!context.client.file?.read)
 return
@@ -7606,15 +7655,15 @@ return new TextDecoder().decode(await context.client.file.read({location:context
 },todo,context)
 const{createVersionStatus,createVersionUpdateActions,createOpenCodeV2VersionUpdater
 }=await loadNavigatorUpdates()
-const versionStatus=createVersionStatus(adapter.api,"0.21.8")
-const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.21.8"))
+const versionStatus=createVersionStatus(adapter.api,"0.23.0")
+const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.23.0"))
 const disposeFooter=context.ui.slot({append:"sidebar.footer",render:()=>_$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
 },get children(){var _el$=_$createElement("box")
 _$setProp(_el$,"flexDirection","row")
 _$setProp(_el$,"justifyContent","space-between")
 _$insert(_el$,_$createComponent(VersionSummary,{get api(){return adapter.api
-},navigatorVersion:"0.21.8",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.23.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }}),null)
 _$insert(_el$,_$createComponent(SettingsFooterButton,{get api(){return adapter.api
@@ -7629,5 +7678,5 @@ await adapter.dispose()
 var plugin={id:PLUGIN_ID,tui:setupOpenCodeV1,setup:setupOpenCodeV2
 }
 var plugin_default=plugin
-export{DEFAULT_SECTION_EXPANSION,DialogAction,DialogHeader,DialogSurface,FOCUS_COMMAND,FirstRunWizard,GuardedConfirmation,KeyboardHelpDialog,LspBadge,McpSection,SelectionMenu as PresetMenu,QUICK_ACTIONS,Section,SectionFilter,SelectionBox,SelectionMenu,SettingsDialog,SidebarFocusBinding,SidebarToggleBinding,SkillsSection,createDialogStack,createMcpController,createPreferencesController,createSidebarInteraction,createSkillController,createSubagentController,createTodoController,plugin_default as default,isEffectivelyVisible,lspIcon,matchesFilter,openFirstRunWizard,openKeyboardHelp,openSettings,showFirstRunWizard,subtleLineColor,useDialogScroll,useDialogState,useDialogs,useIcons
+export{DEFAULT_SECTION_EXPANSION,DialogAction,DialogHeader,DialogSurface,FOCUS_COMMAND,FirstRunWizard,GuardedConfirmation,IconControl,IconPicker,KeyboardHelpDialog,LspBadge,McpSection,SelectionMenu as PresetMenu,QUICK_ACTIONS,QUICK_ACTION_IDS,Section,SectionFilter,SelectionBox,SelectionMenu,SettingsDialog,SidebarFocusBinding,SidebarToggleBinding,SkillsSection,Tab,TodoSection,createDialogStack,createMcpController,createNativeTodoController,createPreferencesController,createQuickActionRevision,createSidebarInteraction,createSkillController,createSubagentController,createTodoController,currentPermissionMode,plugin_default as default,hostCapabilities,hostCapabilityUnavailable,isEffectivelyVisible,lspIcon,matchesFilter,openFirstRunWizard,openKeyboardHelp,openSettings,orderQuickActionIds,parseQuickActionOrder,parseQuickActionVisibility,quickActionDisabledReason,quickActionLabel,quickActionRequiresSession,quickActionState,quickActionStates,setHostCapabilities,setQuickActionStateSource,showFirstRunWizard,subtleLineColor,supportsPermissionMode,supportsSidebarSection,supportsTitleVisibility,terminalIcon,terminalIconIDs,terminalIconLabel,useDialogScroll,useDialogState,useDialogs,useIcons
 }