xiaozuoassistant 0.1.45 → 0.1.48

package/bin/cli.js

@@ -4,6 +4,7 @@ import { spawn } from 'child_process';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
+import os from 'os';
 import { createGzip } from 'zlib';
 import { pipeline } from 'stream';
 import { promisify } from 'util';
@@ -23,24 +24,85 @@ const packageRoot = path.resolve(__dirname, '..');
 
 const args = process.argv.slice(2);
 const command = args[0];
+const commandArgs = args.slice(1);
 
 const EXPORT_FILENAME = 'xiaozuoAssistant-backup.tar.gz';
 
 // 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.
 const CWD = process.cwd();
 
-// Define important paths relative to where the user *runs* the app, NOT the package location
-// Assuming standard structure where config.json and data folders are in CWD
+function getAppHome() {
+  const fromFlag = getFlagValue('--home');
+  const fromEnv = process.env.XIAOZUOASSISTANT_HOME;
+  const base = (fromFlag || fromEnv || path.join(os.homedir(), '.xiaozuoassistant')).trim();
+  return path.resolve(base);
+}
+
+const APP_HOME = getAppHome();
+
+// Unified runtime data directory
 const DATA_PATHS = [
-    'config.json',
-    'memories', // Vector DB and others
-    'data',     // SQLite or other data
-    'logs'
+  'config.json',
+  'memories',
+  'data',
+  'logs',
+  'sessions',
+  'workspace'
 ];
 
