Fix the issues in the hurl client

.vscode/launch.json

@@ -290,7 +290,7 @@
             "preLaunchTask": "npm: watch-apk"
         },
         {
-            "name": "HTTP Client Extension",
+            "name": "Hurl Client Extension",
             "type": "extensionHost",
             "request": "launch",
             "debugWebviews": true,

common/config/rush/pnpm-config.json

@@ -95,7 +95,8 @@
       "@codemirror/view": "6.38.8",
       "@codemirror/lint": "6.8.5",
       "@codemirror/state": "6.5.2",
-      "qs": ">=6.15.2",
+      "qs": ">=6.16.0",
+      "fast-uri": "^3.1.6",
       "@babel/core": ">=7.29.7",
       "dompurify": ">=3.4.12",
       "js-yaml": "4.3.1",

workspaces/api-tryit/hurl-parser/src/hurl-collection-file.ts

@@ -158,23 +158,51 @@ export function splitHurlRequestBlocks(content: string): string[] {
 	return parseHurlDocument(content).blocks.map(block => block.text);
 }
 
+export interface HurlDocumentBoundary {
+	/** Index into the `blocks` array passed to composeHurlDocumentWithBoundaries. */
+	sourceIndex: number;
+	startLine: number;
+	endLine: number;
+}
+
+/**
+ * Like composeHurlDocument, but also reports the line range each surviving
+ * block occupies in the combined document. Blocks that are empty after
+ * trimming are dropped, exactly as composeHurlDocument drops them, and are
+ * simply absent from `boundaries` - callers that need to correlate back to
+ * their original block list should use `sourceIndex`, not array position.
+ */
+export function composeHurlDocumentWithBoundaries(blocks: string[]): { document: string; boundaries: HurlDocumentBoundary[] } {
+	const boundaries: HurlDocumentBoundary[] = [];
+	const survivingBlocks: string[] = [];
+	let currentLine = 1;
+
+	blocks.forEach((block, sourceIndex) => {
+		const normalized = normalizeHurlLineEndings(block).trim();
+		if (!normalized) {
+			return;
+		}
+		const lineCount = normalized.split('\n').length;
+		boundaries.push({ sourceIndex, startLine: currentLine, endLine: currentLine + lineCount - 1 });
+		survivingBlocks.push(normalized);
+		currentLine += lineCount + 1; // account for the blank separator line
+	});
+
+	const document = survivingBlocks.length > 0 ? `${survivingBlocks.join('\n\n').trimEnd()}\n` : '';
+	return { document, boundaries };
+}
+
 export function composeHurlDocument(header: string, blocks: string[]): string {
 	const normalizedHeader = normalizeHurlLineEndings(header).trim();
-	const normalizedBlocks = blocks
-		.map(block => normalizeHurlLineEndings(block).trim())
-		.filter(block => block.length > 0);
+	const { document: blocksDocument } = composeHurlDocumentWithBoundaries(blocks);
 
-	const sections: string[] = [];
-	if (normalizedHeader) {
-		sections.push(normalizedHeader);
+	if (!normalizedHeader) {
+		return blocksDocument;
 	}
-	sections.push(...normalizedBlocks);
-
-	if (sections.length === 0) {
-		return '';
+	if (!blocksDocument) {
+		return `${normalizedHeader}\n`;
 	}
-
-	return `${sections.join('\n\n').trimEnd()}\n`;
+	return `${normalizedHeader}\n\n${blocksDocument}`;
 }
 
 export function upsertCollectionNameInHurl(content: string, collectionName: string): string {

workspaces/api-tryit/hurl-parser/tests/hurl-parser.test.ts

@@ -23,7 +23,7 @@ import {
 	parseHurlCollection,
 } from '../src';
 import type { ApiCollection } from '@wso2/api-tryit-core';
-import { parseHurlDocument } from '../src';
+import { composeHurlDocument, composeHurlDocumentWithBoundaries, parseHurlDocument } from '../src';
 
 // verify that the utility for splitting Hurl documents is available
 
@@ -53,6 +53,97 @@ describe('parseHurlDocument helper', () => {
 	});
 });
 
+describe('composeHurlDocument for combining notebook cells into one Chained Run', () => {
+	it('combines separately-authored entry sources into one document that reparses in the same order', () => {
+		// Mirrors the marketplace review's exact scenario: a GET that captures
+		// api_key, followed by an entry that uses {{api_key}} - each string here
+		// stands in for one notebook cell's own text.
+		const capturingCell = [
+			'GET http://localhost:3333',
+			'HTTP 200',
+			'[Captures]',
+			'api_key: jsonpath "$.api_key"',
+		].join('\n');
+		const dependentCell = [
+			'GET http://localhost:3333/protected',
+			'Authorization: Bearer {{api_key}}',
+			'HTTP 200',
+		].join('\n');
+
+		const combined = composeHurlDocument('', [capturingCell, dependentCell]);
+		const { blocks } = parseHurlDocument(combined);
+
+		expect(blocks).toHaveLength(2);
+		expect(blocks[0].text).toContain('[Captures]');
+		expect(blocks[0].text).toContain('api_key: jsonpath "$.api_key"');
+		expect(blocks[1].text).toContain('{{api_key}}');
+		expect(blocks[1].method).toBe('GET');
+		expect(blocks[1].url).toBe('http://localhost:3333/protected');
+	});
+
+	it('preserves cell order for more than two combined cells', () => {
+		const cells = [
+			'GET https://example.com/one\nHTTP 200',
+			'GET https://example.com/two\nHTTP 200',
+			'GET https://example.com/three\nHTTP 200',
+		];
+
+		const combined = composeHurlDocument('', cells);
+		const { blocks } = parseHurlDocument(combined);
+
+		expect(blocks.map(b => b.url)).toEqual([
+			'https://example.com/one',
+			'https://example.com/two',
+			'https://example.com/three',
+		]);
+	});
+
+	it('drops cells that are blank after trimming rather than producing an empty block', () => {
+		const combined = composeHurlDocument('', ['GET https://example.com/one\nHTTP 200', '   ', '']);
+		const { blocks } = parseHurlDocument(combined);
+
+		expect(blocks).toHaveLength(1);
+	});
+});
+
+describe('composeHurlDocumentWithBoundaries', () => {
+	it('reports the line range each block occupies in the combined document', () => {
+		const blocks = ['GET https://example.com/one\nHTTP 200', 'GET https://example.com/two\nHTTP 200'];
+		const { document, boundaries } = composeHurlDocumentWithBoundaries(blocks);
+
+		expect(document.split('\n')).toEqual([
+			'GET https://example.com/one', 'HTTP 200', '', 'GET https://example.com/two', 'HTTP 200', ''
+		]);
+		expect(boundaries).toEqual([
+			{ sourceIndex: 0, startLine: 1, endLine: 2 },
+			{ sourceIndex: 1, startLine: 4, endLine: 5 }
+		]);
+	});
+
+	it('leaves a gap in source indices for blocks dropped as blank, without shifting later boundaries', () => {
+		// Mirrors the notebook header-cell bug: a comment-only block that
+		// survives (it's non-blank, just has no request) still gets its own
+		// boundary and line range - callers correlate back to their original
+		// cell list via sourceIndex, not array position.
+		const blocks = [
+			'GET https://example.com/one\nHTTP 200',
+			'# just a comment, no request',
+			'GET https://example.com/two\nHTTP 200'
+		];
+		const { boundaries } = composeHurlDocumentWithBoundaries(blocks);
+
+		expect(boundaries.map(b => b.sourceIndex)).toEqual([0, 1, 2]);
+		expect(boundaries[1].startLine).toBe(4);
+		expect(boundaries[2].startLine).toBe(6);
+	});
+
+	it('drops genuinely blank blocks entirely, leaving a gap in sourceIndex', () => {
+		const blocks = ['GET https://example.com/one\nHTTP 200', '   ', 'GET https://example.com/two\nHTTP 200'];
+		const { boundaries } = composeHurlDocumentWithBoundaries(blocks);
+
+		expect(boundaries.map(b => b.sourceIndex)).toEqual([0, 2]);
+	});
+});
 
 describe('parseHurlCollection', () => {
 	it('parses a single Hurl request into an ApiCollection model', () => {

workspaces/api-tryit/hurl-runner/src/hurl-runner.ts

@@ -407,6 +407,12 @@ export class HurlRunnerImpl implements HurlRunner {
 		if (options.includeResponseOutput) {
 			args.push('-i');
 		}
+		// Order matters: later --variables-file entries override earlier ones for
+		// values they both define, so callers pass the shared file before any
+		// per-file override.
+		for (const variablesFilePath of options.variablesFilePaths || []) {
+			args.push('--variables-file', variablesFilePath);
+		}
 		if (options.insecure) {
 			args.push('-k');
 		}
@@ -416,6 +422,9 @@ export class HurlRunnerImpl implements HurlRunner {
 		for (const [key, value] of Object.entries(options.variables || {})) {
 			args.push('--variable', `${key}=${value}`);
 		}
+		if (options.extraArgs && options.extraArgs.length > 0) {
+			args.push(...options.extraArgs);
+		}
 		return args;
 	}