ompgui 0.4.0 → 0.4.2

package/bin/omp-web-options.js

@@ -1,86 +1,2 @@
 "use strict";
-
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const { parseArgs } = require("util");
-
-const TRUE_VALUES = new Set(["1", "true", "yes", "on"]);
-
-function isEnabled(value) {
-  return typeof value === "string" && TRUE_VALUES.has(value.trim().toLowerCase());
-}
-
-
-function printHelp() {
-  console.log(`Usage: ompweb [options]
-
-Options:
-  -p, --port <port>        Server port (default 30177, env PORT)
-  -H, --hostname <host>    Bind hostname (default 127.0.0.1, env OMP_WEB_HOSTNAME)
-      --password <pass>    Password for the web sign-in screen (env OMP_WEB_PASSWORD)
-      --no-open            Do not open the browser automatically
-  -h, --help               Show this help
-      --version            Show version
-
-Password:
-  ompweb --password "a-long-random-password"
-  # env-variable forms (POSIX, PowerShell, CMD handled uniformly)
-  OMP_WEB_PASSWORD="secret" ompweb
-  $env:OMP_WEB_PASSWORD="secret"; ompweb   # PowerShell
-  set OMP_WEB_PASSWORD=secret&& ompweb     # CMD
-
-Security: use HTTPS via a trusted reverse proxy or VPN when binding to a
-non-loopback hostname, so the password and session cookie stay private.`);
-}
-
-function parseLaunchOptions(args = process.argv.slice(2), env = process.env) {
-  const { values: cliArgs } = parseArgs({
-    args,
-    options: {
-      port:      { type: "string", short: "p" },
-      hostname:  { type: "string", short: "H" },
-      password:  { type: "string" },
-      help:      { type: "boolean", short: "h" },
-      version:   { type: "boolean" },
-      "no-open": { type: "boolean" },
-    },
-    strict: false,
-  });
-
-  // --password wins over env so Windows users without POSIX inline-env syntax have a first-class option.
-  const password = cliArgs.password ?? env.OMP_WEB_PASSWORD;
-  if (cliArgs.version) {
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const pkg = require("../package.json");
-      console.log(pkg.version ?? "0.0.0");
-    } catch { console.log("0.0.0"); }
-    return {
-      port: cliArgs.port ?? env.PORT ?? "30177",
-      hostname: cliArgs.hostname ?? env.OMP_WEB_HOSTNAME ?? "127.0.0.1",
-      password,
-      openBrowser: !cliArgs["no-open"] && !isEnabled(env.OMP_WEB_NO_OPEN),
-      version: true,
-    };
-  }
-  // Expose help flag without exiting here — caller (bin/omp-web.js) decides
-  // whether to exit, keeping parseLaunchOptions testable. Print here so
-  // --help works even when the caller is a test.
-  if (cliArgs.help) {
-    printHelp();
-    return {
-      port: cliArgs.port ?? env.PORT ?? "30177",
-      hostname: cliArgs.hostname ?? env.OMP_WEB_HOSTNAME ?? "127.0.0.1",
-      password,
-      openBrowser: !cliArgs["no-open"] && !isEnabled(env.OMP_WEB_NO_OPEN),
-      help: true,
-    };
-  }
-  return {
-    port: cliArgs.port ?? env.PORT ?? "30177",
-    hostname: cliArgs.hostname ?? env.OMP_WEB_HOSTNAME ?? "127.0.0.1",
-    password,
-    openBrowser: !cliArgs["no-open"] && !isEnabled(env.OMP_WEB_NO_OPEN),
-  };
-}
-
-module.exports = { parseLaunchOptions };
+module.exports = require("./ompgui-options");

package/bin/omp-web.js

@@ -1,155 +1,3 @@
 #!/usr/bin/env node
 "use strict";
