xiaozuoassistant 0.1.47 → 0.1.49

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';
@@ -21,6 +22,8 @@ const __dirname = path.dirname(__filename);
 // When installed globally: lib/node_modules/xiaozuoassistant/bin/cli.js -> ../
 const packageRoot = path.resolve(__dirname, '..');
 
+const binName = path.basename(process.argv[1] || 'xiaozuoAssistant');
+
 const args = process.argv.slice(2);
 const command = args[0];
 const commandArgs = args.slice(1);
@@ -28,20 +31,80 @@ 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'));
@@ -56,7 +119,7 @@ function getPortFromConfig() {
 }
 
 function getPidFilePath() {
-  return path.join(CWD, 'logs', 'server.pid');
+  return path.join(APP_HOME, 'logs', 'server.pid');
 }
 
 function hasFlag(flag) {
@@ -247,7 +310,7 @@ async function updateApp() {
     console.error('[CLI] ❌ 更新失败。');
     if (wasRunning) {
       console.log('[CLI] 更新失败，尝试恢复启动旧版本服务...');
-      await runCommand('node', [path.join(packageRoot, 'bin', 'cli.js'), 'start'], { cwd: CWD });
+      await runCommand('node', [path.join(packageRoot, 'bin', 'cli.js'), 'start'], { cwd: APP_HOME });
     }
     process.exit(code);
   }
@@ -256,7 +319,7 @@ async function updateApp() {
 
   if (wasRunning) {
     console.log('[CLI] 正在自动重启服务...');
-    const restartCode = await runCommand('xiaozuoAssistant', ['start'], { cwd: CWD });
+    const restartCode = await runCommand('xiaozuoAssistant', ['start'], { cwd: APP_HOME });
     process.exit(restartCode);
   }
 }
@@ -264,7 +327,7 @@ async function updateApp() {
 async function removeApp() {
   const registry = getRegistry();
   const targets = ['config.json', 'memories', 'data', 'logs', 'sessions', 'workspace']
-    .map(p => path.join(CWD, p));
+    .map(p => path.join(APP_HOME, p));
 
   const doRemove = async () => {
     await stopServer();
@@ -329,12 +392,14 @@ function printVersion() {
 }
 
 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}`);
         }
@@ -349,12 +414,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);
@@ -362,11 +427,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;
     }
 
@@ -380,13 +446,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');
@@ -394,20 +460,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);
                     }
@@ -425,12 +491,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 });
@@ -481,7 +550,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'
@@ -550,6 +619,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');
@@ -563,6 +634,7 @@ if (command === 'start') {
     console.log('Node Version:', process.version);
     console.log('Doctor check complete.');
 } else if (command === 'version') {
+    ensureAppHome();
     printVersion();
 } else if (command === 'update') {
     updateApp();
@@ -573,9 +645,10 @@ if (command === 'start') {
 } else if (command === 'import') {
     importData();
 } else if (command === 'stop') {
+    ensureAppHome();
     stopServer();
 } else {
-    console.log('Usage: xiaozuoAssistant <command>');
+    console.log(`Usage: ${binName} <command>`);
     console.log('Commands:');
     console.log('  start   Start the xiaozuoAssistant server');
     console.log('  stop    Stop the xiaozuoAssistant server');
@@ -585,4 +658,7 @@ if (command === 'start') {
     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.47",
+  "version": "0.1.49",
   "author": "mantle.lau",
   "license": "MIT",
   "repository": {
@@ -20,11 +20,13 @@
   "type": "module",
   "main": "dist/server/index.js",
   "bin": {
-    "xiaozuoAssistant": "bin/cli.js"
+    "xiaozuoAssistant": "bin/cli.js",
+    "mybot": "bin/cli.js"
   },
   "files": [
     "dist",
     "bin",
+    "scripts",
     "public",
     "config.json",
     "README.md"
@@ -37,7 +39,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();
+