@testsmith/api-spector 0.8.7 → 0.8.9

package/out/main/register-handlers.js

@@ -29,13 +29,13 @@ const path = require("node:path");
 const crypto = require("node:crypto");
 const JSZip = require("jszip");
 const dataFiles = require("./chunks/data-files-BYqhsoPe.js");
-const requestExec = require("./chunks/request-exec-BI4sXJop.js");
+const requestCollection = require("./chunks/request-collection-zRRUfg0X.js");
+const requestExec = require("./chunks/request-exec-s7k-oRi2.js");
 const ipcValidate = require("./chunks/ipc-validate-sqUFqRmE.js");
 const uuid = require("uuid");
 const jsYaml = require("js-yaml");
 const undici = require("undici");
 const soapHandler = require("./chunks/soap-handler-BF5ii0UV.js");
-const requestCollection = require("./chunks/request-collection-gkOYlWml.js");
 const runConcurrent = require("./chunks/run-concurrent-468tH0AX.js");
 const flowEngine = require("./chunks/flow-engine-BxwjEy37.js");
 const mockServer = require("./chunks/mock-server-C4kTFkod.js");
@@ -49,7 +49,7 @@ const os = require("node:os");
 const grpc = require("@grpc/grpc-js");
 const protoLoader = require("@grpc/proto-loader");
 const escape = require("./chunks/escape-DDVAlOvZ.js");
-const brokerClient = require("./chunks/broker-client-Bp9YId3a.js");
+const brokerClient = require("./chunks/broker-client-170x6Jx9.js");
 const simpleGit = require("simple-git");
 const recorder = require("./chunks/recorder-BkO8G_mB.js");
 require("fs/promises");
@@ -297,7 +297,7 @@ Create a workspace in this folder and add "${path.basename(wsPath)}" to it? The
     }
     workspaceDir = path.dirname(wsPath);
     workspaceFile = wsPath;
-    await requestExec.loadGlobals(workspaceDir);
+    await requestCollection.loadGlobals(workspaceDir);
     await saveLastWorkspacePath(wsPath);
     requestExec.setSecretsConfig(parsed.settings?.secrets);
     return { workspace: parsed, workspacePath: wsPath };
@@ -313,7 +313,7 @@ Create a workspace in this folder and add "${path.basename(wsPath)}" to it? The
     if (result.canceled || !result.filePath) return null;
     workspaceDir = path.dirname(result.filePath);
     workspaceFile = result.filePath;
-    await requestExec.loadGlobals(workspaceDir);
+    await requestCollection.loadGlobals(workspaceDir);
     await promises.mkdir(path.join(workspaceDir, "collections"), { recursive: true });
     await promises.mkdir(path.join(workspaceDir, "environments"), { recursive: true });
     await promises.mkdir(path.join(workspaceDir, "flows"), { recursive: true });
@@ -420,10 +420,10 @@ Create a workspace in this folder and add "${path.basename(wsPath)}" to it? The
     await promises.writeFile(result.filePath, content, "utf8");
     return true;
   });
