@pushpalsdev/cli 1.0.4 → 1.0.5

package/dist/pushpals-cli.js

@@ -2,7 +2,7 @@
 // @bun
 
 // ../../scripts/pushpals-cli.ts
-import { chmodSync, cpSync, existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { appendFileSync, chmodSync, cpSync, existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { dirname, join as join2, resolve as resolve2 } from "path";
 import { createInterface } from "readline";
 
@@ -747,6 +747,7 @@ var LOCALBUDDY_TIMEOUT_MS = 4000;
 var SSE_RECONNECT_MS = 1500;
 var DEFAULT_RUNTIME_BOOT_TIMEOUT_MS = 90000;
 var DEFAULT_RUNTIME_BOOT_POLL_MS = 1000;
+var DEFAULT_SERVER_BOOT_TIMEOUT_MS = 20000;
 var GITHUB_OWNER = "PushPalsDev";
 var GITHUB_REPO = "pushpals";
 var GITHUB_API_URL = `https://api.github.com/repos/${GITHUB_OWNER}/${GITHUB_REPO}`;
@@ -756,6 +757,16 @@ var GITHUB_HEADERS = {
   "User-Agent": "pushpals-cli"
 };
 var stateVersion = 1;
+function logCliInvocation(argv) {
+  const startedAt = new Date().toISOString();
+  const cliVersion = String(process.env.PUSHPALS_CLI_PACKAGE_VERSION ?? "").trim() || "unknown";
+  const argsText = argv.length > 0 ? argv.join(" ") : "(none)";
+  console.log(`[pushpals] invocation=${startedAt}`);
+  console.log(`[pushpals] version=${cliVersion} runtime=bun@${Bun.version}`);
+  console.log(`[pushpals] platform=${process.platform}/${process.arch}`);
+  console.log(`[pushpals] cwd=${process.cwd()}`);
+  console.log(`[pushpals] args=${argsText}`);
+}
 function printUsage() {
   console.log("PushPals CLI");
   console.log("");
@@ -909,9 +920,16 @@ async function resolveRuntimeReleaseTag(explicitTag) {
   if (fromEnv)
     return fromEnv;
   const packageVersion = parseSemverFromPackageVersion(process.env.PUSHPALS_CLI_PACKAGE_VERSION);
-  if (packageVersion)
-    return `v${packageVersion}`;
-  return await fetchLatestReleaseTag();
+  try {
+    return await fetchLatestReleaseTag();
+  } catch (err) {
+    if (packageVersion) {
+      const fallbackTag = `v${packageVersion}`;
+      console.warn(`[pushpals] Could not resolve latest runtime tag; falling back to package version tag ${fallbackTag}: ${String(err)}`);
+      return fallbackTag;
+    }
+    throw err;
+  }
 }
 function writeTextFileIfMissing(pathValue, text) {
   if (existsSync2(pathValue))
@@ -940,7 +958,7 @@ async function downloadRuntimeAssetsFromSourceTag(runtimeRoot, tag) {
     throw new Error(`Failed to fetch runtime source tree for ${tag} (HTTP ${treeResponse.status})`);
   }
   const treePayload = await treeResponse.json();
-  const paths = (treePayload.tree ?? []).filter((entry) => entry.type === "blob" && typeof entry.path === "string").map((entry) => String(entry.path)).filter((pathValue) => pathValue === ".env.example" || pathValue.startsWith("configs/") || pathValue.startsWith("prompts/"));
+  const paths = (treePayload.tree ?? []).filter((entry) => entry.type === "blob" && typeof entry.path === "string").map((entry) => String(entry.path)).filter((pathValue) => pathValue === ".env.example" || pathValue.startsWith("configs/") || pathValue.startsWith("prompts/") || pathValue.startsWith("packages/protocol/src/schemas/"));
   if (paths.length === 0) {
     throw new Error(`Runtime source tree for ${tag} did not include prompts/config assets`);
   }
@@ -948,7 +966,7 @@ async function downloadRuntimeAssetsFromSourceTag(runtimeRoot, tag) {
   for (const pathValue of sorted) {
     const rawUrl = `https://raw.githubusercontent.com/${GITHUB_OWNER}/${GITHUB_REPO}/${encodeURIComponent(tag)}/${pathValue}`;
     const body = await fetchTextFromUrl(rawUrl, 20000);
-    const outPath = join2(runtimeRoot, pathValue);
+    const outPath = pathValue.startsWith("packages/protocol/src/schemas/") ? join2(runtimeRoot, "protocol", "schemas", pathValue.slice("packages/protocol/src/schemas/".length)) : join2(runtimeRoot, pathValue);
     mkdirSync(dirname(outPath), { recursive: true });
     writeFileSync(outPath, body, "utf8");
   }
@@ -956,10 +974,14 @@ async function downloadRuntimeAssetsFromSourceTag(runtimeRoot, tag) {
 async function ensureRuntimeAssets(runtimeRoot, runtimeTag) {
   const markerPath = join2(runtimeRoot, ".runtime-assets-tag");
   const currentTag = existsSync2(markerPath) ? readFileSync2(markerPath, "utf8").trim() : "";
-  const hasAssets = existsSync2(join2(runtimeRoot, ".env.example")) && existsSync2(join2(runtimeRoot, "configs", "default.toml")) && existsSync2(join2(runtimeRoot, "prompts"));
+  const protocolSchemasDir = join2(runtimeRoot, "protocol", "schemas");
+  const hasProtocolSchemas = existsSync2(join2(protocolSchemasDir, "envelope.schema.json")) && existsSync2(join2(protocolSchemasDir, "events.schema.json"));
+  const hasAssets = existsSync2(join2(runtimeRoot, ".env.example")) && existsSync2(join2(runtimeRoot, "configs", "default.toml")) && existsSync2(join2(runtimeRoot, "prompts")) && hasProtocolSchemas;
   if (!hasAssets || currentTag !== runtimeTag) {
-    const copied = copyBundledRuntimeAssets(runtimeRoot);
-    if (!copied) {
+    copyBundledRuntimeAssets(runtimeRoot);
+    const hasProtocolSchemasAfterCopy = existsSync2(join2(protocolSchemasDir, "envelope.schema.json")) && existsSync2(join2(protocolSchemasDir, "events.schema.json"));
+    const hasAssetsAfterCopy = existsSync2(join2(runtimeRoot, ".env.example")) && existsSync2(join2(runtimeRoot, "configs", "default.toml")) && existsSync2(join2(runtimeRoot, "prompts")) && hasProtocolSchemasAfterCopy;
+    if (!hasAssetsAfterCopy) {
       await downloadRuntimeAssetsFromSourceTag(runtimeRoot, runtimeTag);
     }
     writeFileSync(markerPath, `${runtimeTag}
@@ -980,6 +1002,19 @@ function runtimeBinaryFilename(serviceName, platformKey) {
   const extension = platformKey.startsWith("windows-") ? ".exe" : "";
   return `pushpals-runtime-${serviceToken}-${platformKey}${extension}`;
 }
+function timestampFileToken() {
+  return new Date().toISOString().replace(/[:.]/g, "-");
+}
+function readLogTail(logPath, maxLines = 40) {
+  if (!existsSync2(logPath))
+    return "";
+  const raw = readFileSync2(logPath, "utf8");
+  const lines = raw.split(/\r?\n/).map((line) => line.trimEnd()).filter((line) => line.length > 0);
+  if (lines.length === 0)
+    return "";
+  return lines.slice(-maxLines).join(`
+`);
+}
 async function downloadBinaryAsset(tag, assetName, outPath) {
   const url = `${GITHUB_RELEASE_URL}/${encodeURIComponent(tag)}/${assetName}`;
   const response = await fetchWithTimeout(url, { headers: GITHUB_HEADERS }, 60000);
@@ -1021,16 +1056,50 @@ async function ensureRuntimeBinaries(runtimeRoot, runtimeTag) {
   }
   return runtimeBinaries;
 }
-function spawnRuntimeService(name, command, cwd, env) {
+function spawnRuntimeService(name, command, cwd, env, logPath) {
+  writeFileSync(logPath, `[pushpals] service=${name} command=${command.join(" ")} cwd=${cwd}
+`, "utf8");
   const proc = Bun.spawn(command, {
     cwd,
     env,
-    stdout: "ignore",
-    stderr: "ignore"
+    stdout: "pipe",
+    stderr: "pipe"
   });
+  const pipeToLog = async (stream, channel) => {
+    if (!stream)
+      return;
+    const reader = stream.getReader();
+    const decoder = new TextDecoder;
+    let pending = "";
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      const chunk = decoder.decode(value, { stream: true });
+      if (!chunk)
+        continue;
+      pending += chunk;
+      const lines = pending.split(/\r?\n/);
+      pending = lines.pop() ?? "";
+      for (const line of lines) {
+        appendFileSync(logPath, `[${channel}] ${line}
+`, "utf8");
+      }
+    }
+    const rest = decoder.decode();
+    if (rest)
+      pending += rest;
+    if (pending.trim().length > 0) {
+      appendFileSync(logPath, `[${channel}] ${pending.trimEnd()}
+`, "utf8");
+    }
+  };
+  pipeToLog(proc.stdout, "stdout");
+  pipeToLog(proc.stderr, "stderr");
   const service = {
     name,
     proc,
+    logPath,
     exited: false,
     exitCode: null
   };
@@ -1105,24 +1174,61 @@ async function autoStartRuntimeServices(opts) {
     PUSHPALS_REPO_ROOT_OVERRIDE: opts.repoRoot,
     PUSHPALS_PROJECT_ROOT_OVERRIDE: opts.repoRoot,
     PUSHPALS_CONFIG_DIR_OVERRIDE: join2(runtimeRoot, "configs"),
-    PUSHPALS_PROMPTS_ROOT_OVERRIDE: runtimeRoot
+    PUSHPALS_PROMPTS_ROOT_OVERRIDE: runtimeRoot,
+    PUSHPALS_PROTOCOL_SCHEMAS_DIR: join2(runtimeRoot, "protocol", "schemas")
   };
   const services = [];
+  const runToken = timestampFileToken();
+  const logDir = join2(runtimeRoot, "logs", "bootstrap");
+  mkdirSync(logDir, { recursive: true });
+  const logPathFor = (name) => join2(logDir, `${runToken}-${name}.log`);
   const serverHealthy = await probeServer(opts.serverUrl);
   if (!serverHealthy) {
     console.log("[pushpals] Starting embedded server...");
-    services.push(spawnRuntimeService("server", [runtimeBinaries.server], opts.repoRoot, runtimeEnv));
+    const serverService = spawnRuntimeService("server", [runtimeBinaries.server], opts.repoRoot, runtimeEnv, logPathFor("server"));
+    services.push(serverService);
+    console.log(`[pushpals] server log: ${serverService.logPath}`);
+    const serverDeadline = Date.now() + DEFAULT_SERVER_BOOT_TIMEOUT_MS;
+    let serverIsReady = false;
+    while (Date.now() < serverDeadline) {
+      if (serverService.exited) {
+        const tail = readLogTail(serverService.logPath);
+        stopRuntimeServices(services);
+        throw new Error(`Embedded server exited during bootstrap (code=${serverService.exitCode ?? "unknown"}). ` + `See ${serverService.logPath}${tail ? `
+--- server log tail ---
+${tail}` : ""}`);
+      }
+      if (await probeServer(opts.serverUrl)) {
+        serverIsReady = true;
+        break;
+      }
+      await Bun.sleep(DEFAULT_RUNTIME_BOOT_POLL_MS);
+    }
+    if (!serverIsReady) {
+      const tail = readLogTail(serverService.logPath);
+      stopRuntimeServices(services);
+      throw new Error(`Embedded server did not become healthy within ${DEFAULT_SERVER_BOOT_TIMEOUT_MS}ms. ` + `See ${serverService.logPath}${tail ? `
+--- server log tail ---
+${tail}` : ""}`);
+    }
+    console.log("[pushpals] Embedded server is healthy.");
   } else {
     console.log("[pushpals] Server already healthy; skipping embedded server start.");
   }
   console.log("[pushpals] Starting embedded LocalBuddy...");
-  services.push(spawnRuntimeService("localbuddy", [runtimeBinaries.localbuddy], opts.repoRoot, runtimeEnv));
+  const localbuddyService = spawnRuntimeService("localbuddy", [runtimeBinaries.localbuddy], opts.repoRoot, runtimeEnv, logPathFor("localbuddy"));
+  services.push(localbuddyService);
+  console.log(`[pushpals] localbuddy log: ${localbuddyService.logPath}`);
   console.log("[pushpals] Starting embedded RemoteBuddy...");
-  services.push(spawnRuntimeService("remotebuddy", [runtimeBinaries.remotebuddy], opts.repoRoot, runtimeEnv));
+  const remotebuddyService = spawnRuntimeService("remotebuddy", [runtimeBinaries.remotebuddy], opts.repoRoot, runtimeEnv, logPathFor("remotebuddy"));
+  services.push(remotebuddyService);
+  console.log(`[pushpals] remotebuddy log: ${remotebuddyService.logPath}`);
   const scmHealthy = await probeSourceControlManager(opts.sourceControlManagerPort);
   if (!scmHealthy) {
     console.log("[pushpals] Starting embedded SourceControlManager...");
-    services.push(spawnRuntimeService("source_control_manager", [runtimeBinaries.sourceControlManager, "--skip-clean-check"], opts.repoRoot, runtimeEnv));
+    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 {
     console.log("[pushpals] SourceControlManager already healthy; skipping embedded start.");
   }
@@ -1133,11 +1239,19 @@ async function autoStartRuntimeServices(opts) {
       if (service.exited) {
         if (service.name === "source_control_manager") {
           console.warn(`[pushpals] Embedded ${service.name} exited during startup (code=${service.exitCode ?? "unknown"}); continuing without SCM.`);
+          const tail2 = readLogTail(service.logPath);
+          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 during startup (code=${service.exitCode ?? "unknown"})`);
+        throw new Error(`Embedded ${service.name} exited during startup (code=${service.exitCode ?? "unknown"}). ` + `See ${service.logPath}${tail ? `
+--- ${service.name} log tail ---
+${tail}` : ""}`);
       }
     }
     const health = await probeLocalBuddy(opts.localAgentUrl, opts.authToken);
@@ -1395,7 +1509,9 @@ async function openMonitoringHub(url) {
   return code === 0;
 }
 async function main() {
-  const parsed = parseArgs(process.argv.slice(2));
+  const argv = process.argv.slice(2);
+  logCliInvocation(argv);
+  const parsed = parseArgs(argv);
   if (!parsed)
     return;
   const config = loadPushPalsConfig();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushpalsdev/cli",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "PushPals terminal CLI for LocalBuddy -> RemoteBuddy orchestration",
   "license": "MIT",
   "repository": {