@google/gemini-cli-core 0.24.0-nightly.20260103.30f5c4af4 → 0.25.0-nightly.20260112.15891721a

package/dist/src/test-utils/mock-message-bus.js

@@ -13,6 +13,7 @@ export class MockMessageBus {
     publishedMessages = [];
     hookRequests = [];
     hookResponses = [];
+    defaultToolDecision = 'allow';
     /**
      * Mock publish method that captures messages and simulates responses
      */
@@ -35,6 +36,34 @@ export class MockMessageBus {
             // Emit response to subscribers
             this.emit(MessageBusType.HOOK_EXECUTION_RESPONSE, response);
         }
+        // Handle tool confirmation requests
+        if (message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
+            if (this.defaultToolDecision === 'allow') {
+                this.emit(MessageBusType.TOOL_CONFIRMATION_RESPONSE, {
+                    type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+                    correlationId: message.correlationId,
+                    confirmed: true,
+                });
+            }
+            else if (this.defaultToolDecision === 'deny') {
+                this.emit(MessageBusType.TOOL_CONFIRMATION_RESPONSE, {
+                    type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+                    correlationId: message.correlationId,
+                    confirmed: false,
+                });
+            }
+            else {
+                // ask_user
+                this.emit(MessageBusType.TOOL_CONFIRMATION_RESPONSE, {
+                    type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+                    correlationId: message.correlationId,
+                    confirmed: false,
+                    requiresUserConfirmation: true,
+                });
+            }
+        }
+        // Emit the message to subscribers (mimicking real MessageBus behavior)
+        this.emit(message.type, message);
     });
     /**
      * Mock subscribe method that stores listeners

package/dist/src/test-utils/mock-message-bus.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock-message-bus.js","sourceRoot":"","sources":["../../../src/test-utils/mock-message-bus.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mock-message-bus.js","sourceRoot":"","sources":["../../../src/test-utils/mock-message-bus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,OAAO,EACL,cAAc,GAIf,MAAM,8BAA8B,CAAC;AAEtC;;GAEG;AACH,MAAM,OAAO,cAAc;IACjB,aAAa,GAAG,IAAI,GAAG,EAG5B,CAAC;IACJ,iBAAiB,GAAc,EAAE,CAAC;IAClC,YAAY,GAA2B,EAAE,CAAC;IAC1C,aAAa,GAA4B,EAAE,CAAC;IAC5C,mBAAmB,GAAkC,OAAO,CAAC;IAE7D;;OAEG;IACH,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,OAAgB,EAAE,EAAE;QACnC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAErC,iCAAiC;QACjC,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,sBAAsB,EAAE,CAAC;YAC3D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEhC,wCAAwC;YACxC,MAAM,QAAQ,GAA0B;gBACtC,IAAI,EAAE,cAAc,CAAC,uBAAuB;gBAC5C,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE;oBACN,QAAQ,EAAE,OAAO;oBACjB,MAAM,EAAE,gCAAgC;iBACzC;aACF,CAAC;YACF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAElC,+BAA+B;YAC/B,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAAC;QAC9D,CAAC;QAED,oCAAoC;QACpC,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,yBAAyB,EAAE,CAAC;YAC9D,IAAI,IAAI,CAAC,mBAAmB,KAAK,OAAO,EAAE,CAAC;gBACzC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,0BAA0B,EAAE;oBACnD,IAAI,EAAE,cAAc,CAAC,0BAA0B;oBAC/C,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,mBAAmB,KAAK,MAAM,EAAE,CAAC;gBAC/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,0BAA0B,EAAE;oBACnD,IAAI,EAAE,cAAc,CAAC,0BAA0B;oBAC/C,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,WAAW;gBACX,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,0BAA0B,EAAE;oBACnD,IAAI,EAAE,cAAc,CAAC,0BAA0B;oBAC/C,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,SAAS,EAAE,KAAK;oBAChB,wBAAwB,EAAE,IAAI;iBAC/B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,uEAAuE;QACvE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH;;OAEG;IACH,SAAS,GAAG,EAAE,CAAC,EAAE,CACf,CAAoB,IAAe,EAAE,QAA8B,EAAE,EAAE;QACrE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,GAAG,CAAC,QAAsC,CAAC,CAAC;IAC5E,CAAC,CACF,CAAC;IAEF;;OAEG;IACH,WAAW,GAAG,EAAE,CAAC,EAAE,CACjB,CAAoB,IAAe,EAAE,QAA8B,EAAE,EAAE;QACrE,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,MAAM,CAAC,QAAsC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CACF,CAAC;IAEF;;OAEG;IACK,IAAI,CAAC,IAAoB,EAAE,OAAgB;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED;;OAEG;IACH,mBAAmB,CACjB,aAAqB,EACrB,OAAgB,EAChB,MAAgC,EAChC,KAAa;QAEb,MAAM,QAAQ,GAA0B;YACtC,IAAI,EAAE,cAAc,CAAC,uBAAuB;YAC5C,aAAa;YACb,OAAO;YACP,MAAM;YACN,KAAK;SACN,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzD,CAAC;IAED;;OAEG;IACH,uBAAuB,CAAC,SAAiB;QACvC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;IACxE,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,iBAAiB,CACf,SAAiB,EACjB,KAAwC;QAExC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CACpC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS,CACrC,CAAC;QACF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,oCAAoC,SAAS,sBAAsB,CACpE,CAAC;QACJ,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC7C,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC;oBACjC,MAAM,IAAI,KAAK,CACb,uBAAuB,GAAG,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAC1G,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,cAAc,EAA2B,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAsB;IAEtB,OAAO,UAAuC,CAAC;AACjD,CAAC"}

package/dist/src/test-utils/mock-tool.d.ts

@@ -6,6 +6,7 @@
 import type { ModifiableDeclarativeTool, ModifyContext } from '../tools/modifiable-tool.js';
 import type { ToolCallConfirmationDetails, ToolInvocation, ToolResult } from '../tools/tools.js';
 import { BaseDeclarativeTool, BaseToolInvocation } from '../tools/tools.js';
+import type { MessageBus } from '../confirmation-bus/message-bus.js';
 interface MockToolOptions {
     name: string;
     displayName?: string;
@@ -19,6 +20,7 @@ interface MockToolOptions {
         [key: string]: unknown;
     }, signal?: AbortSignal, updateOutput?: (output: string) => void) => Promise<ToolResult>;
     params?: object;
+    messageBus?: MessageBus;
 }
 /**
  * A highly configurable mock tool for testing purposes.
@@ -35,7 +37,7 @@ export declare class MockTool extends BaseDeclarativeTool<{
     constructor(options: MockToolOptions);
     protected createInvocation(params: {
         [key: string]: unknown;
-    }): ToolInvocation<{
+    }, messageBus: MessageBus, _toolName?: string, _toolDisplayName?: string): ToolInvocation<{
         [key: string]: unknown;
     }, ToolResult>;
 }
@@ -48,7 +50,7 @@ export declare const MOCK_TOOL_SHOULD_CONFIRM_EXECUTE: () => Promise<{
 }>;
 export declare class MockModifiableToolInvocation extends BaseToolInvocation<Record<string, unknown>, ToolResult> {
     private readonly tool;
-    constructor(tool: MockModifiableTool, params: Record<string, unknown>);
+    constructor(tool: MockModifiableTool, params: Record<string, unknown>, messageBus: MessageBus);
     execute(_abortSignal: AbortSignal): Promise<ToolResult>;
     shouldConfirmExecute(_abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
     getDescription(): string;
@@ -61,6 +63,6 @@ export declare class MockModifiableTool extends BaseDeclarativeTool<Record<strin
     shouldConfirm: boolean;
     constructor(name?: string);
     getModifyContext(_abortSignal: AbortSignal): ModifyContext<Record<string, unknown>>;
-    protected createInvocation(params: Record<string, unknown>): ToolInvocation<Record<string, unknown>, ToolResult>;
+    protected createInvocation(params: Record<string, unknown>, messageBus: MessageBus, _toolName?: string, _toolDisplayName?: string): ToolInvocation<Record<string, unknown>, ToolResult>;
 }
 export {};

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) {
@@ -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

@@ -22,6 +22,6 @@ export interface ActivateSkillToolParams {
 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>;
+    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

@@ -9,6 +9,7 @@ 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';
+import { ToolErrorType } from './tool-error.js';
 class ActivateSkillToolInvocation extends BaseToolInvocation {
     config;
     cachedFolderStructure;
@@ -22,7 +23,7 @@ class ActivateSkillToolInvocation extends BaseToolInvocation {
         if (skill) {
             return `"${skillName}": ${skill.description}`;
         }
-        return `"${skillName}" (⚠️ unknown skill)`;
+        return `"${skillName}" (?) unknown skill`;
     }
     async getOrFetchFolderStructure(skillLocation) {
         if (this.cachedFolderStructure === undefined) {
@@ -39,6 +40,9 @@ class ActivateSkillToolInvocation extends BaseToolInvocation {
         if (!skill) {
             return false;
         }
+        if (skill.isBuiltin) {
+            return false;
+        }
         const folderStructure = await this.getOrFetchFolderStructure(skill.location);
         const confirmationDetails = {
             type: 'info',
@@ -62,23 +66,34 @@ ${folderStructure}`,
         const skill = skillManager.getSkill(skillName);
         if (!skill) {
             const skills = skillManager.getSkills();
+            const availableSkills = skills.map((s) => s.name).join(', ');
+            const errorMessage = `Skill "${skillName}" not found. Available skills are: ${availableSkills}`;
             return {
-                llmContent: `Error: Skill "${skillName}" not found. Available skills are: ${skills.map((s) => s.name).join(', ')}`,
-                returnDisplay: `Skill "${skillName}" not found.`,
+                llmContent: `Error: ${errorMessage}`,
+                returnDisplay: `Error: ${errorMessage}`,
+                error: {
+                    message: errorMessage,
+                    type: ToolErrorType.INVALID_TOOL_PARAMS,
+                },
             };
         }
         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>
+            llmContent: `<activated_skill name="${skillName}">
+  <instructions>
     ${skill.body}
-  </INSTRUCTIONS>
+  </instructions>
 
-  <AVAILABLE_RESOURCES>
+  <available_resources>
     ${folderStructure}
-  </AVAILABLE_RESOURCES>
-</ACTIVATED_SKILL>`,
+  </available_resources>
+</activated_skill>`,
             returnDisplay: `Skill **${skillName}** activated. Resources loaded from \`${path.dirname(skill.location)}\`:\n\n${folderStructure}`,
         };
     }
@@ -105,7 +120,10 @@ export class ActivateSkillTool extends BaseDeclarativeTool {
                     .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), true, false, messageBus);
+        const availableSkillsHint = skillNames.length > 0
+            ? ` (Available: ${skillNames.map((n) => `'${n}'`).join(', ')})`
+            : '';
+        super(ActivateSkillTool.Name, 'Activate Skill', `Activates a specialized agent skill by name${availableSkillsHint}. 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. ONLY use names exactly as they appear in the \`<available_skills>\` section.`, Kind.Other, zodToJsonSchema(schema), messageBus, true, false);
         this.config = config;
     }
     createInvocation(params, messageBus, _toolName, _toolDisplayName) {

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

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

@@ -5,18 +5,16 @@
  */
 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;
