@pushpalsdev/cli 1.0.10 → 1.0.12

package/dist/pushpals-cli.js

@@ -7,11 +7,13 @@ import {
   chmodSync,
   cpSync,
   existsSync as existsSync4,
+  lstatSync,
   mkdirSync,
+  readdirSync,
   readFileSync as readFileSync4,
   writeFileSync
 } from "fs";
-import { dirname, extname, join as join2, resolve as resolve4 } from "path";
+import { basename, delimiter, dirname, extname, join as join2, resolve as resolve4 } from "path";
 import { createInterface } from "readline";
 
 // ../shared/src/client_preflight.ts
@@ -1104,6 +1106,17 @@ function formatClientRuntimePreflightLines(result, prefix) {
   return lines;
 }
 
+// ../shared/src/communication.ts
+function stripPresenceSourcePrefix(value) {
+  return value.replace(/^(agent|client)(?:[\s:./_-]+)+/i, "");
+}
+function normalizePresenceClientLabel(value) {
+  return stripPresenceSourcePrefix(String(value ?? "")).replace(/\s+/g, " ").trim();
+}
+function normalizePresenceLookupToken(value) {
+  return normalizePresenceClientLabel(value).toLowerCase().replace(/[^a-z0-9]+/g, "");
+}
+
 // ../shared/src/repo.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3, statSync } from "fs";
 import { resolve as resolve3 } from "path";
@@ -1144,6 +1157,21 @@ function resolveGitStateFilePath(repoRoot, fileName) {
   return resolve3(gitMetadataDir, normalizedFileName);
 }
 
+// ../shared/src/session_event_visibility.ts
+var HEARTBEAT_STATUS_RE = /\bheartbeat\b/i;
+function isHeartbeatStatusSessionEvent(event) {
+  const type = String(event?.type ?? "").trim().toLowerCase();
+  if (type !== "status")
+    return false;
+  const payload = event?.payload ?? {};
+  const detail = typeof payload.detail === "string" ? payload.detail.trim() : "";
+  const message = typeof payload.message === "string" ? payload.message.trim() : "";
+  return HEARTBEAT_STATUS_RE.test(detail) || HEARTBEAT_STATUS_RE.test(message);
+}
+function shouldDisplayInteractiveSessionEvent(event) {
+  return !isHeartbeatStatusSessionEvent(event);
+}
+
 // ../../scripts/pushpals-cli.ts
 var DEFAULT_MONITOR_PORT = 8081;
 var MONITOR_SCAN_PORTS = 32;
@@ -1163,6 +1191,7 @@ var GITHUB_HEADERS = {
   Accept: "application/vnd.github+json",
   "User-Agent": "pushpals-cli"
 };
+var ASK_REMOTE_BUDDY_COMMAND = "/ask_remote_buddy";
 var stateVersion = 1;
 var cliTimestampedConsoleInstalled = false;
 function formatTimestampedCliLine(line, at = new Date) {
@@ -1172,6 +1201,21 @@ function formatTimestampedCliLine(line, at = new Date) {
   }
   return `[${at.toISOString()}]${text}`;
 }
