@machina.ai/cell-cli 1.0.21-rc4 → 1.2.2-rc1

package/dist/src/services/McpPromptLoader.test.js

@@ -0,0 +1,114 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { McpPromptLoader } from './McpPromptLoader.js';
+import { describe, it, expect } from 'vitest';
+describe('McpPromptLoader', () => {
+    const mockConfig = {};
+    describe('parseArgs', () => {
+        it('should handle multi-word positional arguments', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'arg1', required: true },
+                { name: 'arg2', required: true },
+            ];
+            const userArgs = 'hello world';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello', arg2: 'world' });
+        });
+        it('should handle quoted multi-word positional arguments', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'arg1', required: true },
+                { name: 'arg2', required: true },
+            ];
+            const userArgs = '"hello world" foo';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello world', arg2: 'foo' });
+        });
+        it('should handle a single positional argument with multiple words', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [{ name: 'arg1', required: true }];
+            const userArgs = 'hello world';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello world' });
+        });
+        it('should handle escaped quotes in positional arguments', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [{ name: 'arg1', required: true }];
+            const userArgs = '"hello \\"world\\""';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello "world"' });
+        });
+        it('should handle escaped backslashes in positional arguments', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [{ name: 'arg1', required: true }];
+            const userArgs = '"hello\\\\world"';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello\\world' });
+        });
+        it('should handle named args followed by positional args', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'named', required: true },
+                { name: 'pos', required: true },
+            ];
+            const userArgs = '--named="value" positional';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ named: 'value', pos: 'positional' });
+        });
+        it('should handle positional args followed by named args', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'pos', required: true },
+                { name: 'named', required: true },
+            ];
+            const userArgs = 'positional --named="value"';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ pos: 'positional', named: 'value' });
+        });
+        it('should handle positional args interspersed with named args', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'pos1', required: true },
+                { name: 'named', required: true },
+                { name: 'pos2', required: true },
+            ];
+            const userArgs = 'p1 --named="value" p2';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ pos1: 'p1', named: 'value', pos2: 'p2' });
+        });
+        it('should treat an escaped quote at the start as a literal', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'arg1', required: true },
+                { name: 'arg2', required: true },
+            ];
+            const userArgs = '\\"hello world';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: '"hello', arg2: 'world' });
+        });
+        it('should handle a complex mix of args', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'pos1', required: true },
+                { name: 'named1', required: true },
+                { name: 'pos2', required: true },
+                { name: 'named2', required: true },
+                { name: 'pos3', required: true },
+            ];
+            const userArgs = 'p1 --named1="value 1" "p2 has spaces" --named2=value2 "p3 \\"with quotes\\""';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({
+                pos1: 'p1',
+                named1: 'value 1',
+                pos2: 'p2 has spaces',
+                named2: 'value2',
+                pos3: 'p3 "with quotes"',
+            });
+        });
+    });
+});
+//# sourceMappingURL=McpPromptLoader.test.js.map

package/dist/src/services/McpPromptLoader.test.js.map

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

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

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { IPromptProcessor } from './types.js';
-import { CommandContext } from '../../ui/commands/types.js';
+import type { IPromptProcessor, PromptPipelineContent } from './types.js';
+import type { CommandContext } from '../../ui/commands/types.js';
 /**
  * Appends the user's full command invocation to the prompt if arguments are
  * provided, allowing the model to perform its own argument parsing.
@@ -12,5 +12,5 @@ import { CommandContext } from '../../ui/commands/types.js';
  * This processor is only used if the prompt does NOT contain {{args}}.
  */
 export declare class DefaultArgumentProcessor implements IPromptProcessor {
-    process(prompt: string, context: CommandContext): Promise<string>;
+    process(prompt: PromptPipelineContent, context: CommandContext): Promise<PromptPipelineContent>;
 }

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

