From 2a895311d93df8576a8f3d03642829674de06bc2 Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Thu, 8 Jan 2026 20:19:33 +0200
Subject: [PATCH] feat: enhance autocomplete components with agent and command
 metadata support

---
 CHANGELOG.md                                  |  6 +-
 .../chat/AgentMentionAutocomplete.tsx         | 95 +++++++++++++-----
 .../components/chat/CommandAutocomplete.tsx   | 97 ++++++++++++-------
 .../src/components/chat/SkillAutocomplete.tsx | 60 +++++++-----
 4 files changed, 169 insertions(+), 89 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 674be98e..31066d5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-- Added support for model variants (thinking effort).
-- Switched agent cycling shortcut from TAB to Shift + TAB.
+- Chat: Added support for model variants (thinking effort).
+- Shortcuts: Switched agent cycling shortcut from TAB to Shift + TAB.
+- Skills: added autocomplete for skills on "/" when it is not the first character in input.
+- Autocomplete: added scope badges for commands/agents/skills.
 
 
 ## [1.4.4] - 2026-01-08
diff --git a/packages/ui/src/components/chat/AgentMentionAutocomplete.tsx b/packages/ui/src/components/chat/AgentMentionAutocomplete.tsx
index a357eaa4..ec9cc094 100644
--- a/packages/ui/src/components/chat/AgentMentionAutocomplete.tsx
+++ b/packages/ui/src/components/chat/AgentMentionAutocomplete.tsx
@@ -1,12 +1,15 @@
 import React from 'react';
 import { cn } from '@/lib/utils';
 import { useConfigStore } from '@/stores/useConfigStore';
+import { useAgentsStore } from '@/stores/useAgentsStore';
 import { ScrollableOverlay } from '@/components/ui/ScrollableOverlay';
 
 interface AgentInfo {
   name: string;
   description?: string;
   mode?: string | null;
+  scope?: string;
+  isBuiltIn?: boolean;
 }
 
 export interface AgentMentionAutocompleteHandle {
@@ -34,17 +37,30 @@ export const AgentMentionAutocomplete = React.forwardRef<AgentMentionAutocomplet
   const containerRef = React.useRef<HTMLDivElement | null>(null);
   const [selectedIndex, setSelectedIndex] = React.useState(0);
   const [agents, setAgents] = React.useState<AgentInfo[]>([]);
+  const itemRefs = React.useRef<(HTMLDivElement | null)[]>([]);
   const { getVisibleAgents } = useConfigStore();
+  const { agents: agentsWithMetadata, loadAgents } = useAgentsStore();
+
+  React.useEffect(() => {
+    if (agentsWithMetadata.length === 0) {
+      void loadAgents();
+    }
+  }, [loadAgents, agentsWithMetadata.length]);
 
   React.useEffect(() => {
     const visibleAgents = getVisibleAgents();
     const filtered = visibleAgents
       .filter((agent) => isMentionable(agent.mode))
-      .map((agent) => ({
-        name: agent.name,
-        description: agent.description,
-        mode: agent.mode ?? undefined,
-      }));
+      .map((agent) => {
+        const metadata = agentsWithMetadata.find(a => a.name === agent.name);
+        return {
+          name: agent.name,
+          description: agent.description,
+          mode: agent.mode ?? undefined,
+          scope: (metadata as any)?.scope,
+          isBuiltIn: (metadata as any)?.native || (metadata as any)?.builtIn,
+        };
+      });
 
     const normalizedQuery = searchQuery.trim().toLowerCase();
     const matches = normalizedQuery.length
@@ -57,6 +73,13 @@ export const AgentMentionAutocomplete = React.forwardRef<AgentMentionAutocomplet
     setSelectedIndex(0);
   }, [getVisibleAgents, searchQuery]);
 
+  React.useEffect(() => {
+    itemRefs.current[selectedIndex]?.scrollIntoView({
+      behavior: 'smooth',
+      block: 'nearest',
+    });
+  }, [selectedIndex]);
+
   React.useEffect(() => {
     const handlePointerDown = (event: MouseEvent | TouchEvent) => {
       const target = event.target as Node | null;
@@ -104,28 +127,50 @@ export const AgentMentionAutocomplete = React.forwardRef<AgentMentionAutocomplet
     },
   }), [agents, onAgentSelect, onClose, selectedIndex]);
 
