@@ -19,7 +19,7 @@ import { Locale } from "../../util/locale"
 import type { PromptInfo, PromptPartRef } from "../../prompt/history"
 import { useFrecency } from "../../prompt/frecency"
 import { Keymap, type KeymapCommand } from "../../context/keymap"
-import { mentionTriggerIndex, slashTriggerIndex } from "../../prompt/display"
+import { mentionTriggerIndex, slashCommandKind, slashTriggerIndex } from "../../prompt/display"
 import type { FileSystemEntry } from "@opencode/client"
 import { Skill } from "@opencode/schema/skill"
 import { stringWidth } from "../../util/string-width"
@@ -44,7 +44,7 @@ export type AutocompleteOption = {
   path?: string
   absolute?: string
   destructive?: { id: string; confirm: string; run: () => void }
-  kind?: "skill" | "agent" | "reference"
+  kind?: "skill" | "agent" | "reference" | "custom" | "mcp"
   queueable?: boolean
 }
 
@@ -490,6 +490,7 @@ export function Autocomplete(props: {
         description: serverCommand.description,
         queueable: true,
         onSelect: () => insertSlash(serverCommand.name),
+        kind: slashCommandKind(serverCommand.name),
       })
     }
 
@@ -853,6 +854,8 @@ export function Autocomplete(props: {
     skill: "skill",
     agent: "agent",
     reference: "reference",
+    custom: "custom",
+    mcp: "mcp",
   }
 
   return (
 
@@ -39,3 +39,10 @@ export function slashTriggerIndex(text: string, widthMethod: WidthMethod) {
     return measureEditText(text.slice(0, index), { widthMethod })
   }
 }
+
+/** Source badge for a server-provided slash command. MCP prompts follow the `server:prompt`
+ * naming convention from mcpCommandName; everything else from the command registry is
+ * config-defined. Built-in keymap commands never reach this and stay unbadged. */
+export function slashCommandKind(name: string): "mcp" | "custom" {
+  return name.includes(":") ? "mcp" : "custom"
+}
@@ -11,6 +11,7 @@ import {
   directoryRecentValue,
   slashArgumentAutocomplete,
 } from "../../src/prompt/directory-completion"
+import { slashCommandKind } from "../../src/prompt/display"
 
 describe("directoryAutocomplete", () => {
   test("lists parents and siblings without changing location", async () => {
@@ -216,3 +217,15 @@ describe("directoryRecentValue", () => {
     expect(directoryRecentValue("/project/recent", "/home/user")).toBe("/project/recent")
   })
 })
+
+describe("slashCommandKind", () => {
+  test("badges MCP prompts by the server:prompt naming convention", () => {
+    expect(slashCommandKind("github:create_issue")).toBe("mcp")
+    expect(slashCommandKind("my_server:my_prompt")).toBe("mcp")
+  })
+
+  test("badges config-defined commands as custom", () => {
+    expect(slashCommandKind("review-changes")).toBe("custom")
+    expect(slashCommandKind("adapt")).toBe("custom")
+  })
+})
Original file line number	Diff line number	Diff line change
`@@ -39,3 +39,10 @@ export function slashTriggerIndex(text: string, widthMethod: WidthMethod) {`
`39`	`39`	`return measureEditText(text.slice(0, index), { widthMethod })`
`40`	`40`	`}`
`41`	`41`	`}`
	`42`	`+`
	`43`	+/** Source badge for a server-provided slash command. MCP prompts follow the `server:prompt`
	`44`	`+ * naming convention from mcpCommandName; everything else from the command registry is`
	`45`	`+ * config-defined. Built-in keymap commands never reach this and stay unbadged. */`
	`46`	`+export function slashCommandKind(name: string): "mcp" \| "custom" {`
	`47`	`+ return name.includes(":") ? "mcp" : "custom"`
	`48`	`+}`