@qodalis/cli-scp 2.0.0-beta.2 → 2.0.0-beta.21

package/umd/index.global.js

@@ -8,7 +8,11 @@ var scp = (() => {
   var __getProtoOf = Object.getPrototypeOf;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
   var __commonJS = (cb, mod) => function __require() {
-    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+    try {
+      return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+    } catch (e) {
+      throw mod = 0, e;
+    }
   };
   var __copyProps = (to, from, except, desc) => {
     if (from && typeof from === "object" || typeof from === "function") {
@@ -27,7 +31,7 @@ var scp = (() => {
     mod
   ));
   var require_constants = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/internal/constants.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/internal/constants.js"(exports, module2) {
       var SEMVER_SPEC_VERSION = "2.0.0";
       var MAX_LENGTH = 256;
       var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */
@@ -56,26 +60,26 @@ var scp = (() => {
     }
   });
   var require_debug = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/internal/debug.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/internal/debug.js"(exports, module2) {
       var debug = typeof process === "object" && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG) ? (...args) => console.error("SEMVER", ...args) : () => {
       };
       module2.exports = debug;
     }
   });
   var require_re = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/internal/re.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/internal/re.js"(exports, module2) {
       var {
         MAX_SAFE_COMPONENT_LENGTH,
         MAX_SAFE_BUILD_LENGTH,
         MAX_LENGTH
       } = require_constants();
       var debug = require_debug();
-      exports$1 = module2.exports = {};
-      var re = exports$1.re = [];
-      var safeRe = exports$1.safeRe = [];
-      var src = exports$1.src = [];
-      var safeSrc = exports$1.safeSrc = [];
-      var t = exports$1.t = {};
+      exports = module2.exports = {};
+      var re = exports.re = [];
+      var safeRe = exports.safeRe = [];
+      var src = exports.src = [];
+      var safeSrc = exports.safeSrc = [];
+      var t = exports.t = {};
       var R = 0;
       var LETTERDASHNUMBER = "[a-zA-Z0-9-]";
       var safeRegexReplacements = [
@@ -128,18 +132,18 @@ var scp = (() => {
       createToken("COERCERTLFULL", src[t.COERCEFULL], true);
       createToken("LONETILDE", "(?:~>?)");
       createToken("TILDETRIM", `(\\s*)${src[t.LONETILDE]}\\s+`, true);
-      exports$1.tildeTrimReplace = "$1~";
+      exports.tildeTrimReplace = "$1~";
       createToken("TILDE", `^${src[t.LONETILDE]}${src[t.XRANGEPLAIN]}$`);
       createToken("TILDELOOSE", `^${src[t.LONETILDE]}${src[t.XRANGEPLAINLOOSE]}$`);
       createToken("LONECARET", "(?:\\^)");
       createToken("CARETTRIM", `(\\s*)${src[t.LONECARET]}\\s+`, true);
-      exports$1.caretTrimReplace = "$1^";
+      exports.caretTrimReplace = "$1^";
       createToken("CARET", `^${src[t.LONECARET]}${src[t.XRANGEPLAIN]}$`);
       createToken("CARETLOOSE", `^${src[t.LONECARET]}${src[t.XRANGEPLAINLOOSE]}$`);
       createToken("COMPARATORLOOSE", `^${src[t.GTLT]}\\s*(${src[t.LOOSEPLAIN]})$|^$`);
       createToken("COMPARATOR", `^${src[t.GTLT]}\\s*(${src[t.FULLPLAIN]})$|^$`);
       createToken("COMPARATORTRIM", `(\\s*)${src[t.GTLT]}\\s*(${src[t.LOOSEPLAIN]}|${src[t.XRANGEPLAIN]})`, true);
-      exports$1.comparatorTrimReplace = "$1$2$3";
+      exports.comparatorTrimReplace = "$1$2$3";
       createToken("HYPHENRANGE", `^\\s*(${src[t.XRANGEPLAIN]})\\s+-\\s+(${src[t.XRANGEPLAIN]})\\s*$`);
       createToken("HYPHENRANGELOOSE", `^\\s*(${src[t.XRANGEPLAINLOOSE]})\\s+-\\s+(${src[t.XRANGEPLAINLOOSE]})\\s*$`);
       createToken("STAR", "(<|>)?=?\\s*\\*");
@@ -148,7 +152,7 @@ var scp = (() => {
     }
   });
   var require_parse_options = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/internal/parse-options.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/internal/parse-options.js"(exports, module2) {
       var looseOption = Object.freeze({ loose: true });
       var emptyOpts = Object.freeze({});
       var parseOptions = (options) => {
@@ -164,7 +168,7 @@ var scp = (() => {
     }
   });
   var require_identifiers = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/internal/identifiers.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/internal/identifiers.js"(exports, module2) {
       var numeric = /^[0-9]+$/;
       var compareIdentifiers = (a, b) => {
         if (typeof a === "number" && typeof b === "number") {
@@ -186,12 +190,24 @@ var scp = (() => {
     }
   });
   var require_semver = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/classes/semver.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/classes/semver.js"(exports, module2) {
       var debug = require_debug();
       var { MAX_LENGTH, MAX_SAFE_INTEGER } = require_constants();
       var { safeRe: re, t } = require_re();
       var parseOptions = require_parse_options();
       var { compareIdentifiers } = require_identifiers();
+      var isPrereleaseIdentifier = (prerelease, identifier) => {
+        const identifiers = identifier.split(".");
+        if (identifiers.length > prerelease.length) {
+          return false;
+        }
+        for (let i = 0; i < identifiers.length; i++) {
+          if (compareIdentifiers(prerelease[i], identifiers[i]) !== 0) {
+            return false;
+          }
+        }
+        return true;
+      };
       var SemVer = class _SemVer {
         constructor(version, options) {
           options = parseOptions(options);
@@ -438,8 +454,9 @@ var scp = (() => {
                 if (identifierBase === false) {
                   prerelease = [identifier];
                 }
-                if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
-                  if (isNaN(this.prerelease[1])) {
+                if (isPrereleaseIdentifier(this.prerelease, identifier)) {
+                  const prereleaseBase = this.prerelease[identifier.split(".").length];
+                  if (isNaN(prereleaseBase)) {
                     this.prerelease = prerelease;
                   }
                 } else {
@@ -462,7 +479,7 @@ var scp = (() => {
     }
   });
   var require_parse = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/parse.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/parse.js"(exports, module2) {
       var SemVer = require_semver();
       var parse = (version, options, throwErrors = false) => {
         if (version instanceof SemVer) {
@@ -481,7 +498,7 @@ var scp = (() => {
     }
   });
   var require_valid = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/valid.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/valid.js"(exports, module2) {
       var parse = require_parse();
       var valid2 = (version, options) => {
         const v = parse(version, options);
@@ -491,7 +508,7 @@ var scp = (() => {
     }
   });
   var require_clean = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/clean.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/clean.js"(exports, module2) {
       var parse = require_parse();
       var clean = (version, options) => {
         const s = parse(version.trim().replace(/^[=v]+/, ""), options);
@@ -501,7 +518,7 @@ var scp = (() => {
     }
   });
   var require_inc = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/inc.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/inc.js"(exports, module2) {
       var SemVer = require_semver();
       var inc = (version, release, options, identifier, identifierBase) => {
         if (typeof options === "string") {
@@ -522,7 +539,7 @@ var scp = (() => {
     }
   });
   var require_diff = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/diff.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/diff.js"(exports, module2) {
       var parse = require_parse();
       var diff = (version1, version2) => {
         const v1 = parse(version1, null, true);
@@ -563,28 +580,28 @@ var scp = (() => {
     }
   });
   var require_major = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/major.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/major.js"(exports, module2) {
       var SemVer = require_semver();
       var major = (a, loose) => new SemVer(a, loose).major;
       module2.exports = major;
     }
   });
   var require_minor = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/minor.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/minor.js"(exports, module2) {
       var SemVer = require_semver();
       var minor = (a, loose) => new SemVer(a, loose).minor;
       module2.exports = minor;
     }
   });
   var require_patch = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/patch.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/patch.js"(exports, module2) {
       var SemVer = require_semver();
       var patch = (a, loose) => new SemVer(a, loose).patch;
       module2.exports = patch;
     }
   });
   var require_prerelease = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/prerelease.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/prerelease.js"(exports, module2) {
       var parse = require_parse();
       var prerelease = (version, options) => {
         const parsed = parse(version, options);
@@ -594,28 +611,28 @@ var scp = (() => {
     }
   });
   var require_compare = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/compare.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/compare.js"(exports, module2) {
       var SemVer = require_semver();
       var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
       module2.exports = compare2;
     }
   });
   var require_rcompare = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/rcompare.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/rcompare.js"(exports, module2) {
       var compare2 = require_compare();
       var rcompare = (a, b, loose) => compare2(b, a, loose);
       module2.exports = rcompare;
     }
   });
   var require_compare_loose = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/compare-loose.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/compare-loose.js"(exports, module2) {
       var compare2 = require_compare();
       var compareLoose = (a, b) => compare2(a, b, true);
       module2.exports = compareLoose;
     }
   });
   var require_compare_build = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/compare-build.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/compare-build.js"(exports, module2) {
       var SemVer = require_semver();
       var compareBuild = (a, b, loose) => {
         const versionA = new SemVer(a, loose);
@@ -626,63 +643,63 @@ var scp = (() => {
     }
   });
   var require_sort = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/sort.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/sort.js"(exports, module2) {
       var compareBuild = require_compare_build();
