saeeol 1.4.5 → 1.4.6

package/desktop.js

@@ -1,9 +1,22 @@
 #!/usr/bin/env node
 
-// saeeol desktop — launches saeeol web server + Electron window
-const { existsSync, realpathSync } = require("fs")
-const { join, dirname } = require("path")
+// fabulist — launches saeeol server + Electron desktop with React UI
+const { existsSync, realpathSync, createReadStream, statSync, readdirSync } = require("fs")
+const { join, dirname, extname, mimeLookup } = require("path")
 const { spawn } = require("child_process")
+const http = require("http")
+
+const MIME = {
+  ".html": "text/html",
+  ".js": "text/javascript",
+  ".css": "text/css",
+  ".json": "application/json",
+  ".png": "image/png",
+  ".ico": "image/x-icon",
+  ".svg": "image/svg+xml",
+  ".woff2": "font/woff2",
+  ".wasm": "application/wasm",
+}
 
 function getBinaryName() {
   const archMap = { x64: "x64", arm64: "arm64" }
@@ -18,11 +31,9 @@ function findBinary() {
   const binaryRel = process.platform === "win32" ? "bin/saeeol.exe" : "bin/saeeol"
   const scriptDir = dirname(realpathSync(__filename))
 
-  // 1. node_modules of this package
   const local = join(scriptDir, "node_modules", binaryName, binaryRel)
   if (existsSync(local)) return local
 
-  // 2. Walk up
   let current = scriptDir
   for (let i = 0; i < 10; i++) {
     const candidate = join(current, "node_modules", binaryName, binaryRel)
@@ -32,7 +43,6 @@ function findBinary() {
     current = parent
   }
 
-  // 3. Download dir
   const dl = join(scriptDir, "download", process.platform === "win32" ? `${binaryName}.exe` : "saeeol")
   if (existsSync(dl)) return dl
 
@@ -41,11 +51,38 @@ function findBinary() {
 
 function findElectron() {
   const scriptDir = dirname(realpathSync(__filename))
-  const electronPath = join(scriptDir, "node_modules", "electron", "dist", process.platform === "win32" ? "electron.exe" : "electron")
-  if (existsSync(electronPath)) return electronPath
+  const exe = process.platform === "win32" ? "electron.exe" : "electron"
+  const p = join(scriptDir, "node_modules", "electron", "dist", exe)
+  if (existsSync(p)) return p
   return null
 }
 
+function serveStatic(webDir, port) {
+  return new Promise((resolve) => {
+    const server = http.createServer((req, res) => {
+      let urlPath = req.url.split("?")[0]
+      if (urlPath === "/") urlPath = "/index.html"
+
+      const filePath = join(webDir, urlPath)
+      if (!existsSync(filePath)) {
+        res.writeHead(404)
+        res.end("not found")
+        return
+      }
+
+      const ext = extname(filePath)
+      const ct = MIME[ext] || "application/octet-stream"
+      const stat = statSync(filePath)
+      res.writeHead(200, { "Content-Type": ct, "Content-Length": stat.size })
+      createReadStream(filePath).pipe(res)
+    })
+
+    server.listen(port, "127.0.0.1", () => {
+      resolve(server)
+    })
+  })
+}
+
 async function main() {
   const binaryPath = findBinary()
   if (!binaryPath) {
@@ -55,11 +92,16 @@ async function main() {
   }
 
   const electronPath = findElectron()
-
-  // If no electron, fall back to CLI mode
-  if (!electronPath) {
-    console.log("Electron not found. Install with: npm install -g saeeol")
-    console.log("Starting in terminal mode...\n")
+  const webDir = join(dirname(realpathSync(__filename)), "web")
+  const hasWebUI = existsSync(join(webDir, "index.html"))
+
+  if (!electronPath || !hasWebUI) {
+    // Fallback: terminal mode
+    if (!electronPath) {
+      console.log("Electron not found, starting in terminal mode.\n")
+    } else {
+      console.log("Web UI not found, starting in terminal mode.\n")
+    }
     const child = spawn(binaryPath, process.argv.slice(2), {
       stdio: "inherit",
       env: { ...process.env },
@@ -69,32 +111,37 @@ async function main() {
     return
   }
 
-  // Find free port
-  const port = 30000 + Math.floor(Math.random() * 10000)
-
-  console.log(`Starting saeeol server on port ${port}...`)
+  // Find ports
+  const webPort = 31000 + Math.floor(Math.random() * 5000)
+  const apiPort = 32000 + Math.floor(Math.random() * 5000)
 
-  // Start saeeol web in background
-  const server = spawn(binaryPath, ["web", "--port", String(port), "--hostname", "127.0.0.1"], {
+  // 1. Start saeeol API server
+  console.log("Starting saeeol API server...")
+  const api = spawn(binaryPath, ["web", "--port", String(apiPort), "--hostname", "127.0.0.1"], {
     stdio: "pipe",
     env: { ...process.env },
     windowsHide: true,
   })
+  api.stdout.on("data", (d) => { const m = d.toString().trim(); if (m) console.log(`[api] ${m}`) })
+  api.stderr.on("data", (d) => { const m = d.toString().trim(); if (m) console.error(`[api] ${m}`) })
 
-  server.stdout.on("data", (data) => {
-    const msg = data.toString().trim()
-    if (msg) console.log(`[server] ${msg}`)
-  })
-  server.stderr.on("data", (data) => {
-    const msg = data.toString().trim()
-    if (msg) console.error(`[server] ${msg}`)
-  })
+  // 2. Start static file server for React UI
+  const staticServer = await serveStatic(webDir, webPort)
+  console.log(`UI server: http://127.0.0.1:${webPort}`)
 
-  // Create a minimal Electron app that loads the saeeol web URL
-  const electronApp = join(__dirname, "desktop-app.js")
-  const desktopAppCode = `
+  // 3. Wait for API to be ready
+  await new Promise((r) => setTimeout(r, 3000))
+
+  // 4. Launch Electron with inline app
+  console.log("Opening FABULIST desktop...")
+
+  const electronAppDir = join(dirname(realpathSync(__filename__)), "desktop-app")
+  const { mkdirSync, writeFileSync } = require("fs")
+  mkdirSync(electronAppDir, { recursive: true })
+  writeFileSync(join(electronAppDir, "package.json"), '{"name":"fabulist-desktop"}')
+  writeFileSync(join(electronAppDir, "main.js"), `
 const { app, BrowserWindow } = require("electron")
-const url = "http://127.0.0.1:${port}"
+const path = require("path")
 
 function createWindow() {
   const win = new BrowserWindow({
@@ -106,34 +153,31 @@ function createWindow() {
     autoHideMenuBar: true,
     webPreferences: { nodeIntegration: false, contextIsolation: true },
   })
-  win.loadURL(url)
+  win.loadURL("http://127.0.0.1:${webPort}")
 }
 
 app.whenReady().then(createWindow)
-app.on("window-all-closed", () => {
-  app.quit()
-  process.kill(${server.pid})
-  process.exit(0)
-})
-`
-  require("fs").writeFileSync(electronApp, desktopAppCode)
+app.on("window-all-closed", () => app.quit())
+`)
 
-  // Wait a bit for server to start
-  await new Promise((r) => setTimeout(r, 3000))
-
-  console.log("Opening FABULIST desktop...")
-
-  const electron = spawn(electronPath, [electronApp], {
+  const electron = spawn(electronPath, [join(electronAppDir, "main.js")], {
     stdio: "inherit",
     env: { ...process.env },
     windowsHide: false,
   })
 
   electron.on("exit", (code) => {
-    server.kill()
-    try { require("fs").unlinkSync(electronApp) } catch {}
+    api.kill()
+    staticServer.close()
     process.exit(code || 0)
   })
+
+  process.on("SIGINT", () => {
+    api.kill()
+    electron.kill()
+    staticServer.close()
+    process.exit(0)
+  })
 }
 
 main().catch((err) => {

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "saeeol",
-  "version": "1.4.5",
-  "description": "AI agent engine for SAEEOL",
+  "version": "1.4.6",
+  "description": "AI agent engine for SAEEOL — CLI + Desktop in one package",
+  "author": "byfabulist",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -14,7 +15,8 @@
   "files": [
     "cli.js",
     "desktop.js",
-    "postinstall.js"
+    "postinstall.js",
+    "web/**/*"
   ],
   "scripts": {
     "postinstall": "node postinstall.js"