@yeaft/webchat-agent 1.0.525 → 1.0.526

package/package.json

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

package/service/linux.js

@@ -12,17 +12,30 @@ export function getSystemdServicePath(instanceId = DEFAULT_INSTANCE_ID) {
   return join(homedir(), '.config', 'systemd', 'user', `${getServiceName(instanceId)}.service`);
 }
 
+// systemd unit values use C-style quoting and percent specifier expansion.
+function quoteUnit(value, { executable = false } = {}) {
+  let escaped = String(value).replace(/%/g, '%%');
+  if (executable) escaped = escaped.replace(/\$/g, '$$$$');
+  return JSON.stringify(escaped);
+}
+
+function unitPath(value) {
+  const path = String(value);
+  if (/[\r\n\0]/.test(path)) throw new Error('Service paths cannot contain line breaks or NUL');
+  return path.replace(/%/g, '%%');
+}
+
 export function generateSystemdUnit(config) {
   const nodePath = getNodePath();
   const cliPath = getCliPath();
   const logDir = getLogDir(config.instanceId);
   const envLines = [];
-  if (config.instanceId) envLines.push(`Environment=YEAFT_AGENT_INSTANCE=${config.instanceId}`);
-  if (config.serverUrl) envLines.push(`Environment=SERVER_URL=${config.serverUrl}`);
-  if (config.agentName) envLines.push(`Environment=AGENT_NAME=${config.agentName}`);
-  if (config.agentSecret) envLines.push(`Environment=AGENT_SECRET=${config.agentSecret}`);
-  if (config.workDir) envLines.push(`Environment=WORK_DIR=${config.workDir}`);
-  if (config.yeaftDir) envLines.push(`Environment=YEAFT_DIR=${config.yeaftDir}`);
+  if (config.instanceId) envLines.push(`Environment=${quoteUnit(`YEAFT_AGENT_INSTANCE=${config.instanceId}`)}`);
+  if (config.serverUrl) envLines.push(`Environment=${quoteUnit(`SERVER_URL=${config.serverUrl}`)}`);
+  if (config.agentName) envLines.push(`Environment=${quoteUnit(`AGENT_NAME=${config.agentName}`)}`);
+  if (config.agentSecret) envLines.push(`Environment=${quoteUnit(`AGENT_SECRET=${config.agentSecret}`)}`);
+  if (config.workDir) envLines.push(`Environment=${quoteUnit(`WORK_DIR=${config.workDir}`)}`);
+  if (config.yeaftDir) envLines.push(`Environment=${quoteUnit(`YEAFT_DIR=${config.yeaftDir}`)}`);
 
   // Include node's bin dir in PATH for claude CLI access
   const nodeBinDir = dirname(nodePath);
@@ -34,17 +47,17 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-ExecStart=${nodePath} ${cliPath}
-WorkingDirectory=${config.workDir || homedir()}
+ExecStart=${quoteUnit(nodePath, { executable: true })} ${quoteUnit(cliPath, { executable: true })}
+WorkingDirectory=${unitPath(config.workDir || homedir())}
 Restart=on-failure
 RestartSec=10
 KillMode=mixed
 TimeoutStopSec=15
 ${envLines.join('\n')}
-Environment=PATH=${nodeBinDir}:${homedir()}/.local/bin:${homedir()}/.npm-global/bin:/usr/local/bin:/usr/bin:/bin
+Environment=${quoteUnit(`PATH=${nodeBinDir}:${homedir()}/.local/bin:${homedir()}/.npm-global/bin:/usr/local/bin:/usr/bin:/bin`)}
 
-StandardOutput=append:${logDir}/out.log
-StandardError=append:${logDir}/error.log
+StandardOutput=append:${unitPath(`${logDir}/out.log`)}
+StandardError=append:${unitPath(`${logDir}/error.log`)}
 
 [Install]
 WantedBy=default.target

package/service/macos.js

@@ -1,7 +1,7 @@
 /*
  * Service — macOS (launchd) platform implementation
  */
-import { execSync } from 'child_process';
+import { execFileSync, execSync } from 'child_process';
 import { existsSync, writeFileSync, unlinkSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
@@ -12,33 +12,37 @@ export function getLaunchdPlistPath(instanceId = DEFAULT_INSTANCE_ID) {
   return join(homedir(), 'Library', 'LaunchAgents', `${getLaunchdLabel(instanceId)}.plist`);
 }
 
-function generateLaunchdPlist(config) {
+const xmlText = value => String(value).replace(/[&<>"']/g, char => ({
+  '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&apos;',
+})[char]);
+
+export function generateLaunchdPlist(config) {
   const nodePath = getNodePath();
   const cliPath = getCliPath();
   const logDir = getLogDir(config.instanceId);
   const label = getLaunchdLabel(config.instanceId);
 
   const envDict = [];
-  if (config.instanceId) envDict.push(`      <key>YEAFT_AGENT_INSTANCE</key>\n      <string>${config.instanceId}</string>`);
-  if (config.serverUrl) envDict.push(`      <key>SERVER_URL</key>\n      <string>${config.serverUrl}</string>`);
-  if (config.agentName) envDict.push(`      <key>AGENT_NAME</key>\n      <string>${config.agentName}</string>`);
-  if (config.agentSecret) envDict.push(`      <key>AGENT_SECRET</key>\n      <string>${config.agentSecret}</string>`);
-  if (config.workDir) envDict.push(`      <key>WORK_DIR</key>\n      <string>${config.workDir}</string>`);
-  if (config.yeaftDir) envDict.push(`      <key>YEAFT_DIR</key>\n      <string>${config.yeaftDir}</string>`);
+  if (config.instanceId) envDict.push(`      <key>YEAFT_AGENT_INSTANCE</key>\n      <string>${xmlText(config.instanceId)}</string>`);
+  if (config.serverUrl) envDict.push(`      <key>SERVER_URL</key>\n      <string>${xmlText(config.serverUrl)}</string>`);
+  if (config.agentName) envDict.push(`      <key>AGENT_NAME</key>\n      <string>${xmlText(config.agentName)}</string>`);
+  if (config.agentSecret) envDict.push(`      <key>AGENT_SECRET</key>\n      <string>${xmlText(config.agentSecret)}</string>`);
+  if (config.workDir) envDict.push(`      <key>WORK_DIR</key>\n      <string>${xmlText(config.workDir)}</string>`);
+  if (config.yeaftDir) envDict.push(`      <key>YEAFT_DIR</key>\n      <string>${xmlText(config.yeaftDir)}</string>`);
 
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
     <key>Label</key>
-    <string>${label}</string>
+    <string>${xmlText(label)}</string>
     <key>ProgramArguments</key>
     <array>
-        <string>${nodePath}</string>
-        <string>${cliPath}</string>
+        <string>${xmlText(nodePath)}</string>
+        <string>${xmlText(cliPath)}</string>
     </array>
     <key>WorkingDirectory</key>
-    <string>${config.workDir || homedir()}</string>
+    <string>${xmlText(config.workDir || homedir())}</string>
     <key>EnvironmentVariables</key>
     <dict>
 ${envDict.join('\n')}
@@ -53,9 +57,9 @@ ${envDict.join('\n')}
     <key>ThrottleInterval</key>
     <integer>10</integer>
     <key>StandardOutPath</key>
-    <string>${logDir}/out.log</string>
+    <string>${xmlText(`${logDir}/out.log`)}</string>
     <key>StandardErrorPath</key>
-    <string>${logDir}/error.log</string>
+    <string>${xmlText(`${logDir}/error.log`)}</string>
 </dict>
 </plist>
 `;
@@ -68,10 +72,10 @@ export function macInstall(config) {
   mkdirSync(getLogDir(config.instanceId), { recursive: true });
   // Unload first if exists
   if (existsSync(plistPath)) {
-    try { execSync(`launchctl unload ${plistPath} 2>/dev/null`); } catch {}
+    try { execFileSync('launchctl', ['unload', plistPath], { stdio: 'pipe' }); } catch {}
   }
   writeFileSync(plistPath, generateLaunchdPlist(config));
-  execSync(`launchctl load ${plistPath}`);
+  execFileSync('launchctl', ['load', plistPath]);
   console.log(`Service installed and started: ${getLaunchdLabel(config.instanceId)}`);
   console.log(`\nManage with:`);
   console.log(`  yeaft-agent status --name ${config.instanceId}`);
@@ -83,7 +87,7 @@ export function macInstall(config) {
 export function macUninstall(instanceId = DEFAULT_INSTANCE_ID) {
   const plistPath = getLaunchdPlistPath(instanceId);
   if (existsSync(plistPath)) {
-    try { execSync(`launchctl unload ${plistPath}`); } catch {}
+    try { execFileSync('launchctl', ['unload', plistPath]); } catch {}
     unlinkSync(plistPath);
   }
   console.log(`Service uninstalled: ${getLaunchdLabel(instanceId)}`);
@@ -95,14 +99,14 @@ export function macStart(instanceId = DEFAULT_INSTANCE_ID) {
     console.error('Service not installed. Run "yeaft-agent install" first.');
     process.exit(1);
   }
-  execSync(`launchctl load ${plistPath}`);
+  execFileSync('launchctl', ['load', plistPath]);
   console.log(`Service started: ${getLaunchdLabel(instanceId)}`);
 }
 
 export function macStop(instanceId = DEFAULT_INSTANCE_ID) {
   const plistPath = getLaunchdPlistPath(instanceId);
   if (existsSync(plistPath)) {
-    execSync(`launchctl unload ${plistPath}`);
+    execFileSync('launchctl', ['unload', plistPath]);
   }
   console.log(`Service stopped: ${getLaunchdLabel(instanceId)}`);
 }

package/service/windows.js

@@ -26,7 +26,7 @@ export function getEcosystemPath(instanceId = DEFAULT_INSTANCE_ID) {
   return join(getConfigDir(instanceId), 'ecosystem.config.cjs');
 }
 
-function generateEcosystem(config) {
+export function generateEcosystem(config) {
   const nodePath = getNodePath();
   const cliPath = getCliPath();
   const cliDir = dirname(cliPath);
@@ -43,18 +43,18 @@ function generateEcosystem(config) {
 
   return `module.exports = {
   apps: [{
-    name: '${pm2AppName}',
-    script: '${cliPath.replace(/\\/g, '\\\\')}',
-    interpreter: '${nodePath.replace(/\\/g, '\\\\')}',
-    cwd: '${cliDir.replace(/\\/g, '\\\\')}',
+    name: ${JSON.stringify(pm2AppName)},
+    script: ${JSON.stringify(cliPath)},
+    interpreter: ${JSON.stringify(nodePath)},
+    cwd: ${JSON.stringify(cliDir)},
     env: ${JSON.stringify(env, null, 6)},
     autorestart: true,
     watch: false,
     max_restarts: 10,
     restart_delay: 5000,
     log_date_format: 'YYYY-MM-DD HH:mm:ss',
-    error_file: '${join(logDir, 'error.log').replace(/\\/g, '\\\\')}',
-    out_file: '${join(logDir, 'out.log').replace(/\\/g, '\\\\')}',
+    error_file: ${JSON.stringify(join(logDir, 'error.log'))},
+    out_file: ${JSON.stringify(join(logDir, 'out.log'))},
     merge_logs: true,
     max_memory_restart: '500M',
   }]
@@ -105,6 +105,7 @@ export function winInstall(config) {
   // pm2-startup doesn't work well on Windows, use Startup folder approach
   const trayScript = join(dirname(getCliPath()), 'scripts', 'agent-tray.ps1');
   const startupDir = join(process.env.APPDATA, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'Startup');
+  mkdirSync(startupDir, { recursive: true });
   const startupBat = join(startupDir, `${pm2AppName}.bat`);
   // Resurrect pm2 processes + launch tray icon
   let batContent = `@echo off\r\npm2 resurrect\r\n`;