Jminnetian/askskills

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)

docs/api-reference/sourcebot-public.openapi.json

@@ -576,6 +576,9 @@
           },
           "externalWebUrl": {
             "type": "string"
+          },
+          "blobSha": {
+            "type": "string"
           }
         },
         "required": [

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;

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");

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;

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
 

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";
+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;

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",

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;

packages/web/src/app/(app)/askgh/[owner]/[repo]/components/landingPage.tsx

@@ -13,13 +13,15 @@ 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[];
     repoName: string;
     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}

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}
                 />