-
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const { getUnsupportedNodeVersionMessage, isNodeVersionSupported } = require("./node-version");
-
-if (!isNodeVersionSupported(process.versions.node)) {
-  console.error(getUnsupportedNodeVersionMessage(process.versions.node));
-  process.exit(1);
-}
-
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const { spawn } = require("child_process");
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const path = require("path");
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const fs = require("fs");
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const { parseLaunchOptions } = require("./omp-web-options");
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const { isPortAvailable } = require("./port-availability");
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const { wireChildProcessLifecycle } = require("./process-lifecycle");
-
-const pkgDir = path.join(__dirname, "..");
-const nextDir = path.join(pkgDir, ".next");
-
-// Resolve next's CLI entry directly to avoid relying on .bin symlinks (which
-// may not exist when installed via npx).
-let nextBin;
-try {
-  nextBin = require.resolve("next/dist/bin/next", { paths: [pkgDir] });
-} catch {
-  // Fallback: locate next package root and derive the bin path manually.
-  try {
-    const nextPkg = require.resolve("next/package.json", { paths: [pkgDir] });
-    nextBin = path.join(path.dirname(nextPkg), "dist", "bin", "next");
-  } catch {
-    nextBin = path.join(pkgDir, "node_modules", "next", "dist", "bin", "next");
-  }
-}
-
-const launchOptions = parseLaunchOptions();
-if (launchOptions.help || launchOptions.version) {
-  process.exit(0);
-}
-const port = launchOptions.port;
-const hostname = launchOptions.hostname;
-const password = launchOptions.password;
-const openBrowser = launchOptions.openBrowser;
-// Propagate --password into the env for proxy.ts / lib/web-auth.ts and the spawned Next process.
-if (password) process.env.OMP_WEB_PASSWORD = password;
-const loopbackHostnames = new Set(["127.0.0.1", "localhost", "::1", "[::1]"]);
-const passwordEnabled = typeof password === "string" && password.length > 0;
-
-if (!fs.existsSync(nextDir)) {
-  console.error("Build artifacts not found. Please report this issue.");
-  process.exit(1);
-}
-
-if (!loopbackHostnames.has(hostname)) {
-  if (!passwordEnabled) {
-    console.error(`Refusing to listen on ${hostname} without OMP_WEB_PASSWORD (or --password). Set a strong password or bind to 127.0.0.1.`);
-    process.exit(1);
-  }
-  console.warn(`Warning: ompweb is listening on ${hostname} over HTTP. Use HTTPS or a trusted VPN to protect the password and session cookie in transit.`);
-}
-
-const nextArgs = ["start", "-p", port];
-nextArgs.push("-H", hostname);
-
-// Always run next's JS entry with node directly — avoids .bin symlink issues
-// and path-with-spaces problems on Windows when shell: true is used.
-const url = `http://${hostname}:${port}`;
-
-function openBrowserWindow(targetUrl) {
-  const isWindows = process.platform === "win32";
-  const isMac = process.platform === "darwin";
-  const isWsl = process.platform === "linux" && Boolean(process.env.WSL_DISTRO_NAME || process.env.WSL_INTEROP);
-  const openCmd = isWindows ? "cmd.exe" : isMac ? "open" : isWsl ? "wslview" : "xdg-open";
-  const openArgs = isWindows ? ["/c", "start", "", targetUrl] : [targetUrl];
-
-  try {
-    const opener = spawn(openCmd, openArgs, {
-      stdio: "ignore",
-      detached: true,
-    });
-    opener.on("error", (error) => {
-      console.warn(`Could not open browser automatically: ${error.message}`);
-    });
-    opener.unref();
-  } catch (error) {
-    console.warn(`Could not open browser automatically: ${error.message}`);
-  }
-}
-
-async function main() {
-  if (!await isPortAvailable(port, hostname)) {
-    console.log(`ompweb is already running on ${hostname}:${port}.`);
-    if (openBrowser) {
-      console.log(`Opening ${url} in your browser...`);
-      openBrowserWindow(url);
-    }
-    return;
-  }
-
-  const child = spawn(process.execPath, [nextBin, ...nextArgs], {
-    cwd: pkgDir,
-    stdio: ["inherit", "pipe", "inherit"],
-    env: {
-      ...process.env,
-      OMP_WEB_PACKAGE_DIR: pkgDir,
-      OMP_WEB_LAUNCHER_PID: String(process.pid),
-      OMP_WEB_PORT: port,
-      OMP_WEB_HOSTNAME: hostname,
-    },
-  });
-  wireChildProcessLifecycle(child);
-
-  let browserOpened = false;
-  const tryOpenBrowser = () => {
-    if (!openBrowser || browserOpened) return;
-    browserOpened = true;
-    openBrowserWindow(url);
-  };
-
-  child.stdout.on("data", (chunk) => {
-    const text = chunk.toString();
-    process.stdout.write(text);
-    if (/ready|started|local:\s*http|listening/i.test(text)) {
-      tryOpenBrowser();
-    }
-  });
-
-  if (openBrowser) {
-    const checkInterval = setInterval(async () => {
-      if (browserOpened) {
-        clearInterval(checkInterval);
-        return;
-      }
-      const available = await isPortAvailable(port, hostname);
-      if (!available) {
-        clearInterval(checkInterval);
-        tryOpenBrowser();
-      }
-    }, 250);
-
-    setTimeout(() => clearInterval(checkInterval), 15000);
-  }
-}
-
-main().catch((error) => {
-  console.error(`Could not check whether ${url} is available: ${error.message}`);
-  process.exit(1);
-});
+require("./ompgui.js");

