@indigoai-us/hq-cli 5.345.163 → 5.345.164

package/dist/lib/mesh/live/daemon/work-subscribe.js

@@ -4,46 +4,67 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { randomUUID } from "node:crypto";
 import { createPersonalRealtimeFetcher, } from "./credentials.js";
 import { presignIotWssUrl } from "./presign.js";
 import { applyProjectViewPush, parseProjectViewPush } from "./live-cache.js";
 import { backoffDelayMs, RECONNECT_MIN_DELAY_MS } from "./presence.js";
-import { AGENT_INBOX_PUSH_STATE_BASENAME } from "../paths.js";
-export { AGENT_INBOX_PUSH_STATE_BASENAME } from "../paths.js";
+import { AGENT_INBOX_PUSH_STATE_BASENAME, SYNC_WAKE_STATE_BASENAME } from "../paths.js";
+export { AGENT_INBOX_PUSH_STATE_BASENAME, SYNC_WAKE_STATE_BASENAME } from "../paths.js";
 const INBOX_PUSH_HEARTBEAT_MS = 5_000;
-function readInboxWakeSequence(meshRoot, onInfo) {
-    const target = path.join(meshRoot, AGENT_INBOX_PUSH_STATE_BASENAME);
+function readWakeSequence(meshRoot, basename, label, onInfo) {
+    const target = path.join(meshRoot, basename);
     try {
         const info = fs.lstatSync(target);
         if (!info.isFile() || info.isSymbolicLink()) {
-            onInfo?.("agent inbox push state read ignored (not a regular file)");
-            return 0;
+            onInfo?.(`${label} state read ignored (not a regular file)`);
+            return { sequence: 0, writable: false };
         }
         const parsed = JSON.parse(fs.readFileSync(target, "utf8"));
         if (Number.isSafeInteger(parsed.wakeSequence) && Number(parsed.wakeSequence) >= 0) {
-            return Number(parsed.wakeSequence);
+            return { sequence: Number(parsed.wakeSequence), writable: true };
         }
-        onInfo?.("agent inbox push state read ignored (invalid wake sequence)");
-        return 0;
+        onInfo?.(`${label} state read ignored (invalid wake sequence)`);
+        return { sequence: 0, writable: false };
     }
     catch (error) {
         if (error.code !== "ENOENT") {
             const name = error instanceof Error ? error.name : "UnknownError";
-            onInfo?.(`agent inbox push state read failed (${name})`);
+            onInfo?.(`${label} state read failed (${name})`);
         }
-        return 0;
+        return { sequence: 0, writable: error.code === "ENOENT" };
     }
 }
-function writeInboxPushState(meshRoot, state) {
+function writeWakeState(meshRoot, basename, state, durable) {
     fs.mkdirSync(meshRoot, { recursive: true, mode: 0o700 });
-    const target = path.join(meshRoot, AGENT_INBOX_PUSH_STATE_BASENAME);
-    const temporary = `${target}.${process.pid}.tmp`;
+    const rootInfo = fs.lstatSync(meshRoot);
+    if (!rootInfo.isDirectory() || rootInfo.isSymbolicLink()) {
+        throw new Error("wake state root is not a regular directory");
+    }
+    const target = path.join(meshRoot, basename);
+    const temporary = path.join(meshRoot, `.${basename}.${process.pid}.${randomUUID()}.tmp`);
+    let file;
     try {
-        fs.writeFileSync(temporary, `${JSON.stringify(state)}\n`, { mode: 0o600 });
-        fs.chmodSync(temporary, 0o600);
+        file = fs.openSync(temporary, fs.constants.O_WRONLY | fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_NOFOLLOW, 0o600);
+        fs.writeFileSync(file, `${JSON.stringify(state)}\n`);
+        if (durable)
+            fs.fsyncSync(file);
+        fs.closeSync(file);
+        file = undefined;
         fs.renameSync(temporary, target);
+        if (durable && process.platform !== "win32") {
+            const directory = fs.openSync(meshRoot, fs.constants.O_RDONLY);
+            try {
+                fs.fsyncSync(directory);
+            }
+            finally {
+                fs.closeSync(directory);
+            }
+        }
     }
     catch (error) {
+        if (file !== undefined)
+            fs.closeSync(file);
         try {
             fs.unlinkSync(temporary);
         }
@@ -79,37 +100,46 @@ export async function startWorkCacheSubscriber(opts) {
     let heartbeatTimer = null;
     let generation = 0;
     let inboxSubscribed = false;
-    let inboxAgentUid;
-    // Carry the sequence forward from the last state marker so a daemon restart
-    // cannot reuse a value the watcher has already consumed.
-    let wakeSequence = readInboxWakeSequence(opts.meshRoot, opts.onInfo);
+    let syncSubscribed = false;
+    let actorUid;
+    let inboxWakeSequence = readWakeSequence(opts.meshRoot, AGENT_INBOX_PUSH_STATE_BASENAME, "agent inbox push", opts.onInfo).sequence;
+    const syncWakeState = readWakeSequence(opts.meshRoot, SYNC_WAKE_STATE_BASENAME, "sync wake", opts.onInfo);
+    let syncWakeSequence = syncWakeState.sequence;
+    const syncStateWritable = syncWakeState.writable;
     const clearInboxHeartbeat = () => {
         if (heartbeatTimer !== null)
             timers.clearTimeout(heartbeatTimer);
         heartbeatTimer = null;
     };
-    const persistInboxState = (connected) => {
+    const persistState = (basename, label, connected, wakeSequence, identity, durable = true) => {
         try {
-            writeInboxPushState(opts.meshRoot, {
+            writeWakeState(opts.meshRoot, basename, {
                 connected,
                 heartbeatAtMs: now().getTime(),
                 wakeSequence,
-                ...(connected && inboxAgentUid ? { agentUid: inboxAgentUid } : {}),
-            });
+                ...(connected && actorUid && identity ? { [identity]: actorUid } : {}),
+            }, durable);
         }
         catch (error) {
             const name = error instanceof Error ? error.name : "UnknownError";
-            opts.onInfo?.(`agent inbox push state write failed (${name})`);
+            opts.onInfo?.(`${label} state write failed (${name})`);
         }
     };
+    const persistInboxState = (connected, durable = true) => persistState(AGENT_INBOX_PUSH_STATE_BASENAME, "agent inbox push", connected, inboxWakeSequence, "agentUid", durable);
+    const persistSyncState = (connected, durable = true) => syncStateWritable
+        ? persistState(SYNC_WAKE_STATE_BASENAME, "sync wake", connected, syncWakeSequence, undefined, durable)
+        : undefined;
     const scheduleInboxHeartbeat = () => {
-        if (stopped || !inboxSubscribed)
+        if (stopped || (!inboxSubscribed && !syncSubscribed))
             return;
         clearInboxHeartbeat();
         heartbeatTimer = timers.setTimeout(() => {
             heartbeatTimer = null;
-            if (!stopped && inboxSubscribed) {
-                persistInboxState(true);
+            if (!stopped && (inboxSubscribed || syncSubscribed)) {
+                if (inboxSubscribed)
+                    persistInboxState(true, false);
+                if (syncSubscribed)
+                    persistSyncState(true, false);
                 scheduleInboxHeartbeat();
             }
         }, INBOX_PUSH_HEARTBEAT_MS);
@@ -118,9 +148,11 @@ export async function startWorkCacheSubscriber(opts) {
         if (stopped)
             return;
         inboxSubscribed = false;
-        inboxAgentUid = undefined;
+        syncSubscribed = false;
+        actorUid = undefined;
         clearInboxHeartbeat();
         persistInboxState(false);
+        persistSyncState(false);
         const gen = ++generation;
         let bundle;
         try {
@@ -137,14 +169,15 @@ export async function startWorkCacheSubscriber(opts) {
             bundle.topics.inbox === `hq/${bundle.actorUid}/inbox`
             ? bundle.topics.inbox
             : undefined;
-        inboxAgentUid = inboxTopic ? bundle.actorUid : undefined;
-        if (!topic && !inboxTopic) {
+        const syncTopic = syncStateWritable ? `hq/${bundle.actorUid}/sync` : undefined;
+        actorUid = inboxTopic || syncTopic ? bundle.actorUid : undefined;
+        if (!topic && !inboxTopic && !syncTopic) {
             opts.onInfo?.("work cache subscribe skipped: credentials have no supported topic");
             return;
         }
         const url = presignIotWssUrl(bundle.credentials, bundle.iotEndpoint, bundle.region, now());
         const next = opts.mqttConnect(url, {
-            clientId: `${bundle.clientId}-work`,
+            clientId: bundle.clientId,
             clean: true,
             reconnectPeriod: 0,
             protocolVersion: 4,
@@ -154,7 +187,8 @@ export async function startWorkCacheSubscriber(opts) {
             if (stopped || gen !== generation)
                 return;
             reconnectLogged = false;
-            let pendingSubscriptions = Number(Boolean(topic)) + Number(Boolean(inboxTopic));
+            let pendingSubscriptions = Number(Boolean(topic)) + Number(Boolean(inboxTopic)) +
+                Number(Boolean(syncTopic));
             let subscriptionFailed = false;
             const finishSubscription = (err) => {
                 if (err) {
@@ -171,6 +205,13 @@ export async function startWorkCacheSubscriber(opts) {
                 if (pendingSubscriptions === 0)
                     attempt = 0;
             };
+            const finishOptionalSubscription = () => {
+                if (subscriptionFailed)
+                    return;
+                pendingSubscriptions -= 1;
+                if (pendingSubscriptions === 0)
+                    attempt = 0;
+            };
             if (topic) {
                 next.subscribe(topic, { qos: 1 }, (err) => finishSubscription(err));
             }
@@ -180,7 +221,6 @@ export async function startWorkCacheSubscriber(opts) {
                         return;
                     if (err) {
                         inboxSubscribed = false;
-                        inboxAgentUid = undefined;
                         clearInboxHeartbeat();
                         persistInboxState(false);
                         opts.onInfo?.("agent inbox push subscribe failed");
@@ -193,17 +233,37 @@ export async function startWorkCacheSubscriber(opts) {
                     finishSubscription();
                 });
             }
+            if (syncTopic) {
+                next.subscribe(syncTopic, { qos: 1 }, (err) => {
+                    if (stopped || gen !== generation)
+                        return;
+                    if (err) {
+                        syncSubscribed = false;
+                        persistSyncState(false);
+                        opts.onInfo?.("sync wake subscribe failed");
+                        finishOptionalSubscription();
+                        return;
+                    }
+                    syncSubscribed = true;
+                    persistSyncState(true);
+                    scheduleInboxHeartbeat();
+                    finishSubscription();
+                });
+            }
         });
         next.on("message", (_topic, payload) => {
             if (stopped || gen !== generation)
                 return;
             if (inboxTopic && _topic === inboxTopic && inboxSubscribed) {
-                // A topic message is a doorbell only. Never parse, persist, or log its
-                // content; the authenticated inbox GET remains the source of truth.
-                wakeSequence += 1;
+                inboxWakeSequence += 1;
                 persistInboxState(true);
                 return;
             }
+            if (syncTopic && _topic === syncTopic && syncSubscribed) {
+                syncWakeSequence += 1;
+                persistSyncState(true);
+                return;
+            }
             if (_topic !== topic)
                 return;
             const push = parseProjectViewPush(payload);
@@ -214,13 +274,33 @@ export async function startWorkCacheSubscriber(opts) {
                 opts.onInfo?.(`project-view cache cursor=${result.cursor} ${push.companyUid}/${push.projectId}`);
             }
         });
+        next.on("error", (_error) => {
+            if (stopped || gen !== generation)
+                return;
+            inboxSubscribed = false;
+            syncSubscribed = false;
+            actorUid = undefined;
+            clearInboxHeartbeat();
+            persistInboxState(false);
+            persistSyncState(false);
+            opts.onInfo?.("work cache mqtt error");
+            schedule();
+            try {
+                next.end(true);
+            }
+            catch {
+                return;
+            }
+        });
         next.on("close", () => {
             if (stopped || gen !== generation)
                 return;
             inboxSubscribed = false;
-            inboxAgentUid = undefined;
+            syncSubscribed = false;
+            actorUid = undefined;
             clearInboxHeartbeat();
             persistInboxState(false);
+            persistSyncState(false);
             schedule();
         });
     };
@@ -250,7 +330,10 @@ export async function startWorkCacheSubscriber(opts) {
                 timers.clearTimeout(timer);
             clearInboxHeartbeat();
             inboxSubscribed = false;
+            syncSubscribed = false;
+            actorUid = undefined;
             persistInboxState(false);
+            persistSyncState(false);
             const current = client;
             client = null;
             if (!current)

package/dist/lib/mesh/live/paths.d.ts

@@ -4,6 +4,7 @@
  */
 /** Content-free sequence file written by the mesh MQTT inbox subscriber. */
 export declare const AGENT_INBOX_PUSH_STATE_BASENAME = "agent-inbox-push.json";
+export declare const SYNC_WAKE_STATE_BASENAME = "sync-wake.json";
 export declare function workMeshRoot(home?: string, env?: NodeJS.ProcessEnv): string;
 export declare function workMeshSpoolPath(root?: string): string;
 export declare function workMeshHeldPath(root?: string): string;

package/dist/lib/mesh/live/paths.js

@@ -7,6 +7,7 @@ import * as path from "node:path";
 const WORK_MESH_DIRNAME = "work-mesh";
 /** Content-free sequence file written by the mesh MQTT inbox subscriber. */
 export const AGENT_INBOX_PUSH_STATE_BASENAME = "agent-inbox-push.json";
+export const SYNC_WAKE_STATE_BASENAME = "sync-wake.json";
 export function workMeshRoot(home = os.homedir(), env = process.env) {
     const override = env.HQ_WORK_MESH_ROOT?.trim();
     if (override)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.345.163",
+  "version": "5.345.164",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {
@@ -114,11 +114,11 @@
     "*.{ts,tsx,mts,cts,js,jsx,mjs,cjs}": "eslint --cache --no-error-on-unmatched-pattern"
   },
   "optionalDependencies": {
-    "@indigoai-us/hq-hook-win32-x64": "5.345.163",
-    "@indigoai-us/hq-hook-win32-arm64": "5.345.163",
-    "@indigoai-us/hq-hook-darwin-x64": "5.345.163",
-    "@indigoai-us/hq-hook-darwin-arm64": "5.345.163",
-    "@indigoai-us/hq-hook-linux-x64": "5.345.163",
-    "@indigoai-us/hq-hook-linux-arm64": "5.345.163"
+    "@indigoai-us/hq-hook-win32-x64": "5.345.164",
+    "@indigoai-us/hq-hook-win32-arm64": "5.345.164",
+    "@indigoai-us/hq-hook-darwin-x64": "5.345.164",
+    "@indigoai-us/hq-hook-darwin-arm64": "5.345.164",
+    "@indigoai-us/hq-hook-linux-x64": "5.345.164",
+    "@indigoai-us/hq-hook-linux-arm64": "5.345.164"
   }
 }