@pushpalsdev/cli 1.0.8 → 1.0.9

package/dist/pushpals-cli.js

@@ -2,8 +2,16 @@
 // @bun
 
 // ../../scripts/pushpals-cli.ts
-import { appendFileSync, chmodSync, cpSync, existsSync as existsSync3, mkdirSync, readFileSync as readFileSync3, writeFileSync } from "fs";
-import { dirname, join as join2, resolve as resolve3 } from "path";
+import {
+  appendFileSync,
+  chmodSync,
+  cpSync,
+  existsSync as existsSync3,
+  mkdirSync,
+  readFileSync as readFileSync3,
+  writeFileSync
+} from "fs";
+import { dirname, extname, join as join2, resolve as resolve3 } from "path";
 import { createInterface } from "readline";
 
 // ../shared/src/client_preflight.ts
@@ -1228,6 +1236,56 @@ function resolveBundledRuntimeAssetSource() {
   }
   return null;
 }
+function looksLikeMonitoringHubBuild(root) {
+  return existsSync3(join2(root, "index.html")) && existsSync3(join2(root, "_expo"));
+}
+function resolveBundledMonitoringHubRoot() {
+  const candidates = [
+    resolve3(import.meta.dir, "..", "monitor-ui"),
+    resolve3(import.meta.dir, "..", "packages", "cli", "monitor-ui")
+  ];
+  for (const candidate of candidates) {
+    if (looksLikeMonitoringHubBuild(candidate))
+      return candidate;
+  }
+  return null;
+}
+function resolveCliSourceCheckoutRoot() {
+  const candidates = [
+    resolve3(import.meta.dir, ".."),
+    resolve3(import.meta.dir, "..", ".."),
+    resolve3(import.meta.dir, "..", "..", "..")
+  ];
+  for (const candidate of candidates) {
+    if (existsSync3(join2(candidate, "package.json")) && existsSync3(join2(candidate, "apps", "client", "app.json")) && existsSync3(join2(candidate, "scripts", "sync-cli-monitor-ui.ts"))) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function exportBundledMonitoringHubFromSourceCheckout(sourceRoot) {
+  const exportScriptPath = join2(sourceRoot, "scripts", "sync-cli-monitor-ui.ts");
+  console.log("[pushpals] Packaged monitor UI missing; exporting the shared client monitor...");
+  const proc = Bun.spawnSync([process.execPath, exportScriptPath], {
+    cwd: sourceRoot,
+    stdout: "inherit",
+    stderr: "inherit",
+    env: process.env
+  });
+  if (proc.exitCode !== 0) {
+    throw new Error(`Failed to export packaged monitor UI from source checkout (exit ${proc.exitCode || 1})`);
+  }
+}
+async function ensureBundledMonitoringHubRoot() {
+  const existingRoot = resolveBundledMonitoringHubRoot();
+  if (existingRoot)
+    return existingRoot;
+  const sourceRoot = resolveCliSourceCheckoutRoot();
+  if (!sourceRoot)
+    return null;
+  exportBundledMonitoringHubFromSourceCheckout(sourceRoot);
+  return resolveBundledMonitoringHubRoot();
+}
 function repoLooksLikePushPalsSourceCheckout(repoRoot) {
   return existsSync3(join2(repoRoot, "configs", "default.toml")) || existsSync3(join2(repoRoot, "config", "default.toml"));
 }
@@ -1479,10 +1537,7 @@ async function resolveCommandPath(command, cwd, env) {
         stdout: "pipe",
         stderr: "ignore"
       });
-      const [stdout, exitCode] = await Promise.all([
-        new Response(proc.stdout).text(),
-        proc.exited
-      ]);
+      const [stdout, exitCode] = await Promise.all([new Response(proc.stdout).text(), proc.exited]);
       if (exitCode !== 0)
         continue;
       const resolved = stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
@@ -1882,6 +1937,91 @@ async function looksLikeMonitoringHub(url) {
     return false;
   }
 }
