feat: update default skill loading so enabledSkills can skip the built-in skills

Author: qorzj

src/prompt.ts

@@ -100,6 +100,10 @@ type PromptToolOptions = {
   webSearchEnabled?: boolean;
 };
 
+type DefaultSkillPromptOptions = {
+  enabledSkills?: Record<string, boolean>;
+};
+
 const DEFAULT_SKILL_TEMPLATES = ["karpathy-guidelines.md"];
 const DEFAULT_SKILL_RESOURCE_FILE_LIMIT = 50;
 const SKILL_RESOURCE_EXCLUDED_DIRS = new Set([
@@ -153,13 +157,20 @@ function readToolDocs(extensionRoot: string, options: PromptToolOptions = {}): s
   return docs.join("\n\n");
 }
 
-function readDefaultSkillDocs(extensionRoot: string): Array<{ name: string; content: string }> {
+function readDefaultSkillDocs(
+  extensionRoot: string,
+  enabledSkills: Record<string, boolean> = {}
+): Array<{ name: string; content: string }> {
   const skillsDir = path.join(extensionRoot, "templates", "skills");
   return DEFAULT_SKILL_TEMPLATES.map((entry) => {
     const fullPath = path.join(skillsDir, entry);
+    const name = path.basename(entry, ".md");
+    if (enabledSkills[name] === false) {
+      return null;
+    }
     try {
       return {
-        name: path.basename(entry, ".md"),
+        name,
         content: fs.readFileSync(fullPath, "utf8").trim(),
       };
     } catch {
@@ -168,8 +179,8 @@ function readDefaultSkillDocs(extensionRoot: string): Array<{ name: string; cont
   }).filter((skill): skill is { name: string; content: string } => Boolean(skill?.content));
 }
 
-export function getDefaultSkillPrompt(): string {
-  const skillDocs = readDefaultSkillDocs(getExtensionRoot());
+export function getDefaultSkillPrompt(options: DefaultSkillPromptOptions = {}): string {
+  const skillDocs = readDefaultSkillDocs(getExtensionRoot(), options.enabledSkills);
   if (skillDocs.length === 0) {
     return "";
   }

src/session.ts

@@ -1142,7 +1142,7 @@ ${agentInstructions}
     const systemMessage = this.buildSystemMessage(sessionId, systemPrompt);
     this.appendSessionMessage(sessionId, systemMessage);
 
-    const defaultSkillPrompt = getDefaultSkillPrompt();
+    const defaultSkillPrompt = getDefaultSkillPrompt({ enabledSkills: this.getResolvedSettings().enabledSkills });
     if (defaultSkillPrompt) {
       const defaultSkillMessage = this.buildSystemMessage(sessionId, defaultSkillPrompt);
       this.appendSessionMessage(sessionId, defaultSkillMessage);

src/tests/prompt.test.ts

@@ -88,6 +88,12 @@ test("getDefaultSkillPrompt loads the default skill template", () => {
   assert.equal(prompt.includes('path="templates/skills/'), false);
 });
 
+test("getDefaultSkillPrompt skips disabled default skills", () => {
+  const prompt = getDefaultSkillPrompt({ enabledSkills: { "karpathy-guidelines": false } });
+
+  assert.equal(prompt, "");
+});
+
 test("buildSkillDocumentsPrompt excludes SKILL.md frontmatter metadata", () => {
   const prompt = buildSkillDocumentsPrompt([
     {
@@ -200,8 +206,7 @@ test("runtime prompt assets live under templates", () => {
   assert.equal(fs.existsSync(path.join(repoRoot, "templates", "tools", "web-search.md")), true);
   assert.equal(fs.existsSync(path.join(repoRoot, "templates", "tools", "read.md.ejs")), true);
   assert.equal(fs.existsSync(path.join(repoRoot, "templates", "prompts", "init_command.md.ejs")), true);
-  assert.equal(fs.existsSync(path.join(repoRoot, "templates", "skills", "agent-drift-guard.md")), true);
-  assert.equal(fs.existsSync(path.join(repoRoot, "templates", "skills", "plan-and-execute.md")), true);
+  assert.equal(fs.existsSync(path.join(repoRoot, "templates", "skills", "karpathy-guidelines.md")), true);
   assert.equal(fs.existsSync(path.join(repoRoot, "templates", "tools", "read.md")), false);
   assert.equal(fs.existsSync(path.join(repoRoot, "docs", "tools")), false);
   assert.equal(fs.existsSync(path.join(repoRoot, "docs", "prompts")), false);

src/tests/session.test.ts

@@ -1138,6 +1138,40 @@ test("createSession appends default system prompts in prefix-cache-friendly orde
   assert.equal(systemContents[3], "root project instructions");
 });
 
+test("createSession skips disabled default skills", async () => {
+  const workspace = createTempDir("deepcode-disabled-default-skill-workspace-");
+  const home = createTempDir("deepcode-disabled-default-skill-home-");
+  setHomeDir(home);
+
+  const manager = new SessionManager({
+    projectRoot: workspace,
+    createOpenAIClient: () => ({
+      client: null,
+      model: "test-model",
+      baseURL: "https://api.deepseek.com",
+      thinkingEnabled: false,
+      machineId: "machine-id-disabled-default-skill",
+    }),
+    getResolvedSettings: () => ({
+      model: "test-model",
+      enabledSkills: { "karpathy-guidelines": false },
+    }),
+    renderMarkdown: (text) => text,
+    onAssistantMessage: () => {},
+  });
+
+  const sessionId = await manager.createSession({ text: "hello" });
+  const systemContents = manager
+    .listSessionMessages(sessionId)
+    .filter((message) => message.role === "system")
+    .map((message) => message.content ?? "");
+
+  assert.equal(systemContents.length, 2);
+  assert.match(systemContents[0] ?? "", /# Available Tools/);
+  assert.doesNotMatch(systemContents.join("\n"), /<karpathy-guidelines-skill>/);
+  assert.match(systemContents[1] ?? "", /# Local Workspace Environment/);
+});
+
 test("createSession includes agent instructions in the skill matching system prompt", async () => {
   const workspace = createTempDir("deepcode-skill-match-create-workspace-");
   const home = createTempDir("deepcode-skill-match-create-home-");