@yeaft/webchat-agent 1.0.269 → 1.0.271

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.269",
+  "version": "1.0.271",
   "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/config.js

@@ -3,13 +3,19 @@
  */
 import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
 import { join, dirname } from 'path';
-import { platform, homedir } from 'os';
+import { platform, homedir, hostname } from 'os';
 import { fileURLToPath } from 'url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export const SERVICE_NAME = 'yeaft-agent';
 export const DEFAULT_INSTANCE_ID = 'default';
 
+export function getDefaultAgentName(machineName = hostname()) {
+  const raw = String(machineName || '');
+  if (!raw) return DEFAULT_INSTANCE_ID;
+  return raw.replace(/[^A-Za-z0-9._-]/gu, '-');
+}
+
 /**
  * Load .env file from agent directory (or cwd) into process.env
  * Only sets vars that are not already set (won't override existing env)
@@ -58,45 +64,73 @@ export function validateInstanceId(instanceId) {
   return normalized;
 }
 
-export function getInstanceIdFromArgs(args = [], env = process.env) {
-  let instanceId = '';
-  let agentName = '';
+function readIdentityArgs(args = []) {
+  let deprecatedInstanceId = null;
+  let explicitName = null;
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     const next = args[i + 1];
-    if (arg === '--instance' && next) {
-      instanceId = next;
-      i++;
-    } else if (arg === '--name' && next) {
-      agentName = next;
-      i++;
+    if (arg !== '--instance' && arg !== '--name') continue;
+    if (!next || next.startsWith('-')) {
+      throw new Error(`${arg} requires a value`);
     }
+    if (arg === '--name') {
+      explicitName = validateInstanceId(next);
+    } else {
+      deprecatedInstanceId = validateInstanceId(next);
+    }
+    i++;
   }
-  return validateInstanceId(
-    instanceId
-    || agentName
-    || env.YEAFT_AGENT_INSTANCE
+  return { deprecatedInstanceId, explicitName };
+}
+
+export function resolveDisplayName(args = [], env = process.env, fallbackName = getDefaultAgentName()) {
+  const { explicitName } = readIdentityArgs(args);
+  return explicitName
     || env.AGENT_NAME
-    || DEFAULT_INSTANCE_ID,
-  );
+    || fallbackName
+    || getDefaultAgentName();
 }
 
-export function applyAgentIdentityToEnv(args = [], env = process.env) {
-  env.YEAFT_AGENT_INSTANCE = getInstanceIdFromArgs(args, env);
+export function resolveRuntimeIdentity(fileConfig = {}, env = process.env) {
+  const agentName = resolveDisplayName([], env, fileConfig.agentName || getDefaultAgentName());
+  const instanceId = validateInstanceId(env.YEAFT_AGENT_INSTANCE || fileConfig.instanceId || DEFAULT_INSTANCE_ID);
+  return { agentName, instanceId };
+}
 
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === '--name' && args[i + 1]) {
-      env.AGENT_NAME = args[i + 1];
-      i++;
-    }
-  }
+export function resolveServiceInstanceId(args = [], env = process.env, options = {}) {
+  const { deprecatedInstanceId, explicitName } = readIdentityArgs(args);
+  if (explicitName) return explicitName;
+  if (deprecatedInstanceId) return deprecatedInstanceId;
+  if (env.YEAFT_AGENT_INSTANCE) return validateInstanceId(env.YEAFT_AGENT_INSTANCE);
+  if (options.management) return DEFAULT_INSTANCE_ID;
+  if (env.AGENT_NAME) return validateInstanceId(env.AGENT_NAME);
+  return validateInstanceId(options.fallbackName || getDefaultAgentName());
+}
 
-  return env.YEAFT_AGENT_INSTANCE;
+/** Legacy alias for resolveServiceInstanceId(). */
+export function getInstanceIdFromArgs(args = [], env = process.env, options = {}) {
+  return resolveServiceInstanceId(args, env, options);
+}
+
+export function applyAgentIdentityToEnv(args = [], env = process.env) {
+  const { deprecatedInstanceId, explicitName } = readIdentityArgs(args);
+  if (explicitName) {
+    env.YEAFT_AGENT_INSTANCE = explicitName;
+    env.AGENT_NAME = explicitName;
+  } else if (deprecatedInstanceId) {
+    env.YEAFT_AGENT_INSTANCE = deprecatedInstanceId;
+  } else if (!env.YEAFT_AGENT_INSTANCE && env.AGENT_NAME) {
+    env.YEAFT_AGENT_INSTANCE = validateInstanceId(env.AGENT_NAME);
+  } else if (env.YEAFT_AGENT_INSTANCE) {
+    env.YEAFT_AGENT_INSTANCE = validateInstanceId(env.YEAFT_AGENT_INSTANCE);
+  }
+  return env.YEAFT_AGENT_INSTANCE || null;
 }
 
 export function warnDeprecatedInstanceArg(args = [], warn = console.warn) {
   if (args.includes('--instance')) {
-    warn('Warning: --instance is deprecated; use --name instead. The instance id now defaults to the agent name.');
+    warn('Warning: --instance is deprecated; use --name instead. --name takes precedence when both are provided.');
   }
 }
 
