@google/gemini-cli 0.3.0-nightly.20250822.15c62bad → 0.3.0-preview.1

package/dist/src/services/prompt-processors/atFileProcessor.test.js

@@ -0,0 +1,174 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import {} from '../../ui/commands/types.js';
+import { AtFileProcessor } from './atFileProcessor.js';
+import { MessageType } from '../../ui/types.js';
+// Mock the core dependency
+const mockReadPathFromWorkspace = vi.hoisted(() => vi.fn());
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+        ...original,
+        readPathFromWorkspace: mockReadPathFromWorkspace,
+    };
+});
+describe('AtFileProcessor', () => {
+    let context;
+    let mockConfig;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockConfig = {
+        // The processor only passes the config through, so we don't need a full mock.
+        };
+        context = createMockCommandContext({
+            services: {
+                config: mockConfig,
+            },
+        });
+        // Default mock success behavior: return content wrapped in a text part.
+        mockReadPathFromWorkspace.mockImplementation(async (path) => [
+            { text: `content of ${path}` },
+        ]);
+    });
+    it('should not change the prompt if no @{ trigger is present', async () => {
+        const processor = new AtFileProcessor();
+        const prompt = [{ text: 'This is a simple prompt.' }];
+        const result = await processor.process(prompt, context);
+        expect(result).toEqual(prompt);
+        expect(mockReadPathFromWorkspace).not.toHaveBeenCalled();
+    });
+    it('should not change the prompt if config service is missing', async () => {
+        const processor = new AtFileProcessor();
+        const prompt = [{ text: 'Analyze @{file.txt}' }];
+        const contextWithoutConfig = createMockCommandContext({
+            services: {
+                config: null,
+            },
+        });
+        const result = await processor.process(prompt, contextWithoutConfig);
+        expect(result).toEqual(prompt);
+        expect(mockReadPathFromWorkspace).not.toHaveBeenCalled();
+    });
+    describe('Parsing Logic', () => {
+        it('should replace a single valid @{path/to/file.txt} placeholder', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [
+                { text: 'Analyze this file: @{path/to/file.txt}' },
+            ];
+            const result = await processor.process(prompt, context);
+            expect(mockReadPathFromWorkspace).toHaveBeenCalledWith('path/to/file.txt', mockConfig);
+            expect(result).toEqual([
+                { text: 'Analyze this file: ' },
+                { text: 'content of path/to/file.txt' },
+            ]);
+        });
+        it('should replace multiple different @{...} placeholders', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [
+                { text: 'Compare @{file1.js} with @{file2.js}' },
+            ];
+            const result = await processor.process(prompt, context);
+            expect(mockReadPathFromWorkspace).toHaveBeenCalledTimes(2);
+            expect(mockReadPathFromWorkspace).toHaveBeenCalledWith('file1.js', mockConfig);
+            expect(mockReadPathFromWorkspace).toHaveBeenCalledWith('file2.js', mockConfig);
+            expect(result).toEqual([
+                { text: 'Compare ' },
+                { text: 'content of file1.js' },
+                { text: ' with ' },
+                { text: 'content of file2.js' },
+            ]);
+        });
+        it('should handle placeholders at the beginning, middle, and end', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [
+                { text: '@{start.txt} in the @{middle.txt} and @{end.txt}' },
+            ];
+            const result = await processor.process(prompt, context);
+            expect(result).toEqual([
+                { text: 'content of start.txt' },
+                { text: ' in the ' },
+                { text: 'content of middle.txt' },
+                { text: ' and ' },
+                { text: 'content of end.txt' },
+            ]);
+        });
+        it('should correctly parse paths that contain balanced braces', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [
+                { text: 'Analyze @{path/with/{braces}/file.txt}' },
+            ];
+            const result = await processor.process(prompt, context);
+            expect(mockReadPathFromWorkspace).toHaveBeenCalledWith('path/with/{braces}/file.txt', mockConfig);
+            expect(result).toEqual([
+                { text: 'Analyze ' },
+                { text: 'content of path/with/{braces}/file.txt' },
+            ]);
+        });
+        it('should throw an error if the prompt contains an unclosed trigger', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [{ text: 'Hello @{world' }];
+            // The new parser throws an error for unclosed injections.
+            await expect(processor.process(prompt, context)).rejects.toThrow(/Unclosed injection/);
+        });
+    });
+    describe('Integration and Error Handling', () => {
+        it('should leave the placeholder unmodified if readPathFromWorkspace throws', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [
+                { text: 'Analyze @{not-found.txt} and @{good-file.txt}' },
+            ];
+            mockReadPathFromWorkspace.mockImplementation(async (path) => {
+                if (path === 'not-found.txt') {
+                    throw new Error('File not found');
+                }
+                return [{ text: `content of ${path}` }];
+            });
+            const result = await processor.process(prompt, context);
+            expect(result).toEqual([
+                { text: 'Analyze ' },
+                { text: '@{not-found.txt}' }, // Placeholder is preserved as a text part
+                { text: ' and ' },
+                { text: 'content of good-file.txt' },
+            ]);
+        });
+    });
+    describe('UI Feedback', () => {
+        it('should call ui.addItem with an ERROR on failure', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [{ text: 'Analyze @{bad-file.txt}' }];
+            mockReadPathFromWorkspace.mockRejectedValue(new Error('Access denied'));
+            await processor.process(prompt, context);
+            expect(context.ui.addItem).toHaveBeenCalledTimes(1);
+            expect(context.ui.addItem).toHaveBeenCalledWith({
+                type: MessageType.ERROR,
+                text: "Failed to inject content for '@{bad-file.txt}': Access denied",
+            }, expect.any(Number));
+        });
+        it('should call ui.addItem with a WARNING if the file was ignored', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [{ text: 'Analyze @{ignored.txt}' }];
+            // Simulate an ignored file by returning an empty array.
+            mockReadPathFromWorkspace.mockResolvedValue([]);
+            const result = await processor.process(prompt, context);
+            // The placeholder should be removed, resulting in only the prefix.
+            expect(result).toEqual([{ text: 'Analyze ' }]);
+            expect(context.ui.addItem).toHaveBeenCalledTimes(1);
+            expect(context.ui.addItem).toHaveBeenCalledWith({
+                type: MessageType.INFO,
+                text: "File '@{ignored.txt}' was ignored by .gitignore or .geminiignore and was not included in the prompt.",
+            }, expect.any(Number));
+        });
+        it('should NOT call ui.addItem on success', async () => {
+            const processor = new AtFileProcessor();
+            const prompt = [{ text: 'Analyze @{good-file.txt}' }];
+            await processor.process(prompt, context);
+            expect(context.ui.addItem).not.toHaveBeenCalled();
+        });
+    });
+});
+//# sourceMappingURL=atFileProcessor.test.js.map