-      var sort = (list, loose) => list.sort((a, b) => compareBuild(a, b, loose));
+      var sort = (list2, loose) => list2.sort((a, b) => compareBuild(a, b, loose));
       module2.exports = sort;
     }
   });
   var require_rsort = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/rsort.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/rsort.js"(exports, module2) {
       var compareBuild = require_compare_build();
-      var rsort = (list, loose) => list.sort((a, b) => compareBuild(b, a, loose));
+      var rsort = (list2, loose) => list2.sort((a, b) => compareBuild(b, a, loose));
       module2.exports = rsort;
     }
   });
   var require_gt = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/gt.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/gt.js"(exports, module2) {
       var compare2 = require_compare();
       var gt = (a, b, loose) => compare2(a, b, loose) > 0;
       module2.exports = gt;
     }
   });
   var require_lt = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/lt.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/lt.js"(exports, module2) {
       var compare2 = require_compare();
       var lt = (a, b, loose) => compare2(a, b, loose) < 0;
       module2.exports = lt;
     }
   });
   var require_eq = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/eq.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/eq.js"(exports, module2) {
       var compare2 = require_compare();
       var eq = (a, b, loose) => compare2(a, b, loose) === 0;
       module2.exports = eq;
     }
   });
   var require_neq = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/neq.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/neq.js"(exports, module2) {
       var compare2 = require_compare();
       var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
       module2.exports = neq;
     }
   });
   var require_gte = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/gte.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/gte.js"(exports, module2) {
       var compare2 = require_compare();
       var gte2 = (a, b, loose) => compare2(a, b, loose) >= 0;
       module2.exports = gte2;
     }
   });
   var require_lte = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/lte.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/lte.js"(exports, module2) {
       var compare2 = require_compare();
       var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
       module2.exports = lte;
     }
   });
   var require_cmp = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/cmp.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/cmp.js"(exports, module2) {
       var eq = require_eq();
       var neq = require_neq();
       var gt = require_gt();
