fix: update settings and skills handling with assistant redirect

Author: chriswritescode-dev

backend/src/routes/settings.ts

@@ -1126,8 +1126,9 @@ export function createSettingsRoutes(db: Database, gitAuthService: GitAuthServic
       if (repoId !== undefined && isNaN(repoId)) {
         return c.json({ error: 'Invalid repoId' }, 400)
       }
+      const directory = c.req.query('directory')
 
-      const skills = await listManagedSkills(db, openCodeClient, repoId)
+      const skills = await listManagedSkills(db, openCodeClient, repoId, directory)
       return c.json(skills)
     } catch (error) {
       logger.error('Failed to list skills:', error)

backend/src/services/skills.ts

@@ -128,10 +128,17 @@ function classifySkillLocation(
   location: string,
   globalPrefix: string,
   repos: Repo[],
+  customDirectory?: string,
 ): { scope: SkillScope; repo?: Repo } | null {
   if (location.startsWith(globalPrefix + path.sep)) {
     return { scope: 'global' }
   }
+  if (customDirectory) {
+    const projectPrefix = path.join(customDirectory, '.opencode', 'skills')
+    if (location.startsWith(projectPrefix + path.sep)) {
+      return { scope: 'project' }
+    }
+  }
   for (const repo of repos) {
     const projectPrefix = getProjectSkillsPath(repo)
     if (location.startsWith(projectPrefix + path.sep)) {
@@ -160,34 +167,46 @@ export async function listManagedSkills(
   db: Database,
   openCodeClient: OpenCodeClient,
   repoId?: number,
+  directory?: string,
 ): Promise<SkillFileInfo[]> {
   const globalPrefix = getGlobalSkillsPath()
   const allRepos = listRepos(db)
 
-  const targetRepos = repoId
-    ? allRepos.filter(r => r.id === repoId)
-    : allRepos
-
-  if (repoId && targetRepos.length === 0) {
-    throw new Error(`Repository with id ${repoId} not found`)
-  }
-
-  const directories = targetRepos.length > 0
-    ? targetRepos.map(r => r.fullPath)
-    : [getWorkspacePath()]
-
   const seenLocations = new Set<string>()
   const result: SkillFileInfo[] = []
 
-  for (const directory of directories) {
+  if (directory) {
     const skills = await fetchOpenCodeSkills(openCodeClient, directory)
     for (const skill of skills) {
       if (seenLocations.has(skill.location)) continue
-      const classification = classifySkillLocation(skill.location, globalPrefix, allRepos)
+      const classification = classifySkillLocation(skill.location, globalPrefix, allRepos, directory)
       if (!classification) continue
       seenLocations.add(skill.location)
       result.push(toSkillFileInfo(skill, classification))
     }
+  } else {
+    const targetRepos = repoId
+      ? allRepos.filter(r => r.id === repoId)
+      : allRepos
+
+    if (repoId && targetRepos.length === 0) {
+      throw new Error(`Repository with id ${repoId} not found`)
+    }
+
+    const directories = targetRepos.length > 0
+      ? targetRepos.map(r => r.fullPath)
+      : [getWorkspacePath()]
+
+    for (const dir of directories) {
+      const skills = await fetchOpenCodeSkills(openCodeClient, dir)
+      for (const skill of skills) {
+        if (seenLocations.has(skill.location)) continue
+        const classification = classifySkillLocation(skill.location, globalPrefix, allRepos)
+        if (!classification) continue
+        seenLocations.add(skill.location)
+        result.push(toSkillFileInfo(skill, classification))
+      }
+    }
   }
 
   return result

frontend/src/api/settings.ts

@@ -229,9 +229,12 @@ export const settingsApi = {
     return fetchWrapper(`${API_BASE_URL}/api/health/version`)
   },
 
-  listManagedSkills: async (repoId?: number): Promise<SkillFileInfo[]> => {
-    const params = repoId ? `?repoId=${repoId}` : ''
-    return fetchWrapper(`${API_BASE_URL}/api/settings/skills${params}`)
+  listManagedSkills: async (repoId?: number, directory?: string): Promise<SkillFileInfo[]> => {
+    const searchParams = new URLSearchParams()
+    if (repoId) searchParams.set('repoId', String(repoId))
+    if (directory) searchParams.set('directory', directory)
+    const query = searchParams.toString() ? `?${searchParams.toString()}` : ''
+    return fetchWrapper(`${API_BASE_URL}/api/settings/skills${query}`)
   },
 
   getSkill: async (name: string, scope: SkillScope, repoId?: number): Promise<SkillFileInfo> => {

frontend/src/components/repo/RepoSkillsDialog.tsx

@@ -14,7 +14,7 @@ type RepoSkillsDialogBaseProps = {
 }
 
 type RepoSkillsDialogProps = RepoSkillsDialogBaseProps & (
-  | { sessionId: string; opcodeUrl: string; directory: string; onSkillLoaded?: (skill: SkillFileInfo) => void }
+  | { sessionId: string; opcodeUrl: string; directory?: string; onSkillLoaded?: (skill: SkillFileInfo) => void }
   | { sessionId?: undefined; opcodeUrl?: undefined; directory?: undefined; onSkillLoaded?: undefined }
 )
 
@@ -28,9 +28,9 @@ export function RepoSkillsDialog({
   onSkillLoaded,
 }: RepoSkillsDialogProps) {
   const { isLoading, data, error } = useQuery({
-    queryKey: ['settings', 'skills', repoId],
-    queryFn: () => settingsApi.listManagedSkills(repoId),
-    enabled: open && !!repoId,
+    queryKey: directory ? ['settings', 'skills', 'directory', directory] : ['settings', 'skills', repoId],
+    queryFn: () => settingsApi.listManagedSkills(repoId, directory),
+    enabled: open && (!!repoId || !!directory),
     staleTime: 30000,
   })
 
@@ -64,7 +64,7 @@ export function RepoSkillsDialog({
     onOpenChange(false)
   }
 
-  if (!repoId) {
+  if (!repoId && !sessionId) {
     return null
   }
 

frontend/src/pages/AssistantRedirect.tsx

@@ -145,7 +145,22 @@ export function AssistantRedirect() {
           <>
             <FileBrowserSheet isOpen={fileBrowserOpen} onClose={() => setFileBrowserOpen(false)} basePath={assistantFileBasePath} repoName="Assistant" repoId={repoId} />
             <RepoMcpDialog open={mcpDialogOpen} onOpenChange={setMcpDialogOpen} directory={assistantDirectory} />
-            <RepoSkillsDialog open={skillsDialogOpen} onOpenChange={setSkillsDialogOpen} repoId={repoId} />
+            {assistantDirectory && opcodeUrl ? (
+              <RepoSkillsDialog
+                open={skillsDialogOpen}
+                onOpenChange={setSkillsDialogOpen}
+                repoId={repoId}
+                sessionId="assistant-session"
+                opcodeUrl={opcodeUrl}
+                directory={assistantDirectory}
+              />
+            ) : (
+              <RepoSkillsDialog
+                open={skillsDialogOpen}
+                onOpenChange={setSkillsDialogOpen}
+                repoId={repoId}
+              />
+            )}
             <SourceControlPanel repoId={repoId} isOpen={sourceControlOpen} onClose={() => setSourceControlOpen(false)} currentBranch={repo?.currentBranch || repo?.branch || "main"} repoName="Assistant" />
             <ResetPermissionsDialog open={resetPermissionsOpen} onOpenChange={setResetPermissionsOpen} repoId={repoId} repoDirectory={assistantDirectory} />
           </>

frontend/src/pages/SessionDetail.tsx

@@ -118,14 +118,14 @@ export function SessionDetail() {
   const { data: assistantMode, isLoading: assistantModeLoading } = useQuery({
     queryKey: ["repo", repoId, "assistant-mode"],
     queryFn: () => initializeAssistantMode(repoId),
-    enabled: isAssistantSession && !!repoId,
+    enabled: isAssistantSession,
   });
 
   useRepoActivity(repoId, Boolean(repo));
 
   const opcodeUrl = OPENCODE_API_ENDPOINT;
 
-  const repoDirectory = isAssistantSession ? assistantMode?.directory : repo?.fullPath;
+  const repoDirectory = isAssistantSession ? (assistantMode?.directory || repo?.fullPath) : repo?.fullPath;
   const sessionRouteSuffix = isAssistantSession ? '?assistant=1' : '';
 
   const { isConnected, isReconnecting } = useSSE(opcodeUrl, repoDirectory, sessionId);
@@ -438,7 +438,7 @@ export function SessionDetail() {
     return <Navigate to="/" replace />;
   }
 
-  if (!repo) {
+  if (!repo && !isAssistantSession) {
     return (
       <div className="flex items-center justify-center min-h-screen bg-gradient-to-br from-background via-background to-background">
         <div className="flex flex-col items-center gap-2">
@@ -449,7 +449,9 @@ export function SessionDetail() {
     );
   }
 
-  const workspaceDisplayName = isAssistantSession ? 'Assistant' : getRepoDisplayName(repo.repoUrl, repo.localPath, repo.sourcePath);
+  const workspaceDisplayName = isAssistantSession || !repo
+    ? 'Assistant'
+    : getRepoDisplayName(repo.repoUrl, repo.localPath, repo.sourcePath);
   const sessionBackPath = getSessionListPath(repoId, isAssistantSession);
 
   return (
@@ -644,7 +646,7 @@ export function SessionDetail() {
         directory={repoDirectory}
       />
 
-      {repoDirectory && opcodeUrl && sessionId && (
+      {opcodeUrl && sessionId && (
         <RepoSkillsDialog
           open={skillsDialogOpen}
           onOpenChange={setSkillsDialogOpen}
@@ -666,7 +668,7 @@ export function SessionDetail() {
         repoId={repoId}
         isOpen={sourceControlOpen}
         onClose={() => setSourceControlOpen(false)}
-        currentBranch={repo.currentBranch || repo.branch || "main"}
+        currentBranch={repo?.currentBranch || repo?.branch || "main"}
         repoName={workspaceDisplayName}
       />