@pushpalsdev/cli 1.0.7 → 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"));
 }
@@ -1425,9 +1483,10 @@ function runtimeBinaryFilename(serviceName, platformKey) {
   return `pushpals-runtime-${serviceToken}-${platformKey}${extension}`;
 }
 function buildEmbeddedRuntimeEnv(baseEnv, opts) {
+  const env = normalizeChildProcessEnv(baseEnv);
   const useRuntimeConfig = opts.useRuntimeConfig !== false;
   return {
-    ...baseEnv,
+    ...env,
     PUSHPALS_REPO_ROOT_OVERRIDE: opts.repoRoot,
     PUSHPALS_PROJECT_ROOT_OVERRIDE: opts.repoRoot,
     ...useRuntimeConfig ? {
@@ -1436,9 +1495,58 @@ function buildEmbeddedRuntimeEnv(baseEnv, opts) {
     } : {
       PUSHPALS_PROMPTS_ROOT_OVERRIDE: opts.repoRoot
     },
-    PUSHPALS_PROTOCOL_SCHEMAS_DIR: join2(opts.runtimeRoot, "protocol", "schemas")
+    PUSHPALS_PROTOCOL_SCHEMAS_DIR: join2(opts.runtimeRoot, "protocol", "schemas"),
+    ...typeof env.PUSHPALS_GIT_BIN === "string" && env.PUSHPALS_GIT_BIN.trim() ? { PUSHPALS_GIT_BIN: env.PUSHPALS_GIT_BIN.trim() } : {}
   };
 }
+function normalizeChildProcessEnv(baseEnv, platform = process.platform) {
+  const env = {};
+  for (const [key, value] of Object.entries(baseEnv)) {
+    if (typeof value === "string")
+      env[key] = value;
+  }
+  if (platform === "win32") {
+    const resolvedPath = String(env.Path ?? env.PATH ?? process.env.Path ?? process.env.PATH ?? "").trim();
+    if (resolvedPath) {
+      env.Path = resolvedPath;
+      env.PATH = resolvedPath;
+    }
+    const systemRoot = String(env.SystemRoot ?? env.SYSTEMROOT ?? process.env.SystemRoot ?? process.env.SYSTEMROOT ?? "").trim();
+    if (systemRoot) {
+      env.SystemRoot = systemRoot;
+      env.SYSTEMROOT = systemRoot;
+    }
+    const comSpec = String(env.ComSpec ?? env.COMSPEC ?? process.env.ComSpec ?? process.env.COMSPEC ?? "").trim();
+    if (comSpec) {
+      env.ComSpec = comSpec;
+      env.COMSPEC = comSpec;
+    }
+  }
+  return env;
+}
+async function resolveCommandPath(command, cwd, env) {
+  const lookupCommands = process.platform === "win32" ? [
+    ["where.exe", command],
+    ["where", command]
+  ] : [["which", command]];
+  for (const lookup of lookupCommands) {
+    try {
+      const proc = Bun.spawn(lookup, {
+        cwd,
+        env,
+        stdout: "pipe",
+        stderr: "ignore"
+      });
+      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);
+      if (resolved)
+        return resolved;
+    } catch {}
+  }
+  return null;
+}
 function timestampFileToken() {
   return new Date().toISOString().replace(/[:.]/g, "-");
 }
@@ -1546,11 +1654,18 @@ function spawnRuntimeService(name, command, cwd, env, logPath) {
   });
   return service;
 }