+function normalizeCliInteractiveMessage(input) {
+  const trimmed = String(input ?? "").trim();
+  const command = ASK_REMOTE_BUDDY_COMMAND.toLowerCase();
+  if (!trimmed.toLowerCase().startsWith(command)) {
+    return { text: trimmed };
+  }
+  const rest = trimmed.slice(command.length).replace(/^[:\-]\s*/, "").trim();
+  if (!rest) {
+    return {
+      text: "",
+      usageMessage: "Usage: /ask_remote_buddy <request>. Example: /ask_remote_buddy fix the failing job status in the dashboard."
+    };
+  }
+  return { text: rest };
+}
 function installTimestampedCliConsole() {
   if (cliTimestampedConsoleInstalled)
     return;
@@ -1205,12 +1249,12 @@ function printUsage() {
   console.log("");
   console.log("Options:");
   console.log("  --server-url <url>     Override PushPals server URL");
-  console.log("  --local-agent-url <url> Override LocalBuddy URL");
+  console.log("  --local-agent-url <url> Override LocalBuddy URL for monitoring/runtime state");
   console.log("  --session-id <id>      Override session ID");
   console.log("  --hub-url <url>        Override monitoring hub URL");
   console.log("  --runtime-root <path>  Override embedded runtime directory for auto-start");
   console.log("  --runtime-tag <tag>    Override runtime release tag (e.g. v1.0.2)");
-  console.log("  --no-auto-start        Disable runtime auto-start when LocalBuddy is down");
+  console.log("  --no-auto-start        Disable runtime auto-start when the server is down");
   console.log("  --no-stream            Disable live session event stream");
   console.log("  --runtime-only         Start the local runtime and wait for shutdown without opening the interactive chat");
   console.log("  -h, --help             Show this help");
@@ -1223,8 +1267,8 @@ function printUsage() {
   console.log("");
   console.log("Notes:");
   console.log("  - Must be run from inside a git repository.");
-  console.log("  - Auto-start can bootstrap server/localbuddy/remotebuddy/source_control_manager.");
-  console.log("  - LocalBuddy must be attached to the same repo root.");
+  console.log("  - Auto-start can bootstrap server/remotebuddy/source_control_manager and LocalBuddy when runtime config enables it.");
+  console.log("  - Interactive CLI talks directly to server sessions; LocalBuddy is optional.");
 }
 function parseArgs(argv) {
   const options = { noAutoStart: false, noStream: false, runtimeOnly: false };
@@ -1311,12 +1355,6 @@ function parsePositiveInt(value, fallback) {
     return fallback;
   return parsed;
 }
-function normalizePath(value) {
-  const normalized = resolve4(value).replace(/\\/g, "/").replace(/\/+$/, "");
-  if (process.platform === "win32")
-    return normalized.toLowerCase();
-  return normalized;
-}
 function jsonHtmlBootstrap(value) {
   return JSON.stringify(value).replace(/</g, "\\u003c");
 }
@@ -1374,6 +1412,42 @@ function resolveBundledRuntimeAssetSource() {
 function looksLikeMonitoringHubBuild(root) {
   return existsSync4(join2(root, "index.html")) && existsSync4(join2(root, "_expo"));
 }
+function latestPathMtimeMs(pathValue) {
+  if (!existsSync4(pathValue))
+    return 0;
+  const stat = lstatSync(pathValue);
+  let latest = stat.mtimeMs;
+  if (!stat.isDirectory())
+    return latest;
+  for (const entry of readdirSync(pathValue)) {
+    latest = Math.max(latest, latestPathMtimeMs(join2(pathValue, entry)));
+  }
+  return latest;
+}
+function bundledMonitoringHubSourceWatchPaths(sourceRoot) {
+  return [
+    join2(sourceRoot, "apps", "client", "app"),
+    join2(sourceRoot, "apps", "client", "assets"),
+    join2(sourceRoot, "apps", "client", "components"),
+    join2(sourceRoot, "apps", "client", "constants"),
+    join2(sourceRoot, "apps", "client", "hooks"),
+    join2(sourceRoot, "apps", "client", "scripts"),
+    join2(sourceRoot, "apps", "client", "src"),
+    join2(sourceRoot, "apps", "client", "app.json"),
+    join2(sourceRoot, "apps", "client", "package.json"),
+    join2(sourceRoot, "packages", "shared", "src"),
+    join2(sourceRoot, "scripts", "sync-cli-monitor-ui.ts")
+  ];
+}
+function bundledMonitoringHubNeedsRefresh(existingRoot, sourceRoot) {
+  if (!looksLikeMonitoringHubBuild(existingRoot))
+    return true;
+  const bundleMtimeMs = latestPathMtimeMs(existingRoot);
+  if (bundleMtimeMs <= 0)
+    return true;
+  const sourceMtimeMs = bundledMonitoringHubSourceWatchPaths(sourceRoot).reduce((latest, pathValue) => Math.max(latest, latestPathMtimeMs(pathValue)), 0);
+  return sourceMtimeMs > bundleMtimeMs;
+}
 function resolveBundledMonitoringHubRoot() {
   const candidates = [
     resolve4(import.meta.dir, "..", "monitor-ui"),
@@ -1413,11 +1487,15 @@ function exportBundledMonitoringHubFromSourceCheckout(sourceRoot) {
 }
 async function ensureBundledMonitoringHubRoot() {
   const existingRoot = resolveBundledMonitoringHubRoot();
-  if (existingRoot)
-    return existingRoot;
   const sourceRoot = resolveCliSourceCheckoutRoot();
   if (!sourceRoot)
-    return null;
+    return existingRoot;
+  if (existingRoot && !bundledMonitoringHubNeedsRefresh(existingRoot, sourceRoot)) {
+    return existingRoot;
+  }
+  if (existingRoot) {
+    console.log("[pushpals] Packaged monitor UI is stale; refreshing the exported client monitor...");
+  }
   exportBundledMonitoringHubFromSourceCheckout(sourceRoot);
   return resolveBundledMonitoringHubRoot();
 }
@@ -1637,6 +1715,7 @@ function buildEmbeddedRuntimeEnv(baseEnv, opts) {
       PUSHPALS_PROMPTS_ROOT_OVERRIDE: opts.repoRoot
     },
     PUSHPALS_PROTOCOL_SCHEMAS_DIR: join2(opts.runtimeRoot, "protocol", "schemas"),
+    ...typeof opts.sessionId === "string" && opts.sessionId.trim() ? { PUSHPALS_SESSION_ID: opts.sessionId.trim() } : {},
     ...typeof env.PUSHPALS_GIT_BIN === "string" && env.PUSHPALS_GIT_BIN.trim() ? { PUSHPALS_GIT_BIN: env.PUSHPALS_GIT_BIN.trim() } : {}
   };
 }
@@ -1827,6 +1906,34 @@ function stopRuntimeServices(services) {
     } catch {}
   }
 }
+function prependExecutableDirToPath(env, executablePath, platform = process.platform) {
+  const resolvedPath = String(executablePath ?? "").trim();
+  if (!resolvedPath)
+    return env;
+  if (!resolvedPath.includes("/") && !resolvedPath.includes("\\")) {
+    return env;
+  }
+  const executableDir = dirname(resolvedPath);
+  const existingPath = platform === "win32" ? String(env.Path ?? env.PATH ?? "") : String(env.PATH ?? "");
+  const pathEntries = existingPath.split(delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+  const hasDir = pathEntries.some((entry) => entry.toLowerCase() === executableDir.toLowerCase());
+  const nextPath = hasDir ? existingPath : [executableDir, ...pathEntries].join(delimiter);
+  if (platform === "win32") {
+    env.Path = nextPath;
+    env.PATH = nextPath;
+  } else {
+    env.PATH = nextPath;
+  }
+  return env;
+}
+function applyResolvedGitBinaryToRuntimeEnv(env, resolvedGitBinary, platform = process.platform) {
+  const resolvedPath = String(resolvedGitBinary ?? "").trim();
+  if (!resolvedPath)
+    return env;
+  prependExecutableDirToPath(env, resolvedPath, platform);
+  env.PUSHPALS_GIT_BIN = basename(resolvedPath);
+  return env;
+}
 function isOptionalEmbeddedService(name) {
   return name === "source_control_manager";
 }
@@ -1860,6 +1967,111 @@ async function probeServer(serverUrl) {
     return false;
   }
 }
+function normalizeRepoPathForComparison(repoPath) {
+  const normalized = resolve4(String(repoPath ?? "")).replace(/\\/g, "/").replace(/\/+$/, "");
+  return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+}
+async function fetchServerRepoRoot(serverUrl) {
+  const response = await fetchWithTimeout(`${serverUrl}/system/status`, {}, 1e4);
+  if (!response.ok) {
+    throw new Error(`status probe failed with HTTP ${response.status}`);
+  }
+  const payload = await response.json().catch(() => ({}));
+  const repoRoot = payload?.repo && typeof payload.repo.root === "string" ? payload.repo.root.trim() : "";
+  if (!repoRoot) {
+    throw new Error("server did not report repo.root in /system/status");
+  }
+  return repoRoot;
+}
+async function ensureServerRepoAffinity(serverUrl, currentRepoRoot) {
+  const serverRepoRoot = await fetchServerRepoRoot(serverUrl);
+  if (normalizeRepoPathForComparison(serverRepoRoot) === normalizeRepoPathForComparison(currentRepoRoot)) {
+    return;
+  }
+  throw new Error(`repo mismatch: currentRepo=${currentRepoRoot} serverRepo=${serverRepoRoot}. Stop the existing runtime or switch to the matching repo.`);
+}
+function isRemoteBuddyClientRow(row) {
+  const clientId = normalizePresenceLookupToken(row.clientId);
+  const label = normalizePresenceLookupToken(row.label);
+  return clientId.includes("remotebuddy") || label.includes("remotebuddy");
+}
+function extractRemoteBuddySessionConsumerHealth(statusPayload, sessionId) {
+  const rows = Array.isArray(statusPayload?.clients?.items) ? statusPayload.clients?.items ?? [] : [];
+  const sessionRows = rows.filter((row) => {
+    if (!row || typeof row !== "object" || Array.isArray(row))
+      return false;
+    return String(row.sessionId ?? "").trim() === sessionId;
+  });
+  const remotebuddyRows = sessionRows.filter(isRemoteBuddyClientRow);
+  const connectedRow = remotebuddyRows.find((row) => String(row.status ?? "").trim().toLowerCase() === "connected");
+  if (connectedRow) {
+    return {
+      ok: true,
+      detail: `RemoteBuddy session consumer connected (${String(connectedRow.clientId ?? "").trim()})`,
+      clientId: String(connectedRow.clientId ?? "").trim() || undefined,
+      sessionId
+    };
+  }
+  const anyRemoteBuddyRows = rows.filter((row) => {
+    if (!row || typeof row !== "object" || Array.isArray(row))
+      return false;
+    return isRemoteBuddyClientRow(row);
+  });
+  const connectedOtherSession = anyRemoteBuddyRows.find((row) => {
+    const rowSessionId = String(row.sessionId ?? "").trim();
+    if (!rowSessionId || rowSessionId === sessionId)
+      return false;
+    return String(row.status ?? "").trim().toLowerCase() === "connected";
+  });
+  if (connectedOtherSession) {
+    const otherSessionId = String(connectedOtherSession.sessionId ?? "").trim();
+    const otherClientId = String(connectedOtherSession.clientId ?? "").trim();
+    return {
+      ok: false,
+      detail: `RemoteBuddy is connected to session ${otherSessionId || "unknown"} ` + `(${otherClientId || "unknown client"}), not ${sessionId}`,
+      clientId: otherClientId || undefined,
+      sessionId: otherSessionId || undefined
+    };
+  }
+  if (remotebuddyRows.length > 0) {
+    return {
+      ok: false,
+      detail: `RemoteBuddy session consumer exists for ${sessionId} but is not connected`,
+      clientId: String(remotebuddyRows[0]?.clientId ?? "").trim() || undefined,
+      sessionId
+    };
+  }
+  if (anyRemoteBuddyRows.length > 0) {
+    const knownSessions = [...new Set(anyRemoteBuddyRows.map((row) => String(row.sessionId ?? "").trim()))].filter(Boolean).sort();
+    const suffix = knownSessions.length > 0 ? ` Known RemoteBuddy sessions: ${knownSessions.join(", ")}.` : "";
+    return {
+      ok: false,
+      detail: `No connected RemoteBuddy session consumer found for session ${sessionId}.${suffix}`.trim()
+    };
+  }
+  return {
+    ok: false,
+    detail: `No connected RemoteBuddy session consumer found for session ${sessionId}`
+  };
+}
+async function probeRemoteBuddySessionConsumer(serverUrl, sessionId) {
+  try {
+    const response = await fetchWithTimeout(`${serverUrl}/system/status`, {}, 1e4);
+    if (!response.ok) {
+      return {
+        ok: false,
+        detail: `system status probe failed with HTTP ${response.status}`
+      };
+    }
+    const payload = await response.json().catch(() => ({}));
+    return extractRemoteBuddySessionConsumerHealth(payload, sessionId);
+  } catch (err) {
+    return {
+      ok: false,
+      detail: `system status probe failed: ${String(err)}`
+    };
+  }
+}
 async function probeSourceControlManager(port) {
   if (!Number.isFinite(port) || port <= 0)
     return false;
@@ -1911,13 +2123,43 @@ function createRuntimeClientId(prefix) {
 async function probeLocalBuddy(localAgentUrl) {
   return await fetchJsonWithTimeout(`${localAgentUrl}/healthz`, {}, LOCALBUDDY_TIMEOUT_MS);
 }
+function resolveCliLocalBuddyAutostart(runtimeOnly, runtimeConfigEnabled) {
+  return runtimeOnly ? runtimeConfigEnabled : false;
+}
+async function ensureServerSession(serverUrl, requestedSessionId, client) {
+  const response = await fetchWithTimeout(`${serverUrl}/sessions`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      sessionId: requestedSessionId,
+      client: {
+        clientId: client.clientId,
+        kind: client.kind,
+        label: client.label,
+        version: client.version,
+        platform: client.platform,
+        repoRoot: client.repoRoot
+      }
+    })
+  }, 15000);
+  if (!response.ok) {
+    const detail = await response.text().catch(() => "");
+    throw new Error(`Failed to create or join session ${requestedSessionId}: HTTP ${response.status}${detail ? ` ${detail}` : ""}`);
+  }
+  const payload = await response.json().catch(() => ({}));
+  const sessionId = typeof payload.sessionId === "string" && payload.sessionId.trim() ? payload.sessionId.trim() : "";
+  if (!sessionId) {
+    throw new Error("Server session bootstrap returned no sessionId.");
+  }
+  return sessionId;
+}
 async function autoStartRuntimeServices(opts) {
   const { runtimePreflight } = opts.preparedRuntime;
   const runtimeRoot = opts.preparedRuntime.runtimeRoot;
   const runtimeTag = opts.preparedRuntime.runtimeTag || await resolveRuntimeReleaseTag(opts.requestedRuntimeTag);
-  const localBuddyEnabled = Boolean(runtimePreflight.config.localbuddy.enabled);
-  const requireLocalBuddy = opts.requireLocalBuddy ?? true;
-  console.log(`[pushpals] LocalBuddy unavailable. Auto-starting runtime for repo: ${opts.repoRoot}`);
+  const startLocalBuddy = opts.startLocalBuddy ?? Boolean(runtimePreflight.config.localbuddy.enabled);
+  const localBuddyEnabled = startLocalBuddy;
+  console.log(`[pushpals] Runtime unavailable. Auto-starting runtime for repo: ${opts.repoRoot}`);
   console.log(`[pushpals] runtimeRoot=${runtimeRoot}`);
   console.log(`[pushpals] runtimeTag=${runtimeTag}`);
   if (!runtimePreflight.ok) {
@@ -1928,11 +2170,15 @@ async function autoStartRuntimeServices(opts) {
   const runtimeEnv = buildEmbeddedRuntimeEnv(process.env, {
     repoRoot: opts.repoRoot,
     runtimeRoot,
-    useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime
+    useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime,
+    sessionId: opts.sessionId
   });
+  if (runtimeEnv.PUSHPALS_GIT_BIN) {
+    applyResolvedGitBinaryToRuntimeEnv(runtimeEnv, runtimeEnv.PUSHPALS_GIT_BIN);
+  }
   const resolvedGitBinary = await resolveCommandPath("git", opts.repoRoot, normalizeChildProcessEnv(process.env));
   if (resolvedGitBinary) {
-    runtimeEnv.PUSHPALS_GIT_BIN = resolvedGitBinary;
+    applyResolvedGitBinaryToRuntimeEnv(runtimeEnv, resolvedGitBinary);
   }
   const services = [];
   const runToken = timestampFileToken();
@@ -1978,7 +2224,7 @@ ${tail}` : ""}`);
     services.push(localbuddyService);
     console.log(`[pushpals] localbuddy log: ${localbuddyService.logPath}`);
   } else {
-    console.log("[pushpals] Embedded LocalBuddy disabled by runtime config; skipping start.");
+    console.log("[pushpals] Embedded LocalBuddy disabled for this CLI session; skipping start.");
   }
   console.log("[pushpals] Starting embedded RemoteBuddy...");
   const remotebuddyService = spawnRuntimeService("remotebuddy", [runtimeBinaries.remotebuddy], opts.repoRoot, runtimeEnv, logPathFor("remotebuddy"));
@@ -2030,7 +2276,8 @@ ${tail}` : ""}`);
       }
     }
     const health = localBuddyEnabled ? await probeLocalBuddy(opts.localAgentUrl) : null;
