@office-ai/aioncli-core 0.18.7 → 0.24.0-preview.1

package/dist/src/test-utils/mock-tool.js

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { BaseDeclarativeTool, BaseToolInvocation, Kind, } from '../tools/tools.js';
+import { createMockMessageBus } from './mock-message-bus.js';
 class MockToolInvocation extends BaseToolInvocation {
     tool;
-    constructor(tool, params) {
-        super(params);
+    constructor(tool, params, messageBus) {
+        super(params, messageBus, tool.name, tool.displayName);
         this.tool = tool;
     }
     execute(signal, updateOutput) {
@@ -32,7 +33,7 @@ export class MockTool extends BaseDeclarativeTool {
     shouldConfirmExecute;
     execute;
     constructor(options) {
-        super(options.name, options.displayName ?? options.name, options.description ?? options.name, Kind.Other, options.params, options.isOutputMarkdown ?? false, options.canUpdateOutput ?? false);
+        super(options.name, options.displayName ?? options.name, options.description ?? options.name, Kind.Other, options.params, options.messageBus ?? createMockMessageBus(), options.isOutputMarkdown ?? false, options.canUpdateOutput ?? false);
         if (options.shouldConfirmExecute) {
             this.shouldConfirmExecute = options.shouldConfirmExecute;
         }
@@ -49,8 +50,8 @@ export class MockTool extends BaseDeclarativeTool {
             });
         }
     }
-    createInvocation(params) {
-        return new MockToolInvocation(this, params);
+    createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+        return new MockToolInvocation(this, params, messageBus);
     }
 }
 export const MOCK_TOOL_SHOULD_CONFIRM_EXECUTE = () => Promise.resolve({
@@ -62,8 +63,8 @@ export const MOCK_TOOL_SHOULD_CONFIRM_EXECUTE = () => Promise.resolve({
 });
 export class MockModifiableToolInvocation extends BaseToolInvocation {
     tool;
-    constructor(tool, params) {
-        super(params);
+    constructor(tool, params, messageBus) {
+        super(params, messageBus, tool.name, tool.displayName);
         this.tool = tool;
     }
     async execute(_abortSignal) {
@@ -96,7 +97,7 @@ export class MockModifiableToolInvocation extends BaseToolInvocation {
  * Configurable mock modifiable tool for testing.
  */
 export class MockModifiableTool extends BaseDeclarativeTool {
-    // Should be overrided in test file. Functionality will be updated in follow
+    // Should be overridden in test file. Functionality will be updated in follow
     // up PR which has MockModifiableTool expect MockTool
     executeFn = () => undefined;
     shouldConfirm = true;
@@ -104,7 +105,7 @@ export class MockModifiableTool extends BaseDeclarativeTool {
         super(name, name, 'A mock modifiable tool for testing.', Kind.Other, {
             type: 'object',
             properties: { param: { type: 'string' } },
-        });
+        }, createMockMessageBus(), true, false);
     }
     getModifyContext(_abortSignal) {
         return {
@@ -114,8 +115,8 @@ export class MockModifiableTool extends BaseDeclarativeTool {
             createUpdatedParams: (_oldContent, modifiedProposedContent, _originalParams) => ({ newContent: modifiedProposedContent }),
         };
     }
-    createInvocation(params) {
-        return new MockModifiableToolInvocation(this, params);
+    createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+        return new MockModifiableToolInvocation(this, params, messageBus);
     }
 }
 //# sourceMappingURL=mock-tool.js.map

package/dist/src/test-utils/mock-tool.js.map

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

package/dist/src/tools/activate-skill.d.ts

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import type { ToolResult, ToolInvocation } from './tools.js';
+import { BaseDeclarativeTool } from './tools.js';
+import type { Config } from '../config/config.js';
+/**
+ * Parameters for the ActivateSkill tool
+ */
+export interface ActivateSkillToolParams {
+    /**
+     * The name of the skill to activate
+     */
+    name: string;
+}
+/**
+ * Implementation of the ActivateSkill tool logic
+ */
+export declare class ActivateSkillTool extends BaseDeclarativeTool<ActivateSkillToolParams, ToolResult> {
+    private config;
+    static readonly Name = "activate_skill";
+    constructor(config: Config, messageBus: MessageBus);
+    protected createInvocation(params: ActivateSkillToolParams, messageBus: MessageBus, _toolName?: string, _toolDisplayName?: string): ToolInvocation<ActivateSkillToolParams, ToolResult>;
+}

package/dist/src/tools/activate-skill.js

@@ -0,0 +1,120 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { z } from 'zod';
+import { zodToJsonSchema } from 'zod-to-json-schema';
+import * as path from 'node:path';
+import { getFolderStructure } from '../utils/getFolderStructure.js';
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
+import { ACTIVATE_SKILL_TOOL_NAME } from './tool-names.js';
+class ActivateSkillToolInvocation extends BaseToolInvocation {
+    config;
+    cachedFolderStructure;
+    constructor(config, params, messageBus, _toolName, _toolDisplayName) {
+        super(params, messageBus, _toolName, _toolDisplayName);
+        this.config = config;
+    }
+    getDescription() {
+        const skillName = this.params.name;
+        const skill = this.config.getSkillManager().getSkill(skillName);
+        if (skill) {
+            return `"${skillName}": ${skill.description}`;
+        }
+        return `"${skillName}" (⚠️ unknown skill)`;
+    }
+    async getOrFetchFolderStructure(skillLocation) {
+        if (this.cachedFolderStructure === undefined) {
+            this.cachedFolderStructure = await getFolderStructure(path.dirname(skillLocation));
+        }
+        return this.cachedFolderStructure;
+    }
+    async getConfirmationDetails(_abortSignal) {
+        if (!this.messageBus) {
+            return false;
+        }
+        const skillName = this.params.name;
+        const skill = this.config.getSkillManager().getSkill(skillName);
+        if (!skill) {
+            return false;
+        }
+        const folderStructure = await this.getOrFetchFolderStructure(skill.location);
+        const confirmationDetails = {
+            type: 'info',
+            title: `Activate Skill: ${skillName}`,
+            prompt: `You are about to enable the specialized agent skill **${skillName}**.
+
+**Description:**
+${skill.description}
+
+**Resources to be shared with the model:**
+${folderStructure}`,
+            onConfirm: async (outcome) => {
+                await this.publishPolicyUpdate(outcome);
+            },
+        };
+        return confirmationDetails;
+    }
+    async execute(_signal) {
+        const skillName = this.params.name;
+        const skillManager = this.config.getSkillManager();
+        const skill = skillManager.getSkill(skillName);
+        if (!skill) {
+            const skills = skillManager.getSkills();
+            return {
+                llmContent: `Error: Skill "${skillName}" not found. Available skills are: ${skills.map((s) => s.name).join(', ')}`,
+                returnDisplay: `Skill "${skillName}" not found.`,
+            };
+        }
+        skillManager.activateSkill(skillName);
+        // Add the skill's directory to the workspace context so the agent has permission
+        // to read its bundled resources.
+        this.config
+            .getWorkspaceContext()
+            .addDirectory(path.dirname(skill.location));
+        const folderStructure = await this.getOrFetchFolderStructure(skill.location);
+        return {
+            llmContent: `<ACTIVATED_SKILL name="${skillName}">
+  <INSTRUCTIONS>
+    ${skill.body}
+  </INSTRUCTIONS>
+
+  <AVAILABLE_RESOURCES>
+    ${folderStructure}
+  </AVAILABLE_RESOURCES>
+</ACTIVATED_SKILL>`,
+            returnDisplay: `Skill **${skillName}** activated. Resources loaded from \`${path.dirname(skill.location)}\`:\n\n${folderStructure}`,
+        };
+    }
+}
+/**
+ * Implementation of the ActivateSkill tool logic
+ */
+export class ActivateSkillTool extends BaseDeclarativeTool {
+    config;
+    static Name = ACTIVATE_SKILL_TOOL_NAME;
+    constructor(config, messageBus) {
+        const skills = config.getSkillManager().getSkills();
+        const skillNames = skills.map((s) => s.name);
+        let schema;
+        if (skillNames.length === 0) {
+            schema = z.object({
+                name: z.string().describe('No skills are currently available.'),
+            });
+        }
+        else {
+            schema = z.object({
+                name: z
+                    .enum(skillNames)
+                    .describe('The name of the skill to activate.'),
+            });
+        }
+        super(ActivateSkillTool.Name, 'Activate Skill', "Activates a specialized agent skill by name. Returns the skill's instructions wrapped in `<ACTIVATED_SKILL>` tags. These provide specialized guidance for the current task. Use this when you identify a task that matches a skill's description.", Kind.Other, zodToJsonSchema(schema), messageBus, true, false);
+        this.config = config;
+    }
+    createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+        return new ActivateSkillToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName ?? 'Activate Skill');
+    }
+}
+//# sourceMappingURL=activate-skill.js.map

package/dist/src/tools/activate-skill.js.map

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

package/dist/src/tools/activate-skill.test.d.ts

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

package/dist/src/tools/activate-skill.test.js

@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { ActivateSkillTool } from './activate-skill.js';
+import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+vi.mock('../utils/getFolderStructure.js', () => ({
+    getFolderStructure: vi.fn().mockResolvedValue('Mock folder structure'),
+}));
+describe('ActivateSkillTool', () => {
+    let mockConfig;
+    let tool;
+    let mockMessageBus;
+    beforeEach(() => {
+        mockMessageBus = createMockMessageBus();
+        const skills = [
+            {
+                name: 'test-skill',
+                description: 'A test skill',
+                location: '/path/to/test-skill/SKILL.md',
+            },
+        ];
+        mockConfig = {
+            getWorkspaceContext: vi.fn().mockReturnValue({
+                addDirectory: vi.fn(),
+            }),
+            getSkillManager: vi.fn().mockReturnValue({
+                getSkills: vi.fn().mockReturnValue(skills),
+                getAllSkills: vi.fn().mockReturnValue(skills),
+                getSkill: vi.fn().mockImplementation((name) => {
+                    if (name === 'test-skill') {
+                        return {
+                            name: 'test-skill',
+                            description: 'A test skill',
+                            location: '/path/to/test-skill/SKILL.md',
+                            body: 'Skill instructions content.',
+                        };
+                    }
+                    return null;
+                }),
+                activateSkill: vi.fn(),
+            }),
+        };
+        tool = new ActivateSkillTool(mockConfig, mockMessageBus);
+    });
+    it('should return enhanced description', () => {
+        const params = { name: 'test-skill' };
+        const invocation = tool.build(params);
+        expect(invocation.getDescription()).toBe('"test-skill": A test skill');
+    });
+    it('should return enhanced confirmation details', async () => {
+        const params = { name: 'test-skill' };
+        const invocation = tool.build(params);
+        const details = await invocation.getConfirmationDetails(new AbortController().signal);
+        expect(details.title).toBe('Activate Skill: test-skill');
+        expect(details.prompt).toContain('enable the specialized agent skill');
+        expect(details.prompt).toContain('A test skill');
+        expect(details.prompt).toContain('Mock folder structure');
+    });
+    it('should activate a valid skill and return its content in XML tags', async () => {
+        const params = { name: 'test-skill' };
+        const invocation = tool.build(params);
+        const result = await invocation.execute(new AbortController().signal);
+        expect(mockConfig.getSkillManager().activateSkill).toHaveBeenCalledWith('test-skill');
+        expect(mockConfig.getWorkspaceContext().addDirectory).toHaveBeenCalledWith('/path/to/test-skill');
+        expect(result.llmContent).toContain('<ACTIVATED_SKILL name="test-skill">');
+        expect(result.llmContent).toContain('<INSTRUCTIONS>');
+        expect(result.llmContent).toContain('Skill instructions content.');
+        expect(result.llmContent).toContain('</INSTRUCTIONS>');
+        expect(result.llmContent).toContain('<AVAILABLE_RESOURCES>');
+        expect(result.llmContent).toContain('Mock folder structure');
+        expect(result.llmContent).toContain('</AVAILABLE_RESOURCES>');
+        expect(result.llmContent).toContain('</ACTIVATED_SKILL>');
+        expect(result.returnDisplay).toContain('Skill **test-skill** activated');
+        expect(result.returnDisplay).toContain('Mock folder structure');
+    });
+    it('should throw error if skill is not in enum', async () => {
+        const params = { name: 'non-existent' };
+        expect(() => tool.build(params)).toThrow();
+    });
+    it('should return an error if skill content cannot be read', async () => {
+        vi.mocked(mockConfig.getSkillManager().getSkill).mockReturnValue(null);
+        const params = { name: 'test-skill' };
+        const invocation = tool.build(params);
+        const result = await invocation.execute(new AbortController().signal);
+        expect(result.llmContent).toContain('Error: Skill "test-skill" not found.');
+        expect(mockConfig.getSkillManager().activateSkill).not.toHaveBeenCalled();
+    });
+    it('should validate that name is provided', () => {
+        expect(() => tool.build({ name: '' })).toThrow();
+    });
+});
+//# sourceMappingURL=activate-skill.test.js.map

package/dist/src/tools/activate-skill.test.js.map

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

package/dist/src/tools/confirmation-policy.test.d.ts

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

package/dist/src/tools/confirmation-policy.test.js

@@ -0,0 +1,142 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { EditTool } from './edit.js';
+import { WriteFileTool } from './write-file.js';
+import { WebFetchTool } from './web-fetch.js';
+import { ToolConfirmationOutcome } from './tools.js';
+import { ApprovalMode } from '../policy/types.js';
+import { MessageBusType } from '../confirmation-bus/types.js';
+import path from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
+// Mock telemetry loggers to avoid failures
+vi.mock('../telemetry/loggers.js', () => ({
+    logEditStrategy: vi.fn(),
+    logEditCorrectionEvent: vi.fn(),
+    logFileOperation: vi.fn(),
+}));
+describe('Tool Confirmation Policy Updates', () => {
+    let mockConfig;
+    let mockMessageBus;
+    const rootDir = path.join(os.tmpdir(), `gemini-cli-policy-test-${Date.now()}`);
+    beforeEach(() => {
+        if (!fs.existsSync(rootDir)) {
+            fs.mkdirSync(rootDir, { recursive: true });
+        }
+        mockMessageBus = {
+            publish: vi.fn(),
+            subscribe: vi.fn(),
+            unsubscribe: vi.fn(),
+        };
+        mockConfig = {
+            getTargetDir: () => rootDir,
+            getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
+            setApprovalMode: vi.fn(),
+            getFileSystemService: () => ({
+                readTextFile: vi.fn().mockImplementation((p) => {
+                    if (fs.existsSync(p)) {
+                        return fs.readFileSync(p, 'utf8');
+                    }
+                    return 'existing content';
+                }),
+                writeTextFile: vi.fn().mockImplementation((p, c) => {
+                    fs.writeFileSync(p, c);
+                }),
+            }),
+            getFileService: () => ({}),
+            getFileFilteringOptions: () => ({}),
+            getGeminiClient: () => ({}),
+            getBaseLlmClient: () => ({}),
+            getIdeMode: () => false,
+            getWorkspaceContext: () => ({
+                isPathWithinWorkspace: () => true,
+                getDirectories: () => [rootDir],
+            }),
+        };
+    });
+    afterEach(() => {
+        if (fs.existsSync(rootDir)) {
+            fs.rmSync(rootDir, { recursive: true, force: true });
+        }
+        vi.restoreAllMocks();
+    });
+    const tools = [
+        {
+            name: 'EditTool',
+            create: (config, bus) => new EditTool(config, bus),
+            params: {
+                file_path: 'test.txt',
+                instruction: 'change content',
+                old_string: 'existing',
+                new_string: 'new',
+            },
+        },
+        {
+            name: 'WriteFileTool',
+            create: (config, bus) => new WriteFileTool(config, bus),
+            params: {
+                file_path: path.join(rootDir, 'test.txt'),
+                content: 'new content',
+            },
+        },
+        {
+            name: 'WebFetchTool',
+            create: (config, bus) => new WebFetchTool(config, bus),
+            params: {
+                prompt: 'fetch https://example.com',
+            },
+        },
+    ];
+    describe.each(tools)('$name policy updates', ({ create, params }) => {
+        it.each([
+            {
+                outcome: ToolConfirmationOutcome.ProceedAlways,
+                shouldPublish: false,
+                expectedApprovalMode: ApprovalMode.AUTO_EDIT,
+            },
+            {
+                outcome: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+                shouldPublish: true,
+                persist: true,
+            },
+        ])('should handle $outcome correctly', async ({ outcome, shouldPublish, persist, expectedApprovalMode }) => {
+            const tool = create(mockConfig, mockMessageBus);
+            // For file-based tools, ensure the file exists if needed
+            if (params.file_path) {
+                const fullPath = path.isAbsolute(params.file_path)
+                    ? params.file_path
+                    : path.join(rootDir, params.file_path);
+                fs.writeFileSync(fullPath, 'existing content');
+            }
+            const invocation = tool.build(params);
+            // Mock getMessageBusDecision to trigger ASK_USER flow
+            vi.spyOn(invocation, 'getMessageBusDecision').mockResolvedValue('ASK_USER');
+            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
+            expect(confirmation).not.toBe(false);
+            if (confirmation) {
+                await confirmation.onConfirm(outcome);
+                if (shouldPublish) {
+                    expect(mockMessageBus.publish).toHaveBeenCalledWith(expect.objectContaining({
+                        type: MessageBusType.UPDATE_POLICY,
+                        persist,
+                    }));
+                }
+                else {
+                    // Should not publish UPDATE_POLICY message for ProceedAlways
+                    const publishCalls = mockMessageBus.publish.mock.calls;
+                    const hasUpdatePolicy = publishCalls.some((call) => call[0].type === MessageBusType.UPDATE_POLICY);
+                    expect(hasUpdatePolicy).toBe(false);
+                }
+                if (expectedApprovalMode !== undefined) {
+                    expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(expectedApprovalMode);
+                }
+            }
+        });
+    });
+});
+//# sourceMappingURL=confirmation-policy.test.js.map

package/dist/src/tools/confirmation-policy.test.js.map

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

package/dist/src/tools/edit.d.ts

@@ -3,12 +3,29 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool } from './tools.js';
+import { BaseDeclarativeTool, type ToolInvocation, type ToolResult } from './tools.js';
 import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import { ToolErrorType } from './tool-error.js';
 import type { Config } from '../config/config.js';
-import type { ModifiableDeclarativeTool, ModifyContext } from './modifiable-tool.js';
+import { type ModifiableDeclarativeTool, type ModifyContext } from './modifiable-tool.js';
+interface ReplacementContext {
+    params: EditToolParams;
+    currentContent: string;
+    abortSignal: AbortSignal;
+}
+interface ReplacementResult {
+    newContent: string;
+    occurrences: number;
+    finalOldString: string;
+    finalNewString: string;
+}
 export declare function applyReplacement(currentContent: string | null, oldString: string, newString: string, isNewFile: boolean): string;
+export declare function calculateReplacement(config: Config, context: ReplacementContext): Promise<ReplacementResult>;
+export declare function getErrorReplaceResult(params: EditToolParams, occurrences: number, expectedReplacements: number, finalOldString: string, finalNewString: string): {
+    display: string;
+    raw: string;
+    type: ToolErrorType;
+} | undefined;
 /**
  * Parameters for the Edit tool
  */
@@ -30,6 +47,10 @@ export interface EditToolParams {
      * Use when you want to replace multiple occurrences.
      */
     expected_replacements?: number;
+    /**
+     * The instruction for what needs to be done.
+     */
+    instruction?: string;
     /**
      * Whether the edit was modified manually by the user.
      */
@@ -45,13 +66,14 @@ export interface EditToolParams {
 export declare class EditTool extends BaseDeclarativeTool<EditToolParams, ToolResult> implements ModifiableDeclarativeTool<EditToolParams> {
     private readonly config;
     static readonly Name = "replace";
-    constructor(config: Config, messageBus?: MessageBus);
+    constructor(config: Config, messageBus: MessageBus);
     /**
      * Validates the parameters for the Edit tool
      * @param params Parameters to validate
      * @returns Error message string or null if valid
      */
     protected validateToolParamValues(params: EditToolParams): string | null;
-    protected createInvocation(params: EditToolParams, messageBus?: MessageBus, toolName?: string, displayName?: string): ToolInvocation<EditToolParams, ToolResult>;
+    protected createInvocation(params: EditToolParams, messageBus: MessageBus): ToolInvocation<EditToolParams, ToolResult>;
     getModifyContext(_: AbortSignal): ModifyContext<EditToolParams>;
 }
+export {};