arisa 2.1.7 → 2.1.9

package/bin/arisa.js

@@ -437,8 +437,10 @@ function step(ok, msg) {
   process.stdout.write(`  ${ok ? "\u2713" : "\u2717"} ${msg}\n`);
 }
 
+const ARISA_BUN_ENV = 'export BUN_INSTALL=/home/arisa/.bun && export PATH=/home/arisa/.bun/bin:$PATH';
+
 function runAsInherit(cmd) {
-  return spawnSync("su", ["-", "arisa", "-c", cmd], {
+  return spawnSync("su", ["-", "arisa", "-c", `${ARISA_BUN_ENV} && ${cmd}`], {
     stdio: "inherit",
     timeout: 180_000,
   });
@@ -472,6 +474,15 @@ function provisionArisaUser() {
   }
   step(true, "Bun installed for arisa");
 
+  // Ensure .profile has bun PATH (login shells skip .bashrc non-interactive guard)
+  const profilePath = "/home/arisa/.profile";
+  const profileContent = existsSync(profilePath) ? readFileSync(profilePath, "utf8") : "";
+  if (!profileContent.includes("BUN_INSTALL")) {
+    const bunPath = '\n# bun\nexport BUN_INSTALL="/home/arisa/.bun"\nexport PATH="$BUN_INSTALL/bin:$PATH"\n';
+    writeFileSync(profilePath, profileContent + bunPath, "utf8");
+    spawnSync("chown", ["arisa:arisa", profilePath], { stdio: "ignore" });
+  }
+
   // 3. Copy arisa source
   const dest = "/home/arisa/arisa";
   spawnSync("cp", ["-r", pkgRoot, dest], { stdio: "pipe" });
@@ -564,33 +575,38 @@ function isSystemdActive() {
   return result.status === 0;
 }
 
+function canUseSystemdSystem() {
+  if (platform() !== "linux") return false;
+  if (!commandExists("systemctl")) return false;
+  const probe = runCommand("systemctl", ["is-system-running"], { stdio: "pipe" });
+  const state = (probe.stdout || "").trim();
+  return probe.status === 0 || state === "degraded" || state === "running";
+}
+
+function runArisaForeground() {
+  const su = spawnSync("su", ["-", "arisa", "-c", `${ARISA_BUN_ENV} && /home/arisa/.bun/bin/bun /home/arisa/arisa/src/daemon/index.ts`], {
+    stdio: "inherit",
+  });
+  return su.status ?? 1;
+}
+
 // ── Root guard ──────────────────────────────────────────────────────
 
 if (isRoot()) {
   if (!isProvisioned()) {
     provisionArisaUser();
-    writeSystemdSystemUnit();
-    spawnSync("systemctl", ["daemon-reload"], { stdio: "inherit" });
-    spawnSync("systemctl", ["enable", "arisa"], { stdio: "inherit" });
-    step(true, "Systemd service enabled (auto-starts on reboot)");
+    if (canUseSystemdSystem()) {
+      writeSystemdSystemUnit();
+      spawnSync("systemctl", ["daemon-reload"], { stdio: "inherit" });
+      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");
-    const su = spawnSync("su", ["-", "arisa", "-c", "/home/arisa/.bun/bin/bun /home/arisa/arisa/src/daemon/index.ts"], {
-      stdio: "inherit",
-    });
-
-    process.stdout.write(`
-Arisa management:
-  Start:    systemctl start arisa
-  Status:   systemctl status arisa
-  Logs:     journalctl -u arisa -f
-  Restart:  systemctl restart arisa
-  Stop:     systemctl stop arisa
-`);
-    process.exit(su.status ?? 0);
-  }
-
-  // Already provisioned — route commands to system-level systemd
+    process.exit(runArisaForeground());
+  }
+
+  // Already provisioned — route commands
   if (command === "help" || command === "--help" || command === "-h") {
     printHelp();
     process.exit(0);
@@ -600,51 +616,48 @@ Arisa management:
     process.exit(0);
   }
 
-  // No args → interactive setup if not configured, otherwise systemd
+  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");
-      const su = spawnSync("su", ["-", "arisa", "-c", "/home/arisa/.bun/bin/bun /home/arisa/arisa/src/daemon/index.ts"], {
-        stdio: "inherit",
-      });
-      process.stdout.write(`
-Arisa management:
-  Start:    systemctl start arisa
-  Status:   systemctl status arisa
-  Logs:     journalctl -u arisa -f
-  Restart:  systemctl restart arisa
-  Stop:     systemctl stop arisa
-`);
-      process.exit(su.status ?? 0);
+      process.exit(runArisaForeground());
     }
-    if (isSystemdActive()) {
-      process.exit(statusSystemdSystem());
-    } else {
-      process.exit(startSystemdSystem());
+    if (hasSystemd) {
+      if (isSystemdActive()) {
+        process.exit(statusSystemdSystem());
+      } else {
+        process.exit(startSystemdSystem());
+      }
     }
+    // No systemd → foreground
+    process.exit(runArisaForeground());
   }
 
   switch (command) {
     case "start":
-      process.exit(startSystemdSystem());
+      if (hasSystemd) process.exit(startSystemdSystem());
+      process.exit(runArisaForeground());
       break;
     case "stop":
-      process.exit(stopSystemdSystem());
+      if (hasSystemd) process.exit(stopSystemdSystem());
+      process.stderr.write("No systemd available. Stop the foreground process with Ctrl+C.\n");
+      process.exit(1);
       break;
     case "restart":
-      process.exit(restartSystemdSystem());
+      if (hasSystemd) process.exit(restartSystemdSystem());
+      process.stderr.write("No systemd available. Restart the foreground process manually.\n");
+      process.exit(1);
       break;
     case "status":
-      process.exit(statusSystemdSystem());
+      if (hasSystemd) process.exit(statusSystemdSystem());
+      process.stderr.write("No systemd available.\n");
+      process.exit(1);
       break;
     case "daemon":
-    case "run": {
-      // Explicit "arisa daemon/run" → foreground as arisa user
-      const su = spawnSync("su", ["-", "arisa", "-c", "/home/arisa/.bun/bin/bun /home/arisa/arisa/src/daemon/index.ts"], {
-        stdio: "inherit",
-      });
-      process.exit(su.status ?? 1);
-    }
+    case "run":
+      process.exit(runArisaForeground());
     default:
       process.stderr.write(`Unknown command: ${command}\n\n`);
       printHelp();

package/package.json

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