@machina.ai/cell-cli-core 1.22.5-rc1 → 1.25.0-rc1

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

@@ -0,0 +1,113 @@
+/**
+ * @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 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(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.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', () => {
@@ -53,6 +52,7 @@ describe('Tool Confirmation Policy Updates', () => {
             getFileFilteringOptions: () => ({}),
             getGeminiClient: () => ({}),
             getBaseLlmClient: () => ({}),
+            getDisableLLMCorrection: () => false,
             getIdeMode: () => false,
             getWorkspaceContext: () => ({
                 isPathWithinWorkspace: () => true,
@@ -70,15 +70,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 {};