@gamecrate/cli 1.4.0 → 1.4.1

package/dist/gamecrate.js

@@ -313,11 +313,14 @@ function checkValueTokens(program, head) {
     const value = head[++i];
     if (value === undefined)
       return;
-    if (option.long === "--docker-arg")
-      continue;
-    if (value.startsWith("-") && value.length > 1) {
-      throw usage(`${option.long ?? token} needs a value, got the flag ${value}`);
-    }
+    checkValue(option, token, value);
+  }
+}
+function checkValue(option, token, value) {
+  if (option.long === "--docker-arg")
+    return;
+  if (value.startsWith("-") && value.length > 1) {
+    throw usage(`${option.long ?? token} needs a value, got the flag ${value}`);
   }
 }
 function parseArgs(argv, opts = {}) {
@@ -325,47 +328,16 @@ function parseArgs(argv, opts = {}) {
   const sep = argv.indexOf("--");
   const head = sep === -1 ? argv : argv.slice(0, sep);
   const program = buildProgram();
-  const seen = new Set;
-  const counts = new Map;
-  const worktree = [];
-  let cleanTier;
-  for (const option of program.options) {
-    const long = option.long ?? option.flags;
-    program.on(`option:${option.name()}`, (value) => {
-      seen.add(long);
-      counts.set(long, (counts.get(long) ?? 0) + 1);
-      if (long === "--worktree" && value !== undefined)
-        worktree.push(value);
-      if (long === "--staging" || long === "--logs" || long === "--all" || long === "--downloads") {
-        cleanTier = long.slice(2);
-      }
-    });
-  }
+  const log = recordFlags(program);
+  const { seen, counts, worktree } = log;
   checkValueTokens(program, head);
   try {
     program.parse(head, { from: "user" });
   } catch (error) {
     throw translate(error, program);
   }
-  for (const option of program.options) {
-    const long = option.long ?? option.flags;
-    const repeatable = Array.isArray(option.defaultValue);
-    if (option.required && !repeatable && (counts.get(long) ?? 0) > 1) {
-      throw usage(`${long} given more than once`);
-    }
-  }
-  if (seen.has("--build") && seen.has("--no-build"))
-    throw usage("--build and --no-build contradict");
-  if (seen.has("--replace") && seen.has("--no-replace"))
-    throw usage("--replace and --no-replace contradict");
-  if (seen.has("--detach")) {
-    if (seen.has("--no-detach"))
-      throw usage("--detach and --no-detach contradict");
-    if (seen.has("--dry-run"))
-      throw usage("--detach and --dry-run contradict");
-    if (seen.has("--print-plan"))
-      throw usage("--detach and --print-plan contradict");
-  }
+  checkRepeats(program, counts);
+  checkContradictions(seen);
   const values = program.opts();
   const envBuild = applyEnv(program, seen, env, values);
   const out = {
@@ -405,7 +377,7 @@ function parseArgs(argv, opts = {}) {
   out.sort = values["sort"];
   out.instance = values["instance"];
   out.build = envBuild ?? policy(values["build"]);
-  out.cleanTier = cleanTier;
+  out.cleanTier = log.cleanTier;
   if (opts.defaults?.game !== undefined)
     out.game = opts.defaults.game;
   applyPositionals(out, program.args, opts.games, out.help);
@@ -422,6 +394,45 @@ function parseArgs(argv, opts = {}) {
   }
   return out;
 }
+function recordFlags(program) {
+  const log = { seen: new Set, counts: new Map, worktree: [] };
+  for (const option of program.options) {
+    const long = option.long ?? option.flags;
+    program.on(`option:${option.name()}`, (value) => {
+      log.seen.add(long);
+      log.counts.set(long, (log.counts.get(long) ?? 0) + 1);
+      if (long === "--worktree" && value !== undefined)
+        log.worktree.push(value);
+      if (long === "--staging" || long === "--logs" || long === "--all" || long === "--downloads") {
+        log.cleanTier = long.slice(2);
+      }
+    });
+  }
+  return log;
+}
+function checkRepeats(program, counts) {
+  for (const option of program.options) {
+    const long = option.long ?? option.flags;
+    const repeatable = Array.isArray(option.defaultValue);
+    if (option.required && !repeatable && (counts.get(long) ?? 0) > 1) {
+      throw usage(`${long} given more than once`);
+    }
+  }
+}
+function checkContradictions(seen) {
+  if (seen.has("--build") && seen.has("--no-build"))
+    throw usage("--build and --no-build contradict");
+  if (seen.has("--replace") && seen.has("--no-replace"))
+    throw usage("--replace and --no-replace contradict");
+  if (!seen.has("--detach"))
+    return;
+  if (seen.has("--no-detach"))
+    throw usage("--detach and --no-detach contradict");
+  if (seen.has("--dry-run"))
+    throw usage("--detach and --dry-run contradict");
+  if (seen.has("--print-plan"))
+    throw usage("--detach and --print-plan contradict");
+}
 function policy(value) {
   if (value === true)
     return "always";
@@ -454,22 +465,22 @@ function applyPositionals(out, positional, games, help = false) {
     out.help = true;
     return;
   }
+  const { sub, slots, rest } = routePositionals(out, first, positional, games);
+  const left = fillSlots(out, slots, rest);
+  if (!help && (out.subverb === "add" || out.subverb === "rm")) {
+    if (out.game === undefined)
+      throw usage(`mods ${out.subverb} needs a game`);
+    if (out.subverb === "rm" && out.rest.length === 0)
+      throw usage("mods rm needs at least one mod id");
+  }
+  if (left.length > 0) {
+    const shape = sub ? `${sub.name} ${sub.usage}`.trim() : `${out.game} [profile]`;
+    throw usage(`unexpected argument ${left[0]}`, `gamecrate ${shape}`);
+  }
+}
+function routePositionals(out, first, positional, games) {
   const sub = SUBCOMMANDS.find((s) => s.name === first);
-  let slots;
-  let rest;
-  if (sub) {
-    out.subcommand = sub.name;
-    rest = positional.slice(1);
-    const head = rest[0];
-    const verbSlots = head === undefined || sub.subverbs === undefined ? undefined : own(sub.subverbs, head);
-    if (verbSlots === undefined) {
-      slots = [...sub.positionals];
-    } else {
-      out.subverb = head;
-      rest.shift();
-      slots = [...verbSlots];
-    }
-  } else {
+  if (!sub) {
     const known = !NAME_PATTERN.test(first) ? false : games === undefined || games.includes(first);
     if (!known) {
       const candidates = [...SUBCOMMANDS.map((s) => s.name), ...games ?? []];
@@ -477,16 +488,26 @@ function applyPositionals(out, positional, games, help = false) {
     }
     out.subcommand = "run";
     out.game = first;
-    slots = ["profile", "rest"];
-    rest = positional.slice(1);
-  }
+    return { slots: ["profile", "rest"], rest: positional.slice(1) };
+  }
+  out.subcommand = sub.name;
+  const rest = positional.slice(1);
+  const head = rest[0];
+  const verbSlots = head === undefined || sub.subverbs === undefined ? undefined : own(sub.subverbs, head);
+  if (verbSlots === undefined)
+    return { sub, slots: [...sub.positionals], rest };
+  out.subverb = head;
+  rest.shift();
+  return { sub, slots: [...verbSlots], rest };
+}
+function fillSlots(out, slots, rest) {
+  const left = [...rest];
   for (const slot of slots) {
     if (slot === "rest") {
-      out.rest = rest;
-      rest = [];
-      break;
+      out.rest = left;
+      return [];
     }
-    const value = rest.shift();
+    const value = left.shift();
     if (value === undefined)
       break;
     if (!NAME_PATTERN.test(value))
@@ -496,16 +517,7 @@ function applyPositionals(out, positional, games, help = false) {
     else
       out.profile = value;
   }
-  if (!help && (out.subverb === "add" || out.subverb === "rm")) {
-    if (out.game === undefined)
-      throw usage(`mods ${out.subverb} needs a game`);
-    if (out.subverb === "rm" && out.rest.length === 0)
-      throw usage("mods rm needs at least one mod id");
-  }
-  if (rest.length > 0) {
-    const shape = sub ? `${sub.name} ${sub.usage}`.trim() : `${out.game} [profile]`;
-    throw usage(`unexpected argument ${rest[0]}`, `gamecrate ${shape}`);
-  }
+  return left;
 }
 function applyEnv(program, seen, env, values) {
   let build;
@@ -519,27 +531,38 @@ function applyEnv(program, seen, env, values) {
       continue;
     seen.add(flag);
     if (flag === "--build") {
-      if (!BUILD_POLICIES.includes(raw)) {
-        throw usage(`${name} must be one of ${BUILD_POLICIES.join(", ")}, got ${raw}`);
-      }
-      build = raw;
-      continue;
-    }
-    const option = program.options.find((o) => o.long === flag);
-    const key = option.attributeName();
-    if (!option.required) {
-      if (truthy(raw))
-        values[key] = true;
+      build = envBuildPolicy(name, raw);
       continue;
     }
-    if (option.argChoices && !option.argChoices.includes(raw)) {
-      throw usage(`${name} must be one of ${option.argChoices.join(", ")}, got ${raw}`);
-    }
-    values[key] = option.parseArg === undefined ? raw : option.parseArg(raw, values[key]);
+    applyEnvValue(program, flag, name, raw, values);
   }
   return build;
 }
+function envBuildPolicy(name, raw) {
+  if (!BUILD_POLICIES.includes(raw)) {
+    throw usage(`${name} must be one of ${BUILD_POLICIES.join(", ")}, got ${raw}`);
+  }
+  return raw;
+}
+function applyEnvValue(program, flag, name, raw, values) {
+  const option = program.options.find((o) => o.long === flag);
+  const key = option.attributeName();
+  if (!option.required) {
+    if (truthy(raw))
+      values[key] = true;
+    return;
+  }
+  if (option.argChoices && !option.argChoices.includes(raw)) {
+    throw usage(`${name} must be one of ${option.argChoices.join(", ")}, got ${raw}`);
+  }
+  values[key] = option.parseArg === undefined ? raw : option.parseArg(raw, values[key]);
+}
 function applyDefaults(out, seen, defaults, hasGameArgs) {
+  applyListDefaults(out, seen, defaults, hasGameArgs);
+  applyScalarDefaults(out, defaults);
+  applyFlagDefaults(out, seen, defaults);
+}
+function applyListDefaults(out, seen, defaults, hasGameArgs) {
   if (!seen.has("--mod") && defaults.mods !== undefined)
     out.mods = [...defaults.mods];
   if (!seen.has("--without") && defaults.without !== undefined)
@@ -555,6 +578,8 @@ function applyDefaults(out, seen, defaults, hasGameArgs) {
     out.use = [...defaults.use];
   if (!hasGameArgs && defaults.gameArgs !== undefined)
     out.gameArgs = [...defaults.gameArgs];
+}
+function applyScalarDefaults(out, defaults) {
   out.mode ??= defaults.mode;
   out.marker ??= defaults.marker;
   out.timeout ??= defaults.timeout;
@@ -566,6 +591,8 @@ function applyDefaults(out, seen, defaults, hasGameArgs) {
   out.build ??= defaults.build;
   out.sort ??= defaults.sort;
   out.instance ??= defaults.instance;
+}
+function applyFlagDefaults(out, seen, defaults) {
   if (!seen.has("--dry-run"))
     out.dryRun = defaults.dryRun ?? out.dryRun;
   if (!seen.has("--print-plan"))
@@ -639,7 +666,11 @@ function modSource(values) {
   if (kinds.length > 1)
     throw usage(`${kinds[0]} and ${kinds[1]} contradict: a source has one kind`);
   if (url === undefined) {
-    const stray = refs[0] === undefined ? subdir === undefined ? undefined : "--subdir" : `--${refs[0]}`;
+    let stray;
+    if (refs[0] !== undefined)
+      stray = `--${refs[0]}`;
+    else if (subdir !== undefined)
+      stray = "--subdir";
     if (stray !== undefined)
       throw usage(`${stray} only applies to a --git source`);
   }
@@ -739,25 +770,7 @@ function list(args, config, defaults) {
   const games = args.game === undefined ? Object.keys(config.games) : [requireGame(args, config)];
   const fromProject = (game, profile) => defaults.game === game && own(defaults.profiles, profile) !== undefined;
   if (args.json) {
-    const payload = games.map((name) => {
-      const game = config.games[name];
-      return {
-        game: name,
-        core: game.core,
-        dlc: game.dlc,
-        modes: game.modes,
-        profiles: Object.entries(game.profiles).map(([profile, spec]) => ({
-          profile,
-          alias: spec.alias ?? null,
-          description: spec.description ?? null,
-          extends: spec.extends ?? null,
-          mods: spec.mods?.length ?? 0,
-          instances: Object.keys(spec.instances ?? {}),
-          source: fromProject(name, profile) ? "project" : "config"
-        }))
-      };
-    });
-    process.stdout.write(`${JSON.stringify(payload, null, 2)}
+    process.stdout.write(`${JSON.stringify(jsonReport(games, config, fromProject), null, 2)}
 `);
     return Exit.Ok;
   }
@@ -766,27 +779,9 @@ function list(args, config, defaults) {
   for (const name of games) {
     const game = config.games[name];
     const width = Math.max(7, ...Object.keys(game.profiles).map((n) => n.length));
-    out.push(`${name}  (${game.modes.join(", ")})`);
-    out.push(`  ${"modless".padEnd(width)}  built-in: core + official DLC`);
+    out.push(`${name}  (${game.modes.join(", ")})`, `  ${"modless".padEnd(width)}  built-in: core + official DLC`);
     for (const [profile, spec] of Object.entries(game.profiles)) {
-      const notes = [];
-      if (spec.alias)
-        notes.push(`alias for ${spec.alias}`);
-      if (spec.extends)
-        notes.push(`extends ${spec.extends}`);
-      const count = spec.mods?.length ?? 0;
-      if (!spec.alias)
-        notes.push(count === 1 ? "1 entry" : `${count} entries`);
-      if (spec.aliases?.length)
-        notes.push(`aka ${spec.aliases.join(", ")}`);
-      if (fromProject(name, profile))
-        notes.push(`from ${source}`);
-      out.push(`  ${profile.padEnd(width)}  ${notes.join(", ")}`);
-      if (spec.description)
-        out.push(`  ${" ".repeat(width)}  ${spec.description}`);
-      const instances = Object.keys(spec.instances ?? {});
-      if (instances.length > 0)
-        out.push(`  ${" ".repeat(width)}  instances: ${instances.join(", ")}`);
+      out.push(...profileRows(profile, spec, width, profileNotes(spec, fromProject(name, profile), source)));
     }
   }
   process.stdout.write(`${out.join(`
@@ -794,6 +789,51 @@ function list(args, config, defaults) {
 `);
   return Exit.Ok;
 }
+function jsonReport(games, config, fromProject) {
+  return games.map((name) => {
+    const game = config.games[name];
+    return {
+      game: name,
+      core: game.core,
+      dlc: game.dlc,
+      modes: game.modes,
+      profiles: Object.entries(game.profiles).map(([profile, spec]) => ({
+        profile,
+        alias: spec.alias ?? null,
+        description: spec.description ?? null,
+        extends: spec.extends ?? null,
+        mods: spec.mods?.length ?? 0,
+        instances: Object.keys(spec.instances ?? {}),
+        source: fromProject(name, profile) ? "project" : "config"
+      }))
+    };
+  });
+}
+function profileNotes(spec, isProject, source) {
+  const notes = [];
+  if (spec.alias)
+    notes.push(`alias for ${spec.alias}`);
+  if (spec.extends)
+    notes.push(`extends ${spec.extends}`);
+  const count = spec.mods?.length ?? 0;
+  if (!spec.alias)
+    notes.push(count === 1 ? "1 entry" : `${count} entries`);
+  if (spec.aliases?.length)
+    notes.push(`aka ${spec.aliases.join(", ")}`);
+  if (isProject)
+    notes.push(`from ${source}`);
+  return notes;
+}
+function profileRows(profile, spec, width, notes) {
+  const pad = " ".repeat(width);
+  const rows = [`  ${profile.padEnd(width)}  ${notes.join(", ")}`];
+  if (spec.description)
+    rows.push(`  ${pad}  ${spec.description}`);
+  const instances = Object.keys(spec.instances ?? {});
+  if (instances.length > 0)
+    rows.push(`  ${pad}  instances: ${instances.join(", ")}`);
+  return rows;
+}
 
 // src/cli/mods.ts
 import { existsSync as existsSync6 } from "node:fs";
@@ -1262,53 +1302,69 @@ function crossReference(p, games) {
     const profiles = game_["profiles"];
     if (!isObj(profiles))
       continue;
-    const names = Object.keys(profiles);
     for (const [name, prof] of Object.entries(profiles)) {
       const w = `${where}/profiles/${esc(name)}`;
       checkName(p, w, name, "profile");
-      if (!isObj(prof))
-        continue;
-      const parent = prof["extends"];
-      if (typeof parent === "string" && !resolves(profiles, parent)) {
-        const prob = { where: `${w}/extends`, message: `extends unknown profile "${parent}"` };
-        const hint = suggest(parent, names);
-        if (hint)
-          prob.suggestion = `did you mean "${hint}"?`;
-        p.push(prob);
-      }
-      const alias = prof["alias"];
-      if (typeof alias === "string" && !resolves(profiles, alias)) {
-        const prob = { where: `${w}/alias`, message: `alias of unknown profile "${alias}"` };
-        const hint = suggest(alias, [...names, "modless"]);
-        if (hint)
-          prob.suggestion = `did you mean "${hint}"?`;
-        p.push(prob);
-      }
-      if (typeof alias === "string" && alias.toLowerCase() === name.toLowerCase()) {
-        p.push({ where: `${w}/alias`, message: "a profile cannot alias itself" });
-      }
-      const aliases = prof["aliases"];
-      if (Array.isArray(aliases)) {
-        for (const [i, entry] of aliases.entries()) {
-          if (typeof entry !== "string")
-            continue;
-          const at = `${w}/aliases/${i}`;
-          checkName(p, at, entry, "profile alias");
-          if (names.some((k) => k.toLowerCase() === entry.toLowerCase())) {
-            p.push({ where: at, message: `alias "${entry}" is already a profile name` });
-          }
-        }
-      }
-      const instances = prof["instances"];
-      if (isObj(instances)) {
-        for (const instance of Object.keys(instances)) {
-          checkName(p, `${w}/instances/${esc(instance)}`, instance, "instance");
-        }
-      }
+      if (isObj(prof))
+        checkProfile(p, w, name, prof, profiles);
     }
     checkCollisions(p, where, gameName, profiles, containers);
   }
 }
+function checkProfile(p, w, name, prof, profiles) {
+  const names = Object.keys(profiles);
+  checkExtends(p, w, prof, profiles, names);
+  checkAlias(p, w, name, prof, profiles, names);
+  checkAliases(p, w, prof, names);
+  checkInstances(p, w, prof);
+}
+function checkExtends(p, w, prof, profiles, names) {
+  const parent = prof["extends"];
+  if (typeof parent !== "string" || resolves(profiles, parent))
+    return;
+  const prob = { where: `${w}/extends`, message: `extends unknown profile "${parent}"` };
+  const hint = suggest(parent, names);
+  if (hint)
+    prob.suggestion = `did you mean "${hint}"?`;
+  p.push(prob);
+}
+function checkAlias(p, w, name, prof, profiles, names) {
+  const alias = prof["alias"];
+  if (typeof alias !== "string")
+    return;
+  if (!resolves(profiles, alias)) {
+    const prob = { where: `${w}/alias`, message: `alias of unknown profile "${alias}"` };
+    const hint = suggest(alias, [...names, "modless"]);
+    if (hint)
+      prob.suggestion = `did you mean "${hint}"?`;
+    p.push(prob);
+  }
+  if (alias.toLowerCase() === name.toLowerCase()) {
+    p.push({ where: `${w}/alias`, message: "a profile cannot alias itself" });
+  }
+}
+function checkAliases(p, w, prof, names) {
+  const aliases = prof["aliases"];
+  if (!Array.isArray(aliases))
+    return;
+  for (const [i, entry] of aliases.entries()) {
+    if (typeof entry !== "string")
+      continue;
+    const at = `${w}/aliases/${i}`;
+    checkName(p, at, entry, "profile alias");
+    if (names.some((k) => k.toLowerCase() === entry.toLowerCase())) {
+      p.push({ where: at, message: `alias "${entry}" is already a profile name` });
+    }
+  }
+}
+function checkInstances(p, w, prof) {
+  const instances = prof["instances"];
+  if (!isObj(instances))
+    return;
+  for (const instance of Object.keys(instances)) {
+    checkName(p, `${w}/instances/${esc(instance)}`, instance, "instance");
+  }
+}
 function resolves(profiles, name) {
   if (name.toLowerCase() === "modless")
     return true;
@@ -1338,36 +1394,45 @@ function checkCollisions(p, where, gameName, profiles, containers) {
     containers.set(prefix + lower, w);
     if (!isObj(prof))
       continue;
-    const aliases = prof["aliases"];
-    if (Array.isArray(aliases)) {
-      for (const [i, entry] of aliases.entries()) {
-        if (typeof entry !== "string")
-          continue;
-        const owner = aliasOwners.get(entry.toLowerCase());
-        if (owner !== undefined) {
-          p.push({
-            where: `${w}/aliases/${i}`,
-            message: `alias "${entry}" is already declared by profile "${owner}"`
-          });
-          continue;
-        }
-        aliasOwners.set(entry.toLowerCase(), name);
-      }
+    checkAliasOwners(p, w, prof, name, aliasOwners);
+    checkInstanceContainers(p, w, profiles, name, `${prefix}${lower}`, containers);
+  }
+}
+function checkAliasOwners(p, w, prof, name, owners) {
+  const aliases = prof["aliases"];
+  if (!Array.isArray(aliases))
+    return;
+  for (const [i, entry] of aliases.entries()) {
+    if (typeof entry !== "string")
+      continue;
+    const owner = owners.get(entry.toLowerCase());
+    if (owner !== undefined) {
+      p.push({
+        where: `${w}/aliases/${i}`,
+        message: `alias "${entry}" is already declared by profile "${owner}"`
+      });
+      continue;
     }
-    const declared = prof["instances"];
-    for (const instance of instanceNames(profiles, name, prof)) {
-      const container = `${prefix}${lower}-${instance.toLowerCase()}`;
-      const at = isObj(declared) && Object.hasOwn(declared, instance) ? `${w}/instances/${esc(instance)}` : w;
-      const first = containers.get(container);
-      if (first !== undefined) {
-        p.push({
-          where: at,
-          message: `instance "${instance}" makes a container name that collides with ${first}`
-        });
-        continue;
-      }
-      containers.set(container, at);
+    owners.set(entry.toLowerCase(), name);
+  }
+}
+function checkInstanceContainers(p, w, profiles, name, prefix, containers) {
+  const prof = profiles[name];
+  if (!isObj(prof))
+    return;
+  const declared = prof["instances"];
+  for (const instance of instanceNames(profiles, name, prof)) {
+    const container = `${prefix}-${instance.toLowerCase()}`;
+    const at = isObj(declared) && Object.hasOwn(declared, instance) ? `${w}/instances/${esc(instance)}` : w;
+    const first = containers.get(container);
+    if (first !== undefined) {
+      p.push({
+        where: at,
+        message: `instance "${instance}" makes a container name that collides with ${first}`
+      });
+      continue;
     }
+    containers.set(container, at);
   }
 }
 function instanceNames(profiles, name, prof) {
@@ -1389,7 +1454,7 @@ function checkName(p, where, name, kind) {
   }
 }
 function esc(segment) {
-  return segment.replace(/~/g, "~0").replace(/\//g, "~1");
+  return segment.replaceAll("~", "~0").replaceAll("/", "~1");
 }
 function isObj(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
@@ -1416,8 +1481,9 @@ async function probe(dir, stem) {
     }
   }
   if (found.length > 1) {
-    throw new GamecrateError(`two configs in ${dir}`, Exit.Config, `${found.map((f) => `  ${basename2(f)}`).join(`
-`)}
+    const rows = found.map((f) => `  ${basename2(f)}`).join(`
+`);
+    throw new GamecrateError(`two configs in ${dir}`, Exit.Config, `${rows}
 keep one`);
   }
   return found[0];
@@ -1599,7 +1665,7 @@ var GAME_SCOPED_KEYS = ["profiles", "settings", "library"];
 function origin(where, user, plugins, project) {
   if (!where.startsWith("/"))
     return "";
-  const segments = where.slice(1).split("/").map((s) => s.replace(/~1/g, "/").replace(/~0/g, "~"));
+  const segments = where.slice(1).split("/").map((s) => s.replaceAll("~1", "/").replaceAll("~0", "~"));
   const [section, name, sub, ...rest] = segments;
   const repoGame = project?.game;
   const repoSection = GAME_SCOPED_KEYS.find((k) => k === sub);
@@ -1720,7 +1786,7 @@ function entryIds(entry) {
   return [];
 }
 function globToRegExp(pattern) {
-  const body = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
+  const body = pattern.replaceAll(/[.+^${}()|[\]\\]/g, String.raw`\$&`).replaceAll("*", ".*").replaceAll("?", ".");
   return new RegExp(`^${body}$`, "i");
 }
 function deepMerge(base, over, concatArrays = false) {
@@ -1814,7 +1880,7 @@ function unflowGrownMaps(doc, path) {
 function editYaml(text, edits) {
   const doc = parseDocument2(text);
   if (doc.errors.length > 0)
-    throw doc.errors[0];
+    throw new GamecrateError(doc.errors[0].message, Exit.Config);
   for (const edit of edits) {
     if (edit.value === undefined) {
       if (doc.hasIn(edit.path))
@@ -1876,83 +1942,25 @@ function buildRunSpec(plan, modMounts, identity) {
     USER: identity.user,
     LOGNAME: identity.user
   };
-  if (game.gameFiles.source === "mount") {
-    if (!game.gameFiles.host) {
-      throw new GamecrateError(`gameFiles.source is "mount" but no host path is set for ${plan.game}`, Exit.Config);
-    }
-    mounts.push({ type: "bind", source: hostPath(game.gameFiles.host), target: game.gameFiles.container, readonly: true });
-  }
-  mounts.push({ type: "bind", source: hostPath(plan.stageDirHost), target: game.modsDir.container, readonly: true });
-  for (const mount of modMounts) {
-    mounts.push(mount.type === "bind" ? { ...mount, readonly: true } : mount);
-  }
-  mounts.push({ type: "bind", source: hostPath(plan.dataDirHost), target: game.dataDir.container });
+  addGameFiles(mounts, plan);
+  addStage(mounts, plan, modMounts);
   const command = headed ? [game.executable] : [
     "xvfb-run",
     "-a",
     `--server-args=-screen 0 ${settings.width}x${settings.height}x24`,
     game.executable
   ];
-  if (game.dataDir.mode === "arg") {
+  if (game.dataDir.mode === "arg")
     command.push(validateDataDirArg(game.dataDir));
-  } else {
+  else
     Object.assign(env, game.dataDir.env);
-  }
   if (game.logFile.mode === "arg") {
     mounts.push({ type: "bind", source: hostPath(plan.runDirHost), target: CONTAINER_LOG_DIR });
     command.push(game.logFile.arg, `${CONTAINER_LOG_DIR}/Player.log`);
   }
-  for (const target of game.modsDir.mask ?? []) {
-    mounts.push({ type: "tmpfs", target, size: MASK_SIZE, uid: identity.uid, gid: identity.gid, mode: "755" });
-  }
-  if (identity.uid !== 0) {
-    mounts.push({ type: "tmpfs", target: identity.home, size: HOME_SIZE, uid: identity.uid, gid: identity.gid, mode: "700" });
-  }
-  mounts.push({
-    type: "tmpfs",
-    target: CONTAINER_RUNTIME_DIR,
-    size: RUNTIME_DIR_SIZE,
-    uid: identity.uid,
-    gid: identity.gid,
-    mode: "700"
-  });
-  env.XDG_RUNTIME_DIR = CONTAINER_RUNTIME_DIR;
-  mounts.push({ type: "bind", source: hostPath(plan.configDirHost), target: CONTAINER_XDG_DIR });
-  env.XDG_CONFIG_HOME = `${CONTAINER_XDG_DIR}/config`;
-  env.XDG_CACHE_HOME = `${CONTAINER_XDG_DIR}/cache`;
-  env.XDG_DATA_HOME ??= `${CONTAINER_XDG_DIR}/data`;
-  if (headed) {
-    if (settings.display === "x11") {
-      const x11 = x11Session();
-      if (x11) {
-        mounts.push({ type: "bind", source: X11_SOCKET_DIR, target: X11_SOCKET_DIR });
-        env.DISPLAY = x11.display;
-        env.XDG_SESSION_TYPE = "x11";
-        env.SDL_VIDEODRIVER = "x11";
-        env.QT_QPA_PLATFORM = "xcb";
-        if (x11.xauthority) {
-          mounts.push({ type: "bind", source: x11.xauthority, target: CONTAINER_XAUTHORITY, readonly: true });
-          env.XAUTHORITY = CONTAINER_XAUTHORITY;
-        }
-      }
-    } else {
-      const wayland = waylandSocket();
-      if (wayland) {
-        const target = `${CONTAINER_RUNTIME_DIR}/${wayland.name}`;
-        mounts.push({ type: "bind", source: wayland.source, target });
-        env.WAYLAND_DISPLAY = wayland.name;
-        env.XDG_SESSION_TYPE = "wayland";
-        env.SDL_VIDEODRIVER = "wayland";
-        env.QT_QPA_PLATFORM = "wayland";
-      }
-    }
-    if (settings.audio) {
-      for (const socket of audioSockets()) {
-        mounts.push({ type: "bind", source: socket.source, target: `${CONTAINER_RUNTIME_DIR}/${socket.name}` });
-      }
-      env.PULSE_SERVER = `unix:${CONTAINER_RUNTIME_DIR}/pulse/native`;
-    }
-  }
+  addScratch(mounts, env, plan, identity);
+  if (headed)
+    addSession(mounts, env, plan);
   const deviceCgroupRules = [];
   if (settings.input) {
     mounts.push({ type: "bind", source: "/dev/input", target: "/dev/input", readonly: true });
@@ -1988,6 +1996,75 @@ function buildRunSpec(plan, modMounts, identity) {
     extraArgs: [...settings.dockerArgs ?? []]
   };
 }
+function addGameFiles(mounts, plan) {
+  const { gameFiles } = plan.gameConfig;
+  if (gameFiles.source !== "mount")
+    return;
+  if (!gameFiles.host) {
+    throw new GamecrateError(`gameFiles.source is "mount" but no host path is set for ${plan.game}`, Exit.Config);
+  }
+  mounts.push({ type: "bind", source: hostPath(gameFiles.host), target: gameFiles.container, readonly: true });
+}
+function addStage(mounts, plan, modMounts) {
+  const game = plan.gameConfig;
+  mounts.push({ type: "bind", source: hostPath(plan.stageDirHost), target: game.modsDir.container, readonly: true });
+  for (const mount of modMounts) {
+    mounts.push(mount.type === "bind" ? { ...mount, readonly: true } : mount);
+  }
+  mounts.push({ type: "bind", source: hostPath(plan.dataDirHost), target: game.dataDir.container });
+}
+function addScratch(mounts, env, plan, identity) {
+  const { uid, gid } = identity;
+  for (const target of plan.gameConfig.modsDir.mask ?? []) {
+    mounts.push({ type: "tmpfs", target, size: MASK_SIZE, uid, gid, mode: "755" });
+  }
+  if (uid !== 0) {
+    mounts.push({ type: "tmpfs", target: identity.home, size: HOME_SIZE, uid, gid, mode: "700" });
+  }
+  mounts.push({ type: "tmpfs", target: CONTAINER_RUNTIME_DIR, size: RUNTIME_DIR_SIZE, uid, gid, mode: "700" });
+  env.XDG_RUNTIME_DIR = CONTAINER_RUNTIME_DIR;
+  mounts.push({ type: "bind", source: hostPath(plan.configDirHost), target: CONTAINER_XDG_DIR });
+  env.XDG_CONFIG_HOME = `${CONTAINER_XDG_DIR}/config`;
+  env.XDG_CACHE_HOME = `${CONTAINER_XDG_DIR}/cache`;
+  env.XDG_DATA_HOME ??= `${CONTAINER_XDG_DIR}/data`;
+}
+function addSession(mounts, env, plan) {
+  const { settings } = plan;
+  if (settings.display === "x11")
+    addX11(mounts, env);
+  else
+    addWayland(mounts, env);
+  if (!settings.audio)
+    return;
+  for (const socket of audioSockets()) {
+    mounts.push({ type: "bind", source: socket.source, target: `${CONTAINER_RUNTIME_DIR}/${socket.name}` });
+  }
+  env.PULSE_SERVER = `unix:${CONTAINER_RUNTIME_DIR}/pulse/native`;
+}
+function addX11(mounts, env) {
+  const x11 = x11Session();
+  if (!x11)
+    return;
+  mounts.push({ type: "bind", source: X11_SOCKET_DIR, target: X11_SOCKET_DIR });
+  env.DISPLAY = x11.display;
+  env.XDG_SESSION_TYPE = "x11";
+  env.SDL_VIDEODRIVER = "x11";
+  env.QT_QPA_PLATFORM = "xcb";
+  if (!x11.xauthority)
+    return;
+  mounts.push({ type: "bind", source: x11.xauthority, target: CONTAINER_XAUTHORITY, readonly: true });
+  env.XAUTHORITY = CONTAINER_XAUTHORITY;
+}
+function addWayland(mounts, env) {
+  const wayland = waylandSocket();
+  if (!wayland)
+    return;
+  mounts.push({ type: "bind", source: wayland.source, target: `${CONTAINER_RUNTIME_DIR}/${wayland.name}` });
+  env.WAYLAND_DISPLAY = wayland.name;
+  env.XDG_SESSION_TYPE = "wayland";
+  env.SDL_VIDEODRIVER = "wayland";
+  env.QT_QPA_PLATFORM = "wayland";
+}
 function containerName(plan) {
   const base = `gamecrate-${plan.game}-${plan.profile}`;
   return plan.instance === undefined ? base : `${base}-${plan.instance}`;
@@ -2013,14 +2090,7 @@ function toDockerArgs(spec) {
     args.push("--device-cgroup-rule", rule);
   for (const ulimit of spec.ulimits)
     args.push("--ulimit", ulimit);
-  args.push("--network", spec.network);
-  args.push("--memory", spec.memory);
-  args.push("--memory-swap", spec.memorySwap);
-  args.push("--cpus", String(spec.cpus));
-  args.push("--pids-limit", String(spec.pidsLimit));
-  args.push("--workdir", spec.workdir);
-  args.push(...spec.extraArgs);
-  args.push("--pull=never");
+  args.push("--network", spec.network, "--memory", spec.memory, "--memory-swap", spec.memorySwap, "--cpus", String(spec.cpus), "--pids-limit", String(spec.pidsLimit), "--workdir", spec.workdir, ...spec.extraArgs, "--pull=never");
   const [entrypoint, ...rest] = spec.command;
   if (entrypoint !== undefined)
     args.push("--entrypoint", entrypoint);
@@ -2066,7 +2136,10 @@ function validateDataDirArg(dataDir) {
   return dataDir.arg;
 }
 function trimSlash(path) {
-  return path.length > 1 ? path.replace(/\/+$/, "") : path;
+  let end = path.length;
+  while (end > 1 && path[end - 1] === "/")
+    end--;
+  return path.slice(0, end);
 }
 function glEnv(gpu) {
   if (!gpu)
@@ -2093,7 +2166,11 @@ function waylandSocket() {
   const runtime = process.env.XDG_RUNTIME_DIR;
   if (!display)
     return null;
-  const source = display.startsWith("/") ? display : runtime ? join4(runtime, display) : null;
+  let source = null;
+  if (display.startsWith("/"))
+    source = display;
+  else if (runtime)
+    source = join4(runtime, display);
   if (!source || !existsSync(source))
     return null;
   return { source, name: basename3(source) };
@@ -2265,50 +2342,52 @@ import { join as join6, relative } from "node:path";
 var SKIP_DIRS = new Set([".git", ".retired", ".vs", "bin", "node_modules", "obj"]);
 var ENTRY_LIMIT = 20000;
 async function scanBuildTimes(dir) {
-  const times = { sourceTimes: [] };
-  let budget = ENTRY_LIMIT;
-  const walk = async (current, inAssemblies) => {
-    let entries;
-    try {
-      entries = await readdir3(current, { withFileTypes: true });
-    } catch {
+  const state = { root: dir, times: { sourceTimes: [] }, budget: ENTRY_LIMIT };
+  await walk(state, dir, false);
+  return state.times;
+}
+async function walk(state, current, inAssemblies) {
+  let entries;
+  try {
+    entries = await readdir3(current, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    if (state.budget-- <= 0)
       return;
-    }
-    for (const entry of entries) {
-      if (budget-- <= 0)
-        return;
-      const path = join6(current, entry.name);
-      if (entry.isDirectory()) {
-        if (SKIP_DIRS.has(entry.name.toLowerCase()))
-          continue;
-        await walk(path, inAssemblies || entry.name === "Assemblies");
-        continue;
-      }
-      if (!entry.isFile())
-        continue;
-      const lower = entry.name.toLowerCase();
-      const isSource = lower.endsWith(".cs");
-      const isAssembly = inAssemblies && lower.endsWith(".dll");
-      if (!isSource && !isAssembly)
-        continue;
-      let mtimeMs;
-      try {
-        mtimeMs = (await stat3(path)).mtimeMs;
-      } catch {
-        continue;
-      }
-      const found = { path: relative(dir, path), mtimeMs };
-      if (isSource) {
-        times.sourceTimes.push(mtimeMs);
-        if (mtimeMs > (times.newestSource?.mtimeMs ?? -1))
-          times.newestSource = found;
-      } else if (mtimeMs > (times.newestAssembly?.mtimeMs ?? -1)) {
-        times.newestAssembly = found;
+    const path = join6(current, entry.name);
+    if (entry.isDirectory()) {
+      if (!SKIP_DIRS.has(entry.name.toLowerCase())) {
+        await walk(state, path, inAssemblies || entry.name === "Assemblies");
       }
+      continue;
     }
-  };
-  await walk(dir, false);
-  return times;
+    if (entry.isFile())
+      await record(state, path, entry.name, inAssemblies);
+  }
+}
+async function record(state, path, name, inAssemblies) {
+  const lower = name.toLowerCase();
+  const isSource = lower.endsWith(".cs");
+  const isAssembly = inAssemblies && lower.endsWith(".dll");
+  if (!isSource && !isAssembly)
+    return;
+  let mtimeMs;
+  try {
+    mtimeMs = (await stat3(path)).mtimeMs;
+  } catch {
+    return;
+  }
+  const { times } = state;
+  const found = { path: relative(state.root, path), mtimeMs };
+  if (isSource) {
+    times.sourceTimes.push(mtimeMs);
+    if (mtimeMs > (times.newestSource?.mtimeMs ?? -1))
+      times.newestSource = found;
+  } else if (mtimeMs > (times.newestAssembly?.mtimeMs ?? -1)) {
+    times.newestAssembly = found;
+  }
 }
 var SKEW_MS = 1000;
 function newerThan(source, assembly) {
@@ -2475,8 +2554,7 @@ function printPlan(plan, asJson) {
   ];
   if (payload.marker !== undefined)
     out.push(`  marker    ${payload.marker}`);
-  out.push(`  timeout   ${payload.timeoutSeconds}s, render wait ${payload.renderWaitSeconds}s`);
-  out.push(`  mods      ${payload.mods.length}`);
+  out.push(`  timeout   ${payload.timeoutSeconds}s, render wait ${payload.renderWaitSeconds}s`, `  mods      ${payload.mods.length}`);
   const width = Math.max(0, ...payload.mods.map((m) => m.packageId.length));
   for (const mod of payload.mods) {
     const notes = [mod.kind, mod.origin];
@@ -2491,7 +2569,7 @@ function printPlan(plan, asJson) {
 `);
 }
 function runTimestamp(now = new Date) {
-  return now.toISOString().replace(/[-:.]/g, "");
+  return now.toISOString().replaceAll(/[-:.]/g, "");
 }
 function openRunLog(logsDir, now) {
   const runsDir = join7(logsDir, "runs");
@@ -2508,8 +2586,11 @@ function append(fd, chunk) {
 }
 function uniqueRunDir(runsDir, stamp) {
   let candidate = join7(runsDir, stamp);
-  for (let n = 2;existsSync2(candidate); n++)
+  let n = 2;
+  while (existsSync2(candidate)) {
     candidate = join7(runsDir, `${stamp}-${n}`);
+    n++;
+  }
   return candidate;
 }
 var WAIT_NOTICE = { firstMs: 2000, everyMs: 30000 };
@@ -2588,17 +2669,8 @@ async function imageLabel(ref, label) {
 async function acquireImage(game, config, pull) {
   const { image } = config;
   const present = await imageDigest(image.ref) !== null;
-  if (image.acquire === "build") {
-    if (image.context === undefined) {
-      throw new GamecrateError(`${game} has image.acquire "build" but no context`, Exit.Config);
-    }
-    if (present && pull !== "always")
-      return;
-    if (await inherit(["docker", "build", "--tag", image.ref, image.context]) !== 0) {
-      throw new GamecrateError(`docker build failed for ${image.ref}`, Exit.Environment);
-    }
-    return;
-  }
+  if (image.acquire === "build")
+    return await buildImage(game, image, present, pull);
   if (pull === "never") {
     if (present)
       return;
@@ -2612,6 +2684,16 @@ async function acquireImage(game, config, pull) {
     throw new GamecrateError(`docker pull failed for ${image.ref}`, Exit.Environment);
   }
 }
+async function buildImage(game, image, present, pull) {
+  if (image.context === undefined) {
+    throw new GamecrateError(`${game} has image.acquire "build" but no context`, Exit.Config);
+  }
+  if (present && pull !== "always")
+    return;
+  if (await inherit(["docker", "build", "--tag", image.ref, image.context]) !== 0) {
+    throw new GamecrateError(`docker build failed for ${image.ref}`, Exit.Environment);
+  }
+}
 var RUNTIME_PACKAGES = ["xorg-server-xvfb", "xorg-xwd", "imagemagick", "mesa", "ttf-dejavu"];
 var RUNTIME_SUFFIX = "-gamecrate";
 var BASE_LABEL = "gamecrate.base";
@@ -2880,7 +2962,10 @@ function sourcesRoot(dataRoot) {
   return join9(dataRoot, "sources");
 }
 function normalizeUrl(url) {
-  const trimmed = url.replace(/(?:\/|\.git)+$/, "");
+  let trimmed = url;
+  while (trimmed.endsWith("/") || trimmed.endsWith(".git")) {
+    trimmed = trimmed.slice(0, trimmed.endsWith("/") ? -1 : -4);
+  }
   if (/^[A-Za-z][A-Za-z0-9+.-]*:\/\//.test(trimmed)) {
     return trimmed.replace(/^([A-Za-z][A-Za-z0-9+.-]*:\/\/)([^/@]*@)?([^/]*)/, (_, scheme, user, host) => `${scheme.toLowerCase()}${user ?? ""}${host.toLowerCase()}`);
   }
@@ -2892,10 +2977,10 @@ function cloneDir(dataRoot, url, ref) {
   return join9(sourcesRoot(dataRoot), name, `${ref.kind}-${slug(ref.value)}-${hash(ref.value, 6)}`);
 }
 function lastSegment(url) {
-  return url.split(/[/:]/).filter((part) => part.length > 0).pop() ?? "repo";
+  return url.split(/[/:]/).findLast((part) => part.length > 0) ?? "repo";
 }
 function slug(value) {
-  const out = value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+  const out = value.toLowerCase().replaceAll(/[^a-z0-9]+/g, "-").replaceAll(/^-|-$/g, "");
   return (out.length === 0 ? "x" : out).slice(0, SLUG_LIMIT);
 }
 function hash(value, length) {
@@ -3044,8 +3129,7 @@ function reachedEntries(game, profile, args) {
   if (profile.includeBase !== false)
     out.push(...game.base ?? []);
   const only = args.only ?? [];
-  out.push(...only.length > 0 ? only : profile.mods ?? []);
-  out.push(...args.mods ?? []);
+  out.push(...only.length > 0 ? only : profile.mods ?? [], ...args.mods ?? []);
   const dropped = [...profile.exclude ?? [], ...args.without ?? []].map(globToRegExp);
   return out.filter((entry) => {
     if (typeof entry !== "string" && "match" in entry)
@@ -3229,7 +3313,7 @@ function workshopUrlId(url) {
   const id = parsed.searchParams.get("id");
   return id !== null && /^\d+$/.test(id) ? id : undefined;
 }
-var ANSI = new RegExp(`${String.fromCharCode(27)}\\[[0-9;?]*[ -/]*[@-~]`, "g");
+var ANSI = new RegExp(String.raw`${String.fromCodePoint(27)}\[[0-9;?]*[ -/]*[@-~]`, "g");
 var SUCCESS = /Success\. Downloaded item (\d+) to "([^"]+)" \((\d+) bytes\)/g;
 var FAILED = /ERROR! Download item (\d+) failed \(([^)]+)\)/g;
 var ATTEMPTS = 2;
@@ -3509,7 +3593,7 @@ function readDetails(payload) {
     const id = entry["publishedfileid"];
     const result = entry["result"];
     if (typeof id !== "string" || typeof result !== "number") {
-      throw new Error("steam returned a body this does not understand");
+      throw new TypeError("steam returned a body this does not understand");
     }
     out.set(id, { result, timeUpdated: Number(entry["time_updated"]) || 0 });
   }
@@ -3561,14 +3645,16 @@ async function modsAdd(args, ctx) {
   const twice = [...where.values()].filter((at) => at.length > 1);
   if (twice.length > 0) {
     const lines = [...where.entries()].filter(([, at]) => at.length > 1);
-    throw new GamecrateError(`${twice.length} mod id(s) are declared by more than one directory in ${describe(source)}`, Exit.Config, `${lines.map(([id, at]) => `  ${id}: ${at.join(", ")}`).join(`
-`)}
+    const rows = lines.map(([id, at]) => `  ${id}: ${at.join(", ")}`).join(`
+`);
+    throw new GamecrateError(`${twice.length} mod id(s) are declared by more than one directory in ${describe(source)}`, Exit.Config, `${rows}
 pin one of them with --subdir`);
   }
   const clashes = pins.filter((pin) => existingKey(target.existing, pin.id) !== undefined);
   if (clashes.length > 0 && args.force !== true) {
-    throw new GamecrateError(`${clashes.length} mod id(s) are already pinned in ${target.file}`, Exit.Config, `${clashes.map((pin) => `  ${pin.id}`).join(`
-`)}
+    const rows = clashes.map((pin) => `  ${pin.id}`).join(`
+`);
+    throw new GamecrateError(`${clashes.length} mod id(s) are already pinned in ${target.file}`, Exit.Config, `${rows}
 overwrite them with --force`);
   }
   const edits = [];
@@ -3607,21 +3693,7 @@ async function modsRm(args, ctx) {
 async function modsSync(args, ctx) {
   const only = args.rest.map((id) => id.toLowerCase());
   const games = args.game === undefined ? Object.keys(ctx.config.games) : [requireGame(args, ctx.config)];
-  const wanted = [];
-  const subscribed = [];
-  for (const name of games) {
-    const pins = [];
-    for (const [id, entry] of Object.entries(ctx.config.games[name]?.library ?? {})) {
-      if (only.length > 0 && !only.includes(id.toLowerCase()))
-        continue;
-      if (entry.git !== undefined)
-        wanted.push({ id, git: entry.git, entry });
-      else if (entry.workshop !== undefined)
-        pins.push({ id, item: String(entry.workshop) });
-    }
-    if (pins.length > 0)
-      subscribed.push({ game: name, pins });
-  }
+  const { wanted, subscribed } = collectPins(ctx.config, games, only);
   const named = [...wanted.map((pin) => pin.id), ...subscribed.flatMap((one) => one.pins.map((pin) => pin.id))];
   const missing = only.filter((id) => !named.some((pinned) => pinned.toLowerCase() === id));
   if (missing.length > 0) {
@@ -3632,6 +3704,30 @@ async function modsSync(args, ctx) {
     status("nothing to sync");
     return Exit.Ok;
   }
+  await syncGit(ctx, wanted);
+  for (const one of subscribed)
+    await syncWorkshop(ctx, one.game, one.pins);
+  return Exit.Ok;
+}
+function collectPins(config, games, only) {
+  const wanted = [];
+  const subscribed = [];
+  for (const name of games) {
+    const pins = [];
+    for (const [id, entry] of Object.entries(config.games[name]?.library ?? {})) {
+      if (only.length > 0 && !only.includes(id.toLowerCase()))
+        continue;
+      if (entry.git !== undefined)
+        wanted.push({ id, git: entry.git, entry });
+      else if (entry.workshop !== undefined)
+        pins.push({ id, item: String(entry.workshop) });
+    }
+    if (pins.length > 0)
+      subscribed.push({ game: name, pins });
+  }
+  return { wanted, subscribed };
+}
+async function syncGit(ctx, wanted) {
   const branches = new Map;
   const fetched = new Set;
   for (const pin of wanted) {
@@ -3644,20 +3740,20 @@ async function modsSync(args, ctx) {
     const dir = cloneDir(ctx.config.dataRoot, pin.git, ref);
     if (!fetched.has(dir)) {
       fetched.add(dir);
-      const unlock = await lockDir(dir);
-      try {
-        const result = await ensureClone(ctx.config.dataRoot, gitPin(pin.git, pin.entry), ref, "force");
-        if (result.warning !== undefined)
-          warn(result.warning);
-      } finally {
-        await unlock();
-      }
+      await fetchClone(ctx, pin, ref, dir);
     }
     status(`synced ${pin.id} at ${ref.kind} ${ref.value}`);
   }
-  for (const one of subscribed)
-    await syncWorkshop(ctx, one.game, one.pins);
-  return Exit.Ok;
+}
+async function fetchClone(ctx, pin, ref, dir) {
+  const unlock = await lockDir(dir);
+  try {
+    const result = await ensureClone(ctx.config.dataRoot, gitPin(pin.git, pin.entry), ref, "force");
+    if (result.warning !== undefined)
+      warn(result.warning);
+  } finally {
+    await unlock();
+  }
 }
 async function syncWorkshop(ctx, name, pins) {
   const game = ctx.config.games[name];
@@ -3778,7 +3874,7 @@ async function discover(source, game, plugin, ctx) {
     await unlock();
   }
   const start = source.subdir === undefined ? root : join12(root, source.subdir);
-  const found = await walk(start, game.manifest.file, plugin);
+  const found = await walk2(start, game.manifest.file, plugin);
   return found.map(({ id, dir: at }) => {
     const entry = { git: source.url };
     const pinned = source.ref;
@@ -3794,7 +3890,7 @@ async function discover(source, game, plugin, ctx) {
     return { id, entry };
   });
 }
-async function walk(root, manifestFile, plugin) {
+async function walk2(root, manifestFile, plugin) {
   const out = [];
   const descend = async (dir) => {
     const id = await readId(dir, manifestFile, plugin);
@@ -3858,14 +3954,10 @@ function topLevel(config) {
     "subcommands:"
   ];
   const verbs = SUBCOMMANDS.map((s) => [`${s.name} ${s.usage}`.trim(), s.summary]);
-  lines.push(...columns(verbs, 2));
-  lines.push("", "flags:");
-  lines.push(...columns(flags().map(flagRow), 2));
+  lines.push(...columns(verbs, 2), "", "flags:", ...columns(flags().map(flagRow), 2));
   const games = Object.entries(config?.games ?? {});
   if (games.length > 0) {
-    lines.push("", "games:");
-    lines.push(...columns(games.map(([name, game]) => [name, gameSummary(game)]), 2));
-    lines.push("", `${NAME} help <game> lists that game's profiles.`);
+    lines.push("", "games:", ...columns(games.map(([name, game]) => [name, gameSummary(game)]), 2), "", `${NAME} help <game> lists that game's profiles.`);
   }
   lines.push("", "Game args go after a bare --. Env vars are GAMECRATE_ prefixed fallbacks only.");
   return lines.join(`
@@ -3878,8 +3970,7 @@ function subcommandHelp(sub) {
   const all = flags();
   const specs = names.map((name) => all.find((f) => f.long === name)).filter((f) => f !== undefined);
   if (specs.length > 0) {
-    lines.push("", "flags:");
-    lines.push(...columns(specs.map(flagRow), 2));
+    lines.push("", "flags:", ...columns(specs.map(flagRow), 2));
   }
   if (sub.name === "run") {
     lines.push("", `  The subcommand slot defaults to run, so \`${NAME} <game> <profile>\` works.`);
@@ -3890,31 +3981,14 @@ function subcommandHelp(sub) {
 }
 function gameHelp(name, game) {
   const lines = [`usage: ${NAME} ${name} [profile] [flags] [-- game args]`, "", "profiles:"];
-  const rows = [];
-  for (const [profile, config] of Object.entries(game.profiles)) {
-    const notes = [];
-    if (config.alias)
-      notes.push(`alias for ${config.alias}`);
-    if (config.extends)
-      notes.push(`extends ${config.extends}`);
-    if (config.autoDependencies === false)
-      notes.push("no auto dependencies");
-    const count = config.mods?.length ?? 0;
-    if (!config.alias)
-      notes.push(count === 1 ? "1 entry" : `${count} entries`);
-    if (config.aliases?.length)
-      notes.push(`aka ${config.aliases.join(", ")}`);
-    rows.push([profile, notes.join(", ")]);
-  }
+  const rows = Object.entries(game.profiles).map(([profile, config]) => [profile, profileNotes2(config)]);
   if (rows.length === 0)
     rows.push(["(none declared)", ""]);
   lines.push(...columns(rows, 2));
   if (game.aliases && Object.keys(game.aliases).length > 0) {
-    lines.push("", "mod name aliases:");
-    lines.push(...columns(Object.entries(game.aliases).map(([k, v]) => [k, v]), 2));
+    lines.push("", "mod name aliases:", ...columns(Object.entries(game.aliases).map(([k, v]) => [k, v]), 2));
   }
-  lines.push("", `modes: ${game.modes.join(", ")}`);
-  lines.push(`core: ${game.core}`);
+  lines.push("", `modes: ${game.modes.join(", ")}`, `core: ${game.core}`);
   if (game.dlc.length > 0)
     lines.push(`dlc: ${game.dlc.join(", ")}`);
   lines.push(`game files: ${game.gameFiles.source === "mount" ? game.gameFiles.host ?? "(unset)" : game.image.ref}`);
@@ -3922,9 +3996,25 @@ function gameHelp(name, game) {
 `) + `
 `;
 }
+function profileNotes2(config) {
+  const notes = [];
+  if (config.alias)
+    notes.push(`alias for ${config.alias}`);
+  if (config.extends)
+    notes.push(`extends ${config.extends}`);
+  if (config.autoDependencies === false)
+    notes.push("no auto dependencies");
+  const count = config.mods?.length ?? 0;
+  if (!config.alias)
+    notes.push(count === 1 ? "1 entry" : `${count} entries`);
+  if (config.aliases?.length)
+    notes.push(`aka ${config.aliases.join(", ")}`);
+  return notes.join(", ");
+}
 function gameSummary(game) {
   const count = Object.keys(game.profiles).length;
-  return `${count === 1 ? "1 profile" : `${count} profiles`}; modes ${game.modes.join(", ")}`;
+  const profiles = count === 1 ? "1 profile" : `${count} profiles`;
+  return `${profiles}; modes ${game.modes.join(", ")}`;
 }
 function flagRow(spec) {
   const notes = [];
@@ -3949,7 +4039,7 @@ function renderCompletion(shell) {
   const options = flags();
   const names = options.flatMap((f) => f.short ? [f.long, f.short] : [f.long]).join(" ");
   const valueFlags = options.filter((f) => f.required).map((f) => f.long);
-  const fn = `_${NAME.replace(/-/g, "_")}`;
+  const fn = `_${NAME.replaceAll("-", "_")}`;
   if (shell === "bash") {
     const cases = options.filter((f) => f.argChoices).map((f) => `    ${f.long}) COMPREPLY=($(compgen -W "${f.argChoices.join(" ")}" -- "$cur")); return ;;`).join(`
 `);
@@ -3974,12 +4064,13 @@ ${cases}
 complete -F ${fn} ${NAME}
 `;
   }
-  const zshVerbs = SUBCOMMANDS.map((s) => `    '${s.name}:${s.summary.replace(/'/g, "'\\''")}'`).join(`
+  const zshVerbs = SUBCOMMANDS.map((s) => `    '${s.name}:${s.summary.replaceAll("'", String.raw`'\''`)}'`).join(`
 `);
   const zshFlags = options.map((f) => {
-    const desc = f.description.replace(/'/g, "'\\''").replace(/[[\]:]/g, "");
+    const desc = f.description.replaceAll("'", String.raw`'\''`).replaceAll(/[[\]:]/g, "");
     const arg = placeholder(f);
-    const value = arg ? `:${arg.replace(/[<>]/g, "")}:${f.argChoices ? `(${f.argChoices.join(" ")})` : "_files"}` : "";
+    const choices = f.argChoices ? `(${f.argChoices.join(" ")})` : "_files";
+    const value = arg ? `:${arg.replaceAll(/[<>]/g, "")}:${choices}` : "";
     const repeat = Array.isArray(f.defaultValue) ? "*" : "";
     return `    '${repeat}${f.long}[${desc}]${value}'`;
   }).join(`
@@ -4051,7 +4142,7 @@ async function checkDocker(problems) {
     return true;
   problems.push({
     where: "docker",
-    message: `docker is not reachable: ${firstLine(result.stderr) || `exit ${result.code}`}`,
+    message: `docker is not reachable: ${firstLine(result.stderr) || exitCode(result.code)}`,
     suggestion: "start the docker daemon, or check that your user is in the docker group"
   });
   return false;
@@ -4064,7 +4155,7 @@ async function checkImageRunnable(ref, where, game, problems) {
   const corrupt = /content store|failed to extract layer|not found/i.test(run.stderr);
   problems.push({
     where,
-    message: corrupt ? `image ${ref} is present but unrunnable; its layers are missing from the content store` : `image ${ref} is present but failed to start: ${err || `exit ${run.code}`}`,
+    message: corrupt ? `image ${ref} is present but unrunnable; its layers are missing from the content store` : `image ${ref} is present but failed to start: ${err || exitCode(run.code)}`,
     suggestion: corrupt ? `docker image rm ${ref} && docker builder prune -f, then gamecrate build ${game}` : undefined
   });
 }
@@ -4098,7 +4189,7 @@ async function checkImage(plan, problems) {
   }
   problems.push({
     where,
-    message: `image ${image.ref} is not present locally and cannot be pulled: ${firstLine(remote.stderr) || `exit ${remote.code}`}`,
+    message: `image ${image.ref} is not present locally and cannot be pulled: ${firstLine(remote.stderr) || exitCode(remote.code)}`,
     suggestion: host ? `docker login ${host}` : undefined
   });
 }
@@ -4137,7 +4228,7 @@ function checkCdi(problems) {
     problems.push({ where: CDI_SPEC, message: `CDI spec is unreadable: ${message(error)}` });
     return;
   }
-  if (!/^\s*-?\s*name:\s*["']?all["']?\s*$/m.test(text)) {
+  if (!/^[ \t]*(?:-[ \t]*)?name:[ \t]*["']?all["']?[ \t]*$/m.test(text)) {
     problems.push({
       where: CDI_SPEC,
       message: 'CDI spec does not declare a device named "all"',
@@ -4214,6 +4305,9 @@ function hasStoredAuth(host) {
     return false;
   }
 }
+function exitCode(code) {
+  return `exit ${code}`;
+}
 function firstLine(text) {
   return text.trim().split(`
 `)[0]?.trim() ?? "";
@@ -4273,27 +4367,37 @@ async function adoptNewWindow(opts) {
   }
   const seen = new Set(before.map((w) => w.id));
   let stopped = false;
-  (async () => {
-    const deadline = Date.now() + WAIT_MS;
-    while (!stopped && Date.now() < deadline) {
-      await sleep5(POLL_MS);
-      if (stopped)
-        return;
-      for (const match of newMatches(await toplevels() ?? [], seen, opts.executable)) {
-        if (stopped)
-          return;
-        if (await claimedByPeer(match.id))
-          continue;
-        if (!await adopt(match.id, opts))
-          continue;
-        await capture(["wmctrl", "-i", "-r", match.id, "-N", opts.title]);
-        if (opts.stripDelete)
-          await watchForClose(match.id, () => stopped, opts.onClosed);
-        return;
-      }
+  pollForWindow(seen, opts, () => stopped);
+  return {
+    stop: () => {
+      stopped = true;
     }
-  })();
-  return { stop: () => void (stopped = true) };
+  };
+}
+async function pollForWindow(seen, opts, stopped) {
+  const deadline = Date.now() + WAIT_MS;
+  while (!stopped() && Date.now() < deadline) {
+    await sleep5(POLL_MS);
+    if (stopped())
+      return;
+    if (await adoptFirstMatch(seen, opts, stopped))
+      return;
+  }
+}
+async function adoptFirstMatch(seen, opts, stopped) {
+  for (const match of newMatches(await toplevels() ?? [], seen, opts.executable)) {
+    if (stopped())
+      return true;
+    if (await claimedByPeer(match.id))
+      continue;
+    if (!await adopt(match.id, opts))
+      continue;
+    await capture(["wmctrl", "-i", "-r", match.id, "-N", opts.title]);
+    if (opts.stripDelete)
+      await watchForClose(match.id, stopped, opts.onClosed);
+    return true;
+  }
+  return false;
 }
 async function watchForClose(id, stopped, onClosed) {
   let misses = 0;
@@ -4352,7 +4456,7 @@ async function dropDeleteProtocol(id, atoms) {
 }
 function parseAtoms(stdout) {
   const list = stdout.slice(stdout.indexOf(":") + 1).replace(/^\s*protocols\s*/, "");
-  return list.split(",").map((atom) => atom.trim()).filter((atom) => /^[A-Za-z_][A-Za-z0-9_]*$/.test(atom));
+  return list.split(",").map((atom) => atom.trim()).filter((atom) => /^[A-Za-z_]\w*$/.test(atom));
 }
 
 // src/launch/generate.ts
@@ -4718,7 +4822,9 @@ function derive(requests) {
   return `${slug2(first.root)}-${digest.slice(0, 6)}`;
 }
 function slug2(root) {
-  const body = basename9(root).toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[^a-z0-9]+/, "").slice(0, SLUG_LIMIT2).replace(/[-._]+$/, "");
+  let body = basename9(root).toLowerCase().replaceAll(/[^a-z0-9._-]+/g, "-").replace(/^[^a-z0-9]+/, "").slice(0, SLUG_LIMIT2);
+  while (body !== "" && "-._".includes(body.slice(-1)))
+    body = body.slice(0, -1);
   return body === "" ? "wt" : body;
 }
 
@@ -4736,7 +4842,7 @@ function cacheDir() {
   return join17(process.env["XDG_CACHE_HOME"] ?? join17(homedir4(), ".cache"), "gamecrate");
 }
 function globMatch(pattern, path) {
-  return picomatch.isMatch(path, pattern.replace(/[[\]{}()!,@+|^$.\\]/g, "\\$&"), { dot: true });
+  return picomatch.isMatch(path, pattern.replaceAll(/[[\]{}()!,@+|^$.\\]/g, String.raw`\$&`), { dot: true });
 }
 function excluded(patterns, relativePath) {
   return patterns.some((p) => globMatch(p, relativePath) || globMatch(p, `${relativePath}/`));
@@ -4922,7 +5028,7 @@ function compareTiers(a, b) {
   return 0;
 }
 function rank(a, b) {
-  return compareTiers(a, b) || byClone(a, b) || (a.dir < b.dir ? -1 : a.dir > b.dir ? 1 : 0);
+  return compareTiers(a, b) || byClone(a, b) || Number(a.dir > b.dir) - Number(a.dir < b.dir);
 }
 function byClone(a, b) {
   if (a.clonedAt === undefined || b.clonedAt === undefined)
@@ -4936,13 +5042,7 @@ async function applyWorktreeRequests(index, requests, config) {
   for (const bucket of index.byPackageId.values()) {
     for (const record of bucket) {
       known.add(record.dir);
-      for (const request of requests) {
-        if (!contains(request, record.dir))
-          continue;
-        record.worktree = { root: request.root, branch: request.branch, source: request.source };
-        record.selectedWorktree = request.order;
-        break;
-      }
+      stampOwner(record, requests);
     }
   }
   for (const request of requests) {
@@ -4952,14 +5052,25 @@ async function applyWorktreeRequests(index, requests, config) {
     if (fresh.length === 0)
       continue;
     for (const record of await parseAll(fresh, config, index.plugin, index.problems)) {
-      record.worktree = { root: request.root, branch: request.branch, source: request.source };
-      record.selectedWorktree = request.order;
+      markWorktree(record, request);
       insert(index, record);
     }
   }
   for (const bucket of index.byPackageId.values())
     bucket.sort(rank);
 }
+function stampOwner(record, requests) {
+  for (const request of requests) {
+    if (!contains(request, record.dir))
+      continue;
+    markWorktree(record, request);
+    return;
+  }
+}
+function markWorktree(record, request) {
+  record.worktree = { root: request.root, branch: request.branch, source: request.source };
+  record.selectedWorktree = request.order;
+}
 var WORKTREE_SCAN_DEPTH = 5;
 var WORKTREE_EXCLUDE = ["**/.retired/**", "**/node_modules/**", "**/bin/**", "**/obj/**"];
 async function applySourceOverrides(index, overrides, config) {
@@ -5045,51 +5156,58 @@ async function buildIndex(game, config, plugin, sourcesDir, dataRoot) {
     byShortName: new Map,
     problems: []
   };
+  const cacheIndex = config.scanRoots.length;
+  await indexLocal(index, config, sourcesDir, cacheIndex);
+  await indexWorkshop(index, config, dataRoot, cacheIndex);
+  for (const bucket of index.byPackageId.values())
+    bucket.sort(rank);
+  return index;
+}
+async function indexLocal(index, config, sourcesDir, cacheIndex) {
   const local = [];
   await scanGameData(config, -1, local);
   for (const [i, root] of config.scanRoots.entries()) {
     await scanLocalRoot(root, i, config.manifest.file, local);
   }
-  const cacheIndex = config.scanRoots.length;
-  const parsed = await parseAll(local, config, plugin, index.problems);
+  const parsed = await parseAll(local, config, index.plugin, index.problems);
   if (sourcesDir !== undefined) {
     const cache = [];
     await scanLocalRoot({ path: sourcesDir, maxDepth: 4 }, cacheIndex, config.manifest.file, cache);
-    parsed.push(...oneModPerClone(await parseAll(cache, config, plugin, index.problems), sourcesDir));
+    const records = await parseAll(cache, config, index.plugin, index.problems);
+    parsed.push(...oneModPerClone(records, sourcesDir));
   }
   for (const record of parsed)
     insert(index, record);
-  const workshopRoots = [];
+}
+async function indexWorkshop(index, config, dataRoot, cacheIndex) {
+  const roots = [];
   if (dataRoot !== undefined)
-    workshopRoots.push(downloadRoot(dataRoot, config));
+    roots.push(downloadRoot(dataRoot, config));
   if (config.workshopRoot !== null)
-    workshopRoots.push(config.workshopRoot);
-  if (workshopRoots.length > 0) {
-    const stamp = workshopStamp(config, dataRoot);
-    const cached = stamp === null ? null : await readWorkshopCache(game, stamp);
-    if (cached) {
-      for (const record of cached)
-        insert(index, record);
-    } else {
-      const items = [];
-      for (const [i, root] of workshopRoots.entries()) {
-        await scanWorkshopRoot(root, cacheIndex + 1 + i, config.manifest.file, items);
-      }
-      const records = await parseAll(items, config, plugin, index.problems);
-      for (const record of records)
-        insert(index, record);
-      if (stamp !== null)
-        await writeWorkshopCache(game, stamp, records);
-    }
+    roots.push(config.workshopRoot);
+  if (roots.length === 0)
+    return;
+  const stamp = workshopStamp(config, dataRoot);
+  const cached = stamp === null ? null : await readWorkshopCache(index.game, stamp);
+  if (cached) {
+    for (const record of cached)
+      insert(index, record);
+    return;
   }
-  for (const bucket of index.byPackageId.values())
-    bucket.sort(rank);
-  return index;
+  const items = [];
+  for (const [i, root] of roots.entries()) {
+    await scanWorkshopRoot(root, cacheIndex + 1 + i, config.manifest.file, items);
+  }
+  const records = await parseAll(items, config, index.plugin, index.problems);
+  for (const record of records)
+    insert(index, record);
+  if (stamp !== null)
+    await writeWorkshopCache(index.game, stamp, records);
 }
 function oneModPerClone(records, sourcesDir) {
   const kept = new Map;
   const stamps = new Map;
-  for (const record of [...records].sort((a, b) => a.dir < b.dir ? -1 : a.dir > b.dir ? 1 : 0)) {
+  for (const record of [...records].sort((a, b) => Number(a.dir > b.dir) - Number(a.dir < b.dir))) {
     const clone = relative3(sourcesDir, record.dir).split(sep2).slice(0, 2).join(sep2);
     const at = join17(sourcesDir, clone);
     let stamp = stamps.get(at);
@@ -5144,9 +5262,9 @@ function resolveRaw(index, ref, game) {
     return resolveRaw(index, alias, game);
   }
   const short = index.byShortName.get(ref.toLowerCase());
-  if (short && short.length === 1)
+  if (short?.length === 1)
     return pick(index, short[0].toLowerCase(), ref);
-  if (short && short.length > 1) {
+  if (short !== undefined && short.length > 1) {
     throw new GamecrateError(`"${ref}" is a short name for ${short.length} mods`, Exit.Resolution, short.join(", "));
   }
   return null;
@@ -5240,7 +5358,7 @@ function expandDynamic(entry, index, where, problems) {
   const head = matched.filter((id) => firstOrder.includes(id.toLowerCase())).sort((a, b) => firstOrder.indexOf(a.toLowerCase()) - firstOrder.indexOf(b.toLowerCase()));
   const rest = matched.filter((id) => !firstOrder.includes(id.toLowerCase()));
   if ((entry.sort ?? "alpha") === "alpha") {
-    rest.sort((a, b) => a.toLowerCase() < b.toLowerCase() ? -1 : a.toLowerCase() > b.toLowerCase() ? 1 : 0);
+    rest.sort((a, b) => Number(a.toLowerCase() > b.toLowerCase()) - Number(a.toLowerCase() < b.toLowerCase()));
   }
   return [...head, ...rest];
 }
@@ -5297,6 +5415,42 @@ function topoSort(list, problems, core) {
   const position = new Map;
   for (const [i, mod] of list.entries())
     position.set(mod.record.packageId.toLowerCase(), i);
+  const { indegree, outgoing, incoming } = graph(list, position);
+  const coreIndex = core === undefined ? undefined : position.get(core.toLowerCase());
+  const preCore = reachesCore(incoming, coreIndex);
+  const phase = (i) => preCore.has(i) ? 0 : 1;
+  const sorted = [];
+  const done = list.map(() => false);
+  for (;; ) {
+    const next = nextReady(done, indegree, phase);
+    if (next === -1)
+      break;
+    done[next] = true;
+    sorted.push(list[next]);
+    for (const to of outgoing[next])
+      indegree[to] -= 1;
+  }
+  const cycle = list.filter((_, i) => !done[i]);
+  if (cycle.length > 0) {
+    problems.push({
+      where: "flag --sort topo",
+      message: `load-order cycle among ${cycle.map((m) => m.record.packageId).join(", ")}; left in profile order`
+    });
+    sorted.push(...cycle);
+  }
+  return sorted;
+}
+function nextReady(done, indegree, phase) {
+  let next = -1;
+  for (let i = 0;i < done.length; i++) {
+    if (done[i] || indegree[i] !== 0)
+      continue;
+    if (next === -1 || phase(i) < phase(next))
+      next = i;
+  }
+  return next;
+}
+function graph(list, position) {
   const edges = new Set;
   const addEdge = (from, to) => {
     if (from === undefined || to === undefined || from === to)
@@ -5319,46 +5473,22 @@ function topoSort(list, problems, core) {
     incoming[to].push(from);
     indegree[to] += 1;
   }
+  return { indegree, outgoing, incoming };
+}
+function reachesCore(incoming, coreIndex) {
   const preCore = new Set;
-  const coreIndex = core === undefined ? undefined : position.get(core.toLowerCase());
-  if (coreIndex !== undefined) {
-    const queue = [coreIndex];
-    while (queue.length > 0) {
-      for (const from of incoming[queue.pop()]) {
-        if (preCore.has(from))
-          continue;
-        preCore.add(from);
-        queue.push(from);
-      }
-    }
-  }
-  const phase = (i) => preCore.has(i) ? 0 : 1;
-  const sorted = [];
-  const done = list.map(() => false);
-  for (;; ) {
-    let next = -1;
-    for (let i = 0;i < list.length; i++) {
-      if (done[i] || indegree[i] !== 0)
+  if (coreIndex === undefined)
+    return preCore;
+  const queue = [coreIndex];
+  while (queue.length > 0) {
+    for (const from of incoming[queue.pop()]) {
+      if (preCore.has(from))
         continue;
-      if (next === -1 || phase(i) < phase(next))
-        next = i;
+      preCore.add(from);
+      queue.push(from);
     }
-    if (next === -1)
-      break;
-    done[next] = true;
-    sorted.push(list[next]);
-    for (const to of outgoing[next])
-      indegree[to] -= 1;
-  }
-  const cycle = list.filter((_, i) => !done[i]);
-  if (cycle.length > 0) {
-    problems.push({
-      where: "flag --sort topo",
-      message: `load-order cycle among ${cycle.map((m) => m.record.packageId).join(", ")}; left in profile order`
-    });
-    sorted.push(...cycle);
   }
-  return sorted;
+  return preCore;
 }
 function incompatibilityWarnings(list) {
   const byId = new Map(list.map((mod) => [mod.record.packageId.toLowerCase(), mod.record.packageId]));
@@ -5378,6 +5508,96 @@ function incompatibilityWarnings(list) {
   }
   return warnings;
 }
+function stageSlots(input) {
+  const { game, gameName, profileName, profile, args, index } = input;
+  const excluded = [...profile.exclude ?? [], ...args.without ?? []].map(globToRegExp);
+  const isExcluded = (id) => excluded.some((pattern) => pattern.test(id));
+  const staged = [];
+  const present = new Set;
+  for (const slot of collectSlots(game, gameName, profileName, profile, args)) {
+    for (const { ref, optional } of slotRefs(slot, input)) {
+      const record = resolveModRef(index, ref, game);
+      if (!record) {
+        reportMissing(slot, ref, optional, input);
+        continue;
+      }
+      const key = record.packageId.toLowerCase();
+      if (present.has(key) || isExcluded(record.packageId))
+        continue;
+      present.add(key);
+      staged.push({ record, explicit: true });
+    }
+  }
+  return { staged, present };
+}
+function slotRefs(slot, input) {
+  const { entry } = slot;
+  if (isDynamic(entry)) {
+    return expandDynamic(entry, input.index, slot.where, input.problems).map((id) => ({ ref: id, optional: false }));
+  }
+  return [
+    {
+      ref: refFor(entry, input.game, input.sources),
+      optional: typeof entry !== "string" && entry.optional === true
+    }
+  ];
+}
+function reportMissing(slot, ref, optional, input) {
+  if (slot.dlc === true)
+    return;
+  if (optional) {
+    input.warnings.push(`optional mod ${ref} is not installed; skipped`);
+    return;
+  }
+  if (ref.startsWith("workshop:") && input.unfetched.has(ref.slice(9))) {
+    input.problems.push({ where: slot.where, message: notFetched(ref.slice(9)) });
+    return;
+  }
+  input.problems.push({ where: slot.where, message: `no mod matches "${ref}"` });
+}
+function relabelUnfetched(problems, unfetched) {
+  if (unfetched.size === 0)
+    return;
+  for (const problem of problems) {
+    const id = workshopUrlId(problem.suggestion);
+    if (id !== undefined && unfetched.has(id))
+      problem.message = notFetched(id);
+  }
+}
+async function describeMod({ record, explicit }, game, index, warnings) {
+  const times = record.kind === "local" ? await scanBuildTimes(record.dir) : null;
+  const report = times === null ? null : staleReport(times);
+  if (record.worktree) {
+    warnings.push(`${record.packageId} comes from worktree ${record.worktree.branch} (${record.worktree.source}): ${record.dir}`);
+  }
+  const shadowed = (index.byPackageId.get(record.packageId.toLowerCase()) ?? []).filter((other) => other.dir !== record.dir).map((other) => other.dir);
+  return {
+    packageId: record.packageId,
+    hostDir: record.dir,
+    containerDir: `${game.modsDir.container}/${record.packageId}`,
+    kind: record.kind,
+    ...record.workshopId === undefined ? {} : { workshopId: record.workshopId },
+    explicit,
+    stale: times === null ? false : decideStale(times),
+    ...report === null ? {} : { staleReport: report },
+    ...record.worktree === undefined ? {} : { worktree: { ...record.worktree, selected: record.selectedWorktree !== undefined } },
+    ...shadowed.length === 0 ? {} : { shadowed }
+  };
+}
+function checkDataDir(problems, gameName, game) {
+  if (game.dataDir.mode === "arg" && game.dataDir.arg.split("=").length !== 2) {
+    problems.push({
+      where: `/games/${gameName}/dataDir/arg`,
+      message: `"${game.dataDir.arg}" must contain exactly one "="; RimWorld silently ignores anything else`
+    });
+  }
+  if (game.dataDir.container.includes("=")) {
+    problems.push({
+      where: `/games/${gameName}/dataDir/container`,
+      message: `container data path "${game.dataDir.container}" contains "=", which disables the override silently`
+    });
+  }
+}
 async function resolvePlan(options) {
   const { game: gameName, profile: requestedProfile, root } = options;
   const args = options.args ?? {};
@@ -5413,78 +5633,28 @@ async function resolvePlan(options) {
   const index = options.index ?? await buildIndex(gameName, game, plugin, sourcesRoot(root.dataRoot), root.dataRoot);
   await applyWorktreeRequests(index, instance.requests, game);
   problems.push(...await applySourceOverrides(index, args.use ?? [], game));
-  const excluded = [...profile.exclude ?? [], ...args.without ?? []].map(globToRegExp);
-  const isExcluded = (id) => excluded.some((pattern) => pattern.test(id));
-  const staged = [];
-  const present = new Set;
-  for (const slot of collectSlots(game, gameName, profileName, profile, args)) {
-    const entry = slot.entry;
-    const refs = isDynamic(entry) ? expandDynamic(entry, index, slot.where, problems).map((id) => ({ ref: id, optional: false })) : [{ ref: refFor(entry, game, sources), optional: typeof entry !== "string" && entry.optional === true }];
-    for (const { ref, optional } of refs) {
-      const record = resolveModRef(index, ref, game);
-      if (!record) {
-        if (slot.dlc === true)
-          continue;
-        if (optional)
-          warnings.push(`optional mod ${ref} is not installed; skipped`);
-        else if (ref.startsWith("workshop:") && unfetched.has(ref.slice(9))) {
-          problems.push({ where: slot.where, message: notFetched(ref.slice(9)) });
-        } else
-          problems.push({ where: slot.where, message: `no mod matches "${ref}"` });
-        continue;
-      }
-      const key = record.packageId.toLowerCase();
-      if (present.has(key) || isExcluded(record.packageId))
-        continue;
-      present.add(key);
-      staged.push({ record, explicit: true });
-    }
-  }
+  const { staged, present } = stageSlots({
+    game,
+    gameName,
+    profileName,
+    profile,
+    args,
+    index,
+    sources,
+    unfetched,
+    problems,
+    warnings
+  });
   if (profile.autoDependencies !== false)
     insertDependencies(staged, present, index, game, problems);
-  if (unfetched.size > 0) {
-    for (const problem of problems) {
-      const id = workshopUrlId(problem.suggestion);
-      if (id !== undefined && unfetched.has(id))
-        problem.message = notFetched(id);
-    }
-  }
+  relabelUnfetched(problems, unfetched);
   const ordered = args.sort === "none" ? staged : topoSort(staged, problems, game.core);
   warnings.push(...incompatibilityWarnings(ordered));
   const mods = [];
-  for (const { record, explicit } of ordered) {
-    const times = record.kind === "local" ? await scanBuildTimes(record.dir) : null;
-    const report = times === null ? null : staleReport(times);
-    if (record.worktree) {
-      warnings.push(`${record.packageId} comes from worktree ${record.worktree.branch} (${record.worktree.source}): ${record.dir}`);
-    }
-    const shadowed = (index.byPackageId.get(record.packageId.toLowerCase()) ?? []).filter((other) => other.dir !== record.dir).map((other) => other.dir);
-    mods.push({
-      packageId: record.packageId,
-      hostDir: record.dir,
-      containerDir: `${game.modsDir.container}/${record.packageId}`,
-      kind: record.kind,
-      ...record.workshopId === undefined ? {} : { workshopId: record.workshopId },
-      explicit,
-      stale: times === null ? false : decideStale(times),
-      ...report === null ? {} : { staleReport: report },
-      ...record.worktree === undefined ? {} : { worktree: { ...record.worktree, selected: record.selectedWorktree !== undefined } },
-      ...shadowed.length === 0 ? {} : { shadowed }
-    });
-  }
+  for (const entry of ordered)
+    mods.push(await describeMod(entry, game, index, warnings));
   problems.push(...index.problems);
-  if (game.dataDir.mode === "arg" && game.dataDir.arg.split("=").length !== 2) {
-    problems.push({
-      where: `/games/${gameName}/dataDir/arg`,
-      message: `"${game.dataDir.arg}" must contain exactly one "="; RimWorld silently ignores anything else`
-    });
-  }
-  if (game.dataDir.container.includes("=")) {
-    problems.push({
-      where: `/games/${gameName}/dataDir/container`,
-      message: `container data path "${game.dataDir.container}" contains "=", which disables the override silently`
-    });
-  }
+  checkDataDir(problems, gameName, game);
   const mode = args.mode ?? "headed";
   if (!game.modes.includes(mode)) {
     problems.push({ where: "flag --mode", message: `${gameName} does not support mode "${mode}"` });
@@ -5582,29 +5752,34 @@ async function listRuns(dataRoot, docker = dockerPs) {
   const out = [...running];
   for (const lock of await walkLocks(dataRoot)) {
     const match = byContainer.get(lock.container);
-    if (match !== undefined) {
-      const stale = match.pid !== undefined && !isRunning(match.pid, match.startedAt);
-      if (match.pid === undefined || stale && isRunning(lock.pid, lock.startedAt)) {
-        match.pid = lock.pid;
-        match.startedAt = lock.startedAt;
-        if (lock.mode !== undefined)
-          match.mode = lock.mode;
-      }
-      continue;
-    }
-    out.push({
-      game: lock.game,
-      profile: lock.profile,
-      ...lock.instance === undefined ? {} : { instance: lock.instance },
-      container: lock.container,
-      pid: lock.pid,
-      ...lock.mode === undefined ? {} : { mode: lock.mode },
-      startedAt: lock.startedAt,
-      status: isRunning(lock.pid, lock.startedAt) ? "starting" : "orphaned"
-    });
+    if (match === undefined)
+      out.push(fromLock(lock));
+    else
+      mergeLock(match, lock);
   }
   return out;
 }
+function mergeLock(match, lock) {
+  const stale = match.pid !== undefined && !isRunning(match.pid, match.startedAt);
+  if (match.pid !== undefined && !(stale && isRunning(lock.pid, lock.startedAt)))
+    return;
+  match.pid = lock.pid;
+  match.startedAt = lock.startedAt;
+  if (lock.mode !== undefined)
+    match.mode = lock.mode;
+}
+function fromLock(lock) {
+  return {
+    game: lock.game,
+    profile: lock.profile,
+    ...lock.instance === undefined ? {} : { instance: lock.instance },
+    container: lock.container,
+    pid: lock.pid,
+    ...lock.mode === undefined ? {} : { mode: lock.mode },
+    startedAt: lock.startedAt,
+    status: isRunning(lock.pid, lock.startedAt) ? "starting" : "orphaned"
+  };
+}
 
 // src/launch/stage.ts
 import { lstat, mkdir as mkdir5, readdir as readdir10, realpath as realpath2, rm as rm4, stat as stat5 } from "node:fs/promises";
@@ -5817,7 +5992,7 @@ function published2(value) {
 }
 
 // src/index.ts
-var VERSION = "1.4.0";
+var VERSION = "1.4.1";
 async function main(argv) {
   const supervised = supervisedDir(argv);
   try {
@@ -5949,7 +6124,7 @@ async function run2(argv, args, config, plugins, defaults, asShell) {
   const sources = await prepareSources(gameConfig, profile, args, config.dataRoot, allowFetch);
   try {
     const workshop = await prepareWorkshop(gameConfig, profile, args, config, allowFetch, requirePlugin(plugins, game), sources.dirs);
-    return await resolved(argv, args, config, plugins, asShell, game, profile, sources, workshop, allowFetch);
+    return await resolved({ argv, args, config, plugins, asShell, game, profile, sources, workshop, allowFetch });
   } finally {
     await sources.release();
   }
@@ -5965,7 +6140,8 @@ function warnUnfetched(problems, unfetched) {
   }
   return fatal;
 }
-async function resolved(argv, args, config, plugins, asShell, game, profile, sources, workshop, allowFetch) {
+async function resolved(inputs) {
+  const { argv, args, config, plugins, asShell, game, profile, sources, workshop, allowFetch } = inputs;
   for (const warning of [...sources.warnings, ...workshop.warnings])
     warn(warning);
   const index = await buildIndex(game, config.games[game], requirePlugin(plugins, game), sourcesRoot(config.dataRoot), config.dataRoot);
@@ -5974,21 +6150,8 @@ async function resolved(argv, args, config, plugins, asShell, game, profile, sou
   if (fatal.length > 0)
     reportProblems(fatal);
   const identity = resolveIdentity(args.root);
-  if (args.printPlan || args.dryRun) {
-    const environment = await preflight(plan);
-    buildRunSpec(plan, [], identity);
-    if (args.printPlan)
-      printPlan(plan, args.json);
-    for (const warning of planWarnings(plan))
-      warn(warning);
-    if (environment.length > 0)
-      reportEnvironment(environment);
-    if (!args.printPlan) {
-      const what = plan.instance === undefined ? profile : `${profile}/${plan.instance}`;
-      status(`${game} ${what}: ${plan.mods.length} mods resolve cleanly`);
-    }
-    return Exit.Ok;
-  }
+  if (args.printPlan || args.dryRun)
+    return await reportPlanOnly(plan, args, profile, identity);
   const environment = await preflight(plan);
   if (environment.length > 0)
     reportEnvironment(environment);
@@ -6008,6 +6171,21 @@ async function resolved(argv, args, config, plugins, asShell, game, profile, sou
     await lock.release();
   }
 }
+async function reportPlanOnly(plan, args, profile, identity) {
+  const environment = await preflight(plan);
+  buildRunSpec(plan, [], identity);
+  if (args.printPlan)
+    printPlan(plan, args.json);
+  for (const warning of planWarnings(plan))
+    warn(warning);
+  if (environment.length > 0)
+    reportEnvironment(environment);
+  if (!args.printPlan) {
+    const what = plan.instance === undefined ? profile : `${profile}/${plan.instance}`;
+    status(`${plan.game} ${what}: ${plan.mods.length} mods resolve cleanly`);
+  }
+  return Exit.Ok;
+}
 async function launch(plan, args, config, identity, asShell, profileSpec, releaseSources) {
   const game = plan.game;
   const profile = plan.profile;
@@ -6021,12 +6199,13 @@ run: gamecrate fix-perms ${game} ${profile}`);
   plan.runDirHost = runDir;
   const supervisorLog = args.supervised && args.log === undefined ? redirectOutput(join22(runDir, "supervisor.log")) : undefined;
   try {
-    return await execute(plan, args, config, identity, asShell, profileSpec, runDir, releaseSources);
+    return await execute({ plan, args, config, identity, asShell, profileSpec, runDir, releaseSources });
   } finally {
     supervisorLog?.close();
   }
 }
-async function execute(plan, args, config, identity, asShell, profileSpec, runDir, releaseSources) {
+async function execute(inputs) {
+  const { plan, args, config, identity, asShell, profileSpec, runDir, releaseSources } = inputs;
   const game = plan.game;
   await buildLocalMods(plan, buildPolicy(args, profileSpec));
   await releaseSources();
@@ -6153,7 +6332,7 @@ async function copyOutLogs(plan) {
   const source = join22(plan.dataDirHost, spec.from);
   if (!existsSync12(source))
     return;
-  const target = join22(plan.runDirHost, basename11(spec.from.replace(/\/+$/, "")));
+  const target = join22(plan.runDirHost, basename11(spec.from));
   try {
     await cp(source, target, { recursive: true, force: true });
   } catch (error) {
@@ -6176,24 +6355,17 @@ async function mods(args, config, plugins, defaults) {
   return Exit.Ok;
 }
 function usesWorkshop(game) {
-  for (const entry of Object.values(game.library ?? {})) {
-    if (entry.workshop !== undefined)
-      return true;
-  }
-  for (const ref of [...game.preCore ?? [], game.core, ...game.dlc, ...game.base ?? []]) {
-    if (ref.startsWith("workshop:"))
-      return true;
-  }
-  for (const profile of Object.values(game.profiles)) {
-    for (const entry of profile.mods ?? []) {
-      if (typeof entry === "string") {
-        if (entry.startsWith("workshop:"))
-          return true;
-      } else if ("workshop" in entry && entry.workshop !== undefined)
-        return true;
-    }
-  }
-  return false;
+  if (Object.values(game.library ?? {}).some((entry) => entry.workshop !== undefined))
+    return true;
+  const slots = [...game.preCore ?? [], game.core, ...game.dlc, ...game.base ?? []];
+  if (slots.some((ref) => ref.startsWith("workshop:")))
+    return true;
+  return Object.values(game.profiles).some((profile) => (profile.mods ?? []).some(isWorkshopEntry));
+}
+function isWorkshopEntry(entry) {
+  if (typeof entry === "string")
+    return entry.startsWith("workshop:");
+  return "workshop" in entry && entry.workshop !== undefined;
 }
 function steamcmdSource(runner, config) {
   if (runner.kind === "docker")
@@ -6207,37 +6379,44 @@ async function doctor(config, plugins) {
     const gameConfig = config.games[game];
     const sources = cachedSources(gameConfig, "modless", {}, config.dataRoot);
     const { plan, problems } = await resolvePlan({ game, profile: "modless", root: config, plugins, sources });
-    const steamcmd = [];
-    if (usesWorkshop(gameConfig)) {
-      try {
-        status(`${game}: steamcmd ${steamcmdSource(resolveSteamcmd(config), config)}`);
-      } catch (error) {
-        steamcmd.push({
-          where: "steamcmd",
-          message: error instanceof Error ? error.message : String(error),
-          ...error instanceof GamecrateError && error.detail !== undefined ? { suggestion: error.detail } : {}
-        });
-      }
-      const root = downloadRoot(config.dataRoot, gameConfig);
-      status(`${game}: workshop downloads ${root}${existsSync12(root) ? "" : " (not created yet)"}`);
-    }
-    const all = [...problems, ...await preflight(plan), ...steamcmd];
-    if (all.length === 0) {
-      status(`${game}: ok`);
-      continue;
-    }
-    failed = true;
-    status(`${game}: ${all.length} problem(s)`);
-    for (const problem of all) {
-      process.stderr.write(`  ${problem.where}
+    const all = [...problems, ...await preflight(plan), ...steamcmdProblems(game, gameConfig, config)];
+    if (!reportDoctor(game, all))
+      failed = true;
+  }
+  return failed ? Exit.Environment : Exit.Ok;
+}
+function steamcmdProblems(game, gameConfig, config) {
+  if (!usesWorkshop(gameConfig))
+    return [];
+  const problems = [];
+  try {
+    status(`${game}: steamcmd ${steamcmdSource(resolveSteamcmd(config), config)}`);
+  } catch (error) {
+    problems.push({
+      where: "steamcmd",
+      message: error instanceof Error ? error.message : String(error),
+      ...error instanceof GamecrateError && error.detail !== undefined ? { suggestion: error.detail } : {}
+    });
+  }
+  const root = downloadRoot(config.dataRoot, gameConfig);
+  status(`${game}: workshop downloads ${root}${existsSync12(root) ? "" : " (not created yet)"}`);
+  return problems;
+}
+function reportDoctor(game, all) {
+  if (all.length === 0) {
+    status(`${game}: ok`);
+    return true;
+  }
+  status(`${game}: ${all.length} problem(s)`);
+  for (const problem of all) {
+    process.stderr.write(`  ${problem.where}
     ${problem.message}
 `);
-      if (problem.suggestion)
-        process.stderr.write(`      try: ${problem.suggestion}
+    if (problem.suggestion)
+      process.stderr.write(`      try: ${problem.suggestion}
 `);
-    }
   }
-  return failed ? Exit.Environment : Exit.Ok;
+  return false;
 }
 async function logs(args, config, defaults) {
   const game = requireGame(args, config);
@@ -6306,7 +6485,7 @@ async function verify(args, config, plugins, defaults) {
     reportProblems(problems);
   const name = containerName(plan);
   const info = await inspectContainer(name);
-  if (info === null || !info.running) {
+  if (!info?.running) {
     throw new GamecrateError(`no container named ${name} is running`, Exit.Environment, "launch it first, or name the run with --instance or --worktree");
   }
   const prefix = `${plan.gameConfig.modsDir.container}/`;
@@ -6370,8 +6549,7 @@ function renderVerify(name, info, plan, boundMods) {
   const stampWidth = Math.max(...stamps.map((s) => s.length));
   for (const [i, mod] of boundMods.entries()) {
     const origin = mod.branch === null ? "" : `worktree ${mod.branch}`;
-    out.push(`  ${mod.packageId.padEnd(idWidth)}  ${paths[i].padEnd(pathWidth)} ${origin}`.trimEnd());
-    out.push(`  ${" ".repeat(idWidth)}  ${stamps[i].padEnd(stampWidth)}   ${boundStatus(mod)}`);
+    out.push(`  ${mod.packageId.padEnd(idWidth)}  ${paths[i].padEnd(pathWidth)} ${origin}`.trimEnd(), `  ${" ".repeat(idWidth)}  ${stamps[i].padEnd(stampWidth)}   ${boundStatus(mod)}`);
   }
   return out.join(`
 `);
@@ -6552,6 +6730,24 @@ async function configEdit(args) {
   status(`${path} is valid`);
   return Exit.Ok;
 }
+async function repairOwnership(found, identity) {
+  let fixed = 0;
+  const stuck = [];
+  for (const path of found) {
+    const chowned = await chown(path, identity.uid, identity.gid).then(() => true, () => false);
+    if (chowned) {
+      fixed += 1;
+      continue;
+    }
+    if (await removeIfEmptyDir(path)) {
+      status(`removed empty ${path}; it will be recreated on the next run`);
+      fixed += 1;
+      continue;
+    }
+    stuck.push(path);
+  }
+  return { fixed, stuck };
+}
 async function fixPerms(args, config) {
   const game = requireGame(args, config);
   const identity = resolveIdentity(false);
@@ -6572,21 +6768,7 @@ async function fixPerms(args, config) {
     status(`${found.length} foreign-owned path(s); re-run with --yes to chown them`);
     return Exit.Environment;
   }
-  let fixed = 0;
-  const stuck = [];
-  for (const path of found) {
-    const chowned = await chown(path, identity.uid, identity.gid).then(() => true, () => false);
-    if (chowned) {
-      fixed += 1;
-      continue;
-    }
-    if (await removeIfEmptyDir(path)) {
-      status(`removed empty ${path}; it will be recreated on the next run`);
-      fixed += 1;
-      continue;
-    }
-    stuck.push(path);
-  }
+  const { fixed, stuck } = await repairOwnership(found, identity);
   if (fixed > 0)
     status(`fixed ${fixed} path(s) for ${identity.uid}:${identity.gid}`);
   if (stuck.length > 0) {