@office-ai/aioncli-core 0.26.0 → 0.30.1

package/dist/src/skills/skillManager.js

@@ -3,12 +3,17 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import * as path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { Storage } from '../config/storage.js';
 import { loadSkillsFromDir } from './skillLoader.js';
+import { debugLogger } from '../utils/debugLogger.js';
+import { coreEvents } from '../utils/events.js';
 export {};
 export class SkillManager {
     skills = [];
     activeSkillNames = new Set();
+    adminSkillsEnabled = true;
     /**
      * Clears all discovered skills.
      */
@@ -16,28 +21,79 @@ export class SkillManager {
         this.skills = [];
     }
     /**
-     * Discovers skills from standard user and project locations, as well as extensions.
-     * Precedence: Extensions (lowest) -> User -> Project (highest).
+     * Sets administrative settings for skills.
      */
-    async discoverSkills(storage, extensions = []) {
+    setAdminSettings(enabled) {
+        this.adminSkillsEnabled = enabled;
+    }
+    /**
+     * Returns true if skills are enabled by the admin.
+     */
+    isAdminEnabled() {
+        return this.adminSkillsEnabled;
+    }
+    /**
+     * Discovers skills from standard user and workspace locations, as well as extensions.
+     * Precedence: Extensions (lowest) -> User -> Workspace (highest).
+     */
+    async discoverSkills(storage, extensions = [], isTrusted = false) {
         this.clearSkills();
-        // 1. Extension skills (lowest precedence)
+        // 1. Built-in skills (lowest precedence)
+        await this.discoverBuiltinSkills();
+        // 2. Extension skills
         for (const extension of extensions) {
             if (extension.isActive && extension.skills) {
                 this.addSkillsWithPrecedence(extension.skills);
             }
         }
-        // 2. User skills
+        // 3. User skills
         const userSkills = await loadSkillsFromDir(Storage.getUserSkillsDir());
         this.addSkillsWithPrecedence(userSkills);
-        // 3. Project skills (highest precedence)
+        // 3.1 User agent skills alias (.agents/skills)
+        const userAgentSkills = await loadSkillsFromDir(Storage.getUserAgentSkillsDir());
+        this.addSkillsWithPrecedence(userAgentSkills);
+        // 4. Workspace skills (highest precedence)
+        if (!isTrusted) {
+            debugLogger.debug('Workspace skills disabled because folder is not trusted.');
+            return;
+        }
         const projectSkills = await loadSkillsFromDir(storage.getProjectSkillsDir());
         this.addSkillsWithPrecedence(projectSkills);
+        // 4.1 Workspace agent skills alias (.agents/skills)
+        const projectAgentSkills = await loadSkillsFromDir(storage.getProjectAgentSkillsDir());
+        this.addSkillsWithPrecedence(projectAgentSkills);
+    }
+    /**
+     * Discovers built-in skills.
+     */
+    async discoverBuiltinSkills() {
+        const __dirname = path.dirname(fileURLToPath(import.meta.url));
+        const builtinDir = path.join(__dirname, 'builtin');
+        const builtinSkills = await loadSkillsFromDir(builtinDir);
+        for (const skill of builtinSkills) {
+            skill.isBuiltin = true;
+        }
+        this.addSkillsWithPrecedence(builtinSkills);
+    }
+    /**
+     * Adds skills to the manager programmatically.
+     */
+    addSkills(skills) {
+        this.addSkillsWithPrecedence(skills);
     }
     addSkillsWithPrecedence(newSkills) {
-        const skillMap = new Map();
-        for (const skill of [...this.skills, ...newSkills]) {
-            skillMap.set(skill.name, skill);
+        const skillMap = new Map(this.skills.map((s) => [s.name, s]));
+        for (const newSkill of newSkills) {
+            const existingSkill = skillMap.get(newSkill.name);
+            if (existingSkill && existingSkill.location !== newSkill.location) {
+                if (existingSkill.isBuiltin) {
+                    debugLogger.warn(`Skill "${newSkill.name}" from "${newSkill.location}" is overriding the built-in skill.`);
+                }
+                else {
+                    coreEvents.emitFeedback('warning', `Skill conflict detected: "${newSkill.name}" from "${newSkill.location}" is overriding the same skill from "${existingSkill.location}".`);
+                }
+            }
+            skillMap.set(newSkill.name, newSkill);
         }
         this.skills = Array.from(skillMap.values());
     }
@@ -47,6 +103,13 @@ export class SkillManager {
     getSkills() {
         return this.skills.filter((s) => !s.disabled);
     }
+    /**
+     * Returns the list of enabled discovered skills that should be displayed in the UI.
+     * This excludes built-in skills.
+     */
+    getDisplayableSkills() {
+        return this.skills.filter((s) => !s.disabled && !s.isBuiltin);
+    }
     /**
      * Returns all discovered skills, including disabled ones.
      */
@@ -63,15 +126,17 @@ export class SkillManager {
      * Sets the list of disabled skill names.
      */
     setDisabledSkills(disabledNames) {
+        const lowercaseDisabledNames = disabledNames.map((n) => n.toLowerCase());
         for (const skill of this.skills) {
-            skill.disabled = disabledNames.includes(skill.name);
+            skill.disabled = lowercaseDisabledNames.includes(skill.name.toLowerCase());
         }
     }
     /**
      * Reads the full content (metadata + body) of a skill by name.
      */
     getSkill(name) {
-        return this.skills.find((s) => s.name === name) ?? null;
+        const lowercaseName = name.toLowerCase();
+        return (this.skills.find((s) => s.name.toLowerCase() === lowercaseName) ?? null);
     }
     /**
      * Activates a skill by name.

package/dist/src/skills/skillManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"skillManager.js","sourceRoot":"","sources":["../../../src/skills/skillManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAwB,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAwB,CAAC;AAEhC,MAAM,OAAO,YAAY;IACf,MAAM,GAAsB,EAAE,CAAC;IAC/B,gBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAC;IAElD;;OAEG;IACH,WAAW;QACT,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,cAAc,CAClB,OAAgB,EAChB,aAAmC,EAAE;QAErC,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,0CAA0C;QAC1C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBAC3C,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAEzC,yCAAyC;QACzC,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAC3C,OAAO,CAAC,mBAAmB,EAAE,CAC9B,CAAC;QACF,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC;IAEO,uBAAuB,CAAC,SAA4B;QAC1D,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAC;QACpD,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;YACnD,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,SAA8C;QACzD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,aAAuB;QACvC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,KAAK,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,IAAY;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,IAAY;QACxB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CACF"}
+{"version":3,"file":"skillManager.js","sourceRoot":"","sources":["../../../src/skills/skillManager.ts"],"names":[],"mappings":"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"}

package/dist/src/skills/skillManager.test.js

@@ -10,6 +10,16 @@ import * as path from 'node:path';
 import { SkillManager } from './skillManager.js';
 import { Storage } from '../config/storage.js';
 import {} from '../config/config.js';
+import { loadSkillsFromDir } from './skillLoader.js';
+import { coreEvents } from '../utils/events.js';
+import { debugLogger } from '../utils/debugLogger.js';
+vi.mock('./skillLoader.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        loadSkillsFromDir: vi.fn(actual.loadSkillsFromDir),
+    };
+});
 describe('SkillManager', () => {
     let testRootDir;
     beforeEach(async () => {
@@ -19,9 +29,9 @@ describe('SkillManager', () => {
         await fs.rm(testRootDir, { recursive: true, force: true });
         vi.restoreAllMocks();
     });
-    it('should discover skills from extensions, user, and project with precedence', async () => {
+    it('should discover skills from extensions, user, and workspace with precedence', async () => {
         const userDir = path.join(testRootDir, 'user');
-        const projectDir = path.join(testRootDir, 'project');
+        const projectDir = path.join(testRootDir, 'workspace');
         await fs.mkdir(path.join(userDir, 'skill-a'), { recursive: true });
         await fs.mkdir(path.join(projectDir, 'skill-b'), { recursive: true });
         await fs.writeFile(path.join(userDir, 'skill-a', 'SKILL.md'), `---
@@ -51,10 +61,14 @@ description: project-desc
             ],
         };
         vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue(userDir);
+        vi.spyOn(Storage, 'getUserAgentSkillsDir').mockReturnValue('/non-existent-user-agent');
         const storage = new Storage('/dummy');
         vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(projectDir);
+        vi.spyOn(storage, 'getProjectAgentSkillsDir').mockReturnValue('/non-existent-project-agent');
         const service = new SkillManager();
-        await service.discoverSkills(storage, [mockExtension]);
+        // @ts-expect-error accessing private method for testing
+        vi.spyOn(service, 'discoverBuiltinSkills').mockResolvedValue(undefined);
+        await service.discoverSkills(storage, [mockExtension], true);
         const skills = service.getSkills();
         expect(skills).toHaveLength(3);
         const names = skills.map((s) => s.name);
@@ -62,9 +76,9 @@ description: project-desc
         expect(names).toContain('skill-user');
         expect(names).toContain('skill-project');
     });
-    it('should respect precedence: Project > User > Extension', async () => {
+    it('should respect precedence: Workspace > User > Extension', async () => {
         const userDir = path.join(testRootDir, 'user');
-        const projectDir = path.join(testRootDir, 'project');
+        const projectDir = path.join(testRootDir, 'workspace');
         await fs.mkdir(path.join(userDir, 'skill'), { recursive: true });
         await fs.mkdir(path.join(projectDir, 'skill'), { recursive: true });
         await fs.writeFile(path.join(userDir, 'skill', 'SKILL.md'), `---
@@ -94,18 +108,45 @@ description: project-desc
             ],
         };
         vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue(userDir);
+        vi.spyOn(Storage, 'getUserAgentSkillsDir').mockReturnValue('/non-existent-user-agent');
         const storage = new Storage('/dummy');
         vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(projectDir);
+        vi.spyOn(storage, 'getProjectAgentSkillsDir').mockReturnValue('/non-existent-project-agent');
         const service = new SkillManager();
-        await service.discoverSkills(storage, [mockExtension]);
+        // @ts-expect-error accessing private method for testing
+        vi.spyOn(service, 'discoverBuiltinSkills').mockResolvedValue(undefined);
+        await service.discoverSkills(storage, [mockExtension], true);
         const skills = service.getSkills();
         expect(skills).toHaveLength(1);
         expect(skills[0].description).toBe('project-desc');
         // Test User > Extension
         vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue('/non-existent');
-        await service.discoverSkills(storage, [mockExtension]);
+        await service.discoverSkills(storage, [mockExtension], true);
         expect(service.getSkills()[0].description).toBe('user-desc');
     });
+    it('should discover built-in skills', async () => {
+        const service = new SkillManager();
+        const mockBuiltinSkill = {
+            name: 'builtin-skill',
+            description: 'builtin-desc',
+            location: 'builtin-loc',
+            body: 'builtin-body',
+        };
+        vi.mocked(loadSkillsFromDir).mockImplementation(async (dir) => {
+            if (dir.endsWith('builtin')) {
+                return [{ ...mockBuiltinSkill }];
+            }
+            return [];
+        });
+        const storage = new Storage('/dummy');
+        vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue('/non-existent');
+        vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue('/non-existent');
+        await service.discoverSkills(storage, [], true);
+        const skills = service.getSkills();
+        expect(skills).toHaveLength(1);
+        expect(skills[0].name).toBe('builtin-skill');
+        expect(skills[0].isBuiltin).toBe(true);
+    });
     it('should filter disabled skills in getSkills but not in getAllSkills', async () => {
         const skillDir = path.join(testRootDir, 'skill1');
         await fs.mkdir(skillDir, { recursive: true });
@@ -113,16 +154,175 @@ description: project-desc
 name: skill1
 description: desc1
 ---
-`);
+body1`);
         const storage = new Storage('/dummy');
         vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(testRootDir);
+        vi.spyOn(storage, 'getProjectAgentSkillsDir').mockReturnValue('/non-existent-project-agent');
         vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue('/non-existent');
+        vi.spyOn(Storage, 'getUserAgentSkillsDir').mockReturnValue('/non-existent-user-agent');
         const service = new SkillManager();
-        await service.discoverSkills(storage);
+        // @ts-expect-error accessing private method for testing
+        vi.spyOn(service, 'discoverBuiltinSkills').mockResolvedValue(undefined);
+        await service.discoverSkills(storage, [], true);
         service.setDisabledSkills(['skill1']);
         expect(service.getSkills()).toHaveLength(0);
         expect(service.getAllSkills()).toHaveLength(1);
         expect(service.getAllSkills()[0].disabled).toBe(true);
     });
+    it('should skip workspace skills if folder is not trusted', async () => {
+        const projectDir = path.join(testRootDir, 'workspace');
+        await fs.mkdir(path.join(projectDir, 'skill-project'), { recursive: true });
+        await fs.writeFile(path.join(projectDir, 'skill-project', 'SKILL.md'), `---
+name: skill-project
+description: project-desc
+---
+`);
+        const storage = new Storage('/dummy');
+        vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(projectDir);
+        vi.spyOn(storage, 'getProjectAgentSkillsDir').mockReturnValue('/non-existent-project-agent');
+        vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue('/non-existent');
+        vi.spyOn(Storage, 'getUserAgentSkillsDir').mockReturnValue('/non-existent-user-agent');
+        const service = new SkillManager();
+        // @ts-expect-error accessing private method for testing
+        vi.spyOn(service, 'discoverBuiltinSkills').mockResolvedValue(undefined);
+        // Call with isTrusted = false
+        await service.discoverSkills(storage, [], false);
+        const skills = service.getSkills();
+        expect(skills).toHaveLength(0);
+    });
+    it('should filter built-in skills in getDisplayableSkills', async () => {
+        const service = new SkillManager();
+        // @ts-expect-error accessing private property for testing
+        service.skills = [
+            {
+                name: 'regular-skill',
+                description: 'regular',
+                location: 'loc1',
+                body: 'body',
+                isBuiltin: false,
+            },
+            {
+                name: 'builtin-skill',
+                description: 'builtin',
+                location: 'loc2',
+                body: 'body',
+                isBuiltin: true,
+            },
+            {
+                name: 'disabled-builtin',
+                description: 'disabled builtin',
+                location: 'loc3',
+                body: 'body',
+                isBuiltin: true,
+                disabled: true,
+            },
+        ];
+        const displayable = service.getDisplayableSkills();
+        expect(displayable).toHaveLength(1);
+        expect(displayable[0].name).toBe('regular-skill');
+        const all = service.getAllSkills();
+        expect(all).toHaveLength(3);
+        const enabled = service.getSkills();
+        expect(enabled).toHaveLength(2);
+        expect(enabled.map((s) => s.name)).toContain('builtin-skill');
+    });
+    it('should maintain admin settings state', async () => {
+        const service = new SkillManager();
+        // Case 1: Enabled by admin
+        service.setAdminSettings(true);
+        expect(service.isAdminEnabled()).toBe(true);
+        // Case 2: Disabled by admin
+        service.setAdminSettings(false);
+        expect(service.isAdminEnabled()).toBe(false);
+    });
+    describe('Conflict Detection', () => {
+        it('should emit UI warning when a non-built-in skill is overridden', async () => {
+            const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
+            const userDir = path.join(testRootDir, 'user');
+            const projectDir = path.join(testRootDir, 'workspace');
+            await fs.mkdir(userDir, { recursive: true });
+            await fs.mkdir(projectDir, { recursive: true });
+            const skillName = 'conflicting-skill';
+            const userSkillPath = path.join(userDir, 'SKILL.md');
+            const projectSkillPath = path.join(projectDir, 'SKILL.md');
+            vi.mocked(loadSkillsFromDir).mockImplementation(async (dir) => {
+                if (dir === userDir) {
+                    return [
+                        {
+                            name: skillName,
+                            description: 'user-desc',
+                            location: userSkillPath,
+                            body: '',
+                        },
+                    ];
+                }
+                if (dir === projectDir) {
+                    return [
+                        {
+                            name: skillName,
+                            description: 'project-desc',
+                            location: projectSkillPath,
+                            body: '',
+                        },
+                    ];
+                }
+                return [];
+            });
+            vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue(userDir);
+            vi.spyOn(Storage, 'getUserAgentSkillsDir').mockReturnValue('/non-existent-user-agent');
+            const storage = new Storage('/dummy');
+            vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(projectDir);
+            vi.spyOn(storage, 'getProjectAgentSkillsDir').mockReturnValue('/non-existent-project-agent');
+            const service = new SkillManager();
+            // @ts-expect-error accessing private method for testing
+            vi.spyOn(service, 'discoverBuiltinSkills').mockResolvedValue(undefined);
+            await service.discoverSkills(storage, [], true);
+            expect(emitFeedbackSpy).toHaveBeenCalledWith('warning', expect.stringContaining(`Skill conflict detected: "${skillName}" from "${projectSkillPath}" is overriding the same skill from "${userSkillPath}".`));
+        });
+        it('should log warning but NOT emit UI warning when a built-in skill is overridden', async () => {
+            const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
+            const debugWarnSpy = vi.spyOn(debugLogger, 'warn');
+            const userDir = path.join(testRootDir, 'user');
+            await fs.mkdir(userDir, { recursive: true });
+            const skillName = 'builtin-skill';
+            const userSkillPath = path.join(userDir, 'SKILL.md');
+            const builtinSkillPath = 'builtin/loc';
+            vi.mocked(loadSkillsFromDir).mockImplementation(async (dir) => {
+                if (dir.endsWith('builtin')) {
+                    return [
+                        {
+                            name: skillName,
+                            description: 'builtin-desc',
+                            location: builtinSkillPath,
+                            body: '',
+                            isBuiltin: true,
+                        },
+                    ];
+                }
+                if (dir === userDir) {
+                    return [
+                        {
+                            name: skillName,
+                            description: 'user-desc',
+                            location: userSkillPath,
+                            body: '',
+                        },
+                    ];
+                }
+                return [];
+            });
+            vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue(userDir);
+            vi.spyOn(Storage, 'getUserAgentSkillsDir').mockReturnValue('/non-existent-user-agent');
+            const storage = new Storage('/dummy');
+            vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue('/non-existent');
+            vi.spyOn(storage, 'getProjectAgentSkillsDir').mockReturnValue('/non-existent-project-agent');
+            const service = new SkillManager();
+            await service.discoverSkills(storage, [], true);
+            // UI warning should not be called
+            expect(emitFeedbackSpy).not.toHaveBeenCalled();
+            // Debug warning should be called
+            expect(debugWarnSpy).toHaveBeenCalledWith(expect.stringContaining(`Skill "${skillName}" from "${userSkillPath}" is overriding the built-in skill.`));
+        });
+    });
 });
 //# sourceMappingURL=skillManager.test.js.map

package/dist/src/skills/skillManager.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"skillManager.test.js","sourceRoot":"","sources":["../../../src/skills/skillManager.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skillManager.test.js","sourceRoot":"","sources":["../../../src/skills/skillManager.test.ts"],"names":[],"mappings":"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"}

package/dist/src/skills/skillManagerAlias.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/skills/skillManagerAlias.test.js

@@ -0,0 +1,140 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import * as fs from 'node:fs/promises';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { SkillManager } from './skillManager.js';
+import { Storage } from '../config/storage.js';
+import { loadSkillsFromDir } from './skillLoader.js';
+vi.mock('./skillLoader.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        loadSkillsFromDir: vi.fn(actual.loadSkillsFromDir),
+    };
+});
+describe('SkillManager Alias', () => {
+    let testRootDir;
+    beforeEach(async () => {
+        testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'skill-manager-alias-test-'));
+    });
+    afterEach(async () => {
+        await fs.rm(testRootDir, { recursive: true, force: true });
+        vi.restoreAllMocks();
+    });
+    it('should discover skills from .agents/skills directory', async () => {
+        const userGeminiDir = path.join(testRootDir, 'user', '.gemini', 'skills');
+        const userAgentDir = path.join(testRootDir, 'user', '.agents', 'skills');
+        const projectGeminiDir = path.join(testRootDir, 'workspace', '.gemini', 'skills');
+        const projectAgentDir = path.join(testRootDir, 'workspace', '.agents', 'skills');
+        await fs.mkdir(userGeminiDir, { recursive: true });
+        await fs.mkdir(userAgentDir, { recursive: true });
+        await fs.mkdir(projectGeminiDir, { recursive: true });
+        await fs.mkdir(projectAgentDir, { recursive: true });
+        vi.mocked(loadSkillsFromDir).mockImplementation(async (dir) => {
+            if (dir === userGeminiDir) {
+                return [
+                    {
+                        name: 'user-gemini',
+                        description: 'desc',
+                        location: 'loc',
+                        body: '',
+                    },
+                ];
+            }
+            if (dir === userAgentDir) {
+                return [
+                    {
+                        name: 'user-agent',
+                        description: 'desc',
+                        location: 'loc',
+                        body: '',
+                    },
+                ];
+            }
+            if (dir === projectGeminiDir) {
+                return [
+                    {
+                        name: 'project-gemini',
+                        description: 'desc',
+                        location: 'loc',
+                        body: '',
+                    },
+                ];
+            }
+            if (dir === projectAgentDir) {
+                return [
+                    {
+                        name: 'project-agent',
+                        description: 'desc',
+                        location: 'loc',
+                        body: '',
+                    },
+                ];
+            }
+            return [];
+        });
+        vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue(userGeminiDir);
+        vi.spyOn(Storage, 'getUserAgentSkillsDir').mockReturnValue(userAgentDir);
+        const storage = new Storage(path.join(testRootDir, 'workspace'));
+        vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(projectGeminiDir);
+        vi.spyOn(storage, 'getProjectAgentSkillsDir').mockReturnValue(projectAgentDir);
+        const service = new SkillManager();
+        // @ts-expect-error accessing private method for testing
+        vi.spyOn(service, 'discoverBuiltinSkills').mockResolvedValue(undefined);
+        await service.discoverSkills(storage, [], true);
+        const skills = service.getSkills();
+        expect(skills).toHaveLength(4);
+        const names = skills.map((s) => s.name);
+        expect(names).toContain('user-gemini');
+        expect(names).toContain('user-agent');
+        expect(names).toContain('project-gemini');
+        expect(names).toContain('project-agent');
+    });
+    it('should give .agents precedence over .gemini when in the same tier', async () => {
+        const userGeminiDir = path.join(testRootDir, 'user', '.gemini', 'skills');
+        const userAgentDir = path.join(testRootDir, 'user', '.agents', 'skills');
+        await fs.mkdir(userGeminiDir, { recursive: true });
+        await fs.mkdir(userAgentDir, { recursive: true });
+        vi.mocked(loadSkillsFromDir).mockImplementation(async (dir) => {
+            if (dir === userGeminiDir) {
+                return [
+                    {
+                        name: 'same-skill',
+                        description: 'gemini-desc',
+                        location: 'loc-gemini',
+                        body: '',
+                    },
+                ];
+            }
+            if (dir === userAgentDir) {
+                return [
+                    {
+                        name: 'same-skill',
+                        description: 'agent-desc',
+                        location: 'loc-agent',
+                        body: '',
+                    },
+                ];
+            }
+            return [];
+        });
+        vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue(userGeminiDir);
+        vi.spyOn(Storage, 'getUserAgentSkillsDir').mockReturnValue(userAgentDir);
+        const storage = new Storage('/dummy');
+        vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue('/non-existent-gemini');
+        vi.spyOn(storage, 'getProjectAgentSkillsDir').mockReturnValue('/non-existent-agent');
+        const service = new SkillManager();
+        // @ts-expect-error accessing private method for testing
+        vi.spyOn(service, 'discoverBuiltinSkills').mockResolvedValue(undefined);
+        await service.discoverSkills(storage, [], true);
+        const skills = service.getSkills();
+        expect(skills).toHaveLength(1);
+        expect(skills[0].description).toBe('agent-desc');
+    });
+});
+//# sourceMappingURL=skillManagerAlias.test.js.map

package/dist/src/skills/skillManagerAlias.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skillManagerAlias.test.js","sourceRoot":"","sources":["../../../src/skills/skillManagerAlias.test.ts"],"names":[],"mappings":"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"}

package/dist/src/telemetry/activity-monitor.js

@@ -116,6 +116,7 @@ export class ActivityMonitor {
      * Get activity statistics
      */
     getActivityStats() {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         const eventTypes = {};
         let start = Number.MAX_SAFE_INTEGER;
         let end = 0;