-  const renderAgent = (agent: AgentInfo, index: number) => (
-    <div
-      key={agent.name}
-      className={cn(
-        'flex items-start gap-2 px-3 py-1.5 cursor-pointer rounded-lg typography-ui-label',
-        index === selectedIndex && 'bg-muted'
-      )}
-      onClick={() => onAgentSelect(agent.name)}
-      onMouseEnter={() => setSelectedIndex(index)}
->
-      <div className="min-w-0">
-        <div className="flex items-center gap-2">
-          <span className="font-semibold">#{agent.name}</span>
-        </div>
-        {agent.description && (
-          <div className="typography-meta text-muted-foreground truncate">
-            {agent.description}
-          </div>
+  const renderAgent = (agent: AgentInfo, index: number) => {
+    const isSystem = agent.isBuiltIn;
+    const isProject = agent.scope === 'project';
+    
+    return (
+      <div
+        key={agent.name}
+        ref={(el) => {
+          itemRefs.current[index] = el;
+        }}
+        className={cn(
+          'flex items-start gap-2 px-3 py-1.5 cursor-pointer rounded-lg typography-ui-label',
+          index === selectedIndex && 'bg-muted'
         )}
+        onClick={() => onAgentSelect(agent.name)}
+        onMouseEnter={() => setSelectedIndex(index)}
+      >
+        <div className="min-w-0 flex-1">
+          <div className="flex items-center gap-2">
+            <span className="font-semibold">#{agent.name}</span>
+            {isSystem ? (
+              <span className="text-[10px] leading-none uppercase font-bold tracking-tight bg-[var(--status-warning-background)] text-[var(--status-warning)] border-[var(--status-warning-border)] px-1.5 py-1 rounded border flex-shrink-0">
+                system
+              </span>
+            ) : agent.scope ? (
+              <span className={cn(
+                "text-[10px] leading-none uppercase font-bold tracking-tight px-1.5 py-1 rounded border flex-shrink-0",
+                isProject 
+                  ? "bg-[var(--status-info-background)] text-[var(--status-info)] border-[var(--status-info-border)]"
+                  : "bg-[var(--status-success-background)] text-[var(--status-success)] border-[var(--status-success-border)]"
+              )}>
+                {agent.scope}
+              </span>
+            ) : null}
+          </div>
+          {agent.description && (
+            <div className="typography-meta text-muted-foreground mt-0.5 truncate">
+              {agent.description}
+            </div>
+          )}
+        </div>
       </div>
-    </div>
-  );
+    );
+  };
 
   return (
     <div
diff --git a/packages/ui/src/components/chat/CommandAutocomplete.tsx b/packages/ui/src/components/chat/CommandAutocomplete.tsx
index 3ebfe356..8672a471 100644
--- a/packages/ui/src/components/chat/CommandAutocomplete.tsx
+++ b/packages/ui/src/components/chat/CommandAutocomplete.tsx
@@ -3,6 +3,7 @@ import { RiCommandLine, RiFileLine, RiFlashlightLine, RiRefreshLine, RiScissorsL
 import { cn } from '@/lib/utils';
 import { opencodeClient } from '@/lib/opencode/client';
 import { useSessionStore } from '@/stores/useSessionStore';
+import { useCommandsStore } from '@/stores/useCommandsStore';
 import { useShallow } from 'zustand/react/shallow';
 import { ScrollableOverlay } from '@/components/ui/ScrollableOverlay';
 
@@ -12,6 +13,7 @@ interface CommandInfo {
   agent?: string;
   model?: string;
   isBuiltIn?: boolean;
+  scope?: string;
 }
 
 export interface CommandAutocompleteHandle {
@@ -43,6 +45,7 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
 
   const [commands, setCommands] = React.useState<CommandInfo[]>([]);
   const [loading, setLoading] = React.useState(false);
+  const { commands: commandsWithMetadata, loadCommands: refreshCommands } = useCommandsStore();
   const [selectedIndex, setSelectedIndex] = React.useState(0);
   const itemRefs = React.useRef<(HTMLDivElement | null)[]>([]);
   const containerRef = React.useRef<HTMLDivElement | null>(null);
@@ -65,19 +68,22 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
     };
   }, [onClose]);
 
+  React.useEffect(() => {
+    // Force refresh to get latest project context when mounting
+    void refreshCommands();
+  }, [refreshCommands]);
+
   React.useEffect(() => {
     const loadCommands = async () => {
       setLoading(true);
       try {
-
-        const apiCommands = await opencodeClient.listCommands();
-
-        const customCommands: CommandInfo[] = apiCommands.map(cmd => ({
+        const customCommands: CommandInfo[] = commandsWithMetadata.map(cmd => ({
           name: cmd.name,
           description: cmd.description,
-          agent: cmd.agent,
-          model: cmd.model,
-          isBuiltIn: false
+          agent: cmd.agent ?? undefined,
+          model: cmd.model ?? undefined,
+          isBuiltIn: cmd.name === 'init' || cmd.name === 'review',
+          scope: cmd.scope,
         }));
 
         const builtInCommands: CommandInfo[] = [
@@ -154,7 +160,7 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
     };
 
     loadCommands();
-  }, [searchQuery, hasMessagesInCurrentSession, hasSession]);
+  }, [searchQuery, hasMessagesInCurrentSession, hasSession, commandsWithMetadata]);
 
   React.useEffect(() => {
     setSelectedIndex(0);
@@ -236,37 +242,56 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
           </div>
         ) : (
           <div>
-            {commands.map((command, index) => (
-              <div
-                key={command.name}
-                ref={(el) => { itemRefs.current[index] = el; }}
-                className={cn(
-                  "flex items-start gap-2 px-3 py-2 cursor-pointer rounded-lg",
-                  index === selectedIndex && "bg-muted"
-                )}
-                onClick={() => onCommandSelect(command)}
-                onMouseEnter={() => setSelectedIndex(index)}
-              >
-                <div className="mt-0.5">
-                  {getCommandIcon(command)}
-                </div>
-                <div className="flex-1 min-w-0">
-                  <div className="flex items-center gap-2">
-                    <span className="typography-ui-label font-medium">/{command.name}</span>
-                    {command.agent && (
-                      <span className="typography-meta text-muted-foreground bg-muted px-1.5 py-0.5 rounded">
-                        {command.agent}
-                      </span>
+            {commands.map((command, index) => {
+              const isSystem = command.isBuiltIn;
+              const isProject = command.scope === 'project';
+              
+              return (
+                <div
+                  key={command.name}
+                  ref={(el) => { itemRefs.current[index] = el; }}
+                  className={cn(
+                    "flex items-start gap-2 px-3 py-2 cursor-pointer rounded-lg",
+                    index === selectedIndex && "bg-muted"
+                  )}
+                  onClick={() => onCommandSelect(command)}
+                  onMouseEnter={() => setSelectedIndex(index)}
+                >
+                  <div className="mt-0.5">
+                    {getCommandIcon(command)}
+                  </div>
+                  <div className="flex-1 min-w-0">
+                    <div className="flex items-center gap-2">
+                      <span className="typography-ui-label font-medium">/{command.name}</span>
+                      {isSystem ? (
+                        <span className="text-[10px] leading-none uppercase font-bold tracking-tight bg-[var(--status-warning-background)] text-[var(--status-warning)] border-[var(--status-warning-border)] px-1.5 py-1 rounded border flex-shrink-0">
+                          system
+                        </span>
+                      ) : command.scope ? (
+                        <span className={cn(
+                          "text-[10px] leading-none uppercase font-bold tracking-tight px-1.5 py-1 rounded border flex-shrink-0",
+                          isProject 
+                            ? "bg-[var(--status-info-background)] text-[var(--status-info)] border-[var(--status-info-border)]"
+                            : "bg-[var(--status-success-background)] text-[var(--status-success)] border-[var(--status-success-border)]"
+                        )}>
+                          {command.scope}
+                        </span>
+                      ) : null}
+                      {command.agent && (
+                        <span className="text-[10px] leading-none font-bold tracking-tight bg-[var(--surface-subtle)] text-[var(--surface-foreground)] border-[var(--interactive-border)] px-1.5 py-1 rounded border flex-shrink-0">
+                          {command.agent}
+                        </span>
+                      )}
+                    </div>
+                    {command.description && (
+                      <div className="typography-meta text-muted-foreground mt-0.5 truncate">
+                        {command.description}
+                      </div>
                     )}
                   </div>
-                  {command.description && (
-                    <div className="typography-meta text-muted-foreground mt-0.5 truncate">
-                      {command.description}
-                    </div>
-                  )}
                 </div>
-              </div>
-            ))}
+              );
+            })}
             {commands.length === 0 && (
               <div className="px-3 py-2 typography-ui-label text-muted-foreground">
                 No commands found
diff --git a/packages/ui/src/components/chat/SkillAutocomplete.tsx b/packages/ui/src/components/chat/SkillAutocomplete.tsx
index a77e5e8e..8893a21d 100644
--- a/packages/ui/src/components/chat/SkillAutocomplete.tsx
+++ b/packages/ui/src/components/chat/SkillAutocomplete.tsx
@@ -106,34 +106,42 @@ export const SkillAutocomplete = React.forwardRef<SkillAutocompleteHandle, Skill
     },
   }), [filteredSkills, onSkillSelect, onClose, selectedIndex]);
 
-  const renderSkill = (skill: SkillInfo, index: number) => (
-    <div
-      key={`${skill.name}-${skill.scope}`}
-      ref={(el) => {
-        itemRefs.current[index] = el;
-      }}
-      className={cn(
-        'flex items-start gap-2 px-3 py-1.5 cursor-pointer rounded-lg typography-ui-label',
-        index === selectedIndex && 'bg-muted'
-      )}
-      onClick={() => onSkillSelect(skill.name)}
-      onMouseEnter={() => setSelectedIndex(index)}
-    >
-      <div className="min-w-0 flex-1">
-        <div className="flex items-center gap-2">
-          <span className="font-semibold truncate">{skill.name}</span>
-          <span className="text-[10px] leading-none uppercase font-bold tracking-tight text-muted-foreground/70 bg-muted/50 px-1 py-0.5 rounded border border-border/40 flex-shrink-0">
-            {skill.scope}
-          </span>
-        </div>
-        {skill.description && (
-          <div className="typography-meta text-muted-foreground mt-0.5 truncate">
-            {skill.description}
-          </div>
+  const renderSkill = (skill: SkillInfo, index: number) => {
+    const isProject = skill.scope === 'project';
+    return (
+      <div
+        key={`${skill.name}-${skill.scope}`}
+        ref={(el) => {
+          itemRefs.current[index] = el;
+        }}
+        className={cn(
+          'flex items-start gap-2 px-3 py-1.5 cursor-pointer rounded-lg typography-ui-label',
+          index === selectedIndex && 'bg-muted'
         )}
+        onClick={() => onSkillSelect(skill.name)}
+        onMouseEnter={() => setSelectedIndex(index)}
+      >
+        <div className="min-w-0 flex-1">
+          <div className="flex items-center gap-2">
+            <span className="font-semibold truncate">{skill.name}</span>
+            <span className={cn(
+              "text-[10px] leading-none uppercase font-bold tracking-tight px-1.5 py-1 rounded border flex-shrink-0 transition-colors",
+              isProject 
+                ? "bg-[var(--status-info-background)] text-[var(--status-info)] border-[var(--status-info-border)]"
+                : "bg-[var(--status-success-background)] text-[var(--status-success)] border-[var(--status-success-border)]"
+            )}>
+              {skill.scope}
+            </span>
+          </div>
+          {skill.description && (
+            <div className="typography-meta text-muted-foreground mt-0.5 truncate">
+              {skill.description}
+            </div>
+          )}
+        </div>
       </div>
-    </div>
-  );
+    );
+  };
 
   return (
     <div