@google/gemini-cli-core 0.24.0-nightly.20251227.37be16243 → 0.24.0-nightly.20260103.30f5c4af4

package/dist/src/agents/toml-loader.test.js

@@ -33,7 +33,8 @@ describe('toml-loader', () => {
         system_prompt = "You are a test agent."
       `);
             const result = await parseAgentToml(filePath);
-            expect(result).toEqual({
+            expect(result).toHaveLength(1);
+            expect(result[0]).toMatchObject({
                 name: 'test-agent',
                 description: 'A test agent',
                 prompts: {
@@ -41,6 +42,99 @@ describe('toml-loader', () => {
                 },
             });
         });
+        it('should parse a valid remote agent TOML file', async () => {
+            const filePath = await writeAgentToml(`
+        kind = "remote"
+        name = "remote-agent"
+        description = "A remote agent"
+        agent_card_url = "https://example.com/card"
+      `);
+            const result = await parseAgentToml(filePath);
+            expect(result).toHaveLength(1);
+            expect(result[0]).toEqual({
+                kind: 'remote',
+                name: 'remote-agent',
+                description: 'A remote agent',
+                agent_card_url: 'https://example.com/card',
+            });
+        });
+        it('should infer remote agent kind from agent_card_url', async () => {
+            const filePath = await writeAgentToml(`
+        name = "inferred-remote"
+        description = "Inferred"
+        agent_card_url = "https://example.com/inferred"
+      `);
+            const result = await parseAgentToml(filePath);
+            expect(result).toHaveLength(1);
+            expect(result[0]).toEqual({
+                kind: 'remote',
+                name: 'inferred-remote',
+                description: 'Inferred',
+                agent_card_url: 'https://example.com/inferred',
+            });
+        });
+        it('should parse a remote agent without description', async () => {
+            const filePath = await writeAgentToml(`
+        kind = "remote"
+        name = "no-description-remote"
+        agent_card_url = "https://example.com/card"
+      `);
+            const result = await parseAgentToml(filePath);
+            expect(result).toHaveLength(1);
+            expect(result[0]).toEqual({
+                kind: 'remote',
+                name: 'no-description-remote',
+                agent_card_url: 'https://example.com/card',
+            });
+            expect(result[0].description).toBeUndefined();
+            // defined after conversion to AgentDefinition
+            const agentDef = tomlToAgentDefinition(result[0]);
+            expect(agentDef.description).toBe('(Loading description...)');
+        });
+        it('should parse multiple agents in one file', async () => {
+            const filePath = await writeAgentToml(`
+        [[remote_agents]]
+        kind = "remote"
+        name = "agent-1"
+        description = "Remote 1"
+        agent_card_url = "https://example.com/1"
+
+        [[remote_agents]]
+        kind = "remote"
+        name = "agent-2"
+        description = "Remote 2"
+        agent_card_url = "https://example.com/2"
+      `);
+            const result = await parseAgentToml(filePath);
+            expect(result).toHaveLength(2);
+            expect(result[0].name).toBe('agent-1');
+            expect(result[0].kind).toBe('remote');
+            expect(result[1].name).toBe('agent-2');
+            expect(result[1].kind).toBe('remote');
+        });
+        it('should allow omitting kind in remote_agents block', async () => {
+            const filePath = await writeAgentToml(`
+        [[remote_agents]]
+        name = "implicit-remote-1"
+        agent_card_url = "https://example.com/1"
+
+        [[remote_agents]]
+        name = "implicit-remote-2"
+        agent_card_url = "https://example.com/2"
+      `);
+            const result = await parseAgentToml(filePath);
+            expect(result).toHaveLength(2);
+            expect(result[0]).toMatchObject({
+                kind: 'remote',
+                name: 'implicit-remote-1',
+                agent_card_url: 'https://example.com/1',
+            });
+            expect(result[1]).toMatchObject({
+                kind: 'remote',
+                name: 'implicit-remote-2',
+                agent_card_url: 'https://example.com/2',
+            });
+        });
         it('should throw AgentLoadError if file reading fails', async () => {
             const filePath = path.join(tempDir, 'non-existent.toml');
             await expect(parseAgentToml(filePath)).rejects.toThrow(AgentLoadError);
@@ -85,12 +179,35 @@ describe('toml-loader', () => {
         [prompts]
         system_prompt = "You are a test agent."
       `);
-            await expect(parseAgentToml(filePath)).rejects.toThrow(/Validation failed: tools.0: Invalid tool name/);
+            await expect(parseAgentToml(filePath)).rejects.toThrow(/Validation failed:[\s\S]*tools.0: Invalid tool name/);
+        });
+        it('should throw AgentLoadError if file contains both single and multiple agents', async () => {
+            const filePath = await writeAgentToml(`
+            name = "top-level-agent"
+            description = "I should not be here"
+            [prompts]
+            system_prompt = "..."
+
+            [[remote_agents]]
+            kind = "remote"
+            name = "array-agent"
+            description = "I am in an array"
+            agent_card_url = "https://example.com/card"
+          `);
+            await expect(parseAgentToml(filePath)).rejects.toThrow(/Validation failed/);
+        });
+        it('should show both options in error message when validation fails ambiguously', async () => {
+            const filePath = await writeAgentToml(`
+        name = "ambiguous-agent"
+        description = "I have neither prompts nor card"
+      `);
+            await expect(parseAgentToml(filePath)).rejects.toThrow(/Validation failed: Agent Definition:\n\(Local Agent\) prompts: Required\n\(Remote Agent\) agent_card_url: Required/);
         });
     });
     describe('tomlToAgentDefinition', () => {
         it('should convert valid TOML to AgentDefinition with defaults', () => {
             const toml = {
+                kind: 'local',
                 name: 'test-agent',
                 description: 'A test agent',
                 prompts: {
@@ -123,6 +240,7 @@ describe('toml-loader', () => {
         });
         it('should pass through model aliases', () => {
             const toml = {
+                kind: 'local',
                 name: 'test-agent',
                 description: 'A test agent',
                 model: {
@@ -137,6 +255,7 @@ describe('toml-loader', () => {
         });
         it('should pass through unknown model names (e.g. auto)', () => {
             const toml = {
+                kind: 'local',
                 name: 'test-agent',
                 description: 'A test agent',
                 model: {

package/dist/src/agents/toml-loader.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"toml-loader.test.js","sourceRoot":"","sources":["../../../src/agents/toml-loader.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,uBAAuB,EACvB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,OAAe,CAAC;IAEpB,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,QAAQ,GAAG,WAAW;QACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;YAClD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;;;;;OAKrC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACrB,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,cAAc;gBAC3B,OAAO,EAAE;oBACP,aAAa,EAAE,uBAAuB;iBACvC;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;YACzD,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACjE,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,gBAAgB,CAAC,CAAC;YACxD,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;YACxF,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;;;;;OAKrC,CAAC,CAAC;YACH,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpD,mBAAmB,CACpB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACjE,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;;;;;OAKrC,CAAC,CAAC;YACH,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpD,2BAA2B,CAC5B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;YACrF,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;;;;;;OAMrC,CAAC,CAAC;YAEH,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpD,+CAA+C,CAChD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;YAC3E,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;;;;;;OAMrC,CAAC,CAAC;YACH,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpD,+CAA+C,CAChD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,MAAM,IAAI,GAAG;gBACX,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,cAAc;gBAC3B,OAAO,EAAE;oBACP,aAAa,EAAE,uBAAuB;iBACvC;aACF,CAAC;YAEF,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;gBAC3B,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,cAAc;gBAC3B,YAAY,EAAE;oBACZ,YAAY,EAAE,uBAAuB;iBACtC;gBACD,WAAW,EAAE;oBACX,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,IAAI;iBACZ;gBACD,SAAS,EAAE;oBACT,gBAAgB,EAAE,CAAC;iBACpB;gBACD,WAAW,EAAE;oBACX,MAAM,EAAE;wBACN,KAAK,EAAE;4BACL,IAAI,EAAE,QAAQ;4BACd,QAAQ,EAAE,KAAK;yBAChB;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC3C,MAAM,IAAI,GAAG;gBACX,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,cAAc;gBAC3B,KAAK,EAAE;oBACL,KAAK,EAAE,sBAAsB;iBAC9B;gBACD,OAAO,EAAE;oBACP,aAAa,EAAE,uBAAuB;iBACvC;aACF,CAAC;YAEF,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAyB,CAAC;YACnE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC7D,MAAM,IAAI,GAAG;gBACX,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,cAAc;gBAC3B,KAAK,EAAE;oBACL,KAAK,EAAE,MAAM;iBACd;gBACD,OAAO,EAAE;oBACP,aAAa,EAAE,uBAAuB;iBACvC;aACF,CAAC;YAEF,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAyB,CAAC;YACnE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;YACxD,MAAM,cAAc,CAClB;;;;;OAKD,EACC,YAAY,CACb,CAAC;YAEF,yBAAyB;YACzB,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,SAAS,CAAC,CAAC;YAE/D,uBAAuB;YACvB,MAAM,cAAc,CAClB;;;;;OAKD,EACC,cAAc,CACf,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACtC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,cAAc,CAAC,CAAC;YAC7D,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACtC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACpE,+BAA+B;YAC/B,MAAM,cAAc,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;YAEzD,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACtC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"toml-loader.test.js","sourceRoot":"","sources":["../../../src/agents/toml-loader.test.ts"],"names":[],"mappings":"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"}

package/dist/src/config/config.d.ts

@@ -39,6 +39,7 @@ import type { UserTierId } from '../code_assist/types.js';
 import type { RetrieveUserQuotaResponse } from '../code_assist/types.js';
 import type { Experiments } from '../code_assist/experiments/experiments.js';
 import { AgentRegistry } from '../agents/registry.js';
+import { SkillManager } from '../services/skillManager.js';
 import { ApprovalMode } from '../policy/types.js';
 export interface AccessibilitySettings {
     disableLoadingPhrases?: boolean;
@@ -70,6 +71,18 @@ export interface CodebaseInvestigatorSettings {
     thinkingBudget?: number;
     model?: string;
 }
+export interface ExtensionSetting {
+    name: string;
+    description: string;
+    envVar: string;
+    sensitive?: boolean;
+}
+export interface ResolvedExtensionSetting {
+    name: string;
+    envVar: string;
+    value: string;
+    sensitive: boolean;
+}
 export interface IntrospectionAgentSettings {
     enabled?: boolean;
 }
@@ -92,6 +105,8 @@ export interface GeminiCLIExtension {
     hooks?: {
         [K in HookEventName]?: HookDefinition[];
     };
+    settings?: ExtensionSetting[];
+    resolvedSettings?: ResolvedExtensionSetting[];
 }
 export interface ExtensionInstallMetadata {
     source: string;
@@ -210,11 +225,9 @@ export interface ConfigParameters {
     truncateToolOutputLines?: number;
     enableToolOutputTruncation?: boolean;
     eventEmitter?: EventEmitter;
-    useSmartEdit?: boolean;
     useWriteTodos?: boolean;
     policyEngineConfig?: PolicyEngineConfig;
     output?: OutputSettings;
-    enableMessageBusIntegration?: boolean;
     disableModelRouterForAuth?: AuthType[];
     codebaseInvestigatorSettings?: CodebaseInvestigatorSettings;
     introspectionAgentSettings?: IntrospectionAgentSettings;
@@ -241,6 +254,8 @@ export interface ConfigParameters {
     };
     previewFeatures?: boolean;
     enableAgents?: boolean;
+    skillsSupport?: boolean;
+    disabledSkills?: string[];
     experimentalJitContext?: boolean;
     onModelChange?: (model: string) => void;
 }
@@ -255,6 +270,7 @@ export declare class Config {
     private promptRegistry;
     private resourceRegistry;
     private agentRegistry;
+    private skillManager;
     private sessionId;
     private fileSystemService;
     private contentGeneratorConfig;
@@ -329,12 +345,10 @@ export declare class Config {
     readonly storage: Storage;
     private readonly fileExclusions;
     private readonly eventEmitter?;
-    private readonly useSmartEdit;
     private readonly useWriteTodos;
     private readonly messageBus;
     private readonly policyEngine;
     private readonly outputSettings;
-    private readonly enableMessageBusIntegration;
     private readonly codebaseInvestigatorSettings;
     private readonly introspectionAgentSettings;
     private readonly continueOnFailedApiCall;
@@ -354,6 +368,8 @@ export declare class Config {
     private hookSystem?;
     private readonly onModelChange;
     private readonly enableAgents;
+    private readonly skillsSupport;
+    private readonly disabledSkills;
     private readonly experimentalJitContext;
     private contextManager?;
     private terminalBackground;
@@ -380,6 +396,7 @@ export declare class Config {
     getContentGeneratorConfig(): ContentGeneratorConfig;
     getModel(): string;
     setModel(newModel: string, isFallbackModel?: boolean): void;
+    activateFallbackMode(model: string): void;
     getActiveModel(): string;
     setActiveModel(model: string): void;
     setFallbackModelHandler(handler: FallbackModelHandler): void;
@@ -397,6 +414,7 @@ export declare class Config {
     getAgentRegistry(): AgentRegistry;
     getToolRegistry(): ToolRegistry;
     getPromptRegistry(): PromptRegistry;
+    getSkillManager(): SkillManager;
     getResourceRegistry(): ResourceRegistry;
     getDebugMode(): boolean;
     getQuestion(): string | undefined;
@@ -516,6 +534,7 @@ export declare class Config {
     getBannerTextCapacityIssues(): Promise<string>;
     private ensureExperimentsLoaded;
     isInteractiveShellEnabled(): boolean;
+    isSkillsSupportEnabled(): boolean;
     isInteractive(): boolean;
     getUseRipgrep(): boolean;
     getEnableInteractiveShell(): boolean;
@@ -531,14 +550,12 @@ export declare class Config {
     getEnableToolOutputTruncation(): boolean;
     getTruncateToolOutputThreshold(): number;
     getTruncateToolOutputLines(): number;
-    getUseSmartEdit(): boolean;
     getUseWriteTodos(): boolean;
     getOutputFormat(): OutputFormat;
     getGitService(): Promise<GitService>;
     getFileExclusions(): FileExclusions;
     getMessageBus(): MessageBus;
     getPolicyEngine(): PolicyEngine;
-    getEnableMessageBusIntegration(): boolean;
     getEnableHooks(): boolean;
     getCodebaseInvestigatorSettings(): CodebaseInvestigatorSettings;
     getIntrospectionAgentSettings(): IntrospectionAgentSettings;

package/dist/src/config/config.js

@@ -15,7 +15,7 @@ import { ReadFileTool } from '../tools/read-file.js';
 import { GrepTool } from '../tools/grep.js';
 import { canUseRipgrep, RipGrepTool } from '../tools/ripGrep.js';
 import { GlobTool } from '../tools/glob.js';
-import { EditTool } from '../tools/edit.js';
+import { ActivateSkillTool } from '../tools/activate-skill.js';
 import { SmartEditTool } from '../tools/smart-edit.js';
 import { ShellTool } from '../tools/shell.js';
 import { WriteFileTool } from '../tools/write-file.js';
@@ -34,8 +34,8 @@ import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
 import { ideContextStore } from '../ide/ideContext.js';
 import { WriteTodosTool } from '../tools/write-todos.js';
 import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { logRipgrepFallback } from '../telemetry/loggers.js';
-import { RipgrepFallbackEvent } from '../telemetry/types.js';
+import { logRipgrepFallback, logFlashFallback } from '../telemetry/loggers.js';
+import { RipgrepFallbackEvent, FlashFallbackEvent, } from '../telemetry/types.js';
 import { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
 import { ModelRouterService } from '../routing/modelRouterService.js';
 import { OutputFormat } from '../output/types.js';
@@ -56,6 +56,7 @@ import { DELEGATE_TO_AGENT_TOOL_NAME } from '../tools/tool-names.js';
 import { getExperiments } from '../code_assist/experiments/experiments.js';
 import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
 import { debugLogger } from '../utils/debugLogger.js';
+import { SkillManager } from '../services/skillManager.js';
 import { startupProfiler } from '../telemetry/startupProfiler.js';
 import { ApprovalMode } from '../policy/types.js';
 import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, } from './constants.js';
@@ -148,6 +149,7 @@ export class Config {
     promptRegistry;
     resourceRegistry;
     agentRegistry;
+    skillManager;
     sessionId;
     fileSystemService;
     contentGeneratorConfig;
@@ -222,12 +224,10 @@ export class Config {
     storage;
     fileExclusions;
     eventEmitter;
-    useSmartEdit;
     useWriteTodos;
     messageBus;
     policyEngine;
     outputSettings;
-    enableMessageBusIntegration;
     codebaseInvestigatorSettings;
     introspectionAgentSettings;
     continueOnFailedApiCall;
@@ -247,6 +247,8 @@ export class Config {
     hookSystem;
     onModelChange;
     enableAgents;
+    skillsSupport;
+    disabledSkills;
     experimentalJitContext;
     contextManager;
     terminalBackground = undefined;
@@ -307,9 +309,11 @@ export class Config {
         this.model = params.model;
         this._activeModel = params.model;
         this.enableAgents = params.enableAgents ?? false;
-        this.experimentalJitContext = params.experimentalJitContext ?? false;
+        this.skillsSupport = params.skillsSupport ?? false;
+        this.disabledSkills = params.disabledSkills ?? [];
         this.modelAvailabilityService = new ModelAvailabilityService();
         this.previewFeatures = params.previewFeatures ?? undefined;
+        this.experimentalJitContext = params.experimentalJitContext ?? false;
         this.maxSessionTurns = params.maxSessionTurns ?? -1;
         this.experimentalZedIntegration =
             params.experimentalZedIntegration ?? false;
@@ -347,7 +351,6 @@ export class Config {
         this.truncateToolOutputLines =
             params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
         this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
-        this.useSmartEdit = params.useSmartEdit ?? true;
         // // TODO(joshualitt): Re-evaluate the todo tool for 3 family.
         this.useWriteTodos = isPreviewModel(this.model)
             ? false
@@ -357,14 +360,6 @@ export class Config {
             (params.hooks && 'disabled' in params.hooks
                 ? params.hooks.disabled
                 : undefined) ?? [];
-        // Enable MessageBus integration if:
-        // 1. Explicitly enabled via setting, OR
-        // 2. Hooks are enabled and hooks are configured
-        const hasHooks = params.hooks && Object.keys(params.hooks).length > 0;
-        const hooksNeedMessageBus = this.enableHooks && hasHooks;
-        this.enableMessageBusIntegration =
-            params.enableMessageBusIntegration ??
-                (hooksNeedMessageBus ? true : false);
         this.codebaseInvestigatorSettings = {
             enabled: params.codebaseInvestigatorSettings?.enabled ?? true,
             maxNumTurns: params.codebaseInvestigatorSettings?.maxNumTurns ?? 10,
@@ -394,6 +389,7 @@ export class Config {
             approvalMode: params.approvalMode ?? params.policyEngineConfig?.approvalMode,
         });
         this.messageBus = new MessageBus(this.policyEngine, this.debugMode);
+        this.skillManager = new SkillManager();
         this.outputSettings = {
             format: params.output?.format ?? OutputFormat.TEXT,
         };
@@ -472,6 +468,15 @@ export class Config {
             await this.getExtensionLoader().start(this),
         ]);
         initMcpHandle?.end();
+        // Discover skills if enabled
+        if (this.skillsSupport) {
+            await this.getSkillManager().discoverSkills(this.storage);
+            this.getSkillManager().setDisabledSkills(this.disabledSkills);
+            // Re-register ActivateSkillTool to update its schema with the discovered enabled skill enums
+            if (this.getSkillManager().getSkills().length > 0) {
+                this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+            }
+        }
         // Initialize hook system if enabled
         if (this.enableHooks) {
             this.hookSystem = new HookSystem(this);
@@ -605,6 +610,13 @@ export class Config {
         }
         this.modelAvailabilityService.reset();
     }
+    activateFallbackMode(model) {
+        this.setModel(model, true);
+        const authType = this.getContentGeneratorConfig()?.authType;
+        if (authType) {
+            logFlashFallback(this, new FlashFallbackEvent(authType));
+        }
+    }
     getActiveModel() {
         return this._activeModel ?? this.model;
     }
@@ -663,6 +675,9 @@ export class Config {
     getPromptRegistry() {
         return this.promptRegistry;
     }
+    getSkillManager() {
+        return this.skillManager;
+    }
     getResourceRegistry() {
         return this.resourceRegistry;
     }
@@ -1067,6 +1082,9 @@ export class Config {
             this.ptyInfo !== 'child_process' &&
             this.enableInteractiveShell);
     }
+    isSkillsSupportEnabled() {
+        return this.skillsSupport;
+    }
     isInteractive() {
         return this.interactive;
     }
@@ -1122,9 +1140,6 @@ export class Config {
     getTruncateToolOutputLines() {
         return this.truncateToolOutputLines;
     }
-    getUseSmartEdit() {
-        return this.useSmartEdit;
-    }
     getUseWriteTodos() {
         return this.useWriteTodos;
     }
@@ -1149,9 +1164,6 @@ export class Config {
     getPolicyEngine() {
         return this.policyEngine;
     }
-    getEnableMessageBusIntegration() {
-        return this.enableMessageBusIntegration;
-    }
     getEnableHooks() {
         return this.enableHooks;
     }
@@ -1164,9 +1176,7 @@ export class Config {
     async createToolRegistry() {
         const registry = new ToolRegistry(this);
         // Set message bus on tool registry before discovery so MCP tools can access it
-        if (this.getEnableMessageBusIntegration()) {
-            registry.setMessageBus(this.messageBus);
-        }
+        registry.setMessageBus(this.messageBus);
         // helper to create & register core tools that are enabled
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const registerCoreTool = (ToolClass, ...args) => {
@@ -1186,10 +1196,7 @@ export class Config {
                 // Pass message bus to tools when feature flag is enabled
                 // This first implementation is only focused on the general case of
                 // the tool registry.
-                const messageBusEnabled = this.getEnableMessageBusIntegration();
-                const toolArgs = messageBusEnabled
-                    ? [...args, this.getMessageBus()]
-                    : args;
+                const toolArgs = [...args, this.getMessageBus()];
                 registry.registerTool(new ToolClass(...toolArgs));
             }
         };
@@ -1216,12 +1223,8 @@ export class Config {
             registerCoreTool(GrepTool, this);
         }
         registerCoreTool(GlobTool, this);
-        if (this.getUseSmartEdit()) {
-            registerCoreTool(SmartEditTool, this);
-        }
-        else {
-            registerCoreTool(EditTool, this);
-        }
+        registerCoreTool(ActivateSkillTool, this);
+        registerCoreTool(SmartEditTool, this);
         registerCoreTool(WriteFileTool, this);
         registerCoreTool(WebFetchTool, this);
         registerCoreTool(ShellTool, this);
@@ -1238,8 +1241,7 @@ export class Config {
             const allowedTools = this.getAllowedTools();
             const isAllowed = !allowedTools || allowedTools.includes(DELEGATE_TO_AGENT_TOOL_NAME);
             if (isAllowed) {
-                const messageBusEnabled = this.getEnableMessageBusIntegration();
-                const delegateTool = new DelegateToAgentTool(this.agentRegistry, this, messageBusEnabled ? this.getMessageBus() : undefined);
+                const delegateTool = new DelegateToAgentTool(this.agentRegistry, this, this.getMessageBus());
                 registry.registerTool(delegateTool);
             }
         }