viberadar 0.3.210 → 0.3.211

package/dist/ui/dashboard.html

@@ -1786,6 +1786,9 @@ let loadVusDraft = 10;
 let loadDurationDraft = '30s';
 let loadDataDirDraft = '';
 let loadResultDirDraft = '';
+let loadExecutionModeDraft = 'auto';
+let loadVusEnvNameDraft = 'SMOKE_VUS';
+let loadDurationEnvNameDraft = 'SMOKE_DURATION';
 let loadView = 'library';     // 'library' | 'editor'
 
 function toggleObsHint(id) {
@@ -7763,16 +7766,25 @@ function applyLoadConfigToFields(cfg) {
   loadDurationDraft = cfg.duration || loadDurationDraft;
   loadDataDirDraft = cfg.dataDir || loadDataDirDraft;
   loadResultDirDraft = cfg.resultDir || loadResultDirDraft;
+  loadExecutionModeDraft = cfg.executionMode || loadExecutionModeDraft;
+  loadVusEnvNameDraft = cfg.vusEnvName || loadVusEnvNameDraft;
+  loadDurationEnvNameDraft = cfg.durationEnvName || loadDurationEnvNameDraft;
   const baseEl = document.getElementById('loadBaseUrl');
   const vusEl = document.getElementById('loadVus');
   const durEl = document.getElementById('loadDuration');
   const dataEl = document.getElementById('loadDataDir');
   const resultEl = document.getElementById('loadResultDir');
+  const modeEl = document.getElementById('loadExecutionMode');
+  const vusEnvEl = document.getElementById('loadVusEnvName');
+  const durationEnvEl = document.getElementById('loadDurationEnvName');
   if (baseEl) baseEl.value = loadBaseUrlDraft;
   if (vusEl) vusEl.value = loadVusDraft;
   if (durEl) durEl.value = loadDurationDraft;
   if (dataEl) dataEl.value = loadDataDirDraft;
   if (resultEl) resultEl.value = loadResultDirDraft;
+  if (modeEl) modeEl.value = loadExecutionModeDraft;
+  if (vusEnvEl) vusEnvEl.value = loadVusEnvNameDraft;
+  if (durationEnvEl) durationEnvEl.value = loadDurationEnvNameDraft;
 }
 
 function renderLoad(c) {
@@ -7902,6 +7914,25 @@ function renderLoad(c) {
         </div>
       </div>
       <div class="load-config-hint">VUs и Duration применяются через CLI k6 и переопределяют значения из <code>export const options</code>. Base URL доступен в скрипте как <code>__ENV.BASE_URL</code>.</div>
+      <div class="load-config-row" style="margin-top:8px">
+        <div class="load-config-field">
+          <label>Execution</label>
+          <select id="loadExecutionMode" style="width:150px">
+            <option value="auto" ${loadExecutionModeDraft === 'auto' ? 'selected' : ''}>Auto</option>
+            <option value="cli" ${loadExecutionModeDraft === 'cli' ? 'selected' : ''}>CLI override</option>
+            <option value="script" ${loadExecutionModeDraft === 'script' ? 'selected' : ''}>Script scenarios</option>
+          </select>
+        </div>
+        <div class="load-config-field">
+          <label>VUs env</label>
+          <input id="loadVusEnvName" type="text" value="${escapeHtml(loadVusEnvNameDraft)}" style="width:130px" placeholder="SMOKE_VUS" />
+        </div>
+        <div class="load-config-field">
+          <label>Duration env</label>
+          <input id="loadDurationEnvName" type="text" value="${escapeHtml(loadDurationEnvNameDraft)}" style="width:150px" placeholder="SMOKE_DURATION" />
+        </div>
+      </div>
+      <div class="load-config-hint">Auto: если скрипт содержит <code>options.scenarios</code>, VibeRadar не передаёт <code>--vus/--duration</code>, а кладёт значения в env-переменные, например <code>SMOKE_VUS</code> и <code>SMOKE_DURATION</code>.</div>
       <div class="load-config-row" style="margin-top:8px">
         <div class="load-config-field" style="flex:1;min-width:260px">
           <label>Data dir / file <span style="color:var(--dim);font-weight:400">(для <code>open('./users.csv')</code> и локальных lib)</span></label>
@@ -8004,11 +8035,17 @@ function renderLoad(c) {
   const durationInput = document.getElementById('loadDuration');
   const dataInput = document.getElementById('loadDataDir');
   const resultInput = document.getElementById('loadResultDir');
+  const modeInput = document.getElementById('loadExecutionMode');
+  const vusEnvInput = document.getElementById('loadVusEnvName');
+  const durationEnvInput = document.getElementById('loadDurationEnvName');
   if (baseInput) baseInput.addEventListener('input', () => { loadBaseUrlDraft = baseInput.value || 'http://localhost:5000'; });
   if (vusInput) vusInput.addEventListener('input', () => { loadVusDraft = parseInt(vusInput.value || '10', 10) || 10; });
   if (durationInput) durationInput.addEventListener('input', () => { loadDurationDraft = durationInput.value || '30s'; });
   if (dataInput) dataInput.addEventListener('input', () => { loadDataDirDraft = dataInput.value || ''; });
   if (resultInput) resultInput.addEventListener('input', () => { loadResultDirDraft = resultInput.value || ''; });
+  if (modeInput) modeInput.addEventListener('change', () => { loadExecutionModeDraft = modeInput.value || 'auto'; });
+  if (vusEnvInput) vusEnvInput.addEventListener('input', () => { loadVusEnvNameDraft = vusEnvInput.value || 'SMOKE_VUS'; });
+  if (durationEnvInput) durationEnvInput.addEventListener('input', () => { loadDurationEnvNameDraft = durationEnvInput.value || 'SMOKE_DURATION'; });
 
   // Feature selector auto-generates script
   const featSel = document.getElementById('loadFeature');
@@ -8048,6 +8085,9 @@ function loadOpenScript(name) {
   if (s.duration) loadDurationDraft = s.duration;
   loadDataDirDraft = s.dataDir || loadDataDirDraft;
   loadResultDirDraft = s.resultDir || loadResultDirDraft;
+  loadExecutionModeDraft = s.executionMode || loadExecutionModeDraft;
+  loadVusEnvNameDraft = s.vusEnvName || loadVusEnvNameDraft;
+  loadDurationEnvNameDraft = s.durationEnvName || loadDurationEnvNameDraft;
   loadView = 'editor';
   renderContent();
 }
@@ -8078,12 +8118,19 @@ async function runLoadTest() {
   const scriptName = (document.getElementById('loadScriptName')?.value || loadScriptNameDraft || 'Новый тест').trim();
   const dataDir = (document.getElementById('loadDataDir')?.value || loadDataDirDraft || '').trim();
   const resultDir = (document.getElementById('loadResultDir')?.value || loadResultDirDraft || '').trim();
+  const executionModeRaw = (document.getElementById('loadExecutionMode')?.value || loadExecutionModeDraft || 'auto').trim();
+  const executionMode = executionModeRaw === 'auto' ? undefined : executionModeRaw;
+  const vusEnvName = (document.getElementById('loadVusEnvName')?.value || loadVusEnvNameDraft || 'SMOKE_VUS').trim();
+  const durationEnvName = (document.getElementById('loadDurationEnvName')?.value || loadDurationEnvNameDraft || 'SMOKE_DURATION').trim();
   loadBaseUrlDraft = baseUrl;
   loadVusDraft = vus;
   loadDurationDraft = duration;
   loadScriptNameDraft = scriptName;
   loadDataDirDraft = dataDir;
   loadResultDirDraft = resultDir;
+  loadExecutionModeDraft = executionModeRaw;
+  loadVusEnvNameDraft = vusEnvName;
+  loadDurationEnvNameDraft = durationEnvName;
 
   loadLogLines = [];
   loadBuckets  = [];
@@ -8095,7 +8142,7 @@ async function runLoadTest() {
     const r = await fetch('/api/load/run', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ script, vus, duration, baseUrl, scriptName, dataDir, resultDir, envVars }),
+      body: JSON.stringify({ script, vus, duration, baseUrl, scriptName, dataDir, resultDir, executionMode, vusEnvName, durationEnvName, envVars }),
     });
     const d = await r.json();
     if (!r.ok) { alert('Ошибка запуска: ' + (d.error || r.status)); return; }
@@ -8176,7 +8223,7 @@ ${featureList || '(нет данных)'}
 **Шаг 2 — составь k6 скрипт.**
 Требования:
 1. Валидный JavaScript для k6 (import from 'k6/http', 'k6', 'k6/data')
-2. VUs и duration задаёт VibeRadar через CLI, поэтому не хардкодь нагрузку как единственный источник истины; если добавляешь \`export const options\`, оставь там только thresholds/summaryTrendStats или безопасные дефолты
+2. Можно использовать \`options.scenarios\`; тогда VibeRadar в Auto-режиме не будет передавать \`--vus/--duration\`, а прокинет значения UI в \`__ENV.SMOKE_VUS\` и \`__ENV.SMOKE_DURATION\`
 3. \`export default function() { ... }\` с проверками \`check()\`
 4. Base URL бери из \`__ENV.BASE_URL || '${baseUrl}'\`
 5. Если нужна авторизация — добавь заголовок Authorization (Bearer-токен как переменную __ENV.TOKEN)
@@ -8297,17 +8344,23 @@ async function loadSaveScript() {
   const duration = (document.getElementById('loadDuration')?.value || loadDurationDraft || '30s').trim();
   const dataDir = (document.getElementById('loadDataDir')?.value || loadDataDirDraft || '').trim();
   const resultDir = (document.getElementById('loadResultDir')?.value || loadResultDirDraft || '').trim();
+  const executionMode = (document.getElementById('loadExecutionMode')?.value || loadExecutionModeDraft || 'auto').trim();
+  const vusEnvName = (document.getElementById('loadVusEnvName')?.value || loadVusEnvNameDraft || 'SMOKE_VUS').trim();
+  const durationEnvName = (document.getElementById('loadDurationEnvName')?.value || loadDurationEnvNameDraft || 'SMOKE_DURATION').trim();
   loadScriptNameDraft = name;
   loadBaseUrlDraft = baseUrl;
   loadVusDraft = vus;
   loadDurationDraft = duration;
   loadDataDirDraft = dataDir;
   loadResultDirDraft = resultDir;
+  loadExecutionModeDraft = executionMode;
+  loadVusEnvNameDraft = vusEnvName;
+  loadDurationEnvNameDraft = durationEnvName;
   try {
     const r = await fetch('/api/load/scripts', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ name, script, baseUrl, vus, duration, dataDir, resultDir }),
+      body: JSON.stringify({ name, script, baseUrl, vus, duration, dataDir, resultDir, executionMode, vusEnvName, durationEnvName }),
     });
     if (!r.ok) { const d = await r.json().catch(() => ({})); alert('Ошибка: ' + (d.error || r.status)); return; }
     await loadRefreshScripts();
@@ -8327,6 +8380,9 @@ async function loadLoadScript(name) {
   if (s.duration) loadDurationDraft = s.duration;
   loadDataDirDraft = s.dataDir || loadDataDirDraft;
   loadResultDirDraft = s.resultDir || loadResultDirDraft;
+  loadExecutionModeDraft = s.executionMode || loadExecutionModeDraft;
+  loadVusEnvNameDraft = s.vusEnvName || loadVusEnvNameDraft;
+  loadDurationEnvNameDraft = s.durationEnvName || loadDurationEnvNameDraft;
   const ta = document.getElementById('loadScriptEditor');
   if (ta) { ta.value = s.script; ta.style.borderColor = 'var(--blue)'; setTimeout(() => { ta.style.borderColor = ''; }, 1500); }
   const nameEl = document.getElementById('loadScriptName');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "viberadar",
-  "version": "0.3.210",
+  "version": "0.3.211",
   "description": "Live module map with test coverage for vibecoding projects",
   "main": "./dist/cli.js",
   "bin": {