@indigoai-us/hq-cli 5.268.0 → 5.270.0

package/dist/utils/local-files-overview.js

@@ -11,10 +11,11 @@
  * cross the wire; there is no string field on it for anything sensitive to
  * hide inside.
  *
- * Sources (metadata only, via `fs.stat` — full content is read only for the
+ * Sources (metadata only, via `fs.lstat` — full content is read only for the
  * bounded error-line count below, and even then only a capped tail window,
  * and even then only an integer count is ever returned):
- *   - the hq-sync desktop app's log file, `~/.hq/logs/hq-sync.log`
+ *   - the newest available desktop or daemon sync-log family and its rotations
+ *     under `~/.hq/logs/` or `~/.hq/daemon/logs/`
  *   - the CLI's own per-company sync journals, enumerated via `listJournals()`
  *     (never a hand-reconstructed path — see client-health.ts's note on the
  *     single-path-reconstruction regression this mirrors).
@@ -28,6 +29,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { listJournals } from "@indigoai-us/hq-cloud";
+import { currentSyncLogFamily, SYNC_LOG_GENERATIONS, syncLogBasePaths, syncLogGenerationPath, } from "./sync-log-sources.js";
 import { CLIENT_HEALTH_MAX_ERROR_LINE_COUNT, CLIENT_HEALTH_MAX_FILE_AGE_SECONDS, CLIENT_HEALTH_MAX_FILE_SIZE_BYTES, } from "./client-health-contract.js";
 /**
  * Only the last N bytes of the sync log are read for error-line counting —
@@ -37,7 +39,8 @@ import { CLIENT_HEALTH_MAX_ERROR_LINE_COUNT, CLIENT_HEALTH_MAX_FILE_AGE_SECONDS,
 export const LOCAL_FILES_OVERVIEW_TAIL_READ_BYTES = 2 * 1024 * 1024; // 2 MiB
 /** Case-insensitive marker matched against each line (or JSON-lines `level`). */
 const ERROR_MARKER = /error/i;
-const JSON_LEVEL_ERROR = /"level"\s*:\s*"error"/i;
+const JSON_LEVEL_ERROR = /"level"\s*:\s*"error"\s*(?=[,}])/i;
+const JSON_NUMERIC_LEVEL = /"level"\s*:\s*(-?\d+(?:\.\d+)?)\s*(?=[,}])/;
 const ABSENT = { exists: false, sizeBytes: 0, ageSeconds: 0 };
 function clampInt(value, max) {
     if (!Number.isFinite(value) || value < 0)
@@ -102,6 +105,12 @@ export function countRecentErrorLines(filePath, maxBytes = LOCAL_FILES_OVERVIEW_
         for (const line of text.split("\n")) {
             if (count >= cap)
                 break;
+            const numericLevel = JSON_NUMERIC_LEVEL.exec(line)?.[1];
+            if (numericLevel !== undefined) {
+                if (Number(numericLevel) >= 50)
+                    count += 1;
+                continue;
+            }
             if (ERROR_MARKER.test(line) || JSON_LEVEL_ERROR.test(line))
                 count += 1;
         }
@@ -133,9 +142,41 @@ export function collectLocalFilesOverview(deps = {}) {
     const nowMs = now.getTime();
     const homeDir = (deps.homeDir ?? os.homedir)();
     const countErrorLines = deps.countErrorLines ?? countRecentErrorLines;
-    const syncLogPath = path.join(homeDir, ".hq", "logs", "hq-sync.log");
-    const syncLogFacts = statFacts(syncLogPath, nowMs);
-    const recentErrorLineCount = syncLogFacts.exists ? countErrorLines(syncLogPath) : 0;
+    const hqDir = path.join(homeDir, ".hq");
+    const syncLogPaths = syncLogBasePaths(hqDir, deps.env);
+    const generations = {
+        desktop: [],
+        daemon: [],
+    };
+    const familyModifiedMs = (family) => {
+        let newest = null;
+        for (let generation = 0; generation < SYNC_LOG_GENERATIONS; generation += 1) {
+            const file = syncLogGenerationPath(syncLogPaths[family], generation);
+            try {
+                const stat = fs.lstatSync(file);
+                if (!stat.isFile())
+                    continue;
+                generations[family].push({ file, modifiedMs: stat.mtimeMs });
+                newest = newest === null ? stat.mtimeMs : Math.max(newest, stat.mtimeMs);
+            }
+            catch {
+                // Missing, denied, or raced generations are absent from this overview.
+            }
+        }
+        return newest;
+    };
+    const family = currentSyncLogFamily(familyModifiedMs("desktop"), familyModifiedMs("daemon"));
+    const selectedFamily = family ?? "desktop";
+    const selectedFiles = generations[selectedFamily];
+    const activePath = syncLogPaths[selectedFamily];
+    const activeFacts = statFacts(activePath, nowMs);
+    const freshestGeneration = [...selectedFiles].sort((a, b) => b.modifiedMs - a.modifiedMs)[0];
+    const syncLogPath = activeFacts.exists ? activePath : freshestGeneration?.file;
+    const syncLogFacts = syncLogPath ? statFacts(syncLogPath, nowMs) : ABSENT;
+    let recentErrorLineCount = 0;
+    for (const generation of selectedFiles) {
+        recentErrorLineCount = Math.min(CLIENT_HEALTH_MAX_ERROR_LINE_COUNT, recentErrorLineCount + countErrorLines(generation.file));
+    }
     let journalEntries;
     try {
         journalEntries = (deps.journals ?? listJournals)();

package/dist/utils/sync-log-sources.d.ts

@@ -0,0 +1,15 @@
+/** Stable relative names used for feedback attachments. */
+export declare const SYNC_LOG_RELATIVE_PATHS: {
+    readonly desktop: "logs/hq-sync.log";
+    readonly daemon: "daemon/logs/sync.log";
+};
+export type SyncLogFamily = keyof typeof SYNC_LOG_RELATIVE_PATHS;
+/** Read the active file plus the three retained rotations. */
+export declare const SYNC_LOG_GENERATIONS = 4;
+/** Resolve both sync-log families, honoring the daemon's configured root. */
+export declare function syncLogBasePaths(hqDir: string, env?: NodeJS.ProcessEnv): Record<SyncLogFamily, string>;
+export declare function syncLogGenerationPath(basePath: string, generation: number): string;
+export declare function syncLogFamilyForRelativePath(name: string): SyncLogFamily | null;
+/** Choose the most recently written family; desktop wins a timestamp tie. */
+export declare function currentSyncLogFamily(desktopModifiedMs: number | null, daemonModifiedMs: number | null): SyncLogFamily | null;
+//# sourceMappingURL=sync-log-sources.d.ts.map

package/dist/utils/sync-log-sources.js

@@ -0,0 +1,36 @@
+import * as path from "node:path";
+import { daemonPaths } from "../lib/daemon/paths.js";
+/** Stable relative names used for feedback attachments. */
+export const SYNC_LOG_RELATIVE_PATHS = {
+    desktop: "logs/hq-sync.log",
+    daemon: "daemon/logs/sync.log",
+};
+/** Read the active file plus the three retained rotations. */
+export const SYNC_LOG_GENERATIONS = 4;
+/** Resolve both sync-log families, honoring the daemon's configured root. */
+export function syncLogBasePaths(hqDir, env = process.env) {
+    const daemonLogDir = daemonPaths(path.dirname(hqDir), env).logsDir;
+    return {
+        desktop: path.join(hqDir, SYNC_LOG_RELATIVE_PATHS.desktop),
+        daemon: path.join(daemonLogDir, "sync.log"),
+    };
+}
+export function syncLogGenerationPath(basePath, generation) {
+    return generation === 0 ? basePath : `${basePath}.${generation}`;
+}
+export function syncLogFamilyForRelativePath(name) {
+    if (/^logs\/hq-sync\.log(?:\.\d+)?$/.test(name))
+        return "desktop";
+    if (/^daemon\/logs\/sync\.log(?:\.\d+)?$/.test(name))
+        return "daemon";
+    return null;
+}
+/** Choose the most recently written family; desktop wins a timestamp tie. */
+export function currentSyncLogFamily(desktopModifiedMs, daemonModifiedMs) {
+    if (desktopModifiedMs === null)
+        return daemonModifiedMs === null ? null : "daemon";
+    if (daemonModifiedMs === null)
+        return "desktop";
+    return daemonModifiedMs > desktopModifiedMs ? "daemon" : "desktop";
+}
+//# sourceMappingURL=sync-log-sources.js.map

package/dist/utils/version-gate.d.ts

@@ -390,6 +390,7 @@ interface EnforceUpdateDeps {
     performUpdateString?: (command: string) => UpdateResult;
     resolveInstall?: () => RunningInstall;
     runner?: UpdateRunner;
+    platform?: NodeJS.Platform;
     cleanStale?: (prefix: string) => string[];
     acquireLock?: () => UpdateLockHandle | null;
     /**

package/dist/utils/version-gate.js

@@ -1224,7 +1224,12 @@ function attemptRequiredUpdate(decision, deps, install) {
     // Never for pnpm or Bun: elevation changes the package manager's global home,
     // leaving the user's shim untouched while reporting success. A failed
     // non-npm update must surface instead.
-    if (!result.ok && result.code !== "ETIMEDOUT" && primaryCmd && !isManagedOutsideNpm) {
+    const platform = deps.platform ?? process.platform;
+    if (platform !== "win32" &&
+        !result.ok &&
+        result.code !== "ETIMEDOUT" &&
+        primaryCmd &&
+        !isManagedOutsideNpm) {
         console.error(chalk.dim(`  Update failed unprivileged; retrying with: sudo -n ${primaryCmd} ${primaryArgs.join(" ")}`));
         const sudoResult = performUpdateCommand("sudo", ["-n", primaryCmd, ...primaryArgs], runner);
         if (sudoResult.ok)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.268.0",
+  "version": "5.270.0",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {