@cortex-context/cli 0.0.15 → 0.0.16

package/dist/index.js

@@ -18227,84 +18227,33 @@ var import_child_process = require("child_process");
 var import_fs5 = require("fs");
 var import_path5 = require("path");
 var import_os3 = require("os");
-function tryFixLxcSysctl() {
+function isLxcEnvironment() {
+  if ((0, import_os3.platform)() !== "linux") return false;
   try {
-    (0, import_child_process.execSync)("sysctl -w net.ipv4.ip_unprivileged_port_start=0", {
-      stdio: "ignore"
-    });
-    return { applied: true };
+    const environ = (0, import_fs5.readFileSync)("/proc/1/environ", "utf-8");
+    if (environ.includes("container=lxc")) return true;
   } catch {
-    return { applied: false };
-  }
-}
-function tryConfigureCrunRuntime() {
-  const result = {
-    attempted: false,
-    crunInstalled: false,
-    daemonUpdated: false,
-    dockerRestarted: false
-  };
-  if ((0, import_os3.platform)() !== "linux") return result;
-  result.attempted = true;
-  const hasCrun = (() => {
-    try {
-      (0, import_child_process.execSync)("which crun", { stdio: "ignore" });
-      return true;
-    } catch {
-      return false;
-    }
-  })();
-  if (hasCrun) {
-    result.crunInstalled = true;
-  } else {
-    try {
-      (0, import_child_process.execSync)("apt-get install -y crun", { stdio: "ignore" });
-      result.crunInstalled = true;
-    } catch (e) {
-      result.error = `crun install: ${e instanceof Error ? e.message : String(e)}`;
-      return result;
-    }
   }
-  const daemonPath = "/etc/docker/daemon.json";
-  let cfg = {};
   try {
-    if ((0, import_fs5.existsSync)(daemonPath)) {
-      cfg = JSON.parse((0, import_fs5.readFileSync)(daemonPath, "utf-8"));
-    }
+    const virt = (0, import_child_process.execSync)("systemd-detect-virt 2>/dev/null", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "ignore"],
+      timeout: 1e3
+    }).trim();
+    if (virt === "lxc" || virt === "lxc-libvirt") return true;
   } catch {
-    cfg = {};
-  }
-  if (cfg["default-runtime"] === "crun") {
-    result.daemonUpdated = true;
-    result.dockerRestarted = true;
-    return result;
-  }
-  const runtimes = cfg["runtimes"] ?? {};
-  runtimes["crun"] = { path: "/usr/bin/crun" };
-  cfg["runtimes"] = runtimes;
-  cfg["default-runtime"] = "crun";
-  try {
-    (0, import_fs5.writeFileSync)(daemonPath, JSON.stringify(cfg, null, 2) + "\n", "utf-8");
-    result.daemonUpdated = true;
-  } catch (e) {
-    result.error = `daemon.json: ${e instanceof Error ? e.message : String(e)}`;
-    return result;
   }
   try {
-    (0, import_child_process.execSync)("systemctl restart docker", { stdio: "ignore" });
-    result.dockerRestarted = true;
-  } catch (e) {
-    result.error = `docker restart: ${e instanceof Error ? e.message : String(e)}`;
+    const cgroup = (0, import_fs5.readFileSync)("/proc/1/cgroup", "utf-8");
+    if (/\/lxc\//.test(cgroup)) return true;
+  } catch {
   }
-  return result;
+  return false;
 }
 async function deployLocalStack(workspacePath, opts = {}) {
-  const templatePath = (0, import_path5.join)(
-    __dirname,
-    "templates",
-    "local",
-    "docker-compose.local.yml"
-  );
+  const lxc = isLxcEnvironment();
+  const templateFile = lxc ? "docker-compose.host-network.yml" : "docker-compose.local.yml";
+  const templatePath = (0, import_path5.join)(__dirname, "templates", "local", templateFile);
   const destPath = (0, import_path5.join)(workspacePath, "docker-compose.local.yml");
   if (!(0, import_fs5.existsSync)(templatePath)) {
     return { started: false, error: `Template not found: ${templatePath}` };
@@ -18326,8 +18275,16 @@ async function deployLocalStack(workspacePath, opts = {}) {
   };
   let envContent = existingEnv;
   envContent = setEnvVar(envContent, "CORTEX_API_TOKEN", opts.token ?? "");
-  envContent = setEnvVar(envContent, "SPECS_DIR_HOST", opts.specsDir ?? "./specs-sample");
-  envContent = setEnvVar(envContent, "REPOS_DIR_HOST", opts.reposDir ?? "./repos-sample");
+  envContent = setEnvVar(
+    envContent,
+    "SPECS_DIR_HOST",
+    opts.specsDir ?? "./specs-sample"
+  );
+  envContent = setEnvVar(
+    envContent,
+    "REPOS_DIR_HOST",
+    opts.reposDir ?? "./repos-sample"
+  );
   if (!envContent.endsWith("\n")) envContent += "\n";
   (0, import_fs5.writeFileSync)(envPath, envContent, { encoding: "utf-8" });
   const imageTag = opts.embeddings ? "latest-embeddings" : "latest";
@@ -18342,7 +18299,7 @@ async function deployLocalStack(workspacePath, opts = {}) {
         env: { ...process.env, CORTEX_IMAGE: cortexImage }
       }
     );
-    return { started: true };
+    return { started: true, usedHostNetwork: lxc };
   } catch (err) {
     const stderr = err instanceof Error && "stderr" in err ? err.stderr?.toString() ?? "" : "";
     const msg = err instanceof Error ? err.message : String(err);
@@ -18693,7 +18650,9 @@ async function initCommand(options) {
     const spinner2 = ora(
       "  Starting Cortex stack with Docker Compose..."
     ).start();
-    const dockerResult = await deployLocalStack(workspacePath, { token: cortexToken });
+    const dockerResult = await deployLocalStack(workspacePath, {
+      token: cortexToken
+    });
     if (!dockerResult.started) {
       spinner2.fail(
         source_default.red(`  \u2717 Docker deploy failed: ${dockerResult.error}`)
@@ -28397,26 +28356,13 @@ async function serverCommand(options) {
   writeConfig({ url: CORTEX_URL2, token: serverToken });
   console.log("");
   console.log(source_default.bold("  Step 4: Starting Cortex stack"));
-  const sysctlFix = tryFixLxcSysctl();
-  if (sysctlFix.applied) {
+  if (isLxcEnvironment()) {
     console.log(
       source_default.dim(
-        "  (applied net.ipv4.ip_unprivileged_port_start=0 for LXC compatibility)"
+        "  (Proxmox LXC detected \u2014 using host network mode automatically)"
       )
     );
   }
-  const crunSetup = tryConfigureCrunRuntime();
-  if (crunSetup.attempted) {
-    if (crunSetup.dockerRestarted) {
-      console.log(
-        source_default.dim(
-          "  (configured crun as Docker runtime for LXC compatibility \u2014 daemon restarted)"
-        )
-      );
-    } else if (crunSetup.error) {
-      console.log(source_default.dim(`  (crun setup skipped: ${crunSetup.error})`));
-    }
-  }
   console.log(source_default.dim("  $ docker compose up -d"));
   console.log("");
   const startResult = await deployLocalStack(workDir, {
@@ -28426,46 +28372,7 @@ async function serverCommand(options) {
   console.log("");
   if (!startResult.started) {
     console.log(source_default.red("  \u2717 Docker Compose failed"));
-    if (startResult.isLxcSysctlError) {
-      console.log("");
-      console.log(
-        source_default.bold.yellow("  \u26A0  Proxmox LXC sysctl restriction detected")
-      );
-      console.log("");
-      console.log(
-        source_default.dim(
-          "  runc >= 1.1 writes net.ipv4.ip_unprivileged_port_start in each new"
-        )
-      );
-      console.log(
-        source_default.dim(
-          "  Docker network namespace. Unprivileged Proxmox LXC blocks this write."
-        )
-      );
-      console.log("");
-      console.log(
-        source_default.dim("  Attempted automatic fix (crun) \u2014 but it was not enough.")
-      );
-      console.log(
-        source_default.dim(
-          "  Manual fix: install crun and configure Docker daemon on this LXC:"
-        )
-      );
-      console.log("");
-      console.log(source_default.cyan("    apt-get install -y crun"));
-      console.log(source_default.cyan("    cat > /etc/docker/daemon.json << 'EOF'"));
-      console.log(
-        source_default.cyan(
-          '    {"default-runtime":"crun","runtimes":{"crun":{"path":"/usr/bin/crun"}}}'
-        )
-      );
-      console.log(source_default.cyan("    EOF"));
-      console.log(source_default.cyan("    systemctl restart docker"));
-      console.log("");
-      console.log(source_default.dim("  Then run  cortex-context server  again."));
-    } else {
-      console.log(source_default.dim(`  ${startResult.error}`));
-    }
+    console.log(source_default.dim(`  ${startResult.error}`));
     process.exit(1);
   }
   console.log(source_default.green("  \u2713 Containers started"));