xiaozuoassistant 0.1.58 → 0.1.60

package/README.md

@@ -4,7 +4,7 @@ xiaozuoAssistant 是一个**本地优先（Local-first）**的个人 AI 助手
 
 ## 亮点能力
 
-- **Web UI + 实时通信**：浏览器访问 `http://localhost:3001`，Socket.IO 实时收发消息。
+- **Web UI + 实时通信**：浏览器访问 `http://localhost:3021`（生产环境）或 `http://localhost:3001`（开发环境），Socket.IO 实时收发消息。
 - **多通道（Channels）**：内置 Web/Terminal，并可按配置启用 Telegram/飞书/钉钉/微信等。
 - **技能（Skills）+ 工具调用**：模型可触发工具调用（OpenAI tools 兼容格式），技能注册表可扩展。
 - **增强型记忆系统（Enhanced Memory）**：
@@ -24,7 +24,7 @@ npm install -g xiaozuoassistant --registry=https://registry.npmjs.org
 xiaozuoAssistant start
 ```
 
-然后浏览器打开：`http://localhost:3001`
+然后浏览器打开：`http://localhost:3021`
 
 停止服务：
 
@@ -46,6 +46,8 @@ xiaozuoAssistant stop
 
 ### 开发模式（前后端联调）
 
+端口默认为 `3001`。
+
 ```bash
 npm install
 npm run dev
@@ -53,6 +55,8 @@ npm run dev
 
 ### 生产模式（构建后运行）
 
+端口默认为 `3021`。
+
 ```bash
 npm install
 npm run build

package/bin/cli.js

@@ -28,7 +28,9 @@ const args = process.argv.slice(2);
 const command = args[0];
 const commandArgs = args.slice(1);
 
-const EXPORT_FILENAME = 'xiaozuoAssistant-backup.tar.gz';
+const EXPORT_FILENAME_PREFIX = 'xiaozuoAssistant-backup';
+const PRODUCTION_PORT = 3021; // 生产环境（CLI）默认端口
+const DEV_PORT = 3001; // 开发环境默认端口
 
 // Helper to get user's current working directory where they ran the command
 // This is kept only for display/backward compatibility; runtime data is stored in APP_HOME.
