@yeaft/webchat-agent 1.0.442 → 1.0.444

package/cli.js

@@ -74,11 +74,13 @@ if (command === 'doctor') {
 } else if (command === 'local') {
   await handleLocalCommand(subArgs);
 } else if (command === 'container') {
+  let formatContainerError = error => error.code || error.message;
   try {
-    const { runContainerCli } = await import('./container-cli.js');
-    await runContainerCli(subArgs);
+    const containerCli = await import('./container-cli.js');
+    formatContainerError = containerCli.formatContainerError;
+    await containerCli.runContainerCli(subArgs);
   } catch (error) {
-    console.error(`Container Agent failed: ${error.code || error.message}`);
+    console.error(`Container Agent failed: ${formatContainerError(error)}`);
     process.exit(1);
   }
 } else if (command === 'upgrade') {

package/container-cli.js

@@ -2,6 +2,7 @@
 import { spawn } from 'node:child_process';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import {
   createContainerAgent,
   DEFAULT_AGENT_SLICE,
@@ -18,6 +19,25 @@ import {
   writeAgentSecretFile,
 } from './container-manager.js';
 
+function shellQuote(value) {
+  return `'${String(value).replaceAll("'", "'\\''")}'`;
+}
+
+function agentCliEntry() {
+  return fileURLToPath(new URL('./cli.js', import.meta.url));
+}
+
+export function setupLimitsCommand() {
+  return `sudo ${shellQuote(process.execPath)} ${shellQuote(agentCliEntry())} container setup-limits`;
+}
+
+export function formatContainerError(error) {
+  const code = String(error?.code || '').trim();
+  const message = String(error?.message || '').trim();
+  if (code && message && code !== message) return `${code}: ${message}`;
+  return code || message || String(error);
+}
+
 function help() {
   console.log(`
 Usage:
@@ -34,6 +54,8 @@ Resource protection (default): install attaches the container to the shared
 containers at 90% of host CPU and 70% of host memory. The slice is initialized
 automatically on first install (as root directly, otherwise via sudo; you are
 prompted for the sudo password once). Pass --no-slice to opt out of protection.
+If setup-limits must be run manually for a user-local install, use the
+absolute Node/CLI path printed by this command: ${setupLimitsCommand()}.
 
 --disk-size <size>: per-volume capacity quota for the data and workspace volumes, e.g.
   20G or 80% of the Docker data-root filesystem. Requires Docker overlay2 on xfs with
@@ -90,7 +112,7 @@ export async function ensureAgentSliceAuto({
   if (!interactive) {
     throw new Error(
       `Agent slice '${DEFAULT_AGENT_SLICE}' is not initialized and this shell is not interactive; ` +
-      'run "sudo yeaft-agent container setup-limits" once, ' +
+      `run ${setupLimitsCommand()} once, ` +
       'or pass --no-slice to install without shared resource limits',
     );
   }
@@ -98,7 +120,7 @@ export async function ensureAgentSliceAuto({
   if (code !== 0) {
     throw new Error(
       `Failed to initialize Agent slice '${DEFAULT_AGENT_SLICE}' via sudo (exit ${code}); ` +
-      'run "sudo yeaft-agent container setup-limits" manually, ' +
+      `run ${setupLimitsCommand()} manually, ` +
       'or pass --no-slice to install without shared resource limits',
     );
   }
@@ -106,14 +128,10 @@ export async function ensureAgentSliceAuto({
 
 function runSudoSetupLimits({ spawnImpl = spawn } = {}) {
   return new Promise((resolvePromise, reject) => {
-    // `sudo env PATH=...` keeps user-installed runtimes (nvm etc.) reachable
-    // even when sudoers sets a secure_path. Re-invoking the current entry
-    // script avoids depending on the npm bin being in sudo's PATH.
-    const entry = process.argv[1] ? resolve(process.argv[1]) : null;
-    const args = ['env', `PATH=${process.env.PATH || ''}`];
-    if (entry) args.push(process.execPath, entry);
-    else args.push('yeaft-agent');
-    args.push('container', 'setup-limits');
+    // Use absolute paths for both the runtime and this installed module. This
+    // bypasses sudo's secure_path entirely and works for npm-global installs
+    // that only exist in the invoking user's PATH.
+    const args = [process.execPath, agentCliEntry(), 'container', 'setup-limits'];
     const child = spawnImpl('sudo', args, { stdio: 'inherit' });
     child.once('error', reject);
     child.once('close', code => resolvePromise(code ?? 1));
@@ -161,7 +179,7 @@ export async function runContainerCli(args) {
     });
   } else if (action === 'setup-limits') {
     if (typeof process.getuid === 'function' && process.getuid() !== 0) {
-      throw new Error('setup-limits must run as root; use sudo');
+      throw new Error(`setup-limits must run as root; use ${setupLimitsCommand()}`);
     }
     const resources = await detectHostResources();
     result = await ensureAgentSlice({
@@ -191,7 +209,7 @@ export async function runContainerCli(args) {
 
 if (process.argv[1] && import.meta.url === new URL(`file://${resolve(process.argv[1])}`).href) {
   runContainerCli(process.argv.slice(2)).catch(error => {
-    console.error(`Container Agent failed: ${error.code || error.message}`);
+    console.error(`Container Agent failed: ${formatContainerError(error)}`);
     process.exitCode = 1;
   });
 }

package/container-manager.js

@@ -17,6 +17,23 @@ export class ContainerAgentError extends Error {
   }
 }
 
+function isCgroupWritePermissionError(error) {
+  const code = String(error?.code || '').toUpperCase();
+  const message = String(error?.message || '');
+  return ['EACCES', 'EPERM', 'EROFS'].includes(code)
+    || /EACCES|EPERM|EROFS|permission denied|operation not permitted|read-only file system/i.test(message);
+}
+
+function wrapCgroupWriteError(error, slicePath) {
+  if (!isCgroupWritePermissionError(error)) return error;
+  return new ContainerAgentError(
+    'CONTAINER_AGENT_CGROUP_PERMISSION_DENIED',
+    `Cannot write cgroup v2 slice at ${slicePath} (${error.code || 'permission denied'}). ` +
+      'The host cgroup hierarchy is not writable or delegated to this process; ' +
+      'run setup-limits as host root with a read-write cgroup v2 mount, or pass --no-slice to install without shared resource limits',
+  );
+}
+
 export function normalizeContainerAgentName(name) {
   const value = String(name || '').trim();
   if (!NAME_PATTERN.test(value)) throw new ContainerAgentError('CONTAINER_AGENT_INVALID_NAME');
@@ -276,8 +293,9 @@ export async function ensureAgentSlice({
   try {
     const text = await fsImpl.readFile('/sys/fs/cgroup/cgroup.controllers', 'utf8');
     controllers = String(text || '').trim().split(/\s+/).filter(Boolean);
-  } catch {
-    // Treat missing controller list as "no controllers writable".
+  } catch (error) {
+    if (isCgroupWritePermissionError(error)) throw wrapCgroupWriteError(error, '/sys/fs/cgroup');
+    // Treat a missing controller list as "no controllers writable".
   }
   const wanted = ['cpu', 'memory', 'pids'].filter(name => controllers.includes(name));
   if (wanted.length === 0) {
@@ -286,35 +304,39 @@ export async function ensureAgentSlice({
       'cgroup v2 controllers (cpu/memory/pids) are unavailable; setup-limits requires a host running cgroup v2 and root access to /sys/fs/cgroup',
     );
   }
-  await fsImpl.mkdir(slicePath, { recursive: true, mode: 0o755 });
-  await fsImpl.writeFile(
-    `${slicePath}/cgroup.subtree_control`,
-    wanted.map(name => `+${name}`).join(' '),
-    'utf8',
-  );
-  const detected = resources || await detectHostResources({ readFileImpl: fsImpl.readFile });
-  const limits = buildSliceLimits({ cpuPercent, memoryPercent, pidsLimit }, detected);
-  if (wanted.includes('cpu') && limits.cpuQuotaUs > 0) {
-    await fsImpl.writeFile(`${slicePath}/cpu.max`, `${limits.cpuQuotaUs} ${limits.cpuPeriodUs}`, 'utf8');
-  }
-  if (wanted.includes('memory') && limits.memoryMaxBytes > 0) {
-    await fsImpl.writeFile(`${slicePath}/memory.max`, String(limits.memoryMaxBytes), 'utf8');
-    // No swap escape hatch: the 70% RAM hard cap is the whole memory budget.
-    await fsImpl.writeFile(`${slicePath}/memory.swap.max`, '0', 'utf8');
-  }
-  if (wanted.includes('pids') && limits.pidsMax > 0) {
-    await fsImpl.writeFile(`${slicePath}/pids.max`, String(limits.pidsMax), 'utf8');
+  try {
+    await fsImpl.mkdir(slicePath, { recursive: true, mode: 0o755 });
+    await fsImpl.writeFile(
+      `${slicePath}/cgroup.subtree_control`,
+      wanted.map(name => `+${name}`).join(' '),
+      'utf8',
+    );
+    const detected = resources || await detectHostResources({ readFileImpl: fsImpl.readFile });
+    const limits = buildSliceLimits({ cpuPercent, memoryPercent, pidsLimit }, detected);
+    if (wanted.includes('cpu') && limits.cpuQuotaUs > 0) {
+      await fsImpl.writeFile(`${slicePath}/cpu.max`, `${limits.cpuQuotaUs} ${limits.cpuPeriodUs}`, 'utf8');
+    }
+    if (wanted.includes('memory') && limits.memoryMaxBytes > 0) {
+      await fsImpl.writeFile(`${slicePath}/memory.max`, String(limits.memoryMaxBytes), 'utf8');
+      // No swap escape hatch: the 70% RAM hard cap is the whole memory budget.
+      await fsImpl.writeFile(`${slicePath}/memory.swap.max`, '0', 'utf8');
+    }
+    if (wanted.includes('pids') && limits.pidsMax > 0) {
+      await fsImpl.writeFile(`${slicePath}/pids.max`, String(limits.pidsMax), 'utf8');
+    }
+    const marker = {
+      slice,
+      cpuQuotaUs: limits.cpuQuotaUs,
+      cpuPeriodUs: limits.cpuPeriodUs,
+      memoryMaxBytes: limits.memoryMaxBytes,
+      pidsMax: limits.pidsMax,
+      updatedAt: new Date().toISOString(),
+    };
+    await fsImpl.writeFile(`${slicePath}/${SLICE_READY_MARKER}`, JSON.stringify(marker, null, 2), 'utf8');
+    return { slice, limits, controllers: wanted };
+  } catch (error) {
+    throw wrapCgroupWriteError(error, slicePath);
   }
-  const marker = {
-    slice,
-    cpuQuotaUs: limits.cpuQuotaUs,
-    cpuPeriodUs: limits.cpuPeriodUs,
-    memoryMaxBytes: limits.memoryMaxBytes,
-    pidsMax: limits.pidsMax,
-    updatedAt: new Date().toISOString(),
-  };
-  await fsImpl.writeFile(`${slicePath}/${SLICE_READY_MARKER}`, JSON.stringify(marker, null, 2), 'utf8');
-  return { slice, limits, controllers: wanted };
 }
 
 /**

package/index.js

@@ -24,6 +24,7 @@ import { connect } from './connection.js';
 import { loadMcpServers } from './mcp.js';
 import { SAFE_REMOTE_UPGRADE_CAPABILITY } from './upgrade-command.js';
 import { loadConfig as loadYeaftConfig } from './yeaft/config.js';
+import { initYeaftDir } from './yeaft/init.js';
 import { updateBrowserRuntimeSettings } from './yeaft/config-api.js';
 import { bootBrowserRuntime, shutdownBrowserRuntime } from './browser-runtime/index.js';
 import {
@@ -106,12 +107,15 @@ const { agentName: AGENT_NAME, instanceId: INSTANCE_ID } = resolveRuntimeIdentit
 // WebSocket connection goes live, so downstream code can assume a real path.
 const YEAFT_DIR = process.env.YEAFT_DIR || fileConfig.yeaftDir || getDefaultYeaftDir(INSTANCE_ID);
 try {
-  if (!existsSync(YEAFT_DIR)) {
-    mkdirSync(YEAFT_DIR, { recursive: true, mode: 0o700 });
-    console.log(`[Agent] Created yeaft dir: ${YEAFT_DIR}`);
+  const initResult = initYeaftDir(YEAFT_DIR);
+  for (const warning of initResult.warnings || []) {
+    console.warn(`[Agent] ${warning}`);
+  }
+  if (initResult.created?.length > 0) {
+    console.log(`[Agent] Initialized yeaft dir: ${YEAFT_DIR}`);
   }
 } catch (err) {
-  console.warn(`[Agent] Could not ensure yeaft dir ${YEAFT_DIR}: ${err?.message || err}`);
+  console.warn(`[Agent] Could not initialize yeaft dir ${YEAFT_DIR}: ${err?.message || err}`);
 }
 
 const agentSecret = process.env.AGENT_SECRET_FILE

package/local-runtime/agent/container-manager.js

@@ -17,6 +17,23 @@ export class ContainerAgentError extends Error {
   }
 }
 
+function isCgroupWritePermissionError(error) {
+  const code = String(error?.code || '').toUpperCase();
+  const message = String(error?.message || '');
+  return ['EACCES', 'EPERM', 'EROFS'].includes(code)
+    || /EACCES|EPERM|EROFS|permission denied|operation not permitted|read-only file system/i.test(message);
+}
+
+function wrapCgroupWriteError(error, slicePath) {
+  if (!isCgroupWritePermissionError(error)) return error;
+  return new ContainerAgentError(
+    'CONTAINER_AGENT_CGROUP_PERMISSION_DENIED',
+    `Cannot write cgroup v2 slice at ${slicePath} (${error.code || 'permission denied'}). ` +
+      'The host cgroup hierarchy is not writable or delegated to this process; ' +
+      'run setup-limits as host root with a read-write cgroup v2 mount, or pass --no-slice to install without shared resource limits',
+  );
+}
+
 export function normalizeContainerAgentName(name) {
   const value = String(name || '').trim();
   if (!NAME_PATTERN.test(value)) throw new ContainerAgentError('CONTAINER_AGENT_INVALID_NAME');
@@ -276,8 +293,9 @@ export async function ensureAgentSlice({
   try {
     const text = await fsImpl.readFile('/sys/fs/cgroup/cgroup.controllers', 'utf8');
     controllers = String(text || '').trim().split(/\s+/).filter(Boolean);
-  } catch {
-    // Treat missing controller list as "no controllers writable".
+  } catch (error) {
+    if (isCgroupWritePermissionError(error)) throw wrapCgroupWriteError(error, '/sys/fs/cgroup');
+    // Treat a missing controller list as "no controllers writable".
   }
   const wanted = ['cpu', 'memory', 'pids'].filter(name => controllers.includes(name));
   if (wanted.length === 0) {
@@ -286,35 +304,39 @@ export async function ensureAgentSlice({
       'cgroup v2 controllers (cpu/memory/pids) are unavailable; setup-limits requires a host running cgroup v2 and root access to /sys/fs/cgroup',
     );
   }
-  await fsImpl.mkdir(slicePath, { recursive: true, mode: 0o755 });
-  await fsImpl.writeFile(
-    `${slicePath}/cgroup.subtree_control`,
-    wanted.map(name => `+${name}`).join(' '),
-    'utf8',
-  );
-  const detected = resources || await detectHostResources({ readFileImpl: fsImpl.readFile });
-  const limits = buildSliceLimits({ cpuPercent, memoryPercent, pidsLimit }, detected);
-  if (wanted.includes('cpu') && limits.cpuQuotaUs > 0) {
-    await fsImpl.writeFile(`${slicePath}/cpu.max`, `${limits.cpuQuotaUs} ${limits.cpuPeriodUs}`, 'utf8');
-  }
-  if (wanted.includes('memory') && limits.memoryMaxBytes > 0) {
-    await fsImpl.writeFile(`${slicePath}/memory.max`, String(limits.memoryMaxBytes), 'utf8');
-    // No swap escape hatch: the 70% RAM hard cap is the whole memory budget.
-    await fsImpl.writeFile(`${slicePath}/memory.swap.max`, '0', 'utf8');
-  }
-  if (wanted.includes('pids') && limits.pidsMax > 0) {
-    await fsImpl.writeFile(`${slicePath}/pids.max`, String(limits.pidsMax), 'utf8');
+  try {
+    await fsImpl.mkdir(slicePath, { recursive: true, mode: 0o755 });
+    await fsImpl.writeFile(
+      `${slicePath}/cgroup.subtree_control`,
+      wanted.map(name => `+${name}`).join(' '),
+      'utf8',
+    );
+    const detected = resources || await detectHostResources({ readFileImpl: fsImpl.readFile });
+    const limits = buildSliceLimits({ cpuPercent, memoryPercent, pidsLimit }, detected);
+    if (wanted.includes('cpu') && limits.cpuQuotaUs > 0) {
+      await fsImpl.writeFile(`${slicePath}/cpu.max`, `${limits.cpuQuotaUs} ${limits.cpuPeriodUs}`, 'utf8');
+    }
+    if (wanted.includes('memory') && limits.memoryMaxBytes > 0) {
+      await fsImpl.writeFile(`${slicePath}/memory.max`, String(limits.memoryMaxBytes), 'utf8');
+      // No swap escape hatch: the 70% RAM hard cap is the whole memory budget.
+      await fsImpl.writeFile(`${slicePath}/memory.swap.max`, '0', 'utf8');
+    }
+    if (wanted.includes('pids') && limits.pidsMax > 0) {
+      await fsImpl.writeFile(`${slicePath}/pids.max`, String(limits.pidsMax), 'utf8');
+    }
+    const marker = {
+      slice,
+      cpuQuotaUs: limits.cpuQuotaUs,
+      cpuPeriodUs: limits.cpuPeriodUs,
+      memoryMaxBytes: limits.memoryMaxBytes,
+      pidsMax: limits.pidsMax,
+      updatedAt: new Date().toISOString(),
+    };
+    await fsImpl.writeFile(`${slicePath}/${SLICE_READY_MARKER}`, JSON.stringify(marker, null, 2), 'utf8');
+    return { slice, limits, controllers: wanted };
+  } catch (error) {
+    throw wrapCgroupWriteError(error, slicePath);
   }
-  const marker = {
-    slice,
-    cpuQuotaUs: limits.cpuQuotaUs,
-    cpuPeriodUs: limits.cpuPeriodUs,
-    memoryMaxBytes: limits.memoryMaxBytes,
-    pidsMax: limits.pidsMax,
-    updatedAt: new Date().toISOString(),
-  };
-  await fsImpl.writeFile(`${slicePath}/${SLICE_READY_MARKER}`, JSON.stringify(marker, null, 2), 'utf8');
-  return { slice, limits, controllers: wanted };
 }
 
 /**

package/local-runtime/server/config.js

@@ -141,9 +141,10 @@ export const CONFIG = {
     image: process.env.SANDBOX_AGENT_IMAGE || 'ghcr.io/yeaft/yeaft-web-code-agent-agent:dev',
     serverUrl: process.env.SANDBOX_SERVER_URL || '',
     stateDir: process.env.SANDBOX_STATE_DIR || join(homedir(), '.yeaft', 'container-agents'),
-    // Shared cgroup slice (created by `yeaft-agent container setup-limits` on the
-    // Host) that caps the sum of all sandbox containers' CPU/memory usage. Empty
-    // means no cgroup-parent is passed and sandbox containers are unprotected.
+    // Shared cgroup slice (created by the absolute Node/CLI command printed by
+    // `yeaft-agent container setup-limits` on the Host) that caps the sum of all
+    // sandbox containers' CPU/memory usage. Empty means no cgroup-parent is
+    // passed and sandbox containers are unprotected.
     cgroupParent: process.env.SANDBOX_CGROUP_PARENT || ''
   },
 

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.442"}
+{"version":"1.0.444"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.442",
+  "version": "1.0.444",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",