package/dist/src/services/prompt-processors/atFileProcessor.test.js.map

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

package/dist/src/services/prompt-processors/injectionParser.d.ts

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Represents a single detected injection site in a prompt string.
+ */
+export interface Injection {
+    /** The content extracted from within the braces (e.g., the command or path), trimmed. */
+    content: string;
+    /** The starting index of the injection (inclusive, points to the start of the trigger). */
+    startIndex: number;
+    /** The ending index of the injection (exclusive, points after the closing '}'). */
+    endIndex: number;
+}
+/**
+ * Iteratively parses a prompt string to extract injections (e.g., !{...} or @{...}),
+ * correctly handling nested braces within the content.
+ *
+ * This parser relies on simple brace counting and does not support escaping.
+ *
+ * @param prompt The prompt string to parse.
+ * @param trigger The opening trigger sequence (e.g., '!{', '@{').
+ * @param contextName Optional context name (e.g., command name) for error messages.
+ * @returns An array of extracted Injection objects.
+ * @throws Error if an unclosed injection is found.
+ */
+export declare function extractInjections(prompt: string, trigger: string, contextName?: string): Injection[];

package/dist/src/services/prompt-processors/injectionParser.js

@@ -0,0 +1,60 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Iteratively parses a prompt string to extract injections (e.g., !{...} or @{...}),
+ * correctly handling nested braces within the content.
+ *
+ * This parser relies on simple brace counting and does not support escaping.
+ *
+ * @param prompt The prompt string to parse.
+ * @param trigger The opening trigger sequence (e.g., '!{', '@{').
+ * @param contextName Optional context name (e.g., command name) for error messages.
+ * @returns An array of extracted Injection objects.
+ * @throws Error if an unclosed injection is found.
+ */
+export function extractInjections(prompt, trigger, contextName) {
+    const injections = [];
+    let index = 0;
+    while (index < prompt.length) {
+        const startIndex = prompt.indexOf(trigger, index);
+        if (startIndex === -1) {
+            break;
+        }
+        let currentIndex = startIndex + trigger.length;
+        let braceCount = 1;
+        let foundEnd = false;
+        while (currentIndex < prompt.length) {
+            const char = prompt[currentIndex];
+            if (char === '{') {
+                braceCount++;
+            }
+            else if (char === '}') {
+                braceCount--;
+                if (braceCount === 0) {
+                    const injectionContent = prompt.substring(startIndex + trigger.length, currentIndex);
+                    const endIndex = currentIndex + 1;
+                    injections.push({
+                        content: injectionContent.trim(),
+                        startIndex,
+                        endIndex,
+                    });
+                    index = endIndex;
+                    foundEnd = true;
+                    break;
+                }
+            }
+            currentIndex++;
+        }
+        // Check if the inner loop finished without finding the closing brace.
+        if (!foundEnd) {
+            const contextInfo = contextName ? ` in command '${contextName}'` : '';
+            // Enforce strict parsing (Comment 1) and clarify limitations (Comment 2).
+            throw new Error(`Invalid syntax${contextInfo}: Unclosed injection starting at index ${startIndex} ('${trigger}'). Ensure braces are balanced. Paths or commands with unbalanced braces are not supported directly.`);
+        }
+    }
+    return injections;
+}
+//# sourceMappingURL=injectionParser.js.map

