@indigoai-us/hq-cloud 6.18.1-alpha.1 → 6.18.1-alpha.2
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/bandwidth.d.ts +45 -11
- package/dist/bandwidth.d.ts.map +1 -1
- package/dist/bandwidth.js +231 -18
- package/dist/bandwidth.js.map +1 -1
- package/dist/bandwidth.test.js +124 -4
- package/dist/bandwidth.test.js.map +1 -1
- package/dist/bin/sync-runner-company.d.ts +2 -0
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +6 -9
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner-company.test.js +0 -56
- package/dist/bin/sync-runner-company.test.js.map +1 -1
- package/dist/bin/sync-runner-events.test.js +0 -15
- package/dist/bin/sync-runner-events.test.js.map +1 -1
- package/dist/bin/sync-runner-watch-loop.d.ts +32 -8
- package/dist/bin/sync-runner-watch-loop.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-loop.js +228 -13
- package/dist/bin/sync-runner-watch-loop.js.map +1 -1
- package/dist/bin/sync-runner-watch-loop.test.js +63 -5
- package/dist/bin/sync-runner-watch-loop.test.js.map +1 -1
- package/dist/bin/sync-runner.d.ts +26 -7
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +14 -5
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/bin/sync-runner.test.js +107 -1
- package/dist/bin/sync-runner.test.js.map +1 -1
- package/dist/cli/share.d.ts +18 -6
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +92 -80
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/share.test.js +3 -35
- package/dist/cli/share.test.js.map +1 -1
- package/dist/cli/sync.d.ts +17 -8
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +155 -30
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +315 -1
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/object-io.d.ts +34 -23
- package/dist/object-io.d.ts.map +1 -1
- package/dist/object-io.js +333 -258
- package/dist/object-io.js.map +1 -1
- package/dist/object-io.test.js +377 -245
- package/dist/object-io.test.js.map +1 -1
- package/dist/s3-download-stream-hash.test.d.ts +2 -0
- package/dist/s3-download-stream-hash.test.d.ts.map +1 -0
- package/dist/s3-download-stream-hash.test.js +70 -0
- package/dist/s3-download-stream-hash.test.js.map +1 -0
- package/dist/s3.d.ts +8 -3
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +304 -27
- package/dist/s3.js.map +1 -1
- package/dist/s3.test.js +163 -0
- package/dist/s3.test.js.map +1 -1
- package/dist/sync/full-pass-caps.d.ts.map +1 -1
- package/dist/sync/full-pass-caps.js +3 -21
- package/dist/sync/full-pass-caps.js.map +1 -1
- package/dist/sync/full-pass-caps.test.js +1 -56
- package/dist/sync/full-pass-caps.test.js.map +1 -1
- package/dist/sync/inbound-event-admission.d.ts.map +1 -1
- package/dist/sync/inbound-event-admission.js +3 -0
- package/dist/sync/inbound-event-admission.js.map +1 -1
- package/dist/sync/inbound-event-admission.test.js +6 -0
- package/dist/sync/inbound-event-admission.test.js.map +1 -1
- package/dist/sync-core.d.ts +2 -1
- package/dist/sync-core.d.ts.map +1 -1
- package/dist/sync-core.js +5 -10
- package/dist/sync-core.js.map +1 -1
- package/dist/sync-core.test.js +16 -0
- package/dist/sync-core.test.js.map +1 -1
- package/dist/vault-client.d.ts +0 -5
- package/dist/vault-client.d.ts.map +1 -1
- package/dist/vault-client.js +0 -7
- package/dist/vault-client.js.map +1 -1
- package/dist/vault-client.test.js +0 -39
- package/dist/vault-client.test.js.map +1 -1
- package/package.json +1 -1
- package/dist/sync/presign-denial-backoff-flag.d.ts +0 -6
- package/dist/sync/presign-denial-backoff-flag.d.ts.map +0 -1
- package/dist/sync/presign-denial-backoff-flag.js +0 -11
- package/dist/sync/presign-denial-backoff-flag.js.map +0 -1
package/dist/cli/share.d.ts
CHANGED
|
@@ -301,6 +301,8 @@ export interface ShareOptions {
|
|
|
301
301
|
onEvent?: (event: SyncProgressEvent) => void;
|
|
302
302
|
/** See SyncOptions.transferSemaphore: shared across concurrent fanout legs. */
|
|
303
303
|
transferSemaphore?: TransferSemaphore;
|
|
304
|
+
/** Realtime passes bypass the full-chore payload governor. */
|
|
305
|
+
transferPriority?: "chore" | "realtime";
|
|
304
306
|
/** See SyncOptions.progressRecorder: fanout writes one aggregate snapshot. */
|
|
305
307
|
progressRecorder?: (event: SyncProgressEvent) => void;
|
|
306
308
|
/**
|
|
@@ -310,12 +312,22 @@ export interface ShareOptions {
|
|
|
310
312
|
onHeartbeat?: () => void;
|
|
311
313
|
/**
|
|
312
314
|
* Cooperative root-lock hand-off for a watch-mode full push. It is called
|
|
313
|
-
* only after a bounded upload unit
|
|
314
|
-
* updates are on disk. A `true` result
|
|
315
|
-
* pass yielded, so the push is rebuilt
|
|
316
|
-
* before it can plan another durable
|
|
317
|
-
|
|
318
|
-
|
|
315
|
+
* only after a bounded upload unit, or the current active upload set, has
|
|
316
|
+
* completely settled and its journal updates are on disk. A `true` result
|
|
317
|
+
* means realtime work ran while this pass yielded, so the push is rebuilt
|
|
318
|
+
* from current local and journal state before it can plan another durable
|
|
319
|
+
* mutation.
|
|
320
|
+
*/
|
|
321
|
+
cooperativeCheckpoint?: (() => Promise<void | boolean>) & {
|
|
322
|
+
/** Lets an upload queue stop filling its next unit before the next count checkpoint. */
|
|
323
|
+
shouldYieldToRealtime?: () => boolean;
|
|
324
|
+
/** Run one payload PUT while the scheduler lends durable ownership to realtime. */
|
|
325
|
+
runChoreNetworkTransfer?: <T>(work: () => Promise<T>) => Promise<{
|
|
326
|
+
value: T;
|
|
327
|
+
realtimeRan: boolean;
|
|
328
|
+
complete: () => void;
|
|
329
|
+
}>;
|
|
330
|
+
};
|
|
319
331
|
/**
|
|
320
332
|
* When true, files whose local hash matches the journal entry from the
|
|
321
333
|
* last sync are skipped (no remote HEAD, no upload). This is the gate
|
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":"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
|
|
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
|
@@ -1765,19 +1765,9 @@ async function refreshPushJournalAfterWalk(run, collectedKeys = [], deleteScopeR
|
|
|
1765
1765
|
await yieldToCooperativeCheckpoint(checkpointWork, run.options.cooperativeCheckpoint, true);
|
|
1766
1766
|
}
|
|
1767
1767
|
}
|
|
1768
|
-
function planLimitUpgradeUrlForError(error) {
|
|
1769
|
-
if (!(error instanceof VaultClientError) || !error.upgradeUrl)
|
|
1770
|
-
return undefined;
|
|
1771
|
-
if (error.statusCode === 402 && error.code === "plan_limit_reached") {
|
|
1772
|
-
return error.upgradeUrl;
|
|
1773
|
-
}
|
|
1774
|
-
if (error.code === "PLAN_LIMIT_REACHED")
|
|
1775
|
-
return error.upgradeUrl;
|
|
1776
|
-
return undefined;
|
|
1777
|
-
}
|
|
1778
1768
|
async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
1779
1769
|
counters.filesSkipped += pushPlan.preplannedFilesSkipped;
|
|
1780
|
-
const TRANSFER_CONCURRENCY = resolveTransferConcurrency(run.hostLoadAtStart);
|
|
1770
|
+
const TRANSFER_CONCURRENCY = resolveTransferConcurrency(run.hostLoadAtStart, run.options.transferPriority ?? "chore");
|
|
1781
1771
|
let conflictPromptChain = Promise.resolve();
|
|
1782
1772
|
const resolveConflictSerialized = (info) => {
|
|
1783
1773
|
const resolution = conflictPromptChain.then(() => resolveConflict(info, run.onConflict));
|
|
@@ -1828,18 +1818,6 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
1828
1818
|
let aborted = false;
|
|
1829
1819
|
let abortFlightConflictPaths = [];
|
|
1830
1820
|
let hadUploadFailure = false;
|
|
1831
|
-
let emittedPlanLimitNotice = false;
|
|
1832
|
-
const emitPlanLimitSkip = (error) => {
|
|
1833
|
-
const upgradeUrl = planLimitUpgradeUrlForError(error);
|
|
1834
|
-
if (!upgradeUrl)
|
|
1835
|
-
return false;
|
|
1836
|
-
counters.filesSkipped++;
|
|
1837
|
-
if (!emittedPlanLimitNotice) {
|
|
1838
|
-
emittedPlanLimitNotice = true;
|
|
1839
|
-
run.emit({ type: "plan-limit", upgradeUrl });
|
|
1840
|
-
}
|
|
1841
|
-
return true;
|
|
1842
|
-
};
|
|
1843
1821
|
const settleFreshSkip = (item) => {
|
|
1844
1822
|
if (item.action === "refuse-server-owned") {
|
|
1845
1823
|
if (run.options.serverOwnedPathPolicy !== "skip") {
|
|
@@ -2269,50 +2247,80 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2269
2247
|
: undefined;
|
|
2270
2248
|
if (!isSymlinkUpload)
|
|
2271
2249
|
setUploadContentHash(absolutePath, localHash);
|
|
2272
|
-
const
|
|
2273
|
-
|
|
2274
|
-
|
|
2275
|
-
|
|
2276
|
-
|
|
2277
|
-
|
|
2278
|
-
|
|
2279
|
-
|
|
2280
|
-
|
|
2281
|
-
|
|
2282
|
-
}
|
|
2283
|
-
|
|
2284
|
-
|
|
2285
|
-
|
|
2286
|
-
|
|
2250
|
+
const journalSnapshot = JSON.stringify(journalRows(run.journal).get(relativePath) ?? null);
|
|
2251
|
+
const sendPayload = async () => {
|
|
2252
|
+
if (run.options.transferPriority === "realtime") {
|
|
2253
|
+
return isSymlinkUpload
|
|
2254
|
+
? uploadSymlink(run.ctx, item.target, relativePath, run.options.author, pc, { bypassBandwidthGovernor: true })
|
|
2255
|
+
: uploadFile(run.ctx, absolutePath, relativePath, run.options.author, pc, { bypassBandwidthGovernor: true });
|
|
2256
|
+
}
|
|
2257
|
+
return isSymlinkUpload
|
|
2258
|
+
? uploadSymlink(run.ctx, item.target, relativePath, run.options.author, pc)
|
|
2259
|
+
: uploadFile(run.ctx, absolutePath, relativePath, run.options.author, pc);
|
|
2260
|
+
};
|
|
2261
|
+
const runNetworkTransfer = run.options.cooperativeCheckpoint?.runChoreNetworkTransfer;
|
|
2262
|
+
const transfer = runNetworkTransfer
|
|
2263
|
+
? await runNetworkTransfer(sendPayload)
|
|
2264
|
+
: { value: await sendPayload(), realtimeRan: false, complete: () => undefined };
|
|
2265
|
+
try {
|
|
2266
|
+
if (transfer.realtimeRan) {
|
|
2267
|
+
const latestJournal = readJournalScoped(run.journalSlug, [relativePath]);
|
|
2268
|
+
const latestEntry = journalRows(latestJournal).get(relativePath);
|
|
2269
|
+
if (JSON.stringify(latestEntry ?? null) !== journalSnapshot) {
|
|
2270
|
+
if (latestEntry)
|
|
2271
|
+
journalRows(run.journal).set(relativePath, latestEntry);
|
|
2272
|
+
else
|
|
2273
|
+
journalRows(run.journal).delete(relativePath);
|
|
2274
|
+
counters.filesSkipped++;
|
|
2275
|
+
return;
|
|
2276
|
+
}
|
|
2277
|
+
}
|
|
2278
|
+
const { etag } = transfer.value;
|
|
2279
|
+
updateEntry(run.journal, relativePath, localHash, size, "up", absolutePath, {
|
|
2280
|
+
remoteEtag: etag,
|
|
2281
|
+
mtimeMs,
|
|
2282
|
+
ctimeMs,
|
|
2283
|
+
kind: item.kind,
|
|
2284
|
+
skillMetadataPending: skillContentAtPut !== undefined &&
|
|
2285
|
+
skillRegistrarForRun(run) !== undefined,
|
|
2286
|
+
});
|
|
2287
|
+
if (run.message) {
|
|
2288
|
+
journalRows(run.journal).set(relativePath, {
|
|
2289
|
+
...journalRows(run.journal).get(relativePath),
|
|
2290
|
+
message: run.message,
|
|
2291
|
+
});
|
|
2292
|
+
}
|
|
2293
|
+
counters.filesUploaded++;
|
|
2294
|
+
counters.bytesUploaded += size;
|
|
2295
|
+
// A landed company skill needs a durable retry marker before the registry
|
|
2296
|
+
// call. The ordinary cadence is intentionally sparse for large vaults,
|
|
2297
|
+
// but losing this row can strand tags after a crash between PUT and
|
|
2298
|
+
// reconciliation.
|
|
2299
|
+
if (journalRows(run.journal).get(relativePath)?.skillMetadataPending === true) {
|
|
2300
|
+
flushShareJournal(run);
|
|
2301
|
+
}
|
|
2302
|
+
else {
|
|
2303
|
+
// Strictly after the PUT returned and the entry was applied, so an
|
|
2304
|
+
// interrupted pass can only ever re-upload a file, never skip one.
|
|
2305
|
+
checkpointShareJournal(run);
|
|
2306
|
+
}
|
|
2307
|
+
if (skillContentAtPut !== undefined &&
|
|
2308
|
+
skillRegistrarForRun(run) !== undefined &&
|
|
2309
|
+
fs.readFileSync(absolutePath, "utf8") === skillContentAtPut) {
|
|
2310
|
+
const outcome = await reconcileLandedCompanySkill(run, relativePath, skillContentAtPut, absolutePath);
|
|
2311
|
+
settleLandedReconcile(run, relativePath, outcome);
|
|
2312
|
+
checkpointShareJournal(run);
|
|
2313
|
+
}
|
|
2314
|
+
run.emit({
|
|
2315
|
+
type: "progress",
|
|
2316
|
+
path: relativePath,
|
|
2317
|
+
bytes: size,
|
|
2318
|
+
...(run.message ? { message: run.message } : {}),
|
|
2287
2319
|
});
|
|
2288
2320
|
}
|
|
2289
|
-
|
|
2290
|
-
|
|
2291
|
-
// A landed company skill needs a durable retry marker before the registry
|
|
2292
|
-
// call. The ordinary cadence is intentionally sparse for large vaults,
|
|
2293
|
-
// but losing this row can strand tags after a crash between PUT and
|
|
2294
|
-
// reconciliation.
|
|
2295
|
-
if (journalRows(run.journal).get(relativePath)?.skillMetadataPending === true) {
|
|
2296
|
-
flushShareJournal(run);
|
|
2297
|
-
}
|
|
2298
|
-
else {
|
|
2299
|
-
// Strictly after the PUT returned and the entry was applied, so an
|
|
2300
|
-
// interrupted pass can only ever re-upload a file, never skip one.
|
|
2301
|
-
checkpointShareJournal(run);
|
|
2302
|
-
}
|
|
2303
|
-
if (skillContentAtPut !== undefined &&
|
|
2304
|
-
skillRegistrarForRun(run) !== undefined &&
|
|
2305
|
-
fs.readFileSync(absolutePath, "utf8") === skillContentAtPut) {
|
|
2306
|
-
const outcome = await reconcileLandedCompanySkill(run, relativePath, skillContentAtPut, absolutePath);
|
|
2307
|
-
settleLandedReconcile(run, relativePath, outcome);
|
|
2308
|
-
checkpointShareJournal(run);
|
|
2321
|
+
finally {
|
|
2322
|
+
transfer.complete();
|
|
2309
2323
|
}
|
|
2310
|
-
run.emit({
|
|
2311
|
-
type: "progress",
|
|
2312
|
-
path: relativePath,
|
|
2313
|
-
bytes: size,
|
|
2314
|
-
...(run.message ? { message: run.message } : {}),
|
|
2315
|
-
});
|
|
2316
2324
|
};
|
|
2317
2325
|
try {
|
|
2318
2326
|
await performUpload(precondition);
|
|
@@ -2333,8 +2341,6 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2333
2341
|
// full-journal write after every later PUT.
|
|
2334
2342
|
if (err instanceof JournalCheckpointError)
|
|
2335
2343
|
throw err;
|
|
2336
|
-
if (emitPlanLimitSkip(err))
|
|
2337
|
-
return;
|
|
2338
2344
|
if (isPreconditionFailed(err)) {
|
|
2339
2345
|
conflictPaths.push(relativePath);
|
|
2340
2346
|
if (usesVersionAwareWinner(run.onConflict)) {
|
|
@@ -2377,8 +2383,6 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2377
2383
|
}
|
|
2378
2384
|
if (retryErr instanceof JournalCheckpointError)
|
|
2379
2385
|
throw retryErr;
|
|
2380
|
-
if (emitPlanLimitSkip(retryErr))
|
|
2381
|
-
return;
|
|
2382
2386
|
if (isPreconditionFailed(retryErr)) {
|
|
2383
2387
|
counters.filesSkipped++;
|
|
2384
2388
|
return;
|
|
@@ -2465,10 +2469,6 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2465
2469
|
isRetryableIdentityRefusal(retryErr)) {
|
|
2466
2470
|
throw retryErr;
|
|
2467
2471
|
}
|
|
2468
|
-
if (retryErr instanceof JournalCheckpointError)
|
|
2469
|
-
throw retryErr;
|
|
2470
|
-
if (emitPlanLimitSkip(retryErr))
|
|
2471
|
-
return;
|
|
2472
2472
|
hadUploadFailure = true;
|
|
2473
2473
|
run.emit({
|
|
2474
2474
|
type: "error",
|
|
@@ -2553,9 +2553,14 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2553
2553
|
let admittedSinceCooperativeCheckpoint = 0;
|
|
2554
2554
|
let skippedSinceCooperativeCheckpoint = 0;
|
|
2555
2555
|
let remainingPreplannedSkips = pushPlan.preplannedFilesSkipped;
|
|
2556
|
+
let realtimeYieldRequested = false;
|
|
2557
|
+
const realtimeIsWaiting = () => run.options.cooperativeCheckpoint?.shouldYieldToRealtime?.() === true;
|
|
2556
2558
|
while (queue.length > 0 || inFlight.size > 0 || remainingPreplannedSkips > 0) {
|
|
2559
|
+
if (realtimeIsWaiting())
|
|
2560
|
+
realtimeYieldRequested = true;
|
|
2557
2561
|
while (!aborted &&
|
|
2558
2562
|
!sessionAuthAborted &&
|
|
2563
|
+
!realtimeYieldRequested &&
|
|
2559
2564
|
(!run.options.cooperativeCheckpoint ||
|
|
2560
2565
|
(admittedSinceCooperativeCheckpoint <
|
|
2561
2566
|
getActiveFullPassUnitSize() &&
|
|
@@ -2597,12 +2602,19 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2597
2602
|
queue.shift();
|
|
2598
2603
|
admittedSinceCooperativeCheckpoint++;
|
|
2599
2604
|
inFlightBytes += nextBytes;
|
|
2600
|
-
const upload = () =>
|
|
2601
|
-
|
|
2605
|
+
const upload = async () => {
|
|
2606
|
+
await processUploadItem(item);
|
|
2607
|
+
if (realtimeIsWaiting())
|
|
2608
|
+
realtimeYieldRequested = true;
|
|
2609
|
+
};
|
|
2610
|
+
const p = (run.options.transferSemaphore &&
|
|
2611
|
+
run.options.transferPriority !== "realtime"
|
|
2602
2612
|
? run.options.transferSemaphore.withPermit(upload)
|
|
2603
2613
|
: upload())
|
|
2604
2614
|
.catch((err) => {
|
|
2605
2615
|
hadUploadFailure = true;
|
|
2616
|
+
if (realtimeIsWaiting())
|
|
2617
|
+
realtimeYieldRequested = true;
|
|
2606
2618
|
// The journal is no longer persistable, so continuing would upload
|
|
2607
2619
|
// more objects that can never be recorded. Stop feeding the queue.
|
|
2608
2620
|
if (err instanceof JournalCheckpointError)
|
|
@@ -2627,9 +2639,11 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2627
2639
|
!aborted &&
|
|
2628
2640
|
!sessionAuthAborted &&
|
|
2629
2641
|
!hadUploadFailure &&
|
|
2630
|
-
(admittedSinceCooperativeCheckpoint > 0 ||
|
|
2631
|
-
|
|
2632
|
-
|
|
2642
|
+
(admittedSinceCooperativeCheckpoint > 0 ||
|
|
2643
|
+
skippedSinceCooperativeCheckpoint > 0 ||
|
|
2644
|
+
realtimeYieldRequested) &&
|
|
2645
|
+
(realtimeYieldRequested ||
|
|
2646
|
+
admittedSinceCooperativeCheckpoint >= getActiveFullPassUnitSize() ||
|
|
2633
2647
|
skippedSinceCooperativeCheckpoint >=
|
|
2634
2648
|
getActiveFullPassUnitSize() ||
|
|
2635
2649
|
(queue.length === 0 && remainingPreplannedSkips === 0))) {
|
|
@@ -2650,6 +2664,7 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2650
2664
|
resumedAt,
|
|
2651
2665
|
})}\n`);
|
|
2652
2666
|
}
|
|
2667
|
+
realtimeYieldRequested = false;
|
|
2653
2668
|
}
|
|
2654
2669
|
else {
|
|
2655
2670
|
break;
|
|
@@ -3470,9 +3485,6 @@ function defaultConsoleLogger(event) {
|
|
|
3470
3485
|
console.log(`Plan: ${event.filesToUpload} to upload (${event.bytesToUpload} bytes), ${event.filesToSkip} unchanged`);
|
|
3471
3486
|
}
|
|
3472
3487
|
}
|
|
3473
|
-
else if (event.type === "plan-limit") {
|
|
3474
|
-
console.warn(` ! New files are paused by your plan. Upgrade: ${event.upgradeUrl}`);
|
|
3475
|
-
}
|
|
3476
3488
|
else if (event.type === "progress") {
|
|
3477
3489
|
if (event.deleted) {
|
|
3478
3490
|
// Append `message` when present (e.g. tombstone events carry
|