@pushpalsdev/cli 1.0.9 → 1.0.11

package/dist/pushpals-cli.js

@@ -6,12 +6,12 @@ import {
   appendFileSync,
   chmodSync,
   cpSync,
-  existsSync as existsSync3,
+  existsSync as existsSync4,
   mkdirSync,
-  readFileSync as readFileSync3,
+  readFileSync as readFileSync4,
   writeFileSync
 } from "fs";
-import { dirname, extname, join as join2, resolve as resolve3 } from "path";
+import { basename, delimiter, dirname, extname, join as join2, resolve as resolve4 } from "path";
 import { createInterface } from "readline";
 
 // ../shared/src/client_preflight.ts
@@ -21,12 +21,53 @@ import { relative, resolve as resolve2 } from "path";
 // ../shared/src/config.ts
 import { existsSync, readFileSync } from "fs";
 import { join, resolve, isAbsolute } from "path";
+
+// ../shared/src/local_network.ts
+var DEFAULT_LOCAL_LOOPBACK_HOST = "127.0.0.1";
+function isLoopbackHost(hostname) {
+  const normalized = String(hostname ?? "").trim().toLowerCase().replace(/^\[(.*)\]$/, "$1");
+  return normalized === "127.0.0.1" || normalized === "::1" || normalized === "localhost";
+}
+function normalizeLoopbackHost(hostname) {
+  const normalized = String(hostname ?? "").trim().toLowerCase().replace(/^\[(.*)\]$/, "$1");
+  if (isLoopbackHost(normalized))
+    return DEFAULT_LOCAL_LOOPBACK_HOST;
+  return DEFAULT_LOCAL_LOOPBACK_HOST;
+}
+function normalizeLoopbackHttpUrl(value, fallbackPort) {
+  const fallback = `http://${DEFAULT_LOCAL_LOOPBACK_HOST}:${Math.max(1, fallbackPort)}`;
+  const text = String(value ?? "").trim();
+  if (!text)
+    return fallback;
+  try {
+    const parsed = new URL(text);
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+      return fallback;
+    }
+    parsed.protocol = "http:";
+    parsed.username = "";
+    parsed.password = "";
+    parsed.hostname = normalizeLoopbackHost(parsed.hostname);
+    parsed.pathname = "/";
+    parsed.search = "";
+    parsed.hash = "";
+    if (!parsed.port) {
+      parsed.port = String(Math.max(1, fallbackPort));
+    }
+    return parsed.toString().replace(/\/+$/, "");
+  } catch {
+    return fallback;
+  }
+}
+
+// ../shared/src/config.ts
 var PROJECT_ROOT = resolve(import.meta.dir, "..", "..", "..");
 var DEFAULT_CONFIG_DIR = "configs";
 var LEGACY_CONFIG_DIR = "config";
 var TRUTHY = new Set(["1", "true", "yes", "on"]);
 var FALSY = new Set(["0", "false", "no", "off"]);
 var DEFAULT_WORKERPALS_QUALITY_CRITIC_MIN_SCORE = 8;
+var DEFAULT_WORKERPALS_QUALITY_MAX_AUTO_REVISIONS = 1;
 var DEFAULT_WORKERPALS_FILE_MODIFYING_JOBS = ["task.execute"];
 var DEFAULT_WORKERPALS_OUTPUT_MAX_CHARS = 192 * 1024;
 var DEFAULT_WORKERPALS_OUTPUT_MAX_LINES = 600;
