@indigoai-us/hq-cloud 6.18.59 → 6.18.61
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +3 -2
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner-watch-loop.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-loop.js +5 -2
- package/dist/bin/sync-runner-watch-loop.js.map +1 -1
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +8 -1
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/cli/share.d.ts +1 -1
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +300 -23
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/sync.d.ts +13 -1
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +193 -8
- package/dist/cli/sync.js.map +1 -1
- package/dist/cloud-placeholder.d.ts +67 -0
- package/dist/cloud-placeholder.d.ts.map +1 -0
- package/dist/cloud-placeholder.js +300 -0
- package/dist/cloud-placeholder.js.map +1 -0
- package/dist/conflict-notices.d.ts +18 -1
- package/dist/conflict-notices.d.ts.map +1 -1
- package/dist/conflict-notices.js +27 -2
- package/dist/conflict-notices.js.map +1 -1
- package/dist/hq-root-recovery.d.ts +57 -5
- package/dist/hq-root-recovery.d.ts.map +1 -1
- package/dist/hq-root-recovery.js +172 -3
- package/dist/hq-root-recovery.js.map +1 -1
- package/dist/ignore.d.ts +29 -1
- package/dist/ignore.d.ts.map +1 -1
- package/dist/ignore.js +51 -5
- package/dist/ignore.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/conflict-index.d.ts +22 -0
- package/dist/lib/conflict-index.d.ts.map +1 -1
- package/dist/lib/conflict-index.js +62 -1
- package/dist/lib/conflict-index.js.map +1 -1
- package/dist/lib/same-path-upload-lock.d.ts +104 -0
- package/dist/lib/same-path-upload-lock.d.ts.map +1 -0
- package/dist/lib/same-path-upload-lock.js +257 -0
- package/dist/lib/same-path-upload-lock.js.map +1 -0
- package/dist/personal-vault.d.ts.map +1 -1
- package/dist/personal-vault.js +5 -1
- package/dist/personal-vault.js.map +1 -1
- package/dist/session-log-capture.d.ts +10 -0
- package/dist/session-log-capture.d.ts.map +1 -1
- package/dist/session-log-capture.js +140 -14
- package/dist/session-log-capture.js.map +1 -1
- package/dist/sync/pull-scope.d.ts +7 -0
- package/dist/sync/pull-scope.d.ts.map +1 -1
- package/dist/sync/pull-scope.js +7 -0
- package/dist/sync/pull-scope.js.map +1 -1
- package/dist/sync-decision-log.d.ts +1 -1
- package/dist/sync-decision-log.d.ts.map +1 -1
- package/dist/sync-decision-log.js.map +1 -1
- package/dist/watch-owner-lease.d.ts +14 -0
- package/dist/watch-owner-lease.d.ts.map +1 -1
- package/dist/watch-owner-lease.js +17 -0
- package/dist/watch-owner-lease.js.map +1 -1
- package/package.json +1 -1
|
@@ -93,10 +93,71 @@ export function appendConflictEntry(hqRoot, entry) {
|
|
|
93
93
|
index.conflicts[existingIdx] = entry;
|
|
94
94
|
}
|
|
95
95
|
else {
|
|
96
|
-
|
|
96
|
+
// The id carries the detection timestamp, so a re-park of the SAME
|
|
97
|
+
// divergence (same file, same local bytes, same remote version) on a later
|
|
98
|
+
// pass used to append a new row every time. Those repeats are one pending
|
|
99
|
+
// conflict: keep the first row, which already points at a backup of those
|
|
100
|
+
// exact remote bytes, and drop the repeat.
|
|
101
|
+
// If the first row's backup is gone (resolved or cleaned by hand), the
|
|
102
|
+
// new row and its fresh backup replace it so the index still points at
|
|
103
|
+
// bytes that exist.
|
|
104
|
+
const repeatIdx = findConflictEntryIndexForDivergence(index, entry);
|
|
105
|
+
if (repeatIdx >= 0) {
|
|
106
|
+
const repeat = index.conflicts[repeatIdx];
|
|
107
|
+
if (repeat.conflictPath === entry.conflictPath ||
|
|
108
|
+
conflictBackupExists(hqRoot, repeat.conflictPath)) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
index.conflicts[repeatIdx] = entry;
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
index.conflicts.push(entry);
|
|
115
|
+
}
|
|
97
116
|
}
|
|
98
117
|
writeConflictIndex(hqRoot, index);
|
|
99
118
|
}
|
|
119
|
+
function conflictBackupExists(hqRoot, conflictPath) {
|
|
120
|
+
if (!conflictPath)
|
|
121
|
+
return false;
|
|
122
|
+
try {
|
|
123
|
+
fs.lstatSync(localPathForVaultKey(hqRoot, conflictPath));
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
126
|
+
catch {
|
|
127
|
+
return false;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
function findConflictEntryIndexForDivergence(index, divergence) {
|
|
131
|
+
// An empty hash or etag carries no identity; never collapse on it.
|
|
132
|
+
if (!divergence.localHash || !divergence.remoteHash)
|
|
133
|
+
return -1;
|
|
134
|
+
return index.conflicts.findIndex((c) => c.originalPath === divergence.originalPath &&
|
|
135
|
+
c.localHash === divergence.localHash &&
|
|
136
|
+
c.remoteHash === divergence.remoteHash &&
|
|
137
|
+
(c.preserved ?? "remote") === (divergence.preserved ?? "remote"));
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* hq-root-relative backup path already recorded for this exact divergence,
|
|
141
|
+
* when its file still exists on disk. Parkers call this before minting a new
|
|
142
|
+
* timestamped backup, so an unchanged file that re-parks every pass reuses
|
|
143
|
+
* one backup instead of writing a new copy each time. The caller must still
|
|
144
|
+
* verify the backup's bytes against the remote body it just fetched.
|
|
145
|
+
*
|
|
146
|
+
* Never throws: an unreadable or corrupt index means "no reusable backup",
|
|
147
|
+
* and the caller parks a fresh copy exactly as before.
|
|
148
|
+
*/
|
|
149
|
+
export function findReusableConflictBackup(hqRoot, divergence) {
|
|
150
|
+
let index;
|
|
151
|
+
try {
|
|
152
|
+
index = readConflictIndex(hqRoot);
|
|
153
|
+
}
|
|
154
|
+
catch {
|
|
155
|
+
return undefined;
|
|
156
|
+
}
|
|
157
|
+
const entryIdx = findConflictEntryIndexForDivergence(index, divergence);
|
|
158
|
+
const conflictPath = entryIdx >= 0 ? index.conflicts[entryIdx].conflictPath : undefined;
|
|
159
|
+
return conflictBackupExists(hqRoot, conflictPath) ? conflictPath : undefined;
|
|
160
|
+
}
|
|
100
161
|
/**
|
|
101
162
|
* Remove an entry by id. Used by the `/resolve-conflicts` skill after the
|
|
102
163
|
* user picks a resolution and the conflict file is cleaned up. No-op if the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict-index.js","sourceRoot":"","sources":["../../src/lib/conflict-index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"conflict-index.js","sourceRoot":"","sources":["../../src/lib/conflict-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* In-process serialization of same-path uploads.
|
|
3
|
+
*
|
|
4
|
+
* The watch runner runs two kinds of push pass in one process: watcher push
|
|
5
|
+
* groups (realtime) and the full pass push leg (chore). A chore hands its
|
|
6
|
+
* scheduler slot to realtime work while its own PUTs are on the network, so a
|
|
7
|
+
* watcher push of a file can run while the full pass is uploading the same
|
|
8
|
+
* file. Each pass keeps its own in-memory journal, so the second pusher fences
|
|
9
|
+
* its PUT on an etag the first one has already replaced. For a growing file
|
|
10
|
+
* (session logs such as chat_history.jsonl) the second push then hits a 412 or
|
|
11
|
+
* a stale two-sided conflict, local wins on mtime, and a conflict copy of the
|
|
12
|
+
* first pusher's bytes is parked.
|
|
13
|
+
*
|
|
14
|
+
* This module gives both passes one lock per (journal scope, path). The holder
|
|
15
|
+
* decides and uploads under the lock and records what it landed (etag and
|
|
16
|
+
* content hash, plus the etags it replaced). The next holder adopts that record
|
|
17
|
+
* into its own journal before deciding, so it uploads its newer bytes as a
|
|
18
|
+
* normal update fenced on the etag the first pusher wrote.
|
|
19
|
+
*
|
|
20
|
+
* Waits are bounded. A waiter that times out proceeds without the lock, which
|
|
21
|
+
* is the behavior before this module existed (a possible 412 and a parked
|
|
22
|
+
* copy, never data loss). Separate processes (a one-shot `hq sync` next to the
|
|
23
|
+
* runner) are not covered; they keep the conditional-PUT fence.
|
|
24
|
+
*/
|
|
25
|
+
export declare const SAME_PATH_UPLOAD_WAIT_MS = 60000;
|
|
26
|
+
/** Keys with landed records kept in memory; the oldest key is evicted first. */
|
|
27
|
+
export declare const SAME_PATH_LANDED_KEY_CAP = 4096;
|
|
28
|
+
/** Landed records kept per key, newest last. */
|
|
29
|
+
export declare const SAME_PATH_LANDED_PER_KEY_CAP = 8;
|
|
30
|
+
export declare function setSamePathUploadWaitMsForTesting(ms: number | undefined): void;
|
|
31
|
+
/**
|
|
32
|
+
* Lock key for one vault object. `scope` names the journal (one per vault),
|
|
33
|
+
* so the same relative path in two vaults never shares a lock.
|
|
34
|
+
*/
|
|
35
|
+
export declare function samePathUploadKey(scope: string, relativePath: string, caseInsensitive?: boolean): string;
|
|
36
|
+
/** What one pusher in this process landed for a key. */
|
|
37
|
+
export interface LandedUpload {
|
|
38
|
+
/**
|
|
39
|
+
* The exact relative path uploaded. The lock key folds case and Unicode
|
|
40
|
+
* form so two spellings of one file on a case-insensitive volume share a
|
|
41
|
+
* lock, but a landed record is adopted only for the exact path that wrote
|
|
42
|
+
* it: on a case-sensitive volume two case-colliding files are two objects.
|
|
43
|
+
*/
|
|
44
|
+
relativePath: string;
|
|
45
|
+
/** Etags this upload replaced. `null` means it was created over no row. */
|
|
46
|
+
fromEtags: ReadonlyArray<string | null>;
|
|
47
|
+
etag: string;
|
|
48
|
+
hash: string;
|
|
49
|
+
size: number;
|
|
50
|
+
mtimeMs: number;
|
|
51
|
+
ctimeMs?: number;
|
|
52
|
+
kind: "file" | "symlink";
|
|
53
|
+
wireSymlinkTarget?: string;
|
|
54
|
+
}
|
|
55
|
+
/** The upload this process landed at exactly `etag` for `relativePath`, if any. */
|
|
56
|
+
export declare function findLandedUpload(key: string, relativePath: string, etag: string): LandedUpload | undefined;
|
|
57
|
+
/**
|
|
58
|
+
* Follow landed records from `fromEtag` to the newest upload that descends
|
|
59
|
+
* from it. Returns undefined when nothing in this process replaced that etag.
|
|
60
|
+
*/
|
|
61
|
+
export declare function followLandedUploads(key: string, relativePath: string, fromEtag: string | null): LandedUpload | undefined;
|
|
62
|
+
/**
|
|
63
|
+
* One pusher's claim on a key. Create one per upload item, `acquire()` before
|
|
64
|
+
* reading the journal row and hashing, `release()` in a finally.
|
|
65
|
+
*/
|
|
66
|
+
export declare class SamePathUploadHold {
|
|
67
|
+
readonly key: string;
|
|
68
|
+
readonly relativePath: string;
|
|
69
|
+
private holding;
|
|
70
|
+
private waitedSinceCheck;
|
|
71
|
+
/** Set once a wait timed out; later acquires for this item do not wait. */
|
|
72
|
+
private timedOut;
|
|
73
|
+
/** Landed sequence observed when the lock was last acquired. */
|
|
74
|
+
private seenSeq;
|
|
75
|
+
constructor(key: string, relativePath: string);
|
|
76
|
+
/** True once a wait for this item has timed out. */
|
|
77
|
+
get waitTimedOut(): boolean;
|
|
78
|
+
get held(): boolean;
|
|
79
|
+
/**
|
|
80
|
+
* Take the lock, waiting at most the bounded wait. Resolves either way; on
|
|
81
|
+
* timeout the caller proceeds unlocked and `held` stays false.
|
|
82
|
+
*/
|
|
83
|
+
acquire(): Promise<void>;
|
|
84
|
+
/** Release the lock. Safe to call when not held. */
|
|
85
|
+
release(): void;
|
|
86
|
+
/** True once after the most recent acquire had to wait. */
|
|
87
|
+
takeWaited(): boolean;
|
|
88
|
+
/** Landed sequence at the last acquire, for {@link landedSince}. */
|
|
89
|
+
snapshot(): number;
|
|
90
|
+
/** True when another pusher landed this key after `seq` was taken. */
|
|
91
|
+
landedSince(seq: number): boolean;
|
|
92
|
+
/** Record an upload this holder just landed. */
|
|
93
|
+
recordLanded(upload: LandedUpload): void;
|
|
94
|
+
}
|
|
95
|
+
/** Thrown inside a deferred transfer when another pusher landed first. */
|
|
96
|
+
export declare class SamePathUploadSupersededError extends Error {
|
|
97
|
+
readonly relativePath: string;
|
|
98
|
+
constructor(relativePath: string);
|
|
99
|
+
}
|
|
100
|
+
export declare const _testing: {
|
|
101
|
+
reset(): void;
|
|
102
|
+
heldKeys(): string[];
|
|
103
|
+
};
|
|
104
|
+
//# sourceMappingURL=same-path-upload-lock.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"same-path-upload-lock.d.ts","sourceRoot":"","sources":["../../src/lib/same-path-upload-lock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAC/C,gFAAgF;AAChF,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,gDAAgD;AAChD,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAI9C,wBAAgB,iCAAiC,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE9E;AAKD;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,eAAe,GAAE,OAAmC,GACnD,MAAM,CAIR;AAED,wDAAwD;AACxD,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,2EAA2E;IAC3E,SAAS,EAAE,aAAa,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AA0BD,mFAAmF;AACnF,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,YAAY,GAAG,SAAS,CAW1B;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,GACtB,YAAY,GAAG,SAAS,CA2B1B;AAED;;;GAGG;AACH,qBAAa,kBAAkB;IAS3B,QAAQ,CAAC,GAAG,EAAE,MAAM;IACpB,QAAQ,CAAC,YAAY,EAAE,MAAM;IAT/B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,gBAAgB,CAAS;IACjC,2EAA2E;IAC3E,OAAO,CAAC,QAAQ,CAAS;IACzB,gEAAgE;IAChE,OAAO,CAAC,OAAO,CAAK;gBAGT,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM;IAG/B,oDAAoD;IACpD,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,IAAI,IAAI,IAAI,OAAO,CAElB;IAED;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAmD9B,oDAAoD;IACpD,OAAO,IAAI,IAAI;IAef,2DAA2D;IAC3D,UAAU,IAAI,OAAO;IAMrB,oEAAoE;IACpE,QAAQ,IAAI,MAAM;IAIlB,sEAAsE;IACtE,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIjC,gDAAgD;IAChD,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;CAmBzC;AAED,0EAA0E;AAC1E,qBAAa,6BAA8B,SAAQ,KAAK;IAC1C,QAAQ,CAAC,YAAY,EAAE,MAAM;gBAApB,YAAY,EAAE,MAAM;CAI1C;AAED,eAAO,MAAM,QAAQ;aACV,IAAI;gBAMD,MAAM,EAAE;CAGrB,CAAC"}
|
|
@@ -0,0 +1,257 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* In-process serialization of same-path uploads.
|
|
3
|
+
*
|
|
4
|
+
* The watch runner runs two kinds of push pass in one process: watcher push
|
|
5
|
+
* groups (realtime) and the full pass push leg (chore). A chore hands its
|
|
6
|
+
* scheduler slot to realtime work while its own PUTs are on the network, so a
|
|
7
|
+
* watcher push of a file can run while the full pass is uploading the same
|
|
8
|
+
* file. Each pass keeps its own in-memory journal, so the second pusher fences
|
|
9
|
+
* its PUT on an etag the first one has already replaced. For a growing file
|
|
10
|
+
* (session logs such as chat_history.jsonl) the second push then hits a 412 or
|
|
11
|
+
* a stale two-sided conflict, local wins on mtime, and a conflict copy of the
|
|
12
|
+
* first pusher's bytes is parked.
|
|
13
|
+
*
|
|
14
|
+
* This module gives both passes one lock per (journal scope, path). The holder
|
|
15
|
+
* decides and uploads under the lock and records what it landed (etag and
|
|
16
|
+
* content hash, plus the etags it replaced). The next holder adopts that record
|
|
17
|
+
* into its own journal before deciding, so it uploads its newer bytes as a
|
|
18
|
+
* normal update fenced on the etag the first pusher wrote.
|
|
19
|
+
*
|
|
20
|
+
* Waits are bounded. A waiter that times out proceeds without the lock, which
|
|
21
|
+
* is the behavior before this module existed (a possible 412 and a parked
|
|
22
|
+
* copy, never data loss). Separate processes (a one-shot `hq sync` next to the
|
|
23
|
+
* runner) are not covered; they keep the conditional-PUT fence.
|
|
24
|
+
*/
|
|
25
|
+
export const SAME_PATH_UPLOAD_WAIT_MS = 60_000;
|
|
26
|
+
/** Keys with landed records kept in memory; the oldest key is evicted first. */
|
|
27
|
+
export const SAME_PATH_LANDED_KEY_CAP = 4096;
|
|
28
|
+
/** Landed records kept per key, newest last. */
|
|
29
|
+
export const SAME_PATH_LANDED_PER_KEY_CAP = 8;
|
|
30
|
+
let waitMsForTest;
|
|
31
|
+
export function setSamePathUploadWaitMsForTesting(ms) {
|
|
32
|
+
waitMsForTest = ms;
|
|
33
|
+
}
|
|
34
|
+
const CASE_INSENSITIVE_PLATFORM = process.platform === "darwin" || process.platform === "win32";
|
|
35
|
+
/**
|
|
36
|
+
* Lock key for one vault object. `scope` names the journal (one per vault),
|
|
37
|
+
* so the same relative path in two vaults never shares a lock.
|
|
38
|
+
*/
|
|
39
|
+
export function samePathUploadKey(scope, relativePath, caseInsensitive = CASE_INSENSITIVE_PLATFORM) {
|
|
40
|
+
let rel = relativePath.split("\\").join("/").replace(/^(?:\.\/)+/, "").normalize("NFC");
|
|
41
|
+
if (caseInsensitive)
|
|
42
|
+
rel = rel.toLowerCase();
|
|
43
|
+
return `${scope}\u0000${rel}`;
|
|
44
|
+
}
|
|
45
|
+
const slots = new Map();
|
|
46
|
+
const landed = new Map();
|
|
47
|
+
let landedSeq = 0;
|
|
48
|
+
/**
|
|
49
|
+
* Sequence of the newest landed record for the key, or 0 when none is kept.
|
|
50
|
+
* Eviction (per-key or key-cap, see recordLanded) can move this value, so
|
|
51
|
+
* `landedSince` reads true once after an eviction. The cost is one spurious
|
|
52
|
+
* re-decide inside the caller's replan budget, never a wrong fence.
|
|
53
|
+
*/
|
|
54
|
+
function latestLandedSeq(key) {
|
|
55
|
+
const records = landed.get(key);
|
|
56
|
+
return records && records.length > 0 ? records[records.length - 1].seq : 0;
|
|
57
|
+
}
|
|
58
|
+
/** The upload this process landed at exactly `etag` for `relativePath`, if any. */
|
|
59
|
+
export function findLandedUpload(key, relativePath, etag) {
|
|
60
|
+
const records = landed.get(key);
|
|
61
|
+
if (!records)
|
|
62
|
+
return undefined;
|
|
63
|
+
for (let i = records.length - 1; i >= 0; i -= 1) {
|
|
64
|
+
const record = records[i];
|
|
65
|
+
if (record.relativePath === relativePath && record.etag === etag) {
|
|
66
|
+
const { seq: _seq, ...rest } = record;
|
|
67
|
+
return rest;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Follow landed records from `fromEtag` to the newest upload that descends
|
|
74
|
+
* from it. Returns undefined when nothing in this process replaced that etag.
|
|
75
|
+
*/
|
|
76
|
+
export function followLandedUploads(key, relativePath, fromEtag) {
|
|
77
|
+
const records = landed.get(key);
|
|
78
|
+
if (!records || records.length === 0)
|
|
79
|
+
return undefined;
|
|
80
|
+
let current = fromEtag;
|
|
81
|
+
let result;
|
|
82
|
+
const seen = new Set();
|
|
83
|
+
for (let hop = 0; hop < records.length; hop += 1) {
|
|
84
|
+
let next;
|
|
85
|
+
for (let i = records.length - 1; i >= 0; i -= 1) {
|
|
86
|
+
const record = records[i];
|
|
87
|
+
if (record.relativePath === relativePath &&
|
|
88
|
+
record.etag !== current &&
|
|
89
|
+
record.fromEtags.includes(current)) {
|
|
90
|
+
next = record;
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
if (!next || seen.has(next.etag))
|
|
95
|
+
break;
|
|
96
|
+
seen.add(next.etag);
|
|
97
|
+
result = next;
|
|
98
|
+
current = next.etag;
|
|
99
|
+
}
|
|
100
|
+
if (!result)
|
|
101
|
+
return undefined;
|
|
102
|
+
const { seq: _seq, ...record } = result;
|
|
103
|
+
return record;
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* One pusher's claim on a key. Create one per upload item, `acquire()` before
|
|
107
|
+
* reading the journal row and hashing, `release()` in a finally.
|
|
108
|
+
*/
|
|
109
|
+
export class SamePathUploadHold {
|
|
110
|
+
key;
|
|
111
|
+
relativePath;
|
|
112
|
+
holding = false;
|
|
113
|
+
waitedSinceCheck = false;
|
|
114
|
+
/** Set once a wait timed out; later acquires for this item do not wait. */
|
|
115
|
+
timedOut = false;
|
|
116
|
+
/** Landed sequence observed when the lock was last acquired. */
|
|
117
|
+
seenSeq = 0;
|
|
118
|
+
constructor(key, relativePath) {
|
|
119
|
+
this.key = key;
|
|
120
|
+
this.relativePath = relativePath;
|
|
121
|
+
}
|
|
122
|
+
/** True once a wait for this item has timed out. */
|
|
123
|
+
get waitTimedOut() {
|
|
124
|
+
return this.timedOut;
|
|
125
|
+
}
|
|
126
|
+
get held() {
|
|
127
|
+
return this.holding;
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* Take the lock, waiting at most the bounded wait. Resolves either way; on
|
|
131
|
+
* timeout the caller proceeds unlocked and `held` stays false.
|
|
132
|
+
*/
|
|
133
|
+
async acquire() {
|
|
134
|
+
if (this.holding)
|
|
135
|
+
return;
|
|
136
|
+
let slot = slots.get(this.key);
|
|
137
|
+
if (!slot) {
|
|
138
|
+
slot = { held: false, waiters: [] };
|
|
139
|
+
slots.set(this.key, slot);
|
|
140
|
+
}
|
|
141
|
+
if (!slot.held) {
|
|
142
|
+
slot.held = true;
|
|
143
|
+
this.holding = true;
|
|
144
|
+
this.seenSeq = latestLandedSeq(this.key);
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
if (this.timedOut) {
|
|
148
|
+
// This item already waited its bound once. It is running unlocked for
|
|
149
|
+
// the rest of its decision; waiting again would only stall it further.
|
|
150
|
+
this.seenSeq = latestLandedSeq(this.key);
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
const waitMs = waitMsForTest ?? SAME_PATH_UPLOAD_WAIT_MS;
|
|
154
|
+
const ownSlot = slot;
|
|
155
|
+
const granted = await new Promise((resolve) => {
|
|
156
|
+
const waiter = (ok) => {
|
|
157
|
+
clearTimeout(timer);
|
|
158
|
+
resolve(ok);
|
|
159
|
+
};
|
|
160
|
+
const timer = setTimeout(() => {
|
|
161
|
+
const index = ownSlot.waiters.indexOf(waiter);
|
|
162
|
+
if (index >= 0)
|
|
163
|
+
ownSlot.waiters.splice(index, 1);
|
|
164
|
+
resolve(false);
|
|
165
|
+
}, waitMs);
|
|
166
|
+
timer.unref?.();
|
|
167
|
+
ownSlot.waiters.push(waiter);
|
|
168
|
+
});
|
|
169
|
+
this.waitedSinceCheck = true;
|
|
170
|
+
this.seenSeq = latestLandedSeq(this.key);
|
|
171
|
+
if (granted) {
|
|
172
|
+
this.holding = true;
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
this.timedOut = true;
|
|
176
|
+
process.stderr.write(`${JSON.stringify({
|
|
177
|
+
type: "same-path-upload-lock-timeout",
|
|
178
|
+
diagnostic: true,
|
|
179
|
+
path: this.relativePath,
|
|
180
|
+
waitMs,
|
|
181
|
+
})}\n`);
|
|
182
|
+
}
|
|
183
|
+
/** Release the lock. Safe to call when not held. */
|
|
184
|
+
release() {
|
|
185
|
+
if (!this.holding)
|
|
186
|
+
return;
|
|
187
|
+
this.holding = false;
|
|
188
|
+
const slot = slots.get(this.key);
|
|
189
|
+
if (!slot)
|
|
190
|
+
return;
|
|
191
|
+
const next = slot.waiters.shift();
|
|
192
|
+
if (next) {
|
|
193
|
+
// Hand the lock straight to the next waiter; the slot stays held.
|
|
194
|
+
next(true);
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
197
|
+
slot.held = false;
|
|
198
|
+
slots.delete(this.key);
|
|
199
|
+
}
|
|
200
|
+
/** True once after the most recent acquire had to wait. */
|
|
201
|
+
takeWaited() {
|
|
202
|
+
const waited = this.waitedSinceCheck;
|
|
203
|
+
this.waitedSinceCheck = false;
|
|
204
|
+
return waited;
|
|
205
|
+
}
|
|
206
|
+
/** Landed sequence at the last acquire, for {@link landedSince}. */
|
|
207
|
+
snapshot() {
|
|
208
|
+
return this.seenSeq;
|
|
209
|
+
}
|
|
210
|
+
/** True when another pusher landed this key after `seq` was taken. */
|
|
211
|
+
landedSince(seq) {
|
|
212
|
+
return latestLandedSeq(this.key) !== seq;
|
|
213
|
+
}
|
|
214
|
+
/** Record an upload this holder just landed. */
|
|
215
|
+
recordLanded(upload) {
|
|
216
|
+
landedSeq += 1;
|
|
217
|
+
const record = { ...upload, seq: landedSeq };
|
|
218
|
+
const records = landed.get(this.key) ?? [];
|
|
219
|
+
landed.delete(this.key);
|
|
220
|
+
records.push(record);
|
|
221
|
+
if (records.length > SAME_PATH_LANDED_PER_KEY_CAP)
|
|
222
|
+
records.shift();
|
|
223
|
+
landed.set(this.key, records);
|
|
224
|
+
// Evicting a key drops its latestLandedSeq to 0, so a holder that took a
|
|
225
|
+
// snapshot before the eviction sees landedSince() true once and re-decides
|
|
226
|
+
// (bounded by the caller's replan budget). Harmless, and rare at this cap.
|
|
227
|
+
while (landed.size > SAME_PATH_LANDED_KEY_CAP) {
|
|
228
|
+
const oldest = landed.keys().next().value;
|
|
229
|
+
if (oldest === undefined)
|
|
230
|
+
break;
|
|
231
|
+
landed.delete(oldest);
|
|
232
|
+
}
|
|
233
|
+
// The holder's own landing is not a supersede of its own decision.
|
|
234
|
+
this.seenSeq = landedSeq;
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
/** Thrown inside a deferred transfer when another pusher landed first. */
|
|
238
|
+
export class SamePathUploadSupersededError extends Error {
|
|
239
|
+
relativePath;
|
|
240
|
+
constructor(relativePath) {
|
|
241
|
+
super(`upload of ${relativePath} superseded by a newer upload in this process`);
|
|
242
|
+
this.relativePath = relativePath;
|
|
243
|
+
this.name = "SamePathUploadSupersededError";
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
export const _testing = {
|
|
247
|
+
reset() {
|
|
248
|
+
slots.clear();
|
|
249
|
+
landed.clear();
|
|
250
|
+
landedSeq = 0;
|
|
251
|
+
waitMsForTest = undefined;
|
|
252
|
+
},
|
|
253
|
+
heldKeys() {
|
|
254
|
+
return [...slots.entries()].filter(([, slot]) => slot.held).map(([key]) => key);
|
|
255
|
+
},
|
|
256
|
+
};
|
|
257
|
+
//# sourceMappingURL=same-path-upload-lock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"same-path-upload-lock.js","sourceRoot":"","sources":["../../src/lib/same-path-upload-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"personal-vault.d.ts","sourceRoot":"","sources":["../src/personal-vault.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;
|
|
1
|
+
{"version":3,"file":"personal-vault.d.ts","sourceRoot":"","sources":["../src/personal-vault.ts"],"names":[],"mappings":"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"}
|
package/dist/personal-vault.js
CHANGED
|
@@ -47,6 +47,7 @@
|
|
|
47
47
|
import * as fs from "fs";
|
|
48
48
|
import * as path from "path";
|
|
49
49
|
import { noteSwallowedError } from "./best-effort-error.js";
|
|
50
|
+
import { isPathExcludedFromSync } from "./ignore.js";
|
|
50
51
|
import { isGeneratedCommandWrapperPath } from "./personal-vault-exclusions.js";
|
|
51
52
|
import { localPathForVaultKey, vaultKeyForLocalPath, } from "./local-path-codec.js";
|
|
52
53
|
import { journalRows } from "./journal.js";
|
|
@@ -96,6 +97,9 @@ export const PERSONAL_VAULT_EXCLUDED_TOP_LEVEL = [
|
|
|
96
97
|
// existing stray `bin/` from disk; it only reaches boxes via cloud-init and
|
|
97
98
|
// the backfill, so this exclusion is the fleet-wide half of the same fix.
|
|
98
99
|
"bin",
|
|
100
|
+
// Offloaded large-file blobs, managed only by `hq storage offload|fetch`.
|
|
101
|
+
// See HQ_OFFLOAD_PREFIX in sync/pull-scope.ts.
|
|
102
|
+
".hq-offload",
|
|
99
103
|
];
|
|
100
104
|
/** Shared top-level and workspace carve-out rule for watcher and warm-up. */
|
|
101
105
|
export function isPersonalVaultScopeExcluded(relativePath, scope) {
|
|
@@ -742,7 +746,7 @@ export function purgeExcludedPersonalVaultJournalEntries(journal, hqRoot, syncRo
|
|
|
742
746
|
}
|
|
743
747
|
if (presence === "unknown")
|
|
744
748
|
continue;
|
|
745
|
-
const ignoreFiltered =
|
|
749
|
+
const ignoreFiltered = isPathExcludedFromSync(shouldSync, absPath);
|
|
746
750
|
if (presence === "present") {
|
|
747
751
|
// shouldSync is the ONLY classification that applies to a present file:
|
|
748
752
|
// the `workspace/` top-level exclusion is a walk-root fact, and a present
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"personal-vault.js","sourceRoot":"","sources":["../src/personal-vault.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,MAAM,iCAAiC,GAAsB;IAClE,MAAM;IACN,WAAW;IACX,iBAAiB;IACjB,OAAO;IACP,WAAW;IACX,2EAA2E;IAC3E,0EAA0E;IAC1E,wEAAwE;IACxE,6EAA6E;IAC7E,0EAA0E;IAC1E,2EAA2E;IAC3E,yEAAyE;IACzE,cAAc;IACd,mBAAmB;IACnB,gBAAgB;IAChB,qBAAqB;IACrB,WAAW;IACX,cAAc;IACd,6EAA6E;IAC7E,uEAAuE;IACvE,iEAAiE;IACjE,6EAA6E;IAC7E,wEAAwE;IACxE,uEAAuE;IACvE,yEAAyE;IACzE,2EAA2E;IAC3E,0EAA0E;IAC1E,uDAAuD;IACvD,EAAE;IACF,4EAA4E;IAC5E,0EAA0E;IAC1E,sEAAsE;IACtE,8EAA8E;IAC9E,0EAA0E;IAC1E,sEAAsE;IACtE,6EAA6E;IAC7E,wBAAwB;IACxB,EAAE;IACF,0EAA0E;IAC1E,4EAA4E;IAC5E,0EAA0E;IAC1E,KAAK;CACN,CAAC;AAQF,6EAA6E;AAC7E,MAAM,UAAU,4BAA4B,CAC1C,YAAoB,EACpB,KAAiC;IAEjC,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,MAAM,mBAAmB,GAAG,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC;QACjE,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,YAAY,KAAK,kBAAkB,IAAI,YAAY,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAClH,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,YAAY,KAAK,yBAAyB,IAAI,YAAY,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;IACxI,OAAO,iCAAiC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACzD,YAAY,KAAK,yBAAyB;QAC1C,CAAC,mBAAmB,CAAC;AACzB,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qCAAqC,GAAsB;IACtE,WAAW;CACZ,CAAC;AAeF;;;;;;;;;;;;;;;;;;GAkBG;AACH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,yBAAyB,CAAC;AAErE;;;;;;;;;;GAUG;AACH,MAAM,UAAU,wBAAwB,CAAC,GAAW;IAClD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxE,OAAO,CACL,KAAK,CAAC,MAAM,IAAI,CAAC;QACjB,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM;QACnB,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,WAAW;YACvB,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU;YACvB,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS;YACtB,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAC3B,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,GAAW;IACjD,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,yBAAyB,CAAC;IACzC,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9E,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAC5B,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,GAAG,KAAK,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACnD,OAAO,IAAI,KAAK,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AAC7C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,+BAA+B,CAAC,GAAW;IACzD,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAClE,OAAO,CACL,uBAAuB,CAAC,UAAU,CAAC;QACnC,UAAU,KAAK,MAAM;QACrB,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC;QAC9B,UAAU,KAAK,gBAAgB;QAC/B,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC;QACxC,sEAAsE;QACtE,2EAA2E;QAC3E,0EAA0E;QAC1E,wEAAwE;QACxE,0EAA0E;QAC1E,2DAA2D;QAC3D,6BAA6B,CAAC,UAAU,CAAC,CAC1C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,OAA6B,EAAE;IAE/B,IAAI,OAAiB,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kBAAkB,CAAC,YAAY,EAAE,0CAA0C,EAAE,KAAK,CAAC,CAAC;QACpF,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO;SACrB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,iCAAiC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACnE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1C,sEAAsE;IACtE,sEAAsE;IACtE,uEAAuE;IACvE,oEAAoE;IACpE,0EAA0E;IAC1E,2DAA2D;IAC3D,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;IACpE,IAAI,CAAC;QACH,IAAI,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;YACvC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,wEAAwE;IAC1E,CAAC;IACD,MAAM,cAAc,GAAG,6BAA6B,CAClD,MAAM,EACN,IAAI,CAAC,eAAe,CACrB,CAAC;IACF,MAAM,UAAU,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;IACxD,OAAO;QACL,GAAG,QAAQ;QACX,GAAG,QAAQ;QACX,GAAG,cAAc;QACjB,GAAG,UAAU;QACb,GAAG,MAAM;QACT,GAAG,WAAW;KACf,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,gCAAgC,CAAC;AAEvE;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,6BAA6B,CAAC,MAAc;IAC1D,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAE1D,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE;YAAE,OAAO,GAAG,CAAC;QACnD,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,qEAAqE;QACrE,kBAAkB,CAAC,YAAY,EAAE,gDAAgD,EAAE,KAAK,CAAC,CAAC;QAC1F,OAAO,GAAG,CAAC;IACb,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEtB,uEAAuE;IACvE,yEAAyE;IACzE,uDAAuD;IACvD,IAAI,UAAmB,CAAC;IACxB,IAAI,CAAC;QACH,UAAU,GAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAA+B,EAAE,WAAW,CAAC;IAC3E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kBAAkB,CAAC,YAAY,EAAE,iDAAiD,EAAE,KAAK,CAAC,CAAC;QAC3F,OAAO,GAAG,CAAC;IACb,CAAC;IACD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAE1E,4EAA4E;IAC5E,wEAAwE;IACxE,yEAAyE;IACzE,mEAAmE;IACnE,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,GAAG,CAAC;IAC5C,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,CAAC,CAAS,EAAW,EAAE,CAC3C,CAAC,KAAK,eAAe,IAAI,CAAC,CAAC,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACpE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;QAAE,OAAO,GAAG,CAAC;IAC1C,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QAC1E,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,WAAW,KAAK,mBAAmB;YAAE,OAAO,GAAG,CAAC;QACpD,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAW,EAAE,CAC/C,CAAC,KAAK,WAAW,IAAI,CAAC,CAAC,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;YAAE,OAAO,GAAG,CAAC;QACzC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE;YAAE,OAAO,GAAG,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,sEAAsE;QACtE,OAAO,GAAG,CAAC;IACb,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpB,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,6BAA6B,CAC3C,MAAc,EACd,YAAoB;IAEpB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACjE,OAAO,6BAA6B,CAAC,MAAM,CAAC,CAAC,IAAI,CAC/C,CAAC,YAAY,EAAE,EAAE,CACf,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,WAAW;QAC1C,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,SAAS,CAC3C,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAElD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC3D,IAAI,CAAC;QACH,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;YAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,0DAA0D;QAC1D,kBAAkB,CAAC,YAAY,EAAE,4CAA4C,EAAE,KAAK,CAAC,CAAC;IACxF,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC;AAE/D;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,2BAA2B,CAAC,MAAc;IACxD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IACvE,IAAI,CAAC;QACH,IAAI,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE;YAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,mEAAmE;QACnE,kBAAkB,CAAC,YAAY,EAAE,kDAAkD,EAAE,KAAK,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,6BAA6B,CAC3C,MAAc,EACd,kBAAuC,IAAI,GAAG,EAAE;IAEhD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACrD,IAAI,KAAe,CAAC;IACpB,IAAI,CAAC;QACH,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,oEAAoE;IACpE,uEAAuE;IACvE,0EAA0E;IAC1E,kEAAkE;IAClE,MAAM,kBAAkB,GAAG,gCAAgC,CAAC,MAAM,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,qCAAqC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,SAAS;QACnE,IAAI,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QACxC,IAAI,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC;YACH,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,IAAI,yBAAyB,CAAC,MAAM,CAAC;YAAE,SAAS;QAChD,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gCAAgC,CAAC,MAAc;IAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IACrE,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,IAAI,WAAW,GAAkB,IAAI,CAAC;IACtC,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,oEAAoE;QACpE,IAAI,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/C,WAAW,GAAG,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnD,WAAW,GAAG,IAAI,CAAC;YACnB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,WAAW;YAAE,SAAS;QAC3B,kDAAkD;QAClD,MAAM,SAAS,GAAG,+CAA+C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7E,IAAI,SAAS,EAAE,CAAC;YACd,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC3B,SAAS;QACX,CAAC;QACD,IACE,WAAW;YACX,wCAAwC,CAAC,IAAI,CAAC,IAAI,CAAC,EACnD,CAAC;YACD,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACrB,oEAAoE;YACpE,qCAAqC;QACvC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,SAAS,yBAAyB,CAAC,MAAc;IAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC;AAoBD,8EAA8E;AAC9E,kEAAkE;AAClE,8EAA8E;AAC9E,6EAA6E;AAC7E,6EAA6E;AAC7E,4EAA4E;AAC5E,8EAA8E;AAC9E,oDAAoD;AACpD,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,CAAC;AACxC,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAE5C,wEAAwE;AACxE,uEAAuE;AACvE,4EAA4E;AAC5E,4EAA4E;AAC5E,8EAA8E;AAC9E,sEAAsE;AACtE,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAYlD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6FG;AACH,MAAM,UAAU,wCAAwC,CACtD,OAAoB,EACpB,MAAc,EACd,QAAgB,EAChB,UAAyD,EACzD,gBAA0C,EAC1C,UAA4C,EAAE;IAE9C,MAAM,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,IAAI,2BAA2B,CAAC;IACvF,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,mBAAmB,GAAG,CAAC,EAAE,CAAC;QACtE,MAAM,IAAI,KAAK,CACb,iGAAiG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CACvI,CAAC;IACJ,CAAC;IACD,wEAAwE;IACxE,6EAA6E;IAC7E,8EAA8E;IAC9E,2EAA2E;IAC3E,6EAA6E;IAC7E,2EAA2E;IAC3E,qEAAqE;IACrE,+EAA+E;IAC/E,kEAAkE;IAClE,2EAA2E;IAC3E,wCAAwC;IACxC,MAAM,kBAAkB,GAAG;QACzB,GAAG,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACtD,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CACvD;QACD,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACnD,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,CACpC;KACF,CAAC;IAEF,MAAM,yBAAyB,GAAG,CAAC,GAAW,EAAW,EAAE,CACzD,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;IAEhF,MAAM,QAAQ,GAAoD;QAChE,iBAAiB,EAAE,CAAC;QACpB,yBAAyB,EAAE,CAAC;QAC5B,oBAAoB,EAAE,CAAC;KACxB,CAAC;IAEF,8EAA8E;IAC9E,4EAA4E;IAC5E,4EAA4E;IAC5E,4DAA4D;IAC5D,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,UAAU,GAAoE,EAAE,CAAC;IACvF,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9B,yEAAyE;QACzE,4EAA4E;QAC5E,iCAAiC;QACjC,SAAS,IAAI,CAAC,CAAC;QACf,uEAAuE;QACvE,wEAAwE;QACxE,uEAAuE;QACvE,IAAI,gBAAgB,CAAC,GAAG,CAAC;YAAE,SAAS;QAEpC,MAAM,OAAO,GAAG,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACpD,sEAAsE;QACtE,2EAA2E;QAC3E,2EAA2E;QAC3E,yEAAyE;QACzE,2CAA2C;QAC3C,IAAI,QAAQ,GAAsC,SAAS,CAAC;QAC5D,IAAI,CAAC;YACH,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ;gBACL,GAA6B,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7E,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS;YAAE,SAAS;QAErC,MAAM,cAAc,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAEjF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,wEAAwE;YACxE,0EAA0E;YAC1E,4EAA4E;YAC5E,2EAA2E;YAC3E,6EAA6E;YAC7E,wEAAwE;YACxE,uEAAuE;YACvE,yEAAyE;YACzE,kDAAkD;YAClD,yEAAyE;YACzE,mEAAmE;YACnE,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,mBAAmB,EAAE,CAAC;gBAClE,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3B,CAAC;YACD,SAAS;QACX,CAAC;QAED,oEAAoE;QACpE,yEAAyE;QACzE,oDAAoD;QACpD,IAAI,+BAA+B,CAAC,GAAG,CAAC;YAAE,SAAS;QAEnD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnC,IAAI,MAAM,GAA2C,IAAI,CAAC;QAC1D,IAAI,cAAc,EAAE,CAAC;YACnB,yEAAyE;YACzE,4EAA4E;YAC5E,wBAAwB;YACxB,MAAM,GAAG,iBAAiB,CAAC;QAC7B,CAAC;aAAM,IAAI,QAAQ,KAAK,WAAW,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC;YACvE,0EAA0E;YAC1E,sEAAsE;YACtE,MAAM,GAAG,oBAAoB,CAAC;QAChC,CAAC;QAED,IAAI,MAAM,KAAK,IAAI;YAAE,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,8EAA8E;IAC9E,2EAA2E;IAC3E,uEAAuE;IACvE,4EAA4E;IAC5E,iEAAiE;IACjE,IACE,SAAS,IAAI,uBAAuB;QACpC,UAAU,CAAC,MAAM,GAAG,SAAS,GAAG,oBAAoB,EACpD,CAAC;QACD,OAAO;YACL,OAAO,EAAE,EAAE;YACX,QAAQ;YACR,YAAY,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE;SAC1D,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;IACrB,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;IACxC,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC/B,CAAC"}
|
|
1
|
+
{"version":3,"file":"personal-vault.js","sourceRoot":"","sources":["../src/personal-vault.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,16 @@ type CaptureTestPhase = "after-copy" | "after-prepare" | "after-prepare-batch" |
|
|
|
27
27
|
export declare function setSessionLogCaptureTestHook(hook: ((phase: CaptureTestPhase, source: string) => void) | undefined): void;
|
|
28
28
|
/** Test-only seam for forcing the append/compaction crash window. */
|
|
29
29
|
export declare function setSessionLogCaptureMaxRecordsBeforeCompactionForTest(maxRecordsBeforeCompaction: number | undefined): void;
|
|
30
|
+
/**
|
|
31
|
+
* Files a harness keeps rewriting while a session is live and that carry no
|
|
32
|
+
* transcript content: lock files, per-session UI bookkeeping, and terminal
|
|
33
|
+
* logs that are still being written. Capturing them mirrored a live
|
|
34
|
+
* directory into the vault, so every push raced the next local write (the
|
|
35
|
+
* grok session-log parks on 2026-10-10 were all in such session folders). A
|
|
36
|
+
* terminal log is captured once it has been quiet for
|
|
37
|
+
* LIVE_TERMINAL_LOG_QUIET_MS.
|
|
38
|
+
*/
|
|
39
|
+
export declare function isVolatileSessionLogFile(relativePath: string, mtimeMs: number, nowMs: number): boolean;
|
|
30
40
|
/**
|
|
31
41
|
* Capture supported harness logs for one HQ root. This operation is deliberately
|
|
32
42
|
* best-effort to retain reindex's historic contract, except a corrupt capture
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-log-capture.d.ts","sourceRoot":"","sources":["../src/session-log-capture.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-log-capture.d.ts","sourceRoot":"","sources":["../src/session-log-capture.ts"],"names":[],"mappings":"AA0FA,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,2EAA2E;IAC3E,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,+FAA+F;IAC/F,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,wBAAwB;IACxB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,KAAK,gBAAgB,GACjB,YAAY,GACZ,eAAe,GACf,qBAAqB,GACrB,cAAc,GACd,eAAe,GACf,oBAAoB,CAAC;AAIzB,kDAAkD;AAClD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,GACpE,IAAI,CAEN;AAED,qEAAqE;AACrE,wBAAgB,qDAAqD,CACnE,0BAA0B,EAAE,MAAM,GAAG,SAAS,GAC7C,IAAI,CAEN;AA0rBD;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAST;AAmTD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,wBAA6B,GAAG,wBAAwB,CAsFjH"}
|