@yeaft/webchat-agent 1.0.270 → 1.0.272

package/cli.js

@@ -48,7 +48,7 @@ const subArgs = args.slice(1);
 const SERVICE_COMMANDS = ['install', 'uninstall', 'start', 'stop', 'restart', 'status', 'logs'];
 
 if (command === 'doctor') {
-  await handleDoctorCommand();
+  await handleDoctorCommand(subArgs);
 } else if (command === 'llm') {
   await handleLlmCommand(subArgs);
 } else if (command === 'local') {
@@ -78,7 +78,7 @@ function printHelp() {
 
   Usage:
     yeaft-agent [options]              Run agent in foreground
-    yeaft-agent local --name <name>    Run local Web UI, server, and agent
+    yeaft-agent local [options]        Run local Web UI, server, and agent
     yeaft-agent install [options]      Install as system service
     yeaft-agent uninstall [options]    Remove system service
     yeaft-agent start [options]        Start installed service
@@ -94,7 +94,7 @@ function printHelp() {
   Options:
     --instance <id>     Deprecated alias for the local service instance id
     --server <url>      WebSocket server URL (default: ws://localhost:3456)
-    --name <name>       Agent name and instance id (letters, numbers, ._-)
+    --name <name>       Agent name and instance id (default: computer name; invalid chars become -)
     --port <port>       Local server port (local command only; default: 6868)
     --secret <secret>   Agent secret for authentication
     --work-dir <dir>    Default working directory (default: cwd)
@@ -104,13 +104,13 @@ function printHelp() {
   Environment variables (alternative to flags):
     YEAFT_AGENT_INSTANCE Deprecated local service instance id override
     SERVER_URL          WebSocket server URL
-    AGENT_NAME          Agent name and instance id fallback
+    AGENT_NAME          Agent name and instance id override
     AGENT_SECRET        Agent secret
     WORK_DIR            Working directory
     YEAFT_DIR           Yeaft data directory
 
   Examples:
-    yeaft-agent local --name my-worker
+    yeaft-agent local
     yeaft-agent local --name my-worker --port 7000
     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
@@ -415,14 +415,21 @@ async function handleServiceCommand(command, args) {
   }
 }
 
-async function handleDoctorCommand() {
+async function handleDoctorCommand(args) {
+  warnDeprecatedInstanceArg(args);
   const { doctor } = await import('./service.js');
-  doctor();
+  doctor(args);
 }
 
 function parseAndStart(args) {
-  warnDeprecatedInstanceArg(args);
-  applyAgentIdentityToEnv(args);
+  try {
+    warnDeprecatedInstanceArg(args);
+    applyAgentIdentityToEnv(args);
+  } catch (err) {
+    console.error(`Error: ${err.message}`);
+    process.exit(1);
+    return;
+  }
 
   // Parse non-identity flags. Saved environment remains the fallback for these options.
   for (let i = 0; i < args.length; i++) {

package/index.js

@@ -2,7 +2,7 @@ import { assertNodeVersion } from './check-node-version.js';
 assertNodeVersion({ component: '@yeaft/webchat-agent' });
 
 import 'dotenv/config';
-import { platform, homedir } from 'os';
+import { homedir } from 'os';
 import { createAssetOutbox } from './yeaft/asset-outbox.js';
 import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, chmodSync, readdirSync } from 'fs';
 import { join, dirname } from 'path';
@@ -10,7 +10,7 @@ import { exec } from 'child_process';
 import { promisify } from 'util';
 import { fileURLToPath } from 'url';
 import ctx from './context.js';
-import { DEFAULT_INSTANCE_ID, getDefaultYeaftDir, validateInstanceId, getConfigPath, loadServiceConfig } from './service.js';
+import { getDefaultAgentName, getDefaultYeaftDir, resolveRuntimeIdentity, getConfigPath, loadServiceConfig } from './service.js';
 import { loadNodePty } from './terminal.js';
 import { connect } from './connection.js';
 import { loadMcpServers } from './mcp.js';
@@ -33,12 +33,13 @@ ctx.pkgName = pkg.name;
 // 配置文件路径（向后兼容：先查当前目录 .claude-agent.json）
 const LOCAL_CONFIG_FILE = join(process.cwd(), '.claude-agent.json');
 const IS_LOCAL_RUN = process.env.YEAFT_LOCAL_RUN === 'true';
+const DEFAULT_AGENT_NAME = getDefaultAgentName();
 
 // 加载或创建配置
 function loadConfig() {
   const defaults = {
     serverUrl: 'ws://localhost:3456',
-    agentName: `Worker-${platform()}-${process.pid}`,
+    agentName: DEFAULT_AGENT_NAME,
     workDir: process.cwd(),
     reconnectInterval: 5000,
     agentSecret: 'agent-shared-secret'
@@ -74,7 +75,7 @@ function saveConfig(config) {
 }
 
 const fileConfig = loadConfig();
-const INSTANCE_ID = validateInstanceId(process.env.YEAFT_AGENT_INSTANCE || fileConfig.instanceId || DEFAULT_INSTANCE_ID);
+const { agentName: AGENT_NAME, instanceId: INSTANCE_ID } = resolveRuntimeIdentity(fileConfig);
 
 // task-fix (5-bugs): the Yeaft web-bridge reads `ctx.CONFIG.yeaftDir`
 // for every group / VP / memory operation. If unset, `path.join(undefined, …)`
@@ -95,7 +96,7 @@ try {
 const CONFIG = {
   instanceId: INSTANCE_ID,
   serverUrl: process.env.SERVER_URL || fileConfig.serverUrl,
-  agentName: process.env.AGENT_NAME || fileConfig.agentName,
+  agentName: AGENT_NAME,
   workDir: process.env.WORK_DIR || fileConfig.workDir || process.cwd(),
   yeaftDir: YEAFT_DIR,
   reconnectInterval: fileConfig.reconnectInterval,

package/local-run.js

@@ -5,18 +5,18 @@ import { createServer } from 'net';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { WebSocket } from 'ws';
+import { resolveDisplayName, validateInstanceId } from './service/config.js';
 
 const DEFAULT_PORT = 6868;
 const LOCAL_HOST = '127.0.0.1';
 
-export function parseLocalArgs(args) {
-  const options = { name: '', port: DEFAULT_PORT };
+export function parseLocalArgs(args, env = process.env) {
+  const options = { name: resolveDisplayName(args, env), port: DEFAULT_PORT };
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     const value = args[i + 1];
     if (arg === '--name') {
       if (!value || value.startsWith('-')) throw new Error('--name requires a value');
-      options.name = value;
       i++;
     } else if (arg === '--port') {
       if (!value || value.startsWith('-')) throw new Error('--port requires a value');
@@ -28,10 +28,7 @@ export function parseLocalArgs(args) {
       throw new Error(`Unknown local option: ${arg}`);
     }
   }
-  if (!options.name) throw new Error('local requires --name <name>');
-  if (!/^[A-Za-z0-9._-]+$/.test(options.name)) {
-    throw new Error('Invalid name: use only letters, numbers, dot, underscore, or hyphen');
-  }
+  validateInstanceId(options.name);
   return options;
 }
 

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.270"}
+{"version":"1.0.272"}