package/bin/ompgui-options.js

@@ -0,0 +1,24 @@
+"use strict";
+
+const { parseArgs } = require("util");
+const TRUE_VALUES = new Set(["1", "true", "yes", "on"]);
+function isEnabled(value) { return typeof value === "string" && TRUE_VALUES.has(value.trim().toLowerCase()); }
+function printHelp() {
+  console.log(`Usage: ompgui [options]
+
+Options:
+  -p, --port <port>        Server port (default 30177, env OMPGUI_PORT)
+  -H, --hostname <host>    Bind hostname (default 127.0.0.1, env OMPGUI_HOSTNAME)
+      --password <pass>    Password for the web sign-in screen (env OMPGUI_PASSWORD)
+      --no-open            Do not open the browser automatically
+  -h, --help               Show this help
+      --version            Show version`);
+}
+function parseLaunchOptions(args = process.argv.slice(2), env = process.env) {
+  const { values: cliArgs } = parseArgs({ args, options: { port:{type:"string",short:"p"}, hostname:{type:"string",short:"H"}, password:{type:"string"}, help:{type:"boolean",short:"h"}, version:{type:"boolean"}, "no-open":{type:"boolean"} }, strict:false });
+  const result = { port: cliArgs.port ?? env.OMPGUI_PORT ?? env.PORT ?? env.OMP_WEB_PORT ?? "30177", hostname: cliArgs.hostname ?? env.OMPGUI_HOSTNAME ?? env.OMP_WEB_HOSTNAME ?? "127.0.0.1", password: cliArgs.password ?? env.OMPGUI_PASSWORD ?? env.OMP_WEB_PASSWORD, openBrowser: !cliArgs["no-open"] && !isEnabled(env.OMPGUI_NO_OPEN) && !isEnabled(env.OMP_WEB_NO_OPEN) };
+  if (cliArgs.help) { printHelp(); result.help = true; }
+  if (cliArgs.version) { try { result.version = true; console.log(require("../package.json").version ?? "0.0.0"); } catch { result.version = true; } }
+  return result;
+}
+module.exports = { parseLaunchOptions, isEnabled };

package/bin/ompgui-security.test.mjs

@@ -0,0 +1,8 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { spawnSync } from "node:child_process";
+test("ompgui refuses unauthenticated non-loopback binds", () => {
+  const result = spawnSync(process.execPath, ["bin/ompgui.js", "--hostname", "0.0.0.0", "--no-open"], { encoding:"utf8", env:{ ...process.env, OMPGUI_PASSWORD:"", OMP_WEB_PASSWORD:"", OMPGUI_HOSTNAME:undefined, OMP_WEB_HOSTNAME:undefined } });
+  assert.equal(result.status, 1);
+  assert.match(result.stderr, /Refusing to listen/);
+});

