@google/gemini-cli-core 0.24.0-nightly.20260103.30f5c4af4 → 0.24.0-preview.0

package/dist/src/scheduler/tool-executor.test.js

@@ -0,0 +1,231 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { ToolExecutor } from './tool-executor.js';
+import { makeFakeConfig } from '../test-utils/config.js';
+import { MockTool } from '../test-utils/mock-tool.js';
+import { SHELL_TOOL_NAME } from '../tools/tool-names.js';
+import * as fileUtils from '../utils/fileUtils.js';
+import * as coreToolHookTriggers from '../core/coreToolHookTriggers.js';
+import { ShellToolInvocation } from '../tools/shell.js';
+import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+// Mock file utils
+vi.mock('../utils/fileUtils.js', () => ({
+    saveTruncatedContent: vi.fn(),
+}));
+// Mock executeToolWithHooks
+vi.mock('../core/coreToolHookTriggers.js', () => ({
+    executeToolWithHooks: vi.fn(),
+}));
+describe('ToolExecutor', () => {
+    let config;
+    let executor;
+    beforeEach(() => {
+        // Use the standard fake config factory
+        config = makeFakeConfig();
+        executor = new ToolExecutor(config);
+        // Reset mocks
+        vi.resetAllMocks();
+        // Default mock implementation for saveTruncatedContent
+        vi.mocked(fileUtils.saveTruncatedContent).mockImplementation(async (_content, _callId, _tempDir, _threshold, _lines) => ({
+            content: 'TruncatedContent...',
+            outputFile: '/tmp/truncated_output.txt',
+        }));
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should execute a tool successfully', async () => {
+        const mockTool = new MockTool({
+            name: 'testTool',
+            execute: async () => ({
+                llmContent: 'Tool output',
+                returnDisplay: 'Tool output',
+            }),
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to return success
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockResolvedValue({
+            llmContent: 'Tool output',
+            returnDisplay: 'Tool output',
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-1',
+                name: 'testTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const onUpdateToolCall = vi.fn();
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall,
+        });
+        expect(result.status).toBe('success');
+        if (result.status === 'success') {
+            const response = result.response.responseParts[0]?.functionResponse
+                ?.response;
+            expect(response).toEqual({ output: 'Tool output' });
+        }
+    });
+    it('should handle execution errors', async () => {
+        const mockTool = new MockTool({
+            name: 'failTool',
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to throw
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockRejectedValue(new Error('Tool Failed'));
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-2',
+                name: 'failTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-2',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        expect(result.status).toBe('error');
+        if (result.status === 'error') {
+            expect(result.response.error?.message).toBe('Tool Failed');
+        }
+    });
+    it('should return cancelled result when signal is aborted', async () => {
+        const mockTool = new MockTool({
+            name: 'slowTool',
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to simulate slow execution or cancellation check
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockImplementation(async () => {
+            await new Promise((r) => setTimeout(r, 100));
+            return { llmContent: 'Done', returnDisplay: 'Done' };
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-3',
+                name: 'slowTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-3',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const controller = new AbortController();
+        const promise = executor.execute({
+            call: scheduledCall,
+            signal: controller.signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        controller.abort();
+        const result = await promise;
+        expect(result.status).toBe('cancelled');
+    });
+    it('should truncate large shell output', async () => {
+        // 1. Setup Config for Truncation
+        vi.spyOn(config, 'getEnableToolOutputTruncation').mockReturnValue(true);
+        vi.spyOn(config, 'getTruncateToolOutputThreshold').mockReturnValue(10);
+        vi.spyOn(config, 'getTruncateToolOutputLines').mockReturnValue(5);
+        const mockTool = new MockTool({ name: SHELL_TOOL_NAME });
+        const invocation = mockTool.build({});
+        const longOutput = 'This is a very long output that should be truncated.';
+        // 2. Mock execution returning long content
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockResolvedValue({
+            llmContent: longOutput,
+            returnDisplay: longOutput,
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-trunc',
+                name: SHELL_TOOL_NAME,
+                args: { command: 'echo long' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-trunc',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        // 3. Execute
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        // 4. Verify Truncation Logic
+        expect(fileUtils.saveTruncatedContent).toHaveBeenCalledWith(longOutput, 'call-trunc', expect.any(String), // temp dir
+        10, // threshold
+        5);
+        expect(result.status).toBe('success');
+        if (result.status === 'success') {
+            const response = result.response.responseParts[0]?.functionResponse
+                ?.response;
+            // The content should be the *truncated* version returned by the mock saveTruncatedContent
+            expect(response).toEqual({ output: 'TruncatedContent...' });
+            expect(result.response.outputFile).toBe('/tmp/truncated_output.txt');
+        }
+    });
+    it('should report PID updates for shell tools', async () => {
+        // 1. Setup ShellToolInvocation
+        const messageBus = createMockMessageBus();
+        const shellInvocation = new ShellToolInvocation(config, { command: 'sleep 10' }, messageBus);
+        // We need a dummy tool that matches the invocation just for structure
+        const mockTool = new MockTool({ name: SHELL_TOOL_NAME });
+        // 2. Mock executeToolWithHooks to trigger the PID callback
+        const testPid = 12345;
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockImplementation(async (_inv, _name, _sig, _bus, _hooks, _tool, _liveCb, _shellCfg, setPidCallback) => {
+            // Simulate the shell tool reporting a PID
+            if (setPidCallback) {
+                setPidCallback(testPid);
+            }
+            return { llmContent: 'done', returnDisplay: 'done' };
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-pid',
+                name: SHELL_TOOL_NAME,
+                args: { command: 'sleep 10' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-pid',
+            },
+            tool: mockTool,
+            invocation: shellInvocation,
+            startTime: Date.now(),
+        };
+        const onUpdateToolCall = vi.fn();
+        // 3. Execute
+        await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall,
+        });
+        // 4. Verify PID was reported
+        expect(onUpdateToolCall).toHaveBeenCalledWith(expect.objectContaining({
+            status: 'executing',
+            pid: testPid,
+        }));
+    });
+});
+//# sourceMappingURL=tool-executor.test.js.map

package/dist/src/scheduler/tool-executor.test.js.map

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

package/dist/src/skills/skillLoader.d.ts

@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Represents the definition of an Agent Skill.
+ */
+export interface SkillDefinition {
+    /** The unique name of the skill. */
+    name: string;
+    /** A concise description of what the skill does. */
+    description: string;
+    /** The absolute path to the skill's source file on disk. */
+    location: string;
+    /** The core logic/instructions of the skill. */
+    body: string;
+    /** Whether the skill is currently disabled. */
+    disabled?: boolean;
+}
+/**
+ * Discovers and loads all skills in the provided directory.
+ */
+export declare function loadSkillsFromDir(dir: string): Promise<SkillDefinition[]>;
+/**
+ * Loads a single skill from a SKILL.md file.
+ */
+export declare function loadSkillFromFile(filePath: string): Promise<SkillDefinition | null>;

package/dist/src/skills/skillLoader.js

@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import { glob } from 'glob';
+import yaml from 'js-yaml';
+import { debugLogger } from '../utils/debugLogger.js';
+import { coreEvents } from '../utils/events.js';
+const FRONTMATTER_REGEX = /^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)/;
+/**
+ * Discovers and loads all skills in the provided directory.
+ */
+export async function loadSkillsFromDir(dir) {
+    const discoveredSkills = [];
+    try {
+        const absoluteSearchPath = path.resolve(dir);
+        const stats = await fs.stat(absoluteSearchPath).catch(() => null);
+        if (!stats || !stats.isDirectory()) {
+            return [];
+        }
+        const skillFiles = await glob('*/SKILL.md', {
+            cwd: absoluteSearchPath,
+            absolute: true,
+            nodir: true,
+        });
+        for (const skillFile of skillFiles) {
+            const metadata = await loadSkillFromFile(skillFile);
+            if (metadata) {
+                discoveredSkills.push(metadata);
+            }
+        }
+        if (discoveredSkills.length === 0) {
+            const files = await fs.readdir(absoluteSearchPath);
+            if (files.length > 0) {
+                coreEvents.emitFeedback('warning', `Failed to load skills from ${absoluteSearchPath}. The directory is not empty but no valid skills were discovered. Please ensure SKILL.md files are present in subdirectories and have valid frontmatter.`);
+            }
+        }
+    }
+    catch (error) {
+        coreEvents.emitFeedback('warning', `Error discovering skills in ${dir}:`, error);
+    }
+    return discoveredSkills;
+}
+/**
+ * Loads a single skill from a SKILL.md file.
+ */
+export async function loadSkillFromFile(filePath) {
+    try {
+        const content = await fs.readFile(filePath, 'utf-8');
+        const match = content.match(FRONTMATTER_REGEX);
+        if (!match) {
+            return null;
+        }
+        const frontmatter = yaml.load(match[1]);
+        if (!frontmatter || typeof frontmatter !== 'object') {
+            return null;
+        }
+        const { name, description } = frontmatter;
+        if (typeof name !== 'string' || typeof description !== 'string') {
+            return null;
+        }
+        return {
+            name,
+            description,
+            location: filePath,
+            body: match[2].trim(),
+        };
+    }
+    catch (error) {
+        debugLogger.log(`Error parsing skill file ${filePath}:`, error);
+        return null;
+    }
+}
+//# sourceMappingURL=skillLoader.js.map

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

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

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

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

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

@@ -0,0 +1,73 @@
+/**
+ * @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 { loadSkillsFromDir } from './skillLoader.js';
+import { coreEvents } from '../utils/events.js';
+describe('skillLoader', () => {
+    let testRootDir;
+    beforeEach(async () => {
+        testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'skill-loader-test-'));
+        vi.spyOn(coreEvents, 'emitFeedback');
+    });
+    afterEach(async () => {
+        await fs.rm(testRootDir, { recursive: true, force: true });
+        vi.restoreAllMocks();
+    });
+    it('should load skills from a directory with valid SKILL.md', async () => {
+        const skillDir = path.join(testRootDir, 'my-skill');
+        await fs.mkdir(skillDir, { recursive: true });
+        const skillFile = path.join(skillDir, 'SKILL.md');
+        await fs.writeFile(skillFile, `---\nname: my-skill\ndescription: A test skill\n---\n# Instructions\nDo something.\n`);
+        const skills = await loadSkillsFromDir(testRootDir);
+        expect(skills).toHaveLength(1);
+        expect(skills[0].name).toBe('my-skill');
+        expect(skills[0].description).toBe('A test skill');
+        expect(skills[0].location).toBe(skillFile);
+        expect(skills[0].body).toBe('# Instructions\nDo something.');
+        expect(coreEvents.emitFeedback).not.toHaveBeenCalled();
+    });
+    it('should emit feedback when no valid skills are found in a non-empty directory', async () => {
+        const notASkillDir = path.join(testRootDir, 'not-a-skill');
+        await fs.mkdir(notASkillDir, { recursive: true });
+        await fs.writeFile(path.join(notASkillDir, 'some-file.txt'), 'hello');
+        const skills = await loadSkillsFromDir(testRootDir);
+        expect(skills).toHaveLength(0);
+        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('warning', expect.stringContaining('Failed to load skills from'));
+    });
+    it('should ignore empty directories and not emit feedback', async () => {
+        const skills = await loadSkillsFromDir(testRootDir);
+        expect(skills).toHaveLength(0);
+        expect(coreEvents.emitFeedback).not.toHaveBeenCalled();
+    });
+    it('should ignore directories without SKILL.md', async () => {
+        const notASkillDir = path.join(testRootDir, 'not-a-skill');
+        await fs.mkdir(notASkillDir, { recursive: true });
+        // With a subdirectory, even if empty, it might still trigger readdir
+        // But my current logic is if discoveredSkills.length === 0, then check readdir
+        // If readdir is empty, it's fine.
+        const skills = await loadSkillsFromDir(testRootDir);
+        expect(skills).toHaveLength(0);
+        // If notASkillDir is empty, no warning.
+    });
+    it('should ignore SKILL.md without valid frontmatter and emit warning if directory is not empty', async () => {
+        const skillDir = path.join(testRootDir, 'invalid-skill');
+        await fs.mkdir(skillDir, { recursive: true });
+        const skillFile = path.join(skillDir, 'SKILL.md');
+        await fs.writeFile(skillFile, '# No frontmatter here');
+        const skills = await loadSkillsFromDir(testRootDir);
+        expect(skills).toHaveLength(0);
+        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('warning', expect.stringContaining('Failed to load skills from'));
+    });
+    it('should return empty array for non-existent directory', async () => {
+        const skills = await loadSkillsFromDir('/non/existent/path');
+        expect(skills).toEqual([]);
+        expect(coreEvents.emitFeedback).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=skillLoader.test.js.map

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

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

package/dist/src/{services → skills}/skillManager.d.ts

@@ -4,13 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Storage } from '../config/storage.js';
-export interface SkillMetadata {
-    name: string;
-    description: string;
-    location: string;
-    body: string;
-    disabled?: boolean;
-}
+import { type SkillDefinition } from './skillLoader.js';
+import type { GeminiCLIExtension } from '../config/config.js';
+export { type SkillDefinition };
 export declare class SkillManager {
     private skills;
     private activeSkillNames;
@@ -19,28 +15,23 @@ export declare class SkillManager {
      */
     clearSkills(): void;
     /**
-     * Discovers skills from standard user and project locations.
-     * Project skills take precedence over user skills.
+     * Discovers skills from standard user and project locations, as well as extensions.
+     * Precedence: Extensions (lowest) -> User -> Project (highest).
      */
-    discoverSkills(storage: Storage): Promise<void>;
+    discoverSkills(storage: Storage, extensions?: GeminiCLIExtension[]): Promise<void>;
     private addSkillsWithPrecedence;
-    /**
-     * Discovered skills in the provided paths and adds them to the manager.
-     * Internal helper for tiered discovery.
-     */
-    discoverSkillsInternal(paths: string[]): Promise<SkillMetadata[]>;
     /**
      * Returns the list of enabled discovered skills.
      */
-    getSkills(): SkillMetadata[];
+    getSkills(): SkillDefinition[];
     /**
      * Returns all discovered skills, including disabled ones.
      */
-    getAllSkills(): SkillMetadata[];
+    getAllSkills(): SkillDefinition[];
     /**
      * Filters discovered skills by name.
      */
-    filterSkills(predicate: (skill: SkillMetadata) => boolean): void;
+    filterSkills(predicate: (skill: SkillDefinition) => boolean): void;
     /**
      * Sets the list of disabled skill names.
      */
@@ -48,7 +39,7 @@ export declare class SkillManager {
     /**
      * Reads the full content (metadata + body) of a skill by name.
      */
-    getSkill(name: string): SkillMetadata | null;
+    getSkill(name: string): SkillDefinition | null;
     /**
      * Activates a skill by name.
      */
@@ -57,5 +48,4 @@ export declare class SkillManager {
      * Checks if a skill is active.
      */
     isSkillActive(name: string): boolean;
-    private parseSkillFile;
 }

package/dist/src/skills/skillManager.js

@@ -0,0 +1,89 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Storage } from '../config/storage.js';
+import { loadSkillsFromDir } from './skillLoader.js';
+export {};
+export class SkillManager {
+    skills = [];
+    activeSkillNames = new Set();
+    /**
+     * Clears all discovered skills.
+     */
+    clearSkills() {
+        this.skills = [];
+    }
+    /**
+     * Discovers skills from standard user and project locations, as well as extensions.
+     * Precedence: Extensions (lowest) -> User -> Project (highest).
+     */
+    async discoverSkills(storage, extensions = []) {
+        this.clearSkills();
+        // 1. Extension skills (lowest precedence)
+        for (const extension of extensions) {
+            if (extension.isActive && extension.skills) {
+                this.addSkillsWithPrecedence(extension.skills);
+            }
+        }
+        // 2. User skills
+        const userSkills = await loadSkillsFromDir(Storage.getUserSkillsDir());
+        this.addSkillsWithPrecedence(userSkills);
+        // 3. Project skills (highest precedence)
+        const projectSkills = await loadSkillsFromDir(storage.getProjectSkillsDir());
+        this.addSkillsWithPrecedence(projectSkills);
+    }
+    addSkillsWithPrecedence(newSkills) {
+        const skillMap = new Map();
+        for (const skill of [...this.skills, ...newSkills]) {
+            skillMap.set(skill.name, skill);
+        }
+        this.skills = Array.from(skillMap.values());
+    }
+    /**
+     * Returns the list of enabled discovered skills.
+     */
+    getSkills() {
+        return this.skills.filter((s) => !s.disabled);
+    }
+    /**
+     * Returns all discovered skills, including disabled ones.
+     */
+    getAllSkills() {
+        return this.skills;
+    }
+    /**
+     * Filters discovered skills by name.
+     */
+    filterSkills(predicate) {
+        this.skills = this.skills.filter(predicate);
+    }
+    /**
+     * Sets the list of disabled skill names.
+     */
+    setDisabledSkills(disabledNames) {
+        for (const skill of this.skills) {
+            skill.disabled = disabledNames.includes(skill.name);
+        }
+    }
+    /**
+     * Reads the full content (metadata + body) of a skill by name.
+     */
+    getSkill(name) {
+        return this.skills.find((s) => s.name === name) ?? null;
+    }
+    /**
+     * Activates a skill by name.
+     */
+    activateSkill(name) {
+        this.activeSkillNames.add(name);
+    }
+    /**
+     * Checks if a skill is active.
+     */
+    isSkillActive(name) {
+        return this.activeSkillNames.has(name);
+    }
+}
+//# sourceMappingURL=skillManager.js.map

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

@@ -0,0 +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"}

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

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