@@ -729,7 +746,7 @@ var scp = (() => {
     }
   });
   var require_coerce = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/coerce.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/coerce.js"(exports, module2) {
       var SemVer = require_semver();
       var parse = require_parse();
       var { safeRe: re, t } = require_re();
@@ -771,8 +788,46 @@ var scp = (() => {
       module2.exports = coerce2;
     }
   });
+  var require_truncate = __commonJS({
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/truncate.js"(exports, module2) {
+      var parse = require_parse();
+      var constants2 = require_constants();
+      var SemVer = require_semver();
+      var truncate = (version, truncation, options) => {
+        if (!constants2.RELEASE_TYPES.includes(truncation)) {
+          return null;
+        }
+        const clonedVersion = cloneInputVersion(version, options);
+        return clonedVersion && doTruncation(clonedVersion, truncation);
+      };
+      var cloneInputVersion = (version, options) => {
+        const versionStringToParse = version instanceof SemVer ? version.version : version;
+        return parse(versionStringToParse, options);
+      };
+      var doTruncation = (version, truncation) => {
+        if (isPrerelease(truncation)) {
+          return version.version;
+        }
+        version.prerelease = [];
+        switch (truncation) {
+          case "major":
+            version.minor = 0;
+            version.patch = 0;
+            break;
+          case "minor":
+            version.patch = 0;
+            break;
+        }
+        return version.format();
+      };
+      var isPrerelease = (type) => {
+        return type.startsWith("pre");
+      };
+      module2.exports = truncate;
+    }
+  });
   var require_lrucache = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/internal/lrucache.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/internal/lrucache.js"(exports, module2) {
       var LRUCache = class {
         constructor() {
           this.max = 1e3;
@@ -807,7 +862,7 @@ var scp = (() => {
     }
   });
   var require_range = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/classes/range.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/classes/range.js"(exports, module2) {
       var SPACE_CHARACTERS = /\s+/g;
       var Range = class _Range {
         constructor(range, options) {
@@ -874,6 +929,7 @@ var scp = (() => {
           return this.range;
         }
         parseRange(range) {
+          range = range.replace(BUILDSTRIPRE, "");
           const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
           const memoKey = memoOpts + ":" + range;
           const cached = cache.get(memoKey);
@@ -956,12 +1012,14 @@ var scp = (() => {
       var SemVer = require_semver();
       var {
         safeRe: re,
+        src,
         t,
         comparatorTrimReplace,
         tildeTrimReplace,
         caretTrimReplace
       } = require_re();
       var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+      var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
       var isNullSet = (c) => c.value === "<0.0.0-0";
       var isAny = (c) => c.value === "";
       var isSatisfiable = (comparators, options) => {
@@ -990,20 +1048,22 @@ var scp = (() => {
         return comp;
       };
       var isX = (id) => !id || id.toLowerCase() === "x" || id === "*";
+      var invalidXRangeOrder = (M, m, p) => isX(M) && !isX(m) || isX(m) && p && !isX(p);
       var replaceTildes = (comp, options) => {
         return comp.trim().split(/\s+/).map((c) => replaceTilde(c, options)).join(" ");
       };
       var replaceTilde = (comp, options) => {
         const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
+        const z = options.includePrerelease ? "-0" : "";
         return comp.replace(r, (_, M, m, p, pr) => {
           debug("tilde", comp, _, M, m, p, pr);
           let ret;
           if (isX(M)) {
             ret = "";
           } else if (isX(m)) {
-            ret = `>=${M}.0.0 <${+M + 1}.0.0-0`;
+            ret = `>=${M}.0.0${z} <${+M + 1}.0.0-0`;
           } else if (isX(p)) {
-            ret = `>=${M}.${m}.0 <${M}.${+m + 1}.0-0`;
+            ret = `>=${M}.${m}.0${z} <${M}.${+m + 1}.0-0`;
           } else if (pr) {
             debug("replaceTilde pr", pr);
             ret = `>=${M}.${m}.${p}-${pr} <${M}.${+m + 1}.0-0`;
@@ -1049,9 +1109,9 @@ var scp = (() => {
             debug("no pr");
             if (M === "0") {
               if (m === "0") {
-                ret = `>=${M}.${m}.${p}${z} <${M}.${m}.${+p + 1}-0`;
+                ret = `>=${M}.${m}.${p} <${M}.${m}.${+p + 1}-0`;
               } else {
-                ret = `>=${M}.${m}.${p}${z} <${M}.${+m + 1}.0-0`;
+                ret = `>=${M}.${m}.${p} <${M}.${+m + 1}.0-0`;
               }
             } else {
               ret = `>=${M}.${m}.${p} <${+M + 1}.0.0-0`;
@@ -1070,6 +1130,9 @@ var scp = (() => {
         const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
         return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
           debug("xRange", comp, ret, gtlt, M, m, p, pr);
+          if (invalidXRangeOrder(M, m, p)) {
+            return comp;
+          }
           const xM = isX(M);
           const xm = xM || isX(m);
           const xp = xm || isX(p);
@@ -1181,7 +1244,7 @@ var scp = (() => {
     }
   });
   var require_comparator = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/classes/comparator.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/classes/comparator.js"(exports, module2) {
       var ANY = /* @__PURE__ */ Symbol("SemVer ANY");
       var Comparator = class _Comparator {
         static get ANY() {
@@ -1291,7 +1354,7 @@ var scp = (() => {
     }
   });
   var require_satisfies = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/satisfies.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/functions/satisfies.js"(exports, module2) {
       var Range = require_range();
       var satisfies2 = (version, range, options) => {
         try {
@@ -1305,14 +1368,14 @@ var scp = (() => {
     }
   });
   var require_to_comparators = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/to-comparators.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/to-comparators.js"(exports, module2) {
       var Range = require_range();
       var toComparators = (range, options) => new Range(range, options).set.map((comp) => comp.map((c) => c.value).join(" ").trim().split(" "));
       module2.exports = toComparators;
     }
   });
   var require_max_satisfying = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/max-satisfying.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/max-satisfying.js"(exports, module2) {
       var SemVer = require_semver();
       var Range = require_range();
       var maxSatisfying = (versions, range, options) => {
@@ -1338,7 +1401,7 @@ var scp = (() => {
     }
   });
   var require_min_satisfying = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/min-satisfying.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/min-satisfying.js"(exports, module2) {
       var SemVer = require_semver();
       var Range = require_range();
       var minSatisfying = (versions, range, options) => {
@@ -1364,7 +1427,7 @@ var scp = (() => {
     }
   });
   var require_min_version = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/min-version.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/min-version.js"(exports, module2) {
       var SemVer = require_semver();
       var Range = require_range();
       var gt = require_gt();
@@ -1420,7 +1483,7 @@ var scp = (() => {
     }
   });
   var require_valid2 = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/valid.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/valid.js"(exports, module2) {
       var Range = require_range();
       var validRange = (range, options) => {
         try {
@@ -1433,7 +1496,7 @@ var scp = (() => {
     }
   });
   var require_outside = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/outside.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/outside.js"(exports, module2) {
       var SemVer = require_semver();
       var Comparator = require_comparator();
       var { ANY } = Comparator;
@@ -1499,21 +1562,21 @@ var scp = (() => {
     }
   });
   var require_gtr = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/gtr.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/gtr.js"(exports, module2) {
       var outside = require_outside();
       var gtr = (version, range, options) => outside(version, range, ">", options);
       module2.exports = gtr;
     }
   });
   var require_ltr = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/ltr.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/ltr.js"(exports, module2) {
       var outside = require_outside();
       var ltr = (version, range, options) => outside(version, range, "<", options);
       module2.exports = ltr;
     }
   });
   var require_intersects = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/intersects.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/intersects.js"(exports, module2) {
       var Range = require_range();
       var intersects = (r1, r2, options) => {
         r1 = new Range(r1, options);
@@ -1524,7 +1587,7 @@ var scp = (() => {
     }
   });
   var require_simplify = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/simplify.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/simplify.js"(exports, module2) {
       var satisfies2 = require_satisfies();
       var compare2 = require_compare();
       module2.exports = (versions, range, options) => {
@@ -1571,7 +1634,7 @@ var scp = (() => {
     }
   });
   var require_subset = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/ranges/subset.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/ranges/subset.js"(exports, module2) {
       var Range = require_range();
       var Comparator = require_comparator();
       var { ANY } = Comparator;
@@ -1678,7 +1741,7 @@ var scp = (() => {
               if (higher === c && higher !== gt) {
                 return false;
               }
-            } else if (gt.operator === ">=" && !satisfies2(gt.semver, String(c), options)) {
+            } else if (gt.operator === ">=" && !c.test(gt.semver)) {
               return false;
             }
           }
@@ -1693,7 +1756,7 @@ var scp = (() => {
               if (lower === c && lower !== lt) {
                 return false;
               }
-            } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
+            } else if (lt.operator === "<=" && !c.test(lt.semver)) {
               return false;
             }
           }
@@ -1730,7 +1793,7 @@ var scp = (() => {
     }
   });
   var require_semver2 = __commonJS({
-    "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/index.js"(exports$1, module2) {
+    "../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/index.js"(exports, module2) {
       var internalRe = require_re();
       var constants2 = require_constants();
       var SemVer = require_semver();
@@ -1758,6 +1821,7 @@ var scp = (() => {
       var lte = require_lte();
       var cmp = require_cmp();
       var coerce2 = require_coerce();
+      var truncate = require_truncate();
       var Comparator = require_comparator();
       var Range = require_range();
       var satisfies2 = require_satisfies();
@@ -1796,6 +1860,7 @@ var scp = (() => {
         lte,
         cmp,
         coerce: coerce2,
+        truncate,
         Comparator,
         Range,
         satisfies: satisfies2,
@@ -1821,15 +1886,97 @@ var scp = (() => {
       };
     }
   });
-  var ICliFileTransferService_TOKEN = "cli-file-transfer-service";
+  function createCliToken(name) {
+    return name;
+  }
+  var ICliUserSessionService_TOKEN = createCliToken("cli-user-session-service");
+  var ICliUsersStoreService_TOKEN = createCliToken("cli-users-store-service");
+  var ICliGroupsStoreService_TOKEN = createCliToken("cli-groups-store-service");
+  var ICliAuthService_TOKEN = createCliToken("cli-auth-service");
+  var ICliCompletionProvider_TOKEN = createCliToken("cli-completion-provider");
+  var ICliDragDropService_TOKEN = createCliToken("cli-drag-drop-service");
+  var ICliFileTransferService_TOKEN = createCliToken("cli-file-transfer-service");
+  var ICliTranslationService_TOKEN = createCliToken("cli-translation-service");
+  var ICliPermissionService_TOKEN = createCliToken("cli-permission-service");
+  var ICliFilePickerProvider_TOKEN = createCliToken("cli-file-picker-provider");
+  var ICliHttpClient_TOKEN = createCliToken("cli-http-client");
+  var ICliUserEventService_TOKEN = createCliToken("cli-user-event-service");
+  var ICliAuditService_TOKEN = createCliToken("cli-audit-service");
+  var ICliAuthorizationService_TOKEN = createCliToken("cli-authorization-service");
+  var ICliPermissionRegistry_TOKEN = createCliToken("cli-permission-registry");
+  var ICliSessionsService_TOKEN = createCliToken("cli-sessions-service");
+  var ICliKeyValueStore_TOKEN = createCliToken("cli-key-value-store");
+  var ICliServerAuthTokenProvider_TOKEN = createCliToken("cli-server-auth-token-provider");
+  var ICliServerAuthService_TOKEN = createCliToken("cli-server-auth-service");
+  var ICliServerManager_TOKEN = createCliToken("cli-server-manager");
+  function resolveHeaders(provider) {
+    if (!provider) return {};
+    return typeof provider === "function" ? provider() : provider;
+  }
+  function resolveServerHeaders(services, serverName, configHeaders) {
+    if (services) {
+      const authService = services.get(
+        ICliServerAuthService_TOKEN
+      );
+      if (authService) {
+        return authService.getHeaders(serverName, configHeaders);
+      }
+    }
+    return resolveHeaders(configHeaders);
+  }
+  var ICliCommandGuard_TOKEN = createCliToken("cli-command-guard");
+  var ICliEventBus_TOKEN = createCliToken("cli-event-bus");
   var DefaultLibraryAuthor = {
     name: "Nicolae Lupei",
     email: "nicolae.lupei@qodalis.com"
   };
+  function splitShellWords(text) {
+    const words = [];
+    let current = "";
+    let inWord = false;
+    for (let i = 0; i < text.length; i++) {
+      const ch = text[i];
+      if (ch === "\\" && i + 1 < text.length) {
+        current += text[++i];
+        inWord = true;
+      } else if (ch === "'" && text.indexOf("'", i + 1) !== -1) {
+        const end = text.indexOf("'", i + 1);
+        current += text.slice(i + 1, end);
+        inWord = true;
+        i = end;
+      } else if (ch === '"' && closingDoubleQuote(text, i) !== -1) {
+        const end = closingDoubleQuote(text, i);
+        current += unescapeDoubleQuoted(text.slice(i + 1, end));
+        inWord = true;
+        i = end;
+      } else if (/\s/.test(ch)) {
+        if (inWord) words.push(current);
+        current = "";
+        inWord = false;
+      } else {
+        current += ch;
+        inWord = true;
+      }
+    }
+    if (inWord) words.push(current);
+    return words;
+  }
+  function closingDoubleQuote(text, start) {
+    for (let i = start + 1; i < text.length; i++) {
+      if (text[i] === "\\") i++;
+      else if (text[i] === '"') return i;
+    }
+    return -1;
+  }
+  function unescapeDoubleQuoted(text) {
+    return text.replace(/\\(["\\$`])/g, "$1");
+  }
   var semver = __toESM(require_semver2());
+  var API_VERSION = 2;
+  var VERSIONS_ENDPOINT = "/api/qcli/versions";
   var ServerVersionNegotiator = class {
     static {
-      this.CLIENT_SUPPORTED_VERSIONS = [2];
+      this.CLIENT_SUPPORTED_VERSIONS = [API_VERSION];
     }
     /**
      * Given a server's version info, pick the highest mutually compatible version.
@@ -1846,16 +1993,25 @@ var scp = (() => {
      * Returns the negotiated API version and the base path for all subsequent calls,
      * or null if the server is unreachable or incompatible.
      */
-    static async discover(baseUrl) {
+    static async discover(baseUrl, headers, options) {
+      let response;
+      try {
+        const resolved = resolveHeaders(headers);
+        response = await fetch(`${baseUrl}${VERSIONS_ENDPOINT}`, {
+          headers: Object.keys(resolved).length > 0 ? resolved : void 0
+        });
+      } catch (e) {
+        if (options?.rethrowNetworkErrors) throw e;
+        return null;
+      }
       try {
-        const response = await fetch(`${baseUrl}/api/cli/versions`);
         if (!response.ok) return null;
         const info = await response.json();
         const version = this.negotiate(info);
         if (version === null) return null;
         return {
           apiVersion: version,
-          basePath: `${baseUrl}/api/v${version}/cli`
+          basePath: `${baseUrl}/api/v${version}/qcli`
         };
       } catch {
         return null;
@@ -2680,11 +2836,11 @@ var scp = (() => {
   };
 
   // src/lib/version.ts
-  var LIBRARY_VERSION = "2.0.0-beta.2";
-  var API_VERSION = 2;
+  var LIBRARY_VERSION = "2.0.0-beta.21";
+  var API_VERSION2 = 2;
 
   // src/lib/interfaces/index.ts
-  var IScpTransferService_TOKEN = "scp-transfer-service";
+  var IScpTransferService_TOKEN = createCliToken("scp-transfer-service");
 
   // src/lib/processors/scp-utils.ts
   function resolveServer(serverName, context) {
@@ -2724,10 +2880,10 @@ var scp = (() => {
     if (serverArg && pathArg) {
       return [String(serverArg), String(pathArg)];
     }
-    if (!value?.trim()) {
+    const parts = splitShellWords(value ?? "");
+    if (parts.length === 0) {
       return null;
     }
-    const parts = value.trim().split(/\s+/);
     if (parts.length < 2) {
       if (serverArg && parts.length >= 1) {
         return [String(serverArg), parts.join(" ")];
@@ -2771,7 +2927,7 @@ var scp = (() => {
       const [serverName, path] = parsed;
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
@@ -2783,7 +2939,7 @@ var scp = (() => {
         const entries = await transferService.ls(
           serverUrl(server),
           path,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         if (entries.length === 0) {
@@ -2840,7 +2996,7 @@ var scp = (() => {
       const [serverName, path] = parsed;
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
@@ -2852,7 +3008,7 @@ var scp = (() => {
         const content = await transferService.cat(
           serverUrl(server),
           path,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         context.writer.writeln(content);
@@ -2912,12 +3068,11 @@ var scp = (() => {
         remotePath = String(args["remote-path"] || args["path"]);
         localPath = args["local-path"] ? String(args["local-path"]) : void 0;
       } else {
-        const value = command.value?.trim();
-        if (!value) {
+        const parts = command.positionals ?? [];
+        if (parts.length === 0) {
           context.writer.writeError("Usage: scp download <server> <remote-path> [local-path]");
           return;
         }
-        const parts = value.split(/\s+/);
         if (parts.length < 2) {
           context.writer.writeError("Usage: scp download <server> <remote-path> [local-path]");
           return;
@@ -2933,7 +3088,7 @@ var scp = (() => {
       localPath = localPath || remotePath.split("/").pop() || "download";
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
@@ -2942,6 +3097,7 @@ var scp = (() => {
       }
       const useBrowserDownload = command.args?.["save"] === true;
       context.spinner?.show(`Downloading ${remotePath} from ${server.name}...`);
+      context.notifier.info(`scp: downloading from ${server.name}`);
       const abortController = new AbortController();
       const abortSub = context.onAbort.subscribe(() => abortController.abort());
       try {
@@ -2949,7 +3105,7 @@ var scp = (() => {
         const { content, size } = await transferService.download(
           serverUrl(server),
           remotePath,
-          server.headers,
+          resolveServerHeaders(context.services, server.name, server.headers),
           (received, total) => {
             const now = Date.now();
             if (now - lastProgressUpdate < 200) return;
@@ -2959,17 +3115,19 @@ var scp = (() => {
               context.spinner?.show(
                 `Downloading ${remotePath}... ${pct}% (${formatBytes(received)}/${formatBytes(total)})`
               );
+              context.notifier.info(`scp: download ${pct}%`);
             } else {
               context.spinner?.show(
                 `Downloading ${remotePath}... ${formatBytes(received)}`
               );
+              context.notifier.info(`scp: download ${formatBytes(received)}`);
             }
           },
           abortController.signal
         );
         context.spinner?.hide();
         if (useBrowserDownload) {
-          const fileService = context.services.get(
+          const fileService = context.services.getRequired(
             ICliFileTransferService_TOKEN
           );
           if (fileService) {
@@ -2981,7 +3139,7 @@ var scp = (() => {
             context.writer.writeError("File transfer service not available for browser download.");
           }
         } else {
-          const fileService = context.services.get(
+          const fileService = context.services.getRequired(
             ICliFileTransferService_TOKEN
           );
           if (fileService) {
@@ -3012,7 +3170,7 @@ var scp = (() => {
     constructor() {
       this.command = "upload";
       this.aliases = ["put"];
-      this.description = "Upload a local file to a remote server";
+      this.description = "Upload a file to a remote server (use --local to pick from your machine)";
       this.acceptsRawInput = true;
       this.valueRequired = true;
       this.parameters = [
@@ -3024,8 +3182,8 @@ var scp = (() => {
         },
         {
           name: "local-path",
-          description: "Local file path",
-          required: true,
+          description: "Local file path (from virtual filesystem)",
+          required: false,
           type: "string"
         },
         {
@@ -3033,71 +3191,103 @@ var scp = (() => {
           description: "Remote destination path",
           required: true,
           type: "string"
+        },
+        {
+          name: "local",
+          description: "Pick a file from your local machine via browser file picker",
+          required: false,
+          type: "boolean"
         }
       ];
     }
     async processCommand(command, context) {
       const args = command.args || {};
+      const useLocalPicker = !!args["local"];
       let serverName;
       let localPath;
       let remotePath;
-      if (args["server"] && args["local-path"] && args["remote-path"]) {
+      if (args["server"] && args["remote-path"]) {
         serverName = String(args["server"]);
-        localPath = String(args["local-path"]);
+        localPath = args["local-path"] ? String(args["local-path"]) : void 0;
         remotePath = String(args["remote-path"]);
       } else {
-        const value = command.value?.trim();
-        if (!value) {
-          context.writer.writeError("Usage: scp upload <server> <local-path> <remote-path>");
+        const parts = command.positionals ?? [];
+        if (parts.length === 0) {
+          context.writer.writeError(
+            useLocalPicker ? "Usage: scp upload --local <server> <remote-path>" : "Usage: scp upload <server> <local-path> <remote-path>"
+          );
           return;
         }
-        const parts = value.split(/\s+/);
-        if (parts.length < 3) {
-          context.writer.writeError("Usage: scp upload <server> <local-path> <remote-path>");
-          return;
+        if (useLocalPicker) {
+          if (parts.length < 2) {
+            context.writer.writeError("Usage: scp upload --local <server> <remote-path>");
+            return;
+          }
+          serverName = parts[0];
+          remotePath = parts[1];
+        } else {
+          if (parts.length < 3) {
+            context.writer.writeError("Usage: scp upload <server> <local-path> <remote-path>");
+            return;
+          }
+          serverName = parts[0];
+          localPath = parts[1];
+          remotePath = parts[2];
         }
-        serverName = parts[0];
-        localPath = parts[1];
-        remotePath = parts[2];
       }
-      if (!serverName || !localPath || !remotePath) {
-        context.writer.writeError("Usage: scp upload <server> <local-path> <remote-path>");
+      if (!serverName || !useLocalPicker && !localPath || !remotePath) {
+        context.writer.writeError(
+          useLocalPicker ? "Usage: scp upload --local <server> <remote-path>" : "Usage: scp upload <server> <local-path> <remote-path>"
+        );
         return;
       }
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const fileService = context.services.get(
+      const fileService = context.services.getRequired(
         ICliFileTransferService_TOKEN
       );
       if (!fileService) {
         context.writer.writeError("File transfer service not available.");
         return;
       }
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
         context.writer.writeError("SCP transfer service not available.");
         return;
       }
-      context.spinner?.show(`Reading local file "${localPath}"...`);
-      try {
-        const content = await fileService.readFile(localPath);
+      let content;
+      let filename;
+      if (useLocalPicker) {
+        const picked = await fileService.uploadFromBrowser();
+        if (!picked) {
+          context.writer.writeln("Upload cancelled.");
+          return;
+        }
+        content = picked.content;
+        filename = picked.name;
+      } else {
+        context.spinner?.show(`Reading local file "${localPath}"...`);
+        content = await fileService.readFile(localPath);
         if (content === null) {
           context.spinner?.hide();
           context.writer.writeError(`Local file not found: ${localPath}`);
           return;
         }
-        const filename = localPath.split("/").pop() || "file";
-        context.spinner?.show(
-          `Uploading "${filename}" (${formatBytes(content.length)}) to ${server.name}:${remotePath}...`
-        );
+        filename = localPath.split("/").pop() || "file";
+      }
+      context.spinner?.show(
+        `Uploading "${filename}" (${formatBytes(content.length)}) to ${server.name}:${remotePath}...`
+      );
+      context.notifier.info(`scp: uploading to ${server.name}`);
+      try {
         await transferService.upload(
           serverUrl(server),
           remotePath,
           content,
           filename,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         context.writer.writeSuccess(
@@ -3109,8 +3299,11 @@ var scp = (() => {
       }
     }
     writeDescription(context) {
-      context.writer.writeln("Upload a local file to a remote server.");
-      context.writer.writeln("Usage: scp upload <server> <local-path> <remote-path>");
+      context.writer.writeln("Upload a file to a remote server.");
+      context.writer.writeln("");
+      context.writer.writeln("Usage:");
+      context.writer.writeln("  scp upload <server> <local-path> <remote-path>    Upload from virtual filesystem");
+      context.writer.writeln("  scp upload --local <server> <remote-path>         Pick from your machine via browser");
     }
   };
 
@@ -3145,7 +3338,7 @@ var scp = (() => {
       const [serverName, path] = parsed;
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
@@ -3157,7 +3350,7 @@ var scp = (() => {
         await transferService.rm(
           serverUrl(server),
           path,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         context.writer.writeSuccess(`Deleted: ${server.name}:${path}`);
@@ -3202,7 +3395,7 @@ var scp = (() => {
       const [serverName, path] = parsed;
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
@@ -3214,7 +3407,7 @@ var scp = (() => {
         await transferService.mkdir(
           serverUrl(server),
           path,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         context.writer.writeSuccess(`Created directory: ${server.name}:${path}`);
@@ -3259,7 +3452,7 @@ var scp = (() => {
       const [serverName, path] = parsed;
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
@@ -3271,7 +3464,7 @@ var scp = (() => {
         const stat = await transferService.stat(
           serverUrl(server),
           path,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         const entries = {
@@ -3302,6 +3495,7 @@ var scp = (() => {
       this.description = "SCP-like file transfer between browser and remote servers";
       this.author = DefaultLibraryAuthor;
       this.version = LIBRARY_VERSION;
+      this.metadata = { icon: "\u{1F4C1}", module: "file management" };
       this.acceptsRawInput = true;
       this.processors = [
         new CliScpLsProcessor(),
@@ -3314,33 +3508,25 @@ var scp = (() => {
       ];
     }
     async processCommand(command, context) {
-      const value = command.value?.trim();
-      if (value && value.includes(":") && !value.startsWith("-")) {
-        const colonIdx = value.indexOf(":");
-        const spaceBeforeColon = value.lastIndexOf(" ", colonIdx);
-        if (spaceBeforeColon === -1) {
-          const serverName = value.substring(0, colonIdx);
-          const rest = value.substring(colonIdx + 1);
-          const parts2 = rest.trim().split(/\s+/);
-          const remotePath = parts2[0];
-          const localPath = parts2[1] || remotePath.split("/").pop() || "download";
+      const [first = "", second] = command.positionals ?? [];
+      if (first && !first.startsWith("-")) {
+        const colonIdx = first.indexOf(":");
+        if (colonIdx !== -1) {
+          const serverName = first.substring(0, colonIdx);
+          const remotePath = first.substring(colonIdx + 1);
+          const localPath = second || remotePath.split("/").pop() || "download";
           if (remotePath) {
             await this.doDownload(serverName, remotePath, localPath, command, context);
             return;
           }
         }
-        const parts = value.split(/\s+/);
-        if (parts.length >= 2) {
-          const secondPart = parts[1];
-          if (secondPart.includes(":")) {
-            const localPath = parts[0];
-            const srvColonIdx = secondPart.indexOf(":");
-            const serverName = secondPart.substring(0, srvColonIdx);
-            const remotePath = secondPart.substring(srvColonIdx + 1);
-            if (remotePath) {
-              await this.doUpload(serverName, localPath, remotePath, context);
-              return;
-            }
+        if (second?.includes(":")) {
+          const srvColonIdx = second.indexOf(":");
+          const serverName = second.substring(0, srvColonIdx);
+          const remotePath = second.substring(srvColonIdx + 1);
+          if (remotePath) {
+            await this.doUpload(serverName, first, remotePath, context);
+            return;
           }
         }
       }
@@ -3352,7 +3538,7 @@ var scp = (() => {
     async doDownload(serverName, remotePath, localPath, command, context) {
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
@@ -3361,12 +3547,13 @@ var scp = (() => {
       }
       const useBrowserDownload = command.args?.["save"] === true;
       context.spinner?.show(`Downloading ${remotePath} from ${server.name}...`);
+      context.notifier.info(`scp: downloading from ${server.name}`);
       try {
         let lastProgressUpdate = 0;
         const { content, size } = await transferService.download(
           serverUrl(server),
           remotePath,
-          server.headers,
+          resolveServerHeaders(context.services, server.name, server.headers),
           (received, total) => {
             const now = Date.now();
             if (now - lastProgressUpdate < 200) return;
@@ -3376,15 +3563,17 @@ var scp = (() => {
               context.spinner?.show(
                 `Downloading ${remotePath}... ${pct}% (${formatBytes(received)}/${formatBytes(total)})`
               );
+              context.notifier.info(`scp: download ${pct}%`);
             } else {
               context.spinner?.show(
                 `Downloading ${remotePath}... ${formatBytes(received)}`
               );
+              context.notifier.info(`scp: download ${formatBytes(received)}`);
             }
           }
         );
         context.spinner?.hide();
-        const fileService = context.services.get(
+        const fileService = context.services.getRequired(
           ICliFileTransferService_TOKEN
         );
         if (!fileService) {
@@ -3410,14 +3599,14 @@ var scp = (() => {
     async doUpload(serverName, localPath, remotePath, context) {
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const fileService = context.services.get(
+      const fileService = context.services.getRequired(
         ICliFileTransferService_TOKEN
       );
       if (!fileService) {
         context.writer.writeError("File transfer service not available.");
         return;
       }
-      const transferService = context.services.get(
+      const transferService = context.services.getRequired(
         IScpTransferService_TOKEN
       );
       if (!transferService) {
@@ -3425,6 +3614,7 @@ var scp = (() => {
         return;
       }
       context.spinner?.show(`Reading local file "${localPath}"...`);
+      context.notifier.info(`scp: reading ${localPath}`);
       try {
         const content = await fileService.readFile(localPath);
         if (content === null) {
@@ -3436,12 +3626,13 @@ var scp = (() => {
         context.spinner?.show(
           `Uploading "${filename}" (${formatBytes(content.length)}) to ${server.name}:${remotePath}...`
         );
+        context.notifier.info(`scp: uploading to ${server.name}`);
         await transferService.upload(
           serverUrl(server),
           remotePath,
           content,
           filename,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         context.writer.writeSuccess(
@@ -3457,28 +3648,28 @@ var scp = (() => {
   // src/lib/services/scp-transfer.service.ts
   var ScpTransferService = class {
     async ls(serverUrl2, path, headers) {
-      const res = await this._fetch(`${serverUrl2}/api/cli/fs/ls?path=${encodeURIComponent(path)}`, {
-        headers
+      const res = await this._fetch(`${serverUrl2}/api/qcli/fs/ls?path=${encodeURIComponent(path)}`, {
+        headers: resolveHeaders(headers)
       });
       const data = await res.json();
       return data.entries;
     }
     async cat(serverUrl2, path, headers) {
-      const res = await this._fetch(`${serverUrl2}/api/cli/fs/cat?path=${encodeURIComponent(path)}`, {
-        headers
+      const res = await this._fetch(`${serverUrl2}/api/qcli/fs/cat?path=${encodeURIComponent(path)}`, {
+        headers: resolveHeaders(headers)
       });
       const data = await res.json();
       return data.content;
     }
     async stat(serverUrl2, path, headers) {
-      const res = await this._fetch(`${serverUrl2}/api/cli/fs/stat?path=${encodeURIComponent(path)}`, {
-        headers
+      const res = await this._fetch(`${serverUrl2}/api/qcli/fs/stat?path=${encodeURIComponent(path)}`, {
+        headers: resolveHeaders(headers)
       });
       return await res.json();
     }
     async download(serverUrl2, path, headers, onProgress, signal) {
-      const res = await this._fetch(`${serverUrl2}/api/cli/fs/download?path=${encodeURIComponent(path)}`, {
-        headers,
+      const res = await this._fetch(`${serverUrl2}/api/qcli/fs/download?path=${encodeURIComponent(path)}`, {
+        headers: resolveHeaders(headers),
         signal
       });
       const contentLength = parseInt(res.headers.get("content-length") || "0", 10);
@@ -3511,23 +3702,23 @@ var scp = (() => {
       const formData = new FormData();
       formData.append("path", remotePath);
       formData.append("file", new Blob([content]), filename);
-      await this._fetch(`${serverUrl2}/api/cli/fs/upload`, {
+      await this._fetch(`${serverUrl2}/api/qcli/fs/upload`, {
         method: "POST",
         body: formData,
-        headers
+        headers: resolveHeaders(headers)
       });
     }
     async mkdir(serverUrl2, path, headers) {
-      await this._fetch(`${serverUrl2}/api/cli/fs/mkdir`, {
+      await this._fetch(`${serverUrl2}/api/qcli/fs/mkdir`, {
         method: "POST",
-        headers: { "Content-Type": "application/json", ...headers },
+        headers: { "Content-Type": "application/json", ...resolveHeaders(headers) },
         body: JSON.stringify({ path })
       });
     }
     async rm(serverUrl2, path, headers) {
-      await this._fetch(`${serverUrl2}/api/cli/fs/rm?path=${encodeURIComponent(path)}`, {
+      await this._fetch(`${serverUrl2}/api/qcli/fs/rm?path=${encodeURIComponent(path)}`, {
         method: "DELETE",
-        headers
+        headers: resolveHeaders(headers)
       });
     }
     async _fetch(url, init) {
@@ -3548,13 +3739,13 @@ var scp = (() => {
 
   // src/cli-entrypoint.ts
   var module = {
-    apiVersion: API_VERSION,
+    apiVersion: API_VERSION2,
     name: "@qodalis/cli-scp",
     processors: [new CliScpCommandCommandProcessor()],
     services: [
       {
         provide: IScpTransferService_TOKEN,
-        useValue: new ScpTransferService()
+        useClass: ScpTransferService
       }
     ]
   };