@@ -294,13 +335,14 @@ function loadPushPalsConfig(options = {}) {
   const remotebuddyDbPath = resolvePathFromRoot(projectRoot, firstNonEmpty(process.env.REMOTEBUDDY_DB_PATH, asString(pathsNode.remotebuddy_db_path, join(dataDir, "remotebuddy-state.db"))));
   const serverNode = getObject(merged, "server");
   const serverPort = Math.max(1, asInt(parseIntEnv("PUSHPALS_PORT") ?? serverNode.port, 3001));
-  const serverUrl = firstNonEmpty(process.env.PUSHPALS_SERVER_URL, asString(serverNode.url, `http://localhost:${serverPort}`), `http://localhost:${serverPort}`);
-  const serverHost = asString(serverNode.host, "0.0.0.0");
+  const serverUrl = normalizeLoopbackHttpUrl(firstNonEmpty(process.env.PUSHPALS_SERVER_URL, asString(serverNode.url, `http://127.0.0.1:${serverPort}`), `http://127.0.0.1:${serverPort}`), serverPort);
+  const serverHost = normalizeLoopbackHost(firstNonEmpty(process.env.PUSHPALS_HOST, asString(serverNode.host, "127.0.0.1")));
   const debugHttp = parseBoolEnv("PUSHPALS_DEBUG_HTTP") ?? asBoolean(serverNode.debug_http, false);
   const staleClaimTtlMs = Math.max(5000, asInt(parseIntEnv("PUSHPALS_STALE_CLAIM_TTL_MS") ?? serverNode.stale_claim_ttl_ms, 120000));
   const staleClaimSweepIntervalMs = Math.max(1000, asInt(parseIntEnv("PUSHPALS_STALE_CLAIM_SWEEP_INTERVAL_MS") ?? serverNode.stale_claim_sweep_interval_ms, 5000));
   const globalStatusHeartbeatMs = parseIntEnv("PUSHPALS_STATUS_HEARTBEAT_MS");
   const localNode = getObject(merged, "localbuddy");
+  const localEnabled = parseBoolEnv("LOCALBUDDY_ENABLED") ?? asBoolean(localNode.enabled, false);
   const localPort = Math.max(1, asInt(parseIntEnv("LOCAL_AGENT_PORT") ?? localNode.port, 3003));
   const localStatusHeartbeatMs = Math.max(0, asInt(parseIntEnv("LOCALBUDDY_STATUS_HEARTBEAT_MS") ?? globalStatusHeartbeatMs ?? localNode.status_heartbeat_ms, 120000));
   const localLlm = resolveLlmConfig(localNode, "LOCALBUDDY", {
@@ -377,7 +419,7 @@ function loadPushPalsConfig(options = {}) {
   const workerMinisweTimeoutMs = Math.max(1e4, asInt(parseIntEnv("WORKERPALS_MINISWE_TIMEOUT_MS") ?? workerNode.miniswe_timeout_ms, 1800000));
   const workerOpenAICodexPython = firstNonEmpty(process.env.PUSHPALS_OPENAI_CODEX_PYTHON, asString(workerNode.openai_codex_python, "python"), "python");
   const workerOpenAICodexTimeoutMs = Math.max(1e4, asInt(workerNode.openai_codex_timeout_ms, 7200000));
-  const workerQualityMaxAutoRevisions = Math.max(0, Math.min(10, asInt(parseIntEnv("WORKERPALS_QUALITY_MAX_AUTO_REVISIONS") ?? workerNode.quality_max_auto_revisions, 4)));
+  const workerQualityMaxAutoRevisions = Math.max(0, Math.min(10, asInt(parseIntEnv("WORKERPALS_QUALITY_MAX_AUTO_REVISIONS") ?? workerNode.quality_max_auto_revisions, DEFAULT_WORKERPALS_QUALITY_MAX_AUTO_REVISIONS)));
   const workerFileModifyingJobs = (() => {
     const envRaw = firstNonEmpty(process.env.WORKERPALS_FILE_MODIFYING_JOBS);
     const parsed = envRaw ? envRaw.split(",").map((entry) => entry.trim()).filter(Boolean) : asStringArray(workerNode.file_modifying_jobs);
@@ -539,6 +581,7 @@ function loadPushPalsConfig(options = {}) {
       staleClaimSweepIntervalMs
     },
     localbuddy: {
+      enabled: localEnabled,
       port: localPort,
       statusHeartbeatMs: localStatusHeartbeatMs,
       llm: localLlm
@@ -742,7 +785,7 @@ function loadPushPalsConfig(options = {}) {
       portConflictPolicy: startupPortConflictPolicy
     },
     client: {
-      localAgentUrl: firstNonEmpty(process.env.EXPO_PUBLIC_LOCAL_AGENT_URL, asString(clientNode.local_agent_url, `http://localhost:${localPort}`), `http://localhost:${localPort}`),
+      localAgentUrl: normalizeLoopbackHttpUrl(firstNonEmpty(process.env.EXPO_PUBLIC_LOCAL_AGENT_URL, asString(clientNode.local_agent_url, `http://127.0.0.1:${localPort}`), `http://127.0.0.1:${localPort}`), localPort),
       traceTailLines: Math.max(10, asInt(parseIntEnv("EXPO_PUBLIC_PUSHPALS_TRACE_TAIL_LINES") ?? clientNode.trace_tail_lines, 100))
     }
   };
@@ -1061,6 +1104,46 @@ function formatClientRuntimePreflightLines(result, prefix) {
   return lines;
 }
 
+// ../shared/src/repo.ts
+import { existsSync as existsSync3, readFileSync as readFileSync3, statSync } from "fs";
+import { resolve as resolve3 } from "path";
+function resolveDotGitEntry(repoRoot) {
+  return resolve3(repoRoot, ".git");
+}
+function resolveGitMetadataDir(repoRoot) {
+  const dotGitPath = resolveDotGitEntry(repoRoot);
+  if (!existsSync3(dotGitPath))
+    return null;
+  try {
+    const stat = statSync(dotGitPath);
+    if (stat.isDirectory()) {
+      return dotGitPath;
+    }
+    if (!stat.isFile()) {
+      return null;
+    }
+  } catch {
+    return null;
+  }
+  try {
+    const firstLine = readFileSync3(dotGitPath, "utf8").split(/\r?\n/, 1)[0] ?? "";
+    const match = firstLine.match(/^gitdir:\s*(.+)\s*$/i);
+    if (!match)
+      return null;
+    const gitDir = resolve3(repoRoot, match[1].trim());
+    return existsSync3(gitDir) ? gitDir : null;
+  } catch {
+    return null;
+  }
+}
+function resolveGitStateFilePath(repoRoot, fileName) {
+  const gitMetadataDir = resolveGitMetadataDir(repoRoot);
+  const normalizedFileName = String(fileName ?? "").trim();
+  if (!gitMetadataDir || !normalizedFileName)
+    return null;
+  return resolve3(gitMetadataDir, normalizedFileName);
+}
+
 // ../../scripts/pushpals-cli.ts
 var DEFAULT_MONITOR_PORT = 8081;
 var MONITOR_SCAN_PORTS = 32;
@@ -1081,6 +1164,29 @@ var GITHUB_HEADERS = {
   "User-Agent": "pushpals-cli"
 };
 var stateVersion = 1;
+var cliTimestampedConsoleInstalled = false;
+function formatTimestampedCliLine(line, at = new Date) {
+  const text = String(line ?? "");
+  if (!text.startsWith("[pushpals]") && !text.startsWith("[localbuddy]")) {
+    return text;
+  }
+  return `[${at.toISOString()}]${text}`;
+}
+function installTimestampedCliConsole() {
+  if (cliTimestampedConsoleInstalled)
+    return;
+  cliTimestampedConsoleInstalled = true;
+  const patch = (original) => (...args) => {
+    if (args.length > 0 && typeof args[0] === "string") {
+      args[0] = formatTimestampedCliLine(args[0]);
+    }
+    return original(...args);
+  };
+  console.log = patch(console.log.bind(console));
+  console.warn = patch(console.warn.bind(console));
+  console.error = patch(console.error.bind(console));
+}
+installTimestampedCliConsole();
 function logCliInvocation(argv) {
   const startedAt = new Date().toISOString();
   const cliVersion = String(process.env.PUSHPALS_CLI_PACKAGE_VERSION ?? "").trim() || "unknown";
@@ -1106,6 +1212,7 @@ function printUsage() {
   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-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");
   console.log("");
   console.log("Chat commands:");
@@ -1120,7 +1227,7 @@ function printUsage() {
   console.log("  - LocalBuddy must be attached to the same repo root.");
 }
 function parseArgs(argv) {
-  const options = { noAutoStart: false, noStream: false };
+  const options = { noAutoStart: false, noStream: false, runtimeOnly: false };
   for (let i = 0;i < argv.length; i++) {
     const arg = argv[i];
     if (arg === "-h" || arg === "--help") {
@@ -1135,6 +1242,10 @@ function parseArgs(argv) {
       options.noAutoStart = true;
       continue;
     }
+    if (arg === "--runtime-only") {
+      options.runtimeOnly = true;
+      continue;
+    }
     if (arg === "--server-url") {
       options.serverUrl = argv[++i];
       continue;
@@ -1170,6 +1281,30 @@ function normalizeUrl(value, fallback = "") {
   const selected = text || fallback;
   return selected.replace(/\/+$/, "");
 }
+function normalizeLoopbackUrl(value, fallback) {
+  const selected = normalizeUrl(value, fallback);
+  if (!selected)
+    return "";
+  try {
+    const parsed = new URL(selected);
+    parsed.protocol = "http:";
+    parsed.username = "";
+    parsed.password = "";
+    parsed.hostname = "127.0.0.1";
+    return parsed.toString().replace(/\/+$/, "");
+  } catch {
+    return normalizeUrl(fallback);
+  }
+}
+function isLoopbackUrl(value) {
+  try {
+    const parsed = new URL(normalizeUrl(value));
+    const hostname = String(parsed.hostname ?? "").trim().toLowerCase();
+    return hostname === "127.0.0.1" || hostname === "localhost" || hostname === "::1";
+  } catch {
+    return false;
+  }
+}
 function parsePositiveInt(value, fallback) {
   const parsed = Number.parseInt(String(value ?? "").trim(), 10);
   if (!Number.isFinite(parsed) || parsed <= 0)
@@ -1177,7 +1312,7 @@ function parsePositiveInt(value, fallback) {
   return parsed;
 }
 function normalizePath(value) {
-  const normalized = resolve3(value).replace(/\\/g, "/").replace(/\/+$/, "");
+  const normalized = resolve4(value).replace(/\\/g, "/").replace(/\/+$/, "");
   if (process.platform === "win32")
     return normalized.toLowerCase();
   return normalized;
@@ -1205,11 +1340,11 @@ async function resolveCurrentGitRepoRoot(cwd) {
   const root = await runGit(["rev-parse", "--show-toplevel"], cwd);
   if (!root.ok || !root.stdout)
     return null;
-  return resolve3(root.stdout);
+  return resolve4(root.stdout);
 }
 function resolveDefaultRuntimeRoot() {
   const home = process.env.USERPROFILE || process.env.HOME || process.cwd();
-  return resolve3(home, ".pushpals", "runtime");
+  return resolve4(home, ".pushpals", "runtime");
 }
 function buildRuntimeAssetSource(root, protocolSchemasDir) {
   return {
@@ -1222,13 +1357,13 @@ function buildRuntimeAssetSource(root, protocolSchemasDir) {
   };
 }
 function isCompleteRuntimeAssetSource(source) {
-  return existsSync3(source.envExamplePath) && existsSync3(source.visionExamplePath) && existsSync3(join2(source.configsDir, "default.toml")) && existsSync3(source.promptsDir) && existsSync3(join2(source.protocolSchemasDir, "envelope.schema.json")) && existsSync3(join2(source.protocolSchemasDir, "events.schema.json"));
+  return existsSync4(source.envExamplePath) && existsSync4(source.visionExamplePath) && existsSync4(join2(source.configsDir, "default.toml")) && existsSync4(source.promptsDir) && existsSync4(join2(source.protocolSchemasDir, "envelope.schema.json")) && existsSync4(join2(source.protocolSchemasDir, "events.schema.json"));
 }
 function resolveBundledRuntimeAssetSource() {
   const candidates = [
-    buildRuntimeAssetSource(resolve3(import.meta.dir, "..", "runtime"), resolve3(import.meta.dir, "..", "runtime", "protocol", "schemas")),
-    buildRuntimeAssetSource(resolve3(import.meta.dir, ".."), resolve3(import.meta.dir, "..", "packages", "protocol", "src", "schemas")),
-    buildRuntimeAssetSource(resolve3(import.meta.dir, "..", "packages", "cli", "runtime"), resolve3(import.meta.dir, "..", "packages", "cli", "runtime", "protocol", "schemas"))
+    buildRuntimeAssetSource(resolve4(import.meta.dir, "..", "runtime"), resolve4(import.meta.dir, "..", "runtime", "protocol", "schemas")),
+    buildRuntimeAssetSource(resolve4(import.meta.dir, ".."), resolve4(import.meta.dir, "..", "packages", "protocol", "src", "schemas")),
+    buildRuntimeAssetSource(resolve4(import.meta.dir, "..", "packages", "cli", "runtime"), resolve4(import.meta.dir, "..", "packages", "cli", "runtime", "protocol", "schemas"))
   ];
   for (const candidate of candidates) {
     if (isCompleteRuntimeAssetSource(candidate))
@@ -1237,12 +1372,12 @@ function resolveBundledRuntimeAssetSource() {
   return null;
 }
 function looksLikeMonitoringHubBuild(root) {
-  return existsSync3(join2(root, "index.html")) && existsSync3(join2(root, "_expo"));
+  return existsSync4(join2(root, "index.html")) && existsSync4(join2(root, "_expo"));
 }
 function resolveBundledMonitoringHubRoot() {
   const candidates = [
-    resolve3(import.meta.dir, "..", "monitor-ui"),
-    resolve3(import.meta.dir, "..", "packages", "cli", "monitor-ui")
+    resolve4(import.meta.dir, "..", "monitor-ui"),
+    resolve4(import.meta.dir, "..", "packages", "cli", "monitor-ui")
   ];
   for (const candidate of candidates) {
     if (looksLikeMonitoringHubBuild(candidate))
@@ -1252,12 +1387,12 @@ function resolveBundledMonitoringHubRoot() {
 }
 function resolveCliSourceCheckoutRoot() {
   const candidates = [
-    resolve3(import.meta.dir, ".."),
-    resolve3(import.meta.dir, "..", ".."),
-    resolve3(import.meta.dir, "..", "..", "..")
+    resolve4(import.meta.dir, ".."),
+    resolve4(import.meta.dir, "..", ".."),
+    resolve4(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"))) {
+    if (existsSync4(join2(candidate, "package.json")) && existsSync4(join2(candidate, "apps", "client", "app.json")) && existsSync4(join2(candidate, "scripts", "sync-cli-monitor-ui.ts"))) {
       return candidate;
     }
   }
@@ -1287,7 +1422,7 @@ async function ensureBundledMonitoringHubRoot() {
   return resolveBundledMonitoringHubRoot();
 }
 function repoLooksLikePushPalsSourceCheckout(repoRoot) {
-  return existsSync3(join2(repoRoot, "configs", "default.toml")) || existsSync3(join2(repoRoot, "config", "default.toml"));
+  return existsSync4(join2(repoRoot, "configs", "default.toml")) || existsSync4(join2(repoRoot, "config", "default.toml"));
 }
 function parseSemverFromPackageVersion(value) {
   const raw = String(value ?? "").trim();
@@ -1325,6 +1460,7 @@ async function resolveRuntimeReleaseTag(explicitTag) {
   if (fromEnv)
     return fromEnv;
   const packageVersion = parseSemverFromPackageVersion(process.env.PUSHPALS_CLI_PACKAGE_VERSION);
+  console.log("[pushpals] Resolving embedded runtime release tag from GitHub...");
   try {
     return await fetchLatestReleaseTag();
   } catch (err) {
@@ -1337,7 +1473,7 @@ async function resolveRuntimeReleaseTag(explicitTag) {
   }
 }
 function writeTextFileIfMissing(pathValue, text) {
-  if (existsSync3(pathValue))
+  if (existsSync4(pathValue))
     return;
   mkdirSync(dirname(pathValue), { recursive: true });
   writeFileSync(pathValue, text, "utf8");
@@ -1380,8 +1516,8 @@ function seedRuntimePreflightAssets(runtimeRoot) {
   writeTextFileIfMissing(join2(runtimeRoot, ".env"), `# Local PushPals runtime environment
 `);
   const localExamplePath = join2(runtimeRoot, "configs", "local.example.toml");
-  if (existsSync3(localExamplePath)) {
-    writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), readFileSync3(localExamplePath, "utf8"));
+  if (existsSync4(localExamplePath)) {
+    writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), readFileSync4(localExamplePath, "utf8"));
   } else {
     writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), `# Local PushPals runtime overrides
 `);
@@ -1395,6 +1531,7 @@ async function fetchTextFromUrl(url, timeoutMs = 20000) {
   return await response.text();
 }
 async function downloadRuntimeAssetsFromSourceTag(runtimeRoot, tag) {
+  console.log(`[pushpals] Downloading embedded runtime assets from source tag ${tag}...`);
   const treeUrl = `${GITHUB_API_URL}/git/trees/${encodeURIComponent(tag)}?recursive=1`;
   const treeResponse = await fetchWithTimeout(treeUrl, { headers: GITHUB_HEADERS }, 30000);
   if (!treeResponse.ok) {
@@ -1415,16 +1552,19 @@ async function downloadRuntimeAssetsFromSourceTag(runtimeRoot, tag) {
   }
 }
 async function ensureRuntimeAssets(runtimeRoot, runtimeTag) {
+  console.log(`[pushpals] Preparing embedded runtime assets for ${runtimeTag}...`);
   const markerPath = join2(runtimeRoot, ".runtime-assets-tag");
-  const currentTag = existsSync3(markerPath) ? readFileSync3(markerPath, "utf8").trim() : "";
+  const currentTag = existsSync4(markerPath) ? readFileSync4(markerPath, "utf8").trim() : "";
   const protocolSchemasDir = join2(runtimeRoot, "protocol", "schemas");
-  const hasProtocolSchemas = existsSync3(join2(protocolSchemasDir, "envelope.schema.json")) && existsSync3(join2(protocolSchemasDir, "events.schema.json"));
-  const hasAssets = existsSync3(join2(runtimeRoot, ".env.example")) && existsSync3(join2(runtimeRoot, "vision.example.md")) && existsSync3(join2(runtimeRoot, "configs", "default.toml")) && existsSync3(join2(runtimeRoot, "prompts")) && hasProtocolSchemas;
+  const hasProtocolSchemas = existsSync4(join2(protocolSchemasDir, "envelope.schema.json")) && existsSync4(join2(protocolSchemasDir, "events.schema.json"));
+  const hasAssets = existsSync4(join2(runtimeRoot, ".env.example")) && existsSync4(join2(runtimeRoot, "vision.example.md")) && existsSync4(join2(runtimeRoot, "configs", "default.toml")) && existsSync4(join2(runtimeRoot, "prompts")) && hasProtocolSchemas;
   if (!hasAssets || currentTag !== runtimeTag) {
+    console.log(`[pushpals] Embedded runtime assets ${hasAssets ? "are stale" : "are missing"}; refreshing bundle...`);
     copyBundledRuntimeAssets(runtimeRoot);
-    const hasProtocolSchemasAfterCopy = existsSync3(join2(protocolSchemasDir, "envelope.schema.json")) && existsSync3(join2(protocolSchemasDir, "events.schema.json"));
-    const hasAssetsAfterCopy = existsSync3(join2(runtimeRoot, ".env.example")) && existsSync3(join2(runtimeRoot, "vision.example.md")) && existsSync3(join2(runtimeRoot, "configs", "default.toml")) && existsSync3(join2(runtimeRoot, "prompts")) && hasProtocolSchemasAfterCopy;
+    const hasProtocolSchemasAfterCopy = existsSync4(join2(protocolSchemasDir, "envelope.schema.json")) && existsSync4(join2(protocolSchemasDir, "events.schema.json"));
+    const hasAssetsAfterCopy = existsSync4(join2(runtimeRoot, ".env.example")) && existsSync4(join2(runtimeRoot, "vision.example.md")) && existsSync4(join2(runtimeRoot, "configs", "default.toml")) && existsSync4(join2(runtimeRoot, "prompts")) && hasProtocolSchemasAfterCopy;
     if (!hasAssetsAfterCopy) {
+      console.log("[pushpals] Bundled runtime assets are incomplete; falling back to release source downloads...");
       await downloadRuntimeAssetsFromSourceTag(runtimeRoot, runtimeTag);
     }
     writeFileSync(markerPath, `${runtimeTag}
@@ -1433,18 +1573,19 @@ async function ensureRuntimeAssets(runtimeRoot, runtimeTag) {
   writeTextFileIfMissing(join2(runtimeRoot, ".env"), `# Local PushPals runtime environment
 `);
   const localExamplePath = join2(runtimeRoot, "configs", "local.example.toml");
-  if (existsSync3(localExamplePath)) {
-    writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), readFileSync3(localExamplePath, "utf8"));
+  if (existsSync4(localExamplePath)) {
+    writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), readFileSync4(localExamplePath, "utf8"));
   } else {
     writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), `# Local PushPals runtime overrides
 `);
   }
+  console.log("[pushpals] Embedded runtime assets are ready.");
 }
 function resolveDeferredRuntimeTagHint(explicitTag) {
   return String(explicitTag || process.env.PUSHPALS_RUNTIME_TAG || "").trim();
 }
 async function prepareCliRuntime(opts) {
-  const runtimeRoot = resolve3(opts.runtimeRoot || process.env.PUSHPALS_RUNTIME_ROOT || resolveDefaultRuntimeRoot());
+  const runtimeRoot = resolve4(opts.runtimeRoot || process.env.PUSHPALS_RUNTIME_ROOT || resolveDefaultRuntimeRoot());
   if (repoLooksLikePushPalsSourceCheckout(opts.repoRoot)) {
     return {
       runtimeRoot,
@@ -1496,6 +1637,7 @@ function buildEmbeddedRuntimeEnv(baseEnv, opts) {
       PUSHPALS_PROMPTS_ROOT_OVERRIDE: opts.repoRoot
     },
     PUSHPALS_PROTOCOL_SCHEMAS_DIR: join2(opts.runtimeRoot, "protocol", "schemas"),
+    ...opts.forceLocalBuddyEnabled ? { LOCALBUDDY_ENABLED: "1" } : {},
     ...typeof env.PUSHPALS_GIT_BIN === "string" && env.PUSHPALS_GIT_BIN.trim() ? { PUSHPALS_GIT_BIN: env.PUSHPALS_GIT_BIN.trim() } : {}
   };
 }
@@ -1551,9 +1693,9 @@ function timestampFileToken() {
   return new Date().toISOString().replace(/[:.]/g, "-");
 }
 function readLogTail(logPath, maxLines = 40) {
-  if (!existsSync3(logPath))
+  if (!existsSync4(logPath))
     return "";
-  const raw = readFileSync3(logPath, "utf8");
+  const raw = readFileSync4(logPath, "utf8");
   const lines = raw.split(/\r?\n/).map((line) => line.trimEnd()).filter((line) => line.length > 0);
   if (lines.length === 0)
     return "";
@@ -1561,6 +1703,7 @@ function readLogTail(logPath, maxLines = 40) {
 `);
 }
 async function downloadBinaryAsset(tag, assetName, outPath) {
+  console.log(`[pushpals] Downloading embedded runtime binary ${assetName} from ${tag}...`);
   const url = `${GITHUB_RELEASE_URL}/${encodeURIComponent(tag)}/${assetName}`;
   const response = await fetchWithTimeout(url, { headers: GITHUB_HEADERS }, 60000);
   if (!response.ok) {
@@ -1572,6 +1715,7 @@ async function downloadBinaryAsset(tag, assetName, outPath) {
 }
 async function ensureRuntimeBinaries(runtimeRoot, runtimeTag) {
   const platformKey = resolveRuntimePlatformKey();
+  console.log(`[pushpals] Preparing embedded runtime binaries for ${runtimeTag} (${platformKey})...`);
   const binDir = join2(runtimeRoot, "bin", `${runtimeTag}-${platformKey}`);
   mkdirSync(binDir, { recursive: true });
   const runtimeBinaries = {
@@ -1586,11 +1730,13 @@ async function ensureRuntimeBinaries(runtimeRoot, runtimeTag) {
     runtimeBinaries.remotebuddy,
     runtimeBinaries.sourceControlManager
   ];
+  let downloadedCount = 0;
   for (const binaryPath of requiredAssets) {
-    if (existsSync3(binaryPath))
+    if (existsSync4(binaryPath))
       continue;
     const assetName = binaryPath.split(/[\\/]/).pop() || "";
     await downloadBinaryAsset(runtimeTag, assetName, binaryPath);
+    downloadedCount++;
   }
   if (process.platform !== "win32") {
     for (const binaryPath of requiredAssets) {
@@ -1599,6 +1745,12 @@ async function ensureRuntimeBinaries(runtimeRoot, runtimeTag) {
       } catch {}
     }
   }
+  if (downloadedCount === 0) {
+    console.log("[pushpals] Embedded runtime binaries are already present.");
+  } else {
+    console.log(`[pushpals] Embedded runtime binaries downloaded: ${downloadedCount}.`);
+  }
+  console.log("[pushpals] Embedded runtime binaries are ready.");
   return runtimeBinaries;
 }
 function spawnRuntimeService(name, command, cwd, env, logPath) {
@@ -1676,6 +1828,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";
 }
@@ -1738,18 +1918,34 @@ async function fetchJsonWithTimeout(url, init = {}, timeoutMs = HTTP_TIMEOUT_MS)
     return null;
   }
 }
-function authHeaders(authToken) {
-  if (!authToken)
-    return {};
-  return { Authorization: `Bearer ${authToken}` };
+function buildClientTransportQuery(cursor, client) {
+  const params = new URLSearchParams;
+  if (cursor > 0)
+    params.set("after", String(cursor));
+  params.set("clientId", client.clientId);
+  params.set("clientKind", client.kind);
+  params.set("clientLabel", client.label);
+  params.set("clientVersion", client.version);
+  params.set("clientPlatform", client.platform);
+  params.set("clientRepoRoot", client.repoRoot);
+  const query = params.toString();
+  return query ? `?${query}` : "";
 }
-async function probeLocalBuddy(localAgentUrl, authToken) {
-  return await fetchJsonWithTimeout(`${localAgentUrl}/healthz`, { headers: authHeaders(authToken) }, LOCALBUDDY_TIMEOUT_MS);
+function createRuntimeClientId(prefix) {
+  if (typeof crypto?.randomUUID === "function") {
+    return `${prefix}-${crypto.randomUUID()}`;
+  }
+  return `${prefix}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+}
+async function probeLocalBuddy(localAgentUrl) {
+  return await fetchJsonWithTimeout(`${localAgentUrl}/healthz`, {}, LOCALBUDDY_TIMEOUT_MS);
 }
 async function autoStartRuntimeServices(opts) {
   const { runtimePreflight } = opts.preparedRuntime;
   const runtimeRoot = opts.preparedRuntime.runtimeRoot;
   const runtimeTag = opts.preparedRuntime.runtimeTag || await resolveRuntimeReleaseTag(opts.requestedRuntimeTag);
+  const requireLocalBuddy = opts.requireLocalBuddy ?? true;
+  const localBuddyEnabled = requireLocalBuddy || Boolean(runtimePreflight.config.localbuddy.enabled);
   console.log(`[pushpals] LocalBuddy unavailable. Auto-starting runtime for repo: ${opts.repoRoot}`);
   console.log(`[pushpals] runtimeRoot=${runtimeRoot}`);
   console.log(`[pushpals] runtimeTag=${runtimeTag}`);
@@ -1761,11 +1957,15 @@ async function autoStartRuntimeServices(opts) {
   const runtimeEnv = buildEmbeddedRuntimeEnv(process.env, {
     repoRoot: opts.repoRoot,
     runtimeRoot,
-    useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime
+    useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime,
+    forceLocalBuddyEnabled: requireLocalBuddy
   });
+  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();
@@ -1805,10 +2005,17 @@ ${tail}` : ""}`);
   } else {
     console.log("[pushpals] Server already healthy; skipping embedded server start.");
   }
-  console.log("[pushpals] Starting embedded LocalBuddy...");
-  const localbuddyService = spawnRuntimeService("localbuddy", [runtimeBinaries.localbuddy], opts.repoRoot, runtimeEnv, logPathFor("localbuddy"));
-  services.push(localbuddyService);
-  console.log(`[pushpals] localbuddy log: ${localbuddyService.logPath}`);
+  if (localBuddyEnabled) {
+    if (requireLocalBuddy && !runtimePreflight.config.localbuddy.enabled) {
+      console.log("[pushpals] LocalBuddy is disabled in config; forcing it on for this CLI session.");
+    }
+    console.log("[pushpals] Starting embedded LocalBuddy...");
+    const localbuddyService = spawnRuntimeService("localbuddy", [runtimeBinaries.localbuddy], opts.repoRoot, runtimeEnv, logPathFor("localbuddy"));
+    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] Starting embedded RemoteBuddy...");
   const remotebuddyService = spawnRuntimeService("remotebuddy", [runtimeBinaries.remotebuddy], opts.repoRoot, runtimeEnv, logPathFor("remotebuddy"));
   services.push(remotebuddyService);
@@ -1858,8 +2065,8 @@ ${tail2}`);
 ${tail}` : ""}`);
       }
     }
-    const health = await probeLocalBuddy(opts.localAgentUrl, opts.authToken);
-    if (health?.ok) {
+    const health = localBuddyEnabled ? await probeLocalBuddy(opts.localAgentUrl) : null;
+    if (!requireLocalBuddy || localBuddyEnabled && health?.ok) {
       const stabilityDeadline = Date.now() + DEFAULT_SERVICE_STABILITY_GRACE_MS;
       while (Date.now() < stabilityDeadline) {
         for (let i = services.length - 1;i >= 0; i--) {
@@ -1890,13 +2097,16 @@ ${tail}` : ""}`);
     await Bun.sleep(DEFAULT_RUNTIME_BOOT_POLL_MS);
   }
   stopRuntimeServices(services);
+  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`);
 }
 function readCliState(pathValue) {
-  if (!existsSync3(pathValue))
+  if (!existsSync4(pathValue))
     return {};
   try {
-    const raw = readFileSync3(pathValue, "utf8");
+    const raw = readFileSync4(pathValue, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object")
       return {};
@@ -1922,6 +2132,9 @@ function writeCliState(pathValue, state) {
   writeFileSync(pathValue, `${JSON.stringify(payload, null, 2)}
 `, "utf8");
 }
+function resolveCliStatePath(repoRoot) {
+  return resolveGitStateFilePath(repoRoot, "pushpals-cli-state.json");
+}
 async function looksLikeMonitoringHub(url) {
   try {
     const response = await fetchWithTimeout(url, {}, 700);
@@ -1942,7 +2155,9 @@ function buildMonitoringHubRuntimeBootstrap(opts) {
     serverUrl: opts.serverUrl,
     localAgentUrl: opts.localAgentUrl,
     sessionId: opts.sessionId,
-    authToken: opts.authToken
+    clientId: `cli-monitor-${opts.sessionId}`,
+    clientKind: "cli_monitor",
+    clientLabel: "CLI Monitor"
   };
 }
 function injectMonitoringHubBootstrap(html, bootstrap) {
@@ -1983,19 +2198,19 @@ function monitoringHubContentType(pathValue) {
   }
 }
 function resolveMonitoringHubAssetPath(assetRoot, pathname) {
-  const root = resolve3(assetRoot);
+  const root = resolve4(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);
+  const candidatePath = resolve4(root, relativePath);
   if (candidatePath !== root && !candidatePath.startsWith(rootPrefix))
     return null;
-  if (existsSync3(candidatePath))
+  if (existsSync4(candidatePath))
     return candidatePath;
   if (!extname(relativePath)) {
-    const nestedIndexPath = resolve3(root, relativePath, "index.html");
-    if ((nestedIndexPath === root || nestedIndexPath.startsWith(rootPrefix)) && existsSync3(nestedIndexPath)) {
+    const nestedIndexPath = resolve4(root, relativePath, "index.html");
+    if ((nestedIndexPath === root || nestedIndexPath.startsWith(rootPrefix)) && existsSync4(nestedIndexPath)) {
       return nestedIndexPath;
     }
     return join2(root, "index.html");
@@ -2004,10 +2219,10 @@ function resolveMonitoringHubAssetPath(assetRoot, pathname) {
 }
 async function serveBundledMonitoringHub(assetRoot, pathname, bootstrap) {
   const assetPath = resolveMonitoringHubAssetPath(assetRoot, pathname);
-  if (!assetPath || !existsSync3(assetPath))
+  if (!assetPath || !existsSync4(assetPath))
     return null;
   if (assetPath.endsWith("index.html")) {
-    const html = injectMonitoringHubBootstrap(readFileSync3(assetPath, "utf8"), bootstrap);
+    const html = injectMonitoringHubBootstrap(readFileSync4(assetPath, "utf8"), bootstrap);
     return new Response(html, {
       headers: {
         "content-type": "text/html; charset=utf-8",
@@ -2156,9 +2371,9 @@ function buildEmbeddedMonitoringHubHtml(opts) {
 </body>
 </html>`;
 }
-async function proxyMonitoringHubRequest(serverUrl, authToken, pathValue) {
+async function proxyMonitoringHubRequest(serverUrl, pathValue) {
   const target = `${serverUrl}${pathValue}`;
-  const upstream = await fetchWithTimeout(target, { headers: authHeaders(authToken) }, 1e4);
+  const upstream = await fetchWithTimeout(target, {}, 1e4);
   const body = await upstream.text();
   return new Response(body, {
     status: upstream.status,
@@ -2177,14 +2392,14 @@ async function startEmbeddedMonitoringHub(opts) {
   const bootstrap = buildMonitoringHubRuntimeBootstrap({
     serverUrl: opts.serverUrl,
     localAgentUrl: opts.localAgentUrl,
-    sessionId: opts.sessionId,
-    authToken: opts.authToken
+    sessionId: opts.sessionId
   });
   const candidatePorts = Array.from({ length: MONITOR_SCAN_PORTS }, (_, index) => opts.preferredPort + index).concat(0);
   for (const port of candidatePorts) {
     try {
       const server = Bun.serve({
         port,
+        hostname: "127.0.0.1",
         idleTimeout: 30,
         fetch: async (req) => {
           const url = new URL(req.url);
@@ -2197,16 +2412,16 @@ async function startEmbeddedMonitoringHub(opts) {
             });
           }
           if (url.pathname === "/api/status") {
-            return await proxyMonitoringHubRequest(opts.serverUrl, opts.authToken, "/system/status");
+            return await proxyMonitoringHubRequest(opts.serverUrl, "/system/status");
           }
           if (url.pathname === "/api/requests") {
-            return await proxyMonitoringHubRequest(opts.serverUrl, opts.authToken, "/requests?status=all&limit=20");
+            return await proxyMonitoringHubRequest(opts.serverUrl, "/requests?status=all&limit=20");
           }
           if (url.pathname === "/api/jobs") {
-            return await proxyMonitoringHubRequest(opts.serverUrl, opts.authToken, "/jobs?status=all&limit=20");
+            return await proxyMonitoringHubRequest(opts.serverUrl, "/jobs?status=all&limit=20");
           }
           if (url.pathname === "/api/completions") {
-            return await proxyMonitoringHubRequest(opts.serverUrl, opts.authToken, "/completions?status=all&limit=20");
+            return await proxyMonitoringHubRequest(opts.serverUrl, "/completions?status=all&limit=20");
           }
           const bundledResponse = await serveBundledMonitoringHub(monitoringHubAssetRoot, url.pathname, bootstrap);
           if (bundledResponse)
@@ -2227,10 +2442,13 @@ async function startEmbeddedMonitoringHub(opts) {
 async function resolveMonitoringHub(opts) {
   const explicit = normalizeUrl(opts.preferredUrl);
   if (explicit) {
-    if (await looksLikeMonitoringHub(explicit)) {
+    if (!isLoopbackUrl(explicit)) {
+      console.warn(`[pushpals] Preferred monitoring hub ${explicit} is not local; ignoring it and starting a local monitor instead.`);
+    } else if (await looksLikeMonitoringHub(explicit)) {
       return { url: explicit, port: 0, stop: () => {}, embedded: false };
+    } else {
+      console.warn(`[pushpals] Preferred monitoring hub ${explicit} is unavailable; starting embedded monitor instead.`);
     }
-    console.warn(`[pushpals] Preferred monitoring hub ${explicit} is unavailable; starting embedded monitor instead.`);
   }
   for (let port = opts.fallbackPort;port < opts.fallbackPort + MONITOR_SCAN_PORTS; port++) {
     const candidate = `http://127.0.0.1:${port}`;
@@ -2350,12 +2568,11 @@ function formatSessionEventLine(event) {
   }
   return null;
 }
-async function runSessionStream(serverUrl, sessionId, authToken, print, signal) {
+async function runSessionStream(serverUrl, sessionId, client, print, signal) {
   let cursor = 0;
   while (!signal.aborted) {
-    const headers = authHeaders(authToken);
     try {
-      const response = await fetchWithTimeout(`${serverUrl}/sessions/${encodeURIComponent(sessionId)}/events${cursor > 0 ? `?after=${cursor}` : ""}`, { headers }, 15000);
+      const response = await fetchWithTimeout(`${serverUrl}/sessions/${encodeURIComponent(sessionId)}/events${buildClientTransportQuery(cursor, client)}`, {}, 15000);
       if (!response.ok || !response.body) {
         print(`[pushpals] Session stream unavailable: HTTP ${response.status}`);
         await Bun.sleep(SSE_RECONNECT_MS);
@@ -2469,10 +2686,9 @@ async function main() {
     process.exit(1);
   }
   const config = preparedRuntime.runtimePreflight.config;
-  const serverUrl = normalizeUrl(parsed.serverUrl ?? process.env.PUSHPALS_SERVER_URL, config.server.url);
-  const localAgentUrl = normalizeUrl(parsed.localAgentUrl ?? process.env.EXPO_PUBLIC_LOCAL_AGENT_URL, config.client.localAgentUrl);
+  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 authToken = config.authToken;
   let autoStartedServices = [];
   const stopAutoStartedServices = () => {
     if (autoStartedServices.length === 0)
@@ -2480,8 +2696,10 @@ async function main() {
     stopRuntimeServices(autoStartedServices);
     autoStartedServices = [];
   };
-  let health = await probeLocalBuddy(localAgentUrl, authToken);
-  if (!health?.ok && !parsed.noAutoStart) {
+  let serverHealthy = await probeServer(serverUrl);
+  let health = await probeLocalBuddy(localAgentUrl);
+  const runtimeNeedsAutoStart = parsed.runtimeOnly ? !serverHealthy : !health?.ok;
+  if (runtimeNeedsAutoStart && !parsed.noAutoStart) {
     try {
       autoStartedServices = await autoStartRuntimeServices({
         repoRoot,
@@ -2489,45 +2707,58 @@ async function main() {
         localAgentUrl,
         sourceControlManagerPort: config.sourceControlManager.port,
         sourceControlManagerRemote: config.sourceControlManager.remote,
-        authToken,
         preparedRuntime,
-        requestedRuntimeTag: parsed.runtimeTag
+        requestedRuntimeTag: parsed.runtimeTag,
+        requireLocalBuddy: !parsed.runtimeOnly
       });
-      health = await probeLocalBuddy(localAgentUrl, authToken);
+      serverHealthy = await probeServer(serverUrl);
+      health = await probeLocalBuddy(localAgentUrl);
     } catch (err) {
       console.error(`[pushpals] Auto-start failed: ${String(err)}`);
       stopAutoStartedServices();
     }
   }
-  if (!health?.ok) {
-    console.error(`[pushpals] LocalBuddy is unavailable at ${localAgentUrl}.`);
+  if (parsed.runtimeOnly && !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 LocalBuddy online.");
+      console.error("[pushpals] Auto-start could not bring the embedded runtime online.");
     }
     process.exit(1);
   }
-  const localBuddyRepo = health.repo ? resolve3(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.");
+  if (!parsed.runtimeOnly && !health?.ok) {
+    console.error(`[pushpals] LocalBuddy is unavailable at ${localAgentUrl}.`);
+    if (parsed.noAutoStart) {
+      console.error("[pushpals] Auto-start is disabled (--no-auto-start).");
+    } else {
+      console.error("[pushpals] Auto-start could not bring LocalBuddy online.");
+    }
     process.exit(1);
   }
-  const 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}.`);
+  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 = resolve3(repoRoot, ".git", "pushpals-cli-state.json");
-  const saved = readCliState(statePath);
+  const statePath = resolveCliStatePath(repoRoot);
+  const saved = statePath ? readCliState(statePath) : {};
   const preferredHubUrl = normalizeUrl(parsed.monitoringHubUrl ?? process.env.PUSHPALS_MONITOR_URL ?? saved.monitoringHubUrl ?? "");
   const monitorPort = parsePositiveInt(process.env.PUSHPALS_CLIENT_PORT, DEFAULT_MONITOR_PORT);
   const monitoringHub = await resolveMonitoringHub({
@@ -2535,32 +2766,48 @@ async function main() {
     fallbackPort: monitorPort,
     serverUrl,
     localAgentUrl,
-    sessionId: localBuddySessionId,
-    authToken
+    sessionId: localBuddySessionId
   });
   const monitoringHubUrl = monitoringHub?.url ?? "";
-  writeCliState(statePath, {
-    monitoringHubUrl: monitoringHubUrl || undefined,
-    serverUrl,
-    localAgentUrl,
-    sessionId: localBuddySessionId,
-    repoRoot
-  });
+  if (statePath) {
+    writeCliState(statePath, {
+      monitoringHubUrl: monitoringHubUrl || undefined,
+      serverUrl,
+      localAgentUrl,
+      sessionId: localBuddySessionId,
+      repoRoot
+    });
+  } else {
+    console.warn("[pushpals] Could not resolve git metadata dir; skipping CLI state persistence.");
+  }
   console.log("[pushpals] Connected.");
   if (monitoringHubUrl) {
-    console.log(`monitoringHubUrl=${monitoringHubUrl}`);
+    console.log(`[pushpals] monitoringHubUrl=${monitoringHubUrl}`);
     if (monitoringHub?.embedded) {
       console.log("[pushpals] Embedded monitoring hub is running.");
     }
   } else {
-    console.log("monitoringHubUrl=unavailable");
-  }
-  console.log(`serverUrl=${serverUrl}`);
-  console.log(`localAgentUrl=${localAgentUrl}`);
-  console.log(`sessionId=${localBuddySessionId}`);
-  console.log(`repoRoot=${repoRoot}`);
-  console.log(`cliStateFile=${statePath}`);
-  console.log("[pushpals] Type a message and press Enter. Use /exit or exit to quit.");
+    console.log("[pushpals] monitoringHubUrl=unavailable");
+  }
+  console.log(`[pushpals] serverUrl=${serverUrl}`);
+  console.log(`[pushpals] localAgentUrl=${localAgentUrl}`);
+  console.log(`[pushpals] sessionId=${localBuddySessionId}`);
+  console.log(`[pushpals] repoRoot=${repoRoot}`);
+  console.log(`[pushpals] cliStateFile=${statePath ?? "unavailable"}`);
+  if (parsed.runtimeOnly) {
+    console.log("[pushpals] runtimeOnly=true");
+  } 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) => {
@@ -2575,7 +2822,7 @@ ${line}
     }
     console.log(line);
   };
-  const streamTask = parsed.noStream ? Promise.resolve() : runSessionStream(serverUrl, localBuddySessionId, authToken, printIncoming, streamAbort.signal);
+  const streamTask = parsed.noStream ? Promise.resolve() : parsed.runtimeOnly ? Promise.resolve() : runSessionStream(serverUrl, localBuddySessionId, cliClient, printIncoming, streamAbort.signal);
   let shuttingDown = false;
   const requestStop = () => {
     if (shuttingDown)
@@ -2596,6 +2843,39 @@ ${line}
   process.once("SIGINT", requestStop);
   process.once("SIGTERM", requestStop);
   process.once("exit", requestStop);
+  if (parsed.runtimeOnly) {
+    console.log("[pushpals] Runtime-only mode is active. Send `exit` on stdin or terminate the process to stop.");
+    await new Promise((resolveStop) => {
+      let resolved = false;
+      const finish = () => {
+        if (resolved)
+          return;
+        resolved = true;
+        resolveStop();
+      };
+      process.once("SIGINT", finish);
+      process.once("SIGTERM", finish);
+      const runtimeOnlyInput = createInterface({
+        input: process.stdin,
+        output: process.stdout,
+        terminal: false
+      });
+      runtimeOnlyInput.on("line", (line) => {
+        if (!isCliExitCommand(line))
+          return;
+        requestStop();
+        runtimeOnlyInput.close();
+        finish();
+      });
+      runtimeOnlyInput.on("close", () => {
+        requestStop();
+        finish();
+      });
+    });
+    requestStop();
+    await Promise.race([streamTask, Bun.sleep(2000)]);
+    return;
+  }
   rl = createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -2614,16 +2894,16 @@ ${line}
       break;
     }
     if (text === "/hub") {
-      console.log(monitoringHubUrl ? `monitoringHubUrl=${monitoringHubUrl}` : "monitoringHubUrl=unavailable");
+      console.log(monitoringHubUrl ? `[pushpals] monitoringHubUrl=${monitoringHubUrl}` : "[pushpals] monitoringHubUrl=unavailable");
       rl.prompt();
       continue;
     }
     if (text === "/status") {
-      console.log(`serverUrl=${serverUrl}`);
-      console.log(`localAgentUrl=${localAgentUrl}`);
-      console.log(`sessionId=${localBuddySessionId}`);
-      console.log(`repoRoot=${repoRoot}`);
-      console.log(monitoringHubUrl ? `monitoringHubUrl=${monitoringHubUrl}` : "monitoringHubUrl=unavailable");
+      console.log(`[pushpals] serverUrl=${serverUrl}`);
+      console.log(`[pushpals] localAgentUrl=${localAgentUrl}`);
+      console.log(`[pushpals] sessionId=${localBuddySessionId}`);
+      console.log(`[pushpals] repoRoot=${repoRoot}`);
+      console.log(monitoringHubUrl ? `[pushpals] monitoringHubUrl=${monitoringHubUrl}` : "[pushpals] monitoringHubUrl=unavailable");
       rl.prompt();
       continue;
     }
@@ -2656,14 +2936,17 @@ if (import.meta.main) {
 export {
   startEmbeddedMonitoringHub,
   resolveCommandPath,
+  resolveCliStatePath,
   resolveBundledRuntimeAssetSource,
   resolveBundledMonitoringHubRoot,
   prepareCliRuntime,
   normalizeChildProcessEnv,
   isCliExitCommand,
   injectMonitoringHubBootstrap,
+  formatTimestampedCliLine,
   buildServiceStopCommand,
   buildOpenMonitoringHubCommand,
   buildEmbeddedRuntimeEnv,
-  buildEmbeddedMonitoringHubHtml
+  buildEmbeddedMonitoringHubHtml,
+  applyResolvedGitBinaryToRuntimeEnv
 };