@bli-cockpit/cli 0.2.18 → 0.2.20

package/dist/autostart.js

@@ -10,6 +10,16 @@ const WINDOWS_AUTOSTART_SCRIPT_NAME = "autostart-sync.ps1";
 const WINDOWS_AUTOSTART_REGISTRATION_SCRIPT_NAME = "autostart-register.ps1";
 const UTF8_BOM = "\uFEFF";
 export const DEFAULT_AUTOSTART_INTERVAL_SECONDS = 15 * 60;
+/**
+ * macOS rewrites this file on every network transition (join, leave, DNS
+ * change), so watching it retries spooled uploads the moment connectivity
+ * returns instead of waiting out the StartInterval \u2014 the lid-closed-mid-upload
+ * machine hopping caf\u00E9s is where most historical upload failures came from
+ * (BLI-2604). The real file, not the /etc/resolv.conf symlink: launchd watches
+ * the path it is given, and the symlink itself never changes. Burst fires are
+ * cheap \u2014 the collection lock turns overlap into a named no-op.
+ */
+export const DARWIN_NETWORK_CHANGE_SIGNAL = "/private/var/run/resolv.conf";
 const UNSUPPORTED_MESSAGE = "autostart is supported on macOS and Windows only";
 function plistPathFor(homeDir) {
     return path.join(homeDir, "Library", "LaunchAgents", `${AUTOSTART_LABEL}.plist`);
@@ -49,8 +59,13 @@ export async function installAutostartAgent(options) {
     const stderrPath = path.join(paths.state_dir, "sync.err.log");
     // launchd will not reliably watch a path that does not exist at load time, so
     // only feed it the transcript dirs that are present right now. A missing dir
-    // is fine — the StartInterval floor still covers it.
-    const watchPaths = await existingWatchPaths(homeDir);
+    // is fine — the StartInterval floor still covers it. The network signal is
+    // appended unconditionally: it always exists on the Macs this plist targets,
+    // and an existence filter would drop it when rendering on another host.
+    const watchPaths = [
+        ...(await existingWatchPaths(homeDir)),
+        DARWIN_NETWORK_CHANGE_SIGNAL,
+    ];
     await mkdir(path.dirname(plistPath), { recursive: true });
     await mkdir(paths.state_dir, { recursive: true });
     await writeFile(plistPath, renderPlist({
@@ -353,8 +368,16 @@ function renderWindowsRegistrationScript(options) {
         `$taskName = ${powershellLiteral(options.taskName)}`,
         `$syncScriptPath = ${powershellLiteral(options.scriptPath)}`,
         "$powershellPath = Join-Path $PSHOME 'powershell.exe'",
-        "$actionArgs = '-NoProfile -NonInteractive -ExecutionPolicy Bypass -File \"' + $syncScriptPath + '\"'",
-        "$taskCommand = '\"' + $powershellPath + '\" ' + $actionArgs",
+        // Windows PowerShell 5.1 passes a native argument's embedded quotes to
+        // CommandLineToArgvW unescaped, so a /TR value with bare quotes falls out
+        // of the quoted region at the first space inside a quoted path:
+        // `C:\Users\Brandon Chiem\...` reached schtasks as a stray `Chiem\...`
+        // argument and /Create exited 0x80004005 on every CLI version (BLI-2598).
+        // Escaping the embedded quotes as \" keeps the whole /TR value one
+        // argument; Task Scheduler still normalizes what it stores (BLI-2541),
+        // which the read-back validator already compares path-wise.
+        "$actionArgs = '-NoProfile -NonInteractive -ExecutionPolicy Bypass -File \\\"' + $syncScriptPath + '\\\"'",
+        "$taskCommand = '\\\"' + $powershellPath + '\\\" ' + $actionArgs",
         `& schtasks.exe /Create /TN $taskName /TR $taskCommand /SC MINUTE /MO ${options.intervalMinutes} /IT /RL LIMITED /F | Out-Null`,
         "if ($LASTEXITCODE -ne 0) { throw \"schtasks /Create exited $LASTEXITCODE\" }",
         "$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew",

package/dist/commands/public-root.js

@@ -15,7 +15,7 @@ export async function runCockpitCli(argv, io) {
   }
 
   if (command === "--version" || command === "-V" || command === "version") {
-    writeLine(io?.stdout ?? process.stdout, "0.2.18");
+    writeLine(io?.stdout ?? process.stdout, "0.2.20");
     return 0;
   }
 

package/dist/health-detail.js

@@ -27,9 +27,24 @@ import { redactSecretLikeContent } from "@bli-cockpit/telemetry-core";
 export const HEALTH_DETAIL_MAX_CHARS = 600;
 const WINDOWS_ABSOLUTE_PATH = /[A-Za-z]:\\[^\s"';]+/gu;
 const UNC_PATH = /\\\\[^\s"';]+/gu;
+// A quoted Windows path may contain spaces; the quotes bound it, so the whole
+// quoted region is the path. Unquoted, the space-blind pattern above stops at
+// the first space — which is how `C:\Users\Brandon Chiem\...` masked to
+// `[path] Chiem\...` and an operator surname reached the server (BLI-2599).
+const QUOTED_WINDOWS_PATH = /"[A-Za-z]:\\[^"]*"/gu;
+const SINGLE_QUOTED_WINDOWS_PATH = /'[A-Za-z]:\\[^']*'/gu;
+// A backslash-joined fragment of three or more segments is path material even
+// without a drive anchor: schtasks echoes a severed path tail as its own token
+// (`Chiem\.local\state\...`, the BLI-2598 receipt). Over-matching here is the
+// safe direction — this boundary exists to keep local identifiers on the
+// machine, not to keep messages pretty.
+const BACKSLASH_PATH_FRAGMENT = /[^\s"';:,()]+(?:\\[^\s"';:,()]+){2,}/gu;
 // An absolute POSIX path of at least two segments. One segment ("/tmp") carries
 // nothing identifying and masking it would make messages harder to read.
 const POSIX_ABSOLUTE_PATH = /\/[\w.@-]+(?:\/[\w.@ -]+)+/gu;
+// The tail a space split off a masked path: `[path] Chiem\...` collapses back
+// into the placeholder it was severed from.
+const PATH_PLACEHOLDER_RUN = /\[path\](?:\s+\[path\])+/gu;
 export function redactedHealthDetail(message) {
     const collapsed = message.replace(/\s+/gu, " ").trim();
     if (!collapsed)
@@ -43,20 +58,28 @@ export function redactedHealthDetail(message) {
         : masked;
 }
 /**
- * Paths first, because a path usually contains the account name; whatever
- * mentions of the host or account survive on their own are masked after.
+ * Identifiers first, so the account name is caught even when it sits inside a
+ * path the path patterns would only partially cover (BLI-2599: the path
+ * pattern stopped at the space in `Brandon Chiem` and the surname survived).
+ * Then quoted paths before unquoted ones, because the quotes are what bound a
+ * space-containing path; then the drive-anchored and fragment patterns; then
+ * adjacent placeholders collapse so a severed path reads as one `[path]`.
  */
 export function maskLocalIdentifiers(value) {
-    let text = value
-        .replace(UNC_PATH, "[path]")
-        .replace(WINDOWS_ABSOLUTE_PATH, "[path]")
-        .replace(POSIX_ABSOLUTE_PATH, "[path]");
+    let text = value;
     for (const [identifier, placeholder] of localIdentifiers()) {
         if (!identifier)
             continue;
         text = text.replace(literalPattern(identifier), placeholder);
     }
-    return text;
+    return text
+        .replace(QUOTED_WINDOWS_PATH, "[path]")
+        .replace(SINGLE_QUOTED_WINDOWS_PATH, "[path]")
+        .replace(UNC_PATH, "[path]")
+        .replace(WINDOWS_ABSOLUTE_PATH, "[path]")
+        .replace(BACKSLASH_PATH_FRAGMENT, "[path]")
+        .replace(POSIX_ABSOLUTE_PATH, "[path]")
+        .replace(PATH_PLACEHOLDER_RUN, "[path]");
 }
 function localIdentifiers() {
     const identifiers = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "private": false,
   "type": "module",
   "bin": {