package/dist/src/services/prompt-processors/injectionParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"injectionParser.js","sourceRoot":"","sources":["../../../../src/services/prompt-processors/injectionParser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAcH;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAc,EACd,OAAe,EACf,WAAoB;IAEpB,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,OAAO,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAElD,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,MAAM;QACR,CAAC;QAED,IAAI,YAAY,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;QAC/C,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,OAAO,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;YAElC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACjB,UAAU,EAAE,CAAC;YACf,CAAC;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACxB,UAAU,EAAE,CAAC;gBACb,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;oBACrB,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CACvC,UAAU,GAAG,OAAO,CAAC,MAAM,EAC3B,YAAY,CACb,CAAC;oBACF,MAAM,QAAQ,GAAG,YAAY,GAAG,CAAC,CAAC;oBAElC,UAAU,CAAC,IAAI,CAAC;wBACd,OAAO,EAAE,gBAAgB,CAAC,IAAI,EAAE;wBAChC,UAAU;wBACV,QAAQ;qBACT,CAAC,CAAC;oBAEH,KAAK,GAAG,QAAQ,CAAC;oBACjB,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM;gBACR,CAAC;YACH,CAAC;YACD,YAAY,EAAE,CAAC;QACjB,CAAC;QAED,sEAAsE;QACtE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,gBAAgB,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACtE,0EAA0E;YAC1E,MAAM,IAAI,KAAK,CACb,iBAAiB,WAAW,0CAA0C,UAAU,MAAM,OAAO,sGAAsG,CACpM,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/src/services/prompt-processors/injectionParser.test.d.ts

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

package/dist/src/services/prompt-processors/injectionParser.test.js

@@ -0,0 +1,189 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { extractInjections } from './injectionParser.js';
+describe('extractInjections', () => {
+    const SHELL_TRIGGER = '!{';
+    const AT_FILE_TRIGGER = '@{';
+    describe('Basic Functionality', () => {
+        it('should return an empty array if no trigger is present', () => {
+            const prompt = 'This is a simple prompt without injections.';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toEqual([]);
+        });
+        it('should extract a single, simple injection', () => {
+            const prompt = 'Run this command: !{ls -la}';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toEqual([
+                {
+                    content: 'ls -la',
+                    startIndex: 18,
+                    endIndex: 27,
+                },
+            ]);
+        });
+        it('should extract multiple injections', () => {
+            const prompt = 'First: !{cmd1}, Second: !{cmd2}';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toHaveLength(2);
+            expect(result[0]).toEqual({
+                content: 'cmd1',
+                startIndex: 7,
+                endIndex: 14,
+            });
+            expect(result[1]).toEqual({
+                content: 'cmd2',
+                startIndex: 24,
+                endIndex: 31,
+            });
+        });
+        it('should handle different triggers (e.g., @{)', () => {
+            const prompt = 'Read this file: @{path/to/file.txt}';
+            const result = extractInjections(prompt, AT_FILE_TRIGGER);
+            expect(result).toEqual([
+                {
+                    content: 'path/to/file.txt',
+                    startIndex: 16,
+                    endIndex: 35,
+                },
+            ]);
+        });
+    });
+    describe('Positioning and Edge Cases', () => {
+        it('should handle injections at the start and end of the prompt', () => {
+            const prompt = '!{start} middle text !{end}';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toHaveLength(2);
+            expect(result[0]).toEqual({
+                content: 'start',
+                startIndex: 0,
+                endIndex: 8,
+            });
+            expect(result[1]).toEqual({
+                content: 'end',
+                startIndex: 21,
+                endIndex: 27,
+            });
+        });
+        it('should handle adjacent injections', () => {
+            const prompt = '!{A}!{B}';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toHaveLength(2);
+            expect(result[0]).toEqual({ content: 'A', startIndex: 0, endIndex: 4 });
+            expect(result[1]).toEqual({ content: 'B', startIndex: 4, endIndex: 8 });
+        });
+        it('should handle empty injections', () => {
+            const prompt = 'Empty: !{}';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toEqual([
+                {
+                    content: '',
+                    startIndex: 7,
+                    endIndex: 10,
+                },
+            ]);
+        });
+        it('should trim whitespace within the content', () => {
+            const prompt = '!{  \n command with space  \t }';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toEqual([
+                {
+                    content: 'command with space',
+                    startIndex: 0,
+                    endIndex: 29,
+                },
+            ]);
+        });
+        it('should ignore similar patterns that are not the exact trigger', () => {
+            const prompt = 'Not a trigger: !(cmd) or {cmd} or ! {cmd}';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toEqual([]);
+        });
+        it('should ignore extra closing braces before the trigger', () => {
+            const prompt = 'Ignore this } then !{run}';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toEqual([
+                {
+                    content: 'run',
+                    startIndex: 19,
+                    endIndex: 25,
+                },
+            ]);
+        });
+        it('should stop parsing at the first balanced closing brace (non-greedy)', () => {
+            // This tests that the parser doesn't greedily consume extra closing braces
+            const prompt = 'Run !{ls -l}} extra braces';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toEqual([
+                {
+                    content: 'ls -l',
+                    startIndex: 4,
+                    endIndex: 12,
+                },
+            ]);
+        });
+    });
+    describe('Nested Braces (Balanced)', () => {
+        it('should correctly parse content with simple nested braces (e.g., JSON)', () => {
+            const prompt = `Send JSON: !{curl -d '{"key": "value"}'}`;
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toHaveLength(1);
+            expect(result[0].content).toBe(`curl -d '{"key": "value"}'`);
+        });
+        it('should correctly parse content with shell constructs (e.g., awk)', () => {
+            const prompt = `Process text: !{awk '{print $1}' file.txt}`;
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toHaveLength(1);
+            expect(result[0].content).toBe(`awk '{print $1}' file.txt`);
+        });
+        it('should correctly parse multiple levels of nesting', () => {
+            const prompt = `!{level1 {level2 {level3}} suffix}`;
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toHaveLength(1);
+            expect(result[0].content).toBe(`level1 {level2 {level3}} suffix`);
+            expect(result[0].endIndex).toBe(prompt.length);
+        });
+        it('should correctly parse paths containing balanced braces', () => {
+            const prompt = 'Analyze @{path/with/{braces}/file.txt}';
+            const result = extractInjections(prompt, AT_FILE_TRIGGER);
+            expect(result).toHaveLength(1);
+            expect(result[0].content).toBe('path/with/{braces}/file.txt');
+        });
+        it('should correctly handle an injection containing the trigger itself', () => {
+            // This works because the parser counts braces, it doesn't look for the trigger again until the current one is closed.
+            const prompt = '!{echo "The trigger is !{ confusing }"}';
+            const expectedContent = 'echo "The trigger is !{ confusing }"';
+            const result = extractInjections(prompt, SHELL_TRIGGER);
+            expect(result).toHaveLength(1);
+            expect(result[0].content).toBe(expectedContent);
+        });
+    });
+    describe('Error Handling (Unbalanced/Unclosed)', () => {
+        it('should throw an error for a simple unclosed injection', () => {
+            const prompt = 'This prompt has !{an unclosed trigger';
+            expect(() => extractInjections(prompt, SHELL_TRIGGER)).toThrow(/Invalid syntax: Unclosed injection starting at index 16 \('!{'\)/);
+        });
+        it('should throw an error if the prompt ends inside a nested block', () => {
+            const prompt = 'This fails: !{outer {inner';
+            expect(() => extractInjections(prompt, SHELL_TRIGGER)).toThrow(/Invalid syntax: Unclosed injection starting at index 12 \('!{'\)/);
+        });
+        it('should include the context name in the error message if provided', () => {
+            const prompt = 'Failing !{command';
+            const contextName = 'test-command';
+            expect(() => extractInjections(prompt, SHELL_TRIGGER, contextName)).toThrow(/Invalid syntax in command 'test-command': Unclosed injection starting at index 8/);
+        });
+        it('should throw if content contains unbalanced braces (e.g., missing closing)', () => {
+            // This is functionally the same as an unclosed injection from the parser's perspective.
+            const prompt = 'Analyze @{path/with/braces{example.txt}';
+            expect(() => extractInjections(prompt, AT_FILE_TRIGGER)).toThrow(/Invalid syntax: Unclosed injection starting at index 8 \('@{'\)/);
+        });
+        it('should clearly state that unbalanced braces in content are not supported in the error', () => {
+            const prompt = 'Analyze @{path/with/braces{example.txt}';
+            expect(() => extractInjections(prompt, AT_FILE_TRIGGER)).toThrow(/Paths or commands with unbalanced braces are not supported directly/);
+        });
+    });
+});
+//# sourceMappingURL=injectionParser.test.js.map

package/dist/src/services/prompt-processors/injectionParser.test.js.map

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

package/dist/src/services/prompt-processors/shellProcessor.d.ts

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CommandContext } from '../../ui/commands/types.js';
-import { IPromptProcessor } from './types.js';
+import type { CommandContext } from '../../ui/commands/types.js';
+import type { IPromptProcessor, PromptPipelineContent } from './types.js';
 export declare class ConfirmationRequiredError extends Error {
     commandsToConfirm: string[];
     constructor(message: string, commandsToConfirm: string[]);
@@ -22,14 +22,6 @@ export declare class ConfirmationRequiredError extends Error {
 export declare class ShellProcessor implements IPromptProcessor {
     private readonly commandName;
     constructor(commandName: string);
-    process(prompt: string, context: CommandContext): Promise<string>;
-    /**
-     * Iteratively parses the prompt string to extract shell injections (!{...}),
-     * correctly handling nested braces within the command.
-     *
-     * @param prompt The prompt string to parse.
-     * @returns An array of extracted ShellInjection objects.
-     * @throws Error if an unclosed injection (`!{`) is found.
-     */
-    private extractInjections;
+    process(prompt: PromptPipelineContent, context: CommandContext): Promise<PromptPipelineContent>;
+    private processString;
 }

package/dist/src/services/prompt-processors/shellProcessor.js

@@ -3,8 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ApprovalMode, checkCommandPermissions, escapeShellArg, getShellConfiguration, ShellExecutionService, } from '@google/gemini-cli-core';
+import { ApprovalMode, checkCommandPermissions, escapeShellArg, getShellConfiguration, ShellExecutionService, flatMapTextParts, } from '@google/gemini-cli-core';
 import { SHELL_INJECTION_TRIGGER, SHORTHAND_ARGS_PLACEHOLDER, } from './types.js';
+import { extractInjections } from './injectionParser.js';
 export class ConfirmationRequiredError extends Error {
     commandsToConfirm;
     constructor(message, commandsToConfirm) {
@@ -29,28 +30,35 @@ export class ShellProcessor {
         this.commandName = commandName;
     }
     async process(prompt, context) {
+        return flatMapTextParts(prompt, (text) => this.processString(text, context));
+    }
+    async processString(prompt, context) {
         const userArgsRaw = context.invocation?.args || '';
         if (!prompt.includes(SHELL_INJECTION_TRIGGER)) {
-            return prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw);
+            return [
+                { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) },
+            ];
         }
         const config = context.services.config;
         if (!config) {
             throw new Error(`Security configuration not loaded. Cannot verify shell command permissions for '${this.commandName}'. Aborting.`);
         }
         const { sessionShellAllowlist } = context.session;
-        const injections = this.extractInjections(prompt);
+        const injections = extractInjections(prompt, SHELL_INJECTION_TRIGGER, this.commandName);
         // If extractInjections found no closed blocks (and didn't throw), treat as raw.
         if (injections.length === 0) {
-            return prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw);
+            return [
+                { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) },
+            ];
         }
         const { shell } = getShellConfiguration();
         const userArgsEscaped = escapeShellArg(userArgsRaw, shell);
         const resolvedInjections = injections.map((injection) => {
-            if (injection.command === '') {
-                return injection;
+            const command = injection.content;
+            if (command === '') {
+                return { ...injection, resolvedCommand: undefined };
             }
-            // Replace {{args}} inside the command string with the escaped version.
-            const resolvedCommand = injection.command.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsEscaped);
+            const resolvedCommand = command.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsEscaped);
             return { ...injection, resolvedCommand };
         });
         const commandsToConfirm = new Set();
