fix(chat): use ~/.codex/skills/ for Codex expert symlinks and keep expert button always enabled

Change Codex skill storage to use only ~/.codex/skills/ instead of
~/.agents/skills/, and never disable the expert skills button so users
can always access the empty-state hint. Also fix stale expert list in
conversation window after linking in the separate settings window by
re-fetching on window focus.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

src-tauri/src/commands/acp.rs

@@ -1213,11 +1213,8 @@ pub(crate) fn skill_storage_spec(agent_type: AgentType) -> Option<SkillStorageSp
         }),
         AgentType::Codex => Some(SkillStorageSpec {
             kind: SkillStorageKind::SkillDirectoryOrMarkdownFile,
-            global_dirs: vec![
+            global_dirs: vec![codex_home_dir().join("skills")],
-                home_dir_or_default().join(".agents").join("skills"),
+            project_rel_dirs: vec![".codex/skills"],
-                codex_home_dir().join("skills"),
-            ],
-            project_rel_dirs: vec![".agents/skills", ".codex/skills"],
         }),
         AgentType::OpenCode => Some(SkillStorageSpec {
             kind: SkillStorageKind::SkillDirectoryOnly,

src-tauri/src/commands/experts.rs

@@ -851,9 +851,8 @@ pub async fn experts_unlink_from_agent(
 
     let _guard = mutation_lock().lock().await;
 
-    // Scan ALL global dirs for this agent to handle shared-dir agents
+    // Scan ALL global dirs for this agent to handle shared-dir agents.
-    // (Codex and Cline both point at `~/.agents/skills/`). Remove the
+    // Remove the link wherever it is found.
-    // link wherever it is found.
     let dirs = scoped_skill_dirs(agent_type, AgentSkillScope::Global, None)
         .map_err(|_| ExpertsError::UnsupportedAgent(agent_type))?;
 

src/components/chat/message-input.tsx

@@ -1757,7 +1757,7 @@ export function MessageInput({
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
                 <Button
-                  disabled={disabled || availableExperts.length === 0}
+                  disabled={disabled}
                   variant="outline"
                   size="icon"
                   className="h-6 w-6 shrink-0 bg-transparent"

src/hooks/use-agent-experts.ts

@@ -1,6 +1,6 @@
 "use client"
 
-import { useEffect, useMemo, useState } from "react"
+import { useCallback, useEffect, useMemo, useState } from "react"
 
 import { expertsListForAgent } from "@/lib/api"
 import type { AgentType, ExpertListItem } from "@/lib/types"
@@ -10,22 +10,7 @@ const inflightMap = new Map<AgentType, Promise<ExpertListItem[]>>()
 
 const EMPTY: ExpertListItem[] = []
 
-export function useAgentExperts(agentType: AgentType | null): ExpertListItem[] {
+function fetchForAgent(agentType: AgentType): Promise<ExpertListItem[]> {
-  const cached = useMemo(
-    () => (agentType ? (agentCache.get(agentType) ?? null) : null),
-    [agentType]
-  )
-  // Track which agent type the fetched result belongs to so stale data
-  // from a previous agent is never returned after a switch.
-  const [fetched, setFetched] = useState<{
-    agentType: AgentType
-    experts: ExpertListItem[]
-  } | null>(null)
-
-  useEffect(() => {
-    if (!agentType || agentCache.has(agentType)) return
-
-    let cancelled = false
   let promise = inflightMap.get(agentType)
   if (!promise) {
     promise = expertsListForAgent(agentType)
@@ -41,16 +26,49 @@ export function useAgentExperts(agentType: AgentType | null): ExpertListItem[] {
       })
     inflightMap.set(agentType, promise)
   }
+  return promise
+}
 
-    promise.then((list) => {
+export function useAgentExperts(agentType: AgentType | null): ExpertListItem[] {
+  const cached = useMemo(
+    () => (agentType ? (agentCache.get(agentType) ?? null) : null),
+    [agentType]
+  )
+  // Track which agent type the fetched result belongs to so stale data
+  // from a previous agent is never returned after a switch.
+  const [fetched, setFetched] = useState<{
+    agentType: AgentType
+    experts: ExpertListItem[]
+  } | null>(null)
+
+  const doFetch = useCallback(() => {
+    if (!agentType || agentCache.has(agentType)) return
+    let cancelled = false
+    fetchForAgent(agentType).then((list) => {
       if (!cancelled) setFetched({ agentType, experts: list })
     })
-
     return () => {
       cancelled = true
     }
   }, [agentType])
 
+  // Initial fetch
+  useEffect(() => doFetch(), [doFetch])
+
+  // Re-fetch when window regains focus (covers cross-window cache
+  // invalidation — e.g. settings window links/unlinks experts while the
+  // conversation window stays mounted).
+  useEffect(() => {
+    const onFocus = () => {
+      if (!agentType) return
+      agentCache.delete(agentType)
+      inflightMap.delete(agentType)
+      doFetch()
+    }
+    window.addEventListener("focus", onFocus)
+    return () => window.removeEventListener("focus", onFocus)
+  }, [agentType, doFetch])
+
   if (!agentType) return EMPTY
   if (cached) return cached
   if (fetched && fetched.agentType === agentType) return fetched.experts