Merge pull request #1370 from misyuari/fix/refactor-skills

fix: update skill resolution to support disabled skills functionality

src/tools/delegate-task/executor.ts

@@ -44,7 +44,7 @@ interface SessionMessage {
 
 export async function resolveSkillContent(
   skills: string[],
-  options: { gitMasterConfig?: GitMasterConfig; browserProvider?: BrowserAutomationProvider }
+  options: { gitMasterConfig?: GitMasterConfig; browserProvider?: BrowserAutomationProvider, disabledSkills?: Set<string> }
 ): Promise<{ content: string | undefined; error: string | null }> {
   if (skills.length === 0) {
     return { content: undefined, error: null }

src/tools/delegate-task/tools.ts

@@ -83,6 +83,7 @@ Prompts MUST be in English.`
       const { content: skillContent, error: skillError } = await resolveSkillContent(args.load_skills, {
         gitMasterConfig: options.gitMasterConfig,
         browserProvider: options.browserProvider,
+        disabledSkills: options.disabledSkills,
       })
       if (skillError) {
         return skillError

src/tools/delegate-task/types.ts

@@ -41,6 +41,7 @@ export interface DelegateTaskToolOptions {
   gitMasterConfig?: GitMasterConfig
   sisyphusJuniorModel?: string
   browserProvider?: BrowserAutomationProvider
+  disabledSkills?: Set<string>
   onSyncSessionCreated?: (event: SyncSessionCreatedEvent) => Promise<void>
 }
 

src/tools/skill/tools.ts

@@ -133,7 +133,7 @@ export function createSkillTool(options: SkillLoadOptions = {}): ToolDefinition
   const getSkills = async (): Promise<LoadedSkill[]> => {
     if (options.skills) return options.skills
     if (cachedSkills) return cachedSkills
-    cachedSkills = await getAllSkills()
+    cachedSkills = await getAllSkills({disabledSkills: options?.disabledSkills})
     return cachedSkills
   }
 

src/tools/skill/types.ts

@@ -28,4 +28,5 @@ export interface SkillLoadOptions {
   getSessionID?: () => string
   /** Git master configuration for watermark/co-author settings */
   gitMasterConfig?: GitMasterConfig
+  disabledSkills?: Set<string>
 }