diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b89a5c92..d0218a4c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [EE] Added DPoP sender-constrained OAuth tokens for MCP clients. [#1395](https://github.com/sourcebot-dev/sourcebot/pull/1395)
 - [EE] Added text file attachments to Ask Sourcebot, letting users attach text/code/config files to a chat message via the paperclip button, drag-and-drop, or paste, with large pastes auto-converted to attachments. [#1374](https://github.com/sourcebot-dev/sourcebot/pull/1374)
 - [EE] Added image attachments to Ask Sourcebot, letting users attach images to a chat message when the selected model supports image input. [#1375](https://github.com/sourcebot-dev/sourcebot/pull/1375)
+- [EE] Added Ask Sourcebot skills, letting users create, import, share, sync, and auto-invoke reusable chat instructions across personal and workspace scopes.
 
 ### Fixed
 - Send anonymous server-side PostHog events as personless so unauthenticated requests don't inflate person counts. [#1367](https://github.com/sourcebot-dev/sourcebot/pull/1367)
diff --git a/docs/api-reference/sourcebot-public.openapi.json b/docs/api-reference/sourcebot-public.openapi.json
index 3fe693a3e..0278edc4b 100644
--- a/docs/api-reference/sourcebot-public.openapi.json
+++ b/docs/api-reference/sourcebot-public.openapi.json
@@ -576,6 +576,9 @@
           },
           "externalWebUrl": {
             "type": "string"
+          },
+          "blobSha": {
+            "type": "string"
           }
         },
         "required": [
diff --git a/packages/db/prisma/migrations/20260624202848_refactor_agent_skills/migration.sql b/packages/db/prisma/migrations/20260624202848_refactor_agent_skills/migration.sql
new file mode 100644
index 000000000..8f148f28a
--- /dev/null
+++ b/packages/db/prisma/migrations/20260624202848_refactor_agent_skills/migration.sql
@@ -0,0 +1,83 @@
+-- CreateEnum
+CREATE TYPE "AgentSkillVisibility" AS ENUM ('PERSONAL', 'SHARED');
+
+-- CreateTable
+CREATE TABLE "AgentSkill" (
+    "id" TEXT NOT NULL,
+    "visibility" "AgentSkillVisibility" NOT NULL,
+    "scopeId" TEXT NOT NULL,
+    "slug" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "description" TEXT NOT NULL,
+    "instructions" TEXT NOT NULL,
+    "createdById" TEXT NOT NULL,
+    "updatedById" TEXT,
+    "orgId" INTEGER NOT NULL,
+    "enabled" BOOLEAN NOT NULL DEFAULT true,
+    "featured" BOOLEAN NOT NULL DEFAULT false,
+    "autoEnrolled" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "AgentSkill_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "AgentSkillAdoption" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "orgId" INTEGER NOT NULL,
+    "agentSkillId" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "removedAt" TIMESTAMP(3),
+
+    CONSTRAINT "AgentSkillAdoption_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "AgentSkill_createdById_idx" ON "AgentSkill"("createdById");
+
+-- CreateIndex
+CREATE INDEX "AgentSkill_updatedById_idx" ON "AgentSkill"("updatedById");
+
+-- CreateIndex
+CREATE INDEX "AgentSkill_orgId_idx" ON "AgentSkill"("orgId");
+
+-- CreateIndex
+CREATE INDEX "AgentSkill_orgId_visibility_scopeId_idx" ON "AgentSkill"("orgId", "visibility", "scopeId");
+
+-- CreateIndex
+CREATE INDEX "AgentSkill_shared_catalog_idx" ON "AgentSkill"("orgId", "visibility", "scopeId", "enabled", "featured" DESC, "updatedAt" DESC, "name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "AgentSkill_orgId_visibility_scopeId_slug_key" ON "AgentSkill"("orgId", "visibility", "scopeId", "slug");
+
+-- CreateIndex
+CREATE INDEX "AgentSkillAdoption_userId_orgId_removedAt_idx" ON "AgentSkillAdoption"("userId", "orgId", "removedAt");
+
+-- CreateIndex
+CREATE INDEX "AgentSkillAdoption_agentSkillId_idx" ON "AgentSkillAdoption"("agentSkillId");
+
+-- CreateIndex
+CREATE INDEX "AgentSkillAdoption_orgId_idx" ON "AgentSkillAdoption"("orgId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "AgentSkillAdoption_orgId_userId_agentSkillId_key" ON "AgentSkillAdoption"("orgId", "userId", "agentSkillId");
+
+-- AddForeignKey
+ALTER TABLE "AgentSkill" ADD CONSTRAINT "AgentSkill_createdById_fkey" FOREIGN KEY ("createdById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AgentSkill" ADD CONSTRAINT "AgentSkill_updatedById_fkey" FOREIGN KEY ("updatedById") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AgentSkill" ADD CONSTRAINT "AgentSkill_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AgentSkillAdoption" ADD CONSTRAINT "AgentSkillAdoption_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AgentSkillAdoption" ADD CONSTRAINT "AgentSkillAdoption_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AgentSkillAdoption" ADD CONSTRAINT "AgentSkillAdoption_agentSkillId_fkey" FOREIGN KEY ("agentSkillId") REFERENCES "AgentSkill"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/db/prisma/migrations/20260626120000_remove_featured_from_agent_skill/migration.sql b/packages/db/prisma/migrations/20260626120000_remove_featured_from_agent_skill/migration.sql
new file mode 100644
index 000000000..a47038c60
--- /dev/null
+++ b/packages/db/prisma/migrations/20260626120000_remove_featured_from_agent_skill/migration.sql
@@ -0,0 +1,8 @@
+-- DropIndex
+DROP INDEX "AgentSkill_shared_catalog_idx";
+
+-- AlterTable
+ALTER TABLE "AgentSkill" DROP COLUMN "featured";
+
+-- CreateIndex
+CREATE INDEX "AgentSkill_shared_catalog_idx" ON "AgentSkill"("orgId", "visibility", "scopeId", "enabled", "updatedAt" DESC, "name");
diff --git a/packages/db/prisma/migrations/20260627223058_add_agent_skill_source_provenance/migration.sql b/packages/db/prisma/migrations/20260627223058_add_agent_skill_source_provenance/migration.sql
new file mode 100644
index 000000000..12fb131de
--- /dev/null
+++ b/packages/db/prisma/migrations/20260627223058_add_agent_skill_source_provenance/migration.sql
@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE "AgentSkill" ADD COLUMN     "sourceBlobSha" TEXT,
+ADD COLUMN     "sourceFilePath" TEXT,
+ADD COLUMN     "sourceImportedAt" TIMESTAMP(3),
+ADD COLUMN     "sourceRepoName" TEXT,
+ADD COLUMN     "sourceRevision" TEXT;
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
index f18889a5f..0f72c97d0 100644
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -334,6 +334,8 @@ model Org {
   repoVisits RepoVisit[]
 
   mcpServers McpServer[]
+  agentSkills AgentSkill[]
+  agentSkillAdoptions AgentSkillAdoption[]
 
   license License?
   servicePingEvents ServicePingEvent[]
@@ -519,6 +521,9 @@ model User {
   sessionVersion Int @default(0)
 
   userMcpServers       UserMcpServer[]
+  createdAgentSkills   AgentSkill[] @relation("AgentSkillCreatedBy")
+  updatedAgentSkills   AgentSkill[] @relation("AgentSkillUpdatedBy")
+  agentSkillAdoptions  AgentSkillAdoption[]
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -741,6 +746,93 @@ model ChatAccess {
   @@unique([chatId, userId])
 }
 
+enum AgentSkillVisibility {
+  PERSONAL
+  SHARED
+}
+
+model AgentSkill {
+  id String @id @default(cuid())
+
+  // Namespace identity for slash-command uniqueness and lookup.
+  // This is not a foreign key and should not be used as an authorization check by itself.
+  //
+  // Every skill belongs to an org (orgId is always set).
+  // PERSONAL: scopeId is the user id; the skill is private to that user within the org.
+  // SHARED:   scopeId is String(orgId); the skill is visible to the whole org (opt-in via adoptions).
+  //
+  // Future sharing/grants should treat this as the skill's home namespace, not as the ACL.
+  visibility AgentSkillVisibility
+  scopeId    String
+  slug       String
+
+  name         String
+  description  String
+  instructions String
+
+  // The user who authored the skill. This is audit metadata, separate from
+  // the namespace that owns the slash-command slug.
+  createdBy   User   @relation("AgentSkillCreatedBy", fields: [createdById], references: [id], onDelete: Cascade)
+  createdById String
+
+  updatedBy   User?   @relation("AgentSkillUpdatedBy", fields: [updatedById], references: [id], onDelete: SetNull)
+  updatedById String?
+
+  // The owning org. Both PERSONAL and SHARED skills are scoped to an org, so a
+  // user's personal skills change when they switch orgs.
+  org   Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
+  orgId Int
+
+  enabled      Boolean  @default(true)
+  autoEnrolled Boolean  @default(false)
+
+  // Provenance for skills imported from an indexed repository file. All null for
+  // skills created manually or imported from a local file. When set, the skill's
+  // content is a read-only mirror of the source file: edits happen in the repo and
+  // are pulled in via "Update from source". sourceBlobSha (the git blob OID at
+  // import) is the comparison key used to detect when the indexed file has changed.
+  // Sync is personal-only; publishing to shared snapshots the content and drops
+  // these fields.
+  sourceRepoName   String?
+  sourceFilePath   String?
+  sourceRevision   String?
+  sourceBlobSha    String?
+  sourceImportedAt DateTime?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  adoptions AgentSkillAdoption[]
+
+  @@unique([orgId, visibility, scopeId, slug])
+  @@index([createdById])
+  @@index([updatedById])
+  @@index([orgId])
+  @@index([orgId, visibility, scopeId])
+  @@index([orgId, visibility, scopeId, enabled, updatedAt(sort: Desc), name], map: "AgentSkill_shared_catalog_idx")
+}
+
+model AgentSkillAdoption {
+  id String @id @default(cuid())
+
+  user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId String
+
+  org   Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
+  orgId Int
+
+  agentSkill   AgentSkill @relation(fields: [agentSkillId], references: [id], onDelete: Cascade)
+  agentSkillId String
+
+  createdAt DateTime @default(now())
+  removedAt DateTime?
+
+  @@unique([orgId, userId, agentSkillId])
+  @@index([userId, orgId, removedAt])
+  @@index([agentSkillId])
+  @@index([orgId])
+}
+
 // OAuth2 Authorization Server models
 // @see: https://datatracker.ietf.org/doc/html/rfc6749
 
diff --git a/packages/db/src/index.ts b/packages/db/src/index.ts
index 245206d9d..7853b4f1d 100644
--- a/packages/db/src/index.ts
+++ b/packages/db/src/index.ts
@@ -1,3 +1,62 @@
-import type { User, Account } from ".prisma/client";
+import type { Account, Prisma, User } from ".prisma/client";
 export type UserWithAccounts = User & { accounts: Account[] };
-export * from ".prisma/client";
\ No newline at end of file
+export * from ".prisma/client";
+
+// Personal skills are scoped to the (user, org) pair: a user's personal skills
+// change when they switch orgs. scopeId is the userId; orgId binds it to the org.
+export const personalAgentSkillScope = (userId: string, orgId: number) => ({
+    visibility: "PERSONAL" as const,
+    scopeId: userId,
+    orgId,
+});
+
+// Shared skills are visible to the whole org. scopeId is String(orgId) so every
+// shared skill in an org occupies one slug-uniqueness namespace.
+export const sharedAgentSkillScope = (orgId: number) => ({
+    visibility: "SHARED" as const,
+    scopeId: String(orgId),
+    orgId,
+});
+
+export const personalAgentSkillAuthScope = (userId: string, orgId: number) => ({
+    ...personalAgentSkillScope(userId, orgId),
+    createdById: userId,
+});
+
+export const sharedAgentSkillAuthScope = (orgId: number) => ({
+    ...sharedAgentSkillScope(orgId),
+});
+
+export const sharedAgentSkillVisibleToUserWhere = (userId: string, orgId: number) => ({
+    ...sharedAgentSkillAuthScope(orgId),
+    enabled: true,
+    AND: [
+        {
+            OR: [
+                { autoEnrolled: true },
+                {
+                    adoptions: {
+                        some: {
+                            userId,
+                            orgId,
+                            removedAt: null,
+                        },
+                    },
+                },
+            ],
+        },
+        {
+            NOT: {
+                adoptions: {
+                    some: {
+                        userId,
+                        orgId,
+                        removedAt: {
+                            not: null,
+                        },
+                    },
+                },
+            },
+        },
+    ],
+}) satisfies Prisma.AgentSkillWhereInput;
diff --git a/packages/web/package.json b/packages/web/package.json
index 397d0df21..2e31a19b4 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -205,6 +205,7 @@
     "usehooks-ts": "^3.1.0",
     "uuid": "^14.0.0",
     "vscode-icons-js": "^11.6.1",
+    "yaml": "^2.8.3",
     "zod": "^3.25.76",
     "zod-to-json-schema": "^3.24.5"
   },
@@ -213,6 +214,7 @@
     "@eslint/eslintrc": "^3",
     "@react-email/ui": "6.1.4",
     "@react-grab/mcp": "^0.1.23",
+    "@tailwindcss/container-queries": "^0.1.1",
     "@tanstack/eslint-plugin-query": "^5.74.7",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.0",
diff --git a/packages/web/src/app/(app)/@sidebar/components/settingsSidebar/nav.tsx b/packages/web/src/app/(app)/@sidebar/components/settingsSidebar/nav.tsx
index 11960732a..9f86c73d0 100644
--- a/packages/web/src/app/(app)/@sidebar/components/settingsSidebar/nav.tsx
+++ b/packages/web/src/app/(app)/@sidebar/components/settingsSidebar/nav.tsx
@@ -22,6 +22,7 @@ import {
     ServerIcon,
     Settings2Icon,
     ShieldIcon,
+    SparklesIcon,
     UserIcon,
     UsersIcon,
 } from "lucide-react";
@@ -44,6 +45,7 @@ const iconMap = {
     "user": UserIcon,
     "mcp": VscMcp,
     "bot": BotIcon,
+    "sparkles": SparklesIcon,
 } satisfies Record<string, LucideIcon | IconType>;
 
 export type NavIconName = keyof typeof iconMap;
diff --git a/packages/web/src/app/(app)/askgh/[owner]/[repo]/components/landingPage.tsx b/packages/web/src/app/(app)/askgh/[owner]/[repo]/components/landingPage.tsx
index 29cedbb71..956f958f7 100644
--- a/packages/web/src/app/(app)/askgh/[owner]/[repo]/components/landingPage.tsx
+++ b/packages/web/src/app/(app)/askgh/[owner]/[repo]/components/landingPage.tsx
@@ -13,6 +13,7 @@ import { DISABLED_MCP_SERVER_IDS_LOCAL_STORAGE_KEY } from "@/features/chat/const
 import { getRepoImageSrc } from '@/lib/utils';
 import { useMemo, useRef, useState } from "react";
 import { useLocalStorage } from "usehooks-ts";
+import type { AskCommandDefinition } from '@/features/chat/commands/types';
 
 interface LandingPageProps {
     languageModels: LanguageModelInfo[];
@@ -20,6 +21,7 @@ interface LandingPageProps {
     repoDisplayName?: string;
     imageUrl?: string | null;
     repoId: number;
+    askCommands: AskCommandDefinition[];
     isAuthenticated: boolean;
     maxImageBytes: number;
 }
@@ -30,6 +32,7 @@ export const LandingPage = ({
     repoDisplayName,
     imageUrl,
     repoId,
+    askCommands,
     isAuthenticated,
     maxImageBytes,
 }: LandingPageProps) => {
@@ -86,6 +89,7 @@ export const LandingPage = ({
                             isRedirecting={isLoading}
                             selectedSearchScopes={selectedSearchScopes}
                             searchContexts={[]}
+                            askCommands={askCommands}
                             isDisabled={isChatBoxDisabled}
                             isAuthenticated={isAuthenticated}
                             isLoginWallEnabled={true}
diff --git a/packages/web/src/app/(app)/askgh/[owner]/[repo]/page.tsx b/packages/web/src/app/(app)/askgh/[owner]/[repo]/page.tsx
index 37e49ce5a..21657f8f7 100644
--- a/packages/web/src/app/(app)/askgh/[owner]/[repo]/page.tsx
+++ b/packages/web/src/app/(app)/askgh/[owner]/[repo]/page.tsx
@@ -11,6 +11,7 @@ import { auth } from "@/auth";
 import { hasEntitlement } from "@/lib/entitlements";
 import { ChatEntitlementMessage } from "@/features/chat/components/chatEntitlementMessage";
 import { env } from "@sourcebot/shared";
+import { listAgentSkillCommandsOrEmpty } from "@/ee/features/chat/skills/commands.server";
 
 interface PageProps {
     params: Promise<{ owner: string; repo: string }>;
@@ -54,6 +55,9 @@ export default async function GitHubRepoPage(props: PageProps) {
 
     const repoInfo = await getRepoInfo(repoId)
     const languageModels = await getConfiguredLanguageModelsInfo()
+    const askCommands = session?.user
+        ? await listAgentSkillCommandsOrEmpty()
+        : [];
 
     if (isServiceError(repoInfo)) {
         throw new ServiceErrorException(repoInfo);
@@ -68,6 +72,7 @@ export default async function GitHubRepoPage(props: PageProps) {
                     repoDisplayName={repoInfo.displayName ?? undefined}
                     imageUrl={repoInfo.imageUrl ?? undefined}
                     repoId={repoInfo.id}
+                    askCommands={askCommands}
                     isAuthenticated={!!session?.user}
                     maxImageBytes={env.SOURCEBOT_CHAT_ATTACHMENT_MAX_IMAGE_BYTES}
                 />
diff --git a/packages/web/src/app/(app)/chat/[id]/page.tsx b/packages/web/src/app/(app)/chat/[id]/page.tsx
index a16b2a93f..7669888eb 100644
--- a/packages/web/src/app/(app)/chat/[id]/page.tsx
+++ b/packages/web/src/app/(app)/chat/[id]/page.tsx
@@ -19,6 +19,7 @@ import { env } from '@sourcebot/shared';
 import { hasEntitlement } from '@/lib/entitlements';
 import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
 import { captureEvent } from '@/lib/posthog';
+import { listAgentSkillCommandsOrEmpty } from '@/ee/features/chat/skills/commands.server';
 
 interface PageProps {
     params: Promise<{
@@ -118,6 +119,9 @@ export default async function Page(props: PageProps) {
     }
 
     const { messages, name, visibility, isOwner, isSharedWithUser } = chatInfo;
+    const askCommands = session?.user && isOwner
+        ? await listAgentSkillCommandsOrEmpty()
+        : [];
 
     // Track when a non-owner views a shared chat
     if (!isOwner) {
@@ -176,6 +180,7 @@ export default async function Page(props: PageProps) {
                 repos={indexedRepos}
                 searchContexts={searchContexts}
                 messages={messages}
+                askCommands={askCommands}
                 isOwner={isOwner}
                 isAuthenticated={!!session}
                 isLoginWallEnabled={env.EXPERIMENT_ASK_GH_ENABLED === 'true'}
diff --git a/packages/web/src/app/(app)/chat/chatLandingPage.tsx b/packages/web/src/app/(app)/chat/chatLandingPage.tsx
index 153a044a2..c4030489c 100644
--- a/packages/web/src/app/(app)/chat/chatLandingPage.tsx
+++ b/packages/web/src/app/(app)/chat/chatLandingPage.tsx
@@ -13,12 +13,18 @@ import { env } from "@sourcebot/shared";
 import { loadJsonFile } from "@sourcebot/shared";
 import { DemoExamples, demoExamplesSchema } from "@/types";
 import { auth } from "@/auth";
+import { hasEntitlement } from "@/lib/entitlements";
+import { listAgentSkillCommandsOrEmpty } from "@/ee/features/chat/skills/commands.server";
 
 export async function ChatLandingPage() {
     const languageModels = await getConfiguredLanguageModelsInfo();
     const searchContexts = await getSearchContexts();
     const allRepos = await getRepos();
     const session = await auth();
+    const hasAskEntitlement = await hasEntitlement('ask');
+    const askCommands = session?.user && hasAskEntitlement
+        ? await listAgentSkillCommandsOrEmpty()
+        : [];
 
     const carouselRepos = await getRepos({
         where: {
@@ -69,6 +75,7 @@ export async function ChatLandingPage() {
                             languageModels={languageModels}
                             repos={allRepos}
                             searchContexts={searchContexts}
+                            askCommands={askCommands}
                             isAuthenticated={!!session}
                             isLoginWallEnabled={env.EXPERIMENT_ASK_GH_ENABLED === 'true'}
                             maxImageBytes={env.SOURCEBOT_CHAT_ATTACHMENT_MAX_IMAGE_BYTES}
diff --git a/packages/web/src/app/(app)/chat/components/landingPageChatBox.tsx b/packages/web/src/app/(app)/chat/components/landingPageChatBox.tsx
index f9349dc92..9e22d12ee 100644
--- a/packages/web/src/app/(app)/chat/components/landingPageChatBox.tsx
+++ b/packages/web/src/app/(app)/chat/components/landingPageChatBox.tsx
@@ -12,11 +12,13 @@ import { useLocalStorage } from "usehooks-ts";
 import { DISABLED_MCP_SERVER_IDS_LOCAL_STORAGE_KEY, SELECTED_SEARCH_SCOPES_LOCAL_STORAGE_KEY } from "@/features/chat/constants";
 import { SearchModeSelector } from "../../components/searchModeSelector";
 import { NotConfiguredErrorBanner } from "@/features/chat/components/notConfiguredErrorBanner";
+import type { AskCommandDefinition } from "@/features/chat/commands/types";
 
 interface LandingPageChatBox {
     languageModels: LanguageModelInfo[];
     repos: RepositoryQuery[];
     searchContexts: SearchContextQuery[];
+    askCommands: AskCommandDefinition[];
     isAuthenticated: boolean;
     isLoginWallEnabled: boolean;
     maxImageBytes: number;
@@ -26,6 +28,7 @@ export const LandingPageChatBox = ({
     languageModels,
     repos,
     searchContexts,
+    askCommands,
     isAuthenticated,
     isLoginWallEnabled,
     maxImageBytes,
@@ -49,6 +52,7 @@ export const LandingPageChatBox = ({
                     isRedirecting={isLoading}
                     selectedSearchScopes={selectedSearchScopes}
                     searchContexts={searchContexts}
+                    askCommands={askCommands}
                     isDisabled={isChatBoxDisabled}
                     isAuthenticated={isAuthenticated}
                     isLoginWallEnabled={isLoginWallEnabled}
diff --git a/packages/web/src/app/(app)/chat/layout.tsx b/packages/web/src/app/(app)/chat/layout.tsx
index b4bdcdda5..77cc318c9 100644
--- a/packages/web/src/app/(app)/chat/layout.tsx
+++ b/packages/web/src/app/(app)/chat/layout.tsx
@@ -1,5 +1,4 @@
 import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME } from '@/lib/constants';
-import { NavigationGuardProvider } from 'next-navigation-guard';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import { McpOAuthStatusToast } from './components/mcpOAuthStatusToast';
@@ -13,14 +12,12 @@ export default async function Layout({ children }: LayoutProps) {
     const isTutorialDismissed = (await cookies()).get(AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME)?.value === "true";
 
     return (
-        // @note: we use a navigation guard here since we don't support resuming streams yet.
-        // @see: https://ai-sdk.dev/docs/ai-sdk-ui/chatbot-message-persistence#resuming-ongoing-streams
-        <NavigationGuardProvider>
+        <>
             <Suspense fallback={null}>
                 <McpOAuthStatusToast />
             </Suspense>
             {children}
             <TutorialDialog isOpen={!isTutorialDismissed} />
-        </NavigationGuardProvider>
+        </>
     )
 }
diff --git a/packages/web/src/app/(app)/components/searchModeSelector.tsx b/packages/web/src/app/(app)/components/searchModeSelector.tsx
index 610f6b5dc..1446354df 100644
--- a/packages/web/src/app/(app)/components/searchModeSelector.tsx
+++ b/packages/web/src/app/(app)/components/searchModeSelector.tsx
@@ -27,6 +27,7 @@ export const SearchModeSelector = ({
     className,
 }: SearchModeSelectorProps) => {
     const [focusedSearchMode, setFocusedSearchMode] = useState<SearchMode>(searchMode);
+    const [isOpen, setIsOpen] = useState(false);
     const router = useRouter();
 
     const onSearchModeChanged = useCallback((value: SearchMode) => {
@@ -56,6 +57,8 @@ export const SearchModeSelector = ({
         <div className={cn("flex flex-row items-center", className)}>
             <Select
                 value={searchMode}
+                open={isOpen}
+                onOpenChange={setIsOpen}
                 onValueChange={(value) => {
                     onSearchModeChanged(value as SearchMode);
                 }}
@@ -78,7 +81,7 @@ export const SearchModeSelector = ({
                 >
                     <Tooltip
                         delayDuration={100}
-                        open={focusedSearchMode === "precise"}
+                        open={isOpen && focusedSearchMode === "precise"}
                     >
                         <TooltipTrigger asChild>
                             <div
@@ -118,7 +121,7 @@ export const SearchModeSelector = ({
                             </div>
                         </TooltipTrigger>
                     </Tooltip>
-                    <Tooltip delayDuration={100} open={focusedSearchMode === "agentic"}>
+                    <Tooltip delayDuration={100} open={isOpen && focusedSearchMode === "agentic"}>
                         <TooltipTrigger asChild>
                             <div
                                 onMouseEnter={() => setFocusedSearchMode("agentic")}
diff --git a/packages/web/src/app/(app)/layout.tsx b/packages/web/src/app/(app)/layout.tsx
index 5120f6bcc..4ee8e1554 100644
--- a/packages/web/src/app/(app)/layout.tsx
+++ b/packages/web/src/app/(app)/layout.tsx
@@ -35,6 +35,7 @@ import { HasLicenseProvider } from "@/features/billing/hasLicenseProvider";
 import { tryGetLatestSourcebotTag } from "./components/banners/actions";
 import { LanguageModelProvider } from "@/features/chat/languageModelContext";
 import { getConfiguredLanguageModelsInfo } from "@/features/chat/utils.server";
+import { NavigationGuardProvider } from "next-navigation-guard";
 
 interface LayoutProps {
     children: React.ReactNode;
@@ -183,32 +184,35 @@ export default async function Layout(props: LayoutProps) {
             >
                 <LanguageModelProvider languageModels={languageModels}>
                     <SyntaxGuideProvider>
-                        <div className="fixed inset-0 flex bg-shell">
-                            <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
-                                {sidebar}
-                                <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
-                                    <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
-                                        <BannerHeightObserver>
-                                            <BannerSlot
-                                                role={role}
-                                                license={license}
-                                                offlineLicense={offlineLicense}
-                                                hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
-                                                hasPendingFirstSync={hasPendingFirstSync}
-                                                currentVersion={SOURCEBOT_VERSION}
-                                                latestVersion={latestVersion}
-                                            />
-                                        </BannerHeightObserver>
-                                        <div className="flex-1 min-h-0 overflow-y-scroll [scrollbar-gutter:stable]">
-                                            {children}
+                        {/* Keep one guard provider above both sidebar and content so browser history is tracked before guarded routes mount. */}
+                        <NavigationGuardProvider>
+                            <div className="fixed inset-0 flex bg-shell">
+                                <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
+                                    {sidebar}
+                                    <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
+                                        <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
+                                            <BannerHeightObserver>
+                                                <BannerSlot
+                                                    role={role}
+                                                    license={license}
+                                                    offlineLicense={offlineLicense}
+                                                    hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
+                                                    hasPendingFirstSync={hasPendingFirstSync}
+                                                    currentVersion={SOURCEBOT_VERSION}
+                                                    latestVersion={latestVersion}
+                                                />
+                                            </BannerHeightObserver>
+                                            <div className="flex-1 min-h-0 overflow-y-scroll [scrollbar-gutter:stable]">
+                                                {children}
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                            </SidebarProvider>
-                        </div>
-                        <SyntaxReferenceGuide />
-                        <GitHubStarToast />
-                        <CheckoutReturnHandler />
+                                </SidebarProvider>
+                            </div>
+                            <SyntaxReferenceGuide />
+                            <GitHubStarToast />
+                            <CheckoutReturnHandler />
+                        </NavigationGuardProvider>
                     </SyntaxGuideProvider>
                 </LanguageModelProvider>
             </HasLicenseProvider>
diff --git a/packages/web/src/app/(app)/settings/accountAskAgent/skills/[skillId]/page.tsx b/packages/web/src/app/(app)/settings/accountAskAgent/skills/[skillId]/page.tsx
new file mode 100644
index 000000000..d364ed796
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/accountAskAgent/skills/[skillId]/page.tsx
@@ -0,0 +1,34 @@
+import { notFound } from "next/navigation";
+import { getPersonalAgentSkill } from "@/ee/features/chat/skills/actions";
+import { PersonalSkillEditorPage } from "@/ee/features/chat/skills/components/personalSkillEditorPage";
+import { hasEntitlement } from "@/lib/entitlements";
+import { ErrorCode } from "@/lib/errorCodes";
+import { ServiceErrorException } from "@/lib/serviceError";
+import { isServiceError } from "@/lib/utils";
+import { authenticatedPage } from "@/middleware/authenticatedPage";
+import { AccountAskAgentEntitlementMessage } from "../../accountAskAgentEntitlementMessage";
+
+interface PageProps extends Record<string, unknown> {
+    params: Promise<{
+        skillId: string;
+    }>;
+}
+
+export default authenticatedPage<PageProps>(async (_context, { params }) => {
+    // Skills are part of Ask Sourcebot. Gate the EE skill editor behind the
+    // `ask` entitlement so it never renders on a non-entitled deployment.
+    if (!(await hasEntitlement('ask'))) {
+        return <AccountAskAgentEntitlementMessage />;
+    }
+
+    const { skillId } = await params;
+    const skill = await getPersonalAgentSkill(skillId);
+    if (isServiceError(skill)) {
+        if (skill.errorCode === ErrorCode.AGENT_SKILL_NOT_FOUND) {
+            return notFound();
+        }
+        throw new ServiceErrorException(skill);
+    }
+
+    return <PersonalSkillEditorPage skill={skill} />;
+});
diff --git a/packages/web/src/app/(app)/settings/accountAskAgent/skills/new/page.tsx b/packages/web/src/app/(app)/settings/accountAskAgent/skills/new/page.tsx
new file mode 100644
index 000000000..e99900868
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/accountAskAgent/skills/new/page.tsx
@@ -0,0 +1,14 @@
+import { PersonalSkillEditorPage } from "@/ee/features/chat/skills/components/personalSkillEditorPage";
+import { hasEntitlement } from "@/lib/entitlements";
+import { authenticatedPage } from "@/middleware/authenticatedPage";
+import { AccountAskAgentEntitlementMessage } from "../../accountAskAgentEntitlementMessage";
+
+export default authenticatedPage(async () => {
+    // Skills are part of Ask Sourcebot. Gate the EE skill editor behind the
+    // `ask` entitlement so it never renders on a non-entitled deployment.
+    if (!(await hasEntitlement('ask'))) {
+        return <AccountAskAgentEntitlementMessage />;
+    }
+
+    return <PersonalSkillEditorPage skill={null} />;
+});
diff --git a/packages/web/src/app/(app)/settings/accountAskAgent/workspaceSkills/[skillId]/page.tsx b/packages/web/src/app/(app)/settings/accountAskAgent/workspaceSkills/[skillId]/page.tsx
new file mode 100644
index 000000000..6ee5c6c1e
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/accountAskAgent/workspaceSkills/[skillId]/page.tsx
@@ -0,0 +1,35 @@
+import { notFound } from "next/navigation";
+import { getSharedAgentSkill } from "@/ee/features/chat/skills/actions";
+import { SharedSkillEditorPage } from "@/ee/features/chat/skills/components/personalSkillEditorPage";
+import { hasEntitlement } from "@/lib/entitlements";
+import { ErrorCode } from "@/lib/errorCodes";
+import { ServiceErrorException } from "@/lib/serviceError";
+import { isServiceError } from "@/lib/utils";
+import { authenticatedPage } from "@/middleware/authenticatedPage";
+import { AccountAskAgentEntitlementMessage } from "../../accountAskAgentEntitlementMessage";
+
+interface PageProps extends Record<string, unknown> {
+    params: Promise<{
+        skillId: string;
+    }>;
+}
+
+export default authenticatedPage<PageProps>(async (_context, { params }) => {
+    if (!(await hasEntitlement('ask'))) {
+        return <AccountAskAgentEntitlementMessage />;
+    }
+
+    const { skillId } = await params;
+    const skill = await getSharedAgentSkill(skillId);
+    if (isServiceError(skill)) {
+        if (
+            skill.errorCode === ErrorCode.AGENT_SKILL_NOT_FOUND ||
+            skill.errorCode === ErrorCode.INSUFFICIENT_PERMISSIONS
+        ) {
+            return notFound();
+        }
+        throw new ServiceErrorException(skill);
+    }
+
+    return <SharedSkillEditorPage skill={skill} />;
+});
diff --git a/packages/web/src/app/(app)/settings/components/settingsContentFrame.test.tsx b/packages/web/src/app/(app)/settings/components/settingsContentFrame.test.tsx
new file mode 100644
index 000000000..33ed17c14
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/components/settingsContentFrame.test.tsx
@@ -0,0 +1,42 @@
+import { render } from "@testing-library/react";
+import { describe, expect, test, vi } from "vitest";
+import { SettingsContentFrame } from "./settingsContentFrame";
+
+const navigationMock = vi.hoisted(() => ({
+    pathname: "/settings/general",
+}));
+
+vi.mock("next/navigation", () => ({
+    usePathname: () => navigationMock.pathname,
+}));
+
+describe("SettingsContentFrame", () => {
+    test.each([
+        "/settings/accountAskAgent/skills/new",
+        "/settings/accountAskAgent/skills/skill-1",
+        "/settings/accountAskAgent/workspaceSkills/skill-1",
+    ])("renders %s edge-to-edge", (pathname) => {
+        navigationMock.pathname = pathname;
+
+        const { container } = render(
+            <SettingsContentFrame>
+                <div>Editor</div>
+            </SettingsContentFrame>,
+        );
+
+        expect(container.querySelector("main")).toBeNull();
+        expect(container.firstElementChild?.className).toBe("h-full");
+    });
+
+    test("renders ordinary settings pages in the centered frame", () => {
+        navigationMock.pathname = "/settings/general";
+
+        const { container } = render(
+            <SettingsContentFrame>
+                <div>General</div>
+            </SettingsContentFrame>,
+        );
+
+        expect(container.querySelector("main")).not.toBeNull();
+    });
+});
diff --git a/packages/web/src/app/(app)/settings/components/settingsContentFrame.tsx b/packages/web/src/app/(app)/settings/components/settingsContentFrame.tsx
new file mode 100644
index 000000000..a9969a9a0
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/components/settingsContentFrame.tsx
@@ -0,0 +1,29 @@
+'use client';
+
+import { usePathname } from "next/navigation";
+
+// Routes that opt out of the centered settings column and render edge-to-edge
+// (e.g. the full-bleed skill editor). Everything else stays in the constrained,
+// centered column shared by the rest of settings.
+const FULL_BLEED_ROUTE_PATTERNS = [
+    /^\/settings\/skills(\/|$)/,
+    /^\/settings\/accountAskAgent\/skills(\/|$)/,
+    /^\/settings\/accountAskAgent\/workspaceSkills(\/|$)/,
+];
+
+export function SettingsContentFrame({ children }: { children: React.ReactNode }) {
+    const pathname = usePathname();
+    const isFullBleed = FULL_BLEED_ROUTE_PATTERNS.some((pattern) => pattern.test(pathname));
+
+    if (isFullBleed) {
+        return <div className="h-full">{children}</div>;
+    }
+
+    return (
+        <main className="flex justify-center p-4">
+            <div className="w-full max-w-3xl rounded-lg p-6">
+                <div className="w-full rounded-lg">{children}</div>
+            </div>
+        </main>
+    );
+}
diff --git a/packages/web/src/app/(app)/settings/layout.tsx b/packages/web/src/app/(app)/settings/layout.tsx
index 422785ced..655ca28f5 100644
--- a/packages/web/src/app/(app)/settings/layout.tsx
+++ b/packages/web/src/app/(app)/settings/layout.tsx
@@ -87,7 +87,14 @@ export const getSidebarNavGroups = async () =>
                         {
                             title: "Ask Sourcebot",
                             href: `/settings/accountAskAgent`,
+                            hrefRegex: `/settings/accountAskAgent(/.*)?$`,
                             icon: "bot" as const,
+                        },
+                        {
+                            title: "Skills",
+                            href: `/settings/skills`,
+                            hrefRegex: `/settings/skills(/.*)?$`,
+                            icon: "sparkles" as const,
                         }
                     ] : []),
                 ],
diff --git a/packages/web/src/app/(app)/settings/skills/page.tsx b/packages/web/src/app/(app)/settings/skills/page.tsx
new file mode 100644
index 000000000..230ca4a0e
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/skills/page.tsx
@@ -0,0 +1,49 @@
+import { listPersonalAgentSkills, listSharedAgentSkillCatalog } from "@/ee/features/chat/skills/actions";
+import { SkillsPage } from "@/ee/features/chat/skills/components/skillsPage";
+import { hasEntitlement } from "@/lib/entitlements";
+import { ServiceErrorException } from "@/lib/serviceError";
+import { isServiceError } from "@/lib/utils";
+import { authenticatedPage } from "@/middleware/authenticatedPage";
+import { OrgRole } from "@sourcebot/db";
+import { env } from "@sourcebot/shared";
+import { SkillsEntitlementMessage } from "./skillsEntitlementMessage";
+
+interface PageProps extends Record<string, unknown> {
+    // `skill` deep-links a specific skill as the initially-selected one (used by
+    // the workspace admin table's skill-name links).
+    searchParams: Promise<{ skill?: string }>;
+}
+
+export default authenticatedPage<PageProps>(async ({ user, role }, { searchParams }) => {
+    // Skills are part of Ask Sourcebot. Gate the EE skill UI behind the `ask`
+    // entitlement so it never renders on a non-entitled deployment; show the FSL
+    // upsell panel instead.
+    if (!(await hasEntitlement('ask'))) {
+        return <SkillsEntitlementMessage />;
+    }
+
+    const [{ skill: initialSelectedId }, [personalSkills, sharedSkills]] = await Promise.all([
+        searchParams,
+        Promise.all([
+            listPersonalAgentSkills(),
+            listSharedAgentSkillCatalog(),
+        ]),
+    ]);
+    if (isServiceError(personalSkills)) {
+        throw new ServiceErrorException(personalSkills);
+    }
+    if (isServiceError(sharedSkills)) {
+        throw new ServiceErrorException(sharedSkills);
+    }
+
+    return (
+        <SkillsPage
+            initialPersonalSkills={personalSkills}
+            initialSharedSkills={sharedSkills}
+            currentUserEmail={user.email ?? ""}
+            isOwner={role === OrgRole.OWNER}
+            initialSelectedId={initialSelectedId}
+            permissionSyncEnabled={env.PERMISSION_SYNC_ENABLED === 'true'}
+        />
+    );
+});
diff --git a/packages/web/src/app/(app)/settings/skills/skillsEntitlementMessage.tsx b/packages/web/src/app/(app)/settings/skills/skillsEntitlementMessage.tsx
new file mode 100644
index 000000000..0de5adfd2
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/skills/skillsEntitlementMessage.tsx
@@ -0,0 +1,23 @@
+"use client"
+
+import { UpsellPanel } from "@/features/billing/upsellDialog"
+
+/**
+ * Shown in place of the Skills management UI when the deployment is not on a plan
+ * that includes Ask Sourcebot. FSL (not ee/) so it can render for free-plan users
+ * as the upsell surface without mounting any ee/ skill code.
+ */
+export function SkillsEntitlementMessage() {
+    return (
+        <div className="flex items-center justify-center min-h-[60vh] py-12 px-4">
+            <UpsellPanel
+                source="chat_connectors"
+                returnPath="/settings/skills"
+                title="Upgrade to use Ask Sourcebot skills"
+                description="Create reusable slash-command workflows for Ask Sourcebot and share them with your workspace."
+                className="w-full max-w-2xl"
+                loadingVariant="spinner"
+            />
+        </div>
+    )
+}
diff --git a/packages/web/src/app/(app)/settings/workspaceAskAgent/page.tsx b/packages/web/src/app/(app)/settings/workspaceAskAgent/page.tsx
index fd2deff20..ebc1dc6d6 100644
--- a/packages/web/src/app/(app)/settings/workspaceAskAgent/page.tsx
+++ b/packages/web/src/app/(app)/settings/workspaceAskAgent/page.tsx
@@ -4,12 +4,17 @@ import { OrgRole } from "@sourcebot/db";
 import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
 import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
 import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";
+import { listSharedAgentSkillManagement } from "@/ee/features/chat/skills/actions";
+import { ServiceErrorException } from "@/lib/serviceError";
+import { isServiceError } from "@/lib/utils";
 
 interface PageProps extends Record<string, unknown> {
     searchParams: Promise<{
         status?: string;
         server?: string;
         message?: string;
+        // Pre-fills the shared-skills search box (deep link from the account page).
+        skillSearch?: string;
     }>;
 }
 
@@ -20,7 +25,8 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
     // render it for teardown (the page itself disables "add" and only allows
     // removal in that state). We only show the upsell when there is nothing to
     // clean up.
-    if (!(await hasEntitlement("ask"))) {
+    const hasAskEntitlement = await hasEntitlement("ask");
+    if (!hasAskEntitlement) {
         const serverCount = await prisma.mcpServer.count({
             where: { orgId: org.id },
         });
@@ -30,7 +36,11 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
         }
     }
 
-    const { status, server, message } = await searchParams;
+    const { status, server, message, skillSearch } = await searchParams;
+    const orgSkills = hasAskEntitlement ? await listSharedAgentSkillManagement() : [];
+    if (isServiceError(orgSkills)) {
+        throw new ServiceErrorException(orgSkills);
+    }
 
     return (
         <WorkspaceAskAgentPage
@@ -38,6 +48,8 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
             callbackServer={server}
             callbackMessage={message}
             oauthRedirectUrl={getMcpOAuthCallbackUrl()}
+            initialOrgSkills={orgSkills}
+            initialSkillSearch={skillSearch}
         />
     );
 }, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
diff --git a/packages/web/src/app/(app)/settings/workspaceAskAgent/workspaceAskAgentPage.test.tsx b/packages/web/src/app/(app)/settings/workspaceAskAgent/workspaceAskAgentPage.test.tsx
new file mode 100644
index 000000000..5507b5f24
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/workspaceAskAgent/workspaceAskAgentPage.test.tsx
@@ -0,0 +1,270 @@
+import { act, cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { TooltipProvider } from '@/components/ui/tooltip';
+import type { ReactNode } from 'react';
+import type { SharedAgentSkillManagementItem } from '@/ee/features/chat/skills/types';
+
+vi.mock('next/navigation', () => ({
+    useRouter: () => ({
+        push: vi.fn(),
+    }),
+}));
+
+// The shared-skills manager links skill names via next/link; render a plain anchor.
+vi.mock('next/link', async () => {
+    const { createElement } = await import('react');
+    return {
+        default: ({ href, children }: { href: string; children: ReactNode }) =>
+            createElement('a', { href }, children),
+    };
+});
+
+vi.mock('@/app/api/(client)/client', () => ({
+    getMcpConfiguration: vi.fn(),
+    getMcpServersWithStatus: vi.fn(),
+}));
+
+vi.mock('@/ee/features/chat/mcp/actions', () => ({
+    checkMcpServerDynamicClientRegistration: vi.fn(),
+    createMcpServer: vi.fn(),
+    createStaticOAuthMcpServer: vi.fn(),
+    deleteMcpServer: vi.fn(),
+    updateMcpServerOAuthScopes: vi.fn(),
+}));
+
+vi.mock('@/ee/features/chat/skills/actions', () => ({
+    deleteSharedAgentSkill: vi.fn(),
+    setSharedSkillFlag: vi.fn(),
+}));
+
+const clientApi = await import('@/app/api/(client)/client');
+const skillActions = await import('@/ee/features/chat/skills/actions');
+const { WorkspaceAskAgentPage } = await import('./workspaceAskAgentPage');
+
+afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+});
+
+function renderWorkspaceAskAgentPage({
+    orgSkills,
+    isAskAgentAvailable = true,
+}: {
+    orgSkills: SharedAgentSkillManagementItem[];
+    isAskAgentAvailable?: boolean;
+}) {
+    vi.mocked(clientApi.getMcpConfiguration).mockResolvedValue({
+        allowedMode: 'approved_only',
+        isAskAgentAvailable,
+        servers: [],
+    });
+    vi.mocked(clientApi.getMcpServersWithStatus).mockResolvedValue([]);
+
+    const queryClient = new QueryClient({
+        defaultOptions: {
+            queries: {
+                retry: false,
+            },
+        },
+    });
+
+    return render(
+        <QueryClientProvider client={queryClient}>
+            <TooltipProvider>
+                <WorkspaceAskAgentPage
+                    oauthRedirectUrl="http://localhost/api/oauth/callback"
+                    initialOrgSkills={orgSkills}
+                />
+            </TooltipProvider>
+        </QueryClientProvider>,
+    );
+}
+
+describe('WorkspaceAskAgentPage', () => {
+    test('hides shared skills when Ask is unavailable', async () => {
+        const sharedSkill: SharedAgentSkillManagementItem = {
+            id: 'skill-1',
+            scope: 'SHARED',
+            slug: 'review',
+            name: 'Review',
+            description: 'Review risky changes.',
+            enabled: true,
+            autoEnrolled: false,
+            source: null,
+            createdByEmail: 'creator@sourcebot.dev',
+            createdAt: '2026-06-18T00:00:00.000Z',
+            updatedAt: '2026-06-18T00:00:00.000Z',
+        };
+
+        renderWorkspaceAskAgentPage({
+            orgSkills: [sharedSkill],
+            isAskAgentAvailable: false,
+        });
+
+        await screen.findByText('Ask Sourcebot connectors are unavailable');
+
+        expect(screen.queryByText('Review')).toBeNull();
+        expect(screen.queryByText('Available to everyone in your workspace.')).toBeNull();
+    });
+
+    test('disables shared skill delete while a flag update is pending', async () => {
+        const sharedSkill: SharedAgentSkillManagementItem = {
+            id: 'skill-1',
+            scope: 'SHARED',
+            slug: 'review',
+            name: 'Review',
+            description: 'Review risky changes.',
+            enabled: true,
+            autoEnrolled: false,
+            source: null,
+            createdByEmail: 'creator@sourcebot.dev',
+            createdAt: '2026-06-18T00:00:00.000Z',
+            updatedAt: '2026-06-18T00:00:00.000Z',
+        };
+        vi.mocked(skillActions.setSharedSkillFlag).mockReturnValue(new Promise(() => undefined));
+
+        renderWorkspaceAskAgentPage({ orgSkills: [sharedSkill] });
+
+        await screen.findByText('Review');
+
+        const deleteButton = screen.getByRole('button', { name: 'Delete Review' });
+        expect(deleteButton.hasAttribute('disabled')).toBe(false);
+
+        fireEvent.click(screen.getByRole('switch', { name: 'Auto' }));
+
+        await waitFor(() => {
+            expect(deleteButton.hasAttribute('disabled')).toBe(true);
+        });
+    });
+
+    test("allows deleting a different shared skill while another skill's flag update is pending", async () => {
+        const skillA: SharedAgentSkillManagementItem = {
+            id: 'skill-a',
+            scope: 'SHARED',
+            slug: 'review-a',
+            name: 'Review A',
+            description: 'Review risky changes.',
+            enabled: true,
+            autoEnrolled: false,
+            source: null,
+            createdByEmail: 'creator@sourcebot.dev',
+            createdAt: '2026-06-18T00:00:00.000Z',
+            updatedAt: '2026-06-18T00:00:00.000Z',
+        };
+        const skillB: SharedAgentSkillManagementItem = {
+            id: 'skill-b',
+            scope: 'SHARED',
+            slug: 'review-b',
+            name: 'Review B',
+            description: 'Review risky changes.',
+            enabled: true,
+            autoEnrolled: false,
+            source: null,
+            createdByEmail: 'creator@sourcebot.dev',
+            createdAt: '2026-06-18T00:00:00.000Z',
+            updatedAt: '2026-06-18T00:00:00.000Z',
+        };
+        let resolveUpdate!: (value: SharedAgentSkillManagementItem) => void;
+        const pendingUpdate = new Promise<SharedAgentSkillManagementItem>((resolve) => {
+            resolveUpdate = resolve;
+        });
+        vi.mocked(skillActions.setSharedSkillFlag).mockReturnValue(pendingUpdate);
+
+        renderWorkspaceAskAgentPage({ orgSkills: [skillA, skillB] });
+
+        await screen.findByText('Review A');
+
+        fireEvent.click(screen.getAllByRole('switch', { name: 'Auto' })[0]);
+        await waitFor(() => {
+            expect(screen.getByRole('button', { name: 'Delete Review A' }).hasAttribute('disabled')).toBe(true);
+        });
+
+        const skillBDeleteButton = screen.getByRole('button', { name: 'Delete Review B' });
+        expect(skillBDeleteButton.hasAttribute('disabled')).toBe(false);
+
+        fireEvent.click(skillBDeleteButton);
+
+        const dialog = await screen.findByRole('alertdialog', { name: 'Delete Shared Skill' });
+        expect(within(dialog).getByText('Review B')).not.toBeNull();
+
+        await act(async () => {
+            resolveUpdate({ ...skillA, autoEnrolled: true });
+            await pendingUpdate;
+        });
+    });
+
+    test('keeps each shared skill delete disabled until its own flag update finishes', async () => {
+        const skillA: SharedAgentSkillManagementItem = {
+            id: 'skill-a',
+            scope: 'SHARED',
+            slug: 'review-a',
+            name: 'Review A',
+            description: 'Review risky changes.',
+            enabled: true,
+            autoEnrolled: false,
+            source: null,
+            createdByEmail: 'creator@sourcebot.dev',
+            createdAt: '2026-06-18T00:00:00.000Z',
+            updatedAt: '2026-06-18T00:00:00.000Z',
+        };
+        const skillB: SharedAgentSkillManagementItem = {
+            id: 'skill-b',
+            scope: 'SHARED',
+            slug: 'review-b',
+            name: 'Review B',
+            description: 'Review risky changes.',
+            enabled: true,
+            autoEnrolled: false,
+            source: null,
+            createdByEmail: 'creator@sourcebot.dev',
+            createdAt: '2026-06-18T00:00:00.000Z',
+            updatedAt: '2026-06-18T00:00:00.000Z',
+        };
+        let resolveA!: (value: SharedAgentSkillManagementItem) => void;
+        let resolveB!: (value: SharedAgentSkillManagementItem) => void;
+        const updateA = new Promise<SharedAgentSkillManagementItem>((resolve) => {
+            resolveA = resolve;
+        });
+        const updateB = new Promise<SharedAgentSkillManagementItem>((resolve) => {
+            resolveB = resolve;
+        });
+        vi.mocked(skillActions.setSharedSkillFlag).mockImplementation(({ skillId }) =>
+            skillId === 'skill-a' ? updateA : updateB,
+        );
+
+        renderWorkspaceAskAgentPage({ orgSkills: [skillA, skillB] });
+
+        await screen.findByText('Review A');
+        const autoSwitches = screen.getAllByRole('switch', { name: 'Auto' });
+
+        fireEvent.click(autoSwitches[0]);
+        await waitFor(() => {
+            expect(screen.getByRole('button', { name: 'Delete Review A' }).hasAttribute('disabled')).toBe(true);
+        });
+
+        fireEvent.click(autoSwitches[1]);
+        await waitFor(() => {
+            expect(screen.getByRole('button', { name: 'Delete Review B' }).hasAttribute('disabled')).toBe(true);
+        });
+
+        await act(async () => {
+            resolveA({ ...skillA, autoEnrolled: true });
+            await updateA;
+        });
+
+        await waitFor(() => {
+            expect(screen.getByRole('button', { name: 'Delete Review A' }).hasAttribute('disabled')).toBe(false);
+        });
+        expect(screen.getByRole('button', { name: 'Delete Review B' }).hasAttribute('disabled')).toBe(true);
+
+        await act(async () => {
+            resolveB({ ...skillB, autoEnrolled: true });
+            await updateB;
+        });
+
+        await waitFor(() => {
+            expect(screen.getByRole('button', { name: 'Delete Review B' }).hasAttribute('disabled')).toBe(false);
+        });
+    });
+});
diff --git a/packages/web/src/app/(app)/settings/workspaceAskAgent/workspaceAskAgentPage.tsx b/packages/web/src/app/(app)/settings/workspaceAskAgent/workspaceAskAgentPage.tsx
index f71ed904b..e446930f9 100644
--- a/packages/web/src/app/(app)/settings/workspaceAskAgent/workspaceAskAgentPage.tsx
+++ b/packages/web/src/app/(app)/settings/workspaceAskAgent/workspaceAskAgentPage.tsx
@@ -36,6 +36,8 @@ import { AlertTriangleIcon, CableIcon, CopyIcon, InfoIcon, KeyRoundIcon, Loader2
 import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
 import Markdown from "react-markdown";
 import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
+import { WorkspaceSharedSkillsManager } from "@/ee/features/chat/skills/components/workspaceSharedSkillsManager";
+import type { SharedAgentSkillManagementItem } from "@/ee/features/chat/skills/types";
 import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";
 
 function clearCallbackParams() {
@@ -55,6 +57,9 @@ interface WorkspaceAskAgentPageProps {
     callbackServer?: string;
     callbackMessage?: string;
     oauthRedirectUrl: string;
+    initialOrgSkills: SharedAgentSkillManagementItem[];
+    // Pre-fills the shared-skills search box (deep link from the account page).
+    initialSkillSearch?: string;
 }
 
 type WorkspaceConnectorStatus = {
@@ -341,7 +346,7 @@ function WorkspaceConnectorCard({
     );
 }
 
-export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
+export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl, initialOrgSkills, initialSkillSearch }: WorkspaceAskAgentPageProps) {
     const { toast } = useToast();
     const queryClient = useQueryClient();
     const router = useRouter();
@@ -416,6 +421,7 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
     const servers = data?.servers ?? [];
     const canCreateConnectors = data?.isAskAgentAvailable === true;
     const isAskAgentUnavailable = data?.isAskAgentAvailable === false;
+    const canManageWorkspaceSkills = data?.isAskAgentAvailable === true;
     const connectedServerCount = useMemo(
         () => serversWithStatus?.filter((server) => server.isConnected).length ?? 0,
         [serversWithStatus],
@@ -757,6 +763,13 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
                 </div>
             )}
 
+            {canManageWorkspaceSkills && (
+                <>
+                    <WorkspaceSharedSkillsManager initialOrgSkills={initialOrgSkills} initialSearch={initialSkillSearch} />
+                    <Separator />
+                </>
+            )}
+
             {/* Connectors section */}
             <div className="space-y-6">
                 <div>
diff --git a/packages/web/src/app/api/(client)/client.ts b/packages/web/src/app/api/(client)/client.ts
index a75c5396c..10d76bb3e 100644
--- a/packages/web/src/app/api/(client)/client.ts
+++ b/packages/web/src/app/api/(client)/client.ts
@@ -34,6 +34,7 @@ import { OffersResponse } from "@/features/billing/types";
 import { ConnectMcpResponse } from "../(server)/ee/askmcp/connect/types";
 import type { GetMcpServersResponse } from "../(server)/ee/askmcp/servers/route";
 import type { GetMcpConfigurationResponse, GetMcpServerToolPermissionsResponse, GetMcpToolsResponse } from "@/ee/features/chat/mcp/types";
+import type { SkillSourceStatusResponse } from "../(server)/ee/skills/sourceStatus/route";
 
 export const search = async (body: SearchRequest): Promise<SearchResponse | ServiceError> => {
     const result = await fetch("/api/search", {
@@ -296,6 +297,20 @@ export const getMcpServerTools = async (): Promise<GetMcpToolsResponse | Service
     return result as GetMcpToolsResponse | ServiceError;
 }
 
+export const getSkillSourceStatus = async (skillId: string): Promise<SkillSourceStatusResponse | ServiceError> => {
+    const url = new URL("/api/ee/skills/sourceStatus", window.location.origin);
+    url.searchParams.set("skillId", skillId);
+
+    const result = await fetch(url, {
+        method: "GET",
+        headers: {
+            "X-Sourcebot-Client-Source": "sourcebot-web-client",
+        },
+    }).then(response => response.json());
+
+    return result as SkillSourceStatusResponse | ServiceError;
+}
+
 export const getMcpServerToolPermissions = async (serverId: string): Promise<GetMcpServerToolPermissionsResponse | ServiceError> => {
     const result = await fetch(`/api/ee/askmcp/configuration/${encodeURIComponent(serverId)}/tools`, {
         method: 'GET',
diff --git a/packages/web/src/app/api/(server)/ee/askmcp/configuration/[serverId]/tools/route.test.ts b/packages/web/src/app/api/(server)/ee/askmcp/configuration/[serverId]/tools/route.test.ts
index 2e322492e..7a337e8bd 100644
--- a/packages/web/src/app/api/(server)/ee/askmcp/configuration/[serverId]/tools/route.test.ts
+++ b/packages/web/src/app/api/(server)/ee/askmcp/configuration/[serverId]/tools/route.test.ts
@@ -29,6 +29,10 @@ vi.mock('@/ee/features/chat/mcp/mcpToolMetadata', () => ({
 vi.mock('@/prisma', () => ({
     __unsafePrisma: mocks.unsafePrisma,
 }));
+vi.mock('@sourcebot/shared', () => ({
+    createLogger: () => ({ error: vi.fn(), info: vi.fn(), warn: vi.fn(), debug: vi.fn() }),
+    env: { NODE_ENV: 'test' },
+}));
 
 const { GET } = await import('./route');
 
diff --git a/packages/web/src/app/api/(server)/ee/chat/route.ts b/packages/web/src/app/api/(server)/ee/chat/route.ts
index 90a9ddee2..18fff11f3 100644
--- a/packages/web/src/app/api/(server)/ee/chat/route.ts
+++ b/packages/web/src/app/api/(server)/ee/chat/route.ts
@@ -10,6 +10,7 @@ import { resolveModelCapabilities } from "@/features/chat/modelCapabilities.serv
 import { checkAskEntitlement, commitMessageAttachments, getConfiguredLanguageModels, isOwnerOfChat, updateChatMessages } from "@/features/chat/utils.server";
 import { getAISDKLanguageModelAndOptions } from "@/features/chat/llm.server";
 import { resolveContextWindow } from "@/features/chat/modelContextWindow.server";
+import { materializeCommandMessageTexts } from "@/ee/features/chat/skills/commandResolution";
 import { apiHandler } from "@/lib/apiHandler";
 import { ErrorCode } from "@/lib/errorCodes";
 import { captureEvent } from "@/lib/posthog";
@@ -202,9 +203,16 @@ export const POST = apiHandler(async (req: NextRequest) => {
                 ...(env.EXPERIMENT_ASK_GH_ENABLED === 'true' ? { selectedRepos: expandedRepos } : {}),
             });
 
+            const messagesWithMaterializedCommands = await materializeCommandMessageTexts({
+                messages,
+                prisma,
+                userId: user?.id,
+                orgId: org.id,
+            });
+
             const stream = await createMessageStream({
                 chatId: id,
-                messages,
+                messages: messagesWithMaterializedCommands,
                 metadata: {
                     selectedSearchScopes,
                 },
diff --git a/packages/web/src/app/api/(server)/ee/skills/sourceStatus/route.ts b/packages/web/src/app/api/(server)/ee/skills/sourceStatus/route.ts
new file mode 100644
index 000000000..cc4f55fa0
--- /dev/null
+++ b/packages/web/src/app/api/(server)/ee/skills/sourceStatus/route.ts
@@ -0,0 +1,36 @@
+'use server';
+
+import { getAgentSkillSourceStatus } from "@/ee/features/chat/skills/actions";
+import type { AgentSkillSourceStatus } from "@/ee/features/chat/skills/types";
+import { apiHandler } from "@/lib/apiHandler";
+import { queryParamsSchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
+import { isServiceError } from "@/lib/utils";
+import { NextRequest } from "next/server";
+import { z } from "zod";
+
+export type SkillSourceStatusResponse = { status: AgentSkillSourceStatus };
+
+const querySchema = z.object({
+    skillId: z.string().min(1),
+});
+
+// eslint-disable-next-line authz/require-auth-wrapper -- delegates to getAgentSkillSourceStatus() which calls withAuth
+export const GET = apiHandler(async (request: NextRequest) => {
+    const parsed = querySchema.safeParse({
+        skillId: request.nextUrl.searchParams.get('skillId') ?? undefined,
+    });
+
+    if (!parsed.success) {
+        return serviceErrorResponse(
+            queryParamsSchemaValidationError(parsed.error)
+        );
+    }
+
+    const result = await getAgentSkillSourceStatus(parsed.data.skillId);
+
+    if (isServiceError(result)) {
+        return serviceErrorResponse(result);
+    }
+
+    return Response.json(result);
+});
diff --git a/packages/web/src/components/ui/tooltip.tsx b/packages/web/src/components/ui/tooltip.tsx
index e1ae87b9d..492aa698b 100644
--- a/packages/web/src/components/ui/tooltip.tsx
+++ b/packages/web/src/components/ui/tooltip.tsx
@@ -15,15 +15,17 @@ const TooltipContent = React.forwardRef<
   React.ElementRef<typeof TooltipPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
 >(({ className, sideOffset = 4, ...props }, ref) => (
-  <TooltipPrimitive.Content
-    ref={ref}
-    sideOffset={sideOffset}
-    className={cn(
-      "z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-tooltip-content-transform-origin]",
-      className
-    )}
-    {...props}
-  />
+  <TooltipPrimitive.Portal>
+    <TooltipPrimitive.Content
+      ref={ref}
+      sideOffset={sideOffset}
+      className={cn(
+        "z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-tooltip-content-transform-origin]",
+        className
+      )}
+      {...props}
+    />
+  </TooltipPrimitive.Portal>
 ))
 TooltipContent.displayName = TooltipPrimitive.Content.displayName
 
diff --git a/packages/web/src/ee/features/chat/agent.ts b/packages/web/src/ee/features/chat/agent.ts
index 9819d5202..26a99080c 100644
--- a/packages/web/src/ee/features/chat/agent.ts
+++ b/packages/web/src/ee/features/chat/agent.ts
@@ -31,6 +31,10 @@ import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets"
 import { buildMcpToolRegistry, McpToolRegistryEntry, searchMcpTools } from "@/ee/features/chat/mcp/mcpToolRegistry";
 import { PromptCacheStrategy, mergeProviderOptions, detectPromptCacheBreak, detectUnexpectedCacheMiss } from "./promptCaching";
 import { hasEntitlement } from '@/lib/entitlements';
+import { getUserMessageModelText } from "./skills/commandResolution";
+import { buildSkillRegistry } from "./skills/registry";
+import { type AskCommandDefinition } from "@/features/chat/commands/types";
+import { createLoadSkillTool, LOAD_SKILL_TOOL_NAME } from "./skills/loadSkillTool";
 
 const dedent = _dedent.withOptions({ alignValues: true });
 
@@ -121,14 +125,16 @@ const resolveTurnMedia = async ({
 // appended so the model knows context was dropped.
 const buildUserModelMessage = ({
     message,
+    modelText,
     acceptedModalities,
     resolvedMedia,
 }: {
     message: SBChatMessage;
+    modelText?: string;
     acceptedModalities: InputModality[];
     resolvedMedia?: ResolvedTurnMedia;
 }): ModelMessage => {
-    const text = getUserMessageText(message);
+    const text = modelText ?? getUserMessageText(message);
     const attachmentsBlock = formatAttachmentsForPrompt(
         getUserMessageAttachments(message),
     );
@@ -172,6 +178,13 @@ const buildUserModelMessage = ({
     return { role: 'user', content: baseText };
 };
 
+// Collapse whitespace so any skill-authored catalog field (name, argument hint,
+// or description) renders as a single catalog line and cannot break out of the
+// `<agent_skills>` block structure (e.g. an interior newline closing the block
+// early). Every value interpolated into the catalog line must pass through this.
+const sanitizeSkillCatalogText = (value: string): string =>
+    value.replace(/\s+/g, ' ').trim();
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const mergeStreamAsync = async (stream: StreamTextResult<any, any>, writer: UIMessageStreamWriter<SBChatMessage>, options: UIMessageStreamOptions<SBChatMessage> = {}) => {
     await new Promise<void>((resolve) => writer.merge(stream.toUIMessageStream({
@@ -246,6 +259,13 @@ export const createMessageStream = async ({
     // We will use this as the context we carry between messages.
     // Server requests always receive persisted messages between client streams, so evaluate them in the ready state.
     const incomingTurnProgress = getTurnProgressState({ messages, status: 'ready' });
+    const userMessageModelTexts = messages.map((message) => {
+        if (message.role !== 'user') {
+            return undefined;
+        }
+
+        return getUserMessageModelText(message);
+    });
 
     // Media attachment bytes are re-sent on every turn (decision: keep
     // attachments in context across turns rather than dropping them after the
@@ -265,6 +285,7 @@ export const createMessageStream = async ({
             if (message.role === 'user') {
                 return buildUserModelMessage({
                     message,
+                    modelText: userMessageModelTexts[index],
                     acceptedModalities,
                     resolvedMedia,
                 });
@@ -581,10 +602,39 @@ const createAgentStream = async ({
         },
     });
 
+    // Build the skill catalog once, from the requester's static (userId, orgId)
+    // context. Gated like MCP tools: anonymous/programmatic callers (no
+    // userId/orgId) and non-entitled deployments get no catalog and no
+    // load_skill tool. Every skill in the requester's available set is
+    // model-invocable — there is no per-skill opt-in.
+    let skillRegistry: AskCommandDefinition[] = [];
+    if (
+        userId !== undefined &&
+        orgId !== undefined &&
+        await hasEntitlement('ask')
+    ) {
+        try {
+            skillRegistry = await buildSkillRegistry({ prisma, userId, orgId });
+        } catch (error) {
+            logger.error('Failed to build skill registry for auto-invocation:', error);
+        }
+    }
+    const hasSkills = skillRegistry.length > 0;
+
+    const loadSkillTool = (hasSkills && userId !== undefined && orgId !== undefined)
+        ? createLoadSkillTool({
+            prisma,
+            userId,
+            orgId,
+            analyticsContext: { chatId, traceId, source: 'sourcebot-ask-agent' },
+        })
+        : undefined;
+
     const { staticPrompt, dynamicPrompt } = createPrompt({
         repos: sortedRepos,
         files: resolvedFileSources,
         mcpToolRegistry: mcpRegistry,
+        skillRegistry,
     });
 
     const builtinTools = createTools({ source: 'sourcebot-ask-agent', selectedRepos: sortedRepos });
@@ -592,8 +642,21 @@ const createAgentStream = async ({
     const allTools: Record<string, Tool> = {
         ...builtinTools,
         ...(hasMcpTools ? { tool_request_activation: toolRequestActivation, ...mcpToolSetsObj.tools } : {}),
+        ...(loadSkillTool ? { [LOAD_SKILL_TOOL_NAME]: loadSkillTool } : {}),
     };
 
+    // Tools active on every step: builtins, the MCP activation gate (when MCP
+    // tools exist), and load_skill (when skills exist). prepareStep rebuilds
+    // activeTools each step to lazily grow the MCP tool set, so this base set must
+    // be present in BOTH the initial activeTools and every prepareStep rebuild.
+    // Defining it once keeps the two in sync by construction — a new always-on
+    // tool added here automatically survives past step 1.
+    const alwaysActiveTools = [
+        ...builtinToolNames,
+        ...(hasMcpTools ? ['tool_request_activation'] : []),
+        ...(hasSkills ? [LOAD_SKILL_TOOL_NAME] : []),
+    ];
+
     // Anthropic prompt caching uses two nested breakpoints over one cumulative
     // prefix (render order: tools -> system -> messages):
     //
@@ -648,10 +711,7 @@ const createAgentStream = async ({
             messages: inputMessages,
             system: systemMessages,
             tools: allTools,
-            activeTools: [
-                ...builtinToolNames,
-                ...(hasMcpTools ? ['tool_request_activation'] : []),
-            ],
+            activeTools: alwaysActiveTools,
             // `prepareStep` runs before every step (including the first). The SDK
             // rebuilds the step's messages each time as the original input plus
             // its own accumulated response messages. Re-applying the moving tail marker
@@ -668,6 +728,7 @@ const createAgentStream = async ({
                     return stepMessages ? { messages: stepMessages } : {};
                 }
 
+
                 const activated = new Set<string>();
                 for (const step of steps) {
                     for (const toolResult of step.toolResults) {
@@ -686,8 +747,7 @@ const createAgentStream = async ({
                 return {
                     ...(stepMessages ? { messages: stepMessages } : {}),
                     activeTools: [
-                        ...builtinToolNames,
-                        'tool_request_activation',
+                        ...alwaysActiveTools,
                         ...Array.from(activated),
                     ],
                 };
@@ -758,6 +818,7 @@ const createPrompt = ({
     files,
     repos,
     mcpToolRegistry,
+    skillRegistry,
 }: {
     files?: {
         path: string;
@@ -768,6 +829,7 @@ const createPrompt = ({
     }[],
     repos: string[],
     mcpToolRegistry: McpToolRegistryEntry[],
+    skillRegistry: AskCommandDefinition[],
 }): { staticPrompt: string; dynamicPrompt: string } => {
     // Static prefix: byte-identical across every chat and user.
     // It interpolates only module-level constants. Keep it free of any
@@ -886,6 +948,21 @@ const createPrompt = ({
         `);
     }
 
+    if (skillRegistry.length > 0) {
+        dynamicSections.push(dedent`
+        <agent_skills>
+        Skills are reusable, expert-authored workflows for specific tasks. When the user's request matches a skill's description below, you SHOULD load that skill with the \`${LOAD_SKILL_TOOL_NAME}\` tool and then follow the instructions it returns. Prefer applying a relevant skill over improvising your own approach.
+
+        Each entry is \`<name> (id: <id>): <description>\`. To use a skill, call \`${LOAD_SKILL_TOOL_NAME}\` with the skill's exact \`id\`.
+
+        Available skills:
+        ${skillRegistry.map(e => `- ${sanitizeSkillCatalogText(e.name)} (id: ${e.id}): ${sanitizeSkillCatalogText(e.description)}`).join('\n')}
+
+        Do NOT load a skill whose instructions are already present in this conversation (for example, one the user already invoked manually with a slash command).
+        </agent_skills>
+        `);
+    }
+
     return { staticPrompt, dynamicPrompt: dynamicSections.join('\n\n') };
 }
 
diff --git a/packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx b/packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx
index ddfd0a151..471e1ff48 100644
--- a/packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx
+++ b/packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx
@@ -9,11 +9,11 @@ import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMe
 import { useChat } from '@ai-sdk/react';
 import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
 import { ArrowDownIcon, CopyIcon } from 'lucide-react';
-import { useNavigationGuard } from 'next-navigation-guard';
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useStickToBottom } from 'use-stick-to-bottom';
 import { Descendant } from 'slate';
 import { useMessagePairs } from '../../useMessagePairs';
+import { useUnsavedChangesGuard } from '../../useUnsavedChangesGuard';
 import { useSelectedLanguageModel } from '@/features/chat/useSelectedLanguageModel';
 import { ChatBox, ChatBoxHandle } from '@/features/chat/components/chatBox';
 import { ChatBoxToolbar } from '@/features/chat/components/chatBox/chatBoxToolbar';
@@ -33,6 +33,7 @@ import { ToolApprovalProvider } from '../../toolApprovalContext';
 import useCaptureEvent from '@/hooks/useCaptureEvent';
 import { SignInPromptBanner } from './signInPromptBanner';
 import { DuplicateChatDialog } from '@/app/(app)/chat/components/duplicateChatDialog';
+import type { AskCommandDefinition } from '@/features/chat/commands/types';
 
 type ChatHistoryState = {
     scrollOffset?: number;
@@ -45,6 +46,7 @@ interface ChatThreadProps {
     languageModels: LanguageModelInfo[];
     repos: RepositoryQuery[];
     searchContexts: SearchContextQuery[];
+    askCommands: AskCommandDefinition[];
     selectedSearchScopes: SearchScope[];
     onSelectedSearchScopesChange: (items: SearchScope[]) => void;
     disabledMcpServerIds: string[];
@@ -63,6 +65,7 @@ export const ChatThread = ({
     languageModels,
     repos,
     searchContexts,
+    askCommands,
     selectedSearchScopes,
     onSelectedSearchScopesChange,
     disabledMcpServerIds,
@@ -250,18 +253,8 @@ export const ChatThread = ({
         shouldGuardNavigation,
     } = useMemo(() => getTurnProgressState({ messages, status }), [messages, status]);
 
-    useNavigationGuard({
-        enabled: ({ type }) => {
-            // @note: a "refresh" in this context means we have triggered a client side
-            // refresh via `router.refresh()`, and not the user pressing "CMD+R"
-            // (that would be a "beforeunload" event). We can safely peform refreshes
-            // without loosing any unsaved changes.
-            if (type === "refresh") {
-                return false;
-            }
-
-            return shouldGuardNavigation;
-        },
+    useUnsavedChangesGuard({
+        enabled: shouldGuardNavigation,
         confirm: () => window.confirm("You have unsaved changes that will be lost."),
     });
 
@@ -488,6 +481,7 @@ export const ChatThread = ({
                                     onStop={stop}
                                     selectedSearchScopes={selectedSearchScopes}
                                     searchContexts={searchContexts}
+                                    askCommands={askCommands}
                                     isDisabled={languageModels.length === 0}
                                     isAuthenticated={isAuthenticated}
                                     isLoginWallEnabled={isLoginWallEnabled}
diff --git a/packages/web/src/ee/features/chat/components/chatThread/detailsCard.test.tsx b/packages/web/src/ee/features/chat/components/chatThread/detailsCard.test.tsx
index 7e63de144..6724f7bec 100644
--- a/packages/web/src/ee/features/chat/components/chatThread/detailsCard.test.tsx
+++ b/packages/web/src/ee/features/chat/components/chatThread/detailsCard.test.tsx
@@ -119,4 +119,68 @@ describe('DetailsCard', () => {
         expect(screen.queryByText('Tool activation failed: Activation failed')).toBeTruthy();
         expect(screen.queryByText('Activating tool...')).toBeNull();
     });
+
+    test('renders a loaded skill as a tool call with its name and command', () => {
+        const loadedSkillPart = {
+            type: 'tool-load_skill',
+            toolCallId: 'tool-call-1',
+            state: 'output-available',
+            input: { skill_id: 'skill-1' },
+            output: {
+                skill: { id: 'skill-1', slug: 'review-pr', name: 'Review PR' },
+                instructions: 'Look for correctness issues first.',
+            },
+        } satisfies SBChatMessagePart;
+
+        const { container } = render(
+            <TooltipProvider>
+                <DetailsCard
+                    chatId="chat-id"
+                    isExpanded={true}
+                    onExpandedChanged={vi.fn()}
+                    isThinking={false}
+                    isTurnInProgress={false}
+                    isNetworkActive={false}
+                    isAwaitingToolApproval={false}
+                    thinkingSteps={[{ stepIndex: 0, parts: [loadedSkillPart] }]}
+                />
+            </TooltipProvider>
+        );
+
+        expect(container.textContent).toContain('Loaded skill:');
+        expect(container.textContent).toContain('Review PR');
+        expect(container.textContent).toContain('/review-pr');
+        expect(screen.queryByText('Loading skill...')).toBeNull();
+        // Instructions live behind a collapsed details section.
+        expect(screen.queryByText('Look for correctness issues first.')).toBeNull();
+    });
+
+    test('renders an unavailable skill load instead of a silent no-op', () => {
+        const unavailableSkillPart = {
+            type: 'tool-load_skill',
+            toolCallId: 'tool-call-2',
+            state: 'output-available',
+            input: { skill_id: 'ghost-skill' },
+            output: { error: 'That skill is not available.' },
+        } satisfies SBChatMessagePart;
+
+        const { container } = render(
+            <TooltipProvider>
+                <DetailsCard
+                    chatId="chat-id"
+                    isExpanded={true}
+                    onExpandedChanged={vi.fn()}
+                    isThinking={false}
+                    isTurnInProgress={false}
+                    isNetworkActive={false}
+                    isAwaitingToolApproval={false}
+                    thinkingSteps={[{ stepIndex: 0, parts: [unavailableSkillPart] }]}
+                />
+            </TooltipProvider>
+        );
+
+        expect(container.textContent).toContain('ghost-skill');
+        expect(container.textContent).toContain('was unavailable');
+        expect(screen.queryByText('Loading skill...')).toBeNull();
+    });
 });
diff --git a/packages/web/src/ee/features/chat/components/chatThread/detailsCard.tsx b/packages/web/src/ee/features/chat/components/chatThread/detailsCard.tsx
index c705b6be5..7bbb83e78 100644
--- a/packages/web/src/ee/features/chat/components/chatThread/detailsCard.tsx
+++ b/packages/web/src/ee/features/chat/components/chatThread/detailsCard.tsx
@@ -27,6 +27,7 @@ import { ReadFileToolComponent } from './tools/readFileToolComponent';
 import { ToolOutputGuard } from './tools/toolOutputGuard';
 import { McpToolComponent } from './tools/mcpToolComponent';
 import { ToolSearchToolComponent } from './tools/toolSearchToolComponent';
+import { LoadSkillToolComponent } from './tools/loadSkillToolComponent';
 
 
 // A UI-visible step: the parts of one LLM invocation, tagged with the
@@ -529,12 +530,21 @@ export const StepPartRenderer = ({ part, toolTokenUsageMap }: { part: SBChatMess
                 return <span className="text-sm text-muted-foreground animate-pulse">Activating tool...</span>;
             }
             return <ToolSearchToolComponent query={part.input.tool_to_activate_name} results={part.output.results ?? []} estimatedOutputTokens={estimatedOutputTokens} />;
+        case 'tool-load_skill':
+            if (part.state === 'output-error') {
+                return <span className="text-sm text-destructive">Loading skill failed: {part.errorText}</span>;
+            }
+            if (part.state !== 'output-available') {
+                return <span className="text-sm text-muted-foreground animate-pulse">Loading skill...</span>;
+            }
+            return <LoadSkillToolComponent input={part.input} output={part.output} />;
         case 'dynamic-tool':
             if (part.toolName.startsWith('mcp_')) {
                 return <McpToolComponent part={part} estimatedOutputTokens={estimatedOutputTokens} />;
             }
             return null;
         case 'data-source':
+        case 'data-command':
         case 'data-mcp-server':
         case 'data-mcp-failed-server':
         case 'data-attachment':
diff --git a/packages/web/src/ee/features/chat/components/chatThread/tableOfContents.tsx b/packages/web/src/ee/features/chat/components/chatThread/tableOfContents.tsx
index c450a1b69..a16842b94 100644
--- a/packages/web/src/ee/features/chat/components/chatThread/tableOfContents.tsx
+++ b/packages/web/src/ee/features/chat/components/chatThread/tableOfContents.tsx
@@ -34,6 +34,9 @@ export const TableOfContents = ({ tocItems, activeId, className }: TableOfConten
                     key={item.id}
                     variant="link"
                     size="sm"
+                    // Keep mouse clicks from leaving the button focused; otherwise the
+                    // focus-visible ring lingers on the last-clicked item as you scroll.
+                    onMouseDown={(e) => e.preventDefault()}
                     onClick={() => scrollToHeading(item.id)}
                     className={cn(
                         'w-full justify-start text-left h-auto py-0.5 px-0 font-normal text-wrap hover:text-foreground underline-offset-2 text-xs',
diff --git a/packages/web/src/ee/features/chat/components/chatThread/tools/loadSkillToolComponent.tsx b/packages/web/src/ee/features/chat/components/chatThread/tools/loadSkillToolComponent.tsx
new file mode 100644
index 000000000..2dfbaef47
--- /dev/null
+++ b/packages/web/src/ee/features/chat/components/chatThread/tools/loadSkillToolComponent.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
+import { ChevronRight, Sparkles } from "lucide-react";
+import { useState } from "react";
+import { cn } from "@/lib/utils";
+import { SBChatMessageToolTypes } from "@/features/chat/types";
+
+type LoadSkillInput = SBChatMessageToolTypes['load_skill']['input'];
+type LoadSkillOutput = SBChatMessageToolTypes['load_skill']['output'];
+
+interface LoadSkillToolComponentProps {
+    input: LoadSkillInput;
+    output: LoadSkillOutput;
+}
+
+export const LoadSkillToolComponent = ({ input, output }: LoadSkillToolComponentProps) => {
+    const [isOpen, setIsOpen] = useState(false);
+
+    // The fail-closed path returns { error } as a normal (output-available)
+    // result rather than throwing, so the unavailable case surfaces here.
+    if ('error' in output) {
+        return (
+            <div className="flex items-center gap-2 text-sm text-muted-foreground">
+                <Sparkles className="w-3 h-3 flex-shrink-0" />
+                <span>Skill <span className="font-mono text-xs">{input.skill_id}</span> was unavailable</span>
+            </div>
+        );
+    }
+
+    const { skill, instructions } = output;
+
+    return (
+        <Collapsible open={isOpen} onOpenChange={setIsOpen}>
+            <CollapsibleTrigger className="w-full">
+                <div className="flex items-center gap-2 select-none cursor-pointer text-sm text-muted-foreground hover:text-foreground transition-colors">
+                    <ChevronRight className={cn("w-3 h-3 flex-shrink-0 transition-transform", isOpen && "rotate-90")} />
+                    <Sparkles className="w-3 h-3 flex-shrink-0" />
+                    <span className="flex-shrink-0">Loaded skill: <span className="text-foreground font-medium">{skill.name}</span></span>
+                    <span className="font-mono text-xs text-muted-foreground/70 flex-shrink-0">/{skill.slug}</span>
+                    <span className="flex-1" />
+                </div>
+            </CollapsibleTrigger>
+            <CollapsibleContent>
+                <div className="ml-5 mt-1 rounded-lg border border-border p-3 text-xs text-muted-foreground whitespace-pre-wrap overflow-y-auto max-h-72">
+                    {instructions}
+                </div>
+            </CollapsibleContent>
+        </Collapsible>
+    );
+};
diff --git a/packages/web/src/ee/features/chat/components/chatThreadPanel.test.tsx b/packages/web/src/ee/features/chat/components/chatThreadPanel.test.tsx
index b98b99d1d..b2b77566a 100644
--- a/packages/web/src/ee/features/chat/components/chatThreadPanel.test.tsx
+++ b/packages/web/src/ee/features/chat/components/chatThreadPanel.test.tsx
@@ -77,6 +77,7 @@ describe('ChatThreadPanel', () => {
                 repos={[]}
                 searchContexts={[]}
                 messages={[]}
+                askCommands={[]}
                 isOwner={true}
                 isAuthenticated={true}
                 isLoginWallEnabled={false}
diff --git a/packages/web/src/ee/features/chat/components/chatThreadPanel.tsx b/packages/web/src/ee/features/chat/components/chatThreadPanel.tsx
index 96b39c2ff..1ff009011 100644
--- a/packages/web/src/ee/features/chat/components/chatThreadPanel.tsx
+++ b/packages/web/src/ee/features/chat/components/chatThreadPanel.tsx
@@ -8,12 +8,14 @@ import { CreateUIMessage } from 'ai';
 import { useEffect, useState } from 'react';
 import { useChatId } from '@/app/(app)/chat/useChatId';
 import { useSessionStorage } from 'usehooks-ts';
+import type { AskCommandDefinition } from '@/features/chat/commands/types';
 
 interface ChatThreadPanelProps {
     languageModels: LanguageModelInfo[];
     repos: RepositoryQuery[];
     searchContexts: SearchContextQuery[];
     messages: SBChatMessage[];
+    askCommands: AskCommandDefinition[];
     isOwner: boolean;
     isAuthenticated: boolean;
     isLoginWallEnabled: boolean;
@@ -34,6 +36,7 @@ export const ChatThreadPanel = ({
     repos,
     searchContexts,
     messages,
+    askCommands,
     isOwner,
     isAuthenticated,
     isLoginWallEnabled,
@@ -85,6 +88,7 @@ export const ChatThreadPanel = ({
                 languageModels={languageModels}
                 repos={repos}
                 searchContexts={searchContexts}
+                askCommands={askCommands}
                 selectedSearchScopes={selectedSearchScopes}
                 onSelectedSearchScopesChange={setSelectedSearchScopes}
                 disabledMcpServerIds={disabledMcpServerIds}
diff --git a/packages/web/src/ee/features/chat/mcp/components/accountAskAgentPage.test.tsx b/packages/web/src/ee/features/chat/mcp/components/accountAskAgentPage.test.tsx
index 198c70a3c..3b691025c 100644
--- a/packages/web/src/ee/features/chat/mcp/components/accountAskAgentPage.test.tsx
+++ b/packages/web/src/ee/features/chat/mcp/components/accountAskAgentPage.test.tsx
@@ -13,6 +13,7 @@ const { AccountAskAgentEmptyState } = await import('./accountAskAgentPage');
 
 afterEach(() => {
     cleanup();
+    vi.clearAllMocks();
 });
 
 describe('AccountAskAgentEmptyState', () => {
diff --git a/packages/web/src/ee/features/chat/mcp/components/accountAskAgentPage.tsx b/packages/web/src/ee/features/chat/mcp/components/accountAskAgentPage.tsx
index e80ea4183..f4949d364 100644
--- a/packages/web/src/ee/features/chat/mcp/components/accountAskAgentPage.tsx
+++ b/packages/web/src/ee/features/chat/mcp/components/accountAskAgentPage.tsx
@@ -125,7 +125,7 @@ function AccountConnectedConnectorCard({
                 </>
             }
             actionButtons={
-                <DropdownMenu>
+                <DropdownMenu modal={false}>
                     <DropdownMenuTrigger asChild>
                         <Button variant="ghost" size="icon" className="h-8 w-8">
                             <MoreHorizontal className="h-4 w-4" />
diff --git a/packages/web/src/ee/features/chat/mcp/components/connectorsMenu.tsx b/packages/web/src/ee/features/chat/mcp/components/connectorsMenu.tsx
index fc5cbf5b9..97bdaa414 100644
--- a/packages/web/src/ee/features/chat/mcp/components/connectorsMenu.tsx
+++ b/packages/web/src/ee/features/chat/mcp/components/connectorsMenu.tsx
@@ -20,7 +20,7 @@ import { ErrorCode } from "@/lib/errorCodes";
 import type { ServiceError } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { AlertTriangleIcon, CableIcon, Loader2Icon, PlusCircleIcon, PlusIcon, RefreshCwIcon, SettingsIcon } from "lucide-react";
+import { AlertTriangleIcon, CableIcon, Loader2Icon, PlusCircleIcon, PlusIcon, RefreshCwIcon, SettingsIcon, SparklesIcon } from "lucide-react";
 import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
 import { useEffect, useRef, useState } from "react";
@@ -346,6 +346,15 @@ export const ConnectorsMenu = ({
                         )}
                     </DropdownMenuSubContent>
                 </DropdownMenuSub>
+                {isAuthenticated && (
+                    <DropdownMenuItem
+                        className="gap-2"
+                        onSelect={() => router.push(`/settings/skills`)}
+                    >
+                        <SparklesIcon className="w-4 h-4 text-muted-foreground" />
+                        Skills
+                    </DropdownMenuItem>
+                )}
             </DropdownMenuContent>
         </DropdownMenu>
     );
diff --git a/packages/web/src/ee/features/chat/mcp/mcpToolSets.ts b/packages/web/src/ee/features/chat/mcp/mcpToolSets.ts
index 193c08ff2..b474e7919 100644
--- a/packages/web/src/ee/features/chat/mcp/mcpToolSets.ts
+++ b/packages/web/src/ee/features/chat/mcp/mcpToolSets.ts
@@ -8,8 +8,9 @@ import { createHash } from 'crypto';
 import { getExternalMcpErrorLogFields } from './externalMcpError';
 import { getMcpFaviconUrl } from '@/features/chat/mcp/utils';
 import { __unsafePrisma } from '@/prisma';
-import { McpServerToolPermission, Prisma } from '@sourcebot/db';
+import { McpServerToolPermission } from '@sourcebot/db';
 import { captureEvent } from '@/lib/posthog';
+import { isUniqueConstraintError } from '@/lib/prismaErrors';
 import type { AskMcpAnalyticsSource } from '@/lib/posthogEvents';
 import { getRedisClient } from '@/lib/redis';
 import {
@@ -49,7 +50,7 @@ async function incrementMcpToolCallCounter(serverId: string, toolName: string) {
             },
         });
     } catch (error) {
-        if (!(error instanceof Prisma.PrismaClientKnownRequestError) || error.code !== 'P2002') {
+        if (!isUniqueConstraintError(error)) {
             throw error;
         }
 
diff --git a/packages/web/src/ee/features/chat/skills/actions.test.ts b/packages/web/src/ee/features/chat/skills/actions.test.ts
new file mode 100644
index 000000000..196682eb3
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/actions.test.ts
@@ -0,0 +1,1660 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { CodeHostType, OrgRole } from "@sourcebot/db";
+import { ErrorCode } from "@/lib/errorCodes";
+import { StatusCodes } from "http-status-codes";
+
+const mocks = vi.hoisted(() => ({
+    authContext: undefined as unknown,
+    checkAskEntitlement: vi.fn(),
+}));
+
+vi.mock("@/features/chat/utils.server", () => ({
+    checkAskEntitlement: mocks.checkAskEntitlement,
+}));
+
+vi.mock("@/middleware/withAuth", () => ({
+    withAuth: vi.fn((callback: (context: unknown) => unknown) => callback(mocks.authContext)),
+}));
+
+vi.mock("@sourcebot/shared", () => ({
+    createLogger: () => ({ error: vi.fn(), info: vi.fn(), warn: vi.fn(), debug: vi.fn() }),
+    env: { NODE_ENV: "test" },
+}));
+
+// actions.ts imports the git barrel for repo-source syncing; stub it so the test
+// doesn't pull the server-only git chain into this (non-RSC) environment.
+vi.mock("@/features/git", () => ({
+    getFileSourceForRepo: vi.fn(),
+    resolveFileBlobShaForRepo: vi.fn(),
+}));
+
+const {
+    adoptSharedSkill,
+    createSharedAgentSkill,
+    deleteSharedAgentSkill,
+    getAgentSkillSourceStatus,
+    getSharedAgentSkill,
+    listAgentSkillCommands,
+    listSharedAgentSkillCatalog,
+    listSharedAgentSkillManagement,
+    makeSharedAgentSkillPersonal,
+    publishPersonalAgentSkillToShared,
+    setSharedSkillFlag,
+    unadoptSharedSkill,
+    updatePersonalAgentSkill,
+    updatePersonalAgentSkillFromSource,
+    updateSharedAgentSkill,
+    updateSharedAgentSkillFromSource,
+} = await import("./actions");
+
+const gitMock = await import("@/features/git");
+
+function createPrismaMock() {
+    const prisma = {
+        agentSkill: {
+            create: vi.fn(),
+            delete: vi.fn(),
+            findFirst: vi.fn(),
+            findMany: vi.fn(),
+            update: vi.fn(),
+        },
+        agentSkillAdoption: {
+            upsert: vi.fn(),
+            deleteMany: vi.fn(),
+        },
+        repo: {
+            findMany: vi.fn().mockResolvedValue([]),
+            findFirst: vi.fn().mockResolvedValue(null),
+        },
+    };
+    return {
+        ...prisma,
+        $transaction: vi.fn((callback) => callback(prisma)),
+    };
+}
+
+function setAuthContext({
+    role,
+    userId = "member-1",
+    prisma = createPrismaMock(),
+}: {
+    role: OrgRole;
+    userId?: string;
+    prisma?: ReturnType<typeof createPrismaMock>;
+}) {
+    mocks.authContext = {
+        org: { id: 1 },
+        user: { id: userId },
+        role,
+        prisma,
+    };
+    return prisma;
+}
+
+beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.checkAskEntitlement.mockResolvedValue(undefined);
+});
+
+const validCreateInput = {
+    slug: "review",
+    name: "Review",
+    description: "Review risky changes.",
+    instructions: "Review the change.",
+};
+
+describe("listAgentSkillCommands", () => {
+    test("checks entitlement once while loading personal and shared commands", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findMany
+            .mockResolvedValueOnce([{
+                id: "personal-skill",
+                slug: "review",
+                name: "Review",
+                description: "Personal review.",
+            }])
+            .mockResolvedValueOnce([{
+                id: "shared-skill",
+                slug: "review",
+                name: "Review",
+                description: "Shared review.",
+            }]);
+
+        const result = await listAgentSkillCommands();
+
+        expect(mocks.checkAskEntitlement).toHaveBeenCalledTimes(1);
+        expect(prisma.agentSkill.findMany).toHaveBeenCalledTimes(2);
+        expect(prisma.agentSkill.findMany).toHaveBeenNthCalledWith(1, {
+            where: {
+                visibility: "PERSONAL",
+                scopeId: "member-1",
+                orgId: 1,
+                createdById: "member-1",
+                enabled: true,
+            },
+            orderBy: [
+                { updatedAt: "desc" },
+                { name: "asc" },
+            ],
+            select: {
+                id: true,
+                slug: true,
+                name: true,
+                description: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(prisma.agentSkill.findMany).toHaveBeenNthCalledWith(2, {
+            where: {
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+                AND: [
+                    {
+                        OR: [
+                            { autoEnrolled: true },
+                            {
+                                adoptions: {
+                                    some: {
+                                        userId: "member-1",
+                                        orgId: 1,
+                                        removedAt: null,
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        NOT: {
+                            adoptions: {
+                                some: {
+                                    userId: "member-1",
+                                    orgId: 1,
+                                    removedAt: {
+                                        not: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                ],
+            },
+            orderBy: [
+                { updatedAt: "desc" },
+                { name: "asc" },
+            ],
+            select: {
+                id: true,
+                slug: true,
+                name: true,
+                description: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(result).toMatchObject([
+            {
+                id: "personal-skill",
+                sourceId: "personal-skill",
+                sourceLabel: "Personal",
+                slug: "review",
+            },
+            {
+                id: "shared-skill",
+                sourceId: "shared-skill",
+                sourceLabel: "Shared",
+                slug: "review",
+            },
+        ]);
+    });
+});
+
+describe("createSharedAgentSkill", () => {
+    test("creates and adopts a shared skill for the creator", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.create.mockResolvedValue({
+            id: "shared-skill",
+            visibility: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            instructions: "Review the change.",
+            enabled: true,
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+        });
+
+        const result = await createSharedAgentSkill(validCreateInput);
+
+        expect(result).toMatchObject({
+            id: "shared-skill",
+            slug: "review",
+        });
+        expect(prisma.$transaction).toHaveBeenCalledTimes(1);
+        expect(prisma.agentSkill.create).toHaveBeenCalledWith({
+            data: {
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                instructions: "Review the change.",
+                createdById: "member-1",
+                updatedById: "member-1",
+                adoptions: {
+                    create: {
+                        orgId: 1,
+                        userId: "member-1",
+                        removedAt: null,
+                    },
+                },
+            },
+        });
+        expect(prisma.agentSkillAdoption.upsert).not.toHaveBeenCalled();
+    });
+});
+
+describe("publishPersonalAgentSkillToShared", () => {
+    test("moves a personal skill into the shared catalog and adopts it for the publisher", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst
+            .mockResolvedValueOnce({
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                instructions: "Review the change.",
+            })
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                visibility: "SHARED",
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                enabled: true,
+                autoEnrolled: false,
+                createdById: "member-1",
+                createdAt: new Date("2026-01-01T00:00:00.000Z"),
+                updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+                adoptions: [{ id: "adoption-1", removedAt: null }],
+            });
+        prisma.agentSkill.create.mockResolvedValue({
+            id: "shared-skill",
+        });
+
+        const result = await publishPersonalAgentSkillToShared("personal-skill");
+
+        expect(result).toMatchObject({
+            id: "shared-skill",
+            slug: "review",
+            isAdopted: true,
+            isCreatedByUser: true,
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenNthCalledWith(1, {
+            where: {
+                id: "personal-skill",
+                visibility: "PERSONAL",
+                scopeId: "member-1",
+                orgId: 1,
+                createdById: "member-1",
+            },
+            select: {
+                slug: true,
+                name: true,
+                description: true,
+                instructions: true,
+                sourceRepoName: true,
+                sourceFilePath: true,
+                sourceRevision: true,
+                sourceBlobSha: true,
+                sourceImportedAt: true,
+            },
+        });
+        expect(prisma.agentSkill.create).toHaveBeenCalledWith({
+            data: {
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                instructions: "Review the change.",
+                createdById: "member-1",
+                updatedById: "member-1",
+                adoptions: {
+                    create: {
+                        orgId: 1,
+                        userId: "member-1",
+                        removedAt: null,
+                    },
+                },
+            },
+            select: {
+                id: true,
+            },
+        });
+        expect(prisma.agentSkillAdoption.upsert).not.toHaveBeenCalled();
+        expect(prisma.agentSkill.delete).toHaveBeenCalledWith({
+            where: {
+                id: "personal-skill",
+            },
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenNthCalledWith(2, {
+            where: {
+                id: "shared-skill",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+            },
+            select: expect.any(Object),
+        });
+    });
+});
+
+describe("makeSharedAgentSkillPersonal", () => {
+    test("moves the shared skill to personal when the user authored it", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                instructions: "Review the change.",
+                createdById: "member-1",
+                autoEnrolled: false,
+            });
+        prisma.agentSkill.create.mockResolvedValue({
+            id: "personal-skill",
+            visibility: "PERSONAL",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            instructions: "Review the change.",
+            enabled: true,
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+        });
+
+        const result = await makeSharedAgentSkillPersonal("shared-skill");
+
+        expect(result).toMatchObject({
+            id: "personal-skill",
+            scope: "PERSONAL",
+            slug: "review",
+        });
+        expect(prisma.agentSkill.create).toHaveBeenCalledWith({
+            data: {
+                visibility: "PERSONAL",
+                scopeId: "member-1",
+                orgId: 1,
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                instructions: "Review the change.",
+                createdById: "member-1",
+                updatedById: "member-1",
+            },
+        });
+        expect(prisma.agentSkill.delete).toHaveBeenCalledWith({
+            where: {
+                id: "shared-skill",
+            },
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledTimes(1);
+    });
+
+    test("copies another user's auto-enrolled shared skill and opts out of the shared command", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                instructions: "Review the change.",
+                createdById: "author-1",
+                autoEnrolled: true,
+            })
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+            });
+        prisma.agentSkill.create.mockResolvedValue({
+            id: "personal-skill",
+            visibility: "PERSONAL",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            instructions: "Review the change.",
+            enabled: true,
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+        });
+
+        const result = await makeSharedAgentSkillPersonal("shared-skill");
+
+        expect(result).toMatchObject({
+            id: "personal-skill",
+            scope: "PERSONAL",
+        });
+        expect(prisma.agentSkill.delete).not.toHaveBeenCalled();
+        expect(prisma.agentSkillAdoption.upsert).toHaveBeenCalledWith({
+            where: {
+                orgId_userId_agentSkillId: {
+                    orgId: 1,
+                    userId: "member-1",
+                    agentSkillId: "shared-skill",
+                },
+            },
+            create: {
+                orgId: 1,
+                userId: "member-1",
+                agentSkillId: "shared-skill",
+                removedAt: expect.any(Date),
+            },
+            update: {
+                removedAt: expect.any(Date),
+            },
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledTimes(2);
+    });
+
+    test("returns forbidden before copying another user's unavailable shared skill", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                instructions: "Review the change.",
+                createdById: "author-1",
+                autoEnrolled: false,
+            })
+            .mockResolvedValueOnce(null);
+
+        const result = await makeSharedAgentSkillPersonal("shared-skill");
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.FORBIDDEN,
+            errorCode: ErrorCode.INSUFFICIENT_PERMISSIONS,
+            message: "You do not have sufficient permissions to manage this skill.",
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenNthCalledWith(1, {
+            where: {
+                id: "shared-skill",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            select: {
+                id: true,
+                slug: true,
+                name: true,
+                description: true,
+                instructions: true,
+                createdById: true,
+                autoEnrolled: true,
+                sourceRepoName: true,
+                sourceFilePath: true,
+                sourceRevision: true,
+                sourceBlobSha: true,
+                sourceImportedAt: true,
+            },
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenNthCalledWith(2, {
+            where: {
+                id: "shared-skill",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+                AND: [
+                    {
+                        OR: [
+                            { autoEnrolled: true },
+                            {
+                                adoptions: {
+                                    some: {
+                                        userId: "member-1",
+                                        orgId: 1,
+                                        removedAt: null,
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        NOT: {
+                            adoptions: {
+                                some: {
+                                    userId: "member-1",
+                                    orgId: 1,
+                                    removedAt: {
+                                        not: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                ],
+            },
+            select: {
+                id: true,
+            },
+        });
+        expect(prisma.agentSkill.create).not.toHaveBeenCalled();
+        expect(prisma.agentSkill.delete).not.toHaveBeenCalled();
+        expect(prisma.agentSkillAdoption.deleteMany).not.toHaveBeenCalled();
+        expect(prisma.agentSkillAdoption.upsert).not.toHaveBeenCalled();
+    });
+});
+
+describe("getSharedAgentSkill", () => {
+    test("returns skillNotFound when the shared skill is disabled or missing", async () => {
+        const prisma = setAuthContext({ role: OrgRole.OWNER });
+        prisma.agentSkill.findFirst.mockResolvedValue(null);
+
+        const result = await getSharedAgentSkill("skill-1");
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.NOT_FOUND,
+            errorCode: ErrorCode.AGENT_SKILL_NOT_FOUND,
+            message: "Skill not found.",
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            select: {
+                id: true,
+                createdById: true,
+                sourceRepoName: true,
+            },
+        });
+    });
+
+    test("hides a synced shared skill from a manager who can't access its source repo", async () => {
+        const prisma = setAuthContext({ role: OrgRole.OWNER });
+        prisma.agentSkill.findFirst
+            .mockResolvedValueOnce({ id: "skill-1", createdById: "author-1", sourceRepoName: "github.com/acme/secret" })
+            .mockResolvedValueOnce({
+                id: "skill-1",
+                visibility: "SHARED",
+                slug: "audit",
+                name: "Audit",
+                description: "Audit",
+                instructions: "Audit the billing system",
+                enabled: true,
+                sourceRepoName: "github.com/acme/secret",
+                sourceFilePath: "docs/skill.md",
+                sourceRevision: "main",
+                createdAt: new Date("2026-01-01T00:00:00.000Z"),
+                updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+            });
+        prisma.repo.findFirst.mockResolvedValue(null);
+
+        const result = await getSharedAgentSkill("skill-1");
+
+        expect(result).toMatchObject({ errorCode: ErrorCode.AGENT_SKILL_NOT_FOUND });
+        expect(prisma.repo.findFirst).toHaveBeenCalledWith({
+            where: { name: "github.com/acme/secret", orgId: 1 },
+            select: { id: true },
+        });
+    });
+});
+
+describe("listSharedAgentSkillCatalog", () => {
+    const catalogRow = (id: string, sourceRepoName: string | null) => ({
+        id,
+        visibility: "SHARED" as const,
+        slug: id,
+        name: id,
+        description: "",
+        instructions: "Do the thing.",
+        enabled: true,
+        autoEnrolled: true,
+        createdById: "member-1",
+        createdAt: new Date("2026-01-01T00:00:00.000Z"),
+        updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+        sourceRepoName,
+        sourceFilePath: sourceRepoName ? "docs/skill.md" : null,
+        sourceRevision: sourceRepoName ? "main" : null,
+        adoptions: [],
+        createdBy: { email: "member@sourcebot.dev" },
+    });
+
+    test("drops synced skills whose source repo the user can't access, keeping plain and accessible ones", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findMany.mockResolvedValue([
+            catalogRow("plain", null),
+            catalogRow("visible", "github.com/acme/widgets"),
+            catalogRow("hidden", "github.com/acme/secret"),
+        ]);
+        // Only widgets resolves through the user-scoped repo lookup.
+        prisma.repo.findMany.mockResolvedValue([{ name: "github.com/acme/widgets" }]);
+
+        const result = await listSharedAgentSkillCatalog();
+
+        if (!Array.isArray(result)) {
+            throw new Error("Expected catalog skills.");
+        }
+        expect(result.map((skill) => skill.id)).toEqual(["plain", "visible"]);
+        expect(prisma.repo.findMany).toHaveBeenCalledWith({
+            where: { name: { in: ["github.com/acme/widgets", "github.com/acme/secret"] }, orgId: 1 },
+            select: { name: true },
+        });
+    });
+});
+
+describe("deleteSharedAgentSkill", () => {
+    test("returns skillNotFound when the shared skill is disabled or missing", async () => {
+        const prisma = setAuthContext({ role: OrgRole.OWNER });
+        prisma.agentSkill.findFirst.mockResolvedValue(null);
+
+        const result = await deleteSharedAgentSkill("skill-1");
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.NOT_FOUND,
+            errorCode: ErrorCode.AGENT_SKILL_NOT_FOUND,
+            message: "Skill not found.",
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            select: {
+                id: true,
+                createdById: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(prisma.agentSkill.delete).not.toHaveBeenCalled();
+    });
+
+    test("returns forbidden when a member deletes another author's shared skill", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            createdById: "author-1",
+        });
+
+        const result = await deleteSharedAgentSkill("skill-1");
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.FORBIDDEN,
+            errorCode: ErrorCode.INSUFFICIENT_PERMISSIONS,
+            message: "You do not have sufficient permissions to manage this skill.",
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            select: {
+                id: true,
+                createdById: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(prisma.agentSkill.delete).not.toHaveBeenCalled();
+    });
+
+    test("deletes the shared skill when the author requests it", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER, userId: "author-1" });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            createdById: "author-1",
+        });
+
+        const result = await deleteSharedAgentSkill("skill-1");
+
+        expect(result).toEqual({ success: true });
+        expect(prisma.agentSkill.delete).toHaveBeenCalledWith({
+            where: { id: "skill-1" },
+        });
+    });
+
+    test("deletes another author's shared skill when an owner requests it", async () => {
+        const prisma = setAuthContext({ role: OrgRole.OWNER });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            createdById: "author-1",
+        });
+
+        const result = await deleteSharedAgentSkill("skill-1");
+
+        expect(result).toEqual({ success: true });
+        expect(prisma.agentSkill.delete).toHaveBeenCalledWith({
+            where: { id: "skill-1" },
+        });
+    });
+});
+
+const validUpdateInput = {
+    id: "skill-1",
+    name: "Review",
+    slug: "review",
+    description: "Review risky changes.",
+    instructions: "Review the change.",
+};
+
+describe("updateSharedAgentSkill", () => {
+    test("returns forbidden when a member updates another author's shared skill", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            createdById: "author-1",
+        });
+
+        const result = await updateSharedAgentSkill(validUpdateInput);
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.FORBIDDEN,
+            errorCode: ErrorCode.INSUFFICIENT_PERMISSIONS,
+            message: "You do not have sufficient permissions to manage this skill.",
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            select: {
+                id: true,
+                createdById: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(prisma.agentSkill.update).not.toHaveBeenCalled();
+    });
+
+    test("returns skillNotFound when the shared skill is disabled or missing", async () => {
+        const prisma = setAuthContext({ role: OrgRole.OWNER });
+        prisma.agentSkill.findFirst.mockResolvedValue(null);
+
+        const result = await updateSharedAgentSkill(validUpdateInput);
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.NOT_FOUND,
+            errorCode: ErrorCode.AGENT_SKILL_NOT_FOUND,
+            message: "Skill not found.",
+        });
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            select: {
+                id: true,
+                createdById: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(prisma.agentSkill.update).not.toHaveBeenCalled();
+    });
+
+    test("updates the shared skill when the author requests it", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER, userId: "author-1" });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            createdById: "author-1",
+            sourceRepoName: null,
+        });
+        prisma.agentSkill.update.mockResolvedValue({
+            id: "skill-1",
+            visibility: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            instructions: "Review the change.",
+            enabled: true,
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+        });
+
+        const result = await updateSharedAgentSkill(validUpdateInput);
+
+        expect(result).toMatchObject({ id: "skill-1", slug: "review" });
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            select: {
+                id: true,
+                createdById: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(prisma.agentSkill.update).toHaveBeenCalledWith({
+            where: { id: "skill-1" },
+            data: {
+                slug: "review",
+                name: "Review",
+                description: "Review risky changes.",
+                instructions: "Review the change.",
+                updatedById: "author-1",
+            },
+        });
+    });
+
+    test("writes only name and command for a repo-synced shared skill", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER, userId: "author-1" });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            createdById: "author-1",
+            sourceRepoName: "github.com/acme/widgets",
+        });
+        prisma.agentSkill.update.mockResolvedValue({
+            id: "skill-1",
+            visibility: "SHARED",
+            slug: "renamed",
+            name: "Renamed",
+            description: "kept from source",
+            instructions: "kept body from source",
+            enabled: true,
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+        });
+
+        const result = await updateSharedAgentSkill({
+            id: "skill-1",
+            name: "Renamed",
+            slug: "renamed",
+            description: "attempted description change",
+            instructions: "attempted instruction change that is long enough",
+        });
+
+        const updateArg = prisma.agentSkill.update.mock.calls[0][0];
+        expect(updateArg.data).toMatchObject({ name: "Renamed", slug: "renamed" });
+        // A synced shared skill's content tracks the source file, so the client's
+        // description/instructions are ignored here.
+        expect(updateArg.data.description).toBeUndefined();
+        expect(updateArg.data.instructions).toBeUndefined();
+        expect(result).toMatchObject({ id: "skill-1", slug: "renamed", source: { repoName: "github.com/acme/widgets" } });
+    });
+});
+
+describe("adoptSharedSkill", () => {
+    test("returns skillNotFound when the skill is disabled or missing, and never records adoption", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue(null);
+
+        const result = await adoptSharedSkill("skill-1");
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.NOT_FOUND,
+            errorCode: ErrorCode.AGENT_SKILL_NOT_FOUND,
+            message: "Skill not found.",
+        });
+        // The adopt lookup requires `enabled: true`, so a disabled skill is invisible here.
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            select: {
+                id: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(prisma.agentSkillAdoption.upsert).not.toHaveBeenCalled();
+    });
+
+    test("records the adoption when the skill is enabled", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({ id: "skill-1" });
+
+        const result = await adoptSharedSkill("skill-1");
+
+        expect(result).toEqual({ success: true });
+        expect(prisma.agentSkillAdoption.upsert).toHaveBeenCalledWith({
+            where: {
+                orgId_userId_agentSkillId: {
+                    orgId: 1,
+                    userId: "member-1",
+                    agentSkillId: "skill-1",
+                },
+            },
+            create: {
+                orgId: 1,
+                userId: "member-1",
+                agentSkillId: "skill-1",
+                removedAt: null,
+            },
+            update: {
+                removedAt: null,
+            },
+        });
+    });
+
+    test("rejects adopting a skill synced from a repo the user can't access", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({ id: "skill-1", sourceRepoName: "github.com/acme/secret" });
+        prisma.repo.findFirst.mockResolvedValue(null);
+
+        const result = await adoptSharedSkill("skill-1");
+
+        expect(result).toMatchObject({ errorCode: ErrorCode.AGENT_SKILL_NOT_FOUND });
+        expect(prisma.repo.findFirst).toHaveBeenCalledWith({
+            where: { name: "github.com/acme/secret", orgId: 1 },
+            select: { id: true },
+        });
+        expect(prisma.agentSkillAdoption.upsert).not.toHaveBeenCalled();
+    });
+});
+
+describe("unadoptSharedSkill", () => {
+    test("removes the adoption against a disabled skill, since its lookup omits the enabled filter", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({ id: "skill-1", autoEnrolled: false });
+
+        const result = await unadoptSharedSkill("skill-1");
+
+        expect(result).toEqual({ success: true });
+        // Unlike adopt, the unadopt lookup does NOT filter on `enabled`.
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+            },
+            select: {
+                id: true,
+                autoEnrolled: true,
+            },
+        });
+        expect(prisma.agentSkillAdoption.deleteMany).toHaveBeenCalledWith({
+            where: {
+                orgId: 1,
+                userId: "member-1",
+                agentSkillId: "skill-1",
+            },
+        });
+    });
+
+    test("records an opt-out for auto-enrolled skills", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({ id: "skill-1", autoEnrolled: true });
+
+        const result = await unadoptSharedSkill("skill-1");
+
+        expect(result).toEqual({ success: true });
+        expect(prisma.agentSkillAdoption.upsert).toHaveBeenCalledWith({
+            where: {
+                orgId_userId_agentSkillId: {
+                    orgId: 1,
+                    userId: "member-1",
+                    agentSkillId: "skill-1",
+                },
+            },
+            create: {
+                orgId: 1,
+                userId: "member-1",
+                agentSkillId: "skill-1",
+                removedAt: expect.any(Date),
+            },
+            update: {
+                removedAt: expect.any(Date),
+            },
+        });
+        expect(prisma.agentSkillAdoption.deleteMany).not.toHaveBeenCalled();
+    });
+});
+
+describe("listSharedAgentSkillManagement", () => {
+    test("returns owner-management skills without requester adoption state", async () => {
+        const prisma = setAuthContext({ role: OrgRole.OWNER });
+        prisma.agentSkill.findMany.mockResolvedValue([{
+            id: "skill-1",
+            visibility: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            enabled: true,
+            autoEnrolled: false,
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            createdBy: { email: "author@example.com" },
+        }]);
+
+        const result = await listSharedAgentSkillManagement();
+
+        expect(prisma.agentSkill.findMany).toHaveBeenCalledWith({
+            where: {
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+                enabled: true,
+            },
+            orderBy: [
+                { updatedAt: "desc" },
+                { name: "asc" },
+            ],
+            select: expect.not.objectContaining({
+                adoptions: expect.anything(),
+                createdById: expect.anything(),
+            }),
+        });
+        expect(Array.isArray(result)).toBe(true);
+        if (!Array.isArray(result)) {
+            throw new Error("Expected management skills.");
+        }
+
+        expect(result).toEqual([{
+            id: "skill-1",
+            scope: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            enabled: true,
+            autoEnrolled: false,
+            source: { repoName: "github.com/acme/widgets", filePath: "docs/skill.md", revision: "main" },
+            createdByEmail: "author@example.com",
+            createdAt: "2026-01-01T00:00:00.000Z",
+            updatedAt: "2026-01-02T00:00:00.000Z",
+        }]);
+        expect(result[0]).not.toHaveProperty("isAdopted");
+        expect(result[0]).not.toHaveProperty("isVisibleToUser");
+        expect(result[0]).not.toHaveProperty("isCreatedByUser");
+    });
+});
+
+describe("setSharedSkillFlag", () => {
+    test("updates a single shared skill flag through the shared owner-gated path", async () => {
+        const prisma = setAuthContext({ role: OrgRole.OWNER });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+        });
+        prisma.agentSkill.update.mockResolvedValue({
+            id: "skill-1",
+            visibility: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            enabled: true,
+            autoEnrolled: true,
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+        });
+
+        const result = await setSharedSkillFlag({
+            skillId: "skill-1",
+            data: { autoEnrolled: true },
+        });
+
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                visibility: "SHARED",
+                scopeId: "1",
+                orgId: 1,
+            },
+            select: {
+                id: true,
+            },
+        });
+        expect(prisma.agentSkill.update).toHaveBeenCalledWith({
+            where: { id: "skill-1" },
+            data: {
+                autoEnrolled: true,
+                updatedById: "member-1",
+            },
+            select: expect.any(Object),
+        });
+        expect(result).toMatchObject({
+            id: "skill-1",
+            autoEnrolled: true,
+        });
+        expect(result).not.toHaveProperty("isAdopted");
+        expect(result).not.toHaveProperty("isVisibleToUser");
+        expect(result).not.toHaveProperty("isCreatedByUser");
+    });
+
+    test("rejects a non-owner through the owner gate without touching the skill", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+
+        const result = await setSharedSkillFlag({
+            skillId: "skill-1",
+            data: { autoEnrolled: true },
+        });
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.FORBIDDEN,
+            errorCode: ErrorCode.INSUFFICIENT_PERMISSIONS,
+            message: "You do not have sufficient permissions to perform this action.",
+        });
+        // The owner gate returns before its callback runs, so the skill is never looked up or updated.
+        expect(prisma.agentSkill.findFirst).not.toHaveBeenCalled();
+        expect(prisma.agentSkill.update).not.toHaveBeenCalled();
+    });
+
+    test("rejects updates with no flag", async () => {
+        setAuthContext({ role: OrgRole.OWNER });
+
+        const result = await setSharedSkillFlag({
+            skillId: "skill-1",
+            data: {},
+        });
+
+        expect(result).toMatchObject({
+            statusCode: StatusCodes.BAD_REQUEST,
+            errorCode: ErrorCode.INVALID_REQUEST_BODY,
+        });
+        expect(mocks.checkAskEntitlement).not.toHaveBeenCalled();
+    });
+});
+
+describe("getAgentSkillSourceStatus", () => {
+    const syncedRow = {
+        sourceRepoName: "github.com/acme/widgets",
+        sourceFilePath: "docs/skill.md",
+        sourceRevision: "main",
+        sourceBlobSha: "old-sha",
+    };
+
+    test("returns in_sync when the indexed blob matches the imported one", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue(syncedRow);
+        vi.mocked(gitMock.resolveFileBlobShaForRepo).mockResolvedValue("old-sha");
+
+        const result = await getAgentSkillSourceStatus("skill-1");
+
+        expect(result).toEqual({ status: "in_sync" });
+        expect(gitMock.resolveFileBlobShaForRepo).toHaveBeenCalledWith(
+            { path: "docs/skill.md", repo: "github.com/acme/widgets", ref: "main" },
+            expect.objectContaining({ org: { id: 1 } }),
+        );
+    });
+
+    test("returns update_available when the indexed blob has moved on", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue(syncedRow);
+        vi.mocked(gitMock.resolveFileBlobShaForRepo).mockResolvedValue("new-sha");
+
+        expect(await getAgentSkillSourceStatus("skill-1")).toEqual({ status: "update_available" });
+    });
+
+    test("returns not_synced when the skill has no source", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            sourceRepoName: null,
+            sourceFilePath: null,
+            sourceRevision: null,
+            sourceBlobSha: null,
+        });
+
+        expect(await getAgentSkillSourceStatus("skill-1")).toEqual({ status: "not_synced" });
+        expect(gitMock.resolveFileBlobShaForRepo).not.toHaveBeenCalled();
+    });
+
+    test("degrades a missing repo to repo_unavailable and a missing file to source_missing", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue(syncedRow);
+
+        vi.mocked(gitMock.resolveFileBlobShaForRepo).mockResolvedValue({
+            statusCode: StatusCodes.NOT_FOUND,
+            errorCode: ErrorCode.NOT_FOUND,
+            message: "Repository not found.",
+        });
+        expect(await getAgentSkillSourceStatus("skill-1")).toEqual({ status: "repo_unavailable" });
+
+        vi.mocked(gitMock.resolveFileBlobShaForRepo).mockResolvedValue({
+            statusCode: StatusCodes.NOT_FOUND,
+            errorCode: ErrorCode.FILE_NOT_FOUND,
+            message: "File not found.",
+        });
+        expect(await getAgentSkillSourceStatus("skill-1")).toEqual({ status: "source_missing" });
+    });
+
+    test("returns not found for a skill the user does not own", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue(null);
+
+        expect(await getAgentSkillSourceStatus("skill-1")).toMatchObject({
+            errorCode: ErrorCode.AGENT_SKILL_NOT_FOUND,
+        });
+    });
+
+    test("looks the skill up across the caller's personal scope or any enabled shared skill", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue(syncedRow);
+        vi.mocked(gitMock.resolveFileBlobShaForRepo).mockResolvedValue("old-sha");
+
+        await getAgentSkillSourceStatus("skill-1");
+
+        expect(prisma.agentSkill.findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "skill-1",
+                OR: [
+                    {
+                        visibility: "PERSONAL",
+                        scopeId: "member-1",
+                        orgId: 1,
+                        createdById: "member-1",
+                    },
+                    {
+                        visibility: "SHARED",
+                        scopeId: "1",
+                        orgId: 1,
+                        enabled: true,
+                    },
+                ],
+            },
+            select: {
+                sourceRepoName: true,
+                sourceFilePath: true,
+                sourceRevision: true,
+                sourceBlobSha: true,
+            },
+        });
+    });
+});
+
+describe("updatePersonalAgentSkill", () => {
+    test("writes only name and command for a repo-synced skill, leaving content synced", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({ id: "skill-1", sourceRepoName: "github.com/acme/widgets" });
+        prisma.agentSkill.update.mockResolvedValue({
+            id: "skill-1",
+            visibility: "PERSONAL",
+            slug: "renamed",
+            name: "Renamed",
+            description: "kept from source",
+            instructions: "kept body from source",
+            enabled: true,
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            createdAt: new Date("2026-06-20T00:00:00.000Z"),
+            updatedAt: new Date("2026-06-25T00:00:00.000Z"),
+        });
+
+        const result = await updatePersonalAgentSkill({
+            id: "skill-1",
+            name: "Renamed",
+            slug: "renamed",
+            description: "attempted description change",
+            instructions: "attempted instruction change that is long enough",
+        });
+
+        const updateArg = prisma.agentSkill.update.mock.calls[0][0];
+        expect(updateArg.data).toMatchObject({ name: "Renamed", slug: "renamed" });
+        // Content fields are not written for synced skills, even if sent by the client.
+        expect(updateArg.data.description).toBeUndefined();
+        expect(updateArg.data.instructions).toBeUndefined();
+        expect(result).toMatchObject({ id: "skill-1", slug: "renamed", source: { repoName: "github.com/acme/widgets" } });
+    });
+
+    test("writes all fields for a non-synced skill", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({ id: "skill-1", sourceRepoName: null });
+        prisma.agentSkill.update.mockResolvedValue({
+            id: "skill-1",
+            visibility: "PERSONAL",
+            slug: "manual",
+            name: "Manual",
+            description: "Edited description",
+            instructions: "Edited instructions long enough",
+            enabled: true,
+            sourceRepoName: null,
+            sourceFilePath: null,
+            sourceRevision: null,
+            createdAt: new Date("2026-06-20T00:00:00.000Z"),
+            updatedAt: new Date("2026-06-25T00:00:00.000Z"),
+        });
+
+        await updatePersonalAgentSkill({
+            id: "skill-1",
+            name: "Manual",
+            slug: "manual",
+            description: "Edited description",
+            instructions: "Edited instructions long enough",
+        });
+
+        const updateArg = prisma.agentSkill.update.mock.calls[0][0];
+        expect(updateArg.data).toMatchObject({
+            name: "Manual",
+            slug: "manual",
+            description: "Edited description",
+            instructions: "Edited instructions long enough",
+        });
+    });
+});
+
+describe("updatePersonalAgentSkillFromSource", () => {
+    test("refreshes synced content and blob OID, preserving the local name and command", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            name: "My Deploy",
+            slug: "my-deploy",
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+        });
+        // The file's front matter has a different name; it must NOT overwrite the
+        // user's local name/command — only description + instructions are pulled.
+        vi.mocked(gitMock.getFileSourceForRepo).mockResolvedValue({
+            source: "---\nname: Upstream Name\ndescription: New steps\n---\n\nRun the new deploy script.",
+            language: "Markdown",
+            path: "docs/skill.md",
+            repo: "github.com/acme/widgets",
+            repoCodeHostType: CodeHostType.github,
+            webUrl: "https://sourcebot.example.com/browse",
+            blobSha: "new-sha",
+        });
+        prisma.agentSkill.update.mockResolvedValue({
+            id: "skill-1",
+            visibility: "PERSONAL",
+            slug: "my-deploy",
+            name: "My Deploy",
+            description: "New steps",
+            instructions: "Run the new deploy script.",
+            enabled: true,
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            createdAt: new Date("2026-06-20T00:00:00.000Z"),
+            updatedAt: new Date("2026-06-25T00:00:00.000Z"),
+        });
+
+        const result = await updatePersonalAgentSkillFromSource("skill-1");
+
+        const updateArg = prisma.agentSkill.update.mock.calls[0][0];
+        expect(updateArg.where).toEqual({ id: "skill-1" });
+        expect(updateArg.data).toMatchObject({
+            description: "New steps",
+            instructions: "Run the new deploy script.",
+            sourceBlobSha: "new-sha",
+        });
+        // name and command are local labels and are left untouched by a sync.
+        expect(updateArg.data.name).toBeUndefined();
+        expect(updateArg.data.slug).toBeUndefined();
+        expect(result).toMatchObject({
+            id: "skill-1",
+            name: "My Deploy",
+            slug: "my-deploy",
+            source: { repoName: "github.com/acme/widgets", filePath: "docs/skill.md", revision: "main" },
+        });
+    });
+
+    test("rejects when the skill is not linked to a repository source", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            slug: "manual",
+            sourceRepoName: null,
+            sourceFilePath: null,
+            sourceRevision: null,
+        });
+
+        const result = await updatePersonalAgentSkillFromSource("skill-1");
+
+        expect(result).toMatchObject({ errorCode: ErrorCode.INVALID_REQUEST_BODY });
+        expect(gitMock.getFileSourceForRepo).not.toHaveBeenCalled();
+        expect(prisma.agentSkill.update).not.toHaveBeenCalled();
+    });
+
+    test("surfaces a source-fetch error without writing", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "skill-1",
+            slug: "deploy-widgets",
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+        });
+        vi.mocked(gitMock.getFileSourceForRepo).mockResolvedValue({
+            statusCode: StatusCodes.NOT_FOUND,
+            errorCode: ErrorCode.FILE_NOT_FOUND,
+            message: "File not found.",
+        });
+
+        const result = await updatePersonalAgentSkillFromSource("skill-1");
+
+        expect(result).toMatchObject({ errorCode: ErrorCode.FILE_NOT_FOUND });
+        expect(prisma.agentSkill.update).not.toHaveBeenCalled();
+    });
+});
+
+describe("updateSharedAgentSkillFromSource", () => {
+    const importedAt = new Date("2026-06-20T00:00:00.000Z");
+
+    test("refreshes a synced shared skill's content for its author, preserving local name and command", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER, userId: "author-1" });
+        prisma.agentSkill.findFirst
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                createdById: "author-1",
+                sourceRepoName: "github.com/acme/widgets",
+            })
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                name: "Team Deploy",
+                slug: "team-deploy",
+                sourceRepoName: "github.com/acme/widgets",
+                sourceFilePath: "docs/skill.md",
+                sourceRevision: "main",
+            });
+        vi.mocked(gitMock.getFileSourceForRepo).mockResolvedValue({
+            source: "---\nname: Upstream Name\ndescription: New steps\n---\n\nRun the new deploy script.",
+            language: "Markdown",
+            path: "docs/skill.md",
+            repo: "github.com/acme/widgets",
+            repoCodeHostType: CodeHostType.github,
+            webUrl: "https://sourcebot.example.com/browse",
+            blobSha: "new-sha",
+        });
+        prisma.agentSkill.update.mockResolvedValue({
+            id: "shared-skill",
+            visibility: "SHARED",
+            slug: "team-deploy",
+            name: "Team Deploy",
+            description: "New steps",
+            instructions: "Run the new deploy script.",
+            enabled: true,
+            autoEnrolled: false,
+            createdById: "author-1",
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            createdAt: new Date("2026-06-18T00:00:00.000Z"),
+            updatedAt: new Date("2026-06-25T00:00:00.000Z"),
+            adoptions: [{ id: "adoption-1", removedAt: null }],
+            createdBy: { email: "author@sourcebot.dev" },
+        });
+
+        const result = await updateSharedAgentSkillFromSource("shared-skill");
+
+        const updateArg = prisma.agentSkill.update.mock.calls[0][0];
+        expect(updateArg.data).toMatchObject({
+            description: "New steps",
+            instructions: "Run the new deploy script.",
+            sourceBlobSha: "new-sha",
+        });
+        // A sync never overwrites the local label or command.
+        expect(updateArg.data.name).toBeUndefined();
+        expect(updateArg.data.slug).toBeUndefined();
+        expect(result).toMatchObject({
+            id: "shared-skill",
+            scope: "SHARED",
+            name: "Team Deploy",
+            slug: "team-deploy",
+            isCreatedByUser: true,
+            source: { repoName: "github.com/acme/widgets", filePath: "docs/skill.md", revision: "main" },
+        });
+    });
+
+    test("rejects a member who cannot manage the shared skill, without fetching the source", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER, userId: "member-1" });
+        prisma.agentSkill.findFirst.mockResolvedValue({
+            id: "shared-skill",
+            createdById: "author-1",
+            sourceRepoName: "github.com/acme/widgets",
+        });
+
+        const result = await updateSharedAgentSkillFromSource("shared-skill");
+
+        expect(result).toEqual({
+            statusCode: StatusCodes.FORBIDDEN,
+            errorCode: ErrorCode.INSUFFICIENT_PERMISSIONS,
+            message: "You do not have sufficient permissions to manage this skill.",
+        });
+        expect(gitMock.getFileSourceForRepo).not.toHaveBeenCalled();
+        expect(prisma.agentSkill.update).not.toHaveBeenCalled();
+    });
+
+    test("rejects when the shared skill is not linked to a repository source", async () => {
+        const prisma = setAuthContext({ role: OrgRole.OWNER });
+        prisma.agentSkill.findFirst
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                createdById: "author-1",
+                sourceRepoName: null,
+            })
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                name: "Manual",
+                slug: "manual",
+                sourceRepoName: null,
+                sourceFilePath: null,
+                sourceRevision: null,
+            });
+
+        const result = await updateSharedAgentSkillFromSource("shared-skill");
+
+        expect(result).toMatchObject({ errorCode: ErrorCode.INVALID_REQUEST_BODY });
+        expect(gitMock.getFileSourceForRepo).not.toHaveBeenCalled();
+        expect(prisma.agentSkill.update).not.toHaveBeenCalled();
+    });
+
+    test("carries the source link onto the shared skill when publishing a synced personal skill", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst
+            .mockResolvedValueOnce({
+                slug: "deploy-widgets",
+                name: "Deploy Widgets",
+                description: "Deploy steps",
+                instructions: "Run the deploy script.",
+                sourceRepoName: "github.com/acme/widgets",
+                sourceFilePath: "docs/skill.md",
+                sourceRevision: "main",
+                sourceBlobSha: "blob-1",
+                sourceImportedAt: importedAt,
+            })
+            .mockResolvedValueOnce({
+                id: "shared-skill",
+                visibility: "SHARED",
+                slug: "deploy-widgets",
+                name: "Deploy Widgets",
+                description: "Deploy steps",
+                instructions: "Run the deploy script.",
+                enabled: true,
+                autoEnrolled: false,
+                createdById: "member-1",
+                createdAt: new Date("2026-06-18T00:00:00.000Z"),
+                updatedAt: new Date("2026-06-19T00:00:00.000Z"),
+                sourceRepoName: "github.com/acme/widgets",
+                sourceFilePath: "docs/skill.md",
+                sourceRevision: "main",
+                adoptions: [{ id: "adoption-1", removedAt: null }],
+                createdBy: { email: "member@sourcebot.dev" },
+            });
+        prisma.agentSkill.create.mockResolvedValue({ id: "shared-skill" });
+
+        const result = await publishPersonalAgentSkillToShared("personal-skill");
+
+        const createArg = prisma.agentSkill.create.mock.calls[0][0];
+        expect(createArg.data).toMatchObject({
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            sourceBlobSha: "blob-1",
+            sourceImportedAt: importedAt,
+        });
+        expect(result).toMatchObject({
+            id: "shared-skill",
+            source: { repoName: "github.com/acme/widgets", filePath: "docs/skill.md", revision: "main" },
+        });
+    });
+
+    test("carries the source link back to personal when a synced shared skill is made personal", async () => {
+        const prisma = setAuthContext({ role: OrgRole.MEMBER });
+        prisma.agentSkill.findFirst.mockResolvedValueOnce({
+            id: "shared-skill",
+            slug: "deploy-widgets",
+            name: "Deploy Widgets",
+            description: "Deploy steps",
+            instructions: "Run the deploy script.",
+            createdById: "member-1",
+            autoEnrolled: false,
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            sourceBlobSha: "blob-1",
+            sourceImportedAt: importedAt,
+        });
+        prisma.agentSkill.create.mockResolvedValue({
+            id: "personal-skill",
+            visibility: "PERSONAL",
+            slug: "deploy-widgets",
+            name: "Deploy Widgets",
+            description: "Deploy steps",
+            instructions: "Run the deploy script.",
+            enabled: true,
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            createdAt: new Date("2026-06-18T00:00:00.000Z"),
+            updatedAt: new Date("2026-06-19T00:00:00.000Z"),
+        });
+
+        const result = await makeSharedAgentSkillPersonal("shared-skill");
+
+        const createArg = prisma.agentSkill.create.mock.calls[0][0];
+        expect(createArg.data).toMatchObject({
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            sourceBlobSha: "blob-1",
+            sourceImportedAt: importedAt,
+        });
+        expect(result).toMatchObject({
+            id: "personal-skill",
+            scope: "PERSONAL",
+            source: { repoName: "github.com/acme/widgets", filePath: "docs/skill.md", revision: "main" },
+        });
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/actions.ts b/packages/web/src/ee/features/chat/skills/actions.ts
new file mode 100644
index 000000000..8fe16ba2f
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/actions.ts
@@ -0,0 +1,1251 @@
+'use server';
+
+import { checkAskEntitlement } from "@/features/chat/utils.server";
+import { type AskCommandDefinition } from "@/features/chat/commands/types";
+import { getFileSourceForRepo, resolveFileBlobShaForRepo } from "@/features/git";
+import { ErrorCode } from "@/lib/errorCodes";
+import { isUniqueConstraintError } from "@/lib/prismaErrors";
+import { requestBodySchemaValidationError, unexpectedError, ServiceError } from "@/lib/serviceError";
+import { isServiceError } from "@/lib/utils";
+import { sew } from "@/middleware/sew";
+import { withAuth } from "@/middleware/withAuth";
+import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
+import { OrgRole, Prisma, sharedAgentSkillAuthScope, sharedAgentSkillScope, sharedAgentSkillVisibleToUserWhere, personalAgentSkillAuthScope, personalAgentSkillScope, type AgentSkill, type Org, type PrismaClient } from "@sourcebot/db";
+import { StatusCodes } from "http-status-codes";
+import { z } from "zod";
+import {
+    agentSkillInputSchema,
+    agentSkillOrderBy,
+    createPersonalAgentSkillInputSchema,
+    parseAgentSkillMarkdown,
+    toSharedAgentSkillCatalogItem,
+    toSharedAgentSkillManagementItem,
+    toAgentSkillListItem,
+    updateAgentSkillInputSchema,
+    type AgentSkillInput,
+    type AgentSkillListItem,
+    type AgentSkillSourceStatus,
+    type CreatePersonalAgentSkillInput,
+    type SharedAgentSkillCatalogItem,
+    type SharedAgentSkillManagementItem,
+    type UpdateAgentSkillInput,
+} from "./types";
+import {
+    listSharedAgentSkillCommandsForContext,
+    listPersonalAgentSkillCommandsForContext,
+} from "./commandCatalog";
+import { canAccessSkillSource, filterSkillsBySourceRepoAccess } from "./sourceRepoAccess";
+
+const skillAlreadyExists = (slug: string): ServiceError => ({
+    statusCode: StatusCodes.CONFLICT,
+    errorCode: ErrorCode.AGENT_SKILL_ALREADY_EXISTS,
+    message: `A skill with command /${slug} already exists.`,
+});
+
+const skillNotFound = (): ServiceError => ({
+    statusCode: StatusCodes.NOT_FOUND,
+    errorCode: ErrorCode.AGENT_SKILL_NOT_FOUND,
+    message: "Skill not found.",
+});
+
+const insufficientSkillPermissions = (): ServiceError => ({
+    statusCode: StatusCodes.FORBIDDEN,
+    errorCode: ErrorCode.INSUFFICIENT_PERMISSIONS,
+    message: "You do not have sufficient permissions to manage this skill.",
+});
+
+const skillNotSynced = (): ServiceError => ({
+    statusCode: StatusCodes.BAD_REQUEST,
+    errorCode: ErrorCode.INVALID_REQUEST_BODY,
+    message: "This skill is not linked to a repository source.",
+});
+
+const skillSourceInvalid = (): ServiceError => ({
+    statusCode: StatusCodes.UNPROCESSABLE_ENTITY,
+    errorCode: ErrorCode.INVALID_REQUEST_BODY,
+    message: "The source file is no longer a valid skill.",
+});
+
+const sharedCatalogSkillSelect = (userId: string, orgId: number) => ({
+    id: true,
+    visibility: true,
+    slug: true,
+    name: true,
+    description: true,
+    instructions: true,
+    enabled: true,
+    autoEnrolled: true,
+    createdById: true,
+    createdAt: true,
+    updatedAt: true,
+    sourceRepoName: true,
+    sourceFilePath: true,
+    sourceRevision: true,
+    createdBy: {
+        select: {
+            email: true,
+        },
+    },
+    adoptions: {
+        where: {
+            userId,
+            orgId,
+        },
+        select: {
+            id: true,
+            removedAt: true,
+        },
+    },
+});
+
+const sharedManagementSkillSelect = {
+    id: true,
+    visibility: true,
+    slug: true,
+    name: true,
+    description: true,
+    enabled: true,
+    autoEnrolled: true,
+    createdAt: true,
+    updatedAt: true,
+    sourceRepoName: true,
+    sourceFilePath: true,
+    sourceRevision: true,
+    createdBy: { select: { email: true } },
+} satisfies Prisma.AgentSkillSelect;
+
+type AgentSkillWriteClient = Pick<PrismaClient, "agentSkill" | "agentSkillAdoption">;
+type ManageableSharedSkill = {
+    id: string;
+    createdById: string;
+    sourceRepoName: string | null;
+};
+
+// The provenance columns copied verbatim when a synced skill changes scope
+// (publish or make-personal), so the new row stays linked to the same source
+// file at the same imported version.
+type AgentSkillSourceColumns = Pick<
+    AgentSkill,
+    "sourceRepoName" | "sourceFilePath" | "sourceRevision" | "sourceBlobSha" | "sourceImportedAt"
+>;
+
+const sourceColumnsCarryOver = (skill: AgentSkillSourceColumns): AgentSkillSourceColumns => ({
+    sourceRepoName: skill.sourceRepoName,
+    sourceFilePath: skill.sourceFilePath,
+    sourceRevision: skill.sourceRevision,
+    sourceBlobSha: skill.sourceBlobSha,
+    sourceImportedAt: skill.sourceImportedAt,
+});
+
+const canManageSharedSkill = (
+    skill: { createdById: string },
+    userId: string,
+    role: OrgRole,
+) => skill.createdById === userId || role === OrgRole.OWNER;
+
+const requireManageableSharedSkill = async ({
+    prisma,
+    orgId,
+    userId,
+    role,
+    skillId,
+    requireEnabled = true,
+}: {
+    prisma: PrismaClient;
+    orgId: number;
+    userId: string;
+    role: OrgRole;
+    skillId: string;
+    requireEnabled?: boolean;
+}): Promise<ManageableSharedSkill | ServiceError> => {
+    const skill = await prisma.agentSkill.findFirst({
+        where: {
+            id: skillId,
+            ...sharedAgentSkillAuthScope(orgId),
+            ...(requireEnabled ? { enabled: true } : {}),
+        },
+        select: {
+            id: true,
+            createdById: true,
+            sourceRepoName: true,
+        },
+    });
+
+    if (!skill) {
+        return skillNotFound();
+    }
+
+    if (!canManageSharedSkill(skill, userId, role)) {
+        return insufficientSkillPermissions();
+    }
+
+    return skill;
+};
+
+const sharedSkillCreateDataForUser = ({
+    orgId,
+    userId,
+    skill,
+    source,
+}: {
+    orgId: number;
+    userId: string;
+    // Accepts either a full skill input (direct shared creation) or a partial
+    // copy (publishing a personal skill).
+    skill: Pick<AgentSkillInput, "slug" | "name" | "description" | "instructions">;
+    // When publishing a synced personal skill, its provenance is carried over so
+    // the shared skill stays linked to the same source file.
+    source?: AgentSkillSourceColumns | null;
+}) => ({
+    ...sharedAgentSkillScope(orgId),
+    slug: skill.slug,
+    name: skill.name,
+    description: skill.description,
+    instructions: skill.instructions,
+    createdById: userId,
+    updatedById: userId,
+    ...(source ? sourceColumnsCarryOver(source) : {}),
+    adoptions: {
+        create: {
+            orgId,
+            userId,
+            removedAt: null,
+        },
+    },
+});
+
+const createSharedSkillForUser = async ({
+    prisma,
+    orgId,
+    userId,
+    skill,
+}: {
+    prisma: AgentSkillWriteClient;
+    orgId: number;
+    userId: string;
+    skill: AgentSkillInput;
+}) => {
+    const createdSkill = await prisma.agentSkill.create({
+        data: sharedSkillCreateDataForUser({ orgId, userId, skill }),
+    });
+
+    return createdSkill;
+};
+
+const removeSharedSkillForUser = async ({
+    prisma,
+    orgId,
+    userId,
+    skill,
+}: {
+    prisma: AgentSkillWriteClient;
+    orgId: number;
+    userId: string;
+    skill: { id: string; autoEnrolled: boolean };
+}) => {
+    if (skill.autoEnrolled) {
+        const removedAt = new Date();
+        await prisma.agentSkillAdoption.upsert({
+            where: {
+                orgId_userId_agentSkillId: {
+                    orgId,
+                    userId,
+                    agentSkillId: skill.id,
+                },
+            },
+            create: {
+                orgId,
+                userId,
+                agentSkillId: skill.id,
+                removedAt,
+            },
+            update: {
+                removedAt,
+            },
+        });
+        return;
+    }
+
+    await prisma.agentSkillAdoption.deleteMany({
+        where: {
+            orgId,
+            userId,
+            agentSkillId: skill.id,
+        },
+    });
+};
+
+const sharedSkillFlagInputSchema = z.object({
+    skillId: z.string().trim().min(1),
+    data: z.object({
+        autoEnrolled: z.boolean().optional(),
+    }).strict().refine(
+        (data) => Object.keys(data).length === 1,
+        "Exactly one shared skill flag must be provided.",
+    ),
+});
+
+type SharedSkillFlagInput = z.infer<typeof sharedSkillFlagInputSchema>;
+
+export const listPersonalAgentSkills = async (): Promise<AgentSkillListItem[] | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const skills = await prisma.agentSkill.findMany({
+            where: {
+                ...personalAgentSkillAuthScope(user.id, org.id),
+            },
+            orderBy: agentSkillOrderBy,
+        });
+
+        return skills.map(toAgentSkillListItem);
+    }));
+
+export const listPersonalAgentSkillCommands = async (): Promise<AskCommandDefinition[] | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        return listPersonalAgentSkillCommandsForContext({ prisma, userId: user.id, orgId: org.id });
+    }));
+
+export const getPersonalAgentSkill = async (
+    skillId: string,
+): Promise<AgentSkillListItem | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const skill = await prisma.agentSkill.findFirst({
+            where: {
+                id: skillId,
+                ...personalAgentSkillAuthScope(user.id, org.id),
+            },
+        });
+
+        if (!skill) {
+            return skillNotFound();
+        }
+
+        return toAgentSkillListItem(skill);
+    }));
+
+export const getSharedAgentSkill = async (
+    skillId: string,
+): Promise<AgentSkillListItem | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, role, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const manageableSkill = await requireManageableSharedSkill({
+            prisma,
+            orgId: org.id,
+            userId: user.id,
+            role,
+            skillId,
+            requireEnabled: true,
+        });
+
+        if ("errorCode" in manageableSkill) {
+            return manageableSkill;
+        }
+
+        const skill = await prisma.agentSkill.findFirst({
+            where: {
+                id: manageableSkill.id,
+                ...sharedAgentSkillAuthScope(org.id),
+                enabled: true,
+            },
+        });
+
+        if (!skill) {
+            return skillNotFound();
+        }
+
+        // A synced skill's instructions are only exposed to users who can access
+        // its source repo, even managers.
+        if (!(await canAccessSkillSource(skill, { prisma, orgId: org.id }))) {
+            return skillNotFound();
+        }
+
+        return toAgentSkillListItem(skill);
+    }));
+
+export const createPersonalAgentSkill = async (
+    input: CreatePersonalAgentSkillInput,
+): Promise<AgentSkillListItem | ServiceError> => {
+    const parsed = createPersonalAgentSkillInputSchema.safeParse(input);
+    if (!parsed.success) {
+        return requestBodySchemaValidationError(parsed.error);
+    }
+
+    return sew(() =>
+        withAuth(async ({ org, user, prisma }) => {
+            const askError = await checkAskEntitlement();
+            if (askError) {
+                return askError;
+            }
+
+            const scope = personalAgentSkillScope(user.id, org.id);
+            const { source } = parsed.data;
+
+            try {
+                const skill = await prisma.agentSkill.create({
+                    data: {
+                        ...scope,
+                        slug: parsed.data.slug,
+                        name: parsed.data.name,
+                        description: parsed.data.description,
+                        instructions: parsed.data.instructions,
+                        createdById: user.id,
+                        updatedById: user.id,
+                        // When imported from a repository file, record provenance so the
+                        // skill is a read-only mirror that can be synced against the
+                        // indexed file. sourceBlobSha is the comparison key.
+                        ...(source ? {
+                            sourceRepoName: source.repoName,
+                            sourceFilePath: source.filePath,
+                            sourceRevision: source.revision,
+                            sourceBlobSha: source.blobSha,
+                            sourceImportedAt: new Date(),
+                        } : {}),
+                    },
+                });
+
+                return toAgentSkillListItem(skill);
+            } catch (error) {
+                if (isUniqueConstraintError(error)) {
+                    return skillAlreadyExists(parsed.data.slug);
+                }
+
+                throw error;
+            }
+        }));
+};
+
+export const updatePersonalAgentSkill = async (
+    input: UpdateAgentSkillInput,
+): Promise<AgentSkillListItem | ServiceError> => {
+    const parsed = updateAgentSkillInputSchema.safeParse(input);
+    if (!parsed.success) {
+        return requestBodySchemaValidationError(parsed.error);
+    }
+
+    return sew(() =>
+        withAuth(async ({ org, user, prisma }) => {
+            const askError = await checkAskEntitlement();
+            if (askError) {
+                return askError;
+            }
+
+            const scope = personalAgentSkillAuthScope(user.id, org.id);
+            const existingSkill = await prisma.agentSkill.findFirst({
+                where: {
+                    id: parsed.data.id,
+                    ...scope,
+                },
+                select: { id: true, sourceRepoName: true },
+            });
+
+            if (!existingSkill) {
+                return skillNotFound();
+            }
+
+            // For skills imported from a repository, the description and instructions
+            // stay synced with the source file (refreshed via
+            // updatePersonalAgentSkillFromSource), so only the local labels — name and
+            // command — are editable here. Content changes from the client are ignored.
+            const isSynced = existingSkill.sourceRepoName !== null;
+
+            try {
+                const skill = await prisma.agentSkill.update({
+                    where: { id: existingSkill.id },
+                    data: isSynced
+                        ? {
+                            slug: parsed.data.slug,
+                            name: parsed.data.name,
+                            updatedById: user.id,
+                        }
+                        : {
+                            slug: parsed.data.slug,
+                            name: parsed.data.name,
+                            description: parsed.data.description,
+                            instructions: parsed.data.instructions,
+                            updatedById: user.id,
+                        },
+                });
+
+                return toAgentSkillListItem(skill);
+            } catch (error) {
+                if (isUniqueConstraintError(error)) {
+                    return skillAlreadyExists(parsed.data.slug);
+                }
+
+                throw error;
+            }
+        }));
+};
+
+type SourceFreshnessContext = { org: Org; prisma: PrismaClient };
+
+// Compares a synced skill's stored blob OID against the current one in the indexed
+// repo. Repo access goes through the user-scoped prisma, so a caller who cannot see
+// the source repo degrades to repo_unavailable rather than leaking the file.
+const resolveSourceStatus = async (
+    skill: Pick<AgentSkill, "sourceRepoName" | "sourceFilePath" | "sourceRevision" | "sourceBlobSha">,
+    context: SourceFreshnessContext,
+): Promise<{ status: AgentSkillSourceStatus } | ServiceError> => {
+    if (!skill.sourceRepoName || !skill.sourceFilePath || !skill.sourceRevision || !skill.sourceBlobSha) {
+        return { status: "not_synced" };
+    }
+
+    const currentSha = await resolveFileBlobShaForRepo(
+        { path: skill.sourceFilePath, repo: skill.sourceRepoName, ref: skill.sourceRevision },
+        context,
+    );
+
+    if (isServiceError(currentSha)) {
+        if (currentSha.errorCode === ErrorCode.NOT_FOUND) {
+            return { status: "repo_unavailable" };
+        }
+        if (currentSha.errorCode === ErrorCode.UNEXPECTED_ERROR) {
+            return currentSha;
+        }
+        // File renamed/deleted, or the imported ref no longer resolves it.
+        return { status: "source_missing" };
+    }
+
+    return { status: currentSha === skill.sourceBlobSha ? "in_sync" : "update_available" };
+};
+
+// Re-reads a synced skill's source file and validates the refreshed content against
+// its preserved labels, returning the columns to write. The name and slug are local
+// labels (passed in, never overwritten); only description, instructions, and the
+// blob OID come from the file.
+const buildSourceRefreshData = async (
+    skill: Pick<AgentSkill, "name" | "slug" | "sourceRepoName" | "sourceFilePath" | "sourceRevision">,
+    context: SourceFreshnessContext,
+): Promise<{ description: string; instructions: string; sourceBlobSha: string } | ServiceError> => {
+    if (!skill.sourceRepoName || !skill.sourceFilePath || !skill.sourceRevision) {
+        return skillNotSynced();
+    }
+
+    const fileResult = await getFileSourceForRepo(
+        { path: skill.sourceFilePath, repo: skill.sourceRepoName, ref: skill.sourceRevision },
+        context,
+    );
+
+    if (isServiceError(fileResult)) {
+        return fileResult;
+    }
+
+    if (!fileResult.blobSha) {
+        return unexpectedError("Could not determine the source file version.");
+    }
+
+    const fileName = skill.sourceFilePath.split("/").pop();
+    const parsedMarkdown = parseAgentSkillMarkdown(fileResult.source, fileName);
+
+    const candidate = agentSkillInputSchema.safeParse({
+        name: skill.name,
+        slug: skill.slug,
+        description: parsedMarkdown.description ?? "",
+        instructions: parsedMarkdown.instructions,
+    });
+
+    if (!candidate.success) {
+        return skillSourceInvalid();
+    }
+
+    return {
+        description: candidate.data.description,
+        instructions: candidate.data.instructions,
+        sourceBlobSha: fileResult.blobSha,
+    };
+};
+
+// Reports whether a synced skill's source file has changed since import. Read-only,
+// so it accepts either the caller's own personal skill or any shared skill visible
+// in the org; repo access stays user-scoped (see resolveSourceStatus).
+export const getAgentSkillSourceStatus = async (
+    skillId: string,
+): Promise<{ status: AgentSkillSourceStatus } | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const skill = await prisma.agentSkill.findFirst({
+            where: {
+                id: skillId,
+                OR: [
+                    personalAgentSkillAuthScope(user.id, org.id),
+                    { ...sharedAgentSkillAuthScope(org.id), enabled: true },
+                ],
+            },
+            select: {
+                sourceRepoName: true,
+                sourceFilePath: true,
+                sourceRevision: true,
+                sourceBlobSha: true,
+            },
+        });
+
+        if (!skill) {
+            return skillNotFound();
+        }
+
+        return resolveSourceStatus(skill, { org, prisma });
+    }));
+
+// Re-imports a synced personal skill's content from its source file, refreshing
+// description/instructions and the stored blob OID. Name and slug are preserved so
+// the skill's label and /command stay stable.
+export const updatePersonalAgentSkillFromSource = async (
+    skillId: string,
+): Promise<AgentSkillListItem | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const skill = await prisma.agentSkill.findFirst({
+            where: {
+                id: skillId,
+                ...personalAgentSkillAuthScope(user.id, org.id),
+            },
+            select: {
+                id: true,
+                name: true,
+                slug: true,
+                sourceRepoName: true,
+                sourceFilePath: true,
+                sourceRevision: true,
+            },
+        });
+
+        if (!skill) {
+            return skillNotFound();
+        }
+
+        const refresh = await buildSourceRefreshData(skill, { org, prisma });
+        if (isServiceError(refresh)) {
+            return refresh;
+        }
+
+        const updated = await prisma.agentSkill.update({
+            where: { id: skill.id },
+            data: {
+                description: refresh.description,
+                instructions: refresh.instructions,
+                sourceBlobSha: refresh.sourceBlobSha,
+                sourceImportedAt: new Date(),
+                updatedById: user.id,
+            },
+        });
+
+        return toAgentSkillListItem(updated);
+    }));
+
+// Re-imports a synced shared skill's content from its source file. Restricted to the
+// skill's author or an org owner, since the refresh updates the org-wide command for
+// everyone who has it enabled.
+export const updateSharedAgentSkillFromSource = async (
+    skillId: string,
+): Promise<SharedAgentSkillCatalogItem | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, role, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const manageable = await requireManageableSharedSkill({
+            prisma,
+            orgId: org.id,
+            userId: user.id,
+            role,
+            skillId,
+            requireEnabled: true,
+        });
+
+        if ("errorCode" in manageable) {
+            return manageable;
+        }
+
+        const skill = await prisma.agentSkill.findFirst({
+            where: {
+                id: manageable.id,
+                ...sharedAgentSkillAuthScope(org.id),
+                enabled: true,
+            },
+            select: {
+                id: true,
+                name: true,
+                slug: true,
+                sourceRepoName: true,
+                sourceFilePath: true,
+                sourceRevision: true,
+            },
+        });
+
+        if (!skill) {
+            return skillNotFound();
+        }
+
+        const refresh = await buildSourceRefreshData(skill, { org, prisma });
+        if (isServiceError(refresh)) {
+            return refresh;
+        }
+
+        const updated = await prisma.agentSkill.update({
+            where: { id: skill.id },
+            data: {
+                description: refresh.description,
+                instructions: refresh.instructions,
+                sourceBlobSha: refresh.sourceBlobSha,
+                sourceImportedAt: new Date(),
+                updatedById: user.id,
+            },
+            select: sharedCatalogSkillSelect(user.id, org.id),
+        });
+
+        return toSharedAgentSkillCatalogItem(updated, user.id);
+    }));
+
+export const deletePersonalAgentSkill = async (
+    skillId: string,
+): Promise<{ success: true } | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const result = await prisma.agentSkill.deleteMany({
+            where: {
+                id: skillId,
+                ...personalAgentSkillAuthScope(user.id, org.id),
+            },
+        });
+
+        if (result.count === 0) {
+            return skillNotFound();
+        }
+
+        return { success: true };
+    }));
+
+export const publishPersonalAgentSkillToShared = async (
+    skillId: string,
+): Promise<SharedAgentSkillCatalogItem | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const personalSkill = await prisma.agentSkill.findFirst({
+            where: {
+                id: skillId,
+                ...personalAgentSkillAuthScope(user.id, org.id),
+            },
+            select: {
+                slug: true,
+                name: true,
+                description: true,
+                instructions: true,
+                sourceRepoName: true,
+                sourceFilePath: true,
+                sourceRevision: true,
+                sourceBlobSha: true,
+                sourceImportedAt: true,
+            },
+        });
+
+        if (!personalSkill) {
+            return skillNotFound();
+        }
+
+        try {
+            const sharedSkill = await prisma.$transaction(async (tx) => {
+                const createdSkill = await tx.agentSkill.create({
+                    data: sharedSkillCreateDataForUser({
+                        orgId: org.id,
+                        userId: user.id,
+                        skill: personalSkill,
+                        source: personalSkill,
+                    }),
+                    select: {
+                        id: true,
+                    },
+                });
+
+                await tx.agentSkill.delete({
+                    where: {
+                        id: skillId,
+                    },
+                });
+
+                const selectedSkill = await tx.agentSkill.findFirst({
+                    where: {
+                        id: createdSkill.id,
+                        ...sharedAgentSkillAuthScope(org.id),
+                    },
+                    select: sharedCatalogSkillSelect(user.id, org.id),
+                });
+
+                if (!selectedSkill) {
+                    throw new Error("Created shared skill was not found.");
+                }
+
+                return selectedSkill;
+            });
+
+            return toSharedAgentSkillCatalogItem(sharedSkill, user.id);
+        } catch (error) {
+            if (isUniqueConstraintError(error)) {
+                return skillAlreadyExists(personalSkill.slug);
+            }
+
+            throw error;
+        }
+    }));
+
+export const makeSharedAgentSkillPersonal = async (
+    skillId: string,
+): Promise<AgentSkillListItem | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, role, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const sharedSkill = await prisma.agentSkill.findFirst({
+            where: {
+                id: skillId,
+                ...sharedAgentSkillAuthScope(org.id),
+                enabled: true,
+            },
+            select: {
+                id: true,
+                slug: true,
+                name: true,
+                description: true,
+                instructions: true,
+                createdById: true,
+                autoEnrolled: true,
+                sourceRepoName: true,
+                sourceFilePath: true,
+                sourceRevision: true,
+                sourceBlobSha: true,
+                sourceImportedAt: true,
+            },
+        });
+
+        if (!sharedSkill) {
+            return skillNotFound();
+        }
+
+        if (!canManageSharedSkill(sharedSkill, user.id, role)) {
+            const visibleSkill = await prisma.agentSkill.findFirst({
+                where: {
+                    id: skillId,
+                    ...sharedAgentSkillVisibleToUserWhere(user.id, org.id),
+                },
+                select: {
+                    id: true,
+                },
+            });
+
+            if (!visibleSkill) {
+                return insufficientSkillPermissions();
+            }
+        }
+
+        try {
+            const personalSkill = await prisma.$transaction(async (tx) => {
+                const createdSkill = await tx.agentSkill.create({
+                    data: {
+                        ...personalAgentSkillScope(user.id, org.id),
+                        slug: sharedSkill.slug,
+                        name: sharedSkill.name,
+                        description: sharedSkill.description,
+                        instructions: sharedSkill.instructions,
+                        createdById: user.id,
+                        updatedById: user.id,
+                        // Preserve the repository link so a synced skill stays
+                        // synced when pulled back to personal.
+                        ...sourceColumnsCarryOver(sharedSkill),
+                    },
+                });
+
+                if (sharedSkill.createdById === user.id) {
+                    await tx.agentSkill.delete({
+                        where: {
+                            id: sharedSkill.id,
+                        },
+                    });
+                } else {
+                    await removeSharedSkillForUser({
+                        prisma: tx,
+                        orgId: org.id,
+                        userId: user.id,
+                        skill: sharedSkill,
+                    });
+                }
+
+                return createdSkill;
+            });
+
+            return toAgentSkillListItem(personalSkill);
+        } catch (error) {
+            if (isUniqueConstraintError(error)) {
+                return skillAlreadyExists(sharedSkill.slug);
+            }
+
+            throw error;
+        }
+    }));
+
+export const listSharedAgentSkillCatalog = async (): Promise<SharedAgentSkillCatalogItem[] | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const skills = await prisma.agentSkill.findMany({
+            where: {
+                ...sharedAgentSkillAuthScope(org.id),
+                enabled: true,
+            },
+            orderBy: agentSkillOrderBy,
+            select: sharedCatalogSkillSelect(user.id, org.id),
+        });
+
+        // Hide shared skills synced from a repo the user can't access, so their
+        // instructions are not exposed org-wide. (Owners retain a management path
+        // via listSharedAgentSkillManagement, which carries no instructions.)
+        const accessibleSkills = await filterSkillsBySourceRepoAccess(skills, { prisma, orgId: org.id });
+
+        return accessibleSkills.map((skill) => toSharedAgentSkillCatalogItem(skill, user.id));
+    }));
+
+export const listSharedAgentSkillManagement = async (): Promise<SharedAgentSkillManagementItem[] | ServiceError> => sew(() =>
+    withAuth(async ({ org, role, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        return withMinimumOrgRole(role, OrgRole.OWNER, async () => {
+            const skills = await prisma.agentSkill.findMany({
+                where: {
+                    ...sharedAgentSkillAuthScope(org.id),
+                    enabled: true,
+                },
+                orderBy: agentSkillOrderBy,
+                select: sharedManagementSkillSelect,
+            });
+
+            return skills.map(toSharedAgentSkillManagementItem);
+        });
+    }));
+
+export const listSharedAgentSkillCommands = async (): Promise<AskCommandDefinition[] | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        return listSharedAgentSkillCommandsForContext({ prisma, userId: user.id, orgId: org.id });
+    }));
+
+export const listAgentSkillCommands = async (): Promise<AskCommandDefinition[] | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const [personalCommands, sharedCommands] = await Promise.all([
+            listPersonalAgentSkillCommandsForContext({ prisma, userId: user.id, orgId: org.id }),
+            listSharedAgentSkillCommandsForContext({ prisma, userId: user.id, orgId: org.id }),
+        ]);
+
+        return [
+            ...personalCommands,
+            ...sharedCommands,
+        ];
+    }));
+
+export const createSharedAgentSkill = async (
+    input: AgentSkillInput,
+): Promise<AgentSkillListItem | ServiceError> => {
+    const parsed = agentSkillInputSchema.safeParse(input);
+    if (!parsed.success) {
+        return requestBodySchemaValidationError(parsed.error);
+    }
+
+    return sew(() =>
+        withAuth(async ({ org, user, prisma }) => {
+            const askError = await checkAskEntitlement();
+            if (askError) {
+                return askError;
+            }
+
+            try {
+                const skill = await prisma.$transaction(async (tx) => {
+                    return createSharedSkillForUser({
+                        prisma: tx,
+                        orgId: org.id,
+                        userId: user.id,
+                        skill: parsed.data,
+                    });
+                });
+
+                return toAgentSkillListItem(skill);
+            } catch (error) {
+                if (isUniqueConstraintError(error)) {
+                    return skillAlreadyExists(parsed.data.slug);
+                }
+
+                throw error;
+            }
+        }));
+};
+
+export const updateSharedAgentSkill = async (
+    input: UpdateAgentSkillInput,
+): Promise<AgentSkillListItem | ServiceError> => {
+    const parsed = updateAgentSkillInputSchema.safeParse(input);
+    if (!parsed.success) {
+        return requestBodySchemaValidationError(parsed.error);
+    }
+
+    return sew(() =>
+        withAuth(async ({ org, user, role, prisma }) => {
+            const askError = await checkAskEntitlement();
+            if (askError) {
+                return askError;
+            }
+
+            const existingSkill = await requireManageableSharedSkill({
+                prisma,
+                orgId: org.id,
+                userId: user.id,
+                role,
+                skillId: parsed.data.id,
+                requireEnabled: true,
+            });
+
+            if ("errorCode" in existingSkill) {
+                return existingSkill;
+            }
+
+            // As with personal skills, a synced skill's description and
+            // instructions track the source file, so only its name and command are
+            // editable here; content changes from the client are ignored.
+            const isSynced = existingSkill.sourceRepoName !== null;
+
+            try {
+                const skill = await prisma.agentSkill.update({
+                    where: { id: existingSkill.id },
+                    data: isSynced
+                        ? {
+                            slug: parsed.data.slug,
+                            name: parsed.data.name,
+                            updatedById: user.id,
+                        }
+                        : {
+                            slug: parsed.data.slug,
+                            name: parsed.data.name,
+                            description: parsed.data.description,
+                            instructions: parsed.data.instructions,
+                            updatedById: user.id,
+                        },
+                });
+
+                return toAgentSkillListItem(skill);
+            } catch (error) {
+                if (isUniqueConstraintError(error)) {
+                    return skillAlreadyExists(parsed.data.slug);
+                }
+
+                throw error;
+            }
+        }));
+};
+
+export const deleteSharedAgentSkill = async (
+    skillId: string,
+): Promise<{ success: true } | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, role, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const existingSkill = await requireManageableSharedSkill({
+            prisma,
+            orgId: org.id,
+            userId: user.id,
+            role,
+            skillId,
+            requireEnabled: true,
+        });
+
+        if ("errorCode" in existingSkill) {
+            return existingSkill;
+        }
+
+        await prisma.agentSkill.delete({
+            where: { id: existingSkill.id },
+        });
+
+        return { success: true };
+    }));
+
+export const setSharedSkillFlag = async (
+    input: SharedSkillFlagInput,
+): Promise<SharedAgentSkillManagementItem | ServiceError> => {
+    const parsed = sharedSkillFlagInputSchema.safeParse(input);
+    if (!parsed.success) {
+        return requestBodySchemaValidationError(parsed.error);
+    }
+
+    const { skillId, data } = parsed.data;
+
+    return sew(() =>
+        withAuth(async ({ org, user, role, prisma }) => {
+            const askError = await checkAskEntitlement();
+            if (askError) {
+                return askError;
+            }
+
+            return withMinimumOrgRole(role, OrgRole.OWNER, async () => {
+                const existingSkill = await prisma.agentSkill.findFirst({
+                    where: {
+                        id: skillId,
+                        ...sharedAgentSkillAuthScope(org.id),
+                    },
+                    select: {
+                        id: true,
+                    },
+                });
+
+                if (!existingSkill) {
+                    return skillNotFound();
+                }
+
+                const skill = await prisma.agentSkill.update({
+                    where: { id: existingSkill.id },
+                    data: {
+                        ...data,
+                        updatedById: user.id,
+                    },
+                    select: sharedManagementSkillSelect,
+                });
+
+                return toSharedAgentSkillManagementItem(skill);
+            });
+        }));
+};
+
+export const adoptSharedSkill = async (
+    skillId: string,
+): Promise<{ success: true } | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const skill = await prisma.agentSkill.findFirst({
+            where: {
+                id: skillId,
+                ...sharedAgentSkillAuthScope(org.id),
+                enabled: true,
+            },
+            select: {
+                id: true,
+                sourceRepoName: true,
+            },
+        });
+
+        if (!skill) {
+            return skillNotFound();
+        }
+
+        // Don't let a user enable a skill synced from a repo they can't access.
+        if (!(await canAccessSkillSource(skill, { prisma, orgId: org.id }))) {
+            return skillNotFound();
+        }
+
+        await prisma.agentSkillAdoption.upsert({
+            where: {
+                orgId_userId_agentSkillId: {
+                    orgId: org.id,
+                    userId: user.id,
+                    agentSkillId: skill.id,
+                },
+            },
+            create: {
+                orgId: org.id,
+                userId: user.id,
+                agentSkillId: skill.id,
+                removedAt: null,
+            },
+            update: {
+                removedAt: null,
+            },
+        });
+
+        return { success: true };
+    }));
+
+export const unadoptSharedSkill = async (
+    skillId: string,
+): Promise<{ success: true } | ServiceError> => sew(() =>
+    withAuth(async ({ org, user, prisma }) => {
+        const askError = await checkAskEntitlement();
+        if (askError) {
+            return askError;
+        }
+
+        const skill = await prisma.agentSkill.findFirst({
+            where: {
+                id: skillId,
+                ...sharedAgentSkillAuthScope(org.id),
+            },
+            select: {
+                id: true,
+                autoEnrolled: true,
+            },
+        });
+
+        if (!skill) {
+            return skillNotFound();
+        }
+
+        await removeSharedSkillForUser({
+            prisma,
+            orgId: org.id,
+            userId: user.id,
+            skill,
+        });
+
+        return { success: true };
+    }));
diff --git a/packages/web/src/ee/features/chat/skills/commandCatalog.ts b/packages/web/src/ee/features/chat/skills/commandCatalog.ts
new file mode 100644
index 000000000..edfb534e5
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/commandCatalog.ts
@@ -0,0 +1,119 @@
+import {
+    sharedAgentSkillVisibleToUserWhere,
+    personalAgentSkillAuthScope,
+    type Prisma,
+    type PrismaClient,
+} from "@sourcebot/db";
+import {
+    ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+    ASK_COMMAND_SOURCE_SHARED_SKILL,
+    type AskCommandDefinition,
+} from "@/features/chat/commands/types";
+import { agentSkillOrderBy } from "./types";
+import { filterSkillsBySourceRepoAccess } from "./sourceRepoAccess";
+
+// Display labels for where a skill command originates. Shared by the manual
+// slash-command catalog (the listAgentSkillCommands actions) and the
+// auto-invocation catalog (buildSkillRegistry) so both surface a skill's source
+// identically.
+export const PERSONAL_SKILL_SOURCE_LABEL = "Personal";
+export const SHARED_SKILL_SOURCE_LABEL = "Shared";
+
+export const sourceLabelForSkillSourceId = (sourceId: string): string =>
+    sourceId === ASK_COMMAND_SOURCE_SHARED_SKILL ? SHARED_SKILL_SOURCE_LABEL : PERSONAL_SKILL_SOURCE_LABEL;
+
+// The minimal columns needed to build an AskCommandDefinition. Instructions are
+// loaded on demand (manual: at materialization; auto: at load_skill), never in
+// the catalog the model sees. sourceRepoName is selected only to apply the
+// source-repo access gate; it is not surfaced in the command definition.
+const agentSkillCommandSelect = {
+    id: true,
+    slug: true,
+    name: true,
+    description: true,
+    sourceRepoName: true,
+} satisfies Prisma.AgentSkillSelect;
+
+type AgentSkillCommandRow = {
+    id: string;
+    slug: string;
+    name: string;
+    description: string;
+    sourceRepoName: string | null;
+};
+
+export const toAskCommandDefinition = (
+    skill: AgentSkillCommandRow,
+    sourceId: string,
+    sourceLabel: string,
+): AskCommandDefinition => ({
+    id: skill.id,
+    sourceId,
+    sourceLabel,
+    slug: skill.slug,
+    name: skill.name,
+    description: skill.description,
+});
+
+/**
+ * Lists the requester's personal skills (scoped to the current org) as
+ * slash-command definitions. The manual and auto catalogs share this query,
+ * select, ordering, and mapping so they can never drift.
+ */
+export const listPersonalAgentSkillCommandsForContext = async ({
+    prisma,
+    userId,
+    orgId,
+}: {
+    prisma: PrismaClient;
+    userId: string;
+    orgId: number;
+}): Promise<AskCommandDefinition[]> => {
+    const skills = await prisma.agentSkill.findMany({
+        where: {
+            ...personalAgentSkillAuthScope(userId, orgId),
+            enabled: true,
+        },
+        orderBy: agentSkillOrderBy,
+        select: agentSkillCommandSelect,
+    });
+
+    const accessibleSkills = await filterSkillsBySourceRepoAccess(skills, { prisma, orgId });
+
+    return accessibleSkills.map((skill) => toAskCommandDefinition(
+        skill,
+        ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+        PERSONAL_SKILL_SOURCE_LABEL,
+    ));
+};
+
+/**
+ * Lists the shared skills visible to the requester as slash-command definitions,
+ * applying the shared-visibility clause (enabled + adopted/auto-enrolled +
+ * not-removed). See {@link listPersonalAgentSkillCommandsForContext}.
+ */
+export const listSharedAgentSkillCommandsForContext = async ({
+    prisma,
+    userId,
+    orgId,
+}: {
+    prisma: PrismaClient;
+    userId: string;
+    orgId: number;
+}): Promise<AskCommandDefinition[]> => {
+    const skills = await prisma.agentSkill.findMany({
+        where: {
+            ...sharedAgentSkillVisibleToUserWhere(userId, orgId),
+        },
+        orderBy: agentSkillOrderBy,
+        select: agentSkillCommandSelect,
+    });
+
+    const accessibleSkills = await filterSkillsBySourceRepoAccess(skills, { prisma, orgId });
+
+    return accessibleSkills.map((skill) => toAskCommandDefinition(
+        skill,
+        ASK_COMMAND_SOURCE_SHARED_SKILL,
+        SHARED_SKILL_SOURCE_LABEL,
+    ));
+};
diff --git a/packages/web/src/ee/features/chat/skills/commandResolution.test.ts b/packages/web/src/ee/features/chat/skills/commandResolution.test.ts
new file mode 100644
index 000000000..14d6a5aff
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/commandResolution.test.ts
@@ -0,0 +1,481 @@
+import { describe, expect, test, vi } from "vitest";
+
+// commandResolution is guarded with `import 'server-only'` and imports
+// captureEvent from @/lib/posthog (a server-only module). Stub both so the
+// suite can import the module under test in vitest's node environment.
+vi.mock("server-only", () => ({ default: vi.fn() }));
+vi.mock("@/lib/posthog", () => ({ captureEvent: vi.fn() }));
+
+import { ASK_COMMAND_SOURCE_SHARED_SKILL, ASK_COMMAND_SOURCE_PERSONAL_SKILL } from "@/features/chat/commands/types";
+import type { FileSource, SBChatMessage } from "@/features/chat/types";
+import { getFileSourcesFromText, getUserMessageModelText, materializeCommandMessageText, materializeCommandMessageTexts } from "./commandResolution";
+
+const createCommandMessage = (
+    visibleText: string,
+    expandedText?: string,
+    overrides: Partial<{
+        id: string;
+        commandId: string;
+        sourceId: string;
+        sources: FileSource[];
+    }> = {},
+): SBChatMessage => ({
+    id: overrides.id ?? "message-1",
+    role: "user",
+    parts: [
+        {
+            type: "text",
+            text: `/translate ${visibleText}`,
+        },
+        {
+            type: "data-command",
+            data: {
+                type: "command",
+                commandId: overrides.commandId ?? "skill-1",
+                sourceId: overrides.sourceId ?? ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+                slug: "translate",
+                name: "Translate",
+                ...(expandedText !== undefined ? { expandedText } : {}),
+            },
+        },
+        ...(overrides.sources ?? []).map((source) => ({
+            type: "data-source" as const,
+            data: source,
+        })),
+    ],
+});
+
+describe("getFileSourcesFromText", () => {
+    test("extracts and dedupes canonical file references", () => {
+        expect(getFileSourcesFromText(
+            "Read @file:{github.com/sourcebot-dev/sourcebot::packages/web/src/auth.ts} and @file:{github.com/sourcebot-dev/sourcebot::packages/web/src/auth.ts}.",
+        )).toEqual([
+            {
+                type: "file",
+                repo: "github.com/sourcebot-dev/sourcebot",
+                path: "packages/web/src/auth.ts",
+                name: "auth.ts",
+                revision: "HEAD",
+            },
+        ]);
+    });
+});
+
+describe("getUserMessageModelText", () => {
+    test("uses persisted expanded text for the model", () => {
+        expect(getUserMessageModelText(
+            createCommandMessage("hello French", "Translate the most recent message into French."),
+        )).toBe("Translate the most recent message into French.");
+    });
+
+    test("falls back to visible text when no expanded text is materialized", () => {
+        expect(getUserMessageModelText(createCommandMessage("hello French"))).toBe("/translate hello French");
+    });
+});
+
+describe("materializeCommandMessageText", () => {
+    test("materializes expanded text into the command part", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockResolvedValue([{
+                    id: "skill-1",
+                    instructions: "Translate the most recent message into French.",
+                }]),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage("hello French"),
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(message.parts).toContainEqual({
+            type: "data-command",
+            data: {
+                type: "command",
+                commandId: "skill-1",
+                sourceId: ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+                slug: "translate",
+                name: "Translate",
+                expandedText: "Translate the most recent message into French.",
+            },
+        });
+        expect(prisma.agentSkill.findMany).toHaveBeenCalledWith({
+            where: {
+                id: { in: ["skill-1"] },
+                visibility: "PERSONAL",
+                scopeId: "user-1",
+                orgId: 7,
+                createdById: "user-1",
+                enabled: true,
+            },
+            select: {
+                id: true,
+                instructions: true,
+                sourceRepoName: true,
+            },
+        });
+    });
+
+    test("adds file sources from materialized skill instructions", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockResolvedValue([{
+                    id: "skill-1",
+                    instructions: "Review @file:{github.com/sourcebot-dev/sourcebot::packages/web/src/auth.ts}.",
+                }]),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage("session"),
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(message.parts).toContainEqual({
+            type: "data-source",
+            data: {
+                type: "file",
+                repo: "github.com/sourcebot-dev/sourcebot",
+                path: "packages/web/src/auth.ts",
+                name: "auth.ts",
+                revision: "HEAD",
+            },
+        });
+        expect(getUserMessageModelText(message)).toBe("Review @file:{github.com/sourcebot-dev/sourcebot::packages/web/src/auth.ts}.");
+    });
+
+    test("does not duplicate file sources already present on the message", async () => {
+        const existingSource = {
+            type: "file",
+            repo: "github.com/sourcebot-dev/sourcebot",
+            path: "packages/web/src/auth.ts",
+            name: "auth.ts",
+            revision: "HEAD",
+        } satisfies FileSource;
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockResolvedValue([{
+                    id: "skill-1",
+                    instructions: "Review @file:{github.com/sourcebot-dev/sourcebot::packages/web/src/auth.ts}.",
+                }]),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage("", undefined, { sources: [existingSource] }),
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(message.parts.filter((part) => part.type === "data-source")).toEqual([
+            {
+                type: "data-source",
+                data: existingSource,
+            },
+        ]);
+    });
+
+    test("does not rematerialize an existing expanded text snapshot", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn(),
+            },
+        };
+        const originalMessage = createCommandMessage("hello French", "Saved expansion.");
+
+        const message = await materializeCommandMessageText({
+            message: originalMessage,
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(message).toBe(originalMessage);
+        expect(prisma.agentSkill.findMany).not.toHaveBeenCalled();
+    });
+
+    test("adds file sources from an existing expanded text snapshot without querying", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn(),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage(
+                "session handling",
+                "Review @file:{github.com/sourcebot-dev/sourcebot::packages/web/src/auth.ts}.",
+            ),
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(prisma.agentSkill.findMany).not.toHaveBeenCalled();
+        expect(message.parts).toContainEqual({
+            type: "data-source",
+            data: {
+                type: "file",
+                repo: "github.com/sourcebot-dev/sourcebot",
+                path: "packages/web/src/auth.ts",
+                name: "auth.ts",
+                revision: "HEAD",
+            },
+        });
+    });
+
+    test("falls back to visible text when the skill is not accessible", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockResolvedValue([]),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage("hello French"),
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(getUserMessageModelText(message)).toBe("/translate hello French");
+    });
+
+    test("materializes adopted shared skills within the active org", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockResolvedValue([{
+                    id: "shared-skill-1",
+                    instructions: "Explain the most recent message using the team style guide.",
+                }]),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage("decorators", undefined, {
+                commandId: "shared-skill-1",
+                sourceId: ASK_COMMAND_SOURCE_SHARED_SKILL,
+            }),
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(prisma.agentSkill.findMany).toHaveBeenCalledWith({
+            where: {
+                id: { in: ["shared-skill-1"] },
+                visibility: "SHARED",
+                scopeId: "7",
+                orgId: 7,
+                enabled: true,
+                AND: [
+                    {
+                        OR: [
+                            { autoEnrolled: true },
+                            {
+                                adoptions: {
+                                    some: {
+                                        userId: "user-1",
+                                        orgId: 7,
+                                        removedAt: null,
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        NOT: {
+                            adoptions: {
+                                some: {
+                                    userId: "user-1",
+                                    orgId: 7,
+                                    removedAt: {
+                                        not: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                ],
+            },
+            select: {
+                id: true,
+                instructions: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(getUserMessageModelText(message)).toBe("Explain the most recent message using the team style guide.");
+    });
+
+    test("falls back to literal text when a shared command is synced from an inaccessible repo", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockResolvedValue([{
+                    id: "shared-skill-1",
+                    instructions: "Explain using the team style guide.",
+                    sourceRepoName: "github.com/acme/secret",
+                }]),
+            },
+            // The user-scoped repo lookup returns nothing → repo not visible.
+            repo: {
+                findMany: vi.fn().mockResolvedValue([]),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage("decorators", undefined, {
+                commandId: "shared-skill-1",
+                sourceId: ASK_COMMAND_SOURCE_SHARED_SKILL,
+            }),
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        // The synced skill is dropped by the repo-access gate, so the command keeps
+        // its literal text instead of injecting the (inaccessible) instructions.
+        expect(getUserMessageModelText(message)).toBe("/translate decorators");
+        expect(prisma.repo.findMany).toHaveBeenCalledWith({
+            where: { name: { in: ["github.com/acme/secret"] }, orgId: 7 },
+            select: { name: true },
+        });
+    });
+
+    test("does not materialize a shared skill that is neither adopted nor auto-enrolled", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockResolvedValue([]),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage("decorators", undefined, {
+                commandId: "shared-skill-1",
+                sourceId: ASK_COMMAND_SOURCE_SHARED_SKILL,
+            }),
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(getUserMessageModelText(message)).toBe("/translate decorators");
+    });
+
+    test("does not query and falls back to visible text without a user", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn(),
+            },
+        };
+
+        const message = await materializeCommandMessageText({
+            message: createCommandMessage("hello French"),
+            prisma: prisma as never,
+            userId: undefined,
+            orgId: 7,
+        });
+
+        expect(prisma.agentSkill.findMany).not.toHaveBeenCalled();
+        expect(getUserMessageModelText(message)).toBe("/translate hello French");
+    });
+});
+
+describe("materializeCommandMessageTexts", () => {
+    test("batch-resolves unresolved command messages with one query", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockResolvedValue([
+                    {
+                        id: "skill-1",
+                        instructions: "Translate the most recent message into French.",
+                    },
+                    {
+                        id: "skill-2",
+                        instructions: "Generate a Python tutorial about decorators.",
+                    },
+                ]),
+            },
+        };
+
+        const messages = await materializeCommandMessageTexts({
+            messages: [
+                createCommandMessage("hello French", undefined, { id: "message-1", commandId: "skill-1" }),
+                createCommandMessage("Python decorators", undefined, { id: "message-2", commandId: "skill-2" }),
+            ],
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(prisma.agentSkill.findMany).toHaveBeenCalledTimes(1);
+        expect(prisma.agentSkill.findMany).toHaveBeenCalledWith({
+            where: {
+                id: { in: ["skill-1", "skill-2"] },
+                visibility: "PERSONAL",
+                scopeId: "user-1",
+                orgId: 7,
+                createdById: "user-1",
+                enabled: true,
+            },
+            select: {
+                id: true,
+                instructions: true,
+                sourceRepoName: true,
+            },
+        });
+        expect(messages.map(getUserMessageModelText)).toEqual([
+            "Translate the most recent message into French.",
+            "Generate a Python tutorial about decorators.",
+        ]);
+    });
+
+    test("resolves personal and shared skills that share a command id without collision", async () => {
+        const prisma = {
+            agentSkill: {
+                findMany: vi.fn().mockImplementation(async ({ where }) => {
+                    if (where.visibility === "PERSONAL") {
+                        return [{
+                            id: "skill-1",
+                            instructions: "Personal translation skill.",
+                        }];
+                    }
+
+                    return [{
+                        id: "skill-1",
+                        instructions: "Shared translation skill.",
+                    }];
+                }),
+            },
+        };
+
+        const messages = await materializeCommandMessageTexts({
+            messages: [
+                createCommandMessage("hello", undefined, {
+                    id: "message-1",
+                    commandId: "skill-1",
+                    sourceId: ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+                }),
+                createCommandMessage("hello", undefined, {
+                    id: "message-2",
+                    commandId: "skill-1",
+                    sourceId: ASK_COMMAND_SOURCE_SHARED_SKILL,
+                }),
+            ],
+            prisma: prisma as never,
+            userId: "user-1",
+            orgId: 7,
+        });
+
+        expect(prisma.agentSkill.findMany).toHaveBeenCalledTimes(2);
+        expect(messages.map(getUserMessageModelText)).toEqual([
+            "Personal translation skill.",
+            "Shared translation skill.",
+        ]);
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/commandResolution.ts b/packages/web/src/ee/features/chat/skills/commandResolution.ts
new file mode 100644
index 000000000..900f1dfe8
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/commandResolution.ts
@@ -0,0 +1,318 @@
+import 'server-only';
+
+import { captureEvent } from "@/lib/posthog";
+import { buildAskSkillInvokedEvent } from "./skillAnalytics";
+import { ASK_COMMAND_SOURCE_SHARED_SKILL, ASK_COMMAND_SOURCE_PERSONAL_SKILL, commandInvocationDataSchema, type CommandInvocationData } from "@/features/chat/commands/types";
+import { FILE_REFERENCE_REGEX } from "@/features/chat/constants";
+import type { FileSource, SBChatMessage, SBChatMessagePart } from "@/features/chat/types";
+import { sharedAgentSkillVisibleToUserWhere, personalAgentSkillAuthScope, type PrismaClient } from "@sourcebot/db";
+import { filterSkillsBySourceRepoAccess } from "./sourceRepoAccess";
+
+const getTextPartContent = (message: SBChatMessage) =>
+    message.parts.find((part) => part.type === "text")?.text ?? "";
+
+type CommandMessagePart = Extract<SBChatMessagePart, { type: "data-command" }>;
+
+const getCommandPart = (message: SBChatMessage): CommandMessagePart | undefined =>
+    message.parts.find((part): part is CommandMessagePart => part.type === "data-command");
+
+const getCommandInvocation = (message: SBChatMessage) => {
+    const commandPart = getCommandPart(message);
+    if (!commandPart) {
+        return undefined;
+    }
+
+    const parsedCommand = commandInvocationDataSchema.safeParse(commandPart.data);
+    if (!parsedCommand.success) {
+        return undefined;
+    }
+
+    return {
+        commandPart,
+        command: parsedCommand.data,
+        fallbackText: getTextPartContent(message),
+    };
+};
+
+const getMaterializedCommandText = ({
+    command,
+    fallbackText,
+}: {
+    command: CommandInvocationData;
+    fallbackText: string;
+}): string => command.expandedText ?? fallbackText;
+
+const withExpandedCommandText = (
+    message: SBChatMessage,
+    commandPart: CommandMessagePart,
+    command: CommandInvocationData,
+    expandedText: string,
+): SBChatMessage => ({
+    ...message,
+    parts: message.parts.map((part) => {
+        if (part !== commandPart) {
+            return part;
+        }
+
+        return {
+            ...part,
+            data: {
+                ...command,
+                expandedText,
+            },
+        };
+    }),
+});
+
+type ResolvableCommandMessage = {
+    index: number;
+    message: SBChatMessage;
+    commandPart: CommandMessagePart;
+    command: CommandInvocationData;
+    fallbackText: string;
+};
+
+const commandLookupKey = (sourceId: string, commandId: string) => `${sourceId}:${commandId}`;
+
+const getCommandIdsForSource = (
+    resolvableCommands: ResolvableCommandMessage[],
+    sourceId: string,
+) => Array.from(new Set(
+    resolvableCommands
+        .filter(({ command }) => command.sourceId === sourceId)
+        .map(({ command }) => command.commandId)
+));
+
+const DEFAULT_SKILL_FILE_REFERENCE_REVISION = "HEAD";
+
+const getFileSourceKey = (source: Pick<FileSource, "repo" | "path" | "revision">) =>
+    `${source.repo}\0${source.path}\0${source.revision}`;
+
+export const getFileSourcesFromText = (text: string): FileSource[] => {
+    const sources: FileSource[] = [];
+    const seen = new Set<string>();
+
+    FILE_REFERENCE_REGEX.lastIndex = 0;
+    let match: RegExpExecArray | null;
+    while ((match = FILE_REFERENCE_REGEX.exec(text)) !== null) {
+        const [, repo, path] = match;
+        if (!repo || !path) {
+            continue;
+        }
+
+        const source: FileSource = {
+            type: "file",
+            repo,
+            path,
+            name: path.split("/").pop() || path,
+            revision: DEFAULT_SKILL_FILE_REFERENCE_REVISION,
+        };
+        const key = getFileSourceKey(source);
+        if (seen.has(key)) {
+            continue;
+        }
+
+        seen.add(key);
+        sources.push(source);
+    }
+    FILE_REFERENCE_REGEX.lastIndex = 0;
+
+    return sources;
+};
+
+type DataSourceMessagePart = Extract<SBChatMessagePart, { type: "data-source" }>;
+
+const isDataSourceMessagePart = (part: SBChatMessagePart): part is DataSourceMessagePart =>
+    part.type === "data-source";
+
+const withFileSourcesFromMaterializedCommandText = (
+    message: SBChatMessage,
+    expandedText: string,
+): SBChatMessage => {
+    const fileSources = getFileSourcesFromText(expandedText);
+    if (fileSources.length === 0) {
+        return message;
+    }
+
+    const existingSourceKeys = new Set(
+        message.parts
+            .filter(isDataSourceMessagePart)
+            .map((part) => getFileSourceKey(part.data)),
+    );
+    const newSourceParts = fileSources
+        .filter((source) => !existingSourceKeys.has(getFileSourceKey(source)))
+        .map((source): DataSourceMessagePart => ({
+            type: "data-source",
+            data: source,
+        }));
+
+    if (newSourceParts.length === 0) {
+        return message;
+    }
+
+    return {
+        ...message,
+        parts: [...message.parts, ...newSourceParts],
+    };
+};
+
+const withFileSourcesFromExistingMaterializedCommand = (message: SBChatMessage): SBChatMessage => {
+    const invocation = getCommandInvocation(message);
+    if (!invocation || invocation.command.expandedText === undefined) {
+        return message;
+    }
+
+    return withFileSourcesFromMaterializedCommandText(message, invocation.command.expandedText);
+};
+
+export const materializeCommandMessageText = async ({
+    message,
+    prisma,
+    userId,
+    orgId,
+}: {
+    message: SBChatMessage;
+    prisma: PrismaClient;
+    userId?: string;
+    orgId?: number;
+}): Promise<SBChatMessage> => {
+    const [materializedMessage] = await materializeCommandMessageTexts({
+        messages: [message],
+        prisma,
+        userId,
+        orgId,
+    });
+
+    return materializedMessage;
+};
+
+export const materializeCommandMessageTexts = async ({
+    messages,
+    prisma,
+    userId,
+    orgId,
+}: {
+    messages: SBChatMessage[];
+    prisma: PrismaClient;
+    userId?: string;
+    orgId?: number;
+}): Promise<SBChatMessage[]> => {
+    const resolvableCommands = messages
+        .map((message, index): ResolvableCommandMessage | undefined => {
+            if (message.role !== "user") {
+                return undefined;
+            }
+
+            const invocation = getCommandInvocation(message);
+            if (!invocation || invocation.command.expandedText !== undefined) {
+                return undefined;
+            }
+
+            return {
+                index,
+                message,
+                ...invocation,
+            };
+        })
+        .filter((message) => message !== undefined);
+
+    if (resolvableCommands.length === 0) {
+        return messages.map(withFileSourcesFromExistingMaterializedCommand);
+    }
+
+    const personalScope = userId !== undefined && orgId !== undefined
+        ? personalAgentSkillAuthScope(userId, orgId)
+        : undefined;
+    const sharedVisibleWhere = userId !== undefined && orgId !== undefined
+        ? sharedAgentSkillVisibleToUserWhere(userId, orgId)
+        : undefined;
+    const personalSkillCommandIds = getCommandIdsForSource(resolvableCommands, ASK_COMMAND_SOURCE_PERSONAL_SKILL);
+    const sharedSkillCommandIds = getCommandIdsForSource(resolvableCommands, ASK_COMMAND_SOURCE_SHARED_SKILL);
+
+    const [personalSkillsRaw, sharedSkillsRaw] = await Promise.all([
+        personalScope && personalSkillCommandIds.length > 0
+            ? prisma.agentSkill.findMany({
+                where: {
+                    id: { in: personalSkillCommandIds },
+                    ...personalScope,
+                    enabled: true,
+                },
+                select: {
+                    id: true,
+                    instructions: true,
+                    sourceRepoName: true,
+                },
+            })
+            : [],
+        sharedVisibleWhere && sharedSkillCommandIds.length > 0
+            ? prisma.agentSkill.findMany({
+                where: {
+                    id: { in: sharedSkillCommandIds },
+                    ...sharedVisibleWhere,
+                },
+                select: {
+                    id: true,
+                    instructions: true,
+                    sourceRepoName: true,
+                },
+            })
+            : [],
+    ]);
+
+    // Drop skills whose source repo the requester can't access, so an inaccessible
+    // command falls back to its literal text instead of injecting synced
+    // instructions. orgId is defined whenever either query ran (the scopes above
+    // require it), so the arrays are already empty when it isn't.
+    const [personalSkills, sharedSkills] = orgId !== undefined
+        ? await Promise.all([
+            filterSkillsBySourceRepoAccess(personalSkillsRaw, { prisma, orgId }),
+            filterSkillsBySourceRepoAccess(sharedSkillsRaw, { prisma, orgId }),
+        ])
+        : [personalSkillsRaw, sharedSkillsRaw];
+
+    const skillById = new Map([
+        ...personalSkills.map((skill) => [
+            commandLookupKey(ASK_COMMAND_SOURCE_PERSONAL_SKILL, skill.id),
+            skill,
+        ] as const),
+        ...sharedSkills.map((skill) => [
+            commandLookupKey(ASK_COMMAND_SOURCE_SHARED_SKILL, skill.id),
+            skill,
+        ] as const),
+    ]);
+
+    const materializedMessages = [...messages];
+    for (const { index, message, commandPart, command, fallbackText } of resolvableCommands) {
+        const skill = skillById.get(commandLookupKey(command.sourceId, command.commandId));
+        const expandedText = skill
+            ? skill.instructions
+            : fallbackText;
+        materializedMessages[index] = withExpandedCommandText(message, commandPart, command, expandedText);
+
+        // Symmetric observability with auto-invocation (load_skill). Only fires
+        // for newly-materialized commands — already-expanded ones are filtered
+        // out above — so it counts each manual invocation exactly once.
+        if (skill) {
+            void captureEvent('ask_skill_invoked', buildAskSkillInvokedEvent({
+                activationMethod: 'manual',
+                skillId: command.commandId,
+                success: true,
+                slug: command.slug,
+                name: command.name,
+                sourceLabel: command.sourceLabel,
+            }));
+        }
+    }
+
+    return materializedMessages.map(withFileSourcesFromExistingMaterializedCommand);
+};
+
+export const getUserMessageModelText = (message: SBChatMessage): string => {
+    const fallbackText = getTextPartContent(message);
+    const invocation = getCommandInvocation(message);
+    if (!invocation) {
+        return fallbackText;
+    }
+
+    return getMaterializedCommandText(invocation);
+};
diff --git a/packages/web/src/ee/features/chat/skills/commands.server.ts b/packages/web/src/ee/features/chat/skills/commands.server.ts
new file mode 100644
index 000000000..33b821699
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/commands.server.ts
@@ -0,0 +1,33 @@
+import type { AskCommandDefinition } from "@/features/chat/commands/types";
+import { isServiceError } from "@/lib/utils";
+import { listAgentSkillCommands, listSharedAgentSkillCommands, listPersonalAgentSkillCommands } from "./actions";
+
+export const listPersonalAgentSkillCommandsOrEmpty = async (): Promise<AskCommandDefinition[]> => {
+    const commands = await listPersonalAgentSkillCommands();
+    if (isServiceError(commands)) {
+        console.error('Failed to load personal agent skill commands:', commands);
+        return [];
+    }
+
+    return commands;
+}
+
+export const listSharedSkillCommandsOrEmpty = async (): Promise<AskCommandDefinition[]> => {
+    const commands = await listSharedAgentSkillCommands();
+    if (isServiceError(commands)) {
+        console.error('Failed to load shared agent skill commands:', commands);
+        return [];
+    }
+
+    return commands;
+}
+
+export const listAgentSkillCommandsOrEmpty = async (): Promise<AskCommandDefinition[]> => {
+    const commands = await listAgentSkillCommands();
+    if (isServiceError(commands)) {
+        console.error('Failed to load agent skill commands:', commands);
+        return [];
+    }
+
+    return commands;
+}
diff --git a/packages/web/src/ee/features/chat/skills/components/importFromRepoDialog.test.tsx b/packages/web/src/ee/features/chat/skills/components/importFromRepoDialog.test.tsx
new file mode 100644
index 000000000..5f4118ad8
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/importFromRepoDialog.test.tsx
@@ -0,0 +1,214 @@
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { useState } from 'react';
+import type { RepositoryQuery } from '@/lib/types';
+import type { FileTreeItem } from '@/features/git';
+
+// cmdk (the Command palette) relies on browser APIs jsdom does not implement.
+class ResizeObserverStub {
+    observe() {}
+    unobserve() {}
+    disconnect() {}
+}
+globalThis.ResizeObserver = ResizeObserverStub as unknown as typeof ResizeObserver;
+Element.prototype.scrollIntoView = vi.fn();
+
+vi.mock('@/app/api/(client)/client', () => ({
+    listRepos: vi.fn(),
+    getFiles: vi.fn(),
+    getFileSource: vi.fn(),
+}));
+
+const clientApi = await import('@/app/api/(client)/client');
+const { ImportFromRepoDialog } = await import('./importFromRepoDialog');
+
+afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+});
+
+const repo: RepositoryQuery = {
+    codeHostType: 'github',
+    repoId: 1,
+    repoName: 'github.com/acme/widgets',
+    repoDisplayName: 'acme/widgets',
+    webUrl: 'https://github.com/acme/widgets',
+    defaultBranch: 'main',
+    isFork: false,
+    isArchived: false,
+};
+
+const files: FileTreeItem[] = [
+    { type: 'blob', path: 'README.md', name: 'README.md' },
+    { type: 'blob', path: 'docs/skill.md', name: 'skill.md' },
+    { type: 'blob', path: 'src/index.ts', name: 'index.ts' },
+];
+
+function renderDialog(overrides: Partial<Parameters<typeof ImportFromRepoDialog>[0]> = {}) {
+    const onImport = vi.fn();
+    const onError = vi.fn();
+    const onOpenChange = vi.fn();
+    const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
+
+    render(
+        <QueryClientProvider client={queryClient}>
+            <ImportFromRepoDialog
+                open
+                onOpenChange={onOpenChange}
+                onImport={onImport}
+                onError={onError}
+                {...overrides}
+            />
+        </QueryClientProvider>,
+    );
+
+    return { onImport, onError, onOpenChange };
+}
+
+describe('ImportFromRepoDialog', () => {
+    test('lists repos, shows only markdown files, and imports the selected file', async () => {
+        vi.mocked(clientApi.listRepos).mockResolvedValue([repo]);
+        vi.mocked(clientApi.getFiles).mockResolvedValue(files);
+        vi.mocked(clientApi.getFileSource).mockResolvedValue({
+            source: '---\nname: Deploy Widgets\ndescription: Steps to deploy\n---\n\nRun the deploy script.',
+            language: 'Markdown',
+            path: 'docs/skill.md',
+            repo: repo.repoName,
+            repoCodeHostType: 'github',
+            webUrl: 'https://github.com/acme/widgets/blob/main/docs/skill.md',
+            blobSha: 'blob-sha-123',
+        });
+
+        const { onImport } = renderDialog();
+
+        // Repository step.
+        fireEvent.click(await screen.findByText('acme/widgets'));
+
+        // File step: markdown only, the .ts file is filtered out.
+        expect(await screen.findByText('skill.md')).toBeTruthy();
+        expect(screen.getByText('docs/skill.md')).toBeTruthy();
+        expect(screen.getAllByText('README.md').length).toBeGreaterThan(0);
+        expect(screen.queryByText('index.ts')).toBeNull();
+        expect(screen.queryByText('src/index.ts')).toBeNull();
+
+        // getFiles is scoped to the repo's default branch.
+        expect(clientApi.getFiles).toHaveBeenCalledWith({ repoName: repo.repoName, revisionName: 'main' });
+
+        fireEvent.click(screen.getByText('skill.md'));
+
+        await waitFor(() => expect(onImport).toHaveBeenCalledTimes(1));
+        expect(clientApi.getFileSource).toHaveBeenCalledWith({
+            path: 'docs/skill.md',
+            repo: repo.repoName,
+            ref: 'main',
+        });
+        // Imports carry the parsed skill plus the source provenance (incl. blob OID)
+        // so the parent can create a read-only, synced skill.
+        expect(onImport).toHaveBeenCalledWith(
+            expect.objectContaining({
+                parsed: expect.objectContaining({
+                    name: 'Deploy Widgets',
+                    slug: 'deploy-widgets',
+                    description: 'Steps to deploy',
+                    instructions: 'Run the deploy script.',
+                }),
+                source: {
+                    repoName: repo.repoName,
+                    filePath: 'docs/skill.md',
+                    revision: 'main',
+                    blobSha: 'blob-sha-123',
+                },
+            }),
+        );
+    });
+
+    test('does not import when the file has no resolvable blob version', async () => {
+        vi.mocked(clientApi.listRepos).mockResolvedValue([repo]);
+        vi.mocked(clientApi.getFiles).mockResolvedValue(files);
+        // A response without a blobSha means we can't track the file for syncing.
+        vi.mocked(clientApi.getFileSource).mockResolvedValue({
+            source: '---\nname: Deploy Widgets\n---\n\nRun the deploy script.',
+            language: 'Markdown',
+            path: 'docs/skill.md',
+            repo: repo.repoName,
+            repoCodeHostType: 'github',
+            webUrl: 'https://github.com/acme/widgets/blob/main/docs/skill.md',
+        });
+
+        const { onImport, onError } = renderDialog();
+
+        fireEvent.click(await screen.findByText('acme/widgets'));
+        fireEvent.click(await screen.findByText('skill.md'));
+
+        await waitFor(() => expect(onError).toHaveBeenCalledTimes(1));
+        expect(onImport).not.toHaveBeenCalled();
+    });
+
+    test('surfaces an error when the file cannot be fetched', async () => {
+        vi.mocked(clientApi.listRepos).mockResolvedValue([repo]);
+        vi.mocked(clientApi.getFiles).mockResolvedValue(files);
+        vi.mocked(clientApi.getFileSource).mockResolvedValue({
+            statusCode: 500,
+            errorCode: 'UNEXPECTED_ERROR',
+            message: 'boom',
+        });
+
+        const { onImport, onError } = renderDialog();
+
+        fireEvent.click(await screen.findByText('acme/widgets'));
+        fireEvent.click(await screen.findByText('skill.md'));
+
+        await waitFor(() => expect(onError).toHaveBeenCalledTimes(1));
+        expect(onImport).not.toHaveBeenCalled();
+    });
+
+    test('typing in the repo search does not crash and always sends a string query', async () => {
+        vi.mocked(clientApi.listRepos).mockResolvedValue([repo]);
+
+        renderDialog();
+
+        await screen.findByText('acme/widgets');
+        // Each keystroke re-keys the repo query; the CommandList must stay mounted
+        // (cmdk throws "undefined is not iterable" if its list ref unmounts mid-search).
+        const input = screen.getByPlaceholderText('Search your indexed repositories...');
+        fireEvent.change(input, { target: { value: 'wid' } });
+        fireEvent.change(input, { target: { value: 'widg' } });
+
+        await waitFor(() => expect(screen.getByText('acme/widgets')).toBeTruthy());
+        // The shared listRepos client calls value.toString() on every param, so an
+        // undefined query would throw; the dialog must always pass a string.
+        for (const call of vi.mocked(clientApi.listRepos).mock.calls) {
+            expect(typeof call[0].query).toBe('string');
+        }
+    });
+
+    test('releases the body pointer-events lock after import so the page stays interactive', async () => {
+        vi.mocked(clientApi.listRepos).mockResolvedValue([repo]);
+        vi.mocked(clientApi.getFiles).mockResolvedValue(files);
+        vi.mocked(clientApi.getFileSource).mockResolvedValue({
+            source: '---\nname: Deploy Widgets\n---\n\nRun the deploy script.',
+            language: 'Markdown',
+            path: 'docs/skill.md',
+            repo: repo.repoName,
+            repoCodeHostType: 'github',
+            webUrl: 'https://github.com/acme/widgets/blob/main/docs/skill.md',
+            blobSha: 'blob-sha-123',
+        });
+
+        // Mirror how the parent drives the dialog: a controlled `open` that flips
+        // to false on import. Radix locks <body> while the modal is open.
+        function Harness() {
+            const [open, setOpen] = useState(true);
+            return <ImportFromRepoDialog open={open} onOpenChange={setOpen} onImport={vi.fn()} onError={vi.fn()} />;
+        }
+        const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
+        render(<QueryClientProvider client={queryClient}><Harness /></QueryClientProvider>);
+
+        fireEvent.click(await screen.findByText('acme/widgets'));
+        fireEvent.click(await screen.findByText('skill.md'));
+
+        // Once the dialog closes, the page must not be left frozen.
+        await waitFor(() => expect(document.body.style.pointerEvents).not.toBe('none'));
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/components/importFromRepoDialog.tsx b/packages/web/src/ee/features/chat/skills/components/importFromRepoDialog.tsx
new file mode 100644
index 000000000..9f7a361eb
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/importFromRepoDialog.tsx
@@ -0,0 +1,266 @@
+'use client';
+
+import { useEffect, useMemo, useState } from "react";
+import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import { ArrowLeftIcon, FileTextIcon, Loader2Icon } from "lucide-react";
+import {
+    Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList,
+} from "@/components/ui/command";
+import { Dialog, DialogContent, DialogDescription, DialogTitle } from "@/components/ui/dialog";
+import { Skeleton } from "@/components/ui/skeleton";
+import { getFileSource, getFiles, listRepos } from "@/app/api/(client)/client";
+import { parseAgentSkillMarkdown, type ParsedAgentSkillMarkdown } from "@/ee/features/chat/skills/types";
+import type { RepositoryQuery } from "@/lib/types";
+import { unwrapServiceError } from "@/lib/utils";
+
+const MAX_RESULTS = 100;
+const MARKDOWN_FILE_REGEX = /\.(md|markdown)$/i;
+
+// A markdown file imported from a repository, carrying the provenance needed to
+// create a read-only skill that stays synced with its source.
+export interface ImportedRepoSkill {
+    parsed: ParsedAgentSkillMarkdown;
+    source: {
+        repoName: string;
+        filePath: string;
+        revision: string;
+        blobSha: string;
+    };
+}
+
+interface ImportFromRepoDialogProps {
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+    // Called once a markdown file has been fetched, with the parsed skill and the
+    // source provenance. The parent creates the synced skill and surfaces the result.
+    onImport: (imported: ImportedRepoSkill) => void;
+    onError: (message: string) => void;
+}
+
+export const ImportFromRepoDialog = ({ open, onOpenChange, onImport, onError }: ImportFromRepoDialogProps) => {
+    const [selectedRepo, setSelectedRepo] = useState<RepositoryQuery | null>(null);
+    const [repoQuery, setRepoQuery] = useState("");
+    const [fileQuery, setFileQuery] = useState("");
+    const [isImporting, setIsImporting] = useState(false);
+
+    const revisionName = selectedRepo?.defaultBranch ?? "HEAD";
+
+    const { data: repos = [], isLoading: isLoadingRepos, isError: isReposError } = useQuery({
+        queryKey: ["skillImportRepos", repoQuery],
+        queryFn: () => unwrapServiceError(listRepos({
+            page: 1,
+            perPage: MAX_RESULTS,
+            sort: "name",
+            direction: "asc",
+            query: repoQuery,
+        })),
+        enabled: open && selectedRepo === null,
+        // Keep the previous results visible while a new query streams in, so the
+        // CommandList stays mounted on every keystroke (cmdk crashes if its list
+        // ref is unmounted mid-search).
+        placeholderData: keepPreviousData,
+    });
+
+    const { data: files = [], isLoading: isLoadingFiles, isError: isFilesError } = useQuery({
+        queryKey: ["skillImportFiles", selectedRepo?.repoName, revisionName],
+        queryFn: () => unwrapServiceError(getFiles({ repoName: selectedRepo!.repoName, revisionName })),
+        enabled: open && selectedRepo !== null,
+    });
+
+    const markdownFiles = useMemo(() => {
+        const query = fileQuery.trim().toLowerCase();
+        return files
+            .filter((file) => MARKDOWN_FILE_REGEX.test(file.path))
+            .filter((file) => (query ? file.path.toLowerCase().includes(query) : true))
+            .slice(0, MAX_RESULTS);
+    }, [files, fileQuery]);
+
+    // Radix locks `<body>` with `pointer-events: none` while a modal is open, and
+    // when a dialog is opened from a menu it can fail to release that lock on close,
+    // which freezes the whole page. Make sure the lock is cleared whenever this
+    // dialog is not open and on unmount.
+    useEffect(() => {
+        if (!open) {
+            document.body.style.pointerEvents = "";
+        }
+        return () => {
+            document.body.style.pointerEvents = "";
+        };
+    }, [open]);
+
+    const resetAndClose = () => {
+        setSelectedRepo(null);
+        setRepoQuery("");
+        setFileQuery("");
+        onOpenChange(false);
+    };
+
+    const handleSelectRepo = (repo: RepositoryQuery) => {
+        setSelectedRepo(repo);
+        setFileQuery("");
+    };
+
+    const handleBackToRepos = () => {
+        setSelectedRepo(null);
+        setFileQuery("");
+    };
+
+    const handleSelectFile = async (path: string, name: string) => {
+        if (!selectedRepo || isImporting) {
+            return;
+        }
+        setIsImporting(true);
+        try {
+            const result = await unwrapServiceError(getFileSource({
+                path,
+                repo: selectedRepo.repoName,
+                ref: revisionName,
+            }));
+            if (!result.blobSha) {
+                // Without the blob OID we can't track the file for syncing; don't
+                // create a half-linked skill. Leave the dialog open to retry.
+                onError("Couldn't determine the file version to sync. Please try again.");
+                return;
+            }
+            onImport({
+                parsed: parseAgentSkillMarkdown(result.source, name),
+                source: {
+                    repoName: selectedRepo.repoName,
+                    filePath: path,
+                    revision: revisionName,
+                    blobSha: result.blobSha,
+                },
+            });
+            resetAndClose();
+        } catch {
+            onError("Failed to load the selected file.");
+        } finally {
+            setIsImporting(false);
+        }
+    };
+
+    return (
+        <Dialog open={open} onOpenChange={(isOpen) => { if (!isOpen) { resetAndClose(); } }} modal={true}>
+            <DialogContent className="overflow-hidden p-0 shadow-lg max-w-[90vw] sm:max-w-2xl top-[20%] translate-y-0">
+                <DialogTitle className="sr-only">Import a skill from a repository</DialogTitle>
+                <DialogDescription className="sr-only">
+                    Browse your indexed repositories and import a markdown file as a skill.
+                </DialogDescription>
+
+                {selectedRepo === null ? (
+                    <Command shouldFilter={false}>
+                        <CommandInput
+                            placeholder="Search your indexed repositories..."
+                            onValueChange={setRepoQuery}
+                        />
+                        <CommandList>
+                            {isLoadingRepos ? (
+                                <ResultsSkeleton />
+                            ) : isReposError ? (
+                                <p className="py-6 text-center text-sm text-muted-foreground">Error loading repositories.</p>
+                            ) : (
+                                <>
+                                    <CommandEmpty className="py-6 text-center text-sm text-muted-foreground">
+                                        No repositories found.
+                                    </CommandEmpty>
+                                    <CommandGroup heading="Repositories">
+                                        {repos.map((repo) => (
+                                            <CommandItem
+                                                key={repo.repoId}
+                                                value={repo.repoName}
+                                                onSelect={() => handleSelectRepo(repo)}
+                                                className="cursor-pointer"
+                                            >
+                                                <div className="flex min-w-0 flex-col">
+                                                    <span className="truncate text-sm font-medium">
+                                                        {repo.repoDisplayName ?? repo.repoName}
+                                                    </span>
+                                                    {repo.repoDisplayName && (
+                                                        <span className="truncate text-xs text-muted-foreground">{repo.repoName}</span>
+                                                    )}
+                                                </div>
+                                            </CommandItem>
+                                        ))}
+                                    </CommandGroup>
+                                </>
+                            )}
+                        </CommandList>
+                    </Command>
+                ) : (
+                    <Command shouldFilter={false}>
+                        <div className="flex items-center gap-2 border-b px-3 py-2">
+                            <button
+                                type="button"
+                                onClick={handleBackToRepos}
+                                className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground"
+                            >
+                                <ArrowLeftIcon className="h-3.5 w-3.5" />
+                                Repositories
+                            </button>
+                            <span className="truncate text-xs font-medium text-foreground">
+                                {selectedRepo.repoDisplayName ?? selectedRepo.repoName}
+                            </span>
+                        </div>
+                        <CommandInput
+                            placeholder="Search markdown files..."
+                            onValueChange={setFileQuery}
+                            disabled={isLoadingFiles}
+                        />
+                        <CommandList>
+                            {isLoadingFiles ? (
+                                <ResultsSkeleton />
+                            ) : isFilesError ? (
+                                <p className="py-6 text-center text-sm text-muted-foreground">Error loading files.</p>
+                            ) : (
+                                <>
+                                    <CommandEmpty className="py-6 text-center text-sm text-muted-foreground">
+                                        No markdown files found.
+                                    </CommandEmpty>
+                                    <CommandGroup heading="Markdown files">
+                                        {markdownFiles.map((file) => (
+                                            <CommandItem
+                                                key={file.path}
+                                                value={file.path}
+                                                onSelect={() => void handleSelectFile(file.path, file.name)}
+                                                disabled={isImporting}
+                                                className="cursor-pointer"
+                                            >
+                                                <FileTextIcon className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
+                                                <div className="flex min-w-0 flex-col">
+                                                    <span className="truncate text-sm font-medium">{file.name}</span>
+                                                    <span className="truncate text-xs text-muted-foreground">{file.path}</span>
+                                                </div>
+                                            </CommandItem>
+                                        ))}
+                                    </CommandGroup>
+                                </>
+                            )}
+                        </CommandList>
+                        {isImporting && (
+                            <div className="flex items-center justify-center gap-2 border-t py-3 text-sm text-muted-foreground">
+                                <Loader2Icon className="h-4 w-4 animate-spin" />
+                                Importing...
+                            </div>
+                        )}
+                    </Command>
+                )}
+            </DialogContent>
+        </Dialog>
+    );
+};
+
+const ResultsSkeleton = () => {
+    return (
+        <div className="p-2">
+            {Array.from({ length: 6 }).map((_, index) => (
+                <div key={index} className="mb-1 flex flex-row gap-2 p-2">
+                    <Skeleton className="h-4 w-4" />
+                    <div className="flex w-full flex-col gap-1">
+                        <Skeleton className="h-4 w-1/4" />
+                        <Skeleton className="h-3 w-1/2" />
+                    </div>
+                </div>
+            ))}
+        </div>
+    );
+};
diff --git a/packages/web/src/ee/features/chat/skills/components/personalSkillEditorPage.tsx b/packages/web/src/ee/features/chat/skills/components/personalSkillEditorPage.tsx
new file mode 100644
index 000000000..3d42aeee3
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/personalSkillEditorPage.tsx
@@ -0,0 +1,462 @@
+'use client';
+
+import { useEffect, useRef, useState, type ChangeEvent, type FormEvent } from "react";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { ArrowLeftIcon, Building2Icon, PanelRightCloseIcon, PanelRightOpenIcon, PencilIcon, PlusIcon, UploadIcon } from "lucide-react";
+import { useToast } from "@/components/hooks/use-toast";
+import {
+    AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent,
+    AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle,
+} from "@/components/ui/alert-dialog";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+import { Textarea } from "@/components/ui/textarea";
+import { createSharedAgentSkill, createPersonalAgentSkill, updateSharedAgentSkill, updatePersonalAgentSkill } from "@/ee/features/chat/skills/actions";
+import { SkillInstructionsEditor } from "@/ee/features/chat/skills/components/skillInstructionsEditor";
+import { normalizeAgentSkillSlug, parseAgentSkillMarkdown, type AgentSkillInput, type AgentSkillListItem } from "@/ee/features/chat/skills/types";
+import { useUnsavedChangesGuard } from "@/ee/features/chat/useUnsavedChangesGuard";
+import { isServiceError } from "@/lib/utils";
+
+const INSTRUCTIONS_MAX_LENGTH = 20000;
+const DETAILS_COLLAPSED_STORAGE_KEY = "sb.skillEditor.detailsCollapsed";
+const INSTRUCTIONS_PLACEHOLDER = `Find where a symbol is defined and used across the codebase.
+
+Search for exact matches, related types, tests, and call sites. Prioritize the files most likely to explain the behavior.
+
+Return:
+- the most relevant files and symbols
+- a short explanation of how the code is connected
+- any follow-up searches that would narrow the answer`;
+
+const emptySkillForm: AgentSkillInput = {
+    name: "",
+    slug: "",
+    description: "",
+    instructions: "",
+};
+
+type SaveMode = "editShared" | "editPersonal" | "createShared" | "createPersonal";
+
+const saveModeConfig = {
+    editShared: {
+        icon: PencilIcon,
+        buttonLabel: "Save skill",
+        successToast: "Shared skill updated.",
+    },
+    editPersonal: {
+        icon: PencilIcon,
+        buttonLabel: "Save skill",
+        successToast: "Skill updated.",
+    },
+    createShared: {
+        icon: Building2Icon,
+        buttonLabel: "Create shared skill",
+        successToast: "Shared skill created.",
+    },
+    createPersonal: {
+        icon: PlusIcon,
+        buttonLabel: "Create skill",
+        successToast: "Skill created.",
+    },
+} satisfies Record<SaveMode, {
+    icon: typeof PencilIcon;
+    buttonLabel: string;
+    successToast: string;
+}>;
+
+interface PersonalSkillEditorPageProps {
+    skill: AgentSkillListItem | null;
+}
+
+export function PersonalSkillEditorPage(props: PersonalSkillEditorPageProps) {
+    return <SkillEditor {...props} />;
+}
+
+export function SharedSkillEditorPage(props: { skill: AgentSkillListItem }) {
+    return <SkillEditor {...props} />;
+}
+
+function SkillEditor({ skill }: PersonalSkillEditorPageProps) {
+    const router = useRouter();
+    const { toast } = useToast();
+    const markdownFileInputRef = useRef<HTMLInputElement>(null);
+    const initialForm: AgentSkillInput = skill
+        ? {
+            name: skill.name,
+            slug: skill.slug,
+            description: skill.description,
+            instructions: skill.instructions,
+        }
+        : emptySkillForm;
+    const [form, setForm] = useState<AgentSkillInput>(initialForm);
+    const [isSlugTouched, setIsSlugTouched] = useState(skill !== null);
+    const [isSaving, setIsSaving] = useState(false);
+    const [isDetailsCollapsed, setIsDetailsCollapsed] = useState(false);
+    const [instructionsEditorKey, setInstructionsEditorKey] = useState(0);
+    const [publishToShared, setPublishToShared] = useState(false);
+    const isEditing = skill !== null;
+    const isEditingSharedSkill = skill?.scope === "SHARED";
+    const saveMode: SaveMode = isEditing
+        ? isEditingSharedSkill ? "editShared" : "editPersonal"
+        : publishToShared ? "createShared" : "createPersonal";
+    const saveConfig = saveModeConfig[saveMode];
+    const SaveIcon = saveConfig.icon;
+
+    const isDirty =
+        form.name !== initialForm.name ||
+        form.slug !== initialForm.slug ||
+        form.description !== initialForm.description ||
+        form.instructions !== initialForm.instructions ||
+        (!isEditing && publishToShared);
+
+    // Intercept in-app navigation (the Cancel button, the Back link, settings
+    // sidebar links, and the browser back button) while there are unsaved
+    // changes, and resolve it through the themed dialog below.
+    const navGuard = useUnsavedChangesGuard({ enabled: isDirty });
+
+    // Restore the panel preference after mount to avoid an SSR hydration mismatch.
+    // Creating a skill always starts with details expanded so name/command are
+    // front-and-center; editing restores the user's last preference.
+    useEffect(() => {
+        if (isEditing && window.localStorage.getItem(DETAILS_COLLAPSED_STORAGE_KEY) === "true") {
+            setIsDetailsCollapsed(true);
+        }
+    }, [isEditing]);
+
+    const setDetailsCollapsed = (collapsed: boolean) => {
+        setIsDetailsCollapsed(collapsed);
+        window.localStorage.setItem(DETAILS_COLLAPSED_STORAGE_KEY, String(collapsed));
+    };
+
+    const handleNameChange = (name: string) => {
+        setForm((current) => ({
+            ...current,
+            name,
+            slug: isSlugTouched ? current.slug : normalizeAgentSkillSlug(name),
+        }));
+    };
+
+    const handleMarkdownFileChange = async (event: ChangeEvent<HTMLInputElement>) => {
+        const input = event.currentTarget;
+        const file = input.files?.[0];
+        input.value = "";
+
+        if (!file) {
+            return;
+        }
+
+        if (!/\.(md|markdown)$/i.test(file.name)) {
+            toast({ title: "Unsupported file", description: "Choose a markdown file ending in .md or .markdown.", variant: "destructive" });
+            return;
+        }
+
+        try {
+            const text = await file.text();
+            const parsed = parseAgentSkillMarkdown(text, file.name);
+            setForm((current) => ({
+                name: parsed.name ?? current.name,
+                slug: parsed.slug ?? current.slug,
+                description: parsed.description ?? current.description,
+                instructions: parsed.instructions,
+            }));
+            setInstructionsEditorKey((key) => key + 1);
+
+            if (parsed.slug || parsed.name) {
+                setIsSlugTouched(true);
+            }
+
+            toast({
+                title: parsed.frontmatterError ? "Front matter issue" : undefined,
+                description: parsed.frontmatterError
+                    ? `Markdown skill imported. ${parsed.frontmatterError}`
+                    : "Markdown skill imported.",
+                variant: parsed.frontmatterError ? "destructive" : undefined,
+            });
+        } catch {
+            toast({ title: "Error", description: "Failed to import markdown file.", variant: "destructive" });
+        }
+    };
+
+    const handleSubmit = async (event: FormEvent<HTMLFormElement>) => {
+        event.preventDefault();
+        setIsSaving(true);
+        try {
+            const result = await ({
+                editShared: () => updateSharedAgentSkill({ id: skill!.id, ...form }),
+                editPersonal: () => updatePersonalAgentSkill({ id: skill!.id, ...form }),
+                createShared: () => createSharedAgentSkill(form),
+                createPersonal: () => createPersonalAgentSkill(form),
+            } satisfies Record<SaveMode, () => ReturnType<typeof createPersonalAgentSkill>>)[saveMode]();
+
+            if (isServiceError(result)) {
+                toast({ title: "Error", description: result.message, variant: "destructive" });
+                return;
+            }
+
+            toast({
+                description: saveConfig.successToast,
+            });
+            // The form is still "dirty" versus its initial values at this point,
+            // so suppress the guard for the post-save redirect.
+            navGuard.bypass();
+            router.push("/settings/accountAskAgent");
+        } catch {
+            toast({ title: "Error", description: "Failed to save skill.", variant: "destructive" });
+        } finally {
+            setIsSaving(false);
+        }
+    };
+
+    const handleCancel = () => {
+        router.push("/settings/accountAskAgent");
+    };
+
+    const triggerMarkdownImport = () => {
+        markdownFileInputRef.current?.click();
+    };
+
+    return (
+        <>
+        <form onSubmit={handleSubmit} className="flex h-full flex-col bg-background">
+            <input
+                ref={markdownFileInputRef}
+                type="file"
+                accept=".md,.markdown,text/markdown,text/plain"
+                className="hidden"
+                onChange={handleMarkdownFileChange}
+            />
+
+            {/* Top bar */}
+            <header className="flex shrink-0 items-center justify-between gap-4 border-b px-6 py-3">
+                <div className="flex min-w-0 items-center gap-3">
+                    <Link
+                        href="/settings/accountAskAgent"
+                        className="inline-flex shrink-0 items-center gap-1.5 text-sm text-link hover:underline"
+                    >
+                        <ArrowLeftIcon className="h-4 w-4" />
+                        Back to Ask Sourcebot
+                    </Link>
+                    <span className="flex min-w-0 items-center gap-2 rounded-md border bg-muted/40 px-2.5 py-1 transition-colors focus-within:border-ring focus-within:bg-muted/60">
+                        <input
+                            value={form.name}
+                            onChange={(event) => handleNameChange(event.target.value)}
+                            placeholder={isEditing ? "Untitled skill" : "New skill"}
+                            size={Math.max(form.name.length || (isEditing ? "Untitled skill".length : "New skill".length), 4)}
+                            maxLength={80}
+                            aria-label="Skill name"
+                            className="min-w-0 bg-transparent text-sm font-medium text-foreground outline-none placeholder:text-muted-foreground placeholder:font-normal"
+                        />
+                        {form.slug && (
+                            <span className="shrink-0 font-mono text-xs text-muted-foreground">/{form.slug}</span>
+                        )}
+                    </span>
+                </div>
+                <div className="flex shrink-0 items-center gap-2">
+                    <Button type="button" variant="outline" disabled={isSaving} onClick={handleCancel}>
+                        Cancel
+                    </Button>
+                    <Button type="submit" disabled={isSaving}>
+                        <SaveIcon className="h-4 w-4 mr-2" />
+                        {isSaving ? "Saving..." : saveConfig.buttonLabel}
+                    </Button>
+                </div>
+            </header>
+
+            {/* Body: instructions canvas + details panel */}
+            <div className="flex min-h-0 flex-1">
+                {/* Instructions canvas */}
+                <div className="flex min-w-0 flex-1 flex-col px-6 py-4">
+                    <div className="mb-3 flex items-baseline gap-2">
+                        <Label htmlFor="agent-skill-instructions" className="text-sm font-semibold">
+                            Instructions
+                        </Label>
+                        <span className="truncate text-xs text-muted-foreground">
+                            {isDetailsCollapsed
+                                ? "Focus mode — open details to edit name, command & description"
+                                : "Markdown"}
+                        </span>
+                    </div>
+                    <div className="relative min-h-0 flex-1">
+                        <SkillInstructionsEditor
+                            key={instructionsEditorKey}
+                            id="agent-skill-instructions"
+                            value={form.instructions}
+                            onChange={(instructions) => setForm((current) => ({ ...current, instructions }))}
+                            placeholder={INSTRUCTIONS_PLACEHOLDER}
+                            className="h-full resize-none pb-8 font-mono text-sm leading-relaxed"
+                        />
+                        <span className="pointer-events-none absolute bottom-3 right-4 text-xs text-muted-foreground">
+                            {form.instructions.length.toLocaleString()} / {INSTRUCTIONS_MAX_LENGTH.toLocaleString()}
+                        </span>
+                    </div>
+                </div>
+
+                {/* Details panel / collapsed rail */}
+                {isDetailsCollapsed ? (
+                    <aside className="flex w-12 shrink-0 flex-col items-center gap-3 border-l py-4">
+                        <Button
+                            type="button"
+                            variant="ghost"
+                            size="icon"
+                            className="h-8 w-8 text-muted-foreground"
+                            aria-label="Open skill details"
+                            onClick={() => setDetailsCollapsed(false)}
+                        >
+                            <PanelRightOpenIcon className="h-4 w-4" />
+                        </Button>
+                        <button
+                            type="button"
+                            onClick={() => setDetailsCollapsed(false)}
+                            className="text-xs font-medium tracking-wide text-muted-foreground transition-colors hover:text-foreground [writing-mode:vertical-rl]"
+                        >
+                            Details
+                        </button>
+                    </aside>
+                ) : (
+                    <aside className="flex w-[360px] shrink-0 flex-col border-l">
+                        <div className="flex shrink-0 items-center justify-between px-5 py-4">
+                            <h4 className="text-sm font-semibold text-foreground">Skill details</h4>
+                            <Button
+                                type="button"
+                                variant="ghost"
+                                size="icon"
+                                className="h-8 w-8 text-muted-foreground"
+                                aria-label="Collapse skill details"
+                                onClick={() => setDetailsCollapsed(true)}
+                            >
+                                <PanelRightCloseIcon className="h-4 w-4" />
+                            </Button>
+                        </div>
+
+                        <div className="min-h-0 flex-1 space-y-5 overflow-y-auto px-5 pb-5">
+                            <div className="space-y-2">
+                                <Label htmlFor="agent-skill-name">Name</Label>
+                                <Input
+                                    id="agent-skill-name"
+                                    value={form.name}
+                                    onChange={(event) => handleNameChange(event.target.value)}
+                                    placeholder="Find references"
+                                    maxLength={80}
+                                    required
+                                />
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label htmlFor="agent-skill-command">Command</Label>
+                                <div className="relative">
+                                    <span className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-muted-foreground">
+                                        /
+                                    </span>
+                                    <Input
+                                        id="agent-skill-command"
+                                        value={form.slug}
+                                        onChange={(event) => {
+                                            const { value } = event.target;
+                                            setIsSlugTouched(true);
+                                            setForm((current) => ({
+                                                ...current,
+                                                slug: value,
+                                            }));
+                                        }}
+                                        onBlur={() => {
+                                            setForm((current) => ({
+                                                ...current,
+                                                slug: normalizeAgentSkillSlug(current.slug),
+                                            }));
+                                        }}
+                                        placeholder="find-refs"
+                                        className="pl-7 font-mono"
+                                        maxLength={64}
+                                        required
+                                    />
+                                </div>
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label htmlFor="agent-skill-description">
+                                    Description
+                                    <span className="ml-1 font-normal text-muted-foreground">(optional)</span>
+                                </Label>
+                                <Textarea
+                                    id="agent-skill-description"
+                                    value={form.description}
+                                    onChange={(event) => setForm((current) => ({ ...current, description: event.target.value }))}
+                                    placeholder="Search for a symbol or API and summarize where it is defined, used, and tested."
+                                    className="min-h-72 resize-y"
+                                    maxLength={500}
+                                />
+                            </div>
+
+                            {!isEditing && (
+                                <div className="flex items-center justify-between gap-3 rounded-md border bg-muted/30 px-3 py-2">
+                                    <Label
+                                        htmlFor="agent-skill-publish-to-shared"
+                                        className="flex min-w-0 items-center gap-2 text-sm font-medium"
+                                    >
+                                        <Building2Icon className="h-4 w-4 shrink-0 text-muted-foreground" />
+                                        <span className="truncate">Create as shared skill</span>
+                                    </Label>
+                                    <Switch
+                                        id="agent-skill-publish-to-shared"
+                                        checked={publishToShared}
+                                        disabled={isSaving}
+                                        onCheckedChange={setPublishToShared}
+                                    />
+                                </div>
+                            )}
+                        </div>
+
+                        <div className="shrink-0 space-y-2 border-t px-5 py-4">
+                            <Button
+                                type="button"
+                                variant="outline"
+                                className="w-full"
+                                disabled={isSaving}
+                                onClick={triggerMarkdownImport}
+                            >
+                                <UploadIcon className="h-4 w-4 mr-2" />
+                                Import markdown
+                            </Button>
+                            <p className="text-xs text-muted-foreground">
+                                Front matter can fill name, command, and description on import.
+                            </p>
+                        </div>
+                    </aside>
+                )}
+            </div>
+        </form>
+
+        <AlertDialog
+            open={navGuard.active}
+            onOpenChange={(open) => {
+                if (!open) {
+                    navGuard.resolve(false);
+                }
+            }}
+        >
+            <AlertDialogContent>
+                <AlertDialogHeader>
+                    <AlertDialogTitle>Discard unsaved changes?</AlertDialogTitle>
+                    <AlertDialogDescription>
+                        You have unsaved changes to this skill. If you leave now, your progress will be lost.
+                    </AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                    <AlertDialogCancel onClick={() => navGuard.resolve(false)}>
+                        Keep editing
+                    </AlertDialogCancel>
+                    <AlertDialogAction
+                        className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                        onClick={() => navGuard.resolve(true)}
+                    >
+                        Discard changes
+                    </AlertDialogAction>
+                </AlertDialogFooter>
+            </AlertDialogContent>
+        </AlertDialog>
+        </>
+    );
+}
diff --git a/packages/web/src/ee/features/chat/skills/components/skillInstructionsEditor.test.ts b/packages/web/src/ee/features/chat/skills/components/skillInstructionsEditor.test.ts
new file mode 100644
index 000000000..ac56ba17b
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/skillInstructionsEditor.test.ts
@@ -0,0 +1,16 @@
+import { describe, expect, test } from "vitest";
+import { skillInstructionsToSlateValue, slateValueToSkillInstructions } from "./skillInstructionsEditor";
+
+describe("skill instructions Slate serialization", () => {
+    test("round-trips file references without adding spaces around punctuation", () => {
+        const instructions = "Review @file:{github.com/sourcebot-dev/sourcebot::packages/web/src/auth.ts}.";
+
+        expect(slateValueToSkillInstructions(skillInstructionsToSlateValue(instructions))).toBe(instructions);
+    });
+
+    test("preserves trailing blank lines", () => {
+        const instructions = "Review this file:\n@file:{github.com/sourcebot-dev/sourcebot::packages/web/src/auth.ts}\n";
+
+        expect(slateValueToSkillInstructions(skillInstructionsToSlateValue(instructions))).toBe(instructions);
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/components/skillInstructionsEditor.tsx b/packages/web/src/ee/features/chat/skills/components/skillInstructionsEditor.tsx
new file mode 100644
index 000000000..9d9000c8d
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/skillInstructionsEditor.tsx
@@ -0,0 +1,399 @@
+'use client';
+
+import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { FILE_REFERENCE_REGEX } from "@/features/chat/constants";
+import { SuggestionBox } from "@/features/chat/components/chatBox/suggestionsBox";
+import type { FileSuggestion, RefineSuggestion, Suggestion, SuggestionMode } from "@/features/chat/components/chatBox/types";
+import { useSuggestionModeAndQuery } from "@/features/chat/components/chatBox/useSuggestionModeAndQuery";
+import { useSuggestionsData } from "@/features/chat/components/chatBox/useSuggestionsData";
+import type { CustomElement, FileMentionData, MentionElement, RenderElementPropsFor } from "@/features/chat/types";
+import { useCustomSlateEditor } from "@/features/chat/useCustomSlateEditor";
+import { fileReferenceToString, insertMention, isCustomTextElement, isMentionElement, isParagraphElement } from "@/features/chat/utils";
+import { useIsMac } from "@/hooks/useIsMac";
+import { cn } from "@/lib/utils";
+import { computePosition, flip, offset, shift, type VirtualElement } from "@floating-ui/react";
+import { Fragment, type KeyboardEvent, type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { type Descendant, insertText } from "slate";
+import { Editable, ReactEditor, type RenderElementProps, type RenderLeafProps, Slate, useFocused, useSelected, useSlate } from "slate-react";
+
+interface SkillInstructionsEditorProps {
+    id?: string;
+    value: string;
+    onChange: (value: string) => void;
+    placeholder?: string;
+    className?: string;
+    readOnly?: boolean;
+}
+
+const getFileName = (path: string) => path.split("/").pop() || path;
+
+const createFileMentionData = (repo: string, path: string): FileMentionData => ({
+    type: "file",
+    repo,
+    path,
+    name: getFileName(path),
+    language: "",
+    revision: "HEAD",
+});
+
+const parseInlineInstructions = (text: string): Descendant[] => {
+    const children: Descendant[] = [];
+    let lastIndex = 0;
+
+    FILE_REFERENCE_REGEX.lastIndex = 0;
+    let match: RegExpExecArray | null;
+    while ((match = FILE_REFERENCE_REGEX.exec(text)) !== null) {
+        const [rawReference, repo, path] = match;
+        if (!repo || !path) {
+            continue;
+        }
+
+        if (match.index > lastIndex) {
+            children.push({ text: text.slice(lastIndex, match.index) });
+        }
+
+        children.push({
+            type: "mention",
+            data: createFileMentionData(repo, path),
+            children: [{ text: "" }],
+        });
+        lastIndex = match.index + rawReference.length;
+    }
+    FILE_REFERENCE_REGEX.lastIndex = 0;
+
+    if (lastIndex < text.length) {
+        children.push({ text: text.slice(lastIndex) });
+    }
+
+    return children.length > 0 ? children : [{ text: "" }];
+};
+
+export const skillInstructionsToSlateValue = (value: string): CustomElement[] =>
+    value.split("\n").map((line) => ({
+        type: "paragraph",
+        children: parseInlineInstructions(line),
+    }));
+
+const serializeInlineInstructions = (children: Descendant[]): string =>
+    children.map((child) => {
+        if (isCustomTextElement(child)) {
+            return child.text;
+        }
+
+        if (isMentionElement(child)) {
+            if (child.data.type === "file") {
+                return fileReferenceToString({
+                    repo: child.data.repo,
+                    path: child.data.path,
+                });
+            }
+
+            return `/${child.data.slug}`;
+        }
+
+        if (isParagraphElement(child)) {
+            return serializeInlineInstructions(child.children);
+        }
+
+        return "";
+    }).join("");
+
+export const slateValueToSkillInstructions = (children: Descendant[]): string =>
+    children.map((child) => {
+        if (isParagraphElement(child)) {
+            return serializeInlineInstructions(child.children);
+        }
+
+        return serializeInlineInstructions([child]);
+    }).join("\n");
+
+const isSkillSuggestion = (suggestion: Suggestion): suggestion is FileSuggestion | RefineSuggestion =>
+    suggestion.type === "file" || suggestion.type === "refine";
+
+const toSkillSuggestionMode = (suggestionMode: SuggestionMode): SuggestionMode =>
+    suggestionMode === "file" || suggestionMode === "refine" ? suggestionMode : "none";
+
+export const SkillInstructionsEditor = ({
+    id,
+    value,
+    onChange,
+    placeholder,
+    className,
+    readOnly,
+}: SkillInstructionsEditorProps) => {
+    const editor = useCustomSlateEditor();
+    const initialValue = useMemo(() => skillInstructionsToSlateValue(value), [value]);
+
+    const handleChange = useCallback((children: Descendant[]) => {
+        const hasContentChange = editor.operations.some((operation) => operation.type !== "set_selection");
+        if (!hasContentChange) {
+            return;
+        }
+
+        onChange(slateValueToSkillInstructions(children));
+    }, [editor, onChange]);
+
+    return (
+        <Slate
+            editor={editor}
+            initialValue={initialValue}
+            onChange={handleChange}
+        >
+            <SkillInstructionsEditable
+                id={id}
+                className={className}
+                placeholder={placeholder}
+                readOnly={readOnly}
+            />
+        </Slate>
+    );
+};
+
+const SkillInstructionsEditable = ({
+    id,
+    className,
+    placeholder,
+    readOnly,
+}: Pick<SkillInstructionsEditorProps, "id" | "className" | "placeholder" | "readOnly">) => {
+    const suggestionsBoxRef = useRef<HTMLDivElement>(null);
+    const [index, setIndex] = useState(0);
+    const editor = useSlate();
+    const { suggestionQuery, suggestionMode, range } = useSuggestionModeAndQuery();
+    const skillSuggestionMode = toSkillSuggestionMode(suggestionMode);
+    const { suggestions: rawSuggestions, isLoading } = useSuggestionsData({
+        suggestionMode: skillSuggestionMode,
+        suggestionQuery,
+        selectedRepos: [],
+        askCommands: [],
+    });
+    const suggestions = useMemo(() => rawSuggestions.filter(isSkillSuggestion), [rawSuggestions]);
+    const showPlaceholder = Boolean(placeholder && slateValueToSkillInstructions(editor.children).length === 0);
+
+    useEffect(() => {
+        setIndex(0);
+    }, [skillSuggestionMode, suggestionQuery]);
+
+    const renderElement = useCallback((props: RenderElementProps) => {
+        switch (props.element.type) {
+            case "mention":
+                return <FileMentionComponent {...props as RenderElementPropsFor<MentionElement>} />;
+            default:
+                return <DefaultElement {...props} />;
+        }
+    }, []);
+
+    const renderLeaf = useCallback((props: RenderLeafProps) => (
+        <span {...props.attributes}>{props.children}</span>
+    ), []);
+
+    const onInsertSuggestion = useCallback((suggestion: FileSuggestion | RefineSuggestion) => {
+        switch (suggestion.type) {
+            case "file":
+                insertMention(editor, {
+                    type: "file",
+                    path: suggestion.path,
+                    repo: suggestion.repo,
+                    name: suggestion.name,
+                    language: suggestion.language,
+                    revision: suggestion.revision,
+                }, range);
+                insertText(editor, " ");
+                break;
+            case "refine":
+                insertText(editor, "file:");
+                break;
+        }
+        ReactEditor.focus(editor);
+    }, [editor, range]);
+
+    const onKeyDown = useCallback((event: KeyboardEvent<HTMLDivElement>) => {
+        if (suggestions.length === 0) {
+            return;
+        }
+
+        switch (event.key) {
+            case "ArrowDown": {
+                event.preventDefault();
+                setIndex((current) => current >= suggestions.length - 1 ? 0 : current + 1);
+                break;
+            }
+            case "ArrowUp": {
+                event.preventDefault();
+                setIndex((current) => current <= 0 ? suggestions.length - 1 : current - 1);
+                break;
+            }
+            case "Tab":
+            case "Enter": {
+                event.preventDefault();
+                const suggestion = suggestions[index];
+                if (suggestion) {
+                    onInsertSuggestion(suggestion);
+                }
+                break;
+            }
+        }
+    }, [index, onInsertSuggestion, suggestions]);
+
+    useEffect(() => {
+        if (!range || !suggestionsBoxRef.current || skillSuggestionMode === "none") {
+            return;
+        }
+
+        const virtualElement: VirtualElement = {
+            getBoundingClientRect: () => ReactEditor.toDOMRange(editor, range).getBoundingClientRect(),
+        };
+
+        computePosition(virtualElement, suggestionsBoxRef.current, {
+            placement: "bottom-start",
+            middleware: [
+                offset(2),
+                flip({
+                    mainAxis: true,
+                    crossAxis: false,
+                    fallbackPlacements: ["top-start", "bottom-start"],
+                    padding: 20,
+                }),
+                shift({
+                    padding: 5,
+                }),
+            ],
+        }).then(({ x, y }) => {
+            if (suggestionsBoxRef.current) {
+                suggestionsBoxRef.current.style.left = `${x}px`;
+                suggestionsBoxRef.current.style.top = `${y}px`;
+            }
+        });
+    }, [editor, index, range, skillSuggestionMode]);
+
+    return (
+        <>
+            <div className="relative h-full">
+                {showPlaceholder && (
+                    <div
+                        aria-hidden="true"
+                        className="pointer-events-none absolute inset-0 z-10 h-full w-full overflow-hidden whitespace-pre-wrap break-words rounded-md border border-transparent px-3 py-2 pb-8 font-mono text-sm leading-relaxed text-muted-foreground opacity-60"
+                    >
+                        {placeholder}
+                    </div>
+                )}
+                <Editable
+                    aria-label="Skill instructions"
+                    className={cn(
+                        "h-full w-full overflow-y-auto rounded-md border border-input bg-background px-3 py-2 pb-8 font-mono text-sm leading-relaxed ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+                        className,
+                    )}
+                    id={id}
+                    onKeyDown={onKeyDown}
+                    readOnly={readOnly}
+                    renderElement={renderElement}
+                    renderLeaf={renderLeaf}
+                    spellCheck={false}
+                />
+            </div>
+            {skillSuggestionMode !== "none" && (
+                <SuggestionBox
+                    ref={suggestionsBoxRef}
+                    selectedIndex={index}
+                    onInsertSuggestion={(suggestion) => {
+                        if (isSkillSuggestion(suggestion)) {
+                            onInsertSuggestion(suggestion);
+                        }
+                    }}
+                    isLoading={isLoading}
+                    suggestions={suggestions}
+                />
+            )}
+        </>
+    );
+};
+
+const DefaultElement = (props: RenderElementProps) => (
+    <p {...props.attributes} className="m-0">{props.children}</p>
+);
+
+const FileMentionComponent = ({
+    attributes,
+    children,
+    element: { data },
+}: RenderElementPropsFor<MentionElement>) => {
+    const selected = useSelected();
+    const focused = useFocused();
+    const isMac = useIsMac();
+
+    if (data.type !== "file") {
+        return <span {...attributes}>{children}</span>;
+    }
+
+    return (
+        <MentionChip
+            attributes={attributes}
+            content={
+                <Fragment>
+                    <VscodeFileIcon fileName={data.name} className="w-3 h-3 mr-1" />
+                    {data.name}
+                </Fragment>
+            }
+            focused={focused}
+            isMac={isMac}
+            selected={selected}
+            tooltipContent={
+                <span className="text-xs font-mono">
+                    <span className="font-medium">{data.repo.split("/").pop()}</span>/{data.path}
+                </span>
+            }
+        >
+            {children}
+        </MentionChip>
+    );
+};
+
+interface MentionChipProps {
+    attributes: RenderElementPropsFor<MentionElement>["attributes"];
+    children: ReactNode;
+    content: ReactNode;
+    focused: boolean;
+    isMac: boolean;
+    selected: boolean;
+    tooltipContent: ReactNode;
+}
+
+const MentionChip = ({
+    attributes,
+    children,
+    content,
+    focused,
+    isMac,
+    selected,
+    tooltipContent,
+}: MentionChipProps) => (
+    <Tooltip>
+        <TooltipTrigger asChild>
+            <span
+                {...attributes}
+                contentEditable={false}
+                className={cn(
+                    "mb-1 mr-1.5 inline-block rounded bg-muted px-1.5 py-0.5 align-baseline text-xs font-mono",
+                    selected && focused ? "ring-2 ring-blue-300" : undefined,
+                )}
+            >
+                <span contentEditable={false} className="flex select-none flex-row items-center">
+                    {isMac ? (
+                        <Fragment>
+                            {children}
+                            {content}
+                        </Fragment>
+                    ) : (
+                        <Fragment>
+                            {content}
+                            {children}
+                        </Fragment>
+                    )}
+                </span>
+            </span>
+        </TooltipTrigger>
+        <TooltipContent>
+            {tooltipContent}
+        </TooltipContent>
+    </Tooltip>
+);
diff --git a/packages/web/src/ee/features/chat/skills/components/skillsPage.test.tsx b/packages/web/src/ee/features/chat/skills/components/skillsPage.test.tsx
new file mode 100644
index 000000000..6483cf450
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/skillsPage.test.tsx
@@ -0,0 +1,421 @@
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { TooltipProvider } from '@/components/ui/tooltip';
+import type { ReactNode } from 'react';
+import type { AgentSkillListItem, SharedAgentSkillCatalogItem } from '@/ee/features/chat/skills/types';
+
+vi.mock('@/ee/features/chat/skills/actions', () => ({
+    adoptSharedSkill: vi.fn(),
+    createPersonalAgentSkill: vi.fn(),
+    deletePersonalAgentSkill: vi.fn(),
+    deleteSharedAgentSkill: vi.fn(),
+    makeSharedAgentSkillPersonal: vi.fn(),
+    publishPersonalAgentSkillToShared: vi.fn(),
+    unadoptSharedSkill: vi.fn(),
+    updatePersonalAgentSkill: vi.fn(),
+    updatePersonalAgentSkillFromSource: vi.fn(),
+    updateSharedAgentSkill: vi.fn(),
+    updateSharedAgentSkillFromSource: vi.fn(),
+}));
+// The synced-skill banner checks freshness via this client; the repo-import dialog
+// (always mounted) also imports from here, but its queries stay disabled while closed.
+vi.mock('@/app/api/(client)/client', () => ({
+    getSkillSourceStatus: vi.fn(),
+    getFileSource: vi.fn(),
+    getFiles: vi.fn(),
+    listRepos: vi.fn(),
+}));
+// The Slate-based editor pulls in suggestion data hooks that need a richer
+// environment than these interaction tests; stub it out.
+vi.mock('@/ee/features/chat/skills/components/skillInstructionsEditor', () => ({
+    SkillInstructionsEditor: () => null,
+}));
+// The unsaved-changes guard relies on the Next App Router navigation context,
+// which is not present under jsdom.
+vi.mock('@/ee/features/chat/useUnsavedChangesGuard', () => ({
+    useUnsavedChangesGuard: () => ({ active: false, resolve: vi.fn(), bypass: vi.fn() }),
+}));
+// The reading view renders instructions through the chat MarkdownRenderer, which
+// pulls in react-markdown, the Lezer highlighter, and a router context; swap in a
+// lightweight placeholder that still honors the forwarded ref.
+vi.mock('@/ee/features/chat/components/chatThread/markdownRenderer', async () => {
+    const { forwardRef, createElement } = await import('react');
+    return {
+        MarkdownRenderer: forwardRef<HTMLDivElement, { content: string }>(({ content }, ref) =>
+            createElement('div', { ref, 'data-testid': 'markdown-preview' }, content),
+        ),
+    };
+});
+// The table-of-contents hook relies on IntersectionObserver/MutationObserver,
+// which jsdom does not implement.
+vi.mock('@/ee/features/chat/useTOCItems', () => ({
+    useExtractTOCItems: () => ({ tocItems: [], activeId: '' }),
+}));
+// The detail dropdown deep-links via next/link inside a Radix `asChild` slot, so
+// the mock must forward the merged props (role, ref, etc.) onto the anchor.
+vi.mock('next/link', async () => {
+    const { createElement, forwardRef } = await import('react');
+    return {
+        default: forwardRef<HTMLAnchorElement, { href: string; children: ReactNode }>(
+            ({ href, children, ...props }, ref) => createElement('a', { href, ref, ...props }, children),
+        ),
+    };
+});
+
+const skillActions = await import('@/ee/features/chat/skills/actions');
+const clientApi = await import('@/app/api/(client)/client');
+const { SkillsPage } = await import('./skillsPage');
+
+afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+});
+
+function renderSkillsPage({
+    personalSkills = [],
+    sharedSkills = [],
+    isOwner = false,
+    initialSelectedId,
+    permissionSyncEnabled = true,
+}: {
+    personalSkills?: AgentSkillListItem[];
+    sharedSkills?: SharedAgentSkillCatalogItem[];
+    isOwner?: boolean;
+    initialSelectedId?: string;
+    permissionSyncEnabled?: boolean;
+}) {
+    const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
+    return render(
+        <QueryClientProvider client={queryClient}>
+            <TooltipProvider>
+                <SkillsPage
+                    initialPersonalSkills={personalSkills}
+                    initialSharedSkills={sharedSkills}
+                    currentUserEmail="jack@sourcebot.dev"
+                    isOwner={isOwner}
+                    initialSelectedId={initialSelectedId}
+                    permissionSyncEnabled={permissionSyncEnabled}
+                />
+            </TooltipProvider>
+        </QueryClientProvider>,
+    );
+}
+
+const sharedSkill: SharedAgentSkillCatalogItem = {
+    id: 'org-skill',
+    scope: 'SHARED' as SharedAgentSkillCatalogItem['scope'],
+    slug: 'deploy-checklist',
+    name: 'Deploy Checklist',
+    description: 'Release steps',
+    instructions: 'Do release steps',
+    source: null,
+    createdByEmail: 'author@sourcebot.dev',
+    enabled: true,
+    autoEnrolled: true,
+    isAdopted: false,
+    isRemoved: false,
+    isVisibleToUser: true,
+    isCreatedByUser: true,
+    createdAt: '2026-06-18T00:00:00.000Z',
+    updatedAt: '2026-06-18T00:00:00.000Z',
+};
+
+const personalSkill: AgentSkillListItem = {
+    id: 'personal-skill',
+    scope: 'PERSONAL' as AgentSkillListItem['scope'],
+    slug: 'greet-me',
+    name: 'Greet Me',
+    description: 'Greets the user by name',
+    instructions: 'Say hi.',
+    enabled: true,
+    source: null,
+    createdAt: '2026-06-20T00:00:00.000Z',
+    updatedAt: '2026-06-20T00:00:00.000Z',
+};
+
+const syncedSkill: AgentSkillListItem = {
+    id: 'synced-skill',
+    scope: 'PERSONAL' as AgentSkillListItem['scope'],
+    slug: 'deploy-widgets',
+    name: 'Deploy Widgets',
+    description: 'Deploy steps',
+    instructions: 'Run the deploy script.',
+    enabled: true,
+    source: { repoName: 'github.com/acme/widgets', filePath: 'docs/skill.md', revision: 'main' },
+    createdAt: '2026-06-20T00:00:00.000Z',
+    updatedAt: '2026-06-20T00:00:00.000Z',
+};
+
+const sharedSyncedSkill: SharedAgentSkillCatalogItem = {
+    ...sharedSkill,
+    id: 'shared-synced-skill',
+    slug: 'deploy-widgets',
+    name: 'Deploy Widgets',
+    source: { repoName: 'github.com/acme/widgets', filePath: 'docs/skill.md', revision: 'main' },
+};
+
+describe('SkillsPage', () => {
+    test('confirms before making an authored shared skill personal', async () => {
+        vi.mocked(skillActions.makeSharedAgentSkillPersonal).mockResolvedValue({
+            id: 'new-personal-skill',
+            scope: 'PERSONAL',
+            slug: sharedSkill.slug,
+            name: sharedSkill.name,
+            description: sharedSkill.description,
+            instructions: sharedSkill.instructions,
+            enabled: true,
+            source: null,
+            createdAt: sharedSkill.createdAt,
+            updatedAt: sharedSkill.updatedAt,
+        });
+
+        renderSkillsPage({ sharedSkills: [sharedSkill] });
+
+        // The only skill is auto-selected, so its detail pane is shown. Toggling
+        // "Shared" off is the make-personal path (there is no menu item for it).
+        fireEvent.click(screen.getByRole('switch', { name: 'Shared' }));
+
+        expect(skillActions.makeSharedAgentSkillPersonal).not.toHaveBeenCalled();
+        const dialog = await screen.findByRole('alertdialog');
+        expect(within(dialog).getByText('Make Shared Skill Personal')).toBeTruthy();
+        expect(within(dialog).getByText('/deploy-checklist')).toBeTruthy();
+
+        fireEvent.click(within(dialog).getByRole('button', { name: 'Make personal' }));
+
+        expect(skillActions.makeSharedAgentSkillPersonal).toHaveBeenCalledWith('org-skill');
+    });
+
+    test('publishes a personal skill when the Shared toggle is turned on', async () => {
+        vi.mocked(skillActions.publishPersonalAgentSkillToShared).mockResolvedValue({
+            ...sharedSkill,
+            id: 'published-skill',
+            slug: personalSkill.slug,
+            name: personalSkill.name,
+            autoEnrolled: false,
+        });
+
+        renderSkillsPage({ personalSkills: [personalSkill] });
+
+        fireEvent.click(screen.getByRole('switch', { name: 'Shared' }));
+
+        expect(skillActions.publishPersonalAgentSkillToShared).toHaveBeenCalledWith('personal-skill');
+    });
+
+    test('confirms before sharing a synced skill, warning that owners without repo access can still see it', async () => {
+        vi.mocked(clientApi.getSkillSourceStatus).mockResolvedValue({ status: 'in_sync' });
+        vi.mocked(skillActions.publishPersonalAgentSkillToShared).mockResolvedValue({
+            ...sharedSyncedSkill,
+            id: 'published-synced-skill',
+            autoEnrolled: false,
+        });
+
+        renderSkillsPage({ personalSkills: [syncedSkill] });
+
+        // Flipping Shared on a synced skill opens a confirm dialog rather than
+        // publishing immediately.
+        fireEvent.click(await screen.findByRole('switch', { name: 'Shared' }));
+        expect(skillActions.publishPersonalAgentSkillToShared).not.toHaveBeenCalled();
+
+        const dialog = await screen.findByRole('alertdialog');
+        expect(within(dialog).getByText('Share synced skill with your workspace?')).toBeTruthy();
+        expect(within(dialog).getByText(/Organization owners who don.t have access/)).toBeTruthy();
+        expect(within(dialog).getByText(/Members without access to the repository won.t see it/)).toBeTruthy();
+
+        fireEvent.click(within(dialog).getByRole('button', { name: 'Share skill' }));
+
+        expect(skillActions.publishPersonalAgentSkillToShared).toHaveBeenCalledWith('synced-skill');
+    });
+
+    test('shares a synced skill immediately (no warning) when permission syncing is off', async () => {
+        vi.mocked(clientApi.getSkillSourceStatus).mockResolvedValue({ status: 'in_sync' });
+        vi.mocked(skillActions.publishPersonalAgentSkillToShared).mockResolvedValue({
+            ...sharedSyncedSkill,
+            id: 'published-synced-skill',
+            autoEnrolled: false,
+        });
+
+        renderSkillsPage({ personalSkills: [syncedSkill], permissionSyncEnabled: false });
+
+        fireEvent.click(await screen.findByRole('switch', { name: 'Shared' }));
+
+        // With syncing off there is no access caveat, so it publishes directly
+        // without the confirmation dialog.
+        await waitFor(() => expect(skillActions.publishPersonalAgentSkillToShared).toHaveBeenCalledWith('synced-skill'));
+        expect(screen.queryByRole('alertdialog')).toBeNull();
+    });
+
+    test("enables another member's shared skill from the list toggle, with no shared toggle or kebab", () => {
+        vi.mocked(skillActions.adoptSharedSkill).mockResolvedValue({ success: true });
+
+        const othersSkill: SharedAgentSkillCatalogItem = {
+            ...sharedSkill,
+            id: 'others-skill',
+            isCreatedByUser: false,
+            autoEnrolled: false,
+            isAdopted: false,
+            isRemoved: false,
+            isVisibleToUser: false,
+        };
+
+        renderSkillsPage({ sharedSkills: [othersSkill] });
+
+        expect(screen.queryByRole('switch', { name: 'Shared' })).toBeNull();
+        expect(screen.queryByRole('button', { name: /Actions for/ })).toBeNull();
+
+        fireEvent.click(screen.getByRole('switch', { name: 'Enable Deploy Checklist' }));
+
+        expect(skillActions.adoptSharedSkill).toHaveBeenCalledWith('others-skill');
+    });
+
+    test("shows the list toggle as on for shared skills the member has enabled", () => {
+        const enabledSkill: SharedAgentSkillCatalogItem = {
+            ...sharedSkill,
+            id: 'enabled-skill',
+            isCreatedByUser: false,
+            isVisibleToUser: true,
+        };
+
+        renderSkillsPage({ sharedSkills: [enabledSkill] });
+
+        expect(screen.getByRole('switch', { name: 'Enable Deploy Checklist', checked: true })).toBeTruthy();
+    });
+
+    test('shows a repo-synced skill as read-only and updates it from source', async () => {
+        vi.mocked(clientApi.getSkillSourceStatus).mockResolvedValue({ status: 'update_available' });
+        vi.mocked(skillActions.updatePersonalAgentSkillFromSource).mockResolvedValue({
+            ...syncedSkill,
+            instructions: 'Refreshed deploy script.',
+            updatedAt: '2026-06-25T00:00:00.000Z',
+        });
+
+        renderSkillsPage({ personalSkills: [syncedSkill] });
+
+        // Provenance banner is shown. Name + command stay editable (Edit present)...
+        expect(await screen.findByText('github.com/acme/widgets')).toBeTruthy();
+        expect(screen.getByRole('button', { name: 'Edit' })).toBeTruthy();
+        // ...and a synced skill can now be shared; the shared copy stays synced.
+        expect(screen.getByRole('switch', { name: 'Shared' })).toBeTruthy();
+
+        // The freshness check resolves to "update available", surfacing the action.
+        const updateButton = await screen.findByRole('button', { name: /Update from source/ });
+        fireEvent.click(updateButton);
+
+        await waitFor(() => expect(skillActions.updatePersonalAgentSkillFromSource).toHaveBeenCalledWith('synced-skill'));
+        expect(clientApi.getSkillSourceStatus).toHaveBeenCalledWith('synced-skill');
+    });
+
+    test('lets you edit a synced skill\'s name and command but locks its content', async () => {
+        vi.mocked(clientApi.getSkillSourceStatus).mockResolvedValue({ status: 'in_sync' });
+
+        renderSkillsPage({ personalSkills: [syncedSkill] });
+
+        fireEvent.click(await screen.findByRole('button', { name: 'Edit' }));
+
+        // Name and command are editable local labels.
+        const nameInput = await screen.findByDisplayValue('Deploy Widgets') as HTMLInputElement;
+        expect(nameInput.disabled).toBe(false);
+        expect((screen.getByDisplayValue('deploy-widgets') as HTMLInputElement).disabled).toBe(false);
+
+        // The description is locked and the instructions are shown read-only/synced.
+        expect((screen.getByDisplayValue('Deploy steps') as HTMLTextAreaElement).disabled).toBe(true);
+        expect(screen.getByText(/Synced from github\.com\/acme\/widgets/)).toBeTruthy();
+    });
+
+    test('keeps a shared skill synced and lets an owner update it from source', async () => {
+        vi.mocked(clientApi.getSkillSourceStatus).mockResolvedValue({ status: 'update_available' });
+        vi.mocked(skillActions.updateSharedAgentSkillFromSource).mockResolvedValue({
+            ...sharedSyncedSkill,
+            instructions: 'Refreshed deploy script.',
+            updatedAt: '2026-06-26T00:00:00.000Z',
+        });
+
+        renderSkillsPage({ sharedSkills: [sharedSyncedSkill], isOwner: true });
+
+        // A shared skill carries its repo provenance, and the owner can refresh it.
+        expect(await screen.findByText('github.com/acme/widgets')).toBeTruthy();
+        const updateButton = await screen.findByRole('button', { name: /Update from source/ });
+        fireEvent.click(updateButton);
+
+        // The shared (not personal) update path runs for a shared skill.
+        await waitFor(() => expect(skillActions.updateSharedAgentSkillFromSource).toHaveBeenCalledWith('shared-synced-skill'));
+        expect(skillActions.updatePersonalAgentSkillFromSource).not.toHaveBeenCalled();
+    });
+
+    test('imports a skill from a markdown file and pre-populates the create form', async () => {
+        const { container } = renderSkillsPage({});
+
+        const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement;
+        expect(fileInput).toBeTruthy();
+
+        const content = '---\nname: Greet Me\ndescription: Greets warmly\n---\n\nSay hello to the user by name.';
+        const file = new File([content], 'greet-me.md', { type: 'text/markdown' });
+        // jsdom does not implement Blob/File.text(); provide it for the read.
+        Object.defineProperty(file, 'text', { value: async () => content });
+        fireEvent.change(fileInput, { target: { files: [file] } });
+
+        // Front matter fills name, command, and description; the body becomes the
+        // instructions, and we land in the create form ready to review.
+        expect(await screen.findByDisplayValue('Greet Me')).toBeTruthy();
+        expect(screen.getByDisplayValue('greet-me')).toBeTruthy();
+        expect(screen.getByDisplayValue('Greets warmly')).toBeTruthy();
+        expect(screen.getByText('New skill')).toBeTruthy();
+        expect(screen.getByRole('button', { name: /Create skill/ })).toBeTruthy();
+    });
+
+    test('pre-selects the skill named by initialSelectedId', () => {
+        renderSkillsPage({
+            personalSkills: [personalSkill],
+            sharedSkills: [sharedSkill],
+            initialSelectedId: sharedSkill.id,
+        });
+
+        // The deep-linked shared skill's detail (its instructions) is shown, not
+        // the default first (personal) skill.
+        expect(screen.getByTestId('markdown-preview').textContent).toContain('Do release steps');
+    });
+
+    test('falls back to the first skill when initialSelectedId matches nothing', () => {
+        renderSkillsPage({
+            personalSkills: [personalSkill],
+            sharedSkills: [sharedSkill],
+            initialSelectedId: 'does-not-exist',
+        });
+
+        expect(screen.getByTestId('markdown-preview').textContent).toContain('Say hi.');
+    });
+
+    test('lets an owner jump to workspace settings pre-filtered to a shared skill', async () => {
+        renderSkillsPage({ sharedSkills: [sharedSkill], isOwner: true });
+
+        const actionsButton = screen.getByRole('button', { name: 'Actions for Deploy Checklist' });
+        actionsButton.focus();
+        fireEvent.keyDown(actionsButton, { key: 'Enter' });
+
+        const link = await screen.findByRole('menuitem', { name: /View in workspace settings/ });
+        expect(link.getAttribute('href')).toBe('/settings/workspaceAskAgent?skillSearch=Deploy%20Checklist');
+    });
+
+    test('hides the workspace-settings link for a shared skill when not an owner', async () => {
+        renderSkillsPage({ sharedSkills: [sharedSkill], isOwner: false });
+
+        const actionsButton = screen.getByRole('button', { name: 'Actions for Deploy Checklist' });
+        actionsButton.focus();
+        fireEvent.keyDown(actionsButton, { key: 'Enter' });
+        // The authoring user can still manage the skill, so the menu opens.
+        await screen.findByRole('menuitem', { name: /Delete/ });
+
+        expect(screen.queryByRole('menuitem', { name: /View in workspace settings/ })).toBeNull();
+    });
+
+    test('hides the workspace-settings link for a personal skill even for an owner', async () => {
+        renderSkillsPage({ personalSkills: [personalSkill], isOwner: true });
+
+        const actionsButton = screen.getByRole('button', { name: 'Actions for Greet Me' });
+        actionsButton.focus();
+        fireEvent.keyDown(actionsButton, { key: 'Enter' });
+        await screen.findByRole('menuitem', { name: /Delete/ });
+
+        expect(screen.queryByRole('menuitem', { name: /View in workspace settings/ })).toBeNull();
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/components/skillsPage.tsx b/packages/web/src/ee/features/chat/skills/components/skillsPage.tsx
new file mode 100644
index 000000000..ad419715d
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/skillsPage.tsx
@@ -0,0 +1,1676 @@
+'use client';
+
+import { useEffect, useMemo, useRef, useState, type ChangeEvent, type FormEvent } from "react";
+import Link from "next/link";
+import { useQuery } from "@tanstack/react-query";
+import {
+    AlertTriangleIcon,
+    BookOpenIcon,
+    Building2Icon,
+    CheckCircle2Icon,
+    CheckIcon,
+    FolderGit2Icon,
+    ListIcon,
+    Loader2Icon,
+    MoreHorizontalIcon,
+    PencilIcon,
+    PlusIcon,
+    RefreshCwIcon,
+    SearchIcon,
+    Trash2Icon,
+    UploadIcon,
+} from "lucide-react";
+import { useToast } from "@/components/hooks/use-toast";
+import {
+    AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent,
+    AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle,
+} from "@/components/ui/alert-dialog";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+import { Textarea } from "@/components/ui/textarea";
+import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import {
+    DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import {
+    adoptSharedSkill,
+    createPersonalAgentSkill,
+    deletePersonalAgentSkill,
+    deleteSharedAgentSkill,
+    makeSharedAgentSkillPersonal,
+    publishPersonalAgentSkillToShared,
+    unadoptSharedSkill,
+    updatePersonalAgentSkill,
+    updatePersonalAgentSkillFromSource,
+    updateSharedAgentSkill,
+    updateSharedAgentSkillFromSource,
+} from "@/ee/features/chat/skills/actions";
+import { getSkillSourceStatus } from "@/app/api/(client)/client";
+import { SkillInstructionsEditor } from "@/ee/features/chat/skills/components/skillInstructionsEditor";
+import { ImportFromRepoDialog, type ImportedRepoSkill } from "@/ee/features/chat/skills/components/importFromRepoDialog";
+import { MarkdownRenderer } from "@/ee/features/chat/components/chatThread/markdownRenderer";
+import { TableOfContents } from "@/ee/features/chat/components/chatThread/tableOfContents";
+import { useExtractTOCItems } from "@/ee/features/chat/useTOCItems";
+import {
+    AutoEnrolledSkillBadge,
+    DeleteWorkspaceSkillDialog,
+    SkillCommandBadge,
+} from "@/ee/features/chat/skills/components/workspaceSkillShared";
+import {
+    normalizeAgentSkillSlug,
+    parseAgentSkillMarkdown,
+    sortAgentSkillListItems,
+    sortSharedAgentSkillCatalogItems,
+    type AgentSkillInput,
+    type AgentSkillListItem,
+    type AgentSkillSourceRef,
+    type AgentSkillSourceStatus,
+    type ParsedAgentSkillMarkdown,
+    type SharedAgentSkillCatalogItem,
+} from "@/ee/features/chat/skills/types";
+import { useUnsavedChangesGuard } from "@/ee/features/chat/useUnsavedChangesGuard";
+import { cn, isServiceError, unwrapServiceError } from "@/lib/utils";
+
+const INSTRUCTIONS_MAX_LENGTH = 20000;
+const INSTRUCTIONS_PLACEHOLDER = `Find where a symbol is defined and used across the codebase.
+
+Search for exact matches, related types, tests, and call sites. Prioritize the files most likely to explain the behavior.`;
+
+const emptySkillForm: AgentSkillInput = {
+    name: "",
+    slug: "",
+    description: "",
+    instructions: "",
+};
+
+// A normalized view of either a personal or shared skill, so the detail pane can
+// render both from one shape.
+interface DetailSkill {
+    id: string;
+    scope: "PERSONAL" | "SHARED";
+    name: string;
+    slug: string;
+    description: string;
+    instructions: string;
+    updatedAt: string;
+    addedByEmail: string | null;
+    autoEnrolled: boolean;
+    isVisibleToUser: boolean;
+    isCreatedByUser: boolean;
+    canManage: boolean;
+    // The repository file this skill mirrors, or null. When set, the skill is a
+    // read-only sync target: no inline editing, refreshed via "Update from source".
+    source: AgentSkillSourceRef | null;
+}
+
+function toDetailFromPersonal(skill: AgentSkillListItem, currentUserEmail: string): DetailSkill {
+    return {
+        id: skill.id,
+        scope: "PERSONAL",
+        name: skill.name,
+        slug: skill.slug,
+        description: skill.description,
+        instructions: skill.instructions,
+        updatedAt: skill.updatedAt,
+        addedByEmail: currentUserEmail,
+        autoEnrolled: false,
+        isVisibleToUser: true,
+        isCreatedByUser: true,
+        canManage: true,
+        source: skill.source,
+    };
+}
+
+function toDetailFromShared(skill: SharedAgentSkillCatalogItem, isOwner: boolean): DetailSkill {
+    return {
+        id: skill.id,
+        scope: "SHARED",
+        name: skill.name,
+        slug: skill.slug,
+        description: skill.description,
+        instructions: skill.instructions,
+        updatedAt: skill.updatedAt,
+        addedByEmail: skill.createdByEmail,
+        autoEnrolled: skill.autoEnrolled,
+        isVisibleToUser: skill.isVisibleToUser,
+        isCreatedByUser: skill.isCreatedByUser,
+        canManage: skill.isCreatedByUser || isOwner,
+        source: skill.source,
+    };
+}
+
+function formatUpdatedAt(iso: string): string {
+    return new Date(iso).toLocaleDateString("en-US", {
+        month: "short",
+        day: "numeric",
+        year: "numeric",
+    });
+}
+
+function skillInitial(name: string): string {
+    const trimmed = name.trim();
+    return trimmed.length > 0 ? trimmed[0].toUpperCase() : "?";
+}
+
+function SkillAvatar({ name, size = "md" }: { name: string; size?: "sm" | "md" }) {
+    return (
+        <div
+            className={cn(
+                "flex shrink-0 items-center justify-center rounded-lg bg-muted font-medium text-muted-foreground",
+                size === "sm" ? "h-8 w-8 text-sm" : "h-11 w-11 text-base",
+            )}
+        >
+            {skillInitial(name)}
+        </div>
+    );
+}
+
+interface SkillListRowProps {
+    name: string;
+    slug: string;
+    isActive: boolean;
+    badge?: React.ReactNode;
+    enabled?: boolean;
+    togglePending?: boolean;
+    onToggleEnabled?: (checked: boolean) => void;
+    onSelect: () => void;
+}
+
+function SkillListRow({ name, slug, isActive, badge, enabled, togglePending, onToggleEnabled, onSelect }: SkillListRowProps) {
+    return (
+        <div
+            className={cn(
+                "flex items-center rounded-lg transition-colors",
+                isActive ? "bg-muted" : "hover:bg-muted/50",
+            )}
+        >
+            <button
+                type="button"
+                onClick={onSelect}
+                className="flex min-w-0 flex-1 items-center gap-3 rounded-lg px-3 py-2.5 text-left"
+            >
+                <SkillAvatar name={name} size="sm" />
+                <div className="min-w-0 flex-1">
+                    <div className="flex items-center gap-2">
+                        <p className="truncate text-sm font-medium text-foreground">{name}</p>
+                        {badge}
+                    </div>
+                    <p className="truncate font-mono text-xs text-muted-foreground">/{slug}</p>
+                </div>
+            </button>
+            {onToggleEnabled && (
+                <Switch
+                    checked={!!enabled}
+                    disabled={togglePending}
+                    onCheckedChange={onToggleEnabled}
+                    aria-label={`Enable ${name}`}
+                    className={cn(
+                        "mr-3 shrink-0",
+                        "data-[state=unchecked]:bg-muted-foreground/40 data-[state=unchecked]:border-muted-foreground/70",
+                        "data-[state=checked]:bg-green-600 data-[state=checked]:border-green-600",
+                        "[&>span]:bg-foreground",
+                    )}
+                />
+            )}
+        </div>
+    );
+}
+
+interface SkillsPageProps {
+    initialPersonalSkills: AgentSkillListItem[];
+    initialSharedSkills: SharedAgentSkillCatalogItem[];
+    currentUserEmail: string;
+    isOwner: boolean;
+    // Deep-link a skill as the initially-selected one (e.g. from the workspace
+    // admin table). Ignored when it doesn't match a skill visible on this page.
+    initialSelectedId?: string;
+    // Whether repository permission syncing is enabled. When off, every member
+    // sees every repo, so sharing a synced skill carries no access caveat and
+    // skips the confirmation dialog.
+    permissionSyncEnabled: boolean;
+}
+
+export function SkillsPage({
+    initialPersonalSkills,
+    initialSharedSkills,
+    currentUserEmail,
+    isOwner,
+    initialSelectedId,
+    permissionSyncEnabled,
+}: SkillsPageProps) {
+    const { toast } = useToast();
+    const [personalSkills, setPersonalSkills] = useState(() => sortAgentSkillListItems(initialPersonalSkills));
+    const [sharedSkills, setSharedSkills] = useState(() => sortSharedAgentSkillCatalogItems(initialSharedSkills));
+    const [searchQuery, setSearchQuery] = useState("");
+
+    const [selectedId, setSelectedId] = useState<string | null>(() => {
+        // Honor a deep-linked selection, but only when it matches a skill visible
+        // on this page; otherwise fall back to the first skill.
+        if (initialSelectedId
+            && (initialPersonalSkills.some((skill) => skill.id === initialSelectedId)
+                || initialSharedSkills.some((skill) => skill.id === initialSelectedId))) {
+            return initialSelectedId;
+        }
+        const first = sortAgentSkillListItems(initialPersonalSkills)[0] ?? sortSharedAgentSkillCatalogItems(initialSharedSkills)[0];
+        return first?.id ?? null;
+    });
+    const [isCreatingNew, setIsCreatingNew] = useState(false);
+    const [isEditing, setIsEditing] = useState(false);
+    const [form, setForm] = useState<AgentSkillInput>(emptySkillForm);
+    const [isSlugTouched, setIsSlugTouched] = useState(false);
+    // Bumped whenever we enter create mode or import, to remount the (uncontrolled)
+    // instructions editor with fresh content.
+    const [createEditorNonce, setCreateEditorNonce] = useState(0);
+    const markdownFileInputRef = useRef<HTMLInputElement>(null);
+    const [isRepoImportOpen, setIsRepoImportOpen] = useState(false);
+
+    const [isSaving, setIsSaving] = useState(false);
+    const [scopePendingId, setScopePendingId] = useState<string | null>(null);
+    const [adoptionPendingId, setAdoptionPendingId] = useState<string | null>(null);
+    const [deletingId, setDeletingId] = useState<string | null>(null);
+    const [sourceUpdatePendingId, setSourceUpdatePendingId] = useState<string | null>(null);
+
+    const [pendingDiscard, setPendingDiscard] = useState<{ run: () => void } | null>(null);
+    const [confirmMakePersonal, setConfirmMakePersonal] = useState<DetailSkill | null>(null);
+    const [confirmPublishSynced, setConfirmPublishSynced] = useState<DetailSkill | null>(null);
+    const [confirmDeletePersonal, setConfirmDeletePersonal] = useState<DetailSkill | null>(null);
+    const [confirmDeleteShared, setConfirmDeleteShared] = useState<DetailSkill | null>(null);
+
+    const selectedSkill: DetailSkill | null = useMemo(() => {
+        if (selectedId === null) {
+            return null;
+        }
+        const personal = personalSkills.find((skill) => skill.id === selectedId);
+        if (personal) {
+            return toDetailFromPersonal(personal, currentUserEmail);
+        }
+        const shared = sharedSkills.find((skill) => skill.id === selectedId);
+        if (shared) {
+            return toDetailFromShared(shared, isOwner);
+        }
+        return null;
+    }, [selectedId, personalSkills, sharedSkills, currentUserEmail, isOwner]);
+
+    const baselineForm: AgentSkillInput = useMemo(() => {
+        if (isCreatingNew || !selectedSkill) {
+            return emptySkillForm;
+        }
+        return {
+            name: selectedSkill.name,
+            slug: selectedSkill.slug,
+            description: selectedSkill.description,
+            instructions: selectedSkill.instructions,
+        };
+    }, [isCreatingNew, selectedSkill]);
+
+    const isFormActive = isEditing || isCreatingNew;
+    const isDirty = isFormActive && (
+        form.name !== baselineForm.name ||
+        form.slug !== baselineForm.slug ||
+        form.description !== baselineForm.description ||
+        form.instructions !== baselineForm.instructions
+    );
+
+    // Intercept cross-page navigation (sidebar links, browser back) while there
+    // are unsaved edits, and resolve it through the themed dialog below.
+    const navGuard = useUnsavedChangesGuard({ enabled: isDirty });
+
+    // In-page transitions (selecting another skill, starting a new draft) are
+    // local state, not router navigation, so they bypass `navGuard`. Route them
+    // through this helper to confirm discarding unsaved edits first.
+    const guardedTransition = (run: () => void) => {
+        if (isDirty) {
+            setPendingDiscard({ run });
+            return;
+        }
+        run();
+    };
+
+    const handleSelectSkill = (id: string) => {
+        if (id === selectedId && !isFormActive) {
+            return;
+        }
+        guardedTransition(() => {
+            setSelectedId(id);
+            setIsEditing(false);
+            setIsCreatingNew(false);
+        });
+    };
+
+    const handleStartCreate = () => {
+        guardedTransition(() => {
+            setIsCreatingNew(true);
+            setIsEditing(false);
+            setSelectedId(null);
+            setForm(emptySkillForm);
+            setIsSlugTouched(false);
+            setCreateEditorNonce((nonce) => nonce + 1);
+        });
+    };
+
+    // Drop into the create form pre-populated from a parsed markdown skill (a local
+    // file or a repository file): front matter fills name, command, and description,
+    // and the body becomes the instructions, so the user can review before saving.
+    const applyImportedSkillMarkdown = (parsed: ParsedAgentSkillMarkdown) => {
+        guardedTransition(() => {
+            setIsCreatingNew(true);
+            setIsEditing(false);
+            setSelectedId(null);
+            setForm({
+                name: parsed.name ?? "",
+                slug: parsed.slug ?? "",
+                description: parsed.description ?? "",
+                instructions: parsed.instructions,
+            });
+            setIsSlugTouched(Boolean(parsed.slug || parsed.name));
+            setCreateEditorNonce((nonce) => nonce + 1);
+            toast({
+                title: parsed.frontmatterError ? "Front matter issue" : undefined,
+                description: parsed.frontmatterError
+                    ? `Markdown skill imported. ${parsed.frontmatterError}`
+                    : "Markdown skill imported.",
+                variant: parsed.frontmatterError ? "destructive" : undefined,
+            });
+        });
+    };
+
+    // Repository imports create a read-only skill that stays linked to its source
+    // file, so (unlike file import) we create it directly rather than dropping into
+    // the editable form. The repo → file navigation is itself the confirmation.
+    const handleImportRepoSkill = (imported: ImportedRepoSkill) => {
+        guardedTransition(() => { void createSkillFromRepo(imported); });
+    };
+
+    const createSkillFromRepo = async (imported: ImportedRepoSkill) => {
+        const result = await createPersonalAgentSkill({
+            name: imported.parsed.name ?? "",
+            slug: imported.parsed.slug ?? "",
+            description: imported.parsed.description ?? "",
+            instructions: imported.parsed.instructions,
+            source: imported.source,
+        });
+        if (isServiceError(result)) {
+            toast({ title: "Error", description: result.message, variant: "destructive" });
+            return;
+        }
+        setPersonalSkills((current) => sortAgentSkillListItems([result, ...current.filter((item) => item.id !== result.id)]));
+        exitFormMode();
+        setSelectedId(result.id);
+        toast({
+            title: imported.parsed.frontmatterError ? "Front matter issue" : undefined,
+            description: imported.parsed.frontmatterError
+                ? `Skill imported from repository. ${imported.parsed.frontmatterError}`
+                : "Skill imported from repository.",
+            variant: imported.parsed.frontmatterError ? "destructive" : undefined,
+        });
+    };
+
+    const handleUpdateFromSource = async (skill: DetailSkill) => {
+        setSourceUpdatePendingId(skill.id);
+        try {
+            if (skill.scope === "SHARED") {
+                const result = await updateSharedAgentSkillFromSource(skill.id);
+                if (isServiceError(result)) {
+                    toast({ title: "Error", description: result.message, variant: "destructive" });
+                    return;
+                }
+                setSharedSkills((current) => sortSharedAgentSkillCatalogItems(current.map((item) =>
+                    item.id === result.id ? result : item,
+                )));
+            } else {
+                const result = await updatePersonalAgentSkillFromSource(skill.id);
+                if (isServiceError(result)) {
+                    toast({ title: "Error", description: result.message, variant: "destructive" });
+                    return;
+                }
+                setPersonalSkills((current) => sortAgentSkillListItems(current.map((item) =>
+                    item.id === result.id ? result : item,
+                )));
+            }
+            toast({ description: "Skill updated from source." });
+        } catch {
+            toast({ title: "Error", description: "Failed to update from source.", variant: "destructive" });
+        } finally {
+            setSourceUpdatePendingId(null);
+        }
+    };
+
+    const triggerMarkdownImport = () => {
+        markdownFileInputRef.current?.click();
+    };
+
+    const handleImportMarkdownFile = async (event: ChangeEvent<HTMLInputElement>) => {
+        const input = event.currentTarget;
+        const file = input.files?.[0];
+        input.value = "";
+
+        if (!file) {
+            return;
+        }
+
+        if (!/\.(md|markdown)$/i.test(file.name)) {
+            toast({ title: "Unsupported file", description: "Choose a markdown file ending in .md or .markdown.", variant: "destructive" });
+            return;
+        }
+
+        let text: string;
+        try {
+            text = await file.text();
+        } catch {
+            toast({ title: "Error", description: "Failed to import markdown file.", variant: "destructive" });
+            return;
+        }
+
+        applyImportedSkillMarkdown(parseAgentSkillMarkdown(text, file.name));
+    };
+
+    const handleStartEdit = () => {
+        if (!selectedSkill) {
+            return;
+        }
+        setForm({
+            name: selectedSkill.name,
+            slug: selectedSkill.slug,
+            description: selectedSkill.description,
+            instructions: selectedSkill.instructions,
+        });
+        setIsSlugTouched(true);
+        setIsEditing(true);
+    };
+
+    const exitFormMode = () => {
+        setIsEditing(false);
+        setIsCreatingNew(false);
+        setForm(emptySkillForm);
+        setIsSlugTouched(false);
+    };
+
+    const handleCancelEdit = () => {
+        guardedTransition(exitFormMode);
+    };
+
+    const handleNameChange = (name: string) => {
+        setForm((current) => ({
+            ...current,
+            name,
+            slug: isSlugTouched ? current.slug : normalizeAgentSkillSlug(name),
+        }));
+    };
+
+    // Replace a shared skill in local state, preserving catalog-only flags that
+    // the edit action does not return.
+    const mergeSharedSkill = (id: string, updated: AgentSkillListItem) => {
+        setSharedSkills((current) => sortSharedAgentSkillCatalogItems(current.map((item) =>
+            item.id === id
+                ? {
+                    ...item,
+                    name: updated.name,
+                    slug: updated.slug,
+                    description: updated.description,
+                    instructions: updated.instructions,
+                    updatedAt: updated.updatedAt,
+                }
+                : item,
+        )));
+    };
+
+    const handleSubmit = async (event: FormEvent<HTMLFormElement>) => {
+        event.preventDefault();
+        setIsSaving(true);
+        try {
+            if (isCreatingNew) {
+                const result = await createPersonalAgentSkill(form);
+                if (isServiceError(result)) {
+                    toast({ title: "Error", description: result.message, variant: "destructive" });
+                    return;
+                }
+                setPersonalSkills((current) => sortAgentSkillListItems([result, ...current]));
+                exitFormMode();
+                setSelectedId(result.id);
+                toast({ description: "Skill created." });
+                return;
+            }
+
+            if (!selectedSkill) {
+                return;
+            }
+
+            const result = selectedSkill.scope === "SHARED"
+                ? await updateSharedAgentSkill({ id: selectedSkill.id, ...form })
+                : await updatePersonalAgentSkill({ id: selectedSkill.id, ...form });
+            if (isServiceError(result)) {
+                toast({ title: "Error", description: result.message, variant: "destructive" });
+                return;
+            }
+
+            if (selectedSkill.scope === "SHARED") {
+                mergeSharedSkill(selectedSkill.id, result);
+            } else {
+                setPersonalSkills((current) => sortAgentSkillListItems(current.map((item) =>
+                    item.id === result.id ? result : item,
+                )));
+            }
+            exitFormMode();
+            toast({ description: "Skill updated." });
+        } catch {
+            toast({ title: "Error", description: "Failed to save skill.", variant: "destructive" });
+        } finally {
+            setIsSaving(false);
+        }
+    };
+
+    const handlePublish = async (skill: DetailSkill) => {
+        setScopePendingId(skill.id);
+        try {
+            const result = await publishPersonalAgentSkillToShared(skill.id);
+            if (isServiceError(result)) {
+                toast({ title: "Error", description: result.message, variant: "destructive" });
+                return;
+            }
+            setPersonalSkills((current) => current.filter((item) => item.id !== skill.id));
+            setSharedSkills((current) => sortSharedAgentSkillCatalogItems([
+                result,
+                ...current.filter((item) => item.id !== result.id),
+            ]));
+            setConfirmPublishSynced(null);
+            setSelectedId(result.id);
+            toast({ description: "Skill shared with your workspace." });
+        } catch {
+            toast({ title: "Error", description: "Failed to publish skill.", variant: "destructive" });
+        } finally {
+            setScopePendingId(null);
+        }
+    };
+
+    const handleMakePersonal = async (skill: DetailSkill) => {
+        setScopePendingId(skill.id);
+        try {
+            const result = await makeSharedAgentSkillPersonal(skill.id);
+            if (isServiceError(result)) {
+                toast({ title: "Error", description: result.message, variant: "destructive" });
+                return;
+            }
+            setPersonalSkills((current) => sortAgentSkillListItems([
+                result,
+                ...current.filter((item) => item.id !== result.id),
+            ]));
+            if (skill.isCreatedByUser) {
+                setSharedSkills((current) => current.filter((item) => item.id !== skill.id));
+            } else {
+                setSharedSkills((current) => sortSharedAgentSkillCatalogItems(current.map((item) =>
+                    item.id === skill.id
+                        ? { ...item, isAdopted: false, isRemoved: item.autoEnrolled, isVisibleToUser: false }
+                        : item,
+                )));
+            }
+            setConfirmMakePersonal(null);
+            setSelectedId(result.id);
+            toast({ description: "Skill made personal." });
+        } catch {
+            toast({ title: "Error", description: "Failed to make skill personal.", variant: "destructive" });
+        } finally {
+            setScopePendingId(null);
+        }
+    };
+
+    // The header "Shared" toggle switches a skill's scope: a personal skill is
+    // published to the workspace catalog; a shared skill the user can manage is
+    // made personal again (behind a confirm). It is disabled for shared skills
+    // created by others.
+    const handleSharedToggle = (skill: DetailSkill, shared: boolean) => {
+        if (scopePendingId !== null) {
+            return;
+        }
+        if (skill.scope === "PERSONAL" && shared) {
+            // Sharing a synced skill widens who can reach its repo-derived content,
+            // so confirm first — but only when permission syncing is on. With
+            // syncing off every member already sees every repo, so there's no
+            // access caveat to warn about and it publishes immediately, like a
+            // plain personal skill.
+            if (skill.source && permissionSyncEnabled) {
+                setConfirmPublishSynced(skill);
+            } else {
+                void handlePublish(skill);
+            }
+            return;
+        }
+        if (skill.scope === "SHARED" && !shared && skill.canManage) {
+            setConfirmMakePersonal(skill);
+        }
+    };
+
+    const handleAdoptionChange = async (skillId: string, adopt: boolean) => {
+        setAdoptionPendingId(skillId);
+        try {
+            const result = adopt
+                ? await adoptSharedSkill(skillId)
+                : await unadoptSharedSkill(skillId);
+            if (isServiceError(result)) {
+                toast({ title: "Error", description: result.message, variant: "destructive" });
+                return;
+            }
+            setSharedSkills((current) => sortSharedAgentSkillCatalogItems(current.map((item) =>
+                item.id === skillId
+                    ? {
+                        ...item,
+                        isAdopted: adopt,
+                        isRemoved: adopt ? false : item.autoEnrolled,
+                        isVisibleToUser: adopt,
+                    }
+                    : item,
+            )));
+            toast({ description: adopt ? "Skill added to your commands." : "Skill removed from your commands." });
+        } catch {
+            toast({ title: "Error", description: "Failed to update skill.", variant: "destructive" });
+        } finally {
+            setAdoptionPendingId(null);
+        }
+    };
+
+    const handleDeletePersonal = async (skill: DetailSkill) => {
+        setDeletingId(skill.id);
+        try {
+            const result = await deletePersonalAgentSkill(skill.id);
+            if (isServiceError(result)) {
+                toast({ title: "Error", description: result.message, variant: "destructive" });
+                return;
+            }
+            setPersonalSkills((current) => current.filter((item) => item.id !== skill.id));
+            setConfirmDeletePersonal(null);
+            if (selectedId === skill.id) {
+                setSelectedId(null);
+            }
+            toast({ description: "Skill deleted." });
+        } catch {
+            toast({ title: "Error", description: "Failed to delete skill.", variant: "destructive" });
+        } finally {
+            setDeletingId(null);
+        }
+    };
+
+    const handleDeleteShared = async (skill: DetailSkill) => {
+        setDeletingId(skill.id);
+        try {
+            const result = await deleteSharedAgentSkill(skill.id);
+            if (isServiceError(result)) {
+                toast({ title: "Error", description: result.message, variant: "destructive" });
+                return;
+            }
+            setSharedSkills((current) => current.filter((item) => item.id !== skill.id));
+            setConfirmDeleteShared(null);
+            if (selectedId === skill.id) {
+                setSelectedId(null);
+            }
+            toast({ description: "Shared skill deleted." });
+        } catch {
+            toast({ title: "Error", description: "Failed to delete shared skill.", variant: "destructive" });
+        } finally {
+            setDeletingId(null);
+        }
+    };
+
+    const filteredPersonal = useMemo(() => {
+        const q = searchQuery.trim().toLowerCase();
+        if (!q) {
+            return personalSkills;
+        }
+        return personalSkills.filter((skill) =>
+            skill.name.toLowerCase().includes(q) || skill.slug.toLowerCase().includes(q));
+    }, [personalSkills, searchQuery]);
+
+    const filteredShared = useMemo(() => {
+        const q = searchQuery.trim().toLowerCase();
+        if (!q) {
+            return sharedSkills;
+        }
+        return sharedSkills.filter((skill) =>
+            skill.name.toLowerCase().includes(q) || skill.slug.toLowerCase().includes(q));
+    }, [sharedSkills, searchQuery]);
+
+    return (
+        <>
+            <div className="flex h-full min-h-0">
+                {/* Master list */}
+                <aside className="flex w-[320px] shrink-0 flex-col border-r">
+                    <div className="flex shrink-0 items-center justify-between px-5 pb-3 pt-5">
+                        <h2 className="text-xl font-semibold tracking-tight text-foreground">Skills</h2>
+                        <input
+                            ref={markdownFileInputRef}
+                            type="file"
+                            accept=".md,.markdown,text/markdown,text/plain"
+                            className="hidden"
+                            onChange={handleImportMarkdownFile}
+                        />
+                        <DropdownMenu>
+                            <DropdownMenuTrigger asChild>
+                                <Button
+                                    variant="outline"
+                                    size="icon"
+                                    className="h-8 w-8"
+                                    aria-label="Add skill"
+                                >
+                                    <PlusIcon className="h-4 w-4" />
+                                </Button>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent align="end">
+                                <DropdownMenuItem onClick={handleStartCreate}>
+                                    <PlusIcon className="mr-2 h-4 w-4" />
+                                    New skill
+                                </DropdownMenuItem>
+                                <DropdownMenuItem onClick={triggerMarkdownImport}>
+                                    <UploadIcon className="mr-2 h-4 w-4" />
+                                    Import from file
+                                </DropdownMenuItem>
+                                <DropdownMenuItem onClick={() => setIsRepoImportOpen(true)}>
+                                    <FolderGit2Icon className="mr-2 h-4 w-4" />
+                                    Import from repository
+                                </DropdownMenuItem>
+                            </DropdownMenuContent>
+                        </DropdownMenu>
+                    </div>
+                    <div className="shrink-0 px-5 pb-3">
+                        <div className="relative">
+                            <SearchIcon className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+                            <Input
+                                placeholder="Search skills..."
+                                value={searchQuery}
+                                onChange={(event) => setSearchQuery(event.target.value)}
+                                className="h-9 pl-9"
+                            />
+                        </div>
+                    </div>
+
+                    <div className="min-h-0 flex-1 space-y-4 overflow-y-auto px-3 pb-4">
+                        <SkillListSection
+                            label="Personal"
+                            count={filteredPersonal.length}
+                            emptyLabel={searchQuery.trim() ? "No matches." : "No personal skills yet."}
+                        >
+                            {filteredPersonal.map((skill) => (
+                                <SkillListRow
+                                    key={skill.id}
+                                    name={skill.name}
+                                    slug={skill.slug}
+                                    isActive={selectedId === skill.id && !isCreatingNew}
+                                    onSelect={() => handleSelectSkill(skill.id)}
+                                    badge={skill.source ? <SyncedSkillBadge /> : undefined}
+                                />
+                            ))}
+                        </SkillListSection>
+
+                        <SkillListSection
+                            label="Shared"
+                            count={filteredShared.length}
+                            emptyLabel={searchQuery.trim() ? "No matches." : "No shared skills yet."}
+                        >
+                            {filteredShared.map((skill) => (
+                                <SkillListRow
+                                    key={skill.id}
+                                    name={skill.name}
+                                    slug={skill.slug}
+                                    isActive={selectedId === skill.id && !isCreatingNew}
+                                    onSelect={() => handleSelectSkill(skill.id)}
+                                    enabled={skill.isVisibleToUser}
+                                    togglePending={adoptionPendingId === skill.id}
+                                    onToggleEnabled={(checked) => void handleAdoptionChange(skill.id, checked)}
+                                    badge={
+                                        skill.source || skill.autoEnrolled ? (
+                                            <>
+                                                {skill.source && <SyncedSkillBadge />}
+                                                {skill.autoEnrolled && <AutoEnrolledSkillBadge />}
+                                            </>
+                                        ) : undefined
+                                    }
+                                />
+                            ))}
+                        </SkillListSection>
+                    </div>
+                </aside>
+
+                {/* Detail pane */}
+                <section className="flex min-w-0 flex-1 flex-col">
+                    {isCreatingNew ? (
+                        <SkillEditForm
+                            mode="create"
+                            form={form}
+                            isSaving={isSaving}
+                            isDirty={isDirty}
+                            onNameChange={handleNameChange}
+                            onSlugChange={(slug) => { setIsSlugTouched(true); setForm((current) => ({ ...current, slug })); }}
+                            onSlugBlur={() => setForm((current) => ({ ...current, slug: normalizeAgentSkillSlug(current.slug) }))}
+                            onDescriptionChange={(description) => setForm((current) => ({ ...current, description }))}
+                            onInstructionsChange={(instructions) => setForm((current) => ({ ...current, instructions }))}
+                            onSubmit={handleSubmit}
+                            onCancel={handleCancelEdit}
+                            editorKey={`new-${createEditorNonce}`}
+                        />
+                    ) : selectedSkill === null ? (
+                        <SkillsEmptyState onCreate={handleStartCreate} />
+                    ) : isEditing ? (
+                        <SkillEditForm
+                            mode="edit"
+                            form={form}
+                            isSaving={isSaving}
+                            isDirty={isDirty}
+                            lockedSource={selectedSkill.source}
+                            onNameChange={handleNameChange}
+                            onSlugChange={(slug) => { setIsSlugTouched(true); setForm((current) => ({ ...current, slug })); }}
+                            onSlugBlur={() => setForm((current) => ({ ...current, slug: normalizeAgentSkillSlug(current.slug) }))}
+                            onDescriptionChange={(description) => setForm((current) => ({ ...current, description }))}
+                            onInstructionsChange={(instructions) => setForm((current) => ({ ...current, instructions }))}
+                            onSubmit={handleSubmit}
+                            onCancel={handleCancelEdit}
+                            editorKey={`edit-${selectedSkill.id}`}
+                        />
+                    ) : (
+                        <SkillDetailView
+                            skill={selectedSkill}
+                            workspaceAdminHref={
+                                isOwner && selectedSkill.scope === "SHARED"
+                                    ? `/settings/workspaceAskAgent?skillSearch=${encodeURIComponent(selectedSkill.name)}`
+                                    : undefined
+                            }
+                            scopePending={scopePendingId === selectedSkill.id}
+                            sourceUpdatePending={sourceUpdatePendingId === selectedSkill.id}
+                            onSharedToggle={(shared) => handleSharedToggle(selectedSkill, shared)}
+                            onEdit={handleStartEdit}
+                            onUpdateFromSource={() => void handleUpdateFromSource(selectedSkill)}
+                            onDelete={() => {
+                                if (selectedSkill.scope === "SHARED") {
+                                    setConfirmDeleteShared(selectedSkill);
+                                } else {
+                                    setConfirmDeletePersonal(selectedSkill);
+                                }
+                            }}
+                        />
+                    )}
+                </section>
+            </div>
+
+            <ImportFromRepoDialog
+                open={isRepoImportOpen}
+                onOpenChange={setIsRepoImportOpen}
+                onImport={handleImportRepoSkill}
+                onError={(message) => toast({ title: "Error", description: message, variant: "destructive" })}
+            />
+
+            {/* Discard-edits confirmation for in-page transitions */}
+            <AlertDialog
+                open={pendingDiscard !== null}
+                onOpenChange={(open) => { if (!open) { setPendingDiscard(null); } }}
+            >
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>Discard unsaved changes?</AlertDialogTitle>
+                        <AlertDialogDescription>
+                            You have unsaved changes to this skill. If you continue, your progress will be lost.
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <AlertDialogFooter>
+                        <AlertDialogCancel onClick={() => setPendingDiscard(null)}>Keep editing</AlertDialogCancel>
+                        <AlertDialogAction
+                            className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                            onClick={() => {
+                                pendingDiscard?.run();
+                                setPendingDiscard(null);
+                            }}
+                        >
+                            Discard changes
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+
+            {/* Discard-edits confirmation for cross-page navigation */}
+            <AlertDialog
+                open={navGuard.active}
+                onOpenChange={(open) => { if (!open) { navGuard.resolve(false); } }}
+            >
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>Discard unsaved changes?</AlertDialogTitle>
+                        <AlertDialogDescription>
+                            You have unsaved changes to this skill. If you leave now, your progress will be lost.
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <AlertDialogFooter>
+                        <AlertDialogCancel onClick={() => navGuard.resolve(false)}>Keep editing</AlertDialogCancel>
+                        <AlertDialogAction
+                            className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                            onClick={() => navGuard.resolve(true)}
+                        >
+                            Discard changes
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+
+            <AlertDialog
+                open={confirmMakePersonal !== null}
+                onOpenChange={(open) => {
+                    if (!open && scopePendingId === null) {
+                        setConfirmMakePersonal(null);
+                    }
+                }}
+            >
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>Make Shared Skill Personal</AlertDialogTitle>
+                        <AlertDialogDescription>
+                            Make <span className="font-semibold text-foreground">{confirmMakePersonal?.name}</span> personal? This removes the <span className="font-mono text-foreground">/{confirmMakePersonal?.slug}</span> command from the shared catalog for everyone and keeps a personal copy for you.
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={scopePendingId !== null}>Cancel</AlertDialogCancel>
+                        <AlertDialogAction
+                            disabled={scopePendingId !== null}
+                            onClick={(event) => {
+                                event.preventDefault();
+                                if (confirmMakePersonal) {
+                                    void handleMakePersonal(confirmMakePersonal);
+                                }
+                            }}
+                            className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                        >
+                            {scopePendingId !== null ? "Making personal..." : "Make personal"}
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+
+            <AlertDialog
+                open={confirmPublishSynced !== null}
+                onOpenChange={(open) => {
+                    if (!open && scopePendingId === null) {
+                        setConfirmPublishSynced(null);
+                    }
+                }}
+            >
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>Share synced skill with your workspace?</AlertDialogTitle>
+                        <AlertDialogDescription>
+                            <span className="font-semibold text-foreground">{confirmPublishSynced?.name}</span>{" "}
+                            is synced from{" "}
+                            <span className="font-medium text-foreground">{confirmPublishSynced?.source?.repoName}</span>
+                            . Sharing publishes the{" "}
+                            <span className="font-mono text-foreground">/{confirmPublishSynced?.slug}</span>{" "}
+                            command to your workspace and keeps it synced to the source file.
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <div className="flex gap-2 rounded-md border border-amber-500/40 bg-amber-500/10 px-3 py-2.5 text-sm text-muted-foreground">
+                        <AlertTriangleIcon className="mt-0.5 h-4 w-4 shrink-0 text-amber-600 dark:text-amber-500" />
+                        <p>
+                            Organization owners who don&apos;t have access to{" "}
+                            <span className="font-medium text-foreground">{confirmPublishSynced?.source?.repoName}</span>{" "}
+                            will still be able to see and manage this skill from workspace settings. Members without access to the repository won&apos;t see it.
+                        </p>
+                    </div>
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={scopePendingId !== null}>Cancel</AlertDialogCancel>
+                        <AlertDialogAction
+                            disabled={scopePendingId !== null}
+                            onClick={(event) => {
+                                event.preventDefault();
+                                if (confirmPublishSynced) {
+                                    void handlePublish(confirmPublishSynced);
+                                }
+                            }}
+                        >
+                            {scopePendingId !== null ? "Sharing..." : "Share skill"}
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+
+            <AlertDialog
+                open={confirmDeletePersonal !== null}
+                onOpenChange={(open) => {
+                    if (!open && deletingId === null) {
+                        setConfirmDeletePersonal(null);
+                    }
+                }}
+            >
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>Delete Skill</AlertDialogTitle>
+                        <AlertDialogDescription>
+                            Are you sure you want to delete <span className="font-semibold text-foreground">{confirmDeletePersonal?.name}</span>? This will remove the <span className="font-mono text-foreground">/{confirmDeletePersonal?.slug}</span> command.
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={deletingId !== null}>Cancel</AlertDialogCancel>
+                        <AlertDialogAction
+                            disabled={deletingId !== null}
+                            onClick={(event) => {
+                                event.preventDefault();
+                                if (confirmDeletePersonal) {
+                                    void handleDeletePersonal(confirmDeletePersonal);
+                                }
+                            }}
+                            className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                        >
+                            {deletingId !== null ? "Deleting..." : "Delete"}
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+
+            <DeleteWorkspaceSkillDialog
+                skill={confirmDeleteShared}
+                isDeleting={deletingId !== null}
+                onOpenChange={(open) => {
+                    if (!open && deletingId === null) {
+                        setConfirmDeleteShared(null);
+                    }
+                }}
+                onConfirm={() => {
+                    if (confirmDeleteShared) {
+                        void handleDeleteShared(confirmDeleteShared);
+                    }
+                }}
+            />
+        </>
+    );
+}
+
+function SkillListSection({
+    label,
+    count,
+    emptyLabel,
+    children,
+}: {
+    label: string;
+    count: number;
+    emptyLabel: string;
+    children: React.ReactNode;
+}) {
+    return (
+        <div className="space-y-1">
+            <div className="flex items-center justify-between px-3 py-1">
+                <p className="text-xs font-semibold uppercase tracking-wider text-muted-foreground">{label}</p>
+                <p className="text-xs text-muted-foreground">{count}</p>
+            </div>
+            {count === 0 ? (
+                <p className="px-3 py-2 text-xs text-muted-foreground">{emptyLabel}</p>
+            ) : (
+                children
+            )}
+        </div>
+    );
+}
+
+function SkillsEmptyState({ onCreate }: { onCreate: () => void }) {
+    return (
+        <div className="flex flex-1 flex-col items-center justify-center px-6 text-center">
+            <div className="mb-4 rounded-full bg-muted p-3">
+                <BookOpenIcon className="h-6 w-6 text-muted-foreground" />
+            </div>
+            <p className="mb-1 text-sm font-medium text-foreground">No skill selected</p>
+            <p className="max-w-sm text-sm text-muted-foreground">
+                Select a skill to view its details, or create a personal slash-command workflow for Ask Sourcebot.
+            </p>
+            <Button variant="outline" className="mt-4" onClick={onCreate}>
+                <PlusIcon className="mr-2 h-4 w-4" />
+                Create skill
+            </Button>
+        </div>
+    );
+}
+
+interface SkillDetailViewProps {
+    skill: DetailSkill;
+    scopePending: boolean;
+    sourceUpdatePending: boolean;
+    // When set, an owner can jump to the workspace admin table pre-filtered to
+    // this shared skill. Undefined for personal skills or non-owners.
+    workspaceAdminHref?: string;
+    onSharedToggle: (shared: boolean) => void;
+    onEdit: () => void;
+    onUpdateFromSource: () => void;
+    onDelete: () => void;
+}
+
+function SkillDetailView({
+    skill,
+    scopePending,
+    sourceUpdatePending,
+    workspaceAdminHref,
+    onSharedToggle,
+    onEdit,
+    onUpdateFromSource,
+    onDelete,
+}: SkillDetailViewProps) {
+    const isShared = skill.scope === "SHARED";
+    const canManage = skill.canManage;
+    const sharedToggleDisabled = scopePending || (isShared && !canManage);
+
+    // Track the rendered-markdown element via state (not a plain ref) so the TOC
+    // hook re-runs once it mounts. The detail view is static after selection, so a
+    // ref's `.current` would still read null on the render the hook depends on.
+    const [instructionsEl, setInstructionsEl] = useState<HTMLDivElement | null>(null);
+    const [scrollEl, setScrollEl] = useState<HTMLDivElement | null>(null);
+    const [outlineOpen, setOutlineOpen] = useState(false);
+    const { tocItems, activeId } = useExtractTOCItems({ target: instructionsEl, root: scrollEl });
+
+    return (
+        <div className="@container flex h-full min-h-0 flex-col">
+            {/* Header */}
+            <div className="flex shrink-0 items-center justify-between gap-6 border-b px-6 pb-5 pt-6">
+                <div className="flex min-w-0 max-w-5xl items-center gap-3">
+                    <SkillAvatar name={skill.name} />
+                    <div className="min-w-0">
+                        <div className="flex items-center gap-2">
+                            <h3 className="truncate text-xl font-semibold tracking-tight text-foreground">{skill.name}</h3>
+                            <SkillCommandBadge slug={skill.slug} />
+                        </div>
+                        {skill.description && (
+                            <p className="mt-1 line-clamp-2 text-sm text-muted-foreground">{skill.description}</p>
+                        )}
+                    </div>
+                </div>
+                {canManage && (
+                    <div className="flex shrink-0 items-center gap-3">
+                        {/* Sharing a synced skill keeps it linked to its source: the
+                            org-wide command stays synced and the author/owners refresh
+                            it from source. Name + command stay editable either way. */}
+                        <label className="flex items-center gap-2 text-sm font-medium text-muted-foreground">
+                            <span>Shared</span>
+                            {scopePending ? (
+                                <Loader2Icon className="h-4 w-4 animate-spin" />
+                            ) : (
+                                <Switch
+                                    checked={isShared}
+                                    disabled={sharedToggleDisabled}
+                                    onCheckedChange={(checked) => onSharedToggle(checked)}
+                                    aria-label="Shared"
+                                />
+                            )}
+                        </label>
+                        <Button variant="outline" size="sm" onClick={onEdit}>
+                            <PencilIcon className="mr-2 h-4 w-4" />
+                            Edit
+                        </Button>
+                        <DropdownMenu modal={false}>
+                            <DropdownMenuTrigger asChild>
+                                <Button variant="ghost" size="icon" className="h-8 w-8" aria-label={`Actions for ${skill.name}`}>
+                                    <MoreHorizontalIcon className="h-4 w-4" />
+                                </Button>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent align="end">
+                                {workspaceAdminHref && (
+                                    <DropdownMenuItem asChild>
+                                        <Link href={workspaceAdminHref}>
+                                            <Building2Icon className="mr-2 h-4 w-4" />
+                                            View in workspace settings
+                                        </Link>
+                                    </DropdownMenuItem>
+                                )}
+                                <DropdownMenuItem
+                                    className="text-destructive focus:text-destructive"
+                                    onClick={onDelete}
+                                >
+                                    <Trash2Icon className="mr-2 h-4 w-4" />
+                                    Delete
+                                </DropdownMenuItem>
+                            </DropdownMenuContent>
+                        </DropdownMenu>
+                    </div>
+                )}
+            </div>
+
+            {skill.source && (
+                <SkillSourceSyncBanner
+                    skill={skill}
+                    source={skill.source}
+                    canUpdate={canManage}
+                    updatePending={sourceUpdatePending}
+                    onUpdateFromSource={onUpdateFromSource}
+                />
+            )}
+
+            {/* Metadata folds to chips until the pane is wide enough for the right rail. */}
+            <div className="flex shrink-0 flex-wrap items-center gap-2 border-b px-6 py-3 @6xl:hidden">
+                <SkillMetaChips skill={skill} />
+            </div>
+
+            {/* Body: outline rail · reading column · metadata rail */}
+            <div className="flex min-h-0 flex-1 gap-6 px-6 py-4">
+                {tocItems.length > 0 && (
+                    <div className="hidden w-48 shrink-0 overflow-y-auto @3xl:block">
+                        <p className="mb-2 text-xs font-semibold uppercase tracking-wider text-muted-foreground">
+                            On this page
+                        </p>
+                        <TableOfContents tocItems={tocItems} activeId={activeId} />
+                    </div>
+                )}
+                <div className="flex min-w-0 flex-1 flex-col">
+                    <div className="mx-auto flex min-h-0 w-full max-w-[85ch] flex-1 flex-col">
+                        <div className="mb-3 flex items-center gap-2">
+                            <span className="rounded bg-muted px-1.5 py-0.5 font-mono text-[11px] text-muted-foreground">markdown</span>
+                            <span className="text-xs text-muted-foreground">
+                                {skill.instructions.length.toLocaleString()} / {INSTRUCTIONS_MAX_LENGTH.toLocaleString()}
+                            </span>
+                            {tocItems.length > 0 && (
+                                <Popover open={outlineOpen} onOpenChange={setOutlineOpen}>
+                                    <PopoverTrigger asChild>
+                                        <Button variant="outline" size="sm" className="ml-auto h-7 gap-1.5 @3xl:hidden">
+                                            <ListIcon className="h-3.5 w-3.5" />
+                                            On this page
+                                        </Button>
+                                    </PopoverTrigger>
+                                    <PopoverContent align="end" className="max-h-80 w-64 overflow-y-auto p-2">
+                                        <div onClick={() => setOutlineOpen(false)}>
+                                            <TableOfContents tocItems={tocItems} activeId={activeId} />
+                                        </div>
+                                    </PopoverContent>
+                                </Popover>
+                            )}
+                        </div>
+                        <div ref={setScrollEl} className="min-h-0 flex-1 overflow-y-auto rounded-md bg-muted/20 px-4 py-3">
+                            <MarkdownRenderer
+                                key={`view-${skill.id}`}
+                                ref={setInstructionsEl}
+                                content={skill.instructions}
+                                escapeHtml
+                                className="prose-sm prose-headings:scroll-mt-3 max-w-none"
+                            />
+                        </div>
+                    </div>
+                </div>
+                <div className="hidden w-72 shrink-0 @6xl:block">
+                    <div className="space-y-4 rounded-lg border bg-card p-4">
+                        <SkillDetailMetaFields skill={skill} />
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}
+
+function SkillMetaChips({ skill }: { skill: DetailSkill }) {
+    const isShared = skill.scope === "SHARED";
+    const chipClass = "inline-flex items-center gap-1.5 rounded-md border bg-muted/40 px-2 py-1 text-xs text-muted-foreground";
+    return (
+        <>
+            <span className={chipClass}>
+                {isShared ? <Building2Icon className="h-3.5 w-3.5" /> : <BookOpenIcon className="h-3.5 w-3.5" />}
+                {isShared ? "Shared · workspace" : "Personal · only you"}
+            </span>
+            <span className={chipClass}>{skill.addedByEmail || "Unknown"}</span>
+            <span className={chipClass}>Updated {formatUpdatedAt(skill.updatedAt)}</span>
+        </>
+    );
+}
+
+function SkillDetailMetaFields({ skill }: { skill: DetailSkill }) {
+    const isShared = skill.scope === "SHARED";
+    return (
+        <>
+            <DetailMetaField label="Visibility">
+                <span className="inline-flex items-center gap-1.5">
+                    {isShared ? <Building2Icon className="h-3.5 w-3.5" /> : <BookOpenIcon className="h-3.5 w-3.5" />}
+                    {isShared ? "Shared · workspace" : "Personal · only you"}
+                </span>
+            </DetailMetaField>
+            <DetailMetaField label="Added by">
+                {skill.addedByEmail || "Unknown"}
+            </DetailMetaField>
+            <DetailMetaField label="Updated">
+                {formatUpdatedAt(skill.updatedAt)}
+            </DetailMetaField>
+        </>
+    );
+}
+
+function DetailMetaField({ label, children }: { label: string; children: React.ReactNode }) {
+    return (
+        <div className="min-w-0">
+            <p className="mb-1 text-xs font-semibold uppercase tracking-wider text-muted-foreground">{label}</p>
+            <p className="truncate text-sm text-foreground">{children}</p>
+        </div>
+    );
+}
+
+// Small marker on personal list rows for skills mirrored from a repository file.
+function SyncedSkillBadge() {
+    return (
+        <span
+            className="inline-flex shrink-0 items-center gap-1 rounded border border-border bg-muted/40 px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground"
+            title="Synced from a repository"
+        >
+            <FolderGit2Icon className="h-3 w-3" />
+            Synced
+        </span>
+    );
+}
+
+// Banner shown above a synced skill's content: provenance on the left, and — for
+// users who can refresh it (a personal skill's owner, or a shared skill's author /
+// org owner) — a live freshness check and the "Update from source" action when the
+// indexed file has moved ahead of the imported version. Adopters who can't manage a
+// shared skill see only the provenance.
+function SkillSourceSyncBanner({
+    skill,
+    source,
+    canUpdate,
+    updatePending,
+    onUpdateFromSource,
+}: {
+    skill: DetailSkill;
+    source: AgentSkillSourceRef;
+    canUpdate: boolean;
+    updatePending: boolean;
+    onUpdateFromSource: () => void;
+}) {
+    // Keyed on updatedAt so the check re-runs after an update bumps the skill. Only
+    // runs for users who can act on it — there's no point surfacing staleness to an
+    // adopter who can't refresh the org-wide command.
+    const { data, isLoading, isError } = useQuery({
+        queryKey: ["skillSourceStatus", skill.id, skill.updatedAt],
+        queryFn: () => unwrapServiceError(getSkillSourceStatus(skill.id)),
+        retry: false,
+        enabled: canUpdate,
+    });
+    const status = data?.status;
+
+    return (
+        <div className="flex shrink-0 flex-wrap items-center justify-between gap-3 border-b bg-muted/20 px-6 py-3">
+            <div className="flex min-w-0 items-center gap-2 text-sm text-muted-foreground">
+                <FolderGit2Icon className="h-4 w-4 shrink-0" />
+                <span className="shrink-0">Synced from</span>
+                <span className="truncate font-medium text-foreground">{source.repoName}</span>
+                <span className="shrink-0 text-muted-foreground/60">·</span>
+                <span className="truncate font-mono text-xs">{source.filePath}</span>
+            </div>
+            {canUpdate && (
+                <div className="flex shrink-0 items-center gap-3">
+                    <SkillSourceStatusIndicator status={status} isLoading={isLoading} isError={isError} />
+                    {status === "update_available" && (
+                        <Button size="sm" onClick={onUpdateFromSource} disabled={updatePending}>
+                            {updatePending ? (
+                                <Loader2Icon className="mr-2 h-4 w-4 animate-spin" />
+                            ) : (
+                                <RefreshCwIcon className="mr-2 h-4 w-4" />
+                            )}
+                            {updatePending ? "Updating..." : "Update from source"}
+                        </Button>
+                    )}
+                </div>
+            )}
+        </div>
+    );
+}
+
+function SkillSourceStatusIndicator({
+    status,
+    isLoading,
+    isError,
+}: {
+    status?: AgentSkillSourceStatus;
+    isLoading: boolean;
+    isError: boolean;
+}) {
+    if (isLoading) {
+        return (
+            <span className="flex items-center gap-1.5 text-xs text-muted-foreground">
+                <Loader2Icon className="h-3.5 w-3.5 animate-spin" />
+                Checking…
+            </span>
+        );
+    }
+    if (isError || status === "repo_unavailable" || status === "source_missing") {
+        const label = status === "source_missing"
+            ? "Source file not found"
+            : status === "repo_unavailable"
+                ? "Source repo unavailable"
+                : "Couldn't check for updates";
+        return (
+            <span className="flex items-center gap-1.5 text-xs text-amber-600 dark:text-amber-500">
+                <AlertTriangleIcon className="h-3.5 w-3.5" />
+                {label}
+            </span>
+        );
+    }
+    if (status === "update_available") {
+        return (
+            <span className="flex items-center gap-1.5 text-xs font-medium text-amber-600 dark:text-amber-500">
+                <span className="h-1.5 w-1.5 rounded-full bg-amber-500" />
+                Update available
+            </span>
+        );
+    }
+    if (status === "in_sync") {
+        return (
+            <span className="flex items-center gap-1.5 text-xs text-muted-foreground">
+                <CheckCircle2Icon className="h-3.5 w-3.5 text-green-600" />
+                Up to date
+            </span>
+        );
+    }
+    return null;
+}
+
+type InstructionsView = "write" | "split" | "preview";
+
+interface SkillEditFormProps {
+    mode: "create" | "edit";
+    form: AgentSkillInput;
+    isSaving: boolean;
+    isDirty: boolean;
+    // When set, the skill is synced from this repository file: its description and
+    // instructions are read-only here (refreshed via "Update from source"); only the
+    // name and command stay editable.
+    lockedSource?: AgentSkillSourceRef | null;
+    onNameChange: (name: string) => void;
+    onSlugChange: (slug: string) => void;
+    onSlugBlur: () => void;
+    onDescriptionChange: (description: string) => void;
+    onInstructionsChange: (instructions: string) => void;
+    onSubmit: (event: FormEvent<HTMLFormElement>) => void;
+    onCancel: () => void;
+    editorKey: string;
+}
+
+function SkillEditForm({
+    mode,
+    form,
+    isSaving,
+    isDirty,
+    lockedSource = null,
+    onNameChange,
+    onSlugChange,
+    onSlugBlur,
+    onDescriptionChange,
+    onInstructionsChange,
+    onSubmit,
+    onCancel,
+    editorKey,
+}: SkillEditFormProps) {
+    const [instructionsView, setInstructionsView] = useState<InstructionsView>("write");
+    const formRef = useRef<HTMLFormElement>(null);
+    const contentLocked = lockedSource !== null;
+
+    useEffect(() => {
+        const onKeyDown = (event: KeyboardEvent) => {
+            if ((event.metaKey || event.ctrlKey) && event.key.toLowerCase() === "s") {
+                event.preventDefault();
+                formRef.current?.requestSubmit();
+            }
+        };
+        window.addEventListener("keydown", onKeyDown);
+        return () => window.removeEventListener("keydown", onKeyDown);
+    }, []);
+
+    return (
+        <form ref={formRef} onSubmit={onSubmit} className="flex h-full min-h-0 flex-col">
+            {/* Header */}
+            <div className="flex shrink-0 items-center justify-between gap-4 border-b px-6 pb-5 pt-6">
+                <div className="flex min-w-0 items-center gap-3">
+                    <SkillAvatar name={form.name || "?"} />
+                    <h3 className="truncate text-xl font-semibold tracking-tight text-foreground">
+                        {mode === "create" ? "New skill" : "Edit skill"}
+                    </h3>
+                </div>
+                <div className="flex shrink-0 items-center gap-3">
+                    {isDirty && !isSaving && (
+                        <span className="flex items-center gap-1.5 text-xs text-muted-foreground">
+                            <span className="h-1.5 w-1.5 rounded-full bg-amber-500" />
+                            Unsaved changes
+                        </span>
+                    )}
+                    <Button type="button" variant="outline" size="sm" disabled={isSaving} onClick={onCancel}>
+                        Cancel
+                    </Button>
+                    <Button type="submit" size="sm" disabled={isSaving}>
+                        {isSaving ? (
+                            <Loader2Icon className="mr-2 h-4 w-4 animate-spin" />
+                        ) : (
+                            <CheckIcon className="mr-2 h-4 w-4" />
+                        )}
+                        {isSaving ? "Saving..." : mode === "create" ? "Create skill" : "Save skill"}
+                        {!isSaving && (
+                            <kbd className="ml-2 font-sans text-xs font-normal text-primary-foreground/60">⌘S</kbd>
+                        )}
+                    </Button>
+                </div>
+            </div>
+
+            {/* Fields */}
+            <div className="mx-auto grid w-full max-w-5xl shrink-0 grid-cols-1 gap-4 px-6 pt-6 sm:grid-cols-[3fr_2fr]">
+                <div className="space-y-2">
+                    <Label htmlFor="skill-name">Name</Label>
+                    <Input
+                        id="skill-name"
+                        value={form.name}
+                        onChange={(event) => onNameChange(event.target.value)}
+                        placeholder="Find references"
+                        maxLength={80}
+                        required
+                    />
+                </div>
+                <div className="space-y-2">
+                    <Label htmlFor="skill-command">Command</Label>
+                    <div className="relative">
+                        <span className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-muted-foreground">/</span>
+                        <Input
+                            id="skill-command"
+                            value={form.slug}
+                            onChange={(event) => onSlugChange(event.target.value)}
+                            onBlur={onSlugBlur}
+                            placeholder="find-refs"
+                            className="pl-7 font-mono"
+                            maxLength={64}
+                            required
+                        />
+                    </div>
+                </div>
+                <div className="space-y-2 sm:col-span-2">
+                    <Label htmlFor="skill-description">
+                        Description
+                        <span className="ml-1 font-normal text-muted-foreground">
+                            {contentLocked ? "(synced from source)" : "(optional)"}
+                        </span>
+                    </Label>
+                    <Textarea
+                        id="skill-description"
+                        value={form.description}
+                        onChange={(event) => onDescriptionChange(event.target.value)}
+                        placeholder="Search for a symbol or API and summarize where it is defined, used, and tested."
+                        className="min-h-16 resize-y disabled:cursor-not-allowed disabled:opacity-70"
+                        maxLength={500}
+                        disabled={contentLocked}
+                    />
+                </div>
+            </div>
+
+            {/* Instructions */}
+            <div className="flex w-full min-h-0 flex-1 flex-col pb-6 pt-6">
+                <div className="mx-auto mb-3 flex w-full max-w-5xl items-center justify-between gap-2 px-6">
+                    <div className="flex items-center gap-3">
+                        <Label htmlFor="skill-instructions" className="text-sm font-semibold">Instructions</Label>
+                        {contentLocked ? (
+                            <span className="flex items-center gap-1.5 text-xs text-muted-foreground">
+                                <FolderGit2Icon className="h-3.5 w-3.5" />
+                                Synced from {lockedSource?.repoName} · read-only
+                            </span>
+                        ) : (
+                            <ToggleGroup
+                                type="single"
+                                value={instructionsView}
+                                onValueChange={(value) => {
+                                    if (value) {
+                                        setInstructionsView(value as InstructionsView);
+                                    }
+                                }}
+                                className="gap-0.5 rounded-md border bg-muted/40 p-0.5"
+                            >
+                                <ToggleGroupItem value="write" className="h-7 w-auto min-w-0 px-2.5 text-xs font-normal">
+                                    Write
+                                </ToggleGroupItem>
+                                <ToggleGroupItem value="split" className="h-7 w-auto min-w-0 px-2.5 text-xs font-normal">
+                                    Split
+                                </ToggleGroupItem>
+                                <ToggleGroupItem value="preview" className="h-7 w-auto min-w-0 px-2.5 text-xs font-normal">
+                                    Preview
+                                </ToggleGroupItem>
+                            </ToggleGroup>
+                        )}
+                    </div>
+                    <span className="text-xs text-muted-foreground">
+                        markdown · {form.instructions.length.toLocaleString()} / {INSTRUCTIONS_MAX_LENGTH.toLocaleString()}
+                    </span>
+                </div>
+                {contentLocked ? (
+                    <div className="mx-auto flex w-full min-h-0 max-w-5xl flex-1 px-6">
+                        <div className="min-h-0 flex-1 overflow-y-auto rounded-md bg-muted/20 px-4 py-3">
+                            {form.instructions.trim() ? (
+                                <MarkdownRenderer
+                                    content={form.instructions}
+                                    escapeHtml
+                                    className="prose-sm max-w-none"
+                                />
+                            ) : (
+                                <p className="text-sm text-muted-foreground">No instructions.</p>
+                            )}
+                        </div>
+                    </div>
+                ) : (
+                    <div className={cn(
+                        "mx-auto flex w-full min-h-0 flex-1 gap-4 px-6",
+                        instructionsView === "split" ? "max-w-none" : "max-w-5xl",
+                    )}>
+                        <div className={cn("h-full min-h-0 flex-1", instructionsView === "preview" && "hidden")}>
+                            <div className="relative h-full">
+                                <SkillInstructionsEditor
+                                    key={editorKey}
+                                    id="skill-instructions"
+                                    value={form.instructions}
+                                    onChange={onInstructionsChange}
+                                    placeholder={INSTRUCTIONS_PLACEHOLDER}
+                                    className="h-full resize-none font-mono text-sm leading-relaxed"
+                                />
+                            </div>
+                        </div>
+                        {instructionsView !== "write" && (
+                            <div className="min-h-0 flex-1 overflow-y-auto rounded-md bg-muted/20 px-4 py-3">
+                                {form.instructions.trim() ? (
+                                    <MarkdownRenderer
+                                        content={form.instructions}
+                                        escapeHtml
+                                        className="prose-sm max-w-none"
+                                    />
+                                ) : (
+                                    <p className="text-sm text-muted-foreground">Nothing to preview yet.</p>
+                                )}
+                            </div>
+                        )}
+                    </div>
+                )}
+            </div>
+        </form>
+    );
+}
diff --git a/packages/web/src/ee/features/chat/skills/components/workspaceSharedSkillsManager.test.tsx b/packages/web/src/ee/features/chat/skills/components/workspaceSharedSkillsManager.test.tsx
new file mode 100644
index 000000000..4409ac9c7
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/workspaceSharedSkillsManager.test.tsx
@@ -0,0 +1,147 @@
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { TooltipProvider } from '@/components/ui/tooltip';
+import type { ReactNode } from 'react';
+import type { SharedAgentSkillManagementItem } from '@/ee/features/chat/skills/types';
+
+// The manager mutates through workspaceSkillMutations, which calls these server
+// actions; stub them so the client component can render under jsdom.
+vi.mock('@/ee/features/chat/skills/actions', () => ({
+    deleteSharedAgentSkill: vi.fn(),
+    setSharedSkillFlag: vi.fn(),
+}));
+// next/link needs the app-router context in real use; render a plain anchor.
+vi.mock('next/link', async () => {
+    const { createElement } = await import('react');
+    return {
+        default: ({ href, children }: { href: string; children: ReactNode }) =>
+            createElement('a', { href }, children),
+    };
+});
+
+const skillActions = await import('@/ee/features/chat/skills/actions');
+const { WorkspaceSharedSkillsManager } = await import('./workspaceSharedSkillsManager');
+
+afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+});
+
+function makeSkill(
+    overrides: Partial<SharedAgentSkillManagementItem> & Pick<SharedAgentSkillManagementItem, 'id' | 'slug' | 'name'>,
+): SharedAgentSkillManagementItem {
+    return {
+        scope: 'SHARED',
+        description: '',
+        enabled: true,
+        autoEnrolled: false,
+        source: null,
+        createdByEmail: null,
+        createdAt: '2026-06-18T00:00:00.000Z',
+        updatedAt: '2026-06-18T00:00:00.000Z',
+        ...overrides,
+    };
+}
+
+function renderManager(skills: SharedAgentSkillManagementItem[], initialSearch?: string) {
+    return render(
+        <TooltipProvider>
+            <WorkspaceSharedSkillsManager initialOrgSkills={skills} initialSearch={initialSearch} />
+        </TooltipProvider>,
+    );
+}
+
+const syncedSkill = makeSkill({
+    id: 'synced',
+    slug: 'review',
+    name: 'Code Review',
+    source: { repoName: 'github.com/acme/backend', filePath: 'docs/review.md', revision: 'main' },
+    createdByEmail: 'jack@sourcebot.dev',
+});
+
+const manualSkill = makeSkill({
+    id: 'manual',
+    slug: 'greet',
+    name: 'Greeter',
+    createdByEmail: 'sam@sourcebot.dev',
+});
+
+describe('WorkspaceSharedSkillsManager', () => {
+    test('marks synced skills, shows the creator, and a total count', () => {
+        renderManager([syncedSkill, manualSkill]);
+
+        // Synced skills get a compact marker; the full repo name is no longer shown.
+        expect(screen.getAllByTitle('Synced from a repository')).toHaveLength(1);
+        expect(screen.queryByText('github.com/acme/backend')).toBeNull();
+        expect(screen.getByText('jack@sourcebot.dev')).toBeTruthy();
+        expect(screen.getByText('sam@sourcebot.dev')).toBeTruthy();
+        expect(screen.getByText('2 of 2 shared skills')).toBeTruthy();
+    });
+
+    test('links each skill name to the account skills page with its id', () => {
+        renderManager([syncedSkill]);
+
+        const link = screen.getByRole('link', { name: 'Code Review' });
+        expect(link.getAttribute('href')).toBe('/settings/skills?skill=synced');
+    });
+
+    test('pre-fills the search box from initialSearch (deep link from the account page)', () => {
+        renderManager([syncedSkill, manualSkill], 'Code Review');
+
+        expect((screen.getByPlaceholderText('Search skills or commands...') as HTMLInputElement).value).toBe('Code Review');
+        expect(screen.getByText('Code Review')).toBeTruthy();
+        expect(screen.queryByText('Greeter')).toBeNull();
+        expect(screen.getByText('1 of 2 shared skills')).toBeTruthy();
+    });
+
+    test('searches over name and command', () => {
+        renderManager([syncedSkill, manualSkill]);
+
+        fireEvent.change(screen.getByPlaceholderText('Search skills or commands...'), {
+            target: { value: 'greet' },
+        });
+
+        expect(screen.queryByText('Code Review')).toBeNull();
+        expect(screen.getByText('Greeter')).toBeTruthy();
+        expect(screen.getByText('1 of 2 shared skills')).toBeTruthy();
+    });
+
+    test('filters by Synced and Manual', () => {
+        renderManager([syncedSkill, manualSkill]);
+
+        fireEvent.click(screen.getByText('Synced'));
+        expect(screen.getByText('Code Review')).toBeTruthy();
+        expect(screen.queryByText('Greeter')).toBeNull();
+
+        fireEvent.click(screen.getByText('Manual'));
+        expect(screen.queryByText('Code Review')).toBeNull();
+        expect(screen.getByText('Greeter')).toBeTruthy();
+    });
+
+    test('toggles auto-enroll through the row switch', async () => {
+        vi.mocked(skillActions.setSharedSkillFlag).mockResolvedValue({
+            ...syncedSkill,
+            autoEnrolled: true,
+        });
+
+        renderManager([syncedSkill]);
+
+        fireEvent.click(screen.getByRole('switch', { name: 'Auto' }));
+
+        await waitFor(() => expect(skillActions.setSharedSkillFlag).toHaveBeenCalledWith({
+            skillId: 'synced',
+            data: { autoEnrolled: true },
+        }));
+    });
+
+    test('reports no matches when search and filters exclude everything', () => {
+        renderManager([syncedSkill, manualSkill]);
+
+        fireEvent.change(screen.getByPlaceholderText('Search skills or commands...'), {
+            target: { value: 'zzz-nothing' },
+        });
+
+        expect(screen.getByText('No skills match your search.')).toBeTruthy();
+        expect(screen.getByText('0 of 2 shared skills')).toBeTruthy();
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/components/workspaceSharedSkillsManager.tsx b/packages/web/src/ee/features/chat/skills/components/workspaceSharedSkillsManager.tsx
new file mode 100644
index 000000000..66881bd41
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/workspaceSharedSkillsManager.tsx
@@ -0,0 +1,286 @@
+'use client';
+
+import { useMemo, useState } from "react";
+import Link from "next/link";
+import { FolderGit2Icon, InfoIcon, Loader2, SearchIcon, Trash2Icon } from "lucide-react";
+import { useToast } from "@/components/hooks/use-toast";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Switch } from "@/components/ui/switch";
+import {
+    Table, TableBody, TableCell, TableHead, TableHeader, TableRow,
+} from "@/components/ui/table";
+import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import {
+    deleteWorkspaceSkill,
+    updateWorkspaceSkillFlag,
+    type OrgSkillFlagKey,
+} from "@/ee/features/chat/skills/components/workspaceSkillMutations";
+import {
+    AUTO_ENROLLED_SKILL_TOOLTIP,
+    DeleteWorkspaceSkillDialog,
+    WorkspaceSkillsEmptyState,
+} from "@/ee/features/chat/skills/components/workspaceSkillShared";
+import { sortSharedAgentSkillCatalogItems, type SharedAgentSkillManagementItem } from "@/ee/features/chat/skills/types";
+import { pluralize } from "@/features/chat/mcp/utils";
+import { cn } from "@/lib/utils";
+
+// Synced = mirrors a repository file (has a source); Manual = created in-app or
+// imported from a local file (no source).
+type SkillSourceFilter = "all" | "synced" | "manual";
+
+export function WorkspaceSharedSkillsManager({
+    initialOrgSkills,
+    initialSearch = "",
+}: {
+    initialOrgSkills: SharedAgentSkillManagementItem[];
+    // Pre-fills the search box (e.g. a deep link from the account skills page that
+    // targets a specific skill by name).
+    initialSearch?: string;
+}) {
+    const { toast } = useToast();
+    const [orgSkills, setOrgSkills] = useState(() => sortSharedAgentSkillCatalogItems(initialOrgSkills));
+    const [search, setSearch] = useState(initialSearch);
+    const [sourceFilter, setSourceFilter] = useState<SkillSourceFilter>("all");
+    const [flagPendingSkills, setFlagPendingSkills] = useState<Record<string, OrgSkillFlagKey>>({});
+    const [deletingSkillId, setDeletingSkillId] = useState<string | null>(null);
+    const [skillToDelete, setSkillToDelete] = useState<SharedAgentSkillManagementItem | null>(null);
+
+    const handleFlagChange = async (
+        skill: SharedAgentSkillManagementItem,
+        flag: OrgSkillFlagKey,
+        checked: boolean,
+    ) => {
+        if (flagPendingSkills[skill.id] !== undefined) {
+            return;
+        }
+
+        setFlagPendingSkills((current) => ({ ...current, [skill.id]: flag }));
+        try {
+            const error = await updateWorkspaceSkillFlag({
+                skillId: skill.id,
+                flag,
+                checked,
+                updateOrgSkills: setOrgSkills,
+            });
+            if (error) {
+                toast({ title: "Error", description: error.message, variant: "destructive" });
+                return;
+            }
+
+            toast({ description: "Shared skill updated." });
+        } catch {
+            toast({ title: "Error", description: "Failed to update shared skill.", variant: "destructive" });
+        } finally {
+            setFlagPendingSkills((current) => {
+                const next = { ...current };
+                delete next[skill.id];
+                return next;
+            });
+        }
+    };
+
+    const handleDelete = async (skillId: string) => {
+        if (flagPendingSkills[skillId] !== undefined) {
+            return;
+        }
+
+        setDeletingSkillId(skillId);
+        try {
+            const error = await deleteWorkspaceSkill({ skillId, updateOrgSkills: setOrgSkills });
+            if (error) {
+                toast({ title: "Error", description: error.message, variant: "destructive" });
+                return;
+            }
+
+            setSkillToDelete(null);
+            toast({ description: "Shared skill deleted." });
+        } catch {
+            toast({ title: "Error", description: "Failed to delete shared skill.", variant: "destructive" });
+        } finally {
+            setDeletingSkillId(null);
+        }
+    };
+
+    const filteredSkills = useMemo(() => {
+        const query = search.trim().toLowerCase();
+        return orgSkills.filter((skill) => {
+            if (sourceFilter === "synced" && !skill.source) {
+                return false;
+            }
+            if (sourceFilter === "manual" && skill.source) {
+                return false;
+            }
+            if (query && !(skill.name.toLowerCase().includes(query) || skill.slug.toLowerCase().includes(query))) {
+                return false;
+            }
+            return true;
+        });
+    }, [orgSkills, search, sourceFilter]);
+
+    return (
+        <div className="space-y-3">
+            <div className="flex items-center justify-between gap-3">
+                <div>
+                    <h4 className="text-sm font-semibold text-foreground">Shared skills</h4>
+                    <p className="text-sm text-muted-foreground">Available to everyone in your workspace.</p>
+                </div>
+                <p className="shrink-0 text-xs text-muted-foreground">
+                    {orgSkills.length} {pluralize(orgSkills.length, "skill")}
+                </p>
+            </div>
+
+            {orgSkills.length === 0 ? (
+                <WorkspaceSkillsEmptyState />
+            ) : (
+                <>
+                    <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
+                        <div className="relative flex-1">
+                            <SearchIcon className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+                            <Input
+                                value={search}
+                                onChange={(event) => setSearch(event.target.value)}
+                                placeholder="Search skills or commands..."
+                                className="h-9 pl-9"
+                                aria-label="Search skills or commands"
+                            />
+                        </div>
+                        <ToggleGroup
+                            type="single"
+                            value={sourceFilter}
+                            onValueChange={(value) => {
+                                if (value) {
+                                    setSourceFilter(value as SkillSourceFilter);
+                                }
+                            }}
+                            className="shrink-0 gap-0.5 rounded-md border bg-muted/40 p-0.5"
+                        >
+                            <ToggleGroupItem value="all" className="h-7 w-auto min-w-0 px-3 text-xs font-normal">All</ToggleGroupItem>
+                            <ToggleGroupItem value="synced" className="h-7 w-auto min-w-0 px-3 text-xs font-normal">Synced</ToggleGroupItem>
+                            <ToggleGroupItem value="manual" className="h-7 w-auto min-w-0 px-3 text-xs font-normal">Manual</ToggleGroupItem>
+                        </ToggleGroup>
+                    </div>
+
+                    <Table wrapperClassName="max-h-[22rem] overflow-y-auto rounded-lg border">
+                        <TableHeader className="sticky top-0 z-10 bg-card">
+                            <TableRow className="hover:bg-transparent">
+                                <TableHead className="h-10 w-1/2 px-4 text-xs uppercase tracking-wider">Skill</TableHead>
+                                <TableHead className="h-10 w-1/2 px-4 text-xs uppercase tracking-wider">Added by</TableHead>
+                                <TableHead className="h-10 w-24 whitespace-nowrap px-4 text-xs uppercase tracking-wider">
+                                    <span className="inline-flex items-center gap-1">
+                                        Auto
+                                        <Tooltip>
+                                            <TooltipTrigger asChild>
+                                                <span tabIndex={0} className="inline-flex cursor-help text-muted-foreground">
+                                                    <InfoIcon className="h-3.5 w-3.5" />
+                                                </span>
+                                            </TooltipTrigger>
+                                            <TooltipContent>{AUTO_ENROLLED_SKILL_TOOLTIP}</TooltipContent>
+                                        </Tooltip>
+                                    </span>
+                                </TableHead>
+                                <TableHead className="h-10 w-12 px-4" />
+                            </TableRow>
+                        </TableHeader>
+                        <TableBody>
+                            {filteredSkills.length === 0 ? (
+                                <TableRow className="hover:bg-transparent">
+                                    <TableCell colSpan={4} className="py-10 text-center text-sm text-muted-foreground">
+                                        No skills match your search.
+                                    </TableCell>
+                                </TableRow>
+                            ) : (
+                                filteredSkills.map((skill) => {
+                                    const isDeleting = deletingSkillId === skill.id;
+                                    const isFlagPending = flagPendingSkills[skill.id] !== undefined;
+                                    return (
+                                        <TableRow key={skill.id}>
+                                            <TableCell className="px-4 py-3">
+                                                <div className="flex min-w-0 items-center gap-2">
+                                                    <Link
+                                                        href={`/settings/skills?skill=${skill.id}`}
+                                                        className="truncate font-medium text-foreground hover:underline"
+                                                        title={`Open ${skill.name} in skills`}
+                                                    >
+                                                        {skill.name}
+                                                    </Link>
+                                                    {skill.source && (
+                                                        <span
+                                                            title="Synced from a repository"
+                                                            className="inline-flex shrink-0 text-muted-foreground"
+                                                        >
+                                                            <FolderGit2Icon className="h-3.5 w-3.5" />
+                                                        </span>
+                                                    )}
+                                                </div>
+                                            </TableCell>
+                                            <TableCell className="px-4 py-3">
+                                                {skill.createdByEmail ? (
+                                                    <span className="block max-w-[14rem] truncate text-sm text-muted-foreground" title={skill.createdByEmail}>
+                                                        {skill.createdByEmail}
+                                                    </span>
+                                                ) : (
+                                                    <span className="text-sm text-muted-foreground">Unknown</span>
+                                                )}
+                                            </TableCell>
+                                            <TableCell className="px-4 py-3">
+                                                <Switch
+                                                    checked={skill.autoEnrolled}
+                                                    disabled={isFlagPending}
+                                                    onCheckedChange={(checked) => void handleFlagChange(skill, "autoEnrolled", checked)}
+                                                    aria-label="Auto"
+                                                    className={cn(
+                                                        "data-[state=unchecked]:bg-muted-foreground/40 data-[state=unchecked]:border-muted-foreground/70",
+                                                        "data-[state=checked]:bg-green-600 data-[state=checked]:border-green-600",
+                                                        "[&>span]:bg-foreground",
+                                                    )}
+                                                />
+                                            </TableCell>
+                                            <TableCell className="px-4 py-3">
+                                                <Button
+                                                    variant="ghost"
+                                                    size="icon"
+                                                    className="h-8 w-8 text-muted-foreground hover:text-destructive"
+                                                    disabled={isDeleting || isFlagPending}
+                                                    onClick={() => setSkillToDelete(skill)}
+                                                    aria-label={`Delete ${skill.name}`}
+                                                >
+                                                    {isDeleting ? (
+                                                        <Loader2 className="h-4 w-4 animate-spin" />
+                                                    ) : (
+                                                        <Trash2Icon className="h-4 w-4" />
+                                                    )}
+                                                </Button>
+                                            </TableCell>
+                                        </TableRow>
+                                    );
+                                })
+                            )}
+                        </TableBody>
+                    </Table>
+
+                    <p className="text-xs text-muted-foreground">
+                        {filteredSkills.length} of {orgSkills.length} shared {pluralize(orgSkills.length, "skill")}
+                    </p>
+                </>
+            )}
+
+            <DeleteWorkspaceSkillDialog
+                skill={skillToDelete}
+                isDeleting={deletingSkillId !== null}
+                disabled={skillToDelete ? flagPendingSkills[skillToDelete.id] !== undefined : false}
+                onOpenChange={(open) => {
+                    if (!open && deletingSkillId === null) {
+                        setSkillToDelete(null);
+                    }
+                }}
+                onConfirm={() => {
+                    if (skillToDelete && flagPendingSkills[skillToDelete.id] === undefined) {
+                        void handleDelete(skillToDelete.id);
+                    }
+                }}
+            />
+        </div>
+    );
+}
diff --git a/packages/web/src/ee/features/chat/skills/components/workspaceSkillMutations.ts b/packages/web/src/ee/features/chat/skills/components/workspaceSkillMutations.ts
new file mode 100644
index 000000000..48ef340af
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/workspaceSkillMutations.ts
@@ -0,0 +1,46 @@
+import { isServiceError } from "@/lib/utils";
+import type { ServiceError } from "@/lib/serviceError";
+import { deleteSharedAgentSkill, setSharedSkillFlag } from "@/ee/features/chat/skills/actions";
+import { sortSharedAgentSkillCatalogItems, type SharedAgentSkillManagementItem } from "@/ee/features/chat/skills/types";
+
+export type OrgSkillFlagKey = "autoEnrolled";
+
+export async function deleteWorkspaceSkill<T extends { id: string }>({
+    skillId,
+    updateOrgSkills,
+}: {
+    skillId: string;
+    updateOrgSkills: (updater: (skills: T[]) => T[]) => void;
+}): Promise<ServiceError | null> {
+    const result = await deleteSharedAgentSkill(skillId);
+    if (isServiceError(result)) {
+        return result;
+    }
+
+    updateOrgSkills((current) => current.filter((skill) => skill.id !== skillId));
+    return null;
+}
+
+export async function updateWorkspaceSkillFlag({
+    skillId,
+    checked,
+    updateOrgSkills,
+}: {
+    skillId: string;
+    flag: OrgSkillFlagKey;
+    checked: boolean;
+    updateOrgSkills: (updater: (skills: SharedAgentSkillManagementItem[]) => SharedAgentSkillManagementItem[]) => void;
+}): Promise<ServiceError | null> {
+    const result = await setSharedSkillFlag({
+        skillId,
+        data: { autoEnrolled: checked },
+    });
+    if (isServiceError(result)) {
+        return result;
+    }
+
+    updateOrgSkills((current) => sortSharedAgentSkillCatalogItems(current.map((item) =>
+        item.id === result.id ? result : item,
+    )));
+    return null;
+}
diff --git a/packages/web/src/ee/features/chat/skills/components/workspaceSkillShared.tsx b/packages/web/src/ee/features/chat/skills/components/workspaceSkillShared.tsx
new file mode 100644
index 000000000..768b6316b
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/components/workspaceSkillShared.tsx
@@ -0,0 +1,129 @@
+'use client';
+
+import type { ReactNode } from "react";
+import { Building2Icon } from "lucide-react";
+import {
+    AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent,
+    AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle,
+} from "@/components/ui/alert-dialog";
+import { Card, CardContent } from "@/components/ui/card";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
+
+export const AUTO_ENROLLED_SKILL_TOOLTIP = "Added to members' Ask commands by default.";
+
+export function SkillCommandBadge({ slug }: { slug: string }) {
+    return (
+        <span className="rounded border bg-muted px-1.5 py-0.5 font-mono text-[11px] text-muted-foreground">
+            /{slug}
+        </span>
+    );
+}
+
+function SkillStatusBadge({
+    children,
+    tooltip,
+    className,
+}: {
+    children: ReactNode;
+    tooltip?: string;
+    className?: string;
+}) {
+    const badge = (
+        <span
+            className={cn(
+                "inline-flex items-center rounded border px-1.5 py-0.5 text-[11px] font-medium",
+                className ?? "border-border bg-background text-muted-foreground",
+            )}
+            tabIndex={tooltip ? 0 : undefined}
+        >
+            {children}
+        </span>
+    );
+
+    if (!tooltip) {
+        return badge;
+    }
+
+    return (
+        <Tooltip>
+            <TooltipTrigger asChild>{badge}</TooltipTrigger>
+            <TooltipContent>{tooltip}</TooltipContent>
+        </Tooltip>
+    );
+}
+
+export function AutoEnrolledSkillBadge() {
+    return (
+        <SkillStatusBadge
+            tooltip={AUTO_ENROLLED_SKILL_TOOLTIP}
+            className="border-sky-500/40 bg-sky-500/15 text-sky-700 dark:border-sky-500/50 dark:bg-sky-950/60 dark:text-sky-400"
+        >
+            Auto
+        </SkillStatusBadge>
+    );
+}
+
+export function WorkspaceSkillsEmptyState({
+    description = "Shared skills created by members will appear here.",
+}: {
+    description?: string;
+}) {
+    return (
+        <Card>
+            <CardContent className="flex flex-col items-center justify-center py-10 text-center">
+                <div className="rounded-full bg-muted p-3 mb-4">
+                    <Building2Icon className="h-6 w-6 text-muted-foreground" />
+                </div>
+                <p className="text-sm font-medium text-foreground mb-1">
+                    No shared skills yet
+                </p>
+                <p className="text-sm text-muted-foreground max-w-sm">
+                    {description}
+                </p>
+            </CardContent>
+        </Card>
+    );
+}
+
+export function DeleteWorkspaceSkillDialog({
+    skill,
+    isDeleting,
+    disabled = false,
+    onOpenChange,
+    onConfirm,
+}: {
+    skill: { name: string; slug: string } | null;
+    isDeleting: boolean;
+    disabled?: boolean;
+    onOpenChange: (open: boolean) => void;
+    onConfirm: () => void;
+}) {
+    const isActionDisabled = isDeleting || disabled;
+
+    return (
+        <AlertDialog open={skill !== null} onOpenChange={onOpenChange}>
+            <AlertDialogContent>
+                <AlertDialogHeader>
+                    <AlertDialogTitle>Delete Shared Skill</AlertDialogTitle>
+                    <AlertDialogDescription>
+                        Are you sure you want to delete <span className="font-semibold text-foreground">{skill?.name}</span>? This removes the <span className="font-mono text-foreground">/{skill?.slug}</span> command for everyone in this workspace.
+                    </AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                    <AlertDialogCancel disabled={isActionDisabled}>Cancel</AlertDialogCancel>
+                    <AlertDialogAction
+                        disabled={isActionDisabled}
+                        onClick={(event) => {
+                            event.preventDefault();
+                            onConfirm();
+                        }}
+                        className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                    >
+                        {isDeleting ? "Deleting..." : "Delete"}
+                    </AlertDialogAction>
+                </AlertDialogFooter>
+            </AlertDialogContent>
+        </AlertDialog>
+    );
+}
diff --git a/packages/web/src/ee/features/chat/skills/loadSkillTool.test.ts b/packages/web/src/ee/features/chat/skills/loadSkillTool.test.ts
new file mode 100644
index 000000000..f8526e0cb
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/loadSkillTool.test.ts
@@ -0,0 +1,88 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import type { Tool } from "ai";
+
+const captureEvent = vi.fn();
+vi.mock("@/lib/posthog", () => ({
+    captureEvent: (...args: unknown[]) => captureEvent(...args),
+}));
+
+// loadSkillTool imports `createLogger` from @sourcebot/shared, whose real module
+// reads server-side env vars at import time and trips the t3-env client guard
+// under vitest's jsdom environment. Stub it so the module under test can load.
+vi.mock("@sourcebot/shared", () => ({
+    createLogger: () => ({ error: vi.fn(), info: vi.fn(), warn: vi.fn(), debug: vi.fn() }),
+    env: { NODE_ENV: "test" },
+}));
+
+import { createLoadSkillTool } from "./loadSkillTool";
+
+// The AI SDK passes (input, options) to execute; the tool ignores options.
+const execute = (tool: Tool, input: unknown) =>
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (tool.execute as any)(input, { toolCallId: "call-1", messages: [] });
+
+describe("createLoadSkillTool", () => {
+    beforeEach(() => {
+        captureEvent.mockClear();
+    });
+
+    test("loads the skill's raw instructions and reports success", async () => {
+        const findFirst = vi.fn().mockResolvedValue({
+            id: "p1",
+            visibility: "PERSONAL",
+            slug: "translate",
+            name: "Translate",
+            instructions: "Translate the file to the requested language.",
+        });
+        const prisma = { agentSkill: { findFirst } } as never;
+
+        const tool = createLoadSkillTool({ prisma, userId: "user-1", orgId: 7 });
+        const result = await execute(tool, { skill_id: "p1" });
+
+        expect(result).toEqual({
+            skill: { id: "p1", slug: "translate", name: "Translate" },
+            instructions: "Translate the file to the requested language.",
+        });
+        expect(captureEvent).toHaveBeenCalledWith("ask_skill_invoked", expect.objectContaining({
+            activationMethod: "auto",
+            skillId: "p1",
+            slug: "translate",
+            success: true,
+        }));
+    });
+
+    test("fails closed and surfaces a non-leaking error when the skill is unavailable", async () => {
+        const findFirst = vi.fn().mockResolvedValue(null);
+        const prisma = { agentSkill: { findFirst } } as never;
+
+        const tool = createLoadSkillTool({ prisma, userId: "user-1", orgId: 7 });
+        const result = await execute(tool, { skill_id: "not-visible" });
+
+        expect(result).toHaveProperty("error");
+        expect(result).not.toHaveProperty("instructions");
+        expect(captureEvent).toHaveBeenCalledWith("ask_skill_invoked", expect.objectContaining({
+            activationMethod: "auto",
+            skillId: "not-visible",
+            success: false,
+        }));
+    });
+
+    test("fails closed without leaking the error when the lookup throws", async () => {
+        const findFirst = vi.fn().mockRejectedValue(new Error("connection pool exhausted"));
+        const prisma = { agentSkill: { findFirst } } as never;
+
+        const tool = createLoadSkillTool({ prisma, userId: "user-1", orgId: 7 });
+        const result = await execute(tool, { skill_id: "p1" });
+
+        // The transient throw must take the fail-closed path, not propagate.
+        expect(result).toHaveProperty("error");
+        expect(result).not.toHaveProperty("instructions");
+        // The raw error text must never reach the model.
+        expect(JSON.stringify(result)).not.toContain("connection pool exhausted");
+        expect(captureEvent).toHaveBeenCalledWith("ask_skill_invoked", expect.objectContaining({
+            activationMethod: "auto",
+            skillId: "p1",
+            success: false,
+        }));
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/loadSkillTool.ts b/packages/web/src/ee/features/chat/skills/loadSkillTool.ts
new file mode 100644
index 000000000..bd35a3338
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/loadSkillTool.ts
@@ -0,0 +1,128 @@
+import type { PrismaClient } from "@sourcebot/db";
+import { createLogger } from "@sourcebot/shared";
+import { tool, type Tool } from "ai";
+import { z } from "zod";
+import _dedent from "dedent";
+import { captureEvent } from "@/lib/posthog";
+import type { AskMcpAnalyticsSource } from "@/lib/posthogEvents";
+import { buildAskSkillInvokedEvent } from "./skillAnalytics";
+import { resolveAutoInvocableSkill } from "./registry";
+
+const dedent = _dedent.withOptions({ alignValues: true });
+
+const logger = createLogger('load-skill-tool');
+
+// Stable name of the auto-invocation tool. Referenced by the `<agent_skills>`
+// system-prompt block so the model knows what to call.
+export const LOAD_SKILL_TOOL_NAME = "load_skill";
+
+interface LoadSkillToolAnalyticsContext {
+    chatId?: string;
+    traceId?: string;
+    source?: AskMcpAnalyticsSource;
+}
+
+interface CreateLoadSkillToolOptions {
+    prisma: PrismaClient;
+    userId: string;
+    orgId: number;
+    analyticsContext?: LoadSkillToolAnalyticsContext;
+}
+
+/**
+ * Single-phase skill loader, modelled on Claude Code's `Skill` tool. The model
+ * discovers skills from the `<agent_skills>` catalog in the system prompt, then
+ * calls this tool with the skill's id to load its (auth-checked) instructions as
+ * the tool result. Unlike MCP tools, a
+ * skill is an instruction blob rather than a callable tool with its own schema,
+ * so it does not need to be promoted into `activeTools` — one call returns the
+ * instructions directly. This keeps the tool set static across steps, so the
+ * prompt cache is never invalidated by skill loading.
+ */
+export const createLoadSkillTool = ({
+    prisma,
+    userId,
+    orgId,
+    analyticsContext,
+}: CreateLoadSkillToolOptions): Tool =>
+    tool({
+        description: dedent`
+        Load the instructions for one of the skills listed in the <agent_skills> section of the system prompt, then follow them.
+        Call this when the user's request matches a skill's description. Pass the skill's exact id from the catalog.
+        After the tool returns, treat the returned instructions as authoritative guidance for completing the task.
+
+        Examples:
+          CORRECT: load_skill({ skill_id: "ckz9q..." })
+          INCORRECT: load_skill({ skill_id: "audit billing issues" })   // not an id from the catalog
+        `,
+        inputSchema: z.object({
+            skill_id: z.string().describe('Exact skill id from the <agent_skills> catalog, e.g. "ckz9q1a2b0000xyz".'),
+        }),
+        execute: async ({ skill_id }) => {
+            const startTime = Date.now();
+
+            // Both failure paths — an unknown/unauthorized id and a transient
+            // lookup error — must fail closed identically: emit a success:false
+            // event and return a generic message that never reveals why it failed.
+            const captureFailure = () => {
+                void captureEvent('ask_skill_invoked', buildAskSkillInvokedEvent({
+                    activationMethod: 'auto',
+                    skillId: skill_id,
+                    success: false,
+                    source: analyticsContext?.source,
+                    chatId: analyticsContext?.chatId,
+                    traceId: analyticsContext?.traceId,
+                    durationMs: Date.now() - startTime,
+                }));
+            };
+
+            try {
+                const skill = await resolveAutoInvocableSkill({ prisma, userId, orgId, skillId: skill_id });
+
+                if (!skill) {
+                    // Fail closed without leaking whether the id exists: the model
+                    // simply learns this skill is not available to auto-invoke.
+                    captureFailure();
+                    return {
+                        error: 'That skill is not available. Use only the skills listed in the <agent_skills> section, referencing their exact id.',
+                    };
+                }
+
+                const instructions = skill.instructions;
+
+                void captureEvent('ask_skill_invoked', buildAskSkillInvokedEvent({
+                    activationMethod: 'auto',
+                    skillId: skill.id,
+                    success: true,
+                    slug: skill.slug,
+                    name: skill.name,
+                    sourceLabel: skill.sourceLabel,
+                    source: analyticsContext?.source,
+                    chatId: analyticsContext?.chatId,
+                    traceId: analyticsContext?.traceId,
+                    durationMs: Date.now() - startTime,
+                }));
+
+                return {
+                    skill: {
+                        id: skill.id,
+                        slug: skill.slug,
+                        name: skill.name,
+                    },
+                    instructions,
+                };
+            } catch (error) {
+                // A transient failure (DB error, pool exhaustion) must fail closed
+                // the same way an unknown id does — the raw error must never reach
+                // the model. Log it server-side so the failure stays observable.
+                logger.error('Failed to load skill for auto-invocation.', {
+                    skillId: skill_id,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+                captureFailure();
+                return {
+                    error: 'That skill could not be loaded right now. You can retry once, or continue without it.',
+                };
+            }
+        },
+    });
diff --git a/packages/web/src/ee/features/chat/skills/registry.test.ts b/packages/web/src/ee/features/chat/skills/registry.test.ts
new file mode 100644
index 000000000..8c1fad41c
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/registry.test.ts
@@ -0,0 +1,170 @@
+import { describe, expect, test, vi } from "vitest";
+import { ASK_COMMAND_SOURCE_SHARED_SKILL, ASK_COMMAND_SOURCE_PERSONAL_SKILL } from "@/features/chat/commands/types";
+import { sharedAgentSkillVisibleToUserWhere, personalAgentSkillAuthScope } from "@sourcebot/db";
+import { buildSkillRegistry, resolveAutoInvocableSkill } from "./registry";
+
+describe("buildSkillRegistry", () => {
+    test("returns personal + shared skills, auth-scoped and mapped", async () => {
+        const findMany = vi.fn()
+            .mockResolvedValueOnce([
+                { id: "p1", slug: "translate", name: "Translate", description: "Translate text" },
+            ])
+            .mockResolvedValueOnce([
+                { id: "o1", slug: "audit", name: "Audit", description: "Audit billing" },
+            ]);
+        const prisma = { agentSkill: { findMany } } as never;
+
+        const registry = await buildSkillRegistry({ prisma, userId: "user-1", orgId: 7 });
+
+        expect(registry).toEqual([
+            {
+                id: "p1",
+                sourceId: ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+                sourceLabel: "Personal",
+                slug: "translate",
+                name: "Translate",
+                description: "Translate text",
+            },
+            {
+                id: "o1",
+                sourceId: ASK_COMMAND_SOURCE_SHARED_SKILL,
+                sourceLabel: "Shared",
+                slug: "audit",
+                name: "Audit",
+                description: "Audit billing",
+            },
+        ]);
+
+        // Personal query: reuses the same auth scope as the manual pipeline. No
+        // per-skill auto-invocation opt-in — every visible skill is model-invocable.
+        expect(findMany).toHaveBeenNthCalledWith(1, expect.objectContaining({
+            where: { ...personalAgentSkillAuthScope("user-1", 7), enabled: true },
+            select: { id: true, slug: true, name: true, description: true, sourceRepoName: true },
+        }));
+        // Shared query: shared-visibility clause only.
+        expect(findMany).toHaveBeenNthCalledWith(2, expect.objectContaining({
+            where: { ...sharedAgentSkillVisibleToUserWhere("user-1", 7) },
+            select: { id: true, slug: true, name: true, description: true, sourceRepoName: true },
+        }));
+    });
+});
+
+describe("resolveAutoInvocableSkill", () => {
+    test("resolves a skill by id within auth scope and derives its source", async () => {
+        const findFirst = vi.fn().mockResolvedValue({
+            id: "o1",
+            visibility: "SHARED",
+            slug: "audit",
+            name: "Audit",
+            instructions: "Audit the billing system",
+        });
+        const prisma = { agentSkill: { findFirst } } as never;
+
+        const result = await resolveAutoInvocableSkill({ prisma, userId: "user-1", orgId: 7, skillId: "o1" });
+
+        expect(result).toEqual({
+            id: "o1",
+            sourceId: ASK_COMMAND_SOURCE_SHARED_SKILL,
+            sourceLabel: "Shared",
+            slug: "audit",
+            name: "Audit",
+            instructions: "Audit the billing system",
+        });
+        expect(findFirst).toHaveBeenCalledWith({
+            where: {
+                id: "o1",
+                enabled: true,
+                OR: [
+                    personalAgentSkillAuthScope("user-1", 7),
+                    sharedAgentSkillVisibleToUserWhere("user-1", 7),
+                ],
+            },
+            select: {
+                id: true,
+                visibility: true,
+                slug: true,
+                name: true,
+                instructions: true,
+                sourceRepoName: true,
+            },
+        });
+    });
+
+    test("derives the personal source for a personal-visibility skill", async () => {
+        const findFirst = vi.fn().mockResolvedValue({
+            id: "p1",
+            visibility: "PERSONAL",
+            slug: "translate",
+            name: "Translate",
+            instructions: "Translate the text",
+        });
+        const prisma = { agentSkill: { findFirst } } as never;
+
+        const result = await resolveAutoInvocableSkill({ prisma, userId: "user-1", orgId: 7, skillId: "p1" });
+
+        expect(result).toEqual({
+            id: "p1",
+            sourceId: ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+            sourceLabel: "Personal",
+            slug: "translate",
+            name: "Translate",
+            instructions: "Translate the text",
+        });
+    });
+
+    test("does not filter on autoInvocationEnabled (forced auto-invocation parity)", async () => {
+        const findFirst = vi.fn().mockResolvedValue(null);
+        const prisma = { agentSkill: { findFirst } } as never;
+
+        await resolveAutoInvocableSkill({ prisma, userId: "user-1", orgId: 7, skillId: "o1" });
+
+        const where = findFirst.mock.calls[0][0].where;
+        expect(where).not.toHaveProperty("autoInvocationEnabled");
+    });
+
+    test("fails closed (returns null) when no visible skill matches", async () => {
+        const findFirst = vi.fn().mockResolvedValue(null);
+        const prisma = { agentSkill: { findFirst } } as never;
+
+        expect(await resolveAutoInvocableSkill({ prisma, userId: "u", orgId: 1, skillId: "x" })).toBeNull();
+    });
+
+    test("fails closed when the skill is synced from a repo the user can't access", async () => {
+        const findFirst = vi.fn().mockResolvedValue({
+            id: "o1",
+            visibility: "SHARED",
+            slug: "audit",
+            name: "Audit",
+            instructions: "Audit the billing system",
+            sourceRepoName: "github.com/acme/secret",
+        });
+        // The user-scoped repo lookup returns nothing → repo not visible.
+        const repoFindFirst = vi.fn().mockResolvedValue(null);
+        const prisma = { agentSkill: { findFirst }, repo: { findFirst: repoFindFirst } } as never;
+
+        const result = await resolveAutoInvocableSkill({ prisma, userId: "user-1", orgId: 7, skillId: "o1" });
+
+        expect(result).toBeNull();
+        expect(repoFindFirst).toHaveBeenCalledWith({
+            where: { name: "github.com/acme/secret", orgId: 7 },
+            select: { id: true },
+        });
+    });
+
+    test("loads a synced skill when its source repo is visible to the user", async () => {
+        const findFirst = vi.fn().mockResolvedValue({
+            id: "o1",
+            visibility: "SHARED",
+            slug: "audit",
+            name: "Audit",
+            instructions: "Audit the billing system",
+            sourceRepoName: "github.com/acme/widgets",
+        });
+        const repoFindFirst = vi.fn().mockResolvedValue({ id: 11 });
+        const prisma = { agentSkill: { findFirst }, repo: { findFirst: repoFindFirst } } as never;
+
+        const result = await resolveAutoInvocableSkill({ prisma, userId: "user-1", orgId: 7, skillId: "o1" });
+
+        expect(result).toMatchObject({ id: "o1", instructions: "Audit the billing system" });
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/registry.ts b/packages/web/src/ee/features/chat/skills/registry.ts
new file mode 100644
index 000000000..5d9d54d56
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/registry.ts
@@ -0,0 +1,119 @@
+import {
+    sharedAgentSkillVisibleToUserWhere,
+    personalAgentSkillAuthScope,
+    type Prisma,
+    type PrismaClient,
+} from "@sourcebot/db";
+import {
+    ASK_COMMAND_SOURCE_SHARED_SKILL,
+    ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+    type AskCommandDefinition,
+} from "@/features/chat/commands/types";
+import {
+    listSharedAgentSkillCommandsForContext,
+    listPersonalAgentSkillCommandsForContext,
+    sourceLabelForSkillSourceId,
+} from "./commandCatalog";
+import { canAccessSkillSource } from "./sourceRepoAccess";
+
+// The skill instructions resolved when the model invokes `load_skill`.
+export interface ResolvedAutoInvocableSkill {
+    id: string;
+    sourceId: string;
+    sourceLabel: string;
+    slug: string;
+    name: string;
+    instructions: string;
+}
+
+/**
+ * Builds the skill catalog the model sees for a given requester. This is the
+ * same catalog the manual slash-command path builds (same auth scopes, select,
+ * ordering, and {@link AskCommandDefinition} shape — see commandCatalog.ts), so
+ * the model can never see or load a skill the requester could not already invoke
+ * manually, and the two catalogs cannot drift. Every available skill is
+ * model-invocable — there is no per-skill opt-in.
+ *
+ * Both legs require an org: personal skills are scoped to the (user, org) pair,
+ * and shared skills are org-owned.
+ */
+export const buildSkillRegistry = async ({
+    prisma,
+    userId,
+    orgId,
+}: {
+    prisma: PrismaClient;
+    userId: string;
+    orgId: number;
+}): Promise<AskCommandDefinition[]> => {
+    const [personalCommands, sharedCommands] = await Promise.all([
+        listPersonalAgentSkillCommandsForContext({ prisma, userId, orgId }),
+        listSharedAgentSkillCommandsForContext({ prisma, userId, orgId }),
+    ]);
+
+    return [...personalCommands, ...sharedCommands];
+};
+
+/**
+ * Re-resolves a skill by id at invocation time, re-applying the auth scope
+ * (defense in depth — never trusts the registry snapshot). Returns null if the
+ * skill is no longer visible, so a mid-stream adoption removal fails closed.
+ * This mirrors the auth-scoped lookup the manual pipeline performs in
+ * commandResolution.ts.
+ */
+export const resolveAutoInvocableSkill = async ({
+    prisma,
+    userId,
+    orgId,
+    skillId,
+}: {
+    prisma: PrismaClient;
+    userId: string;
+    orgId: number;
+    skillId: string;
+}): Promise<ResolvedAutoInvocableSkill | null> => {
+    const visibilityScopes: Prisma.AgentSkillWhereInput[] = [
+        personalAgentSkillAuthScope(userId, orgId),
+        sharedAgentSkillVisibleToUserWhere(userId, orgId),
+    ];
+
+    const skill = await prisma.agentSkill.findFirst({
+        where: {
+            id: skillId,
+            enabled: true,
+            OR: visibilityScopes,
+        },
+        select: {
+            id: true,
+            visibility: true,
+            slug: true,
+            name: true,
+            instructions: true,
+            sourceRepoName: true,
+        },
+    });
+
+    if (!skill) {
+        return null;
+    }
+
+    // A skill synced from a repo is only loadable by users who can access that
+    // repo. Fails closed (returns null, as for an unscoped/removed skill) so the
+    // model cannot load instructions mirrored from a repo the user can't see.
+    if (!(await canAccessSkillSource(skill, { prisma, orgId }))) {
+        return null;
+    }
+
+    const sourceId = skill.visibility === "SHARED"
+        ? ASK_COMMAND_SOURCE_SHARED_SKILL
+        : ASK_COMMAND_SOURCE_PERSONAL_SKILL;
+
+    return {
+        id: skill.id,
+        sourceId,
+        sourceLabel: sourceLabelForSkillSourceId(sourceId),
+        slug: skill.slug,
+        name: skill.name,
+        instructions: skill.instructions,
+    };
+};
diff --git a/packages/web/src/ee/features/chat/skills/skillAnalytics.test.ts b/packages/web/src/ee/features/chat/skills/skillAnalytics.test.ts
new file mode 100644
index 000000000..691f6d05e
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/skillAnalytics.test.ts
@@ -0,0 +1,74 @@
+import { describe, expect, test } from "vitest";
+import { buildAskSkillInvokedEvent } from "./skillAnalytics";
+
+describe("buildAskSkillInvokedEvent", () => {
+    test("builds a success payload with skill identity and the auto analytics context", () => {
+        const event = buildAskSkillInvokedEvent({
+            activationMethod: "auto",
+            skillId: "skill-1",
+            success: true,
+            slug: "translate",
+            name: "Translate",
+            sourceLabel: "Personal",
+            chatId: "chat-1",
+            traceId: "trace-1",
+            durationMs: 42,
+        });
+
+        expect(event).toEqual({
+            source: "sourcebot-ask-agent",
+            activationMethod: "auto",
+            skillId: "skill-1",
+            success: true,
+            slug: "translate",
+            name: "Translate",
+            sourceLabel: "Personal",
+            chatId: "chat-1",
+            traceId: "trace-1",
+            durationMs: 42,
+        });
+    });
+
+    test("omits skill identity on failure (the skill was never resolved)", () => {
+        const event = buildAskSkillInvokedEvent({
+            activationMethod: "auto",
+            skillId: "ghost",
+            success: false,
+            durationMs: 7,
+        });
+
+        expect(event).toEqual({
+            source: "sourcebot-ask-agent",
+            activationMethod: "auto",
+            skillId: "ghost",
+            success: false,
+            chatId: undefined,
+            traceId: undefined,
+            durationMs: 7,
+        });
+        expect(event).not.toHaveProperty("slug");
+        expect(event).not.toHaveProperty("name");
+        expect(event).not.toHaveProperty("sourceLabel");
+    });
+
+    test("defaults the source to the agent but honors an explicit override (manual path)", () => {
+        const manual = buildAskSkillInvokedEvent({
+            activationMethod: "manual",
+            skillId: "skill-1",
+            success: true,
+            slug: "translate",
+            name: "Translate",
+        });
+        expect(manual.source).toBe("sourcebot-ask-agent");
+        expect(manual.durationMs).toBeUndefined();
+        expect(manual.sourceLabel).toBeUndefined();
+
+        const explicit = buildAskSkillInvokedEvent({
+            activationMethod: "auto",
+            skillId: "skill-1",
+            success: false,
+            source: "sourcebot-web-client",
+        });
+        expect(explicit.source).toBe("sourcebot-web-client");
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/skillAnalytics.ts b/packages/web/src/ee/features/chat/skills/skillAnalytics.ts
new file mode 100644
index 000000000..1d2787a20
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/skillAnalytics.ts
@@ -0,0 +1,58 @@
+import type { AskMcpAnalyticsSource, PosthogEventMap } from "@/lib/posthogEvents";
+
+type AskSkillInvokedEvent = PosthogEventMap['ask_skill_invoked'];
+
+// Shared inputs across every ask_skill_invoked emission. `source` defaults to
+// the agent; chatId/traceId/durationMs are present only where the call site has
+// them (the auto path does; the manual path does not).
+type AskSkillInvokedBase = {
+    activationMethod: AskSkillInvokedEvent['activationMethod'];
+    skillId: string;
+    source?: AskMcpAnalyticsSource;
+    chatId?: string;
+    traceId?: string;
+    durationMs?: number;
+};
+
+// Success carries the resolved skill's identity; failure cannot (the skill was
+// never resolved), so slug/name/sourceLabel are intentionally absent there. The
+// discriminated union encodes that divergence so it is enforced, not re-decided
+// field-by-field at each call site.
+type AskSkillInvokedInput =
+    | (AskSkillInvokedBase & {
+        success: true;
+        slug: string;
+        name: string;
+        // Known for auto invocations; the manual command snapshot may omit it.
+        sourceLabel?: string;
+    })
+    | (AskSkillInvokedBase & {
+        success: false;
+    });
+
+const DEFAULT_SKILL_ANALYTICS_SOURCE: AskMcpAnalyticsSource = 'sourcebot-ask-agent';
+
+/**
+ * Single source of truth for the `ask_skill_invoked` event payload, shared by
+ * the auto-invocation (load_skill) and manual slash-command paths so the event
+ * shape cannot drift between them. Pass the result to `captureEvent`.
+ */
+export const buildAskSkillInvokedEvent = (input: AskSkillInvokedInput): AskSkillInvokedEvent => {
+    const event: AskSkillInvokedEvent = {
+        source: input.source ?? DEFAULT_SKILL_ANALYTICS_SOURCE,
+        activationMethod: input.activationMethod,
+        skillId: input.skillId,
+        success: input.success,
+        chatId: input.chatId,
+        traceId: input.traceId,
+        durationMs: input.durationMs,
+    };
+
+    if (input.success) {
+        event.slug = input.slug;
+        event.name = input.name;
+        event.sourceLabel = input.sourceLabel;
+    }
+
+    return event;
+};
diff --git a/packages/web/src/ee/features/chat/skills/sourceRepoAccess.test.ts b/packages/web/src/ee/features/chat/skills/sourceRepoAccess.test.ts
new file mode 100644
index 000000000..feb1ad82f
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/sourceRepoAccess.test.ts
@@ -0,0 +1,87 @@
+import { describe, expect, test, vi } from "vitest";
+import { canAccessSkillSource, filterSkillsBySourceRepoAccess } from "./sourceRepoAccess";
+
+describe("filterSkillsBySourceRepoAccess", () => {
+    test("keeps non-synced skills and resolves no repos when nothing is synced", async () => {
+        const findMany = vi.fn();
+        const prisma = { repo: { findMany } } as never;
+
+        const skills = [
+            { id: "a", sourceRepoName: null },
+            { id: "b", sourceRepoName: null },
+        ];
+
+        expect(await filterSkillsBySourceRepoAccess(skills, { prisma, orgId: 1 })).toEqual(skills);
+        // Short-circuits: no repo lookup when there are no synced skills.
+        expect(findMany).not.toHaveBeenCalled();
+    });
+
+    test("keeps a synced skill only when its source repo resolves for the user", async () => {
+        // The user-scoped prisma applies the repo permission filter, so only the
+        // repos the user can see come back. Here: widgets is visible, secret is not.
+        const findMany = vi.fn().mockResolvedValue([{ name: "github.com/acme/widgets" }]);
+        const prisma = { repo: { findMany } } as never;
+
+        const skills = [
+            { id: "plain", sourceRepoName: null },
+            { id: "visible", sourceRepoName: "github.com/acme/widgets" },
+            { id: "hidden", sourceRepoName: "github.com/acme/secret" },
+        ];
+
+        const result = await filterSkillsBySourceRepoAccess(skills, { prisma, orgId: 7 });
+
+        expect(result.map((skill) => skill.id)).toEqual(["plain", "visible"]);
+        // One batched lookup over the distinct referenced repo names.
+        expect(findMany).toHaveBeenCalledWith({
+            where: { name: { in: ["github.com/acme/widgets", "github.com/acme/secret"] }, orgId: 7 },
+            select: { name: true },
+        });
+    });
+
+    test("is a no-op when every referenced repo resolves (e.g. permission syncing off)", async () => {
+        // With PERMISSION_SYNC_ENABLED off the repo query carries no filter, so every
+        // referenced repo comes back and nothing is dropped.
+        const findMany = vi.fn().mockResolvedValue([
+            { name: "github.com/acme/widgets" },
+            { name: "github.com/acme/secret" },
+        ]);
+        const prisma = { repo: { findMany } } as never;
+
+        const skills = [
+            { id: "visible", sourceRepoName: "github.com/acme/widgets" },
+            { id: "also-visible", sourceRepoName: "github.com/acme/secret" },
+        ];
+
+        const result = await filterSkillsBySourceRepoAccess(skills, { prisma, orgId: 7 });
+
+        expect(result.map((skill) => skill.id)).toEqual(["visible", "also-visible"]);
+    });
+});
+
+describe("canAccessSkillSource", () => {
+    test("allows a skill with no source without a repo lookup", async () => {
+        const findFirst = vi.fn();
+        const prisma = { repo: { findFirst } } as never;
+
+        expect(await canAccessSkillSource({ sourceRepoName: null }, { prisma, orgId: 1 })).toBe(true);
+        expect(findFirst).not.toHaveBeenCalled();
+    });
+
+    test("allows a synced skill when its source repo resolves", async () => {
+        const findFirst = vi.fn().mockResolvedValue({ id: 9 });
+        const prisma = { repo: { findFirst } } as never;
+
+        expect(await canAccessSkillSource({ sourceRepoName: "github.com/acme/widgets" }, { prisma, orgId: 3 })).toBe(true);
+        expect(findFirst).toHaveBeenCalledWith({
+            where: { name: "github.com/acme/widgets", orgId: 3 },
+            select: { id: true },
+        });
+    });
+
+    test("denies a synced skill when its source repo does not resolve", async () => {
+        const findFirst = vi.fn().mockResolvedValue(null);
+        const prisma = { repo: { findFirst } } as never;
+
+        expect(await canAccessSkillSource({ sourceRepoName: "github.com/acme/secret" }, { prisma, orgId: 3 })).toBe(false);
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/sourceRepoAccess.ts b/packages/web/src/ee/features/chat/skills/sourceRepoAccess.ts
new file mode 100644
index 000000000..897ff4e40
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/sourceRepoAccess.ts
@@ -0,0 +1,61 @@
+import type { PrismaClient } from "@sourcebot/db";
+
+// Permission gate for skills imported from a repository file. A synced skill
+// (sourceRepoName !== null) mirrors content from an indexed repo, so it must only
+// be exposed to users who can access that repo. Visibility is resolved by querying
+// the `repo` table through the *user-scoped* prisma, which injects the same repo
+// permission filter that gates file reads (see getRepoPermissionFilterForUser).
+// Two consequences fall out for free:
+//   - it is a no-op when PERMISSION_SYNC_ENABLED is off (every repo resolves), and
+//   - a repo the user cannot see, or that no longer exists, both resolve to "no
+//     access", so an orphaned source fails closed.
+// Skills with no source are always allowed.
+
+const distinctSourceRepoNames = (skills: { sourceRepoName: string | null }[]): string[] =>
+    [...new Set(
+        skills
+            .map((skill) => skill.sourceRepoName)
+            .filter((name): name is string => typeof name === "string" && name.length > 0),
+    )];
+
+// Returns the subset of skills the requester may see: any skill without a source,
+// plus synced skills whose source repo is visible to the user. The referenced-repo
+// set is resolved in a single batched query, so this is one extra `repo` read per
+// list (skipped entirely when no skill is synced).
+export const filterSkillsBySourceRepoAccess = async <T extends { sourceRepoName: string | null }>(
+    skills: T[],
+    { prisma, orgId }: { prisma: PrismaClient; orgId: number },
+): Promise<T[]> => {
+    const repoNames = distinctSourceRepoNames(skills);
+    if (repoNames.length === 0) {
+        return skills;
+    }
+
+    const visibleRepos = await prisma.repo.findMany({
+        where: { name: { in: repoNames }, orgId },
+        select: { name: true },
+    });
+    const visibleRepoNames = new Set(visibleRepos.map((repo) => repo.name));
+
+    return skills.filter(
+        (skill) => !skill.sourceRepoName || visibleRepoNames.has(skill.sourceRepoName),
+    );
+};
+
+// Single-skill form of the gate, for the auto-invocation resolver and per-skill
+// fetches where one skill is loaded by id.
+export const canAccessSkillSource = async (
+    skill: { sourceRepoName: string | null },
+    { prisma, orgId }: { prisma: PrismaClient; orgId: number },
+): Promise<boolean> => {
+    if (!skill.sourceRepoName) {
+        return true;
+    }
+
+    const repo = await prisma.repo.findFirst({
+        where: { name: skill.sourceRepoName, orgId },
+        select: { id: true },
+    });
+
+    return repo !== null;
+};
diff --git a/packages/web/src/ee/features/chat/skills/types.test.ts b/packages/web/src/ee/features/chat/skills/types.test.ts
new file mode 100644
index 000000000..f2c156f28
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/types.test.ts
@@ -0,0 +1,277 @@
+import { describe, expect, test } from "vitest";
+import {
+    agentSkillInputSchema,
+    normalizeAgentSkillSlug,
+    parseAgentSkillMarkdown,
+    sortAgentSkillListItems,
+    toSharedAgentSkillCatalogItem,
+    toSharedAgentSkillManagementItem,
+    type AgentSkillListItem,
+} from "./types";
+
+describe("normalizeAgentSkillSlug", () => {
+    test("turns display text into a slash-command slug", () => {
+        expect(normalizeAgentSkillSlug("Review PR for Risky Changes")).toBe("review-pr-for-risky-changes");
+    });
+
+    test("removes unsupported leading and trailing characters", () => {
+        expect(normalizeAgentSkillSlug("  /Release Notes!!!  ")).toBe("release-notes");
+    });
+});
+
+describe("agentSkillInputSchema", () => {
+    test("normalizes slug before validation", () => {
+        const result = agentSkillInputSchema.safeParse({
+            name: "PR review",
+            slug: "PR Review",
+            description: "Review a pull request.",
+            instructions: "Find correctness issues.",
+        });
+
+        expect(result.success).toBe(true);
+        if (result.success) {
+            expect(result.data.slug).toBe("pr-review");
+        }
+    });
+
+    test("rejects empty normalized slug", () => {
+        const result = agentSkillInputSchema.safeParse({
+            name: "PR review",
+            slug: "!!!",
+            description: "Review a pull request.",
+            instructions: "Find correctness issues.",
+        });
+
+        expect(result.success).toBe(false);
+    });
+
+    test("allows an empty description", () => {
+        const result = agentSkillInputSchema.safeParse({
+            name: "PR review",
+            slug: "pr-review",
+            description: "",
+            instructions: "Find correctness issues.",
+        });
+
+        expect(result.success).toBe(true);
+        if (result.success) {
+            expect(result.data.description).toBe("");
+        }
+    });
+});
+
+describe("sortAgentSkillListItems", () => {
+    const skill = (overrides: Partial<AgentSkillListItem>): AgentSkillListItem => ({
+        id: "skill",
+        scope: "PERSONAL" as AgentSkillListItem["scope"],
+        slug: "skill",
+        name: "Skill",
+        description: "Description.",
+        instructions: "Instructions.",
+        enabled: true,
+        source: null,
+        createdAt: "2026-01-01T00:00:00.000Z",
+        updatedAt: "2026-01-01T00:00:00.000Z",
+        ...overrides,
+    });
+
+    test("sorts by updated date descending, then name ascending", () => {
+        const skills = [
+            skill({ id: "older", name: "Older", updatedAt: "2026-01-01T00:00:00.000Z" }),
+            skill({ id: "z-newer", name: "Z newer", updatedAt: "2026-01-02T00:00:00.000Z" }),
+            skill({ id: "a-newer", name: "A newer", updatedAt: "2026-01-02T00:00:00.000Z" }),
+        ];
+
+        expect(sortAgentSkillListItems(skills).map((item) => item.id)).toEqual([
+            "a-newer",
+            "z-newer",
+            "older",
+        ]);
+        expect(skills.map((item) => item.id)).toEqual(["older", "z-newer", "a-newer"]);
+    });
+});
+
+describe("toSharedAgentSkillCatalogItem", () => {
+    test("includes instructions, creator email, and repo provenance for the detail view", () => {
+        const item = toSharedAgentSkillCatalogItem({
+            id: "skill-1",
+            visibility: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            instructions: "Review the diff carefully.",
+            enabled: true,
+            autoEnrolled: true,
+            createdById: "user-1",
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            adoptions: [{ id: "adoption-1", removedAt: null }],
+            createdBy: { email: "author@example.com" },
+        }, "user-1");
+
+        expect(item).toEqual({
+            id: "skill-1",
+            scope: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            instructions: "Review the diff carefully.",
+            source: { repoName: "github.com/acme/widgets", filePath: "docs/skill.md", revision: "main" },
+            createdByEmail: "author@example.com",
+            enabled: true,
+            autoEnrolled: true,
+            isAdopted: true,
+            isRemoved: false,
+            isVisibleToUser: true,
+            isCreatedByUser: true,
+            createdAt: "2026-01-01T00:00:00.000Z",
+            updatedAt: "2026-01-02T00:00:00.000Z",
+        });
+        expect(item).not.toHaveProperty("author");
+        expect(item).not.toHaveProperty("createdById");
+    });
+
+    test("falls back to a null email and null source when neither is present", () => {
+        const item = toSharedAgentSkillCatalogItem({
+            id: "skill-2",
+            visibility: "SHARED",
+            slug: "deploy",
+            name: "Deploy",
+            description: "",
+            instructions: "Ship it.",
+            enabled: true,
+            autoEnrolled: false,
+            createdById: "user-2",
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+            sourceRepoName: null,
+            sourceFilePath: null,
+            sourceRevision: null,
+            adoptions: [],
+            createdBy: null,
+        }, "user-1");
+
+        expect(item.createdByEmail).toBeNull();
+        expect(item.isCreatedByUser).toBe(false);
+        expect(item.source).toBeNull();
+    });
+});
+
+describe("toSharedAgentSkillManagementItem", () => {
+    test("contains global management fields without requester adoption state", () => {
+        const item = toSharedAgentSkillManagementItem({
+            id: "skill-1",
+            visibility: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            enabled: true,
+            autoEnrolled: false,
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+            sourceRepoName: "github.com/acme/widgets",
+            sourceFilePath: "docs/skill.md",
+            sourceRevision: "main",
+            createdBy: { email: "author@example.com" },
+        });
+
+        expect(item).toEqual({
+            id: "skill-1",
+            scope: "SHARED",
+            slug: "review",
+            name: "Review",
+            description: "Review risky changes.",
+            enabled: true,
+            autoEnrolled: false,
+            source: { repoName: "github.com/acme/widgets", filePath: "docs/skill.md", revision: "main" },
+            createdByEmail: "author@example.com",
+            createdAt: "2026-01-01T00:00:00.000Z",
+            updatedAt: "2026-01-02T00:00:00.000Z",
+        });
+        expect(item).not.toHaveProperty("instructions");
+        expect(item).not.toHaveProperty("isAdopted");
+        expect(item).not.toHaveProperty("isVisibleToUser");
+        expect(item).not.toHaveProperty("isCreatedByUser");
+    });
+
+    test("maps a manual skill to a null source and a null creator email", () => {
+        const item = toSharedAgentSkillManagementItem({
+            id: "skill-2",
+            visibility: "SHARED",
+            slug: "deploy",
+            name: "Deploy",
+            description: "",
+            enabled: true,
+            autoEnrolled: true,
+            createdAt: new Date("2026-01-01T00:00:00.000Z"),
+            updatedAt: new Date("2026-01-02T00:00:00.000Z"),
+            sourceRepoName: null,
+            sourceFilePath: null,
+            sourceRevision: null,
+            createdBy: null,
+        });
+
+        expect(item.source).toBeNull();
+        expect(item.createdByEmail).toBeNull();
+    });
+});
+
+describe("parseAgentSkillMarkdown", () => {
+    test("prefers an explicit slug from front matter over the name", () => {
+        const result = parseAgentSkillMarkdown(`---
+name: PR Review
+slug: review-pr
+description: Review a pull request for risky changes.
+---
+# Workflow
+
+Look for bugs first.
+`, "ignored.md");
+
+        expect(result).toEqual({
+            name: "PR Review",
+            slug: "review-pr",
+            description: "Review a pull request for risky changes.",
+            instructions: "# Workflow\n\nLook for bugs first.",
+            hasFrontmatter: true,
+        });
+    });
+
+    test("prefers an explicit command over the title-derived slug", () => {
+        const result = parseAgentSkillMarkdown(`---
+title: Release notes
+command: /release
+description: Draft user-facing release notes.
+---
+Summarize merged changes.
+`);
+
+        expect(result.name).toBe("Release notes");
+        expect(result.slug).toBe("release");
+        expect(result.description).toBe("Draft user-facing release notes.");
+        expect(result.instructions).toBe("Summarize merged changes.");
+    });
+
+    test("derives the slug from the name when no explicit slug is given", () => {
+        const result = parseAgentSkillMarkdown(`---
+name: Release notes
+description: Draft user-facing release notes.
+---
+Summarize merged changes.
+`);
+
+        expect(result.slug).toBe("release-notes");
+    });
+
+    test("falls back to the filename when no front matter exists", () => {
+        const result = parseAgentSkillMarkdown("Use short answers.", "short-answers.md");
+
+        expect(result.name).toBe("Short Answers");
+        expect(result.slug).toBe("short-answers");
+        expect(result.instructions).toBe("Use short answers.");
+        expect(result.hasFrontmatter).toBe(false);
+    });
+});
diff --git a/packages/web/src/ee/features/chat/skills/types.ts b/packages/web/src/ee/features/chat/skills/types.ts
new file mode 100644
index 000000000..f8a7843a7
--- /dev/null
+++ b/packages/web/src/ee/features/chat/skills/types.ts
@@ -0,0 +1,292 @@
+import type { AgentSkill, AgentSkillVisibility, Prisma } from "@sourcebot/db";
+import { parse as parseYaml } from "yaml";
+import { z } from "zod";
+
+export const normalizeAgentSkillSlug = (value: string) =>
+    value
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .slice(0, 64)
+        .replace(/-+$/g, "");
+
+const agentSkillSlugSchema = z.string()
+    .transform(normalizeAgentSkillSlug)
+    .pipe(z.string()
+        .min(1, "Command is required.")
+        .max(64, "Command must be 64 characters or fewer.")
+        .regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/, "Command can only contain lowercase letters, numbers, and hyphens."));
+
+export const agentSkillInputSchema = z.object({
+    name: z.string().trim().min(1, "Name is required.").max(80, "Name must be 80 characters or fewer."),
+    slug: agentSkillSlugSchema,
+    description: z.string().trim().max(500, "Description must be 500 characters or fewer."),
+    instructions: z.string().trim().min(1, "Instructions are required.").max(20000, "Instructions must be 20,000 characters or fewer."),
+});
+
+// Provenance for a skill imported from an indexed repository file. When present,
+// the created skill becomes a read-only mirror of that file (synced via the git
+// blob OID). Personal-only: shared skills never carry source.
+export const agentSkillSourceSchema = z.object({
+    repoName: z.string().trim().min(1),
+    filePath: z.string().trim().min(1),
+    revision: z.string().trim().min(1),
+    blobSha: z.string().trim().min(1),
+});
+
+export const createPersonalAgentSkillInputSchema = agentSkillInputSchema.extend({
+    source: agentSkillSourceSchema.optional(),
+});
+
+export const updateAgentSkillInputSchema = agentSkillInputSchema.extend({
+    id: z.string().trim().min(1),
+});
+
+// The non-secret provenance surfaced to the client for a synced skill. The blob
+// OID is intentionally omitted; staleness is computed server-side.
+export const agentSkillSourceRefSchema = z.object({
+    repoName: z.string(),
+    filePath: z.string(),
+    revision: z.string(),
+});
+
+// Staleness of a synced skill relative to its indexed source file. source_missing:
+// the file was renamed/deleted; repo_unavailable: the repo is gone or not visible
+// to the user. not_synced is returned for skills that have no source.
+export const agentSkillSourceStatusSchema = z.enum([
+    "in_sync",
+    "update_available",
+    "source_missing",
+    "repo_unavailable",
+    "not_synced",
+]);
+
+export type AgentSkillSource = z.infer<typeof agentSkillSourceSchema>;
+export type AgentSkillSourceRef = z.infer<typeof agentSkillSourceRefSchema>;
+export type AgentSkillSourceStatus = z.infer<typeof agentSkillSourceStatusSchema>;
+export type CreatePersonalAgentSkillInput = z.infer<typeof createPersonalAgentSkillInputSchema>;
+
+export const agentSkillListItemSchema = z.object({
+    id: z.string(),
+    scope: z.custom<AgentSkillVisibility>(),
+    slug: z.string(),
+    name: z.string(),
+    description: z.string(),
+    instructions: z.string(),
+    enabled: z.boolean(),
+    // The repository file this skill mirrors, or null for manually-created and
+    // local-file-imported skills. Presence marks the skill as read-only/synced.
+    source: agentSkillSourceRefSchema.nullable(),
+    createdAt: z.string(),
+    updatedAt: z.string(),
+});
+
+export const sharedAgentSkillBaseItemSchema = agentSkillListItemSchema.omit({
+    instructions: true,
+    source: true,
+}).extend({
+    autoEnrolled: z.boolean(),
+});
+
+export const sharedAgentSkillCatalogItemSchema = sharedAgentSkillBaseItemSchema.extend({
+    // Surfaced so the standalone Skills page can render a read-only preview and
+    // populate the inline editor without an extra per-selection fetch. Shared
+    // skills are org-wide visible, so exposing instructions here is not a leak.
+    instructions: z.string(),
+    // The repository file this shared skill mirrors, or null. A shared skill keeps
+    // its source link when published, so the org-wide command stays synced and the
+    // author/owners can refresh it from source.
+    source: agentSkillSourceRefSchema.nullable(),
+    // Audit metadata for the detail pane's "Added by" field. Null when the
+    // creating user has no email on record.
+    createdByEmail: z.string().nullable(),
+    isAdopted: z.boolean(),
+    isRemoved: z.boolean(),
+    isVisibleToUser: z.boolean(),
+    isCreatedByUser: z.boolean(),
+});
+
+export const sharedAgentSkillManagementItemSchema = sharedAgentSkillBaseItemSchema.extend({
+    // The repository file this shared skill mirrors, or null for manually-created
+    // and file-imported skills. Drives the Source column and the Synced/Manual
+    // filter in the workspace management table.
+    source: agentSkillSourceRefSchema.nullable(),
+    // Creator email for the management table's "Added by" column. Null when the
+    // creating user has no email on record.
+    createdByEmail: z.string().nullable(),
+});
+
+export type AgentSkillInput = z.infer<typeof agentSkillInputSchema>;
+export type UpdateAgentSkillInput = z.infer<typeof updateAgentSkillInputSchema>;
+export type AgentSkillListItem = z.infer<typeof agentSkillListItemSchema>;
+export type SharedAgentSkillBaseItem = z.infer<typeof sharedAgentSkillBaseItemSchema>;
+export type SharedAgentSkillCatalogItem = z.infer<typeof sharedAgentSkillCatalogItemSchema>;
+export type SharedAgentSkillManagementItem = z.infer<typeof sharedAgentSkillManagementItemSchema>;
+
+export const agentSkillOrderBy = [
+    { updatedAt: "desc" },
+    { name: "asc" },
+] satisfies Prisma.AgentSkillOrderByWithRelationInput[];
+
+export const sortAgentSkillListItems = (skills: AgentSkillListItem[]) =>
+    [...skills].sort((a, b) => {
+        const updatedDiff = new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime();
+        return updatedDiff !== 0 ? updatedDiff : a.name.localeCompare(b.name);
+    });
+
+export const sortSharedAgentSkillCatalogItems = <T extends Pick<SharedAgentSkillBaseItem, "updatedAt" | "name">>(skills: T[]) =>
+    [...skills].sort((a, b) => {
+        const updatedDiff = new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime();
+        return updatedDiff !== 0 ? updatedDiff : a.name.localeCompare(b.name);
+    });
+
+export interface ParsedAgentSkillMarkdown {
+    name?: string;
+    slug?: string;
+    description?: string;
+    instructions: string;
+    hasFrontmatter: boolean;
+    frontmatterError?: string;
+}
+
+const getOptionalString = (value: unknown) =>
+    typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
+
+const fileNameToSkillName = (fileName?: string) => {
+    if (!fileName) {
+        return undefined;
+    }
+
+    const stem = fileName.replace(/\.[^.]+$/, "");
+    return stem
+        .split(/[-_\s]+/)
+        .filter(Boolean)
+        .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+        .join(" ");
+};
+
+export const parseAgentSkillMarkdown = (
+    content: string,
+    fileName?: string,
+): ParsedAgentSkillMarkdown => {
+    const text = content.replace(/^\uFEFF/, "");
+    const fallbackName = fileNameToSkillName(fileName);
+    const fallbackSlug = fallbackName ? normalizeAgentSkillSlug(fallbackName) : undefined;
+    const frontmatterMatch = text.match(/^---[ \t]*\r?\n([\s\S]*?)\r?\n---[ \t]*(?:\r?\n|$)/);
+
+    if (!frontmatterMatch) {
+        return {
+            name: fallbackName,
+            slug: fallbackSlug,
+            instructions: text.trim(),
+            hasFrontmatter: false,
+        };
+    }
+
+    const rawFrontmatter = frontmatterMatch[1];
+    const body = text.slice(frontmatterMatch[0].length).trim();
+
+    let parsed: Record<string, unknown> | null;
+    try {
+        parsed = parseYaml(rawFrontmatter) as Record<string, unknown> | null;
+    } catch (error) {
+        return {
+            name: fallbackName,
+            slug: fallbackSlug,
+            instructions: body,
+            hasFrontmatter: true,
+            frontmatterError: error instanceof Error ? error.message : "Could not parse front matter.",
+        };
+    }
+
+    const name = getOptionalString(parsed?.name) ?? getOptionalString(parsed?.title) ?? fallbackName;
+    const explicitSlug = getOptionalString(parsed?.slug) ?? getOptionalString(parsed?.command);
+    const slug = explicitSlug
+        ? normalizeAgentSkillSlug(explicitSlug)
+        : name
+            ? normalizeAgentSkillSlug(name)
+            : fallbackSlug;
+
+    return {
+        name,
+        slug: slug || undefined,
+        description: getOptionalString(parsed?.description),
+        instructions: body,
+        hasFrontmatter: true,
+    };
+};
+
+// Maps the stored provenance columns to the client-facing source ref, or null
+// when the skill has no repository link. All three columns are written together,
+// so any one being absent means "not synced".
+const toAgentSkillSourceRef = (
+    skill: Pick<AgentSkill, "sourceRepoName" | "sourceFilePath" | "sourceRevision">,
+): AgentSkillSourceRef | null =>
+    skill.sourceRepoName && skill.sourceFilePath && skill.sourceRevision
+        ? {
+            repoName: skill.sourceRepoName,
+            filePath: skill.sourceFilePath,
+            revision: skill.sourceRevision,
+        }
+        : null;
+
+export const toAgentSkillListItem = (
+    skill: Pick<AgentSkill, "id" | "visibility" | "slug" | "name" | "description" | "instructions" | "enabled" | "createdAt" | "updatedAt" | "sourceRepoName" | "sourceFilePath" | "sourceRevision">,
+): AgentSkillListItem => ({
+    id: skill.id,
+    scope: skill.visibility,
+    slug: skill.slug,
+    name: skill.name,
+    description: skill.description,
+    instructions: skill.instructions,
+    enabled: skill.enabled,
+    source: toAgentSkillSourceRef(skill),
+    createdAt: skill.createdAt.toISOString(),
+    updatedAt: skill.updatedAt.toISOString(),
+});
+
+const toSharedAgentSkillBaseItem = (
+    skill: Pick<AgentSkill, "id" | "visibility" | "slug" | "name" | "description" | "enabled" | "autoEnrolled" | "createdAt" | "updatedAt">,
+): SharedAgentSkillBaseItem => ({
+    id: skill.id,
+    scope: skill.visibility,
+    slug: skill.slug,
+    name: skill.name,
+    description: skill.description,
+    enabled: skill.enabled,
+    createdAt: skill.createdAt.toISOString(),
+    updatedAt: skill.updatedAt.toISOString(),
+    autoEnrolled: skill.autoEnrolled,
+});
+
+export const toSharedAgentSkillManagementItem = (
+    skill: Pick<AgentSkill, "id" | "visibility" | "slug" | "name" | "description" | "enabled" | "autoEnrolled" | "createdAt" | "updatedAt" | "sourceRepoName" | "sourceFilePath" | "sourceRevision"> & {
+        createdBy: { email: string | null } | null;
+    },
+): SharedAgentSkillManagementItem => ({
+    ...toSharedAgentSkillBaseItem(skill),
+    source: toAgentSkillSourceRef(skill),
+    createdByEmail: skill.createdBy?.email ?? null,
+});
+
+export const toSharedAgentSkillCatalogItem = (
+    skill: Pick<AgentSkill, "id" | "visibility" | "slug" | "name" | "description" | "instructions" | "enabled" | "autoEnrolled" | "createdById" | "createdAt" | "updatedAt" | "sourceRepoName" | "sourceFilePath" | "sourceRevision"> & {
+        adoptions: { id: string; removedAt: Date | null }[];
+        createdBy: { email: string | null } | null;
+    },
+    userId: string,
+): SharedAgentSkillCatalogItem => {
+    const isAdopted = skill.adoptions.some((adoption) => adoption.removedAt === null);
+    const isRemoved = skill.adoptions.some((adoption) => adoption.removedAt !== null);
+    return {
+        ...toSharedAgentSkillBaseItem(skill),
+        instructions: skill.instructions,
+        source: toAgentSkillSourceRef(skill),
+        createdByEmail: skill.createdBy?.email ?? null,
+        isAdopted,
+        isRemoved,
+        isVisibleToUser: (skill.autoEnrolled || isAdopted) && !isRemoved,
+        isCreatedByUser: skill.createdById === userId,
+    };
+};
diff --git a/packages/web/src/ee/features/chat/useTOCItems.ts b/packages/web/src/ee/features/chat/useTOCItems.ts
index 44ee62b81..e02b9358b 100644
--- a/packages/web/src/ee/features/chat/useTOCItems.ts
+++ b/packages/web/src/ee/features/chat/useTOCItems.ts
@@ -4,6 +4,9 @@ import { useEffect, useRef, useState } from "react";
 
 interface Props {
     target: HTMLElement | null;
+    // IntersectionObserver root for active-section tracking. Pass the scroll
+    // container when content scrolls inside an element rather than the page.
+    root?: HTMLElement | null;
 }
 
 export interface TocItem {
@@ -14,7 +17,7 @@ export interface TocItem {
 }
 
 
-export const useExtractTOCItems = ({ target }: Props) => {
+export const useExtractTOCItems = ({ target, root }: Props) => {
     const [tocItems, setTocItems] = useState<TocItem[]>([]);
     const [activeId, setActiveId] = useState<string>('');
     const observerRef = useRef<IntersectionObserver | null>(null);
@@ -76,6 +79,7 @@ export const useExtractTOCItems = ({ target }: Props) => {
                 });
             },
             {
+                root: root ?? null,
                 rootMargin: '-20px 0px -80% 0px'
             }
         );
@@ -91,7 +95,7 @@ export const useExtractTOCItems = ({ target }: Props) => {
                 observerRef.current.disconnect();
             }
         };
-    }, [tocItems]);
+    }, [tocItems, root]);
 
     return {
         tocItems,
diff --git a/packages/web/src/ee/features/chat/useUnsavedChangesGuard.test.tsx b/packages/web/src/ee/features/chat/useUnsavedChangesGuard.test.tsx
new file mode 100644
index 000000000..34b095c92
--- /dev/null
+++ b/packages/web/src/ee/features/chat/useUnsavedChangesGuard.test.tsx
@@ -0,0 +1,128 @@
+import { act, cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { useContext } from "react";
+import { AppRouterContext, type AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
+import { NavigationGuardProvider } from "next-navigation-guard";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { useUnsavedChangesGuard } from "./useUnsavedChangesGuard";
+
+// jsdom initializes history.state to null; the library's history augmentation
+// reads fields off it, so seed an object first.
+beforeEach(() => {
+    window.history.replaceState({}, "");
+});
+
+// This vitest config doesn't enable RTL auto-cleanup, so unmount between tests
+// to drop the window `beforeunload` listeners each render registers.
+afterEach(() => {
+    cleanup();
+});
+
+// A minimal underlying App Router for the guard library to wrap. Without an
+// outer router there is nothing to intercept, so the guard never engages.
+const makeMockRouter = (): AppRouterInstance => ({
+    push: vi.fn(),
+    replace: vi.fn(),
+    refresh: vi.fn(),
+    back: vi.fn(),
+    forward: vi.fn(),
+    prefetch: vi.fn(),
+});
+
+const renderWithRouter = (ui: React.ReactNode, router: AppRouterInstance) =>
+    render(
+        <AppRouterContext.Provider value={router}>
+            <NavigationGuardProvider>{ui}</NavigationGuardProvider>
+        </AppRouterContext.Provider>,
+    );
+
+describe("useUnsavedChangesGuard — beforeunload", () => {
+    test("prevents unload when enabled", () => {
+        renderWithRouter(<Noop enabled={true} />, makeMockRouter());
+        const event = new Event("beforeunload", { cancelable: true });
+        act(() => { window.dispatchEvent(event); });
+        expect(event.defaultPrevented).toBe(true);
+    });
+
+    test("does NOT prevent unload when disabled", () => {
+        renderWithRouter(<Noop enabled={false} />, makeMockRouter());
+        const event = new Event("beforeunload", { cancelable: true });
+        act(() => { window.dispatchEvent(event); });
+        expect(event.defaultPrevented).toBe(false);
+    });
+});
+
+function Noop({ enabled, confirm }: { enabled: boolean; confirm?: () => boolean }) {
+    useUnsavedChangesGuard({ enabled, confirm });
+    return null;
+}
+
+describe("useUnsavedChangesGuard — in-app router.push", () => {
+    test("controlled mode: intercepts push and toggles `active` when enabled", async () => {
+        const router = makeMockRouter();
+
+        function Probe() {
+            const r = useContext(AppRouterContext);
+            const guard = useUnsavedChangesGuard({ enabled: true });
+            return (
+                <button type="button" data-active={guard.active} onClick={() => r?.push("/elsewhere")}>
+                    go
+                </button>
+            );
+        }
+
+        renderWithRouter(<Probe />, router);
+
+        fireEvent.click(screen.getByRole("button", { name: "go" }));
+
+        await waitFor(() => {
+            expect(screen.getByRole("button", { name: "go" }).getAttribute("data-active")).toBe("true");
+        });
+        // navigation should be suspended, not forwarded to the underlying router
+        expect(router.push).not.toHaveBeenCalled();
+    });
+
+    test("confirm mode: calls confirm() on push when enabled", async () => {
+        const router = makeMockRouter();
+        const confirm = vi.fn(() => true);
+
+        function Probe() {
+            const r = useContext(AppRouterContext);
+            useUnsavedChangesGuard({ enabled: true, confirm });
+            return (
+                <button type="button" onClick={() => r?.push("/elsewhere")}>
+                    go
+                </button>
+            );
+        }
+
+        renderWithRouter(<Probe />, router);
+
+        fireEvent.click(screen.getByRole("button", { name: "go" }));
+
+        await waitFor(() => {
+            expect(confirm).toHaveBeenCalled();
+        });
+    });
+
+    test("does NOT intercept push when disabled", async () => {
+        const router = makeMockRouter();
+
+        function Probe() {
+            const r = useContext(AppRouterContext);
+            useUnsavedChangesGuard({ enabled: false });
+            return (
+                <button type="button" onClick={() => r?.push("/elsewhere")}>
+                    go
+                </button>
+            );
+        }
+
+        renderWithRouter(<Probe />, router);
+
+        fireEvent.click(screen.getByRole("button", { name: "go" }));
+
+        await waitFor(() => {
+            expect(router.push).toHaveBeenCalledWith("/elsewhere");
+        });
+    });
+});
diff --git a/packages/web/src/ee/features/chat/useUnsavedChangesGuard.ts b/packages/web/src/ee/features/chat/useUnsavedChangesGuard.ts
new file mode 100644
index 000000000..556d1a44d
--- /dev/null
+++ b/packages/web/src/ee/features/chat/useUnsavedChangesGuard.ts
@@ -0,0 +1,105 @@
+'use client';
+
+import { useNavigationGuard } from 'next-navigation-guard';
+import { useEffect, useRef } from 'react';
+
+interface UseUnsavedChangesGuardOptions {
+    // Whether there are unsaved changes that should block navigation.
+    enabled: boolean;
+    // Optional native `window.confirm` used to resolve in-app navigation. Provide
+    // this for the lightweight confirm flow; omit it to drive a themed dialog via
+    // the returned `active` / `resolve`.
+    confirm?: () => boolean;
+}
+
+interface UnsavedChangesGuard {
+    // True while an in-app navigation is pending a keep/discard decision. Only
+    // meaningful in themed-dialog mode (i.e. when `confirm` is not provided).
+    active: boolean;
+    // Resolve a pending in-app navigation: `true` discards and proceeds, `false`
+    // keeps the user on the page.
+    resolve: (discard: boolean) => void;
+    // Suppress the guard for a deliberate programmatic navigation (e.g. a
+    // save-then-redirect, where the form is still "dirty" versus its initial
+    // values at the moment we navigate away).
+    bypass: () => void;
+}
+
+/**
+ * Guards against losing unsaved changes when the user navigates away. Centralizes
+ * the navigation-guard wiring shared by the chat thread and the skill editor:
+ *
+ *  - in-app navigation (links, back/forward) is intercepted while `enabled`,
+ *  - programmatic `router.refresh()` calls are always allowed through,
+ *  - full-page unloads (refresh key, tab close) trigger the native browser prompt.
+ *
+ * Pass `confirm` for the simple `window.confirm` flow, or omit it and render a
+ * themed dialog driven by the returned `active` / `resolve`.
+ */
+export function useUnsavedChangesGuard({ enabled, confirm }: UseUnsavedChangesGuardOptions): UnsavedChangesGuard {
+    const bypassRef = useRef(false);
+
+    const navGuard = useNavigationGuard({
+        enabled: ({ type }) => {
+            if (bypassRef.current) {
+                return false;
+            }
+            // A "refresh" here means a client-side `router.refresh()` (not the
+            // user pressing the refresh key, which is a "beforeunload"); those
+            // don't lose unsaved changes. Full-page unloads are handled by the
+            // native `beforeunload` listener below, so neither goes through the
+            // in-app guard.
+            if (type === 'refresh' || type === 'beforeunload') {
+                return false;
+            }
+            return enabled;
+        },
+        ...(confirm ? { confirm } : {}),
+    });
+
+    // One-shot latch so accept()/reject() fire exactly once per activation: the
+    // dialog's action buttons resolve the guard, and closing the dialog would
+    // otherwise resolve it a second time via onOpenChange.
+    const decisionMadeRef = useRef(false);
+    useEffect(() => {
+        if (navGuard.active) {
+            decisionMadeRef.current = false;
+        }
+    }, [navGuard.active]);
+
+    const resolve = (discard: boolean) => {
+        if (decisionMadeRef.current) {
+            return;
+        }
+        decisionMadeRef.current = true;
+        if (discard) {
+            navGuard.accept();
+        } else {
+            navGuard.reject();
+        }
+    };
+
+    // Native prompt for full-page unloads (refresh key, tab close). Browsers
+    // won't render a custom dialog here, so this is the unavoidable fallback.
+    useEffect(() => {
+        if (!enabled) {
+            return;
+        }
+
+        const handleBeforeUnload = (event: BeforeUnloadEvent) => {
+            event.preventDefault();
+            event.returnValue = '';
+        };
+
+        window.addEventListener('beforeunload', handleBeforeUnload);
+        return () => window.removeEventListener('beforeunload', handleBeforeUnload);
+    }, [enabled]);
+
+    return {
+        active: navGuard.active,
+        resolve,
+        bypass: () => {
+            bypassRef.current = true;
+        },
+    };
+}
diff --git a/packages/web/src/ee/features/oauth/server.ts b/packages/web/src/ee/features/oauth/server.ts
index 9253ce93a..640d1a548 100644
--- a/packages/web/src/ee/features/oauth/server.ts
+++ b/packages/web/src/ee/features/oauth/server.ts
@@ -1,7 +1,7 @@
 import 'server-only';
 
 import { __unsafePrisma } from '@/prisma';
-import { Prisma } from '@prisma/client';
+import { isRecordNotFoundError } from '@/lib/prismaErrors';
 import {
     env,
     generateOAuthRefreshToken,
@@ -115,7 +115,7 @@ export async function verifyAndExchangeCode({
     try {
         await __unsafePrisma.oAuthAuthorizationCode.delete({ where: { codeHash } });
     } catch (error) {
-        if (error instanceof Prisma.PrismaClientKnownRequestError && error.code === 'P2025') {
+        if (isRecordNotFoundError(error)) {
             return { error: 'invalid_grant', errorDescription: 'Authorization code has already been used.' };
         }
         throw error;
diff --git a/packages/web/src/features/chat/commands/types.ts b/packages/web/src/features/chat/commands/types.ts
new file mode 100644
index 000000000..e8175fe30
--- /dev/null
+++ b/packages/web/src/features/chat/commands/types.ts
@@ -0,0 +1,43 @@
+import { z } from "zod";
+
+export const ASK_COMMAND_SOURCE_PERSONAL_SKILL = "personal-skill";
+export const ASK_COMMAND_SOURCE_SHARED_SKILL = "shared-skill";
+
+export type AskCommandDefinition = {
+    id: string;
+    // The registry/source that owns this command, not its execution type.
+    sourceId: string;
+    slug: string;
+    name: string;
+    description: string;
+    sourceLabel?: string;
+    aliases?: string[];
+    isHidden?: boolean;
+}
+
+export type AskCommandSuggestion = AskCommandDefinition & {
+    type: 'command';
+}
+
+// Snapshot data for rendering/restoring the editor chip. Execution should
+// resolve the command definition by sourceId + commandId in a later layer.
+export const commandMentionDataSchema = z.object({
+    type: z.literal('command'),
+    commandId: z.string(),
+    // The registry/source that owns this command, not its execution type.
+    sourceId: z.string(),
+    slug: z.string(),
+    name: z.string(),
+    sourceLabel: z.string().optional(),
+});
+
+export type CommandMentionData = z.infer<typeof commandMentionDataSchema>;
+
+export const isCommandMentionData = (value: unknown): value is CommandMentionData =>
+    commandMentionDataSchema.safeParse(value).success;
+
+export const commandInvocationDataSchema = commandMentionDataSchema.extend({
+    expandedText: z.string().optional(),
+});
+
+export type CommandInvocationData = z.infer<typeof commandInvocationDataSchema>;
diff --git a/packages/web/src/features/chat/commands/utils.test.ts b/packages/web/src/features/chat/commands/utils.test.ts
new file mode 100644
index 000000000..e828031d4
--- /dev/null
+++ b/packages/web/src/features/chat/commands/utils.test.ts
@@ -0,0 +1,107 @@
+import { describe, expect, test } from 'vitest';
+import { ASK_COMMAND_SOURCE_SHARED_SKILL, ASK_COMMAND_SOURCE_PERSONAL_SKILL, type AskCommandDefinition } from './types';
+import { createCommandInvocationData, filterAskCommandDefinitions, toAskCommandSuggestion } from './utils';
+
+const command = (overrides: Partial<AskCommandDefinition>): AskCommandDefinition => ({
+    id: 'skill-1',
+    sourceId: ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+    slug: 'review-pr',
+    name: 'Review PR',
+    description: 'Review changes for risky code.',
+    ...overrides,
+});
+
+describe('filterAskCommandDefinitions', () => {
+    test('returns visible commands for an empty query', () => {
+        const commands = [
+            command({ id: 'visible' }),
+            command({ id: 'hidden', isHidden: true }),
+        ];
+
+        expect(filterAskCommandDefinitions(commands, '').map((item) => item.id)).toEqual(['visible']);
+    });
+
+    test('matches slug, name, description, and aliases', () => {
+        const commands = [
+            command({ id: 'slug', slug: 'release-notes', name: 'Release notes', description: '' }),
+            command({ id: 'name', slug: 'ship', name: 'Deploy Checklist', description: '' }),
+            command({ id: 'description', slug: 'audit', name: 'Audit', description: 'Find security risks.' }),
+            command({ id: 'alias', slug: 'summarize', name: 'Summarize', description: '', aliases: ['tl-dr'] }),
+        ];
+
+        expect(filterAskCommandDefinitions(commands, 'release').map((item) => item.id)).toEqual(['slug']);
+        expect(filterAskCommandDefinitions(commands, 'deploy').map((item) => item.id)).toEqual(['name']);
+        expect(filterAskCommandDefinitions(commands, 'security').map((item) => item.id)).toEqual(['description']);
+        expect(filterAskCommandDefinitions(commands, 'tl-dr').map((item) => item.id)).toEqual(['alias']);
+    });
+
+    test('normalizes a leading slash in the query', () => {
+        expect(filterAskCommandDefinitions([command({})], '/review').map((item) => item.id)).toEqual(['skill-1']);
+    });
+
+    test('keeps commands with the same slug from different sources', () => {
+        const commands = [
+            command({ id: 'personal-skill', sourceId: ASK_COMMAND_SOURCE_PERSONAL_SKILL, slug: 'review' }),
+            command({ id: 'shared-skill', sourceId: ASK_COMMAND_SOURCE_SHARED_SKILL, slug: 'review' }),
+        ];
+
+        expect(filterAskCommandDefinitions(commands, '/review').map((item) => item.id)).toEqual([
+            'personal-skill',
+            'shared-skill',
+        ]);
+    });
+});
+
+describe('toAskCommandSuggestion', () => {
+    test('adds the command suggestion discriminator', () => {
+        expect(toAskCommandSuggestion(command({}))).toMatchObject({
+            type: 'command',
+            slug: 'review-pr',
+        });
+    });
+});
+
+describe('createCommandInvocationData', () => {
+    const commandMention = {
+        type: 'command' as const,
+        commandId: 'skill-1',
+        sourceId: ASK_COMMAND_SOURCE_PERSONAL_SKILL,
+        slug: 'review-pr',
+        name: 'Review PR',
+    };
+
+    test('returns the invocation snapshot for a leading command mention', () => {
+        expect(createCommandInvocationData('/review-pr src/auth/session.ts\n', [commandMention])).toEqual(commandMention);
+    });
+
+    test('returns the invocation snapshot when text appears before the command mention', () => {
+        expect(createCommandInvocationData('please /review-pr src/auth/session.ts', [commandMention])).toEqual(commandMention);
+    });
+
+    test('returns the invocation snapshot when the command has no trailing text', () => {
+        expect(createCommandInvocationData('/review-pr', [commandMention])).toEqual(commandMention);
+        expect(createCommandInvocationData('/review-pr\n', [commandMention])).toEqual(commandMention);
+    });
+
+    test('preserves the command source label when present', () => {
+        expect(createCommandInvocationData('/review-pr src/auth/session.ts\n', [{
+            ...commandMention,
+            sourceLabel: 'Personal',
+        }])).toEqual({
+            ...commandMention,
+            sourceLabel: 'Personal',
+        });
+    });
+
+    test('does not match adjacent command-like text', () => {
+        expect(createCommandInvocationData('/review-pr-extra src/auth/session.ts', [commandMention])).toBeUndefined();
+    });
+
+    test('does not match a command preceded by non-whitespace', () => {
+        expect(createCommandInvocationData('foo/review-pr src/auth/session.ts', [commandMention])).toBeUndefined();
+    });
+
+    test('skips an embedded false match and resolves a later valid occurrence', () => {
+        expect(createCommandInvocationData('x/review-prX then /review-pr real', [commandMention])).toEqual(commandMention);
+    });
+});
diff --git a/packages/web/src/features/chat/commands/utils.ts b/packages/web/src/features/chat/commands/utils.ts
new file mode 100644
index 000000000..ae4c4b4d3
--- /dev/null
+++ b/packages/web/src/features/chat/commands/utils.ts
@@ -0,0 +1,78 @@
+import type { AskCommandDefinition, AskCommandSuggestion, CommandInvocationData, CommandMentionData } from "./types";
+
+export const toAskCommandSuggestion = (command: AskCommandDefinition): AskCommandSuggestion => ({
+    ...command,
+    type: 'command',
+});
+
+export const filterAskCommandDefinitions = (
+    commands: AskCommandDefinition[],
+    query: string,
+): AskCommandDefinition[] => {
+    const normalizedQuery = query.trim().replace(/^\//, '').toLowerCase();
+
+    return commands.filter((command) => {
+        if (command.isHidden) {
+            return false;
+        }
+
+        if (normalizedQuery.length === 0) {
+            return true;
+        }
+
+        const searchableFields = [
+            command.slug,
+            command.name,
+            command.description,
+            ...(command.aliases ?? []),
+        ];
+
+        return searchableFields.some((field) => field.toLowerCase().includes(normalizedQuery));
+    });
+};
+
+const findCommandPrefixIndex = (text: string, slug: string): number => {
+    const commandPrefix = `/${slug}`;
+    let searchFrom = 0;
+
+    while (searchFrom < text.length) {
+        const index = text.indexOf(commandPrefix, searchFrom);
+        if (index === -1) {
+            return -1;
+        }
+
+        const beforeCommand = index === 0 ? "" : text[index - 1];
+        const afterCommand = text[index + commandPrefix.length] ?? "";
+        if ((!beforeCommand || /\s/.test(beforeCommand)) && (!afterCommand || /\s/.test(afterCommand))) {
+            return index;
+        }
+
+        searchFrom = index + commandPrefix.length;
+    }
+
+    return -1;
+};
+
+export const createCommandInvocationData = (
+    text: string,
+    commandMentions: CommandMentionData[],
+): CommandInvocationData | undefined => {
+    const command = commandMentions[0];
+    if (!command) {
+        return undefined;
+    }
+
+    const commandIndex = findCommandPrefixIndex(text, command.slug);
+    if (commandIndex === -1) {
+        return undefined;
+    }
+
+    return {
+        type: command.type,
+        commandId: command.commandId,
+        sourceId: command.sourceId,
+        slug: command.slug,
+        name: command.name,
+        ...(command.sourceLabel ? { sourceLabel: command.sourceLabel } : {}),
+    };
+};
diff --git a/packages/web/src/features/chat/components/chatBox/chatBox.tsx b/packages/web/src/features/chat/components/chatBox/chatBox.tsx
index a7dd7fd31..4f5a3ecdb 100644
--- a/packages/web/src/features/chat/components/chatBox/chatBox.tsx
+++ b/packages/web/src/features/chat/components/chatBox/chatBox.tsx
@@ -12,7 +12,7 @@ import { cn } from "@/lib/utils";
 import { useIsMac } from "@/hooks/useIsMac";
 import { computePosition, flip, offset, shift, VirtualElement } from "@floating-ui/react";
 import { ArrowUp, Loader2, StopCircleIcon } from "lucide-react";
-import { forwardRef, Fragment, KeyboardEvent, memo, Ref, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
+import { forwardRef, Fragment, KeyboardEvent, memo, Ref, type ReactNode, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { Descendant, insertText } from "slate";
 import { Editable, ReactEditor, RenderElementProps, RenderLeafProps, useFocused, useSelected, useSlate } from "slate-react";
@@ -30,6 +30,9 @@ import { ATTACHMENT_MAX_IMAGE_BYTES, ATTACHMENT_MAX_TURN_TEXT_BYTES, PENDING_CHA
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 import { useHasEntitlement } from "@/features/entitlements/useHasEntitlement";
 import { UpsellDialog } from "@/features/billing/upsellDialog";
+import type { AskCommandDefinition, CommandMentionData } from "@/features/chat/commands/types";
+import { shouldUsePlainComposerEnterBehavior } from "./keyboard";
+import { SourceLabelBadge } from "./sourceLabelBadge";
 
 export interface ChatBoxHandle {
     addFiles: (files: File[]) => void;
@@ -55,6 +58,7 @@ interface ChatBoxProps {
     isDisabled?: boolean;
     selectedSearchScopes: SearchScope[];
     searchContexts: SearchContextQuery[];
+    askCommands: AskCommandDefinition[];
     isLoginWallEnabled: boolean;
     isAuthenticated: boolean;
     // Authoritative per-image byte cap from the server
@@ -77,6 +81,7 @@ const ChatBoxComponent = ({
     selectedSearchScopes,
     searchContexts,
     maxImageBytes = ATTACHMENT_MAX_IMAGE_BYTES,
+    askCommands,
 }: ChatBoxProps, ref: Ref<ChatBoxHandle>) => {
     const suggestionsBoxRef = useRef<HTMLDivElement>(null);
     const [index, setIndex] = useState(0);
@@ -100,6 +105,7 @@ const ChatBoxComponent = ({
 
             return [];
         }).flat(),
+        askCommands,
     });
     const { selectedLanguageModel } = useSelectedLanguageModel();
     const { toast } = useToast();
@@ -260,13 +266,17 @@ const ChatBoxComponent = ({
         },
     }), [onAddFiles]);
 
-    // Reset the index when the suggestion mode changes.
+    // Reset the index when the active suggestion set changes.
     useEffect(() => {
         setIndex(0);
-    }, [suggestionMode]);
+    }, [suggestionMode, suggestionQuery]);
 
     // Hotkey to focus the chat box.
     useHotkeys("/", (e) => {
+        if (ReactEditor.isFocused(editor)) {
+            return;
+        }
+
         e.preventDefault();
         ReactEditor.focus(editor);
     });
@@ -508,14 +518,20 @@ const ChatBoxComponent = ({
                     revision: suggestion.revision,
                 }, range);
                 break;
-            case 'refine': {
-                switch (suggestion.targetSuggestionMode) {
-                    case 'file':
-                        insertText(editor, 'file:');
-                        break;
-                }
+            case 'command':
+                insertMention(editor, {
+                    type: 'command',
+                    commandId: suggestion.id,
+                    sourceId: suggestion.sourceId,
+                    slug: suggestion.slug,
+                    name: suggestion.name,
+                    sourceLabel: suggestion.sourceLabel,
+                }, range);
+                insertText(editor, ' ');
+                break;
+            case 'refine':
+                insertText(editor, 'file:');
                 break;
-            }
         }
         ReactEditor.focus(editor);
     }, [editor, range]);
@@ -531,7 +547,7 @@ const ChatBoxComponent = ({
             rawPasteRequestedRef.current = true;
         }
 
-        if (suggestionMode === "none") {
+        if (shouldUsePlainComposerEnterBehavior(suggestionMode, suggestions.length)) {
             switch (event.key) {
                 case 'Enter': {
                     if (event.shiftKey) {
@@ -568,6 +584,9 @@ const ChatBoxComponent = ({
                 case 'Enter': {
                     event.preventDefault();
                     const suggestion = suggestions[index];
+                    if (!suggestion) {
+                        break;
+                    }
                     onInsertSuggestion(suggestion);
                     break;
                 }
@@ -782,42 +801,117 @@ const MentionComponent = ({
 
     if (data.type === 'file') {
         return (
-            <Tooltip>
-                <TooltipTrigger asChild>
-                    <span
-                        {...attributes}
-                        contentEditable={false}
-                        className={cn(
-                            "px-1.5 py-0.5 mr-1.5 mb-1 align-baseline inline-block rounded bg-muted text-xs font-mono",
-                            {
-                                "ring-2 ring-blue-300": selected && focused
-                            }
-                        )}
-                    >
-                        <span contentEditable={false} className="flex flex-row items-center select-none">
-                            {/* @see: https://github.com/ianstormtaylor/slate/issues/3490 */}
-                            {isMac ? (
-                                <Fragment>
-                                    {children}
-                                    <VscodeFileIcon fileName={data.name} className="w-3 h-3 mr-1" />
-                                    {data.name}
-                                </Fragment>
-                            ) : (
-                                <Fragment>
-                                    <VscodeFileIcon fileName={data.name} className="w-3 h-3 mr-1" />
-                                    {data.name}
-                                    {children}
-                                </Fragment>
-                            )}
-                        </span>
-                    </span>
-                </TooltipTrigger>
-                <TooltipContent>
+            <MentionChip
+                attributes={attributes}
+                content={
+                    <Fragment>
+                        <VscodeFileIcon fileName={data.name} className="w-3 h-3 mr-1" />
+                        {data.name}
+                    </Fragment>
+                }
+                focused={focused}
+                isMac={isMac}
+                selected={selected}
+                tooltipContent={
                     <span className="text-xs font-mono">
                         <span className="font-medium">{data.repo.split('/').pop()}</span>/{data.path}
                     </span>
-                </TooltipContent>
-            </Tooltip>
+                }
+            >
+                {children}
+            </MentionChip>
+        )
+    }
+
+    if (data.type === 'command') {
+        return (
+            <MentionChip
+                attributes={attributes}
+                content={
+                    <span className="inline-flex items-center gap-1">
+                        <span>{`/${data.slug}`}</span>
+                        {data.sourceLabel && (
+                            <SourceLabelBadge>{data.sourceLabel}</SourceLabelBadge>
+                        )}
+                    </span>
+                }
+                focused={focused}
+                isMac={isMac}
+                selected={selected}
+                tooltipContent={<CommandMentionTooltip data={data} />}
+            >
+                {children}
+            </MentionChip>
         )
     }
+
+    return null;
+}
+
+const CommandMentionTooltip = ({ data }: { data: CommandMentionData }) => {
+    return (
+        <span className="flex flex-col gap-1 text-xs">
+            <span className="flex items-center gap-1.5">
+                <span>{data.name}</span>
+                {data.sourceLabel && (
+                    <SourceLabelBadge>{data.sourceLabel}</SourceLabelBadge>
+                )}
+            </span>
+        </span>
+    );
+};
+
+interface MentionChipProps {
+    attributes: RenderElementPropsFor<MentionElement>["attributes"];
+    children: ReactNode;
+    content: ReactNode;
+    focused: boolean;
+    isMac: boolean;
+    selected: boolean;
+    tooltipContent: ReactNode;
+}
+
+const MentionChip = ({
+    attributes,
+    children,
+    content,
+    focused,
+    isMac,
+    selected,
+    tooltipContent,
+}: MentionChipProps) => {
+    return (
+        <Tooltip>
+            <TooltipTrigger asChild>
+                <span
+                    {...attributes}
+                    contentEditable={false}
+                    className={cn(
+                        "px-1.5 py-0.5 mr-1.5 mb-1 align-baseline inline-block rounded bg-muted text-xs font-mono",
+                        {
+                            "ring-2 ring-blue-300": selected && focused
+                        }
+                    )}
+                >
+                    <span contentEditable={false} className="flex flex-row items-center select-none">
+                        {/* @see: https://github.com/ianstormtaylor/slate/issues/3490 */}
+                        {isMac ? (
+                            <Fragment>
+                                {children}
+                                {content}
+                            </Fragment>
+                        ) : (
+                            <Fragment>
+                                {content}
+                                {children}
+                            </Fragment>
+                        )}
+                    </span>
+                </span>
+            </TooltipTrigger>
+            <TooltipContent>
+                {tooltipContent}
+            </TooltipContent>
+        </Tooltip>
+    )
 }
diff --git a/packages/web/src/features/chat/components/chatBox/keyboard.test.ts b/packages/web/src/features/chat/components/chatBox/keyboard.test.ts
new file mode 100644
index 000000000..0040e6cea
--- /dev/null
+++ b/packages/web/src/features/chat/components/chatBox/keyboard.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, test } from 'vitest';
+import { shouldUsePlainComposerEnterBehavior } from './keyboard';
+
+describe('shouldUsePlainComposerEnterBehavior', () => {
+    test('uses plain enter behavior when there is no suggestion mode', () => {
+        expect(shouldUsePlainComposerEnterBehavior('none', 0)).toBe(true);
+        expect(shouldUsePlainComposerEnterBehavior('none', 2)).toBe(true);
+    });
+
+    test('uses plain enter behavior for command mode with no matching suggestions', () => {
+        expect(shouldUsePlainComposerEnterBehavior('command', 0)).toBe(true);
+    });
+
+    test('keeps suggestion handling when command suggestions are available', () => {
+        expect(shouldUsePlainComposerEnterBehavior('command', 1)).toBe(false);
+    });
+
+    test('preserves existing mention behavior for empty file and refine suggestions', () => {
+        expect(shouldUsePlainComposerEnterBehavior('file', 0)).toBe(false);
+        expect(shouldUsePlainComposerEnterBehavior('refine', 0)).toBe(false);
+    });
+});
diff --git a/packages/web/src/features/chat/components/chatBox/keyboard.ts b/packages/web/src/features/chat/components/chatBox/keyboard.ts
new file mode 100644
index 000000000..f601ac00e
--- /dev/null
+++ b/packages/web/src/features/chat/components/chatBox/keyboard.ts
@@ -0,0 +1,6 @@
+import type { SuggestionMode } from "./types";
+
+export const shouldUsePlainComposerEnterBehavior = (
+    suggestionMode: SuggestionMode,
+    suggestionCount: number,
+) => suggestionMode === "none" || (suggestionMode === "command" && suggestionCount === 0);
diff --git a/packages/web/src/features/chat/components/chatBox/sourceLabelBadge.tsx b/packages/web/src/features/chat/components/chatBox/sourceLabelBadge.tsx
new file mode 100644
index 000000000..d3b38507f
--- /dev/null
+++ b/packages/web/src/features/chat/components/chatBox/sourceLabelBadge.tsx
@@ -0,0 +1,16 @@
+import { cn } from "@/lib/utils";
+import type { ReactNode } from "react";
+
+interface SourceLabelBadgeProps {
+    children: ReactNode;
+    className?: string;
+}
+
+export const SourceLabelBadge = ({ children, className }: SourceLabelBadgeProps) => (
+    <span className={cn(
+        "shrink-0 rounded border border-border px-1 py-px font-sans text-[10px] leading-none text-muted-foreground",
+        className,
+    )}>
+        {children}
+    </span>
+);
diff --git a/packages/web/src/features/chat/components/chatBox/suggestionsBox.tsx b/packages/web/src/features/chat/components/chatBox/suggestionsBox.tsx
index a636c10e6..4375a165c 100644
--- a/packages/web/src/features/chat/components/chatBox/suggestionsBox.tsx
+++ b/packages/web/src/features/chat/components/chatBox/suggestionsBox.tsx
@@ -3,10 +3,13 @@
 import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
 import { Skeleton } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
-import { forwardRef, useMemo } from "react";
+import { forwardRef, type ReactNode } from "react";
 import { createPortal } from "react-dom";
 import { VscFiles } from "react-icons/vsc";
 import { FileSuggestion, RefineSuggestion, Suggestion } from "./types";
+import { BookOpenIcon } from "lucide-react";
+import type { AskCommandSuggestion } from "@/features/chat/commands/types";
+import { SourceLabelBadge } from "./sourceLabelBadge";
 
 interface SuggestionBoxProps {
     selectedIndex: number;
@@ -66,6 +69,11 @@ export const SuggestionBox = forwardRef<HTMLDivElement, SuggestionBoxProps>(({
                                             <RefineSuggestionListItem refine={suggestion} />
                                         )
                                     }
+                                    {
+                                        suggestion.type === 'command' && (
+                                            <CommandSuggestionListItem command={suggestion} />
+                                        )
+                                    }
                                 </div>
                             ))}
                         </div>
@@ -80,38 +88,83 @@ SuggestionBox.displayName = 'SuggestionBox';
 
 const FileSuggestionListItem = ({ file }: { file: FileSuggestion }) => {
     return (
-        <>
-            <VscodeFileIcon fileName={file.name} className="mt-1" />
-            <div className="flex flex-col w-full">
-                <span className="text-sm font-medium">
-                    {file.name}
-                </span>
-                <span className="text-xs text-muted-foreground">
+        <SuggestionListItem
+            description={
+                <>
                     <span className="font-medium">{file.repo.split('/').pop()}</span>/{file.path}
-                </span>
-            </div>
-        </>
+                </>
+            }
+            icon={<VscodeFileIcon fileName={file.name} className="mt-1" />}
+            title={file.name}
+        />
     )
 }
 
 const RefineSuggestionListItem = ({ refine }: { refine: RefineSuggestion }) => {
+    return (
+        <SuggestionListItem
+            description={refine.description}
+            icon={<VscFiles className="w-4 h-4 flex-shrink-0 mt-1" />}
+            title={refine.name}
+        />
+    )
+}
 
-    const Icon = useMemo(() => {
-        switch (refine.targetSuggestionMode) {
-            case 'file':
-                return VscFiles;
-        }
-    }, [refine.targetSuggestionMode]);
+const CommandSuggestionListItem = ({ command }: { command: AskCommandSuggestion }) => {
+    return (
+        <SuggestionListItem
+            description={command.description}
+            icon={<BookOpenIcon className="w-4 h-4 flex-shrink-0 mt-1" />}
+            title={`/${command.slug}`}
+            titleDetail={command.name}
+            badge={command.sourceLabel}
+        />
+    )
+}
 
+interface SuggestionListItemProps {
+    description: ReactNode;
+    icon: ReactNode;
+    title: ReactNode;
+    badge?: ReactNode;
+    titleDetail?: ReactNode;
+}
+
+const SuggestionListItem = ({
+    badge,
+    description,
+    icon,
+    title,
+    titleDetail,
+}: SuggestionListItemProps) => {
     return (
         <>
-            <Icon className="w-4 h-4 flex-shrink-0 mt-1" />
-            <div className="flex flex-col w-full">
-                <span className="text-sm font-medium">
-                    {refine.name}
-                </span>
-                <span className="text-xs text-muted-foreground">
-                    {refine.description}
+            {icon}
+            <div className="flex flex-col w-full min-w-0">
+                {titleDetail ? (
+                    <div className="flex flex-row items-baseline gap-2 min-w-0">
+                        <span className="text-sm font-medium truncate">
+                            {title}
+                        </span>
+                        <span className="text-sm text-muted-foreground truncate">
+                            {titleDetail}
+                        </span>
+                        {badge && (
+                            <SourceLabelBadge className="ml-auto">{badge}</SourceLabelBadge>
+                        )}
+                    </div>
+                ) : (
+                    <div className="flex flex-row items-baseline gap-2 min-w-0">
+                        <span className="text-sm font-medium truncate">
+                            {title}
+                        </span>
+                        {badge && (
+                            <SourceLabelBadge className="ml-auto">{badge}</SourceLabelBadge>
+                        )}
+                    </div>
+                )}
+                <span className="text-xs text-muted-foreground truncate">
+                    {description}
                 </span>
             </div>
         </>
diff --git a/packages/web/src/features/chat/components/chatBox/types.ts b/packages/web/src/features/chat/components/chatBox/types.ts
index b7f92ba1e..096f34a95 100644
--- a/packages/web/src/features/chat/components/chatBox/types.ts
+++ b/packages/web/src/features/chat/components/chatBox/types.ts
@@ -1,13 +1,14 @@
+import type { AskCommandSuggestion } from "@/features/chat/commands/types";
 
 export type SuggestionMode = 
     "none" |
     "refine" |
+    "command" |
     "file"
 ;
 
 export type RefineSuggestion = {
     type: 'refine';
-    targetSuggestionMode: Exclude<SuggestionMode, 'none' | 'refine'>;
     name: string;
     description: string;
 }
@@ -21,4 +22,4 @@ export type FileSuggestion = {
     revision: string;
 }
 
-export type Suggestion = FileSuggestion | RefineSuggestion;
+export type Suggestion = FileSuggestion | RefineSuggestion | AskCommandSuggestion;
diff --git a/packages/web/src/features/chat/components/chatBox/useSuggestionModeAndQuery.ts b/packages/web/src/features/chat/components/chatBox/useSuggestionModeAndQuery.ts
index 595e9fc4b..6bf5325cf 100644
--- a/packages/web/src/features/chat/components/chatBox/useSuggestionModeAndQuery.ts
+++ b/packages/web/src/features/chat/components/chatBox/useSuggestionModeAndQuery.ts
@@ -42,6 +42,16 @@ export const useSuggestionModeAndQuery = () => {
 
         let match: RegExpMatchArray | null = null;
 
+        // Command mode.
+        match = text.match(/^\/(.*)$/);
+        if (match && Editor.isStart(editor, Range.start(range), [])) {
+            return {
+                suggestionMode: "command",
+                suggestionQuery: match[1],
+                range,
+            };
+        }
+
         // Refine mode.
         match = text.match(/^@$/);
         if (match) {
@@ -95,4 +105,4 @@ export const useSuggestionModeAndQuery = () => {
         suggestionMode,
         range,
     }
-}
\ No newline at end of file
+}
diff --git a/packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts b/packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts
index 77b360f12..b8253f787 100644
--- a/packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts
+++ b/packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts
@@ -5,17 +5,19 @@ import { FileSuggestion, RefineSuggestion, Suggestion, SuggestionMode } from "./
 import { unwrapServiceError } from "@/lib/utils";
 import { search } from "@/app/api/(client)/client";
 import { useMemo } from "react";
+import type { AskCommandDefinition } from "@/features/chat/commands/types";
+import { filterAskCommandDefinitions, toAskCommandSuggestion } from "@/features/chat/commands/utils";
 
 interface Props {
     suggestionMode: SuggestionMode;
     suggestionQuery: string;
     selectedRepos: string[];
+    askCommands: AskCommandDefinition[];
 }
 
 const refineSuggestions: RefineSuggestion[] = [
     {
         type: 'refine',
-        targetSuggestionMode: 'file',
         name: 'Files',
         description: 'Include a file in the agent\'s context window.',
     }
@@ -25,6 +27,7 @@ export const useSuggestionsData = ({
     suggestionMode,
     suggestionQuery,
     selectedRepos,
+    askCommands,
 }: Props): { isLoading: boolean, suggestions: Suggestion[] } => {
     const { data: fileSuggestions, isLoading: _isLoadingFileSuggestions } = useQuery({
         queryKey: ["fileSuggestions-agentic", suggestionQuery, selectedRepos],
@@ -66,6 +69,12 @@ export const useSuggestionsData = ({
     const isLoadingFiles = useMemo(() => suggestionMode === "file" && _isLoadingFileSuggestions, [_isLoadingFileSuggestions, suggestionMode]);
 
     switch (suggestionMode) {
+        case 'command':
+            return {
+                suggestions: filterAskCommandDefinitions(askCommands, suggestionQuery)
+                    .map(toAskCommandSuggestion),
+                isLoading: false,
+            }
         case 'file':
             return {
                 suggestions: fileSuggestions ?? [],
@@ -82,4 +91,4 @@ export const useSuggestionsData = ({
                 suggestions: [],
             }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/web/src/features/chat/mcpOAuthDraft.test.ts b/packages/web/src/features/chat/mcpOAuthDraft.test.ts
index 030376136..df5e5b4ef 100644
--- a/packages/web/src/features/chat/mcpOAuthDraft.test.ts
+++ b/packages/web/src/features/chat/mcpOAuthDraft.test.ts
@@ -14,6 +14,24 @@ const children = [{
     children: [{ text: 'check the Linear ticket' }],
 }] satisfies Descendant[];
 
+const commandChildren = [{
+    type: 'paragraph',
+    children: [
+        {
+            type: 'mention',
+            data: {
+                type: 'command',
+                commandId: 'skill-1',
+                sourceId: 'personal-skill',
+                slug: 'review-pr',
+                name: 'Review PR',
+            },
+            children: [{ text: '' }],
+        },
+        { text: ' focus on auth changes' },
+    ],
+}] satisfies Descendant[];
+
 const selectedSearchScopes = [{
     type: 'repo',
     value: 'sourcebot/sourcebot',
@@ -65,6 +83,22 @@ describe('MCP OAuth draft persistence', () => {
         expect(resolveMcpOAuthDraftForPath(JSON.stringify(draft), '/chat/thread-1?scope=sourcebot', 30 * 60 * 1000 + 101).shouldClear).toBe(true);
     });
 
+    test('accepts drafts with command mentions', () => {
+        const commandDraft = {
+            ...draft,
+            children: commandChildren,
+        };
+
+        const result = resolveMcpOAuthDraftForPath(
+            JSON.stringify(commandDraft),
+            '/chat/thread-1?scope=sourcebot&status=connected&server=Linear',
+            200,
+        );
+
+        expect(result.shouldClear).toBe(true);
+        expect(result.draft?.children).toEqual(commandChildren);
+    });
+
     test('saves and consumes the composer draft from sessionStorage', () => {
         saveMcpOAuthDraft({
             returnTo: '/chat/thread-1?scope=sourcebot&status=error',
diff --git a/packages/web/src/features/chat/mcpOAuthDraft.ts b/packages/web/src/features/chat/mcpOAuthDraft.ts
index 0c4fd655c..08884b667 100644
--- a/packages/web/src/features/chat/mcpOAuthDraft.ts
+++ b/packages/web/src/features/chat/mcpOAuthDraft.ts
@@ -1,6 +1,7 @@
 import type { Descendant } from "slate";
 import { MCP_OAUTH_DRAFT_SESSION_STORAGE_KEY } from "@/features/chat/constants";
-import type { CustomText, MentionElement, ParagraphElement, SearchScope } from "@/features/chat/types";
+import { isFileMentionData, type CustomText, type MentionElement, type ParagraphElement, type SearchScope } from "@/features/chat/types";
+import { isCommandMentionData } from "@/features/chat/commands/types";
 
 const MCP_OAUTH_DRAFT_BASE_URL = 'https://sourcebot.invalid';
 const MCP_OAUTH_DRAFT_MAX_AGE_MS = 30 * 60 * 1000;
@@ -37,13 +38,7 @@ function isMentionElement(value: unknown): value is MentionElement {
     return (
         isRecord(value) &&
         value.type === 'mention' &&
-        isRecord(value.data) &&
-        value.data.type === 'file' &&
-        typeof value.data.repo === 'string' &&
-        typeof value.data.path === 'string' &&
-        typeof value.data.name === 'string' &&
-        typeof value.data.language === 'string' &&
-        typeof value.data.revision === 'string' &&
+        (isFileMentionData(value.data) || isCommandMentionData(value.data)) &&
         Array.isArray(value.children) &&
         value.children.every(isCustomText)
     );
diff --git a/packages/web/src/features/chat/types.ts b/packages/web/src/features/chat/types.ts
index 4f09fbc57..465c7d236 100644
--- a/packages/web/src/features/chat/types.ts
+++ b/packages/web/src/features/chat/types.ts
@@ -10,6 +10,7 @@ import type { createTools } from "@/ee/features/chat/tools";
 export { sourceSchema } from "@/features/tools/types";
 export type { FileSource, Source } from "@/features/tools/types";
 import type { Source } from "@/features/tools/types";
+import type { CommandInvocationData, CommandMentionData } from "./commands/types";
 
 const fileReferenceSchema = z.object({
     type: z.literal('file'),
@@ -101,6 +102,15 @@ export type SBChatMessageToolTypes = {
         input: { tool_to_activate_name: string };
         output: { results: Array<{ name: string; description: string }> };
     };
+    // load_skill is constructed in the EE agent (createLoadSkillTool), not in
+    // createTools, so its UI part shape is declared here by hand — mirror of the
+    // execute() return in ee/features/chat/skills/loadSkillTool.ts.
+    load_skill: {
+        input: { skill_id: string };
+        output:
+            | { skill: { id: string; slug: string; name: string }; instructions: string }
+            | { error: string };
+    };
 };
 
 // A user-provided file attachment. The `text` variant carries the file's
@@ -147,6 +157,9 @@ export type SBChatMessageDataParts = {
     "mcp-failed-server": { serverName: string },
     // A user-provided file attachment included with the message.
     "attachment": AttachmentData,
+    // The `command` data type preserves the slash command identity so the server
+    // can resolve and expand the command's instructions securely.
+    "command": CommandInvocationData,
 }
 
 export type SBChatMessage = UIMessage<
@@ -170,16 +183,21 @@ export type ParagraphElement = {
     children: Descendant[];
 }
 
-export type FileMentionData = {
-    type: 'file';
-    repo: string;
-    path: string;
-    name: string;
-    language: string;
-    revision: string;
-}
+export const fileMentionDataSchema = z.object({
+    type: z.literal('file'),
+    repo: z.string(),
+    path: z.string(),
+    name: z.string(),
+    language: z.string(),
+    revision: z.string(),
+});
+
+export type FileMentionData = z.infer<typeof fileMentionDataSchema>;
+
+export const isFileMentionData = (value: unknown): value is FileMentionData =>
+    fileMentionDataSchema.safeParse(value).success;
 
-export type MentionData = FileMentionData;
+export type MentionData = FileMentionData | CommandMentionData;
 
 export type MentionElement = {
     type: 'mention';
diff --git a/packages/web/src/features/chat/utils.test.ts b/packages/web/src/features/chat/utils.test.ts
index 1f83c8f50..bf598a25e 100644
--- a/packages/web/src/features/chat/utils.test.ts
+++ b/packages/web/src/features/chat/utils.test.ts
@@ -1,7 +1,8 @@
 import { expect, test, describe, vi } from 'vitest'
-import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
+import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences, slateContentToString } from './utils'
 import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
 import { SBChatMessage, SBChatMessagePart } from './types';
+import type { Descendant } from 'slate';
 
 // Mock the env module
 vi.mock('@sourcebot/shared', () => ({
@@ -133,6 +134,58 @@ test('fileReferenceToString matches FILE_REFERENCE_REGEX', () => {
     }))).toBe(true);
 });
 
+test('slateContentToString serializes command mentions as literal slash commands', () => {
+    const children = [{
+        type: 'paragraph',
+        children: [
+            {
+                type: 'mention',
+                data: {
+                    type: 'command',
+                    commandId: 'skill-1',
+                    sourceId: 'personal-skill',
+                    slug: 'review-pr',
+                    name: 'Review PR',
+                },
+                children: [{ text: '' }],
+            },
+            { text: ' focus on auth changes' },
+        ],
+    }] satisfies Descendant[];
+
+    expect(slateContentToString(children)).toBe('/review-pr focus on auth changes\n');
+});
+
+test('slateContentToString separates command mentions from adjacent text without doubling spaces', () => {
+    const commandMention = {
+        type: 'mention' as const,
+        data: {
+            type: 'command' as const,
+            commandId: 'skill-1',
+            sourceId: 'personal-skill',
+            slug: 'review-pr',
+            name: 'Review PR',
+        },
+        children: [{ text: '' }],
+    };
+
+    expect(slateContentToString([{
+        type: 'paragraph',
+        children: [
+            commandMention,
+            { text: 'focus on auth changes' },
+        ],
+    }])).toBe('/review-pr focus on auth changes\n');
+
+    expect(slateContentToString([{
+        type: 'paragraph',
+        children: [
+            commandMention,
+            { text: ' focus on auth changes' },
+        ],
+    }])).toBe('/review-pr focus on auth changes\n');
+});
+
 test('groupMessageIntoSteps returns an empty array when there are no parts', () => {
     const parts: SBChatMessagePart[] = []
 
@@ -741,4 +794,58 @@ describe('createUIMessage', () => {
         expect(result.metadata?.selectedSearchScopes).toEqual(scopes);
         expect(result.metadata?.disabledMcpServerIds).toEqual(['disabled1']);
     });
+
+    test('converts a leading command mention into command data', () => {
+        const result = createUIMessage('/review-pr src/auth/session.ts\n', [{
+            type: 'command',
+            commandId: 'skill-1',
+            sourceId: 'personal-skill',
+            slug: 'review-pr',
+            name: 'Review PR',
+        }], [], []);
+
+        expect(result.parts).toEqual([
+            {
+                type: 'text',
+                text: '/review-pr src/auth/session.ts\n',
+            },
+            {
+                type: 'data-command',
+                data: {
+                    type: 'command',
+                    commandId: 'skill-1',
+                    sourceId: 'personal-skill',
+                    slug: 'review-pr',
+                    name: 'Review PR',
+                },
+            },
+        ]);
+    });
+
+    test('converts non-leading command mentions into command data', () => {
+        const result = createUIMessage('please /review-pr src/auth/session.ts', [{
+            type: 'command',
+            commandId: 'skill-1',
+            sourceId: 'personal-skill',
+            slug: 'review-pr',
+            name: 'Review PR',
+        }], [], []);
+
+        expect(result.parts).toEqual([
+            {
+                type: 'text',
+                text: 'please /review-pr src/auth/session.ts',
+            },
+            {
+                type: 'data-command',
+                data: {
+                    type: 'command',
+                    commandId: 'skill-1',
+                    sourceId: 'personal-skill',
+                    slug: 'review-pr',
+                    name: 'Review PR',
+                },
+            },
+        ]);
+    });
 });
diff --git a/packages/web/src/features/chat/utils.ts b/packages/web/src/features/chat/utils.ts
index 8c1334e99..23cd08590 100644
--- a/packages/web/src/features/chat/utils.ts
+++ b/packages/web/src/features/chat/utils.ts
@@ -2,6 +2,7 @@ import { BrowseHighlightRange, getBrowsePath } from "@/app/(app)/browse/hooks/ut
 import { CreateUIMessage, isToolUIPart, TextUIPart, UIMessagePart } from "ai";
 import type { ChatStatus, DynamicToolUIPart, ToolUIPart } from "ai";
 import { Descendant, Editor, Point, Range, Transforms } from "slate";
+import { createCommandInvocationData } from "./commands/utils";
 import { ANSWER_TAG, FILE_REFERENCE_PREFIX, FILE_REFERENCE_REGEX } from "./constants";
 import {
     AttachmentData,
@@ -14,6 +15,7 @@ import {
     MentionElement,
     ParagraphElement,
     SBChatMessage,
+    SBChatMessageDataParts,
     SBChatMessagePart,
     SBChatMessageToolTypes,
     SearchScope,
@@ -129,8 +131,16 @@ export const isParagraphElement = (element: Descendant): element is ParagraphEle
     return 'type' in element && element.type === 'paragraph';
 }
 
+const commandMentionSeparator = (nextChild: Descendant | undefined) => {
+    if (nextChild && isCustomTextElement(nextChild) && /^\s/.test(nextChild.text)) {
+        return "";
+    }
+
+    return " ";
+}
+
 export const slateContentToString = (children: Descendant[]): string => {
-    return children.map((child) => {
+    return children.map((child, index) => {
         if (isCustomTextElement(child)) {
             return child.text;
         }
@@ -141,6 +151,8 @@ export const slateContentToString = (children: Descendant[]): string => {
             switch (type) {
                 case 'file':
                     return `${fileReferenceToString({ repo: child.data.repo, path: child.data.path })} `;
+                case 'command':
+                    return `/${child.data.slug}${commandMentionSeparator(children[index + 1])}`;
             }
         }
 
@@ -206,6 +218,10 @@ export const createUIMessage = (text: string, mentions: MentionData[], selectedS
             return undefined;
         })
         .filter((source) => source !== undefined);
+    const commandInvocation = createCommandInvocationData(
+        text,
+        mentions.filter((mention) => mention.type === 'command'),
+    );
 
     return {
         role: 'user',
@@ -222,6 +238,10 @@ export const createUIMessage = (text: string, mentions: MentionData[], selectedS
                 type: 'data-attachment',
                 data,
             })) as UIMessagePart<{ attachment: AttachmentData }, SBChatMessageToolTypes>[],
+            ...(commandInvocation ? [{
+                type: 'data-command',
+                data: commandInvocation,
+            }] as UIMessagePart<SBChatMessageDataParts, SBChatMessageToolTypes>[] : []),
         ],
         metadata: {
             selectedSearchScopes,
diff --git a/packages/web/src/features/git/getFileSourceApi.ts b/packages/web/src/features/git/getFileSourceApi.ts
index 9346eb4ff..55b44273b 100644
--- a/packages/web/src/features/git/getFileSourceApi.ts
+++ b/packages/web/src/features/git/getFileSourceApi.ts
@@ -61,6 +61,16 @@ export const getFileSourceForRepo = async (
         return unexpectedError(errorMessage);
     }
 
+    // The git blob OID is a content hash of the file at this ref. We resolve it
+    // best-effort so callers that track imported files (agent skills) can detect
+    // when the indexed file changes. A failure here must not fail the read.
+    let blobSha: string | undefined;
+    try {
+        blobSha = (await git.raw(['rev-parse', `${gitRef}:${filePath}`])).trim();
+    } catch {
+        blobSha = undefined;
+    }
+
     let gitattributesContent: string | undefined;
     try {
         gitattributesContent = await git.raw(['show', `${gitRef}:.gitattributes`]);
@@ -97,9 +107,54 @@ export const getFileSourceForRepo = async (
         repoExternalWebUrl: repo.webUrl ?? undefined,
         webUrl,
         externalWebUrl,
+        blobSha,
     } satisfies FileSourceResponse;
 });
 
+/**
+ * Resolves the git blob OID for a file at a ref without reading its contents.
+ * Used to cheaply detect whether an imported file has changed since import.
+ * Distinguishes "repo not found" from "file not found" from "bad ref" so callers
+ * can surface the right sync state. Privileged: intended for callers that have
+ * already established org context (e.g. via withAuth).
+ */
+export const resolveFileBlobShaForRepo = async (
+    { path: filePath, repo: repoName, ref }: FileSourceRequest,
+    { org, prisma }: { org: Org; prisma: PrismaClient },
+): Promise<string | ServiceError> => sew(async () => {
+    const repo = await prisma.repo.findFirst({
+        where: { name: repoName, orgId: org.id },
+    });
+    if (!repo) {
+        return notFound(`Repository "${repoName}" not found.`);
+    }
+
+    if (!isPathValid(filePath)) {
+        return fileNotFound(filePath, repoName);
+    }
+
+    if (ref !== undefined && !isGitRefValid(ref)) {
+        return invalidGitRef(ref);
+    }
+
+    const { path: repoPath } = getRepoPath(repo);
+    const git = simpleGit().cwd(repoPath);
+    const gitRef = ref ?? repo.defaultBranch ?? 'HEAD';
+
+    try {
+        return (await git.raw(['rev-parse', `${gitRef}:${filePath}`])).trim();
+    } catch (error: unknown) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (errorMessage.includes('does not exist') || errorMessage.includes('fatal: path')) {
+            return fileNotFound(filePath, repoName);
+        }
+        if (errorMessage.includes('unknown revision') || errorMessage.includes('bad revision') || errorMessage.includes('invalid object name')) {
+            return unresolvedGitRef(gitRef);
+        }
+        return unexpectedError(errorMessage);
+    }
+});
+
 export const getFileSource = async ({ path: filePath, repo: repoName, ref }: FileSourceRequest, { source }: { source?: string } = {}): Promise<FileSourceResponse | ServiceError> => sew(() => withOptionalAuth(async ({ org, prisma, user }) => {
     if (user) {
         const resolvedSource = source ?? (await headers()).get('X-Sourcebot-Client-Source') ?? undefined;
diff --git a/packages/web/src/features/git/schemas.ts b/packages/web/src/features/git/schemas.ts
index a73e45c0b..a92a11364 100644
--- a/packages/web/src/features/git/schemas.ts
+++ b/packages/web/src/features/git/schemas.ts
@@ -35,6 +35,10 @@ export const fileSourceResponseSchema = z.object({
     repoExternalWebUrl: z.string().optional(),
     webUrl: z.string(),
     externalWebUrl: z.string().optional(),
+    // The git blob OID (SHA-1 of the file bytes) at the resolved ref. Used as a
+    // cheap content identifier to detect when an imported file has changed.
+    // Optional because it is best-effort; absent if `git rev-parse` failed.
+    blobSha: z.string().optional(),
 });
 
 export const getDiffRequestSchema = z.object({
diff --git a/packages/web/src/lib/errorCodes.ts b/packages/web/src/lib/errorCodes.ts
index c73344850..fa2c4f023 100644
--- a/packages/web/src/lib/errorCodes.ts
+++ b/packages/web/src/lib/errorCodes.ts
@@ -47,4 +47,6 @@ export enum ErrorCode {
     MEMBER_APPROVAL_CONTROLLED_BY_ENV = 'MEMBER_APPROVAL_CONTROLLED_BY_ENV',
     ANONYMOUS_ACCESS_CONTROLLED_BY_ENV = 'ANONYMOUS_ACCESS_CONTROLLED_BY_ENV',
     MEMBERSHIP_MANAGED_BY_IDP = 'MEMBERSHIP_MANAGED_BY_IDP',
+    AGENT_SKILL_ALREADY_EXISTS = 'AGENT_SKILL_ALREADY_EXISTS',
+    AGENT_SKILL_NOT_FOUND = 'AGENT_SKILL_NOT_FOUND',
 }
diff --git a/packages/web/src/lib/posthogEvents.ts b/packages/web/src/lib/posthogEvents.ts
index 4a448bf9b..7e3633225 100644
--- a/packages/web/src/lib/posthogEvents.ts
+++ b/packages/web/src/lib/posthogEvents.ts
@@ -241,6 +241,22 @@ export type PosthogEventMap = {
         durationMs: number,
         failureReason?: string,
     },
+    // Fired when an agent skill is invoked, either automatically by the model
+    // (activationMethod: 'auto', via the load_skill tool) or manually by the
+    // user (activationMethod: 'manual', via a slash command). Multi-source, so
+    // no wa_ prefix; source identifies the origin.
+    ask_skill_invoked: {
+        chatId?: string,
+        traceId?: string,
+        source: AskMcpAnalyticsSource,
+        activationMethod: 'auto' | 'manual',
+        skillId: string,
+        slug?: string,
+        name?: string,
+        sourceLabel?: string,
+        success: boolean,
+        durationMs?: number,
+    },
     ask_mcp_connector_added: {
         source: SourcebotWebClientSource,
         entryPoint: 'workspace_settings',
diff --git a/packages/web/src/lib/prismaErrors.ts b/packages/web/src/lib/prismaErrors.ts
new file mode 100644
index 000000000..7eae687e3
--- /dev/null
+++ b/packages/web/src/lib/prismaErrors.ts
@@ -0,0 +1,21 @@
+import { Prisma } from "@sourcebot/db";
+
+// @see https://www.prisma.io/docs/orm/reference/error-reference#error-codes
+const isKnownRequestError = (
+    error: unknown,
+    code: string,
+): error is Prisma.PrismaClientKnownRequestError =>
+    error instanceof Prisma.PrismaClientKnownRequestError && error.code === code;
+
+/**
+ * P2002: a unique constraint was violated (e.g. inserting a duplicate row).
+ */
+export const isUniqueConstraintError = (error: unknown) =>
+    isKnownRequestError(error, "P2002");
+
+/**
+ * P2025: an operation failed because the record it depends on was not found
+ * (e.g. updating or deleting a row that no longer exists).
+ */
+export const isRecordNotFoundError = (error: unknown) =>
+    isKnownRequestError(error, "P2025");
diff --git a/packages/web/tailwind.config.ts b/packages/web/tailwind.config.ts
index 9ab2ba665..1bd0cf32c 100644
--- a/packages/web/tailwind.config.ts
+++ b/packages/web/tailwind.config.ts
@@ -161,6 +161,8 @@ const config = {
         require("tailwindcss-animate"),
         // eslint-disable-next-line @typescript-eslint/no-require-imports
         require('@tailwindcss/typography'),
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        require('@tailwindcss/container-queries'),
     ],
 } satisfies Config
 
diff --git a/yarn.lock b/yarn.lock
index c0c1cb7ad..76797891c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9420,6 +9420,7 @@ __metadata:
     "@sourcebot/schemas": "workspace:*"
     "@sourcebot/shared": "workspace:*"
     "@ssddanbrown/codemirror-lang-twig": "npm:^1.0.0"
+    "@tailwindcss/container-queries": "npm:^0.1.1"
     "@tailwindcss/typography": "npm:^0.5.16"
     "@tanstack/eslint-plugin-query": "npm:^5.74.7"
     "@tanstack/react-query": "npm:^5.53.3"
@@ -9548,6 +9549,7 @@ __metadata:
     vitest: "npm:^4.1.4"
     vitest-mock-extended: "npm:^4.0.0"
     vscode-icons-js: "npm:^11.6.1"
+    yaml: "npm:^2.8.3"
     zod: "npm:^3.25.76"
     zod-to-json-schema: "npm:^3.24.5"
   languageName: unknown
@@ -9615,6 +9617,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tailwindcss/container-queries@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "@tailwindcss/container-queries@npm:0.1.1"
+  peerDependencies:
+    tailwindcss: ">=3.2.0"
+  checksum: 10c0/336546ddcc60280723f2a92e311cac0acb8b05624c6519675d4b11ae13ed01dba5e622705a9be69cd66ca2c8019032551176546e6920d9634750165ac4c15d8e
+  languageName: node
+  linkType: hard
+
 "@tailwindcss/typography@npm:^0.5.16":
   version: 0.5.16
   resolution: "@tailwindcss/typography@npm:0.5.16"