turbollm 1.13.5 → 1.13.7

package/dist/cli.js

@@ -788,7 +788,7 @@ function clampMaxTokens(requested, limit) {
 }
 
 // src/engines/manager.ts
-import { execFile as execFile6, spawn, spawnSync } from "child_process";
+import { execFile as execFile7, spawn, spawnSync } from "child_process";
 import { createWriteStream, existsSync as existsSync10, mkdirSync as mkdirSync5, readdirSync as readdirSync2, readFileSync as readFileSync2, rmSync as rmSync5, writeFileSync as writeFileSync2 } from "fs";
 import { createConnection, createServer } from "net";
 import { dirname as dirname2, join as join10 } from "path";
@@ -1213,10 +1213,99 @@ async function restoreSlot(p) {
 
 // src/engines/vllm.ts
 import { existsSync as existsSync8 } from "fs";
-import { execFile as execFile4 } from "child_process";
+import { execFile as execFile5 } from "child_process";
 import { join as join8 } from "path";
+import { promisify as promisify5 } from "util";
+
+// src/engines/py-engine-blocker.ts
+import { execFile as execFile4 } from "child_process";
+import { homedir as homedir2 } from "os";
 import { promisify as promisify4 } from "util";
 var execFileP4 = promisify4(execFile4);
+var DETAIL_LIMIT = 200;
+var UvloopPreflight = class {
+  constructor(engine, homeDirectory = homedir2) {
+    this.engine = engine;
+    this.homeDirectory = homeDirectory;
+  }
+  engine;
+  homeDirectory;
+  async blockerFor(python) {
+    try {
+      await execFileP4(python, ["-c", "import uvloop"], { timeout: 2e4 });
+      return null;
+    } catch (error) {
+      return this.classify(process.platform, error);
+    }
+  }
+  // uvloop publishes manylinux *and* macOS wheels, so only Windows is a real platform wall —
+  // anywhere else a failed import is a broken local environment the user can reinstall.
+  classify(platform, error) {
+    if (platform === "win32") return this.unsupportedPlatform();
+    const failure = error;
+    if (failure?.code === "ENOENT") return this.missingInterpreter();
+    return this.brokenEnvironment(platform, failure);
+  }
+  unsupportedPlatform() {
+    return `${this.engine} cannot run on Windows: its server requires uvloop (and other Linux-only components such as NCCL/Triton), which have no Windows build. Use the llama.cpp / TurboQuant engine for GGUF models here, or run ${this.engine} under WSL2 / Linux.`;
+  }
+  missingInterpreter() {
+    return `${this.engine}'s environment looks missing or broken (interpreter not found). Reinstall the ${this.engine} engine from the Engines page.`;
+  }
+  brokenEnvironment(platform, failure) {
+    return `${this.engine}'s environment looks broken or incomplete (uvloop failed to import: ${failureDetail(failure, this.homeOrEmpty())}). ${this.platformStanding(platform)}`;
+  }
+  // homedir() throws (uv_os_homedir ENOENT) for a uid with no passwd entry and no HOME, e.g. a container.
+  homeOrEmpty() {
+    try {
+      return this.homeDirectory();
+    } catch {
+      return "";
+    }
+  }
+  // Only what is true is claimed: Linux is where these engines are officially supported, while on
+  // macOS the catalog rates them experimental / unsupported upstream, so only uvloop's own support
+  // may be asserted there.
+  platformStanding(platform) {
+    const plat = platformDisplay(platform);
+    if (platform === "linux") {
+      return `${plat} is a supported platform for ${this.engine} \u2014 reinstall the ${this.engine} engine from the Engines page rather than switching engines.`;
+    }
+    if (platform === "darwin") {
+      return `uvloop itself supports ${plat}, so reinstall the ${this.engine} engine from the Engines page first \u2014 though ${plat} is not a first-class platform for ${this.engine} upstream.`;
+    }
+    return `${this.engine} support on ${plat} is unverified \u2014 reinstall the ${this.engine} engine from the Engines page; if the import keeps failing, ${this.engine} may have no working build here.`;
+  }
+};
+function platformDisplay(platform) {
+  if (platform === "win32") return "Windows";
+  if (platform === "darwin") return "macOS";
+  if (platform === "linux") return "Linux";
+  return platform;
+}
+function failureDetail(failure, home) {
+  const raw = failure?.stderr ? String(failure.stderr) : failure?.message ?? "";
+  return capped(redactHome(lastMeaningfulLine(raw), home));
+}
+function lastMeaningfulLine(text) {
+  const lines = text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  return lines.at(-1) ?? "unknown error";
+}
+function redactHome(text, home) {
+  if (home.length < 2) return text;
+  const spellings = /* @__PURE__ */ new Set([home, home.split("\\").join("/"), home.split("/").join("\\")]);
+  const anySpelling = new RegExp([...spellings].map(escapeRegExp).join("|"), "gi");
+  return text.replace(anySpelling, "~");
+}
+function escapeRegExp(text) {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function capped(detail) {
+  return detail.length <= DETAIL_LIMIT ? detail : `${detail.slice(0, DETAIL_LIMIT)}\u2026`;
+}
+
+// src/engines/vllm.ts
+var execFileP5 = promisify5(execFile5);
 var VLLM_PYTHON = "3.12";
 function venvPython4(envDir) {
   return process.platform === "win32" ? join8(envDir, "Scripts", "python.exe") : join8(envDir, "bin", "python");
@@ -1227,43 +1316,23 @@ async function ensureVllmEnv(root, onProgress, upgrade = false) {
   const py = venvPython4(envDir);
   if (!existsSync8(py)) {
     onProgress?.({ phase: "extracting", pct: -1 });
-    await execFileP4(uv, ["venv", "--python", VLLM_PYTHON, envDir], { cwd: root });
+    await execFileP5(uv, ["venv", "--python", VLLM_PYTHON, envDir], { cwd: root });
   }
   onProgress?.({ phase: "extracting", pct: -1 });
   const installArgs = ["pip", "install", "--python", py, ...upgrade ? ["-U"] : [], "vllm"];
-  await execFileP4(uv, installArgs, {
+  await execFileP5(uv, installArgs, {
     cwd: root,
     maxBuffer: 64 * 1024 * 1024
   });
   const version2 = await probeVllm(py);
   return { python: py, version: version2 };
 }
-function platformDisplay(platform) {
-  return platform === "win32" ? "Windows" : platform === "darwin" ? "macOS" : platform;
-}
-function classifyVllmBlocker(platform, error) {
-  const plat = platformDisplay(platform);
-  if (platform === "win32" || platform === "darwin") {
-    return `vLLM cannot run on ${plat}: its OpenAI server requires uvloop (and other Linux-only components such as NCCL/Triton), which have no ${plat} build. Use the llama.cpp / TurboQuant engine for GGUF models here, or run vLLM under WSL2 / Linux.`;
-  }
-  const err9 = error;
-  if (err9?.code === "ENOENT") {
-    return `vLLM's environment looks missing or broken (interpreter not found). Reinstall the vLLM engine from the Engines page.`;
-  }
-  const raw = err9?.stderr ? String(err9.stderr) : err9?.message ?? "unknown error";
-  const detail = raw.trim().split("\n").filter(Boolean).slice(-1)[0] ?? raw.trim();
-  return `vLLM's environment looks broken or incomplete (uvloop failed to import: ${detail}). ${plat} is a supported platform for vLLM \u2014 reinstall the vLLM engine from the Engines page rather than switching engines.`;
-}
-async function vllmServeBlocker(python) {
-  try {
-    await execFileP4(python, ["-c", "import uvloop"], { timeout: 2e4 });
-    return null;
-  } catch (error) {
-    return classifyVllmBlocker(process.platform, error);
-  }
+var uvloopPreflight = new UvloopPreflight("vLLM");
+function vllmServeBlocker(python) {
+  return uvloopPreflight.blockerFor(python);
 }
 async function probeVllm(python) {
-  const { stdout } = await execFileP4(
+  const { stdout } = await execFileP5(
     python,
     ["-c", 'import importlib.metadata as m; print(m.version("vllm"))'],
     { timeout: 3e4 }
@@ -1293,10 +1362,10 @@ function vllmServerCommand(python, model, port2, host2, tensorParallelSize = 1,
 
 // src/engines/sglang.ts
 import { existsSync as existsSync9 } from "fs";
-import { execFile as execFile5 } from "child_process";
+import { execFile as execFile6 } from "child_process";
 import { join as join9 } from "path";
-import { promisify as promisify5 } from "util";
-var execFileP5 = promisify5(execFile5);
+import { promisify as promisify6 } from "util";
+var execFileP6 = promisify6(execFile6);
 var SGLANG_PYTHON = "3.12";
 function venvPython5(envDir) {
   return process.platform === "win32" ? join9(envDir, "Scripts", "python.exe") : join9(envDir, "bin", "python");
@@ -1307,40 +1376,20 @@ async function ensureSglangEnv(root, onProgress, upgrade = false) {
   const py = venvPython5(envDir);
   if (!existsSync9(py)) {
     onProgress?.({ phase: "extracting", pct: -1 });
-    await execFileP5(uv, ["venv", "--python", SGLANG_PYTHON, envDir], { cwd: root });
+    await execFileP6(uv, ["venv", "--python", SGLANG_PYTHON, envDir], { cwd: root });
   }
   onProgress?.({ phase: "extracting", pct: -1 });
   const installArgs = ["pip", "install", "--python", py, ...upgrade ? ["-U"] : [], "sglang[all]"];
-  await execFileP5(uv, installArgs, { cwd: root, maxBuffer: 64 * 1024 * 1024 });
+  await execFileP6(uv, installArgs, { cwd: root, maxBuffer: 64 * 1024 * 1024 });
   const version2 = await probeSglang(py);
   return { python: py, version: version2 };
 }
-function platformDisplay2(platform) {
-  return platform === "win32" ? "Windows" : platform === "darwin" ? "macOS" : platform;
-}
-function classifySglangBlocker(platform, error) {
-  const plat = platformDisplay2(platform);
-  if (platform === "win32" || platform === "darwin") {
-    return `SGLang cannot run on ${plat}: its server requires uvloop (and other Linux-only components), which have no ${plat} build. Use the llama.cpp / TurboQuant engine for GGUF models here, or run SGLang under WSL2 / Linux.`;
-  }
-  const err9 = error;
-  if (err9?.code === "ENOENT") {
-    return `SGLang's environment looks missing or broken (interpreter not found). Reinstall the SGLang engine from the Engines page.`;
-  }
-  const raw = err9?.stderr ? String(err9.stderr) : err9?.message ?? "unknown error";
-  const detail = raw.trim().split("\n").filter(Boolean).slice(-1)[0] ?? raw.trim();
-  return `SGLang's environment looks broken or incomplete (uvloop failed to import: ${detail}). ${plat} is a supported platform for SGLang \u2014 reinstall the SGLang engine from the Engines page rather than switching engines.`;
-}
-async function sgLangServeBlocker(python) {
-  try {
-    await execFileP5(python, ["-c", "import uvloop"], { timeout: 2e4 });
-    return null;
-  } catch (error) {
-    return classifySglangBlocker(process.platform, error);
-  }
+var uvloopPreflight2 = new UvloopPreflight("SGLang");
+function sgLangServeBlocker(python) {
+  return uvloopPreflight2.blockerFor(python);
 }
 async function probeSglang(python) {
-  const { stdout } = await execFileP5(
+  const { stdout } = await execFileP6(
     python,
     ["-c", 'import importlib.metadata as m; print(m.version("sglang"))'],
     { timeout: 3e4 }
@@ -1952,7 +2001,7 @@ async function gracefulStop(child, exited) {
 function signalTerm(child) {
   if (!child.pid) return;
   if (process.platform === "win32") {
-    execFile6("taskkill", ["/PID", String(child.pid), "/T"], () => {
+    execFile7("taskkill", ["/PID", String(child.pid), "/T"], () => {
     });
   } else {
     child.kill("SIGTERM");
@@ -1961,7 +2010,7 @@ function signalTerm(child) {
 function forceKill(child) {
   if (!child.pid) return;
   if (process.platform === "win32") {
-    execFile6("taskkill", ["/PID", String(child.pid), "/F", "/T"], () => {
+    execFile7("taskkill", ["/PID", String(child.pid), "/F", "/T"], () => {
     });
   } else {
     child.kill("SIGKILL");
@@ -2066,7 +2115,7 @@ function killTrackedEnginesSync(dataDir) {
 }
 function killPidTree(pid) {
   if (process.platform === "win32") {
-    execFile6("taskkill", ["/PID", String(pid), "/F", "/T"], () => {
+    execFile7("taskkill", ["/PID", String(pid), "/F", "/T"], () => {
     });
   } else {
     try {
@@ -2321,7 +2370,7 @@ import { existsSync as existsSync14 } from "fs";
 import { randomUUID as randomUUID2 } from "crypto";
 
 // src/engines/probe.ts
-import { execFile as execFile7 } from "child_process";
+import { execFile as execFile8 } from "child_process";
 import { closeSync, existsSync as existsSync11, openSync, readSync, statSync as statSync2 } from "fs";
 import { dirname as dirname3 } from "path";
 function probeEnv(bin) {
@@ -2350,7 +2399,7 @@ function runCaptured(bin, arg) {
   return new Promise((resolve6) => {
     try {
       const timeoutMs = process.platform === "darwin" ? 6e4 : 15e3;
-      execFile7(bin, [arg], { cwd: dirname3(bin), env: probeEnv(bin), timeout: timeoutMs, windowsHide: true, maxBuffer: 4 * 1024 * 1024 }, (error, stdout, stderr) => {
+      execFile8(bin, [arg], { cwd: dirname3(bin), env: probeEnv(bin), timeout: timeoutMs, windowsHide: true, maxBuffer: 4 * 1024 * 1024 }, (error, stdout, stderr) => {
         resolve6({ out: (stdout || "") + (stderr || ""), err: error });
       });
     } catch (e) {
@@ -2507,17 +2556,17 @@ function trimLen(s, n) {
 }
 
 // src/engines/build-runner.ts
-import { execFile as execFile9, spawn as spawn2 } from "child_process";
+import { execFile as execFile10, spawn as spawn2 } from "child_process";
 import { createHash as createHash2 } from "crypto";
 import { copyFileSync, existsSync as existsSync13, mkdirSync as mkdirSync6, readFileSync as readFileSync3, readdirSync as readdirSync3, rmSync as rmSync6, writeFileSync as writeFileSync3 } from "fs";
 import { delimiter as delimiter2, dirname as dirname5, join as join12 } from "path";
-import { promisify as promisify7 } from "util";
+import { promisify as promisify8 } from "util";
 
 // src/engines/build-prereqs.ts
-import { execFile as execFile8 } from "child_process";
+import { execFile as execFile9 } from "child_process";
 import { delimiter, join as join11 } from "path";
-import { promisify as promisify6 } from "util";
-var execFileP6 = promisify6(execFile8);
+import { promisify as promisify7 } from "util";
+var execFileP7 = promisify7(execFile9);
 function buildEnv(toolchainDirs = []) {
   const dirs = toolchainDirs.map((d) => d.trim()).filter(Boolean);
   const env = { ...process.env };
@@ -2579,7 +2628,7 @@ var INSTALL_URLS = {
   gcc: "https://gcc.gnu.org/install/"
 };
 async function runVersion(cmd, args, env) {
-  const { stdout, stderr } = await execFileP6(cmd, args, {
+  const { stdout, stderr } = await execFileP7(cmd, args, {
     timeout: 8e3,
     windowsHide: true,
     maxBuffer: 1024 * 1024,
@@ -2777,10 +2826,10 @@ function suggestEngineName(binPath, version2) {
 }
 
 // src/engines/build-runner.ts
-var execFileP7 = promisify7(execFile9);
+var execFileP8 = promisify8(execFile10);
 async function findLibcudaDir(signal) {
   try {
-    const { stdout } = await execFileP7("ldconfig", ["-p"], {
+    const { stdout } = await execFileP8("ldconfig", ["-p"], {
       timeout: 5e3,
       maxBuffer: 4 * 1024 * 1024,
       signal
@@ -2796,16 +2845,86 @@ function chooseEngineName(name, priorName) {
   return name ?? priorName ?? "";
 }
 function findPriorEngine(engines, build2) {
-  return engines.find((e) => e.binPath === build2.binPath) ?? engines.find(
-    (e) => sameRepo(e.sourceRepo, build2.sourceRepo) && (e.sourceBranch ?? "") === (build2.sourceBranch ?? "") && (e.sourceCommit ?? "") === (build2.sourceCommit ?? "")
+  const byBinPath = engines.find((e) => e.binPath === build2.binPath);
+  if (byBinPath) return byBinPath;
+  const sameTarget = engines.filter(
+    (e) => sameRepo(e.sourceRepo, build2.sourceRepo) && (e.sourceCommit ?? "") === (build2.sourceCommit ?? "")
+  );
+  return pickByBranch(sameTarget, (build2.sourceBranch ?? "").trim(), effectiveBranch(build2.sourceBranch, build2.defaultBranch), build2.defaultBranch);
+}
+function effectiveBranch(branch, defaultBranch) {
+  return (branch ?? "").trim() || (defaultBranch ?? "").trim();
+}
+function pickByBranch(candidates, exactBranch, effective, defaultBranch) {
+  return candidates.find((e) => (e.sourceBranch ?? "").trim() === exactBranch) ?? candidates.find((e) => effectiveBranch(e.sourceBranch, defaultBranch) === effective);
+}
+var isPinnedEntry = (entry) => !!(entry.sourceCommit || entry.patchUrl);
+function findEngineForCatalogEntry(engines, entry, requestedBranch) {
+  const sameBuild = engines.filter(
+    (e) => sameRepo(e.sourceRepo, entry.homepage) && (e.sourceCommit ?? "") === (entry.sourceCommit ?? "") && (e.sourcePatchUrl ?? "") === (entry.patchUrl ?? "")
   );
+  if (isPinnedEntry(entry)) return sameBuild[0];
+  const wanted = effectiveBranch(requestedBranch, entry.defaultBranch);
+  return pickByBranch(sameBuild, wanted, wanted, entry.defaultBranch);
+}
+function catalogBranchesToScan(entry, requestedBranch) {
+  if (isPinnedEntry(entry)) return [void 0];
+  const wanted = effectiveBranch(requestedBranch, entry.defaultBranch);
+  if (!wanted) return [void 0];
+  return wanted === (entry.defaultBranch ?? "").trim() ? [wanted, void 0] : [wanted];
+}
+function legacyBuildDirName(repoUrl, branch, commit) {
+  const last = repoUrl.trim().replace(/\/+$/, "").split(/[\\/]/).pop() ?? "";
+  const repo = last.replace(/\.git$/i, "").trim() || "engine";
+  const b = (branch ?? "").trim();
+  const sha = (commit ?? "").trim();
+  return asDirName(sha ? `${repo}-${sha.slice(0, 12)}` : b ? `${repo}-${b}` : repo);
+}
+function serverBinaryIn(enginesRoot, dirName) {
+  const root = join12(enginesRoot, "build", dirName);
+  return resolveServerBinary(join12(root, "build")) ?? resolveServerBinary(root);
+}
+function findCatalogBuildOnDisk(enginesRoot, entry, requestedBranch) {
+  for (const branch of catalogBranchesToScan(entry, requestedBranch)) {
+    const binPath = sourceBuildBinary(enginesRoot, entry.homepage, branch, entry.sourceCommit);
+    if (binPath) return { binPath, branch: branch ?? "" };
+  }
+  if (!entry.sourceCommit) return void 0;
+  const legacy = serverBinaryIn(enginesRoot, legacyBuildDirName(entry.homepage, void 0, entry.sourceCommit));
+  return legacy ? { binPath: legacy, branch: "" } : void 0;
+}
+var slashed = (path) => path.replace(/\\/g, "/").toLowerCase();
+function isEngineInBuildDir(binPath, buildRoot) {
+  return slashed(binPath).startsWith(`${slashed(buildRoot).replace(/\/+$/, "")}/`);
+}
+var branchesProvablyDiffer = (a, b) => {
+  const x = (a ?? "").trim();
+  const y = (b ?? "").trim();
+  return !!x && !!y && x !== y;
+};
+function findNameConflict(engines, name, build2) {
+  const wanted = (name ?? "").trim().toLowerCase();
+  if (!wanted) return void 0;
+  const holder = engines.find((e) => e.name.trim().toLowerCase() === wanted);
+  if (!holder) return void 0;
+  const replaced = isEngineInBuildDir(holder.binPath, build2.buildRoot) || sameRepo(holder.sourceRepo, build2.sourceRepo) && (holder.sourceCommit ?? "") === (build2.sourceCommit ?? "") && !branchesProvablyDiffer(holder.sourceBranch, build2.sourceBranch);
+  return replaced ? void 0 : holder;
+}
+function parseDefaultBranch(lsRemoteOutput) {
+  return /^ref:\s+refs\/heads\/(\S+)\s+HEAD\s*$/m.exec(lsRemoteOutput)?.[1];
 }
 function buildDirName(repoUrl, branch, commit) {
   const repo = normRepoUrl(repoUrl) || "engine";
   const b = (branch ?? "").trim();
   const sha = (commit ?? "").trim();
-  const raw = sha ? `${repo}-${sha.slice(0, 12)}` : b ? `${repo}-${b}` : repo;
-  return raw.replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "engine";
+  return asDirName(sha ? `${repo}-${sha.slice(0, 12)}` : b ? `${repo}-${b}` : repo);
+}
+function asDirName(raw) {
+  const slug = raw.replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
+  return isPathStep(slug) ? "engine" : slug;
+}
+function isPathStep(name) {
+  return /^\.*$/.test(name);
 }
 function sameRepo(a, b) {
   const na = normRepoUrl(a);
@@ -2815,12 +2934,11 @@ function normRepoUrl(s) {
   return (s ?? "").trim().toLowerCase().replace(/^https?:\/\//, "").replace(/^github\.com\//, "").replace(/\/+$/, "").replace(/\.git$/, "");
 }
 function sourceBuildBinary(enginesRoot, repoUrl, branch, commit) {
-  const root = join12(enginesRoot, "build", buildDirName(repoUrl, branch, commit));
-  return resolveServerBinary(join12(root, "build")) ?? resolveServerBinary(root);
+  return serverBinaryIn(enginesRoot, buildDirName(repoUrl, branch, commit));
 }
 function sourceBuildDirOf(binPath, enginesRoot) {
   const m = binPath.replace(/\\/g, "/").match(/\/engines\/build\/([^/]+)(?:\/|$)/i);
-  if (!m) return null;
+  if (!m || isPathStep(m[1])) return null;
   return join12(enginesRoot, "build", m[1]);
 }
 function pickGenerator(hasNinja, isWindows) {
@@ -2972,7 +3090,7 @@ async function findVcvarsall() {
   try {
     const programFilesX86 = process.env["ProgramFiles(x86)"] || "C:\\Program Files (x86)";
     const vswhere = join12(programFilesX86, "Microsoft Visual Studio", "Installer", "vswhere.exe");
-    const { stdout } = await execFileP7(
+    const { stdout } = await execFileP8(
       vswhere,
       ["-latest", "-products", "*", "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "-find", "VC\\Auxiliary\\Build\\vcvarsall.bat"],
       { timeout: 8e3, windowsHide: true, maxBuffer: 1024 * 1024 }
@@ -3168,6 +3286,15 @@ async function runBuild(req, hooks, signal) {
   }
   const commit = (await runStep("git", ["-C", srcDir, "rev-parse", "HEAD"], { env, signal, onLine: () => {
   } })).trim();
+  let defaultBranch;
+  try {
+    const lsRemoteArgs = ["-c", "http.lowSpeedLimit=1000", "-c", "http.lowSpeedTime=15", "ls-remote", "--symref", req.repoUrl, "HEAD"];
+    const lsRemote = await runStep("git", lsRemoteArgs, { env, signal, onLine: () => {
+    } });
+    defaultBranch = parseDefaultBranch(lsRemote);
+  } catch (e) {
+    if (e?.name === "AbortError") throw e;
+  }
   const patchUrl = (req.patchUrl ?? "").trim();
   if (patchUrl) {
     const expectedSha = (req.patchSha256 ?? "").trim();
@@ -3253,7 +3380,7 @@ async function runBuild(req, hooks, signal) {
   }
   if (isWindows) copyCudaRuntimeDlls(env, dirname5(binPath), hooks.log);
   else if (!isMac && !isAndroid2) copyCudaRuntimeLibs(env, dirname5(binPath), hooks.log);
-  return { binPath, commit, buildRoot };
+  return { binPath, commit, buildRoot, defaultBranch };
 }
 
 // src/engines/registry.ts
@@ -3265,11 +3392,19 @@ var NotFoundError = class extends Error {
   }
 };
 var NameTakenError = class extends Error {
-  constructor() {
-    super("Name already in use \u2014 choose a different name.");
+  constructor(holder, incoming) {
+    super(nameTakenMessage(holder, incoming));
     this.name = "NameTakenError";
   }
 };
+function nameTakenMessage(holder, incoming) {
+  if (!holder) return "Name already in use \u2014 choose a different name.";
+  const base2 = `Name already in use by "${holder.name}" \u2014 choose a different name.`;
+  const held = holder.sourceBranch?.trim();
+  const wanted = incoming?.sourceBranch?.trim();
+  const anotherBranchOfTheSameRepo = !!held && !!wanted && held !== wanted && sameRepo(holder.sourceRepo, incoming?.sourceRepo);
+  return anotherBranchOfTheSameRepo ? `${base2} It is a build of branch "${held}"; a build of "${wanted}" is a separate engine and needs its own name.` : base2;
+}
 var Registry = class {
   constructor(store2) {
     this.store = store2;
@@ -3288,7 +3423,7 @@ var Registry = class {
   }
   async add(name, binPath, source) {
     const finalName = name.trim() || "llama-server";
-    this.assertNameFree(finalName);
+    this.assertNameFree(finalName, source);
     const pr = await probe(binPath);
     const sourceRepo = source?.sourceRepo?.trim() || void 0;
     const sourceBranch = source?.sourceBranch?.trim() || void 0;
@@ -3308,19 +3443,21 @@ var Registry = class {
       ...sourcePatchUrl ? { sourcePatchUrl } : {}
     };
     this.store.update((c) => {
-      if (this.nameClash(c.engines, finalName)) throw new NameTakenError();
+      const holder = this.nameHolder(c.engines, finalName);
+      if (holder) throw new NameTakenError(holder, source);
       c.engines.push(eng);
       if (!c.activeEngineId) c.activeEngineId = eng.id;
     });
     return { engine: eng, warning: pr.version === "unknown" ? "no_version" : void 0 };
   }
-  /** True if any registered engine already uses `name` (case-insensitive, trimmed). */
-  nameClash(engines, name) {
+  /** The registered engine that already uses `name` (case-insensitive, trimmed), if any. */
+  nameHolder(engines, name) {
     const n = name.trim().toLowerCase();
-    return engines.some((e) => e.name.trim().toLowerCase() === n);
+    return engines.find((e) => e.name.trim().toLowerCase() === n);
   }
-  assertNameFree(name) {
-    if (this.nameClash(this.store.snapshot().engines, name)) throw new NameTakenError();
+  assertNameFree(name, incoming) {
+    const holder = this.nameHolder(this.store.snapshot().engines, name);
+    if (holder) throw new NameTakenError(holder, incoming);
   }
   /** Register an MLX engine (kind='mlx'). No llama-server probe — the binPath is
    *  a venv python, not a llama-server, so capabilities/flags don't apply. */
@@ -5142,9 +5279,9 @@ ${e.message}`, timedOut });
       resolve6({ exitCode, stdout, stderr, timedOut });
     };
     const armGrace = (ms) => {
-      const capped = hardDeadlineAt === void 0 ? ms : Math.max(0, Math.min(ms, hardDeadlineAt - Date.now()));
+      const capped2 = hardDeadlineAt === void 0 ? ms : Math.max(0, Math.min(ms, hardDeadlineAt - Date.now()));
       if (graceTimer) clearTimeout(graceTimer);
-      graceTimer = setTimeout(finish, capped);
+      graceTimer = setTimeout(finish, capped2);
     };
     const finishIfDrained = () => {
       if (!exited || settled) return;
@@ -5257,7 +5394,7 @@ function parseClaudeCliStreamJson(stdout) {
 
 // src/cli-launch.ts
 import { spawn as spawn4 } from "child_process";
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3 } from "os";
 import { readFile, writeFile, mkdir } from "fs/promises";
 import { join as join15, dirname as dirname7 } from "path";
 
@@ -5430,7 +5567,7 @@ function resolveModelKey(models, input) {
   return null;
 }
 var realFs = {
-  home: homedir2(),
+  home: homedir3(),
   readFile: (p) => readFile(p, "utf8"),
   writeFile: (p, data) => writeFile(p, data, "utf8"),
   mkdir: async (p) => {
@@ -7840,7 +7977,7 @@ var AppUpdateChecker = class {
 };
 
 // src/app-update-apply.ts
-import { execFile as execFile10, spawn as spawn6 } from "child_process";
+import { execFile as execFile11, spawn as spawn6 } from "child_process";
 import { existsSync as existsSync17, openSync as openSync2, readFileSync as readFileSync6, unlinkSync, writeFileSync as writeFileSync5 } from "fs";
 import { dirname as dirname8, join as join18, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
@@ -7937,7 +8074,7 @@ async function npmGlobalRoot() {
   if (npmRootCache) return npmRootCache.value;
   const value = await new Promise((res) => {
     const cmd = process.platform === "win32" ? "npm.cmd" : "npm";
-    execFile10(cmd, ["root", "-g"], { timeout: 1e4, windowsHide: true }, (e, stdout) => {
+    execFile11(cmd, ["root", "-g"], { timeout: 1e4, windowsHide: true }, (e, stdout) => {
       if (e) return res(null);
       const out = String(stdout).trim();
       res(out || null);
@@ -10133,9 +10270,9 @@ async function loadPrimaryModel(opts, { manager: manager2, comfy: comfy2, modelR
 
 // src/models/hf-cache.ts
 import { existsSync as existsSync20, mkdirSync as mkdirSync8 } from "fs";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir4 } from "os";
 import { join as join22 } from "path";
-function hfHubCacheDir(env = process.env, home = homedir3()) {
+function hfHubCacheDir(env = process.env, home = homedir4()) {
   const explicit = env.HUGGINGFACE_HUB_CACHE;
   if (explicit && explicit.trim()) return explicit;
   const hfHome = env.HF_HOME;
@@ -13668,7 +13805,7 @@ function repoSubdir(repo) {
 }
 
 // src/bench/bench.ts
-import { execFile as execFile11 } from "child_process";
+import { execFile as execFile12 } from "child_process";
 import { readFileSync as readFileSync11 } from "fs";
 import { randomUUID as randomUUID8 } from "crypto";
 
@@ -15977,7 +16114,7 @@ function kvSpeedAdvisory(tps, currentKv, supportedKvTypes) {
 function readNvidiaVramMb() {
   return new Promise((resolve6) => {
     try {
-      execFile11(
+      execFile12(
         "nvidia-smi",
         ["--query-gpu=memory.used", "--format=csv,noheader,nounits"],
         { timeout: 8e3, windowsHide: true },
@@ -16010,7 +16147,7 @@ function parseRocmVramUsed(memJson) {
 function readRocmVramMb() {
   return new Promise((resolve6) => {
     try {
-      execFile11("rocm-smi", ["--showmeminfo", "vram", "--json"], { timeout: 8e3, windowsHide: true }, (err9, stdout) => {
+      execFile12("rocm-smi", ["--showmeminfo", "vram", "--json"], { timeout: 8e3, windowsHide: true }, (err9, stdout) => {
         resolve6(err9 || !stdout ? null : parseRocmVramUsed(stdout));
       });
     } catch {
@@ -16030,7 +16167,7 @@ function readWddmSharedMb() {
   if (process.platform !== "win32" || wddmSharedUnsupported) return Promise.resolve(null);
   return new Promise((resolve6) => {
     try {
-      execFile11(
+      execFile12(
         "powershell",
         ["-NoProfile", "-NonInteractive", "-Command", WDDM_SHARED_PS],
         { timeout: 1e4, windowsHide: true },
@@ -16069,7 +16206,7 @@ function parseRocmGttUsed(memJson) {
 function readRocmGttMb() {
   return new Promise((resolve6) => {
     try {
-      execFile11("rocm-smi", ["--showmeminfo", "gtt", "--json"], { timeout: 8e3, windowsHide: true }, (err9, stdout) => {
+      execFile12("rocm-smi", ["--showmeminfo", "gtt", "--json"], { timeout: 8e3, windowsHide: true }, (err9, stdout) => {
         if (err9 || !stdout) return resolve6(null);
         resolve6(parseRocmGttUsed(stdout));
       });
@@ -19327,7 +19464,7 @@ __all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
 
 // src/api/routes.ts
 import { randomUUID as randomUUID12 } from "crypto";
-import { homedir as homedir4 } from "os";
+import { homedir as homedir5 } from "os";
 
 // src/config/config-bounds.ts
 var CONFIG_BOUNDS = {
@@ -22065,12 +22202,12 @@ function catalogEngine(id) {
 }
 
 // src/engines/cuda-provision.ts
-import { execFile as execFile12 } from "child_process";
+import { execFile as execFile13 } from "child_process";
 import { cpSync as cpSync2, existsSync as existsSync24, mkdirSync as mkdirSync14, readdirSync as readdirSync8, rmSync as rmSync13 } from "fs";
 import { tmpdir } from "os";
 import { join as join30 } from "path";
-import { promisify as promisify8 } from "util";
-var execFileP8 = promisify8(execFile12);
+import { promisify as promisify9 } from "util";
+var execFileP9 = promisify9(execFile13);
 var REDIST_BASE = "https://developer.download.nvidia.com/compute/cuda/redist/";
 var CUDA_REQUIRED_COMPONENTS = ["cuda_nvcc", "cuda_cudart", "libcublas", "cuda_cccl"];
 var CUDA_OPTIONAL_COMPONENTS = ["libnvvm", "cuda_crt"];
@@ -22086,7 +22223,7 @@ function cmpMajorMinor(a, b) {
 }
 async function driverMaxCuda() {
   try {
-    const { stdout } = await execFileP8("nvidia-smi", [], { timeout: 8e3, windowsHide: true, maxBuffer: 1024 * 1024 });
+    const { stdout } = await execFileP9("nvidia-smi", [], { timeout: 8e3, windowsHide: true, maxBuffer: 1024 * 1024 });
     const m = stdout.match(/CUDA Version:\s*([\d.]+)/i);
     return m ? m[1] : null;
   } catch {
@@ -22248,7 +22385,7 @@ function recommendEngines(p, engines) {
 }
 
 // src/sysinfo/usage.ts
-import { execFile as execFile13, spawn as spawn8 } from "child_process";
+import { execFile as execFile14, spawn as spawn8 } from "child_process";
 import { existsSync as existsSync25, readFileSync as readFileSync15, readdirSync as readdirSync9 } from "fs";
 import os2 from "os";
 
@@ -22498,7 +22635,7 @@ var MAX_CONSECUTIVE_FAILURES = 3;
 function run(cmd, args) {
   return new Promise((resolve6, reject) => {
     try {
-      execFile13(cmd, args, { timeout: READER_TIMEOUT_MS, windowsHide: true, maxBuffer: 4 * 1024 * 1024 }, (err9, stdout) => {
+      execFile14(cmd, args, { timeout: READER_TIMEOUT_MS, windowsHide: true, maxBuffer: 4 * 1024 * 1024 }, (err9, stdout) => {
         if (err9) reject(err9);
         else resolve6(String(stdout ?? ""));
       });
@@ -23815,13 +23952,9 @@ function registerApi(app2, d) {
         installed2 = existsSync27(llamafileBinPath(enginesRoot));
         enabled = regEngines.some((x) => x.kind === "llamafile");
       }
-      const isBranchCapable = !e.sourceCommit && !e.patchUrl;
-      const matchBranch = isBranchCapable ? branchParam ?? "" : void 0;
-      const srcEng = e.excludeFromSourceMatch ? void 0 : regEngines.find(
-        (x) => sameRepo(x.sourceRepo, e.homepage) && (x.sourceCommit ?? "") === (e.sourceCommit ?? "") && (x.sourcePatchUrl ?? "") === (e.patchUrl ?? "") && (x.sourceBranch ?? "") === (matchBranch ?? "")
-      );
-      let sourceBinPath = srcEng?.binPath;
-      if (!srcEng && !e.excludeFromSourceMatch) sourceBinPath = sourceBuildBinary(enginesRoot, e.homepage, matchBranch, e.sourceCommit) ?? void 0;
+      const srcEng = e.excludeFromSourceMatch ? void 0 : findEngineForCatalogEntry(regEngines, e, branchParam);
+      const onDisk = !srcEng && !e.excludeFromSourceMatch ? findCatalogBuildOnDisk(enginesRoot, e, branchParam) : void 0;
+      const sourceBinPath = srcEng?.binPath ?? onDisk?.binPath;
       const sourceBuilt = !!srcEng || !!sourceBinPath;
       if (srcEng) {
         installed2 = true;
@@ -23836,7 +23969,7 @@ function registerApi(app2, d) {
         enabled,
         sourceBuilt,
         sourceEngineId: srcEng?.id,
-        sourceBranch: srcEng?.sourceBranch ?? "",
+        sourceBranch: srcEng?.sourceBranch ?? onDisk?.branch ?? "",
         sourceBinPath: sourceBinPath ?? ""
       };
     });
@@ -23921,6 +24054,12 @@ function registerApi(app2, d) {
     const enginesRoot = join34(d.store.dir(), "engines");
     const toolchainDirs = d.store.snapshot().build.toolchainDirs;
     const buildRoot = join34(enginesRoot, "build", buildDirName(repoUrl, branch, commit));
+    const engines = d.registry.list().engines;
+    const conflict = findNameConflict(engines, name, { buildRoot, sourceRepo: repoUrl, sourceBranch: branch, sourceCommit: commit });
+    if (conflict) return err5(c, 400, "name_already_taken", nameTakenMessage(conflict, { sourceRepo: repoUrl, sourceBranch: branch }));
+    const running2 = d.registry.active();
+    if (running2 && engineBusy(d) && isEngineInBuildDir(running2.binPath, buildRoot))
+      return err5(c, 409, "engine_in_use", `Stop "${running2.name}" before rebuilding it \u2014 the rebuild replaces its files.`);
     const ac = new AbortController();
     buildAbort = ac;
     d.build.start(name ?? repoUrl);
@@ -23954,7 +24093,8 @@ function registerApi(app2, d) {
           binPath: out.binPath,
           sourceRepo: repoUrl,
           sourceBranch: branch,
-          sourceCommit: commit
+          sourceCommit: commit,
+          defaultBranch: out.defaultBranch
         });
         if (prior) {
           if (d.registry.active()?.id === prior.id) await d.manager.stopAndWait();
@@ -24205,10 +24345,11 @@ function registerApi(app2, d) {
       const { engine, warning } = await d.registry.add(b.name ?? "", b.binPath, {
         sourceRepo: b.sourceRepo,
         sourceBranch: b.sourceBranch,
-        sourceCommit: b.sourceCommit
+        sourceCommit: b.sourceCommit,
+        sourcePatchUrl: b.sourcePatchUrl
       });
       if (!isCatalogRepo(b.sourceRepo)) {
-        d.registry.recordCustomSource({ name: engine.name, binPath: engine.binPath, kind: engine.kind, sourceRepo: b.sourceRepo, sourceBranch: b.sourceBranch, sourceCommit: b.sourceCommit });
+        d.registry.recordCustomSource({ name: engine.name, binPath: engine.binPath, kind: engine.kind, sourceRepo: b.sourceRepo, sourceBranch: b.sourceBranch, sourceCommit: b.sourceCommit, sourcePatchUrl: b.sourcePatchUrl });
       }
       return c.json({ ...engine, warning: warning ?? null }, 201);
     } catch (e) {
@@ -24436,7 +24577,7 @@ function registerApi(app2, d) {
     if (raw === FS_DRIVES_ROOT && process.platform === "win32") {
       return c.json({ path: FS_DRIVES_ROOT, parent: null, entries: listWindowsDrives() });
     }
-    const target = raw ? resolve5(raw) : homedir4();
+    const target = raw ? resolve5(raw) : homedir5();
     let real;
     try {
       real = realpathSync3(target);
@@ -24977,7 +25118,7 @@ function registerApi(app2, d) {
     };
     const isMemoryServer = server2.transport === "stdio" && (server2.command?.includes("server-memory") || server2.args?.some((a) => a.includes("server-memory")));
     if (isMemoryServer && !server2.env?.MEMORY_FILE_PATH) {
-      server2.env = { ...server2.env, MEMORY_FILE_PATH: join34(homedir4(), ".turbollm", "mcp-memory.jsonl") };
+      server2.env = { ...server2.env, MEMORY_FILE_PATH: join34(homedir5(), ".turbollm", "mcp-memory.jsonl") };
     }
     d.store.update((cfg2) => {
       cfg2.mcp.servers.push(server2);
@@ -25786,8 +25927,8 @@ function isValidMachineName(name) {
 }
 function sanitizeMachineName(raw) {
   const collapsed = (raw ?? "").replace(/[\\/]+/g, "-").replace(/\s+/g, " ").trim();
-  const capped = collapsed.slice(0, MAX_NAME_LEN).trim();
-  return /[^\s-]/.test(capped) ? capped : FALLBACK_MACHINE_NAME;
+  const capped2 = collapsed.slice(0, MAX_NAME_LEN).trim();
+  return /[^\s-]/.test(capped2) ? capped2 : FALLBACK_MACHINE_NAME;
 }
 function uniqueMachineName(desired, taken) {
   const used = /* @__PURE__ */ new Set();
@@ -25877,7 +26018,7 @@ function redactDownload(rec) {
 // src/link/link-client.ts
 var DEFAULT_TIMEOUT_MS = 8e3;
 var ERROR_CODE = /^[a-z][a-z0-9_]{0,63}$/i;
-async function failureDetail(res) {
+async function failureDetail2(res) {
   if (!(res.headers.get("content-type") ?? "").includes("application/json")) return {};
   try {
     const body10 = await res.json();
@@ -26102,7 +26243,7 @@ var LinkClient = class {
         ...json === void 0 ? {} : { body: JSON.stringify(json) },
         signal: AbortSignal.timeout(this.timeoutMs)
       });
-      if (!res.ok) return { kind: "http", status: res.status, ...await failureDetail(res) };
+      if (!res.ok) return { kind: "http", status: res.status, ...await failureDetail2(res) };
       const ct = res.headers.get("content-type") ?? "";
       if (!ct.includes("application/json")) return { kind: "network" };
       const parsed = await res.json();