@indigoai-us/hq-cloud 6.11.10 → 6.11.12

package/dist/bin/sync-runner.d.ts

@@ -346,6 +346,8 @@ export interface RunnerDeps {
     createVaultClient?: (config: VaultServiceConfig) => VaultClientSurface;
     /** Sync function. Defaults to `cli/sync.sync`. */
     sync?: (options: SyncOptions) => Promise<SyncResult>;
+    /** Internal: set when runRunner is invoked under the per-root operation lock. */
+    operationLockAlreadyHeld?: boolean;
     /** Share function (push phase). Defaults to `cli/share.share`. */
     share?: (options: ShareOptions) => Promise<ShareResult>;
     /**

package/dist/bin/sync-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-runner.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync-runner.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner.ts"],"names":[],"mappings":"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"}

package/dist/bin/sync-runner.js

@@ -71,7 +71,7 @@ import { collectAndSendTelemetry } from "../telemetry.js";
 import { collectAndSendSkillTelemetry } from "../skill-telemetry.js";
 import { reindexAfterSync } from "../qmd-reindex.js";
 import { pruneConflictIndex } from "../lib/conflict-index.js";
-import { withOperationLock, OperationLockedError, OPERATION_LOCKED_EXIT, } from "../operation-lock.js";
+import { acquireOperationLock, withOperationLock, OperationLockedError, OPERATION_LOCKED_EXIT, } from "../operation-lock.js";
 import { describeError } from "../lib/describe-error.js";
 import { getOrCreateMachineId } from "../lib/machine-id.js";
 import { TreeWatcher, WatchPushDriver, systemClock, } from "../watcher.js";
@@ -763,6 +763,7 @@ export async function runRunner(argv, deps = {}) {
         // rows land on the right company regardless of which phase emitted them.
         // Also updates `state` for `progress` events so the rollup has accurate
         // partial counts even if the sync function throws before returning.
+        let companyHadTransferError = false;
         const tagAndEmit = (event) => {
             if (event.type === "plan") {
                 emit({
@@ -810,6 +811,11 @@ export async function runRunner(argv, deps = {}) {
                 });
             }
             else if (event.type === "error") {
+                companyHadTransferError = true;
+                errors.push({
+                    company: companyLabel,
+                    message: event.path ? `${event.path}: ${event.message}` : event.message,
+                });
                 emit({
                     type: "error",
                     company: companyLabel,
@@ -1026,6 +1032,9 @@ export async function runRunner(argv, deps = {}) {
                             teamSyncedSlugs,
                         }
                         : {}),
+                    ...(deps.operationLockAlreadyHeld
+                        ? { operationLockAlreadyHeld: true }
+                        : {}),
                     onEvent: tagAndEmit,
                 });
             }
@@ -1059,7 +1068,11 @@ export async function runRunner(argv, deps = {}) {
             state.bytesDownloaded = pullResult.bytesDownloaded;
             state.filesUploaded = pushResult.filesUploaded;
             state.bytesUploaded = pushResult.bytesUploaded;
-            state.status = aborted ? "aborted" : "complete";
+            state.status = companyHadTransferError
+                ? "errored"
+                : aborted
+                    ? "aborted"
+                    : "complete";
             emit({
                 type: "complete",
                 company: companyLabel,
@@ -1335,6 +1348,22 @@ export function buildTargetedPushArgv(route, baseArgv) {
     }
     return ["--companies", "--direction", "push", ...carried];
 }
+function routeKey(route) {
+    return route.kind === "company" ? `company:${route.slug}` : "personal";
+}
+function routesForBatch(batch) {
+    const routes = new Map();
+    for (const relPath of batch.paths.values()) {
+        const route = routeChangeToTarget(relPath);
+        if (!route)
+            continue;
+        routes.set(routeKey(route), route);
+    }
+    return routes;
+}
+function buildFullFanoutPushArgv(baseArgv) {
+    return ["--companies", "--direction", "push", ...carriedFlags(baseArgv)];
+}
 /**
  * Build the argv for a targeted PULL pass from a routed change (US-009 — the
  * receiver's pull-on-event path). Mirrors {@link buildTargetedPushArgv} but
@@ -1354,14 +1383,12 @@ export function buildTargetedPullArgv(route, baseArgv) {
     return ["--companies", "--direction", "pull", ...carried];
 }
 export async function runRunnerWithLoop(argv, deps = {}) {
+    const parsed = parseArgs(argv);
     if (!argv.includes("--watch")) {
         // One-shot cloud sync — take the per-root operation lock so it is mutually
-        // exclusive with rescue/reindex. The `--watch` path below is the push
-        // watcher and is intentionally EXEMPT (it neither takes nor is blocked by
-        // the lock; its in-process targeted passes call `runRunner` directly, not
-        // through here). If args don't parse, fall through to `runRunner` so it
-        // surfaces the parse error rather than us masking it with a lock failure.
-        const parsed = parseArgs(argv);
+        // exclusive with rescue/reindex. If args don't parse, fall through to
+        // `runRunner` so it surfaces the parse error rather than us masking it
+        // with a lock failure.
         if ("error" in parsed)
             return runRunner(argv);
         // The actual sync pass — same seam the watch loop uses (deps.runPass),
@@ -1371,7 +1398,8 @@ export async function runRunnerWithLoop(argv, deps = {}) {
         // (feedback_28a1833f): instant-sync one-shots used to exit 17 and die on
         // a lock conflict with the ~1-min reindex hook; they now WAIT (default)
         // and proceed once the short holder releases.
-        const runOnce = deps.runPass ?? ((passArgv) => runRunner(passArgv));
+        const runOnce = deps.runPass ??
+            ((passArgv) => runRunner(passArgv, { operationLockAlreadyHeld: true }));
         try {
             return await withOperationLock(parsed.hqRoot, "sync", () => runOnce(argv), {
                 timeoutSec: parsed.lockTimeoutSec,
@@ -1392,9 +1420,12 @@ export async function runRunnerWithLoop(argv, deps = {}) {
             throw err;
         }
     }
+    if ("error" in parsed)
+        return runRunner(argv);
     const sleep = deps.sleep ??
         ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
-    const runPass = deps.runPass ?? ((passArgv) => runRunner(passArgv));
+    const runPass = deps.runPass ??
+        ((passArgv) => runRunner(passArgv, { operationLockAlreadyHeld: true }));
     const pollIdx = argv.indexOf("--poll-remote-ms");
     const pollMs = pollIdx >= 0 && argv[pollIdx + 1] ? Number(argv[pollIdx + 1]) : 600_000;
     const eventPush = argv.includes("--event-push");
@@ -1407,8 +1438,7 @@ export async function runRunnerWithLoop(argv, deps = {}) {
     // watch filter correctly in companies mode. personalMode is only for a
     // personal-vault-as-root run, where companies/ et al. genuinely aren't synced.
     const companiesMode = argv.includes("--companies");
-    const hqIdx = argv.indexOf("--hq-root");
-    const hqRoot = hqIdx >= 0 && argv[hqIdx + 1] ? argv[hqIdx + 1] : DEFAULT_HQ_ROOT;
+    const hqRoot = parsed.hqRoot;
     // Strip the loop-only flags before delegating: the parser inside runRunner
     // accepts --watch/--poll-remote-ms/--event-push, but we don't want a per-
     // iteration pass to think it's re-entering watch mode.
@@ -1423,30 +1453,166 @@ export async function runRunnerWithLoop(argv, deps = {}) {
             return false;
         return true;
     });
-    // ---- shared in-flight guard ------------------------------------------
-    // The poll loop AND watcher-triggered targeted pushes funnel through this
-    // mutex so a watcher push never overlaps an in-flight pass (PRD AC). A
-    // trigger that arrives while a pass runs is collapsed by WatchPushDriver's
-    // own pending-while-pushing logic, then re-armed after the pass settles.
-    let inFlight = false;
-    let stopped = false;
-    const runGuarded = async (pass) => {
-        if (inFlight)
-            return "skipped";
-        inFlight = true;
+    if (parsed.lockTimeoutSec === 0) {
+        try {
+            const handle = acquireOperationLock(hqRoot, "sync", {
+                timeoutSec: 0,
+                onWaitStart: () => undefined,
+            });
+            handle.release();
+        }
+        catch (err) {
+            if (err instanceof OperationLockedError) {
+                process.stderr.write(err.message + "\n");
+                return OPERATION_LOCKED_EXIT;
+            }
+            throw err;
+        }
+    }
+    const runPassWithLock = async (passArgvForRun) => {
         try {
-            return await pass();
+            const handle = acquireOperationLock(hqRoot, "sync", {
+                timeoutSec: 0,
+                onWaitStart: () => undefined,
+            });
+            try {
+                return await runPass(passArgvForRun);
+            }
+            finally {
+                handle.release();
+            }
         }
-        finally {
-            inFlight = false;
+        catch (err) {
+            if (!(err instanceof OperationLockedError))
+                throw err;
+            if (parsed.lockTimeoutSec === 0) {
+                process.stderr.write(err.message + "\n");
+                return OPERATION_LOCKED_EXIT;
+            }
+        }
+        try {
+            return await withOperationLock(hqRoot, "sync", () => runPass(passArgvForRun), { timeoutSec: parsed.lockTimeoutSec });
+        }
+        catch (err) {
+            if (err instanceof OperationLockedError) {
+                process.stderr.write(err.message + "\n");
+                return OPERATION_LOCKED_EXIT;
+            }
+            throw err;
         }
     };
+    // ---- shared pass queue -----------------------------------------------
+    // The poll loop, pull-on-event receiver, and watcher-triggered pushes all
+    // funnel through this queue so local/remote triggers never overlap, and a
+    // trigger arriving during an active pass runs immediately after it instead
+    // of being dropped.
+    let stopped = false;
+    let activePass = null;
+    const pendingPasses = [];
+    const resolveStoppedQueue = () => {
+        while (pendingPasses.length > 0) {
+            pendingPasses.shift()?.resolve(0);
+        }
+    };
+    const drainQueuedPasses = () => {
+        if (activePass !== null)
+            return;
+        if (stopped) {
+            resolveStoppedQueue();
+            return;
+        }
+        const next = pendingPasses.shift();
+        if (!next)
+            return;
+        const current = startGuardedPass(next.argv);
+        void current.then(next.resolve, next.reject);
+    };
+    const startGuardedPass = (passArgvForRun) => {
+        const current = stopped
+            ? Promise.resolve(0)
+            : runPassWithLock(passArgvForRun);
+        activePass = current;
+        void current
+            .finally(() => {
+            if (activePass === current) {
+                activePass = null;
+                drainQueuedPasses();
+            }
+        })
+            .catch(() => undefined);
+        return current;
+    };
+    const runGuarded = (passArgvForRun) => {
+        if (activePass === null && pendingPasses.length === 0) {
+            return startGuardedPass(passArgvForRun);
+        }
+        return new Promise((resolve, reject) => {
+            pendingPasses.push({ argv: passArgvForRun, resolve, reject });
+            drainQueuedPasses();
+        });
+    };
     // ---- event-push wiring (Phase 1) -------------------------------------
     let watcher = null;
     let driver = null;
     let detachSignal = null;
-    let lastChangedRel = null;
-    let lastBatch = null;
+    const pendingWatcherPaths = new Map();
+    let pendingWatcherOriginalBatch = null;
+    let pendingWatcherBareChange = false;
+    let pendingWatcherOverflowed = false;
+    let pendingWatcherDroppedPaths = 0;
+    let pendingWatcherDroppedBytes = 0;
+    const addPendingWatcherChange = (changedRelPath, batch) => {
+        if (batch) {
+            pendingWatcherOriginalBatch =
+                pendingWatcherPaths.size === 0 &&
+                    !pendingWatcherBareChange &&
+                    !pendingWatcherOverflowed &&
+                    !batch.overflowed
+                    ? batch
+                    : null;
+            for (const [absolutePath, relativePath] of batch.paths.entries()) {
+                pendingWatcherPaths.set(absolutePath, relativePath);
+            }
+            if (batch.overflowed) {
+                pendingWatcherOverflowed = true;
+                pendingWatcherDroppedPaths += batch.droppedPaths ?? 0;
+                pendingWatcherDroppedBytes += batch.droppedBytes ?? 0;
+            }
+            return;
+        }
+        if (changedRelPath) {
+            pendingWatcherOriginalBatch = null;
+            pendingWatcherPaths.set(path.join(hqRoot, changedRelPath), changedRelPath);
+            return;
+        }
+        pendingWatcherOriginalBatch = null;
+        pendingWatcherBareChange = true;
+    };
+    const takePendingWatcherChange = () => {
+        const batch = pendingWatcherOriginalBatch !== null && !pendingWatcherOverflowed
+            ? pendingWatcherOriginalBatch
+            : pendingWatcherPaths.size > 0 || pendingWatcherOverflowed
+                ? {
+                    paths: new Map(pendingWatcherPaths),
+                    ...(pendingWatcherOverflowed
+                        ? {
+                            overflowed: true,
+                            droppedPaths: pendingWatcherDroppedPaths,
+                            droppedBytes: pendingWatcherDroppedBytes,
+                        }
+                        : {}),
+                }
+                : null;
+        const rel = [...pendingWatcherPaths.values()][0] ?? null;
+        const fallbackRel = rel ?? (pendingWatcherBareChange ? null : null);
+        pendingWatcherPaths.clear();
+        pendingWatcherOriginalBatch = null;
+        pendingWatcherBareChange = false;
+        pendingWatcherOverflowed = false;
+        pendingWatcherDroppedPaths = 0;
+        pendingWatcherDroppedBytes = 0;
+        return { rel: fallbackRel, batch };
+    };
     // ---- pull-on-event receiver (Phase 2, US-009) ------------------------
     // Started after the watcher, disposed before the watcher (mirror of the
     // PushTransport ordering). Dormant by default: the default factory returns
@@ -1480,25 +1646,37 @@ export async function runRunnerWithLoop(argv, deps = {}) {
             push: async () => {
                 if (stopped)
                     return;
-                const rel = lastChangedRel;
-                // Snapshot the settled batch BEFORE the await: a change landing
-                // mid-pass overwrites lastBatch for the NEXT pass, and this pass
-                // must only announce what it actually pushed.
-                const batchForPublish = lastBatch;
-                lastBatch = null;
-                const route = rel
-                    ? routeChangeToTarget(rel)
-                    : { kind: "personal" };
-                if (!route)
-                    return;
-                const targetedArgv = buildTargetedPushArgv(route, passArgv);
-                const result = await runGuarded(() => runPass(targetedArgv));
+                // Snapshot accumulated watcher work BEFORE the await. Changes landing
+                // mid-pass are accumulated for the NEXT pass instead of overwriting
+                // this pass's publish target.
+                const { rel, batch: batchForPublish } = takePendingWatcherChange();
+                const batchRoutes = batchForPublish
+                    ? routesForBatch(batchForPublish)
+                    : new Map();
+                let targetedArgv;
+                if (batchForPublish?.overflowed || batchRoutes.size > 1) {
+                    targetedArgv = buildFullFanoutPushArgv(passArgv);
+                }
+                else {
+                    const route = batchRoutes.size === 1
+                        ? [...batchRoutes.values()][0]
+                        : rel
+                            ? routeChangeToTarget(rel)
+                            : { kind: "personal" };
+                    if (!route)
+                        return;
+                    targetedArgv = buildTargetedPushArgv(route, passArgv);
+                }
+                const result = await runGuarded(targetedArgv);
                 // Phase 3 (US-017): publish PushEvents only AFTER the targeted push
                 // pass succeeded — an event must never announce bytes that are not
-                // in S3 yet. A skipped pass (guard held) or a failed pass publishes
-                // nothing; the cadence poll covers the miss. Fall back to a
-                // single-path batch when the watcher emitted a bare path signal.
-                if (result === 0 && eventSync) {
+                // in S3 yet. A failed pass publishes nothing; queued passes run after
+                // the active pass instead of dropping the watcher-triggered push. Fall
+                // back to a single-path batch when the watcher emitted a bare path
+                // signal. Overflowed batches deliberately publish nothing because the
+                // exact path set was dropped; the full fanout push plus cadence poll is
+                // the resync signal.
+                if (result === 0 && !stopped && eventSync && !batchForPublish?.overflowed) {
                     const batch = batchForPublish ??
                         (rel ? { paths: new Map([[path.join(hqRoot, rel), rel]]) } : null);
                     if (batch)
@@ -1514,8 +1692,7 @@ export async function runRunnerWithLoop(argv, deps = {}) {
         watcher.onChange((changedRelPath, batch) => {
             if (stopped)
                 return;
-            lastChangedRel = changedRelPath ?? null;
-            lastBatch = batch ?? null;
+            addPendingWatcherChange(changedRelPath, batch);
             driver?.notifyChange();
         });
         watcher.start();
@@ -1533,7 +1710,10 @@ export async function runRunnerWithLoop(argv, deps = {}) {
             if (!route)
                 return;
             const targetedArgv = buildTargetedPullArgv(route, passArgv);
-            await runGuarded(() => runPass(targetedArgv));
+            const result = await runGuarded(targetedArgv);
+            if (result !== 0) {
+                throw new Error(`targeted pull failed with exit code ${result}`);
+            }
         };
         const createReceiver = deps.createReceiver ?? (() => new NoopPushReceiver());
         receiver = createReceiver({ syncFn: receiverSyncFn, hqRoot });
@@ -1608,6 +1788,7 @@ export async function runRunnerWithLoop(argv, deps = {}) {
         if (stopped)
             return;
         stopped = true;
+        resolveStoppedQueue();
         // Dispose the receiver FIRST (mirror of the PushTransport ordering:
         // inbound subscription torn down before the watcher) so no new
         // pull-on-event fires mid-teardown. dispose() is async (it drains the
@@ -1656,10 +1837,8 @@ export async function runRunnerWithLoop(argv, deps = {}) {
     detachSignal = onShutdownSignal(shutdown);
     try {
         while (!stopped) {
-            const result = await runGuarded(() => runPass(passArgv));
-            // A poll pass that was skipped because a watcher push held the guard is
-            // benign — the next iteration retries after the poll interval.
-            if (typeof result === "number" && result !== 0) {
+            const result = await runGuarded(passArgv);
+            if (result !== 0) {
                 return result;
             }
             // Sleep the poll interval, but wake early on shutdown so SIGTERM stops