@indigoai-us/hq-cloud 6.14.18 → 6.14.20
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/.github/workflows/ci.yml +35 -0
- package/dist/bin/sync-runner-company.d.ts +7 -0
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +21 -1
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner-planning.d.ts.map +1 -1
- package/dist/bin/sync-runner-planning.js +8 -16
- package/dist/bin/sync-runner-planning.js.map +1 -1
- package/dist/bin/sync-runner-planning.test.js +138 -0
- package/dist/bin/sync-runner-planning.test.js.map +1 -1
- package/dist/bin/sync-runner-watch-loop.d.ts +10 -2
- package/dist/bin/sync-runner-watch-loop.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-loop.js +201 -25
- package/dist/bin/sync-runner-watch-loop.js.map +1 -1
- package/dist/bin/sync-runner-watch-routes.d.ts +1 -1
- package/dist/bin/sync-runner-watch-routes.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-routes.js +14 -2
- package/dist/bin/sync-runner-watch-routes.js.map +1 -1
- package/dist/bin/sync-runner.d.ts +17 -2
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +36 -6
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/bin/sync-runner.test.js +550 -3
- package/dist/bin/sync-runner.test.js.map +1 -1
- package/dist/cli/rescue-core.js +27 -1
- package/dist/cli/rescue-core.js.map +1 -1
- package/dist/cli/rescue-drop-dir-symlink.test.d.ts +2 -0
- package/dist/cli/rescue-drop-dir-symlink.test.d.ts.map +1 -0
- package/dist/cli/rescue-drop-dir-symlink.test.js +206 -0
- package/dist/cli/rescue-drop-dir-symlink.test.js.map +1 -0
- package/dist/cli/share.d.ts +15 -0
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +100 -55
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/share.test.js +119 -6
- package/dist/cli/share.test.js.map +1 -1
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +19 -25
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +121 -0
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/journal.d.ts +3 -1
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +13 -2
- package/dist/journal.js.map +1 -1
- package/dist/journal.test.js +26 -1
- package/dist/journal.test.js.map +1 -1
- package/dist/personal-vault.d.ts +12 -0
- package/dist/personal-vault.d.ts.map +1 -1
- package/dist/personal-vault.js +20 -0
- package/dist/personal-vault.js.map +1 -1
- package/dist/qmd-reindex.d.ts +88 -11
- package/dist/qmd-reindex.d.ts.map +1 -1
- package/dist/qmd-reindex.js +354 -65
- package/dist/qmd-reindex.js.map +1 -1
- package/dist/qmd-reindex.test.d.ts +4 -0
- package/dist/qmd-reindex.test.d.ts.map +1 -1
- package/dist/qmd-reindex.test.js +285 -3
- package/dist/qmd-reindex.test.js.map +1 -1
- package/dist/s3.d.ts +13 -0
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +34 -1
- package/dist/s3.js.map +1 -1
- package/dist/s3.test.js +60 -1
- package/dist/s3.test.js.map +1 -1
- package/dist/telemetry.d.ts +22 -0
- package/dist/telemetry.d.ts.map +1 -1
- package/dist/telemetry.js +79 -0
- package/dist/telemetry.js.map +1 -1
- package/dist/telemetry.test.js +117 -1
- package/dist/telemetry.test.js.map +1 -1
- package/dist/watcher.d.ts +26 -1
- package/dist/watcher.d.ts.map +1 -1
- package/dist/watcher.js +75 -12
- package/dist/watcher.js.map +1 -1
- package/package.json +1 -1
- package/src/bin/sync-runner-company.ts +29 -1
- package/src/bin/sync-runner-planning.test.ts +153 -0
- package/src/bin/sync-runner-planning.ts +10 -17
- package/src/bin/sync-runner-watch-loop.ts +322 -32
- package/src/bin/sync-runner-watch-routes.ts +14 -1
- package/src/bin/sync-runner.test.ts +662 -6
- package/src/bin/sync-runner.ts +65 -7
- package/src/cli/rescue-core.ts +26 -1
- package/src/cli/rescue-drop-dir-symlink.test.ts +224 -0
- package/src/cli/share.test.ts +150 -6
- package/src/cli/share.ts +143 -48
- package/src/cli/sync.test.ts +150 -1
- package/src/cli/sync.ts +25 -29
- package/src/journal.test.ts +45 -0
- package/src/journal.ts +18 -1
- package/src/personal-vault.ts +23 -0
- package/src/qmd-reindex.test.ts +324 -4
- package/src/qmd-reindex.ts +414 -76
- package/src/s3.test.ts +79 -0
- package/src/s3.ts +48 -1
- package/src/telemetry.test.ts +128 -0
- package/src/telemetry.ts +80 -0
- package/src/watcher.ts +111 -14
- package/test/e2e/watcher-real-chokidar.test.ts +62 -2
- package/test/e2e/watcher-recursive-backend.test.ts +67 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as os from "os";
|
|
2
2
|
import * as path from "path";
|
|
3
|
+
import * as fs from "fs";
|
|
3
4
|
import { inventoryManagedSnapshots } from "../backup-prune.js";
|
|
4
5
|
import { VaultClient } from "../index.js";
|
|
5
6
|
import { pickCanonicalPersonEntity } from "../vault-client.js";
|
|
@@ -9,6 +10,7 @@ import { TRANSIENT_NETWORK_EXIT } from "../lib/net-errors.js";
|
|
|
9
10
|
import { PARTIAL_SYNC_EXIT } from "../lib/exit-codes.js";
|
|
10
11
|
import { getOrCreateMachineId } from "../lib/machine-id.js";
|
|
11
12
|
import { TreeWatcher, systemClock, } from "../watcher.js";
|
|
13
|
+
import { clearLocalDeleteIntent, markLocalDeleteIntent, PERSONAL_VAULT_JOURNAL_SLUG, readJournal, writeJournal, } from "../journal.js";
|
|
12
14
|
import { NoopPushReceiver, } from "../sync/push-receiver.js";
|
|
13
15
|
import { resolveEventSync, startEventSync as defaultStartEventSync, } from "../sync/event-sync.js";
|
|
14
16
|
import { buildScopedDrainPullArgv, buildScopedPushArgv, buildTargetedPullArgv, routeChangeToTarget, routeKey, } from "./sync-runner-watch-routes.js";
|
|
@@ -39,12 +41,26 @@ export function adaptivePollMs(load1, cpuCount, floorMs = ADAPTIVE_POLL_FLOOR_MS
|
|
|
39
41
|
const ratio = Math.max(0, Math.min(1, saturation));
|
|
40
42
|
return Math.round(floorMs + ratio * (ceilMs - floorMs));
|
|
41
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Select journal entries covered by one watcher delete. Exact file unlinks
|
|
46
|
+
* deliberately avoid enumeration; only directory unlinks expand descendants.
|
|
47
|
+
*/
|
|
48
|
+
export function journalEntriesForWatcherDelete(files, key, kind) {
|
|
49
|
+
if (kind === "unlink") {
|
|
50
|
+
const entry = files[key];
|
|
51
|
+
return entry ? [[key, entry]] : [];
|
|
52
|
+
}
|
|
53
|
+
return Object.entries(files).filter(([candidate]) => key === "" || candidate === key || candidate.startsWith(`${key}/`));
|
|
54
|
+
}
|
|
55
|
+
function passExitCode(outcome) {
|
|
56
|
+
return typeof outcome === "number" ? outcome : outcome.exitCode;
|
|
57
|
+
}
|
|
42
58
|
export async function runOneShotWithOperationLock(argv, parsed, deps, runtime) {
|
|
43
59
|
const runOnce = deps.runPass ?? runtime.runPassWithOperationLockAlreadyHeld;
|
|
44
60
|
try {
|
|
45
|
-
return await withOperationLock(parsed.hqRoot, "sync", () => runOnce(argv), {
|
|
61
|
+
return passExitCode(await withOperationLock(parsed.hqRoot, "sync", () => runOnce(argv), {
|
|
46
62
|
timeoutSec: parsed.lockTimeoutSec,
|
|
47
|
-
});
|
|
63
|
+
}));
|
|
48
64
|
}
|
|
49
65
|
catch (err) {
|
|
50
66
|
if (err instanceof OperationLockedError) {
|
|
@@ -92,10 +108,14 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
92
108
|
return false;
|
|
93
109
|
if (a === "--scope-path")
|
|
94
110
|
return false;
|
|
111
|
+
if (a === "--delete-scope-path")
|
|
112
|
+
return false;
|
|
95
113
|
if (i > 0 && argv[i - 1] === "--poll-remote-ms")
|
|
96
114
|
return false;
|
|
97
115
|
if (i > 0 && argv[i - 1] === "--scope-path")
|
|
98
116
|
return false;
|
|
117
|
+
if (i > 0 && argv[i - 1] === "--delete-scope-path")
|
|
118
|
+
return false;
|
|
99
119
|
return true;
|
|
100
120
|
});
|
|
101
121
|
// Authoritative direction from parseArgs — never re-derive from argv (that
|
|
@@ -120,13 +140,14 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
120
140
|
throw err;
|
|
121
141
|
}
|
|
122
142
|
}
|
|
123
|
-
const runPassWithLock = async (passArgvForRun) => {
|
|
143
|
+
const runPassWithLock = async (passArgvForRun, prepare) => {
|
|
124
144
|
try {
|
|
125
145
|
const handle = acquireOperationLock(hqRoot, "sync", {
|
|
126
146
|
timeoutSec: 0,
|
|
127
147
|
onWaitStart: () => undefined,
|
|
128
148
|
});
|
|
129
149
|
try {
|
|
150
|
+
prepare?.();
|
|
130
151
|
return await runPass(passArgvForRun);
|
|
131
152
|
}
|
|
132
153
|
finally {
|
|
@@ -142,7 +163,10 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
142
163
|
}
|
|
143
164
|
}
|
|
144
165
|
try {
|
|
145
|
-
return await withOperationLock(hqRoot, "sync", () =>
|
|
166
|
+
return await withOperationLock(hqRoot, "sync", () => {
|
|
167
|
+
prepare?.();
|
|
168
|
+
return runPass(passArgvForRun);
|
|
169
|
+
}, { timeoutSec: parsed.lockTimeoutSec });
|
|
146
170
|
}
|
|
147
171
|
catch (err) {
|
|
148
172
|
if (err instanceof OperationLockedError) {
|
|
@@ -170,13 +194,13 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
170
194
|
const next = pendingPasses.shift();
|
|
171
195
|
if (!next)
|
|
172
196
|
return;
|
|
173
|
-
const current = startGuardedPass(next.argv);
|
|
197
|
+
const current = startGuardedPass(next.argv, next.prepare);
|
|
174
198
|
void current.then(next.resolve, next.reject);
|
|
175
199
|
};
|
|
176
|
-
const startGuardedPass = (passArgvForRun) => {
|
|
200
|
+
const startGuardedPass = (passArgvForRun, prepare) => {
|
|
177
201
|
const current = stopped
|
|
178
202
|
? Promise.resolve(0)
|
|
179
|
-
: runPassWithLock(passArgvForRun);
|
|
203
|
+
: runPassWithLock(passArgvForRun, prepare);
|
|
180
204
|
activePass = current;
|
|
181
205
|
void current
|
|
182
206
|
.finally(() => {
|
|
@@ -188,18 +212,19 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
188
212
|
.catch(() => undefined);
|
|
189
213
|
return current;
|
|
190
214
|
};
|
|
191
|
-
const runGuarded = (passArgvForRun) => {
|
|
215
|
+
const runGuarded = (passArgvForRun, prepare) => {
|
|
192
216
|
if (activePass === null && pendingPasses.length === 0) {
|
|
193
|
-
return startGuardedPass(passArgvForRun);
|
|
217
|
+
return startGuardedPass(passArgvForRun, prepare);
|
|
194
218
|
}
|
|
195
219
|
return new Promise((resolve, reject) => {
|
|
196
|
-
pendingPasses.push({ argv: passArgvForRun, resolve, reject });
|
|
220
|
+
pendingPasses.push({ argv: passArgvForRun, prepare, resolve, reject });
|
|
197
221
|
drainQueuedPasses();
|
|
198
222
|
});
|
|
199
223
|
};
|
|
200
224
|
let watcher = null;
|
|
201
225
|
let detachSignal = null;
|
|
202
226
|
const pendingWatcherPaths = new Map();
|
|
227
|
+
const pendingWatcherChanges = new Map();
|
|
203
228
|
let pendingWatcherOriginalBatch = null;
|
|
204
229
|
let pendingWatcherBareChange = false;
|
|
205
230
|
let pendingWatcherOverflowed = false;
|
|
@@ -216,6 +241,9 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
216
241
|
: null;
|
|
217
242
|
for (const [absolutePath, relativePath] of batch.paths.entries()) {
|
|
218
243
|
pendingWatcherPaths.set(absolutePath, relativePath);
|
|
244
|
+
const change = batch.changes?.get(absolutePath);
|
|
245
|
+
if (change)
|
|
246
|
+
pendingWatcherChanges.set(absolutePath, change);
|
|
219
247
|
}
|
|
220
248
|
if (batch.overflowed) {
|
|
221
249
|
pendingWatcherOverflowed = true;
|
|
@@ -226,7 +254,9 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
226
254
|
}
|
|
227
255
|
if (changedRelPath) {
|
|
228
256
|
pendingWatcherOriginalBatch = null;
|
|
229
|
-
|
|
257
|
+
const absolutePath = path.join(hqRoot, changedRelPath);
|
|
258
|
+
pendingWatcherPaths.set(absolutePath, changedRelPath);
|
|
259
|
+
pendingWatcherChanges.delete(absolutePath);
|
|
230
260
|
return;
|
|
231
261
|
}
|
|
232
262
|
pendingWatcherOriginalBatch = null;
|
|
@@ -238,6 +268,9 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
238
268
|
: pendingWatcherPaths.size > 0 || pendingWatcherOverflowed
|
|
239
269
|
? {
|
|
240
270
|
paths: new Map(pendingWatcherPaths),
|
|
271
|
+
...(pendingWatcherChanges.size > 0
|
|
272
|
+
? { changes: new Map(pendingWatcherChanges) }
|
|
273
|
+
: {}),
|
|
241
274
|
...(pendingWatcherOverflowed
|
|
242
275
|
? {
|
|
243
276
|
overflowed: true,
|
|
@@ -249,6 +282,7 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
249
282
|
: null;
|
|
250
283
|
const bare = pendingWatcherBareChange;
|
|
251
284
|
pendingWatcherPaths.clear();
|
|
285
|
+
pendingWatcherChanges.clear();
|
|
252
286
|
pendingWatcherOriginalBatch = null;
|
|
253
287
|
pendingWatcherBareChange = false;
|
|
254
288
|
pendingWatcherOverflowed = false;
|
|
@@ -262,6 +296,113 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
262
296
|
pendingWatcherPaths.set(absolutePath, relativePath);
|
|
263
297
|
}
|
|
264
298
|
};
|
|
299
|
+
const journalCoordinates = (relativePath) => {
|
|
300
|
+
const route = routeChangeToTarget(relativePath);
|
|
301
|
+
if (!route)
|
|
302
|
+
return null;
|
|
303
|
+
if (route.kind === "personal") {
|
|
304
|
+
return { slug: PERSONAL_VAULT_JOURNAL_SLUG, key: relativePath };
|
|
305
|
+
}
|
|
306
|
+
const prefix = `companies/${route.slug}`;
|
|
307
|
+
return {
|
|
308
|
+
slug: route.slug,
|
|
309
|
+
key: relativePath === prefix
|
|
310
|
+
? ""
|
|
311
|
+
: relativePath.slice(prefix.length + 1),
|
|
312
|
+
};
|
|
313
|
+
};
|
|
314
|
+
const captureLocalDeleteSnapshots = (relativePath, kind) => {
|
|
315
|
+
const coordinates = journalCoordinates(relativePath);
|
|
316
|
+
const route = routeChangeToTarget(relativePath);
|
|
317
|
+
if (!coordinates || !route)
|
|
318
|
+
return [];
|
|
319
|
+
const journal = readJournal(coordinates.slug);
|
|
320
|
+
const snapshots = [];
|
|
321
|
+
const captureEntry = (key, entry) => {
|
|
322
|
+
if (!entry?.remoteEtag || !entry.kind || entry.removedAt !== undefined) {
|
|
323
|
+
return;
|
|
324
|
+
}
|
|
325
|
+
const snapshot = {
|
|
326
|
+
journalSlug: coordinates.slug,
|
|
327
|
+
journalPath: key,
|
|
328
|
+
deleteScopeRoot: coordinates.key,
|
|
329
|
+
absolutePath: route.kind === "company"
|
|
330
|
+
? path.join(hqRoot, "companies", route.slug, key)
|
|
331
|
+
: path.join(hqRoot, key),
|
|
332
|
+
remoteEtag: entry.remoteEtag,
|
|
333
|
+
localHash: entry.hash,
|
|
334
|
+
localKind: entry.kind,
|
|
335
|
+
};
|
|
336
|
+
if (markLocalDeleteIntent(journal, key, snapshot.localHash, snapshot.localKind, snapshot.remoteEtag)) {
|
|
337
|
+
snapshots.push(snapshot);
|
|
338
|
+
}
|
|
339
|
+
};
|
|
340
|
+
// Chokidar emits one unlink per file during rm -rf. Avoid walking the
|
|
341
|
+
// whole shard for every exact-key event; directory unlinks alone need
|
|
342
|
+
// descendant expansion.
|
|
343
|
+
for (const [key, entry] of journalEntriesForWatcherDelete(journal.files, coordinates.key, kind)) {
|
|
344
|
+
captureEntry(key, entry);
|
|
345
|
+
}
|
|
346
|
+
// Persist at observation time, before the debounced batch can queue
|
|
347
|
+
// behind an in-flight pull. The pull planner treats this current,
|
|
348
|
+
// version-bound intent as authoritative and will not resurrect the path.
|
|
349
|
+
if (snapshots.length > 0) {
|
|
350
|
+
writeJournal(coordinates.slug, journal);
|
|
351
|
+
}
|
|
352
|
+
return snapshots;
|
|
353
|
+
};
|
|
354
|
+
const prepareWatcherChanges = (changes) => {
|
|
355
|
+
const journals = new Map();
|
|
356
|
+
const dirty = new Set();
|
|
357
|
+
const journalFor = (slug) => {
|
|
358
|
+
const loaded = journals.get(slug);
|
|
359
|
+
if (loaded)
|
|
360
|
+
return loaded;
|
|
361
|
+
const journal = readJournal(slug);
|
|
362
|
+
journals.set(slug, journal);
|
|
363
|
+
return journal;
|
|
364
|
+
};
|
|
365
|
+
for (const [absolutePath, change] of changes.entries()) {
|
|
366
|
+
if (change.kind === "unlink" || change.kind === "unlinkDir") {
|
|
367
|
+
for (const snapshot of change.deleteSnapshots ?? []) {
|
|
368
|
+
let absent = false;
|
|
369
|
+
try {
|
|
370
|
+
fs.lstatSync(snapshot.absolutePath);
|
|
371
|
+
}
|
|
372
|
+
catch (err) {
|
|
373
|
+
const code = err && typeof err === "object" && "code" in err
|
|
374
|
+
? err.code
|
|
375
|
+
: undefined;
|
|
376
|
+
if (code !== "ENOENT")
|
|
377
|
+
continue;
|
|
378
|
+
absent = true;
|
|
379
|
+
}
|
|
380
|
+
if (!absent) {
|
|
381
|
+
if (clearLocalDeleteIntent(journalFor(snapshot.journalSlug), snapshot.journalPath)) {
|
|
382
|
+
dirty.add(snapshot.journalSlug);
|
|
383
|
+
}
|
|
384
|
+
continue;
|
|
385
|
+
}
|
|
386
|
+
if (markLocalDeleteIntent(journalFor(snapshot.journalSlug), snapshot.journalPath, snapshot.localHash, snapshot.localKind, snapshot.remoteEtag)) {
|
|
387
|
+
dirty.add(snapshot.journalSlug);
|
|
388
|
+
}
|
|
389
|
+
}
|
|
390
|
+
continue;
|
|
391
|
+
}
|
|
392
|
+
const relativePath = path
|
|
393
|
+
.relative(hqRoot, absolutePath)
|
|
394
|
+
.split(path.sep)
|
|
395
|
+
.join("/");
|
|
396
|
+
const coordinates = journalCoordinates(relativePath);
|
|
397
|
+
if (coordinates &&
|
|
398
|
+
clearLocalDeleteIntent(journalFor(coordinates.slug), coordinates.key)) {
|
|
399
|
+
dirty.add(coordinates.slug);
|
|
400
|
+
}
|
|
401
|
+
}
|
|
402
|
+
for (const slug of dirty) {
|
|
403
|
+
writeJournal(slug, journals.get(slug));
|
|
404
|
+
}
|
|
405
|
+
};
|
|
265
406
|
const groupBatchByRoute = (batch) => {
|
|
266
407
|
const grouped = new Map();
|
|
267
408
|
for (const [absolutePath, relativePath] of batch.paths.entries()) {
|
|
@@ -270,9 +411,23 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
270
411
|
continue;
|
|
271
412
|
const key = routeKey(route);
|
|
272
413
|
const existing = grouped.get(key) ??
|
|
273
|
-
{
|
|
414
|
+
{
|
|
415
|
+
route,
|
|
416
|
+
paths: new Map(),
|
|
417
|
+
changes: new Map(),
|
|
418
|
+
relPaths: [],
|
|
419
|
+
deleteScopeRoots: [],
|
|
420
|
+
};
|
|
274
421
|
existing.paths.set(absolutePath, relativePath);
|
|
422
|
+
const change = batch.changes?.get(absolutePath);
|
|
423
|
+
if (change)
|
|
424
|
+
existing.changes.set(absolutePath, change);
|
|
275
425
|
existing.relPaths = [...new Set([...existing.paths.values()])];
|
|
426
|
+
existing.deleteScopeRoots = [
|
|
427
|
+
...new Set([...existing.changes.values()].flatMap((item) => (item.deleteSnapshots ?? []).flatMap((snapshot) => snapshot.deleteScopeRoot === undefined
|
|
428
|
+
? []
|
|
429
|
+
: [snapshot.deleteScopeRoot]))),
|
|
430
|
+
];
|
|
276
431
|
grouped.set(key, existing);
|
|
277
432
|
}
|
|
278
433
|
return grouped;
|
|
@@ -286,11 +441,25 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
286
441
|
if (drainRunsPush && batch && batch.paths.size > 0) {
|
|
287
442
|
const grouped = groupBatchByRoute(batch);
|
|
288
443
|
for (const group of grouped.values()) {
|
|
289
|
-
const scopedArgv = buildScopedPushArgv(group.route, group.relPaths, passArgv);
|
|
444
|
+
const scopedArgv = buildScopedPushArgv(group.route, group.relPaths, passArgv, group.deleteScopeRoots);
|
|
290
445
|
try {
|
|
291
|
-
const result = await runGuarded(scopedArgv
|
|
292
|
-
|
|
293
|
-
|
|
446
|
+
const result = await runGuarded(scopedArgv, group.changes.size > 0
|
|
447
|
+
? () => prepareWatcherChanges(group.changes)
|
|
448
|
+
: undefined);
|
|
449
|
+
if (passExitCode(result) === 0) {
|
|
450
|
+
const refusedPaths = new Set(typeof result === "number"
|
|
451
|
+
? []
|
|
452
|
+
: (result.result?.pushPathResults ?? [])
|
|
453
|
+
.filter((pathResult) => pathResult.status === "refused")
|
|
454
|
+
.map((pathResult) => pathResult.relativePath));
|
|
455
|
+
publishBatchIfAvailable(new Map([...group.paths.entries()].filter(([absolutePath, relativePath]) => {
|
|
456
|
+
if (refusedPaths.has(relativePath))
|
|
457
|
+
return false;
|
|
458
|
+
if (group.changes.get(absolutePath)?.kind !== "unlinkDir") {
|
|
459
|
+
return true;
|
|
460
|
+
}
|
|
461
|
+
return ![...refusedPaths].some((refusedPath) => refusedPath.startsWith(`${relativePath}/`));
|
|
462
|
+
})));
|
|
294
463
|
}
|
|
295
464
|
else {
|
|
296
465
|
restorePendingWatcherPaths(group.paths);
|
|
@@ -304,7 +473,7 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
304
473
|
}
|
|
305
474
|
if (!drainRunsPull)
|
|
306
475
|
return 0;
|
|
307
|
-
return runGuarded(buildScopedDrainPullArgv(passArgv));
|
|
476
|
+
return passExitCode(await runGuarded(buildScopedDrainPullArgv(passArgv)));
|
|
308
477
|
};
|
|
309
478
|
let receiver = null;
|
|
310
479
|
let eventSync = null;
|
|
@@ -317,8 +486,14 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
317
486
|
debounceMs: opts.debounceMs,
|
|
318
487
|
clock: opts.clock,
|
|
319
488
|
personalMode: !companiesMode,
|
|
489
|
+
captureLocalDeleteSnapshots: opts.captureLocalDeleteSnapshots,
|
|
320
490
|
}));
|
|
321
|
-
watcher = createWatcher({
|
|
491
|
+
watcher = createWatcher({
|
|
492
|
+
hqRoot,
|
|
493
|
+
debounceMs,
|
|
494
|
+
clock,
|
|
495
|
+
captureLocalDeleteSnapshots,
|
|
496
|
+
});
|
|
322
497
|
watcher.onChange((changedRelPath, batch) => {
|
|
323
498
|
if (stopped)
|
|
324
499
|
return;
|
|
@@ -333,8 +508,8 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
333
508
|
return;
|
|
334
509
|
const targetedArgv = buildTargetedPullArgv(route, passArgv);
|
|
335
510
|
const result = await runGuarded(targetedArgv);
|
|
336
|
-
if (result !== 0) {
|
|
337
|
-
throw new Error(`targeted pull failed with exit code ${result}`);
|
|
511
|
+
if (passExitCode(result) !== 0) {
|
|
512
|
+
throw new Error(`targeted pull failed with exit code ${passExitCode(result)}`);
|
|
338
513
|
}
|
|
339
514
|
};
|
|
340
515
|
const createReceiver = deps.createReceiver ?? (() => new NoopPushReceiver());
|
|
@@ -435,13 +610,14 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
435
610
|
const result = shouldRunFull
|
|
436
611
|
? await runGuarded(passArgv)
|
|
437
612
|
: await runScopedDrain(pending.batch);
|
|
438
|
-
|
|
613
|
+
const exitCode = passExitCode(result);
|
|
614
|
+
if (exitCode === runtime.authRequiredPassExit) {
|
|
439
615
|
// The pass already emitted auth-error. Stop the unattended loop but
|
|
440
616
|
// keep the process exit successful so desktop/manual consumers treat
|
|
441
617
|
// this as a reauth state, not a crash.
|
|
442
618
|
return 0;
|
|
443
619
|
}
|
|
444
|
-
else if (
|
|
620
|
+
else if (exitCode === TRANSIENT_NETWORK_EXIT) {
|
|
445
621
|
// The machine was briefly offline (the discovery fetch failed after
|
|
446
622
|
// retries). That is NOT a crash — stay alive and retry on the next
|
|
447
623
|
// poll. Returning it here would exit the watcher and the menubar would
|
|
@@ -449,7 +625,7 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
449
625
|
// (HQ-SYNC-1W). Log to stderr so it still shows up as a breadcrumb.
|
|
450
626
|
process.stderr.write("hq-sync-runner: watch pass skipped — transient network failure; retrying next poll\n");
|
|
451
627
|
}
|
|
452
|
-
else if (
|
|
628
|
+
else if (exitCode === PARTIAL_SYNC_EXIT) {
|
|
453
629
|
// The pass completed but some per-file transfers threw. Also NOT a
|
|
454
630
|
// crash: the per-file errors were already emitted as ndjson `error`
|
|
455
631
|
// events (menubar breadcrumbs + journal), and exiting here just gets
|
|
@@ -459,8 +635,8 @@ export async function runWatchLoop(argv, parsed, deps, runtime) {
|
|
|
459
635
|
// on the next tick. A one-shot `hq sync` still exits 2.
|
|
460
636
|
process.stderr.write("hq-sync-runner: watch pass completed with per-file errors; staying alive, retrying next poll\n");
|
|
461
637
|
}
|
|
462
|
-
else if (
|
|
463
|
-
return
|
|
638
|
+
else if (exitCode !== 0) {
|
|
639
|
+
return exitCode;
|
|
464
640
|
}
|
|
465
641
|
if (Date.now() >= nextBackupPruneAt) {
|
|
466
642
|
// Advance before invoking: a failed/unavailable backstop cannot become
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-runner-watch-loop.js","sourceRoot":"","sources":["../../src/bin/sync-runner-watch-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sync-runner-watch-loop.js","sourceRoot":"","sources":["../../src/bin/sync-runner-watch-loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,WAAW,GAIZ,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,2BAA2B,EAC3B,WAAW,EACX,YAAY,GACb,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,gBAAgB,GAGjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,gBAAgB,EAChB,cAAc,IAAI,qBAAqB,GAExC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,QAAQ,GAET,MAAM,+BAA+B,CAAC;AAQvC,MAAM,0BAA0B,GAAG,EAAE,CAAC;AAEtC;;;;;;;;;GASG;AACH,MAAM,sBAAsB,GAAG,MAAM,CAAC;AACtC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AAEtC;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAC5B,KAAa,EACb,QAAgB,EAChB,UAAkB,sBAAsB,EACxC,SAAiB,qBAAqB;IAEtC,MAAM,KAAK,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;AAC1D,CAAC;AA4BD;;;GAGG;AACH,MAAM,UAAU,8BAA8B,CAC5C,KAAmB,EACnB,GAAW,EACX,IAA4B;IAE5B,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrC,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CACjC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,CACd,GAAG,KAAK,EAAE,IAAI,SAAS,KAAK,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,GAAG,GAAG,CAAC,CACrE,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,OAAmC;IACvD,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;AAClE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,IAAc,EACd,MAAsB,EACtB,IAAoB,EACpB,OAAyB;IAEzB,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,mCAAmC,CAAC;IAC9D,IAAI,CAAC;QACH,OAAO,YAAY,CACjB,MAAM,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAClE,UAAU,EAAE,MAAM,CAAC,cAAc;SAClC,CAAC,CACH,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,oBAAoB,EAAE,CAAC;YACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;YACzC,OAAO,qBAAqB,CAAC;QAC/B,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,IAAc,EACd,MAAsB,EACtB,IAAoB,EACpB,OAAyB;IAEzB,MAAM,KAAK,GACT,IAAI,CAAC,KAAK;QACV,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,mCAAmC,CAAC;IAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjD,4EAA4E;IAC5E,2EAA2E;IAC3E,0EAA0E;IAC1E,MAAM,cAAc,GAClB,OAAO,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,0EAA0E;IAC1E,0EAA0E;IAC1E,sCAAsC;IACtC,IAAI,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC;IAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,KAAK,EAAE,IAAY,EAAE,EAAE;QACpE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,yBAAyB,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,KAAK,CAAC;QAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjJ,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,IAAI,CAAC,UAAU,CAAC,MAAM,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,cAAc,CAAC,CAAC;IAClJ,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACpC,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAClC,IAAI,CAAC,KAAK,kBAAkB;YAAE,OAAO,KAAK,CAAC;QAC3C,IAAI,CAAC,KAAK,cAAc;YAAE,OAAO,KAAK,CAAC;QACvC,IAAI,CAAC,KAAK,cAAc;YAAE,OAAO,KAAK,CAAC;QACvC,IAAI,CAAC,KAAK,qBAAqB;YAAE,OAAO,KAAK,CAAC;QAC9C,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,kBAAkB;YAAE,OAAO,KAAK,CAAC;QAC9D,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,cAAc;YAAE,OAAO,KAAK,CAAC;QAC1D,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,qBAAqB;YAAE,OAAO,KAAK,CAAC;QACjE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,2EAA2E;IAC3E,oEAAoE;IACpE,6EAA6E;IAC7E,MAAM,iBAAiB,GAAc,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC;IAChE,MAAM,aAAa,GACjB,iBAAiB,KAAK,MAAM,IAAI,iBAAiB,KAAK,MAAM,CAAC;IAC/D,MAAM,aAAa,GACjB,iBAAiB,KAAK,MAAM,IAAI,iBAAiB,KAAK,MAAM,CAAC;IAE/D,IAAI,MAAM,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE;gBAClD,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;aAC7B,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,oBAAoB,EAAE,CAAC;gBACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;gBACzC,OAAO,qBAAqB,CAAC;YAC/B,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAGD,MAAM,eAAe,GAAG,KAAK,EAC3B,cAAwB,EACxB,OAAyB,EACY,EAAE;QACvC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE;gBAClD,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;aAC7B,CAAC,CAAC;YACH,IAAI,CAAC;gBACH,OAAO,EAAE,EAAE,CAAC;gBACZ,OAAO,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;YACvC,CAAC;oBAAS,CAAC;gBACT,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,CAAC,GAAG,YAAY,oBAAoB,CAAC;gBAAE,MAAM,GAAG,CAAC;YACtD,IAAI,MAAM,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;gBACzC,OAAO,qBAAqB,CAAC;YAC/B,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,OAAO,MAAM,iBAAiB,CAC5B,MAAM,EACN,MAAM,EACN,GAAG,EAAE;gBACH,OAAO,EAAE,EAAE,CAAC;gBACZ,OAAO,OAAO,CAAC,cAAc,CAAC,CAAC;YACjC,CAAC,EACD,EAAE,UAAU,EAAE,MAAM,CAAC,cAAc,EAAE,CACtC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,oBAAoB,EAAE,CAAC;gBACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;gBACzC,OAAO,qBAAqB,CAAC;YAC/B,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,UAAU,GAA+C,IAAI,CAAC;IAOlE,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,MAAM,mBAAmB,GAAG,GAAS,EAAE;QACrC,OAAO,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,aAAa,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,CAAC;IACF,MAAM,iBAAiB,GAAG,GAAS,EAAE;QACnC,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO;QAChC,IAAI,OAAO,EAAE,CAAC;YACZ,mBAAmB,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1D,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC,CAAC;IACF,MAAM,gBAAgB,GAAG,CACvB,cAAwB,EACxB,OAAyB,EACY,EAAE;QACvC,MAAM,OAAO,GAAG,OAAO;YACrB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YACpB,CAAC,CAAC,eAAe,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC7C,UAAU,GAAG,OAAO,CAAC;QACrB,KAAK,OAAO;aACT,OAAO,CAAC,GAAG,EAAE;YACZ,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBAC3B,UAAU,GAAG,IAAI,CAAC;gBAClB,iBAAiB,EAAE,CAAC;YACtB,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC1B,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,CACjB,cAAwB,EACxB,OAAyB,EACY,EAAE;QACvC,IAAI,UAAU,KAAK,IAAI,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtD,OAAO,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,IAAI,OAAO,CAA6B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjE,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACvE,iBAAiB,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,OAAO,GAA0B,IAAI,CAAC;IAC1C,IAAI,YAAY,GAAwB,IAAI,CAAC;IAC7C,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACtD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC5D,IAAI,2BAA2B,GAA2B,IAAI,CAAC;IAC/D,IAAI,wBAAwB,GAAG,KAAK,CAAC;IACrC,IAAI,wBAAwB,GAAG,KAAK,CAAC;IACrC,IAAI,0BAA0B,GAAG,CAAC,CAAC;IACnC,IAAI,0BAA0B,GAAG,CAAC,CAAC;IACnC,MAAM,uBAAuB,GAAG,CAC9B,cAAuB,EACvB,KAAuB,EACjB,EAAE;QACR,IAAI,KAAK,EAAE,CAAC;YACV,2BAA2B;gBACzB,mBAAmB,CAAC,IAAI,KAAK,CAAC;oBAC9B,CAAC,wBAAwB;oBACzB,CAAC,wBAAwB;oBACzB,CAAC,KAAK,CAAC,UAAU;oBACf,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,IAAI,CAAC;YACX,KAAK,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;gBACjE,mBAAmB,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;gBACpD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;gBAChD,IAAI,MAAM;oBAAE,qBAAqB,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC9D,CAAC;YACD,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACrB,wBAAwB,GAAG,IAAI,CAAC;gBAChC,0BAA0B,IAAI,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC;gBACtD,0BAA0B,IAAI,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC;YACxD,CAAC;YACD,OAAO;QACT,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACnB,2BAA2B,GAAG,IAAI,CAAC;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YACvD,mBAAmB,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YACtD,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;QACD,2BAA2B,GAAG,IAAI,CAAC;QACnC,wBAAwB,GAAG,IAAI,CAAC;IAClC,CAAC,CAAC;IACF,MAAM,wBAAwB,GAAG,GAG/B,EAAE;QACF,MAAM,KAAK,GACT,2BAA2B,KAAK,IAAI,IAAI,CAAC,wBAAwB;YAC/D,CAAC,CAAC,2BAA2B;YAC7B,CAAC,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,IAAI,wBAAwB;gBACxD,CAAC,CAAC;oBACE,KAAK,EAAE,IAAI,GAAG,CAAC,mBAAmB,CAAC;oBACnC,GAAG,CAAC,qBAAqB,CAAC,IAAI,GAAG,CAAC;wBAChC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,GAAG,CAAC,qBAAqB,CAAC,EAAE;wBAC7C,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,wBAAwB;wBAC1B,CAAC,CAAC;4BACE,UAAU,EAAE,IAAI;4BAChB,YAAY,EAAE,0BAA0B;4BACxC,YAAY,EAAE,0BAA0B;yBACzC;wBACH,CAAC,CAAC,EAAE,CAAC;iBACR;gBACH,CAAC,CAAC,IAAI,CAAC;QACb,MAAM,IAAI,GAAG,wBAAwB,CAAC;QACtC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QAC5B,qBAAqB,CAAC,KAAK,EAAE,CAAC;QAC9B,2BAA2B,GAAG,IAAI,CAAC;QACnC,wBAAwB,GAAG,KAAK,CAAC;QACjC,wBAAwB,GAAG,KAAK,CAAC;QACjC,0BAA0B,GAAG,CAAC,CAAC;QAC/B,0BAA0B,GAAG,CAAC,CAAC;QAC/B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC;IACF,MAAM,0BAA0B,GAAG,CAAC,KAA0B,EAAQ,EAAE;QACtE,2BAA2B,GAAG,IAAI,CAAC;QACnC,KAAK,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,mBAAmB,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACtD,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,CACzB,YAAoB,EACkB,EAAE;QACxC,MAAM,KAAK,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9B,OAAO,EAAE,IAAI,EAAE,2BAA2B,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;QAClE,CAAC;QACD,MAAM,MAAM,GAAG,aAAa,KAAK,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,GAAG,EACD,YAAY,KAAK,MAAM;gBACrB,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;SAC5C,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,2BAA2B,GAAG,CAClC,YAAoB,EACpB,IAA4B,EACL,EAAE;QACzB,MAAM,WAAW,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAA0B,EAAE,CAAC;QAC5C,MAAM,YAAY,GAAG,CACnB,GAAW,EACX,KAAiD,EAC3C,EAAE;YACR,IAAI,CAAC,KAAK,EAAE,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBACvE,OAAO;YACT,CAAC;YACD,MAAM,QAAQ,GAAwB;gBACpC,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC7B,WAAW,EAAE,GAAG;gBAChB,eAAe,EAAE,WAAW,CAAC,GAAG;gBAChC,YAAY,EACV,KAAK,CAAC,IAAI,KAAK,SAAS;oBACtB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC;oBACjD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;gBAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,SAAS,EAAE,KAAK,CAAC,IAAI;gBACrB,SAAS,EAAE,KAAK,CAAC,IAAI;aACtB,CAAC;YACF,IACE,qBAAqB,CACnB,OAAO,EACP,GAAG,EACH,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,UAAU,CACpB,EACD,CAAC;gBACD,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC,CAAC;QAEF,sEAAsE;QACtE,sEAAsE;QACtE,wBAAwB;QACxB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,8BAA8B,CACvD,OAAO,CAAC,KAAK,EACb,WAAW,CAAC,GAAG,EACf,IAAI,CACL,EAAE,CAAC;YACF,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3B,CAAC;QAED,oEAAoE;QACpE,kEAAkE;QAClE,yEAAyE;QACzE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,qBAAqB,GAAG,CAAC,OAAgC,EAAQ,EAAE;QACvE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA0C,CAAC;QACnE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;QAChC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE;YAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAC;YAC1B,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YAClC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC;QAEF,KAAK,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC5D,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;oBACpD,IAAI,MAAM,GAAG,KAAK,CAAC;oBACnB,IAAI,CAAC;wBACH,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;oBACtC,CAAC;oBAAC,OAAO,GAAY,EAAE,CAAC;wBACtB,MAAM,IAAI,GACR,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG;4BAC7C,CAAC,CAAE,GAAyB,CAAC,IAAI;4BACjC,CAAC,CAAC,SAAS,CAAC;wBAChB,IAAI,IAAI,KAAK,QAAQ;4BAAE,SAAS;wBAChC,MAAM,GAAG,IAAI,CAAC;oBAChB,CAAC;oBACD,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,IACE,sBAAsB,CACpB,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,EAChC,QAAQ,CAAC,WAAW,CACrB,EACD,CAAC;4BACD,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;wBAClC,CAAC;wBACD,SAAS;oBACX,CAAC;oBACD,IACE,qBAAqB,CACnB,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,EAChC,QAAQ,CAAC,WAAW,EACpB,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,UAAU,CACpB,EACD,CAAC;wBACD,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;oBAClC,CAAC;gBACH,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,YAAY,GAAG,IAAI;iBACtB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;iBAC9B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;iBACf,IAAI,CAAC,GAAG,CAAC,CAAC;YACb,MAAM,WAAW,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;YACrD,IACE,WAAW;gBACX,sBAAsB,CACpB,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,EAC5B,WAAW,CAAC,GAAG,CAChB,EACD,CAAC;gBACD,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,CACxB,KAAsB,EAUtB,EAAE;QACF,MAAM,OAAO,GAAG,IAAI,GAAG,EASpB,CAAC;QACJ,KAAK,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACjE,MAAM,KAAK,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAChD,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrB,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC5B,MAAM,QAAQ,GACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;gBAChB;oBACE,KAAK;oBACL,KAAK,EAAE,IAAI,GAAG,EAAkB;oBAChC,OAAO,EAAE,IAAI,GAAG,EAAsB;oBACtC,QAAQ,EAAE,EAAE;oBACZ,gBAAgB,EAAE,EAAE;iBACrB,CAAC;YACJ,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;YAChD,IAAI,MAAM;gBAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACvD,QAAQ,CAAC,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/D,QAAQ,CAAC,gBAAgB,GAAG;gBAC1B,GAAG,IAAI,GAAG,CACR,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9C,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAChD,QAAQ,CAAC,eAAe,KAAK,SAAS;oBACpC,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAC/B,CACF,CACF;aACF,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,uBAAuB,GAAG,CAAC,KAA0B,EAAQ,EAAE;QACnE,IAAI,CAAC,OAAO,IAAI,SAAS,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAC5C,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,EAC1B,KAA6B,EACZ,EAAE;QACnB,IAAI,aAAa,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;gBACrC,MAAM,UAAU,GAAG,mBAAmB,CACpC,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,QAAQ,EACd,QAAQ,EACR,KAAK,CAAC,gBAAgB,CACvB,CAAC;gBACF,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAC7B,UAAU,EACV,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC;wBACpB,CAAC,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC;wBAC5C,CAAC,CAAC,SAAS,CACd,CAAC;oBACF,IAAI,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC/B,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,OAAO,MAAM,KAAK,QAAQ;4BACxB,CAAC,CAAC,EAAE;4BACJ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,IAAI,EAAE,CAAC;iCACnC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,KAAK,SAAS,CAAC;iCACvD,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CACpD,CAAC;wBACF,uBAAuB,CACrB,IAAI,GAAG,CACL,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAC/B,CAAC,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,EAAE;4BAC/B,IAAI,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC;gCAAE,OAAO,KAAK,CAAC;4BACjD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;gCAC1D,OAAO,IAAI,CAAC;4BACd,CAAC;4BACD,OAAO,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAC7C,WAAW,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC,CAC3C,CAAC;wBACJ,CAAC,CACF,CACF,CACF,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,0BAA0B,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC1C,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,0BAA0B,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,mDAAmD,aAAa,CAAC,GAAG,CAAC,IAAI,CAC1E,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,aAAa;YAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,YAAY,CACjB,MAAM,UAAU,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CACrD,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,QAAQ,GAAwB,IAAI,CAAC;IACzC,IAAI,SAAS,GAA4B,IAAI,CAAC;IAE9C,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC;QACxB,MAAM,aAAa,GACjB,IAAI,CAAC,aAAa;YAClB,CAAC,CAAC,IAAI,EAAE,EAAE,CACR,IAAI,WAAW,CAAC;gBACd,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,YAAY,EAAE,CAAC,aAAa;gBAC5B,2BAA2B,EAAE,IAAI,CAAC,2BAA2B;aAC9D,CAAC,CAAC,CAAC;QACR,OAAO,GAAG,aAAa,CAAC;YACtB,MAAM;YACN,UAAU;YACV,KAAK;YACL,2BAA2B;SAC5B,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE;YACzC,IAAI,OAAO;gBAAE,OAAO;YACpB,uBAAuB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,cAAc,GAAiB,KAAK,EAAE,GAAG,EAAE,EAAE;YACjD,IAAI,OAAO;gBAAE,OAAO;YACpB,MAAM,KAAK,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC1D,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,YAAY,GAAG,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,CAAC;YAC9C,IAAI,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CACb,uCAAuC,YAAY,CAAC,MAAM,CAAC,EAAE,CAC9D,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC;QAC7E,QAAQ,GAAG,cAAc,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9D,KAAK,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAE9D,MAAM,SAAS,GACb,IAAI,CAAC,gBAAgB,IAAI,OAAO,CAAC,uBAAuB,CAAC;QAC3D,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,CAAC;QAC5B,IAAI,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC5D,MAAM,cAAc,GAClB,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,qBAAqB,CAAC;YACvD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,IAAI,qBAAqB,CAAC;YAC7D,KAAK,CAAC,KAAK,IAAI,EAAE;gBACf,MAAM,eAAe,GAAG,IAAI,WAAW,CAAC;oBACtC,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,SAAS,EAAE,cAAc;oBACzB,MAAM,EAAE,OAAO,CAAC,MAAM;iBACvB,CAAC,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;oBAC5B,MAAM;oBACN,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,SAAS,EAAE,cAAc;oBACzB,QAAQ,EAAE,oBAAoB,CAAC,MAAM,CAAC;oBACtC,eAAe,EAAE,KAAK,IAAI,EAAE;wBAC1B,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;wBAClE,MAAM,IAAI,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;wBAChD,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;4BACf,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;wBACjE,CAAC;wBACD,OAAO,IAAI,CAAC,GAAG,CAAC;oBAClB,CAAC;oBACD,MAAM,EAAE,cAAc;oBACtB,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;oBAC1C,eAAe,EAAE,eAAe;oBAChC,eAAe,EAAE,MAAM;iBACxB,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO;oBAAE,OAAO;gBACrB,IAAI,OAAO,EAAE,CAAC;oBACZ,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;oBACvB,OAAO;gBACT,CAAC;gBACD,SAAS,GAAG,OAAO,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,oDAAoD,aAAa,CAAC,GAAG,CAAC,IAAI,CAC3E,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,cAAc,GAAwB,IAAI,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAClD,cAAc,GAAG,OAAO,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,GAAS,EAAE;QAC1B,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,GAAG,IAAI,CAAC;QACf,mBAAmB,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,KAAK,QAAQ,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;QACD,IAAI,CAAC;YACH,KAAK,SAAS,EAAE,OAAO,EAAE,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;QACD,SAAS,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC;YACH,OAAO,EAAE,OAAO,EAAE,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;QACD,cAAc,EAAE,EAAE,CAAC;IACrB,CAAC,CAAC;IACF,MAAM,gBAAgB,GACpB,IAAI,CAAC,gBAAgB;QACrB,CAAC,CAAC,OAAmB,EAAE,EAAE;YACvB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;YAChC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC/B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9B,OAAO,GAAG,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACjC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,YAAY,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAE1C,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,EAAE,CAAC;YAChB,QAAQ,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,wBAAwB,EAAE,CAAC;YAC3C,MAAM,aAAa,GACjB,QAAQ,KAAK,CAAC;gBACd,OAAO,CAAC,IAAI;gBACZ,OAAO,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI;gBAClC,QAAQ,GAAG,0BAA0B,KAAK,CAAC,CAAC;YAC9C,MAAM,MAAM,GAAG,aAAa;gBAC1B,CAAC,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC;gBAC5B,CAAC,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACxC,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,QAAQ,KAAK,OAAO,CAAC,oBAAoB,EAAE,CAAC;gBAC9C,oEAAoE;gBACpE,qEAAqE;gBACrE,uCAAuC;gBACvC,OAAO,CAAC,CAAC;YACX,CAAC;iBAAM,IAAI,QAAQ,KAAK,sBAAsB,EAAE,CAAC;gBAC/C,oEAAoE;gBACpE,mEAAmE;gBACnE,uEAAuE;gBACvE,8DAA8D;gBAC9D,oEAAoE;gBACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,sFAAsF,CACvF,CAAC;YACJ,CAAC;iBAAM,IAAI,QAAQ,KAAK,iBAAiB,EAAE,CAAC;gBAC1C,mEAAmE;gBACnE,oEAAoE;gBACpE,qEAAqE;gBACrE,sEAAsE;gBACtE,qEAAqE;gBACrE,wEAAwE;gBACxE,wDAAwD;gBACxD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,gGAAgG,CACjG,CAAC;YACJ,CAAC;iBAAM,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;gBAC1B,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,iBAAiB,EAAE,CAAC;gBACpC,uEAAuE;gBACvE,qEAAqE;gBACrE,mBAAmB;gBACnB,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;gBACrD,IAAI,CAAC;oBAAC,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;gBAAC,CAAC;gBACrC,OAAO,KAAK,EAAE,CAAC;oBAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAAC,CAAC;YAC1J,CAAC;YACD,MAAM,UAAU,GACd,cAAc,IAAI,cAAc,CAAC,aAAa,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC9D,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,QAAQ,EAAE,CAAC;QACX,YAAY,EAAE,EAAE,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
@@ -17,7 +17,7 @@ export declare function routeChangeToTarget(relPath: string): WatchRoute | null;
|
|
|
17
17
|
* Build the argv for a targeted push pass from a routed change.
|
|
18
18
|
*/
|
|
19
19
|
export declare function buildTargetedPushArgv(route: WatchRoute, baseArgv: string[]): string[];
|
|
20
|
-
export declare function buildScopedPushArgv(route: WatchRoute, relPaths: readonly string[], baseArgv: string[]): string[];
|
|
20
|
+
export declare function buildScopedPushArgv(route: WatchRoute, relPaths: readonly string[], baseArgv: string[], deleteScopeRoots?: readonly string[]): string[];
|
|
21
21
|
export declare function buildFullFanoutPushArgv(baseArgv: string[]): string[];
|
|
22
22
|
export declare function buildScopedDrainPullArgv(baseArgv: string[]): string[];
|
|
23
23
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-runner-watch-routes.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner-watch-routes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;AAEzB;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAWtE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,MAAM,EAAE,GACjB,MAAM,EAAE,CAMV;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,QAAQ,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"sync-runner-watch-routes.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner-watch-routes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;AAEzB;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAWtE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,MAAM,EAAE,GACjB,MAAM,EAAE,CAMV;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,QAAQ,EAAE,MAAM,EAAE,EAClB,gBAAgB,GAAE,SAAS,MAAM,EAAO,GACvC,MAAM,EAAE,CA0BV;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAEpE;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAgBrE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,MAAM,EAAE,GACjB,MAAM,EAAE,CAMV;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAElD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAQ9E"}
|
|
@@ -32,8 +32,12 @@ export function buildTargetedPushArgv(route, baseArgv) {
|
|
|
32
32
|
}
|
|
33
33
|
return ["--companies", "--direction", "push", ...carried];
|
|
34
34
|
}
|
|
35
|
-
export function buildScopedPushArgv(route, relPaths, baseArgv) {
|
|
35
|
+
export function buildScopedPushArgv(route, relPaths, baseArgv, deleteScopeRoots = []) {
|
|
36
36
|
const scopeArgs = scopedPathArgs(route, relPaths);
|
|
37
|
+
const deleteScopeArgs = deleteScopeRoots.flatMap((root) => [
|
|
38
|
+
"--delete-scope-path",
|
|
39
|
+
root,
|
|
40
|
+
]);
|
|
37
41
|
const carried = carriedFlags(baseArgv);
|
|
38
42
|
if (route.kind === "company") {
|
|
39
43
|
return [
|
|
@@ -42,10 +46,18 @@ export function buildScopedPushArgv(route, relPaths, baseArgv) {
|
|
|
42
46
|
"--direction",
|
|
43
47
|
"push",
|
|
44
48
|
...scopeArgs,
|
|
49
|
+
...deleteScopeArgs,
|
|
45
50
|
...carried,
|
|
46
51
|
];
|
|
47
52
|
}
|
|
48
|
-
return [
|
|
53
|
+
return [
|
|
54
|
+
"--personal",
|
|
55
|
+
"--direction",
|
|
56
|
+
"push",
|
|
57
|
+
...scopeArgs,
|
|
58
|
+
...deleteScopeArgs,
|
|
59
|
+
...carried,
|
|
60
|
+
];
|
|
49
61
|
}
|
|
50
62
|
export function buildFullFanoutPushArgv(baseArgv) {
|
|
51
63
|
return ["--companies", "--direction", "push", ...carriedFlags(baseArgv)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-runner-watch-routes.js","sourceRoot":"","sources":["../../src/bin/sync-runner-watch-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAO7B;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACpE,IAAI,IAAI,KAAK,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;QAChC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACjE,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,WAAW;YAAE,OAAO,IAAI,CAAC;QAC7C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,KAAiB,EACjB,QAAkB;IAElB,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,KAAiB,EACjB,QAA2B,EAC3B,QAAkB;
|
|
1
|
+
{"version":3,"file":"sync-runner-watch-routes.js","sourceRoot":"","sources":["../../src/bin/sync-runner-watch-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ import { reindexAfterSync } from "../qmd-reindex.js";
|
|
|
65
65
|
import type { ReindexOptions as QmdReindexOptions } from "../qmd-reindex.js";
|
|
66
66
|
import type { ReindexOptions, ReindexResult } from "../cli/reindex.js";
|
|
67
67
|
import type { TelemetryEventsBatch, TelemetryEventsIngestResult } from "../vault-client.js";
|
|
68
|
-
import type { Clock, TreeChangeBatch } from "../watcher.js";
|
|
68
|
+
import type { Clock, LocalDeleteSnapshot, TreeChangeBatch } from "../watcher.js";
|
|
69
69
|
import type { PushReceiver, SyncEngineFn } from "../sync/push-receiver.js";
|
|
70
70
|
import { type EventSyncHandles, type StartEventSyncOptions } from "../sync/event-sync.js";
|
|
71
71
|
import { type RunnerTarget, type SetupNeededReason } from "./sync-runner-planning.js";
|
|
@@ -422,6 +422,8 @@ export interface RunnerDeps {
|
|
|
422
422
|
operationLockAlreadyHeld?: boolean;
|
|
423
423
|
/** Internal watch-loop result override; one-shot callers keep exit 0. */
|
|
424
424
|
authRequiredExitCode?: number;
|
|
425
|
+
/** Internal watch-loop callback carrying uncapped per-path push outcomes. */
|
|
426
|
+
onPassResult?: (result: RunnerPassResult) => void;
|
|
425
427
|
/** Share function (push phase). Defaults to `cli/share.share`. */
|
|
426
428
|
share?: (options: ShareOptions) => Promise<ShareResult>;
|
|
427
429
|
/**
|
|
@@ -436,6 +438,18 @@ export interface RunnerDeps {
|
|
|
436
438
|
/** Maximum time to wait for pre-completion telemetry. Defaults to 120s. */
|
|
437
439
|
telemetryTimeoutMs?: number;
|
|
438
440
|
}
|
|
441
|
+
export interface RunnerPassResult {
|
|
442
|
+
pushPathResults: Array<{
|
|
443
|
+
relativePath: string;
|
|
444
|
+
status: "accepted" | "refused";
|
|
445
|
+
operation: "delete" | "tombstone";
|
|
446
|
+
reason?: string;
|
|
447
|
+
}>;
|
|
448
|
+
}
|
|
449
|
+
export interface RunnerPassOutcome {
|
|
450
|
+
exitCode: number;
|
|
451
|
+
result?: RunnerPassResult;
|
|
452
|
+
}
|
|
439
453
|
export declare function defaultCollectTelemetry(client: VaultClientSurface, clientIsStub: boolean, hqRoot: string, reportDiagnostic?: RunnerDiagnosticReporter): Promise<void>;
|
|
440
454
|
export declare function runRunner(argv: string[], deps?: RunnerDeps): Promise<number>;
|
|
441
455
|
/**
|
|
@@ -474,7 +488,7 @@ export interface RunnerLoopDeps {
|
|
|
474
488
|
* targeted push share one seam and one in-flight guard. The default ignores
|
|
475
489
|
* `deps` and forwards just the argv to `runRunner`.
|
|
476
490
|
*/
|
|
477
|
-
runPass?: (passArgv: string[]) => Promise<number>;
|
|
491
|
+
runPass?: (passArgv: string[]) => Promise<number | RunnerPassOutcome>;
|
|
478
492
|
/** Stage-0 backup retention backstop: a dry-run only, never a sync-tick action. */
|
|
479
493
|
runBackupPrune?: (hqRoot: string) => Promise<void>;
|
|
480
494
|
/**
|
|
@@ -492,6 +506,7 @@ export interface RunnerLoopDeps {
|
|
|
492
506
|
hqRoot: string;
|
|
493
507
|
debounceMs: number;
|
|
494
508
|
clock: Clock;
|
|
509
|
+
captureLocalDeleteSnapshots: (relativePath: string, kind: "unlink" | "unlinkDir") => LocalDeleteSnapshot[];
|
|
495
510
|
}) => WatcherSurface;
|
|
496
511
|
/**
|
|
497
512
|
* Register a one-shot shutdown signal handler. Defaults to listening for
|