@indigoai-us/hq-cloud 6.11.10 → 6.11.12
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.d.ts +2 -0
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +231 -52
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/bin/sync-runner.test.js +330 -11
- package/dist/bin/sync-runner.test.js.map +1 -1
- package/dist/cli/reindex.d.ts.map +1 -1
- package/dist/cli/reindex.js +16 -1
- package/dist/cli/reindex.js.map +1 -1
- package/dist/cli/reindex.test.js +39 -1
- package/dist/cli/reindex.test.js.map +1 -1
- package/dist/cli/rescue-classify-ordering.test.js +58 -0
- package/dist/cli/rescue-classify-ordering.test.js.map +1 -1
- package/dist/cli/rescue-core.js +229 -15
- package/dist/cli/rescue-core.js.map +1 -1
- package/dist/cli/rescue-exec-bit-preserve.test.d.ts +2 -0
- package/dist/cli/rescue-exec-bit-preserve.test.d.ts.map +1 -0
- package/dist/cli/rescue-exec-bit-preserve.test.js +169 -0
- package/dist/cli/rescue-exec-bit-preserve.test.js.map +1 -0
- package/dist/cli/share.d.ts +2 -1
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +100 -32
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/share.test.js +30 -0
- package/dist/cli/share.test.js.map +1 -1
- package/dist/cli/sync.d.ts +28 -1
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +188 -59
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +487 -1
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/cognito-auth.d.ts.map +1 -1
- package/dist/cognito-auth.js +55 -10
- package/dist/cognito-auth.js.map +1 -1
- package/dist/cognito-auth.test.js +61 -0
- package/dist/cognito-auth.test.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +93 -6
- package/dist/journal.js.map +1 -1
- package/dist/journal.test.js +59 -0
- package/dist/journal.test.js.map +1 -1
- package/dist/machine-auth.test.js +60 -2
- package/dist/machine-auth.test.js.map +1 -1
- package/dist/object-io.d.ts +37 -1
- package/dist/object-io.d.ts.map +1 -1
- package/dist/object-io.js +148 -29
- package/dist/object-io.js.map +1 -1
- package/dist/object-io.test.js +121 -0
- package/dist/object-io.test.js.map +1 -1
- package/dist/operation-lock.d.ts +8 -8
- package/dist/operation-lock.d.ts.map +1 -1
- package/dist/operation-lock.js +99 -32
- package/dist/operation-lock.js.map +1 -1
- package/dist/operation-lock.test.js +51 -4
- package/dist/operation-lock.test.js.map +1 -1
- package/dist/personal-vault.d.ts +8 -0
- package/dist/personal-vault.d.ts.map +1 -1
- package/dist/personal-vault.js +17 -3
- package/dist/personal-vault.js.map +1 -1
- package/dist/personal-vault.test.js +34 -0
- package/dist/personal-vault.test.js.map +1 -1
- package/dist/prefix-coalesce.d.ts +20 -9
- package/dist/prefix-coalesce.d.ts.map +1 -1
- package/dist/prefix-coalesce.js +124 -28
- package/dist/prefix-coalesce.js.map +1 -1
- package/dist/prefix-coalesce.test.js +57 -2
- package/dist/prefix-coalesce.test.js.map +1 -1
- package/dist/remote-pull.d.ts +6 -1
- package/dist/remote-pull.d.ts.map +1 -1
- package/dist/remote-pull.js +62 -13
- package/dist/remote-pull.js.map +1 -1
- package/dist/remote-pull.test.js +189 -0
- package/dist/remote-pull.test.js.map +1 -1
- package/dist/s3.d.ts +2 -0
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +197 -116
- package/dist/s3.js.map +1 -1
- package/dist/s3.test.js +109 -0
- package/dist/s3.test.js.map +1 -1
- package/dist/scope-shrink.d.ts +3 -2
- package/dist/scope-shrink.d.ts.map +1 -1
- package/dist/scope-shrink.js +1 -1
- package/dist/scope-shrink.js.map +1 -1
- package/dist/skill-telemetry.d.ts +1 -1
- package/dist/skill-telemetry.d.ts.map +1 -1
- package/dist/skill-telemetry.js +69 -9
- package/dist/skill-telemetry.js.map +1 -1
- package/dist/skill-telemetry.test.js +86 -0
- package/dist/skill-telemetry.test.js.map +1 -1
- package/dist/sync/event-sync.d.ts +6 -0
- package/dist/sync/event-sync.d.ts.map +1 -1
- package/dist/sync/event-sync.js +34 -1
- package/dist/sync/event-sync.js.map +1 -1
- package/dist/sync/event-sync.test.js +73 -0
- package/dist/sync/event-sync.test.js.map +1 -1
- package/dist/sync/metrics.d.ts +17 -1
- package/dist/sync/metrics.d.ts.map +1 -1
- package/dist/sync/metrics.js +32 -1
- package/dist/sync/metrics.js.map +1 -1
- package/dist/sync/metrics.test.js +74 -1
- package/dist/sync/metrics.test.js.map +1 -1
- package/dist/sync/pull-scope.d.ts.map +1 -1
- package/dist/sync/pull-scope.js +15 -7
- package/dist/sync/pull-scope.js.map +1 -1
- package/dist/sync/push-receiver.d.ts +6 -5
- package/dist/sync/push-receiver.d.ts.map +1 -1
- package/dist/sync/push-receiver.js +13 -15
- package/dist/sync/push-receiver.js.map +1 -1
- package/dist/sync/push-receiver.test.js +36 -1
- package/dist/sync/push-receiver.test.js.map +1 -1
- package/dist/telemetry.d.ts +1 -1
- package/dist/telemetry.d.ts.map +1 -1
- package/dist/telemetry.js +59 -6
- package/dist/telemetry.js.map +1 -1
- package/dist/telemetry.test.js +74 -0
- package/dist/telemetry.test.js.map +1 -1
- package/dist/types.d.ts +8 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/watcher.d.ts +36 -0
- package/dist/watcher.d.ts.map +1 -1
- package/dist/watcher.js +152 -30
- package/dist/watcher.js.map +1 -1
- package/dist/watcher.test.js +103 -0
- package/dist/watcher.test.js.map +1 -1
- package/package.json +1 -1
- package/src/bin/sync-runner.test.ts +396 -11
- package/src/bin/sync-runner.ts +254 -52
- package/src/cli/reindex.test.ts +47 -1
- package/src/cli/reindex.ts +17 -1
- package/src/cli/rescue-classify-ordering.test.ts +61 -0
- package/src/cli/rescue-core.ts +261 -15
- package/src/cli/rescue-exec-bit-preserve.test.ts +187 -0
- package/src/cli/share.test.ts +38 -0
- package/src/cli/share.ts +103 -34
- package/src/cli/sync.test.ts +594 -1
- package/src/cli/sync.ts +229 -65
- package/src/cognito-auth.test.ts +77 -0
- package/src/cognito-auth.ts +73 -11
- package/src/index.ts +8 -0
- package/src/journal.test.ts +72 -0
- package/src/journal.ts +95 -8
- package/src/machine-auth.test.ts +64 -2
- package/src/object-io.test.ts +142 -0
- package/src/object-io.ts +182 -30
- package/src/operation-lock.test.ts +63 -4
- package/src/operation-lock.ts +99 -31
- package/src/personal-vault.test.ts +42 -0
- package/src/personal-vault.ts +18 -3
- package/src/prefix-coalesce.test.ts +71 -1
- package/src/prefix-coalesce.ts +155 -30
- package/src/remote-pull.test.ts +205 -0
- package/src/remote-pull.ts +77 -14
- package/src/s3.test.ts +126 -0
- package/src/s3.ts +237 -122
- package/src/scope-shrink.ts +6 -3
- package/src/skill-telemetry.test.ts +109 -0
- package/src/skill-telemetry.ts +82 -14
- package/src/sync/event-sync.test.ts +75 -0
- package/src/sync/event-sync.ts +54 -1
- package/src/sync/metrics.test.ts +81 -0
- package/src/sync/metrics.ts +59 -4
- package/src/sync/pull-scope.ts +23 -7
- package/src/sync/push-receiver.test.ts +38 -1
- package/src/sync/push-receiver.ts +15 -18
- package/src/telemetry.test.ts +85 -0
- package/src/telemetry.ts +69 -6
- package/src/types.ts +8 -0
- package/src/watcher.test.ts +117 -0
- package/src/watcher.ts +209 -33
package/dist/prefix-coalesce.js
CHANGED
|
@@ -21,17 +21,115 @@
|
|
|
21
21
|
* - **Determinism:** output is sorted lexicographically so the journal's
|
|
22
22
|
* `prefixSet` stays diff-stable across runs.
|
|
23
23
|
*
|
|
24
|
-
* Coverage rule:
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
24
|
+
* Coverage rule: exact-file entries cover only themselves. Directory prefixes
|
|
25
|
+
* (ending in `/`) and bare glob prefixes cover descendants with literal
|
|
26
|
+
* `startsWith` matching. When a string is ambiguous (e.g. `foo` from `foo*`,
|
|
27
|
+
* which must be a prefix, not an exact file), the coalesced `prefixSet` stores
|
|
28
|
+
* a small in-band marker in the string itself so the match type survives
|
|
29
|
+
* `[...prefixSet]` copies and JSON persistence.
|
|
28
30
|
*/
|
|
31
|
+
const SCOPE_PREFIX_MARKER = "\u0000hq-scope:";
|
|
32
|
+
const SCOPE_PREFIX_MARKER_PREFIX = `${SCOPE_PREFIX_MARKER}prefix`;
|
|
33
|
+
const SCOPE_PREFIX_MARKER_EXACT = `${SCOPE_PREFIX_MARKER}exact`;
|
|
34
|
+
function isScopePrefixEntry(value) {
|
|
35
|
+
return typeof value !== "string";
|
|
36
|
+
}
|
|
37
|
+
function inferStringMatch(prefix) {
|
|
38
|
+
return prefix === "" || prefix.endsWith("/") ? "prefix" : "exact";
|
|
39
|
+
}
|
|
40
|
+
function parseStringPrefix(input) {
|
|
41
|
+
if (input.endsWith(SCOPE_PREFIX_MARKER_PREFIX)) {
|
|
42
|
+
return {
|
|
43
|
+
prefix: input.slice(0, -SCOPE_PREFIX_MARKER_PREFIX.length),
|
|
44
|
+
match: "prefix",
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
if (input.endsWith(SCOPE_PREFIX_MARKER_EXACT)) {
|
|
48
|
+
return {
|
|
49
|
+
prefix: input.slice(0, -SCOPE_PREFIX_MARKER_EXACT.length),
|
|
50
|
+
match: "exact",
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
return {
|
|
54
|
+
prefix: input,
|
|
55
|
+
match: inferStringMatch(input),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
function encodeScopePrefix(entry) {
|
|
59
|
+
return entry.match === inferStringMatch(entry.prefix)
|
|
60
|
+
? entry.prefix
|
|
61
|
+
: `${entry.prefix}${SCOPE_PREFIX_MARKER}${entry.match}`;
|
|
62
|
+
}
|
|
63
|
+
function normalizeScopePrefix(input) {
|
|
64
|
+
if (typeof input === "string") {
|
|
65
|
+
return parseStringPrefix(input);
|
|
66
|
+
}
|
|
67
|
+
if (typeof input.prefix !== "string")
|
|
68
|
+
return null;
|
|
69
|
+
return {
|
|
70
|
+
prefix: input.prefix,
|
|
71
|
+
match: input.match === "prefix" ? "prefix" : "exact",
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
function materializeScopePrefixes(prefixes) {
|
|
75
|
+
const entries = [];
|
|
76
|
+
for (const p of prefixes) {
|
|
77
|
+
const entry = normalizeScopePrefix(p);
|
|
78
|
+
if (entry)
|
|
79
|
+
entries.push(entry);
|
|
80
|
+
}
|
|
81
|
+
return entries;
|
|
82
|
+
}
|
|
83
|
+
function compareEntries(a, b) {
|
|
84
|
+
if (a.prefix < b.prefix)
|
|
85
|
+
return -1;
|
|
86
|
+
if (a.prefix > b.prefix)
|
|
87
|
+
return 1;
|
|
88
|
+
if (a.match === b.match)
|
|
89
|
+
return 0;
|
|
90
|
+
return a.match === "prefix" ? -1 : 1;
|
|
91
|
+
}
|
|
92
|
+
function entryCoversPath(entry, key) {
|
|
93
|
+
if (entry.prefix === "")
|
|
94
|
+
return true;
|
|
95
|
+
if (key === entry.prefix)
|
|
96
|
+
return true;
|
|
97
|
+
return entry.match === "prefix" && key.startsWith(entry.prefix);
|
|
98
|
+
}
|
|
99
|
+
function entryCoversEntry(entry, candidate) {
|
|
100
|
+
if (entry.prefix === "")
|
|
101
|
+
return true;
|
|
102
|
+
if (entry.match === "prefix") {
|
|
103
|
+
return (candidate.prefix === entry.prefix ||
|
|
104
|
+
candidate.prefix.startsWith(entry.prefix));
|
|
105
|
+
}
|
|
106
|
+
return candidate.match === "exact" && candidate.prefix === entry.prefix;
|
|
107
|
+
}
|
|
108
|
+
export function toScopePrefixEntries(prefixSet) {
|
|
109
|
+
return materializeScopePrefixes(prefixSet);
|
|
110
|
+
}
|
|
111
|
+
export function pathToScopePrefix(path) {
|
|
112
|
+
const p = (path ?? "").replace(/^\/+/, "");
|
|
113
|
+
if (p.endsWith(SCOPE_PREFIX_MARKER_PREFIX) ||
|
|
114
|
+
p.endsWith(SCOPE_PREFIX_MARKER_EXACT)) {
|
|
115
|
+
return parseStringPrefix(p);
|
|
116
|
+
}
|
|
117
|
+
if (p === "*" || p === "")
|
|
118
|
+
return { prefix: "", match: "prefix" };
|
|
119
|
+
if (p.endsWith("/*"))
|
|
120
|
+
return { prefix: p.slice(0, -1), match: "prefix" };
|
|
121
|
+
if (p.endsWith("*"))
|
|
122
|
+
return { prefix: p.slice(0, -1), match: "prefix" };
|
|
123
|
+
if (p.endsWith("/"))
|
|
124
|
+
return { prefix: p, match: "prefix" };
|
|
125
|
+
return { prefix: p, match: "exact" };
|
|
126
|
+
}
|
|
29
127
|
export function coalescePrefixes(prefixes) {
|
|
30
128
|
// Dedup + drop empties.
|
|
31
|
-
const unique = new
|
|
32
|
-
for (const
|
|
33
|
-
if (
|
|
34
|
-
unique.
|
|
129
|
+
const unique = new Map();
|
|
130
|
+
for (const entry of materializeScopePrefixes(prefixes)) {
|
|
131
|
+
if (entry.prefix !== "") {
|
|
132
|
+
unique.set(`${entry.match}\0${entry.prefix}`, entry);
|
|
35
133
|
}
|
|
36
134
|
}
|
|
37
135
|
if (unique.size === 0)
|
|
@@ -39,29 +137,29 @@ export function coalescePrefixes(prefixes) {
|
|
|
39
137
|
// Sort lexicographically so a broader prefix (`a/`) appears before its
|
|
40
138
|
// narrower descendants (`a/b/`). Then a single pass keeps the broadest in
|
|
41
139
|
// each cover chain.
|
|
42
|
-
const sorted = [...unique].sort();
|
|
140
|
+
const sorted = [...unique.values()].sort(compareEntries);
|
|
43
141
|
const result = [];
|
|
44
142
|
let lastKept = null;
|
|
45
|
-
for (const
|
|
46
|
-
if (lastKept !== null &&
|
|
143
|
+
for (const entry of sorted) {
|
|
144
|
+
if (lastKept !== null && entryCoversEntry(lastKept, entry)) {
|
|
47
145
|
// `lastKept` already covers `p`; skip.
|
|
48
146
|
continue;
|
|
49
147
|
}
|
|
50
|
-
result.push(
|
|
51
|
-
lastKept =
|
|
148
|
+
result.push(entry);
|
|
149
|
+
lastKept = entry;
|
|
52
150
|
}
|
|
53
|
-
return result;
|
|
151
|
+
return result.map(encodeScopePrefix);
|
|
54
152
|
}
|
|
55
153
|
/**
|
|
56
154
|
* Predicate companion: does any prefix in `prefixSet` cover `path`?
|
|
57
155
|
*
|
|
58
156
|
* Used by the journal scope-shrink algorithm to test whether a journaled
|
|
59
|
-
* file is still in scope under the current pull's `prefixSet`.
|
|
60
|
-
*
|
|
157
|
+
* file is still in scope under the current pull's `prefixSet`. Exact-file
|
|
158
|
+
* entries match only themselves; directory/glob prefixes use `startsWith`.
|
|
61
159
|
*/
|
|
62
160
|
export function isCoveredByAny(path, prefixSet) {
|
|
63
|
-
for (const
|
|
64
|
-
if (
|
|
161
|
+
for (const entry of materializeScopePrefixes(prefixSet)) {
|
|
162
|
+
if (entryCoversPath(entry, path))
|
|
65
163
|
return true;
|
|
66
164
|
}
|
|
67
165
|
return false;
|
|
@@ -89,12 +187,13 @@ export function isCoveredByAny(path, prefixSet) {
|
|
|
89
187
|
*/
|
|
90
188
|
export function isDirInScope(relDir, prefixSet) {
|
|
91
189
|
const dir = relDir === "" || relDir.endsWith("/") ? relDir : relDir + "/";
|
|
92
|
-
for (const
|
|
190
|
+
for (const entry of materializeScopePrefixes(prefixSet)) {
|
|
191
|
+
const p = entry.prefix;
|
|
93
192
|
if (p === "")
|
|
94
193
|
return true; // full scope
|
|
95
194
|
if (dir === "")
|
|
96
195
|
return true; // company root — descend to reach grants
|
|
97
|
-
if (dir.startsWith(p))
|
|
196
|
+
if (entry.match === "prefix" && dir.startsWith(p))
|
|
98
197
|
return true; // dir is inside a granted prefix
|
|
99
198
|
if (p.startsWith(dir))
|
|
100
199
|
return true; // a granted prefix is inside dir
|
|
@@ -129,7 +228,7 @@ export function isDirInScope(relDir, prefixSet) {
|
|
|
129
228
|
* `syncMode: shared` would download nothing and prune everything the caller
|
|
130
229
|
* actually has access to. See the live grant dump in the hq-pro vault.
|
|
131
230
|
*/
|
|
132
|
-
export function
|
|
231
|
+
export function grantPathToScopePrefix(grantPath, slug) {
|
|
133
232
|
let p = (grantPath ?? "").replace(/^\/+/, "");
|
|
134
233
|
// 1. Strip the company anchor, if present.
|
|
135
234
|
const companyAnchor = `companies/${slug}/`;
|
|
@@ -141,12 +240,9 @@ export function grantPathToPrefix(grantPath, slug) {
|
|
|
141
240
|
p = p.slice(slugAnchor.length);
|
|
142
241
|
}
|
|
143
242
|
// 2. Fold the ACL glob suffix into a startsWith prefix.
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
if (p.endsWith("*"))
|
|
149
|
-
return p.slice(0, -1); // "a/b*" → "a/b"
|
|
150
|
-
return p; // dir prefix ("a/b/") or exact key ("a/b.md") — already a prefix
|
|
243
|
+
return pathToScopePrefix(p);
|
|
244
|
+
}
|
|
245
|
+
export function grantPathToPrefix(grantPath, slug) {
|
|
246
|
+
return encodeScopePrefix(grantPathToScopePrefix(grantPath, slug));
|
|
151
247
|
}
|
|
152
248
|
//# sourceMappingURL=prefix-coalesce.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefix-coalesce.js","sourceRoot":"","sources":["../src/prefix-coalesce.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"prefix-coalesce.js","sourceRoot":"","sources":["../src/prefix-coalesce.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { describe, it, expect } from "vitest";
|
|
2
|
-
import { coalescePrefixes, isCoveredByAny, grantPathToPrefix, } from "./prefix-coalesce.js";
|
|
2
|
+
import { coalescePrefixes, isCoveredByAny, grantPathToPrefix, grantPathToScopePrefix, toScopePrefixEntries, } from "./prefix-coalesce.js";
|
|
3
3
|
describe("coalescePrefixes", () => {
|
|
4
4
|
it("returns empty for empty input", () => {
|
|
5
5
|
expect(coalescePrefixes([])).toEqual([]);
|
|
@@ -56,6 +56,9 @@ describe("coalescePrefixes", () => {
|
|
|
56
56
|
// prefixes — the grants endpoint always does.)
|
|
57
57
|
expect(coalescePrefixes(["a/", "ab/"]).sort()).toEqual(["a/", "ab/"]);
|
|
58
58
|
});
|
|
59
|
+
it("F16: keeps exact-file scopes distinct from prefixed sibling keys", () => {
|
|
60
|
+
expect(coalescePrefixes(["knowledge/README.md", "knowledge/README.md.bak"])).toEqual(["knowledge/README.md", "knowledge/README.md.bak"]);
|
|
61
|
+
});
|
|
59
62
|
});
|
|
60
63
|
describe("isCoveredByAny", () => {
|
|
61
64
|
it("returns true when a prefix covers the path", () => {
|
|
@@ -87,7 +90,11 @@ describe("grantPathToPrefix", () => {
|
|
|
87
90
|
expect(grantPathToPrefix("companies/indigo/design-pack/*", slug)).toBe("design-pack/");
|
|
88
91
|
});
|
|
89
92
|
it("folds a trailing bare * into its parent prefix", () => {
|
|
90
|
-
|
|
93
|
+
const prefix = grantPathToPrefix("reports*", slug);
|
|
94
|
+
expect(toScopePrefixEntries([prefix])).toEqual([
|
|
95
|
+
{ prefix: "reports", match: "prefix" },
|
|
96
|
+
]);
|
|
97
|
+
expect(isCoveredByAny("reports-q1.md", [prefix])).toBe(true);
|
|
91
98
|
});
|
|
92
99
|
it("leaves a company-relative directory prefix unchanged", () => {
|
|
93
100
|
expect(grantPathToPrefix("knowledge/security/", slug)).toBe("knowledge/security/");
|
|
@@ -123,5 +130,53 @@ describe("grantPathToPrefix", () => {
|
|
|
123
130
|
expect(isCoveredByAny("secrets/db.json", prefixes)).toBe(false);
|
|
124
131
|
expect(isCoveredByAny("knowledge/OTHER.md", prefixes)).toBe(false);
|
|
125
132
|
});
|
|
133
|
+
it("F16: exact-file grants do not authorize prefixed sibling keys", () => {
|
|
134
|
+
const grants = [
|
|
135
|
+
"companies/indigo/knowledge/README.md",
|
|
136
|
+
"company.yaml",
|
|
137
|
+
"data/vyg/*",
|
|
138
|
+
];
|
|
139
|
+
const prefixes = coalescePrefixes(grants.map((g) => grantPathToPrefix(g, slug)));
|
|
140
|
+
expect(isCoveredByAny("knowledge/README.md", prefixes)).toBe(true);
|
|
141
|
+
expect(isCoveredByAny("company.yaml", prefixes)).toBe(true);
|
|
142
|
+
expect(isCoveredByAny("data/vyg/2026/q1.md", prefixes)).toBe(true);
|
|
143
|
+
expect(isCoveredByAny("knowledge/README.md.bak", prefixes)).toBe(false);
|
|
144
|
+
expect(isCoveredByAny("company.yaml.tmp", prefixes)).toBe(false);
|
|
145
|
+
});
|
|
146
|
+
it("R-F16: exact scope is deterministic after a prior bare-glob scope", () => {
|
|
147
|
+
expect(toScopePrefixEntries([grantPathToPrefix("companies/indigo/foo*", slug)])).toEqual([
|
|
148
|
+
{ prefix: "foo", match: "prefix" },
|
|
149
|
+
]);
|
|
150
|
+
const exactPrefixes = coalescePrefixes([
|
|
151
|
+
grantPathToPrefix("companies/other/foo", "other"),
|
|
152
|
+
]);
|
|
153
|
+
expect(isCoveredByAny("foo", exactPrefixes)).toBe(true);
|
|
154
|
+
expect(isCoveredByAny("foo.bak", exactPrefixes)).toBe(false);
|
|
155
|
+
});
|
|
156
|
+
it("RF-F16DUR: exact-vs-prefix survives array copy and JSON round-trip", () => {
|
|
157
|
+
const priorBareGlob = coalescePrefixes([
|
|
158
|
+
grantPathToScopePrefix("companies/indigo/foo*", slug),
|
|
159
|
+
]);
|
|
160
|
+
const copiedBareGlob = [...priorBareGlob];
|
|
161
|
+
const jsonBareGlob = JSON.parse(JSON.stringify(priorBareGlob));
|
|
162
|
+
expect(jsonBareGlob).toEqual(priorBareGlob);
|
|
163
|
+
expect(toScopePrefixEntries(copiedBareGlob)).toEqual([
|
|
164
|
+
{ prefix: "foo", match: "prefix" },
|
|
165
|
+
]);
|
|
166
|
+
expect(toScopePrefixEntries(jsonBareGlob)).toEqual([
|
|
167
|
+
{ prefix: "foo", match: "prefix" },
|
|
168
|
+
]);
|
|
169
|
+
expect(isCoveredByAny("foo.bak", copiedBareGlob)).toBe(true);
|
|
170
|
+
expect(isCoveredByAny("foo.bak", jsonBareGlob)).toBe(true);
|
|
171
|
+
const exactAfterPriorGlob = coalescePrefixes([
|
|
172
|
+
grantPathToScopePrefix("companies/indigo/foo", slug),
|
|
173
|
+
]);
|
|
174
|
+
const jsonExact = JSON.parse(JSON.stringify(exactAfterPriorGlob));
|
|
175
|
+
expect(toScopePrefixEntries(jsonExact)).toEqual([
|
|
176
|
+
{ prefix: "foo", match: "exact" },
|
|
177
|
+
]);
|
|
178
|
+
expect(isCoveredByAny("foo", jsonExact)).toBe(true);
|
|
179
|
+
expect(isCoveredByAny("foo.bak", jsonExact)).toBe(false);
|
|
180
|
+
});
|
|
126
181
|
});
|
|
127
182
|
//# sourceMappingURL=prefix-coalesce.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefix-coalesce.test.js","sourceRoot":"","sources":["../src/prefix-coalesce.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,iBAAiB,
|
|
1
|
+
{"version":3,"file":"prefix-coalesce.test.js","sourceRoot":"","sources":["../src/prefix-coalesce.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,iBAAiB,EACjB,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAE9B,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;QAClC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACrE,IAAI;SACL,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,CACJ,gBAAgB,CAAC;YACf,4BAA4B;YAC5B,iCAAiC;YACjC,iCAAiC;SAClC,CAAC,CACH,CAAC,OAAO,CAAC;YACR,4BAA4B;YAC5B,iCAAiC;SAClC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,6DAA6D;QAC7D,MAAM,MAAM,GAAG,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;QAC5B,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxB,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,gBAAgB,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACtD,mBAAmB;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAClF,mEAAmE;QACnE,qEAAqE;QACrE,+CAA+C;QAC/C,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,CACJ,gBAAgB,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,CAAC,CACrE,CAAC,OAAO,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,MAAM,IAAI,GAAG,QAAQ,CAAC;IAEtB,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,iBAAiB,CAAC,sCAAsC,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAC1E,qBAAqB,CACtB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,iBAAiB,CAAC,gCAAgC,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACpE,wBAAwB,CACzB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,CAAC,iBAAiB,CAAC,gCAAgC,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACpE,cAAc,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC7C,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE;SACvC,CAAC,CAAC;QACH,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACzD,qBAAqB,CACtB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,CAAC,iBAAiB,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,oEAAoE;QACpE,8CAA8C;QAC9C,MAAM,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACzD,oBAAoB,CACrB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QACjF,MAAM,MAAM,GAAG;YACb,gCAAgC;YAChC,sCAAsC;YACtC,YAAY;YACZ,cAAc;SACf,CAAC;QACF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACjF,MAAM,CAAC,cAAc,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,MAAM,CAAC,cAAc,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,CAAC,cAAc,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,gBAAgB;QAChB,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChE,MAAM,CAAC,cAAc,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,MAAM,GAAG;YACb,sCAAsC;YACtC,cAAc;YACd,YAAY;SACb,CAAC;QACF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAEjF,MAAM,CAAC,cAAc,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,CAAC,cAAc,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEnE,MAAM,CAAC,cAAc,CAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxE,MAAM,CAAC,cAAc,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,CAAC,oBAAoB,CAAC,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACvF,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE;SACnC,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACrC,iBAAiB,CAAC,qBAAqB,EAAE,OAAO,CAAC;SAClD,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACrC,sBAAsB,CAAC,uBAAuB,EAAE,IAAI,CAAC;SACtD,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAa,CAAC;QAE3E,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;YACnD,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE;SACnC,CAAC,CAAC;QACH,MAAM,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;YACjD,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE;SACnC,CAAC,CAAC;QACH,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7D,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3D,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;YAC3C,sBAAsB,CAAC,sBAAsB,EAAE,IAAI,CAAC;SACrD,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAa,CAAC;QAE9E,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9C,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE;SAClC,CAAC,CAAC;QACH,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/remote-pull.d.ts
CHANGED
|
@@ -48,8 +48,13 @@ export interface DecideRemotePullsInput {
|
|
|
48
48
|
* conflict resolution can't be silently overwritten.
|
|
49
49
|
*/
|
|
50
50
|
conflictKeys: Set<string>;
|
|
51
|
+
/**
|
|
52
|
+
* Journal keys intentionally retained by scope-shrink authorship guards
|
|
53
|
+
* even though they are outside the current remote listing scope.
|
|
54
|
+
*/
|
|
55
|
+
protectedMissingKeys?: Set<string>;
|
|
51
56
|
}
|
|
52
|
-
export declare function decideRemotePulls({ remoteFiles, journal, conflictKeys, }: DecideRemotePullsInput): RemotePullDecision;
|
|
57
|
+
export declare function decideRemotePulls({ remoteFiles, journal, conflictKeys, protectedMissingKeys, }: DecideRemotePullsInput): RemotePullDecision;
|
|
53
58
|
/**
|
|
54
59
|
* Hard cap on coalesced prefixes per STS vend (US-001-D). The vault-service
|
|
55
60
|
* `validateVendRequest` rejects `paths.length > 10`, so the engine MUST
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-pull.d.ts","sourceRoot":"","sources":["../src/remote-pull.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAS1C,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,WAAW,EACZ,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EACV,aAAa,EACb,oBAAoB,EACrB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-pull.d.ts","sourceRoot":"","sources":["../src/remote-pull.ts"],"names":[],"mappings":"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"}
|
package/dist/remote-pull.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { listRemoteFiles } from "./s3.js";
|
|
2
2
|
import { appendPullRecord, gcTombstones, generatePullId, lastPullRecord, normalizeEtag, } from "./journal.js";
|
|
3
|
-
import { coalescePrefixes } from "./prefix-coalesce.js";
|
|
3
|
+
import { coalescePrefixes, isCoveredByAny, pathToScopePrefix, toScopePrefixEntries, } from "./prefix-coalesce.js";
|
|
4
4
|
import { applyScopeShrink, buildScopeShrinkPlan, ScopeShrinkBlockedError, } from "./scope-shrink.js";
|
|
5
|
-
export function decideRemotePulls({ remoteFiles, journal, conflictKeys, }) {
|
|
5
|
+
export function decideRemotePulls({ remoteFiles, journal, conflictKeys, protectedMissingKeys = new Set(), }) {
|
|
6
6
|
const download = [];
|
|
7
7
|
const skip = [];
|
|
8
8
|
const deleteLocal = [];
|
|
@@ -30,6 +30,12 @@ export function decideRemotePulls({ remoteFiles, journal, conflictKeys, }) {
|
|
|
30
30
|
for (const relativePath of Object.keys(journal.files)) {
|
|
31
31
|
if (seenRemote.has(relativePath))
|
|
32
32
|
continue;
|
|
33
|
+
if (journal.files[relativePath]?.removedAt)
|
|
34
|
+
continue;
|
|
35
|
+
if (protectedMissingKeys.has(relativePath)) {
|
|
36
|
+
skip.push({ key: relativePath });
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
33
39
|
if (conflictKeys.has(relativePath)) {
|
|
34
40
|
// Remote tombstone for a file the user is conflict-resolving locally.
|
|
35
41
|
// Skip — record so callers can log/report, but do NOT delete.
|
|
@@ -86,11 +92,11 @@ export function resolveCompanyScope(input) {
|
|
|
86
92
|
}
|
|
87
93
|
let raw;
|
|
88
94
|
if (syncConfig.syncMode === "custom") {
|
|
89
|
-
raw = syncConfig.customPaths ?? [];
|
|
95
|
+
raw = (syncConfig.customPaths ?? []).map(pathToScopePrefix);
|
|
90
96
|
}
|
|
91
97
|
else {
|
|
92
98
|
// 'shared'
|
|
93
|
-
raw = (explicitGrants ?? []).map((g) => g.path);
|
|
99
|
+
raw = (explicitGrants ?? []).map((g) => pathToScopePrefix(g.path));
|
|
94
100
|
}
|
|
95
101
|
const prefixSet = coalescePrefixes(raw);
|
|
96
102
|
// Empty grant set in `shared` mode means the caller has no explicit grants
|
|
@@ -114,9 +120,10 @@ export function resolveCompanyScope(input) {
|
|
|
114
120
|
export function batchPrefixesForVend(prefixes, cap = VEND_PATH_CAP) {
|
|
115
121
|
if (cap <= 0)
|
|
116
122
|
throw new Error(`batchPrefixesForVend: cap must be > 0`);
|
|
123
|
+
const vendPrefixes = toScopePrefixEntries(prefixes).map((entry) => entry.prefix);
|
|
117
124
|
const batches = [];
|
|
118
|
-
for (let i = 0; i <
|
|
119
|
-
batches.push(
|
|
125
|
+
for (let i = 0; i < vendPrefixes.length; i += cap) {
|
|
126
|
+
batches.push(vendPrefixes.slice(i, i + cap));
|
|
120
127
|
}
|
|
121
128
|
return batches;
|
|
122
129
|
}
|
|
@@ -163,12 +170,15 @@ export async function listRemoteForScope(input) {
|
|
|
163
170
|
}
|
|
164
171
|
if (scope.strategy === "broad-postfilter") {
|
|
165
172
|
const all = await list(ctx);
|
|
166
|
-
|
|
173
|
+
const scopeEntries = toScopePrefixEntries(scope.prefixSet);
|
|
174
|
+
return all.filter((f) => isCoveredByAny(f.key, scopeEntries));
|
|
167
175
|
}
|
|
168
176
|
// vend-fanout
|
|
169
177
|
if (scope.prefixSet.length === 0)
|
|
170
178
|
return [];
|
|
171
|
-
const
|
|
179
|
+
const scopeEntries = toScopePrefixEntries(scope.prefixSet);
|
|
180
|
+
const listPrefixes = scopeEntries.map((entry) => entry.prefix);
|
|
181
|
+
const batches = batchPrefixesForVend(listPrefixes);
|
|
172
182
|
const perBatch = await mapWithConcurrency(batches, VEND_FANOUT_CONCURRENCY, async (paths) => {
|
|
173
183
|
const batchCtx = input.vendForBatchFn
|
|
174
184
|
? await input.vendForBatchFn(ctx, paths)
|
|
@@ -180,7 +190,7 @@ export async function listRemoteForScope(input) {
|
|
|
180
190
|
const lists = await Promise.all(paths.map((p) => list(batchCtx, p)));
|
|
181
191
|
return lists.flat();
|
|
182
192
|
});
|
|
183
|
-
return dedupByKey(perBatch.flat());
|
|
193
|
+
return dedupByKey(perBatch.flat().filter((f) => isCoveredByAny(f.key, scopeEntries)));
|
|
184
194
|
}
|
|
185
195
|
function dedupByKey(files) {
|
|
186
196
|
const seen = new Set();
|
|
@@ -222,11 +232,12 @@ export async function pullCompany(input) {
|
|
|
222
232
|
// the last scope as "everything under the company prefix". For the
|
|
223
233
|
// `all` -> `shared` flip this correctly flags shared-mode orphans.
|
|
224
234
|
[companyPrefixOf(input.scope, last)];
|
|
235
|
+
const currentPrefixSet = input.scope.prefixSet;
|
|
225
236
|
const scopeShrinkPlan = buildScopeShrinkPlan({
|
|
226
237
|
journal: input.journal,
|
|
227
238
|
hqRoot: input.hqRoot,
|
|
228
239
|
lastPrefixSet,
|
|
229
|
-
currentPrefixSet
|
|
240
|
+
currentPrefixSet,
|
|
230
241
|
callerSub: input.callerSub,
|
|
231
242
|
// Background runner pull: protect the caller's own work and don't make a
|
|
232
243
|
// destructive guess about unknown-author (legacy) orphans. The explicit
|
|
@@ -256,6 +267,13 @@ export async function pullCompany(input) {
|
|
|
256
267
|
remoteFiles,
|
|
257
268
|
journal: input.journal,
|
|
258
269
|
conflictKeys,
|
|
270
|
+
protectedMissingKeys: collectScopeProtectedMissingKeys({
|
|
271
|
+
journal: input.journal,
|
|
272
|
+
lastPrefixSet,
|
|
273
|
+
currentPrefixSet,
|
|
274
|
+
callerSub: input.callerSub,
|
|
275
|
+
protectUnknownAuthors: true,
|
|
276
|
+
}),
|
|
259
277
|
});
|
|
260
278
|
const completedAt = now().toISOString();
|
|
261
279
|
const pullRecord = {
|
|
@@ -282,6 +300,36 @@ export async function pullCompany(input) {
|
|
|
282
300
|
tombstonesGcd,
|
|
283
301
|
};
|
|
284
302
|
}
|
|
303
|
+
function collectScopeProtectedMissingKeys(input) {
|
|
304
|
+
const protectedKeys = new Set();
|
|
305
|
+
for (const [relPath, entry] of Object.entries(input.journal.files)) {
|
|
306
|
+
if (entry.removedAt)
|
|
307
|
+
continue;
|
|
308
|
+
if (entry.direction !== "down")
|
|
309
|
+
continue;
|
|
310
|
+
if (isCoveredByAny(relPath, input.currentPrefixSet)) {
|
|
311
|
+
if (entry.outOfScopeProtected)
|
|
312
|
+
delete entry.outOfScopeProtected;
|
|
313
|
+
continue;
|
|
314
|
+
}
|
|
315
|
+
if (entry.outOfScopeProtected) {
|
|
316
|
+
protectedKeys.add(relPath);
|
|
317
|
+
continue;
|
|
318
|
+
}
|
|
319
|
+
if (!isCoveredByAny(relPath, input.lastPrefixSet))
|
|
320
|
+
continue;
|
|
321
|
+
if (input.callerSub && entry.createdBySub === input.callerSub) {
|
|
322
|
+
entry.outOfScopeProtected = true;
|
|
323
|
+
protectedKeys.add(relPath);
|
|
324
|
+
continue;
|
|
325
|
+
}
|
|
326
|
+
if (input.protectUnknownAuthors && entry.createdBySub === undefined) {
|
|
327
|
+
entry.outOfScopeProtected = true;
|
|
328
|
+
protectedKeys.add(relPath);
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
return protectedKeys;
|
|
332
|
+
}
|
|
285
333
|
/**
|
|
286
334
|
* Recover the "company prefix" for a v1-migrated record with no recorded
|
|
287
335
|
* `prefixSet`. We derive it from the current scope's first prefix's parent
|
|
@@ -291,11 +339,12 @@ export async function pullCompany(input) {
|
|
|
291
339
|
*/
|
|
292
340
|
function companyPrefixOf(scope, _last) {
|
|
293
341
|
// For `all` mode, scope.prefixSet[0] IS the company prefix.
|
|
294
|
-
|
|
295
|
-
|
|
342
|
+
const firstEntry = toScopePrefixEntries(scope.prefixSet)[0];
|
|
343
|
+
if (scope.strategy === "all" && firstEntry)
|
|
344
|
+
return firstEntry.prefix;
|
|
296
345
|
// Otherwise, derive `companies/{slug}/` from the first prefix. ACL grant
|
|
297
346
|
// paths always start with `companies/{slug}/...`.
|
|
298
|
-
const first =
|
|
347
|
+
const first = firstEntry?.prefix ?? "";
|
|
299
348
|
const m = first.match(/^(companies\/[^/]+\/)/);
|
|
300
349
|
return m ? m[1] : first;
|
|
301
350
|
}
|
package/dist/remote-pull.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-pull.js","sourceRoot":"","sources":["../src/remote-pull.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,aAAa,GACd,MAAM,cAAc,CAAC;AAUtB,OAAO,
|
|
1
|
+
{"version":3,"file":"remote-pull.js","sourceRoot":"","sources":["../src/remote-pull.ts"],"names":[],"mappings":"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"}
|