@cleocode/core 2026.10.10 → 2026.10.11
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/build-provenance.json +2 -2
- package/dist/cloud/nexus-cloud-conflicts.d.ts +8 -3
- package/dist/cloud/nexus-cloud-conflicts.d.ts.map +1 -1
- package/dist/cloud/nexus-cloud-conflicts.js +21 -5
- package/dist/cloud/nexus-cloud-conflicts.js.map +1 -1
- package/dist/cloud/nexus-cloud-journal-activity.d.ts +15 -1
- package/dist/cloud/nexus-cloud-journal-activity.d.ts.map +1 -1
- package/dist/cloud/nexus-cloud-journal-activity.js +8 -2
- package/dist/cloud/nexus-cloud-journal-activity.js.map +1 -1
- package/dist/cloud/nexus-cloud-status.d.ts.map +1 -1
- package/dist/cloud/nexus-cloud-status.js +6 -2
- package/dist/cloud/nexus-cloud-status.js.map +1 -1
- package/dist/cloud/nexus-vault.d.ts.map +1 -1
- package/dist/cloud/nexus-vault.js +52 -8
- package/dist/cloud/nexus-vault.js.map +1 -1
- package/dist/cloud/secret-seal.d.ts +31 -0
- package/dist/cloud/secret-seal.d.ts.map +1 -1
- package/dist/cloud/secret-seal.js +82 -4
- package/dist/cloud/secret-seal.js.map +1 -1
- package/dist/internal.d.ts +2 -0
- package/dist/internal.d.ts.map +1 -1
- package/dist/internal.js +1 -0
- package/dist/internal.js.map +1 -1
- package/dist/memory/decision-cross-link.d.ts +5 -2
- package/dist/memory/decision-cross-link.d.ts.map +1 -1
- package/dist/memory/decision-cross-link.js +5 -2
- package/dist/memory/decision-cross-link.js.map +1 -1
- package/dist/memory/decisions.d.ts.map +1 -1
- package/dist/memory/decisions.js +13 -5
- package/dist/memory/decisions.js.map +1 -1
- package/dist/resources/admission-ledger.d.ts +7 -0
- package/dist/resources/admission-ledger.d.ts.map +1 -1
- package/dist/resources/admission-ledger.js +53 -9
- package/dist/resources/admission-ledger.js.map +1 -1
- package/dist/store/migration-runner.d.ts +17 -0
- package/dist/store/migration-runner.d.ts.map +1 -1
- package/dist/store/migration-runner.js +53 -0
- package/dist/store/migration-runner.js.map +1 -1
- package/dist/store/migration-safety.d.ts +406 -0
- package/dist/store/migration-safety.d.ts.map +1 -0
- package/dist/store/migration-safety.js +587 -0
- package/dist/store/migration-safety.js.map +1 -0
- package/dist/store/portable-bundle.d.ts +8 -0
- package/dist/store/portable-bundle.d.ts.map +1 -1
- package/dist/store/portable-bundle.js +5 -0
- package/dist/store/portable-bundle.js.map +1 -1
- package/dist/store/sync/conflicts.d.ts +37 -0
- package/dist/store/sync/conflicts.d.ts.map +1 -1
- package/dist/store/sync/conflicts.js +88 -0
- package/dist/store/sync/conflicts.js.map +1 -1
- package/dist/store/sync/merge/engine.d.ts.map +1 -1
- package/dist/store/sync/merge/engine.js +18 -0
- package/dist/store/sync/merge/engine.js.map +1 -1
- package/dist/store/sync/merge/rules.d.ts +2 -1
- package/dist/store/sync/merge/rules.d.ts.map +1 -1
- package/dist/store/sync/merge/rules.js +9 -2
- package/dist/store/sync/merge/rules.js.map +1 -1
- package/dist/store/sync/merge/types.d.ts +7 -0
- package/dist/store/sync/merge/types.d.ts.map +1 -1
- package/dist/store/sync/reconcile-copy.d.ts +8 -0
- package/dist/store/sync/reconcile-copy.d.ts.map +1 -1
- package/dist/store/sync/reconcile-copy.js +1 -1
- package/dist/store/sync/reconcile-copy.js.map +1 -1
- package/dist/store/sync/sealer.d.ts +5 -1
- package/dist/store/sync/sealer.d.ts.map +1 -1
- package/dist/store/sync/sealer.js +35 -3
- package/dist/store/sync/sealer.js.map +1 -1
- package/dist/store/vault-manifest.d.ts +72 -0
- package/dist/store/vault-manifest.d.ts.map +1 -1
- package/dist/store/vault-manifest.js +134 -0
- package/dist/store/vault-manifest.js.map +1 -1
- package/dist/tasks/complete.d.ts.map +1 -1
- package/dist/tasks/complete.js +7 -1
- package/dist/tasks/complete.js.map +1 -1
- package/package.json +13 -13
- package/templates/git-hooks/commit-msg +7 -2
- package/templates/git-hooks/legacy-hashes.json +3 -1
- package/templates/git-hooks/pre-push +9 -3
|
@@ -8,15 +8,18 @@
|
|
|
8
8
|
* parent delete with live children, a uid collision, a broken post-apply
|
|
9
9
|
* invariant. Nothing is silently dropped; this lists them, and `resolve`
|
|
10
10
|
* acknowledges one once its resolution (an ordinary write) is made or it
|
|
11
|
-
* was reviewed; it never replays the voided op.
|
|
12
|
-
*
|
|
11
|
+
* was reviewed; it never replays the voided op. Each conflict carries the
|
|
12
|
+
* row's human id, both sides' values per column and the device that wrote
|
|
13
|
+
* the op (T12997). Local, except that device names come from the account's
|
|
14
|
+
* device list unless `offline` is set.
|
|
13
15
|
*
|
|
14
16
|
* @module cloud/nexus-cloud-conflicts
|
|
15
17
|
* @task T12344
|
|
16
18
|
*/
|
|
17
19
|
import type { CloudConflictResolveResult, CloudConflictsResult, CloudVaultScope } from '@cleocode/contracts';
|
|
20
|
+
import type { NexusCloudOptions } from './nexus-cloud.js';
|
|
18
21
|
/** Options of {@link nexusCloudConflicts}. */
|
|
19
|
-
export interface NexusCloudConflictsOptions {
|
|
22
|
+
export interface NexusCloudConflictsOptions extends NexusCloudOptions {
|
|
20
23
|
/** The project directory (default: the current project). */
|
|
21
24
|
readonly cwd?: string;
|
|
22
25
|
/** Which store (default `project`). */
|
|
@@ -25,6 +28,8 @@ export interface NexusCloudConflictsOptions {
|
|
|
25
28
|
readonly all?: boolean;
|
|
26
29
|
/** Only this stream's conflicts. */
|
|
27
30
|
readonly stream?: string;
|
|
31
|
+
/** Skip the device-name lookup: no request leaves the machine. */
|
|
32
|
+
readonly offline?: boolean;
|
|
28
33
|
}
|
|
29
34
|
/**
|
|
30
35
|
* List the store's recorded sync conflicts, oldest first.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nexus-cloud-conflicts.d.ts","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-conflicts.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"nexus-cloud-conflicts.d.ts","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-conflicts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EACV,0BAA0B,EAC1B,oBAAoB,EACpB,eAAe,EAEhB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAG1D,8CAA8C;AAC9C,MAAM,WAAW,0BAA2B,SAAQ,iBAAiB;IACnE,4DAA4D;IAC5D,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC;IACjC,4DAA4D;IAC5D,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,oCAAoC;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,kEAAkE;IAClE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAeD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,GAAE,0BAA+B,GACpC,OAAO,CAAC,oBAAoB,CAAC,CA8B/B;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAQtC"}
|
|
@@ -8,15 +8,18 @@
|
|
|
8
8
|
* parent delete with live children, a uid collision, a broken post-apply
|
|
9
9
|
* invariant. Nothing is silently dropped; this lists them, and `resolve`
|
|
10
10
|
* acknowledges one once its resolution (an ordinary write) is made or it
|
|
11
|
-
* was reviewed; it never replays the voided op.
|
|
12
|
-
*
|
|
11
|
+
* was reviewed; it never replays the voided op. Each conflict carries the
|
|
12
|
+
* row's human id, both sides' values per column and the device that wrote
|
|
13
|
+
* the op (T12997). Local, except that device names come from the account's
|
|
14
|
+
* device list unless `offline` is set.
|
|
13
15
|
*
|
|
14
16
|
* @module cloud/nexus-cloud-conflicts
|
|
15
17
|
* @task T12344
|
|
16
18
|
*/
|
|
17
19
|
import { getDualScopeNativeDb, openDualScopeDb } from '../store/dual-scope-db.js';
|
|
18
|
-
import { conflictCounts, listConflicts, resolveConflict } from '../store/sync/conflicts.js';
|
|
20
|
+
import { conflictCounts, conflictDetail, listConflicts, resolveConflict, } from '../store/sync/conflicts.js';
|
|
19
21
|
import { hasTable } from '../store/sync/schema.js';
|
|
22
|
+
import { deviceNames } from './nexus-cloud-journal-activity.js';
|
|
20
23
|
const NOT_SYNCING = {
|
|
21
24
|
code: 'W_SYNC_NOT_ENABLED',
|
|
22
25
|
message: 'this store has never applied a sync stream: no conflicts are recorded',
|
|
@@ -42,11 +45,24 @@ export async function nexusCloudConflicts(opts = {}) {
|
|
|
42
45
|
open: opts.all !== true,
|
|
43
46
|
...(opts.stream !== undefined ? { stream: opts.stream } : {}),
|
|
44
47
|
});
|
|
48
|
+
// Device names only when there is something to name (no request otherwise).
|
|
49
|
+
const { names, warning } = rows.length > 0 ? await deviceNames(opts) : { names: new Map(), warning: null };
|
|
45
50
|
return {
|
|
46
51
|
scope,
|
|
47
52
|
...conflictCounts(db, opts.stream),
|
|
48
|
-
conflicts: rows.map((c) =>
|
|
49
|
-
|
|
53
|
+
conflicts: rows.map((c) => {
|
|
54
|
+
const d = conflictDetail(db, scope, c);
|
|
55
|
+
return {
|
|
56
|
+
...c,
|
|
57
|
+
columns: [...c.columns],
|
|
58
|
+
humanId: d.humanId,
|
|
59
|
+
deviceId: d.deviceId,
|
|
60
|
+
deviceName: d.deviceId ? (names.get(d.deviceId) ?? null) : null,
|
|
61
|
+
opKnown: d.opKnown,
|
|
62
|
+
fields: d.fields.map((f) => ({ ...f })),
|
|
63
|
+
};
|
|
64
|
+
}),
|
|
65
|
+
warnings: warning ? [warning] : [],
|
|
50
66
|
};
|
|
51
67
|
}
|
|
52
68
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nexus-cloud-conflicts.js","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-conflicts.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"nexus-cloud-conflicts.js","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-conflicts.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
* @task T13369
|
|
18
18
|
* @epic T12323
|
|
19
19
|
*/
|
|
20
|
-
import type { CloudJournalActivityResult, CloudVaultScope } from '@cleocode/contracts';
|
|
20
|
+
import type { CloudJournalActivityResult, CloudVaultScope, CloudWarning } from '@cleocode/contracts';
|
|
21
21
|
import { type NexusCloudOptions } from './nexus-cloud.js';
|
|
22
22
|
/** Options of {@link nexusJournalActivity}. */
|
|
23
23
|
export interface NexusJournalActivityOptions extends NexusCloudOptions {
|
|
@@ -44,6 +44,20 @@ export declare class JournalActivitySinceError extends Error {
|
|
|
44
44
|
readonly fix = "pass --since as an ISO-8601 date or time, e.g. 2026-10-09 or 2026-10-09T12:00:00Z";
|
|
45
45
|
constructor(since: string);
|
|
46
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* Device names and last presence by Nexus device id, or why there are none.
|
|
49
|
+
* No request is made when `offline` is set.
|
|
50
|
+
*
|
|
51
|
+
* @param opts - The connection options and `offline`.
|
|
52
|
+
* @returns The names, last presence times, and a warning when the lookup failed.
|
|
53
|
+
*/
|
|
54
|
+
export declare function deviceNames(opts: NexusCloudOptions & {
|
|
55
|
+
readonly offline?: boolean;
|
|
56
|
+
}): Promise<{
|
|
57
|
+
names: Map<string, string>;
|
|
58
|
+
lastSeen: Map<string, string>;
|
|
59
|
+
warning: CloudWarning | null;
|
|
60
|
+
}>;
|
|
47
61
|
/**
|
|
48
62
|
* List the journal transactions this store received, newest first, with
|
|
49
63
|
* the device that wrote each one.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nexus-cloud-journal-activity.d.ts","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-journal-activity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EACV,0BAA0B,EAC1B,eAAe,
|
|
1
|
+
{"version":3,"file":"nexus-cloud-journal-activity.d.ts","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-journal-activity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EACV,0BAA0B,EAC1B,eAAe,EACf,YAAY,EACb,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAyB,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEjF,+CAA+C;AAC/C,MAAM,WAAW,2BAA4B,SAAQ,iBAAiB;IACpE,4DAA4D;IAC5D,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC;IACjC,mDAAmD;IACnD,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,uDAAuD;IACvD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,wDAAwD;IACxD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,qEAAqE;IACrE,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,6CAA6C;IAC7C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAOD,+CAA+C;AAC/C,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,QAAQ,CAAC,IAAI,kBAAkB;IAC/B,QAAQ,CAAC,GAAG,uFAC0E;gBAC1E,KAAK,EAAE,MAAM;CAI1B;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GACvD,OAAO,CAAC;IACT,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;CAC9B,CAAC,CAqBD;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,GAAE,2BAAgC,GACrC,OAAO,CAAC,0BAA0B,CAAC,CA2BrC"}
|
|
@@ -34,8 +34,14 @@ export class JournalActivitySinceError extends Error {
|
|
|
34
34
|
this.name = 'JournalActivitySinceError';
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
/**
|
|
38
|
-
|
|
37
|
+
/**
|
|
38
|
+
* Device names and last presence by Nexus device id, or why there are none.
|
|
39
|
+
* No request is made when `offline` is set.
|
|
40
|
+
*
|
|
41
|
+
* @param opts - The connection options and `offline`.
|
|
42
|
+
* @returns The names, last presence times, and a warning when the lookup failed.
|
|
43
|
+
*/
|
|
44
|
+
export async function deviceNames(opts) {
|
|
39
45
|
if (opts.offline === true)
|
|
40
46
|
return { names: new Map(), lastSeen: new Map(), warning: null };
|
|
41
47
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nexus-cloud-journal-activity.js","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-journal-activity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAOH,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAA0B,MAAM,kBAAkB,CAAC;AAsBjF,MAAM,WAAW,GAAiB;IAChC,IAAI,EAAE,oBAAoB;IAC1B,OAAO,EAAE,4EAA4E;CACtF,CAAC;AAEF,+CAA+C;AAC/C,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IACzC,IAAI,GAAG,cAAc,CAAC;IACtB,GAAG,GACV,mFAAmF,CAAC;IACtF,YAAY,KAAa;QACvB,KAAK,CAAC,2BAA2B,KAAK,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;IAC1C,CAAC;CACF;AAED
|
|
1
|
+
{"version":3,"file":"nexus-cloud-journal-activity.js","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-journal-activity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAOH,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAA0B,MAAM,kBAAkB,CAAC;AAsBjF,MAAM,WAAW,GAAiB;IAChC,IAAI,EAAE,oBAAoB;IAC1B,OAAO,EAAE,4EAA4E;CACtF,CAAC;AAEF,+CAA+C;AAC/C,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IACzC,IAAI,GAAG,cAAc,CAAC;IACtB,GAAG,GACV,mFAAmF,CAAC;IACtF,YAAY,KAAa;QACvB,KAAK,CAAC,2BAA2B,KAAK,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;IAC1C,CAAC;CACF;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAwD;IAMxD,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3F,IAAI,CAAC;QACH,uFAAuF;QACvF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAqB,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC3C,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,EAAE,GAAG,CAAC,CAAC,cAAc,IAAI,CAAC,CAAC,UAAU,CAAC;YAC5C,IAAI,EAAE;gBAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC/F,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,KAAK,EAAE,IAAI,GAAG,EAAE;YAChB,QAAQ,EAAE,IAAI,GAAG,EAAE;YACnB,OAAO,EAAE;gBACP,IAAI,EAAE,4BAA4B;gBAClC,OAAO,EAAE,+BAA+B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;aAC3F;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAAoC,EAAE;IAEtC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC;IACtC,IAAI,OAA2B,CAAC;IAChC,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,2FAA2F;QAC3F,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,MAAM,IAAI,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,EAAE,GAAG,oBAAoB,CAC7B,KAAK,KAAK,QAAQ;QAChB,CAAC,CAAC,MAAM,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC;QAC3C,CAAC,CAAC,MAAM,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAC/C,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,aAAa,CAAC,EAAE,CAAC;QACjC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;IACtF,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,EAAE;QAC/B,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,QAAQ;QACxB,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrE,CAAC,CAAC;IACH,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAChE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nexus-cloud-status.d.ts","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAIV,yBAAyB,EACzB,iBAAiB,EAEjB,eAAe,EACf,qBAAqB,EAGrB,YAAY,EAEZ,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,EAAE,iBAAiB,EAAsB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EAIvB,MAAM,kBAAkB,CAAC;AAM1B,4GAA4G;AAC5G,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAuC/D,sFAAsF;AACtF,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AAEjE,wFAAwF;AACxF,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAEvE,yFAAyF;AACzF,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD,yFAAyF;AACzF,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAEvE,8FAA8F;AAC9F,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AAEjE,+CAA+C;AAC/C,MAAM,WAAW,uBAAwB,SAAQ,iBAAiB;IAChE,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,iBAAiB;IAC3D;;;;OAIG;IACH,QAAQ,CAAC,aAAa,EAAE,yBAAyB,CAAC;IAElD;;;;OAIG;gBACS,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,yBAAyB,EAAE,GAAG,CAAC,EAAE,MAAM;CAKpF;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,SAAS,qBAAqB,EAAE,GACvC,gBAAgB,CAAC,SAAS,CAAC,CAO7B;AAOD,8EAA8E;AAC9E,MAAM,WAAW,qBAAqB;IACpC,oFAAoF;IACpF,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,sDAAsD;IACtD,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;CACvC;AAcD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAWjG;AA6CD,0FAA0F;AAC1F,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AA8HjE;;;;;;;;;;;;;GAaG;AACH,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,YAAY,EAChB,KAAK,EAAE,SAAS,GAAG,QAAQ,EAC3B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"nexus-cloud-status.d.ts","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -308,7 +308,7 @@ async function streamJournalFacts(db, linked, replica) {
|
|
|
308
308
|
* @task T12998
|
|
309
309
|
*/
|
|
310
310
|
export async function readStoreSyncStream(db, scope, stream, dbPath) {
|
|
311
|
-
const [{ readSyncFlags }, { hasTable }, { sealBacklog }, { suspectTables }, { holdsReport }, { undoBudget }, { seenTxnReport }, { activeReplica },] = await Promise.all([
|
|
311
|
+
const [{ readSyncFlags }, { hasTable }, { sealBacklog }, { suspectTables }, { holdsReport }, { undoBudget }, { seenTxnReport }, { activeReplica }, { conflictCounts },] = await Promise.all([
|
|
312
312
|
import('../store/sync/flags.js'),
|
|
313
313
|
import('../store/sync/schema.js'),
|
|
314
314
|
import('../store/sync/seal-backlog.js'),
|
|
@@ -317,6 +317,7 @@ export async function readStoreSyncStream(db, scope, stream, dbPath) {
|
|
|
317
317
|
import('../store/sync/sequencing.js'),
|
|
318
318
|
import('../store/sync/pull.js'),
|
|
319
319
|
import('../store/sync/replica.js'),
|
|
320
|
+
import('../store/sync/conflicts.js'),
|
|
320
321
|
]);
|
|
321
322
|
const holds = holdsReport(db, Date.now());
|
|
322
323
|
const flags = readSyncFlags(db);
|
|
@@ -381,7 +382,10 @@ export async function readStoreSyncStream(db, scope, stream, dbPath) {
|
|
|
381
382
|
lastPulledSeq: journal.lastPulledSeq,
|
|
382
383
|
serverHeadSeq: needsPush("the server's head for this stream"),
|
|
383
384
|
devices: needsPush('per-device last sync'),
|
|
384
|
-
|
|
385
|
+
// The apply's conflict log is local (T12997): `cleo cloud conflicts` lists them.
|
|
386
|
+
openConflicts: hasTable(db, '_sync_conflict')
|
|
387
|
+
? { known: true, value: conflictCounts(db, journal.stream ?? undefined).open }
|
|
388
|
+
: needsPush('the conflicts held open on this stream'),
|
|
385
389
|
lag: needsPush('lag behind the server'),
|
|
386
390
|
};
|
|
387
391
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nexus-cloud-status.js","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-status.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nexus-cloud-status.js","sourceRoot":"","sources":["../../src/cloud/nexus-cloud-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAmB1C,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,wBAAwB,EACxB,sBAAsB,EAItB,cAAc,EACd,wBAAwB,GACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAwB,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,4GAA4G;AAC5G,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAwB,CAAC;AAE/D;;;;GAIG;AACH,KAAK,UAAU,SAAS,CACtB,IAA0B,EAC1B,SAAiB,EACjB,OAA4B,EAC5B,GAAe,EACf,QAAwB;IAExB,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9B,4EAA4E;QAC5E,OAAO,QAAQ;aACZ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACX,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,KAAK,EACH,CAAC,CAAC,UAAU,KAAK,IAAI;gBACrB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,4BAA4B,GAAG,IAAI;YACzE,UAAU,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ;SAChD,CAAC,CAAC,CAAC;IACR,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,8CAA8C,SAAS,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;SACxH,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,sFAAsF;AACtF,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAEjE,wFAAwF;AACxF,MAAM,CAAC,MAAM,0BAA0B,GAAG,4BAA4B,CAAC;AAEvE,yFAAyF;AACzF,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEvD,yFAAyF;AACzF,MAAM,CAAC,MAAM,0BAA0B,GAAG,4BAA4B,CAAC;AAEvE,8FAA8F;AAC9F,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAUjE;;;GAGG;AACH,MAAM,OAAO,sBAAuB,SAAQ,iBAAiB;IAC3D;;;;OAIG;IACM,aAAa,CAA4B;IAElD;;;;OAIG;IACH,YAAY,OAAe,EAAE,aAAwC,EAAE,GAAY;QACjF,KAAK,CAAC,qBAAqB,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAAwC;IAExC,MAAM,MAAM,GAAG,CAAC,EAA+B,EAAW,EAAE,CAC1D,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3C,IAAI,MAAM,CAAC,mBAAmB,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC;QAAE,OAAO,gBAAgB,CAAC;IACpF,IAAI,MAAM,CAAC,oBAAoB,CAAC,IAAI,MAAM,CAAC,kBAAkB,CAAC;QAAE,OAAO,YAAY,CAAC;IACpF,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAAE,OAAO,WAAW,CAAC;IAChE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,uEAAuE;AACvE,SAAS,UAAU,CAAC,MAAwC;IAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAC5F,CAAC;AAeD,mDAAmD;AACnD,SAAS,eAAe,CAAC,MAAc;IACrC,OAAO;QACL,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE;YACP,IAAI,EAAE,0BAA0B;YAChC,OAAO,EAAE,6EAA6E,MAAM,EAAE;SAC/F;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,WAAmB;IAC/D,gFAAgF;IAChF,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC,CAAC;IAC1D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAClC,IAAI,EACJ,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,SAAS,IAAI,IAAI,CACxD,CAAC;IACF,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACzF,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACrE,CAAC;AAQD;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,iBAAiB,CAC9B,IAAY,EACZ,IAA0C;IAE1C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjD,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAC7D,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,MAAM,EACJ,uHAAuH;SAC1H,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IACxE,IAAI,IAAuD,CAAC;IAC5D,IAAI,CAAC;QACH,IAAI,GAAG,kBAAkB,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;QACzE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;IACtD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IAC1F,CAAC;YAAS,CAAC;QACT,IAAI,EAAE,KAAK,EAAE,CAAC;IAChB,CAAC;AACH,CAAC;AAED,0FAA0F;AAC1F,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAEjE,+EAA+E;AAC/E,MAAM,cAAc,GAAqB;IACvC,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,2EAA2E;CACpF,CAAC;AAEF,0FAA0F;AAC1F,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO;QACL,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,GAAG,IAAI,yFAAyF;KACzG,CAAC;AACJ,CAAC;AAYD;;;;;GAKG;AACH,SAAS,WAAW,CAClB,EAAgB,EAChB,QAAkD,EAClD,SAAiB;IAEjB,IAAI,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,EAAE;aACX,OAAO,CACN,kGAAkG,CACnG;aACA,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAmC,CAAC;QAC5F,IAAI,GAAG;YAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAC7B,CAAC;IACD,IAAI,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,yDAAyD,CAAC,CAAC,GAAG,EAExE,CAAC;QACd,IAAI,GAAG;YAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,kBAAkB,CAC/B,EAAgB,EAChB,MAAqB,EACrB,OAAsB;IAEtB,MAAM,CACJ,EAAE,QAAQ,EAAE,sBAAsB,EAAE,EACpC,EAAE,YAAY,EAAE,cAAc,EAAE,EAChC,EAAE,gBAAgB,EAAE,EACrB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpB,MAAM,CAAC,yBAAyB,CAAC;QACjC,MAAM,CAAC,0BAA0B,CAAC;QAClC,MAAM,CAAC,uBAAuB,CAAC;KAChC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,IAAI,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,sBAAsB,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;IAC1E,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAC/B,OAAO;YACL,MAAM;YACN,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE,KAAK;YACrB,SAAS,EAAE,cAAc;YACzB,aAAa,EAAE,SAAS,CAAC,0BAA0B,CAAC;YACpD,aAAa,EAAE,SAAS,CAAC,0BAA0B,CAAC;SACrD,CAAC;IACJ,CAAC;IACD,4EAA4E;IAC5E,MAAM,MAAM,GACV,EAAE;SACC,OAAO,CACN;;;;;8FAKsF,CACvF;SACA,GAAG,CAAC,OAAO,EAAE,MAAM,CACvB,CAAC,CAAC,CAAC;IACJ,MAAM,MAAM,GAAG,EAAE;SACd,OAAO,CACN,wFAAwF,CACzF;SACA,GAAG,CAAC,MAAM,CAA2B,CAAC;IACzC,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACrC,OAAO;QACL,MAAM;QACN,UAAU,EAAE,GAAG,IAAI,IAAI;QACvB,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC;QAC1C,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE;QACzC,aAAa,EACX,MAAM,CAAC,GAAG,KAAK,IAAI;YACjB,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC;YACvC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,EAAE;QACxC,aAAa,EACX,MAAM,KAAK,IAAI;YACb,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC;YACvC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE;KAC3C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAgB,EAChB,KAA2B,EAC3B,MAAqB,EACrB,MAAc;IAEd,MAAM,CACJ,EAAE,aAAa,EAAE,EACjB,EAAE,QAAQ,EAAE,EACZ,EAAE,WAAW,EAAE,EACf,EAAE,aAAa,EAAE,EACjB,EAAE,WAAW,EAAE,EACf,EAAE,UAAU,EAAE,EACd,EAAE,aAAa,EAAE,EACjB,EAAE,aAAa,EAAE,EACjB,EAAE,cAAc,EAAE,EACnB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpB,MAAM,CAAC,wBAAwB,CAAC;QAChC,MAAM,CAAC,yBAAyB,CAAC;QACjC,MAAM,CAAC,+BAA+B,CAAC;QACvC,MAAM,CAAC,6BAA6B,CAAC;QACrC,MAAM,CAAC,uBAAuB,CAAC;QAC/B,MAAM,CAAC,6BAA6B,CAAC;QACrC,MAAM,CAAC,uBAAuB,CAAC;QAC/B,MAAM,CAAC,0BAA0B,CAAC;QAClC,MAAM,CAAC,4BAA4B,CAAC;KACrC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IAChC,IAAI,aAAa,GAAkB,IAAI,CAAC;IACxC,IAAI,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC;QAC9B,yEAAyE;QACzE,yEAAyE;QACzE,mEAAmE;QACnE,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,SAAS,IAAI,IAAI,CAAC;QAC5D,MAAM,GAAG,GAAG,CACV,OAAO,KAAK,IAAI;YACd,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,wEAAwE,CAAC,CAAC,GAAG,EAAE;YAC5F,CAAC,CAAC,EAAE;iBACC,OAAO,CACN,wFAAwF,CACzF;iBACA,GAAG,CAAC,OAAO,CAAC,CACkB,CAAC;QACxC,aAAa,GAAG,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC;IACnC,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,SAAS,IAAI,IAAI,CAAC,CAAC;IAClG,MAAM,WAAW,GAA2B,EAAE,CAAC;IAC/C,IAAI,QAAQ,CAAC,EAAE,EAAE,kBAAkB,CAAC,EAAE,CAAC;QACrC,KAAK,MAAM,CAAC,IAAI,EAAE;aACf,OAAO,CAAC,2EAA2E,CAAC;aACpF,GAAG,EAAuC,EAAE,CAAC;YAC9C,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO;QACL,KAAK;QACL,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM;QACN,gBAAgB,EAAE,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;QAC5E,KAAK,EAAE;YACL,OAAO,EAAE,KAAK,CAAC,cAAc,CAAC;YAC9B,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC;YACxB,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC;YACxB,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC;YACxB,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC;SAC7B;QACD,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,kBAAkB,EAAE,OAAO,CAAC,UAAU;QACtC,aAAa;QACb,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,WAAW;QACX,aAAa,EAAE,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QAClE,IAAI,EAAE;YACJ,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC3B,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,MAAM,EAAE,CAAC,CAAC,MAAM;aACjB,CAAC,CAAC;YACH,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB;QACD,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC;QACpB,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC;QAC3B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,aAAa,EAAE,SAAS,CAAC,mCAAmC,CAAC;QAC7D,OAAO,EAAE,SAAS,CAAC,sBAAsB,CAAC;QAC1C,iFAAiF;QACjF,aAAa,EAAE,QAAQ,CAAC,EAAE,EAAE,gBAAgB,CAAC;YAC3C,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,IAAI,EAAE;YAC9E,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC;QACvD,GAAG,EAAE,SAAS,CAAC,uBAAuB,CAAC;KACxC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAA0B,EAC1B,aAA4B,EAC5B,QAAwB,EACxB,aAAqB,WAAW,EAAE;IAElC,MAAM,MAAM,GAAgF,EAAE,CAAC;IAC/F,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC;YAClD,MAAM,EAAE,aAAa;SACtB,CAAC,CAAC;IACL,CAAC;IACD,4EAA4E;IAC5E,sEAAsE;IACtE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CACtD,mBAAmB,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAC/D,CAAC;QACF,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;YAAE,SAAS;QACrC,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,uBAAuB;gBAC7B,OAAO,EAAE,sBAAsB,KAAK,CAAC,KAAK,oCAAoC,IAAI,CAAC,MAAM,EAAE;aAC5F,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACvE,CAAC;AAED,iDAAiD;AACjD,SAAS,UAAU,CAAC,GAAW;IAC7B,IAAI,CAAC;QACH,UAAU,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,6FAA6F;AAC7F,KAAK,UAAU,kBAAkB,CAC/B,MAAc,EACd,OAAyB,EACzB,QAAyB;IAEzB,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACtC,KAAK,MAAM,CAAC,IAAI,MAAM,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACrC,IAAI,CAAC,YAAY,qBAAqB,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM;YAAE,SAAS;QACxE,IAAI,CAAC,CAAC,aAAa,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,aAAa;YAAE,OAAO,IAAI,CAAC;IAC1E,CAAC;IACD,OAAO,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC;AAC/C,CAAC;AAED,sCAAsC;AACtC,SAAS,YAAY,CAAC,KAAuB;IAC3C,OAAO;QACL,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,KAAK;QACb,eAAe,EAAE,KAAK;QACtB,OAAO,EAAE,CAAC;QACV,cAAc,EAAE,IAAI;QACpB,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,IAAI;QACb,aAAa,EAAE,IAAI;KACpB,CAAC;AACJ,CAAC;AAED,iBAAiB;AACjB,SAAS,KAAK,CACZ,EAA+B,EAC/B,EAAW,EACX,QAAiB,EACjB,MAAc;IAEd,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC;AAED,yCAAyC;AACzC,SAAS,YAAY,CAAC,MAAwB;IAC5C,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IACxB,MAAM,GAAG,GAAG;QACV,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,sBAAsB,CAAC;QACtF,KAAK,CAAC,mBAAmB,EAAE,CAAC,KAAK,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;QACtF,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,KAAK,KAAK,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,KAAK,IAAI,MAAM,EAAE,CAAC;KACnF,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACrC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC,WAAW,KAAK,IAAI,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,uFAAuF;AACvF,KAAK,UAAU,WAAW,CACxB,IAA0B,EAC1B,SAAiB,EACjB,SAAiB,EACjB,MAAoC,EACpC,SAAkB;IAElB,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;IAC1D,IAAI,GAAG,IAAI,CAAC,SAAS;QAAE,OAAO,GAAG,IAAI,IAAI,CAAC;IAC1C,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1D,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,IAAI,CAAC;AACrE,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAA0B,EAC1B,SAAwB,EACxB,SAAwB,EACxB,MAAkB,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;IAElC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IACzF,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,MAAM;YACN,OAAO,EAAE,kBAAkB,CAAC,MAAM,CAAC;SACpC,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5B,gBAAgB,kBAAkB,CAAC,SAAS,CAAC,EAAE,EAC/C,6BAA6B,CAC9B,CAAC;IACF,MAAM,CAAC,IAAI,CACT,KAAK,CAAC,oBAAoB,EAAE,MAAM,KAAK,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CACvF,CAAC;IACF,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG;YACd,SAAS;YACT,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,IAAI;YACtB,IAAI,EAAE,IAAI;SACX,CAAC;QACF,OAAO;YACL,GAAG,IAAI;YACP,OAAO;YACP,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,MAAM;YACN,OAAO,EAAE,kBAAkB,CAAC,MAAM,CAAC;SACpC,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC;IACrE,MAAM,aAAa,GACjB,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,KAAK,QAAQ,CAAC;IAChF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACvF,IAAI,OAAO,GAAgC,IAAI,CAAC;IAChD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QAC7F,MAAM,IAAI,GAAG,GAAG,KAAK,IAAI,IAAI,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;QACtE,OAAO,GAAG;YACR,SAAS;YACT,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,GAAG,KAAK,IAAI,IAAI,CAAC,IAAI;YACxC,UAAU,EAAE,GAAG,EAAE,UAAU,IAAI,IAAI;YACnC,UAAU,EAAE,GAAG,EAAE,UAAU,IAAI,IAAI;YACnC,UAAU,EAAE,GAAG,EAAE,UAAU,IAAI,IAAI;YACnC,cAAc,EAAE,IAAI;SACrB,CAAC;QACF,MAAM,KAAK,GACT,OAAO,CAAC,UAAU,KAAK,IAAI;YAC3B,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,4BAA4B,GAAG,IAAI,CAAC;QAC1F,MAAM,MAAM,GAAG,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;QACrD,MAAM,CAAC,IAAI,CACT,KAAK,CACH,kBAAkB,EAClB,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,cAAc,CAC3F,EACD,KAAK,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,UAAU,IAAI,aAAa,CAAC,EAC1E,KAAK,CACH,gBAAgB,EAChB,OAAO,CAAC,UAAU,KAAK,IAAI,EAC3B,MAAM,EACN,OAAO,CAAC,UAAU,IAAI,cAAc,CACrC,CACF,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,IAAI,CACT,KAAK,CAAC,gBAAgB,EAAE,MAAM,CAAC,aAAa,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,aAAa,OAAO,CAAC,CAC1F,CAAC;IACF,OAAO;QACL,GAAG,IAAI;QACP,OAAO,EAAE;YACP,SAAS;YACT,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc;YAC7C,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,IAAI,IAAI;YACzD,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB;QACD,OAAO;QACP,MAAM,EAAE,MAAM,CAAC,MAAM;YACnB,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;YACpF,CAAC,CAAC,IAAI;QACR,MAAM;QACN,OAAO,EAAE,kBAAkB,CAAC,MAAM,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,4DAA4D;AAC5D,KAAK,UAAU,YAAY,CACzB,IAA0B,EAC1B,SAAwB,EACxB,SAAwB,EACxB,GAA6B,EAC7B,QAAwB;IAExB,MAAM,IAAI,GAAG,cAAc,CAAC,YAAY,EAAE;QACxC,SAAS,EAAE,SAAS,IAAI,SAAS;QACjC,8CAA8C;QAC9C,SAAS,EAAE,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;KAC5E,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC7D,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACnC,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EACL,qGAAqG;KACxG,CAAC,CAAC;IACH,OAAO,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;AAC7D,CAAC;AAED,+DAA+D;AAC/D,SAAS,YAAY,CACnB,MAAwB,EACxB,OAAiC,EACjC,OAAgB,EAChB,OAA8B,EAC9B,QAAwB;IAExB,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE,CAAC;QACtE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,uBAAuB;YAC7B,OAAO,EAAE,WAAW,MAAM,CAAC,OAAO,CAAC,SAAS,gEAAgE;SAC7G,CAAC,CAAC;QACH,OAAO,kBAAkB,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACvD,CAAC;IACD,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,MAAM,CAAC,OAAO,KAAK,WAAW,CAAC,EAAE,CAAC;QAChG,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,0BAA0B;YAChC,OAAO,EACL,yFAAyF;SAC5F,CAAC,CAAC;QACH,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,uEAAuE;QACvE,uDAAuD;QACvD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;QAC/B,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,oEAAoE;SAC9E,CAAC,CAAC;QACH,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC;AAED,sCAAsC;AACtC,SAAS,SAAS,CAChB,MAAwB,EACxB,KAAuB,EACvB,OAAiC,EACjC,OAAgB;IAEhB,MAAM,EAAE,GAAG,CAAC,EAA+B,EAAW,EAAE,CACtD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IACjD,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAAC;IAC/D,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC;QAC1D,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO;QACnD,MAAM,EAAE,kBAAkB,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC;QAC5E,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI;QAClD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,CAAC;QAC3C,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,IAAI,IAAI;QAClD,UAAU,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,IAAI,IAAI;QAC9C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,IAAI,IAAI;QACvC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,IAAI;KACpD,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAgC,EAAE;IAElC,0BAA0B,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,gBAAgB,EAAE,CAAC;IAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,mBAAmB,EAAE,CAAC;IACzD,MAAM,QAAQ,GAAmB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1F,MAAM,OAAO,GACX,OAAO,KAAK,IAAI;QAChB,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS;YAC3B,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;YACpC,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACtD,0EAA0E;IAC1E,wDAAwD;IACxD,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC;IACnE,IAAI,OAAO,GAA0B,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3F,IAAI,eAAe,GAAwC,EAAE,CAAC;IAC9D,IAAI,OAAO,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QAChC,OAAO,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,OAAO,CAAC,OAAO;YAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpD,eAAe,GAAG,MAAM,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC;IACD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACpC,wEAAwE;IACxE,sEAAsE;IACtE,uBAAuB;IACvB,MAAM,IAAI,GAAG,MAAM,mBAAmB,CACpC,OAAO,IAAI,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EACjD,OAAO,IAAI,OAAO,EAAE,IAAI;QACtB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC;QACtE,CAAC,CAAC,IAAI,EACR,QAAQ,CACT,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IACpD,uEAAuE;IACvE,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;IACnC,IAAI,QAAQ;QAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtC,0EAA0E;IAC1E,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,yBAAyB,EAAE,CAAC;IAC/C,IAAI,UAAU;QAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAqB;QAC9B,MAAM;QACN,QAAQ,EAAE,KAAK;QACf,aAAa,EAAE,IAAI;QACnB,OAAO,EAAE,IAAI;QACb,SAAS;QACT,SAAS;QACT,eAAe;QACf,QAAQ,EAAE,OAAO,IAAI,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QAC5D,eAAe,EAAE,OAAO,CAAC,QAAQ;KAClC,CAAC;IACF,MAAM,WAAW,GAAG,GAAsB,EAAE,CAAC,CAAC;QAC5C,OAAO,EAAE,eAAe;QACxB,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;QAC5B,KAAK;QACL,MAAM,EAAE,IAAI;QACZ,GAAG,QAAQ;QACX,QAAQ;KACT,CAAC,CAAC;IACH,IAAI,CAAC,CAAC,MAAM,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAAE,OAAO,WAAW,EAAE,CAAC;IACjF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC;YACnC,GAAG,IAAI;YACP,MAAM;YACN,WAAW,EAAE,OAAO;YACpB,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QACtB,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC3C,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,IAAI,IAAI,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClF,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,OAAO,GACX,SAAS,KAAK,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI;YACvD,CAAC,CAAC,MAAM,SAAS,CACb,IAAI,EACJ,SAAS,EACT,IAAI,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAChD,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAC9B,QAAQ,CACT;YACH,CAAC,CAAC,SAAS,CAAC;QAChB,OAAO;YACL,OAAO;YACP,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC;YACnD,KAAK;YACL,MAAM;YACN,MAAM,EAAE,MAAM,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC;YAC3C,GAAG,QAAQ;YACX,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7C,QAAQ;SACT,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IACE,GAAG,YAAY,iBAAiB;YAChC,GAAG,CAAC,IAAI,KAAK,uBAAuB;YACpC,CAAC,KAAK,CAAC,QAAQ,EACf,CAAC;YACD,OAAO,WAAW,EAAE,CAAC;QACvB,CAAC;QACD,IAAI,GAAG,YAAY,iBAAiB,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC3E,MAAM,IAAI,sBAAsB,CAC9B,GAAG,CAAC,OAAO,EACX,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAE,EAC9D,GAAG,CAAC,GAAG,CACR,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,aAAa,CAC1B,IAA0B,EAC1B,QAAwB;IAExB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,0BAA0B,CAAC,CAAC;QACtF,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QAC9F,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;QACpF,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,6BAA6B;gBACnC,OAAO,EACL,mFAAmF;aACtF,CAAC,CAAC;QACL,CAAC;QACD,OAAO;YACL,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,IAAI,KAAK,IAAI;YACvB,SAAS,EAAE,IAAI,EAAE,SAAS,IAAI,IAAI;YAClC,UAAU,EAAE,IAAI,EAAE,UAAU,IAAI,IAAI;YACpC,OAAO,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;SAC5D,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,2BAA2B;YACjC,OAAO,EAAE,gDAAgD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;SAC5G,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAC9F,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nexus-vault.d.ts","sourceRoot":"","sources":["../../src/cloud/nexus-vault.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAQH,OAAO,KAAK,EACV,uBAAuB,EACvB,eAAe,EACf,kBAAkB,EAClB,yBAAyB,EACzB,eAAe,EAGf,eAAe,EAEf,sBAAsB,EAGtB,iBAAiB,EAGlB,MAAM,qBAAqB,CAAC;AAkD7B,OAAO,EACL,KAAK,gBAAgB,EAMtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAoB,KAAK,gBAAgB,EAAc,MAAM,uBAAuB,CAAC;AAgB5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAsChE,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EAIvB,MAAM,uBAAuB,CAAC;AAK/B,gGAAgG;AAChG,eAAO,MAAM,6BAA6B,MAAM,CAAC;AAMjD;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;CA6B1B,CAAC;AAkCX,4CAA4C;AAC5C,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IACjE,0FAA0F;IAC1F,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;
|
|
1
|
+
{"version":3,"file":"nexus-vault.d.ts","sourceRoot":"","sources":["../../src/cloud/nexus-vault.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAQH,OAAO,KAAK,EACV,uBAAuB,EACvB,eAAe,EACf,kBAAkB,EAClB,yBAAyB,EACzB,eAAe,EAGf,eAAe,EAEf,sBAAsB,EAGtB,iBAAiB,EAGlB,MAAM,qBAAqB,CAAC;AAkD7B,OAAO,EACL,KAAK,gBAAgB,EAMtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAoB,KAAK,gBAAgB,EAAc,MAAM,uBAAuB,CAAC;AAgB5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAsChE,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EAIvB,MAAM,uBAAuB,CAAC;AAK/B,gGAAgG;AAChG,eAAO,MAAM,6BAA6B,MAAM,CAAC;AAMjD;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;CA6B1B,CAAC;AAkCX,4CAA4C;AAC5C,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IACjE,0FAA0F;IAC1F,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAmhED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,EACxC,KAAK,EAAE,eAAe,EACtB,SAAS,GAAE,MAAM,GAAG,IAAW,GAC9B,OAAO,CAAC,gBAAgB,EAAE,GAAG,SAAS,CAAC,CAmCzC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,UAAU,CAAC,EACrD,KAAK,EAAE,eAAe,EACtB,SAAS,GAAE,MAAM,GAAG,IAAW,GAC9B,OAAO,CAAC,gBAAgB,EAAE,GAAG,SAAS,CAAC,CAUzC;AAuJD,sFAAsF;AACtF,MAAM,WAAW,cAAc;IAC7B,gGAAgG;IAChG,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,8CAA8C;IAC9C,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,8DAA8D;IAC9D,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;CAC/B;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,aAAa,CAAC,EACvD,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,aAAa,CAAC,GACtD,cAAc,CAkBhB;AAgID,4CAA4C;AAC5C,MAAM,WAAW,wBAAyB,SAAQ,wBAAwB;IACxE,uHAAuH;IACvH,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gEAAgE;IAChE,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mEAAmE;IACnE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4FAA4F;IAC5F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,8FAA8F;IAC9F,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACrD;AAyDD,4FAA4F;AAC5F,eAAO,MAAM,+BAA+B,KAAK,CAAC;AA63BlD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,IAAI,GAAE,wBAAwB,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GACxE,OAAO,CAAC,eAAe,CAAC,CAE1B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAC5B,IAAI,GAAE,wBAAwB,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAClE,OAAO,CAAC,yBAAyB,CAAC,CAEpC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAC5B,IAAI,GAAE,wBAAwB,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAClE,OAAO,CAAC,gBAAgB,CAAC,CAE3B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,IAAI,GAAE,wBAA6B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAE7F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CACvB,IAAI,GAAE,wBAAwB,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAClE,OAAO,CAAC,eAAe,CAAC,CAE1B;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAE7F;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,GAAE,wBAA6B,GAClC,OAAO,CAAC,sBAAsB,CAAC,CAEjC;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,GAAE,wBAAwB,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GACvD,OAAO,CAAC,iBAAiB,CAAC,CAE5B;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,GAAE,wBAA6B,GAClC,OAAO,CAAC,uBAAuB,CAAC,CAElC"}
|
|
@@ -591,11 +591,13 @@ const VAULT_CLEARED_JOURNAL_TABLES = [
|
|
|
591
591
|
'_sync_seen_floor',
|
|
592
592
|
];
|
|
593
593
|
/**
|
|
594
|
-
* Export the store the way the vault snapshots it: no secrets, no
|
|
595
|
-
* columns (T13007), no local change journal (T13042), and for the
|
|
596
|
-
* store without machine-local state or the config home (T12968).
|
|
594
|
+
* Export the store the way the vault snapshots it: no plaintext secrets, no
|
|
595
|
+
* `strip` columns (T13007), no local change journal (T13042), and for the
|
|
596
|
+
* global store without machine-local state or the config home (T12968). A
|
|
597
|
+
* global snapshot carries its credential cells sealed under the account key
|
|
598
|
+
* when `seal` is given, so a device that restores it can use them (T13530).
|
|
597
599
|
*/
|
|
598
|
-
async function exportVaultBundle(t, outputPath, label, tracked) {
|
|
600
|
+
async function exportVaultBundle(t, outputPath, label, tracked, seal) {
|
|
599
601
|
await exportPortableBundle({
|
|
600
602
|
scope: t.scope === 'global' ? 'global' : 'project',
|
|
601
603
|
...(t.scope === 'project' ? { projectRoot: t.storeRoot } : {}),
|
|
@@ -605,6 +607,17 @@ async function exportVaultBundle(t, outputPath, label, tracked) {
|
|
|
605
607
|
...(t.scope === 'project' && tracked.size > 0 ? { gitTrackedFiles: tracked } : {}),
|
|
606
608
|
stripColumns: vaultStripColumns(tableScopeOf(t)),
|
|
607
609
|
clearTables: VAULT_CLEARED_JOURNAL_TABLES,
|
|
610
|
+
...(t.scope === 'global' && seal !== null
|
|
611
|
+
? {
|
|
612
|
+
sealCredentials: async (snapshotPath) => {
|
|
613
|
+
const { sealSnapshotCredentials, secretValuesKey } = await import('./secret-seal.js');
|
|
614
|
+
return sealSnapshotCredentials(snapshotPath, secretValuesKey(seal.masterKey), {
|
|
615
|
+
cleoHome: t.storeRoot,
|
|
616
|
+
warn: seal.warn,
|
|
617
|
+
});
|
|
618
|
+
},
|
|
619
|
+
}
|
|
620
|
+
: {}),
|
|
608
621
|
outputPath,
|
|
609
622
|
label,
|
|
610
623
|
});
|
|
@@ -714,9 +727,9 @@ async function snapshotManifest(extractDir, manifest, t) {
|
|
|
714
727
|
return { vault, dbPath, files: digests };
|
|
715
728
|
}
|
|
716
729
|
/** Export and extract the store into `work`, returning its bundle and vault manifest. */
|
|
717
|
-
async function exportAndRead(t, work, label, tracked) {
|
|
730
|
+
async function exportAndRead(t, work, label, tracked, seal) {
|
|
718
731
|
const bundlePath = path.join(work, 'snapshot.cleobundle.tar.gz');
|
|
719
|
-
await exportVaultBundle(t, bundlePath, label, tracked);
|
|
732
|
+
await exportVaultBundle(t, bundlePath, label, tracked, seal);
|
|
720
733
|
const extractDir = path.join(work, 'x');
|
|
721
734
|
fs.mkdirSync(extractDir);
|
|
722
735
|
await tarExtract({ file: bundlePath, cwd: extractDir });
|
|
@@ -964,7 +977,7 @@ async function pushNexusVaultImpl(opts = {}) {
|
|
|
964
977
|
warnings.push(gitUnknownWarning(t));
|
|
965
978
|
const work = tempDir('cleo-vault-push-');
|
|
966
979
|
try {
|
|
967
|
-
const { bundlePath, vault, gitTracked, files } = await exportAndRead(t, work, `cloud-vault-${scope}`, trackedForPush(t, git, synced));
|
|
980
|
+
const { bundlePath, vault, gitTracked, files } = await exportAndRead(t, work, `cloud-vault-${scope}`, trackedForPush(t, git, synced), { masterKey: key.masterKey, warn: (w) => warnings.push(w) });
|
|
968
981
|
const names = await deviceNames(conn);
|
|
969
982
|
// Nothing changed since the head: no lease, no upload (T12971). Against the
|
|
970
983
|
// snapshot this store synced, files are judged path by path (T13038).
|
|
@@ -1231,6 +1244,8 @@ async function enableSyncPushImpl(opts = {}) {
|
|
|
1231
1244
|
stream: t.streamId,
|
|
1232
1245
|
mergedCursor,
|
|
1233
1246
|
baseline,
|
|
1247
|
+
// The global scratch's credentials were filled under this machine's key (T13544).
|
|
1248
|
+
adoptSecrets: t.scope === 'global',
|
|
1234
1249
|
});
|
|
1235
1250
|
}
|
|
1236
1251
|
catch (err) {
|
|
@@ -1363,7 +1378,7 @@ async function enableSyncPushImpl(opts = {}) {
|
|
|
1363
1378
|
}, async (at) => {
|
|
1364
1379
|
// The store exactly as the committed cut left it: the genesis marker
|
|
1365
1380
|
// holds every other writer off until this returns (T13296, T13297).
|
|
1366
|
-
const exported = await exportAndRead(t, work, `sync-genesis-${t.scope}`, trackedForPush(t, git, synced));
|
|
1381
|
+
const exported = await exportAndRead(t, work, `sync-genesis-${t.scope}`, trackedForPush(t, git, synced), { masterKey: key.masterKey, warn: (w) => warnings.push(w) });
|
|
1367
1382
|
snap.taken = {
|
|
1368
1383
|
bundlePath: exported.bundlePath,
|
|
1369
1384
|
record: {
|
|
@@ -1582,6 +1597,7 @@ async function reconcileOwedCopy(session, db) {
|
|
|
1582
1597
|
stream: t.streamId,
|
|
1583
1598
|
mergedCursor,
|
|
1584
1599
|
baseline,
|
|
1600
|
+
adoptSecrets: t.scope === 'global',
|
|
1585
1601
|
});
|
|
1586
1602
|
}
|
|
1587
1603
|
catch (err) {
|
|
@@ -1664,6 +1680,16 @@ async function withMergedScratch(session, fn) {
|
|
|
1664
1680
|
// The scratch replays the stream; it never seals or pushes. The store
|
|
1665
1681
|
// it reconciles already has its sync flags, so the release gate holds.
|
|
1666
1682
|
setSyncFlag(scratch, 'sync.pull', true, { allowUnreleased: true });
|
|
1683
|
+
const { openSnapshotCredentials, prepareSecretOpens, secretValuesKey } = await import('./secret-seal.js');
|
|
1684
|
+
// The checkpoint's sealed credential cells fill the scratch at the checkpoint's
|
|
1685
|
+
// state, under this machine's key (T13544), BEFORE the pull: a post-cut op then
|
|
1686
|
+
// applies on top, so a revoked (cleared) credential stays cleared (T13593). A
|
|
1687
|
+
// failure aborts the merge: the reconcile stays due and the next sync retries.
|
|
1688
|
+
if (t.scope === 'global') {
|
|
1689
|
+
await openSnapshotCredentials(scratchPath, secretValuesKey(key.masterKey), {
|
|
1690
|
+
cleoHome: t.storeRoot,
|
|
1691
|
+
});
|
|
1692
|
+
}
|
|
1667
1693
|
// Soft and project-aware like the live pull (T13551): a failed listing confirms none, never aborts.
|
|
1668
1694
|
const serverRetirements = await confirmableRetirements(conn, t.scope, t.projectId);
|
|
1669
1695
|
const merged = await pullStream(scratch, {
|
|
@@ -1675,6 +1701,16 @@ async function withMergedScratch(session, fn) {
|
|
|
1675
1701
|
pull: journalPuller(journal, key),
|
|
1676
1702
|
verify: txnVerifier(key, t.streamId),
|
|
1677
1703
|
seal: () => { },
|
|
1704
|
+
// Sealed secrets written after the cut open as the live pull opens them, so the
|
|
1705
|
+
// merged state holds their newest values, not the checkpoint's (T13592). One this
|
|
1706
|
+
// machine cannot open stays pending, as on the live pull.
|
|
1707
|
+
...(t.scope === 'global'
|
|
1708
|
+
? {
|
|
1709
|
+
openSecrets: () => prepareSecretOpens(scratch, tableScopeOf(t), t.streamId, secretValuesKey(key.masterKey), {
|
|
1710
|
+
cleoHome: t.storeRoot,
|
|
1711
|
+
}),
|
|
1712
|
+
}
|
|
1713
|
+
: {}),
|
|
1678
1714
|
...(serverRetirements !== undefined ? { serverRetirements } : {}),
|
|
1679
1715
|
});
|
|
1680
1716
|
if (merged.refused !== null) {
|
|
@@ -2525,6 +2561,14 @@ async function restoreNexusVaultImpl(opts) {
|
|
|
2525
2561
|
? { snapshotCarried: JOURNAL_SNAPSHOT_CARRIED }
|
|
2526
2562
|
: {}),
|
|
2527
2563
|
})));
|
|
2564
|
+
// Credential cells the snapshot carries sealed fill what this
|
|
2565
|
+
// machine does not hold, under its own key (T13530).
|
|
2566
|
+
if (t.scope === 'global') {
|
|
2567
|
+
const { openSnapshotCredentials, secretValuesKey } = await import('./secret-seal.js');
|
|
2568
|
+
await openSnapshotCredentials(staged.dbPath, secretValuesKey(key.masterKey), {
|
|
2569
|
+
cleoHome: t.storeRoot,
|
|
2570
|
+
});
|
|
2571
|
+
}
|
|
2528
2572
|
},
|
|
2529
2573
|
});
|
|
2530
2574
|
let replica = null;
|