+function ensureAppHome() {
+  try {
+    fs.mkdirSync(APP_HOME, { recursive: true });
+  } catch (e) {
+    console.error(`[CLI] 无法创建数据目录：${APP_HOME}`);
+    console.error(e);
+    process.exit(1);
+  }
+}
+
+function ensureDefaultConfig() {
+  const configPath = path.join(APP_HOME, 'config.json');
+  if (fs.existsSync(configPath)) return;
+  const templatePath = path.join(packageRoot, 'config.json');
+  try {
+    if (fs.existsSync(templatePath)) {
+      fs.copyFileSync(templatePath, configPath);
+      return;
+    }
+  } catch (e) {
+    // ignore
+  }
+
+  const fallback = {
+    server: { port: 3001, host: 'localhost' },
+    llm: { apiKey: '', baseURL: '', model: '', temperature: 0.7 },
+    logging: { level: 'info' },
+    channels: {},
+    systemPrompt: ''
+  };
+  try {
+    fs.writeFileSync(configPath, JSON.stringify(fallback, null, 2));
+  } catch (e) {
+    console.error(`[CLI] 无法写入默认配置：${configPath}`);
+    console.error(e);
+    process.exit(1);
+  }
+}
+
+function ensureDefaultDirs() {
+  for (const dir of ['logs', 'data', 'memories', 'sessions', 'workspace']) {
+    try {
+      fs.mkdirSync(path.join(APP_HOME, dir), { recursive: true });
+    } catch {
+      // ignore
+    }
+  }
+}
+
 function getPortFromConfig() {
   let port = 3001;
-  const configPath = path.join(CWD, 'config.json');
+  const configPath = path.join(APP_HOME, 'config.json');
   if (fs.existsSync(configPath)) {
     try {
       const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
@@ -55,7 +117,23 @@ function getPortFromConfig() {
 }
 
 function getPidFilePath() {
-  return path.join(CWD, 'logs', 'server.pid');
+  return path.join(APP_HOME, 'logs', 'server.pid');
+}
+
+function hasFlag(flag) {
+  return commandArgs.includes(flag);
+}
+
+function getFlagValue(name) {
+  const idx = commandArgs.findIndex(a => a === name);
+  if (idx < 0) return null;
+  const next = commandArgs[idx + 1];
+  if (!next || next.startsWith('-')) return null;
+  return next;
+}
+
+function getRegistry() {
+  return getFlagValue('--registry') || process.env.npm_config_registry || 'https://registry.npmjs.org';
 }
 
 function isProcessRunning(pid) {
@@ -186,13 +264,140 @@ async function stopServer() {
   console.error('[CLI] ❌ 停止失败：端口仍在占用。');
 }
 
+async function runCommand(cmd, cmdArgs, options = {}) {
+  const child = spawn(cmd, cmdArgs, { stdio: 'inherit', ...options });
+  const code = await new Promise((resolve) => child.on('close', resolve));
+  return typeof code === 'number' ? code : 1;
+}
+
+async function runWithSudoIfNeeded(cmd, cmdArgs, options = {}) {
+  const code = await runCommand(cmd, cmdArgs, options);
+  if (code === 0) return 0;
+
+  const canSudo = process.platform !== 'win32' && process.stdin.isTTY;
+  if (!canSudo) return code;
+
+  console.log('[CLI] 权限不足，尝试使用 sudo 继续...');
+  return await runCommand('sudo', [cmd, ...cmdArgs], options);
+}
+
+async function updateApp() {
+  const registry = getRegistry();
+  const port = getPortFromConfig();
+  const pidFile = getPidFilePath();
+
+  const runningByPid = fs.existsSync(pidFile) && (() => {
+    try {
+      const pid = Number(fs.readFileSync(pidFile, 'utf-8').trim());
+      return Number.isFinite(pid) && pid > 0 && isProcessRunning(pid);
+    } catch {
+      return false;
+    }
+  })();
+  const runningByPort = await isPortOpen(port);
+  const wasRunning = runningByPid || runningByPort;
+
+  if (wasRunning) {
+    console.log('[CLI] 检测到服务正在运行，更新前将自动停止...');
+    await stopServer();
+  }
+
+  console.log(`[CLI] 正在更新 xiaozuoassistant（registry=${registry}）...`);
+  const code = await runWithSudoIfNeeded('npm', ['install', '-g', 'xiaozuoassistant@latest', `--registry=${registry}`]);
+  if (code !== 0) {
+    console.error('[CLI] ❌ 更新失败。');
+    if (wasRunning) {
+      console.log('[CLI] 更新失败，尝试恢复启动旧版本服务...');
+      await runCommand('node', [path.join(packageRoot, 'bin', 'cli.js'), 'start'], { cwd: APP_HOME });
+    }
+    process.exit(code);
+  }
+
+  console.log('[CLI] ✅ 更新完成。');
+
+  if (wasRunning) {
+    console.log('[CLI] 正在自动重启服务...');
+    const restartCode = await runCommand('xiaozuoAssistant', ['start'], { cwd: APP_HOME });
+    process.exit(restartCode);
+  }
+}
+
+async function removeApp() {
+  const registry = getRegistry();
+  const targets = ['config.json', 'memories', 'data', 'logs', 'sessions', 'workspace']
+    .map(p => path.join(APP_HOME, p));
+
+  const doRemove = async () => {
+    await stopServer();
+
+    console.log('[CLI] 正在删除本地数据（当前目录）...');
+    for (const target of targets) {
+      try {
+        if (fs.existsSync(target)) {
+          fs.rmSync(target, { recursive: true, force: true });
+          console.log(`[CLI] 已删除：${target}`);
+        }
+      } catch (e) {
+        console.error(`[CLI] 删除失败：${target}`);
+        console.error(e);
+      }
+    }
+
+    console.log('[CLI] 正在卸载全局包 xiaozuoassistant...');
+    const code = await runWithSudoIfNeeded('npm', ['uninstall', '-g', 'xiaozuoassistant', `--registry=${registry}`]);
+    if (code !== 0) {
+      console.error('[CLI] ❌ 卸载失败。');
+      process.exit(code);
+    }
+
+    console.log('[CLI] ✅ 已卸载并清理数据。');
+  };
+
+  if (hasFlag('--yes') || hasFlag('-y')) {
+    await doRemove();
+    return;
+  }
+
+  console.log('[CLI] remove 将执行以下操作：');
+  console.log('  1) 停止后台服务');
+  console.log('  2) 删除当前目录下的数据：');
+  for (const target of targets) console.log(`     - ${target}`);
+  console.log('  3) 卸载全局 npm 包：xiaozuoassistant');
+  process.stdout.write('确认继续？(y/N) ');
+  process.stdin.once('data', async (data) => {
+    const answer = data.toString().trim().toLowerCase();
+    if (answer === 'y' || answer === 'yes') {
+      await doRemove();
+    } else {
+      console.log('已取消。');
+    }
+    process.exit(0);
+  });
+}
+
+function printVersion() {
+  try {
+    const pkgPath = path.join(packageRoot, 'package.json');
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+    console.log(`${pkg.name}@${pkg.version}`);
+    console.log('Package Root:', packageRoot);
+    console.log('Node Version:', process.version);
+  } catch {
+    console.log('xiaozuoassistant@unknown');
+    console.log('Package Root:', packageRoot);
+    console.log('Node Version:', process.version);
+  }
+}
+
 async function exportData() {
+    ensureAppHome();
+    ensureDefaultDirs();
     console.log('📦 Starting data export...');
     
     const filesToArchive = [];
     
     for (const p of DATA_PATHS) {
-        if (fs.existsSync(path.join(CWD, p))) {
+        if (fs.existsSync(path.join(APP_HOME, p))) {
             filesToArchive.push(p);
             console.log(`   - Found: ${p}`);
         }
@@ -207,12 +412,12 @@ async function exportData() {
         await tar.c(
             {
                 gzip: true,
-                file: EXPORT_FILENAME,
-                cwd: CWD
+                file: path.join(APP_HOME, EXPORT_FILENAME),
+                cwd: APP_HOME
             },
             filesToArchive
         );
-        console.log(`✅ Export successful! Backup created at: ${path.join(CWD, EXPORT_FILENAME)}`);
+        console.log(`✅ Export successful! Backup created at: ${path.join(APP_HOME, EXPORT_FILENAME)}`);
         console.log(`   Copy this file to your new machine to import.`);
     } catch (err) {
         console.error('❌ Export failed:', err);
@@ -220,11 +425,12 @@ async function exportData() {
 }
 
 async function importData() {
-    const backupPath = path.join(CWD, EXPORT_FILENAME);
+    ensureAppHome();
+    const backupPath = path.join(APP_HOME, EXPORT_FILENAME);
     
     if (!fs.existsSync(backupPath)) {
         console.error(`❌ Backup file not found: ${backupPath}`);
-        console.log(`   Please ensure '${EXPORT_FILENAME}' is in the current directory.`);
+        console.log(`   Please ensure '${EXPORT_FILENAME}' is in ${APP_HOME}`);
         return;
     }
 
@@ -238,13 +444,13 @@ async function importData() {
         if (answer === 'y' || answer === 'yes') {
             try {
                 await tar.x({
-                    file: EXPORT_FILENAME,
-                    cwd: CWD
+                    file: backupPath,
+                    cwd: APP_HOME
                 });
                 console.log('✅ Import successful! Data restored.');
                 
                 // Auto-configure workspace path in config.json
-                const configPath = path.join(CWD, 'config.json');
+                const configPath = path.join(APP_HOME, 'config.json');
                 if (fs.existsSync(configPath)) {
                     try {
                         const configContent = fs.readFileSync(configPath, 'utf-8');
@@ -252,20 +458,20 @@ async function importData() {
                         
                         // Update workspace to current directory
                         const oldWorkspace = config.workspace;
-                        config.workspace = CWD;
+                        config.workspace = APP_HOME;
                         
                         // Also update System Prompt if it contains the old workspace path
                         if (config.systemPrompt && typeof config.systemPrompt === 'string') {
                             if (oldWorkspace && config.systemPrompt.includes(oldWorkspace)) {
-                                config.systemPrompt = config.systemPrompt.replace(oldWorkspace, CWD);
+                                config.systemPrompt = config.systemPrompt.replace(oldWorkspace, APP_HOME);
                             } else if (config.systemPrompt.includes('Current Workspace:')) {
                                 // Fallback regex replacement if exact string match fails
-                                config.systemPrompt = config.systemPrompt.replace(/Current Workspace: .*/, `Current Workspace: ${CWD}`);
+                                config.systemPrompt = config.systemPrompt.replace(/Current Workspace: .*/, `Current Workspace: ${APP_HOME}`);
                             }
                         }
 
                         fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-                        console.log(`✅ Auto-configured workspace path to: ${CWD}`);
+                        console.log(`✅ Auto-configured workspace path to: ${APP_HOME}`);
                     } catch (e) {
                         console.warn('⚠️ Failed to auto-update config.json path:', e);
                     }
@@ -283,12 +489,15 @@ async function importData() {
 }
 
 if (command === 'start') {
+  ensureAppHome();
+  ensureDefaultDirs();
+  ensureDefaultConfig();
   console.log('Starting xiaozuoAssistant...');
   
   const serverPath = path.join(packageRoot, 'dist', 'server', 'index.js');
   
-  // Ensure logs directory exists in CWD
-  const logDir = path.join(CWD, 'logs');
+  // Ensure logs directory exists in APP_HOME
+  const logDir = path.join(APP_HOME, 'logs');
   if (!fs.existsSync(logDir)) {
     try {
       fs.mkdirSync(logDir, { recursive: true });
@@ -339,7 +548,7 @@ if (command === 'start') {
     const child = spawn('node', [serverPath, ...args.slice(1)], {
       detached: true, // Allow child to run independently
       stdio: ['ignore', out, err], // Disconnect stdin, redirect stdout/stderr
-      cwd: CWD, // Run in user's current directory
+      cwd: APP_HOME, // Run in unified app home
       env: {
         ...process.env,
         NODE_ENV: 'production'
@@ -408,6 +617,8 @@ if (command === 'start') {
     process.exit(1);
   }
 } else if (command === 'doctor') {
+    ensureAppHome();
+    ensureDefaultDirs();
     console.log('Running doctor check...');
     try {
         const pkgPath = path.join(packageRoot, 'package.json');
@@ -420,11 +631,19 @@ if (command === 'start') {
     console.log('Package Root:', packageRoot);
     console.log('Node Version:', process.version);
     console.log('Doctor check complete.');
+} else if (command === 'version') {
+    ensureAppHome();
+    printVersion();
+} else if (command === 'update') {
+    updateApp();
+} else if (command === 'remove') {
+    removeApp();
 } else if (command === 'export') {
     exportData();
 } else if (command === 'import') {
     importData();
 } else if (command === 'stop') {
+    ensureAppHome();
     stopServer();
 } else {
     console.log('Usage: xiaozuoAssistant <command>');
@@ -432,6 +651,12 @@ if (command === 'start') {
     console.log('  start   Start the xiaozuoAssistant server');
     console.log('  stop    Stop the xiaozuoAssistant server');
     console.log('  doctor  Check the health and configuration');
+    console.log('  version Print package version and environment');
+    console.log('  update  Update xiaozuoassistant and auto-restart if running');
+    console.log('  remove  Uninstall and delete data in current directory');
     console.log('  export  Backup local data (config, memories) to a file');
     console.log('  import  Restore data from a backup file');
+    console.log('');
+    console.log(`Data Dir: ${APP_HOME}`);
+    console.log('  Use --home <path> or env XIAOZUOASSISTANT_HOME to override.');
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "xiaozuoassistant",
   "private": false,
   "description": "Your personal, locally-hosted AI assistant for office productivity.",
-  "version": "0.1.45",
+  "version": "0.1.48",
   "author": "mantle.lau",
   "license": "MIT",
   "repository": {
@@ -25,6 +25,7 @@
   "files": [
     "dist",
     "bin",
+    "scripts",
     "public",
     "config.json",
     "README.md"
@@ -37,7 +38,7 @@
     "check": "tsc --noEmit",
     "server:dev": "nodemon --watch src --watch config.json --exec tsx src/index.ts",
     "dev": "concurrently \"npm run client:dev\" \"npm run server:dev\"",
-    "postinstall": "cp node_modules/@lancedb/lancedb-darwin-x64/lancedb.darwin-x64.node node_modules/@lancedb/lancedb/dist/ 2>/dev/null || true && npm rebuild better-sqlite3"
+    "postinstall": "node scripts/init-app-home.cjs || true && cp node_modules/@lancedb/lancedb-darwin-x64/lancedb.darwin-x64.node node_modules/@lancedb/lancedb/dist/ 2>/dev/null || true && npm rebuild better-sqlite3"
   },
   "dependencies": {
     "@lancedb/lancedb": "0.22.3",

package/scripts/init-app-home.cjs

@@ -0,0 +1,43 @@
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+function guessHomeFromSudoUser() {
+  const sudoUser = process.env.SUDO_USER;
+  if (!sudoUser) return null;
+
+  const candidates = [
+    path.join('/Users', sudoUser),
+    path.join('/home', sudoUser)
+  ];
+
+  for (const p of candidates) {
+    try {
+      if (fs.existsSync(p)) return p;
+    } catch {
+      // ignore
+    }
+  }
+
+  return null;
+}
+
+function resolveTargetHome() {
+  const guessed = guessHomeFromSudoUser();
+  if (guessed) return guessed;
+  return os.homedir();
+}
+
+function main() {
+  const home = resolveTargetHome();
+  const appHome = path.join(home, '.xiaozuoassistant');
+
+  try {
+    fs.mkdirSync(appHome, { recursive: true });
+  } catch {
+    process.exit(0);
+  }
+}
+
+main();
+