@umsai/ums-code 0.0.14-v1 → 0.1.4-v2

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

@@ -0,0 +1,233 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { CommandService } from './CommandService.js';
+import {} from './types.js';
+import { CommandKind } from '../ui/commands/types.js';
+const createMockCommand = (name, kind) => ({
+    name,
+    description: `Description for ${name}`,
+    kind,
+    action: vi.fn(),
+});
+const mockCommandA = createMockCommand('command-a', CommandKind.BUILT_IN);
+const mockCommandB = createMockCommand('command-b', CommandKind.BUILT_IN);
+const mockCommandC = createMockCommand('command-c', CommandKind.FILE);
+const mockCommandB_Override = createMockCommand('command-b', CommandKind.FILE);
+class MockCommandLoader {
+    commandsToLoad;
+    constructor(commandsToLoad) {
+        this.commandsToLoad = commandsToLoad;
+    }
+    loadCommands = vi.fn(async () => Promise.resolve(this.commandsToLoad));
+}
+describe('CommandService', () => {
+    beforeEach(() => {
+        vi.spyOn(console, 'debug').mockImplementation(() => { });
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should load commands from a single loader', async () => {
+        const mockLoader = new MockCommandLoader([mockCommandA, mockCommandB]);
+        const service = await CommandService.create([mockLoader], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(mockLoader.loadCommands).toHaveBeenCalledTimes(1);
+        expect(commands).toHaveLength(2);
+        expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandB]));
+    });
+    it('should aggregate commands from multiple loaders', async () => {
+        const loader1 = new MockCommandLoader([mockCommandA]);
+        const loader2 = new MockCommandLoader([mockCommandC]);
+        const service = await CommandService.create([loader1, loader2], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(loader1.loadCommands).toHaveBeenCalledTimes(1);
+        expect(loader2.loadCommands).toHaveBeenCalledTimes(1);
+        expect(commands).toHaveLength(2);
+        expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandC]));
+    });
+    it('should override commands from earlier loaders with those from later loaders', async () => {
+        const loader1 = new MockCommandLoader([mockCommandA, mockCommandB]);
+        const loader2 = new MockCommandLoader([
+            mockCommandB_Override,
+            mockCommandC,
+        ]);
+        const service = await CommandService.create([loader1, loader2], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(3); // Should be A, C, and the overridden B.
+        // The final list should contain the override from the *last* loader.
+        const commandB = commands.find((cmd) => cmd.name === 'command-b');
+        expect(commandB).toBeDefined();
+        expect(commandB?.kind).toBe(CommandKind.FILE); // Verify it's the overridden version.
+        expect(commandB).toEqual(mockCommandB_Override);
+        // Ensure the other commands are still present.
+        expect(commands).toEqual(expect.arrayContaining([
+            mockCommandA,
+            mockCommandC,
+            mockCommandB_Override,
+        ]));
+    });
+    it('should handle loaders that return an empty array of commands gracefully', async () => {
+        const loader1 = new MockCommandLoader([mockCommandA]);
+        const emptyLoader = new MockCommandLoader([]);
+        const loader3 = new MockCommandLoader([mockCommandB]);
+        const service = await CommandService.create([loader1, emptyLoader, loader3], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(emptyLoader.loadCommands).toHaveBeenCalledTimes(1);
+        expect(commands).toHaveLength(2);
+        expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandB]));
+    });
+    it('should load commands from successful loaders even if one fails', async () => {
+        const successfulLoader = new MockCommandLoader([mockCommandA]);
+        const failingLoader = new MockCommandLoader([]);
+        const error = new Error('Loader failed');
+        vi.spyOn(failingLoader, 'loadCommands').mockRejectedValue(error);
+        const service = await CommandService.create([successfulLoader, failingLoader], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(1);
+        expect(commands).toEqual([mockCommandA]);
+        expect(console.debug).toHaveBeenCalledWith('A command loader failed:', error);
+    });
+    it('getCommands should return a readonly array that cannot be mutated', async () => {
+        const service = await CommandService.create([new MockCommandLoader([mockCommandA])], new AbortController().signal);
+        const commands = service.getCommands();
+        // Expect it to throw a TypeError at runtime because the array is frozen.
+        expect(() => {
+            // @ts-expect-error - Testing immutability is intentional here.
+            commands.push(mockCommandB);
+        }).toThrow();
+        // Verify the original array was not mutated.
+        expect(service.getCommands()).toHaveLength(1);
+    });
+    it('should pass the abort signal to all loaders', async () => {
+        const controller = new AbortController();
+        const signal = controller.signal;
+        const loader1 = new MockCommandLoader([mockCommandA]);
+        const loader2 = new MockCommandLoader([mockCommandB]);
+        await CommandService.create([loader1, loader2], signal);
+        expect(loader1.loadCommands).toHaveBeenCalledTimes(1);
+        expect(loader1.loadCommands).toHaveBeenCalledWith(signal);
+        expect(loader2.loadCommands).toHaveBeenCalledTimes(1);
+        expect(loader2.loadCommands).toHaveBeenCalledWith(signal);
+    });
+    it('should rename extension commands when they conflict', async () => {
+        const builtinCommand = createMockCommand('deploy', CommandKind.BUILT_IN);
+        const userCommand = createMockCommand('sync', CommandKind.FILE);
+        const extensionCommand1 = {
+            ...createMockCommand('deploy', CommandKind.FILE),
+            extensionName: 'firebase',
+            description: '[firebase] Deploy to Firebase',
+        };
+        const extensionCommand2 = {
+            ...createMockCommand('sync', CommandKind.FILE),
+            extensionName: 'git-helper',
+            description: '[git-helper] Sync with remote',
+        };
+        const mockLoader1 = new MockCommandLoader([builtinCommand]);
+        const mockLoader2 = new MockCommandLoader([
+            userCommand,
+            extensionCommand1,
+            extensionCommand2,
+        ]);
+        const service = await CommandService.create([mockLoader1, mockLoader2], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(4);
+        // Built-in command keeps original name
+        const deployBuiltin = commands.find((cmd) => cmd.name === 'deploy' && !cmd.extensionName);
+        expect(deployBuiltin).toBeDefined();
+        expect(deployBuiltin?.kind).toBe(CommandKind.BUILT_IN);
+        // Extension command conflicting with built-in gets renamed
+        const deployExtension = commands.find((cmd) => cmd.name === 'firebase.deploy');
+        expect(deployExtension).toBeDefined();
+        expect(deployExtension?.extensionName).toBe('firebase');
+        // User command keeps original name
+        const syncUser = commands.find((cmd) => cmd.name === 'sync' && !cmd.extensionName);
+        expect(syncUser).toBeDefined();
+        expect(syncUser?.kind).toBe(CommandKind.FILE);
+        // Extension command conflicting with user command gets renamed
+        const syncExtension = commands.find((cmd) => cmd.name === 'git-helper.sync');
+        expect(syncExtension).toBeDefined();
+        expect(syncExtension?.extensionName).toBe('git-helper');
+    });
+    it('should handle user/project command override correctly', async () => {
+        const builtinCommand = createMockCommand('help', CommandKind.BUILT_IN);
+        const userCommand = createMockCommand('help', CommandKind.FILE);
+        const projectCommand = createMockCommand('deploy', CommandKind.FILE);
+        const userDeployCommand = createMockCommand('deploy', CommandKind.FILE);
+        const mockLoader1 = new MockCommandLoader([builtinCommand]);
+        const mockLoader2 = new MockCommandLoader([
+            userCommand,
+            userDeployCommand,
+            projectCommand,
+        ]);
+        const service = await CommandService.create([mockLoader1, mockLoader2], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(2);
+        // User command overrides built-in
+        const helpCommand = commands.find((cmd) => cmd.name === 'help');
+        expect(helpCommand).toBeDefined();
+        expect(helpCommand?.kind).toBe(CommandKind.FILE);
+        // Project command overrides user command (last wins)
+        const deployCommand = commands.find((cmd) => cmd.name === 'deploy');
+        expect(deployCommand).toBeDefined();
+        expect(deployCommand?.kind).toBe(CommandKind.FILE);
+    });
+    it('should handle secondary conflicts when renaming extension commands', async () => {
+        // User has both /deploy and /gcp.deploy commands
+        const userCommand1 = createMockCommand('deploy', CommandKind.FILE);
+        const userCommand2 = createMockCommand('gcp.deploy', CommandKind.FILE);
+        // Extension also has a deploy command that will conflict with user's /deploy
+        const extensionCommand = {
+            ...createMockCommand('deploy', CommandKind.FILE),
+            extensionName: 'gcp',
+            description: '[gcp] Deploy to Google Cloud',
+        };
+        const mockLoader = new MockCommandLoader([
+            userCommand1,
+            userCommand2,
+            extensionCommand,
+        ]);
+        const service = await CommandService.create([mockLoader], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(3);
+        // Original user command keeps its name
+        const deployUser = commands.find((cmd) => cmd.name === 'deploy' && !cmd.extensionName);
+        expect(deployUser).toBeDefined();
+        // User's dot notation command keeps its name
+        const gcpDeployUser = commands.find((cmd) => cmd.name === 'gcp.deploy' && !cmd.extensionName);
+        expect(gcpDeployUser).toBeDefined();
+        // Extension command gets renamed with suffix due to secondary conflict
+        const deployExtension = commands.find((cmd) => cmd.name === 'gcp.deploy1' && cmd.extensionName === 'gcp');
+        expect(deployExtension).toBeDefined();
+        expect(deployExtension?.description).toBe('[gcp] Deploy to Google Cloud');
+    });
+    it('should handle multiple secondary conflicts with incrementing suffixes', async () => {
+        // User has /deploy, /gcp.deploy, and /gcp.deploy1
+        const userCommand1 = createMockCommand('deploy', CommandKind.FILE);
+        const userCommand2 = createMockCommand('gcp.deploy', CommandKind.FILE);
+        const userCommand3 = createMockCommand('gcp.deploy1', CommandKind.FILE);
+        // Extension has a deploy command
+        const extensionCommand = {
+            ...createMockCommand('deploy', CommandKind.FILE),
+            extensionName: 'gcp',
+            description: '[gcp] Deploy to Google Cloud',
+        };
+        const mockLoader = new MockCommandLoader([
+            userCommand1,
+            userCommand2,
+            userCommand3,
+            extensionCommand,
+        ]);
+        const service = await CommandService.create([mockLoader], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(4);
+        // Extension command gets renamed with suffix 2 due to multiple conflicts
+        const deployExtension = commands.find((cmd) => cmd.name === 'gcp.deploy2' && cmd.extensionName === 'gcp');
+        expect(deployExtension).toBeDefined();
+        expect(deployExtension?.description).toBe('[gcp] Deploy to Google Cloud');
+    });
+});
+//# sourceMappingURL=CommandService.test.js.map

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

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

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

@@ -3,9 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Config } from '@umsai/ums-code-core';
-import { ICommandLoader } from './types.js';
-import { SlashCommand } from '../ui/commands/types.js';
+import type { Config } from '@umsai/ums-code-core';
+import type { ICommandLoader } from './types.js';
+import type { SlashCommand } from '../ui/commands/types.js';
 /**
  * Discovers and loads custom slash commands from .toml files in both the
  * user's global config directory and the current project's directory.
@@ -19,6 +19,8 @@ import { SlashCommand } from '../ui/commands/types.js';
 export declare class FileCommandLoader implements ICommandLoader {
     private readonly config;
     private readonly projectRoot;
+    private readonly folderTrustEnabled;
+    private readonly folderTrust;
     constructor(config: Config | null);
     /**
      * Loads all commands from user, project, and extension directories.

package/dist/src/services/FileCommandLoader.js

@@ -3,16 +3,17 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { promises as fs } from 'fs';
-import path from 'path';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
 import toml from '@iarna/toml';
 import { glob } from 'glob';
 import { z } from 'zod';
-import { getProjectCommandsDir, getUserCommandsDir, } from '@umsai/ums-code-core';
-import { CommandKind, } from '../ui/commands/types.js';
-import { DefaultArgumentProcessor, ShorthandArgumentProcessor, } from './prompt-processors/argumentProcessor.js';
-import { SHORTHAND_ARGS_PLACEHOLDER, SHELL_INJECTION_TRIGGER, } from './prompt-processors/types.js';
+import { Storage } from '@umsai/ums-code-core';
+import { CommandKind } from '../ui/commands/types.js';
+import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
+import { SHORTHAND_ARGS_PLACEHOLDER, SHELL_INJECTION_TRIGGER, AT_FILE_INJECTION_TRIGGER, } from './prompt-processors/types.js';
 import { ConfirmationRequiredError, ShellProcessor, } from './prompt-processors/shellProcessor.js';
+import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
 /**
  * Defines the Zod schema for a command definition file. This serves as the
  * single source of truth for both validation and type inference.
@@ -37,8 +38,12 @@ const TomlCommandDefSchema = z.object({
 export class FileCommandLoader {
     config;
     projectRoot;
+    folderTrustEnabled;
+    folderTrust;
     constructor(config) {
         this.config = config;
+        this.folderTrustEnabled = !!config?.getFolderTrustFeature();
+        this.folderTrust = !!config?.getFolderTrust();
         this.projectRoot = config?.getProjectRoot() || process.cwd();
     }
     /**
@@ -68,6 +73,9 @@ export class FileCommandLoader {
                     ...globOptions,
                     cwd: dirInfo.path,
                 });
+                if (this.folderTrustEnabled && !this.folderTrust) {
+                    return [];
+                }
                 const commandPromises = files.map((file) => this.parseAndAdaptFile(path.join(dirInfo.path, file), dirInfo.path, dirInfo.extensionName));
                 const commands = (await Promise.all(commandPromises)).filter((cmd) => cmd !== null);
                 // Add all commands without deduplication
@@ -88,10 +96,11 @@ export class FileCommandLoader {
      */
     getCommandDirectories() {
         const dirs = [];
+        const storage = this.config?.storage ?? new Storage(this.projectRoot);
         // 1. User commands
-        dirs.push({ path: getUserCommandsDir() });
+        dirs.push({ path: Storage.getUserCommandsDir() });
         // 2. Project commands (override user commands)
-        dirs.push({ path: getProjectCommandsDir(this.projectRoot) });
+        dirs.push({ path: storage.getProjectCommandsDir() });
         // 3. Extension commands (processed last to detect all conflicts)
         if (this.config) {
             const activeExtensions = this.config
@@ -152,15 +161,23 @@ export class FileCommandLoader {
             description = `[${extensionName}] ${description}`;
         }
         const processors = [];
-        // Add the Shell Processor if needed.
-        if (validDef.prompt.includes(SHELL_INJECTION_TRIGGER)) {
-            processors.push(new ShellProcessor(baseCommandName));
+        const usesArgs = validDef.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER);
+        const usesShellInjection = validDef.prompt.includes(SHELL_INJECTION_TRIGGER);
+        const usesAtFileInjection = validDef.prompt.includes(AT_FILE_INJECTION_TRIGGER);
+        // 1. @-File Injection (Security First).
+        // This runs first to ensure we're not executing shell commands that
+        // could dynamically generate malicious @-paths.
+        if (usesAtFileInjection) {
+            processors.push(new AtFileProcessor(baseCommandName));
         }
-        // The presence of '{{args}}' is the switch that determines the behavior.
-        if (validDef.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER)) {
-            processors.push(new ShorthandArgumentProcessor());
+        // 2. Argument and Shell Injection.
+        // This runs after file content has been safely injected.
+        if (usesShellInjection || usesArgs) {
+            processors.push(new ShellProcessor(baseCommandName));
         }
-        else {
+        // 3. Default Argument Handling.
+        // Appends the raw invocation if no explicit {{args}} are used.
+        if (!usesArgs) {
             processors.push(new DefaultArgumentProcessor());
         }
         return {
@@ -173,17 +190,19 @@ export class FileCommandLoader {
                     console.error(`[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`);
                     return {
                         type: 'submit_prompt',
-                        content: validDef.prompt, // Fallback to unprocessed prompt
+                        content: [{ text: validDef.prompt }], // Fallback to unprocessed prompt
                     };
                 }
                 try {
-                    let processedPrompt = validDef.prompt;
+                    let processedContent = [
+                        { text: validDef.prompt },
+                    ];
                     for (const processor of processors) {
-                        processedPrompt = await processor.process(processedPrompt, context);
+                        processedContent = await processor.process(processedContent, context);
                     }
                     return {
                         type: 'submit_prompt',
-                        content: processedPrompt,
+                        content: processedContent,
                     };
                 }
                 catch (e) {

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

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

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

@@ -3,9 +3,10 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Config } from '@umsai/ums-code-core';
-import { SlashCommand } from '../ui/commands/types.js';
-import { ICommandLoader } from './types.js';
+import type { Config } from '@umsai/ums-code-core';
+import type { SlashCommand } from '../ui/commands/types.js';
+import type { ICommandLoader } from './types.js';
+import type { PromptArgument } from '@modelcontextprotocol/sdk/types.js';
 /**
  * Discovers and loads executable slash commands from prompts exposed by
  * Model-Context-Protocol (MCP) servers.
@@ -21,5 +22,14 @@ export declare class McpPromptLoader implements ICommandLoader {
      * @returns A promise that resolves to an array of loaded SlashCommands.
      */
     loadCommands(_signal: AbortSignal): Promise<SlashCommand[]>;
-    private parseArgs;
+    /**
+     * Parses the `userArgs` string representing the prompt arguments (all the text
+     * after the command) into a record matching the shape of the `promptArgs`.
+     *
+     * @param userArgs
+     * @param promptArgs
+     * @returns A record of the parsed arguments
+     * @visibleForTesting
+     */
+    parseArgs(userArgs: string, promptArgs: PromptArgument[] | undefined): Record<string, unknown> | Error;
 }

package/dist/src/services/McpPromptLoader.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { getErrorMessage, getMCPServerPrompts, } from '@umsai/ums-code-core';
-import { CommandKind, } from '../ui/commands/types.js';
+import { CommandKind } from '../ui/commands/types.js';
 /**
  * Discovers and loads executable slash commands from prompts exposed by
  * Model-Context-Protocol (MCP) servers.
@@ -95,14 +95,14 @@ export class McpPromptLoader {
                                 };
                             }
                             const result = await prompt.invoke(promptInputs);
-                            if (result.error) {
+                            if (result['error']) {
                                 return {
                                     type: 'message',
                                     messageType: 'error',
-                                    content: `Error invoking prompt: ${result.error}`,
+                                    content: `Error invoking prompt: ${result['error']}`,
                                 };
                             }
-                            if (!result.messages?.[0]?.content?.text) {
+                            if (!result.messages?.[0]?.content?.['text']) {
                                 return {
                                     type: 'message',
                                     messageType: 'error',
@@ -122,18 +122,53 @@ export class McpPromptLoader {
                             };
                         }
                     },
-                    completion: async (_, partialArg) => {
-                        if (!prompt || !prompt.arguments) {
+                    completion: async (commandContext, partialArg) => {
+                        const invocation = commandContext.invocation;
+                        if (!prompt || !prompt.arguments || !invocation) {
                             return [];
                         }
-                        const suggestions = [];
-                        const usedArgNames = new Set((partialArg.match(/--([^=]+)/g) || []).map((s) => s.substring(2)));
-                        for (const arg of prompt.arguments) {
-                            if (!usedArgNames.has(arg.name)) {
-                                suggestions.push(`--${arg.name}=""`);
+                        const indexOfFirstSpace = invocation.raw.indexOf(' ') + 1;
+                        let promptInputs = indexOfFirstSpace === 0
+                            ? {}
+                            : this.parseArgs(invocation.raw.substring(indexOfFirstSpace), prompt.arguments);
+                        if (promptInputs instanceof Error) {
+                            promptInputs = {};
+                        }
+                        const providedArgNames = Object.keys(promptInputs);
+                        const unusedArguments = prompt.arguments
+                            .filter((arg) => {
+                            // If this arguments is not in the prompt inputs
+                            // add it to unusedArguments
+                            if (!providedArgNames.includes(arg.name)) {
+                                return true;
+                            }
+                            // The parseArgs method assigns the value
+                            // at the end of the prompt as a final value
+                            // The argument should still be suggested
+                            // Example /add --numberOne="34" --num
+                            // numberTwo would be assigned a value of --num
+                            // numberTwo should still be considered unused
+                            const argValue = promptInputs[arg.name];
+                            return argValue === partialArg;
+                        })
+                            .map((argument) => `--${argument.name}="`) || [];
+                        const exactlyMatchingArgumentAtTheEnd = prompt.arguments
+                            .map((argument) => `--${argument.name}="`)
+                            .filter((flagArgument) => {
+                            const regex = new RegExp(`${flagArgument}[^"]*$`);
+                            return regex.test(invocation.raw);
+                        });
+                        if (exactlyMatchingArgumentAtTheEnd.length === 1) {
+                            if (exactlyMatchingArgumentAtTheEnd[0] === partialArg) {
+                                return [`${partialArg}"`];
                             }
+                            if (partialArg.endsWith('"')) {
+                                return [partialArg];
+                            }
+                            return [`${partialArg}"`];
                         }
-                        return suggestions;
+                        const matchingArguments = unusedArguments.filter((flagArgument) => flagArgument.startsWith(partialArg));
+                        return matchingArguments;
                     },
                 };
                 promptCommands.push(newPromptCommand);
@@ -141,29 +176,46 @@ export class McpPromptLoader {
         }
         return Promise.resolve(promptCommands);
     }
+    /**
+     * Parses the `userArgs` string representing the prompt arguments (all the text
+     * after the command) into a record matching the shape of the `promptArgs`.
+     *
+     * @param userArgs
+     * @param promptArgs
+     * @returns A record of the parsed arguments
+     * @visibleForTesting
+     */
     parseArgs(userArgs, promptArgs) {
         const argValues = {};
         const promptInputs = {};
         // arg parsing: --key="value" or --key=value
-        const namedArgRegex = /--([^=]+)=(?:"((?:\\.|[^"\\])*)"|([^ ]*))/g;
+        const namedArgRegex = /--([^=]+)=(?:"((?:\\.|[^"\\])*)"|([^ ]+))/g;
         let match;
-        const remainingArgs = [];
         let lastIndex = 0;
+        const positionalParts = [];
         while ((match = namedArgRegex.exec(userArgs)) !== null) {
             const key = match[1];
-            const value = match[2] ?? match[3]; // Quoted or unquoted value
+            // Extract the quoted or unquoted argument and remove escape chars.
+            const value = (match[2] ?? match[3]).replace(/\\(.)/g, '$1');
             argValues[key] = value;
             // Capture text between matches as potential positional args
             if (match.index > lastIndex) {
-                remainingArgs.push(userArgs.substring(lastIndex, match.index).trim());
+                positionalParts.push(userArgs.substring(lastIndex, match.index));
             }
             lastIndex = namedArgRegex.lastIndex;
         }
         // Capture any remaining text after the last named arg
         if (lastIndex < userArgs.length) {
-            remainingArgs.push(userArgs.substring(lastIndex).trim());
+            positionalParts.push(userArgs.substring(lastIndex));
+        }
+        const positionalArgsString = positionalParts.join('').trim();
+        // extracts either quoted strings or non-quoted sequences of non-space characters.
+        const positionalArgRegex = /(?:"((?:\\.|[^"\\])*)"|([^ ]+))/g;
+        const positionalArgs = [];
+        while ((match = positionalArgRegex.exec(positionalArgsString)) !== null) {
+            // Extract the quoted or unquoted argument and remove escape chars.
+            positionalArgs.push((match[1] ?? match[2]).replace(/\\(.)/g, '$1'));
         }