-  handle.handleIpc(ipc, handle.IPC.globals.get, () => requestExec.getGlobals());
+  handle.handleIpc(ipc, handle.IPC.globals.get, () => requestCollection.getGlobals());
   handle.handleIpc(ipc, handle.IPC.globals.set, async (_e, patch) => {
-    requestExec.setGlobals(patch);
-    await requestExec.persistGlobals();
+    requestCollection.setGlobals(patch);
+    await requestCollection.persistGlobals();
   });
   handle.handleIpc(ipc, handle.IPC.file.closeWorkspace, async () => {
     workspaceDir = null;
@@ -445,7 +445,7 @@ Create a workspace in this folder and add "${path.basename(wsPath)}" to it? The
       const workspace = JSON.parse(raw);
       workspaceDir = path.dirname(wsPath);
       workspaceFile = wsPath;
-      await requestExec.loadGlobals(workspaceDir);
+      await requestCollection.loadGlobals(workspaceDir);
       requestExec.setSecretsConfig(workspace.settings?.secrets);
       return { workspace, workspacePath: wsPath };
     } catch {
@@ -475,7 +475,7 @@ Create a workspace in this folder and add "${path.basename(wsPath)}" to it? The
     if (looksLikeCollection(parsed)) return null;
     workspaceDir = path.dirname(wsPath);
     workspaceFile = wsPath;
-    await requestExec.loadGlobals(workspaceDir);
+    await requestCollection.loadGlobals(workspaceDir);
     await saveLastWorkspacePath(wsPath);
     requestExec.setSecretsConfig(parsed.settings?.secrets);
     return { workspace: parsed, workspacePath: wsPath };
@@ -509,7 +509,7 @@ Create a workspace in this folder and add "${path.basename(wsPath)}" to it? The
     const parsed = JSON.parse(await promises.readFile(wsPath, "utf8"));
     workspaceDir = path.dirname(wsPath);
     workspaceFile = wsPath;
-    await requestExec.loadGlobals(workspaceDir);
+    await requestCollection.loadGlobals(workspaceDir);
     await saveLastWorkspacePath(wsPath);
     requestExec.setSecretsConfig(parsed.settings?.secrets);
     return { workspace: parsed, workspacePath: wsPath };
@@ -530,7 +530,7 @@ async function tryOpenWorkspaceInDir(dir) {
     const workspace = JSON.parse(raw);
     workspaceDir = dir;
     workspaceFile = wsPath;
-    await requestExec.loadGlobals(workspaceDir);
+    await requestCollection.loadGlobals(workspaceDir);
     requestExec.setSecretsConfig(workspace.settings?.secrets);
     return { workspace, workspacePath: wsPath };
   } catch {
@@ -657,10 +657,15 @@ async function wrapCollectionAsWorkspace(collFilePath, collection) {
   await atomicWrite(collFilePath, JSON.stringify(ws, null, 2));
   workspaceDir = dir;
   workspaceFile = collFilePath;
-  await requestExec.loadGlobals(dir);
+  await requestCollection.loadGlobals(dir);
   await saveLastWorkspacePath(collFilePath);
   return { workspace: ws, workspacePath: collFilePath };
 }
+function scopeDelta(base, updated) {
+  const out = {};
+  for (const [k, v] of Object.entries(updated)) if (base[k] !== v) out[k] = v;
+  return out;
+}
 function asObject(value) {
   return value && typeof value === "object" ? value : null;
 }
@@ -737,6 +742,7 @@ function registerRequestHandler(ipc) {
       request: req,
       environment,
       collectionVars,
+      folderVars = {},
       globals: payloadGlobals,
       proxy,
       tls,
@@ -759,7 +765,7 @@ function registerRequestHandler(ipc) {
       flushTimer = setInterval(flushStream, 40);
     }
     const start = Date.now();
-    const liveGlobals = requestExec.getGlobals();
+    const liveGlobals = requestCollection.getGlobals();
     const mergedGlobals = { ...payloadGlobals, ...liveGlobals };
     const envVars = await requestExec.buildEnvVars(environment);
     let localVars = {};
@@ -777,21 +783,24 @@ function registerRequestHandler(ipc) {
     }
     const dynamicVars = await requestExec.buildDynamicVars();
     if (dataRow && Object.keys(dataRow).length > 0) {
-      localVars = requestExec.resolveDataRow(dataRow, requestExec.mergeVars(envVars, collectionVars, mergedGlobals, {}, dynamicVars));
+      localVars = requestExec.resolveDataRow(dataRow, requestExec.mergeVars(envVars, collectionVars, mergedGlobals, {}, dynamicVars, folderVars));
     }
     if (req.variables && Object.keys(req.variables).length > 0) {
       localVars = { ...req.variables, ...localVars };
     }
-    let vars = requestExec.mergeVars(envVars, collectionVars, mergedGlobals, localVars, dynamicVars);
+    const seededLocalVars = { ...localVars };
+    let vars = requestExec.mergeVars(envVars, collectionVars, mergedGlobals, localVars, dynamicVars, folderVars);
     let preScriptMeta = { consoleOutput: [] };
     let updatedCollectionVars = { ...collectionVars };
     let updatedEnvVars = { ...envVars };
     let updatedGlobals = { ...mergedGlobals };
+    let updatedFolderVars = { ...folderVars };
     if (req.preRequestScript?.trim()) {
       const result = await requestExec.runScript(requestExec.interpolate(req.preRequestScript, vars), {
         envVars: { ...envVars },
         collectionVars: { ...collectionVars },
         globals: { ...mergedGlobals },
+        folderVars: { ...folderVars },
         // Seed the script's local scope with the already-resolved local vars
         // (request-scoped variables + any data-row) so they survive the script
         // run — otherwise updatedLocalVars below would overwrite them with {} and
@@ -803,9 +812,8 @@ function registerRequestHandler(ipc) {
       updatedEnvVars = result.updatedEnvVars;
       updatedCollectionVars = result.updatedCollectionVars;
       updatedGlobals = result.updatedGlobals;
-      requestExec.patchGlobals(result.updatedGlobals);
-      await requestExec.persistGlobals();
-      vars = requestExec.mergeVars(updatedEnvVars, updatedCollectionVars, updatedGlobals, localVars, dynamicVars);
+      updatedFolderVars = result.updatedFolderVars;
+      vars = requestExec.mergeVars(updatedEnvVars, updatedCollectionVars, updatedGlobals, localVars, dynamicVars, updatedFolderVars);
     }
     let response;
     let scriptResponse;
@@ -917,6 +925,7 @@ function registerRequestHandler(ipc) {
         envVars: { ...updatedEnvVars },
         collectionVars: { ...updatedCollectionVars },
         globals: { ...updatedGlobals },
+        folderVars: { ...updatedFolderVars },
         localVars: { ...localVars },
         // Pass the *unmasked* response so the script can extract real values
         // (tokens, ids, …). The displayed `response` keeps the redacted copy.
@@ -928,9 +937,8 @@ function registerRequestHandler(ipc) {
       updatedEnvVars = result.updatedEnvVars;
       updatedCollectionVars = result.updatedCollectionVars;
       updatedGlobals = result.updatedGlobals;
+      updatedFolderVars = result.updatedFolderVars;
       localVars = result.updatedLocalVars;
-      requestExec.patchGlobals(result.updatedGlobals);
-      await requestExec.persistGlobals();
     }
     const combinedTestResults = [...schemaTestResults, ...postTestResults];
     if (!response.error && response.status >= 400 && combinedTestResults.length === 0) {
@@ -943,10 +951,14 @@ function registerRequestHandler(ipc) {
     const scriptResult = {
       testResults: combinedTestResults,
       consoleOutput: [...decryptionWarnings, ...preScriptMeta.consoleOutput, ...postConsole],
-      updatedEnvVars,
-      updatedCollectionVars,
-      updatedGlobals,
-      updatedLocalVars: localVars,
+      // Persist only what the scripts actually changed, so echoed inputs (the
+      // sent session/collection vars, the seeded request/data vars) don't get
+      // written back and overwrite stored values.
+      updatedEnvVars: scopeDelta(envVars, updatedEnvVars),
+      updatedCollectionVars: scopeDelta(collectionVars, updatedCollectionVars),
+      updatedGlobals: scopeDelta(mergedGlobals, updatedGlobals),
+      updatedLocalVars: scopeDelta(seededLocalVars, localVars),
+      updatedFolderVars: scopeDelta(folderVars, updatedFolderVars),
       resolvedUrl,
       preScriptError: preScriptMeta.error,
       postScriptError: postError
@@ -956,8 +968,6 @@ function registerRequestHandler(ipc) {
   handle.handleIpc(ipc, handle.IPC.script.runHook, async (_e, payload) => {
     const { script, envVars, collectionVars, globals } = payload;
     const result = await requestExec.runScript(script, { envVars, collectionVars, globals, localVars: {} });
-    requestExec.patchGlobals(result.updatedGlobals);
-    await requestExec.persistGlobals();
     return {
       updatedEnvVars: result.updatedEnvVars,
       updatedCollectionVars: result.updatedCollectionVars,
@@ -1128,6 +1138,18 @@ function parseHeaders$1(raw) {
     description: h.description ?? ""
   }));
 }
+function parseCollectionVariables(raw) {
+  const variables = {};
+  const disabled = {};
+  for (const v of raw ?? []) {
+    const key = typeof v?.key === "string" ? v.key.trim() : "";
+    if (!key) continue;
+    const value = v.value == null ? "" : String(v.value);
+    if (v.disabled) disabled[key] = value;
+    else variables[key] = value;
+  }
+  return { variables, disabled };
+}
 function parseParams$1(urlObj) {
   if (!urlObj || typeof urlObj === "string") return [];
   return (urlObj.query ?? []).map((p) => ({
@@ -1309,13 +1331,16 @@ async function importPostman(filePath) {
       rootFolder.requestIds.push(req.id);
     }
   }
+  const { variables: collectionVariables, disabled: collectionVariablesDisabled } = parseCollectionVariables(data.variable);
   return {
     version: "1.0",
     id: uuid.v4(),
     name: info.name ?? "Imported Collection",
     description: info.description ?? "",
     rootFolder,
-    requests
+    requests,
+    ...Object.keys(collectionVariables).length ? { collectionVariables } : {},
+    ...Object.keys(collectionVariablesDisabled).length ? { collectionVariablesDisabled } : {}
   };
 }
 async function importPostmanEnvironment(filePath) {
@@ -1745,6 +1770,15 @@ function parseAuth(auth) {
   }
   return { type: "none" };
 }
+function toVarMap(data) {
+  const out = {};
+  if (!data || typeof data !== "object") return out;
+  for (const [key, value] of Object.entries(data)) {
+    if (!key || value == null) continue;
+    out[key] = typeof value === "object" ? JSON.stringify(value) : String(value);
+  }
+  return out;
+}
 async function importInsomnia(filePath) {
   const raw = await promises.readFile(filePath, "utf8");
   const data = JSON.parse(raw);
@@ -1756,12 +1790,14 @@ async function importInsomnia(filePath) {
   const rootFolder = { id: uuid.v4(), name: "root", description: "", folders: [], requestIds: [] };
   for (const r of resources) {
     if (r._type !== "request_group") continue;
+    const variables = toVarMap(r.environment);
     folderById[r._id] = {
       id: uuid.v4(),
       name: r.name ?? "Folder",
       description: r.description ?? "",
       folders: [],
-      requestIds: []
+      requestIds: [],
+      ...Object.keys(variables).length ? { variables } : {}
     };
   }
   for (const r of resources) {
@@ -1798,13 +1834,16 @@ async function importInsomnia(filePath) {
       folderById[r.parentId].folders.push(folder);
     }
   }
+  const baseEnv = resources.find((r) => r._type === "environment" && r.parentId === workspaceId) ?? resources.find((r) => r._type === "environment");
+  const collectionVariables = toVarMap(baseEnv?.data);
   return {
     version: "1.0",
     id: uuid.v4(),
     name: workspace.name ?? "Imported Collection",
     description: workspace.description ?? "",
     rootFolder,
-    requests
+    requests,
+    ...Object.keys(collectionVariables).length ? { collectionVariables } : {}
   };
 }
 function extractBlock(content, blockName) {
@@ -1844,6 +1883,20 @@ function parseKv(blockContent) {
   }
   return result;
 }
+function parseVarsBlock(blockContent) {
+  const variables = {};
+  const disabled = {};
+  for (const [rawKey, value] of Object.entries(parseKv(blockContent))) {
+    if (rawKey.startsWith("~")) {
+      const key = rawKey.slice(1).trim();
+      if (key) disabled[key] = value;
+    } else {
+      variables[rawKey] = value;
+    }
+  }
+  return { variables, disabled };
+}
+const BRU_CONFIG_FILES = /* @__PURE__ */ new Set(["folder.bru", "collection.bru"]);
 const HTTP_METHODS = ["get", "post", "put", "patch", "delete", "head", "options", "query"];
 function parseBruFile(content, fileName) {
   const meta = parseKv(extractBlock(content, "meta"));
@@ -1908,6 +1961,7 @@ function parseBruFile(content, fileName) {
       apiKeyIn: apiKeyAttrs["in"] === "query" ? "query" : "header"
     };
   }
+  const { variables, disabled: variablesDisabled } = parseVarsBlock(extractBlock(content, "vars:pre-request"));
   return {
     id: uuid.v4(),
     name: meta["name"] ?? path.basename(fileName, ".bru"),
@@ -1921,7 +1975,9 @@ function parseBruFile(content, fileName) {
     description: extractBlock(content, "docs")?.trim() ?? "",
     preRequestScript: extractBlock(content, "script:pre-request") ? translateScript(extractBlock(content, "script:pre-request").trim(), "bruno") || void 0 : void 0,
     postRequestScript: extractBlock(content, "script:post-response") ? translateScript(extractBlock(content, "script:post-response").trim(), "bruno") || void 0 : void 0,
-    meta: { seq: meta["seq"] !== void 0 ? Number(meta["seq"]) : 0 }
+    meta: { seq: meta["seq"] !== void 0 ? Number(meta["seq"]) : 0 },
+    ...Object.keys(variables).length ? { variables } : {},
+    ...Object.keys(variablesDisabled).length ? { variablesDisabled } : {}
   };
 }
 async function scanDir(dirPath, name, requests, ignore) {
@@ -1935,7 +1991,16 @@ async function scanDir(dirPath, name, requests, ignore) {
     if (s.isDirectory()) {
       const sub = await scanDir(fullPath, entry, requests, ignore);
       if (sub.folders.length > 0 || sub.requestIds.length > 0) folder.folders.push(sub);
-    } else if (entry.endsWith(".bru")) {
+    } else if (entry === "folder.bru") {
+      const content = await promises.readFile(fullPath, "utf8");
+      const meta = parseKv(extractBlock(content, "meta"));
+      if (meta["name"]) folder.name = meta["name"];
+      const docs = extractBlock(content, "docs")?.trim();
+      if (docs) folder.description = docs;
+      const { variables, disabled } = parseVarsBlock(extractBlock(content, "vars:pre-request"));
+      if (Object.keys(variables).length) folder.variables = variables;
+      if (Object.keys(disabled).length) folder.variablesDisabled = disabled;
+    } else if (entry.endsWith(".bru") && !BRU_CONFIG_FILES.has(entry)) {
       const content = await promises.readFile(fullPath, "utf8");
       const req = parseBruFile(content, entry);
       requests[req.id] = req;
@@ -1953,13 +2018,24 @@ async function importBruno(filePath) {
   const ignore = /* @__PURE__ */ new Set(["node_modules", ".git", ...config.ignore ?? []]);
   const requests = {};
   const rootFolder = await scanDir(dirPath, "root", requests, ignore);
+  let collectionVariables = {};
+  let collectionVariablesDisabled = {};
+  try {
+    const colBru = await promises.readFile(path.join(dirPath, "collection.bru"), "utf8");
+    const parsed = parseVarsBlock(extractBlock(colBru, "vars:pre-request"));
+    collectionVariables = parsed.variables;
+    collectionVariablesDisabled = parsed.disabled;
+  } catch {
+  }
   return {
     version: "1.0",
     id: uuid.v4(),
     name: config.name ?? "Imported Collection",
     description: "",
     rootFolder,
-    requests
+    requests,
+    ...Object.keys(collectionVariables).length ? { collectionVariables } : {},
+    ...Object.keys(collectionVariablesDisabled).length ? { collectionVariablesDisabled } : {}
   };
 }
 const METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS", "QUERY"];
@@ -5359,7 +5435,7 @@ function registerRunnerHandler(ipc) {
     const { items, environment, globals: payloadGlobals, proxy, tls, piiMaskPatterns = [], requestDelay = 0 } = payload;
     const concurrency = Math.max(1, Math.min(20, Math.floor(payload.concurrency ?? 1)));
     const envVars = await requestExec.buildEnvVars(environment);
-    const liveGlobals = requestExec.getGlobals();
+    const liveGlobals = requestCollection.getGlobals();
     const globals = { ...payloadGlobals, ...liveGlobals };
     const dispatcher = await requestExec.buildDispatcher(proxy, tls);
     const summary = { total: items.length, passed: 0, failed: 0, errors: 0, skipped: 0, durationMs: 0 };
@@ -5484,7 +5560,7 @@ function registerFlowHandler(ipc) {
     const flow = flowEngine.normalizeFlow(payload.flow);
     const flows = (payload.flows ?? []).map(flowEngine.normalizeFlow);
     const envVars = await requestExec.buildEnvVars(environment);
-    const globals = { ...payloadGlobals, ...requestExec.getGlobals() };
+    const globals = { ...payloadGlobals, ...requestCollection.getGlobals() };
     const dispatcher = await requestExec.buildDispatcher(proxy, tls);
     const colById = new Map(collections.map((c) => [c.id, c]));
     const deps = {
@@ -7339,6 +7415,31 @@ function registerContractHandlers(ipc) {
     return { file };
   });
 }
+const BRANCH_REF_FORMAT = "%(refname)|%(refname:short)|%(HEAD)|%(upstream:short)|%(upstream:track)";
+function parseBranchRefs(raw, current) {
+  const branches = [];
+  for (const line of raw.split("\n")) {
+    if (!line.trim()) continue;
+    const [fullRef, shortName, head, upstream, track] = line.split("|");
+    if (!shortName || shortName.endsWith("/HEAD")) continue;
+    const isRemote = fullRef.startsWith("refs/remotes/");
+    let ahead;
+    let behind;
+    const aheadM = /ahead (\d+)/.exec(track ?? "");
+    const behindM = /behind (\d+)/.exec(track ?? "");
+    if (aheadM) ahead = Number(aheadM[1]);
+    if (behindM) behind = Number(behindM[1]);
+    branches.push({
+      name: shortName,
+      current: !isRemote && (head === "*" || shortName === current),
+      remote: isRemote,
+      upstream: upstream || void 0,
+      ahead,
+      behind
+    });
+  }
+  return branches;
+}
 function git() {
   const dir = getWorkspaceDir();
   if (!dir) throw new Error("No workspace open");
@@ -7431,34 +7532,12 @@ function registerGitHandlers(ipc) {
   handle.handleIpc(ipc, handle.IPC.git.branches, async () => {
     const raw = await git().raw([
       "for-each-ref",
-      "--format=%(refname:short)|%(HEAD)|%(upstream:short)|%(upstream:track)",
+      `--format=${BRANCH_REF_FORMAT}`,
       "refs/heads",
       "refs/remotes"
     ]);
     const current = (await git().branch()).current;
-    const branches = [];
-    for (const line of raw.split("\n")) {
-      if (!line.trim()) continue;
-      const [shortName, head, upstream, track] = line.split("|");
-      if (!shortName || shortName.endsWith("/HEAD")) continue;
-      const isRemote = shortName.startsWith("origin/") || shortName.includes("/");
-      const looksLocal = !isRemote;
-      let ahead;
-      let behind;
-      const aheadM = /ahead (\d+)/.exec(track);
-      const behindM = /behind (\d+)/.exec(track);
-      if (aheadM) ahead = Number(aheadM[1]);
-      if (behindM) behind = Number(behindM[1]);
-      branches.push({
-        name: shortName,
-        current: looksLocal && (head === "*" || shortName === current),
-        remote: isRemote,
-        upstream: upstream || void 0,
-        ahead,
-        behind
-      });
-    }
-    return branches;
+    return parseBranchRefs(raw, current);
   });
   handle.handleIpc(ipc, handle.IPC.git.checkout, async (_e, branch, create) => {
     if (create) {
@@ -7833,7 +7912,7 @@ function registerCloudHandlers(ipc) {
   handle.handleIpc(ipc, handle.IPC.cloud.pushMonitor, async (_e, input) => {
     const { request, environment, collectionVars, globals } = input;
     const envVars = await requestExec.buildEnvVars(environment);
-    const liveGlobals = { ...globals, ...requestExec.getGlobals() };
+    const liveGlobals = { ...globals, ...requestCollection.getGlobals() };
     const staticVars = requestExec.mergeVars(envVars, collectionVars ?? {}, liveGlobals, {}, {});
     const setup = input.setup ?? [];
     const resolveVars2 = omitKeys(staticVars, setVarNames(setup));

package/out/main/runner.js

@@ -2,9 +2,9 @@
 "use strict";
 const promises = require("node:fs/promises");
 const path = require("node:path");
-const requestExec = require("./chunks/request-exec-BI4sXJop.js");
+const requestExec = require("./chunks/request-exec-s7k-oRi2.js");
+const requestCollection = require("./chunks/request-collection-zRRUfg0X.js");
 const escape = require("./chunks/escape-DDVAlOvZ.js");
-const requestCollection = require("./chunks/request-collection-gkOYlWml.js");
 const runConcurrent = require("./chunks/run-concurrent-468tH0AX.js");
 const environments = require("./chunks/environments-iM3SUM-4.js");
 const cliCommon = require("./chunks/cli-common-GnihVSjU.js");
@@ -510,10 +510,10 @@ function printResult(r, verbose) {
   if (r.error) console.log(cliCommon.color(`     Error: ${r.error}`, cliCommon.C.red));
 }
 async function main() {
-  const args = cliCommon.parseArgs(process.argv.slice(2));
+  const args = cliCommon.parseArgs(process.argv.slice(2), ["ask", "var", "env-var", "global-var"]);
   if (args.help) {
     console.log(
-      '\nUsage:\n  api-spector run --workspace <path> [--environment <name>] [--tags <a,b>]\n                  [--collection <name>] [--output <path>] [--format json|junit|html|sarif]\n                  [--ask "Message=value"] [--concurrency <n>] [--verbose] [--bail]\n\n  --ask "Message=value"  Supply an ask variable ({{@Message}}) for this run\n                         (repeatable). Requests whose ask variables are not\n                         supplied are skipped.\n  --concurrency <n>      Run n requests at a time (default 1 = sequential).\n                         Hooks run as barriers; best for independent requests.\n'
+      '\nUsage:\n  api-spector run --workspace <path> [--environment <name>] [--tags <a,b>]\n                  [--collection <name>] [--var "key=value"]\n                  [--env-var "key=value"] [--global-var "key=value"]\n                  [--output <path>] [--format json|junit|html|sarif]\n                  [--ask "Message=value"] [--concurrency <n>] [--verbose] [--bail]\n\n  --var "key=value"      Override a variable for this run (repeatable). Sits at\n                         the CLI tier: above environment/collection/folder/\n                         request values, below data-row and script-set values.\n  --env-var "key=value"  Set an environment variable for this run (repeatable).\n                         Seeds the environment scope; a script may override it.\n  --global-var "key=value"  Set a global variable for this run (repeatable).\n                         Seeds the globals scope; a script may override it.\n  --ask "Message=value"  Supply an ask variable ({{@Message}}) for this run\n                         (repeatable). Requests whose ask variables are not\n                         supplied are skipped.\n  --concurrency <n>      Run n requests at a time (default 1 = sequential).\n                         Hooks run as barriers; best for independent requests.\n'
     );
     process.exit(0);
   }
@@ -539,7 +539,7 @@ async function main() {
     console.error(cliCommon.color(`Error: could not read workspace file: ${wsPath}`, cliCommon.C.red));
     process.exit(1);
   }
-  await requestExec.loadGlobals(wsDir);
+  await requestCollection.loadGlobals(wsDir);
   requestExec.setSecretsConfig(workspace.settings?.secrets);
   const collections = await cliCommon.loadCollections(workspace, wsDir, {
     onError: (relPath) => console.error(cliCommon.color(`  [warn] Could not load collection: ${relPath}`, cliCommon.C.yellow))
@@ -551,7 +551,7 @@ async function main() {
   } else if (!envName && workspace.settings?.defaultEnvironment && !env) {
     console.warn(cliCommon.color(`Warning: default environment "${workspace.settings.defaultEnvironment}" not found. Running without environment.`, cliCommon.C.yellow));
   }
-  const version = `v${"0.8.7"}`;
+  const version = `v${"0.8.9"}`;
   console.log("");
   console.log(cliCommon.color("  API Test Runner" + (version ? ` ${version}` : ""), cliCommon.C.bold, cliCommon.C.white));
   console.log(cliCommon.color(`  Workspace:   ${wsPath}`, cliCommon.C.gray));
@@ -565,6 +565,18 @@ async function main() {
     const eq = entry.indexOf("=");
     if (eq > 0) askAnswers[entry.slice(0, eq).trim()] = entry.slice(eq + 1);
   }
+  const parseKeyVals = (raw) => {
+    const out = {};
+    for (const entry of Array.isArray(raw) ? raw : raw ? [raw] : []) {
+      if (typeof entry !== "string") continue;
+      const eq = entry.indexOf("=");
+      if (eq > 0) out[entry.slice(0, eq).trim()] = entry.slice(eq + 1);
+    }
+    return out;
+  };
+  const cliVars = parseKeyVals(args["var"]);
+  const envVarOverrides = parseKeyVals(args["env-var"]);
+  const globalVarOverrides = parseKeyVals(args["global-var"]);
   const concurrency = Math.max(1, Math.min(20, Math.floor(Number(args["concurrency"] ?? 1) || 1)));
   const envVarsSnapshot = await requestExec.buildEnvVars(env);
   const secretValuesToMask = (env?.variables ?? []).filter((v) => (v.secret || v.secretRef) && v.enabled).map((v) => envVarsSnapshot[v.key]).filter((v) => typeof v === "string" && v.length > 0);
@@ -616,11 +628,26 @@ async function main() {
     let items = requestCollection.buildRunPlan(col, null, filterTags);
     if (items.length === 0) continue;
     if (!firstColName) firstColName = col.name;
-    let runEnvVars = await requestExec.buildEnvVars(env);
-    let runGlobals = requestExec.getGlobals();
+    let runEnvVars = { ...await requestExec.buildEnvVars(env), ...envVarOverrides };
+    let runGlobals = { ...requestCollection.getGlobals(), ...globalVarOverrides };
     let runCollectionVars = { ...col.collectionVariables };
     let runLocalVars = {};
     const runFolderVars = {};
+    const cliOverridden = /* @__PURE__ */ new Set();
+    const cliSeed = () => Object.fromEntries(Object.entries(cliVars).filter(([k]) => !cliOverridden.has(k)));
+    const stripCliSeed = (m) => {
+      const copy = { ...m };
+      for (const k of Object.keys(cliVars)) delete copy[k];
+      return copy;
+    };
+    const trackCliOverrides = (out, inputs) => {
+      for (const k of Object.keys(cliVars)) {
+        if (cliOverridden.has(k)) continue;
+        if (out.updatedCollectionVars[k] !== inputs.col[k] || out.updatedEnvVars[k] !== inputs.env[k] || out.updatedGlobals[k] !== inputs.globals[k] || out.updatedFolderVars[k] !== inputs.folder[k] || out.updatedLocalVars[k] !== inputs.local[k]) {
+          cliOverridden.add(k);
+        }
+      }
+    };
     console.log(cliCommon.color(`  ┌ ${col.name}`, cliCommon.C.bold, cliCommon.C.white));
     const workspaceTls = workspace.settings?.tls;
     const effectiveTls = col.tls ? { ...workspaceTls, ...col.tls } : workspaceTls;
@@ -682,16 +709,16 @@ async function main() {
           iterationLabel: item.iterationLabel
         };
       } else {
+        const colInput = { ...item.collectionVars, ...runCollectionVars, ...resolveAskValues(itemAsks, askAnswers) };
+        const folderInput = { ...item.folderVars ?? {}, ...item.folderId ? runFolderVars[item.folderId] ?? {} : {} };
+        const localInput = { ...cliSeed(), ...runLocalVars, ...item.dataRow };
         const out = await requestExec.executeRunnerRequest({
           req: item.request,
-          collectionVars: { ...item.collectionVars, ...runCollectionVars, ...resolveAskValues(itemAsks, askAnswers) },
+          collectionVars: colInput,
           envVars: runEnvVars,
           globals: runGlobals,
-          localVars: { ...runLocalVars, ...item.dataRow },
-          folderVars: {
-            ...item.folderVars ?? {},
-            ...item.folderId ? runFolderVars[item.folderId] ?? {} : {}
-          },
+          localVars: localInput,
+          folderVars: folderInput,
           dispatcher,
           piiMaskPatterns: piiPatterns,
           tls: effectiveTls,
@@ -699,11 +726,12 @@ async function main() {
           expectStatus: item.expectStatus,
           owaspTag: item.owaspTag
         });
+        trackCliOverrides(out, { col: colInput, env: runEnvVars, globals: runGlobals, folder: folderInput, local: localInput });
         result = out.result;
         runEnvVars = out.updatedEnvVars;
         runCollectionVars = out.updatedCollectionVars;
         runGlobals = out.updatedGlobals;
-        runLocalVars = out.updatedLocalVars;
+        runLocalVars = stripCliSeed(out.updatedLocalVars);
         if (item.folderId) {
           runFolderVars[item.folderId] = { ...runFolderVars[item.folderId] ?? {}, ...out.updatedFolderVars };
         }
@@ -762,23 +790,27 @@ async function main() {
           return;
         }
         try {
+          const colInput = { ...item.collectionVars, ...runCollectionVars, ...resolveAskValues(itemAsks, askAnswers) };
+          const folderInput = { ...item.folderVars ?? {}, ...item.folderId ? runFolderVars[item.folderId] ?? {} : {} };
+          const localInput = { ...cliSeed(), ...runLocalVars, ...item.dataRow };
           const out = await requestExec.executeRunnerRequest({
             req: item.request,
-            collectionVars: { ...item.collectionVars, ...runCollectionVars, ...resolveAskValues(itemAsks, askAnswers) },
+            collectionVars: colInput,
             envVars: runEnvVars,
             globals: runGlobals,
-            localVars: { ...runLocalVars, ...item.dataRow },
-            folderVars: { ...item.folderVars ?? {}, ...item.folderId ? runFolderVars[item.folderId] ?? {} : {} },
+            localVars: localInput,
+            folderVars: folderInput,
             dispatcher,
             piiMaskPatterns: piiPatterns,
             tls: effectiveTls,
             expectStatus: item.expectStatus,
             owaspTag: item.owaspTag
           });
+          trackCliOverrides(out, { col: colInput, env: runEnvVars, globals: runGlobals, folder: folderInput, local: localInput });
           runEnvVars = { ...runEnvVars, ...out.updatedEnvVars };
           runCollectionVars = { ...runCollectionVars, ...out.updatedCollectionVars };
           runGlobals = { ...runGlobals, ...out.updatedGlobals };
-          runLocalVars = { ...runLocalVars, ...out.updatedLocalVars };
+          runLocalVars = stripCliSeed({ ...runLocalVars, ...out.updatedLocalVars });
           if (item.folderId) runFolderVars[item.folderId] = { ...runFolderVars[item.folderId] ?? {}, ...out.updatedFolderVars };
           const result = out.result;
           result.isHook = item.isHook;

package/out/renderer/assets/{GraphQLEditor-DqY91rWn.js → GraphQLEditor-CR3JSOwU.js}

@@ -1,5 +1,5 @@
 import { l as linter, E as EditorView, L as LanguageSupport, i as LRLanguage, s as styleTags, m as indentNodeProp, n as delimitedIndent, p as foldNodeProp, q as foldInside, S as StateField, u as LRParser, v as StateEffect, w as tags, a as reactExports, j as jsxRuntimeExports, e as ReactCodeMirror, o as oneDark, d as json } from "./codemirror-BKmwMUlV.js";
-import { u as useT, a as useStore, b as useActiveEnvironment, i as isSubscriptionQuery } from "./index-CLKJD4rg.js";
+import { u as useT, a as useStore, b as useActiveEnvironment, i as isSubscriptionQuery } from "./index-D_-cF6J0.js";
 import "./ajv-CJPwFjiP.js";
 function devAssert(condition, message) {
   const booleanCondition = Boolean(condition);

package/out/renderer/assets/{SoapEditor-DcpInN2A.js → SoapEditor-eAhSrhoc.js}

@@ -1,5 +1,5 @@
 import { a as reactExports, j as jsxRuntimeExports, e as ReactCodeMirror, o as oneDark, x as xml } from "./codemirror-BKmwMUlV.js";
-import { u as useT, c as btnPrimaryCls, d as commentKeymap } from "./index-CLKJD4rg.js";
+import { u as useT, c as btnPrimaryCls, d as commentKeymap } from "./index-D_-cF6J0.js";
 import "./ajv-CJPwFjiP.js";
 const SOAP_11_CONTENT_TYPE = "text/xml; charset=utf-8";
 const SOAP_12_CONTENT_TYPE = "application/soap+xml; charset=utf-8";