windows-development-sandbox 1.23.2 → 1.25.0

package/dist/runtime/daemon.js

@@ -1363,11 +1363,11 @@ var require_lodash = __commonJS({
             return isFunction(object2[key2]);
           });
         }
-        function baseGet(object2, path96) {
-          path96 = castPath(path96, object2);
-          var index = 0, length = path96.length;
+        function baseGet(object2, path95) {
+          path95 = castPath(path95, object2);
+          var index = 0, length = path95.length;
           while (object2 != null && index < length) {
-            object2 = object2[toKey(path96[index++])];
+            object2 = object2[toKey(path95[index++])];
           }
           return index && index == length ? object2 : undefined2;
         }
@@ -1431,10 +1431,10 @@ var require_lodash = __commonJS({
           });
           return accumulator;
         }
-        function baseInvoke(object2, path96, args) {
-          path96 = castPath(path96, object2);
-          object2 = parent(object2, path96);
-          var func = object2 == null ? object2 : object2[toKey(last(path96))];
+        function baseInvoke(object2, path95, args) {
+          path95 = castPath(path95, object2);
+          object2 = parent(object2, path95);
+          var func = object2 == null ? object2 : object2[toKey(last(path95))];
           return func == null ? undefined2 : apply(func, object2, args);
         }
         function baseIsArguments(value) {
@@ -1590,13 +1590,13 @@ var require_lodash = __commonJS({
             return object2 === source || baseIsMatch(object2, source, matchData);
           };
         }
-        function baseMatchesProperty(path96, srcValue) {
-          if (isKey(path96) && isStrictComparable(srcValue)) {
-            return matchesStrictComparable(toKey(path96), srcValue);
+        function baseMatchesProperty(path95, srcValue) {
+          if (isKey(path95) && isStrictComparable(srcValue)) {
+            return matchesStrictComparable(toKey(path95), srcValue);
           }
           return function(object2) {
-            var objValue = get(object2, path96);
-            return objValue === undefined2 && objValue === srcValue ? hasIn(object2, path96) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
+            var objValue = get(object2, path95);
+            return objValue === undefined2 && objValue === srcValue ? hasIn(object2, path95) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
           };
         }
         function baseMerge(object2, source, srcIndex, customizer, stack) {
@@ -1693,23 +1693,23 @@ var require_lodash = __commonJS({
           });
         }
         function basePick(object2, paths) {
-          return basePickBy(object2, paths, function(value, path96) {
-            return hasIn(object2, path96);
+          return basePickBy(object2, paths, function(value, path95) {
+            return hasIn(object2, path95);
           });
         }
         function basePickBy(object2, paths, predicate) {
           var index = -1, length = paths.length, result2 = {};
           while (++index < length) {
-            var path96 = paths[index], value = baseGet(object2, path96);
-            if (predicate(value, path96)) {
-              baseSet(result2, castPath(path96, object2), value);
+            var path95 = paths[index], value = baseGet(object2, path95);
+            if (predicate(value, path95)) {
+              baseSet(result2, castPath(path95, object2), value);
             }
           }
           return result2;
         }
-        function basePropertyDeep(path96) {
+        function basePropertyDeep(path95) {
           return function(object2) {
-            return baseGet(object2, path96);
+            return baseGet(object2, path95);
           };
         }
         function basePullAll(array2, values2, iteratee2, comparator) {
@@ -1783,14 +1783,14 @@ var require_lodash = __commonJS({
           var array2 = values(collection);
           return shuffleSelf(array2, baseClamp(n, 0, array2.length));
         }
-        function baseSet(object2, path96, value, customizer) {
+        function baseSet(object2, path95, value, customizer) {
           if (!isObject2(object2)) {
             return object2;
           }
-          path96 = castPath(path96, object2);
-          var index = -1, length = path96.length, lastIndex = length - 1, nested = object2;
+          path95 = castPath(path95, object2);
+          var index = -1, length = path95.length, lastIndex = length - 1, nested = object2;
           while (nested != null && ++index < length) {
-            var key2 = toKey(path96[index]), newValue = value;
+            var key2 = toKey(path95[index]), newValue = value;
             if (key2 === "__proto__" || key2 === "constructor" || key2 === "prototype") {
               return object2;
             }
@@ -1798,7 +1798,7 @@ var require_lodash = __commonJS({
               var objValue = nested[key2];
               newValue = customizer ? customizer(objValue, key2, nested) : undefined2;
               if (newValue === undefined2) {
-                newValue = isObject2(objValue) ? objValue : isIndex(path96[index + 1]) ? [] : {};
+                newValue = isObject2(objValue) ? objValue : isIndex(path95[index + 1]) ? [] : {};
               }
             }
             assignValue(nested, key2, newValue);
@@ -1964,14 +1964,14 @@ var require_lodash = __commonJS({
             }
           return result2;
         }
-        function baseUnset(object2, path96) {
-          path96 = castPath(path96, object2);
-          var index = -1, length = path96.length;
+        function baseUnset(object2, path95) {
+          path95 = castPath(path95, object2);
+          var index = -1, length = path95.length;
           if (!length) {
             return true;
           }
           while (++index < length) {
-            var key2 = toKey(path96[index]);
+            var key2 = toKey(path95[index]);
             if (key2 === "__proto__" && !hasOwnProperty.call(object2, "__proto__")) {
               return false;
             }
@@ -1979,11 +1979,11 @@ var require_lodash = __commonJS({
               return false;
             }
           }
-          var obj = parent(object2, path96);
-          return obj == null || delete obj[toKey(last(path96))];
+          var obj = parent(object2, path95);
+          return obj == null || delete obj[toKey(last(path95))];
         }
-        function baseUpdate(object2, path96, updater, customizer) {
-          return baseSet(object2, path96, updater(baseGet(object2, path96)), customizer);
+        function baseUpdate(object2, path95, updater, customizer) {
+          return baseSet(object2, path95, updater(baseGet(object2, path95)), customizer);
         }
         function baseWhile(array2, predicate, isDrop, fromRight) {
           var length = array2.length, index = fromRight ? length : -1;
@@ -2866,11 +2866,11 @@ var require_lodash = __commonJS({
           var match = source.match(reWrapDetails);
           return match ? match[1].split(reSplitDetails) : [];
         }
-        function hasPath(object2, path96, hasFunc) {
-          path96 = castPath(path96, object2);
-          var index = -1, length = path96.length, result2 = false;
+        function hasPath(object2, path95, hasFunc) {
+          path95 = castPath(path95, object2);
+          var index = -1, length = path95.length, result2 = false;
           while (++index < length) {
-            var key2 = toKey(path96[index]);
+            var key2 = toKey(path95[index]);
             if (!(result2 = object2 != null && hasFunc(object2, key2))) {
               break;
             }
@@ -3072,8 +3072,8 @@ var require_lodash = __commonJS({
             return apply(func, this, otherArgs);
           };
         }
-        function parent(object2, path96) {
-          return path96.length < 2 ? object2 : baseGet(object2, baseSlice(path96, 0, -1));
+        function parent(object2, path95) {
+          return path95.length < 2 ? object2 : baseGet(object2, baseSlice(path95, 0, -1));
         }
         function reorder(array2, indexes) {
           var arrLength = array2.length, length = nativeMin(indexes.length, arrLength), oldArray = copyArray(array2);
@@ -3708,10 +3708,10 @@ var require_lodash = __commonJS({
           }
           return isString(collection) ? fromIndex <= length && collection.indexOf(value, fromIndex) > -1 : !!length && baseIndexOf(collection, value, fromIndex) > -1;
         }
-        var invokeMap = baseRest(function(collection, path96, args) {
-          var index = -1, isFunc = typeof path96 == "function", result2 = isArrayLike(collection) ? Array2(collection.length) : [];
+        var invokeMap = baseRest(function(collection, path95, args) {
+          var index = -1, isFunc = typeof path95 == "function", result2 = isArrayLike(collection) ? Array2(collection.length) : [];
           baseEach(collection, function(value) {
-            result2[++index] = isFunc ? apply(path96, value, args) : baseInvoke(value, path96, args);
+            result2[++index] = isFunc ? apply(path95, value, args) : baseInvoke(value, path95, args);
           });
           return result2;
         });
@@ -4363,15 +4363,15 @@ var require_lodash = __commonJS({
         function functionsIn(object2) {
           return object2 == null ? [] : baseFunctions(object2, keysIn(object2));
         }
-        function get(object2, path96, defaultValue) {
-          var result2 = object2 == null ? undefined2 : baseGet(object2, path96);
+        function get(object2, path95, defaultValue) {
+          var result2 = object2 == null ? undefined2 : baseGet(object2, path95);
           return result2 === undefined2 ? defaultValue : result2;
         }
-        function has(object2, path96) {
-          return object2 != null && hasPath(object2, path96, baseHas);
+        function has(object2, path95) {
+          return object2 != null && hasPath(object2, path95, baseHas);
         }
-        function hasIn(object2, path96) {
-          return object2 != null && hasPath(object2, path96, baseHasIn);
+        function hasIn(object2, path95) {
+          return object2 != null && hasPath(object2, path95, baseHasIn);
         }
         var invert = createInverter(function(result2, value, key2) {
           if (value != null && typeof value.toString != "function") {
@@ -4424,10 +4424,10 @@ var require_lodash = __commonJS({
             return result2;
           }
           var isDeep = false;
-          paths = arrayMap(paths, function(path96) {
-            path96 = castPath(path96, object2);
-            isDeep || (isDeep = path96.length > 1);
-            return path96;
+          paths = arrayMap(paths, function(path95) {
+            path95 = castPath(path95, object2);
+            isDeep || (isDeep = path95.length > 1);
+            return path95;
           });
           copyObject(object2, getAllKeysIn(object2), result2);
           if (isDeep) {
@@ -4453,19 +4453,19 @@ var require_lodash = __commonJS({
             return [prop];
           });
           predicate = getIteratee(predicate);
-          return basePickBy(object2, props, function(value, path96) {
-            return predicate(value, path96[0]);
+          return basePickBy(object2, props, function(value, path95) {
+            return predicate(value, path95[0]);
           });
         }
-        function result(object2, path96, defaultValue) {
-          path96 = castPath(path96, object2);
-          var index = -1, length = path96.length;
+        function result(object2, path95, defaultValue) {
+          path95 = castPath(path95, object2);
+          var index = -1, length = path95.length;
           if (!length) {
             length = 1;
             object2 = undefined2;
           }
           while (++index < length) {
-            var value = object2 == null ? undefined2 : object2[toKey(path96[index])];
+            var value = object2 == null ? undefined2 : object2[toKey(path95[index])];
             if (value === undefined2) {
               index = length;
               value = defaultValue;
@@ -4474,12 +4474,12 @@ var require_lodash = __commonJS({
           }
           return object2;
         }
-        function set2(object2, path96, value) {
-          return object2 == null ? object2 : baseSet(object2, path96, value);
+        function set2(object2, path95, value) {
+          return object2 == null ? object2 : baseSet(object2, path95, value);
         }
-        function setWith(object2, path96, value, customizer) {
+        function setWith(object2, path95, value, customizer) {
           customizer = typeof customizer == "function" ? customizer : undefined2;
-          return object2 == null ? object2 : baseSet(object2, path96, value, customizer);
+          return object2 == null ? object2 : baseSet(object2, path95, value, customizer);
         }
         var toPairs = createToPairs(keys);
         var toPairsIn = createToPairs(keysIn);
@@ -4501,15 +4501,15 @@ var require_lodash = __commonJS({
           });
           return accumulator;
         }
-        function unset(object2, path96) {
-          return object2 == null ? true : baseUnset(object2, path96);
+        function unset(object2, path95) {
+          return object2 == null ? true : baseUnset(object2, path95);
         }
-        function update(object2, path96, updater) {
-          return object2 == null ? object2 : baseUpdate(object2, path96, castFunction(updater));
+        function update(object2, path95, updater) {
+          return object2 == null ? object2 : baseUpdate(object2, path95, castFunction(updater));
         }
-        function updateWith(object2, path96, updater, customizer) {
+        function updateWith(object2, path95, updater, customizer) {
           customizer = typeof customizer == "function" ? customizer : undefined2;
-          return object2 == null ? object2 : baseUpdate(object2, path96, castFunction(updater), customizer);
+          return object2 == null ? object2 : baseUpdate(object2, path95, castFunction(updater), customizer);
         }
         function values(object2) {
           return object2 == null ? [] : baseValues(object2, keys(object2));
@@ -4895,17 +4895,17 @@ var require_lodash = __commonJS({
         function matches(source) {
           return baseMatches(baseClone(source, CLONE_DEEP_FLAG));
         }
-        function matchesProperty(path96, srcValue) {
-          return baseMatchesProperty(path96, baseClone(srcValue, CLONE_DEEP_FLAG));
+        function matchesProperty(path95, srcValue) {
+          return baseMatchesProperty(path95, baseClone(srcValue, CLONE_DEEP_FLAG));
         }
-        var method = baseRest(function(path96, args) {
+        var method = baseRest(function(path95, args) {
           return function(object2) {
-            return baseInvoke(object2, path96, args);
+            return baseInvoke(object2, path95, args);
           };
         });
         var methodOf = baseRest(function(object2, args) {
-          return function(path96) {
-            return baseInvoke(object2, path96, args);
+          return function(path95) {
+            return baseInvoke(object2, path95, args);
           };
         });
         function mixin(object2, source, options) {
@@ -4952,12 +4952,12 @@ var require_lodash = __commonJS({
         var over = createOver(arrayMap);
         var overEvery = createOver(arrayEvery);
         var overSome = createOver(arraySome);
-        function property(path96) {
-          return isKey(path96) ? baseProperty(toKey(path96)) : basePropertyDeep(path96);
+        function property(path95) {
+          return isKey(path95) ? baseProperty(toKey(path95)) : basePropertyDeep(path95);
         }
         function propertyOf(object2) {
-          return function(path96) {
-            return object2 == null ? undefined2 : baseGet(object2, path96);
+          return function(path95) {
+            return object2 == null ? undefined2 : baseGet(object2, path95);
           };
         }
         var range = createRange();
@@ -5410,12 +5410,12 @@ var require_lodash = __commonJS({
         LazyWrapper.prototype.findLast = function(predicate) {
           return this.reverse().find(predicate);
         };
-        LazyWrapper.prototype.invokeMap = baseRest(function(path96, args) {
-          if (typeof path96 == "function") {
+        LazyWrapper.prototype.invokeMap = baseRest(function(path95, args) {
+          if (typeof path95 == "function") {
             return new LazyWrapper(this);
           }
           return this.map(function(value) {
-            return baseInvoke(value, path96, args);
+            return baseInvoke(value, path95, args);
           });
         });
         LazyWrapper.prototype.reject = function(predicate) {
@@ -6367,10 +6367,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path96) {
-  if (!path96)
+function getElementAtPath(obj, path95) {
+  if (!path95)
     return obj;
-  return path96.reduce((acc, key2) => acc?.[key2], obj);
+  return path95.reduce((acc, key2) => acc?.[key2], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -6710,11 +6710,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path96, issues) {
+function prefixIssues(path95, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path96);
+    iss.path.unshift(path95);
     return iss;
   });
 }
@@ -7164,16 +7164,16 @@ function flattenError(error62, mapper = (issue2) => issue2.message) {
 }
 function formatError(error62, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error63, path96 = []) => {
+  const processError = (error63, path95 = []) => {
     for (const issue2 of error63.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path96, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path95, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path96, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path95, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path96, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path95, ...issue2.path]);
       } else {
-        const fullpath = [...path96, ...issue2.path];
+        const fullpath = [...path95, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -7212,17 +7212,17 @@ function formatError(error62, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error62, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error63, path96 = []) => {
+  const processError = (error63, path95 = []) => {
     var _a3;
     for (const issue2 of error63.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path96, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path95, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path96, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path95, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path96, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path95, ...issue2.path]);
       } else {
-        const fullpath = [...path96, ...issue2.path];
+        const fullpath = [...path95, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -7261,8 +7261,8 @@ function treeifyError(error62, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path96 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path96) {
+  const path95 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path95) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -24364,13 +24364,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path96 = ref.slice(1).split("/").filter(Boolean);
-  if (path96.length === 0) {
+  const path95 = ref.slice(1).split("/").filter(Boolean);
+  if (path95.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path96[0] === defsKey) {
-    const key2 = path96[1] === void 0 ? void 0 : decodeJSONPointerSegment(path96[1]);
+  if (path95[0] === defsKey) {
+    const key2 = path95[1] === void 0 ? void 0 : decodeJSONPointerSegment(path95[1]);
     if (!key2 || !ctx.defs[key2]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -25688,7 +25688,7 @@ var ToolchainsSchema = external_exports.strictObject({
   }),
   unreal: external_exports.strictObject({
     enabled: enabled(
-      "Unreal Engine development: Visual Studio Community 2022 with the C++ game workload (MSVC, a Windows 11 SDK, .NET Framework targeting packs, Unreal integration and the Epic Games Launcher) and the DirectX End-User Runtime. A real installer: it runs every boot (~10 GB on the sandbox disk). The engine itself comes from the Epic Games Launcher or its source.",
+      "Unreal Engine development: Visual Studio Community 2022 with the C++ game workload (MSVC, a Windows 11 SDK, .NET Framework targeting packs, Unreal integration and the Epic Games Launcher) and the DirectX End-User Runtime. Visual Studio is installed once and kept on the data disk (~6.5 GB); later boots put it back in seconds. The engine itself comes from the Epic Games Launcher or its source.",
       "a .uproject or .uplugin"
     ),
     acceptLicense: external_exports.boolean().describe(
@@ -25697,11 +25697,8 @@ var ToolchainsSchema = external_exports.strictObject({
     components: StringsSchema.describe(
       'More Visual Studio workload or component IDs to add, e.g. ["Microsoft.VisualStudio.Component.VC.Llvm.Clang"].'
     ),
-    keepInstallFiles: external_exports.boolean().describe(
-      "Keep an offline copy of the Visual Studio install files in tools\\visualstudio (~10 GB, made once), so later boots install without downloading them again. Skipped while that disk has too little room."
-    ),
-    visualStudio: external_exports.enum(["full", "autosdk"]).describe(
-      `"full": install Visual Studio Community (the engine finds it through the Setup API; ~10 GB, redone every boot). "autosdk" (experimental): skip Visual Studio and build an Unreal AutoSDK tree from the portable MSVC in tools\\unreal\\autosdk (kept between sandboxes); UnrealBuildTool finds MSVC through AutoSDK, but the editor's Visual Studio integration is not available. Needs toolchains.msvc (turned on for you).`
+    visualStudio: external_exports.enum(["full", "buildtools"]).describe(
+      '"full": Visual Studio Community with the C++ game workload (the IDE, its debugger and Unreal integration). "buildtools": only the Visual Studio Build Tools (MSVC, the Windows SDK and the .NET Framework parts UnrealBuildTool needs; no IDE). Either is installed once and kept on the data disk (tools\\visualstudio\\persist, ~6.5 GB for Community); later boots put it back in seconds.'
     ),
     persistEngines: external_exports.boolean().describe(
       "Engines the Epic Games Launcher installs go to tools\\unreal\\engines (kept between sandboxes, 40-60 GB each) and are registered with the launcher again every boot. Off: they go on the sandbox disk and are lost when it closes. Engines installed on this PC can be mapped instead (pcInstalls.unrealEngines)."
@@ -26935,12 +26932,12 @@ function appsToInstall(apps, gitAccess) {
     return e && !e.setting ? [e] : [];
   });
   const skipped = chosen.filter((e) => e.fullGitOnly && gitAccess !== "full").map((e) => e.name + ' (needs provisioning.git.access "full")');
-  const allowed = [
+  const allowed2 = [
     ...chosen.filter((e) => !(e.fullGitOnly && gitAccess !== "full")),
     ...Object.entries(apps.custom).map(([id, app]) => customEntry(id, app))
   ];
-  const needs7zip = allowed.some((e) => e.needs?.includes("7zip") || e.unpack === "nsis") && !allowed.some((e) => e.id === "7zip");
-  return { entries: [...needs7zip ? [appById("7zip")] : [], ...allowed], skipped };
+  const needs7zip = allowed2.some((e) => e.needs?.includes("7zip") || e.unpack === "nsis") && !allowed2.some((e) => e.id === "7zip");
+  return { entries: [...needs7zip ? [appById("7zip")] : [], ...allowed2], skipped };
 }
 function appsNeedUv(apps) {
   return Boolean(
@@ -28086,6 +28083,16 @@ var toolsDir = path9.join(dataDir, "tools");
 var logsDir = path9.join(dataDir, "logs");
 var run = new RunDir(dataDir);
 
+// src/guest/runtime/log-line.ts
+var ESCAPES = /\x1b\[[0-9;?]{0,32}[A-Za-z]/g;
+function plainText(text) {
+  return text.replace(ESCAPES, "");
+}
+function fileLines(message, at = /* @__PURE__ */ new Date(), task) {
+  const stamp = at.toISOString() + " " + (task ? "[" + task + "] " : "");
+  return plainText(message).split(/\r?\n/).filter((line) => line.trim() !== "").map((line) => stamp + line.trimEnd());
+}
+
 // src/guest/runtime/log.ts
 fs8.mkdirSync(logsDir, { recursive: true });
 var logFile = path10.join(
@@ -28093,33 +28100,30 @@ var logFile = path10.join(
   (process.env.AGENT_LOG_PREFIX ?? "guest") + "-" + (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-") + ".log"
 );
 var context = new AsyncLocalStorage();
+var sink = null;
 function runQuiet(work) {
   return context.run({ ...context.getStore(), quiet: true }, work);
 }
-function fileLine(message, at = /* @__PURE__ */ new Date()) {
-  return at.toISOString() + " " + message;
-}
-var append = (line) => {
+var append = (message, ctx) => {
   try {
-    fs8.appendFileSync(logFile, fileLine(line) + "\n");
+    const lines = fileLines(message, /* @__PURE__ */ new Date(), ctx?.task);
+    if (lines.length) fs8.appendFileSync(logFile, lines.join("\n") + "\n");
   } catch {
   }
 };
-var tagged = (message, ctx) => {
-  const prefix = ctx?.prefix?.();
-  return prefix ? prefix + " | " + message : message;
-};
 function log(message) {
   const ctx = context.getStore();
-  const line = tagged(message, ctx);
-  if (!ctx?.quiet) console.log(line);
-  append(line);
+  append(message, ctx);
+  if (ctx?.quiet) return;
+  if (sink) sink.line(message, ctx?.stage);
+  else console.log(message);
 }
 function warn(message) {
   const ctx = context.getStore();
-  const line = tagged(message, ctx);
-  if (!ctx?.quiet) console.warn("\x1B[33mWARNING: " + line + "\x1B[0m");
-  append("WARNING: " + line);
+  append("WARNING: " + message, ctx);
+  if (ctx?.quiet) return;
+  if (sink) sink.warning(message);
+  else console.warn("\x1B[33mWARNING: " + message + "\x1B[0m");
 }
 
 // src/guest/runtime/session.ts
@@ -28917,27 +28921,82 @@ import fs16 from "node:fs";
 import os3 from "node:os";
 import path19 from "node:path";
 import { spawn as spawn2, spawnSync as spawnSync2 } from "node:child_process";
+var outputSink = null;
+var captureOutput = () => outputSink?.capturing() ?? false;
+function logOutput(text) {
+  for (const line of text.split(/\r?\n/)) if (line.trim()) outputSink?.line(line.trimEnd());
+}
+var CAPTURE_BYTES = 64 * 1024 * 1024;
+var LINE_CHARS = 2e3;
+function logLines(stream) {
+  if (!stream) return;
+  let partial2 = "";
+  stream.setEncoding("utf8");
+  stream.on("data", (chunk) => {
+    const lines = (partial2 + chunk).split(/\r?\n/);
+    partial2 = lines.pop().slice(0, LINE_CHARS);
+    logOutput(lines.map((l) => l.slice(0, LINE_CHARS)).join("\n"));
+  });
+  stream.on("end", () => logOutput(partial2));
+}
 async function execAsync(file3, args, options = {}) {
-  const code = await spawnAsync(file3, args, { stdio: "inherit", ...options });
+  const code = captureOutput() ? await new Promise((resolve2, reject) => {
+    const child = spawn2(file3, args, { stdio: ["inherit", "pipe", "pipe"], windowsHide: true, ...options });
+    logLines(child.stdout);
+    logLines(child.stderr);
+    child.once("error", reject);
+    child.once("close", (c) => resolve2(c ?? -1));
+  }) : await spawnAsync(file3, args, { stdio: "inherit", ...options });
   if (code !== 0)
     throw new Error(path19.basename(file3) + " " + args.slice(0, 3).join(" ") + " failed with exit code " + code);
 }
+function scriptErrors(errors) {
+  if (!errors) return;
+  if (captureOutput()) logOutput(errors);
+  else process.stderr.write(errors + "\n");
+}
 function execOutput(file3, args, options = {}) {
   const result = spawnSync2(file3, args, { encoding: "utf8", windowsHide: true, ...options });
   return result.status === 0 ? String(result.stdout ?? "").trim() : "";
 }
 function runScript(name, args = []) {
+  const capture = captureOutput();
   const result = spawnSync2(SYSTEM.powershell(), scriptArgs(name, args), {
-    stdio: ["inherit", "inherit", "pipe"],
+    stdio: ["inherit", capture ? "pipe" : "inherit", "pipe"],
     encoding: "utf8",
-    windowsHide: true
+    windowsHide: true,
+    ...capture ? { maxBuffer: CAPTURE_BYTES } : {}
   });
+  if (capture) logOutput(String(result.stdout ?? ""));
   if (result.error) throw result.error;
   const errors = String(result.stderr ?? "").trim();
-  if (errors) process.stderr.write(errors + "\n");
+  scriptErrors(errors);
   if (result.status !== 0)
     throw new Error(name + " failed with exit code " + result.status + (errors ? ": " + errors.slice(0, 400) : ""));
 }
+function runScriptAsync(name, args = []) {
+  return new Promise((resolve2, reject) => {
+    const capture = captureOutput();
+    const child = spawn2(SYSTEM.powershell(), scriptArgs(name, args), {
+      stdio: ["inherit", capture ? "pipe" : "inherit", "pipe"],
+      windowsHide: true
+    });
+    if (capture) logLines(child.stdout);
+    let errors = "";
+    child.stderr?.setEncoding("utf8");
+    child.stderr?.on("data", (chunk) => {
+      if (errors.length < 4096) errors += chunk;
+    });
+    child.once("error", reject);
+    child.once("close", (code) => {
+      errors = errors.trim();
+      scriptErrors(errors);
+      if (code !== 0)
+        reject(new Error(name + " failed with exit code " + code + (errors ? ": " + errors.slice(0, 400) : "")));
+      else resolve2();
+    });
+  });
+}
 function scriptOutput(name, args = [], options = {}) {
   return execOutput(SYSTEM.powershell(), scriptArgs(name, args), options);
 }
@@ -28951,6 +29010,16 @@ function runScriptWithJson(name, param, data, args = []) {
     fs16.rmSync(dir, { recursive: true, force: true });
   }
 }
+async function runScriptWithJsonAsync(name, param, data, args = []) {
+  const dir = fs16.mkdtempSync(path19.join(os3.tmpdir(), "sbx-"));
+  const file3 = path19.join(dir, "input.json");
+  try {
+    fs16.writeFileSync(file3, JSON.stringify(data), "utf8");
+    await runScriptAsync(name, ["-" + param, file3, ...args]);
+  } finally {
+    fs16.rmSync(dir, { recursive: true, force: true });
+  }
+}
 function robocopy(from, to, files = []) {
   if (!isWin) {
     if (!files.length) {
@@ -29050,7 +29119,7 @@ function execHeavy(file3, args, options = {}) {
 }
 
 // src/guest/daemon/daemon.ts
-import fs76 from "node:fs";
+import fs75 from "node:fs";
 
 // src/guest/setup/claude-mem.ts
 import fs17 from "node:fs";
@@ -29163,6 +29232,9 @@ function localStateEntries(agents2, stateDir3, localRoot2) {
   );
 }
 var CODEX_MARKER = "# Set by the sandbox";
+var CODEX_MARKER_LINE = CODEX_MARKER + " from its codex settings (`sandbox config`); a line of your own without it wins.";
+var CODEX_MARKERS = [CODEX_MARKER, "# agent-sandbox:"];
+var CODEX_OWNED_KEYS = ["sandbox_mode", "approval_policy", "model", "model_reasoning_effort"];
 function codexArguments(c) {
   const out = c.sandboxMode === "danger-full-access" && c.approvalPolicy === "never" ? ["--dangerously-bypass-approvals-and-sandbox"] : ["--sandbox", c.sandboxMode, "--ask-for-approval", c.approvalPolicy];
   if (c.model) out.push("-c", 'model="' + c.model + '"');
@@ -29174,7 +29246,7 @@ function agentArguments(name, harness, codex) {
 }
 var MAX_CODEX_CONFIG_BYTES = 1024 * 1024;
 var MARKED_LINES = new RegExp(
-  "^" + CODEX_MARKER + "[^\r\n]*\r?\n(?:(?:sandbox_mode|approval_policy)[ 	]*=[^\r\n]*\r?\n)*(?:[ 	]*\r?\n)?",
+  "^(?:" + CODEX_MARKERS.join("|") + ")[^\r\n]*\r?\n(?:(?:" + CODEX_OWNED_KEYS.join("|") + ")[ 	]*=[^\r\n]*(?:\r?\n|$))*(?:[ 	]*\r?\n)?",
   "m"
 );
 var isDatabaseFile = (name) => /\.(sqlite3?|db)(-wal|-shm)?$/i.test(name);
@@ -29318,6 +29390,17 @@ function planPath(input2) {
   }
   return msvcBeforeGitUsr(result);
 }
+function sessionPath(o) {
+  const seen = /* @__PURE__ */ new Set();
+  const result = [];
+  for (const folder of [o.commands, ...o.prepend, ...o.base, ...o.append]) {
+    const key2 = pathKey(folder);
+    if (!folder.trim() || seen.has(key2)) continue;
+    seen.add(key2);
+    result.push(folder);
+  }
+  return msvcBeforeGitUsr(result);
+}
 function appendMissing(base, extra, skip = () => false) {
   const seen = new Set(splitPath(base).map(pathKey));
   const added = splitPath(extra).filter((folder) => {
@@ -29415,7 +29498,12 @@ function agentEnv(tools, target = { workspace, project: session.project, base: p
     mkdirp(dir);
   const runners = [path25.join(toolsDir, "node"), path25.dirname(process.execPath)].map((d) => d.toLowerCase());
   const base = (target.base.PATH ?? "").split(path25.delimiter).filter((d) => d && !runners.includes(d.toLowerCase()));
-  env.PATH = msvcBeforeGitUsr([.../* @__PURE__ */ new Set([...tools.prepend, ...base, ...tools.append])]).join(path25.delimiter);
+  env.PATH = sessionPath({
+    commands: path25.join(localDir, "bin"),
+    prepend: tools.prepend,
+    base,
+    append: tools.append
+  }).join(path25.delimiter);
   return env;
 }
 function addMachineEnvironment(vars, dirs, additive = false) {
@@ -29452,8 +29540,8 @@ function withRegistryPath(env) {
 }
 
 // src/guest/daemon/project-provisioner.ts
-import fs66 from "node:fs";
-import path84 from "node:path";
+import fs65 from "node:fs";
+import path83 from "node:path";
 
 // src/guest/boot/boot-env.ts
 import fs19 from "node:fs";
@@ -29766,7 +29854,7 @@ async function runHooksAsync(stage, env, target) {
 }
 
 // src/guest/toolchains/setup.ts
-import fs65 from "node:fs";
+import fs64 from "node:fs";
 
 // src/guest/apps/app-installer.ts
 import fs32 from "node:fs";
@@ -32915,7 +33003,7 @@ async function setupMsvc(env, config2) {
 
 // src/guest/toolchains/native/unreal.ts
 import os10 from "node:os";
-import path68 from "node:path";
+import path67 from "node:path";
 
 // src/guest/toolchains/not-yet.ts
 function notAvailableYet2(_env, what) {
@@ -32927,132 +33015,10 @@ async function setupUnrealEngines(env, _config, _ctx) {
   notAvailableYet2(env, "Unreal engines");
 }
 
-// src/guest/toolchains/native/autosdk.ts
-import fs50 from "node:fs";
-import path65 from "node:path";
-
-// src/guest/toolchains/native/vs-request.ts
-import path64 from "node:path";
-var UNREAL_COMPONENTS = [
-  "Microsoft.VisualStudio.Workload.NativeGame",
-  "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-  "Microsoft.VisualStudio.Component.Windows11SDK.22621",
-  "Microsoft.VisualStudio.Component.VC.DiagnosticTools",
-  "Microsoft.Net.Component.4.6.2.TargetingPack",
-  "Microsoft.Net.Component.4.8.SDK",
-  "Component.Unreal.Ide",
-  "Component.Unreal"
-];
-var BUILD_TOOLS_COMPONENTS = [
-  "Microsoft.VisualStudio.Workload.VCTools",
-  "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-  "Microsoft.VisualStudio.Component.Windows11SDK.22621"
-];
-var isOn = (setting) => setting === true;
-function visualStudioWanted(t, on = isOn) {
-  const unreal = on(t.unreal.enabled, "unreal") && t.unreal.visualStudio === "full";
-  const flutter = on(t.flutter.enabled, "flutter") && t.flutter.windowsDesktop;
-  const unity = on(t.unity.enabled, "unity") && t.unity.modules.includes("windows-il2cpp");
-  const users = [...unreal ? ["unreal"] : [], ...flutter ? ["flutter"] : [], ...unity ? ["unity"] : []];
-  if (!users.length) return null;
-  if (unreal)
-    return {
-      product: "community",
-      components: [.../* @__PURE__ */ new Set([...UNREAL_COMPONENTS, ...t.unreal.components])],
-      for: users,
-      licence: "toolchains.unreal.acceptLicense",
-      accepted: t.unreal.acceptLicense
-    };
-  return {
-    product: "buildtools",
-    components: [...BUILD_TOOLS_COMPONENTS],
-    for: users,
-    licence: "toolchains.msvc.acceptLicense",
-    accepted: t.msvc.acceptLicense
-  };
-}
-function unrealUsesAutosdk(t, on = isOn) {
-  return on(t.unreal.enabled, "unreal") && t.unreal.visualStudio === "autosdk";
-}
-function vsExitText(code) {
-  const c = code >>> 0;
-  switch (c) {
-    case 0:
-      return "installed";
-    case 3010:
-      return "done; a restart would finish it (not needed here)";
-    case 1602:
-      return "cancelled";
-    case 5007:
-      return "the installer refused to run (blocked by Windows, for example a restart waiting)";
-    case 8006:
-      return "Visual Studio is running and must be closed first";
-    case 3762504530:
-      return "0xE0434352: the Visual Studio installer crashed";
-    default:
-      return "the installer failed with exit " + c + " (0x" + c.toString(16).toUpperCase() + ")";
-  }
-}
-var LAYOUT_STAGING_BYTES = 8 * 1024 ** 3;
-var STAGING_RESERVE_BYTES = 1.5 * 1024 ** 3;
-function layoutNextStep(exit, localFreeBytes, reserveBytes) {
-  if (exit !== null && (exit === 0 || exit === 3010)) return "done";
-  return localFreeBytes >= LAYOUT_STAGING_BYTES + reserveBytes ? "stage" : "skip";
-}
-function autosdkLayout(msvcRoot, msvc, sdk, autosdkRoot) {
-  const win64 = path64.win32.join(autosdkRoot, "HostWin64", "Win64");
-  return [
-    {
-      from: path64.win32.join(msvcRoot, "VC", "Tools", "MSVC", msvc),
-      to: path64.win32.join(win64, "VS2022", msvc)
-    },
-    ...["Include", "Lib", "bin"].map((part) => ({
-      from: path64.win32.join(msvcRoot, "Windows Kits", "10", part, sdk),
-      to: path64.win32.join(win64, "Windows Kits", "10", part, sdk)
-    }))
-  ];
-}
-
-// src/guest/toolchains/native/autosdk.ts
-var AUTOSDK_DIR = tool("unreal", "autosdk");
-var MARKER3 = path65.join(AUTOSDK_DIR, ".complete.json");
-var MarkerSchema = external_exports.object({ msvc: external_exports.string(), sdk: external_exports.string() });
-function builtFor(msvc, sdk) {
-  try {
-    const done = MarkerSchema.parse(JSON.parse(fs50.readFileSync(MARKER3, "utf8")));
-    return done.msvc === msvc && done.sdk === sdk;
-  } catch {
-    return false;
-  }
-}
-async function setupAutosdk(env) {
-  const msvc = readInstalled();
-  if (!msvc || !hasCompiler(msvc.msvc))
-    throw new Error(
-      'toolchains.unreal.visualStudio = "autosdk" builds from the portable MSVC, which is not installed (is toolchains.msvc off?)'
-    );
-  if (!builtFor(msvc.msvc, msvc.sdk)) {
-    log("Making the Unreal AutoSDK from MSVC " + msvc.msvc + " (~2 GB, once) ...");
-    fs50.rmSync(MARKER3, { force: true });
-    for (const pair of autosdkLayout(ROOT, msvc.msvc, msvc.sdk, AUTOSDK_DIR)) {
-      mkdirp(pair.to);
-      const code = await spawnAsync(SYSTEM.robocopy(), [pair.from, pair.to, "/E", "/COPY:DAT", "/R:1", "/W:1", "/NP"]);
-      if (robocopyFailed(code))
-        throw new Error("could not copy " + pair.from + " into the AutoSDK (robocopy " + code + ")");
-    }
-    writeJsonAtomic(MARKER3, { msvc: msvc.msvc, sdk: msvc.sdk });
-  }
-  if (!exists(MARKER3)) throw new Error("the Unreal AutoSDK was not completed");
-  env.vars["UE_SDKS_ROOT"] = AUTOSDK_DIR;
-  env.summary.push(
-    "unreal autosdk: MSVC " + msvc.msvc + ", Windows SDK " + msvc.sdk + " (UE_SDKS_ROOT=" + AUTOSDK_DIR + ")"
-  );
-}
-
 // src/guest/toolchains/native/visual-studio.ts
-import fs52 from "node:fs";
+import fs51 from "node:fs";
 import os9 from "node:os";
-import path67 from "node:path";
+import path66 from "node:path";
 
 // src/guest/runtime/status.ts
 import os8 from "node:os";
@@ -33104,8 +33070,8 @@ function writeStatus(phase, message) {
 
 // src/guest/toolchains/persisted.ts
 import crypto6 from "node:crypto";
-import fs51 from "node:fs";
-import path66 from "node:path";
+import fs50 from "node:fs";
+import path64 from "node:path";
 
 // src/shared/installs.ts
 var INSTALL_RECORDS_FILE = "installs.json";
@@ -33121,11 +33087,11 @@ var InstallRecordsSchema = external_exports.object({ installs: external_exports.
 // src/guest/toolchains/persisted.ts
 var GB = 1024 ** 3;
 var LOCAL_RESERVE_BYTES = 13 * GB;
-var MARKER4 = ".complete.json";
+var MARKER3 = ".complete.json";
 var MAX_WALK = 2e6;
 var NAME = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
-var toolsOf = (deps) => deps.toolsDir ?? path66.join(dataDir, "tools");
-var recordsFile = (deps) => path66.join(toolsOf(deps), INSTALL_RECORDS_FILE);
+var toolsOf = (deps) => deps.toolsDir ?? path64.join(dataDir, "tools");
+var recordsFile = (deps) => path64.join(toolsOf(deps), INSTALL_RECORDS_FILE);
 function checkSpec(spec) {
   const parts2 = spec.name.split("/");
   if (parts2.length > 2 || !parts2.every((p) => NAME.test(p)) || !NAME.test(spec.version))
@@ -33156,7 +33122,7 @@ function installRecords(deps = {}) {
   return readValid(InstallRecordsSchema, recordsFile(deps))?.installs ?? [];
 }
 function writeRecords(records, deps) {
-  fs51.mkdirSync(toolsOf(deps), { recursive: true });
+  fs50.mkdirSync(toolsOf(deps), { recursive: true });
   writeJsonAtomic(recordsFile(deps), { installs: [...records] });
 }
 function recordUse(name, version2, deps = {}) {
@@ -33176,17 +33142,17 @@ function folderSize(dir) {
     const current2 = stack.pop();
     let entries2;
     try {
-      entries2 = fs51.readdirSync(current2, { withFileTypes: true });
+      entries2 = fs50.readdirSync(current2, { withFileTypes: true });
     } catch {
       continue;
     }
     for (const e of entries2) {
       if (++seen > MAX_WALK) return null;
-      const full = path66.join(current2, e.name);
+      const full = path64.join(current2, e.name);
       if (e.isDirectory()) stack.push(full);
       else if (e.isFile())
         try {
-          total += fs51.statSync(full).size;
+          total += fs50.statSync(full).size;
         } catch {
         }
     }
@@ -33194,16 +33160,16 @@ function folderSize(dir) {
   return total;
 }
 function complete(dir, marker) {
-  return fs51.existsSync(path66.join(dir, MARKER4)) && fs51.existsSync(path66.join(dir, marker));
+  return fs50.existsSync(path64.join(dir, MARKER3)) && fs50.existsSync(path64.join(dir, marker));
 }
 function prune(spec, deps) {
   if (!spec.keepVersions) return;
-  const root = path66.join(toolsOf(deps), ...spec.name.split("/"));
+  const root = path64.join(toolsOf(deps), ...spec.name.split("/"));
   const mine = installRecords(deps).filter((r) => r.name === spec.name && r.version !== spec.version).sort((a, b) => b.usedAt.localeCompare(a.usedAt));
   const gone = mine.slice(Math.max(0, spec.keepVersions - 1));
   for (const r of gone) {
     if (!NAME.test(r.version)) continue;
-    safeRemove(path66.join(root, r.version), root);
+    safeRemove(path64.join(root, r.version), root);
     deps.log?.("Removed " + spec.name + " " + r.version + " (keepVersions " + spec.keepVersions + ")");
   }
   const isGone2 = (r) => r.name === spec.name && gone.some((g) => g.version === r.version);
@@ -33215,14 +33181,14 @@ function prune(spec, deps) {
 }
 async function ensurePersisted(spec, install2, deps = {}) {
   checkSpec(spec);
-  const root = path66.join(toolsOf(deps), ...spec.name.split("/"));
-  const dir = path66.join(root, spec.version);
+  const root = path64.join(toolsOf(deps), ...spec.name.split("/"));
+  const dir = path64.join(root, spec.version);
   if (complete(dir, spec.marker)) {
     recordUse(spec.name, spec.version, deps);
     const known = installRecords(deps).find((r) => r.name === spec.name && r.version === spec.version);
     return { dir, fresh: false, sizeBytes: known?.sizeBytes ?? null };
   }
-  fs51.mkdirSync(root, { recursive: true });
+  fs50.mkdirSync(root, { recursive: true });
   assertRoom(
     root,
     spec.needBytes,
@@ -33230,18 +33196,18 @@ async function ensurePersisted(spec, install2, deps = {}) {
     "Free room on that disk (with contained storage: raise storage.containedMaxGb), or keep fewer versions.",
     deps
   );
-  const staging = path66.join(root, ".staging-" + spec.version + "-" + crypto6.randomBytes(3).toString("hex"));
-  const temp = path66.join(staging, ".temp");
-  fs51.mkdirSync(temp, { recursive: true });
+  const staging = path64.join(root, ".staging-" + spec.version + "-" + crypto6.randomBytes(3).toString("hex"));
+  const temp = path64.join(staging, ".temp");
+  fs50.mkdirSync(temp, { recursive: true });
   try {
     await install2(staging, temp);
-    if (!fs51.existsSync(path66.join(staging, spec.marker)))
+    if (!fs50.existsSync(path64.join(staging, spec.marker)))
       throw new Error(spec.what + ": the install finished without " + spec.marker);
     safeRemove(temp, staging);
     const sizeBytes = folderSize(staging);
-    writeJsonAtomic(path66.join(staging, MARKER4), { name: spec.name, version: spec.version, sizeBytes });
-    if (fs51.existsSync(dir)) safeRemove(dir, root);
-    fs51.renameSync(staging, dir);
+    writeJsonAtomic(path64.join(staging, MARKER3), { name: spec.name, version: spec.version, sizeBytes });
+    if (fs50.existsSync(dir)) safeRemove(dir, root);
+    fs50.renameSync(staging, dir);
     const now2 = (/* @__PURE__ */ new Date()).toISOString();
     writeRecords(
       [
@@ -33253,8 +33219,295 @@ async function ensurePersisted(spec, install2, deps = {}) {
     prune(spec, deps);
     return { dir, fresh: true, sizeBytes };
   } finally {
-    if (fs51.existsSync(staging)) safeRemove(staging, root);
+    if (fs50.existsSync(staging)) safeRemove(staging, root);
+  }
+}
+
+// src/guest/toolchains/native/vs-request.ts
+var UNREAL_COMPONENTS = [
+  "Microsoft.VisualStudio.Workload.NativeGame",
+  "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+  "Microsoft.VisualStudio.Component.Windows11SDK.22621",
+  "Microsoft.VisualStudio.Component.VC.DiagnosticTools",
+  "Microsoft.Net.Component.4.6.2.TargetingPack",
+  "Microsoft.Net.Component.4.8.SDK",
+  "Component.Unreal.Ide",
+  "Component.Unreal"
+];
+var BUILD_TOOLS_COMPONENTS = [
+  "Microsoft.VisualStudio.Workload.VCTools",
+  "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+  "Microsoft.VisualStudio.Component.Windows11SDK.22621"
+];
+var UNREAL_BUILD_TOOLS_COMPONENTS = [
+  ...BUILD_TOOLS_COMPONENTS,
+  "Microsoft.Net.Component.4.6.2.TargetingPack",
+  "Microsoft.Net.Component.4.8.SDK"
+];
+var isOn = (setting) => setting === true;
+function visualStudioWanted(t, on = isOn) {
+  const unreal = on(t.unreal.enabled, "unreal");
+  const flutter = on(t.flutter.enabled, "flutter") && t.flutter.windowsDesktop;
+  const unity = on(t.unity.enabled, "unity") && t.unity.modules.includes("windows-il2cpp");
+  const users = [...unreal ? ["unreal"] : [], ...flutter ? ["flutter"] : [], ...unity ? ["unity"] : []];
+  if (!users.length) return null;
+  if (unreal) {
+    const full = t.unreal.visualStudio === "full";
+    return {
+      product: full ? "community" : "buildtools",
+      components: [.../* @__PURE__ */ new Set([...full ? UNREAL_COMPONENTS : UNREAL_BUILD_TOOLS_COMPONENTS, ...t.unreal.components])],
+      for: users,
+      licence: "toolchains.unreal.acceptLicense",
+      accepted: t.unreal.acceptLicense
+    };
+  }
+  return {
+    product: "buildtools",
+    components: [...BUILD_TOOLS_COMPONENTS],
+    for: users,
+    licence: "toolchains.msvc.acceptLicense",
+    accepted: t.msvc.acceptLicense
+  };
+}
+function vsExitText(code) {
+  const c = code >>> 0;
+  switch (c) {
+    case 0:
+      return "installed";
+    case 3010:
+      return "done; a restart would finish it (not needed here)";
+    case 1602:
+      return "cancelled";
+    case 5007:
+      return "the installer refused to run (blocked by Windows, for example a restart waiting)";
+    case 8006:
+      return "Visual Studio is running and must be closed first";
+    case 3762504530:
+      return "0xE0434352: the Visual Studio installer crashed";
+    default:
+      return "the installer failed with exit " + c + " (0x" + c.toString(16).toUpperCase() + ")";
+  }
+}
+
+// src/guest/toolchains/native/vs-persist.ts
+import path65 from "node:path";
+var win = path65.win32;
+var MARKER_FILE = ".complete.json";
+var SETUP_CLSID = "{177F0C4A-1CD3-4DE7-A32C-71DBBB9FA36D}";
+var SETUP_DLL = "Microsoft.VisualStudio.Setup.Configuration.Native.dll";
+var INSTANCE_ID = /^[A-Za-z0-9]{1,64}$/;
+function winPlaces(env) {
+  return {
+    programFiles: env.ProgramFiles ?? "C:\\Program Files",
+    programFilesX86: env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)",
+    programData: env.ProgramData ?? "C:\\ProgramData"
+  };
+}
+var FOLDER_NAMES = [
+  "Community",
+  "BuildTools",
+  "WindowsKits10",
+  "NETFXSDK",
+  "MicrosoftSDKs-v10.0A",
+  "ReferenceAssemblies",
+  "Installer",
+  "Shared",
+  "Setup",
+  "instance"
+];
+function productFolder(product) {
+  return product === "community" ? "Community" : "BuildTools";
+}
+function instancesDir(places) {
+  return win.join(places.programData, "Microsoft", "VisualStudio", "Packages", "_Instances");
+}
+function persistFolders(vs, places) {
+  if (!INSTANCE_ID.test(vs.instanceId)) throw new Error('"' + vs.instanceId + '" is not a Visual Studio instance ID');
+  const x86 = places.programFilesX86;
+  const one = (name, source, restore, optional2 = false) => ({
+    name,
+    source,
+    restore,
+    optional: optional2
+  });
+  return [
+    one(productFolder(vs.product), vs.installationPath, "stay"),
+    one("WindowsKits10", win.join(x86, "Windows Kits", "10"), "stay"),
+    one("NETFXSDK", win.join(x86, "Windows Kits", "NETFXSDK"), "stay", true),
+    one("MicrosoftSDKs-v10.0A", win.join(x86, "Microsoft SDKs", "Windows", "v10.0A"), "stay", true),
+    // MSBuild looks for the .NET Framework reference assemblies at this fixed path.
+    one(
+      "ReferenceAssemblies",
+      win.join(x86, "Reference Assemblies", "Microsoft", "Framework", ".NETFramework"),
+      "copy-missing",
+      true
+    ),
+    // Scripts and build tools look for vswhere here; the instance's state names setup.exe here too (144 MB).
+    one("Installer", win.join(x86, "Microsoft Visual Studio", "Installer"), "copy"),
+    one("Shared", win.join(x86, "Microsoft Visual Studio", "Shared"), "copy", true),
+    one("Setup", win.join(places.programData, "Microsoft", "VisualStudio", "Setup"), "copy"),
+    one("instance", win.join(instancesDir(places), vs.instanceId), "copy")
+  ];
+}
+var RegEntrySchema = external_exports.strictObject({
+  view: external_exports.enum(["64", "32"]),
+  /** Under HKLM, e.g. SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0 (the view picks WOW6432Node). */
+  key: external_exports.string().min(1).max(400),
+  /** '' is the default value. */
+  name: external_exports.string().max(200),
+  kind: external_exports.enum(["string", "expand", "dword"]),
+  value: external_exports.union([external_exports.string().max(2e3), external_exports.number().int()])
+});
+var REGISTRY_READS = [
+  { key: "SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", names: ["KitsRoot10"], recurse: false },
+  { key: "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v10.0", names: null, recurse: false },
+  { key: "SOFTWARE\\Microsoft\\Microsoft SDKs\\NETFXSDK", names: null, recurse: true },
+  { key: "SOFTWARE\\Microsoft\\VisualStudio\\Setup", names: null, recurse: false }
+];
+var VIEWS = ["64", "32"];
+var VsPersistMarkerSchema = external_exports.strictObject({
+  product: external_exports.enum(["community", "buildtools"]),
+  /** The installed version (17.14.37827.9). */
+  version: external_exports.string().min(1).max(100),
+  /** The component IDs it was installed with. */
+  components: external_exports.array(external_exports.string().max(200)).max(500),
+  instanceId: external_exports.string().regex(INSTANCE_ID),
+  /** Where the installer put it (the paths in its state and the registry are rewritten from this). */
+  installationPath: external_exports.string().min(3).max(400),
+  /** The Windows SDK's ProductVersion (10.0.22621), '' when there is none. */
+  sdkVersion: external_exports.string().max(50),
+  folders: external_exports.array(external_exports.enum(FOLDER_NAMES)).max(FOLDER_NAMES.length),
+  /** The registry values as the installer wrote them (paths on C:). */
+  registry: external_exports.array(RegEntrySchema).max(500),
+  capturedAt: external_exports.string().max(50)
+});
+var SaveResultSchema = external_exports.strictObject({
+  copied: external_exports.array(external_exports.enum(FOLDER_NAMES)).max(FOLDER_NAMES.length),
+  registry: external_exports.array(RegEntrySchema).max(500)
+});
+var needed = (product) => [
+  productFolder(product),
+  "instance",
+  "Setup",
+  "Installer",
+  "WindowsKits10"
+];
+function persistCovers(marker, req) {
+  const same = marker.product === req.product;
+  if (!same && !(marker.product === "community" && req.product === "buildtools")) return false;
+  if (!needed(marker.product).every((f) => marker.folders.includes(f))) return false;
+  const have = new Set(marker.components.map((c) => c.toLowerCase()));
+  return req.components.filter((id) => same || !/\.workload\./i.test(id)).every((id) => have.has(id.toLowerCase()));
+}
+var jsonEscaped = (s) => JSON.stringify(s).slice(1, -1);
+function rewriteInstanceState(text, from, to) {
+  const needle = jsonEscaped(win.normalize(from).replace(/\\+$/, ""));
+  const replacement = jsonEscaped(win.normalize(to).replace(/\\+$/, ""));
+  const lower = text.toLowerCase();
+  const find = needle.toLowerCase();
+  let out = "";
+  let at = 0;
+  for (let i = lower.indexOf(find); i !== -1; i = lower.indexOf(find, i + find.length)) {
+    const next = text.slice(i + find.length, i + find.length + 2);
+    if (next !== "\\\\" && !next.startsWith('"')) continue;
+    out += text.slice(at, i) + replacement;
+    at = i + find.length;
+  }
+  return out + text.slice(at);
+}
+function rebase(value, moves) {
+  for (const move of moves) {
+    const from = move.from.replace(/\\+$/, "");
+    const lower = value.toLowerCase();
+    if (lower === from.toLowerCase() || lower.startsWith(from.toLowerCase() + "\\"))
+      return move.to.replace(/\\+$/, "") + value.slice(from.length);
   }
+  return value;
+}
+var allowed = (entry) => REGISTRY_READS.some((read) => {
+  const key2 = entry.key.toLowerCase();
+  const root = read.key.toLowerCase();
+  const under = key2 === root || read.recurse && key2.startsWith(root + "\\");
+  return under && (read.names === null || read.names.some((n) => n.toLowerCase() === entry.name.toLowerCase()));
+});
+function registryPlan(marker, root, places) {
+  const folders = persistFolders(marker, places).filter((f) => marker.folders.includes(f.name));
+  const moves = folders.filter((f) => f.restore === "stay").map((f) => ({ from: f.source, to: win.join(root, f.name) }));
+  const values = /* @__PURE__ */ new Map();
+  const put = (e) => {
+    values.set(e.key.toLowerCase() + "|" + e.name.toLowerCase(), e);
+  };
+  for (const e of marker.registry.filter(allowed))
+    put({
+      key: e.key,
+      name: e.name,
+      kind: e.kind,
+      value: typeof e.value === "string" ? rebase(e.value, moves) : e.value
+    });
+  if (marker.folders.includes("WindowsKits10")) {
+    const kits = win.join(root, "WindowsKits10") + "\\";
+    const sdk = "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v10.0";
+    put({ key: "SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", name: "KitsRoot10", kind: "string", value: kits });
+    put({ key: sdk, name: "InstallationFolder", kind: "string", value: kits });
+    if (marker.sdkVersion) put({ key: sdk, name: "ProductVersion", kind: "string", value: marker.sdkVersion });
+  }
+  const both = [...values.values()].flatMap((e) => VIEWS.map((view) => ({ view, ...e })));
+  const setup = win.join(places.programData, "Microsoft", "VisualStudio", "Setup");
+  const com = (view, arch2) => {
+    const key2 = "SOFTWARE\\Classes\\CLSID\\" + SETUP_CLSID + "\\InprocServer32";
+    return [
+      { view, key: key2, name: "", kind: "string", value: win.join(setup, arch2, SETUP_DLL) },
+      { view, key: key2, name: "ThreadingModel", kind: "string", value: "Both" }
+    ];
+  };
+  return [...both, ...com("64", "x64"), ...com("32", "x86")];
+}
+function compareVersions2(a, b) {
+  const x = a.split(".").map((p) => parseInt(p, 10) || 0);
+  const y = b.split(".").map((p) => parseInt(p, 10) || 0);
+  for (let i = 0; i < Math.max(x.length, y.length); i++)
+    if ((x[i] ?? 0) !== (y[i] ?? 0)) return (x[i] ?? 0) - (y[i] ?? 0);
+  return 0;
+}
+function newestInstance(instances) {
+  return [...instances].sort((a, b) => compareVersions2(b.installationVersion ?? "", a.installationVersion ?? ""))[0] ?? null;
+}
+function saveInput(vs, root, places, resultFile) {
+  return {
+    copies: persistFolders(vs, places).map((f) => ({
+      name: f.name,
+      from: f.source,
+      to: win.join(root, f.name),
+      optional: f.optional
+    })),
+    registry: VIEWS.flatMap((view) => REGISTRY_READS.map((r) => ({ view, ...r }))),
+    resultFile
+  };
+}
+function markerFrom(req, vs, result, capturedAt) {
+  const sdk = result.registry.find(
+    (e) => /\\Microsoft SDKs\\Windows\\v10\.0$/i.test(e.key) && e.name.toLowerCase() === "productversion"
+  );
+  return {
+    product: req.product,
+    version: vs.version,
+    components: [...req.components],
+    instanceId: vs.instanceId,
+    installationPath: vs.installationPath,
+    sdkVersion: typeof sdk?.value === "string" ? sdk.value : "",
+    folders: [...result.copied],
+    registry: [...result.registry],
+    capturedAt
+  };
+}
+function restoreInput(marker, root, places) {
+  const copies = persistFolders(marker, places).filter((f) => f.restore !== "stay" && marker.folders.includes(f.name)).map((f) => ({
+    name: f.name,
+    from: win.join(root, f.name),
+    to: f.source,
+    mode: f.restore === "copy-missing" ? "missing" : "all"
+  }));
+  return { copies, registry: registryPlan(marker, root, places) };
 }
 
 // src/guest/toolchains/native/visual-studio.ts
@@ -33270,204 +33523,197 @@ var BOOTSTRAPPERS = {
     name: "Visual Studio Build Tools 2022"
   }
 };
+var GB2 = 1024 ** 3;
 var INSTALL_BYTES = {
-  community: 7 * 1024 ** 3,
-  buildtools: 5 * 1024 ** 3
+  community: 7 * GB2,
+  buildtools: 5 * GB2
 };
+var SAVE_ROOM_BYTES = 8 * GB2;
 var OK_EXIT_CODES = [0, 3010];
-var LAYOUT_ROOM_BYTES = 15 * 1024 ** 3;
 var ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,199}$/;
 var VS_DIR = tool("visualstudio");
-var LayoutSchema = external_exports.object({ components: external_exports.array(external_exports.string()) });
-var VSWHERE = path67.join(
-  process.env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)",
-  "Microsoft Visual Studio",
-  "Installer",
-  "vswhere.exe"
+var PERSIST_DIR = path66.join(VS_DIR, "persist");
+var MARKER4 = path66.join(PERSIST_DIR, MARKER_FILE);
+var LEFTOVERS = ["layout", "layout-buildtools", "tmp"];
+var PLACES = winPlaces(process.env);
+var INSTALLER_DIR = path66.join(PLACES.programFilesX86, "Microsoft Visual Studio", "Installer");
+var VSWHERE = path66.join(INSTALLER_DIR, "vswhere.exe");
+var VswhereSchema = external_exports.array(
+  external_exports.looseObject({
+    instanceId: external_exports.string(),
+    installationPath: external_exports.string(),
+    installationVersion: external_exports.string().optional()
+  })
 );
 function installedVs() {
   if (!exists(VSWHERE)) return null;
-  const ask = (property) => execOutput(VSWHERE, [
-    "-latest",
+  const out = execOutput(VSWHERE, [
     "-products",
     "*",
     "-requires",
     "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "-property",
-    property
+    "-format",
+    "json",
+    "-utf8"
   ]);
-  const at = ask("installationPath");
-  return at ? { path: at, version: ask("installationVersion") || "installed" } : null;
-}
-function layoutDir(product) {
-  return path67.join(VS_DIR, product === "community" ? "layout" : "layout-buildtools");
-}
-var layoutArgs = (req, folder) => [
-  "--layout",
-  folder,
-  "--lang",
-  "en-US",
-  "--quiet",
-  "--wait",
-  ...req.components.flatMap((id) => ["--add", id])
-];
-function newestBootstrapperLog(folders) {
-  const logs = folders.flatMap((dir) => {
-    try {
-      return fs52.readdirSync(dir).filter((n) => /^dd_bootstrapper_.*\.log$/i.test(n)).map((n) => path67.join(dir, n));
-    } catch {
-      return [];
-    }
-  });
-  const stamp = (f) => {
-    try {
-      return fs52.statSync(f).mtimeMs;
-    } catch {
-      return 0;
-    }
-  };
-  return logs.sort((x, y) => stamp(y) - stamp(x))[0] ?? null;
-}
-function reportLayoutFailure(code, temps) {
-  warn("Visual Studio: saving the install files failed (exit " + code + "): " + vsExitText(code));
-  const found = newestBootstrapperLog(temps);
-  if (!found) return;
-  const kept = path67.join(logsDir, "vs-layout-" + (/* @__PURE__ */ new Date()).toISOString().slice(0, 10) + ".log");
+  let found;
   try {
-    fs52.mkdirSync(logsDir, { recursive: true });
-    fs52.copyFileSync(found, kept);
-    warn("Visual Studio: the installer log is " + found + " (a copy is in " + kept + ")");
-  } catch (e) {
-    warn("Visual Studio: the installer log is " + found + " (could not copy it: " + errMsg(e) + ")");
+    found = JSON.parse(out || "[]");
+  } catch {
+    return null;
   }
+  const first = newestInstance(VswhereSchema.safeParse(found).data ?? []);
+  return first ? { path: first.installationPath, version: first.installationVersion ?? "installed", instanceId: first.instanceId } : null;
+}
+function savedCopy(req) {
+  const marker = readValid(VsPersistMarkerSchema, MARKER4);
+  if (!marker || !persistCovers(marker, req)) return null;
+  const product = path66.join(PERSIST_DIR, productFolder(marker.product));
+  const files = [
+    path66.join(product, "VC", "Auxiliary", "Build", "vcvars64.bat"),
+    path66.join(PERSIST_DIR, "instance", "state.json"),
+    path66.join(PERSIST_DIR, "Installer", "vswhere.exe"),
+    path66.join(PERSIST_DIR, "Setup", "x64", "Microsoft.VisualStudio.Setup.Configuration.Native.dll")
+  ];
+  return files.every(exists) ? marker : null;
 }
-async function copyLayout(from, to) {
-  mkdirp(to);
-  const code = await heavy.run(
-    () => spawnAsync(SYSTEM.robocopy(), [from, to, "/E", "/COPY:DAT", "/R:1", "/W:1", "/MT:8", "/NP"])
+function visualStudioSaved(req) {
+  return savedCopy(req) !== null;
+}
+async function restoreSaved(marker) {
+  const started = Date.now();
+  log("Visual Studio: putting back the copy saved in " + PERSIST_DIR + " ...");
+  const plan2 = restoreInput(marker, PERSIST_DIR, PLACES);
+  await heavy.run(() => runScriptWithJsonAsync("restore-visual-studio.ps1", "PlanFile", plan2));
+  const vs = installedVs();
+  if (!vs) throw new Error("vswhere does not find the Visual Studio that was put back");
+  log(
+    "Visual Studio " + vs.version + " is back in " + Math.round((Date.now() - started) / 1e3) + " s (" + vs.path + ")"
   );
-  return !robocopyFailed(code);
-}
-async function layoutInstaller(req, bootstrapper, lowPriority) {
-  const layout = layoutDir(req.product);
-  const marker = path67.join(layout, ".complete.json");
-  const installer2 = path67.join(layout, BOOTSTRAPPERS[req.product].file);
-  const has = () => {
-    if (!exists(marker) || !exists(installer2)) return false;
-    try {
-      const done = LayoutSchema.parse(JSON.parse(fs52.readFileSync(marker, "utf8")));
-      return req.components.every((id) => done.components.includes(id));
-    } catch {
-      return false;
-    }
-  };
-  const finish = () => {
-    writeJsonAtomic(marker, { components: [...req.components] });
-    return installer2;
-  };
-  if (has()) return installer2;
-  if (freeBytes(mkdirp(VS_DIR)) < LAYOUT_ROOM_BYTES) {
+  return vs;
+}
+async function saveInstall(req, vs, lowPriority) {
+  const free = freeBytes(mkdirp(PERSIST_DIR));
+  if (free < SAVE_ROOM_BYTES) {
     warn(
-      "Visual Studio: not keeping the install files (less than 15 GB free in " + VS_DIR + "); downloading this boot"
+      "Visual Studio: not saved for later boots (" + (free / GB2).toFixed(1) + " GB free in " + PERSIST_DIR + ", it needs 8 GB); the next boot installs it again"
     );
-    return null;
+    return;
   }
-  log("Saving the Visual Studio install files for later boots (~10 GB, once) ...");
-  fs52.rmSync(marker, { force: true });
-  const drive = (process.env.SystemDrive ?? "C:") + "\\";
-  if (layoutNextStep(null, freeBytes(drive), STAGING_RESERVE_BYTES) !== "stage") {
-    warn(
-      "Visual Studio: less than " + Math.round((LAYOUT_STAGING_BYTES + STAGING_RESERVE_BYTES) / 1024 ** 3) + " GB free on " + drive + " to build the install files; downloading this boot"
+  fs51.rmSync(MARKER4, { force: true });
+  log("Saving Visual Studio in " + PERSIST_DIR + " for later boots (~6.5 GB, once) ...");
+  const dir = fs51.mkdtempSync(path66.join(os9.tmpdir(), "sbx-vs-"));
+  const resultFile = path66.join(dir, "result.json");
+  try {
+    const plan2 = saveInput(
+      { product: req.product, installationPath: vs.path, instanceId: vs.instanceId },
+      PERSIST_DIR,
+      PLACES,
+      resultFile
     );
-    return null;
-  }
-  const staging = path67.join(drive, "vs-layout-staging");
-  log("Building the install files on " + drive + " and copying them to " + layout + " ...");
-  const stagedCode = await runInstaller(bootstrapper, layoutArgs(req, staging), { lowPriority });
-  const staged = path67.join(staging, BOOTSTRAPPERS[req.product].file);
-  let kept = false;
-  if (OK_EXIT_CODES.includes(stagedCode) && exists(staged)) {
-    kept = await copyLayout(staging, layout);
-    if (!kept) warn("Visual Studio: copying the install files to " + layout + " failed");
-  } else {
-    reportLayoutFailure(stagedCode, [os9.tmpdir()]);
+    await heavy.run(
+      () => runScriptWithJsonAsync("save-visual-studio.ps1", "PlanFile", plan2, lowPriority ? ["-LowPriority"] : [])
+    );
+    const result = readValid(SaveResultSchema, resultFile);
+    if (!result) throw new Error("the save script left no result");
+    const state = path66.join(PERSIST_DIR, "instance", "state.json");
+    const saved2 = path66.join(PERSIST_DIR, productFolder(req.product));
+    fs51.writeFileSync(state, rewriteInstanceState(fs51.readFileSync(state, "utf8"), vs.path, saved2), "utf8");
+    safeRemove(path66.join(PERSIST_DIR, productFolder(req.product === "community" ? "buildtools" : "community")), VS_DIR);
+    writeJsonAtomic(
+      MARKER4,
+      markerFrom(
+        req,
+        { installationPath: vs.path, instanceId: vs.instanceId, version: vs.version },
+        result,
+        (/* @__PURE__ */ new Date()).toISOString()
+      )
+    );
+    log("Visual Studio is saved: later boots put it back in seconds");
+  } catch (e) {
+    warn("Visual Studio: saving it for later boots failed (" + errMsg(e) + "); the next boot installs it again");
+  } finally {
+    fs51.rmSync(dir, { recursive: true, force: true });
   }
-  safeRemove(staging, drive);
-  return kept && exists(installer2) ? finish() : null;
 }
 function bootstrapperFor(req) {
   const boot = BOOTSTRAPPERS[req.product];
-  return signedInstaller(boot.url, path67.join(VS_DIR, boot.file), "the " + boot.name + " installer", SIGNERS.microsoft);
+  return signedInstaller(boot.url, path66.join(VS_DIR, boot.file), "the " + boot.name + " installer", SIGNERS.microsoft);
 }
 async function prefetchVisualStudio(req) {
-  if (!req.accepted || installedVs()) return;
+  if (!req.accepted || installedVs() || savedCopy(req)) return;
   await bootstrapperFor(req);
 }
-async function install(req, keepInstallFiles, lowPriority) {
+async function install(req, lowPriority) {
   const boot = BOOTSTRAPPERS[req.product];
   const bootstrapper = await bootstrapperFor(req);
-  let installer2 = null;
-  if (keepInstallFiles) {
-    try {
-      installer2 = await layoutInstaller(req, bootstrapper, lowPriority);
-    } catch (e) {
-      warn("Visual Studio: the offline copy failed (" + errMsg(e) + "); downloading this boot");
-    }
-  }
-  const run2 = (from, offline) => runInstaller(
-    from,
-    [
-      "--quiet",
-      "--wait",
-      "--norestart",
-      "--nocache",
-      ...offline ? ["--noWeb"] : [],
-      ...req.components.flatMap((id) => ["--add", id])
-    ],
+  log("Installing " + boot.name + " (downloads ~5-8 GB, once: it is saved on the data disk afterwards) ...");
+  const code = await runInstaller(
+    bootstrapper,
+    ["--quiet", "--wait", "--norestart", "--nocache", ...req.components.flatMap((id) => ["--add", id])],
     { lowPriority }
   );
-  log("Installing " + boot.name + (installer2 ? " from the saved install files" : " (downloads ~5-8 GB)") + " ...");
-  let code = await run2(installer2 ?? bootstrapper, installer2 !== null);
-  if (installer2 && (!OK_EXIT_CODES.includes(code) || !installedVs())) {
-    warn("Visual Studio: installing from the saved install files failed (" + vsExitText(code) + "); downloading");
-    code = await run2(bootstrapper, false);
-  }
   if (!OK_EXIT_CODES.includes(code) || !installedVs())
     throw new Error(
       "the Visual Studio installer failed (exit " + code + ": " + vsExitText(code) + "); its logs are the dd_*.log files in " + os9.tmpdir()
     );
 }
-async function ensureVisualStudio(env, req, o) {
+function removeLeftovers() {
+  for (const name of LEFTOVERS) {
+    const dir = path66.join(VS_DIR, name);
+    try {
+      if (exists(dir)) safeRemove(dir, VS_DIR);
+    } catch (e) {
+      warn("Visual Studio: could not remove " + dir + " (" + errMsg(e) + ")");
+    }
+  }
+}
+async function ensureVisualStudio(env, req, o = {}) {
   if (!req.accepted)
     throw new Error(
       "Visual Studio (for " + req.for.join(", ") + ") is installed only with " + req.licence + " = true: it comes under Microsoft licence terms (https://visualstudio.microsoft.com/license-terms/)"
     );
   const bad = req.components.find((id) => !ID.test(id));
   if (bad) throw new Error('"' + bad + '" is not a Visual Studio component ID');
+  removeLeftovers();
+  const name = BOOTSTRAPPERS[req.product].name;
+  const done = (vs2, how) => {
+    env.append.push(INSTALLER_DIR);
+    env.summary.push(
+      "visual studio: " + name + " " + vs2.version + " at " + vs2.path + " (" + how + "; for " + req.for.join(", ") + ")"
+    );
+    return vs2;
+  };
   const have = installedVs();
-  if (have) return have;
+  if (have) return done(have, "installed");
+  const saved2 = savedCopy(req);
+  if (saved2) {
+    try {
+      return done(await restoreSaved(saved2), "kept on the data disk");
+    } catch (e) {
+      warn("Visual Studio: putting the saved copy back failed (" + errMsg(e) + "); installing it again");
+    }
+  }
   if (duringSession())
     throw new Error(
       backgroundRunning("Visual Studio") ? "Visual Studio is still installing in the background; it is ready in a few minutes" : "Visual Studio is installed when the sandbox starts: restart it (sandbox restart) to get it"
     );
-  assertLocalRoom(INSTALL_BYTES[req.product], BOOTSTRAPPERS[req.product].name);
-  await install(req, o.keepInstallFiles, o.lowPriority === true);
+  assertLocalRoom(INSTALL_BYTES[req.product], name);
+  await install(req, o.lowPriority === true);
   const vs = installedVs();
-  env.summary.push(
-    "visual studio: " + BOOTSTRAPPERS[req.product].name + " " + vs.version + " at " + vs.path + " (for " + req.for.join(", ") + ")"
-  );
-  return vs;
+  await saveInstall(req, vs, o.lowPriority === true);
+  return done(vs, "installed, saved for later boots");
 }
 
 // src/guest/toolchains/native/unreal.ts
 var DIRECTX_URL = "https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe";
 var directXInstalled = () => {
-  const system322 = path68.join(process.env.WINDIR ?? "C:\\Windows", "System32");
-  return exists(path68.join(system322, "d3dx9_43.dll")) && exists(path68.join(system322, "XAudio2_7.dll"));
+  const system322 = path67.join(process.env.WINDIR ?? "C:\\Windows", "System32");
+  return exists(path67.join(system322, "d3dx9_43.dll")) && exists(path67.join(system322, "XAudio2_7.dll"));
 };
 var directXRedist = () => signedInstaller(
   DIRECTX_URL,
-  path68.join(tool("visualstudio"), "directx_Jun2010_redist.exe"),
+  path67.join(tool("visualstudio"), "directx_Jun2010_redist.exe"),
   "the DirectX End-User Runtime (~95 MB once)",
   SIGNERS.microsoft
 );
@@ -33477,12 +33723,12 @@ async function fetchDirectX(config2) {
 async function installDirectX() {
   if (directXInstalled()) return;
   const redist = await directXRedist();
-  const unpacked = path68.join(os10.tmpdir(), "directx-redist");
+  const unpacked = path67.join(os10.tmpdir(), "directx-redist");
   safeRemove(unpacked, os10.tmpdir());
   mkdirp(unpacked);
-  if (await runInstaller(redist, ["/Q", "/T:" + unpacked]) !== 0 || !exists(path68.join(unpacked, "DXSETUP.exe")))
+  if (await runInstaller(redist, ["/Q", "/T:" + unpacked]) !== 0 || !exists(path67.join(unpacked, "DXSETUP.exe")))
     throw new Error("could not unpack the DirectX End-User Runtime");
-  const code = await runInstaller(path68.join(unpacked, "DXSETUP.exe"), ["/silent"]);
+  const code = await runInstaller(path67.join(unpacked, "DXSETUP.exe"), ["/silent"]);
   safeRemove(unpacked, os10.tmpdir());
   if (code !== 0) throw new Error("the DirectX End-User Runtime installer failed (exit " + code + ")");
 }
@@ -33496,33 +33742,32 @@ async function setupUnreal(env, config2, ctx) {
     return;
   }
   await installDirectX();
-  if (config2.visualStudio === "autosdk") await setupAutosdk(env);
   await setupUnrealEngines(env, config2, ctx);
   const vs = installedVs();
   env.summary.push(
-    "unreal: " + (vs ? "Visual Studio " + vs.version + " (C++ game workload, Windows 11 SDK, Unreal support); " : "") + "DirectX End-User Runtime; get the engine from the Epic Games Launcher (Start menu)"
+    "unreal: " + (vs ? "Visual Studio " + vs.version + " at " + vs.path + "; " : "") + "DirectX End-User Runtime; get the engine from the Epic Games Launcher (Start menu)"
   );
 }
 
 // src/guest/toolchains/native/rust.ts
-import path70 from "node:path";
+import path69 from "node:path";
 
 // src/guest/toolchains/native/binstall.ts
-import fs53 from "node:fs";
-import path69 from "node:path";
+import fs52 from "node:fs";
+import path68 from "node:path";
 var ensureBinstall = async (cargoBin) => {
-  const target = path69.join(cargoBin, "cargo-binstall.exe");
+  const target = path68.join(cargoBin, "cargo-binstall.exe");
   if (exists(target)) return true;
   try {
     const dir = tool("cargo-binstall");
-    if (!exists(path69.join(dir, "cargo-binstall.exe"))) {
+    if (!exists(path68.join(dir, "cargo-binstall.exe"))) {
       await installFromGithub("cargo-bins/cargo-binstall", binstallAsset(arch), {
         dest: dir,
         what: "cargo-binstall for prebuilt Rust tools (~10 MB once)",
         locate: "cargo-binstall.exe"
       });
     }
-    fs53.copyFileSync(path69.join(dir, "cargo-binstall.exe"), target);
+    fs52.copyFileSync(path68.join(dir, "cargo-binstall.exe"), target);
     return true;
   } catch (e) {
     warn("cargo-binstall unavailable, compiling crates with cargo install instead: " + errMsg(e));
@@ -33530,14 +33775,14 @@ var ensureBinstall = async (cargoBin) => {
   }
 };
 function crateInstaller(cargoHome, cargoEnv) {
-  const cargo = path69.join(cargoHome, "bin", "cargo.exe");
+  const cargo = path68.join(cargoHome, "bin", "cargo.exe");
   let binstall = null;
   const binstallEnv = {
     ...cargoEnv,
     env: { ...cargoEnv.env ?? process.env, BINSTALL_DISABLE_TELEMETRY: "true" }
   };
   return async (crate) => {
-    binstall ??= ensureBinstall(path69.join(cargoHome, "bin"));
+    binstall ??= ensureBinstall(path68.join(cargoHome, "bin"));
     if (await binstall) {
       try {
         await execHeavy(
@@ -33557,7 +33802,7 @@ function crateInstaller(cargoHome, cargoEnv) {
 // src/guest/toolchains/native/rust.ts
 async function fetchRustupInit() {
   const init = tool("rust", "rustup-init.exe");
-  if (exists(init) || exists(path70.join(tool("rust", "cargo"), "bin", "rustup.exe"))) return;
+  if (exists(init) || exists(path69.join(tool("rust", "cargo"), "bin", "rustup.exe"))) return;
   await downloadFile(
     "https://static.rust-lang.org/rustup/dist/" + (arch === "arm64" ? "aarch64" : "x86_64") + "-pc-windows-msvc/rustup-init.exe",
     init
@@ -33567,7 +33812,7 @@ async function setupRust(env, config2, refresh) {
   const RUSTUP_HOME = tool("rust", "rustup");
   const CARGO_HOME = tool("rust", "cargo");
   const rustEnv = { env: { ...process.env, RUSTUP_HOME, CARGO_HOME } };
-  const rustup = path70.join(CARGO_HOME, "bin", "rustup.exe");
+  const rustup = path69.join(CARGO_HOME, "bin", "rustup.exe");
   if (dryRun) {
     log("(dry run) would provision Rust " + config2.toolchain + " (" + config2.host + ")");
     return;
@@ -33600,9 +33845,9 @@ async function setupRust(env, config2, refresh) {
     if (refresh) await execHeavy(rustup, ["update"], rustEnv);
   }
   Object.assign(env.vars, { RUSTUP_HOME, CARGO_HOME });
-  env.prepend.push(path70.join(CARGO_HOME, "bin"));
+  env.prepend.push(path69.join(CARGO_HOME, "bin"));
   env.summary.push(
-    "rust: " + versionOf(path70.join(CARGO_HOME, "bin", "rustc.exe"), ["--version"], rustEnv) + " [" + config2.host + "]"
+    "rust: " + versionOf(path69.join(CARGO_HOME, "bin", "rustc.exe"), ["--version"], rustEnv) + " [" + config2.host + "]"
   );
   const toolchainKey = "rustup@" + config2.toolchain;
   await installOnce(
@@ -33623,36 +33868,36 @@ async function setupRust(env, config2, refresh) {
     env: {
       ...rustEnv.env,
       ...msvc.vars,
-      PATH: [path70.join(CARGO_HOME, "bin"), ...msvc.path, process.env.PATH ?? ""].join(path70.delimiter)
+      PATH: [path69.join(CARGO_HOME, "bin"), ...msvc.path, process.env.PATH ?? ""].join(path69.delimiter)
     }
   } : {
     env: {
       ...rustEnv.env,
-      CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: path70.join(mingw, "gcc.exe"),
-      PATH: [path70.join(CARGO_HOME, "bin"), mingw, process.env.PATH ?? ""].join(path70.delimiter)
+      CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: path69.join(mingw, "gcc.exe"),
+      PATH: [path69.join(CARGO_HOME, "bin"), mingw, process.env.PATH ?? ""].join(path69.delimiter)
     }
   };
   await installOnce(env, "cargo", config2.crates, crateInstaller(CARGO_HOME, cargoEnv));
 }
 
 // src/guest/toolchains/languages/node.ts
-import fs54 from "node:fs";
-import path71 from "node:path";
+import fs53 from "node:fs";
+import path70 from "node:path";
 import { spawn as spawn7 } from "node:child_process";
 var NVM_HOME = tool("nvm");
-var NVM_SYMLINK = path71.join(localDir, "nodejs");
-var HOST_NVM = path71.join(hostToolsDir, "nvm");
+var NVM_SYMLINK = path70.join(localDir, "nodejs");
+var HOST_NVM = path70.join(hostToolsDir, "nvm");
 var HOST_VERSIONS_MAX = 3;
-var hostNvmVersions = () => exists(HOST_NVM) ? fs54.readdirSync(HOST_NVM).filter((d) => /^v\d+\.\d+\.\d+$/.test(d) && exists(path71.join(HOST_NVM, d, "node.exe"))).map((d) => d.slice(1)) : [];
+var hostNvmVersions = () => exists(HOST_NVM) ? fs53.readdirSync(HOST_NVM).filter((d) => /^v\d+\.\d+\.\d+$/.test(d) && exists(path70.join(HOST_NVM, d, "node.exe"))).map((d) => d.slice(1)) : [];
 var resolveNode = (spec) => resolveCached("node:" + spec, async () => {
   const exact = spec.replace(/^v/, "");
   if (/^\d+\.\d+\.\d+$/.test(exact)) return exact;
   const releases = await fetchJson("https://nodejs.org/dist/index.json");
   return pickNodeVersion(releases, spec) ?? Promise.reject(new Error('No Node.js release matches "' + spec + '"'));
 });
-var NVM_TEMP = path71.join(NVM_HOME, ".tmp");
+var NVM_TEMP = path70.join(NVM_HOME, ".tmp");
 var nvm = (args) => new Promise((resolve2) => {
-  const child = spawn7(path71.join(NVM_HOME, "nvm.exe"), args, {
+  const child = spawn7(path70.join(NVM_HOME, "nvm.exe"), args, {
     windowsHide: true,
     env: { ...process.env, NVM_HOME, NVM_SYMLINK, TEMP: NVM_TEMP, TMP: NVM_TEMP }
   });
@@ -33667,12 +33912,12 @@ var nvm = (args) => new Promise((resolve2) => {
   child.once("close", () => resolve2(out));
 });
 var ensureNvm = async () => {
-  if (exists(path71.join(NVM_HOME, "nvm.exe"))) return;
-  if (exists(path71.join(HOST_NVM, "nvm.exe"))) {
+  if (exists(path70.join(NVM_HOME, "nvm.exe"))) return;
+  if (exists(path70.join(HOST_NVM, "nvm.exe"))) {
     log("Copying nvm from this PC ...");
     mkdirp(NVM_HOME);
-    const files = fs54.readdirSync(HOST_NVM).filter((f) => /\.(exe|cmd|vbs)$/i.test(f)).sort((a, b) => Number(a.toLowerCase() === "nvm.exe") - Number(b.toLowerCase() === "nvm.exe"));
-    for (const file3 of files) fs54.copyFileSync(path71.join(HOST_NVM, file3), path71.join(NVM_HOME, file3));
+    const files = fs53.readdirSync(HOST_NVM).filter((f) => /\.(exe|cmd|vbs)$/i.test(f)).sort((a, b) => Number(a.toLowerCase() === "nvm.exe") - Number(b.toLowerCase() === "nvm.exe"));
+    for (const file3 of files) fs53.copyFileSync(path70.join(HOST_NVM, file3), path70.join(NVM_HOME, file3));
     return;
   }
   const asset = await githubAsset("coreybutler/nvm-windows", /^nvm-noinstall\.zip$/, true);
@@ -33680,14 +33925,14 @@ var ensureNvm = async () => {
   await downloader.archive(asset.url, NVM_HOME, { sha256: asset.sha256, locate: "nvm.exe", fileName: asset.name });
 };
 var hostNodeFolder = (version2) => {
-  const dir = path71.join(hostToolsDir, "node");
-  return session.hostTools.nodeVersion?.replace(/^v/, "") === version2 && exists(path71.join(dir, "node.exe")) ? dir : null;
+  const dir = path70.join(hostToolsDir, "node");
+  return session.hostTools.nodeVersion?.replace(/^v/, "") === version2 && exists(path70.join(dir, "node.exe")) ? dir : null;
 };
 var installNodeVersion = async (version2) => {
-  const dir = path71.join(NVM_HOME, "v" + version2);
-  const fromHost = path71.join(HOST_NVM, "v" + version2);
-  if (exists(path71.join(dir, "node.exe"))) return;
-  if (exists(path71.join(fromHost, "node.exe"))) {
+  const dir = path70.join(NVM_HOME, "v" + version2);
+  const fromHost = path70.join(HOST_NVM, "v" + version2);
+  if (exists(path70.join(dir, "node.exe"))) return;
+  if (exists(path70.join(fromHost, "node.exe"))) {
     log("Copying Node " + version2 + " from this PC's nvm (without global packages) ...");
     copyNode(fromHost, dir);
     return;
@@ -33706,19 +33951,19 @@ var installNodeVersion = async (version2) => {
   } finally {
     safeRemove(NVM_TEMP, NVM_HOME);
   }
-  if (!exists(path71.join(dir, "node.exe"))) {
+  if (!exists(path70.join(dir, "node.exe"))) {
     const tail = out.trim().split(/\r?\n/).filter(Boolean).slice(-3).join(" ");
     const why = /complete/i.test(out) ? "nvm said it finished, but its move into the data folder did not happen" : "nvm could not download or unpack it: check the internet connection and the free disk space";
     throw new Error(
-      "nvm install " + version2 + " did not leave " + path71.join(dir, "node.exe") + " (" + why + ")" + (tail ? ". nvm printed: " + tail : "")
+      "nvm install " + version2 + " did not leave " + path70.join(dir, "node.exe") + " (" + why + ")" + (tail ? ". nvm printed: " + tail : "")
     );
   }
 };
 var activate = async (version2) => {
   await nvm(["use", version2]);
-  if (exists(path71.join(NVM_SYMLINK, "node.exe"))) return;
-  fs54.rmSync(NVM_SYMLINK, { recursive: true, force: true });
-  fs54.symlinkSync(path71.join(NVM_HOME, "v" + version2), NVM_SYMLINK, "junction");
+  if (exists(path70.join(NVM_SYMLINK, "node.exe"))) return;
+  fs53.rmSync(NVM_SYMLINK, { recursive: true, force: true });
+  fs53.symlinkSync(path70.join(NVM_HOME, "v" + version2), NVM_SYMLINK, "junction");
 };
 var PLAYWRIGHT_VARS = () => ({
   PLAYWRIGHT_BROWSERS_PATH: tool("ms-playwright"),
@@ -33730,8 +33975,8 @@ async function setupNode(env, versions, config2) {
     return;
   }
   await ensureNvm();
-  fs54.writeFileSync(
-    path71.join(NVM_HOME, "settings.txt"),
+  fs53.writeFileSync(
+    path70.join(NVM_HOME, "settings.txt"),
     [
       "root: " + NVM_HOME,
       "path: " + NVM_SYMLINK,
@@ -33758,7 +34003,7 @@ async function setupNode(env, versions, config2) {
     }
   }
   Object.assign(env.vars, { NVM_HOME, NVM_SYMLINK, ...PLAYWRIGHT_VARS() });
-  if (duringSession()) env.prepend.push(path71.join(NVM_HOME, "v" + main), NVM_HOME, NVM_SYMLINK);
+  if (duringSession()) env.prepend.push(path70.join(NVM_HOME, "v" + main), NVM_HOME, NVM_SYMLINK);
   else {
     await activate(main);
     env.prepend.push(NVM_HOME, NVM_SYMLINK);
@@ -33768,13 +34013,13 @@ async function setupNode(env, versions, config2) {
   await packageManagers(env, config2, main);
 }
 var packageManagers = async (env, config2, version2) => {
-  const dir = path71.join(NVM_HOME, "v" + version2);
-  const nodeEnv = { ...process.env, PATH: dir + path71.delimiter + (process.env.PATH ?? "") };
-  const npm = (args) => execHeavy(path71.join(dir, "node.exe"), [path71.join(dir, "node_modules", "npm", "bin", "npm-cli.js"), ...args], {
+  const dir = path70.join(NVM_HOME, "v" + version2);
+  const nodeEnv = { ...process.env, PATH: dir + path70.delimiter + (process.env.PATH ?? "") };
+  const npm = (args) => execHeavy(path70.join(dir, "node.exe"), [path70.join(dir, "node_modules", "npm", "bin", "npm-cli.js"), ...args], {
     env: nodeEnv,
     stdio: "ignore"
   });
-  const corepackJs = path71.join(dir, "node_modules", "corepack", "dist", "corepack.js");
+  const corepackJs = path70.join(dir, "node_modules", "corepack", "dist", "corepack.js");
   const extra = config2.corepack && !exists(corepackJs) ? ["corepack"] : [];
   await installOnce(
     env,
@@ -33795,7 +34040,7 @@ var packageManagers = async (env, config2, version2) => {
   }
   try {
     await execHeavy(
-      path71.join(dir, "node.exe"),
+      path70.join(dir, "node.exe"),
       [corepackJs, "enable", "--install-directory", mkdirp(tool("bin")), "pnpm", "yarn"],
       { env: nodeEnv, stdio: "ignore" }
     );
@@ -33820,8 +34065,8 @@ async function setupPwsh(env, refresh = false) {
 }
 
 // src/guest/toolchains/languages/python.ts
-import fs55 from "node:fs";
-import path72 from "node:path";
+import fs54 from "node:fs";
+import path71 from "node:path";
 var installPython = async (pkg, spec) => {
   const version2 = await resolveCached(pkg + ":" + spec, async () => {
     const { versions } = await fetchJson(
@@ -33830,7 +34075,7 @@ var installPython = async (pkg, spec) => {
     return pickPackageVersion(versions, spec) ?? Promise.reject(new Error("No " + pkg + ' release matches "' + spec + '"'));
   });
   const dir = tool("python", pkg + "-" + version2);
-  const exe = path72.join(dir, "python.exe");
+  const exe = path71.join(dir, "python.exe");
   if (!exists(exe)) {
     log("Downloading Python " + version2 + (pkg === "python2" ? " (Python 2, " : " (") + "~30 MB once) ...");
     await downloader.archive(
@@ -33839,32 +34084,32 @@ var installPython = async (pkg, spec) => {
       { locate: "python.exe", fileName: pkg + "." + version2 + ".zip" }
     );
   }
-  if (!exists(path72.join(dir, "Scripts", "pip.exe")) && !exists(path72.join(dir, "Scripts", "pip2.exe")))
+  if (!exists(path71.join(dir, "Scripts", "pip.exe")) && !exists(path71.join(dir, "Scripts", "pip2.exe")))
     await execAsync(exe, ["-m", "ensurepip", "--default-pip"], { stdio: "ignore" });
   return dir;
 };
-var shimDir = (dir) => duringSession() ? tool("shims", path72.basename(dir)) : tool("shims");
+var shimDir = (dir) => duringSession() ? tool("shims", path71.basename(dir)) : tool("shims");
 var shim = (folder, name, program, args = []) => {
   const fixed = [program, ...args];
-  fs55.writeFileSync(
-    path72.join(mkdirp(folder), name + ".cmd"),
+  fs54.writeFileSync(
+    path71.join(mkdirp(folder), name + ".cmd"),
     "@echo off\r\n" + fixed.map((a) => '"' + a + '"').join(" ") + " %*\r\n"
   );
   const sh = fixed.map((a) => "'" + a.replace(/\\/g, "/").replace(/'/g, "'\\''") + "'").join(" ");
-  fs55.writeFileSync(path72.join(folder, name), "#!/bin/sh\nexec " + sh + ' "$@"\n');
+  fs54.writeFileSync(path71.join(folder, name), "#!/bin/sh\nexec " + sh + ' "$@"\n');
 };
 var shimPair = (folder, version2, dir) => {
-  const python = path72.join(dir, "python.exe");
+  const python = path71.join(dir, "python.exe");
   shim(folder, "python" + version2, python);
   shim(folder, "pip" + version2, python, ["-m", "pip"]);
 };
 var pyLauncher = (folder, py3, py2) => {
-  const script = path72.join(mkdirp(folder), "py-launcher.py");
-  fs55.writeFileSync(
+  const script = path71.join(mkdirp(folder), "py-launcher.py");
+  fs54.writeFileSync(
     script,
     [
       "import subprocess, sys",
-      "PY3, PY2 = " + JSON.stringify(path72.join(py3, "python.exe")) + ", " + JSON.stringify(py2 ? path72.join(py2, "python.exe") : null),
+      "PY3, PY2 = " + JSON.stringify(path71.join(py3, "python.exe")) + ", " + JSON.stringify(py2 ? path71.join(py2, "python.exe") : null),
       "args = sys.argv[1:]",
       "exe = PY3",
       "if args and args[0].startswith('-2'):",
@@ -33876,7 +34121,7 @@ var pyLauncher = (folder, py3, py2) => {
       ""
     ].join("\n")
   );
-  shim(folder, "py", path72.join(py3, "python.exe"), [script]);
+  shim(folder, "py", path71.join(py3, "python.exe"), [script]);
 };
 async function setupPython(env, config2, versions) {
   if (dryRun) {
@@ -33886,10 +34131,10 @@ async function setupPython(env, config2, versions) {
   const py3 = await installPython("python", versions.python.spec);
   const shims = shimDir(py3);
   shimPair(shims, "3", py3);
-  env.prepend.push(py3, mkdirp(path72.join(py3, "Scripts")), shims);
+  env.prepend.push(py3, mkdirp(path71.join(py3, "Scripts")), shims);
   env.vars.PYTHONIOENCODING = "utf-8";
   env.summary.push(
-    "python: " + path72.basename(py3).replace("python-", "") + " (from " + versions.python.source + "; py works too)"
+    "python: " + path71.basename(py3).replace("python-", "") + " (from " + versions.python.source + "; py works too)"
   );
   if (!config2.python2) {
     pyLauncher(shims, py3, null);
@@ -33898,22 +34143,22 @@ async function setupPython(env, config2, versions) {
   const py2 = await installPython("python2", "2.7");
   shimPair(shims, "2", py2);
   pyLauncher(shims, py3, py2);
-  env.summary.push("python2: " + path72.basename(py2).replace("python2-", ""));
+  env.summary.push("python2: " + path71.basename(py2).replace("python2-", ""));
 }
 
 // src/guest/toolchains/languages/php.ts
-import fs57 from "node:fs";
-import path74 from "node:path";
-
-// src/guest/toolchains/native/vcruntime.ts
 import fs56 from "node:fs";
 import path73 from "node:path";
+
+// src/guest/toolchains/native/vcruntime.ts
+import fs55 from "node:fs";
+import path72 from "node:path";
 var VC_REDIST = "https://aka.ms/vs/17/release/vc_redist.x64.exe";
 var OK_EXIT_CODES2 = [0, 1638, 3010];
 async function fetchVcRuntime() {
-  const system322 = path73.join(process.env.WINDIR ?? "C:\\Windows", "System32");
+  const system322 = path72.join(process.env.WINDIR ?? "C:\\Windows", "System32");
   const installer2 = tool("vcredist", "vc_redist.x64.exe");
-  if (exists(installer2) || exists(path73.join(system322, "vcruntime140.dll"))) return;
+  if (exists(installer2) || exists(path72.join(system322, "vcruntime140.dll"))) return;
   await downloadFile(VC_REDIST, installer2);
 }
 async function setupVcRuntime(env, summary = true) {
@@ -33921,8 +34166,8 @@ async function setupVcRuntime(env, summary = true) {
     log("(dry run) would install the Visual C++ runtime");
     return false;
   }
-  const system322 = path73.join(process.env.WINDIR ?? "C:\\Windows", "System32");
-  const missing = !exists(path73.join(system322, "vcruntime140.dll")) || !exists(path73.join(system322, "msvcp140.dll"));
+  const system322 = path72.join(process.env.WINDIR ?? "C:\\Windows", "System32");
+  const missing = !exists(path72.join(system322, "vcruntime140.dll")) || !exists(path72.join(system322, "msvcp140.dll"));
   if (missing) {
     const installer2 = tool("vcredist", "vc_redist.x64.exe");
     if (!exists(installer2)) {
@@ -33930,12 +34175,12 @@ async function setupVcRuntime(env, summary = true) {
       await downloadFile(VC_REDIST, installer2);
     }
     if (!signedBy(installer2, SIGNERS.microsoft)) {
-      fs56.rmSync(installer2, { force: true });
+      fs55.rmSync(installer2, { force: true });
       throw new Error("vc_redist.x64.exe is not signed by Microsoft; deleted it (it is downloaded again next boot)");
     }
     log("Installing the Visual C++ runtime ...");
     const code = await runInstaller(installer2, ["/install", "/quiet", "/norestart"]);
-    if (!OK_EXIT_CODES2.includes(code ?? -1) || !exists(path73.join(system322, "vcruntime140.dll")))
+    if (!OK_EXIT_CODES2.includes(code ?? -1) || !exists(path72.join(system322, "vcruntime140.dll")))
       throw new Error("the Visual C++ runtime installer failed (exit " + code + ")");
   }
   if (summary) env.summary.push("vc++ runtime: installed");
@@ -33973,16 +34218,16 @@ var phpBuild = async (spec) => {
   return { version: release.version, ...build.zip };
 };
 var writePhpIni = (home) => {
-  const ini = path74.join(home, "php.ini");
-  if (exists(ini) || !exists(path74.join(home, "php.ini-development"))) return;
-  let text = fs57.readFileSync(path74.join(home, "php.ini-development"), "utf8").replace(/^;\s*extension_dir\s*=\s*"ext"/m, 'extension_dir = "' + path74.join(home, "ext") + '"');
-  for (const ext of PHP_EXTENSIONS.filter((e) => exists(path74.join(home, "ext", "php_" + e + ".dll"))))
+  const ini = path73.join(home, "php.ini");
+  if (exists(ini) || !exists(path73.join(home, "php.ini-development"))) return;
+  let text = fs56.readFileSync(path73.join(home, "php.ini-development"), "utf8").replace(/^;\s*extension_dir\s*=\s*"ext"/m, 'extension_dir = "' + path73.join(home, "ext") + '"');
+  for (const ext of PHP_EXTENSIONS.filter((e) => exists(path73.join(home, "ext", "php_" + e + ".dll"))))
     text = text.replace(new RegExp("^;(extension=" + ext + ")\\s*$", "m"), "$1");
-  fs57.writeFileSync(ini + ".tmp", text);
-  fs57.renameSync(ini + ".tmp", ini);
+  fs56.writeFileSync(ini + ".tmp", text);
+  fs56.renameSync(ini + ".tmp", ini);
 };
 var shim2 = (env, name, command) => {
-  fs57.writeFileSync(path74.join(mkdirp(tool("shims")), name + ".cmd"), "@echo off\r\n" + command + " %*\r\n");
+  fs56.writeFileSync(path73.join(mkdirp(tool("shims")), name + ".cmd"), "@echo off\r\n" + command + " %*\r\n");
   env.prepend.push(tool("shims"));
 };
 var setupComposer = async (env, php) => {
@@ -33994,18 +34239,18 @@ var setupComposer = async (env, php) => {
   }
   const composerHome = tool("composer-home");
   env.vars.COMPOSER_HOME = composerHome;
-  env.prepend.push(path74.join(composerHome, "vendor", "bin"));
+  env.prepend.push(path73.join(composerHome, "vendor", "bin"));
   shim2(env, "composer", '"' + php + '" "' + phar + '"');
   env.summary.push(
     "composer: " + (/\d+\.\d+\.\d+/.exec(execOutput(php, [phar, "--version", "--no-ansi"]))?.[0] ?? "installed")
   );
 };
 var PHP_RELEASES = "https://windows.php.net/downloads/releases/";
-var phpCache = (zip) => tool("downloads", "php-" + path74.basename(zip));
+var phpCache = (zip) => tool("downloads", "php-" + path73.basename(zip));
 async function fetchPhp(config2) {
   const spec = versionFromFiles([".php-version"]) ?? { spec: config2.version, source: "config" };
   const version2 = await resolveCached("php:" + spec.spec, async () => (await phpBuild(spec.spec)).version);
-  if (exists(path74.join(tool("php", version2), "php.exe"))) return;
+  if (exists(path73.join(tool("php", version2), "php.exe"))) return;
   const build = await phpBuild(version2);
   await downloader.file(PHP_RELEASES + build.path, phpCache(build.path), build.sha256);
 }
@@ -34018,7 +34263,7 @@ async function setupPhp(env, config2) {
   await setupVcRuntime(env, false);
   const version2 = await resolveCached("php:" + wantedSpec.spec, async () => (await phpBuild(wantedSpec.spec)).version);
   const home = tool("php", version2);
-  if (!exists(path74.join(home, "php.exe"))) {
+  if (!exists(path73.join(home, "php.exe"))) {
     const build = await phpBuild(version2);
     log("Downloading PHP " + version2 + " (~30 MB once) ...");
     await downloader.archive(PHP_RELEASES + build.path, home, {
@@ -34031,11 +34276,11 @@ async function setupPhp(env, config2) {
   writePhpIni(home);
   env.prepend.push(home);
   env.summary.push("php: " + version2 + " (from " + wantedSpec.source + ")");
-  if (config2.composer) await setupComposer(env, path74.join(home, "php.exe"));
+  if (config2.composer) await setupComposer(env, path73.join(home, "php.exe"));
 }
 
 // src/guest/toolchains/languages/ruby.ts
-import path75 from "node:path";
+import path74 from "node:path";
 var RUBY_ASSET = /^rubyinstaller-(\d+\.\d+\.\d+)-(\d+)-x64\.7z$/;
 var buildNumber = (asset) => Number(RUBY_ASSET.exec(asset.name)?.[2] ?? 0);
 var rubyBuilds = async () => {
@@ -34063,7 +34308,7 @@ async function setupRuby(env, config2) {
     async () => pickPackageVersion([...(await rubyBuilds()).keys()], wantedSpec.spec) ?? Promise.reject(new Error('No RubyInstaller build matches "' + wantedSpec.spec + '"'))
   );
   const home = tool("ruby", version2);
-  if (!exists(path75.join(home, "bin", "ruby.exe"))) {
+  if (!exists(path74.join(home, "bin", "ruby.exe"))) {
     const asset = (await rubyBuilds()).get(version2);
     if (!asset) throw new Error("RubyInstaller " + version2 + " is no longer published");
     log("Downloading Ruby " + version2 + " (~100 MB once) ...");
@@ -34076,11 +34321,11 @@ async function setupRuby(env, config2) {
   }
   const gems = tool("ruby-gems", version2.split(".").slice(0, 2).join("."));
   Object.assign(env.vars, { GEM_HOME: gems, BUNDLE_USER_HOME: tool("bundle-home") });
-  env.prepend.push(path75.join(home, "bin"), path75.join(gems, "bin"));
+  env.prepend.push(path74.join(home, "bin"), path74.join(gems, "bin"));
   env.summary.push(
-    "ruby: " + versionOf(path75.join(home, "bin", "ruby.exe")) + " (from " + wantedSpec.source + "; gems with C extensions need MSYS2, not included)"
+    "ruby: " + versionOf(path74.join(home, "bin", "ruby.exe")) + " (from " + wantedSpec.source + "; gems with C extensions need MSYS2, not included)"
   );
-  const gem = path75.join(home, "bin", "gem.cmd");
+  const gem = path74.join(home, "bin", "gem.cmd");
   await installOnce(
     env,
     "gem@" + version2,
@@ -34092,9 +34337,9 @@ async function setupRuby(env, config2) {
 }
 
 // src/guest/toolchains/tools/vscode.ts
-import fs58 from "node:fs";
+import fs57 from "node:fs";
 import os11 from "node:os";
-import path76 from "node:path";
+import path75 from "node:path";
 
 // node_modules/jsonc-parser/lib/esm/impl/scanner.js
 var CharacterCodes;
@@ -34274,14 +34519,14 @@ var ParseErrorCode;
 var VERSION_MARKER = ".agent-sandbox-version";
 var desktopShortcut = (exe) => {
   if (!isWin) return;
-  const link = path76.join(os11.homedir(), "Desktop", "Visual Studio Code.lnk");
+  const link = path75.join(os11.homedir(), "Desktop", "Visual Studio Code.lnk");
   runScriptWithJson("new-shortcuts.ps1", "ListFile", [
     { link, target: exe, arguments: '"' + (process.env.AGENT_WORKSPACE ?? "") + '"' }
   ]);
 };
 async function setupVscode(env, refresh) {
   const root = tool("vscode");
-  const exe = path76.join(root, "Code.exe");
+  const exe = path75.join(root, "Code.exe");
   if (dryRun) {
     log("(dry run) would provision VS Code");
     return;
@@ -34291,11 +34536,11 @@ async function setupVscode(env, refresh) {
       "https://update.code.visualstudio.com/api/update/win32-" + (arch === "arm64" ? "arm64" : "x64") + "-archive/stable/latest"
     );
     log("Downloading VS Code " + release.productVersion + " (~150 MB once) ...");
-    const keep = path76.join(root, "data");
+    const keep = path75.join(root, "data");
     const parked = root + "-data";
     if (exists(keep)) {
-      fs58.rmSync(parked, { recursive: true, force: true });
-      fs58.renameSync(keep, parked);
+      fs57.rmSync(parked, { recursive: true, force: true });
+      fs57.renameSync(keep, parked);
     }
     try {
       await downloader.archive(release.url, root, {
@@ -34303,77 +34548,77 @@ async function setupVscode(env, refresh) {
         locate: "Code.exe",
         fileName: "vscode.zip"
       });
-      fs58.writeFileSync(path76.join(root, VERSION_MARKER), release.productVersion);
+      fs57.writeFileSync(path75.join(root, VERSION_MARKER), release.productVersion);
     } finally {
       if (exists(parked)) {
         mkdirp(root);
-        fs58.rmSync(keep, { recursive: true, force: true });
-        fs58.renameSync(parked, keep);
+        fs57.rmSync(keep, { recursive: true, force: true });
+        fs57.renameSync(parked, keep);
       }
     }
   }
-  mkdirp(path76.join(root, "data"));
-  env.prepend.push(path76.join(root, "bin"));
+  mkdirp(path75.join(root, "data"));
+  env.prepend.push(path75.join(root, "bin"));
   desktopShortcut(exe);
-  const version2 = exists(path76.join(root, VERSION_MARKER)) ? fs58.readFileSync(path76.join(root, VERSION_MARKER), "utf8").trim() : "installed";
+  const version2 = exists(path75.join(root, VERSION_MARKER)) ? fs57.readFileSync(path75.join(root, VERSION_MARKER), "utf8").trim() : "installed";
   env.summary.push("vscode: " + version2 + " (portable; run code . or use the desktop shortcut)");
 }
 
 // src/guest/toolchains/steam/steam.ts
-import fs61 from "node:fs";
-import path80 from "node:path";
+import fs60 from "node:fs";
+import path79 from "node:path";
 
 // src/guest/toolchains/steam/client.ts
-import fs59 from "node:fs";
-import path78 from "node:path";
+import fs58 from "node:fs";
+import path77 from "node:path";
 
 // src/guest/toolchains/steam/commands.ts
-import path77 from "node:path";
+import path76 from "node:path";
 var STEAMCMD_DIR = "C:\\SteamCMD";
 var STEAMCMD_URL = "https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip";
 var STEAM_CLIENT_URL = "https://steamcdn-a.akamaihd.net/client/installer/SteamSetup.exe";
 function steamCmdStore(tools = toolsDir) {
-  return path77.join(tools, "steamcmd");
+  return path76.join(tools, "steamcmd");
 }
 function steamClientDir(tools = toolsDir) {
-  return path77.join(tools, "steam");
+  return path76.join(tools, "steam");
 }
 var MAX_SCRIPT_BYTES = 256 * 1024;
 
 // src/guest/toolchains/steam/client.ts
-var GB2 = 1024 ** 3;
-var CLIENT_NEED_BYTES = 2 * GB2;
+var GB3 = 1024 ** 3;
+var CLIENT_NEED_BYTES = 2 * GB3;
 var SETUP_TIMEOUT_MS = 10 * 60 * 1e3;
 function installedSteamClient() {
-  const exe = path78.join(steamClientDir(), "steam.exe");
+  const exe = path77.join(steamClientDir(), "steam.exe");
   return exists(exe) && signedBy(exe, SIGNERS.valve) ? exe : null;
 }
 async function installSteamClient() {
   const dir = steamClientDir();
-  const exe = path78.join(dir, "steam.exe");
+  const exe = path77.join(dir, "steam.exe");
   if (exists(exe)) {
     if (!signedBy(exe, SIGNERS.valve)) throw new Error("tools\\steam\\steam.exe is not signed by Valve");
     return exe;
   }
-  fs59.mkdirSync(toolsDir, { recursive: true });
+  fs58.mkdirSync(toolsDir, { recursive: true });
   assertRoom(toolsDir, CLIENT_NEED_BYTES, "the Steam client", "Free room on the data disk.");
   const setup = await signedInstaller(
     STEAM_CLIENT_URL,
-    path78.join(tool("steam-setup"), "SteamSetup.exe"),
+    path77.join(tool("steam-setup"), "SteamSetup.exe"),
     "the Steam client installer (~2 MB once)",
     SIGNERS.valve
   );
   const work = stagingFolder(dir);
-  fs59.mkdirSync(work, { recursive: true });
+  fs58.mkdirSync(work, { recursive: true });
   try {
     log("Unpacking the Steam client into tools\\steam ...");
     const code = await heavy.run(() => spawnAsync(setup, ["/S", "/D=" + work], { timeout: SETUP_TIMEOUT_MS }));
-    const unpacked = path78.join(work, "steam.exe");
+    const unpacked = path77.join(work, "steam.exe");
     if (!exists(unpacked)) throw new Error("SteamSetup.exe did not unpack steam.exe (exit code " + code + ")");
     if (!signedBy(unpacked, SIGNERS.valve)) throw new Error("the unpacked steam.exe is not signed by Valve");
     moveIntoPlace(work, dir);
   } finally {
-    if (fs59.existsSync(work)) safeRemove(work, path78.dirname(work));
+    if (fs58.existsSync(work)) safeRemove(work, path77.dirname(work));
   }
   return exe;
 }
@@ -34391,8 +34636,8 @@ async function ensureSteamClient(env) {
 
 // src/guest/toolchains/steam/steamcmd-install.ts
 import { spawn as spawn8 } from "node:child_process";
-import fs60 from "node:fs";
-import path79 from "node:path";
+import fs59 from "node:fs";
+import path78 from "node:path";
 var MB = 1024 ** 2;
 var STEAMCMD_NEED_BYTES = 600 * MB;
 var STEAMCMD_UPDATE_TIMEOUT_MS = 15 * 60 * 1e3;
@@ -34417,41 +34662,41 @@ function runWithTimeout(exe, args, cwd, timeoutMs) {
     });
   });
 }
-var notSigned = (file3) => new Error(path79.basename(file3) + " is not signed by Valve: not running it (it is downloaded again next boot)");
+var notSigned = (file3) => new Error(path78.basename(file3) + " is not signed by Valve: not running it (it is downloaded again next boot)");
 async function fetchSteamCmd(store2, deps) {
-  fs60.mkdirSync(path79.dirname(store2), { recursive: true });
-  assertRoom(path79.dirname(store2), STEAMCMD_NEED_BYTES, "SteamCMD", "Free room on the data disk.", deps);
+  fs59.mkdirSync(path78.dirname(store2), { recursive: true });
+  assertRoom(path78.dirname(store2), STEAMCMD_NEED_BYTES, "SteamCMD", "Free room on the data disk.", deps);
   const work = stagingFolder(store2);
-  const unpacked = path79.join(work, "x");
+  const unpacked = path78.join(work, "x");
   const extract2 = deps.extract ?? extractArchive;
   try {
-    fs60.mkdirSync(work, { recursive: true });
+    fs59.mkdirSync(work, { recursive: true });
     const verify = async (part) => {
       await extract2(part, unpacked);
-      const exe = path79.join(unpacked, "steamcmd.exe");
-      if (!fs60.existsSync(exe)) throw new Error("steamcmd.zip has no steamcmd.exe");
+      const exe = path78.join(unpacked, "steamcmd.exe");
+      if (!fs59.existsSync(exe)) throw new Error("steamcmd.zip has no steamcmd.exe");
       if (!deps.signed(exe)) throw notSigned(exe);
     };
-    const zip = path79.join(work, "steamcmd.zip");
+    const zip = path78.join(work, "steamcmd.zip");
     if (deps.download) await deps.download(STEAMCMD_URL, zip, verify);
     else await downloader.file(STEAMCMD_URL, zip, { verify });
     moveIntoPlace(unpacked, store2);
   } finally {
-    if (fs60.existsSync(work)) safeRemove(work, path79.dirname(work));
+    if (fs59.existsSync(work)) safeRemove(work, path78.dirname(work));
   }
 }
 async function copyBinaries(from, to) {
-  fs60.mkdirSync(to, { recursive: true });
-  for (const entry of fs60.readdirSync(from, { withFileTypes: true })) {
+  fs59.mkdirSync(to, { recursive: true });
+  for (const entry of fs59.readdirSync(from, { withFileTypes: true })) {
     if (isPrivate(entry.name) || entry.isSymbolicLink()) continue;
     if (!entry.isFile() && !entry.isDirectory()) continue;
-    await fs60.promises.cp(path79.join(from, entry.name), path79.join(to, entry.name), {
+    await fs59.promises.cp(path78.join(from, entry.name), path78.join(to, entry.name), {
       recursive: true,
       force: true,
       verbatimSymlinks: true,
       filter: (source) => {
         try {
-          return !fs60.lstatSync(source).isSymbolicLink();
+          return !fs59.lstatSync(source).isSymbolicLink();
         } catch {
           return false;
         }
@@ -34461,41 +34706,41 @@ async function copyBinaries(from, to) {
 }
 function snapshot(dir) {
   try {
-    return fs60.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && !isPrivate(e.name) && /\.(exe|dll)$/i.test(e.name)).map((e) => {
-      const s = fs60.statSync(path79.join(dir, e.name));
+    return fs59.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && !isPrivate(e.name) && /\.(exe|dll)$/i.test(e.name)).map((e) => {
+      const s = fs59.statSync(path78.join(dir, e.name));
       return e.name.toLowerCase() + ":" + s.size + ":" + Math.floor(s.mtimeMs / 1e3);
     }).sort().join("|");
   } catch {
     return "";
   }
 }
-var bootstrapped = (dir) => BOOTSTRAPPED.some((f) => fs60.existsSync(path79.join(dir, f)));
+var bootstrapped = (dir) => BOOTSTRAPPED.some((f) => fs59.existsSync(path78.join(dir, f)));
 function scrubStore(store2) {
   let names = [];
   try {
-    names = fs60.readdirSync(store2);
+    names = fs59.readdirSync(store2);
   } catch {
     return;
   }
-  for (const name of names.filter(isPrivate)) safeRemove(path79.join(store2, name), store2);
+  for (const name of names.filter(isPrivate)) safeRemove(path78.join(store2, name), store2);
 }
 async function prepareSteamCmd(deps) {
   const store2 = deps.storeDir ?? steamCmdStore(deps.toolsDir);
   const work = deps.workDir ?? STEAMCMD_DIR;
   const log2 = deps.log ?? (() => void 0);
-  const exe = path79.join(work, "steamcmd.exe");
-  if (fs60.existsSync(exe) && bootstrapped(work)) {
+  const exe = path78.join(work, "steamcmd.exe");
+  if (fs59.existsSync(exe) && bootstrapped(work)) {
     if (!deps.signed(exe)) throw notSigned(exe);
     return exe;
   }
-  if (!fs60.existsSync(path79.join(store2, "steamcmd.exe"))) {
+  if (!fs59.existsSync(path78.join(store2, "steamcmd.exe"))) {
     log2("Downloading SteamCMD (~3 MB once; it fetches ~300 MB on its first run) ...");
     await fetchSteamCmd(store2, deps);
   }
   scrubStore(store2);
   await copyBinaries(store2, work);
   if (!deps.signed(exe)) {
-    safeRemove(store2, path79.dirname(store2));
+    safeRemove(store2, path78.dirname(store2));
     throw notSigned(exe);
   }
   const before = snapshot(work);
@@ -34516,7 +34761,7 @@ async function prepareSteamCmd(deps) {
       await copyBinaries(work, staging);
       moveIntoPlace(staging, store2);
     } finally {
-      if (fs60.existsSync(staging)) safeRemove(staging, path79.dirname(staging));
+      if (fs59.existsSync(staging)) safeRemove(staging, path78.dirname(staging));
     }
   }
   return exe;
@@ -34535,10 +34780,10 @@ function signedInAs() {
 }
 function sdkFolder(env, setting) {
   if (!setting.trim()) return;
-  const dir = path80.resolve(projectWorkspace(), setting.trim());
+  const dir = path79.resolve(projectWorkspace(), setting.trim());
   let ok = false;
   try {
-    ok = fs61.statSync(dir).isDirectory();
+    ok = fs60.statSync(dir).isDirectory();
   } catch {
   }
   if (!ok) {
@@ -34586,14 +34831,14 @@ async function setupUnity(env, _config, _ctx) {
 }
 
 // src/guest/toolchains/fivem/fivem.ts
-import fs63 from "node:fs";
-import path82 from "node:path";
-
-// src/guest/accounts/kinds/cfx.ts
 import fs62 from "node:fs";
 import path81 from "node:path";
+
+// src/guest/accounts/kinds/cfx.ts
+import fs61 from "node:fs";
+import path80 from "node:path";
 function cfxSecretsFile(dir = secretDir("cfx")) {
-  return path81.join(dir, "server-secrets.cfg");
+  return path80.join(dir, "server-secrets.cfg");
 }
 function cfxSecretsText(p) {
   return [
@@ -34606,8 +34851,8 @@ function cfxSecretsText(p) {
 }
 function writeCfxSecrets(p, dir = secretDir("cfx")) {
   const file3 = cfxSecretsFile(dir);
-  fs62.mkdirSync(dir, { recursive: true });
-  fs62.writeFileSync(file3, cfxSecretsText(p), { encoding: "utf8", mode: 384 });
+  fs61.mkdirSync(dir, { recursive: true });
+  fs61.writeFileSync(file3, cfxSecretsText(p), { encoding: "utf8", mode: 384 });
   return file3;
 }
 var cfxAdapter = {
@@ -34708,25 +34953,25 @@ var SelectionSchema = external_exports.strictObject({
   build: external_exports.number().int().positive()
 });
 function fivemStateDir() {
-  return path82.join(stateDir, "fivem");
+  return path81.join(stateDir, "fivem");
 }
 function txDataDir() {
-  return path82.join(fivemStateDir(), "txData");
+  return path81.join(fivemStateDir(), "txData");
 }
-var selectionFile = () => path82.join(fivemStateDir(), "artifact.json");
+var selectionFile = () => path81.join(fivemStateDir(), "artifact.json");
 function artifactDir(build) {
-  return path82.join(toolsDir, ...ARTIFACTS_NAME.split("/"), String(build));
+  return path81.join(toolsDir, ...ARTIFACTS_NAME.split("/"), String(build));
 }
 function secretsCfg() {
   const file3 = cfxSecretsFile();
-  return fs63.existsSync(file3) ? file3 : null;
+  return fs62.existsSync(file3) ? file3 : null;
 }
 function chosenArtifact(setting) {
   const picked = readValid(SelectionSchema, selectionFile());
   return picked ? { setting: picked.artifact, chosen: true, build: picked.build } : { setting, chosen: false, build: null };
 }
 function installedBuilds() {
-  return installRecords().filter((r) => r.name === ARTIFACTS_NAME && /^\d+$/.test(r.version)).map((r) => Number(r.version)).filter((b) => fs63.existsSync(path82.join(artifactDir(b), "FXServer.exe"))).sort((a, b) => b - a);
+  return installRecords().filter((r) => r.name === ARTIFACTS_NAME && /^\d+$/.test(r.version)).map((r) => Number(r.version)).filter((b) => fs62.existsSync(path81.join(artifactDir(b), "FXServer.exe"))).sort((a, b) => b - a);
 }
 async function resolveArtifact(setting, live = false) {
   const want = artifactSetting(setting);
@@ -34748,12 +34993,12 @@ async function resolveArtifact(setting, live = false) {
   }
 }
 async function installBuild(a, staging, temp) {
-  const zip = path82.join(temp, "server.zip");
-  const check2 = path82.join(temp, "check");
+  const zip = path81.join(temp, "server.zip");
+  const check2 = path81.join(temp, "check");
   const verify = async (file3) => {
     await extractArchive(file3, check2, ["FXServer.exe"]);
-    const exe2 = path82.join(check2, "FXServer.exe");
-    if (artifactTrust(true, fs63.existsSync(exe2) ? signatureOf(exe2)?.subject ?? "" : "") !== "signed")
+    const exe2 = path81.join(check2, "FXServer.exe");
+    if (artifactTrust(true, fs62.existsSync(exe2) ? signatureOf(exe2)?.subject ?? "" : "") !== "signed")
       throw new Error(
         "FXServer build " + a.build + ": FXServer.exe is not validly signed by Rockstar Games, and downloads.requireChecksum is on (Cfx.re publishes no checksums)"
       );
@@ -34762,9 +35007,9 @@ async function installBuild(a, staging, temp) {
   log("Downloading FXServer build " + a.build + " (~65 MB once) ...");
   await downloader.file(a.url, zip, downloader.requireChecksum ? { verify } : null);
   await extractArchive(zip, staging);
-  fs63.rmSync(zip, { force: true });
-  const exe = path82.join(staging, "FXServer.exe");
-  const trust = artifactTrust(downloader.requireChecksum, fs63.existsSync(exe) ? signatureOf(exe)?.subject ?? "" : "");
+  fs62.rmSync(zip, { force: true });
+  const exe = path81.join(staging, "FXServer.exe");
+  const trust = artifactTrust(downloader.requireChecksum, fs62.existsSync(exe) ? signatureOf(exe)?.subject ?? "" : "");
   if (trust === "refused") throw new Error("FXServer build " + a.build + " is not validly signed; not using it");
   if (trust === "unsigned-allowed")
     warn(
@@ -34794,7 +35039,7 @@ async function setupFivem(env, config2, _ctx) {
   }
   const artifact = await resolveArtifact(setting);
   const installed = await installArtifact(artifact, config2.keepVersions);
-  fs63.mkdirSync(txDataDir(), { recursive: true });
+  fs62.mkdirSync(txDataDir(), { recursive: true });
   env.vars.FXSERVER_DIR = installed.dir;
   env.vars.FIVEM_GAME = config2.game;
   env.summary.push(
@@ -34828,9 +35073,9 @@ async function setupKotlin(env, _ctx) {
 }
 
 // src/guest/toolchains/native/rust-extras.ts
-import fs64 from "node:fs";
+import fs63 from "node:fs";
 import os12 from "node:os";
-import path83 from "node:path";
+import path82 from "node:path";
 
 // src/shared/memory/policy.ts
 var DIAL_STEPS = {
@@ -35085,11 +35330,11 @@ function decide(prev, sample, nowMs, profile, maxCompilers2 = null) {
   const cpuRate = DIAL_CPU_RATE[step] ?? 100;
   if (cpuRate !== prev.cpuRate) actions.push({ kind: "cpu", percent: cpuRate });
   const heavy2 = sample.procs.filter((p) => isHeavyCompiler(p.name)).sort((a, b) => a.pid - b.pid);
-  let allowed = compilersAllowed(step, heavy2.length);
-  if (maxCompilers2 !== null && step >= 1) allowed = Math.min(allowed, Math.max(1, maxCompilers2));
+  let allowed2 = compilersAllowed(step, heavy2.length);
+  if (maxCompilers2 !== null && step >= 1) allowed2 = Math.min(allowed2, Math.max(1, maxCompilers2));
   const turn = heavy2.length > 0 ? Math.floor(nowMs / ROTATE_MS) % heavy2.length : 0;
   const order = [...heavy2.slice(turn), ...heavy2.slice(0, turn)];
-  let waiting = order.slice(Math.min(allowed, order.length));
+  let waiting = order.slice(Math.min(allowed2, order.length));
   if (step >= 2) {
     const waitingPids = new Set(waiting.map((p) => p.pid));
     let linking = 0;
@@ -35148,40 +35393,40 @@ function targetSummary(rust) {
 }
 var cargoTarget = (targetDir) => {
   if (targetDir === "shared" || targetDir === "separate") return null;
-  if (targetDir === "local") return path83.join(localDir, "cargo-target");
+  if (targetDir === "local") return path82.join(localDir, "cargo-target");
   return targetDir;
 };
 function cargoShim(env, rust) {
-  const real = path83.join(tool("rust", "cargo", "bin"), "cargo.exe");
+  const real = path82.join(tool("rust", "cargo", "bin"), "cargo.exe");
   if (rust.targetDir !== "separate" || !exists(real)) return;
   const dir = mkdirp(tool("shims", "cargo"));
-  fs64.copyFileSync(ensureCompiled("cargoshim"), path83.join(dir, "cargo.exe"));
+  fs63.copyFileSync(ensureCompiled("cargoshim"), path82.join(dir, "cargo.exe"));
   env.prepend.unshift(dir);
   env.vars.AGENT_REAL_CARGO = real;
 }
 function linkGate(env, rust, host) {
   const gcc = tool("mingw", "mingw64", "bin", "gcc.exe");
   if (!host.endsWith("-pc-windows-gnu") || !exists(gcc)) return;
-  const gate = path83.join(mkdirp(tool("shims")), "linkgate.exe");
-  fs64.copyFileSync(ensureCompiled("linkgate"), gate);
+  const gate = path82.join(mkdirp(tool("shims")), "linkgate.exe");
+  fs63.copyFileSync(ensureCompiled("linkgate"), gate);
   const slots = rust.linkSlots === "auto" ? linkerSlots(os12.totalmem() / 1024 ** 2, os12.cpus().length) : rust.linkSlots;
   env.vars.AGENT_LINK_SLOTS = String(slots);
   env.vars.AGENT_REAL_LINKER = gcc;
   env.vars.CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER = gate;
   const rustEnv = { ...process.env, RUSTUP_HOME: tool("rust", "rustup"), CARGO_HOME: tool("rust", "cargo") };
   const sysroot = rust.linker === "lld" ? execOutput(tool("rust", "cargo", "bin", "rustc.exe"), ["--print", "sysroot"], { env: rustEnv }) : "";
-  const lld = sysroot ? path83.join(sysroot, "lib", "rustlib", host, "bin", "gcc-ld") : "";
-  if (lld && exists(path83.join(lld, "ld.lld.exe"))) env.vars.AGENT_LLD_DIR = lld;
+  const lld = sysroot ? path82.join(sysroot, "lib", "rustlib", host, "bin", "gcc-ld") : "";
+  if (lld && exists(path82.join(lld, "ld.lld.exe"))) env.vars.AGENT_LLD_DIR = lld;
   env.summary.push(
     "rust linking: " + (env.vars.AGENT_LLD_DIR ? "lld" : "GNU ld") + ", at most " + env.vars.AGENT_LINK_SLOTS + " at once"
   );
 }
 function cargoDefaults(host) {
   const file3 = tool("rust", "cargo", "config.toml");
-  if (exists(file3) || !exists(path83.dirname(file3))) return;
+  if (exists(file3) || !exists(path82.dirname(file3))) return;
   const jobs = cargoJobs(os12.cpus().length, os12.totalmem() / 1024 ** 3, 1);
   const gnu = host.endsWith("-gnu");
-  fs64.writeFileSync(
+  fs63.writeFileSync(
     file3,
     [
       "# Written by windows-development-sandbox once; edit freely, it is never overwritten.",
@@ -35196,7 +35441,7 @@ function rustCaches(rust) {
   const target = cargoTarget(rust.targetDir);
   return {
     ...target ? { CARGO_TARGET_DIR: target } : {},
-    ...process.env.SCCACHE_DIR ? {} : { SCCACHE_DIR: path83.join(dataDir, "cache", "sccache") }
+    ...process.env.SCCACHE_DIR ? {} : { SCCACHE_DIR: path82.join(dataDir, "cache", "sccache") }
   };
 }
 function rustHost(config2) {
@@ -35226,7 +35471,6 @@ function plan(config2, versions, o) {
   const unreal = wanted(config2.unreal.enabled, "unreal");
   const android = wanted(config2.android.enabled, "android");
   const vs = visualStudioWanted(config2, (setting, name) => wanted(setting, name));
-  const autosdk = unrealUsesAutosdk(config2, (setting, name) => wanted(setting, name));
   const ctx = {
     refresh: o.refresh,
     pcInstalls: o.pcInstalls ?? { items: [] },
@@ -35251,33 +35495,30 @@ function plan(config2, versions, o) {
       enabled: wanted(config2.cpp.enabled, "cpp") || wanted(config2.rust.enabled, "rust"),
       install: (env) => setupCpp(env, config2.cpp)
     },
-    // Visual Studio brings MSVC and the real vswhere: the portable MSVC (and its stand-in vswhere) stays out.
+    // Visual Studio brings MSVC and the real vswhere: the portable MSVC (and its stand-in vswhere) stays out. Only the
+    // first install goes to the background: a saved copy is back in seconds, before the agent starts.
     {
       name: "Visual Studio",
       enabled: vs !== null,
       shared: true,
-      background: deferred,
+      background: deferred && !visualStudioSaved(vs),
       ...ahead(() => prefetchVisualStudio(vs)),
       install: async (env) => {
-        await ensureVisualStudio(env, vs, { keepInstallFiles: config2.unreal.keepInstallFiles, lowPriority: deferred });
+        await ensureVisualStudio(env, vs, { lowPriority: deferred });
       }
     },
     {
       name: "Unreal",
       enabled: unreal,
       shared: true,
-      after: ["Visual Studio", "MSVC"],
+      after: ["Visual Studio"],
       ...ahead(() => fetchDirectX(config2.unreal)),
       install: (env) => setupUnreal(env, config2.unreal, ctx)
     },
     {
       name: "MSVC",
-      enabled: (wanted(config2.msvc.enabled, "msvc") || autosdk && config2.msvc.enabled !== false) && vs === null,
-      // The same Visual Studio licence terms, which Unreal's acceptLicense already names.
-      install: (env) => setupMsvc(
-        env,
-        autosdk ? { ...config2.msvc, acceptLicense: config2.msvc.acceptLicense || config2.unreal.acceptLicense } : config2.msvc
-      )
+      enabled: wanted(config2.msvc.enabled, "msvc") && vs === null,
+      install: (env) => setupMsvc(env, config2.msvc)
     },
     // Rust links with MSVC (msvc host) or MinGW's gcc (GNU host): whichever it uses goes first.
     {
@@ -35350,10 +35591,11 @@ function plan(config2, versions, o) {
     },
     { name: "Ruby", enabled: wanted(config2.ruby.enabled, "ruby"), install: (env) => setupRuby(env, config2.ruby) },
     // PHP installs the Visual C++ runtime itself: one installer at a time.
-    // Many apps (bat, delta, Neovim, most GUIs, your own programs) are built against it too.
+    // Many apps (bat, delta, Neovim, most GUIs, your own programs) are built against it too, and so is what Visual
+    // Studio builds: a Visual Studio put back from the data disk does not bring it, as its installer did.
     {
       name: "Visual C++ runtime",
-      enabled: config2.vcRuntime.enabled || apps,
+      enabled: config2.vcRuntime.enabled || apps || vs !== null,
       shared: true,
       ...ahead(fetchVcRuntime),
       install: async (env) => {
@@ -35425,19 +35667,19 @@ function plan(config2, versions, o) {
 // src/guest/toolchains/step-scheduler.ts
 import { AsyncLocalStorage as AsyncLocalStorage4 } from "node:async_hooks";
 var PARALLEL2 = 4;
-async function runReported(sink, name, env, work) {
+async function runReported(sink2, name, env, work) {
   try {
     await work();
   } catch (e) {
-    sink.warn(
+    sink2.warn(
       name + " could not be set up and is skipped; everything else still works, and the next start tries again. Reason: " + errMsg(e)
     );
     env.summary.push(name + ": FAILED");
   }
 }
 var StepScheduler = class {
-  constructor(sink, parallel = PARALLEL2) {
-    this.sink = sink;
+  constructor(sink2, parallel = PARALLEL2) {
+    this.sink = sink2;
     this.parallel = parallel;
   }
   sink;
@@ -35624,7 +35866,7 @@ async function setupToolchains(config2, versions, options, run2 = {}, extras = {
   const have = new Set(steps.map((s) => s.name));
   const installed = installedToolPaths(
     toolsDir,
-    { exists: fs65.existsSync, list: (dir) => fs65.existsSync(dir) ? fs65.readdirSync(dir) : [] },
+    { exists: fs64.existsSync, list: (dir) => fs64.existsSync(dir) ? fs64.readdirSync(dir) : [] },
     /* @__PURE__ */ new Set([...have.has("Python") ? ["python"] : [], ...have.has("Rust") ? ["rust"] : []])
   );
   result.append.push(...installed.append);
@@ -35650,21 +35892,21 @@ function cmdSet(env, names) {
   return names.filter((n) => env[n] !== void 0 && !/[\r\n]/.test(String(env[n]))).map((n) => '@set "' + n + "=" + String(env[n]).replace(/%/g, "%%") + '"');
 }
 function writeShell(spec, env, names) {
-  const dir = mkdirp(path84.join(localDir, "projects", spec.name));
-  fs66.writeFileSync(path84.join(dir, "env.cmd"), [...cmdSet(env, [...names, "PATH"]), ""].join("\r\n"));
-  fs66.writeFileSync(
-    path84.join(dir, "shell.cmd"),
-    ['@call "' + path84.join(dir, "env.cmd") + '"', '@cd /d "' + spec.workspace + '"', "@title " + spec.name, ""].join(
+  const dir = mkdirp(path83.join(localDir, "projects", spec.name));
+  fs65.writeFileSync(path83.join(dir, "env.cmd"), [...cmdSet(env, [...names, "PATH"]), ""].join("\r\n"));
+  fs65.writeFileSync(
+    path83.join(dir, "shell.cmd"),
+    ['@call "' + path83.join(dir, "env.cmd") + '"', '@cd /d "' + spec.workspace + '"', "@title " + spec.name, ""].join(
       "\r\n"
     )
   );
-  const bin = mkdirp(path84.join(localDir, "bin"));
-  fs66.writeFileSync(
-    path84.join(bin, "sbx-shell.cmd"),
+  const bin = mkdirp(path83.join(localDir, "bin"));
+  fs65.writeFileSync(
+    path83.join(bin, "sbx-shell.cmd"),
     [
-      '@if "%~1"=="" (echo Usage: sbx-shell ^<project^>   ^(a terminal in that project with its tools^) & dir /b "' + path84.join(localDir, "projects") + '" & exit /b 2)',
-      '@if not exist "' + path84.join(localDir, "projects") + '\\%~1\\shell.cmd" (echo No project %~1 in this sandbox. & exit /b 2)',
-      '@cmd /k ""' + path84.join(localDir, "projects") + '\\%~1\\shell.cmd""',
+      '@if "%~1"=="" (echo Usage: sbx-shell ^<project^>   ^(a terminal in that project with its tools^) & dir /b "' + path83.join(localDir, "projects") + '" & exit /b 2)',
+      '@if not exist "' + path83.join(localDir, "projects") + '\\%~1\\shell.cmd" (echo No project %~1 in this sandbox. & exit /b 2)',
+      '@cmd /k ""' + path83.join(localDir, "projects") + '\\%~1\\shell.cmd""',
       ""
     ].join("\r\n")
   );
@@ -35722,10 +35964,10 @@ async function setUp(spec, say) {
       }
     )
   );
-  tools.prepend.push(path84.join(localDir, "bin"));
+  tools.prepend.push(path83.join(localDir, "bin"));
   const env = agentEnv(tools, { workspace: spec.workspace, project: spec.name, base });
-  const specFile = path84.join(mkdirp(path84.join(localDir, "projects", spec.name)), "project.json");
-  fs66.writeFileSync(specFile, JSON.stringify(spec));
+  const specFile = path83.join(mkdirp(path83.join(localDir, "projects", spec.name)), "project.json");
+  fs65.writeFileSync(specFile, JSON.stringify(spec));
   env.AGENT_PROJECT_FILE = specFile;
   addMachineEnvironment(tools.vars, [...tools.prepend, ...tools.append], true);
   try {
@@ -35842,8 +36084,8 @@ function execCommand(req) {
 }
 
 // src/guest/daemon/sessions.ts
-import fs73 from "node:fs";
-import path93 from "node:path";
+import fs72 from "node:fs";
+import path92 from "node:path";
 import crypto7 from "node:crypto";
 import os16 from "node:os";
 import { spawn as spawn12 } from "node:child_process";
@@ -35924,7 +36166,7 @@ async function sendControl(endpoint, type) {
 var MAX_CLIPBOARD_STRING = 1024 * 1024;
 
 // src/guest/sessions/cmdline.ts
-import path85 from "node:path";
+import path84 from "node:path";
 var quoted = (arg) => '"' + arg.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\+)$/, "$1$1") + '"';
 function quoteArg(arg) {
   return arg !== "" && !/[\s"]/.test(arg) ? arg : quoted(arg);
@@ -35938,7 +36180,7 @@ function cmdArgs(args) {
   }).join("");
 }
 function commandLine(file3, args) {
-  return path85.win32.basename(file3).toLowerCase() === "cmd.exe" ? [quoteArg(file3), cmdArgs(args)].filter(Boolean).join(" ") : [file3, ...args].map(quoteArg).join(" ");
+  return path84.win32.basename(file3).toLowerCase() === "cmd.exe" ? [quoteArg(file3), cmdArgs(args)].filter(Boolean).join(" ") : [file3, ...args].map(quoteArg).join(" ");
 }
 function shellLaunch(asked, paths) {
   if (asked === "cmd") return { name: "cmd", file: paths.cmd, args: [] };
@@ -35952,8 +36194,8 @@ function shellLaunch(asked, paths) {
 }
 
 // src/guest/sessions/pty-host.ts
-import fs67 from "node:fs";
-import path86 from "node:path";
+import fs66 from "node:fs";
+import path85 from "node:path";
 import { execFile, spawn as spawn10 } from "node:child_process";
 function ensurePtyHost() {
   return ensureCompiled("ptyhost");
@@ -35972,21 +36214,21 @@ async function waitForPtyHost(child, port, timeoutMs) {
   throw new Error("the session host did not start listening on port " + port);
 }
 function ptyHostLog(id) {
-  return path86.join(logsDir, "ptyhost-" + id + ".log");
+  return path85.join(logsDir, "ptyhost-" + id + ".log");
 }
 function ptyHostLogTail(id, lines = 12) {
   try {
-    return fs67.readFileSync(ptyHostLog(id), "utf8").trim().split(/\r?\n/).slice(-lines).join("\n");
+    return fs66.readFileSync(ptyHostLog(id), "utf8").trim().split(/\r?\n/).slice(-lines).join("\n");
   } catch {
     return "";
   }
 }
 var conptyDll = () => {
-  const dll = path86.join(toolsDir, "conpty", "conpty.dll");
-  return session.provisioning.conpty?.enabled !== false && fs67.existsSync(dll) && fs67.existsSync(path86.join(toolsDir, "conpty", "OpenConsole.exe")) ? dll : null;
+  const dll = path85.join(toolsDir, "conpty", "conpty.dll");
+  return session.provisioning.conpty?.enabled !== false && fs66.existsSync(dll) && fs66.existsSync(path85.join(toolsDir, "conpty", "OpenConsole.exe")) ? dll : null;
 };
 function startPtyHost(o) {
-  fs67.mkdirSync(run.treesDir, { recursive: true });
+  fs66.mkdirSync(run.treesDir, { recursive: true });
   const env = {
     ...o.env,
     PTYHOST_BIND: o.remote ? "any" : "loopback",
@@ -36004,13 +36246,13 @@ function startPtyHost(o) {
 var END_TREE_MS = 3e4;
 function endLeftoverTree(id, exe = ensurePtyHost()) {
   const file3 = run.treeFile(id);
-  if (!fs67.existsSync(file3)) return Promise.resolve(null);
+  if (!fs66.existsSync(file3)) return Promise.resolve(null);
   return new Promise((resolve2) => {
     execFile(exe, ["--end-tree", file3], { timeout: END_TREE_MS, windowsHide: true }, (error62, stdout) => {
       const code = error62 ? typeof error62.code === "number" ? error62.code : -1 : 0;
       if (code !== 3)
         try {
-          fs67.rmSync(file3, { force: true });
+          fs66.rmSync(file3, { force: true });
         } catch {
         }
       resolve2(code === 0 ? stdout.trim().slice(0, 200) : code === 3 ? null : "could not end them (code " + code + ")");
@@ -36019,15 +36261,15 @@ function endLeftoverTree(id, exe = ensurePtyHost()) {
 }
 function recordedTrees() {
   try {
-    return fs67.readdirSync(run.treesDir).filter((n) => /^[A-Za-z0-9_-]{1,64}\.json$/.test(n)).map((n) => n.slice(0, -".json".length));
+    return fs66.readdirSync(run.treesDir).filter((n) => /^[A-Za-z0-9_-]{1,64}\.json$/.test(n)).map((n) => n.slice(0, -".json".length));
   } catch {
     return [];
   }
 }
 
 // src/guest/agents/agent-installer.ts
-import fs68 from "node:fs";
-import path87 from "node:path";
+import fs67 from "node:fs";
+import path86 from "node:path";
 
 // src/guest/agents/profile-links.ts
 var profileRoot = () => process.env.USERPROFILE ?? "";
@@ -36053,7 +36295,7 @@ var agentPaths2 = (name, harness) => agentPaths(toolsDir, name, harness);
 async function installViaNpm(name, harness, dir, env) {
   if (!harness.npmPackage)
     throw new Error("No npmPackage configured for " + name + " and no host executable was available.");
-  const npmCli = path87.join(path87.dirname(process.execPath), "node_modules", "npm", "bin", "npm-cli.js");
+  const npmCli = path86.join(path86.dirname(process.execPath), "node_modules", "npm", "bin", "npm-cli.js");
   const args = [npmCli, "install", "--global", "--prefix", dir, harness.npmPackage, "--no-fund", "--no-audit"];
   log("Installing " + harness.npmPackage + " (this can take a minute)...");
   if (dryRun) {
@@ -36064,7 +36306,7 @@ async function installViaNpm(name, harness, dir, env) {
   await execHeavy(process.execPath, args, { env });
 }
 async function installViaUv(name, harness, dir, env) {
-  const uv = path87.join(toolsDir, "uv", "uv.exe");
+  const uv = path86.join(toolsDir, "uv", "uv.exe");
   log("Installing " + harness.uvPackage + " with uv (this can take a minute)...");
   if (dryRun) {
     log("(dry run) uv tool install " + harness.uvPackage);
@@ -36079,8 +36321,8 @@ async function installViaUv(name, harness, dir, env) {
   });
 }
 function putOnPath(dir, env) {
-  const parts2 = (env.PATH ?? "").split(path87.delimiter);
-  if (!parts2.some((p) => p.toLowerCase() === dir.toLowerCase())) env.PATH = [...parts2, dir].join(path87.delimiter);
+  const parts2 = (env.PATH ?? "").split(path86.delimiter);
+  if (!parts2.some((p) => p.toLowerCase() === dir.toLowerCase())) env.PATH = [...parts2, dir].join(path86.delimiter);
   addMachineEnvironment({}, [dir], true);
 }
 var AgentInstaller = class {
@@ -36121,9 +36363,9 @@ var AgentInstaller = class {
     }
     mkdirp(p.dir);
     if (this.sourceOf(name, harness) === "host") {
-      const source = path87.join(hostToolsDir, "agents", name, harness.hostExecutable);
+      const source = path86.join(hostToolsDir, "agents", name, harness.hostExecutable);
       if (exists(source) && p.exe) {
-        fs68.copyFileSync(source, p.exe);
+        fs67.copyFileSync(source, p.exe);
         log("Copied " + name + " from this PC: " + source);
         return;
       }
@@ -36144,22 +36386,22 @@ function guestAddresses() {
 }
 
 // src/guest/sessions/conversation.ts
-import fs69 from "node:fs";
-import path88 from "node:path";
+import fs68 from "node:fs";
+import path87 from "node:path";
 var MAX_FILES = 2e3;
 function conversationFiles(claudeDir2, cwd) {
   const names = /* @__PURE__ */ new Set([projectFolderName(cwd), projectFolderName(sandboxFolder(cwd))]);
   return [...names].flatMap((name) => {
-    const dir = path88.join(claudeDir2, "projects", name);
+    const dir = path87.join(claudeDir2, "projects", name);
     let entries2;
     try {
-      entries2 = fs69.readdirSync(dir);
+      entries2 = fs68.readdirSync(dir);
     } catch {
       return [];
     }
     return entries2.filter((e) => e.endsWith(".jsonl") && isConversationId(e.slice(0, -".jsonl".length))).slice(0, MAX_FILES).flatMap((e) => {
       try {
-        return [{ id: e.slice(0, -".jsonl".length), createdMs: fs69.statSync(path88.join(dir, e)).birthtimeMs }];
+        return [{ id: e.slice(0, -".jsonl".length), createdMs: fs68.statSync(path87.join(dir, e)).birthtimeMs }];
       } catch {
         return [];
       }
@@ -36174,8 +36416,8 @@ function findConversation(claudeDir2, cwd, sessionStartMs, claimed) {
 import { spawnSync as spawnSync6 } from "node:child_process";
 
 // src/guest/accounts/watch.ts
-import fs71 from "node:fs";
-import path91 from "node:path";
+import fs70 from "node:fs";
+import path90 from "node:path";
 
 // src/guest/accounts/kinds/appstore.ts
 var appstoreAdapter = {
@@ -36186,8 +36428,8 @@ var appstoreAdapter = {
 };
 
 // src/guest/accounts/kinds/epic.ts
-import fs70 from "node:fs";
-import path89 from "node:path";
+import fs69 from "node:fs";
+import path88 from "node:path";
 function settingsFile() {
   return epicSettingsFile(localAppData());
 }
@@ -36197,8 +36439,8 @@ var epicAdapter = {
     const file3 = settingsFile();
     const bytes = readBoundedFile(file3, MAX_EPIC_INI_BYTES);
     const read = bytes ? decodeText(bytes) : { text: "", encoding: "utf8" };
-    fs70.mkdirSync(path89.dirname(file3), { recursive: true });
-    fs70.writeFileSync(file3, encodeText(withEpicLogin(read.text, p), read.encoding));
+    fs69.mkdirSync(path88.dirname(file3), { recursive: true });
+    fs69.writeFileSync(file3, encodeText(withEpicLogin(read.text, p), read.encoding));
     return { summary: "Epic Games Launcher: signed in with your saved sign-in" };
   },
   current() {
@@ -36278,13 +36520,13 @@ var ADAPTERS = {
 };
 
 // src/guest/accounts/apply.ts
-import path90 from "node:path";
+import path89 from "node:path";
 var DeliveredSchema = external_exports.object({
   fingerprints: external_exports.partialRecord(external_exports.enum(SERVICE_KINDS), external_exports.string().max(128)),
   leased: external_exports.array(external_exports.enum(SERVICE_KINDS))
 });
 function deliveredFile(root = accountsRoot()) {
-  return path90.join(root, "delivered.json");
+  return path89.join(root, "delivered.json");
 }
 function readDelivered(root = accountsRoot()) {
   return readValid(DeliveredSchema, deliveredFile(root)) ?? { fingerprints: {}, leased: [] };
@@ -36333,8 +36575,8 @@ var AccountWatch = class {
       if (!now2) return false;
       const print = fingerprint2(now2);
       if (print === this.last.get(kind)) return false;
-      const file3 = path91.join(this.o.dataDir, ...HANDOFF_PARTS, kind + ".json");
-      fs71.mkdirSync(path91.dirname(file3), { recursive: true });
+      const file3 = path90.join(this.o.dataDir, ...HANDOFF_PARTS, kind + ".json");
+      fs70.mkdirSync(path90.dirname(file3), { recursive: true });
       writeJsonAtomic(file3, { kind, launchId: this.o.launchId, payload: now2 });
       this.last.set(kind, print);
       return true;
@@ -36504,9 +36746,9 @@ var GovernorCore = class {
 };
 
 // src/guest/governor/governor.ts
-import fs72 from "node:fs";
+import fs71 from "node:fs";
 import os14 from "node:os";
-import path92 from "node:path";
+import path91 from "node:path";
 import { spawn as spawn11 } from "node:child_process";
 import { createInterface } from "node:readline";
 var SampleSchema = external_exports.object({
@@ -36579,12 +36821,12 @@ var MemGovProcess = class {
 };
 function appendToMemoryLog(line) {
   try {
-    const logs = path92.join(dataDir, "logs");
-    const newest = fs72.readdirSync(logs).filter((f) => /^memory-\d{8}-\d{6}\.log$/.test(f)).sort().pop();
+    const logs = path91.join(dataDir, "logs");
+    const newest = fs71.readdirSync(logs).filter((f) => /^memory-\d{8}-\d{6}\.log$/.test(f)).sort().pop();
     if (!newest) return;
     const t = /* @__PURE__ */ new Date();
     const stamp = [t.getHours(), t.getMinutes(), t.getSeconds()].map((n) => String(n).padStart(2, "0")).join(":");
-    fs72.appendFileSync(path92.join(logs, newest), stamp + " | " + line + "\r\n");
+    fs71.appendFileSync(path91.join(logs, newest), stamp + " | " + line + "\r\n");
   } catch {
   }
 }
@@ -36701,8 +36943,8 @@ var IdleShutdown = class {
 var CLOSE_WAIT_MS = 8e3;
 var ROOTS_KEPT_MS = 10 * 60 * 1e3;
 function terminalTab(id, title, cwd) {
-  const view = [process.execPath, path93.join(path93.dirname(process.argv[1]), "view.js"), id];
-  const wt = path93.join(toolsDir, "terminal", "wt.exe");
+  const view = [process.execPath, path92.join(path92.dirname(process.argv[1]), "view.js"), id];
+  const wt = path92.join(toolsDir, "terminal", "wt.exe");
   if (exists(wt))
     spawn12(wt, ["-w", "0", "nt", "--title", title, "-d", cwd, ...view], { detached: true, stdio: "ignore" }).unref();
   else spawn12(SYSTEM.cmd(), ["/d", "/c", "start", title, ...view], { detached: true, stdio: "ignore", cwd }).unref();
@@ -36758,10 +37000,10 @@ var agentProgram = async (req, env, say) => {
 };
 function shellPaths() {
   const candidates = [
-    path93.join(pwshDir(), "pwsh.exe"),
-    path93.join(process.env.ProgramFiles ?? "C:\\Program Files", "PowerShell", "7", "pwsh.exe")
+    path92.join(pwshDir(), "pwsh.exe"),
+    path92.join(process.env.ProgramFiles ?? "C:\\Program Files", "PowerShell", "7", "pwsh.exe")
   ];
-  return { pwsh: candidates.find((f) => fs73.existsSync(f)) ?? null, powershell: SYSTEM.powershell(), cmd: SYSTEM.cmd() };
+  return { pwsh: candidates.find((f) => fs72.existsSync(f)) ?? null, powershell: SYSTEM.powershell(), cmd: SYSTEM.cmd() };
 }
 var shellProgram = (shell) => {
   const line = commandLine(shell.file, shell.args);
@@ -36795,7 +37037,7 @@ var launchPtyHost = async (req, program, remote, env, sessions2, onSpawn) => {
   } catch (e) {
     const tail = ptyHostLogTail(req.id);
     throw new Error(
-      errMsg(e) + (tail ? ". From its log:\n" + tail : "") + "\nLog: " + path93.join(dataDir, "logs", "ptyhost-" + req.id + ".log")
+      errMsg(e) + (tail ? ". From its log:\n" + tail : "") + "\nLog: " + path92.join(dataDir, "logs", "ptyhost-" + req.id + ".log")
     );
   }
   return { child, port, token };
@@ -36909,7 +37151,7 @@ var SessionManager = class {
     };
     this.starting++;
     if (req.id !== session.launchId && process.env.AGENT_NO_TABS !== "1")
-      safely("terminal tab", () => terminalTab(req.id, name + " " + path93.basename(req.cwd), req.cwd));
+      safely("terminal tab", () => terminalTab(req.id, name + " " + path92.basename(req.cwd), req.cwd));
     try {
       if (problem) throw new Error(problem);
       const place = await placeFor(req, say);
@@ -37078,13 +37320,13 @@ var SessionManager = class {
 var sessions = new SessionManager();
 
 // src/guest/daemon/live.ts
-import fs75 from "node:fs";
-import path95 from "node:path";
+import fs74 from "node:fs";
+import path94 from "node:path";
 import { spawnSync as spawnSync7 } from "node:child_process";
 
 // src/guest/daemon/live-folders.ts
-import fs74 from "node:fs";
-import path94 from "node:path";
+import fs73 from "node:fs";
+import path93 from "node:path";
 
 // src/shared/channel/live.ts
 import crypto8 from "node:crypto";
@@ -37177,7 +37419,7 @@ var LiveFolderHandler = class {
   }
   read() {
     try {
-      const text = fs74.readFileSync(this.o.stateFile, "utf8");
+      const text = fs73.readFileSync(this.o.stateFile, "utf8");
       const parsed = StateSchema.safeParse(JSON.parse(text));
       if (parsed.success && parsed.data.launchId === this.o.launchId) return parsed.data;
     } catch {
@@ -37185,7 +37427,7 @@ var LiveFolderHandler = class {
     return { key: null, launchId: this.o.launchId, seen: [], mappings: [] };
   }
   save(state) {
-    fs74.mkdirSync(path94.dirname(this.o.stateFile), { recursive: true });
+    fs73.mkdirSync(path93.dirname(this.o.stateFile), { recursive: true });
     writeJsonAtomic(this.o.stateFile, state);
   }
   /** The key the boot handed over (from the one-shot secrets file). */
@@ -37196,30 +37438,30 @@ var LiveFolderHandler = class {
   /** C:\Workspace\<name> from a checked name only. */
   folderPath(name) {
     if (!LIVE_FOLDER_NAME.test(name)) throw new Error("not a plain folder name");
-    return path94.win32.join(this.o.workspaces ?? WORKSPACES_GUEST, name);
+    return path93.win32.join(this.o.workspaces ?? WORKSPACES_GUEST, name);
   }
   /** One pass over run\live: every file is claimed (deleted) at once; valid ones are handled one after another. */
   tick() {
     const dir = this.o.run.liveDir;
     let names;
     try {
-      names = fs74.readdirSync(dir);
+      names = fs73.readdirSync(dir);
     } catch {
       return;
     }
     for (const name of names.slice(0, 64)) {
       if (name.endsWith(".tmp")) continue;
-      const file3 = path94.join(dir, name);
+      const file3 = path93.join(dir, name);
       let envelope = null;
       try {
-        const stat = fs74.lstatSync(file3);
+        const stat = fs73.lstatSync(file3);
         if (stat.isFile() && stat.size <= MAX_REQUEST_BYTES && /^[A-Za-z0-9_-]{1,64}\.json$/.test(name))
-          envelope = JSON.parse(fs74.readFileSync(file3, "utf8"));
+          envelope = JSON.parse(fs73.readFileSync(file3, "utf8"));
       } catch {
         envelope = null;
       } finally {
         try {
-          fs74.rmSync(file3, { recursive: true, force: true });
+          fs73.rmSync(file3, { recursive: true, force: true });
         } catch {
         }
       }
@@ -37256,7 +37498,7 @@ var LiveFolderHandler = class {
   }
   reply(id, r) {
     try {
-      fs74.mkdirSync(this.o.run.liveRepliesDir, { recursive: true });
+      fs73.mkdirSync(this.o.run.liveRepliesDir, { recursive: true });
       writeJsonAtomic(this.o.run.liveReplyFile(id), { id, ...r, finishedAt: new Date(this.now()).toISOString() });
     } catch (e) {
       this.log("live folder reply not written: " + errMsg(e));
@@ -37277,14 +37519,14 @@ var LiveFolderHandler = class {
   assertFree(folder) {
     let exists2 = true;
     try {
-      fs74.lstatSync(folder);
+      fs73.lstatSync(folder);
     } catch {
       exists2 = false;
     }
     if (exists2) throw new Error(folder + " exists already");
-    const parent = path94.dirname(folder);
-    fs74.mkdirSync(parent, { recursive: true });
-    if (!fs74.lstatSync(parent).isDirectory()) throw new Error(parent + " is not a plain folder");
+    const parent = path93.dirname(folder);
+    fs73.mkdirSync(parent, { recursive: true });
+    if (!fs73.lstatSync(parent).isDirectory()) throw new Error(parent + " is not a plain folder");
   }
   async act(p) {
     const folder = this.folderPath(p.folder);
@@ -37305,9 +37547,9 @@ var LiveFolderHandler = class {
       const code2 = await this.mapWithRetry(folder, share2, true);
       if (code2 !== EXIT_OK) return { ok: false, message: "the test share could not be shown (" + code2 + ")" };
       try {
-        const file3 = path94.join(folder, "token.txt");
-        const stat = fs74.statSync(file3);
-        const token = stat.size <= 64 ? fs74.readFileSync(file3, "utf8").trim() : "";
+        const file3 = path93.join(folder, "token.txt");
+        const stat = fs73.statSync(file3);
+        const token = stat.size <= 64 ? fs73.readFileSync(file3, "utf8").trim() : "";
         return LIVE_TOKEN.test(token) ? { ok: true, message: "read the test share", token } : { ok: false, message: "the test share holds no token" };
       } finally {
         this.o.bind.unmap(folder);
@@ -37335,7 +37577,7 @@ var LiveFolderHandler = class {
     for (const m of this.read().mappings) {
       const folder = this.folderPath(m.folder);
       if (this.o.bind.mapped(folder) === EXIT_OK) continue;
-      fs74.mkdirSync(path94.dirname(folder), { recursive: true });
+      fs73.mkdirSync(path93.dirname(folder), { recursive: true });
       if (this.o.bind.map(folder, m.share, m.readOnly) === EXIT_OK) done++;
       else this.log("live folder " + folder + " could not be shown again");
     }
@@ -37346,7 +37588,7 @@ var LiveFolderHandler = class {
 // src/guest/daemon/live.ts
 var BIND_TIMEOUT_MS = 3e4;
 var testing = Boolean(process.env.AGENT_DAEMON_STATE_DIR || process.env.AGENT_LOCAL_DIR);
-var stateDir2 = process.env.AGENT_DAEMON_STATE_DIR ?? (process.env.AGENT_LOCAL_DIR ? path95.join(localDir, "daemon-state") : path95.join(process.env.ProgramData ?? "C:\\ProgramData", "AgentSandboxDaemon"));
+var stateDir2 = process.env.AGENT_DAEMON_STATE_DIR ?? (process.env.AGENT_LOCAL_DIR ? path94.join(localDir, "daemon-state") : path94.join(process.env.ProgramData ?? "C:\\ProgramData", "AgentSandboxDaemon"));
 function bindMount(args) {
   const r = spawnSync7(ensureCompiled("bindmount"), args, {
     windowsHide: true,
@@ -37361,7 +37603,7 @@ var realBind = {
   mapped: (folder) => bindMount(["mapped", folder])
 };
 function protectStateDir() {
-  fs75.mkdirSync(stateDir2, { recursive: true });
+  fs74.mkdirSync(stateDir2, { recursive: true });
   if (!isWin || testMode || testing) return;
   spawnSync7(
     SYSTEM.icacls(),
@@ -37374,7 +37616,7 @@ function protectStateDir() {
 }
 var liveFolders = new LiveFolderHandler({
   run,
-  stateFile: path95.join(stateDir2, "live-folders.json"),
+  stateFile: path94.join(stateDir2, "live-folders.json"),
   launchId: session.launchId,
   bind: realBind,
   log: warn
@@ -37404,9 +37646,9 @@ var Daemon = class {
   tick() {
     const { valid, invalid } = run.scanRequests();
     for (const file3 of invalid)
-      safely("removing an invalid request", () => fs76.rmSync(file3, { recursive: true, force: true }));
+      safely("removing an invalid request", () => fs75.rmSync(file3, { recursive: true, force: true }));
     for (const req of valid) {
-      safely("claiming a request", () => fs76.rmSync(run.requestFile(req.id), { force: true }));
+      safely("claiming a request", () => fs75.rmSync(run.requestFile(req.id), { force: true }));
       if (run.readSession(req.id)) continue;
       void Promise.resolve(this.handle(withRequestSecrets(req))).catch(
         (e) => respond(req.id, { ok: false, message: errMsg(e) })