-        const positionalArgs = remainingArgs.join(' ').split(/ +/);
         if (!promptArgs) {
             return promptInputs;
         }
@@ -173,19 +225,28 @@ export class McpPromptLoader {
             }
         }
         const unfilledArgs = promptArgs.filter((arg) => arg.required && !promptInputs[arg.name]);
-        const missingArgs = [];
-        for (let i = 0; i < unfilledArgs.length; i++) {
-            if (positionalArgs.length > i && positionalArgs[i]) {
-                promptInputs[unfilledArgs[i].name] = positionalArgs[i];
+        if (unfilledArgs.length === 1) {
+            // If we have only one unfilled arg, we don't require quotes we just
+            // join all the given arguments together as if they were quoted.
+            promptInputs[unfilledArgs[0].name] = positionalArgs.join(' ');
+        }
+        else {
+            const missingArgs = [];
+            for (let i = 0; i < unfilledArgs.length; i++) {
+                if (positionalArgs.length > i) {
+                    promptInputs[unfilledArgs[i].name] = positionalArgs[i];
+                }
+                else {
+                    missingArgs.push(unfilledArgs[i].name);
+                }
             }
-            else {
-                missingArgs.push(unfilledArgs[i].name);
+            if (missingArgs.length > 0) {
+                const missingArgNames = missingArgs
+                    .map((name) => `--${name}`)
+                    .join(', ');
+                return new Error(`Missing required argument(s): ${missingArgNames}`);
             }
         }
-        if (missingArgs.length > 0) {
-            const missingArgNames = missingArgs.map((name) => `--${name}`).join(', ');
-            return new Error(`Missing required argument(s): ${missingArgNames}`);
-        }
         return promptInputs;
     }
 }