@@ -50,7 +52,8 @@ const DATA_PATHS = [
   'data',
   'logs',
   'sessions',
-  'workspace'
+  'workspace',
+  'plugins'
 ];
 
 function ensureAppHome() {
@@ -65,11 +68,37 @@ function ensureAppHome() {
 
 function ensureDefaultConfig() {
   const configPath = path.join(APP_HOME, 'config.json');
-  if (fs.existsSync(configPath)) return;
+  
+  // 如果配置文件已存在，检查是否需要迁移端口（例如从 3001 迁移到 3021）
+  if (fs.existsSync(configPath)) {
+    try {
+        const configContent = fs.readFileSync(configPath, 'utf-8');
+        const config = JSON.parse(configContent);
+        // 如果端口是旧的默认值 3001，自动更新为 3021
+        if (config.server && config.server.port === DEV_PORT) {
+            console.log(`[CLI] 检测到旧端口配置 (${DEV_PORT})，正在迁移到生产环境端口 (${PRODUCTION_PORT})...`);
+            config.server.port = PRODUCTION_PORT;
+            fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+            console.log(`[CLI] ✅ 端口已更新为 ${PRODUCTION_PORT}`);
+        }
+    } catch (e) {
+        console.warn('[CLI] 检查现有配置失败:', e);
+    }
+    return;
+  }
+
+  // 如果配置文件不存在，创建新的默认配置
   const templatePath = path.join(packageRoot, 'config.json');
   try {
     if (fs.existsSync(templatePath)) {
-      fs.copyFileSync(templatePath, configPath);
+      // 复制模板，但强制修改端口为 3021
+      const templateContent = fs.readFileSync(templatePath, 'utf-8');
+      const templateConfig = JSON.parse(templateContent);
+      
+      if (!templateConfig.server) templateConfig.server = {};
+      templateConfig.server.port = PRODUCTION_PORT;
+      
+      fs.writeFileSync(configPath, JSON.stringify(templateConfig, null, 2));
       return;
     }
   } catch (e) {
@@ -77,7 +106,7 @@ function ensureDefaultConfig() {
   }
 
   const fallback = {
-    server: { port: 3001, host: 'localhost' },
+    server: { port: PRODUCTION_PORT, host: 'localhost' },
     llm: { apiKey: '', baseURL: '', model: '', temperature: 0.7 },
     logging: { level: 'info' },
     channels: {},
@@ -103,7 +132,7 @@ function ensureDefaultDirs() {
 }
 
 function getPortFromConfig() {
-  let port = 3001;
+  let port = PRODUCTION_PORT;
   const configPath = path.join(APP_HOME, 'config.json');
   if (fs.existsSync(configPath)) {
     try {
@@ -396,6 +425,11 @@ async function exportData() {
     ensureDefaultDirs();
     console.log('📦 Starting data export...');
     
+    // Generate filename with timestamp
+    const now = new Date();
+    const timestamp = now.toISOString().replace(/[-:T.]/g, '').slice(0, 14); // YYYYMMDDHHmmss
+    const exportFilename = `${EXPORT_FILENAME_PREFIX}-${timestamp}.tar.gz`;
+    
     const filesToArchive = [];
     
     for (const p of DATA_PATHS) {
@@ -410,16 +444,19 @@ async function exportData() {
         return;
     }
 
+    const exportPath = path.join(APP_HOME, exportFilename);
+
     try {
         await tar.c(
             {
                 gzip: true,
-                file: path.join(APP_HOME, EXPORT_FILENAME),
+                file: exportPath,
                 cwd: APP_HOME
             },
             filesToArchive
         );
-        console.log(`✅ Export successful! Backup created at: ${path.join(APP_HOME, EXPORT_FILENAME)}`);
+        console.log(`✅ Export successful!`);
+        console.log(`   Backup file: ${exportPath}`);
         console.log(`   Copy this file to your new machine to import.`);
     } catch (err) {
         console.error('❌ Export failed:', err);
@@ -428,15 +465,49 @@ async function exportData() {
 
 async function importData() {
     ensureAppHome();
-    const backupPath = path.join(APP_HOME, EXPORT_FILENAME);
+    
+    // Find backup file
+    let backupFile = getFlagValue('--file');
+    
+    if (!backupFile) {
+        // Try to find the latest backup file in APP_HOME
+        try {
+            const files = fs.readdirSync(APP_HOME)
+                .filter(f => f.startsWith(EXPORT_FILENAME_PREFIX) && f.endsWith('.tar.gz'))
+                .sort()
+                .reverse();
+                
+            if (files.length > 0) {
+                backupFile = path.join(APP_HOME, files[0]);
+                console.log(`[CLI] No file specified, using latest found: ${files[0]}`);
+            } else {
+                // Fallback to old filename for compatibility
+                const oldFile = path.join(APP_HOME, 'xiaozuoAssistant-backup.tar.gz');
+                if (fs.existsSync(oldFile)) {
+                    backupFile = oldFile;
+                    console.log(`[CLI] Using legacy backup file: xiaozuoAssistant-backup.tar.gz`);
+                }
+            }
+        } catch (e) {
+            // ignore
+        }
+    }
+
+    if (!backupFile) {
+        console.error(`❌ No backup file found or specified.`);
+        console.log(`   Use --file <path> to specify a backup file.`);
+        return;
+    }
+    
+    // Resolve absolute path
+    const backupPath = path.resolve(process.cwd(), backupFile);
     
     if (!fs.existsSync(backupPath)) {
         console.error(`❌ Backup file not found: ${backupPath}`);
-        console.log(`   Please ensure '${EXPORT_FILENAME}' is in ${APP_HOME}`);
         return;
     }
 
-    console.log('📦 Starting data import...');
+    console.log(`📦 Starting data import from: ${backupPath}`);
     console.log('⚠️  Warning: This will overwrite existing data files (config.json, memories, etc.)');
     
     // Simple prompt implementation for Node.js
@@ -445,6 +516,13 @@ async function importData() {
         const answer = data.toString().trim().toLowerCase();
         if (answer === 'y' || answer === 'yes') {
             try {
+                // Stop server if running before import
+                const pidFile = getPidFilePath();
+                if (fs.existsSync(pidFile)) {
+                     console.log('[CLI] Stopping server before import...');
+                     await stopServer();
+                }
+
                 await tar.x({
                     file: backupPath,
                     cwd: APP_HOME
@@ -472,6 +550,12 @@ async function importData() {
                             }
                         }
 
+                        // Ensure port is set to production port if it was dev port
+                        if (config.server && config.server.port === DEV_PORT) {
+                            config.server.port = PRODUCTION_PORT;
+                            console.log(`[CLI] Updated port from ${DEV_PORT} to ${PRODUCTION_PORT}`);
+                        }
+
                         fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
                         console.log(`✅ Auto-configured workspace path to: ${APP_HOME}`);
                     } catch (e) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "xiaozuoassistant",
   "private": false,
   "description": "Your personal, locally-hosted AI assistant for office productivity.",
-  "version": "0.1.58",
+  "version": "0.1.60",
   "author": "mantle.lau",
   "license": "MIT",
   "repository": {