-    const mockMessageBus = {
-        publish: vi.fn(),
-        subscribe: vi.fn(),
-        unsubscribe: vi.fn(),
-    };
+    let mockMessageBus;
     beforeEach(() => {
+        mockMessageBus = createMockMessageBus();
         const skills = [
             {
                 name: 'test-skill',
@@ -25,6 +23,9 @@ describe('ActivateSkillTool', () => {
             },
         ];
         mockConfig = {
+            getWorkspaceContext: vi.fn().mockReturnValue({
+                addDirectory: vi.fn(),
+            }),
             getSkillManager: vi.fn().mockReturnValue({
                 getSkills: vi.fn().mockReturnValue(skills),
                 getAllSkills: vi.fn().mockReturnValue(skills),
@@ -58,19 +59,38 @@ describe('ActivateSkillTool', () => {
         expect(details.prompt).toContain('A test skill');
         expect(details.prompt).toContain('Mock folder structure');
     });
+    it('should skip confirmation for built-in skills', async () => {
+        const builtinSkill = {
+            name: 'builtin-skill',
+            description: 'A built-in skill',
+            location: '/path/to/builtin/SKILL.md',
+            isBuiltin: true,
+            body: 'Built-in instructions',
+        };
+        vi.mocked(mockConfig.getSkillManager().getSkill).mockReturnValue(builtinSkill);
+        vi.mocked(mockConfig.getSkillManager().getSkills).mockReturnValue([
+            builtinSkill,
+        ]);
+        const params = { name: 'builtin-skill' };
+        const toolWithBuiltin = new ActivateSkillTool(mockConfig, mockMessageBus);
+        const invocation = toolWithBuiltin.build(params);
+        const details = await invocation.getConfirmationDetails(new AbortController().signal);
+        expect(details).toBe(false);
+    });
     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(result.llmContent).toContain('<ACTIVATED_SKILL name="test-skill">');
-        expect(result.llmContent).toContain('<INSTRUCTIONS>');
+        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('</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.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');
     });

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

@@ -1 +1 @@
-{"version":3,"file":"activate-skill.test.js","sourceRoot":"","sources":["../../../src/tools/activate-skill.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAIxD,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/C,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,uBAAuB,CAAC;CACvE,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,UAAkB,CAAC;IACvB,IAAI,IAAuB,CAAC;IAC5B,MAAM,cAAc,GAAG;QACrB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;QAChB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;QAClB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;KACI,CAAC;IAE3B,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,MAAM,GAAG;YACb;gBACE,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,cAAc;gBAC3B,QAAQ,EAAE,8BAA8B;aACzC;SACF,CAAC;QACF,UAAU,GAAG;YACX,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;gBACvC,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC;gBAC1C,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC;gBAC7C,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,IAAY,EAAE,EAAE;oBACpD,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;wBAC1B,OAAO;4BACL,IAAI,EAAE,YAAY;4BAClB,WAAW,EAAE,cAAc;4BAC3B,QAAQ,EAAE,8BAA8B;4BACxC,IAAI,EAAE,6BAA6B;yBACpC,CAAC;oBACJ,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC;gBACF,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;aACvB,CAAC;SACkB,CAAC;QACvB,IAAI,GAAG,IAAI,iBAAiB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,MACd,UAMD,CAAC,sBAAsB,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;QAEvD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACzD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAC;QACvE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;QAEtE,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACrE,YAAY,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,qCAAqC,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;QAC7D,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;QAC7D,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;QACxC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAA0B,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;QAEtE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,sCAAsC,CAAC,CAAC;QAC5E,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,GAAG,EAAE,CACV,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,EAAiC,CAAC,CACxD,CAAC,OAAO,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"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.js

@@ -6,7 +6,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { EditTool } from './edit.js';
-import { SmartEditTool } from './smart-edit.js';
 import { WriteFileTool } from './write-file.js';
 import { WebFetchTool } from './web-fetch.js';
 import { ToolConfirmationOutcome } from './tools.js';
@@ -17,8 +16,8 @@ import fs from 'node:fs';
 import os from 'node:os';
 // Mock telemetry loggers to avoid failures
 vi.mock('../telemetry/loggers.js', () => ({
-    logSmartEditStrategy: vi.fn(),
-    logSmartEditCorrectionEvent: vi.fn(),
+    logEditStrategy: vi.fn(),
+    logEditCorrectionEvent: vi.fn(),
     logFileOperation: vi.fn(),
 }));
 describe('Tool Confirmation Policy Updates', () => {
@@ -70,15 +69,6 @@ describe('Tool Confirmation Policy Updates', () => {
         {
             name: 'EditTool',
             create: (config, bus) => new EditTool(config, bus),
-            params: {
-                file_path: 'test.txt',
-                old_string: 'existing',
-                new_string: 'new',
-            },
-        },
-        {
-            name: 'SmartEditTool',
-            create: (config, bus) => new SmartEditTool(config, bus),
             params: {
                 file_path: 'test.txt',
                 instruction: 'change content',

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

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