windows-development-sandbox 1.23.1 → 1.25.0

package/dist/runtime/agent.js

@@ -25669,7 +25669,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(
@@ -25678,11 +25678,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)."
@@ -27852,36 +27849,45 @@ function mkdirp(p) {
 import fs6 from "node:fs";
 import path7 from "node:path";
 import { AsyncLocalStorage } from "node:async_hooks";
+
+// 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
 fs6.mkdirSync(logsDir, { recursive: true });
 var logFile = path7.join(
   logsDir,
   (process.env.AGENT_LOG_PREFIX ?? "guest") + "-" + (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-") + ".log"
 );
 var context = new AsyncLocalStorage();
-function fileLine(message, at = /* @__PURE__ */ new Date()) {
-  return at.toISOString() + " " + message;
-}
-var append = (line) => {
+var sink = null;
+var append = (message, ctx) => {
   try {
-    fs6.appendFileSync(logFile, fileLine(line) + "\n");
+    const lines = fileLines(message, /* @__PURE__ */ new Date(), ctx?.task);
+    if (lines.length) fs6.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/toolchains/tool-env.ts
@@ -28177,24 +28183,56 @@ var githubAssetFromPage = async (repo, pattern, searchOlder) => {
 };
 
 // src/guest/runtime/process.ts
+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(file2, args, options = {}) {
-  const code = await spawnAsync(file2, args, { stdio: "inherit", ...options });
+  const code = captureOutput() ? await new Promise((resolve, reject) => {
+    const child = spawn2(file2, args, { stdio: ["inherit", "pipe", "pipe"], windowsHide: true, ...options });
+    logLines(child.stdout);
+    logLines(child.stderr);
+    child.once("error", reject);
+    child.once("close", (c) => resolve(c ?? -1));
+  }) : await spawnAsync(file2, args, { stdio: "inherit", ...options });
   if (code !== 0)
     throw new Error(path11.basename(file2) + " " + 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(file2, args, options = {}) {
   const result = spawnSync(file2, args, { encoding: "utf8", windowsHide: true, ...options });
   return result.status === 0 ? String(result.stdout ?? "").trim() : "";
 }
 function runScript(name, args = []) {
+  const capture = captureOutput();
   const result = spawnSync(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) : ""));
 }
@@ -28381,9 +28419,12 @@ function agentCommand(name, harness) {
   return harness.npmBin ?? harness.uvBin ?? (harness.hostExecutable ?? name).replace(/\.exe$/i, "");
 }
 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"];
 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"
 );