@yeaft/webchat-agent 0.1.1104 → 0.1.1107

package/cli.js

@@ -41,7 +41,7 @@ const subArgs = args.slice(1);
 const SERVICE_COMMANDS = ['install', 'uninstall', 'start', 'stop', 'restart', 'status', 'logs'];
 
 if (command === 'doctor') {
-  handleDoctorCommand();
+  await handleDoctorCommand();
 } else if (command === 'llm') {
   await handleLlmCommand(subArgs);
 } else if (command === 'upgrade') {
@@ -51,7 +51,7 @@ if (command === 'doctor') {
 } else if (command === '--help' || command === '-h') {
   printHelp();
 } else if (SERVICE_COMMANDS.includes(command)) {
-  handleServiceCommand(command, subArgs);
+  await handleServiceCommand(command, subArgs);
 } else {
   // Normal agent startup — parse flags and set env vars
   parseAndStart(args);
@@ -64,35 +64,40 @@ function printHelp() {
   Usage:
     yeaft-agent [options]              Run agent in foreground
     yeaft-agent install [options]      Install as system service
-    yeaft-agent uninstall              Remove system service
-    yeaft-agent start                  Start installed service
-    yeaft-agent stop                   Stop installed service
-    yeaft-agent restart                Restart installed service
-    yeaft-agent status                 Show service status
-    yeaft-agent logs                   View service logs (follow mode)
+    yeaft-agent uninstall [options]    Remove system service
+    yeaft-agent start [options]        Start installed service
+    yeaft-agent stop [options]         Stop installed service
+    yeaft-agent restart [options]      Restart installed service
+    yeaft-agent status [options]       Show service status
+    yeaft-agent logs [options]         View service logs (follow mode)
     yeaft-agent doctor                 Diagnose service configuration
     yeaft-agent llm <command>          Configure local Yeaft LLM providers/models
     yeaft-agent upgrade                Upgrade to latest version
     yeaft-agent --version              Show version
 
   Options:
+    --instance <id>     Local service instance id (default: default)
     --server <url>      WebSocket server URL (default: ws://localhost:3456)
     --name <name>       Agent display name (default: Worker-{platform}-{pid})
     --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
     SERVER_URL          WebSocket server URL
     AGENT_NAME          Agent display name
     AGENT_SECRET        Agent secret
     WORK_DIR            Working directory
+    YEAFT_DIR           Yeaft data directory
 
   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 status
-    yeaft-agent logs
+    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
 `);
 }
 
@@ -380,13 +385,13 @@ function parseLlmArgs(args) {
 async function handleServiceCommand(command, args) {
   const service = await import('./service.js');
   switch (command) {
-    case 'install':   service.install(args); break;
-    case 'uninstall': service.uninstall(); break;
-    case 'start':     service.start(); break;
-    case 'stop':      service.stop(); break;
-    case 'restart':   service.restart(); break;
-    case 'status':    service.status(); break;
-    case 'logs':      service.logs(); break;
+    case 'install':   await service.install(args); break;
+    case 'uninstall': await service.uninstall(args); break;
+    case 'start':     await service.start(args); break;
+    case 'stop':      await service.stop(args); break;
+    case 'restart':   await service.restart(args); break;
+    case 'status':    await service.status(args); break;
+    case 'logs':      await service.logs(args); break;
   }
 }
 
@@ -402,6 +407,9 @@ function parseAndStart(args) {
     const next = args[i + 1];
 
     switch (arg) {
+      case '--instance':
+        if (next) { process.env.YEAFT_AGENT_INSTANCE = process.env.YEAFT_AGENT_INSTANCE || next; i++; }
+        break;
       case '--server':
         if (next) { process.env.SERVER_URL = process.env.SERVER_URL || next; i++; }
         break;
@@ -414,6 +422,9 @@ function parseAndStart(args) {
       case '--work-dir':
         if (next) { process.env.WORK_DIR = process.env.WORK_DIR || next; i++; }
         break;
+      case '--yeaft-dir':
+        if (next) { process.env.YEAFT_DIR = process.env.YEAFT_DIR || next; i++; }
+        break;
       case '--auto-upgrade':
         checkForUpdates();
         break;

package/connection/index.js

@@ -5,12 +5,15 @@ import { startAgentHeartbeat, stopAgentHeartbeat, scheduleReconnect } from './he
 import { handleMessage } from './message-router.js';
 
 export function connect() {
-  // Don't include secret in URL - it will be sent via WebSocket message after connection
-  // 使用 agentName 作为唯一标识（不再使用随机 UUID）
+  // Don't include secret in URL - it will be sent via WebSocket message after connection.
+  // instanceId is the stable local service identity; agentName is display-only.
+  // Old configs without instanceId still use agentName for backward-compatible identity.
+  const instanceId = ctx.CONFIG.instanceId || ctx.CONFIG.agentName;
   const params = new URLSearchParams({
     type: 'agent',
-    id: ctx.CONFIG.agentName,  // 直接用名称作为 ID
+    id: instanceId,
     name: ctx.CONFIG.agentName,
+    instanceId,
     workDir: ctx.CONFIG.workDir,
     capabilities: ctx.agentCapabilities.join(',')
   });

package/connection/message-router.js

@@ -38,7 +38,7 @@ import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 import { getLlmConfig, updateLlmConfig, getYeaftSettings, updateYeaftSettings, getSearchSettings, updateSearchSettings, fetchTavilyUsage } from '../yeaft/config-api.js';
 import { discoverLlmModels } from '../llm-model-discovery.js';
 import { fetchModelsDev } from '../yeaft/llm/models-dev.js';
-import { handleYeaftSessionSend, handleYeaftSubAgentPrompt, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, handleYeaftLoadMoreHistory, handleYeaftAbortThread, handleYeaftAbortAll, handleYeaftAbortTurn, handleYeaftVpSubscribe, handleYeaftVpCreate, handleYeaftVpUpdate, handleYeaftVpDelete, handleYeaftVpRead, handleYeaftListSessions, handleYeaftCreateSession, handleYeaftRenameSession, handleYeaftUpdateSession, handleYeaftUpdateSessionConfig, handleYeaftArchiveSession, handleYeaftDeleteSession, handleYeaftSessionAddMember, handleYeaftSessionRemoveMember, handleYeaftSessionSetDefaultVp, handleYeaftScanWorkdirSessions, handleYeaftRestoreSession, handleYeaftDreamTrigger, handleYeaftFetchToolStats, handleYeaftFetchDebugHistory, handleYeaftMcpList, handleYeaftMcpAdd, handleYeaftMcpRemove, handleYeaftMcpReload, broadcastLanguageChange, broadcastYeaftSessionSnapshotEager } from '../yeaft/web-bridge.js';
+import { handleYeaftSessionSend, handleYeaftSubAgentPrompt, handleYeaftTaskCancel, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, handleYeaftLoadMoreHistory, handleYeaftAbortThread, handleYeaftAbortAll, handleYeaftAbortTurn, handleYeaftVpSubscribe, handleYeaftVpCreate, handleYeaftVpUpdate, handleYeaftVpDelete, handleYeaftVpRead, handleYeaftListSessions, handleYeaftCreateSession, handleYeaftRenameSession, handleYeaftUpdateSession, handleYeaftUpdateSessionConfig, handleYeaftArchiveSession, handleYeaftDeleteSession, handleYeaftSessionAddMember, handleYeaftSessionRemoveMember, handleYeaftSessionSetDefaultVp, handleYeaftScanWorkdirSessions, handleYeaftRestoreSession, handleYeaftDreamTrigger, handleYeaftFetchToolStats, handleYeaftFetchDebugHistory, handleYeaftMcpList, handleYeaftMcpAdd, handleYeaftMcpRemove, handleYeaftMcpReload, broadcastLanguageChange, broadcastYeaftSessionSnapshotEager } from '../yeaft/web-bridge.js';
 import { startYeaftStatusRefresh, refreshYeaftStatus } from '../yeaft/status-cache.js';
 
 export async function handleMessage(msg) {
@@ -58,11 +58,13 @@ export async function handleMessage(msg) {
         console.log('[WS] Server accepts plaintext, disabling outbound encryption');
       }
 
-      // 只保存基本配置（不再保存 agentId，因为现在用 agentName 作为 ID）
+      // 只保存基本配置。instanceId 是本地服务实例身份；agentName 只用于展示。
       ctx.saveConfig({
+        instanceId: ctx.CONFIG.instanceId,
         serverUrl: ctx.CONFIG.serverUrl,
         agentName: ctx.CONFIG.agentName,
         workDir: ctx.CONFIG.workDir,
+        yeaftDir: ctx.CONFIG.yeaftDir,
         reconnectInterval: ctx.CONFIG.reconnectInterval
         // 不保存 agentSecret 到配置文件（安全考虑）
       });
@@ -658,6 +660,9 @@ export async function handleMessage(msg) {
     case 'yeaft_sub_agent_prompt':
       handleYeaftSubAgentPrompt(msg);
       break;
+    case 'yeaft_task_cancel':
+      handleYeaftTaskCancel(msg);
+      break;
 
     // wave-6b: manual dream trigger from VP detail page
     case 'yeaft_dream_trigger':
@@ -671,10 +676,9 @@ export async function handleMessage(msg) {
       await handleYeaftFetchToolStats(msg);
       break;
 
-    // fix-vp-multi-thread (bug 4): hydrate the Yeaft debug panel from
-    // the persistent SQLite trace. Without this, the panel only shows
-    // turns that happened after the panel was opened — every previous
-    // turn is invisible.
+    // Hydrate the Yeaft debug panel from the persistent file-backed trace.
+    // Without this, the panel only shows turns that happened after it was
+    // opened — every previous turn is invisible.
     case 'yeaft_fetch_debug_history':
     case 'unify_fetch_debug_history':
       await handleYeaftFetchDebugHistory(msg);

package/index.js

@@ -9,7 +9,7 @@ import { exec } from 'child_process';
 import { promisify } from 'util';
 import { fileURLToPath } from 'url';
 import ctx from './context.js';
-import { getConfigPath, loadServiceConfig } from './service.js';
+import { DEFAULT_INSTANCE_ID, getDefaultYeaftDir, validateInstanceId, getConfigPath, loadServiceConfig } from './service.js';
 import { loadNodePty } from './terminal.js';
 import { connect } from './connection.js';
 import { loadMcpServers } from './mcp.js';
@@ -60,6 +60,7 @@ function saveConfig(config) {
 }
 
 const fileConfig = loadConfig();
+const INSTANCE_ID = validateInstanceId(process.env.YEAFT_AGENT_INSTANCE || fileConfig.instanceId || DEFAULT_INSTANCE_ID);
 
 // task-fix (5-bugs): the Yeaft web-bridge reads `ctx.CONFIG.yeaftDir`
 // for every group / VP / memory operation. If unset, `path.join(undefined, …)`
@@ -67,7 +68,7 @@ const fileConfig = loadConfig();
 // and the UI surfaces "群组操作失败: …" with a raw node error. Resolve the
 // default (`~/.yeaft`) here and make sure the directory exists before the
 // WebSocket connection goes live, so downstream code can assume a real path.
-const YEAFT_DIR = process.env.YEAFT_DIR || fileConfig.yeaftDir || join(homedir(), '.yeaft');
+const YEAFT_DIR = process.env.YEAFT_DIR || fileConfig.yeaftDir || getDefaultYeaftDir(INSTANCE_ID);
 try {
   if (!existsSync(YEAFT_DIR)) {
     mkdirSync(YEAFT_DIR, { recursive: true });
@@ -78,6 +79,7 @@ try {
 }
 
 const CONFIG = {
+  instanceId: INSTANCE_ID,
   serverUrl: process.env.SERVER_URL || fileConfig.serverUrl,
   agentName: process.env.AGENT_NAME || fileConfig.agentName,
   workDir: process.env.WORK_DIR || fileConfig.workDir || process.cwd(),

package/llm-config-cli.js

@@ -8,6 +8,8 @@ import {
   modelIdsFromProviderModels,
 } from './llm-model-discovery.js';
 
+export const DEFAULT_GITHUB_COPILOT_MODEL = 'gpt-5.5';
+
 const VALID_PROTOCOLS = new Set(['anthropic', 'openai-responses']);
 const VALID_CREDENTIAL_PROVIDERS = new Set(['github-copilot']);
 
@@ -230,6 +232,52 @@ export async function useGitHubCopilot(config, options = {}) {
   return { config: next, provider, discovery };
 }
 
+export function hasLocalLlmConfig(config = {}) {
+  const providers = Array.isArray(config.providers) ? config.providers.filter(Boolean) : [];
+  return providers.length > 0 || Boolean(config.primaryModel) || Boolean(config.fastModel);
+}
+
+export function isDefaultSeedLlmConfig(config = {}) {
+  const providers = Array.isArray(config.providers) ? config.providers.filter(Boolean) : [];
+  if (providers.length !== 1) return false;
+  const provider = providers[0];
+  return provider?.name === 'my-proxy'
+    && provider?.baseUrl === 'http://localhost:6628/v1'
+    && provider?.apiKey === 'proxy'
+    && typeof config.primaryModel === 'string'
+    && config.primaryModel.startsWith('my-proxy/');
+}
+
+export async function tryAutoConfigureGitHubCopilot(configPath = getDefaultYeaftConfigPath(), options = {}) {
+  let current;
+  try {
+    current = readLocalLlmConfig(configPath);
+  } catch (error) {
+    return { configured: false, reason: 'invalid-config', error, config: null };
+  }
+
+  const allowConfigured = Boolean(options.allowConfigured) || isDefaultSeedLlmConfig(current);
+  if (!allowConfigured && hasLocalLlmConfig(current)) {
+    return { configured: false, reason: 'already-configured', config: current };
+  }
+
+  try {
+    const result = await useGitHubCopilot(current, {
+      ...options,
+      model: options.model || DEFAULT_GITHUB_COPILOT_MODEL,
+    });
+    writeLocalLlmConfig(result.config, configPath);
+    return { configured: true, reason: 'configured', ...result };
+  } catch (error) {
+    return {
+      configured: false,
+      reason: error?.code === 'COPILOT_CREDENTIAL_MISSING' ? 'credential-missing' : 'unavailable',
+      error,
+      config: current,
+    };
+  }
+}
+
 
 export async function useOpenAICompatible(config, options = {}, env = process.env) {
   const name = options.name ? String(options.name).trim() : 'openai';

package/package.json

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

@@ -1,4 +1,4 @@
-/**
+/*
  * Service — shared configuration and utility functions
  */
 import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
@@ -8,6 +8,7 @@ import { fileURLToPath } from 'url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export const SERVICE_NAME = 'yeaft-agent';
+export const DEFAULT_INSTANCE_ID = 'default';
 
 /**
  * Load .env file from agent directory (or cwd) into process.env
@@ -40,36 +41,98 @@ function loadDotenv() {
   }
 }
 
-// Standard config/log directory per platform
-export function getConfigDir() {
+export function normalizeInstanceId(instanceId) {
+  const raw = String(instanceId || '').trim();
+  return raw || DEFAULT_INSTANCE_ID;
+}
+
+export function isDefaultInstance(instanceId) {
+  return normalizeInstanceId(instanceId) === DEFAULT_INSTANCE_ID;
+}
+
+export function validateInstanceId(instanceId) {
+  const normalized = normalizeInstanceId(instanceId);
+  if (!/^[A-Za-z0-9_.-]+$/.test(normalized)) {
+    throw new Error('Instance id may only contain letters, numbers, dot, underscore, or dash');
+  }
+  return normalized;
+}
+
+export function getInstanceIdFromArgs(args = [], env = process.env) {
+  let instanceId = env.YEAFT_AGENT_INSTANCE || '';
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    const next = args[i + 1];
+    if (arg === '--instance' && next) {
+      instanceId = next;
+      i++;
+    }
+  }
+  return validateInstanceId(instanceId || DEFAULT_INSTANCE_ID);
+}
+
+export function getServiceName(instanceId = DEFAULT_INSTANCE_ID) {
+  const normalized = validateInstanceId(instanceId);
+  return isDefaultInstance(normalized) ? SERVICE_NAME : `${SERVICE_NAME}@${normalized}`;
+}
+
+export function getPm2AppName(instanceId = DEFAULT_INSTANCE_ID) {
+  const normalized = validateInstanceId(instanceId);
+  return isDefaultInstance(normalized) ? SERVICE_NAME : `${SERVICE_NAME}-${normalized}`;
+}
+
+export function getLaunchdLabel(instanceId = DEFAULT_INSTANCE_ID) {
+  const normalized = validateInstanceId(instanceId);
+  return isDefaultInstance(normalized) ? 'com.yeaft.agent' : `com.yeaft.agent.${normalized}`;
+}
+
+export function getDefaultYeaftDir(instanceId = DEFAULT_INSTANCE_ID) {
+  const normalized = validateInstanceId(instanceId);
+  return isDefaultInstance(normalized)
+    ? join(homedir(), '.yeaft')
+    : join(homedir(), '.yeaft', 'instances', normalized);
+}
+
+function getBaseConfigDir() {
   if (platform() === 'win32') {
     return join(process.env.APPDATA || join(homedir(), 'AppData', 'Roaming'), SERVICE_NAME);
   }
   return join(homedir(), '.config', SERVICE_NAME);
 }
 
-export function getLogDir() {
-  return join(getConfigDir(), 'logs');
+// Standard config/log directory per platform. The default instance keeps the
+// historical paths for compatibility; named instances live under instances/<id>.
+export function getConfigDir(instanceId = process.env.YEAFT_AGENT_INSTANCE || DEFAULT_INSTANCE_ID) {
+  const normalized = validateInstanceId(instanceId);
+  const base = getBaseConfigDir();
+  return isDefaultInstance(normalized) ? base : join(base, 'instances', normalized);
+}
+
+export function getLogDir(instanceId = process.env.YEAFT_AGENT_INSTANCE || DEFAULT_INSTANCE_ID) {
+  return join(getConfigDir(instanceId), 'logs');
 }
 
-export function getConfigPath() {
-  return join(getConfigDir(), 'config.json');
+export function getConfigPath(instanceId = process.env.YEAFT_AGENT_INSTANCE || DEFAULT_INSTANCE_ID) {
+  return join(getConfigDir(instanceId), 'config.json');
 }
 
 /** Save agent configuration to standard location */
 export function saveServiceConfig(config) {
-  const dir = getConfigDir();
+  const instanceId = validateInstanceId(config.instanceId || DEFAULT_INSTANCE_ID);
+  const dir = getConfigDir(instanceId);
   mkdirSync(dir, { recursive: true });
-  mkdirSync(getLogDir(), { recursive: true });
-  writeFileSync(getConfigPath(), JSON.stringify(config, null, 2));
+  mkdirSync(getLogDir(instanceId), { recursive: true });
+  writeFileSync(getConfigPath(instanceId), JSON.stringify({ ...config, instanceId }, null, 2));
 }
 
 /** Load agent configuration from standard location */
-export function loadServiceConfig() {
-  const configPath = getConfigPath();
+export function loadServiceConfig(instanceId = process.env.YEAFT_AGENT_INSTANCE || DEFAULT_INSTANCE_ID) {
+  const normalized = validateInstanceId(instanceId);
+  const configPath = getConfigPath(normalized);
   if (!existsSync(configPath)) return null;
   try {
-    return JSON.parse(readFileSync(configPath, 'utf-8'));
+    const loaded = JSON.parse(readFileSync(configPath, 'utf-8'));
+    return { ...loaded, instanceId: loaded.instanceId || normalized };
   } catch {
     return null;
   }
@@ -86,18 +149,21 @@ export function getCliPath() {
 }
 
 /**
- * Parse --server/--name/--secret/--work-dir from args, merge with existing config
+ * Parse service options from args, merging with the selected instance config.
  */
 export function parseServiceArgs(args) {
   // Load .env if available (for dev / source-based usage)
   loadDotenv();
 
-  const existing = loadServiceConfig() || {};
+  const instanceId = getInstanceIdFromArgs(args);
+  const existing = loadServiceConfig(instanceId) || {};
   const config = {
+    instanceId,
     serverUrl: existing.serverUrl || '',
     agentName: existing.agentName || '',
     agentSecret: existing.agentSecret || '',
     workDir: existing.workDir || '',
+    yeaftDir: existing.yeaftDir || '',
   };
 
   // Environment variables override saved config
@@ -105,16 +171,19 @@ export function parseServiceArgs(args) {
   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;
 
   // CLI args override everything
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     const next = args[i + 1];
     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 '--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;
     }
   }
 
@@ -122,6 +191,12 @@ export function parseServiceArgs(args) {
 }
 
 export function validateConfig(config) {
+  try {
+    validateInstanceId(config.instanceId || DEFAULT_INSTANCE_ID);
+  } catch (err) {
+    console.error(`Error: ${err.message}`);
+    process.exit(1);
+  }
   if (!config.serverUrl) {
     console.error('Error: --server <url> is required');
     process.exit(1);

package/service/index.js

@@ -1,15 +1,17 @@
-/**
+/*
  * Service — platform dispatcher
  * Routes install/uninstall/start/stop/restart/status/logs to the correct platform module.
  */
 import { existsSync } from 'fs';
+import { join } from 'path';
 import { platform } from 'os';
 import {
-  SERVICE_NAME, getConfigDir, getLogDir, getConfigPath,
+  getConfigDir, getLogDir, getConfigPath,
   saveServiceConfig, loadServiceConfig,
-  parseServiceArgs, validateConfig
+  parseServiceArgs, validateConfig, getInstanceIdFromArgs, getDefaultYeaftDir
 } from './config.js';
 import { initYeaftDir } from '../yeaft/init.js';
+import { DEFAULT_GITHUB_COPILOT_MODEL, tryAutoConfigureGitHubCopilot } from '../llm-config-cli.js';
 import { getSystemdServicePath, linuxInstall, linuxUninstall, linuxStart, linuxStop, linuxRestart, linuxStatus, linuxLogs } from './linux.js';
 import { getLaunchdPlistPath, macInstall, macUninstall, macStart, macStop, macRestart, macStatus, macLogs } from './macos.js';
 import { winInstall, winUninstall, winStart, winStop, winRestart, winStatus, winLogs } from './windows.js';
@@ -20,17 +22,42 @@ export {
   saveServiceConfig, loadServiceConfig,
   parseServiceArgs
 };
+export {
+  SERVICE_NAME,
+  DEFAULT_INSTANCE_ID,
+  normalizeInstanceId,
+  isDefaultInstance,
+  validateInstanceId,
+  getInstanceIdFromArgs,
+  getServiceName,
+  getPm2AppName,
+  getLaunchdLabel,
+  getDefaultYeaftDir,
+} from './config.js';
 
 const os = platform();
 
-function ensureInstalled() {
+export async function autoConfigureGitHubCopilotIfAvailable(yeaftDir, options = {}) {
+  const result = await tryAutoConfigureGitHubCopilot(join(yeaftDir, 'config.json'), options);
+  if (result.configured) {
+    console.log(`Configured GitHub Copilot provider automatically with ${DEFAULT_GITHUB_COPILOT_MODEL}.`);
+    if (result.discovery?.warning) console.log(`Warning: ${result.discovery.warning}`);
+  } else if (result.reason === 'already-configured') {
+    console.log('LLM config already exists; skipped automatic GitHub Copilot setup.');
+  } else if (result.reason === 'invalid-config') {
+    console.log('Existing LLM config is invalid; skipped automatic GitHub Copilot setup.');
+  }
+  return result;
+}
+
+function ensureInstalled(instanceId) {
   if (os === 'linux') {
-    if (!existsSync(getSystemdServicePath())) {
+    if (!existsSync(getSystemdServicePath(instanceId))) {
       console.error('Service not installed. Run "yeaft-agent install" first.');
       process.exit(1);
     }
   } else if (os === 'darwin') {
-    if (!existsSync(getLaunchdPlistPath())) {
+    if (!existsSync(getLaunchdPlistPath(instanceId))) {
       console.error('Service not installed. Run "yeaft-agent install" first.');
       process.exit(1);
     }
@@ -38,24 +65,29 @@ function ensureInstalled() {
   // Windows check is done inside individual functions
 }
 
-export function install(args) {
+export async function install(args) {
   const config = parseServiceArgs(args);
   validateConfig(config);
   saveServiceConfig(config);
 
   // Initialize ~/.yeaft/ directory + default config.json
   // so `yeaft` CLI is ready to use immediately after install
-  const { dir, created } = initYeaftDir();
+  const effectiveYeaftDir = config.yeaftDir || getDefaultYeaftDir(config.instanceId);
+  const { dir, created } = initYeaftDir(effectiveYeaftDir);
+  await autoConfigureGitHubCopilotIfAvailable(dir, {
+    allowConfigured: created.includes(join(dir, 'config.json')),
+  });
   if (created.length > 0) {
     console.log(`Initialized ${dir}`);
     console.log(`  Edit ${dir}/config.json to configure LLM providers.`);
     console.log('');
   }
 
-  console.log(`Installing ${SERVICE_NAME} service...`);
-  console.log(`  Server: ${config.serverUrl}`);
-  console.log(`  Name:   ${config.agentName || '(auto)'}`);
-  console.log(`  WorkDir: ${config.workDir || '(home)'}`);
+  console.log(`Installing yeaft-agent service...`);
+  console.log(`  Instance: ${config.instanceId}`);
+  console.log(`  Server:   ${config.serverUrl}`);
+  console.log(`  Name:     ${config.agentName || '(auto)'}`);
+  console.log(`  WorkDir:  ${config.workDir || '(home)'}`);
   console.log('');
 
   if (os === 'linux') linuxInstall(config);
@@ -68,45 +100,51 @@ export function install(args) {
   }
 }
 
-export function uninstall() {
-  console.log(`Uninstalling ${SERVICE_NAME} service...`);
-  if (os === 'linux') linuxUninstall();
-  else if (os === 'darwin') macUninstall();
-  else if (os === 'win32') winUninstall();
+export function uninstall(args = []) {
+  const instanceId = getInstanceIdFromArgs(args);
+  console.log(`Uninstalling yeaft-agent service (${instanceId})...`);
+  if (os === 'linux') linuxUninstall(instanceId);
+  else if (os === 'darwin') macUninstall(instanceId);
+  else if (os === 'win32') winUninstall(instanceId);
   else { console.error(`Unsupported platform: ${os}`); process.exit(1); }
 }
 
-export function start() {
-  ensureInstalled();
-  if (os === 'linux') linuxStart();
-  else if (os === 'darwin') macStart();
-  else if (os === 'win32') winStart();
+export function start(args = []) {
+  const instanceId = getInstanceIdFromArgs(args);
+  ensureInstalled(instanceId);
+  if (os === 'linux') linuxStart(instanceId);
+  else if (os === 'darwin') macStart(instanceId);
+  else if (os === 'win32') winStart(instanceId);
 }
 
-export function stop() {
-  ensureInstalled();
-  if (os === 'linux') linuxStop();
-  else if (os === 'darwin') macStop();
-  else if (os === 'win32') winStop();
+export function stop(args = []) {
+  const instanceId = getInstanceIdFromArgs(args);
+  ensureInstalled(instanceId);
+  if (os === 'linux') linuxStop(instanceId);
+  else if (os === 'darwin') macStop(instanceId);
+  else if (os === 'win32') winStop(instanceId);
 }
 
-export function restart() {
-  ensureInstalled();
-  if (os === 'linux') linuxRestart();
-  else if (os === 'darwin') macRestart();
-  else if (os === 'win32') winRestart();
+export function restart(args = []) {
+  const instanceId = getInstanceIdFromArgs(args);
+  ensureInstalled(instanceId);
+  if (os === 'linux') linuxRestart(instanceId);
+  else if (os === 'darwin') macRestart(instanceId);
+  else if (os === 'win32') winRestart(instanceId);
 }
 
-export function status() {
-  if (os === 'linux') linuxStatus();
-  else if (os === 'darwin') macStatus();
-  else if (os === 'win32') winStatus();
+export function status(args = []) {
+  const instanceId = getInstanceIdFromArgs(args);
+  if (os === 'linux') linuxStatus(instanceId);
+  else if (os === 'darwin') macStatus(instanceId);
+  else if (os === 'win32') winStatus(instanceId);
 }
 
-export function logs() {
-  if (os === 'linux') linuxLogs();
-  else if (os === 'darwin') macLogs();
-  else if (os === 'win32') winLogs();
+export function logs(args = []) {
+  const instanceId = getInstanceIdFromArgs(args);
+  if (os === 'linux') linuxLogs(instanceId);
+  else if (os === 'darwin') macLogs(instanceId);
+  else if (os === 'win32') winLogs(instanceId);
 }
 
 export { doctor };