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

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

@@ -0,0 +1,75 @@
+/**
+ * @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';
+import { debugLogger } from '../utils/debugLogger.js';
+describe('skillLoader', () => {
+    let testRootDir;
+    beforeEach(async () => {
+        testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'skill-loader-test-'));
+        vi.spyOn(coreEvents, 'emitFeedback');
+        vi.spyOn(debugLogger, 'debug').mockImplementation(() => { });
+    });
+    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(debugLogger.debug).toHaveBeenCalledWith(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(debugLogger.debug).toHaveBeenCalledWith(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,32 @@ 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>;
-    private addSkillsWithPrecedence;
+    discoverSkills(storage: Storage, extensions?: GeminiCLIExtension[]): Promise<void>;
     /**
-     * Discovered skills in the provided paths and adds them to the manager.
-     * Internal helper for tiered discovery.
+     * Discovers built-in skills.
      */
-    discoverSkillsInternal(paths: string[]): Promise<SkillMetadata[]>;
+    private discoverBuiltinSkills;
+    private addSkillsWithPrecedence;
     /**
      * Returns the list of enabled discovered skills.
      */
-    getSkills(): SkillMetadata[];
+    getSkills(): SkillDefinition[];
+    /**
+     * Returns the list of enabled discovered skills that should be displayed in the UI.
+     * This excludes built-in skills.
+     */
+    getDisplayableSkills(): 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 +48,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 +57,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,108 @@
+/**
+ * @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. 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);
+            }
+        }
+        // 3. User skills
+        const userSkills = await loadSkillsFromDir(Storage.getUserSkillsDir());
+        this.addSkillsWithPrecedence(userSkills);
+        // 4. Project skills (highest precedence)
+        const projectSkills = await loadSkillsFromDir(storage.getProjectSkillsDir());
+        this.addSkillsWithPrecedence(projectSkills);
+    }
+    /**
+     * Discovers built-in skills.
+     */
+    async discoverBuiltinSkills() {
+        // Built-in skills can be added here.
+        // For now, this is a placeholder for where built-in skills will be loaded from.
+        // They could be loaded from a specific directory within the package.
+    }
+    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 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.
+     */
+    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) {
+        const lowercaseDisabledNames = disabledNames.map((n) => n.toLowerCase());
+        for (const skill of this.skills) {
+            skill.disabled = lowercaseDisabledNames.includes(skill.name.toLowerCase());
+        }
+    }
+    /**
+     * Reads the full content (metadata + body) of a skill by name.
+     */
+    getSkill(name) {
+        const lowercaseName = name.toLowerCase();
+        return (this.skills.find((s) => s.name.toLowerCase() === lowercaseName) ?? 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":"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"}

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

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

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

@@ -0,0 +1,164 @@
+/**
+ * @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 {} from '../config/config.js';
+describe('SkillManager', () => {
+    let testRootDir;
+    beforeEach(async () => {
+        testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'skill-manager-test-'));
+    });
+    afterEach(async () => {
+        await fs.rm(testRootDir, { recursive: true, force: true });
+        vi.restoreAllMocks();
+    });
+    it('should discover skills from extensions, user, and project with precedence', async () => {
+        const userDir = path.join(testRootDir, 'user');
+        const projectDir = path.join(testRootDir, 'project');
+        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'), `---
+name: skill-user
+description: user-desc
+---
+`);
+        await fs.writeFile(path.join(projectDir, 'skill-b', 'SKILL.md'), `---
+name: skill-project
+description: project-desc
+---
+`);
+        const mockExtension = {
+            name: 'test-ext',
+            version: '1.0.0',
+            isActive: true,
+            path: '/ext',
+            contextFiles: [],
+            id: 'ext-id',
+            skills: [
+                {
+                    name: 'skill-extension',
+                    description: 'ext-desc',
+                    location: '/ext/skills/SKILL.md',
+                    body: 'body',
+                },
+            ],
+        };
+        vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue(userDir);
+        const storage = new Storage('/dummy');
+        vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(projectDir);
+        const service = new SkillManager();
+        await service.discoverSkills(storage, [mockExtension]);
+        const skills = service.getSkills();
+        expect(skills).toHaveLength(3);
+        const names = skills.map((s) => s.name);
+        expect(names).toContain('skill-extension');
+        expect(names).toContain('skill-user');
+        expect(names).toContain('skill-project');
+    });
+    it('should respect precedence: Project > User > Extension', async () => {
+        const userDir = path.join(testRootDir, 'user');
+        const projectDir = path.join(testRootDir, 'project');
+        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'), `---
+name: same-name
+description: user-desc
+---
+`);
+        await fs.writeFile(path.join(projectDir, 'skill', 'SKILL.md'), `---
+name: same-name
+description: project-desc
+---
+`);
+        const mockExtension = {
+            name: 'test-ext',
+            version: '1.0.0',
+            isActive: true,
+            path: '/ext',
+            contextFiles: [],
+            id: 'ext-id',
+            skills: [
+                {
+                    name: 'same-name',
+                    description: 'ext-desc',
+                    location: '/ext/skills/SKILL.md',
+                    body: 'body',
+                },
+            ],
+        };
+        vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue(userDir);
+        const storage = new Storage('/dummy');
+        vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(projectDir);
+        const service = new SkillManager();
+        await service.discoverSkills(storage, [mockExtension]);
+        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]);
+        expect(service.getSkills()[0].description).toBe('user-desc');
+    });
+    it('should filter disabled skills in getSkills but not in getAllSkills', async () => {
+        const skillDir = path.join(testRootDir, 'skill1');
+        await fs.mkdir(skillDir, { recursive: true });
+        await fs.writeFile(path.join(skillDir, 'SKILL.md'), `---
+name: skill1
+description: desc1
+---
+`);
+        const storage = new Storage('/dummy');
+        vi.spyOn(storage, 'getProjectSkillsDir').mockReturnValue(testRootDir);
+        vi.spyOn(Storage, 'getUserSkillsDir').mockReturnValue('/non-existent');
+        const service = new SkillManager();
+        await service.discoverSkills(storage);
+        service.setDisabledSkills(['skill1']);
+        expect(service.getSkills()).toHaveLength(0);
+        expect(service.getAllSkills()).toHaveLength(1);
+        expect(service.getAllSkills()[0].disabled).toBe(true);
+    });
+    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');
+    });
+});
+//# sourceMappingURL=skillManager.test.js.map

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

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

package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import type { StartSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiResponseEvent, ApiErrorEvent, LoopDetectedEvent, NextSpeakerCheckEvent, SlashCommandEvent, MalformedJsonResponseEvent, IdeConnectionEvent, ConversationFinishedEvent, ChatCompressionEvent, FileOperationEvent, InvalidChunkEvent, ContentRetryEvent, ContentRetryFailureEvent, ExtensionInstallEvent, ToolOutputTruncatedEvent, ExtensionUninstallEvent, ModelRoutingEvent, ExtensionEnableEvent, ModelSlashCommandEvent, ExtensionDisableEvent, SmartEditStrategyEvent, SmartEditCorrectionEvent, AgentStartEvent, AgentFinishEvent, RecoveryAttemptEvent, WebFetchFallbackAttemptEvent, ExtensionUpdateEvent, LlmLoopCheckEvent, HookCallEvent } from '../types.js';
+import type { StartSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiResponseEvent, ApiErrorEvent, LoopDetectedEvent, NextSpeakerCheckEvent, SlashCommandEvent, MalformedJsonResponseEvent, IdeConnectionEvent, ConversationFinishedEvent, ChatCompressionEvent, FileOperationEvent, InvalidChunkEvent, ContentRetryEvent, ContentRetryFailureEvent, ExtensionInstallEvent, ToolOutputTruncatedEvent, ExtensionUninstallEvent, ModelRoutingEvent, ExtensionEnableEvent, ModelSlashCommandEvent, ExtensionDisableEvent, EditStrategyEvent, EditCorrectionEvent, AgentStartEvent, AgentFinishEvent, RecoveryAttemptEvent, WebFetchFallbackAttemptEvent, ExtensionUpdateEvent, LlmLoopCheckEvent, HookCallEvent } from '../types.js';
 import { EventMetadataKey } from './event-metadata-key.js';
 import type { Config } from '../../config/config.js';
 export declare enum EventNames {
@@ -38,8 +38,8 @@ export declare enum EventNames {
     TOOL_OUTPUT_TRUNCATED = "tool_output_truncated",
     MODEL_ROUTING = "model_routing",
     MODEL_SLASH_COMMAND = "model_slash_command",
-    SMART_EDIT_STRATEGY = "smart_edit_strategy",
-    SMART_EDIT_CORRECTION = "smart_edit_correction",
+    EDIT_STRATEGY = "edit_strategy",
+    EDIT_CORRECTION = "edit_correction",
     AGENT_START = "agent_start",
     AGENT_FINISH = "agent_finish",
     RECOVERY_ATTEMPT = "recovery_attempt",
@@ -53,6 +53,9 @@ export interface LogResponse {
 export interface LogEventEntry {
     event_time_ms: number;
     source_extension_json: string;
+    exp?: {
+        gws_experiment: number[];
+    };
 }
 export interface EventValue {
     gemini_cli_key: EventMetadataKey;
@@ -101,7 +104,7 @@ export declare class ClearcutLogger {
     static getInstance(config?: Config): ClearcutLogger | undefined;
     /** For testing purposes only. */
     static clearInstance(): void;
-    enqueueHelper(event: LogEvent): void;
+    enqueueHelper(event: LogEvent, experimentIds?: number[]): void;
     enqueueLogEvent(event: LogEvent): void;
     enqueueLogEventAfterExperimentsLoadAsync(event: LogEvent): Promise<void>;
     createBasicLogEvent(eventName: EventNames, data?: EventValue[]): LogEvent;
@@ -137,8 +140,8 @@ export declare class ClearcutLogger {
     logExtensionEnableEvent(event: ExtensionEnableEvent): Promise<void>;
     logModelSlashCommandEvent(event: ModelSlashCommandEvent): void;
     logExtensionDisableEvent(event: ExtensionDisableEvent): Promise<void>;
-    logSmartEditStrategyEvent(event: SmartEditStrategyEvent): void;
-    logSmartEditCorrectionEvent(event: SmartEditCorrectionEvent): void;
+    logEditStrategyEvent(event: EditStrategyEvent): void;
+    logEditCorrectionEvent(event: EditCorrectionEvent): void;
     logAgentStartEvent(event: AgentStartEvent): void;
     logAgentFinishEvent(event: AgentFinishEvent): void;
     logRecoveryAttemptEvent(event: RecoveryAttemptEvent): void;

package/dist/src/telemetry/clearcut-logger/clearcut-logger.js

@@ -45,8 +45,8 @@ export var EventNames;
     EventNames["TOOL_OUTPUT_TRUNCATED"] = "tool_output_truncated";
     EventNames["MODEL_ROUTING"] = "model_routing";
     EventNames["MODEL_SLASH_COMMAND"] = "model_slash_command";
-    EventNames["SMART_EDIT_STRATEGY"] = "smart_edit_strategy";
-    EventNames["SMART_EDIT_CORRECTION"] = "smart_edit_correction";
+    EventNames["EDIT_STRATEGY"] = "edit_strategy";
+    EventNames["EDIT_CORRECTION"] = "edit_correction";
     EventNames["AGENT_START"] = "agent_start";
     EventNames["AGENT_FINISH"] = "agent_finish";
     EventNames["RECOVERY_ATTEMPT"] = "recovery_attempt";
@@ -164,18 +164,22 @@ export class ClearcutLogger {
         // @ts-expect-error - ClearcutLogger is a singleton, but we need to clear it for tests.
         ClearcutLogger.instance = undefined;
     }
-    enqueueHelper(event) {
+    enqueueHelper(event, experimentIds) {
         // Manually handle overflow for FixedDeque, which throws when full.
         const wasAtCapacity = this.events.size >= MAX_EVENTS;
         if (wasAtCapacity) {
             this.events.shift(); // Evict oldest element to make space.
         }
-        this.events.push([
-            {
-                event_time_ms: Date.now(),
-                source_extension_json: safeJsonStringify(event),
-            },
-        ]);
+        const logEventEntry = {
+            event_time_ms: Date.now(),
+            source_extension_json: safeJsonStringify(event),
+        };
+        if (experimentIds !== undefined) {
+            logEventEntry.exp = {
+                gws_experiment: experimentIds,
+            };
+        }
+        this.events.push([logEventEntry]);
         if (wasAtCapacity && this.config?.getDebugMode()) {
             debugLogger.debug(`ClearcutLogger: Dropped old event to prevent memory leak (queue size: ${this.events.size})`);
         }
@@ -203,7 +207,7 @@ export class ClearcutLogger {
                     ];
                     event.event_metadata = [[...event.event_metadata[0], ...exp_id_data]];
                 }
-                this.enqueueHelper(event);
+                this.enqueueHelper(event, experiments?.experimentIds);
             });
         }
         catch (error) {
@@ -988,24 +992,24 @@ export class ClearcutLogger {
             debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
-    logSmartEditStrategyEvent(event) {
+    logEditStrategyEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SMART_EDIT_STRATEGY,
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EDIT_STRATEGY,
                 value: event.strategy,
             },
         ];
-        this.enqueueLogEvent(this.createLogEvent(EventNames.SMART_EDIT_STRATEGY, data));
+        this.enqueueLogEvent(this.createLogEvent(EventNames.EDIT_STRATEGY, data));
         this.flushIfNeeded();
     }
-    logSmartEditCorrectionEvent(event) {
+    logEditCorrectionEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SMART_EDIT_CORRECTION,
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EDIT_CORRECTION,
                 value: event.correction,
             },
         ];
-        this.enqueueLogEvent(this.createLogEvent(EventNames.SMART_EDIT_CORRECTION, data));
+        this.enqueueLogEvent(this.createLogEvent(EventNames.EDIT_CORRECTION, data));
         this.flushIfNeeded();
     }
     logAgentStartEvent(event) {