+function buildServiceStopCommand(pid, platform = process.platform) {
+  if (platform === "win32" && typeof pid === "number" && pid > 0) {
+    return ["taskkill", "/PID", String(pid), "/T", "/F"];
+  }
+  return null;
+}
 function stopRuntimeServices(services) {
   for (const service of services) {
     try {
-      if (process.platform === "win32" && typeof service.proc.pid === "number" && service.proc.pid > 0) {
-        Bun.spawnSync(["taskkill", "/PID", String(service.proc.pid), "/T", "/F"], {
+      const stopCommand = buildServiceStopCommand(service.proc.pid, process.platform);
+      if (stopCommand) {
+        Bun.spawnSync(stopCommand, {
           stdin: "ignore",
           stdout: "ignore",
           stderr: "ignore"
@@ -1561,6 +1676,24 @@ function stopRuntimeServices(services) {
     } catch {}
   }
 }
+function isOptionalEmbeddedService(name) {
+  return name === "source_control_manager";
+}
+async function canSpawnCommand(command, cwd, env) {
+  try {
+    const proc = Bun.spawn(command, {
+      cwd,
+      env,
+      stdin: "ignore",
+      stdout: "ignore",
+      stderr: "ignore"
+    });
+    const exitCode = await proc.exited;
+    return exitCode === 0;
+  } catch {
+    return false;
+  }
+}
 async function repoHasRemote(repoRoot, remote) {
   const normalizedRemote = remote.trim();
   if (!normalizedRemote)
@@ -1630,6 +1763,10 @@ async function autoStartRuntimeServices(opts) {
     runtimeRoot,
     useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime
   });
+  const resolvedGitBinary = await resolveCommandPath("git", opts.repoRoot, normalizeChildProcessEnv(process.env));
+  if (resolvedGitBinary) {
+    runtimeEnv.PUSHPALS_GIT_BIN = resolvedGitBinary;
+  }
   const services = [];
   const runToken = timestampFileToken();
   const logDir = join2(runtimeRoot, "logs", "bootstrap");
@@ -1678,13 +1815,24 @@ ${tail}` : ""}`);
   console.log(`[pushpals] remotebuddy log: ${remotebuddyService.logPath}`);
   const scmHealthy = await probeSourceControlManager(opts.sourceControlManagerPort);
   const scmRemoteAvailable = await repoHasRemote(opts.repoRoot, opts.sourceControlManagerRemote);
+  const gitProbeCommand = typeof runtimeEnv.PUSHPALS_GIT_BIN === "string" && runtimeEnv.PUSHPALS_GIT_BIN.trim() ? [runtimeEnv.PUSHPALS_GIT_BIN.trim(), "--version"] : ["git", "--version"];
+  const gitAvailableForScm = await canSpawnCommand(gitProbeCommand, opts.repoRoot, runtimeEnv);
   if (!scmHealthy && scmRemoteAvailable) {
-    console.log("[pushpals] Starting embedded SourceControlManager...");
-    const sourceControlManagerService = spawnRuntimeService("source_control_manager", [runtimeBinaries.sourceControlManager, "--skip-clean-check"], opts.repoRoot, runtimeEnv, logPathFor("source_control_manager"));
-    services.push(sourceControlManagerService);
-    console.log(`[pushpals] source_control_manager log: ${sourceControlManagerService.logPath}`);
+    if (!gitAvailableForScm) {
+      console.warn("[pushpals] Git is not available to embedded SourceControlManager; skipping SCM startup.");
+    } else {
+      if (runtimeEnv.PUSHPALS_GIT_BIN) {
+        console.log(`[pushpals] Embedded SourceControlManager git=${runtimeEnv.PUSHPALS_GIT_BIN}`);
+      }
+      console.log("[pushpals] Starting embedded SourceControlManager...");
+      const sourceControlManagerService = spawnRuntimeService("source_control_manager", [runtimeBinaries.sourceControlManager, "--skip-clean-check"], opts.repoRoot, runtimeEnv, logPathFor("source_control_manager"));
+      services.push(sourceControlManagerService);
+      console.log(`[pushpals] source_control_manager log: ${sourceControlManagerService.logPath}`);
+    }
   } else if (!scmRemoteAvailable) {
     console.log(`[pushpals] Repo has no git remote "${opts.sourceControlManagerRemote}"; skipping embedded SourceControlManager.`);
+  } else if (!gitAvailableForScm) {
+    console.warn("[pushpals] Git is not available to embedded SourceControlManager; skipping SCM startup.");
   } else {
     console.log("[pushpals] SourceControlManager already healthy; skipping embedded start.");
   }
@@ -1693,7 +1841,7 @@ ${tail}` : ""}`);
     for (let i = services.length - 1;i >= 0; i--) {
       const service = services[i];
       if (service.exited) {
-        if (service.name === "source_control_manager") {
+        if (isOptionalEmbeddedService(service.name)) {
           console.warn(`[pushpals] Embedded ${service.name} exited during startup (code=${service.exitCode ?? "unknown"}); continuing without SCM.`);
           const tail2 = readLogTail(service.logPath);
           if (tail2) {
@@ -1714,9 +1862,20 @@ ${tail}` : ""}`);
     if (health?.ok) {
       const stabilityDeadline = Date.now() + DEFAULT_SERVICE_STABILITY_GRACE_MS;
       while (Date.now() < stabilityDeadline) {
-        for (const service of services) {
+        for (let i = services.length - 1;i >= 0; i--) {
+          const service = services[i];
           if (!service.exited)
             continue;
+          if (isOptionalEmbeddedService(service.name)) {
+            const tail2 = readLogTail(service.logPath);
+            console.warn(`[pushpals] Embedded ${service.name} exited immediately after bootstrap (code=${service.exitCode ?? "unknown"}); continuing without SCM.`);
+            if (tail2) {
+              console.warn(`[pushpals] ${service.name} log tail:
+${tail2}`);
+            }
+            services.splice(i, 1);
+            continue;
+          }
           const tail = readLogTail(service.logPath);
           stopRuntimeServices(services);
           throw new Error(`Embedded ${service.name} exited immediately after bootstrap (code=${service.exitCode ?? "unknown"}). ` + `See ${service.logPath}${tail ? `
@@ -1778,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>
@@ -1925,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) {
@@ -1938,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");
@@ -1961,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 });
         }
       });
@@ -2163,15 +2413,17 @@ async function runSessionStream(serverUrl, sessionId, authToken, print, signal)
     }
   }
 }
-async function openMonitoringHub(url) {
-  let cmd = null;
-  if (process.platform === "win32") {
-    cmd = ["cmd", "/c", "start", "", url];
-  } else if (process.platform === "darwin") {
-    cmd = ["open", url];
-  } else {
-    cmd = ["xdg-open", url];
+function buildOpenMonitoringHubCommand(url, platform = process.platform) {
+  if (platform === "win32") {
+    return ["cmd", "/c", "start", "", url];
   }
+  if (platform === "darwin") {
+    return ["open", url];
+  }
+  return ["xdg-open", url];
+}
+async function openMonitoringHub(url) {
+  const cmd = buildOpenMonitoringHubCommand(url, process.platform);
   const proc = Bun.spawn(cmd, {
     stdin: "ignore",
     stdout: "ignore",
@@ -2180,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);
@@ -2304,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) => {
@@ -2325,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);
@@ -2349,7 +2609,7 @@ ${line}
       rl.prompt();
       continue;
     }
-    if (text === "/exit" || text === "/quit") {
+    if (isCliExitCommand(text)) {
       requestStop();
       break;
     }
@@ -2395,8 +2655,15 @@ if (import.meta.main) {
 }
 export {
   startEmbeddedMonitoringHub,
+  resolveCommandPath,
   resolveBundledRuntimeAssetSource,
+  resolveBundledMonitoringHubRoot,
   prepareCliRuntime,
+  normalizeChildProcessEnv,
+  isCliExitCommand,
+  injectMonitoringHubBootstrap,
+  buildServiceStopCommand,
+  buildOpenMonitoringHubCommand,
   buildEmbeddedRuntimeEnv,
   buildEmbeddedMonitoringHubHtml
 };