opencode-navigator 0.19.2 → 0.20.0

package/dist/tui.js

@@ -3,14 +3,14 @@ import {insert as _$insert,setProp as _$setProp,createElement as _$createElement
 
 
 
-import {createSignal as createSignal2,createSignal,createEffect,onCleanup,createContext,useContext,createContext as createContext2,createSignal as createSignal3,useContext as useContext2,createEffect as createEffect2,splitProps,untrack,splitProps as splitProps2,For,createEffect as createEffect3,onCleanup as onCleanup2,Show,splitProps as splitProps3,createSignal as createSignal4,createSignal as createSignal5,createSignal as createSignal6,onCleanup as onCleanup3,batch,createSignal as createSignal8,createSignal as createSignal7,createEffect as createEffect4,createSignal as createSignal9,onCleanup as onCleanup4,createSignal as createSignal10,createSignal as createSignal11,Index,createSignal as createSignal12,onCleanup as onCleanup5,createEffect as createEffect6,onCleanup as onCleanup7,batch as batch2,createEffect as createEffect5,createMemo,createSignal as createSignal13,onCleanup as onCleanup6,onMount,For as For2,For as For3,Show as Show2,createMemo as createMemo2,Show as Show3,createSignal as createSignal14,onCleanup as onCleanup8,For as For4,For as For5,For as For8,createMemo as createMemo4,onMount as onMount3,For as For7,createMemo as createMemo3,onMount as onMount2,Show as Show5,createEffect as createEffect7,createSignal as createSignal15,onCleanup as onCleanup9,Show as Show4,For as For6,For as For9,createEffect as createEffect8,createMemo as createMemo5,onCleanup as onCleanup10,createEffect as createEffect9,createMemo as createMemo6,untrack as untrack2,For as For10,createEffect as createEffect10,createMemo as createMemo9,onCleanup as onCleanup11,onMount as onMount4,createMemo as createMemo7,createMemo as createMemo8,Show as Show6,onCleanup as onCleanup12,createEffect as createEffect11,onCleanup as onCleanup13,createSignal as createSignal16,createEffect as createEffect12,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,createEffect as createEffect13,createSignal as createSignal22,createMemo as createMemo13,createSignal as createSignal24,createMemo as createMemo12,For as For13,Show as Show14,Show as Show11,Show as Show12,Show as Show13,createSignal as createSignal23,onCleanup as onCleanup17,For as For14,Show as Show16,createMemo as createMemo15,Show as Show15,createMemo as createMemo14,createSignal as createSignal25,createEffect as createEffect14,onCleanup as onCleanup18,For as For19,Match,Switch,createMemo as createMemo19,onCleanup as onCleanup22,For as For15,Show as Show17,createSignal as createSignal26,createEffect as createEffect15,createMemo as createMemo16,onCleanup as onCleanup19,untrack as untrack5,For as For17,Show as Show20,createEffect as createEffect16,createMemo as createMemo17,createSignal as createSignal27,onCleanup as onCleanup20,untrack as untrack6,For as For16,Show as Show19,Show as Show18,Show as Show24,createEffect as createEffect17,createMemo as createMemo18,createSignal as createSignal28,onCleanup as onCleanup21,untrack as untrack7,For as For18,Show as Show22,Show as Show21,Show as Show23,createEffect as createEffect18,createMemo as createMemo20,onCleanup as onCleanup23,untrack as untrack8,Show as Show25,createMemo as createMemo21,onCleanup as onCleanup24,createSignal as createSignal29,onCleanup as onCleanup25,onMount as onMount7} from "solid-js"
-var SIDEBAR_SECTIONS=["todo","subagents","skills","quick_actions","lsp","mcp"]
+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,createEffect as createEffect14,createSignal as createSignal22,createMemo as createMemo13,createSignal as createSignal25,createMemo as createMemo12,For as For13,Show as Show14,Show as Show11,Show as Show12,createSignal as createSignal23,createContext as createContext3,useContext as useContext3,Show as Show13,createSignal as createSignal24,onCleanup as onCleanup17,For as For14,Show as Show16,createSignal as createSignal26,untrack as untrack5,createSignal as createSignal27,createEffect as createEffect15,Show as Show15,For as For15,Show as Show18,createMemo as createMemo15,Show as Show17,createMemo as createMemo14,createSignal as createSignal28,createEffect as createEffect16,onCleanup as onCleanup18,For as For20,Match,Switch,createMemo as createMemo19,onCleanup as onCleanup22,For as For16,Show as Show19,createSignal as createSignal29,createEffect as createEffect17,createMemo as createMemo16,onCleanup as onCleanup19,untrack as untrack6,For as For18,Show as Show22,createEffect as createEffect18,createMemo as createMemo17,createSignal as createSignal30,onCleanup as onCleanup20,untrack as untrack7,For as For17,Show as Show21,Show as Show20,Show as Show26,createEffect as createEffect19,createMemo as createMemo18,createSignal as createSignal31,onCleanup as onCleanup21,untrack as untrack8,For as For19,Show as Show24,Show as Show23,Show as Show25,createEffect as createEffect20,createMemo as createMemo20,onCleanup as onCleanup23,untrack as untrack9,Show as Show27,createMemo as createMemo21,onCleanup as onCleanup24,createEffect as createEffect21,onCleanup as onCleanup25,untrack as untrack10,createSignal as createSignal32,onCleanup as onCleanup26,onMount as onMount7} from "solid-js"
+var SIDEBAR_SECTIONS=["limits","todo","subagents","skills","quick_actions","lsp","mcp"]
 var QUICK_ACTION_IDS=["session.rename","session.timeline","session.copy","session.export","session.compact","session.list","session.new","session.fork","messages.copy","session.first","session.last","session.messages_last_user","session.message.next","session.message.previous","permission.mode"]
 function preferencesScope(path){return path.worktree||path.directory||"global"
 }
-var DEFAULT_SECTION_EXPANSION={todo:true,subagents:false,skills:false,quick_actions:false,lsp:false,mcp:false
+var DEFAULT_SECTION_EXPANSION={limits:true,todo:true,subagents:false,skills:false,quick_actions:false,lsp:false,mcp:false
 }
-var SECTION_DEFINITIONS=[{name:"todo",label:"Todo"},{name:"subagents",label:"Subagents"},{name:"skills",label:"Skills"},{name:"quick_actions",label:"Quick actions"},{name:"lsp",label:"LSP"},{name:"mcp",label:"MCP"}]
+var SECTION_DEFINITIONS=[{name:"limits",label:"Limits"},{name:"todo",label:"Todo"},{name:"subagents",label:"Subagents"},{name:"skills",label:"Skills"},{name:"quick_actions",label:"Quick actions"},{name:"lsp",label:"LSP"},{name:"mcp",label:"MCP"}]
 function parseQuickActionOrder(value){if(!Array.isArray(value))
 return
 const order=[...new Set(value.filter((id)=>QUICK_ACTION_IDS.includes(id)))]
@@ -30,9 +30,11 @@ continue
 seen.add(candidate)
 order.push(candidate)
 }
-for(const section of SIDEBAR_SECTIONS){if(!seen.has(section))
+for(const section of SIDEBAR_SECTIONS){if(!seen.has(section)){if(section==="limits")
+order.unshift(section)
+else
 order.push(section)
-}
+}}
 return order
 }
 function parseSectionPreferences(value){if(!value||typeof value!=="object"||Array.isArray(value))
@@ -61,7 +63,7 @@ return defaults
 const input=value
 return Object.fromEntries(Object.entries(defaults).map(([name,visible])=>[name,typeof input[name]==="boolean"?input[name]:visible]))
 }
