@google/gemini-cli-core 0.25.0-nightly.20260112.15891721a → 0.25.0-preview.0

package/dist/src/policy/shell-safety.test.js

@@ -3,26 +3,98 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, beforeEach } from 'vitest';
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+// Mock shell-utils to avoid relying on tree-sitter WASM which is flaky in CI on Windows
+vi.mock('../utils/shell-utils.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    // Static map of test commands to their expected subcommands
+    // This mirrors what the real parser would output for these specific strings
+    const commandMap = {
+        'git log': ['git log'],
+        'git log --oneline': ['git log --oneline'],
+        'git logout': ['git logout'],
+        'git log && rm -rf /': ['git log', 'rm -rf /'],
+        'git log; rm -rf /': ['git log', 'rm -rf /'],
+        'git log || rm -rf /': ['git log', 'rm -rf /'],
+        'git log &&& rm -rf /': [], // Simulates parse failure
+        'echo $(rm -rf /)': ['echo $(rm -rf /)', 'rm -rf /'],
+        'echo $(git log)': ['echo $(git log)', 'git log'],
+        'echo `rm -rf /`': ['echo `rm -rf /`', 'rm -rf /'],
+        'diff <(git log) <(rm -rf /)': [
+            'diff <(git log) <(rm -rf /)',
+            'git log',
+            'rm -rf /',
+        ],
+        'tee >(rm -rf /)': ['tee >(rm -rf /)', 'rm -rf /'],
+        'git log | rm -rf /': ['git log', 'rm -rf /'],
+        'git log --format=$(rm -rf /)': [
+            'git log --format=$(rm -rf /)',
+            'rm -rf /',
+        ],
+        'git log && echo $(git log | rm -rf /)': [
+            'git log',
+            'echo $(git log | rm -rf /)',
+            'git log',
+            'rm -rf /',
+        ],
+        'git log && echo $(git log)': ['git log', 'echo $(git log)', 'git log'],
+        'git log > /tmp/test': ['git log > /tmp/test'],
+        'git log @(Get-Process)': [], // Simulates parse failure (Bash parser vs PowerShell syntax)
+        'git commit -m "msg" && git push': ['git commit -m "msg"', 'git push'],
+        'git status && unknown_command': ['git status', 'unknown_command'],
+        'unknown_command_1 && another_unknown_command': [
+            'unknown_command_1',
+            'another_unknown_command',
+        ],
+        'known_ask_command_1 && known_ask_command_2': [
+            'known_ask_command_1',
+            'known_ask_command_2',
+        ],
+    };
+    return {
+        ...actual,
+        initializeShellParsers: vi.fn(),
+        splitCommands: (command) => {
+            if (Object.prototype.hasOwnProperty.call(commandMap, command)) {
+                return commandMap[command];
+            }
+            const known = commandMap[command];
+            if (known)
+                return known;
+            // Default fallback for unmatched simple cases in development, but explicit map is better
+            return [command];
+        },
+        hasRedirection: (command) => 
+        // Simple regex check sufficient for testing the policy engine's handling of the *result* of hasRedirection
+        /[><]/.test(command),
+    };
+});
 import { PolicyEngine } from './policy-engine.js';
 import { PolicyDecision, ApprovalMode } from './types.js';
