k6ctl 1.1.0 → 1.3.0

package/dist/utils/testRunManifestBuilder.d.ts

@@ -1,5 +1,18 @@
-import type { ArchivedFile, ConfigMapResult } from '../types/kubernetes.types';
+import type { ArchivedFile, ConfigMapResult, VolumeClaimResult } from '../types/kubernetes.types';
 import { K6Config } from '../types/config.types';
 import { TestRunManifest } from '../types/testRunManifest.types';
+export type RunnerEnvVar = {
+    name: string;
+    value: string;
+} | {
+    name: string;
+    valueFrom: {
+        secretKeyRef: {
+            name: string;
+            key: string;
+        };
+    };
+};
 export declare function buildTestRunManifest(configMapResult: ConfigMapResult, archiveOutput: ArchivedFile, cfg: K6Config, envFromLoader?: Record<string, string>): TestRunManifest;
+export declare function buildTestRunManifestWithVolumeClaim(volumeClaimResult: VolumeClaimResult, cfg: K6Config, envFromLoader?: Record<string, string>): TestRunManifest;
 //# sourceMappingURL=testRunManifestBuilder.d.ts.map

package/dist/utils/testRunManifestBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testRunManifestBuilder.d.ts","sourceRoot":"","sources":["../../src/utils/testRunManifestBuilder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAajE,wBAAgB,oBAAoB,CAChC,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,YAAY,EAC3B,GAAG,EAAE,QAAQ,EACb,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,eAAe,CAoCjB"}
+{"version":3,"file":"testRunManifestBuilder.d.ts","sourceRoot":"","sources":["../../src/utils/testRunManifestBuilder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,MAAM,MAAM,YAAY,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE;QAAE,YAAY,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,CAAC;AAWnF,wBAAgB,oBAAoB,CAChC,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,YAAY,EAC3B,GAAG,EAAE,QAAQ,EACb,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,eAAe,CAoCjB;AAoED,wBAAgB,mCAAmC,CAC/C,iBAAiB,EAAE,iBAAiB,EACpC,GAAG,EAAE,QAAQ,EACb,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,eAAe,CAgCjB"}

package/dist/utils/testRunManifestBuilder.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildTestRunManifest = buildTestRunManifest;
+exports.buildTestRunManifestWithVolumeClaim = buildTestRunManifestWithVolumeClaim;
 const logger_1 = __importDefault(require("../utils/logger"));
 const K6_GROUP = "k6.io";
 const K6_VERSION = "v1alpha1";
@@ -50,22 +51,14 @@ function buildTestRunManifest(configMapResult, archiveOutput, cfg, envFromLoader
 function buildRunnerEnv(cfg, envFromLoader) {
     const envMap = new Map();
     if (envFromLoader) {
-        for (const [key, value] of Object.entries(envFromLoader)) {
-            if (value !== undefined && value !== null) {
-                envMap.set(key, String(value));
-            }
+        for (const [key, raw] of Object.entries(envFromLoader)) {
+            if (raw === undefined || raw === null)
+                continue;
+            addEnvToMap(key, raw, envMap);
         }
     }
-    if (cfg.prometheus?.serverUrl) {
-        envMap.set(K6_PROMETHEUS_RW_SERVER_URL, cfg.prometheus.serverUrl);
-        if (cfg.prometheus.trendStats?.length) {
-            envMap.set(K6_PROMETHEUS_RW_TREND_STATS, cfg.prometheus.trendStats.join(","));
-        }
-    }
-    const envArray = Array.from(envMap.entries()).map(([name, value]) => ({
-        name,
-        value,
-    }));
+    addPrometheusEnvVars(cfg, envMap);
+    const envArray = Array.from(envMap.values());
     return envArray.length > 0 ? envArray : undefined;
 }
 function buildArgumentsString(args, cfg, name) {
@@ -86,4 +79,67 @@ function buildArgumentsString(args, cfg, name) {
     }
     return finalArgs.join(" ");
 }
+function parseSecretPlaceholder(value) {
+    const m = /^\{\{SECRETS\.([^.}]+)\.([^.}]+)\}\}$/.exec(value.trim());
+    if (!m)
+        return null;
+    return { secretName: m[1], secretKey: m[2] };
+}
+function addEnvToMap(key, raw, envMap) {
+    const value = String(raw);
+    const secret = parseSecretPlaceholder(value);
+    if (secret) {
+        envMap.set(key, { name: key, valueFrom: { secretKeyRef: { name: secret.secretName, key: secret.secretKey } } });
+    }
+    else {
+        envMap.set(key, { name: key, value });
+    }
+}
+function addPrometheusEnvVars(cfg, envMap) {
+    if (cfg.prometheus?.serverUrl) {
+        envMap.set(K6_PROMETHEUS_RW_SERVER_URL, {
+            name: K6_PROMETHEUS_RW_SERVER_URL,
+            value: cfg.prometheus.serverUrl,
+        });
+        if (cfg.prometheus.trendStats?.length) {
+            envMap.set(K6_PROMETHEUS_RW_TREND_STATS, {
+                name: K6_PROMETHEUS_RW_TREND_STATS,
+                value: cfg.prometheus.trendStats.join(","),
+            });
+        }
+    }
+}
+function buildTestRunManifestWithVolumeClaim(volumeClaimResult, cfg, envFromLoader) {
+    const testName = volumeClaimResult.volumeClaimName.replace('archive-', 'test-');
+    const argumentsString = buildArgumentsString(cfg.arguments, cfg, testName);
+    logger_1.default.debug('Constructed arguments string for TestRun manifest (volume):', argumentsString);
+    const testRun = {
+        apiVersion: `${K6_GROUP}/${K6_VERSION}`,
+        kind: K6_KIND,
+        metadata: {
+            name: testName,
+            namespace: volumeClaimResult.namespace,
+        },
+        spec: {
+            parallelism: cfg.parallelism,
+            arguments: argumentsString,
+            quiet: String(cfg.quiet),
+            ...(cfg.cleanup === true ? { cleanup: K6_CLEANUP_LABEL } : {}),
+            separate: cfg.separate,
+            runner: {
+                image: cfg.runner?.image,
+                env: buildRunnerEnv(cfg, envFromLoader),
+                ...(cfg.runner?.resources ? { resources: cfg.runner.resources } : {}),
+            },
+            script: {
+                volumeClaim: {
+                    name: volumeClaimResult.volumeClaimName,
+                    file: volumeClaimResult.archiveFilename,
+                },
+            },
+        },
+    };
+    logger_1.default.debug('Constructed TestRun manifest (volume):', JSON.stringify(testRun, null, 2));
+    return testRun;
+}
 //# sourceMappingURL=testRunManifestBuilder.js.map

package/dist/utils/testRunManifestBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"testRunManifestBuilder.js","sourceRoot":"","sources":["../../src/utils/testRunManifestBuilder.ts"],"names":[],"mappings":";;;;;AAgBA,oDAyCC;AAzDD,6DAAqC;AAMrC,MAAM,QAAQ,GAAG,OAAO,CAAC;AACzB,MAAM,UAAU,GAAG,UAAU,CAAC;AAC9B,MAAM,OAAO,GAAG,SAAS,CAAC;AAC1B,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,OAAO,GAAG,OAAO,CAAC;AACxB,MAAM,OAAO,GAAG,OAAO,CAAC;AACxB,MAAM,kBAAkB,GAAG,4BAA4B,CAAC;AACxD,MAAM,2BAA2B,GAAG,6BAA6B,CAAC;AAClE,MAAM,4BAA4B,GAAG,8BAA8B,CAAC;AAEpE,SAAgB,oBAAoB,CAChC,eAAgC,EAChC,aAA2B,EAC3B,GAAa,EACb,aAAsC;IAEtC,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5E,MAAM,eAAe,GAAG,oBAAoB,CACxC,GAAG,CAAC,SAAS,EACb,GAAG,EACH,QAAQ,CACX,CAAC;IACF,gBAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,eAAe,CAAC,CAAC;IACpF,MAAM,OAAO,GAAoB;QAC7B,UAAU,EAAE,GAAG,QAAQ,IAAI,UAAU,EAAE;QACvC,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,eAAe,CAAC,SAAS;SACvC;QACD,IAAI,EAAE;YACF,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,SAAS,EAAE,eAAe;YAC1B,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC;YACxB,GAAG,CAAC,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,MAAM,EAAE;gBACJ,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK;gBACxB,GAAG,EAAE,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC;gBACvC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACxE;YACD,MAAM,EAAE;gBACJ,SAAS,EAAE;oBACP,IAAI,EAAE,eAAe,CAAC,aAAa;oBACnC,IAAI,EAAE,aAAa,CAAC,eAAe;iBACtC;aACJ;SACJ;KACJ,CAAC;IACF,gBAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAChF,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,cAAc,CACnB,GAAa,EACb,aAAsC;IAEtC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,IAAI,aAAa,EAAE,CAAC;QAChB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACvD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACxC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;IACL,CAAC;IACD,IAAI,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,2BAA2B,EAAE,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAClE,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAClF,CAAC;IACL,CAAC;IACD,MAAM,QAAQ,GAAmB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAClF,IAAI;QACJ,KAAK;KACR,CAAC,CAAC,CAAC;IACJ,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AACtD,CAAC;AAED,SAAS,oBAAoB,CAAC,IAA0B,EAAE,GAAa,EAAE,IAAY;IACjF,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IACpC,IAAI,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAChE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvC,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"testRunManifestBuilder.js","sourceRoot":"","sources":["../../src/utils/testRunManifestBuilder.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k6ctl",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "CLI tool to run k6 tests on Kubernetes using k6-operator",
   "main": "dist/index.js",
   "bin": {
@@ -28,6 +28,7 @@
     "commander": "^14.0.3",
     "dotenv": "^17.3.1",
     "js-yaml": "^4.1.1",
+    "tar": "^7.5.13",
     "winston": "^3.19.0",
     "zod": "^4.3.6"
   },

package/src/cli.ts

@@ -16,12 +16,14 @@ program
   .version(version);
 
 program
-  .command('run <script>')
-  .description('Run a k6 test script')
-  .option('-c, --config <path>', 'Path to config file', 'k6ctl.config.js')
+  .command('run [script]')
+  .description('Run a k6 test script (omit to select interactively from ${pwd}/dist/tests)')
+  .option('-c, --config <path>', 'Path to config file', 'k6ctl.config.json')
   .option('-n, --namespace <namespace>', 'Kubernetes namespace')
   .option('-p, --parallelism <number>', 'Number of parallel test pods')
   .option('-v, --verbose', 'enable debug logging')
+  .option('-d, --dir <path>', 'Folder to search for .js test files', 'dist/tests')
+  .option('--smart', 'Enable smart scenario analysis')
   .action(runTest);
 
 program
@@ -46,9 +48,12 @@ program
 
 program
   .command('delete')
-  .description('Delete the last test run (TestRun + ConfigMap)')
+  .description('Delete the last test run (TestRun + script)')
   .option('-n, --namespace <namespace>', 'Kubernetes namespace (overrides saved value)')
-  .option('--keep-configmap', 'Skip deletion of the associated ConfigMap')
+  .option('--keep-script', 'Skip deletion of the associated script in ConfigMap or PVC')
+  .option('-p, --pod <name>', 'Delete a specific pod instead of those associated with the last TestRun')
+  .option('-t, --testrun <name>', 'Delete a specific TestRun by name instead of the last one')
+  .option('-c, --configmap <name>', 'Delete a specific ConfigMap by name instead of the one associated with the last TestRun')
   .action(deleteLastRun);
 
 program.parse();

package/src/commands/delete.ts

@@ -4,26 +4,53 @@ import logger from '../utils/logger';
 
 interface DeleteOptions {
   namespace?: string;
-  keepConfigmap?: boolean;
+  keepScript?: boolean;
+  pod?: string;
+  testrun?: string;
+  configmap?: string;
 }
 
 export async function deleteLastRun(options: DeleteOptions) {
+  const kubernetesService = createDefaultKubernetesService();
+
   const lastRun = await loadLastRun();
+  const namespace = options.namespace ?? lastRun?.namespace ?? 'default';
+
+  if (options.pod) {
+    logger.info(`Deleting Pod: ${options.pod} (namespace: ${namespace})`);
+    await kubernetesService.deletePodByName(options.pod, namespace);
+    return;
+  }
+
+  if (options.testrun) {
+    logger.info(`Deleting TestRun: ${options.testrun} (namespace: ${namespace})`);
+    await kubernetesService.deleteTestRunByName(options.testrun, namespace);
+    return;
+  }
+
+  if (options.configmap) {
+    logger.info(`Deleting ConfigMap: ${options.configmap} (namespace: ${namespace})`);
+    await kubernetesService.deleteConfigMap(options.configmap, namespace);
+    return;
+  }
+
   if (!lastRun) {
     logger.error('No last run found. Run a test first with: k6ctl run <script>');
     process.exit(1);
   }
 
-  const namespace = options.namespace ?? lastRun.namespace;
   logger.info(`Deleting TestRun: ${lastRun.testRunName} (namespace: ${namespace})`);
-
-  const kubernetesService = createDefaultKubernetesService();
-
   await kubernetesService.deleteTestRunByName(lastRun.testRunName, namespace);
 
-  if (!options.keepConfigmap) {
-    logger.info(`Deleting ConfigMap: ${lastRun.configMapName} (namespace: ${namespace})`);
-    await kubernetesService.deleteConfigMap(lastRun.configMapName, namespace);
+  if (!options.keepScript) {
+    if (lastRun.configMapName) {
+      logger.info(`Deleting ConfigMap: ${lastRun.configMapName} (namespace: ${namespace})`);
+      await kubernetesService.deleteConfigMap(lastRun.configMapName, namespace);
+    }
+    if (lastRun.volumeClaimName) {
+      logger.info(`Deleting PVC: ${lastRun.volumeClaimName} (namespace: ${namespace})`);
+      await kubernetesService.deleteVolumeClaimByName(lastRun.volumeClaimName, namespace);
+    }
   }
 
   await clearLastRun();

package/src/commands/list.ts

@@ -1,26 +1,26 @@
 import logger, { setLogLevel } from '../utils/logger';
-import { createDefaultKubernetesService } from '../services/kubernetes.service';
+import { createDefaultKubernetesService, printPodsTable, printTestRunsTable, printConfigMapsTable } from '../services/kubernetes.service';
 
 export async function list(type: string, options: { namespace?: string }) {
   const kubernetesService = createDefaultKubernetesService();
   switch (type) {
     case 'all':
       logger.debug(`Listing all resources in namespace: ${options.namespace}`);
-      await kubernetesService.listTestRuns(options.namespace);
-      await kubernetesService.listPods(options.namespace);
-      await kubernetesService.listConfigMaps(options.namespace);
+      printTestRunsTable(await kubernetesService.listTestRuns(options.namespace));
+      printPodsTable(await kubernetesService.listPods(options.namespace));
+      printConfigMapsTable(await kubernetesService.listConfigMaps(options.namespace));
       break;
     case 'pods':
       logger.debug(`Listing Pods in namespace: ${options.namespace}`);
-      await kubernetesService.listPods(options.namespace);
+      printPodsTable(await kubernetesService.listPods(options.namespace));
       break;
     case 'testruns':
       logger.debug(`Listing TestRuns in namespace: ${options.namespace}`);
-      await kubernetesService.listTestRuns(options.namespace);
+      printTestRunsTable(await kubernetesService.listTestRuns(options.namespace));
       break;
     case 'configmaps':
       logger.debug(`Listing ConfigMaps in namespace: ${options.namespace}`);
-      await kubernetesService.listConfigMaps(options.namespace);
+      printConfigMapsTable(await kubernetesService.listConfigMaps(options.namespace));
       break;
     default:
       logger.debug(`Listing ${type} in namespace: ${options.namespace}`);

package/src/commands/run.ts

@@ -1,20 +1,84 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import * as readline from 'readline';
 import { createDefaultKubernetesService } from '../services/kubernetes.service';
 import { ScriptService } from '../services/script.service';
 import { loadK6Config } from '../utils/configLoader';
 import { loadAndValidateEnv } from '../utils/env';
 import logger, { setLogLevel } from '../utils/logger';
-import { buildTestRunManifest } from '../utils/testRunManifestBuilder';
+import { buildTestRunManifest, buildTestRunManifestWithVolumeClaim } from '../utils/testRunManifestBuilder';
 import { saveLastRun } from '../utils/lastRunStore';
+import { K6StageMetrics, K6ScenarioOptions, K6ScenarioMetrics, K6InspectResult } from "../types/script.types";
+import { ConfigMapResult } from '../types/kubernetes.types';
+
+const DEFAULT_VUS_PER_POD = process.env.DEFAULT_VUS_PER_POD ? parseInt(process.env.DEFAULT_VUS_PER_POD, 10) : 100;
+const MAX_ITERATION_DURATION_SECONDS = process.env.MAX_ITERATION_DURATION_SECONDS ? parseInt(process.env.MAX_ITERATION_DURATION_SECONDS, 10) : 60;
+
+function listTestFiles(dir: string): string[] {
+  if (!fs.existsSync(dir)) {
+    return [];
+  }
+  const results: string[] = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      results.push(...listTestFiles(fullPath));
+    } else if (entry.isFile() && entry.name.endsWith('.js')) {
+      results.push(fullPath);
+    }
+  }
+  return results;
+}
+
+function promptSelection(files: string[], dir: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    console.log('\nAvailable test scripts:');
+    files.forEach((file, i) => {
+      const relative = path.relative(dir, file);
+      console.log(`  [${String(i + 1).padStart(2)}] ${relative}`);
+    });
+
+    console.log('');
+
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(`Select a test (1-${files.length}): `, answer => {
+      rl.close();
+      const index = parseInt(answer.trim(), 10) - 1;
+      if (isNaN(index) || index < 0 || index >= files.length) {
+        reject(new Error(`Invalid selection: "${answer}"`));
+      } else {
+        resolve(files[index]);
+      }
+    });
+  });
+}
 
 interface RunOptions {
   config: string;
   namespace?: string;
   parallelism?: number;
   verbose?: boolean;
+  dir: string;
+  smart?: boolean;
 }
 
 export async function runTest(scriptPath: string, options: RunOptions) {
   if (options.verbose) setLogLevel('debug');
+
+  if (!scriptPath) {
+    const files = listTestFiles(options.dir);
+    if (files.length === 0) {
+      logger.error(`No .js test files found in ${options.dir}`);
+      process.exit(1);
+    }
+    try {
+      scriptPath = await promptSelection(files, options.dir);
+    } catch (error) {
+      logger.error(error instanceof Error ? error.message : String(error));
+      process.exit(1);
+    }
+  }
+
   logger.debug(`Running k6 test: ${scriptPath}`);
   logger.debug(`Using config: ${JSON.stringify(options.config, null, 2)}`);
 
@@ -24,11 +88,45 @@ export async function runTest(scriptPath: string, options: RunOptions) {
     const kubernetesService = createDefaultKubernetesService();
 
     // Load test script
-    const archive = await scriptService.archiveTest(scriptPath);
+    let archive = await scriptService.archiveTest(scriptPath);
 
     // Load config
     const config = loadK6Config(options.config);
 
+
+    // Analyze script if smart option is enabled
+    if (options.smart) {
+      logger.info(`Analyzing script: ${scriptPath}`);
+      const inspectResult = await scriptService.inspectScript(scriptPath);
+      const scenarioMetrics: K6ScenarioMetrics[] = await analyzeScript(inspectResult);
+      if (scenarioMetrics) {
+        const estimatedTotalIterations = scenarioMetrics.reduce((sum, metrics) => sum + (metrics?.totalIterations ?? 0), 0);
+        const totalRecommendedMaxVUs = scenarioMetrics.reduce((sum, metrics) => sum + (metrics?.recommendedMaxVUs ?? 0), 0);
+        const parallelism = Math.ceil(totalRecommendedMaxVUs / DEFAULT_VUS_PER_POD) || 1;
+        const peakTps = scenarioMetrics.reduce((max, metrics) => Math.max(max, metrics?.peakTps ?? 0), 0);
+
+        config.parallelism = parallelism;
+
+        logger.info(`Total recommendedMaxVUs: ${Math.ceil(totalRecommendedMaxVUs)} 
+        based on scenario analysis and MAX_ITERATION_DURATION_SECONDS=${MAX_ITERATION_DURATION_SECONDS} seconds
+        per iteration assumption with a safety factor of 1.2 applied to account for variability in iteration duration and ensure we have enough VUs 
+        to meet the target TPS. This is an estimate and actual resource needs may vary based on the specific workload and environment.
+        Consider monitoring the test run and adjusting resources as needed.`);
+
+        logger.info(`Calculated parallelism: ${parallelism} (based on DEFAULT_VUS_PER_POD=${DEFAULT_VUS_PER_POD})`);
+        logger.info(`Peak TPS: ${peakTps.toFixed(2)}`);
+        logger.info(`Estimated Total Iterations: ${Math.round(estimatedTotalIterations)}`);
+        logger.info(`Using MAX_ITERATION_DURATION_SECONDS=${MAX_ITERATION_DURATION_SECONDS} seconds`);
+        logger.info(`Using safety factor of 1.2 to calculate recommended VUs.`);
+        logger.info(`Using DEFAULT_VUS_PER_POD=${DEFAULT_VUS_PER_POD} to calculate parallelism.`);
+
+        // Extract, modify, and recompress the archive
+        archive = await scriptService.extractModifyAndRecompress(archive, scenarioMetrics);
+      }
+    } else {
+      logger.info('Smart scenario analysis is disabled. Running test without previous analysis.');
+    }
+
     // Load environment variables
     let envVars;
     try {
@@ -38,6 +136,25 @@ export async function runTest(scriptPath: string, options: RunOptions) {
       logger.debug(`Error loading environment variables: ${error instanceof Error ? error.message : String(error)}`);
     }
 
+    if (archive.archiveSize > 1024 * 1024) {
+      // Volume flow
+      logger.info(`Test script archive size (${(archive.archiveSize / (1024 * 1024)).toFixed(2)} MB) exceeds 1 MB, using volume flow.`);
+
+      const volumeClaimResult = await kubernetesService.createPVCWithArchive(archive, config.namespace);
+      const testRunManifest = buildTestRunManifestWithVolumeClaim(volumeClaimResult, config, envVars);
+      await kubernetesService.createTestRun(testRunManifest);
+
+      await saveLastRun({
+        testRunName: testRunManifest.metadata.name,
+        namespace: testRunManifest.metadata.namespace,
+        volumeClaimName: volumeClaimResult.volumeClaimName,
+        scriptPath,
+        createdAt: new Date().toISOString(),
+      });
+      logger.info(`Last run saved: ${testRunManifest.metadata.name} (namespace: ${testRunManifest.metadata.namespace})`);
+      return;
+    }
+
     // Create configmap for test script
     const configMap = await kubernetesService.createConfigMap(archive, config.namespace);
 
@@ -61,3 +178,100 @@ export async function runTest(scriptPath: string, options: RunOptions) {
     logger.error(`Error running test: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
+
+async function analyzeScript(inspectResult: K6InspectResult): Promise<K6ScenarioMetrics[]> {
+  if (!inspectResult.scenarios) {
+    logger.info('No scenarios found in the script. Smart analysis cannot be performed.');
+    return [];
+  }
+  const allMetrics: K6ScenarioMetrics[] = Object.entries(inspectResult.scenarios).map(([name, scenario]) => {
+    return calculateScenarioMetrics(name, scenario) as K6ScenarioMetrics;
+  });
+  return allMetrics;
+}
+
+function calculateScenarioMetrics(
+  name: string,
+  scenario: K6ScenarioOptions,
+  avgIterationDurationSeconds: number = MAX_ITERATION_DURATION_SECONDS,
+  safetyFactor: number = 1.2
+): K6ScenarioMetrics | null {
+  if (scenario.executor !== 'ramping-arrival-rate') {
+    return null;
+  }
+  if (!scenario.stages || scenario.stages.length === 0) {
+    return null;
+  }
+  const timeUnitSeconds = parseTimeUnitToSeconds(scenario.timeUnit);
+  let previousRate = scenario.startRate ?? 0;
+  let peakTps = previousRate / timeUnitSeconds;
+  let totalIterations = 0;
+  const stageMetrics: K6StageMetrics[] = scenario.stages.map((stage, index) => {
+    const durationSeconds = parseDurationToSeconds(stage.duration);
+    const fromTps = previousRate / timeUnitSeconds;
+    const toTps = stage.target / timeUnitSeconds;
+    const avgTps = (fromTps + toTps) / 2;
+    const estimatedIterations = avgTps * durationSeconds;
+    totalIterations += estimatedIterations;
+    peakTps = Math.max(peakTps, toTps);
+    const requiredVUsAtTarget = toTps * avgIterationDurationSeconds;
+    const recommendedVUsAtTarget = requiredVUsAtTarget * safetyFactor;
+    previousRate = stage.target;
+    return {
+      stageIndex: index + 1,
+      duration: stage.duration,
+      durationSeconds,
+      fromTps,
+      toTps,
+      avgTps,
+      estimatedIterations,
+      requiredVUsAtTarget,
+      recommendedVUsAtTarget,
+    };
+  });
+  const requiredMaxVUs = peakTps * avgIterationDurationSeconds;
+  const recommendedMaxVUs = requiredMaxVUs * safetyFactor;
+  return {
+    name,
+    peakTps,
+    totalIterations,
+    requiredMaxVUs,
+    recommendedMaxVUs,
+    stageMetrics,
+  };
+}
+
+function parseDurationToSeconds(duration: string): number {
+  const regex = /(\d+)(ms|s|m|h)/g;
+  let match: RegExpExecArray | null;
+  let totalMs = 0;
+  while ((match = regex.exec(duration)) !== null) {
+    const value = Number(match[1]);
+    const unit = match[2];
+    switch (unit) {
+      case 'h':
+        totalMs += value * 60 * 60 * 1000;
+        break;
+      case 'm':
+        totalMs += value * 60 * 1000;
+        break;
+      case 's':
+        totalMs += value * 1000;
+        break;
+      case 'ms':
+        totalMs += value;
+        break;
+      default:
+        throw new Error(`Unsupported duration unit: ${unit}`);
+    }
+  }
+  if (totalMs === 0) {
+    throw new Error(`Invalid duration format: ${duration}`);
+  }
+  return totalMs / 1000;
+}
+
+function parseTimeUnitToSeconds(timeUnit?: string): number {
+  if (!timeUnit) return 1;
+  return parseDurationToSeconds(timeUnit);
+}

package/src/commands/status.ts

@@ -21,6 +21,10 @@ export async function status(options: StatusOptions) {
   const kubernetesService = createDefaultKubernetesService();
 
   const testRun = await kubernetesService.getTestRun(lastRun.testRunName, namespace);
+  if (!testRun) {
+    logger.error(`TestRun ${lastRun.testRunName} not found in namespace ${namespace}. It may have been deleted externally.`);
+    process.exit(1);
+  }
   printTestRunsTable([testRun]);
 
   const podList = await kubernetesService.getPodsForTestRun(lastRun.testRunName, namespace);