aglio-worker 0.13.0 → 0.14.0

package/agent.js

@@ -5052,8 +5052,8 @@ var require_multipleOf = __commonJS({
         const { gen, data, schemaCode, it } = cxt;
         const prec = it.opts.multipleOfPrecision;
         const res = gen.let("res");
-        const invalid = prec ? (0, codegen_1._)`Math.abs(Math.round(${res}) - ${res}) > 1e-${prec}` : (0, codegen_1._)`${res} !== parseInt(${res})`;
-        cxt.fail$data((0, codegen_1._)`(${schemaCode} === 0 || (${res} = ${data}/${schemaCode}, ${invalid}))`);
+        const invalid2 = prec ? (0, codegen_1._)`Math.abs(Math.round(${res}) - ${res}) > 1e-${prec}` : (0, codegen_1._)`${res} !== parseInt(${res})`;
+        cxt.fail$data((0, codegen_1._)`(${schemaCode} === 0 || (${res} = ${data}/${schemaCode}, ${invalid2}))`);
       }
     };
     exports.default = def;
@@ -28152,10 +28152,6 @@ var cardLabelInputSchema = external_exports.object({
 var INVITE_TTL_DAYS = 7;
 var INVITE_TTL_MS = INVITE_TTL_DAYS * 24 * 60 * 60 * 1e3;
 
-// ../../packages/shared/src/workspace-theme.ts
-var WORKSPACE_THEME_ACCENT_IDS = ["default", "violet", "emerald", "amber", "rose"];
-var WORKSPACE_THEME_SCALES = ["compact", "default", "large"];
-
 // ../../packages/shared/src/workspace-settings.ts
 var WORKSPACE_SETTINGS_DEFAULTS = {
   allowMemberInvites: true,
@@ -28165,11 +28161,7 @@ var WORKSPACE_SETTINGS_DEFAULTS = {
   artifactRetentionDays: 0,
   defaultGitProvider: "github",
   /** The shared workspace consultant is opt-out. Disabled hides every entry point. */
-  consultantEnabled: true,
-  /** Workspace-wide accent preset. Applied to every member, light and dark. */
-  themeAccent: "default",
-  /** Workspace-wide text scale. Same for every member so boards stay aligned. */
-  themeScale: "default"
+  consultantEnabled: true
 };
 var workspaceSettingsSchema = external_exports.object({
   allowMemberInvites: external_exports.boolean().catch(WORKSPACE_SETTINGS_DEFAULTS.allowMemberInvites),
@@ -28177,11 +28169,21 @@ var workspaceSettingsSchema = external_exports.object({
   requireVerificationEvidence: external_exports.boolean().catch(WORKSPACE_SETTINGS_DEFAULTS.requireVerificationEvidence),
   artifactRetentionDays: external_exports.number().int().min(0).max(3650).catch(WORKSPACE_SETTINGS_DEFAULTS.artifactRetentionDays),
   defaultGitProvider: external_exports.string().optional().transform((value) => normalizeGitProvider(value)).catch(WORKSPACE_SETTINGS_DEFAULTS.defaultGitProvider),
-  consultantEnabled: external_exports.boolean().catch(WORKSPACE_SETTINGS_DEFAULTS.consultantEnabled),
-  themeAccent: external_exports.enum(WORKSPACE_THEME_ACCENT_IDS).catch(WORKSPACE_SETTINGS_DEFAULTS.themeAccent),
-  themeScale: external_exports.enum(WORKSPACE_THEME_SCALES).catch(WORKSPACE_SETTINGS_DEFAULTS.themeScale)
+  consultantEnabled: external_exports.boolean().catch(WORKSPACE_SETTINGS_DEFAULTS.consultantEnabled)
 }).passthrough();
 
+// ../../packages/shared/src/theme.ts
+var THEME_ACCENT_IDS = ["default", "violet", "emerald", "amber", "rose"];
+var THEME_SCALES = ["compact", "default", "large"];
+var DEFAULT_THEME_PREFERENCES = {
+  themeAccent: "default",
+  themeScale: "default"
+};
+var themePreferencesSchema = external_exports.object({
+  themeAccent: external_exports.enum(THEME_ACCENT_IDS).catch(DEFAULT_THEME_PREFERENCES.themeAccent),
+  themeScale: external_exports.enum(THEME_SCALES).catch(DEFAULT_THEME_PREFERENCES.themeScale)
+});
+
 // ../../packages/shared/src/plans.ts
 var PLAN_IDS = ["free", "team", "enterprise"];
 var MEGABYTE = 1024 * 1024;
@@ -28355,10 +28357,121 @@ async function ensureDockerImage(input2) {
   return "pulled";
 }
 
+// src/resources.ts
+var GIB = 1024 * 1024 * 1024;
+var AUTO_MEMORY_RATIO = 0.8;
+var MEMORY_UNITS = {
+  "": 1,
+  b: 1,
+  k: 1024,
+  kb: 1024,
+  m: 1024 ** 2,
+  mb: 1024 ** 2,
+  g: 1024 ** 3,
+  gb: 1024 ** 3,
+  t: 1024 ** 4,
+  tb: 1024 ** 4
+};
+var AGENT_RESOURCE_FALLBACK = {
+  cpu: 2,
+  memoryBytes: 4 * GIB
+};
+function invalid(variable, value, expected) {
+  return new Error(`Invalid ${variable} value "${value}": expected ${expected}`);
+}
+function parseCpuLimit(value, variable = "AGENT_CPU_LIMIT") {
+  const trimmed = value.trim();
+  if (!/^\d+(?:\.\d+)?$/.test(trimmed)) {
+    throw invalid(variable, value, "positive CPU cores such as 2 or 2.5");
+  }
+  const cores = Number(trimmed);
+  if (!Number.isFinite(cores) || cores <= 0) {
+    throw invalid(variable, value, "positive CPU cores such as 2 or 2.5");
+  }
+  return cores;
+}
+function parseMemoryLimit(value, variable = "AGENT_MEMORY_LIMIT") {
+  const trimmed = value.trim().toLowerCase();
+  const match = /^(\d+(?:\.\d+)?)\s*([bkmgt]?b?)$/.exec(trimmed);
+  const multiplier = match ? MEMORY_UNITS[match[2] ?? ""] : void 0;
+  const amount = match ? Number(match[1]) : Number.NaN;
+  if (!match || multiplier === void 0 || !Number.isFinite(amount)) {
+    throw invalid(variable, value, "bytes or a Docker-style size such as 512m, 8g, 1073741824");
+  }
+  const bytes = Math.round(amount * multiplier);
+  if (bytes <= 0) {
+    throw invalid(variable, value, "bytes or a Docker-style size such as 512m, 8g, 1073741824");
+  }
+  return bytes;
+}
+function cpuToNanoCpus(cpu) {
+  return Math.round(cpu * 1e9);
+}
+function readAgentResourceOverrides(source = process.env) {
+  const cpu = source.AGENT_CPU_LIMIT?.trim();
+  const memory = source.AGENT_MEMORY_LIMIT?.trim();
+  return {
+    cpu: cpu ? parseCpuLimit(cpu) : null,
+    memory: memory ? parseMemoryLimit(memory) : null
+  };
+}
+function resolveAgentResources(input2) {
+  const fallback = input2.fallback ?? AGENT_RESOURCE_FALLBACK;
+  const hostCpu = input2.host?.cpuCount;
+  const hostMemory = input2.host?.totalMemoryBytes;
+  let cpu;
+  let cpuSource;
+  if (input2.cpu != null) {
+    cpu = input2.cpu;
+    cpuSource = "env";
+  } else if (typeof hostCpu === "number" && Number.isFinite(hostCpu) && hostCpu > 0) {
+    cpu = hostCpu;
+    cpuSource = "auto";
+  } else {
+    cpu = fallback.cpu;
+    cpuSource = "fallback";
+  }
+  let memoryBytes;
+  let memorySource;
+  if (input2.memory != null) {
+    memoryBytes = input2.memory;
+    memorySource = "env";
+  } else {
+    const detected = typeof hostMemory === "number" && Number.isFinite(hostMemory) && hostMemory > 0 ? Math.floor(hostMemory * AUTO_MEMORY_RATIO) : 0;
+    if (detected > 0) {
+      memoryBytes = detected;
+      memorySource = "auto";
+    } else {
+      memoryBytes = fallback.memoryBytes;
+      memorySource = "fallback";
+    }
+  }
+  return { cpu, memoryBytes, nanoCpus: cpuToNanoCpus(cpu), cpuSource, memorySource };
+}
+function agentHostResources(resources) {
+  return { Memory: resources.memoryBytes, NanoCpus: resources.nanoCpus };
+}
+
 // src/remote-docker.ts
-async function runnerCpuCount(client) {
+async function resolveRemoteAgentResources(client, log, overrides = readAgentResourceOverrides()) {
+  const needsDetection = overrides.cpu == null || overrides.memory == null;
+  const info = needsDetection ? await client.info().catch(() => null) : null;
+  const resources = resolveAgentResources({
+    cpu: overrides.cpu,
+    memory: overrides.memory,
+    host: { cpuCount: info?.NCPU, totalMemoryBytes: info?.MemTotal }
+  });
+  if (resources.cpuSource === "fallback" || resources.memorySource === "fallback") {
+    log?.("remote daemon resources unavailable, using fallback 2 CPU / 4 GB", {
+      cpuSource: resources.cpuSource,
+      memorySource: resources.memorySource
+    });
+  }
+  return resources;
+}
+async function loginCpuNanoCpus(client) {
   const info = await client.info().catch(() => null);
-  return Math.max(1, Math.min(2, Math.floor(info?.NCPU ?? 1)));
+  return Math.max(1, Math.min(2, Math.floor(info?.NCPU ?? 1))) * 1e9;
 }
 var CONTAINER_WORKSPACE = "/workspace";
 function isRunningInContainer() {
@@ -28405,7 +28518,7 @@ function sleep(ms) {
   return new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
 }
 var defaultClients = /* @__PURE__ */ new Map();
-function defaultClient(socketPath) {
+function remoteDockerClient(socketPath) {
   const existing = defaultClients.get(socketPath);
   if (existing) return existing;
   const client = new Dockerode({ socketPath });
@@ -28413,7 +28526,7 @@ function defaultClient(socketPath) {
   return client;
 }
 async function createDockerJobExecutor(input2) {
-  const client = input2.client ?? defaultClient(input2.socketPath ?? "/var/run/docker.sock");
+  const client = input2.client ?? remoteDockerClient(input2.socketPath ?? "/var/run/docker.sock");
   await ensureDockerImage({ client, image: input2.image, log: input2.log });
   const { hostPath } = mapDockerWorkspace({
     workspaceRoot: input2.workspaceRoot,
@@ -28437,11 +28550,11 @@ async function createDockerJobExecutor(input2) {
     if (error62.statusCode !== 404) throw error62;
   }
   const networkMode = input2.networkMode?.trim() || "bridge";
+  const resources = input2.resources ?? await resolveRemoteAgentResources(client, input2.log);
   const hostConfig = {
     Binds: [`${hostPath}:${CONTAINER_WORKSPACE}`],
     NetworkMode: networkMode,
-    Memory: 4 * 1024 * 1024 * 1024,
-    NanoCpus: await runnerCpuCount(client) * 1e9,
+    ...agentHostResources(resources),
     PidsLimit: 1024,
     AutoRemove: false,
     Init: true,
@@ -28527,7 +28640,7 @@ async function createDockerJobExecutor(input2) {
   };
 }
 async function prefetchRunnerImage(input2) {
-  const client = input2.client ?? defaultClient(input2.socketPath ?? "/var/run/docker.sock");
+  const client = input2.client ?? remoteDockerClient(input2.socketPath ?? "/var/run/docker.sock");
   try {
     if (isRegistryImage(input2.image)) {
       await pullDockerImage(client, input2.image);
@@ -28550,7 +28663,7 @@ async function prefetchRunnerImage(input2) {
   }
 }
 async function createDockerLoginContainer(input2) {
-  const client = new Dockerode({ socketPath: input2.socketPath ?? "/var/run/docker.sock" });
+  const client = input2.client ?? new Dockerode({ socketPath: input2.socketPath ?? "/var/run/docker.sock" });
   await ensureDockerImage({
     client,
     image: input2.image
@@ -28576,6 +28689,7 @@ async function createDockerLoginContainer(input2) {
   } catch (error62) {
     if (error62.statusCode !== 404) throw error62;
   }
+  const overrides = readAgentResourceOverrides();
   const container = await client.createContainer({
     Image: input2.image,
     name,
@@ -28588,8 +28702,10 @@ async function createDockerLoginContainer(input2) {
       Binds: [`${hostPath}:${CONTAINER_WORKSPACE}`],
       NetworkMode: "bridge",
       ExtraHosts: input2.extraHosts ?? [],
-      Memory: 2 * 1024 * 1024 * 1024,
-      NanoCpus: await runnerCpuCount(client) * 1e9,
+      // Login keeps its small legacy default and never auto-detects, but an
+      // explicit AGENT_CPU_LIMIT / AGENT_MEMORY_LIMIT override wins.
+      Memory: overrides.memory ?? 2 * 1024 * 1024 * 1024,
+      NanoCpus: overrides.cpu != null ? cpuToNanoCpus(overrides.cpu) : await loginCpuNanoCpus(client),
       PidsLimit: 512,
       AutoRemove: false,
       Init: true,
@@ -28682,11 +28798,11 @@ async function verifyHostRuntime(input2, run = defaultRunner) {
 import { statfs } from "node:fs/promises";
 import { dirname, resolve as resolve2 } from "node:path";
 import Dockerode2 from "dockerode";
-var GIB = 1024 * 1024 * 1024;
+var GIB2 = 1024 * 1024 * 1024;
 var DISK_GUARD_DEFAULTS = {
   enabled: true,
-  minFreeBytes: 10 * GIB,
-  criticalFreeBytes: 2 * GIB,
+  minFreeBytes: 10 * GIB2,
+  criticalFreeBytes: 2 * GIB2,
   buildCachePrune: true,
   runnerImageRetentionDays: 14,
   intervalMs: 60 * 60 * 1e3
@@ -28708,16 +28824,16 @@ function resolveDiskGuardPolicy(source = process.env) {
   const minFreeBytes = numberFromEnv(
     source,
     "AGLIO_DISK_MIN_FREE_GB",
-    DISK_GUARD_DEFAULTS.minFreeBytes / GIB,
+    DISK_GUARD_DEFAULTS.minFreeBytes / GIB2,
     0
-  ) * GIB;
+  ) * GIB2;
   const criticalFreeBytes = Math.min(
     numberFromEnv(
       source,
       "AGLIO_DISK_CRITICAL_FREE_GB",
-      DISK_GUARD_DEFAULTS.criticalFreeBytes / GIB,
+      DISK_GUARD_DEFAULTS.criticalFreeBytes / GIB2,
       0
-    ) * GIB,
+    ) * GIB2,
     // A critical threshold above the low threshold would make "low" unreachable.
     minFreeBytes
   );
@@ -28888,7 +29004,7 @@ async function cleanupDockerDisk(input2) {
   input2.log?.("docker disk cleanup", {
     status: result.status,
     pressure,
-    freeGb: input2.disk ? Number((input2.disk.freeBytes / GIB).toFixed(1)) : null,
+    freeGb: input2.disk ? Number((input2.disk.freeBytes / GIB2).toFixed(1)) : null,
     reclaimedMb: Math.round(result.spaceReclaimedBytes / (1024 * 1024)),
     danglingImages: result.danglingImagesRemoved,
     runnerImages: result.runnerImagesRemoved,
@@ -43835,6 +43951,15 @@ async function main() {
   );
   const hostTools = await verifyHostRuntime({ mode, labels, platform: process.platform });
   if (hostTools.length > 0) console.log(`[worker-agent] host tools ${hostTools.join(" | ")}`);
+  const agentResources = mode === "docker" ? await resolveRemoteAgentResources(
+    remoteDockerClient(dockerSocket),
+    (message, extra) => console.log(`[worker-agent] ${message}`, extra ?? "")
+  ) : void 0;
+  if (agentResources) {
+    console.log(
+      `[worker-agent] agent resources cpu=${agentResources.cpu} (${agentResources.cpuSource}) memoryBytes=${agentResources.memoryBytes} (${agentResources.memorySource})`
+    );
+  }
   if (mode === "docker") {
     void prefetchRunnerImage({
       image: runnerImage,
@@ -43858,6 +43983,7 @@ async function main() {
         // Only the bridge fallback needs a host gateway. Docker Desktop
         // resolves host.docker.internal already; Linux needs the entry.
         extraHosts: runnerExtraHosts,
+        resources: agentResources,
         log: (message, extra) => console.log(`[worker-agent] ${message}`, extra ?? "")
       }) : void 0
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aglio-worker",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Host machine agent for Aglio: claims jobs over the API and starts aglio-runner containers.",
   "type": "module",
   "bin": {