package/bin/ompgui.js

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+"use strict";
+const { getUnsupportedNodeVersionMessage, isNodeVersionSupported } = require("./node-version");
+if (!isNodeVersionSupported(process.versions.node)) { console.error(getUnsupportedNodeVersionMessage(process.versions.node)); process.exit(1); }
+const { spawn } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+const { parseLaunchOptions } = require("./ompgui-options");
+const { isPortAvailable } = require("./port-availability");
+const { wireChildProcessLifecycle } = require("./process-lifecycle");
+const pkgDir = path.join(__dirname, "..");
+const nextDir = path.join(pkgDir, ".next");
+let nextBin;
+try { nextBin = require.resolve("next/dist/bin/next", { paths:[pkgDir] }); } catch { try { nextBin = path.join(path.dirname(require.resolve("next/package.json", {paths:[pkgDir]})), "dist", "bin", "next"); } catch { nextBin = path.join(pkgDir,"node_modules/next/dist/bin/next"); } }
+const options = parseLaunchOptions();
+if (options.help || options.version) process.exit(0);
+const { port, hostname, password, openBrowser } = options;
+if (password) { process.env.OMPGUI_PASSWORD = password; process.env.OMP_WEB_PASSWORD = password; }
+const loopback = new Set(["127.0.0.1","localhost","::1","[::1]"]);
+if (!fs.existsSync(nextDir)) { console.error("Build artifacts not found. Please report this issue."); process.exit(1); }
+if (!loopback.has(hostname) && !(typeof password === "string" && password.length)) { console.error(`Refusing to listen on ${hostname} without OMPGUI_PASSWORD (or --password). Set a strong password or bind to 127.0.0.1.`); process.exit(1); }
+const url = `http://${hostname}:${port}`;
+function openBrowserWindow(target) { const cmd = process.platform === "win32" ? "cmd.exe" : process.platform === "darwin" ? "open" : process.platform === "linux" && (process.env.WSL_DISTRO_NAME || process.env.WSL_INTEROP) ? "wslview" : "xdg-open"; const args = process.platform === "win32" ? ["/c","start","",target] : [target]; try { const p=spawn(cmd,args,{stdio:"ignore",detached:true}); p.on("error",e=>console.warn(`Could not open browser automatically: ${e.message}`)); p.unref(); } catch(e) { console.warn(`Could not open browser automatically: ${e.message}`); } }
+async function main() {
+  if (!await isPortAvailable(port, hostname)) { console.log(`ompgui is already running on ${hostname}:${port}.`); if (openBrowser) openBrowserWindow(url); return; }
+  const env={...process.env, OMPGUI_PACKAGE_DIR:pkgDir, OMPGUI_LAUNCHER_PID:String(process.pid), OMPGUI_PORT:port, OMPGUI_HOSTNAME:hostname, OMP_WEB_PACKAGE_DIR:pkgDir, OMP_WEB_LAUNCHER_PID:String(process.pid), OMP_WEB_PORT:port, OMP_WEB_HOSTNAME:hostname};
+  const child=spawn(process.execPath,[nextBin,"start","-p",port,"-H",hostname],{cwd:pkgDir,stdio:["inherit","pipe","inherit"],env}); wireChildProcessLifecycle(child);
+  let opened=false; const ready=()=>{if(!openBrowser||opened)return; opened=true; openBrowserWindow(url);}; child.stdout.on("data",c=>{process.stdout.write(c);if(/ready|started|local:\s*http|listening/i.test(c.toString()))ready();});
+  if(openBrowser){const timer=setInterval(async()=>{if(opened)return clearInterval(timer);if(!await isPortAvailable(port,hostname)){clearInterval(timer);ready();}},250);setTimeout(()=>clearInterval(timer),15000);}
+}
+main().catch(e=>{console.error(`Could not check whether ${url} is available: ${e.message}`);process.exit(1);});

package/next.config.ts

@@ -83,6 +83,7 @@ const nextConfig = (phase: string): NextConfig => {
     },
     env: {
       NEXT_PUBLIC_APP_VERSION: version,
+      NEXT_PUBLIC_OMPGUI_VERSION: version,
       NEXT_PUBLIC_OMP_WEB_VERSION: version,
     },
   };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "ompgui",
-  "version": "0.4.0",
-  "description": "Web UI for the oh-my-pi (omp) coding agent",
-  "homepage": "https://github.com/dbc-hbin/ompweb#readme",
+  "version": "0.4.2",
+  "description": "Web UI & Browser GUI for the oh-my-pi (omp) coding agent",
+  "homepage": "https://github.com/dbc-hbin/ompgui#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/dbc-hbin/ompweb.git"
+    "url": "git+https://github.com/dbc-hbin/ompgui.git"
   },
   "bugs": {
-    "url": "https://github.com/dbc-hbin/ompweb/issues"
+    "url": "https://github.com/dbc-hbin/ompgui/issues"
   },
   "author": "dbc-hbin",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "node": ">=22.19.0"
   },
   "bin": {
-    "ompgui": "bin/omp-web.js",
+    "ompgui": "bin/ompgui.js",
     "ompweb": "bin/omp-web.js"
   },
   "files": [