-    if (!requireLocalBuddy || localBuddyEnabled && health?.ok) {
+    const remoteBuddyHealth2 = await probeRemoteBuddySessionConsumer(opts.serverUrl, opts.sessionId);
+    if ((!localBuddyEnabled || health?.ok) && remoteBuddyHealth2.ok) {
       const stabilityDeadline = Date.now() + DEFAULT_SERVICE_STABILITY_GRACE_MS;
       while (Date.now() < stabilityDeadline) {
         for (let i = services.length - 1;i >= 0; i--) {
@@ -2061,10 +2308,14 @@ ${tail}` : ""}`);
     await Bun.sleep(DEFAULT_RUNTIME_BOOT_POLL_MS);
   }
   stopRuntimeServices(services);
+  const remoteBuddyHealth = await probeRemoteBuddySessionConsumer(opts.serverUrl, opts.sessionId);
+  if (!localBuddyEnabled && !remoteBuddyHealth.ok) {
+    throw new Error(`Timed out waiting for RemoteBuddy session consumer readiness after ${DEFAULT_RUNTIME_BOOT_TIMEOUT_MS}ms (${remoteBuddyHealth.detail})`);
+  }
   if (!localBuddyEnabled) {
     throw new Error(`Timed out waiting for embedded runtime readiness after ${DEFAULT_RUNTIME_BOOT_TIMEOUT_MS}ms`);
   }
-  throw new Error(`Timed out waiting for LocalBuddy at ${opts.localAgentUrl} after ${DEFAULT_RUNTIME_BOOT_TIMEOUT_MS}ms`);
+  throw new Error(`Timed out waiting for LocalBuddy at ${opts.localAgentUrl} and RemoteBuddy session consumer after ${DEFAULT_RUNTIME_BOOT_TIMEOUT_MS}ms`);
 }
 function readCliState(pathValue) {
   if (!existsSync4(pathValue))
@@ -2117,7 +2368,6 @@ async function looksLikeMonitoringHub(url) {
 function buildMonitoringHubRuntimeBootstrap(opts) {
   return {
     serverUrl: opts.serverUrl,
-    localAgentUrl: opts.localAgentUrl,
     sessionId: opts.sessionId,
     clientId: `cli-monitor-${opts.sessionId}`,
     clientKind: "cli_monitor",
@@ -2202,7 +2452,10 @@ async function serveBundledMonitoringHub(assetRoot, pathname, bootstrap) {
   });
 }
 function buildEmbeddedMonitoringHubHtml(opts) {
-  const bootstrap = jsonHtmlBootstrap(opts);
+  const bootstrap = jsonHtmlBootstrap({
+    serverUrl: opts.serverUrl,
+    sessionId: opts.sessionId
+  });
   return `<!doctype html>
 <html lang="en">
 <head>
@@ -2298,7 +2551,6 @@ function buildEmbeddedMonitoringHubHtml(opts) {
       cardsEl.innerHTML = cards.map((card) => '<div class="card"><div class="label">' + esc(card.label) + '</div><div class="value">' + esc(card.value) + '</div><div class="sub">' + esc(card.sub) + '</div></div>').join("");
       metaEl.innerHTML = [
         '<span class="pill">server ' + esc(boot.serverUrl) + '</span>',
-        '<span class="pill">localbuddy ' + esc(boot.localAgentUrl) + '</span>',
         '<span class="pill">session ' + esc(boot.sessionId) + '</span>',
         '<span class="pill">repo ' + esc(repo?.root ?? repo?.remoteUrl ?? "current repo") + '</span>'
       ].join("");
@@ -2355,7 +2607,6 @@ async function startEmbeddedMonitoringHub(opts) {
   }
   const bootstrap = buildMonitoringHubRuntimeBootstrap({
     serverUrl: opts.serverUrl,
-    localAgentUrl: opts.localAgentUrl,
     sessionId: opts.sessionId
   });
   const candidatePorts = Array.from({ length: MONITOR_SCAN_PORTS }, (_, index) => opts.preferredPort + index).concat(0);
@@ -2426,72 +2677,30 @@ async function resolveMonitoringHub(opts) {
   }
   return embedded;
 }
-async function sendMessageToLocalBuddy(localAgentUrl, text) {
-  let response;
+async function sendMessageToServerSession(serverUrl, sessionId, text) {
   try {
-    response = await fetchWithTimeout(`${localAgentUrl}/message`, {
+    const response = await fetchWithTimeout(`${serverUrl}/sessions/${encodeURIComponent(sessionId)}/message`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ text })
-    }, 30000);
+    }, 15000);
+    if (!response.ok) {
+      const detail = await response.text().catch(() => "");
+      console.error(`[pushpals] Session message rejected: HTTP ${response.status}${detail ? ` ${detail}` : ""}`);
+      return false;
+    }
+    return true;
   } catch (err) {
-    console.error(`[pushpals] Failed to reach LocalBuddy: ${String(err)}`);
+    console.error(`[pushpals] Failed to reach server session endpoint: ${String(err)}`);
     return false;
   }
-  if (!response.ok) {
-    const detail = await response.text().catch(() => "");
-    console.error(`[pushpals] LocalBuddy rejected message: HTTP ${response.status} ${detail}`);
-    return false;
-  }
-  const reader = response.body?.getReader();
-  if (!reader) {
-    console.error("[pushpals] LocalBuddy response stream missing.");
-    return false;
-  }
-  let buffer = "";
-  const decoder = new TextDecoder;
-  let complete = false;
-  let ok = true;
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done)
-      break;
-    buffer += decoder.decode(value, { stream: true });
-    const chunks = buffer.split(`
-
-`);
-    buffer = chunks.pop() ?? "";
-    for (const chunk of chunks) {
-      const dataLine = chunk.split(/\r?\n/).map((line) => line.trim()).find((line) => line.startsWith("data: "));
-      if (!dataLine)
-        continue;
-      try {
-        const payload = JSON.parse(dataLine.slice(6));
-        const type = String(payload.type ?? "").trim().toLowerCase();
-        const message = String(payload.message ?? "").trim();
-        if (type === "status" && message) {
-          console.log(`[localbuddy] ${message}`);
-        } else if (type === "error") {
-          ok = false;
-          console.log(`[localbuddy] ERROR: ${message || "Unknown failure"}`);
-        } else if (type === "complete") {
-          complete = true;
-          const requestId = payload.data && typeof payload.data.requestId === "string" ? payload.data.requestId : "";
-          if (requestId) {
-            console.log(`[localbuddy] requestId=${requestId}`);
-          } else if (message) {
-            console.log(`[localbuddy] ${message}`);
-          }
-        }
-      } catch {}
-    }
-  }
-  return ok && complete;
 }
 function formatSessionEventLine(event) {
   const type = String(event.type ?? "").toLowerCase();
   const from = String(event.from ?? "");
   const payload = event.payload ?? {};
+  if (!shouldDisplayInteractiveSessionEvent(event))
+    return null;
   if (type === "message")
     return null;
   if (type === "assistant_message") {
@@ -2653,6 +2862,15 @@ async function main() {
   const serverUrl = normalizeLoopbackUrl(parsed.serverUrl ?? process.env.PUSHPALS_SERVER_URL, config.server.url);
   const localAgentUrl = normalizeLoopbackUrl(parsed.localAgentUrl ?? process.env.EXPO_PUBLIC_LOCAL_AGENT_URL, config.client.localAgentUrl);
   const sessionId = String(parsed.sessionId ?? process.env.PUSHPALS_SESSION_ID ?? config.sessionId).trim();
+  const cliVersion = String(process.env.PUSHPALS_CLI_PACKAGE_VERSION ?? "").trim() || "unknown";
+  const cliClient = {
+    clientId: createRuntimeClientId("cli"),
+    kind: "cli",
+    label: "CLI",
+    version: cliVersion,
+    platform: `${process.platform}/${process.arch}`,
+    repoRoot
+  };
   let autoStartedServices = [];
   const stopAutoStartedServices = () => {
     if (autoStartedServices.length === 0)
@@ -2661,66 +2879,76 @@ async function main() {
     autoStartedServices = [];
   };
   let serverHealthy = await probeServer(serverUrl);
-  let health = await probeLocalBuddy(localAgentUrl);
-  const runtimeNeedsAutoStart = parsed.runtimeOnly ? !serverHealthy : !health?.ok;
-  if (runtimeNeedsAutoStart && !parsed.noAutoStart) {
+  const serverWasAlreadyHealthy = serverHealthy;
+  let remoteBuddyConsumerHealth = {
+    ok: false,
+    detail: `No connected RemoteBuddy session consumer found for session ${sessionId}`
+  };
+  if (!serverHealthy) {
+    if (!parsed.noAutoStart) {
+      try {
+        autoStartedServices = await autoStartRuntimeServices({
+          repoRoot,
+          serverUrl,
+          localAgentUrl,
+          sessionId,
+          sourceControlManagerPort: config.sourceControlManager.port,
+          sourceControlManagerRemote: config.sourceControlManager.remote,
+          preparedRuntime,
+          requestedRuntimeTag: parsed.runtimeTag,
+          startLocalBuddy: resolveCliLocalBuddyAutostart(parsed.runtimeOnly, Boolean(config.localbuddy.enabled))
+        });
+        serverHealthy = await probeServer(serverUrl);
+      } catch (err) {
+        console.error(`[pushpals] Auto-start failed: ${String(err)}`);
+        stopAutoStartedServices();
+      }
+    }
+    if (!serverHealthy) {
+      console.error(`[pushpals] Server is unavailable at ${serverUrl}.`);
+      if (parsed.noAutoStart) {
+        console.error("[pushpals] Auto-start is disabled (--no-auto-start).");
+      } else {
+        console.error("[pushpals] Auto-start could not bring the embedded runtime online.");
+      }
+      process.exit(1);
+    }
+  }
+  try {
+    await ensureServerRepoAffinity(serverUrl, repoRoot);
+  } catch (err) {
+    stopAutoStartedServices();
+    console.error(`[pushpals] Repo affinity check failed: ${String(err)}`);
+    process.exit(1);
+  }
+  let activeSessionId = sessionId;
+  if (!parsed.runtimeOnly) {
     try {
-      autoStartedServices = await autoStartRuntimeServices({
-        repoRoot,
-        serverUrl,
-        localAgentUrl,
-        sourceControlManagerPort: config.sourceControlManager.port,
-        sourceControlManagerRemote: config.sourceControlManager.remote,
-        preparedRuntime,
-        requestedRuntimeTag: parsed.runtimeTag,
-        requireLocalBuddy: !parsed.runtimeOnly
-      });
-      serverHealthy = await probeServer(serverUrl);
-      health = await probeLocalBuddy(localAgentUrl);
+      activeSessionId = await ensureServerSession(serverUrl, sessionId, cliClient);
     } catch (err) {
-      console.error(`[pushpals] Auto-start failed: ${String(err)}`);
       stopAutoStartedServices();
+      console.error(`[pushpals] Session bootstrap failed: ${String(err)}`);
+      process.exit(1);
     }
   }
-  if (parsed.runtimeOnly && !serverHealthy) {
+  remoteBuddyConsumerHealth = await probeRemoteBuddySessionConsumer(serverUrl, activeSessionId);
+  if (!serverHealthy) {
     console.error(`[pushpals] Server is unavailable at ${serverUrl}.`);
-    if (parsed.noAutoStart) {
-      console.error("[pushpals] Auto-start is disabled (--no-auto-start).");
-    } else {
-      console.error("[pushpals] Auto-start could not bring the embedded runtime online.");
-    }
     process.exit(1);
   }
-  if (!parsed.runtimeOnly && !health?.ok) {
-    console.error(`[pushpals] LocalBuddy is unavailable at ${localAgentUrl}.`);
-    if (parsed.noAutoStart) {
+  if (!remoteBuddyConsumerHealth.ok) {
+    stopAutoStartedServices();
+    console.error(`[pushpals] RemoteBuddy is not ready for session ${activeSessionId}: ${remoteBuddyConsumerHealth.detail}`);
+    if (serverWasAlreadyHealthy) {
+      console.error("[pushpals] A PushPals runtime is already serving this repo, but it does not have a connected RemoteBuddy consumer for this session.");
+      console.error("[pushpals] Refusing to start another embedded RemoteBuddy against the same runtime. Restart or stop the existing runtime before retrying.");
+    } else if (parsed.noAutoStart) {
       console.error("[pushpals] Auto-start is disabled (--no-auto-start).");
     } else {
-      console.error("[pushpals] Auto-start could not bring LocalBuddy online.");
+      console.error("[pushpals] Auto-start could not bring the embedded runtime into a usable state.");
     }
     process.exit(1);
   }
-  let localBuddySessionId = sessionId;
-  if (!parsed.runtimeOnly) {
-    const localBuddyRepo = health?.repo ? resolve4(health.repo) : "";
-    if (!localBuddyRepo) {
-      stopAutoStartedServices();
-      console.error("[pushpals] LocalBuddy health response did not include repo path.");
-      process.exit(1);
-    }
-    if (normalizePath(localBuddyRepo) !== normalizePath(repoRoot)) {
-      stopAutoStartedServices();
-      console.error("[pushpals] Repo mismatch detected.");
-      console.error(`[pushpals] currentRepo=${repoRoot}`);
-      console.error(`[pushpals] localBuddyRepo=${localBuddyRepo}`);
-      console.error("[pushpals] LocalBuddy must run against the same repo. Start PushPals from this repo and retry.");
-      process.exit(1);
-    }
-    localBuddySessionId = health?.sessionId && String(health.sessionId).trim() ? String(health.sessionId).trim() : sessionId;
-    if (sessionId && sessionId !== localBuddySessionId) {
-      console.warn(`[pushpals] Requested sessionId=${sessionId}, but LocalBuddy is currently attached to sessionId=${localBuddySessionId}.`);
-    }
-  }
   const statePath = resolveCliStatePath(repoRoot);
   const saved = statePath ? readCliState(statePath) : {};
   const preferredHubUrl = normalizeUrl(parsed.monitoringHubUrl ?? process.env.PUSHPALS_MONITOR_URL ?? saved.monitoringHubUrl ?? "");
@@ -2729,8 +2957,7 @@ async function main() {
     preferredUrl: preferredHubUrl,
     fallbackPort: monitorPort,
     serverUrl,
-    localAgentUrl,
-    sessionId: localBuddySessionId
+    sessionId: activeSessionId
   });
   const monitoringHubUrl = monitoringHub?.url ?? "";
   if (statePath) {
@@ -2738,7 +2965,7 @@ async function main() {
       monitoringHubUrl: monitoringHubUrl || undefined,
       serverUrl,
       localAgentUrl,
-      sessionId: localBuddySessionId,
+      sessionId: activeSessionId,
       repoRoot
     });
   } else {
@@ -2754,8 +2981,7 @@ async function main() {
     console.log("[pushpals] monitoringHubUrl=unavailable");
   }
   console.log(`[pushpals] serverUrl=${serverUrl}`);
-  console.log(`[pushpals] localAgentUrl=${localAgentUrl}`);
-  console.log(`[pushpals] sessionId=${localBuddySessionId}`);
+  console.log(`[pushpals] sessionId=${activeSessionId}`);
   console.log(`[pushpals] repoRoot=${repoRoot}`);
   console.log(`[pushpals] cliStateFile=${statePath ?? "unavailable"}`);
   if (parsed.runtimeOnly) {
@@ -2763,15 +2989,6 @@ async function main() {
   } else {
     console.log("[pushpals] Type a message and press Enter. Use /exit or exit to quit.");
   }
-  const cliVersion = String(process.env.PUSHPALS_CLI_PACKAGE_VERSION ?? "").trim() || "unknown";
-  const cliClient = {
-    clientId: createRuntimeClientId("cli"),
-    kind: "cli",
-    label: "CLI",
-    version: cliVersion,
-    platform: `${process.platform}/${process.arch}`,
-    repoRoot
-  };
   const streamAbort = new AbortController;
   let rl = null;
   const printIncoming = (line) => {
@@ -2786,7 +3003,7 @@ ${line}
     }
     console.log(line);
   };
-  const streamTask = parsed.noStream ? Promise.resolve() : parsed.runtimeOnly ? Promise.resolve() : runSessionStream(serverUrl, localBuddySessionId, cliClient, printIncoming, streamAbort.signal);
+  const streamTask = parsed.noStream ? Promise.resolve() : parsed.runtimeOnly ? Promise.resolve() : runSessionStream(serverUrl, activeSessionId, cliClient, printIncoming, streamAbort.signal);
   let shuttingDown = false;
   const requestStop = () => {
     if (shuttingDown)
@@ -2864,8 +3081,7 @@ ${line}
     }
     if (text === "/status") {
       console.log(`[pushpals] serverUrl=${serverUrl}`);
-      console.log(`[pushpals] localAgentUrl=${localAgentUrl}`);
-      console.log(`[pushpals] sessionId=${localBuddySessionId}`);
+      console.log(`[pushpals] sessionId=${activeSessionId}`);
       console.log(`[pushpals] repoRoot=${repoRoot}`);
       console.log(monitoringHubUrl ? `[pushpals] monitoringHubUrl=${monitoringHubUrl}` : "[pushpals] monitoringHubUrl=unavailable");
       rl.prompt();
@@ -2882,7 +3098,13 @@ ${line}
       rl.prompt();
       continue;
     }
-    const ok = await sendMessageToLocalBuddy(localAgentUrl, text);
+    const normalized = normalizeCliInteractiveMessage(text);
+    if (normalized.usageMessage) {
+      console.log(`[pushpals] ${normalized.usageMessage}`);
+      rl.prompt();
+      continue;
+    }
+    const ok = await sendMessageToServerSession(serverUrl, activeSessionId, normalized.text);
     if (!ok) {
       console.log("[pushpals] Message failed.");
     }
@@ -2901,15 +3123,22 @@ export {
   startEmbeddedMonitoringHub,
   resolveCommandPath,
   resolveCliStatePath,
+  resolveCliLocalBuddyAutostart,
   resolveBundledRuntimeAssetSource,
   resolveBundledMonitoringHubRoot,
   prepareCliRuntime,
+  normalizeRepoPathForComparison,
+  normalizeCliInteractiveMessage,
   normalizeChildProcessEnv,
   isCliExitCommand,
   injectMonitoringHubBootstrap,
   formatTimestampedCliLine,
+  formatSessionEventLine,
+  extractRemoteBuddySessionConsumerHealth,
+  bundledMonitoringHubNeedsRefresh,
   buildServiceStopCommand,
   buildOpenMonitoringHubCommand,
   buildEmbeddedRuntimeEnv,
-  buildEmbeddedMonitoringHubHtml
+  buildEmbeddedMonitoringHubHtml,
+  applyResolvedGitBinaryToRuntimeEnv
 };