norn-cli 4.6.1 → 4.6.2

package/dist/cli.js

@@ -166647,6 +166647,9 @@ function parseDurationToMs(rawValue, defaultUnit = "ms") {
 }
 
 // src/formUrlEncoded.ts
+function decodeFieldValue(value) {
+  return isQuotedStringLiteral(value) ? decodeQuotedStringLiteral(value) : value;
+}
 function parseEqualsField(segment) {
   const eqIndex = segment.indexOf("=");
   if (eqIndex <= 0) {
@@ -166654,9 +166657,53 @@ function parseEqualsField(segment) {
   }
   return {
     key: segment.substring(0, eqIndex).trim(),
-    value: segment.substring(eqIndex + 1).trim()
+    value: decodeFieldValue(segment.substring(eqIndex + 1).trim())
   };
 }
+function splitAmpersandDelimitedLine(line2) {
+  const segments = [];
+  let current = "";
+  let quote;
+  let escaped = false;
+  let inValue = false;
+  let valueStarted = false;
+  for (const char of line2) {
+    if (escaped) {
+      current += char;
+      escaped = false;
+      continue;
+    }
+    if (quote && char === "\\") {
+      current += char;
+      escaped = true;
+      continue;
+    }
+    if ((char === '"' || char === "'") && (quote || inValue && !valueStarted)) {
+      if (!quote) {
+        quote = char;
+      } else if (quote === char) {
+        quote = void 0;
+      }
+      current += char;
+      continue;
+    }
+    if (char === "&" && !quote) {
+      segments.push(current.trim());
+      current = "";
+      inValue = false;
+      valueStarted = false;
+      continue;
+    }
+    current += char;
+    if (!inValue && char === "=") {
+      inValue = true;
+    } else if (inValue && !/\s/.test(char)) {
+      valueStarted = true;
+    }
+  }
+  segments.push(current.trim());
+  return segments;
+}
 function isFormUrlEncodedContentType(contentType) {
   return Boolean(contentType && contentType.toLowerCase().includes("application/x-www-form-urlencoded"));
 }
@@ -166672,7 +166719,7 @@ function parseFormUrlEncodedLines(lines) {
     const firstColonIndex = line2.indexOf(":");
     if (firstEqIndex > 0 && (firstColonIndex === -1 || firstEqIndex < firstColonIndex)) {
       if (line2.includes("&")) {
-        const segments = line2.split("&").map((segment) => segment.trim());
+        const segments = splitAmpersandDelimitedLine(line2);
         const hasInvalidSegment = segments.some((segment) => !parseEqualsField(segment));
         if (hasInvalidSegment) {
           errors.push({
@@ -166699,7 +166746,7 @@ function parseFormUrlEncodedLines(lines) {
     if (firstColonIndex > 0) {
       fields.push({
         key: line2.substring(0, firstColonIndex).trim(),
-        value: line2.substring(firstColonIndex + 1).trim()
+        value: decodeFieldValue(line2.substring(firstColonIndex + 1).trim())
       });
       continue;
     }
@@ -166723,10 +166770,13 @@ function encodeFormUrlEncodedBody(body) {
     return { encodedBody: "", errors };
   }
   return {
-    encodedBody: fields.map((field) => `${encodeURIComponent(field.key)}=${encodeURIComponent(field.value)}`).join("&"),
+    encodedBody: encodeFormUrlEncodedFields(fields),
     errors: []
   };
 }
+function encodeFormUrlEncodedFields(fields) {
+  return fields.map((field) => `${encodeURIComponent(field.key)}=${encodeURIComponent(field.value)}`).join("&");
+}
 
 // src/sequenceCancellation.ts
 var SEQUENCE_CANCELLED_MESSAGE = "Sequence run cancelled by user.";
@@ -166861,7 +166911,10 @@ async function sendRequestWithJar(request, jar, retryOptions, signal) {
           );
           const contentTypeValue = contentType ? headers[contentType] : "";
           if (isFormUrlEncodedContentType(contentTypeValue)) {
-            const encoded = encodeFormUrlEncodedBody(currentBody);
+            const encoded = request.formUrlEncodedBody ? {
+              encodedBody: encodeFormUrlEncodedFields(request.formUrlEncodedBody.fields),
+              errors: request.formUrlEncodedBody.errors
+            } : encodeFormUrlEncodedBody(currentBody);
             if (encoded.errors.length > 0) {
               throw new NornError({
                 category: "syntax",
@@ -168154,7 +168207,7 @@ function validatePreparedRequest(parsed, context) {
   }
   const contentType = getHeaderValueCaseInsensitive(parsed.headers, "Content-Type");
   if (isFormUrlEncodedContentType(contentType)) {
-    const { errors } = parseFormUrlEncodedBody(parsed.body);
+    const errors = parsed.formUrlEncodedBody?.errors ?? parseFormUrlEncodedBody(parsed.body).errors;
     if (errors.length > 0) {
       throw new NornError({
         category: "syntax",
@@ -185378,6 +185431,25 @@ var McpSessionManager = class {
 };
 
 // src/requestPreparation.ts
+function getHeaderValueCaseInsensitive2(headers, name) {
+  const target = name.toLowerCase();
+  return Object.entries(headers).find(([headerName]) => headerName.toLowerCase() === target)?.[1];
+}
+function attachPreparedFormBody(request, authoredBody, variables) {
+  const contentType = getHeaderValueCaseInsensitive2(request.headers, "Content-Type");
+  if (!isFormUrlEncodedContentType(contentType) || !authoredBody) {
+    return request;
+  }
+  const parsed = parseFormUrlEncodedBody(authoredBody);
+  const prepared = {
+    errors: parsed.errors,
+    fields: parsed.fields.map((field) => ({
+      key: substituteVariables(field.key, variables),
+      value: substituteVariables(field.value, variables)
+    }))
+  };
+  return { ...request, formUrlEncodedBody: prepared };
+}
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -185421,7 +185493,8 @@ function resolveBareVariableRequestBody(request, variables) {
   }
   return {
     ...request,
-    body: stringifyRequestValue(variables[bareVariableMatch[1]])
+    body: stringifyRequestValue(variables[bareVariableMatch[1]]),
+    formUrlEncodedBody: void 0
   };
 }
 function applyHeaderGroupsToRequest(parsed, requestText, headerGroups, variables) {
@@ -185530,12 +185603,13 @@ function prepareRequestFromContent(requestContent, variables, apiDefinitions) {
       for (const [headerName, headerValue] of Object.entries(apiRequest.inlineHeaders)) {
         combinedHeaders[headerName] = substituteVariables(headerValue, variables);
       }
-      const request2 = {
+      let request2 = {
         method: apiRequest.method,
         url: resolvedPath,
         headers: combinedHeaders,
         body: apiRequest.body ? substituteVariables(apiRequest.body, variables) : void 0
       };
+      request2 = attachPreparedFormBody(request2, apiRequest.body, variables);
       return {
         request: request2,
         description: `${apiRequest.endpointName}(${Object.values(resolvedParams).join(", ")}) -> ${request2.method} ${request2.url}`,
@@ -185544,9 +185618,12 @@ function prepareRequestFromContent(requestContent, variables, apiDefinitions) {
     }
   }
   let request = parserHttpRequest(requestContent, variables);
+  let authoredRequest = parserHttpRequest(requestContent, {});
   if (apiDefinitions && apiDefinitions.headerGroups.length > 0) {
     request = applyHeaderGroupsToRequest(request, requestContent, apiDefinitions.headerGroups, variables);
+    authoredRequest = applyHeaderGroupsToRequest(authoredRequest, requestContent, apiDefinitions.headerGroups, {});
   }
+  request = attachPreparedFormBody(request, authoredRequest.body, variables);
   return {
     request,
     description: `${request.method} ${request.url}`
@@ -200666,7 +200743,20 @@ ${TOOL_RESULT_RECOVERY_INSTRUCTIONS}`;
           retry2.correctedByInvocationId = child.invocationId;
         }
         outputContractFailures = 0;
-        return Object.prototype.hasOwnProperty.call(child.output, "body") ? child.output.body : child.output.text;
+        const returnedOutput = Object.prototype.hasOwnProperty.call(child.output, "body") ? child.output.body : child.output.text;
+        if (this.rootInvocationId && this.options.onJournalEvent && !this.options.signal?.aborted) {
+          this.options.onJournalEvent({
+            type: "return",
+            timestamp: Date.now(),
+            rootInvocationId: this.rootInvocationId,
+            invocationId: child.invocationId,
+            parentInvocationId: parentHop.invocationId,
+            agent: child.agent,
+            parentAgent: parentHop.agent,
+            output: returnedOutput
+          });
+        }
+        return returnedOutput;
       }));
     }
     const offeredJournal = requestToolsOverride?.find((tool) => tool.kind === "journal" && tool.name === "report_progress");
@@ -208190,7 +208280,7 @@ ${describeUnmetExpectations(verdict).map((line2) => `  - ${line2}`).join("\n")}`
             let requestText = `${parsed.method} ${parsed.url}`;
             const contentLines = step.content.split("\n");
             if (contentLines.length > 1) {
-              const extraLines = contentLines.slice(1).map((line2) => substituteVariables(line2, runtimeVariables));
+              const extraLines = contentLines.slice(1);
               const hasExplicitBlank = extraLines.some((line2) => line2.trim() === "");
               const firstNonEmpty = extraLines.find((line2) => line2.trim() !== "");
               const startsWithHeader = firstNonEmpty ? /^[A-Za-z0-9\-_]+\s*:/.test(firstNonEmpty.trim()) : false;
@@ -214822,7 +214912,7 @@ async function main() {
   }
   const args = rawArgs[0] === "run" ? rawArgs.slice(1) : rawArgs;
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-V")) {
-    console.log(`Norn CLI ${"4.6.0"}`);
+    console.log(`Norn CLI ${"4.6.1"}`);
     return;
   }
   if (args.length === 0) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "norn-cli",
   "displayName": "Norn",
   "description": "Build version-controlled agentic flows in VS Code and run them from the CLI or CI.",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"