+import { buildArgsPatterns } from './utils.js';
 describe('Shell Safety Policy', () => {
     let policyEngine;
-    beforeEach(() => {
-        policyEngine = new PolicyEngine({
+    // Helper to create a policy engine with a simple command prefix rule
+    function createPolicyEngineWithPrefix(prefix) {
+        const argsPatterns = buildArgsPatterns(undefined, prefix, undefined);
+        // Since buildArgsPatterns returns array of patterns (strings), we pick the first one
+        // and compile it.
+        const argsPattern = new RegExp(argsPatterns[0]);
+        return new PolicyEngine({
             rules: [
                 {
                     toolName: 'run_shell_command',
-                    // Mimic the regex generated by toml-loader for commandPrefix = ["git log"]
-                    // Regex: "command":"git log(?:[\s"]|$)
-                    argsPattern: /"command":"git log(?:[\s"]|$)/,
+                    argsPattern,
                     decision: PolicyDecision.ALLOW,
-                    priority: 1.01, // Higher priority than default
+                    priority: 1.01,
                 },
             ],
             defaultDecision: PolicyDecision.ASK_USER,
             approvalMode: ApprovalMode.DEFAULT,
         });
+    }
+    beforeEach(() => {
+        policyEngine = createPolicyEngineWithPrefix('git log');
     });
     it('SHOULD match "git log" exactly', async () => {
         const toolCall = {
@@ -61,15 +133,306 @@ describe('Shell Safety Policy', () => {
         const result = await policyEngine.check(toolCall, undefined);
         expect(result.decision).toBe(PolicyDecision.ASK_USER);
     });
+    it('SHOULD NOT allow "git log; rm -rf /" (semicolon separator)', async () => {
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log; rm -rf /' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD NOT allow "git log || rm -rf /" (OR separator)', async () => {
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log || rm -rf /' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
     it('SHOULD NOT allow "git log &&& rm -rf /" when prefix is "git log" (parse failure)', async () => {
         const toolCall = {
             name: 'run_shell_command',
             args: { command: 'git log &&& rm -rf /' },
         };
         // Desired behavior: Should fail safe (ASK_USER or DENY) because parsing failed.
-        // If we let it pass as "single command" that matches prefix, it's dangerous.
         const result = await policyEngine.check(toolCall, undefined);
         expect(result.decision).toBe(PolicyDecision.ASK_USER);
     });
+    it('SHOULD NOT allow command substitution $(rm -rf /)', async () => {
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'echo $(rm -rf /)' },
+        };
+        // `splitCommands` recursively finds nested commands (e.g., `rm` inside `echo $()`).
+        // The policy engine requires ALL extracted commands to be allowed.
+        // Since `rm` does not match the allowed prefix, this should result in ASK_USER.
+        const echoPolicy = createPolicyEngineWithPrefix('echo');
+        const result = await echoPolicy.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD allow command substitution if inner command is ALSO allowed', async () => {
+        // Both `echo` and `git` allowed.
+        const argsPatternsEcho = buildArgsPatterns(undefined, 'echo', undefined);
+        const argsPatternsGit = buildArgsPatterns(undefined, 'git', undefined); // Allow all git
+        const policyEngineWithBoth = new PolicyEngine({
+            rules: [
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsEcho[0]),
+                    decision: PolicyDecision.ALLOW,
+                    priority: 2,
+                },
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsGit[0]),
+                    decision: PolicyDecision.ALLOW,
+                    priority: 2,
+                },
+            ],
+            defaultDecision: PolicyDecision.ASK_USER,
+        });
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'echo $(git log)' },
+        };
+        const result = await policyEngineWithBoth.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ALLOW);
+    });
+    it('SHOULD NOT allow command substitution with backticks `rm -rf /`', async () => {
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'echo `rm -rf /`' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD NOT allow process substitution <(rm -rf /)', async () => {
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'diff <(git log) <(rm -rf /)' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD NOT allow process substitution >(rm -rf /)', async () => {
+        // Note: >(...) is output substitution, but syntax is similar.
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'tee >(rm -rf /)' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD NOT allow piped commands "git log | rm -rf /"', async () => {
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log | rm -rf /' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD NOT allow argument injection via --arg=$(rm -rf /)', async () => {
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log --format=$(rm -rf /)' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD NOT allow complex nested commands "git log && echo $(git log | rm -rf /)"', async () => {
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log && echo $(git log | rm -rf /)' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD allow complex allowed commands "git log && echo $(git log)"', async () => {
+        // Both `echo` and `git` allowed.
+        const argsPatternsEcho = buildArgsPatterns(undefined, 'echo', undefined);
+        const argsPatternsGit = buildArgsPatterns(undefined, 'git', undefined);
+        const policyEngineWithBoth = new PolicyEngine({
+            rules: [
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsEcho[0]),
+                    decision: PolicyDecision.ALLOW,
+                    priority: 2,
+                },
+                {
+                    toolName: 'run_shell_command',
+                    // Matches "git" at start of *subcommand*
+                    argsPattern: new RegExp(argsPatternsGit[0]),
+                    decision: PolicyDecision.ALLOW,
+                    priority: 2,
+                },
+            ],
+            defaultDecision: PolicyDecision.ASK_USER,
+        });
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log && echo $(git log)' },
+        };
+        const result = await policyEngineWithBoth.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ALLOW);
+    });
+    it('SHOULD NOT allow generic redirection > /tmp/test', async () => {
+        // Current logic downgrades ALLOW to ASK_USER for redirections if redirection is not explicitly allowed.
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log > /tmp/test' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD allow generic redirection > /tmp/test if allowRedirection is true', async () => {
+        // If PolicyRule has allowRedirection: true, it should stay ALLOW
+        const argsPatternsGitLog = buildArgsPatterns(undefined, 'git log', undefined);
+        const policyWithRedirection = new PolicyEngine({
+            rules: [
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsGitLog[0]),
+                    decision: PolicyDecision.ALLOW,
+                    priority: 2,
+                    allowRedirection: true,
+                },
+            ],
+            defaultDecision: PolicyDecision.ASK_USER,
+        });
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log > /tmp/test' },
+        };
+        const result = await policyWithRedirection.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ALLOW);
+    });
+    it('SHOULD NOT allow PowerShell @(...) usage if it implies code execution', async () => {
+        // Bash parser fails on PowerShell syntax @(...) (returns empty subcommands).
+        // The policy engine correctly identifies this as unparseable and falls back to ASK_USER.
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git log @(Get-Process)' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+    });
+    it('SHOULD match DENY rule even if nested/chained with unknown command', async () => {
+        // Scenario:
+        // git commit -m "..." (Unknown/No Rule -> ASK_USER)
+        // git push (DENY -> DENY)
+        // Overall should be DENY.
+        const argsPatternsPush = buildArgsPatterns(undefined, 'git push', undefined);
+        const denyPushPolicy = new PolicyEngine({
+            rules: [
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsPush[0]),
+                    decision: PolicyDecision.DENY,
+                    priority: 2,
+                },
+            ],
+            defaultDecision: PolicyDecision.ASK_USER,
+        });
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git commit -m "msg" && git push' },
+        };
+        const result = await denyPushPolicy.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.DENY);
+    });
+    it('SHOULD aggregate ALLOW + ASK_USER to ASK_USER and blame the ASK_USER part', async () => {
+        // Scenario:
+        // `git status` (ALLOW) && `unknown_command` (ASK_USER by default)
+        // Expected: ASK_USER, and the matched rule should be related to the unknown_command
+        const argsPatternsGitStatus = buildArgsPatterns(undefined, 'git status', undefined);
+        const policyEngine = new PolicyEngine({
+            rules: [
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsGitStatus[0]),
+                    decision: PolicyDecision.ALLOW,
+                    priority: 2,
+                    name: 'allow_git_status_rule', // Give a name to easily identify
+                },
+            ],
+            defaultDecision: PolicyDecision.ASK_USER,
+        });
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'git status && unknown_command' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+        // Expect the matched rule to be null/undefined since it's the default decision for 'unknown_command'
+        // or the rule that led to the ASK_USER decision. In this case, it should be the rule for 'unknown_command', which is the default decision.
+        // The policy engine's `matchedRule` will be the rule that caused the final decision.
+        // If it's a default ASK_USER, then `result.rule` should be undefined.
+        expect(result.rule).toBeUndefined();
+    });
+    it('SHOULD aggregate ASK_USER (default) + ASK_USER (rule) to ASK_USER and blame the specific ASK_USER rule', async () => {
+        // Scenario:
+        // `unknown_command_1` (ASK_USER by default) && `another_unknown_command` (ASK_USER by explicit rule)
+        // Expected: ASK_USER, and the matched rule should be the explicit ASK_USER rule
+        const argsPatternsAnotherUnknown = buildArgsPatterns(undefined, 'another_unknown_command', undefined);
+        const policyEngine = new PolicyEngine({
+            rules: [
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsAnotherUnknown[0]),
+                    decision: PolicyDecision.ASK_USER,
+                    priority: 2,
+                    name: 'ask_another_unknown_command_rule',
+                },
+            ],
+            defaultDecision: PolicyDecision.ASK_USER,
+        });
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'unknown_command_1 && another_unknown_command' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+        // The first command triggers default ASK_USER (undefined rule).
+        // The second triggers explicit ASK_USER rule.
+        // We attribute to the first cause => undefined.
+        expect(result.rule).toBeUndefined();
+    });
+    it('SHOULD aggregate ASK_USER (rule) + ASK_USER (rule) to ASK_USER and blame the first specific ASK_USER rule in subcommands', async () => {
+        // Scenario:
+        // `known_ask_command_1` (ASK_USER by explicit rule 1) && `known_ask_command_2` (ASK_USER by explicit rule 2)
+        // Expected: ASK_USER, and the matched rule should be explicit ASK_USER rule 1.
+        // The current implementation prioritizes the rule that changes the decision to ASK_USER, if any.
+        // If multiple rules lead to ASK_USER, it takes the first one.
+        const argsPatternsAsk1 = buildArgsPatterns(undefined, 'known_ask_command_1', undefined);
+        const argsPatternsAsk2 = buildArgsPatterns(undefined, 'known_ask_command_2', undefined);
+        const policyEngine = new PolicyEngine({
+            rules: [
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsAsk1[0]),
+                    decision: PolicyDecision.ASK_USER,
+                    priority: 2,
+                    name: 'ask_rule_1',
+                },
+                {
+                    toolName: 'run_shell_command',
+                    argsPattern: new RegExp(argsPatternsAsk2[0]),
+                    decision: PolicyDecision.ASK_USER,
+                    priority: 2,
+                    name: 'ask_rule_2',
+                },
+            ],
+            defaultDecision: PolicyDecision.ALLOW, // Set default to ALLOW to ensure rules are hit
+        });
+        const toolCall = {
+            name: 'run_shell_command',
+            args: { command: 'known_ask_command_1 && known_ask_command_2' },
+        };
+        const result = await policyEngine.check(toolCall, undefined);
+        expect(result.decision).toBe(PolicyDecision.ASK_USER);
+        // Expect the rule that first caused ASK_USER to be blamed
+        expect(result.rule?.name).toBe('ask_rule_1');
+    });
 });
 //# sourceMappingURL=shell-safety.test.js.map