-function parseSectionVisibility(value){return resolveSectionVisibility({todo:true,subagents:true,skills:true,quick_actions:true,lsp:true,mcp:true
+function parseSectionVisibility(value){return resolveSectionVisibility({limits:true,todo:true,subagents:true,skills:true,quick_actions:true,lsp:true,mcp:true
 },value)
 }
 var PLUGIN_ID="opencode-navigator"
@@ -495,7 +497,7 @@ return changeMany({action:state.action,...state.preset&&{preset:state.preset},..
 
 
 
-var ICONS={todo:["\uEAB3","[T]"],subagents:["\uEA7E","[A]"],skills:["\uEAA4","[S]"],actions:["\uEB9E","[Q]"],lsp:["\uEAC4","{}"],mcp:["\uEB2D","[M]"],sections:["\uEBEB","[]"],scope:["\uEB01","@"],presets:["\uEBD2","#"],settings:["\uEAF8","[=]"],reset:["\uEB37","R"],save:["\uEB4B","S"],add:["\uEA60","+"],edit:["\uEA73","[R]"],history:["\uEA82","[T]"],copy:["\uEBCC","[C]"],export:["\uEBAC","[E]"],compact:["\uEAF5","[-]"],checked:["\uEBB3","[x]"],unchecked:["\uEBB5","[ ]"],selected:["\uEAB6",">"],expanded:["\uEAB4","v"],collapsed:["\uEAB6",">"],radioOn:["\uEA71","(*)"],radioOff:["\uEABC","( )"],done:["\uEAB2","v"],busy:["\uEA71","*"],idle:["\uEABC","-"],close:["\uEA76","x"],error:["\uEA87","!"],retry:["\uEA77","~"],pending:["\uDB86\uDD78","..."],connected:["\uDB81\uDC3E","(*)"],disconnected:["\uDB81\uDC3D","( )"],favorite:["\uEB59","*"],favoriteEmpty:["\uEA6A","+"],bookmark:["\uDB80\uDCC0","*"],bookmarkEmpty:["\uDB80\uDCC3","+"],mcpFavorite:["\uDB80\uDCC0","*"],mcpFavoriteEmpty:["\uDB80\uDCC3","+"],recent:["\uEA82","~"],info:["\uEA74","i"],search:["\uEA6D","/"],update:["\uDB80\uDC5F","^"],up:["\uEAA1","^"],down:["\uEA9A","v"],left:["\uEA9B","<"],right:["\uEA9C",">"],keyEnter:["\uEBEA","enter"],keyTab:["\uDB80\uDF12","tab"],keyEscape:["\uDB84\uDEB7","esc"],keySpace:["\uDB84\uDC50","space"],delete:["\uEA81","del"],priorityMedium:["\uEA71","-"],help:["\uEB32","?"],selectionLeft:["\uE0B6"," "],selectionRight:["\uE0B4"," "],selectionTopLeft:["\uDBFC\uDC04"," "],selectionTopRight:["\uDBFC\uDC05"," "],selectionBottomLeft:["\uDBFC\uDC06"," "],selectionBottomRight:["\uDBFC\uDC07"," "]
+var ICONS={limits:["\uDB80\uDE9A","%"],todo:["\uEAB3","[T]"],subagents:["\uEA7E","[A]"],skills:["\uEAA4","[S]"],actions:["\uEB9E","[Q]"],lsp:["\uEAC4","{}"],mcp:["\uEB2D","[M]"],sections:["\uEBEB","[]"],scope:["\uEB01","@"],presets:["\uEBD2","#"],settings:["\uEAF8","[=]"],reset:["\uEB37","R"],save:["\uEB4B","S"],add:["\uEA60","+"],edit:["\uEA73","[R]"],history:["\uEA82","[T]"],copy:["\uEBCC","[C]"],export:["\uEBAC","[E]"],compact:["\uEAF5","[-]"],checked:["\uEBB3","[x]"],unchecked:["\uEBB5","[ ]"],selected:["\uEAB6",">"],expanded:["\uEAB4","v"],collapsed:["\uEAB6",">"],radioOn:["\uEA71","(*)"],radioOff:["\uEABC","( )"],done:["\uEAB2","v"],busy:["\uEA71","*"],idle:["\uEABC","-"],close:["\uEA76","x"],error:["\uEA87","!"],retry:["\uEA77","~"],pending:["\uDB86\uDD78","..."],connected:["\uDB81\uDC3E","(*)"],disconnected:["\uDB81\uDC3D","( )"],favorite:["\uEB59","*"],favoriteEmpty:["\uEA6A","+"],bookmark:["\uDB80\uDCC0","*"],bookmarkEmpty:["\uDB80\uDCC3","+"],mcpFavorite:["\uDB80\uDCC0","*"],mcpFavoriteEmpty:["\uDB80\uDCC3","+"],recent:["\uEA82","~"],info:["\uEA74","i"],search:["\uEA6D","/"],update:["\uDB80\uDC5F","^"],up:["\uEAA1","^"],down:["\uEA9A","v"],left:["\uEA9B","<"],right:["\uEA9C",">"],keyEnter:["\uEBEA","enter"],keyTab:["\uDB80\uDF12","tab"],keyEscape:["\uDB84\uDEB7","esc"],keySpace:["\uDB84\uDC50","space"],delete:["\uEA81","del"],priorityMedium:["\uEA71","-"],help:["\uEB32","?"],selectionLeft:["\uE0B6"," "],selectionRight:["\uE0B4"," "],selectionTopLeft:["\uDBFC\uDC04"," "],selectionTopRight:["\uDBFC\uDC05"," "],selectionBottomLeft:["\uDBFC\uDC06"," "],selectionBottomRight:["\uDBFC\uDC07"," "]
 }
 function uiIcon(name,style="nerd"){return ICONS[name][style==="text"?1:0]
 }
@@ -846,6 +848,7 @@ return _el$
 
 
 
+
 function IconControl(props){function mouseOver(event){props.onMouseOver?.()
 event.stopPropagation()
 }
@@ -873,7 +876,7 @@ function BookmarkControl(props){const icons=useIcons()
 return _$createComponent(IconControl,{ref(r$){var _ref$=props.ref
 typeof _ref$==="function"?_ref$(r$):props.ref=r$
 },get id(){return props.id
-},get icon(){return icons.icon(props.bookmarked?"bookmark":"bookmarkEmpty")
+},get icon(){return _$memo(()=>props.visible?.()===false)()?" ":icons.icon(props.bookmarked?"bookmark":"bookmarkEmpty")
 },get backgroundColor(){return props.backgroundColor
 },get foregroundColor(){return props.foregroundColor
 },get onMouseOver(){return props.onMouseOver
@@ -914,13 +917,13 @@ return _el$
 
 
 
-function PresetMenu(props){const icons=useIcons()
+function SelectionMenu(props){const icons=useIcons()
 const dialogs=useDialogs(props.api)
 const scroll=useDialogScroll()
 const [active,setActive]=useDialogState("selection",0)
 const theme=()=>props.api.theme.current
 let body
-const prefix=`${PLUGIN_ID}.mcp-preset-menu`
+const prefix=`${PLUGIN_ID}.selection-menu`
 createEffect3(()=>{if(active()>=props.options.length)
 setActive(Math.max(0,props.options.length-1))
 })
@@ -1015,6 +1018,19 @@ return _el$7
 }
 
 
+function GuardedConfirmation(props){const dialogs=useDialogs(props.api)
+createEffect4(()=>{if(!props.current())
+dialogs.close()
+})
+return _$createComponent(props.api.ui.DialogConfirm,{get title(){return props.title
+},get message(){return props.message
+},onConfirm:()=>{if(props.current())
+props.onConfirm()
+},get onCancel(){return dialogs.back
+}})
+}
+
+
 
 
 
@@ -1060,7 +1076,7 @@ return _p$
 return _el$
 }}))
 }
-function McpErrorDialog(props){return _$createComponent(PresetMenu,{get api(){return props.api
+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"
 }]
@@ -1221,6 +1237,11 @@ return server.trim()&&group?[[server,group]]:[]
 }))
 }
 var parseSkillGroups=parseMcpServerGroups
+var parseCodexAccountBindings=parseMcpServerGroups
+function parsePendingResetAttempt(value){const input=record(value)
+if(!input||typeof input.providerID!=="string"||typeof input.modelID!=="string"||typeof input.accountID!=="string"||typeof input.idempotencyKey!=="string"||!/^[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}$/iu.test(input.idempotencyKey)||typeof input.createdAt!=="number"||!Number.isFinite(input.createdAt)||input.creditID!==undefined&&typeof input.creditID!=="string")
+return
+return{providerID:input.providerID,modelID:input.modelID,accountID:input.accountID,idempotencyKey:input.idempotencyKey,createdAt:input.createdAt,...input.creditID&&{creditID:input.creditID}}}
 function parseWorkspaceProfiles(value){return Object.fromEntries(Object.entries(record(value)??{}).flatMap(([layout,rawMcp])=>{const layoutName=layout.trim().slice(0,64)
 const mcpName=typeof rawMcp==="string"?rawMcp.trim().slice(0,64):""
 return layoutName&&mcpName?[[layoutName,mcpName]]:[]
@@ -1255,11 +1276,13 @@ const recentSkills=parseRecentSkills(userInput?.recentSkills)
 const recentQuickActions=parseRecentQuickActions(userInput?.recentQuickActions)
 const mcpServerGroups=parseMcpServerGroups(userInput?.mcpServerGroups)
 const skillGroups=parseSkillGroups(userInput?.skillGroups)
+const codexAccountBindings=parseCodexAccountBindings(userInput?.codexAccountBindings)
+const pendingResetAttempt=parsePendingResetAttempt(userInput?.pendingResetAttempt)
 const workspaceProfiles=parseWorkspaceProfiles(userInput?.workspaceProfiles)
 return{global:{...Object.keys(behavior).length>0&&{behavior},...layout&&{layout},...Object.keys(globalMcp).length>0&&{mcp:globalMcp}},worktrees,user:{...skippedSkillConfirmations&&{skippedSkillConfirmations},...typeof userInput?.onboardingCompleted==="boolean"&&{onboardingCompleted:userInput.onboardingCompleted
 },...typeof userInput?.lastNavigatorVersion==="string"&&{lastNavigatorVersion:userInput.lastNavigatorVersion
 },...typeof userInput?.previousNavigatorVersion==="string"&&{previousNavigatorVersion:userInput.previousNavigatorVersion
-},...Object.keys(layoutPresets).length>0&&{layoutPresets},...Object.keys(mcpPresets).length>0&&{mcpPresets},...favoriteSkills&&{favoriteSkills},...favoriteMcpServers?.length&&{favoriteMcpServers},...favoriteQuickActions.length>0&&{favoriteQuickActions},...recentSkills.length>0&&{recentSkills},...recentQuickActions.length>0&&{recentQuickActions},...Object.keys(mcpServerGroups).length>0&&{mcpServerGroups},...Object.keys(skillGroups).length>0&&{skillGroups},...typeof userInput?.autoApprovePermissions==="boolean"&&{autoApprovePermissions:userInput.autoApprovePermissions
+},...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}}}}
 function parseValues(value){if(!value)
 return{}
@@ -1407,6 +1430,15 @@ const recentSkills=parseRecentSkills([...update.user?.recentSkill?[update.user.r
 const recentQuickActions=parseRecentQuickActions([...update.user?.recentQuickAction?[update.user.recentQuickAction]:[],...current.user.recentQuickActions??[]])
 const mcpServerGroups=assignGroup(current.user.mcpServerGroups,update.user?.mcpServerGroup?.name,update.user?.mcpServerGroup?.group)
 const skillGroups=assignGroup(current.user.skillGroups,update.user?.skillGroup?.location,update.user?.skillGroup?.group)
+const binding=update.user?.codexAccountBinding
+const codexAccountBindings=assignGroup(current.user.codexAccountBindings,binding?.providerID&&binding.modelID?JSON.stringify([binding.providerID,binding.modelID]):undefined,binding?.accountID)
+const pendingUpdate=update.user?.pendingResetAttempt
+const currentAttempt=current.user.pendingResetAttempt
+if(pendingUpdate&&currentAttempt&&currentAttempt.idempotencyKey!==pendingUpdate.idempotencyKey){throw new Error("Another reset attempt is still unresolved")
+}
+if(update.user?.clearPendingResetAttempt&&currentAttempt?.idempotencyKey!==update.user.clearPendingResetAttempt){throw new Error("Reset attempt changed; refresh before retrying")
+}
+const pendingResetAttempt=update.user?.clearPendingResetAttempt?undefined:pendingUpdate??currentAttempt
 const favoriteSkills=update.user?.favoriteSkills?parseSkillConfirmations(update.user.favoriteSkills):[...current.user.favoriteSkills??[]]
 const favoriteSkill=update.user?.favoriteSkill
 if(favoriteSkill?.location){const index=favoriteSkills.indexOf(favoriteSkill.location)
@@ -1422,7 +1454,8 @@ return{global:target.kind==="global"?scope:current.global,worktrees,user:{...ski
 },...(update.user?.previousNavigatorVersion??current.user.previousNavigatorVersion)&&{previousNavigatorVersion:update.user?.previousNavigatorVersion??current.user.previousNavigatorVersion
 },...Object.keys(parsedLayoutPresets).length>0&&{layoutPresets:parsedLayoutPresets},...Object.keys(parsedMcpPresets).length>0&&{mcpPresets:parsedMcpPresets},...Object.keys(workspaceProfiles).length>0&&{workspaceProfiles:parseWorkspaceProfiles(workspaceProfiles)
 },...favoriteSkills.length>0&&{favoriteSkills},...favoriteMcpServers.size>0&&{favoriteMcpServers:[...favoriteMcpServers].sort()},...favoriteQuickActions.size>0&&{favoriteQuickActions:parseFavoriteQuickActions([...favoriteQuickActions])
-},...recentSkills.length>0&&{recentSkills},...recentQuickActions.length>0&&{recentQuickActions},...Object.keys(mcpServerGroups).length>0&&{mcpServerGroups:parseMcpServerGroups(mcpServerGroups)},...Object.keys(skillGroups).length>0&&{skillGroups:parseSkillGroups(skillGroups)},...typeof (update.user?.autoApprovePermissions??current.user.autoApprovePermissions)==="boolean"&&{autoApprovePermissions:update.user?.autoApprovePermissions??current.user.autoApprovePermissions
+},...recentSkills.length>0&&{recentSkills},...recentQuickActions.length>0&&{recentQuickActions},...Object.keys(mcpServerGroups).length>0&&{mcpServerGroups:parseMcpServerGroups(mcpServerGroups)},...Object.keys(skillGroups).length>0&&{skillGroups:parseSkillGroups(skillGroups)},...Object.keys(codexAccountBindings).length>0&&{codexAccountBindings:parseCodexAccountBindings(codexAccountBindings)
+},...pendingResetAttempt&&{pendingResetAttempt},...typeof (update.user?.autoApprovePermissions??current.user.autoApprovePermissions)==="boolean"&&{autoApprovePermissions:update.user?.autoApprovePermissions??current.user.autoApprovePermissions
 }}}}
 function targetForLegacyScope(scope){return scope==="global"?{kind:"global"}:{kind:"worktree",key:scope}}
 function createPreferencesStore(stateDirectory){const directory=join(stateDirectory,LEGACY_PLUGIN_ID)
@@ -1593,6 +1626,8 @@ const [recentQuickActions,setRecentQuickActions]=createSignal4([])
 const [mcpServerGroups,setMcpServerGroups]=createSignal4(configured.mcpServerGroups??{})
 const [skillGroups,setSkillGroups]=createSignal4({})
 const [autoApprovePermissions,setAutoApprovePermissions]=createSignal4()
+const [codexAccountBindings,setCodexAccountBindings]=createSignal4({})
+const [pendingResetAttempt,setPendingResetAttempt]=createSignal4()
 const [ready,setReady]=createSignal4(false)
 const [revision,setRevision]=createSignal4(0)
 const sessionLayouts=new Map
@@ -1662,6 +1697,8 @@ setRecentQuickActions(value.user.recentQuickActions??[])
 setMcpServerGroups({...configured.mcpServerGroups,...value.user.mcpServerGroups})
 setSkillGroups(value.user.skillGroups??{})
 setAutoApprovePermissions(value.user.autoApprovePermissions)
+setCodexAccountBindings(value.user.codexAccountBindings??{})
+setPendingResetAttempt(value.user.pendingResetAttempt)
 setReady(true)
 refreshResolved()
 }
@@ -1782,6 +1819,21 @@ return
 setAutoApprovePermissions(value)
 update({user:{autoApprovePermissions:value}})
 }
+function changeCodexAccountBinding(providerID,modelID,accountID){if(!isHydrated){load().then(()=>changeCodexAccountBinding(providerID,modelID,accountID))
+return
+}
+if(!providerID||!modelID)
+return
+const key=JSON.stringify([providerID,modelID])
+setCodexAccountBindings((currentBindings)=>{const next={...currentBindings}
+if(accountID)
+next[key]=accountID
+else
+delete next[key]
+return next
+})
+update({user:{codexAccountBinding:{providerID,modelID,accountID}}})
+}
 function toggleFavoriteMcpServer(name){if(!isHydrated){load().then(()=>toggleFavoriteMcpServer(name))
 return
 }
@@ -1852,7 +1904,13 @@ throw new Error("MCP preset no longer exists")
 update({user:{workspaceProfile:{layout,mcp}}})
 },favoriteSkills,favoriteMcpServers,favoriteQuickActions,toggleFavoriteMcpServer,toggleFavoriteQuickAction,recentSkills,recentQuickActions,mcpServerGroups,setMcpServerGroup(name,value){setMcpServerGroups(assignGroup(mcpServerGroups(),name,value))
 update({user:{mcpServerGroup:{name,group:value}}})
-},skillGroups,setSkillGroup:changeSkillGroup,autoApprovePermissions,setAutoApprovePermissions:changeAutoApprovePermissions,async recordSkillUse(skill){await load()
+},skillGroups,setSkillGroup:changeSkillGroup,autoApprovePermissions,setAutoApprovePermissions:changeAutoApprovePermissions,codexAccountForModel:(providerID,modelID)=>codexAccountBindings()[JSON.stringify([providerID,modelID])],setCodexAccountBinding:changeCodexAccountBinding,pendingResetAttempt,async beginResetAttempt(attempt){await load()
+await store.update({user:{pendingResetAttempt:attempt}})
+const current=await store.load()
+setPendingResetAttempt(current.user.pendingResetAttempt)
+},async finishResetAttempt(idempotencyKey){await store.update({user:{clearPendingResetAttempt:idempotencyKey}})
+setPendingResetAttempt(undefined)
+},async recordSkillUse(skill){await load()
 if(!skill.location)
 return
 setRecentSkills(parseRecentSkills([skill.location,...recentSkills()]))
@@ -2642,7 +2700,7 @@ value=`${Math.floor(seconds / 60)}m ${String(seconds % 60).padStart(2, "0")}s`
 return value
 }
 function createSubagentClock(key){const [now,setNow]=createSignal9(Date.now())
-createEffect4(()=>{if(key()===undefined)
+createEffect5(()=>{if(key()===undefined)
 return
 setNow(Date.now())
 const timer=setInterval(()=>setNow(Date.now()),1000)
@@ -3100,7 +3158,7 @@ unregister()
 onMount(()=>{input?.focus()
 refresh().catch(report)
 })
-createEffect5(()=>{if(!sameContext())
+createEffect6(()=>{if(!sameContext())
 dialogs.close()
 })
 return{active,activeTab,activate,allErrors,byID,dialogs,errors,icons,loading,matches,prefix,query,queryScope,resultColors,results,selectTab,setBody(node){body=node
@@ -3337,7 +3395,7 @@ timers.add(timer)
 }},{name:`${LEGACY_PLUGIN_ID}.search`,run(){props.api.keymap.dispatchCommand(SEARCH_COMMAND)
 }}]
 })
-createEffect6(()=>{const key=props.preferences.searchKey()
+createEffect7(()=>{const key=props.preferences.searchKey()
 const remove=props.api.keymap.registerLayer({mode:"base",bindings:[{key,cmd:SEARCH_COMMAND
 }]
 })
@@ -3351,18 +3409,6 @@ clearTimeout(timer)
 return _$createElement("box")
 }
 
-function createLayoutPresetPreview(preferences,name){const scope=preferences.selectedScopeKey()
-const valid=()=>preferences.selectedScopeKey()===scope
-const preset=createMemo2(()=>preferences.layoutPresets()[name])
-const preview=createMemo2(()=>{const value=preset()
-return value?preferences.previewLayoutPreset(value):undefined
-})
-return{valid,preview,scope:preferences.preferenceScopeLabel,blocked:()=>preset()?"":"Preset no longer exists.",apply(){const value=preset()
-if(!valid()||!value)
-return false
-preferences.applyLayoutPreset(value)
-return true
-}}}
 function createMcpPresetPreview(controller,preferences,name){const target=controller.target()
 const valid=()=>{const current=controller.target()
 return current.key===target.key&&current.scope===target.scope
@@ -3408,8 +3454,8 @@ function supportsTitleVisibility(api){return hostCapabilities(api).titleVisibili
 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."
-},{icon:"history",title:"Direct navigation",description:"Open a child session without leaving your workflow."
+},{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."
 }]
 },{title:"Find anything and launch Skills safely",summary:"Search complete source lists without expanding every sidebar section.",icon:"search",features:[{icon:"search",title:"Search Everything",description:"Search Skills, Subagents, MCP, and Actions in shared tabs."
 },{icon:"search",title:"Full source lists",description:"Search beyond sidebar visibility and item limits."},{icon:"skills",title:"Skill confirmation",description:"Review a skill and its source before inserting its command."
@@ -3805,7 +3851,7 @@ const unregister=props.api.keymap.registerLayer({mode:"modal",priority:1000,comm
 }]
 })
 onCleanup9(unregister)
-createEffect7(()=>{if(!props.valid())
+createEffect8(()=>{if(!props.valid())
 dialogs.close()
 })
 return _$createComponent(DialogSurface,{get api(){return props.api
@@ -3979,55 +4025,6 @@ const description=row.desired?{missing:`Not available in this workspace \xB7 tar
 return{icon:icons.icon("mcp"),title:row.name,description,changed:row.change==="connect"||row.change==="disconnect",skipped:row.change==="missing"||row.change==="unavailable",status:row.change==="connect"||row.change==="disconnect"?"changed":row.change==="missing"||row.change==="unavailable"?"skipped":"unchanged",statusIcon:row.change==="connect"?"connected":row.change==="disconnect"?"disconnected":row.change==="missing"||row.change==="unavailable"?"pending":"done",statusLabel:row.change==="connect"?"CONNECT":row.change==="disconnect"?"DISCONNECT":row.change==="missing"||row.change==="unavailable"?"SKIPPED":"UNCHANGED"
 }}).sort((a,b)=>Number(b.changed)-Number(a.changed)||Number(b.skipped)-Number(a.skipped))
 }
-function LayoutPresetPreview(props){const dialogs=useDialogs(props.api)
-const icons=useIcons()
-const model=createLayoutPresetPreview(props.preferences,props.name)
-const linked=props.preferences.workspaceProfiles?.()[props.name]
-const mcpModel=props.controller&&linked?createMcpPresetPreview(props.controller,props.preferences,linked):undefined
-const rows=createMemo4(()=>model.preview()?.rows.map((row)=>{const changes=[]
-if(row.visibility[0]!==row.visibility[1])
-changes.push(`${row.visibility[0] ? "visible" : "hidden"} -> ${row.visibility[1] ? "visible" : "hidden"}`)
-if(row.expansion[0]!==row.expansion[1])
-changes.push(`${row.expansion[0] ? "expanded" : "collapsed"} -> ${row.expansion[1] ? "expanded" : "collapsed"}`)
-if(row.position[0]!==row.position[1])
-changes.push(`position ${row.position[0]} -> ${row.position[1]}`)
-return{icon:icons.section(row.section),title:`${row.position[1]}. ${SECTION_DEFINITIONS.find((section) => section.name === row.section).label}`,description:changes.join(" \xB7 ")||"No changes",changed:changes.length>0,status:changes.length>0?"changed":"unchanged",statusIcon:changes.length>0?"edit":"done",statusLabel:changes.length>0?"CHANGED":"UNCHANGED"
-}}).sort((a,b)=>Number(b.changed)-Number(a.changed))??[])
-const mcpRows=createMemo4(()=>mcpModel?mcpPreviewRows(mcpModel,icons):[])
-const changed=()=>rows().filter((row)=>row.changed).length
-onMount3(()=>mcpModel?.refresh())
-return _$createComponent(PresetPreviewFrame,{get api(){return props.api
-},get title(){return `${mcpModel ? "Workspace profile" : "Layout preview"}: ${props.name}`
-},get scope(){return mcpModel?`${model.scope()} \xB7 MCP ${mcpModel.scope}`:model.scope()
-},get stats(){return [{icon:"edit",label:`${changed()} layout changed`,tone:"accent"
-},{icon:"done",label:`${rows().length - changed()} layout unchanged`,tone:"muted"
-}]
-},get rowCount(){return rows().length + mcpRows().length
-},valid:()=>model.valid()&&(!mcpModel||mcpModel.valid()),get blocked(){return model.blocked()||mcpModel?.blocked()
-},get onRefresh(){return mcpModel?.refresh
-},notice:mcpModel?"Applies both presets; layout stays session-only.":"Applies layout changes. Save current layout as default to persist them.",onApply:()=>{const request=mcpModel?.apply()
-if(mcpModel&&!request)
-return
-if(!model.apply())
-return
-if(mcpModel)
-dialogs.close()
-else{dialogs.back()
-dialogs.back()
-}
-props.api.ui.toast({variant:"success",title:mcpModel?"Workspace profile":"Layout presets",message:`${props.name} applied to ${model.scope()}`,duration:3000
-})
-if(request)
-reportMcpApplyError(props.api,request)
-},get children(){return [_$createComponent(For8,{get each(){return rows()
-},children:(row)=>_$createComponent(PresetPreviewRow,_$mergeProps({get api(){return props.api
-}},row))
-}),_$createComponent(For8,{get each(){return mcpRows()
-},children:(row)=>_$createComponent(PresetPreviewRow,_$mergeProps({get api(){return props.api
-}},row))
-})]
-}})
-}
 
 
 
@@ -4057,7 +4054,7 @@ if(renameFrom)
 dialogs.back()
 }})
 }
-function actions(name){dialogs.open(()=>_$createComponent(PresetMenu,{api,title:name,options:[{title:"Preview & apply",value:"apply",description:"review server changes before applying",icon:"info"
+function actions(name){dialogs.open(()=>_$createComponent(SelectionMenu,{api,title:name,options:[{title:"Preview & apply",value:"apply",description:"review server changes before applying",icon:"info"
 },{title:"Update from current",value:"update",description:"replace the saved states",icon:"save"
 },{title:"Rename",value:"rename",description:"change the preset name",icon:"edit"
 },{title:"Delete",value:"delete",description:"remove this preset",icon:"delete"
@@ -4089,7 +4086,7 @@ notify(`Deleted ${name}`)
 dialogs.back()
 }}))
 }
-dialogs.open(()=>_$createComponent(PresetMenu,{api,title:"MCP presets",get options(){return [{title:"Save current",value:"save",description:"Create a preset from the current server states",icon:"save"
+dialogs.open(()=>_$createComponent(SelectionMenu,{api,title:"MCP presets",get options(){return [{title:"Save current",value:"save",description:"Create a preset from the current server states",icon:"save"
 },...Object.entries(preferences.mcpPresets()).map(([name,states])=>({title:name,value:`preset:${name}`,icon:"presets",description:`${Object.values(states).filter((state) => state === "enabled").length}/${Object.keys(states).length} enabled`
 }))]
 },onSelect:(option)=>option.value==="save"?prompt():actions(option.value.slice("preset:".length))
@@ -4122,61 +4119,6 @@ dialogs.open(()=>_$createComponent(PresetMenu,{api,title:"MCP presets",get optio
 
 
 
-
-
-
-
-
-
-function createLayoutPresetActions(input){function prompt(value="",renameFrom){input.dialogs.prompt({title:renameFrom?"Rename layout preset":"Save layout preset",description:()=>(()=>{var _el$=_$createElement("text")
-_$insertNode(_el$,_$createTextNode(`Save the current visible, expanded, and ordered sections.`))
-_$effect((_$p)=>_$setProp(_el$,"fg",input.api.theme.current.textMuted,_$p))
-return _el$
-})(),placeholder:"Preset name",value,onConfirm(nameInput){const name=renameFrom?input.preferences.renameLayoutPreset(renameFrom,nameInput):input.preferences.saveLayoutPreset(nameInput)
-input.dialogs.back()
-if(renameFrom)
-input.dialogs.back()
-input.api.ui.toast({variant:"success",title:"Layout presets",message:renameFrom?`Renamed to ${name}`:`Saved ${name}`,duration:3000
-})
-}})
-}
-function open(name){const linked=input.preferences.workspaceProfiles?.()[name]
-const link=()=>input.dialogs.prompt({title:`Link MCP \xB7 ${name}`,placeholder:"Preset; empty unlinks",value:linked??"",onConfirm(value){input.preferences.linkWorkspaceProfile?.(name,value.trim()||undefined)
-input.dialogs.back()
-input.dialogs.back()
-}})
-input.dialogs.open(()=>_$createComponent(PresetMenu,{get api(){return input.api
-},title:name,get options(){return [{title:"Preview & apply",value:"apply",icon:"info",description:linked?`profile \xB7 ${linked}`:"review layout changes"
-},{title:"Update from current",value:"update",icon:"save",description:"replace saved layout"
-},{title:"Rename\u2026",value:"rename",description:"change preset name",icon:"edit"
-},...input.mcp?[{title:linked?"Change MCP link\u2026":"Link MCP preset\u2026",value:"link",icon:"mcp",description:linked?`${linked} \xB7 empty unlinks`:"pair layout and MCP"
-}]:[],{title:"Delete",value:"delete",description:"remove preset",icon:"delete"
-}]
-},onSelect:(option)=>{switch(option.value){case "apply":{input.dialogs.open(()=>_$createComponent(LayoutPresetPreview,{get api(){return input.api
-},get preferences(){return input.preferences
-},get controller(){return input.mcp
-},name
-}),"large")
-break
-}
-case "update":{input.preferences.updateLayoutPreset(name)
-input.dialogs.back()
-input.api.ui.toast({variant:"success",title:"Layout presets",message:`Updated ${name}`,duration:3000
-})
-break
-}
-case "rename":{prompt(name,name)
-break
-}
-case "link":{link()
-break
-}
-default:{input.preferences.deleteLayoutPreset(name)
-input.dialogs.back()
-}}}}))
-}
-return{open,prompt
-}}
 
 function titleVisibilityOptions(api,preferences,icons){if(!supportsTitleVisibility(api))
 return []
@@ -4245,25 +4187,6 @@ input.openLimitPrompt(section)
 
 
 
-
-
-var RESET_ALL="__reset_all__"
-function TrustedSkillsDialog(props){const options=createMemo8(()=>{const locations=props.preferences.trustedSkillLocations()
-if(locations.length===0)
-return [{title:"Every skill requires confirmation",value:"empty",description:"No trusted skills",icon:"info"
-}]
-return [{title:"Require confirmation for all",value:RESET_ALL,description:`Revoke trust for ${locations.length} skill${locations.length === 1 ? "" : "s"}`,icon:"reset"
-},...locations.map((location)=>({title:location.split("/").at(-2)??location,value:location,description:location,icon:"checked"
-}))]
-})
-return _$createComponent(PresetMenu,{get api(){return props.api
-},title:"Trusted skills",get options(){return options()
-},onSelect:(option)=>{if(option.value===RESET_ALL)
-props.preferences.resetSkillConfirmations()
-else if(option.value!=="empty")
-props.preferences.revokeSkillConfirmation(option.value)
-}})
-}
 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)
@@ -4299,36 +4222,11 @@ function exportSettings(){const copied=input.api.renderer.copyToClipboardOSC52(i
 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
 })
 }
-function importSettings(){input.dialogs.prompt({title:"Import portable settings",description:()=>(()=>{var _el$5=_$createElement("text")
-_$insertNode(_el$5,_$createTextNode(`Paste versioned Navigator JSON.`))
-_$effect((_$p)=>_$setProp(_el$5,"fg",input.api.theme.current.textMuted,_$p))
-return _el$5
-})(),onConfirm(source){const preview=input.preferences.previewPortableSettings(source)
-const options=[...preview.settings.layout?[{title:`Layout \xB7 ${preview.layoutChanged ? "CHANGED" : "UNCHANGED"}`,value:"status",description:`${Object.keys(preview.settings.layout.sections).length} visibility \xB7 ${Object.keys(preview.settings.layout.expanded).length} expansion values`,icon:preview.layoutChanged?"edit":"done"
-}]:[],...preview.settings.mcp?[{title:`MCP \xB7 ${preview.mcpChanged ? "CHANGED" : "UNCHANGED"}`,value:"status",description:`${Object.keys(preview.settings.mcp).length} remembered server states`,icon:preview.mcpChanged?"edit":"done"
-}]:[],...preview.unsupported.map((path)=>({title:"Unsupported field \xB7 SKIPPED",value:"status",description:path,icon:"error"
-})),...preview.layoutChanged||preview.mcpChanged?[{title:"Apply imported settings",value:"apply",description:preview.target,icon:"done"
-}]:[],{title:"Cancel",value:"cancel",description:"return without changes",icon:"close"
-}]
-let applying=false
-async function apply(){applying=true
-try{await input.preferences.applyPortableSettings(preview)
-input.api.ui.toast({variant:"success",title:"Portable settings",message:"Layout and MCP settings imported",duration:3000
-})
-input.dialogs.back()
-} catch(error){applying=false
-input.api.ui.toast({variant:"error",title:"Portable settings",message:error instanceof Error?error.message:"Could not import settings",duration:5000
-})
-}}
-input.dialogs.replace(()=>_$createComponent(PresetMenu,{get api(){return input.api
-},title:"Settings import preview",options,get height(){return Math.min(options.length*3,18)
-},onSelect:(option)=>{if(option.value==="cancel")
-input.dialogs.back()
-if(option.value!=="apply"||applying)
-return
-apply()
-}}))
-}})
+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)
 return
@@ -4399,9 +4297,16 @@ break
 case "reset_mcp":{input.preferences.resetMcpStates()
 break
 }
-case "trusted_skills":{input.dialogs.open(()=>_$createComponent(TrustedSkillsDialog,{get api(){return input.api
+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
@@ -4464,19 +4369,19 @@ const icons=useIcons()
 const dialogs=useDialogs(props.api)
 const scroll=useDialogScroll()
 const dimensions=useTerminalDimensions6()
-const bodyHeight=createMemo9(()=>Math.max(4,Math.floor(dimensions().height*0.75)-10))
+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=createMemo9(()=>orderedGroups().find((group)=>group.id===activeGroup())?.options??[])
+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))
-createEffect10(()=>{if(active()>=options().length)
+createEffect11(()=>{if(active()>=options().length)
 setActive(Math.max(0,options().length-1))
 })
-const contentHeight=createMemo9(()=>Math.min(bodyHeight(),Math.max(1,options().length*2-1)))
-const footerHint=createMemo9(()=>{const common=`${icons.key("tab")} switch \xB7 ${icons.key("up/down")} navigate`
+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")
@@ -4517,9 +4422,20 @@ setActive(next)
 body?.scrollChildIntoView(optionId(value))
 })
 }
-const presetActions=createLayoutPresetActions({api:props.api,preferences:props.preferences,mcp:props.mcp,dialogs
+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
 })
-const selection=createSettingsSelection({api:props.api,preferences:props.preferences,mcp:props.mcp,skills:props.skills,dialogs,options,active,setActive,openPreset:presetActions.open,promptPreset:presetActions.prompt
+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
 })
@@ -4714,7 +4630,7 @@ return title.startsWith("Enable auto-approve permissions")?false:undefined
 }
 function PermissionModeBinding(props){let applying=false
 let observed
-createEffect11(()=>{if(!props.preferences.ready())
+createEffect12(()=>{if(!props.preferences.ready())
 return
 const preferred=props.preferences.autoApprovePermissions()
 const current=currentPermissionMode(props.api)
@@ -4750,6 +4666,8 @@ return _$createComponent(IconControl,{id:`${PLUGIN_ID}.settings.footer`,get icon
 },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 ?? "" : ""}`
@@ -4813,7 +4731,7 @@ queueMicrotask(()=>void props.controller.start())
 })
 onCleanup14(unregister)
 } else
-createEffect12(()=>{if(!props.controller.enabled())
+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()
 }]
@@ -5111,7 +5029,7 @@ return !needle||values.some((value)=>value?.toLocaleLowerCase().includes(needle)
 
 function position(descriptor){return typeof descriptor.position==="function"?descriptor.position():descriptor.position
 }
-var SECTION_COMMANDS=[{section:"todo",title:"Focus Todo"},{section:"subagents",title:"Focus Subagents"},{section:"skills",title:"Focus Skills"},{section:"quick_actions",title:"Focus Quick Actions"},{section:"lsp",title:"Focus LSP"},{section:"mcp",title:"Focus MCP"}]
+var SECTION_COMMANDS=[{section:"limits",title:"Focus Limits"},{section:"todo",title:"Focus Todo"},{section:"subagents",title:"Focus Subagents"},{section:"skills",title:"Focus Skills"},{section:"quick_actions",title:"Focus Quick Actions"},{section:"lsp",title:"Focus LSP"},{section:"mcp",title:"Focus MCP"}]
 function belongsTo(renderable,ancestor){if(!renderable||!ancestor)
 return false
 for(let current=renderable;current; current=current.parent){if(current===ancestor)
@@ -5550,7 +5468,7 @@ const item=useSidebarItem(props.api,props.interaction,{id:props.sectionId??`sect
 const action=props.headerAction?useSidebarItem(props.api,props.interaction,{id:props.headerAction.id,position:()=>({section:props.navigationSection??0,row:0,column:1
 }),disabled:props.headerAction.disabled,activate:props.headerAction.onActivate
 },()=>theme().accent,"control"):undefined
-createEffect13(()=>{props.headerAction?.label()
+createEffect14(()=>{props.headerAction?.label()
 setActionWidth(undefined)
 })
 const actionLabel=()=>{const label=props.headerAction?.label()??""
@@ -5808,7 +5726,7 @@ const item=useSidebarItem(props.api,props.interaction,{id:id(),position:()=>prop
 })
 return _$createComponent(SelectionBox,{ref:(node)=>item.ref(node),get id(){return id()
 },height:1,get marginTop(){return props.marginTop
-},flexDirection:"row",justifyContent:"space-between",gap:1,get backgroundColor(){return item.backgroundColor()
+},flexDirection:"row",justifyContent:"space-between",gap:1,paddingRight:1,get backgroundColor(){return item.backgroundColor()
 },get onMouseOver(){return item.onMouseOver
 },get onMouseOut(){return item.onMouseOut
 },onMouseUp:(event)=>{event.stopPropagation()
@@ -5905,25 +5823,70 @@ return _el$8
 return _el$5
 })()
 }
-function McpRow(props){const icons=useIcons()
-const dialogs=useDialogs(props.api)
-const theme=()=>props.api.theme.current
+
+
+
+function createSidebarBookmark(input){const{api,interaction,row,position,favorite,disabled,onToggle
+}=input
+const id=`${input.id}.favorite`
+const [rowHovered,setRowHovered]=createSignal23(false)
+const [controlHovered,setControlHovered]=createSignal23(false)
+const control=useSidebarItem(api,interaction,{id,position:()=>({...position(),column:0
+}),disabled,activate:()=>{onToggle()
+queueMicrotask(()=>interaction?.select(id))
+}},()=>api.theme.current.warning,"control")
+const visible=()=>favorite()||row.focused()||control.focused()||rowHovered()||controlHovered()
+return{onRowOver:()=>{row.onMouseOver()
+setRowHovered(true)
+},onRowOut:()=>{row.onMouseOut()
+setRowHovered(false)
+},render:()=>_$createComponent(BookmarkControl,{ref:(node)=>control.ref(node),id,get bookmarked(){return favorite()
+},visible,get backgroundColor(){return _$memo(()=>control.backgroundColor()==="transparent")()?row.backgroundColor():control.backgroundColor()
+},get foregroundColor(){return _$memo(()=>!!row.focused())()?row.foregroundColor():control.foregroundColor()
+},onMouseOver:()=>{control.onMouseOver()
+setControlHovered(true)
+},onMouseOut:()=>{control.onMouseOut()
+setControlHovered(false)
+},onMouseUp:(event)=>control.activate(event)
+})
+}}
+
+
+
+
+
+
+var Context=createContext3()
+function useSidebarList(){const value=useContext3(Context)
+if(!value)
+throw new Error("No sidebar list")
+return value
+}
+function SidebarRowList(props){return _$createComponent(Context.Provider,{get value(){return{api:props.api,interaction:props.interaction,grouped:props.grouped??(()=>false)
+}},get children(){var _el$=_$createElement("box")
+_$insert(_el$,()=>props.children)
+_$effect((_$p)=>_$setProp(_el$,"gap",props.density==="comfortable"?1:0,_$p))
+return _el$
+}})
+}
+function McpRow(props){const{api,interaction,grouped
+}=useSidebarList()
+const icons=useIcons()
+const dialogs=useDialogs(api)
+const theme=()=>api.theme.current
 const busy=()=>props.state.status==="loading"||props.state.status==="refreshing"
 const error=()=>props.state.error
 const disabled=()=>props.disabled||busy()
 const id=()=>`${PLUGIN_ID}.mcp.${props.item.name}`
-const row=useSidebarItem(props.api,props.interaction,{id:id(),position:()=>({...props.position,column:0
+const row=useSidebarItem(api,interaction,{id:id(),position:()=>({...props.position,column:1
 }),disabled,activate:props.onToggle
 })
-const bookmark=useSidebarItem(props.api,props.interaction,{id:`${id()}.favorite`,position:()=>({...props.position,column:2
-}),disabled:()=>props.favoriteDisabled,activate:()=>{props.onToggleFavorite()
-queueMicrotask(()=>props.interaction?.select(`${id()}.favorite`))
-}},()=>theme().warning,"control")
-const info=useSidebarItem(props.api,props.interaction,{id:`${id()}.info`,position:()=>({...props.position,column:1
+const bookmark=createSidebarBookmark({api,interaction,id:id(),position:()=>props.position,row,favorite:()=>props.favorite,disabled:()=>props.favoriteDisabled,onToggle:props.onToggleFavorite
+})
+const info=useSidebarItem(api,interaction,{id:`${id()}.info`,position:()=>({...props.position,column:2
 }),activate:()=>{if(!props.item.error)
 return
-dialogs.open(()=>_$createComponent(McpErrorDialog,{get api(){return props.api
-},get name(){return props.item.name
+dialogs.open(()=>_$createComponent(McpErrorDialog,{api,get name(){return props.item.name
 },get status(){return props.item.status
 },get error(){return props.item.error
 }}),"medium")
@@ -5931,12 +5894,14 @@ dialogs.open(()=>_$createComponent(McpErrorDialog,{get api(){return props.api
 const nestedBackground=(background)=>background==="transparent"?row.backgroundColor():background
 return _$createComponent(ListRow,{ref:(node)=>row.ref(node),get id(){return id()
 },get backgroundColor(){return row.backgroundColor()
-},paddingLeft:1,paddingRight:1,get paddingTop(){return error()?1:0
+},get paddingLeft(){return grouped()?0:1
+},paddingRight:1,contentGap:0,get paddingTop(){return error()?1:0
 },get paddingBottom(){return error()?1:0
 },get marginTop(){return props.separator?1:0
-},get onMouseOver(){return row.onMouseOver
-},get onMouseOut(){return row.onMouseOut
-},onMouseDown:(event)=>row.activate(event),get content(){return(()=>{var _el$=_$createElement("text")
+},get onMouseOver(){return bookmark.onRowOver
+},get onMouseOut(){return bookmark.onRowOut
+},onMouseDown:(event)=>row.activate(event),get leading(){return bookmark.render()
+},get content(){return(()=>{var _el$=_$createElement("text")
 _$setProp(_el$,"flexGrow",1)
 _$setProp(_el$,"wrapMode","none")
 _$insert(_el$,()=>props.item.name)
@@ -5948,8 +5913,6 @@ _$insertNode(_el$2,_el$3)
 _$setProp(_el$2,"flexDirection","row")
 _$setProp(_el$2,"flexShrink",0)
 _$setProp(_el$2,"gap",1)
-_$insertNode(_el$3,_el$4)
-_$insert(_el$4,()=>icons.icon(mcpToggle(props.item.status,busy())))
 _$insert(_el$2,(()=>{var _c$=_$memo(()=>!!props.item.error)
 return()=>_c$()?_$createComponent(IconControl,{ref:(node)=>info.ref(node),get id(){return `${id()}.info`
 },get icon(){return icons.icon("info")
@@ -5959,21 +5922,13 @@ return()=>_c$()?_$createComponent(IconControl,{ref:(node)=>info.ref(node),get id
 },get onMouseOut(){return info.onMouseOut
 },onMouseUp:(event)=>info.activate(event)
 }):null
-})(),null)
-_$insert(_el$2,_$createComponent(BookmarkControl,{ref:(node)=>bookmark.ref(node),get id(){return `${id()}.favorite`
-},get bookmarked(){return props.favorite
-},get backgroundColor(){return nestedBackground(bookmark.backgroundColor())
-},get foregroundColor(){return _$memo(()=>!!row.focused())()?row.foregroundColor():bookmark.foregroundColor()
-},get onMouseOver(){return bookmark.onMouseOver
-},get onMouseOut(){return bookmark.onMouseOut
-},onMouseUp:(event)=>bookmark.activate(event)
-}),null)
-_$effect((_$p)=>_$setProp(_el$3,"fg",row.focused()?row.foregroundColor():mcpColor(props.api,props.item.status),_$p))
+})(),_el$3)
+_$insertNode(_el$3,_el$4)
+_$insert(_el$4,()=>icons.icon(mcpToggle(props.item.status,busy())))
+_$effect((_$p)=>_$setProp(_el$3,"fg",row.focused()?row.foregroundColor():mcpColor(api,props.item.status),_$p))
 return _el$2
 })()
-},get details(){return _$createComponent(RequestErrorRow,{get api(){return props.api
-},get interaction(){return props.interaction
-},get id(){return `${id()}.retry`
+},get details(){return _$createComponent(RequestErrorRow,{api,interaction,get id(){return `${id()}.retry`
 },get position(){return{...props.position,row:props.position.row + 1,column:0
 }},get state(){return props.state
 },get onRetry(){return props.onRetry
@@ -5991,7 +5946,7 @@ return _el$2
 function SectionFilter(props){const icons=useIcons()
 let input
 let unregisterInput
-const [inputFocused,setInputFocused]=createSignal23(false)
+const [inputFocused,setInputFocused]=createSignal24(false)
 const theme=()=>props.api.theme.current
 const item=useSidebarItem(props.api,props.interaction,{id:props.id??`filter.${props.placeholder}`,position:()=>props.position??{section:0,row:0,column:0
 },activate:()=>{if(!input)
@@ -6060,16 +6015,6 @@ return _el$3
 }})]
 }})
 }
-
-
-
-
-function SidebarRowList(props){return(()=>{var _el$=_$createElement("box")
-_$insert(_el$,()=>props.children)
-_$effect((_$p)=>_$setProp(_el$,"gap",props.density==="comfortable"?1:0,_$p))
-return _el$
-})()
-}
 function McpSectionContent(props){const model=props.model
 return _$createComponent(SectionRequestBody,{get api(){return props.api
 },get interaction(){return props.interaction
@@ -6095,7 +6040,10 @@ _$insertNode(_el$2,_$createTextNode(`No matching MCP servers`))
 _$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
 return _el$2
 })()
-},get children(){return [_$createComponent(SidebarRowList,{get density(){return props.preferences.rowDensity?.()??"compact"
+},get children(){return [_$createComponent(SidebarRowList,{get api(){return props.api
+},get interaction(){return props.interaction
+},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)
 },get children(){return _$createComponent(McpGroupHeader,{get api(){return props.api
@@ -6108,9 +6056,7 @@ return _el$2
 },get position(){return{section:props.navigationSection,row:9 + index()*3,column:0
 }},onToggle:()=>void props.controller.toggleGroup(item.bucket,model.groupNames(item.bucket),model.target())
 })
-}}),_$createComponent(McpRow,{get api(){return props.api
-},get interaction(){return props.interaction
-},item,get position(){return{section:props.navigationSection,row:10 + index()*3,column:0
+}}),_$createComponent(McpRow,{item,get position(){return{section:props.navigationSection,row:10 + index()*3,column:0
 }},get state(){return props.controller.serverState(item.name,model.target())
 },get disabled(){return model.bulkRunning()
 },onToggle:()=>void props.controller.toggle(item.name).catch(()=>{}),onRetry:()=>void props.controller.retryServer(item.name,model.target())?.catch(()=>{}),get favorite(){return model.favorites().has(item.name)
@@ -6130,7 +6076,7 @@ return _el$
 }})
 }
 function McpSection(props){const icons=useIcons()
-const [query,setQuery]=createSignal24("")
+const [query,setQuery]=createSignal25("")
 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")}` : ""}`)
@@ -6165,48 +6111,79 @@ return _$createComponent(SectionWithHeaderAction,{get api(){return props.api
 
 
 
-function QuickActionRow(props){const icons=useIcons()
-const theme=()=>props.api.theme.current
-const [width,setWidth]=createSignal25(0)
-const shortcut=createMemo14(()=>{const bindings=props.api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+function QuickActionRow(props){const{api,interaction
+}=useSidebarList()
+const icons=useIcons()
+const theme=()=>api.theme.current
+const [width,setWidth]=createSignal28(0)
+const shortcut=createMemo14(()=>{const bindings=api.keymap.getCommandBindings({visibility:"registered",commands:[props.action.command]
 })
-return props.api.keys.formatBindings(bindings.get(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) + 9?value:undefined
+return value&&width()>=Bun.stringWidth(props.action.label) + Bun.stringWidth(value) + 8?value:undefined
 })
 function run(){if(props.action.command==="session.new"&&props.onNewSession?.())
 return
-const result=props.interaction?props.interaction.dispatchFromReturnTarget(props.action.command):props.api.keymap.dispatchCommand(props.action.command)
+const result=interaction?interaction.dispatchFromReturnTarget(props.action.command):api.keymap.dispatchCommand(props.action.command)
 if(result.ok)
 return
-props.api.ui.toast({variant:"warning",title:props.action.label,message:`Command is ${result.reason}`,duration:3000
+api.ui.toast({variant:"warning",title:props.action.label,message:`Command is ${result.reason}`,duration:3000
 })
 }
 const id=()=>`${PLUGIN_ID}.quick-action.${props.action.command}`
-const row=useSidebarItem(props.api,props.interaction,{id:id(),position:()=>props.position,activate:run,disabled:()=>Boolean(props.disabled)
+const row=useSidebarItem(api,interaction,{id:id(),position:()=>({...props.position,column:1
+}),activate:run,disabled:()=>Boolean(props.disabled)
+})
+const bookmark=createSidebarBookmark({api,interaction,id:id(),position:()=>props.position,row,favorite:()=>props.favorite,disabled:()=>props.favoriteDisabled,onToggle:props.onToggleFavorite
 })
-const favorite=useSidebarItem(props.api,props.interaction,{id:`${id()}.favorite`,position:()=>({...props.position,column:1
-}),disabled:()=>props.favoriteDisabled,activate:()=>{props.onToggleFavorite()
-queueMicrotask(()=>props.interaction?.select(`${id()}.favorite`))
-}},()=>theme().warning,"control")
-const controlBackground=()=>{const background=favorite.backgroundColor()
-return background==="transparent"?row.backgroundColor():background
-}
 return _$createComponent(ListRow,{ref:(node)=>row.ref(node),get id(){return id()
 },paddingLeft:1,paddingRight:1,get marginTop(){return props.separator?1:0
 },onSizeChange:function(){setWidth(this.width)
 },get backgroundColor(){return row.backgroundColor()
-},get onMouseOver(){return row.onMouseOver
-},get onMouseOut(){return row.onMouseOut
+},get onMouseOver(){return bookmark.onRowOver
+},get onMouseOut(){return bookmark.onRowOut
 },onMouseUp:(event)=>{event.stopPropagation()
 row.activate(event)
-},get leading(){return(()=>{var _el$=_$createElement("text")
+},get leading(){return [_$memo(()=>bookmark.render()),(()=>{var _el$=_$createElement("text")
 _$setProp(_el$,"flexShrink",0)
 _$insert(_el$,()=>icons.action(props.action.command))
 _$effect((_$p)=>_$setProp(_el$,"fg",props.disabled?theme().textMuted:row.focused()?row.foregroundColor():theme().accent,_$p))
 return _el$
-})()
+})()]
 },get content(){return(()=>{var _el$2=_$createElement("text")
 _$setProp(_el$2,"flexGrow",1)
 _$setProp(_el$2,"wrapMode","none")
@@ -6215,7 +6192,7 @@ _$insert(_el$2,()=>props.action.label)
 _$effect((_$p)=>_$setProp(_el$2,"fg",row.foregroundColor(),_$p))
 return _el$2
 })()
-},get metadata(){return _$createComponent(Show15,{get when(){return visibleShortcut()
+},get metadata(){return _$createComponent(Show17,{get when(){return visibleShortcut()
 },children:(value)=>(()=>{var _el$3=_$createElement("text")
 _$setProp(_el$3,"flexShrink",0)
 _$setProp(_el$3,"wrapMode","none")
@@ -6224,7 +6201,7 @@ _$effect((_$p)=>_$setProp(_el$3,"fg",row.focused()?row.foregroundColor():theme()
 return _el$3
 })()
 })
-},get details(){return _$createComponent(Show15,{get when(){return props.disabled
+},get details(){return _$createComponent(Show17,{get when(){return props.disabled
 },children:(reason)=>(()=>{var _el$4=_$createElement("text")
 _$setProp(_el$4,"wrapMode","word")
 _$insert(_el$4,reason)
@@ -6232,14 +6209,6 @@ _$effect((_$p)=>_$setProp(_el$4,"fg",row.focused()?row.foregroundColor():theme()
 return _el$4
 })()
 })
-},get trailing(){return _$createComponent(BookmarkControl,{ref:(node)=>favorite.ref(node),get id(){return `${id()}.favorite`
-},get bookmarked(){return props.favorite
-},get backgroundColor(){return controlBackground()
-},get foregroundColor(){return _$memo(()=>!!row.focused())()?row.foregroundColor():favorite.foregroundColor()
-},get onMouseOver(){return favorite.onMouseOver
-},get onMouseOut(){return favorite.onMouseOut
-},onMouseUp:(event)=>favorite.activate(event)
-})
 }})
 }
 function QuickActionsSection(props){const commandRevision=createQuickActionRevision(props.api)
@@ -6257,16 +6226,16 @@ return _$createComponent(Section,{get api(){return props.api
 },sectionId:`${PLUGIN_ID}.section.quick_actions`,get navigationSection(){return navigationSection()
 },title:"QUICK ACTIONS",section:"quick_actions",get summary(){return String(actions().length)
 },get open(){return props.preferences.expanded().quick_actions
-},onToggle:()=>props.preferences.toggleSectionExpanded("quick_actions"),get children(){return [_$createComponent(SidebarRowList,{get density(){return props.preferences.rowDensity?.()??"compact"
-},get children(){return [_$createComponent(Show16,{get when(){return actions().length===0
+},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(Show18,{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))
 return _el$
-}}),_$createComponent(For14,{get each(){return visibility.visible()
-},children:(action,index)=>_$createComponent(QuickActionRow,{get api(){return props.api
-},get interaction(){return props.interaction
-},get onNewSession(){return props.onNewSession
+}}),_$createComponent(For15,{get each(){return visibility.visible()
+},children:(action,index)=>_$createComponent(QuickActionRow,{get onNewSession(){return props.onNewSession
 },action,get disabled(){return action.disabled
 },get favorite(){return props.preferences.favoriteQuickActions?.().has(action.command)??false
 },get favoriteDisabled(){return _$memo(()=>!!props.preferences.ready)()?!props.preferences.ready():false
@@ -6375,7 +6344,7 @@ unregisterBinding=undefined
 unregisterCommands()
 }}}
 function SidebarToggleBinding(props){const shortcuts=createSidebarShortcutMode(props.api)
-createEffect14(()=>shortcuts.bind(props.preferences.toggleKey()))
+createEffect16(()=>shortcuts.bind(props.preferences.toggleKey()))
 onCleanup18(shortcuts.dispose)
 return _$createElement("box")
 }
@@ -6385,7 +6354,7 @@ const unregisterCommands=props.api.keymap.registerLayer({commands:[...commands,.
 }))]
 })
 onCleanup18(unregisterCommands)
-createEffect14(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
+createEffect16(()=>{const unregister=props.api.keymap.registerLayer({bindings:[{key:props.preferences.focusKey(),cmd:FOCUS_COMMAND
 }]
 })
 onCleanup18(unregister)
@@ -6419,10 +6388,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()))
-createEffect15(()=>{const current=target()
-const deactivate=untrack5(()=>props.controller.activate?.(current)??(()=>{}))
+createEffect17(()=>{const current=target()
+const deactivate=untrack6(()=>props.controller.activate?.(current)??(()=>{}))
 onCleanup19(deactivate)
-untrack5(()=>void props.controller.refresh(current).catch(()=>{}))
+untrack6(()=>void props.controller.refresh(current).catch(()=>{}))
 })
 async function useSkill(item){try{const isInserted=await props.controller.use(target(),item.name)
 if(isInserted)
@@ -6445,49 +6414,36 @@ return{target,recent,grouped,list,filtered,visibility,state,useSkill,skillGroup}
 
 
 
-function SkillRow(props){const icons=useIcons()
-const theme=()=>props.api.theme.current
+function SkillRow(props){const{api,interaction,grouped
+}=useSidebarList()
+const icons=useIcons()
 const id=()=>`${PLUGIN_ID}.skill.${props.item.location || props.item.name}`
-const row=useSidebarItem(props.api,props.interaction,{id:id(),position:()=>({...props.position,column:0
+const row=useSidebarItem(api,interaction,{id:id(),position:()=>({...props.position,column:1
 }),activate:props.onUse
 })
-const favorite=useSidebarItem(props.api,props.interaction,{id:`${id()}.favorite`,position:()=>({...props.position,column:1
-}),disabled:()=>props.favoriteDisabled,activate:()=>{props.onToggleFavorite()
-queueMicrotask(()=>props.interaction?.select(`${id()}.favorite`))
-}},()=>theme().warning,"control")
-const controlBackground=()=>{const background=favorite.backgroundColor()
-return background==="transparent"?row.backgroundColor():background
-}
+const bookmark=createSidebarBookmark({api,interaction,id:id(),position:()=>props.position,row,favorite:()=>props.favorite,disabled:()=>props.favoriteDisabled,onToggle:props.onToggleFavorite
+})
 return _$createComponent(ListRow,{ref:(node)=>row.ref(node),get id(){return id()
-},paddingLeft:1,paddingRight:1,get marginTop(){return props.separator?1:0
+},get paddingLeft(){return grouped()?0:1
+},paddingRight:1,contentGap:0,get marginTop(){return props.separator?1:0
 },get backgroundColor(){return row.backgroundColor()
-},get onMouseOver(){return row.onMouseOver
-},get onMouseOut(){return row.onMouseOut
-},onMouseUp:(event)=>row.activate(event),get leading(){return(()=>{var _el$=_$createElement("text")
-_$setProp(_el$,"flexShrink",0)
-_$insert(_el$,()=>icons.icon(props.recent?"recent":"skills"))
-_$effect((_$p)=>_$setProp(_el$,"fg",row.focused()?row.foregroundColor():theme().accent,_$p))
+},get onMouseOver(){return bookmark.onRowOver
+},get onMouseOut(){return bookmark.onRowOut
+},onMouseUp:(event)=>row.activate(event),get leading(){return bookmark.render()
+},get content(){return(()=>{var _el$=_$createElement("text")
+_$setProp(_el$,"flexGrow",1)
+_$setProp(_el$,"wrapMode","word")
+_$insert(_el$,(()=>{var _c$=_$memo(()=>!!props.recent)
+return()=>_c$()?`${icons.icon("recent")} `:""
+})(),null)
+_$insert(_el$,()=>props.item.name,null)
+_$effect((_$p)=>_$setProp(_el$,"fg",row.foregroundColor(),_$p))
 return _el$
 })()
-},get content(){return(()=>{var _el$2=_$createElement("text")
-_$setProp(_el$2,"flexGrow",1)
-_$setProp(_el$2,"wrapMode","word")
-_$insert(_el$2,()=>props.item.name)
-_$effect((_$p)=>_$setProp(_el$2,"fg",row.foregroundColor(),_$p))
-return _el$2
-})()
-},get trailing(){return _$createComponent(BookmarkControl,{ref:(node)=>favorite.ref(node),get id(){return `${id()}.favorite`
-},get bookmarked(){return props.favorite
-},get backgroundColor(){return controlBackground()
-},get foregroundColor(){return _$memo(()=>!!row.focused())()?row.foregroundColor():favorite.foregroundColor()
-},get onMouseOver(){return favorite.onMouseOver
-},get onMouseOut(){return favorite.onMouseOut
-},onMouseUp:(event)=>favorite.activate(event)
-})
 }})
 }
 function SkillsSection(props){const dialogs=useDialogs(props.api)
-const [query,setQuery]=createSignal26("")
+const [query,setQuery]=createSignal29("")
 const model=createSkillSectionModel(props,query)
 const navigationSection=()=>props.navigationSection??3
 function selectSkill(item){if(!props.preferences.shouldConfirmSkill(item)){model.useSkill(item)
@@ -6520,15 +6476,18 @@ _$insert(_el$,_$createComponent(SectionFilter,{get api(){return props.api
 }},get query(){return query()
 },placeholder:"Filter skills...",onInput:setQuery
 }),null)
-_$insert(_el$,_$createComponent(Show17,{get when(){return model.filtered().length>0
+_$insert(_el$,_$createComponent(Show19,{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))
 return _el$2
 })()
-},get children(){return [_$createComponent(SidebarRowList,{get density(){return props.preferences.rowDensity?.()??"compact"
-},get children(){return _$createComponent(For15,{get each(){return model.visibility.visible()
-},children:(item,index)=>[_$createComponent(Show17,{get when(){return _$memo(()=>!!model.grouped())()&&(index()===0||model.visibility.visible()[index()-1]?.bucket!==item.bucket)
+},get children(){return [_$createComponent(SidebarRowList,{get api(){return props.api
+},get interaction(){return props.interaction
+},get grouped(){return model.grouped
+},get density(){return props.preferences.rowDensity?.()??"compact"
+},get children(){return _$createComponent(For16,{get each(){return model.visibility.visible()
+},children:(item,index)=>[_$createComponent(Show19,{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")
@@ -6541,9 +6500,7 @@ return _p$
 },{e:undefined,t:undefined
 })
 return _el$4
-}}),_$createComponent(SkillRow,{get api(){return props.api
-},get interaction(){return props.interaction
-},item,get position(){return{section:navigationSection(),row:10 + index()*(model.grouped()?2:1),column:0
+}}),_$createComponent(SkillRow,{item,get position(){return{section:navigationSection(),row:10 + index()*(model.grouped()?2:1),column:0
 }},onUse:()=>selectSkill(item),get recent(){return model.recent().has(item.location)
 },get favorite(){return props.preferences.isFavoriteSkill?.(item)??false
 },get favoriteDisabled(){return props.preferences.ready?.()===false
@@ -6575,18 +6532,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]=createSignal27("")
-const [mode,setMode]=createSignal27("all")
+const [query,setQuery]=createSignal30("")
+const [mode,setMode]=createSignal30("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)
-createEffect16(()=>{targetKey()
+createEffect18(()=>{targetKey()
 setQuery("")
 setMode("all")
 })
-createEffect16(()=>{if(mode()!=="all"&&counts()[mode()]===0)
+createEffect18(()=>{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()])
@@ -6596,11 +6553,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))
-createEffect16(()=>{const sessionID=props.sessionID
+createEffect18(()=>{const sessionID=props.sessionID
 targetKey()
-const deactivate=untrack6(()=>props.controller.activate?.(sessionID)??(()=>{}))
+const deactivate=untrack7(()=>props.controller.activate?.(sessionID)??(()=>{}))
 onCleanup20(deactivate)
-untrack6(()=>void props.controller.refresh(sessionID).catch(()=>{}))
+untrack7(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 })
 return{list,recent,rows,query,setQuery,mode,setMode,counts,tabs,filtered,parentID,visibility,now,byId,ids,state
 }}
@@ -6620,18 +6577,20 @@ return{list,recent,rows,query,setQuery,mode,setMode,counts,tabs,filtered,parentI
 
 
 
-function SubagentRow(props){const icons=useIcons()
-const theme=()=>props.api.theme.current
+function SubagentRow(props){const{api,interaction
+}=useSidebarList()
+const icons=useIcons()
+const theme=()=>api.theme.current
 const retrying=()=>props.item.status.type==="retry"
 const idle=()=>props.item.status.type==="idle"
 const failed=()=>props.item.run?.outcome==="error"
 const cancelled=()=>props.item.run?.outcome==="cancelled"
 const id=()=>`${PLUGIN_ID}.subagent.${props.item.session.id}`
-const row=useSidebarItem(props.api,props.interaction,{id:id(),position:()=>props.position,activate:props.onOpen
+const row=useSidebarItem(api,interaction,{id:id(),position:()=>props.position,activate:props.onOpen
 })
 const leadingColor=()=>row.focused()?row.foregroundColor():failed()?theme().error:retrying()||props.item.unavailable?theme().warning:idle()?theme().textMuted:theme().primary
 return _$createComponent(ListRow,{ref:(node)=>row.ref(node),get id(){return id()
-},paddingLeft:1,paddingRight:1,get backgroundColor(){return row.backgroundColor()
+},paddingLeft:2,paddingRight:1,get backgroundColor(){return row.backgroundColor()
 },get onMouseOver(){return row.onMouseOver
 },get onMouseOut(){return row.onMouseOut
 },onMouseDown:(event)=>row.activate(event),get leading(){return(()=>{var _el$=_$createElement("text")
@@ -6655,7 +6614,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(Show18,{get when(){return props.item.run?.errorMessage
+},get details(){return [_$createComponent(Show20,{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")
@@ -6663,12 +6622,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(Show18,{get when(){return props.item.unavailable
+}}),_$createComponent(Show20,{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(Show18,{get when(){return _$memo(()=>props.item.status.type==="retry")()?props.item.status:undefined
+}}),_$createComponent(Show20,{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)
@@ -6680,7 +6639,7 @@ _$insert(_el$0,()=>status().message,null)
 _$effect((_$p)=>_$setProp(_el$0,"fg",row.focused()?row.foregroundColor():theme().warning,_$p))
 return _el$0
 })()
-}),_$createComponent(Show18,{get when(){return _$memo(()=>!!idle())()&&!props.item.run?.errorMessage
+}),_$createComponent(Show20,{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))
@@ -6688,22 +6647,22 @@ return _el$8
 }})]
 }})
 }
-function SubagentList(props){return _$createComponent(SidebarRowList,{get density(){return props.density
-},get children(){return _$createComponent(For16,{get each(){return props.ids
+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(For17,{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(Show19,{get when(){return startsGroup()
+_$insert(_el$,_$createComponent(Show21,{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)
 _$effect((_$p)=>_$setProp(_el$2,"fg",props.api.theme.current.textMuted,_$p))
 return _el$2
 }}),null)
-_$insert(_el$,_$createComponent(SubagentRow,{get api(){return props.api
-},get interaction(){return props.interaction
-},get item(){return item()
+_$insert(_el$,_$createComponent(SubagentRow,{get item(){return item()
 },get now(){return props.now
 },get position(){return{section:props.navigationSection,row:10 + index(),column:0
 }},onOpen:()=>props.controller.open(id)
@@ -6722,7 +6681,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(Show20,{get when(){return model.parentID()
+},onToggle:()=>props.preferences.toggleSectionExpanded("subagents"),get children(){return [_$createComponent(Show22,{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
@@ -6745,7 +6704,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(For17,{get each(){return model.tabs()
+_$insert(_el$2,_$createComponent(For18,{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()
@@ -6756,7 +6715,7 @@ _$insert(_el$2,_$createComponent(For17,{get each(){return model.tabs()
 },onActivate:()=>model.setMode(value)
 })
 }))
-_$insert(_el$,_$createComponent(Show20,{get when(){return model.filtered().length===0
+_$insert(_el$,_$createComponent(Show22,{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))
@@ -6808,8 +6767,10 @@ return _el$
 
 
 
-function TodoRow(props){const icons=useIcons()
-const theme=()=>props.api.theme.current
+function TodoRow(props){const{api
+}=useSidebarList()
+const icons=useIcons()
+const theme=()=>api.theme.current
 const done=()=>props.item.status==="completed"
 const active=()=>props.item.status==="in_progress"
 const cancelled=()=>props.item.status==="cancelled"
@@ -6832,12 +6793,13 @@ _$insertNode(_el$,_el$2)
 _$insertNode(_el$,_el$3)
 _$setProp(_el$,"flexDirection","row")
 _$setProp(_el$,"gap",1)
+_$setProp(_el$,"paddingLeft",2)
 _$setProp(_el$2,"flexShrink",0)
 _$insert(_el$2,()=>icons.icon(done()?"done":active()?"busy":cancelled()?"close":"idle"))
 _$setProp(_el$3,"flexGrow",1)
 _$setProp(_el$3,"wrapMode","word")
 _$insert(_el$3,()=>props.item.content)
-_$insert(_el$,_$createComponent(Show21,{get when(){return props.item.priority==="high"||props.item.priority==="medium"||props.item.priority==="low"
+_$insert(_el$,_$createComponent(Show23,{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)
@@ -6864,7 +6826,7 @@ _$insertNode(_el$,_el$2)
 _$setProp(_el$,"gap",1)
 _$setProp(_el$2,"flexDirection","row")
 _$setProp(_el$2,"flexWrap","wrap")
-_$insert(_el$2,_$createComponent(For18,{each:["all","active","finished"],children:(value,index)=>_$createComponent(SectionTab,{get api(){return props.api
+_$insert(_el$2,_$createComponent(For19,{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)
@@ -6873,23 +6835,24 @@ _$insert(_el$2,_$createComponent(For18,{each:["all","active","finished"],childre
 },onActivate:()=>props.setMode(value)
 })
 }))
-_$insert(_el$,_$createComponent(Show22,{get when(){return props.view.rows.length>0
+_$insert(_el$,_$createComponent(Show24,{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 density(){return props.density
-},get children(){return _$createComponent(For18,{get each(){return props.visibility.visible()
+},get children(){return _$createComponent(SidebarRowList,{get api(){return props.api
+},get interaction(){return props.interaction
+},get density(){return props.density
+},get children(){return _$createComponent(For19,{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(Show22,{get when(){return startsGroup()
+_$insert(_el$3,_$createComponent(Show24,{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)
 _$effect((_$p)=>_$setProp(_el$4,"fg",props.api.theme.current.textMuted,_$p))
 return _el$4
 }}),null)
-_$insert(_el$3,_$createComponent(TodoRow,{get api(){return props.api
-},get item(){return row.item
+_$insert(_el$3,_$createComponent(TodoRow,{get item(){return row.item
 }}),null)
 _$effect((_$p)=>_$setProp(_el$3,"marginTop",index()>0&&startsGroup()?1:0,_$p))
 return _el$3
@@ -6919,7 +6882,7 @@ return _el$6
 
 
 function TodoGuidanceControl(props){const state=()=>props.controller.guidance(props.sessionID)
-return _$createComponent(Show23,{get when(){return state().available
+return _$createComponent(Show25,{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
@@ -6929,7 +6892,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(Show23,{get when(){return state().error
+_$insert(_el$,_$createComponent(Show25,{get when(){return state().error
 },children:(message)=>(()=>{var _el$2=_$createElement("text")
 _$setProp(_el$2,"wrapMode","word")
 _$insert(_el$2,message)
@@ -6944,22 +6907,22 @@ 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]=createSignal28("all")
+const [mode,setMode]=createSignal31("all")
 const targetKey=createMemo18(()=>props.controller.target?.(props.sessionID).key??props.sessionID)
-createEffect17(()=>{targetKey()
+createEffect19(()=>{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))
-createEffect17(()=>{const sessionID=props.sessionID
+createEffect19(()=>{const sessionID=props.sessionID
 targetKey()
 if(unavailable())
 return
-const deactivate=untrack7(()=>props.controller.activate?.(sessionID)??(()=>{}))
+const deactivate=untrack8(()=>props.controller.activate?.(sessionID)??(()=>{}))
 onCleanup21(deactivate)
-untrack7(()=>void props.controller.refresh(sessionID).catch(()=>{}))
+untrack8(()=>void props.controller.refresh(sessionID).catch(()=>{}))
 })
 const navigationSection=()=>props.navigationSection??1
 return _$createComponent(Section,{get api(){return props.api
@@ -6967,10 +6930,10 @@ return _$createComponent(Section,{get api(){return props.api
 },sectionId:`${PLUGIN_ID}.section.todo`,get navigationSection(){return navigationSection()
 },title:"TODO",section:"todo",get summary(){return _$memo(()=>!!(unavailable()||managed()?.missing(props.sessionID)))()?"\u2014":`${view().counts.completed}/${list().length}`
 },get open(){return props.preferences.expanded().todo
-},onToggle:()=>props.preferences.toggleSectionExpanded("todo"),get children(){return _$createComponent(Show24,{get when(){return unavailable()
+},onToggle:()=>props.preferences.toggleSectionExpanded("todo"),get children(){return _$createComponent(Show26,{get when(){return unavailable()
 },get fallback(){return(()=>{var _el$=_$createElement("box")
 _$setProp(_el$,"gap",1)
-_$insert(_el$,_$createComponent(Show24,{get when(){return managed()?.guidance(props.sessionID).available
+_$insert(_el$,_$createComponent(Show26,{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
@@ -6978,7 +6941,7 @@ _$insert(_el$,_$createComponent(Show24,{get when(){return managed()?.guidance(pr
 },get navigationSection(){return navigationSection()
 }})
 }}),null)
-_$insert(_el$,_$createComponent(Show24,{get when(){return managed()?.missing(props.sessionID)
+_$insert(_el$,_$createComponent(Show26,{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
@@ -7027,10 +6990,11 @@ event.preventDefault()
 event.stopPropagation()
 props.interaction.leave()
 })
-_$insert(_el$,_$createComponent(For19,{get each(){return visibleSections()
+_$insert(_el$,_$createComponent(For20,{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==="todo",get children(){return _$createComponent(TodoSection,_$mergeProps(props,{get navigationSection(){return index() + 1
+},get children(){return _$createComponent(Switch,{get children(){return [_$createComponent(Match,{when:section==="limits",get children(){return props.limitsSection(index() + 1)
+}}),_$createComponent(Match,{when:section==="todo",get children(){return _$createComponent(TodoSection,_$mergeProps(props,{get navigationSection(){return index() + 1
 },get controller(){return props.todo
 }}))
 }}),_$createComponent(Match,{when:section==="subagents",get children(){return _$createComponent(SubagentSection,_$mergeProps(props,{get navigationSection(){return index() + 1
@@ -7062,7 +7026,7 @@ return _el$
 
 
 function McpPersistence(props){const persist=createMemo20(()=>props.controller.persist())
-createEffect18(()=>{if(!props.api.state.ready)
+createEffect20(()=>{if(!props.api.state.ready)
 return
 persist()
 const route=props.api.route.current
@@ -7071,19 +7035,19 @@ if(typeof params?.sessionID!=="string")
 return
 const current=props.controller.target()
 onCleanup23(()=>props.controller.deactivate(current))
-untrack8(()=>void props.controller.activate(current).catch(()=>{}))
+untrack9(()=>void props.controller.activate(current).catch(()=>{}))
 })
 return _$createElement("box")
 }
-function PreferencesPersistence(props){createEffect18(()=>{const location=currentLocation(props.api)
-untrack8(()=>props.controller.setActiveScope(preferencesScope({directory:location.routing.directory,worktree:props.api.state.path.worktree
+function PreferencesPersistence(props){createEffect20(()=>{const location=currentLocation(props.api)
+untrack9(()=>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
-createEffect18(()=>{if(isChecked)
+createEffect20(()=>{if(isChecked)
 return
 isChecked=true
 showFirstRunWizard(props.api,props.preferences).catch(()=>{})
@@ -7121,7 +7085,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(Show25,{get when(){return props.preferences.showSessionTitle()
+_$insert(_el$3,_$createComponent(Show27,{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")
@@ -7129,7 +7093,7 @@ _$insert(_el$5,()=>props.title)
 _$effect((_$p)=>_$setProp(_el$4,"fg",theme().text,_$p))
 return _el$4
 }}),null)
-_$insert(_el$3,_$createComponent(Show25,{get when(){return _$memo(()=>!!props.preferences.showSessionDate())()&&created()
+_$insert(_el$3,_$createComponent(Show27,{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))
@@ -7169,6 +7133,17 @@ return
 const [user,project]=await Promise.all([safe(userPath?readSource(userPath,()=>readFile2(userPath,"utf8")):undefined),safe(readProject?readSource(".opencode/navigator.json",readProject):undefined)])
 return mergeConfiguredDefaults(configuredDefaultsFromPluginOptions(options),user,project)
 }
+
+
+function LimitsPersistence(props){createEffect21(()=>{const{model,adapter
+}=props.controller.current()
+if(model&&adapter)
+untrack10(()=>void props.controller.refresh(true))
+})
+const timer=setInterval(()=>void props.controller.refresh(),5000)
+onCleanup25(()=>clearInterval(timer))
+return _$createElement("box")
+}
 import {homedir,homedir as homedir2} from "os"
 
 function location(input){return input.directory?{location:{directory:input.directory}}:{}}
@@ -7262,7 +7237,7 @@ return false
 }
 function enabled(value){return typeof value==="function"?value():value!==false
 }
-function createV2Keymap(context){const [revision,setRevision]=createSignal29(0)
+function createV2Keymap(context){const [revision,setRevision]=createSignal32(0)
 const layers=new Map
 let sequence=0
 function layerActive(layer){const mode=layer.mode??"base"
@@ -7373,7 +7348,7 @@ function legacyTheme(theme){return{primary:theme.hue.interactive[200],secondary:
 
 function createV2UI(context){let dialogOpen=false
 function DialogPrompt(props){let active=true
-onCleanup25(()=>{active=false
+onCleanup26(()=>{active=false
 })
 onMount7(async ()=>{const value=await context.ui.dialog.prompt({title:props.title,placeholder:props.placeholder,value:props.value
 })
@@ -7387,7 +7362,7 @@ props.onConfirm?.(value)
 return _$createElement("box")
 }
 function DialogConfirm(props){let active=true
-onCleanup25(()=>{active=false
+onCleanup26(()=>{active=false
 })
 onMount7(async ()=>{const confirmed=await context.ui.dialog.confirm({title:props.title,message:props.message
 })
@@ -7459,6 +7434,11 @@ for(let index=disposers.length-1;index>=0; index--)
 await disposers[index]()
 disposers.length=0
 }}}
+function selectedV2Model(context){const route=context.ui.router.current()
+const model=context.ui.model.current()
+if(route.type!=="session"||!model)
+return
+return{sessionID:route.sessionID,providerID:model.providerID,modelID:model.modelID,...model.variant&&{variant:model.variant}}}
 
 
 import {fileURLToPath} from "url"
@@ -7525,16 +7505,28 @@ if(item.source.target.startsWith("."))
 throw new Error("Unrecognized local Navigator source")
 await context.client.plugin.update({location:response.location,targets:[item.source.target]})
 }}}
-async function setupNavigator(api,options,readProject,managedTodo){const config=pluginConfig(undefined)
+async function setupNavigator(api,options,readProject,managedTodo,selectedModel){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 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 codex=limitsModule.createCodexQuotaAdapter(limitsModule.createCodexAppServerClient({version:"0.20.0"
+}))
+const LimitsSection=limitsModule.ProviderLimitsSection
+const limits=limitsModule.createProviderLimitsController([codex],()=>{const model=selectedModel?.()??limitsModule.selectedV1Model(api)
+if(!model)
+return
+const accountID=preferences.codexAccountForModel(model.providerID,model.modelID)
+return{...model,...accountID&&{accountID
+}}},api.lifecycle.signal)
 const mcp=createMcpController(api,preferences.persistMcp,preferences)
 const interaction=createSidebarInteraction(api,()=>openKeyboardHelp(api,preferences.lspIconStyle,preferences.cornerFont))
 const startup=createStartupSessionController(api,preferences)
 api.lifecycle.onDispose(()=>preferences.flush())
+api.lifecycle.onDispose(()=>limits.dispose())
 api.lifecycle.onDispose(()=>interaction.dispose())
 const unsubscribeMcp=api.event.on("mcp.tools.changed",()=>{mcp.refresh().catch(()=>{})
 })
@@ -7547,6 +7539,7 @@ api.lifecycle.onDispose(unsubscribeConnected)
 api.slots.register({order:100,slots:{app(){return _$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
 },get children(){return [_$createComponent(PreferencesPersistence,{api,controller:preferences
+}),_$createComponent(LimitsPersistence,{controller:limits
 }),_$memo(()=>_$memo(()=>!!supportsPermissionMode(api))()&&_$createComponent(PermissionModeBinding,{api,preferences
 })),_$createComponent(SettingsBinding,{api,preferences,mcp,skills
 }),_$createComponent(SidebarToggleBinding,{api,preferences
@@ -7555,7 +7548,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.19.2"
+}),_$createComponent(UpgradeNotesBinding,{api,preferences,version:"0.20.0"
 }),_$createComponent(McpPersistence,{api,controller:mcp
 })]
 }})
@@ -7568,7 +7561,8 @@ api.slots.register({order:100,slots:{app(){return _$createComponent(IconProvider
 },sidebar_content(_context,props){return _$createComponent(IconProvider,{get style(){return preferences.lspIconStyle
 },get multilineCorners(){return preferences.cornerFont
 },get children(){return _$createComponent(SidebarContent,{api,get onNewSession(){return startup.handleNewSession
-},mcp,todo,subagents,skills,preferences,interaction,get sessionID(){return props.session_id
+},mcp,limitsSection:(navigationSection)=>_$createComponent(LimitsSection,{api,preferences,interaction,controller:limits,codex,navigationSection
+}),todo,subagents,skills,preferences,interaction,get sessionID(){return props.session_id
 }})
 }})
 }}})
@@ -7585,12 +7579,12 @@ throw result.error
 }
 return result.data?.type==="text"?result.data.content:undefined
 })
-const versionStatus=createVersionStatus(api,"0.19.2")
-const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.19.2"))
+const versionStatus=createVersionStatus(api,"0.20.0")
+const versionUpdates=createVersionUpdateActions(api,versionStatus,createOpenCodeV1VersionUpdater(api,meta),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.20.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.19.2",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.20.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }})
 }})
@@ -7603,16 +7597,16 @@ const{mcp,skills,preferences
 return
 return new TextDecoder().decode(await context.client.file.read({location:context.location,path:".opencode/navigator.json"
 }))
-},todo)
-const versionStatus=createVersionStatus(adapter.api,"0.19.2")
-const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.19.2"))
+},todo,()=>selectedV2Model(context))
+const versionStatus=createVersionStatus(adapter.api,"0.20.0")
+const versionUpdates=createVersionUpdateActions(adapter.api,versionStatus,createOpenCodeV2VersionUpdater(context),()=>preferences.rememberNavigatorVersionBeforeUpdate("0.20.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.19.2",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
+},navigatorVersion:"0.20.0",status:versionStatus,get onOpenCodeUpdate(){return versionUpdates.openCode
 },get onNavigatorUpdate(){return versionUpdates.navigator
 }}),null)
 _$insert(_el$,_$createComponent(SettingsFooterButton,{get api(){return adapter.api
@@ -7627,5 +7621,5 @@ await adapter.dispose()
 var plugin={id:PLUGIN_ID,tui:setupOpenCodeV1,setup:setupOpenCodeV2
 }
 var plugin_default=plugin
-export{DEFAULT_SECTION_EXPANSION,DialogSurface,FOCUS_COMMAND,FirstRunWizard,KeyboardHelpDialog,LspBadge,McpSection,PresetMenu,QUICK_ACTIONS,Section,SectionFilter,SelectionBox,SettingsDialog,SidebarFocusBinding,SidebarToggleBinding,SkillsSection,createDialogStack,createMcpController,createPreferencesController,createSidebarInteraction,createSkillController,createSubagentController,createTodoController,plugin_default as default,isEffectivelyVisible,lspIcon,matchesFilter,openFirstRunWizard,openKeyboardHelp,openSettings,showFirstRunWizard,useDialogScroll,useDialogState,useDialogs,useIcons
+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,useDialogScroll,useDialogState,useDialogs,useIcons
 }