@zerwiz/sessrumnir 0.1.12 → 0.1.13

package/bin/sessrumnir.js

@@ -1,11 +1,167 @@
 #!/usr/bin/env node
-// sessrumnir — the seat-hall window. Launches the built Electron shell.
-const { spawn } = require("node:child_process");
-const path = require("node:path");
-let electron;
-try { electron = require("electron"); } catch { // not installed as a dep (dev mode) — resolve the local dev binary
-  electron = path.join(__dirname, "..", "node_modules", ".bin", "electron");
-}
-const main = path.join(__dirname, "..", "out", "main", "index.js");
-const child = spawn(electron, [main, ...process.argv.slice(2)], { stdio: "inherit", env: process.env });
-child.on("exit", (code, signal) => process.exit(signal ? (signal === "SIGINT" ? 130 : 1) : (code ?? 0)));
+
+/**
+ * pi-desktop — CLI launcher for Pi Desktop GUI
+ *
+ * Usage:
+ *   pi-desktop              # Launch the app
+ *   pi-desktop --help       # Show help
+ *   pi-desktop --version    # Show version
+ *   pi-desktop /path/to/dir # Launch with workspace
+ */
+
+const { spawn } = require('child_process')
+const { existsSync } = require('fs')
+const { join, resolve } = require('path')
+
+const VERSION = require('../package.json').version
+
+// ─── Parse args ──────────────────────────────────────────────────────────────
+
+const args = process.argv.slice(2)
+
+if (args.includes('--help') || args.includes('-h')) {
+  console.log(`
+  pi-desktop v${VERSION} — Desktop GUI for the Pi coding agent
+
+  Usage:
+    pi-desktop                  Launch the app
+    pi-desktop <path>           Launch with workspace directory
+    pi-desktop --help           Show this help
+    pi-desktop --version        Show version
+
+  Examples:
+    pi-desktop                  # Launch with default workspace
+    pi-desktop ~/my-project     # Launch with specific project
+    pi-desktop .                # Launch with current directory
+
+  Install:
+    See https://github.com/FaqFirebase/pi-desktop for releases
+    and build-from-source instructions.
+
+  The app requires Pi to be installed:
+    curl -fsSL https://pi.dev/install.sh | sh
+    # or
+    npm install -g @earendil-works/pi-coding-agent
+`)
+  process.exit(0)
+}
+
+if (args.includes('--version') || args.includes('-v')) {
+  console.log(VERSION)
+  process.exit(0)
+}
+
+// ─── Find Electron binary ────────────────────────────────────────────────────
+
+function findElectron() {
+  // Try to find electron from the package's own node_modules
+  const candidates = [
+    join(__dirname, '..', 'node_modules', 'electron', 'dist', 'electron'),
+    join(__dirname, '..', 'node_modules', '.bin', 'electron'),
+  ]
+
+  for (const candidate of candidates) {
+    if (existsSync(candidate)) {
+      return candidate
+    }
+  }
+
+  // Try to find globally installed electron
+  try {
+    const { execSync } = require('child_process')
+    const electronPath = execSync('which electron', { encoding: 'utf8', timeout: 5000 }).trim()
+    if (existsSync(electronPath)) {
+      return electronPath
+    }
+  } catch {
+    // Not found
+  }
+
+  console.error('Error: Electron not found. Please install dependencies:')
+  console.error('  cd ' + join(__dirname, '..') + ' && npm install')
+  process.exit(1)
+}
+
+// ─── Find app resources ─────────────────────────────────────────────────────
+
+function findAppResources() {
+  // Packaged app: resources are in app.asar or app directory
+  const packagedPaths = [
+    join(__dirname, '..', 'app.asar'),
+    join(__dirname, '..', 'app'),
+    join(__dirname, '..', 'resources', 'app.asar'),
+    join(__dirname, '..', 'resources', 'app'),
+  ]
+
+  for (const p of packagedPaths) {
+    if (existsSync(p)) {
+      return p
+    }
+  }
+
+  // Development: use the project root (electron-vite builds to out/)
+  const devPath = join(__dirname, '..')
+  if (existsSync(join(devPath, 'out', 'main', 'index.js'))) {
+    return devPath
+  }
+
+  // Build first
+  console.error('Error: App not built. Run "npm run build" first.')
+  process.exit(1)
+}
+
+// ─── Launch ──────────────────────────────────────────────────────────────────
+
+function launch() {
+  const electronPath = findElectron()
+  const appPath = findAppResources()
+
+  // Resolve workspace path if provided
+  let workspacePath = null
+  if (args.length > 0 && !args[0].startsWith('-')) {
+    workspacePath = resolve(args[0])
+    if (!existsSync(workspacePath)) {
+      console.error(`Error: Path does not exist: ${workspacePath}`)
+      process.exit(1)
+    }
+  }
+
+  // Build electron args.
+  // --no-sandbox is required so Pi subprocesses can spawn.
+  // --disable-gpu is intentionally NOT passed by default — it breaks window
+  // creation on some Wayland + AMD setups. If the GPU process crashes on your
+  // system, re-add it locally as an escape hatch.
+  const electronArgs = [
+    appPath,
+    '--no-sandbox',
+  ]
+
+  // Pass workspace path via environment variable
+  const env = { ...process.env }
+  if (workspacePath) {
+    env.PI_DESKTOP_WORKSPACE = workspacePath
+  }
+
+  // Launch Electron
+  const child = spawn(electronPath, electronArgs, {
+    stdio: 'inherit',
+    env,
+    detached: false,
+  })
+
+  child.on('error', (err) => {
+    console.error('Failed to start Pi Desktop:', err.message)
+    process.exit(1)
+  })
+
+  child.on('exit', (code) => {
+    process.exit(code ?? 0)
+  })
+
+  // Forward signals
+  process.on('SIGINT', () => child.kill('SIGINT'))
+  process.on('SIGTERM', () => child.kill('SIGTERM'))
+}
+
+launch()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerwiz/sessrumnir",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Desktop GUI frontend for the Pi coding agent",
   "main": "out/main/index.js",
   "desktopName": "pi-desktop.desktop",