arisa 2.2.8 → 2.2.10

package/bin/arisa.js

@@ -580,14 +580,63 @@ function canUseSystemdSystem() {
 }
 
 function runArisaForeground() {
-  // Detach child + exit parent immediately to free parent bun memory (~50-100MB).
-  // On 1GB VPS, two bun processes trigger OOM.
-  const child = spawn("su", ["-", "arisa", "-c", `${ARISA_BUN_ENV} && export ARISA_PROJECT_DIR=${SHARED_ARISA_ROOT} && exec /home/arisa/.bun/bin/bun ${sharedDaemonEntry}`], {
+  const result = spawnSync("su", ["-", "arisa", "-c", `${ARISA_BUN_ENV} && export ARISA_PROJECT_DIR=${SHARED_ARISA_ROOT} && exec /home/arisa/.bun/bin/bun ${sharedDaemonEntry}`], {
     stdio: "inherit",
-    detached: true,
   });
-  child.unref();
-  process.exit(0);
+  return result.status ?? 1;
+}
+
+// ── Minimal setup (runs as root, no second bun process) ─────────────
+
+function askLine(promptText) {
+  process.stdout.write(promptText);
+  const result = spawnSync("bash", ["-c", "read -r line; echo \"$line\""], {
+    stdio: ["inherit", "pipe", "inherit"],
+  });
+  return (result.stdout || "").toString().trim();
+}
+
+function runMinimalSetup() {
+  const arisaDataDir = "/home/arisa/.arisa";
+  const envPath = join(arisaDataDir, ".env");
+
+  // Load existing .env if any
+  const vars = {};
+  if (existsSync(envPath)) {
+    for (const line of readFileSync(envPath, "utf8").split("\n")) {
+      const match = line.match(/^([A-Z_][A-Z0-9_]*)=(.+)$/);
+      if (match) vars[match[1]] = match[2].trim();
+    }
+  }
+
+  if (!vars.TELEGRAM_BOT_TOKEN) {
+    process.stdout.write("\nArisa Setup\n\n");
+    const token = askLine("Telegram Bot Token (from https://t.me/BotFather): ");
+    if (!token) {
+      process.stdout.write("No token provided. Cannot start without Telegram Bot Token.\n");
+      process.exit(1);
+    }
+    vars.TELEGRAM_BOT_TOKEN = token;
+    process.stdout.write("  Token saved.\n");
+  }
+
+  if (!vars.OPENAI_API_KEY) {
+    const key = askLine("OpenAI API Key (optional, enter to skip): ");
+    if (key) {
+      vars.OPENAI_API_KEY = key;
+      process.stdout.write("  Key saved.\n");
+    }
+  }
+
+  vars.ARISA_SETUP_COMPLETE = "1";
+
+  // Write .env
+  mkdirSync(arisaDataDir, { recursive: true });
+  const content = Object.entries(vars).map(([k, v]) => `${k}=${v}`).join("\n") + "\n";
+  writeFileSync(envPath, content, "utf8");
+  spawnSync("chown", ["-R", "arisa:arisa", arisaDataDir], { stdio: "ignore" });
+
+  process.stdout.write(`\nConfig saved to ${envPath}\n`);
 }
 
 // ── Root guard ──────────────────────────────────────────────────────
@@ -601,12 +650,14 @@ if (isRoot()) {
       spawnSync("systemctl", ["enable", "arisa"], { stdio: "inherit" });
       step(true, "Systemd service enabled (auto-starts on reboot)");
     }
+  }
 
-    process.stdout.write("\nStarting interactive setup as user arisa...\n\n");
-    runArisaForeground(); // exits parent process internally
+  // Minimal setup: collect tokens here (no second bun process)
+  if (!isArisaConfigured()) {
+    runMinimalSetup();
   }
 
-  // Already provisioned — route commands
+  // Already provisioned + configured — route commands
   if (command === "help" || command === "--help" || command === "-h") {
     printHelp();
     process.exit(0);
@@ -618,27 +669,27 @@ if (isRoot()) {
 
   const hasSystemd = canUseSystemdSystem();
 
-  // No args → setup if needed, then systemd or foreground
   if (isDefaultInvocation) {
-    if (!isArisaConfigured()) {
-      process.stdout.write("Arisa is not configured yet. Starting interactive setup...\n\n");
-      runArisaForeground(); // exits parent process internally
-    }
     if (hasSystemd) {
-      if (isSystemdActive()) {
-        process.exit(statusSystemdSystem());
-      } else {
-        process.exit(startSystemdSystem());
+      if (!isSystemdActive()) {
+        const start = startSystemdSystem();
+        if (start !== 0) process.exit(start);
       }
+      process.stdout.write("\nArisa is running. Management commands:\n");
+      process.stdout.write("  Status:   systemctl status arisa\n");
+      process.stdout.write("  Logs:     journalctl -u arisa -f\n");
+      process.stdout.write("  Restart:  systemctl restart arisa\n");
+      process.stdout.write("  Stop:     systemctl stop arisa\n\n");
+      process.exit(0);
     }
-    // No systemd → foreground
-    runArisaForeground(); // exits parent process internally
+    // No systemd → foreground (two bun processes, but no other option)
+    process.exit(runArisaForeground());
   }
 
   switch (command) {
     case "start":
       if (hasSystemd) process.exit(startSystemdSystem());
-      runArisaForeground(); // exits parent process internally
+      process.exit(runArisaForeground());
       break;
     case "stop":
       if (hasSystemd) process.exit(stopSystemdSystem());
@@ -657,7 +708,7 @@ if (isRoot()) {
       break;
     case "daemon":
     case "run":
-      runArisaForeground(); // exits parent process internally
+      process.exit(runArisaForeground());
     default:
       process.stderr.write(`Unknown command: ${command}\n\n`);
       printHelp();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arisa",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "description": "Arisa - dynamic agent runtime with daemon/core architecture that evolves through user interaction",
   "preferGlobal": true,
   "bin": {