package/dist/src/policy/shell-safety.test.js.map

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

package/dist/src/policy/types.d.ts

@@ -62,6 +62,10 @@ export interface InProcessCheckerConfig {
  */
 export type SafetyCheckerConfig = ExternalCheckerConfig | InProcessCheckerConfig;
 export interface PolicyRule {
+    /**
+     * A unique name for the policy rule, useful for identification and debugging.
+     */
+    name?: string;
     /**
      * The name of the tool this rule applies to.
      * If undefined, the rule applies to all tools.

package/dist/src/services/modelConfigService.d.ts

@@ -74,7 +74,13 @@ export declare class ModelConfigService {
     private findMatchingOverrides;
     private sortOverrides;
     getResolvedConfig(context: ModelConfigKey): ResolvedModelConfig;
-    private isObject;
-    private deepMerge;
-    private genericDeepMerge;
+    static isObject(item: unknown): item is Record<string, unknown>;
+    /**
+     * Merges an override `ModelConfig` into a base `ModelConfig`.
+     * The override's model name takes precedence if provided.
+     * The `generateContentConfig` properties are deeply merged.
+     */
+    static merge(base: ModelConfig, override: ModelConfig): ModelConfig;
+    static deepMerge(config1: GenerateContentConfig | undefined, config2: GenerateContentConfig | undefined): GenerateContentConfig;
+    private static genericDeepMerge;
 }

package/dist/src/services/modelConfigService.js

@@ -48,9 +48,7 @@ export class ModelConfigService {
             ...customAliases,
             ...this.runtimeAliases,
         };
-        const { aliasChain, baseModel: initialBaseModel, resolvedConfig: initialResolvedConfig, } = this.resolveAliasChain(context.model, allAliases);
-        let baseModel = initialBaseModel;
-        let resolvedConfig = initialResolvedConfig;
+        const { aliasChain, baseModel, resolvedConfig } = this.resolveAliasChain(context.model, allAliases);
         const modelToLevel = this.buildModelLevelMap(aliasChain, baseModel);
         const allOverrides = [
             ...overrides,
@@ -59,19 +57,19 @@ export class ModelConfigService {
         ];
         const matches = this.findMatchingOverrides(allOverrides, context, modelToLevel);
         this.sortOverrides(matches);
+        let currentConfig = {
+            model: baseModel,
+            generateContentConfig: resolvedConfig,
+        };
         for (const match of matches) {
-            if (match.modelConfig.model) {
-                baseModel = match.modelConfig.model;
-            }
-            if (match.modelConfig.generateContentConfig) {
-                resolvedConfig = this.deepMerge(resolvedConfig, match.modelConfig.generateContentConfig);
-            }
+            currentConfig = ModelConfigService.merge(currentConfig, match.modelConfig);
         }
-        return { model: baseModel, generateContentConfig: resolvedConfig };
+        return {
+            model: currentConfig.model,
+            generateContentConfig: currentConfig.generateContentConfig ?? {},
+        };
     }
     resolveAliasChain(requestedModel, allAliases) {
-        let baseModel = undefined;
-        let resolvedConfig = {};
         const aliasChain = [];
         if (allAliases[requestedModel]) {
             let current = requestedModel;
@@ -93,14 +91,16 @@ export class ModelConfigService {
             }
             // Root-to-Leaf chain for merging and level assignment.
             const reversedChain = [...aliasChain].reverse();
+            let resolvedConfig = {};
             for (const aliasName of reversedChain) {
                 const alias = allAliases[aliasName];
-                if (alias.modelConfig.model) {
-                    baseModel = alias.modelConfig.model;
-                }
-                resolvedConfig = this.deepMerge(resolvedConfig, alias.modelConfig.generateContentConfig);
+                resolvedConfig = ModelConfigService.merge(resolvedConfig, alias.modelConfig);
             }
-            return { aliasChain: reversedChain, baseModel, resolvedConfig };
+            return {
+                aliasChain: reversedChain,
+                baseModel: resolvedConfig.model,
+                resolvedConfig: resolvedConfig.generateContentConfig ?? {},
+            };
         }
         return {
             aliasChain: [requestedModel],
@@ -170,13 +170,24 @@ export class ModelConfigService {
             generateContentConfig: resolved.generateContentConfig,
         };
     }
-    isObject(item) {
+    static isObject(item) {
         return !!item && typeof item === 'object' && !Array.isArray(item);
     }
-    deepMerge(config1, config2) {
-        return this.genericDeepMerge(config1, config2);
+    /**
+     * Merges an override `ModelConfig` into a base `ModelConfig`.
+     * The override's model name takes precedence if provided.
+     * The `generateContentConfig` properties are deeply merged.
+     */
+    static merge(base, override) {
+        return {
+            model: override.model ?? base.model,
+            generateContentConfig: ModelConfigService.deepMerge(base.generateContentConfig, override.generateContentConfig),
+        };
+    }
+    static deepMerge(config1, config2) {
+        return ModelConfigService.genericDeepMerge(config1, config2);
     }
-    genericDeepMerge(...objects) {
+    static genericDeepMerge(...objects) {
         return objects.reduce((acc, obj) => {
             if (!obj) {
                 return acc;
@@ -189,8 +200,9 @@ export class ModelConfigService {
                 // override the base array.
                 // TODO(joshualitt): Consider knobs here, i.e. opt-in to deep merging
                 // arrays on a case-by-case basis.
-                if (this.isObject(accValue) && this.isObject(objValue)) {
-                    acc[key] = this.deepMerge(accValue, objValue);
+                if (ModelConfigService.isObject(accValue) &&
+                    ModelConfigService.isObject(objValue)) {
+                    acc[key] = ModelConfigService.genericDeepMerge(accValue, objValue);
                 }
                 else {
                     acc[key] = objValue;

package/dist/src/services/modelConfigService.js.map

@@ -1 +1 @@
-{"version":3,"file":"modelConfigService.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modelConfigService.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAoDH,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAWlC,MAAM,OAAO,kBAAkB;IAKA;IAJZ,cAAc,GAAqC,EAAE,CAAC;IACtD,gBAAgB,GAA0B,EAAE,CAAC;IAE9D,gEAAgE;IAChE,YAA6B,MAAgC;QAAhC,WAAM,GAAN,MAAM,CAA0B;IAAG,CAAC;IAEjE,0BAA0B,CAAC,SAAiB,EAAE,KAAuB;QACnE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;IACzC,CAAC;IAED,4BAA4B,CAAC,QAA6B;QACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACK,yBAAyB,CAAC,OAAuB;QAIvD,MAAM,EACJ,OAAO,GAAG,EAAE,EACZ,aAAa,GAAG,EAAE,EAClB,SAAS,GAAG,EAAE,EACd,eAAe,GAAG,EAAE,GACrB,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG;YACjB,GAAG,OAAO;YACV,GAAG,aAAa;YAChB,GAAG,IAAI,CAAC,cAAc;SACvB,CAAC;QAEF,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,iBAAiB,CACtE,OAAO,CAAC,KAAK,EACb,UAAU,CACX,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACpE,MAAM,YAAY,GAAG;YACnB,GAAG,SAAS;YACZ,GAAG,eAAe;YAClB,GAAG,IAAI,CAAC,gBAAgB;SACzB,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CACxC,YAAY,EACZ,OAAO,EACP,YAAY,CACb,CAAC;QAEF,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAE5B,IAAI,aAAa,GAAgB;YAC/B,KAAK,EAAE,SAAS;YAChB,qBAAqB,EAAE,cAAc;SACtC,CAAC;QAEF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,aAAa,GAAG,kBAAkB,CAAC,KAAK,CACtC,aAAa,EACb,KAAK,CAAC,WAAW,CAClB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,KAAK,EAAE,aAAa,CAAC,KAAK;YAC1B,qBAAqB,EAAE,aAAa,CAAC,qBAAqB,IAAI,EAAE;SACjE,CAAC;IACJ,CAAC;IAEO,iBAAiB,CACvB,cAAsB,EACtB,UAA4C;QAM5C,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YAC/B,IAAI,OAAO,GAAuB,cAAc,CAAC;YACjD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;YAClC,OAAO,OAAO,EAAE,CAAC;gBACf,MAAM,KAAK,GAAqB,UAAU,CAAC,OAAO,CAAC,CAAC;gBACpD,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,cAAc,CAAC,CAAC;gBACnD,CAAC;gBACD,IAAI,OAAO,CAAC,IAAI,IAAI,qBAAqB,EAAE,CAAC;oBAC1C,MAAM,IAAI,KAAK,CACb,qDAAqD,qBAAqB,GAAG,CAC9E,CAAC;gBACJ,CAAC;gBACD,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBACzB,MAAM,IAAI,KAAK,CACb,8BAA8B,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CACnE,CAAC;gBACJ,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACrB,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC1B,CAAC;YAED,uDAAuD;YACvD,MAAM,aAAa,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;YAChD,IAAI,cAAc,GAAgB,EAAE,CAAC;YACrC,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;gBACtC,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;gBACpC,cAAc,GAAG,kBAAkB,CAAC,KAAK,CACvC,cAAc,EACd,KAAK,CAAC,WAAW,CAClB,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,UAAU,EAAE,aAAa;gBACzB,SAAS,EAAE,cAAc,CAAC,KAAK;gBAC/B,cAAc,EAAE,cAAc,CAAC,qBAAqB,IAAI,EAAE;aAC3D,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,CAAC,cAAc,CAAC;YAC5B,SAAS,EAAE,cAAc;YACzB,cAAc,EAAE,EAAE;SACnB,CAAC;IACJ,CAAC;IAEO,kBAAkB,CACxB,UAAoB,EACpB,SAA6B;QAE7B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC/C,0CAA0C;QAC1C,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACjC,CAAC;QACD,iCAAiC;QACjC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC/D,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,qBAAqB,CAC3B,SAAgC,EAChC,OAAuB,EACvB,YAAiC;QAOjC,OAAO,SAAS;aACb,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAE3C,IAAI,YAAY,GAAG,CAAC,CAAC,CAAC,oBAAoB;YAC1C,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAClD,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;oBACpB,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,KAAe,CAAC,CAAC;oBAChD,IAAI,KAAK,KAAK,SAAS;wBAAE,OAAO,KAAK,CAAC;oBACtC,YAAY,GAAG,KAAK,CAAC;oBACrB,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,IAAI,GAAG,KAAK,eAAe,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;oBAChD,OAAO,OAAO,CAAC,aAAa,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;gBACpE,CAAC;gBACD,OAAO,OAAO,CAAC,GAA2B,CAAC,KAAK,KAAK,CAAC;YACxD,CAAC,CAAC,CAAC;YAEH,OAAO,OAAO;gBACZ,CAAC,CAAC;oBACE,WAAW,EAAE,YAAY,CAAC,MAAM;oBAChC,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;oBACjC,KAAK;iBACN;gBACH,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAA8B,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;IAC3D,CAAC;IAEO,aAAa,CACnB,OAAqE;QAErE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACpB,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;gBACxB,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YAC3B,CAAC;YACD,IAAI,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBACpC,OAAO,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;YACvC,CAAC;YACD,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,OAAuB;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAEzD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CACb,6CAA6C,OAAO,CAAC,KAAK,4EAA4E,CACvI,CAAC;QACJ,CAAC;QAED,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB;SAC/B,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAa;QAC3B,OAAO,CAAC,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,IAAiB,EAAE,QAAqB;QACnD,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK;YACnC,qBAAqB,EAAE,kBAAkB,CAAC,SAAS,CACjD,IAAI,CAAC,qBAAqB,EAC1B,QAAQ,CAAC,qBAAqB,CAC/B;SACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CACd,OAA0C,EAC1C,OAA0C;QAE1C,OAAO,kBAAkB,CAAC,gBAAgB,CACxC,OAA8C,EAC9C,OAA8C,CACtB,CAAC;IAC7B,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAC7B,GAAG,OAAmD;QAEtD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAA4B,EAAE,GAAG,EAAE,EAAE;YAC1D,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,OAAO,GAAG,CAAC;YACb,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC/B,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC1B,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBAE1B,uEAAuE;gBACvE,sEAAsE;gBACtE,2BAA2B;gBAC3B,qEAAqE;gBACrE,kCAAkC;gBAClC,IACE,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBACrC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACrC,CAAC;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACrE,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;gBACtB,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;CACF"}

package/dist/src/skills/skillLoader.js

@@ -9,7 +9,7 @@ import { glob } from 'glob';
 import yaml from 'js-yaml';
 import { debugLogger } from '../utils/debugLogger.js';
 import { coreEvents } from '../utils/events.js';
-export const FRONTMATTER_REGEX = /^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)/;
+export const FRONTMATTER_REGEX = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n([\s\S]*))?/;
 /**
  * Discovers and loads all skills in the provided directory.
  */
@@ -21,7 +21,7 @@ export async function loadSkillsFromDir(dir) {
         if (!stats || !stats.isDirectory()) {
             return [];
         }
-        const skillFiles = await glob('*/SKILL.md', {
+        const skillFiles = await glob(['SKILL.md', '*/SKILL.md'], {
             cwd: absoluteSearchPath,
             absolute: true,
             nodir: true,

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

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