@yeaft/webchat-agent 1.0.163 → 1.0.165

package/cli.js

@@ -29,6 +29,7 @@ import {
   discoverOpenAICompatibleModels,
   GITHUB_COPILOT_PROVIDER,
 } from './llm-model-discovery.js';
+import { applyAgentIdentityToEnv, warnDeprecatedInstanceArg } from './service/config.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf-8'));
@@ -76,18 +77,18 @@ function printHelp() {
     yeaft-agent --version              Show version
 
   Options:
-    --instance <id>     Local service instance id (default: default)
+    --instance <id>     Deprecated alias for the local service instance id
     --server <url>      WebSocket server URL (default: ws://localhost:3456)
-    --name <name>       Agent display name (default: Worker-{platform}-{pid})
+    --name <name>       Agent name and instance id (letters, numbers, ._-)
     --secret <secret>   Agent secret for authentication
     --work-dir <dir>    Default working directory (default: cwd)
     --yeaft-dir <dir>   Yeaft data directory for this instance
     --auto-upgrade      Check for updates on startup
 
   Environment variables (alternative to flags):
-    YEAFT_AGENT_INSTANCE Local service instance id
+    YEAFT_AGENT_INSTANCE Deprecated local service instance id override
     SERVER_URL          WebSocket server URL
-    AGENT_NAME          Agent display name
+    AGENT_NAME          Agent name and instance id fallback
     AGENT_SECRET        Agent secret
     WORK_DIR            Working directory
     YEAFT_DIR           Yeaft data directory
@@ -95,9 +96,9 @@ function printHelp() {
   Examples:
     yeaft-agent --server wss://your-server.com --name my-worker --secret xxx
     yeaft-agent install --server wss://your-server.com --name my-worker --secret xxx
-    yeaft-agent install --instance second --server wss://your-server.com --name my-worker-2 --secret xxx
-    yeaft-agent status --instance second
-    yeaft-agent logs --instance second
+    yeaft-agent install --server wss://your-server.com --name my-worker-2 --secret xxx
+    yeaft-agent status --name my-worker-2
+    yeaft-agent logs --name my-worker-2
 `);
 }
 
@@ -383,6 +384,7 @@ function parseLlmArgs(args) {
 }
 
 async function handleServiceCommand(command, args) {
+  warnDeprecatedInstanceArg(args);
   const service = await import('./service.js');
   switch (command) {
     case 'install':   await service.install(args); break;
@@ -401,20 +403,23 @@ async function handleDoctorCommand() {
 }
 
 function parseAndStart(args) {
-  // Parse CLI flags → set environment variables (env vars take precedence over flags)
+  warnDeprecatedInstanceArg(args);
+  applyAgentIdentityToEnv(args);
+
+  // Parse non-identity flags. Saved environment remains the fallback for these options.
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     const next = args[i + 1];
 
     switch (arg) {
       case '--instance':
-        if (next) { process.env.YEAFT_AGENT_INSTANCE = process.env.YEAFT_AGENT_INSTANCE || next; i++; }
+        if (next) i++;
         break;
       case '--server':
         if (next) { process.env.SERVER_URL = process.env.SERVER_URL || next; i++; }
         break;
       case '--name':
-        if (next) { process.env.AGENT_NAME = process.env.AGENT_NAME || next; i++; }
+        if (next) i++;
         break;
       case '--secret':
         if (next) { process.env.AGENT_SECRET = process.env.AGENT_SECRET || next; i++; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.163",
+  "version": "1.0.165",
   "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

@@ -59,16 +59,45 @@ export function validateInstanceId(instanceId) {
 }
 
 export function getInstanceIdFromArgs(args = [], env = process.env) {
-  let instanceId = env.YEAFT_AGENT_INSTANCE || '';
+  let instanceId = '';
+  let agentName = '';
   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++;
+    }
+  }
+  return validateInstanceId(
+    instanceId
+    || agentName
+    || env.YEAFT_AGENT_INSTANCE
+    || env.AGENT_NAME
+    || DEFAULT_INSTANCE_ID,
+  );
+}
+
+export function applyAgentIdentityToEnv(args = [], env = process.env) {
+  env.YEAFT_AGENT_INSTANCE = getInstanceIdFromArgs(args, env);
+
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === '--name' && args[i + 1]) {
+      env.AGENT_NAME = args[i + 1];
+      i++;
     }
   }
-  return validateInstanceId(instanceId || DEFAULT_INSTANCE_ID);
+
+  return env.YEAFT_AGENT_INSTANCE;
+}
+
+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.');
+  }
 }
 
 export function getServiceName(instanceId = DEFAULT_INSTANCE_ID) {

package/service/index.js

@@ -29,6 +29,7 @@ export {
   isDefaultInstance,
   validateInstanceId,
   getInstanceIdFromArgs,
+  warnDeprecatedInstanceArg,
   getServiceName,
   getPm2AppName,
   getLaunchdLabel,

package/service/linux.js

@@ -62,10 +62,10 @@ export function linuxInstall(config) {
   execSync(`systemctl --user start ${serviceName}`);
   console.log(`Service installed and started: ${serviceName}`);
   console.log(`\nManage with:`);
-  console.log(`  yeaft-agent status --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent logs --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent restart --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent uninstall --instance ${config.instanceId}`);
+  console.log(`  yeaft-agent status --name ${config.instanceId}`);
+  console.log(`  yeaft-agent logs --name ${config.instanceId}`);
+  console.log(`  yeaft-agent restart --name ${config.instanceId}`);
+  console.log(`  yeaft-agent uninstall --name ${config.instanceId}`);
   console.log(`\nTo run when not logged in:`);
   console.log(`  sudo loginctl enable-linger $(whoami)`);
 }

package/service/macos.js

@@ -74,10 +74,10 @@ export function macInstall(config) {
   execSync(`launchctl load ${plistPath}`);
   console.log(`Service installed and started: ${getLaunchdLabel(config.instanceId)}`);
   console.log(`\nManage with:`);
-  console.log(`  yeaft-agent status --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent logs --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent restart --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent uninstall --instance ${config.instanceId}`);
+  console.log(`  yeaft-agent status --name ${config.instanceId}`);
+  console.log(`  yeaft-agent logs --name ${config.instanceId}`);
+  console.log(`  yeaft-agent restart --name ${config.instanceId}`);
+  console.log(`  yeaft-agent uninstall --name ${config.instanceId}`);
 }
 
 export function macUninstall(instanceId = DEFAULT_INSTANCE_ID) {

package/service/windows.js

@@ -123,10 +123,10 @@ export function winInstall(config) {
   console.log(`  Ecosystem: ${ecoPath}`);
   console.log(`  Startup:   ${startupBat}`);
   console.log(`\nManage with:`);
-  console.log(`  yeaft-agent status --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent logs --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent restart --instance ${config.instanceId}`);
-  console.log(`  yeaft-agent uninstall --instance ${config.instanceId}`);
+  console.log(`  yeaft-agent status --name ${config.instanceId}`);
+  console.log(`  yeaft-agent logs --name ${config.instanceId}`);
+  console.log(`  yeaft-agent restart --name ${config.instanceId}`);
+  console.log(`  yeaft-agent uninstall --name ${config.instanceId}`);
 }
 
 export function winUninstall(instanceId = DEFAULT_INSTANCE_ID) {

package/service.js

@@ -22,6 +22,7 @@ export {
   isDefaultInstance,
   validateInstanceId,
   getInstanceIdFromArgs,
+  warnDeprecatedInstanceArg,
   getServiceName,
   getPm2AppName,
   getLaunchdLabel,