mmt-mcp 1.48.4 → 1.49.1-pre

package/dist/server.cjs

@@ -12210,7 +12210,11 @@ function currentValueForToken(spec) {
     return void 0;
   }
   if (alias) {
-    const duration = unsignedDurationMs(match[2]);
+    const raw = String(match[2] || "").trim();
+    if (/^[+-]/.test(raw)) {
+      return void 0;
+    }
+    const duration = parseRelativeAmountMs(raw);
     if (duration === void 0) {
       return void 0;
     }
@@ -12234,7 +12238,7 @@ var ACCESSOR_SEGMENT_RE = "(?:\\.[A-Za-z_][A-Za-z0-9_]*|\\[(?:-?\\d+(?::-?\\d*)?
 var ACCESSOR_PATH_RE = `${ACCESSOR_SEGMENT_RE}*`;
 var RANDOM_TOKEN_ARGUMENTS_RE = "\\(\\s*[^(),\\s]+(?:\\s*,\\s*[^(),\\s]+)?\\s*\\)";
 var RANDOM_TOKEN_SPEC_RE = `${TOKEN_NAME_RE}(?:${RANDOM_TOKEN_ARGUMENTS_RE})?`;
-var CURRENT_TOKEN_ARGUMENTS_RE = "\\([+-](?:\\d+(?:\\.\\d+)?(?:ms|s|m|h|d|w))+\\)";
+var CURRENT_TOKEN_ARGUMENTS_RE = "\\([^()]*\\)";
 var CURRENT_TOKEN_SPEC_RE = `${TOKEN_NAME_RE}(?:${CURRENT_TOKEN_ARGUMENTS_RE})?`;
 var RUNTIME_ARGS_LOOSE_RE = "(?:\\([^)]*\\))?";
 var RUNTIME_SPEC_RE = `${TOKEN_NAME_RE}${RUNTIME_ARGS_LOOSE_RE}`;
@@ -12874,7 +12878,7 @@ function isNonEmptyList(value) {
 var TOKEN_NAME_RE2 = "[A-Za-z_][A-Za-z0-9_\\-]*";
 var RANDOM_TOKEN_ARGUMENTS_RE2 = "\\(\\s*[^(),\\s]+(?:\\s*,\\s*[^(),\\s]+)?\\s*\\)";
 var RANDOM_TOKEN_SPEC_RE2 = `${TOKEN_NAME_RE2}(?:${RANDOM_TOKEN_ARGUMENTS_RE2})?`;
-var CURRENT_TOKEN_ARGUMENTS_RE2 = "\\([+-](?:\\d+(?:\\.\\d+)?(?:ms|s|m|h|d|w))+\\)";
+var CURRENT_TOKEN_ARGUMENTS_RE2 = "\\([^()]*\\)";
 var CURRENT_TOKEN_SPEC_RE2 = `${TOKEN_NAME_RE2}(?:${CURRENT_TOKEN_ARGUMENTS_RE2})?`;
 var ACCESSOR_SEGMENT_RE2 = "(?:\\.[A-Za-z_][A-Za-z0-9_]*|\\[(?:-?\\d+(?::-?\\d*)?|:-?\\d*|[A-Za-z_][A-Za-z0-9_]*)\\])";
 var ACCESSOR_PATH_RE2 = `${ACCESSOR_SEGMENT_RE2}*`;
@@ -13141,11 +13145,25 @@ function embedDynamicTokensAsJsInterpolations(value, options) {
   }
   return value;
 }
+function unwrapWholeValueDollarRef(value) {
+  const trimmed = String(value ?? "").trim();
+  if (!trimmed.startsWith("${") || !trimmed.endsWith("}")) {
+    return void 0;
+  }
+  if (trimmed.indexOf("${", 2) !== -1) {
+    return void 0;
+  }
+  return trimmed.slice(2, -1).trim();
+}
 function toTemplateValueJs(value, options) {
   const s = String(value ?? "");
   if (isLiteralTokenValue(s)) {
     return JSON.stringify(unwrapLiteralToken(s));
   }
+  const wholeRef = unwrapWholeValueDollarRef(s);
+  if (wholeRef !== void 0) {
+    return wholeRef || "undefined";
+  }
   const fullEnvAngle = new RegExp(`^<<\\s*e:(${TOKEN_NAME_RE2})(${ACCESSOR_PATH_RE2})\\s*>>$`);
   const fullEnvCurly = new RegExp(`^\\{\\{\\s*e:(${TOKEN_NAME_RE2})(${ACCESSOR_PATH_RE2})\\s*\\}\\}$`, "i");
   const fullEnvPlain = new RegExp(`^e:(${TOKEN_NAME_RE2})(${ACCESSOR_PATH_RE2})$`);
@@ -13816,7 +13834,7 @@ var PARSE_DURATION_JS_FN = `(function __parseDurationMs(v) {
   }
   return Math.round(total);
 })`;
-function durationToJsMsExpr(value) {
+function durationToJsMsExpr(value, tokenOptions) {
   if (typeof value === "number") {
     return String(Math.round(value));
   }
@@ -13828,7 +13846,8 @@ function durationToJsMsExpr(value) {
   if (/^\d+(?:\.\d+)?$/.test(trimmed)) {
     return String(Math.round(Number(trimmed)));
   }
-  return `${PARSE_DURATION_JS_FN}(${JSON.stringify(value)})`;
+  const resolved = toTemplateValueJs(trimmed, tokenOptions);
+  return `${PARSE_DURATION_JS_FN}(${resolved})`;
 }
 function toLowerUnderscore(input) {
   if (input === void 0 || input === null) {
@@ -20026,8 +20045,9 @@ var toConditionJsExpr = (value, knownInputNames) => {
   if (!trimmed) {
     return "undefined";
   }
-  if (/^\$\{[\s\S]+\}$/.test(trimmed)) {
-    return trimmed.slice(2, -1).trim() || "undefined";
+  const wholeRef = unwrapWholeValueDollarRef(trimmed);
+  if (wholeRef !== void 0) {
+    return normalizeRuntimeActualExpression(wholeRef) || "undefined";
   }
   try {
     const parsed = YAML5.parse(trimmed);
@@ -20311,14 +20331,46 @@ var repeatToJSfunc = async (loop, useExternalReport, importTitleMap, hoistedIds,
   ${indentLines(loopBody)}
 }`;
   }
-  return `for (let i = 0; i < ${loopCondition}; i++) {
+  if (loopCondition.toLowerCase() === "inf") {
+    return `for (;;) {
   ${indentLines(loopBody)}
+}`;
+  }
+  if (typeof loop.repeat === "number" || /^\d+$/.test(loopCondition)) {
+    return `for (let i = 0; i < ${loopCondition}; i++) {
+  ${indentLines(loopBody)}
+}`;
+  }
+  const rawExpr = toTemplateValueJs(
+    loopCondition,
+    jsTokenOptions(knownInputNames)
+  );
+  const indentedBody = indentLines(loopBody);
+  return `{
+  const __repeatRaw = ${rawExpr};
+  const __repeatStr = String(__repeatRaw ?? '').trim();
+  const __repeatLower = __repeatStr.toLowerCase();
+  if (__repeatLower === 'inf') {
+    for (;;) {
+      ${indentedBody}
+    }
+  } else if (/^((?:\\d+(?:\\.\\d+)?)(?:ns|ms|s|m|h))+$/i.test(__repeatLower)) {
+    const __repeatMs = ${PARSE_DURATION_JS_FN}(__repeatStr);
+    for (const __repeatStart = Date.now(); Date.now() < __repeatStart + __repeatMs; ) {
+      ${indentedBody}
+    }
+  } else {
+    const __repeatN = Number(__repeatRaw);
+    for (let i = 0; i < __repeatN; i++) {
+      ${indentedBody}
+    }
+  }
 }`;
 };
 var DELAY_ABORT_CHECK_MS = 2e3;
-function delayToJSfunc(d) {
+function delayToJSfunc(d, knownInputNames) {
   return `{
-  let __delayLeft = ${durationToJsMsExpr(d)};
+  let __delayLeft = ${durationToJsMsExpr(d, jsTokenOptions(knownInputNames))};
   while (__delayLeft > 0) {
     await checkAbort_();
     const __wait = Math.min(__delayLeft, ${DELAY_ABORT_CHECK_MS});
@@ -20354,7 +20406,8 @@ var comparisonToJSfunc = (type, comparison, useExternalReport, knownInputNames)
   );
   const reportLevel = useExternalReport ? reportCfg.external : reportCfg.internal;
   const actualTrimmed = typeof actual === "string" ? actual.trim() : "";
-  const actualRuntimeExpr = actualTrimmed && /^\$\{.+\}$/.test(actualTrimmed) ? normalizeRuntimeActualExpression(actualTrimmed.slice(2, -1)) : void 0;
+  const actualWholeRef = actualTrimmed ? unwrapWholeValueDollarRef(actualTrimmed) : void 0;
+  const actualRuntimeExpr = actualWholeRef !== void 0 ? normalizeRuntimeActualExpression(actualWholeRef) : void 0;
   const conditionStatement = actualRuntimeExpr ? comparisonFromPartsToJSfunc(actualRuntimeExpr, operator, expected, knownInputNames) : conditionalStatementToJSfunc(raw, knownInputNames);
   const finalTitle = typeof title === "string" ? toTemplateWithVars(title) : void 0;
   const finalDetails = typeof details === "string" ? toTemplateWithVars(details) : void 0;
@@ -20383,8 +20436,9 @@ var checkToJSfunc = (check, useExternalReport, knownInputNames) => comparisonToJ
 var assertToJSfunc = (assert, useExternalReport, knownInputNames) => comparisonToJSfunc("assert", assert, useExternalReport, knownInputNames);
 var judgeValueToJs = (value, knownInputNames) => {
   if (typeof value === "string") {
-    if (/^\$\{[\s\S]+\}$/.test(value.trim())) {
-      return value.trim().slice(2, -1).trim() || "undefined";
+    const wholeRef = unwrapWholeValueDollarRef(value);
+    if (wholeRef !== void 0) {
+      return normalizeRuntimeActualExpression(wholeRef) || "undefined";
     }
     return toTemplateValueJs(value, jsTokenOptions(knownInputNames));
   }
@@ -20450,7 +20504,14 @@ var isExplicitMultiCheckArray = (value) => {
 };
 var expectValueToJs = (value, knownInputNames) => {
   const normalized = normalizeOmitToNull(value);
-  return typeof normalized === "string" ? toTemplateValueJs(normalized, jsTokenOptions(knownInputNames)) : JSON.stringify(normalized);
+  if (typeof normalized === "string") {
+    const wholeRef = unwrapWholeValueDollarRef(normalized);
+    if (wholeRef !== void 0) {
+      return normalizeRuntimeActualExpression(wholeRef) || "undefined";
+    }
+    return toTemplateValueJs(normalized, jsTokenOptions(knownInputNames));
+  }
+  return JSON.stringify(normalized);
 };
 var comparisonFromPartsToJSfunc = (actualExpr, operator, expected, knownInputNames) => {
   if (isOmitSentinel(expected) || expected === null) {
@@ -20793,17 +20854,17 @@ try {
   );
   return result;
 };
-var varToJSfunc = (decl, step, rewriteOutputKeys = false) => {
+var varToJSfunc = (decl, step, rewriteOutputKeys = false, knownInputNames) => {
   return Object.entries(step).map(([varName, value]) => {
     const lhs = rewriteOutputKeys ? rewriteOutputSetKey(varName) ?? varName : varName;
     if (typeof value === "string") {
-      return `${decl}${lhs} = \`${value}\`;`;
+      return `${decl}${lhs} = ${toTemplateValueJs(value, jsTokenOptions(knownInputNames))};`;
     } else {
       return `${decl}${lhs} = ${value};`;
     }
   }).join("\n");
 };
-var setenvToJSfunc = (setenv, enabled) => {
+var setenvToJSfunc = (setenv, enabled, knownInputNames) => {
   if (!enabled) {
     return "";
   }
@@ -20812,7 +20873,10 @@ var setenvToJSfunc = (setenv, enabled) => {
     return "";
   }
   const objEntries = entries.map(([envKey, outputKeyOrValue]) => {
-    const valueExpr = typeof outputKeyOrValue === "string" ? toTemplateWithVars(outputKeyOrValue) : JSON.stringify(outputKeyOrValue);
+    const valueExpr = typeof outputKeyOrValue === "string" ? toTemplateValueJs(
+      outputKeyOrValue,
+      jsTokenOptions(knownInputNames)
+    ) : JSON.stringify(outputKeyOrValue);
     return `${JSON.stringify(envKey)}: ${valueExpr}`;
   });
   return `setenv_({ ${objEntries.join(", ")} });`;
@@ -20894,7 +20958,7 @@ var flowStepsToJsfunc = async (flow, root, useExternalReport = !root, importTitl
         );
         break;
       case "delay":
-        stepJs = delayToJSfunc(step.delay);
+        stepJs = delayToJSfunc(step.delay, knownInputNames);
         break;
       case "for":
         stepJs = await forToJSfunc(
@@ -20918,19 +20982,43 @@ var flowStepsToJsfunc = async (flow, root, useExternalReport = !root, importTitl
         }
         break;
       case "set":
-        stepJs = varToJSfunc("", step.set, true);
+        stepJs = varToJSfunc(
+          "",
+          step.set,
+          true,
+          knownInputNames
+        );
         break;
       case "var":
-        stepJs = varToJSfunc("var ", step.var);
+        stepJs = varToJSfunc(
+          "var ",
+          step.var,
+          false,
+          knownInputNames
+        );
         break;
       case "const":
-        stepJs = varToJSfunc("const ", step.const);
+        stepJs = varToJSfunc(
+          "const ",
+          step.const,
+          false,
+          knownInputNames
+        );
         break;
       case "let":
-        stepJs = varToJSfunc("let ", step.let);
+        stepJs = varToJSfunc(
+          "let ",
+          step.let,
+          false,
+          knownInputNames
+        );
         break;
       case "setenv":
-        stepJs = setenvToJSfunc(step.setenv, emitSetenv);
+        stepJs = setenvToJSfunc(
+          step.setenv,
+          emitSetenv,
+          knownInputNames
+        );
         break;
       default:
         stepJs = "";

package/dist/server.js

@@ -12210,7 +12210,11 @@ function currentValueForToken(spec) {
     return void 0;
   }
   if (alias) {
-    const duration = unsignedDurationMs(match[2]);
+    const raw = String(match[2] || "").trim();
+    if (/^[+-]/.test(raw)) {
+      return void 0;
+    }
+    const duration = parseRelativeAmountMs(raw);
     if (duration === void 0) {
       return void 0;
     }
@@ -12234,7 +12238,7 @@ var ACCESSOR_SEGMENT_RE = "(?:\\.[A-Za-z_][A-Za-z0-9_]*|\\[(?:-?\\d+(?::-?\\d*)?
 var ACCESSOR_PATH_RE = `${ACCESSOR_SEGMENT_RE}*`;
 var RANDOM_TOKEN_ARGUMENTS_RE = "\\(\\s*[^(),\\s]+(?:\\s*,\\s*[^(),\\s]+)?\\s*\\)";
 var RANDOM_TOKEN_SPEC_RE = `${TOKEN_NAME_RE}(?:${RANDOM_TOKEN_ARGUMENTS_RE})?`;
-var CURRENT_TOKEN_ARGUMENTS_RE = "\\([+-](?:\\d+(?:\\.\\d+)?(?:ms|s|m|h|d|w))+\\)";
+var CURRENT_TOKEN_ARGUMENTS_RE = "\\([^()]*\\)";
 var CURRENT_TOKEN_SPEC_RE = `${TOKEN_NAME_RE}(?:${CURRENT_TOKEN_ARGUMENTS_RE})?`;
 var RUNTIME_ARGS_LOOSE_RE = "(?:\\([^)]*\\))?";
 var RUNTIME_SPEC_RE = `${TOKEN_NAME_RE}${RUNTIME_ARGS_LOOSE_RE}`;
@@ -12874,7 +12878,7 @@ function isNonEmptyList(value) {
 var TOKEN_NAME_RE2 = "[A-Za-z_][A-Za-z0-9_\\-]*";
 var RANDOM_TOKEN_ARGUMENTS_RE2 = "\\(\\s*[^(),\\s]+(?:\\s*,\\s*[^(),\\s]+)?\\s*\\)";
 var RANDOM_TOKEN_SPEC_RE2 = `${TOKEN_NAME_RE2}(?:${RANDOM_TOKEN_ARGUMENTS_RE2})?`;
-var CURRENT_TOKEN_ARGUMENTS_RE2 = "\\([+-](?:\\d+(?:\\.\\d+)?(?:ms|s|m|h|d|w))+\\)";
+var CURRENT_TOKEN_ARGUMENTS_RE2 = "\\([^()]*\\)";
 var CURRENT_TOKEN_SPEC_RE2 = `${TOKEN_NAME_RE2}(?:${CURRENT_TOKEN_ARGUMENTS_RE2})?`;
 var ACCESSOR_SEGMENT_RE2 = "(?:\\.[A-Za-z_][A-Za-z0-9_]*|\\[(?:-?\\d+(?::-?\\d*)?|:-?\\d*|[A-Za-z_][A-Za-z0-9_]*)\\])";
 var ACCESSOR_PATH_RE2 = `${ACCESSOR_SEGMENT_RE2}*`;
@@ -13141,11 +13145,25 @@ function embedDynamicTokensAsJsInterpolations(value, options) {
   }
   return value;
 }
+function unwrapWholeValueDollarRef(value) {
+  const trimmed = String(value ?? "").trim();
+  if (!trimmed.startsWith("${") || !trimmed.endsWith("}")) {
+    return void 0;
+  }
+  if (trimmed.indexOf("${", 2) !== -1) {
+    return void 0;
+  }
+  return trimmed.slice(2, -1).trim();
+}
 function toTemplateValueJs(value, options) {
   const s = String(value ?? "");
   if (isLiteralTokenValue(s)) {
     return JSON.stringify(unwrapLiteralToken(s));
   }
+  const wholeRef = unwrapWholeValueDollarRef(s);
+  if (wholeRef !== void 0) {
+    return wholeRef || "undefined";
+  }
   const fullEnvAngle = new RegExp(`^<<\\s*e:(${TOKEN_NAME_RE2})(${ACCESSOR_PATH_RE2})\\s*>>$`);
   const fullEnvCurly = new RegExp(`^\\{\\{\\s*e:(${TOKEN_NAME_RE2})(${ACCESSOR_PATH_RE2})\\s*\\}\\}$`, "i");
   const fullEnvPlain = new RegExp(`^e:(${TOKEN_NAME_RE2})(${ACCESSOR_PATH_RE2})$`);
@@ -13816,7 +13834,7 @@ var PARSE_DURATION_JS_FN = `(function __parseDurationMs(v) {
   }
   return Math.round(total);
 })`;
-function durationToJsMsExpr(value) {
+function durationToJsMsExpr(value, tokenOptions) {
   if (typeof value === "number") {
     return String(Math.round(value));
   }
@@ -13828,7 +13846,8 @@ function durationToJsMsExpr(value) {
   if (/^\d+(?:\.\d+)?$/.test(trimmed)) {
     return String(Math.round(Number(trimmed)));
   }
-  return `${PARSE_DURATION_JS_FN}(${JSON.stringify(value)})`;
+  const resolved = toTemplateValueJs(trimmed, tokenOptions);
+  return `${PARSE_DURATION_JS_FN}(${resolved})`;
 }
 function toLowerUnderscore(input) {
   if (input === void 0 || input === null) {
@@ -20026,8 +20045,9 @@ var toConditionJsExpr = (value, knownInputNames) => {
   if (!trimmed) {
     return "undefined";
   }
-  if (/^\$\{[\s\S]+\}$/.test(trimmed)) {
-    return trimmed.slice(2, -1).trim() || "undefined";
+  const wholeRef = unwrapWholeValueDollarRef(trimmed);
+  if (wholeRef !== void 0) {
+    return normalizeRuntimeActualExpression(wholeRef) || "undefined";
   }
   try {
     const parsed = YAML5.parse(trimmed);
@@ -20311,14 +20331,46 @@ var repeatToJSfunc = async (loop, useExternalReport, importTitleMap, hoistedIds,
   ${indentLines(loopBody)}
 }`;
   }
-  return `for (let i = 0; i < ${loopCondition}; i++) {
+  if (loopCondition.toLowerCase() === "inf") {
+    return `for (;;) {
   ${indentLines(loopBody)}
+}`;
+  }
+  if (typeof loop.repeat === "number" || /^\d+$/.test(loopCondition)) {
+    return `for (let i = 0; i < ${loopCondition}; i++) {
+  ${indentLines(loopBody)}
+}`;
+  }
+  const rawExpr = toTemplateValueJs(
+    loopCondition,
+    jsTokenOptions(knownInputNames)
+  );
+  const indentedBody = indentLines(loopBody);
+  return `{
+  const __repeatRaw = ${rawExpr};
+  const __repeatStr = String(__repeatRaw ?? '').trim();
+  const __repeatLower = __repeatStr.toLowerCase();
+  if (__repeatLower === 'inf') {
+    for (;;) {
+      ${indentedBody}
+    }
+  } else if (/^((?:\\d+(?:\\.\\d+)?)(?:ns|ms|s|m|h))+$/i.test(__repeatLower)) {
+    const __repeatMs = ${PARSE_DURATION_JS_FN}(__repeatStr);
+    for (const __repeatStart = Date.now(); Date.now() < __repeatStart + __repeatMs; ) {
+      ${indentedBody}
+    }
+  } else {
+    const __repeatN = Number(__repeatRaw);
+    for (let i = 0; i < __repeatN; i++) {
+      ${indentedBody}
+    }
+  }
 }`;
 };
 var DELAY_ABORT_CHECK_MS = 2e3;
-function delayToJSfunc(d) {
+function delayToJSfunc(d, knownInputNames) {
   return `{
-  let __delayLeft = ${durationToJsMsExpr(d)};
+  let __delayLeft = ${durationToJsMsExpr(d, jsTokenOptions(knownInputNames))};
   while (__delayLeft > 0) {
     await checkAbort_();
     const __wait = Math.min(__delayLeft, ${DELAY_ABORT_CHECK_MS});
@@ -20354,7 +20406,8 @@ var comparisonToJSfunc = (type, comparison, useExternalReport, knownInputNames)
   );
   const reportLevel = useExternalReport ? reportCfg.external : reportCfg.internal;
   const actualTrimmed = typeof actual === "string" ? actual.trim() : "";
-  const actualRuntimeExpr = actualTrimmed && /^\$\{.+\}$/.test(actualTrimmed) ? normalizeRuntimeActualExpression(actualTrimmed.slice(2, -1)) : void 0;
+  const actualWholeRef = actualTrimmed ? unwrapWholeValueDollarRef(actualTrimmed) : void 0;
+  const actualRuntimeExpr = actualWholeRef !== void 0 ? normalizeRuntimeActualExpression(actualWholeRef) : void 0;
   const conditionStatement = actualRuntimeExpr ? comparisonFromPartsToJSfunc(actualRuntimeExpr, operator, expected, knownInputNames) : conditionalStatementToJSfunc(raw, knownInputNames);
   const finalTitle = typeof title === "string" ? toTemplateWithVars(title) : void 0;
   const finalDetails = typeof details === "string" ? toTemplateWithVars(details) : void 0;
@@ -20383,8 +20436,9 @@ var checkToJSfunc = (check, useExternalReport, knownInputNames) => comparisonToJ
 var assertToJSfunc = (assert, useExternalReport, knownInputNames) => comparisonToJSfunc("assert", assert, useExternalReport, knownInputNames);
 var judgeValueToJs = (value, knownInputNames) => {
   if (typeof value === "string") {
-    if (/^\$\{[\s\S]+\}$/.test(value.trim())) {
-      return value.trim().slice(2, -1).trim() || "undefined";
+    const wholeRef = unwrapWholeValueDollarRef(value);
+    if (wholeRef !== void 0) {
+      return normalizeRuntimeActualExpression(wholeRef) || "undefined";
     }
     return toTemplateValueJs(value, jsTokenOptions(knownInputNames));
   }
@@ -20450,7 +20504,14 @@ var isExplicitMultiCheckArray = (value) => {
 };
 var expectValueToJs = (value, knownInputNames) => {
   const normalized = normalizeOmitToNull(value);
-  return typeof normalized === "string" ? toTemplateValueJs(normalized, jsTokenOptions(knownInputNames)) : JSON.stringify(normalized);
+  if (typeof normalized === "string") {
+    const wholeRef = unwrapWholeValueDollarRef(normalized);
+    if (wholeRef !== void 0) {
+      return normalizeRuntimeActualExpression(wholeRef) || "undefined";
+    }
+    return toTemplateValueJs(normalized, jsTokenOptions(knownInputNames));
+  }
+  return JSON.stringify(normalized);
 };
 var comparisonFromPartsToJSfunc = (actualExpr, operator, expected, knownInputNames) => {
   if (isOmitSentinel(expected) || expected === null) {
@@ -20793,17 +20854,17 @@ try {
   );
   return result;
 };
-var varToJSfunc = (decl, step, rewriteOutputKeys = false) => {
+var varToJSfunc = (decl, step, rewriteOutputKeys = false, knownInputNames) => {
   return Object.entries(step).map(([varName, value]) => {
     const lhs = rewriteOutputKeys ? rewriteOutputSetKey(varName) ?? varName : varName;
     if (typeof value === "string") {
-      return `${decl}${lhs} = \`${value}\`;`;
+      return `${decl}${lhs} = ${toTemplateValueJs(value, jsTokenOptions(knownInputNames))};`;
     } else {
       return `${decl}${lhs} = ${value};`;
     }
   }).join("\n");
 };
-var setenvToJSfunc = (setenv, enabled) => {
+var setenvToJSfunc = (setenv, enabled, knownInputNames) => {
   if (!enabled) {
     return "";
   }
@@ -20812,7 +20873,10 @@ var setenvToJSfunc = (setenv, enabled) => {
     return "";
   }
   const objEntries = entries.map(([envKey, outputKeyOrValue]) => {
-    const valueExpr = typeof outputKeyOrValue === "string" ? toTemplateWithVars(outputKeyOrValue) : JSON.stringify(outputKeyOrValue);
+    const valueExpr = typeof outputKeyOrValue === "string" ? toTemplateValueJs(
+      outputKeyOrValue,
+      jsTokenOptions(knownInputNames)
+    ) : JSON.stringify(outputKeyOrValue);
     return `${JSON.stringify(envKey)}: ${valueExpr}`;
   });
   return `setenv_({ ${objEntries.join(", ")} });`;
@@ -20894,7 +20958,7 @@ var flowStepsToJsfunc = async (flow, root, useExternalReport = !root, importTitl
         );
         break;
       case "delay":
-        stepJs = delayToJSfunc(step.delay);
+        stepJs = delayToJSfunc(step.delay, knownInputNames);
         break;
       case "for":
         stepJs = await forToJSfunc(
@@ -20918,19 +20982,43 @@ var flowStepsToJsfunc = async (flow, root, useExternalReport = !root, importTitl
         }
         break;
       case "set":
-        stepJs = varToJSfunc("", step.set, true);
+        stepJs = varToJSfunc(
+          "",
+          step.set,
+          true,
+          knownInputNames
+        );
         break;
       case "var":
-        stepJs = varToJSfunc("var ", step.var);
+        stepJs = varToJSfunc(
+          "var ",
+          step.var,
+          false,
+          knownInputNames
+        );
         break;
       case "const":
-        stepJs = varToJSfunc("const ", step.const);
+        stepJs = varToJSfunc(
+          "const ",
+          step.const,
+          false,
+          knownInputNames
+        );
         break;
       case "let":
-        stepJs = varToJSfunc("let ", step.let);
+        stepJs = varToJSfunc(
+          "let ",
+          step.let,
+          false,
+          knownInputNames
+        );
         break;
       case "setenv":
-        stepJs = setenvToJSfunc(step.setenv, emitSetenv);
+        stepJs = setenvToJSfunc(
+          step.setenv,
+          emitSetenv,
+          knownInputNames
+        );
         break;
       default:
         stepJs = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mmt-mcp",
-  "version": "1.48.4",
+  "version": "1.49.1-pre",
   "description": "Multimeter MCP server for Cursor, Copilot, and Claude. Scaffold, validate, format, and run YAML .mmt API tests. Do not invent .mmt syntax.",
   "mcpName": "io.github.mshobeyri/multimeter",
   "type": "module",