@@ -107,56 +115,7 @@ export class ShellProcessor {
         // Append the remaining text AFTER the last injection, substituting {{args}} with RAW input.
         const finalSegment = prompt.substring(lastIndex);
         processedPrompt += finalSegment.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw);
-        return processedPrompt;
-    }
-    /**
-     * Iteratively parses the prompt string to extract shell injections (!{...}),
-     * correctly handling nested braces within the command.
-     *
-     * @param prompt The prompt string to parse.
-     * @returns An array of extracted ShellInjection objects.
-     * @throws Error if an unclosed injection (`!{`) is found.
-     */
-    extractInjections(prompt) {
-        const injections = [];
-        let index = 0;
-        while (index < prompt.length) {
-            const startIndex = prompt.indexOf(SHELL_INJECTION_TRIGGER, index);
-            if (startIndex === -1) {
-                break;
-            }
-            let currentIndex = startIndex + SHELL_INJECTION_TRIGGER.length;
-            let braceCount = 1;
-            let foundEnd = false;
-            while (currentIndex < prompt.length) {
-                const char = prompt[currentIndex];
-                // We count literal braces. This parser does not interpret shell quoting/escaping.
-                if (char === '{') {
-                    braceCount++;
-                }
-                else if (char === '}') {
-                    braceCount--;
-                    if (braceCount === 0) {
-                        const commandContent = prompt.substring(startIndex + SHELL_INJECTION_TRIGGER.length, currentIndex);
-                        const endIndex = currentIndex + 1;
-                        injections.push({
-                            command: commandContent.trim(),
-                            startIndex,
-                            endIndex,
-                        });
-                        index = endIndex;
-                        foundEnd = true;
-                        break;
-                    }
-                }
-                currentIndex++;
-            }
-            // Check if the inner loop finished without finding the closing brace.
-            if (!foundEnd) {
-                throw new Error(`Invalid syntax in command '${this.commandName}': Unclosed shell injection starting at index ${startIndex} ('!{'). Ensure braces are balanced.`);
-            }
-        }
-        return injections;
+        return [{ text: processedPrompt }];
     }
 }
 //# sourceMappingURL=shellProcessor.js.map