@@ -184,12 +218,20 @@ export function parseServiceArgs(args) {
   // Load .env if available (for dev / source-based usage)
   loadDotenv();
 
-  const instanceId = getInstanceIdFromArgs(args);
+  const instanceId = resolveServiceInstanceId(args, process.env, { management: true });
   const existing = loadServiceConfig(instanceId) || {};
+  const explicitIdentity = args.includes('--name') || args.includes('--instance');
+  const fallbackName = explicitIdentity
+    ? instanceId
+    : existing.agentName || getDefaultAgentName();
   const config = {
     instanceId,
     serverUrl: existing.serverUrl || '',
-    agentName: existing.agentName || '',
+    agentName: resolveDisplayName(
+      args,
+      explicitIdentity ? { ...process.env, AGENT_NAME: '' } : process.env,
+      fallbackName,
+    ),
     agentSecret: existing.agentSecret || '',
     workDir: existing.workDir || '',
     yeaftDir: existing.yeaftDir || '',
@@ -197,7 +239,6 @@ export function parseServiceArgs(args) {
 
   // Environment variables override saved config
   if (process.env.SERVER_URL) config.serverUrl = process.env.SERVER_URL;
-  if (process.env.AGENT_NAME) config.agentName = process.env.AGENT_NAME;
   if (process.env.AGENT_SECRET) config.agentSecret = process.env.AGENT_SECRET;
   if (process.env.WORK_DIR) config.workDir = process.env.WORK_DIR;
   if (process.env.YEAFT_DIR) config.yeaftDir = process.env.YEAFT_DIR;
@@ -209,7 +250,7 @@ export function parseServiceArgs(args) {
     switch (arg) {
       case '--instance': if (next) { i++; } break;
       case '--server': if (next) { config.serverUrl = next; i++; } break;
-      case '--name': if (next) { config.agentName = next; i++; } break;
+      case '--name': if (next) { i++; } break;
       case '--secret': if (next) { config.agentSecret = next; i++; } break;
       case '--work-dir': if (next) { config.workDir = next; i++; } break;
       case '--yeaft-dir': if (next) { config.yeaftDir = next; i++; } break;

package/service/doctor.js

@@ -7,7 +7,7 @@
 import { execSync } from 'child_process';
 import { existsSync, readFileSync, statSync } from 'fs';
 import { platform, homedir } from 'os';
-import { getNodePath } from './config.js';
+import { getNodePath, resolveServiceInstanceId } from './config.js';
 import { getLaunchdPlistPath, getMacServiceStatus } from './macos.js';
 import { getSystemdServicePath, getLinuxServiceStatus } from './linux.js';
 import { getEcosystemPath, getWinServiceStatus } from './windows.js';
@@ -112,8 +112,9 @@ function tildeify(filePath) {
 
 // ── Main doctor logic ──────────────────────────────────────────────────────
 
-export function doctor() {
+export function doctor(args = []) {
   const os = platform();
+  const instanceId = resolveServiceInstanceId(args, process.env, { management: true });
   let configPath = null;
   let parsePaths = null;
   let getServiceStatus = null;
@@ -122,17 +123,17 @@ export function doctor() {
 
   // 1. Determine platform and config path
   if (os === 'darwin') {
-    configPath = getLaunchdPlistPath();
+    configPath = getLaunchdPlistPath(instanceId);
     parsePaths = parseMacPaths;
-    getServiceStatus = getMacServiceStatus;
+    getServiceStatus = () => getMacServiceStatus(instanceId);
   } else if (os === 'linux') {
-    configPath = getSystemdServicePath();
+    configPath = getSystemdServicePath(instanceId);
     parsePaths = parseLinuxPaths;
-    getServiceStatus = getLinuxServiceStatus;
+    getServiceStatus = () => getLinuxServiceStatus(instanceId);
   } else if (os === 'win32') {
-    configPath = getEcosystemPath();
+    configPath = getEcosystemPath(instanceId);
     parsePaths = parseWindowsPaths;
-    getServiceStatus = getWinServiceStatus;
+    getServiceStatus = () => getWinServiceStatus(instanceId);
   } else {
     console.log(`\u26a0\ufe0f  Unsupported platform: ${os}`);
     console.log(`   The doctor command supports macOS, Linux, and Windows.`);
@@ -143,7 +144,7 @@ export function doctor() {
   // 2. Check if service config exists
   if (!existsSync(configPath)) {
     console.log(`\u26a0\ufe0f  No service configuration found.`);
-    console.log(`   Run 'yeaft-agent install --server <url> --name <name> --secret <secret>' to set up.`);
+    console.log(`   Run 'yeaft-agent install --server <url> --secret <secret>' to set up.`);
     console.log('');
     return;
   }
@@ -209,7 +210,7 @@ export function doctor() {
   if (hasErrors) {
     console.log('Fix: Run the following commands:');
     console.log('  npm install -g @yeaft/webchat-agent');
-    console.log('  yeaft-agent install --server <your-server-url> --name <your-agent-name> --secret <your-secret>');
+    console.log('  yeaft-agent install --server <your-server-url> --secret <your-secret>');
   } else {
     console.log('All checks passed.');
   }

package/service/index.js

@@ -8,7 +8,7 @@ import { platform } from 'os';
 import {
   getConfigDir, getLogDir, getConfigPath,
   saveServiceConfig, loadServiceConfig,
-  parseServiceArgs, validateConfig, getInstanceIdFromArgs, getDefaultYeaftDir
+  parseServiceArgs, validateConfig, resolveServiceInstanceId, getDefaultYeaftDir
 } from './config.js';
 import { initYeaftDir } from '../yeaft/init.js';
 import { DEFAULT_GITHUB_COPILOT_MODEL, tryAutoConfigureGitHubCopilot } from '../llm-config-cli.js';
@@ -25,6 +25,10 @@ export {
 export {
   SERVICE_NAME,
   DEFAULT_INSTANCE_ID,
+  getDefaultAgentName,
+  resolveDisplayName,
+  resolveRuntimeIdentity,
+  resolveServiceInstanceId,
   normalizeInstanceId,
   isDefaultInstance,
   validateInstanceId,
@@ -105,7 +109,7 @@ export async function install(args) {
 }
 
 export function uninstall(args = []) {
-  const instanceId = getInstanceIdFromArgs(args);
+  const instanceId = resolveServiceInstanceId(args, process.env, { management: true });
   console.log(`Uninstalling yeaft-agent service (${instanceId})...`);
   if (os === 'linux') linuxUninstall(instanceId);
   else if (os === 'darwin') macUninstall(instanceId);
@@ -114,7 +118,7 @@ export function uninstall(args = []) {
 }
 
 export function start(args = []) {
-  const instanceId = getInstanceIdFromArgs(args);
+  const instanceId = resolveServiceInstanceId(args, process.env, { management: true });
   ensureInstalled(instanceId);
   if (os === 'linux') linuxStart(instanceId);
   else if (os === 'darwin') macStart(instanceId);
@@ -122,7 +126,7 @@ export function start(args = []) {
 }
 
 export function stop(args = []) {
-  const instanceId = getInstanceIdFromArgs(args);
+  const instanceId = resolveServiceInstanceId(args, process.env, { management: true });
   ensureInstalled(instanceId);
   if (os === 'linux') linuxStop(instanceId);
   else if (os === 'darwin') macStop(instanceId);
@@ -130,7 +134,7 @@ export function stop(args = []) {
 }
 
 export function restart(args = []) {
-  const instanceId = getInstanceIdFromArgs(args);
+  const instanceId = resolveServiceInstanceId(args, process.env, { management: true });
   ensureInstalled(instanceId);
   if (os === 'linux') linuxRestart(instanceId);
   else if (os === 'darwin') macRestart(instanceId);
@@ -138,14 +142,14 @@ export function restart(args = []) {
 }
 
 export function status(args = []) {
-  const instanceId = getInstanceIdFromArgs(args);
+  const instanceId = resolveServiceInstanceId(args, process.env, { management: true });
   if (os === 'linux') linuxStatus(instanceId);
   else if (os === 'darwin') macStatus(instanceId);
   else if (os === 'win32') winStatus(instanceId);
 }
 
 export function logs(args = []) {
-  const instanceId = getInstanceIdFromArgs(args);
+  const instanceId = resolveServiceInstanceId(args, process.env, { management: true });
   if (os === 'linux') linuxLogs(instanceId);
   else if (os === 'darwin') macLogs(instanceId);
   else if (os === 'win32') winLogs(instanceId);

package/service.js

@@ -18,6 +18,10 @@ export {
   parseServiceArgs,
   SERVICE_NAME,
   DEFAULT_INSTANCE_ID,
+  getDefaultAgentName,
+  resolveDisplayName,
+  resolveRuntimeIdentity,
+  resolveServiceInstanceId,
   normalizeInstanceId,
   isDefaultInstance,
   validateInstanceId,