@indigoai-us/hq-cloud 6.16.58-alpha.2 → 6.16.58-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +67 -4
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner-company.test.js +277 -8
- package/dist/bin/sync-runner-company.test.js.map +1 -1
- package/dist/bin/sync-runner-planning.test.js +64 -0
- package/dist/bin/sync-runner-planning.test.js.map +1 -1
- package/dist/bin/sync-runner-watch-loop.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-loop.js +6 -1
- package/dist/bin/sync-runner-watch-loop.js.map +1 -1
- package/dist/bin/sync-runner-watch-routes.d.ts +17 -0
- package/dist/bin/sync-runner-watch-routes.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-routes.js +26 -1
- package/dist/bin/sync-runner-watch-routes.js.map +1 -1
- package/dist/bin/sync-runner-watch-routes.test.js +47 -0
- package/dist/bin/sync-runner-watch-routes.test.js.map +1 -1
- package/dist/bin/sync-runner.d.ts +6 -0
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/bin/sync-runner.test.js +63 -1
- package/dist/bin/sync-runner.test.js.map +1 -1
- package/dist/cli/push-scan-exclusions.test.js +4 -4
- package/dist/cli/push-scan-exclusions.test.js.map +1 -1
- package/dist/cli/share.d.ts +2 -1
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +75 -20
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/share.test.js +95 -4
- package/dist/cli/share.test.js.map +1 -1
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +74 -10
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +40 -0
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/context.d.ts +5 -0
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +92 -12
- package/dist/context.js.map +1 -1
- package/dist/context.test.js +77 -2
- package/dist/context.test.js.map +1 -1
- package/dist/ignore.d.ts +10 -0
- package/dist/ignore.d.ts.map +1 -1
- package/dist/ignore.js +47 -5
- package/dist/ignore.js.map +1 -1
- package/dist/ignore.test.js +30 -3
- package/dist/ignore.test.js.map +1 -1
- package/dist/journal-store.test.js +65 -0
- package/dist/journal-store.test.js.map +1 -1
- package/dist/journal.d.ts +8 -1
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +14 -8
- package/dist/journal.js.map +1 -1
- package/dist/lib/net-errors.d.ts +12 -0
- package/dist/lib/net-errors.d.ts.map +1 -1
- package/dist/lib/net-errors.js +35 -0
- package/dist/lib/net-errors.js.map +1 -1
- package/dist/lib/net-errors.test.js +19 -1
- package/dist/lib/net-errors.test.js.map +1 -1
- package/dist/manifest/build-manifest-resident-parity.test.js +3 -3
- package/dist/manifest/build-manifest-resident-parity.test.js.map +1 -1
- package/dist/sync/area-ledger.d.ts +25 -1
- package/dist/sync/area-ledger.d.ts.map +1 -1
- package/dist/sync/area-ledger.js +88 -10
- package/dist/sync/area-ledger.js.map +1 -1
- package/dist/sync/area-ledger.test.js +102 -0
- package/dist/sync/area-ledger.test.js.map +1 -1
- package/dist/vault-client.d.ts +7 -0
- package/dist/vault-client.d.ts.map +1 -1
- package/dist/vault-client.js +26 -1
- package/dist/vault-client.js.map +1 -1
- package/dist/vault-client.test.js +33 -0
- package/dist/vault-client.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -52,8 +52,8 @@ describe("push-scan personal-vault exclusions", () => {
|
|
|
52
52
|
fs.rmSync(hqRoot, { recursive: true, force: true });
|
|
53
53
|
});
|
|
54
54
|
const buildFilter = () => wrapFilterWithPersonalVaultDefaults(createIgnoreFilter(hqRoot), hqRoot, () => { });
|
|
55
|
-
it("excludes every excluded class from the plan and keeps legit content", () => {
|
|
56
|
-
const collected = collectFiles(computePersonalVaultPaths(hqRoot, {}), hqRoot, hqRoot, buildFilter());
|
|
55
|
+
it("excludes every excluded class from the plan and keeps legit content", async () => {
|
|
56
|
+
const collected = await collectFiles(computePersonalVaultPaths(hqRoot, {}), hqRoot, hqRoot, buildFilter());
|
|
57
57
|
const keys = collected.map((e) => e.relativePath);
|
|
58
58
|
expect(keys).toContain("personal/keep.md");
|
|
59
59
|
expect(keys).toContain("core/policies/p.md");
|
|
@@ -66,10 +66,10 @@ describe("push-scan personal-vault exclusions", () => {
|
|
|
66
66
|
expect(k).not.toMatch(/(^|\/)\.conflict-/);
|
|
67
67
|
}
|
|
68
68
|
});
|
|
69
|
-
it("prunes excluded directories during traversal (never reads inside them)", () => {
|
|
69
|
+
it("prunes excluded directories during traversal (never reads inside them)", async () => {
|
|
70
70
|
const readdirSpy = vi.spyOn(fs, "readdirSync");
|
|
71
71
|
try {
|
|
72
|
-
collectFiles(computePersonalVaultPaths(hqRoot, {}), hqRoot, hqRoot, buildFilter());
|
|
72
|
+
await collectFiles(computePersonalVaultPaths(hqRoot, {}), hqRoot, hqRoot, buildFilter());
|
|
73
73
|
}
|
|
74
74
|
finally {
|
|
75
75
|
// Capture the directories the walk enumerated, then restore.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-scan-exclusions.test.js","sourceRoot":"","sources":["../../src/cli/push-scan-exclusions.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,4EAA4E;AAC5E,2EAA2E;AAC3E,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACrC,MAAM,MAAM,GAAG,MAAM,cAAc,EAAuB,CAAC;IAC3D,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,mCAAmC,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;AAElC,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACnD,IAAI,MAAc,CAAC;IAEnB,MAAM,EAAE,GAAG,CAAC,GAAW,EAAE,IAAI,GAAG,GAAG,EAAE,EAAE;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACnC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC;QAC9D,gCAAgC;QAChC,EAAE,CAAC,kBAAkB,CAAC,CAAC;QACvB,EAAE,CAAC,oBAAoB,CAAC,CAAC;QACzB,EAAE,CAAC,6BAA6B,CAAC,CAAC;QAClC,8DAA8D;QAC9D,EAAE,CAAC,wCAAwC,CAAC,CAAC;QAC7C,EAAE,CAAC,wCAAwC,CAAC,CAAC;QAC7C,EAAE,CAAC,yCAAyC,CAAC,CAAC;QAC9C,EAAE,CAAC,8BAA8B,CAAC,CAAC;QACnC,EAAE,CAAC,mCAAmC,CAAC,CAAC;QACxC,wDAAwD;QACxD,EAAE,CAAC,4CAA4C,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,mCAAmC,CACjC,kBAAkB,CAAC,MAAM,CAAC,EAC1B,MAAM,EACN,GAAG,EAAE,GAAE,CAAC,CACT,CAAC;IAEJ,EAAE,CAAC,qEAAqE,EAAE,
|
|
1
|
+
{"version":3,"file":"push-scan-exclusions.test.js","sourceRoot":"","sources":["../../src/cli/push-scan-exclusions.test.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/share.d.ts
CHANGED
|
@@ -741,6 +741,7 @@ interface CollectHooks {
|
|
|
741
741
|
onUnreachablePath?: (namedPath: string, reason: UnreachablePathReason) => void;
|
|
742
742
|
onLinkedSubtree?: (rel: string) => void;
|
|
743
743
|
onHeartbeat?: () => void;
|
|
744
|
+
cooperativeCheckpoint?: () => Promise<void | boolean>;
|
|
744
745
|
}
|
|
745
746
|
/**
|
|
746
747
|
* Resolve a caller-supplied push path to an absolute path.
|
|
@@ -818,6 +819,6 @@ declare function isWithinLexicalOrReal(parent: string, child: string, hqRoot: st
|
|
|
818
819
|
* Pre-fix, statSync followed the link and the target's bytes were uploaded
|
|
819
820
|
* under the link's key — silently flattening the link topology.
|
|
820
821
|
*/
|
|
821
|
-
declare function collectFiles(paths: string[], hqRoot: string, syncRoot: string, filter: (p: string, isDir?: boolean) => boolean, hooks?: CollectHooks): CollectedEntry[]
|
|
822
|
+
declare function collectFiles(paths: string[], hqRoot: string, syncRoot: string, filter: (p: string, isDir?: boolean) => boolean, hooks?: CollectHooks): Promise<CollectedEntry[]>;
|
|
822
823
|
export {};
|
|
823
824
|
//# sourceMappingURL=share.d.ts.map
|
package/dist/cli/share.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/cli/share.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAe,YAAY,EAAE,MAAM,aAAa,CAAC;AAwBhG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAqC7C,OAAO,KAAK,EAAwC,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAOL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAML,KAAK,0BAA0B,EAChC,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAA4B,KAAK,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAiEtG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,eAAO,MAAM,sBAAsB,QACmD,CAAC;AAEvF;;;;;;;;;GASG;AACH;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,QAAqB,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAElD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;CASpB,CAAC;AAEF;;;;;;;;;GASG;AACH,KAAK,YAAY,GACb;IACE,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IAOb,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B,GACD;IACE,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IAIrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,CAAC,CAAC;CACT,GACD;IACE,MAAM,EAAE,qBAAqB,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IAMrB,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9D,CAAC;AASN;;;;;;;;;GASG;AACH,oDAAoD;AACpD,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AA6CD;;;GAGG;AACH,iBAAS,kBAAkB,CACzB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,YAAY,GAAG,SAAS,GAC9B,OAAO,CAWT;
|
|
1
|
+
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/cli/share.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/share.js
CHANGED
|
@@ -285,6 +285,28 @@ function statMatchesJournal(absolutePath, entry) {
|
|
|
285
285
|
// (journal.ts) so the pull planner applies the identical gate.
|
|
286
286
|
return journalEntryMatchesStat(entry, lstat);
|
|
287
287
|
}
|
|
288
|
+
class CooperativePushHandoff extends Error {
|
|
289
|
+
constructor() {
|
|
290
|
+
super("Realtime work ran at a settled full-push boundary");
|
|
291
|
+
this.name = "CooperativePushHandoff";
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
/**
|
|
295
|
+
* Let watcher ingress run at a bounded row cadence, then hand the full-pass
|
|
296
|
+
* scheduler a mutation-free boundary when it has realtime work waiting. The
|
|
297
|
+
* planner and collector do not mutate durable state, so a true hand-off can
|
|
298
|
+
* safely restart `share()` and rebuild their snapshot.
|
|
299
|
+
*/
|
|
300
|
+
async function yieldToCooperativeCheckpoint(work, cooperativeCheckpoint, force = false) {
|
|
301
|
+
work.rowsSinceYield += 1;
|
|
302
|
+
if (!force && work.rowsSinceYield < FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE)
|
|
303
|
+
return;
|
|
304
|
+
work.rowsSinceYield = 0;
|
|
305
|
+
await new Promise((resolve) => setImmediate(resolve));
|
|
306
|
+
if (cooperativeCheckpoint && (await cooperativeCheckpoint()) === true) {
|
|
307
|
+
throw new CooperativePushHandoff();
|
|
308
|
+
}
|
|
309
|
+
}
|
|
288
310
|
function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
289
311
|
const items = [];
|
|
290
312
|
for (const entry of filesToShare) {
|
|
@@ -433,6 +455,27 @@ function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
|
433
455
|
}
|
|
434
456
|
return { items, filesToUpload, bytesToUpload, filesToSkip };
|
|
435
457
|
}
|
|
458
|
+
/**
|
|
459
|
+
* Build a full-pass plan in bounded row batches. A scoped replan deliberately
|
|
460
|
+
* uses the synchronous single-row planner above, so it does not add an await
|
|
461
|
+
* boundary between upload admissions and collapse the transfer pool.
|
|
462
|
+
*/
|
|
463
|
+
async function computePushPlanCooperatively(filesToShare, journal, skipUnchanged, onHeartbeat, cooperativeCheckpoint) {
|
|
464
|
+
const items = [];
|
|
465
|
+
let filesToUpload = 0;
|
|
466
|
+
let bytesToUpload = 0;
|
|
467
|
+
let filesToSkip = 0;
|
|
468
|
+
const cooperativeWork = { rowsSinceYield: 0 };
|
|
469
|
+
for (let start = 0; start < filesToShare.length; start += FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE) {
|
|
470
|
+
const plan = computePushPlan(filesToShare.slice(start, start + FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE), journal, skipUnchanged, onHeartbeat);
|
|
471
|
+
items.push(...plan.items);
|
|
472
|
+
filesToUpload += plan.filesToUpload;
|
|
473
|
+
bytesToUpload += plan.bytesToUpload;
|
|
474
|
+
filesToSkip += plan.filesToSkip;
|
|
475
|
+
await yieldToCooperativeCheckpoint(cooperativeWork, cooperativeCheckpoint, true);
|
|
476
|
+
}
|
|
477
|
+
return { items, filesToUpload, bytesToUpload, filesToSkip };
|
|
478
|
+
}
|
|
436
479
|
/** Re-read one collected path at the execution seam. */
|
|
437
480
|
function recollectPushEntry(item) {
|
|
438
481
|
let lstat;
|
|
@@ -628,12 +671,6 @@ export function wrapFilterWithIgnoreVisibility(underlying, hqRoot, onIgnoreExclu
|
|
|
628
671
|
return false;
|
|
629
672
|
};
|
|
630
673
|
}
|
|
631
|
-
class CooperativePushHandoff extends Error {
|
|
632
|
-
constructor() {
|
|
633
|
-
super("Realtime work ran at a settled full-push boundary");
|
|
634
|
-
this.name = "CooperativePushHandoff";
|
|
635
|
-
}
|
|
636
|
-
}
|
|
637
674
|
/**
|
|
638
675
|
* Share local file(s) to the entity vault.
|
|
639
676
|
*
|
|
@@ -1486,7 +1523,7 @@ async function reconcileLandedCompanySkill(run, relativePath, content, absoluteP
|
|
|
1486
1523
|
}
|
|
1487
1524
|
}
|
|
1488
1525
|
async function buildSharePlans(run) {
|
|
1489
|
-
const collected = collectFiles(run.paths, run.hqRoot, run.syncRoot, run.shouldSync, {
|
|
1526
|
+
const collected = await collectFiles(run.paths, run.hqRoot, run.syncRoot, run.shouldSync, {
|
|
1490
1527
|
onUnreachablePath: (namedPath, reason) => {
|
|
1491
1528
|
// First reason wins: a path is named once, and re-adding would only
|
|
1492
1529
|
// churn the map ordering the error message and event sample rely on.
|
|
@@ -1496,6 +1533,7 @@ async function buildSharePlans(run) {
|
|
|
1496
1533
|
},
|
|
1497
1534
|
onLinkedSubtree: (rel) => run.linkedSubtreeSet.add(rel),
|
|
1498
1535
|
onHeartbeat: run.options.onHeartbeat,
|
|
1536
|
+
cooperativeCheckpoint: run.options.cooperativeCheckpoint,
|
|
1499
1537
|
});
|
|
1500
1538
|
// Ask #2 of feedback_a51cb63d: "error, not warn-skip, when the named file
|
|
1501
1539
|
// exists locally but is unreachable by the resolver". This is the throw that
|
|
@@ -1578,7 +1616,7 @@ async function buildSharePlans(run) {
|
|
|
1578
1616
|
const uploadableFiles = registrationSkipped.size > 0
|
|
1579
1617
|
? filesToShare.filter((entry) => !registrationSkipped.has(entry.relativePath))
|
|
1580
1618
|
: filesToShare;
|
|
1581
|
-
const pushPlan =
|
|
1619
|
+
const pushPlan = await computePushPlanCooperatively(uploadableFiles, run.journal, run.skipUnchanged === true, run.options.onHeartbeat, run.options.cooperativeCheckpoint);
|
|
1582
1620
|
const deletePlan = run.propagateDeletes === true
|
|
1583
1621
|
? await computeDeletePlan(run.journal, run.syncRoot, deleteScopeRoots, run.shouldSync, run.propagateDeletePolicy, run.ctx, run.options.personalMode !== true)
|
|
1584
1622
|
: { toDelete: [], toTombstone: [], refusedStale: [] };
|
|
@@ -2369,15 +2407,20 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2369
2407
|
// throwUploadWorkerErrors below. In-flight legs still drain.
|
|
2370
2408
|
let sessionAuthAborted = false;
|
|
2371
2409
|
// Cooperative work is admitted in bounded units, then fully drained before
|
|
2372
|
-
// the root lock can change owners.
|
|
2373
|
-
//
|
|
2410
|
+
// the root lock can change owners. A mostly unchanged personal vault can
|
|
2411
|
+
// contain more than a million skip rows, so those rows get an equally
|
|
2412
|
+
// bounded, mutation-free hand-off cadence instead of monopolizing the
|
|
2413
|
+
// scheduler until the full pass ends.
|
|
2374
2414
|
let admittedSinceCooperativeCheckpoint = 0;
|
|
2415
|
+
let skippedSinceCooperativeCheckpoint = 0;
|
|
2375
2416
|
while (queue.length > 0 || inFlight.size > 0) {
|
|
2376
2417
|
while (!aborted &&
|
|
2377
2418
|
!sessionAuthAborted &&
|
|
2378
2419
|
(!run.options.cooperativeCheckpoint ||
|
|
2379
|
-
admittedSinceCooperativeCheckpoint <
|
|
2380
|
-
FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE
|
|
2420
|
+
(admittedSinceCooperativeCheckpoint <
|
|
2421
|
+
FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE &&
|
|
2422
|
+
skippedSinceCooperativeCheckpoint <
|
|
2423
|
+
FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE)) &&
|
|
2381
2424
|
inFlight.size < TRANSFER_CONCURRENCY &&
|
|
2382
2425
|
queue.length > 0) {
|
|
2383
2426
|
const previewItem = queue[0];
|
|
@@ -2385,15 +2428,18 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2385
2428
|
if (item === null) {
|
|
2386
2429
|
queue.shift();
|
|
2387
2430
|
counters.filesSkipped++;
|
|
2431
|
+
skippedSinceCooperativeCheckpoint++;
|
|
2388
2432
|
continue;
|
|
2389
2433
|
}
|
|
2390
2434
|
if (item.action !== "upload") {
|
|
2391
2435
|
queue.shift();
|
|
2392
2436
|
settleFreshSkip(item);
|
|
2437
|
+
skippedSinceCooperativeCheckpoint++;
|
|
2393
2438
|
continue;
|
|
2394
2439
|
}
|
|
2395
2440
|
if (suppressFreshTombstone(item)) {
|
|
2396
2441
|
queue.shift();
|
|
2442
|
+
skippedSinceCooperativeCheckpoint++;
|
|
2397
2443
|
continue;
|
|
2398
2444
|
}
|
|
2399
2445
|
// Reserve the file's CURRENT on-disk size, not the planned size: an
|
|
@@ -2436,16 +2482,21 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2436
2482
|
!aborted &&
|
|
2437
2483
|
!sessionAuthAborted &&
|
|
2438
2484
|
!hadUploadFailure &&
|
|
2439
|
-
admittedSinceCooperativeCheckpoint > 0 &&
|
|
2485
|
+
(admittedSinceCooperativeCheckpoint > 0 || skippedSinceCooperativeCheckpoint > 0) &&
|
|
2440
2486
|
(admittedSinceCooperativeCheckpoint >=
|
|
2441
2487
|
FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE ||
|
|
2488
|
+
skippedSinceCooperativeCheckpoint >=
|
|
2489
|
+
FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE ||
|
|
2442
2490
|
queue.length === 0)) {
|
|
2443
2491
|
// Every admitted upload has settled, so `processUploadItem` has
|
|
2444
|
-
// finished its mutable journal updates. Persist
|
|
2445
|
-
//
|
|
2446
|
-
//
|
|
2447
|
-
|
|
2492
|
+
// finished its mutable journal updates. Persist that durable unit before
|
|
2493
|
+
// yielding. Skip-only units have no new durable state; any in-memory
|
|
2494
|
+
// restamp is safe to recompute after a hand-off restart.
|
|
2495
|
+
if (admittedSinceCooperativeCheckpoint > 0)
|
|
2496
|
+
flushShareJournal(run);
|
|
2448
2497
|
admittedSinceCooperativeCheckpoint = 0;
|
|
2498
|
+
skippedSinceCooperativeCheckpoint = 0;
|
|
2499
|
+
await new Promise((resolve) => setImmediate(resolve));
|
|
2449
2500
|
if ((await run.options.cooperativeCheckpoint()) === true) {
|
|
2450
2501
|
throw new CooperativePushHandoff();
|
|
2451
2502
|
}
|
|
@@ -3644,14 +3695,16 @@ function reportLinkedSubtreeIfExternal(linkPath, syncRoot, relativePath, hooks)
|
|
|
3644
3695
|
* Pre-fix, statSync followed the link and the target's bytes were uploaded
|
|
3645
3696
|
* under the link's key — silently flattening the link topology.
|
|
3646
3697
|
*/
|
|
3647
|
-
function collectFiles(paths, hqRoot, syncRoot, filter, hooks = {}) {
|
|
3698
|
+
async function collectFiles(paths, hqRoot, syncRoot, filter, hooks = {}) {
|
|
3648
3699
|
const results = [];
|
|
3700
|
+
const cooperativeWork = { rowsSinceYield: 0 };
|
|
3649
3701
|
// Scoped to THIS collect pass and discarded with it: a watcher batch can
|
|
3650
3702
|
// name hundreds of paths, and rescanning the companies/ tree for each one
|
|
3651
3703
|
// is wasted I/O. A cache that outlived the pass could fail open on a tenant
|
|
3652
3704
|
// boundary, so it deliberately does not.
|
|
3653
3705
|
const tenantRoots = new Map();
|
|
3654
3706
|
for (const p of paths) {
|
|
3707
|
+
await yieldToCooperativeCheckpoint(cooperativeWork, hooks.cooperativeCheckpoint);
|
|
3655
3708
|
hooks.onHeartbeat?.();
|
|
3656
3709
|
const absolutePath = resolveNamedPath(p, hqRoot, syncRoot);
|
|
3657
3710
|
// Ephemeral artifacts (conflict mirrors) — see EPHEMERAL_PATH_PATTERN doc.
|
|
@@ -3730,7 +3783,7 @@ function collectFiles(paths, hqRoot, syncRoot, filter, hooks = {}) {
|
|
|
3730
3783
|
if (lstat.isDirectory()) {
|
|
3731
3784
|
if (!filter(absolutePath, true))
|
|
3732
3785
|
continue;
|
|
3733
|
-
walkDir(absolutePath, syncRoot, filter, results, hooks);
|
|
3786
|
+
await walkDir(absolutePath, syncRoot, filter, results, hooks, cooperativeWork);
|
|
3734
3787
|
}
|
|
3735
3788
|
else if (lstat.isFile()) {
|
|
3736
3789
|
const relativePath = vaultKeyForLocalPath(syncRoot, absolutePath);
|
|
@@ -3739,9 +3792,10 @@ function collectFiles(paths, hqRoot, syncRoot, filter, hooks = {}) {
|
|
|
3739
3792
|
}
|
|
3740
3793
|
}
|
|
3741
3794
|
}
|
|
3795
|
+
await yieldToCooperativeCheckpoint(cooperativeWork, hooks.cooperativeCheckpoint, true);
|
|
3742
3796
|
return results;
|
|
3743
3797
|
}
|
|
3744
|
-
function walkDir(dir, syncRoot, filter, results, hooks = {}) {
|
|
3798
|
+
async function walkDir(dir, syncRoot, filter, results, hooks = {}, cooperativeWork = { rowsSinceYield: 0 }) {
|
|
3745
3799
|
// A frame per open directory preserves the recursive walk's depth-first
|
|
3746
3800
|
// ordering without turning a completed subtree into one giant call argument
|
|
3747
3801
|
// list. This matters for both operator-visible plan ordering and large trees.
|
|
@@ -3757,6 +3811,7 @@ function walkDir(dir, syncRoot, filter, results, hooks = {}) {
|
|
|
3757
3811
|
};
|
|
3758
3812
|
enterDirectory(dir);
|
|
3759
3813
|
while (stack.length > 0) {
|
|
3814
|
+
await yieldToCooperativeCheckpoint(cooperativeWork, hooks.cooperativeCheckpoint);
|
|
3760
3815
|
hooks.onHeartbeat?.();
|
|
3761
3816
|
const frame = stack[stack.length - 1];
|
|
3762
3817
|
if (frame.index >= frame.entries.length) {
|