@@ -3,6 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { appendToLastTextPart } from '@machina.ai/cell-cli-core';
 /**
  * Appends the user's full command invocation to the prompt if arguments are
  * provided, allowing the model to perform its own argument parsing.
@@ -11,8 +12,8 @@
  */
 export class DefaultArgumentProcessor {
     async process(prompt, context) {
-        if (context.invocation.args) {
-            return `${prompt}\n\n${context.invocation.raw}`;
+        if (context.invocation?.args) {
+            return appendToLastTextPart(prompt, context.invocation.raw);
         }
         return prompt;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"argumentProcessor.js","sourceRoot":"","sources":["../../../../src/services/prompt-processors/argumentProcessor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH;;;;;GAKG;AACH,MAAM,OAAO,wBAAwB;IACnC,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,OAAuB;QACnD,IAAI,OAAO,CAAC,UAAW,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,GAAG,MAAM,OAAO,OAAO,CAAC,UAAW,CAAC,GAAG,EAAE,CAAC;QACnD,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
+{"version":3,"file":"argumentProcessor.js","sourceRoot":"","sources":["../../../../src/services/prompt-processors/argumentProcessor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAIjE;;;;;GAKG;AACH,MAAM,OAAO,wBAAwB;IACnC,KAAK,CAAC,OAAO,CACX,MAA6B,EAC7B,OAAuB;QAEvB,IAAI,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;YAC7B,OAAO,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}

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

@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandContext } from '../../ui/commands/types.js';
+import { type IPromptProcessor, type PromptPipelineContent } from './types.js';
+export declare class AtFileProcessor implements IPromptProcessor {
+    private readonly commandName?;
+    constructor(commandName?: string | undefined);
+    process(input: PromptPipelineContent, context: CommandContext): Promise<PromptPipelineContent>;
+}

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

@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { flatMapTextParts, readPathFromWorkspace, } from '@machina.ai/cell-cli-core';
+import { MessageType } from '../../ui/types.js';
+import { AT_FILE_INJECTION_TRIGGER, } from './types.js';
+import { extractInjections } from './injectionParser.js';
+export class AtFileProcessor {
+    commandName;
+    constructor(commandName) {
+        this.commandName = commandName;
+    }
+    async process(input, context) {
+        const config = context.services.config;
+        if (!config) {
+            return input;
+        }
+        return flatMapTextParts(input, async (text) => {
+            if (!text.includes(AT_FILE_INJECTION_TRIGGER)) {
+                return [{ text }];
+            }
+            const injections = extractInjections(text, AT_FILE_INJECTION_TRIGGER, this.commandName);
+            if (injections.length === 0) {
+                return [{ text }];
+            }
+            const output = [];
+            let lastIndex = 0;
+            for (const injection of injections) {
+                const prefix = text.substring(lastIndex, injection.startIndex);
+                if (prefix) {
+                    output.push({ text: prefix });
+                }
+                const pathStr = injection.content;
+                try {
+                    const fileContentParts = await readPathFromWorkspace(pathStr, config);
+                    if (fileContentParts.length === 0) {
+                        const uiMessage = `File '@{${pathStr}}' was ignored by .gitignore or .geminiignore and was not included in the prompt.`;
+                        context.ui.addItem({ type: MessageType.INFO, text: uiMessage }, Date.now());
+                    }
+                    output.push(...fileContentParts);
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message}`;
+                    console.error(`[AtFileProcessor] ${uiMessage}. Leaving placeholder in prompt.`);
+                    context.ui.addItem({ type: MessageType.ERROR, text: uiMessage }, Date.now());
+                    const placeholder = text.substring(injection.startIndex, injection.endIndex);
+                    output.push({ text: placeholder });
+                }
+                lastIndex = injection.endIndex;
+            }
+            const suffix = text.substring(lastIndex);
+            if (suffix) {
+                output.push({ text: suffix });
+            }
+            return output;
+        });
+    }
+}
+//# sourceMappingURL=atFileProcessor.js.map

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

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

package/dist/src/services/prompt-processors/atFileProcessor.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/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('@machina.ai/cell-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 {};