+function buildMonitoringHubRuntimeBootstrap(opts) {
+  return {
+    serverUrl: opts.serverUrl,
+    localAgentUrl: opts.localAgentUrl,
+    sessionId: opts.sessionId,
+    authToken: opts.authToken
+  };
+}
+function injectMonitoringHubBootstrap(html, bootstrap) {
+  const payload = jsonHtmlBootstrap(bootstrap);
+  const script = `<script>globalThis.__PUSHPALS_WEB_BOOTSTRAP__=${payload};</script>`;
+  if (html.includes("</head>")) {
+    return html.replace("</head>", `${script}</head>`);
+  }
+  return `${script}${html}`;
+}
+function monitoringHubContentType(pathValue) {
+  switch (extname(pathValue).toLowerCase()) {
+    case ".html":
+      return "text/html; charset=utf-8";
+    case ".js":
+      return "application/javascript; charset=utf-8";
+    case ".css":
+      return "text/css; charset=utf-8";
+    case ".json":
+      return "application/json; charset=utf-8";
+    case ".svg":
+      return "image/svg+xml";
+    case ".png":
+      return "image/png";
+    case ".jpg":
+    case ".jpeg":
+      return "image/jpeg";
+    case ".ico":
+      return "image/x-icon";
+    case ".woff2":
+      return "font/woff2";
+    case ".ttf":
+      return "font/ttf";
+    case ".map":
+      return "application/json; charset=utf-8";
+    default:
+      return "application/octet-stream";
+  }
+}
+function resolveMonitoringHubAssetPath(assetRoot, pathname) {
+  const root = resolve3(assetRoot);
+  const rootPrefix = `${root}${root.endsWith("\\") || root.endsWith("/") ? "" : process.platform === "win32" ? "\\" : "/"}`;
+  const decodedPath = decodeURIComponent(pathname);
+  const trimmedPath = decodedPath === "/" ? "/index.html" : decodedPath;
+  const relativePath = trimmedPath.replace(/^\/+/, "");
+  const candidatePath = resolve3(root, relativePath);
+  if (candidatePath !== root && !candidatePath.startsWith(rootPrefix))
+    return null;
+  if (existsSync3(candidatePath))
+    return candidatePath;
+  if (!extname(relativePath)) {
+    const nestedIndexPath = resolve3(root, relativePath, "index.html");
+    if ((nestedIndexPath === root || nestedIndexPath.startsWith(rootPrefix)) && existsSync3(nestedIndexPath)) {
+      return nestedIndexPath;
+    }
+    return join2(root, "index.html");
+  }
+  return null;
+}
+async function serveBundledMonitoringHub(assetRoot, pathname, bootstrap) {
+  const assetPath = resolveMonitoringHubAssetPath(assetRoot, pathname);
+  if (!assetPath || !existsSync3(assetPath))
+    return null;
+  if (assetPath.endsWith("index.html")) {
+    const html = injectMonitoringHubBootstrap(readFileSync3(assetPath, "utf8"), bootstrap);
+    return new Response(html, {
+      headers: {
+        "content-type": "text/html; charset=utf-8",
+        "cache-control": "no-store"
+      }
+    });
+  }
+  return new Response(Bun.file(assetPath), {
+    headers: {
+      "content-type": monitoringHubContentType(assetPath),
+      "cache-control": "no-store"
+    }
+  });
+}
 function buildEmbeddedMonitoringHubHtml(opts) {
   const bootstrap = jsonHtmlBootstrap(opts);
   return `<!doctype html>
@@ -2029,10 +2169,16 @@ async function proxyMonitoringHubRequest(serverUrl, authToken, pathValue) {
   });
 }
 async function startEmbeddedMonitoringHub(opts) {
-  const html = buildEmbeddedMonitoringHubHtml({
+  const monitoringHubAssetRoot = opts.assetRoot === undefined ? await ensureBundledMonitoringHubRoot() : opts.assetRoot;
+  if (!monitoringHubAssetRoot || !looksLikeMonitoringHubBuild(monitoringHubAssetRoot)) {
+    console.error("[pushpals] Unified monitoring hub assets are unavailable; build or export the packaged client monitor first.");
+    return null;
+  }
+  const bootstrap = buildMonitoringHubRuntimeBootstrap({
     serverUrl: opts.serverUrl,
     localAgentUrl: opts.localAgentUrl,
-    sessionId: opts.sessionId
+    sessionId: opts.sessionId,
+    authToken: opts.authToken
   });
   const candidatePorts = Array.from({ length: MONITOR_SCAN_PORTS }, (_, index) => opts.preferredPort + index).concat(0);
   for (const port of candidatePorts) {
@@ -2042,16 +2188,13 @@ async function startEmbeddedMonitoringHub(opts) {
         idleTimeout: 30,
         fetch: async (req) => {
           const url = new URL(req.url);
-          if (url.pathname === "/") {
-            return new Response(html, {
-              headers: {
-                "content-type": "text/html; charset=utf-8",
-                "cache-control": "no-store"
-              }
-            });
-          }
           if (url.pathname === "/healthz") {
-            return Response.json({ ok: true, port, serverUrl: opts.serverUrl, sessionId: opts.sessionId });
+            return Response.json({
+              ok: true,
+              port,
+              serverUrl: opts.serverUrl,
+              sessionId: opts.sessionId
+            });
           }
           if (url.pathname === "/api/status") {
             return await proxyMonitoringHubRequest(opts.serverUrl, opts.authToken, "/system/status");
@@ -2065,6 +2208,9 @@ async function startEmbeddedMonitoringHub(opts) {
           if (url.pathname === "/api/completions") {
             return await proxyMonitoringHubRequest(opts.serverUrl, opts.authToken, "/completions?status=all&limit=20");
           }
+          const bundledResponse = await serveBundledMonitoringHub(monitoringHubAssetRoot, url.pathname, bootstrap);
+          if (bundledResponse)
+            return bundledResponse;
           return new Response("Not found", { status: 404 });
         }
       });
@@ -2286,6 +2432,10 @@ async function openMonitoringHub(url) {
   const code = await proc.exited;
   return code === 0;
 }
+function isCliExitCommand(text) {
+  const normalized = String(text ?? "").trim().toLowerCase();
+  return normalized === "/exit" || normalized === "/quit" || normalized === "exit" || normalized === "quit";
+}
 async function main() {
   const argv = process.argv.slice(2);
   logCliInvocation(argv);
@@ -2410,7 +2560,7 @@ async function main() {
   console.log(`sessionId=${localBuddySessionId}`);
   console.log(`repoRoot=${repoRoot}`);
   console.log(`cliStateFile=${statePath}`);
-  console.log("[pushpals] Type a message and press Enter. Use /exit to quit.");
+  console.log("[pushpals] Type a message and press Enter. Use /exit or exit to quit.");
   const streamAbort = new AbortController;
   let rl = null;
   const printIncoming = (line) => {
@@ -2431,12 +2581,16 @@ ${line}
     if (shuttingDown)
       return;
     shuttingDown = true;
+    console.log("[pushpals] Shutting down CLI session...");
     streamAbort.abort();
     if (rl)
       rl.close();
     try {
       monitoringHub?.stop();
     } catch {}
+    if (autoStartedServices.length > 0) {
+      console.log("[pushpals] Stopping embedded runtime services...");
+    }
     stopAutoStartedServices();
   };
   process.once("SIGINT", requestStop);
@@ -2455,7 +2609,7 @@ ${line}
       rl.prompt();
       continue;
     }
-    if (text === "/exit" || text === "/quit") {
+    if (isCliExitCommand(text)) {
       requestStop();
       break;
     }
@@ -2503,8 +2657,11 @@ export {
   startEmbeddedMonitoringHub,
   resolveCommandPath,
   resolveBundledRuntimeAssetSource,
+  resolveBundledMonitoringHubRoot,
   prepareCliRuntime,
   normalizeChildProcessEnv,
+  isCliExitCommand,
+  injectMonitoringHubBootstrap,
   buildServiceStopCommand,
   buildOpenMonitoringHubCommand,
   buildEmbeddedRuntimeEnv,