@indigoai-us/hq-cloud 5.22.0 → 5.23.0
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/index.d.ts +9 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -1
- package/dist/index.js.map +1 -1
- package/dist/journal.d.ts +76 -1
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +148 -1
- package/dist/journal.js.map +1 -1
- package/dist/journal.test.js +251 -5
- package/dist/journal.test.js.map +1 -1
- package/dist/prefix-coalesce.d.ts +38 -0
- package/dist/prefix-coalesce.d.ts.map +1 -0
- package/dist/prefix-coalesce.js +69 -0
- package/dist/prefix-coalesce.js.map +1 -0
- package/dist/prefix-coalesce.test.d.ts +2 -0
- package/dist/prefix-coalesce.test.d.ts.map +1 -0
- package/dist/prefix-coalesce.test.js +77 -0
- package/dist/prefix-coalesce.test.js.map +1 -0
- package/dist/public-surface.test.d.ts +15 -0
- package/dist/public-surface.test.d.ts.map +1 -0
- package/dist/public-surface.test.js +105 -0
- package/dist/public-surface.test.js.map +1 -0
- package/dist/remote-pull.d.ts +145 -1
- package/dist/remote-pull.d.ts.map +1 -1
- package/dist/remote-pull.js +258 -1
- package/dist/remote-pull.js.map +1 -1
- package/dist/remote-pull.test.js +470 -2
- package/dist/remote-pull.test.js.map +1 -1
- package/dist/scope-shrink.d.ts +109 -0
- package/dist/scope-shrink.d.ts.map +1 -0
- package/dist/scope-shrink.js +196 -0
- package/dist/scope-shrink.js.map +1 -0
- package/dist/scope-shrink.test.d.ts +13 -0
- package/dist/scope-shrink.test.d.ts.map +1 -0
- package/dist/scope-shrink.test.js +342 -0
- package/dist/scope-shrink.test.js.map +1 -0
- package/dist/types.d.ts +48 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/vault-client.d.ts +178 -0
- package/dist/vault-client.d.ts.map +1 -1
- package/dist/vault-client.js +73 -0
- package/dist/vault-client.js.map +1 -1
- package/dist/vault-client.test.js +226 -0
- package/dist/vault-client.test.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +67 -0
- package/src/journal.test.ts +284 -5
- package/src/journal.ts +167 -2
- package/src/prefix-coalesce.test.ts +95 -0
- package/src/prefix-coalesce.ts +72 -0
- package/src/public-surface.test.ts +112 -0
- package/src/remote-pull.test.ts +540 -3
- package/src/remote-pull.ts +419 -2
- package/src/scope-shrink.test.ts +402 -0
- package/src/scope-shrink.ts +264 -0
- package/src/types.ts +49 -1
- package/src/vault-client.test.ts +335 -0
- package/src/vault-client.ts +223 -0
package/dist/remote-pull.test.js
CHANGED
|
@@ -13,8 +13,13 @@
|
|
|
13
13
|
* `decideRemotePulls` in `./remote-pull.ts`. Per the project test-first
|
|
14
14
|
* rule, the implementation lands AFTER these tests are validated.
|
|
15
15
|
*/
|
|
16
|
-
import { describe, expect, it } from "vitest";
|
|
17
|
-
import
|
|
16
|
+
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
17
|
+
import * as fs from "fs";
|
|
18
|
+
import * as os from "os";
|
|
19
|
+
import * as path from "path";
|
|
20
|
+
import * as crypto from "crypto";
|
|
21
|
+
import { batchPrefixesForVend, decideRemotePulls, listRemoteForScope, POST_FILTER_THRESHOLD, pullCompany, resolveCompanyScope, VEND_PATH_CAP, } from "./remote-pull.js";
|
|
22
|
+
import { ScopeShrinkBlockedError } from "./scope-shrink.js";
|
|
18
23
|
function remote(partial) {
|
|
19
24
|
return {
|
|
20
25
|
size: 100,
|
|
@@ -226,4 +231,467 @@ describe("decideRemotePulls", () => {
|
|
|
226
231
|
expect(result.download.map((f) => f.key)).toEqual(["docs/legacy.md"]);
|
|
227
232
|
});
|
|
228
233
|
});
|
|
234
|
+
// ─── US-005 — ACL-aware narrowing in the engine layer ────────────────────────
|
|
235
|
+
function sha256(s) {
|
|
236
|
+
return crypto.createHash("sha256").update(s).digest("hex");
|
|
237
|
+
}
|
|
238
|
+
function makeCtx() {
|
|
239
|
+
return {
|
|
240
|
+
uid: "cmp_indigo",
|
|
241
|
+
slug: "indigo",
|
|
242
|
+
bucketName: "cmp-indigo-vault",
|
|
243
|
+
region: "us-east-1",
|
|
244
|
+
credentials: {
|
|
245
|
+
accessKeyId: "k",
|
|
246
|
+
secretAccessKey: "s",
|
|
247
|
+
sessionToken: "t",
|
|
248
|
+
},
|
|
249
|
+
expiresAt: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
|
|
250
|
+
};
|
|
251
|
+
}
|
|
252
|
+
function makeSyncConfig(partial) {
|
|
253
|
+
return {
|
|
254
|
+
membershipId: "mb_test",
|
|
255
|
+
isDefault: false,
|
|
256
|
+
...partial,
|
|
257
|
+
};
|
|
258
|
+
}
|
|
259
|
+
function makeGrant(p) {
|
|
260
|
+
return {
|
|
261
|
+
companyUid: "cmp_indigo",
|
|
262
|
+
path: p,
|
|
263
|
+
permission: "read",
|
|
264
|
+
source: "person",
|
|
265
|
+
};
|
|
266
|
+
}
|
|
267
|
+
describe("resolveCompanyScope", () => {
|
|
268
|
+
it("syncMode='all' returns strategy=all with the company prefix", () => {
|
|
269
|
+
const scope = resolveCompanyScope({
|
|
270
|
+
companyUid: "cmp_indigo",
|
|
271
|
+
companyPrefix: "companies/indigo/",
|
|
272
|
+
syncConfig: makeSyncConfig({ syncMode: "all" }),
|
|
273
|
+
});
|
|
274
|
+
expect(scope.strategy).toBe("all");
|
|
275
|
+
expect(scope.prefixSet).toEqual(["companies/indigo/"]);
|
|
276
|
+
expect(scope.syncMode).toBe("all");
|
|
277
|
+
});
|
|
278
|
+
it("syncMode='shared' coalesces explicit grants and picks vend-fanout when ≤ POST_FILTER_THRESHOLD", () => {
|
|
279
|
+
const scope = resolveCompanyScope({
|
|
280
|
+
companyUid: "cmp_indigo",
|
|
281
|
+
companyPrefix: "companies/indigo/",
|
|
282
|
+
syncConfig: makeSyncConfig({ syncMode: "shared" }),
|
|
283
|
+
explicitGrants: [
|
|
284
|
+
makeGrant("companies/indigo/meetings/"),
|
|
285
|
+
makeGrant("companies/indigo/meetings/2026/"), // nested — collapsed
|
|
286
|
+
makeGrant("companies/indigo/scratch/jacob/"),
|
|
287
|
+
],
|
|
288
|
+
});
|
|
289
|
+
expect(scope.strategy).toBe("vend-fanout");
|
|
290
|
+
expect(scope.prefixSet).toEqual([
|
|
291
|
+
"companies/indigo/meetings/",
|
|
292
|
+
"companies/indigo/scratch/jacob/",
|
|
293
|
+
]);
|
|
294
|
+
});
|
|
295
|
+
it("syncMode='shared' with no grants returns empty prefixSet (short-circuit)", () => {
|
|
296
|
+
const scope = resolveCompanyScope({
|
|
297
|
+
companyUid: "cmp_indigo",
|
|
298
|
+
companyPrefix: "companies/indigo/",
|
|
299
|
+
syncConfig: makeSyncConfig({ syncMode: "shared" }),
|
|
300
|
+
explicitGrants: [],
|
|
301
|
+
});
|
|
302
|
+
expect(scope.prefixSet).toEqual([]);
|
|
303
|
+
});
|
|
304
|
+
it("syncMode='shared' with > POST_FILTER_THRESHOLD coalesced prefixes picks broad-postfilter", () => {
|
|
305
|
+
const grants = [];
|
|
306
|
+
for (let i = 0; i < POST_FILTER_THRESHOLD + 5; i++) {
|
|
307
|
+
grants.push(makeGrant(`companies/indigo/p${i}/`));
|
|
308
|
+
}
|
|
309
|
+
const scope = resolveCompanyScope({
|
|
310
|
+
companyUid: "cmp_indigo",
|
|
311
|
+
companyPrefix: "companies/indigo/",
|
|
312
|
+
syncConfig: makeSyncConfig({ syncMode: "shared" }),
|
|
313
|
+
explicitGrants: grants,
|
|
314
|
+
});
|
|
315
|
+
expect(scope.strategy).toBe("broad-postfilter");
|
|
316
|
+
expect(scope.prefixSet.length).toBe(POST_FILTER_THRESHOLD + 5);
|
|
317
|
+
});
|
|
318
|
+
it("syncMode='custom' coalesces customPaths", () => {
|
|
319
|
+
const scope = resolveCompanyScope({
|
|
320
|
+
companyUid: "cmp_indigo",
|
|
321
|
+
companyPrefix: "companies/indigo/",
|
|
322
|
+
syncConfig: makeSyncConfig({
|
|
323
|
+
syncMode: "custom",
|
|
324
|
+
customPaths: [
|
|
325
|
+
"companies/indigo/a/",
|
|
326
|
+
"companies/indigo/a/b/", // nested
|
|
327
|
+
"companies/indigo/c/",
|
|
328
|
+
],
|
|
329
|
+
}),
|
|
330
|
+
});
|
|
331
|
+
expect(scope.prefixSet).toEqual([
|
|
332
|
+
"companies/indigo/a/",
|
|
333
|
+
"companies/indigo/c/",
|
|
334
|
+
]);
|
|
335
|
+
});
|
|
336
|
+
});
|
|
337
|
+
describe("batchPrefixesForVend", () => {
|
|
338
|
+
it("batches into chunks of VEND_PATH_CAP", () => {
|
|
339
|
+
const prefixes = Array.from({ length: 23 }, (_, i) => `p${i}/`);
|
|
340
|
+
const batches = batchPrefixesForVend(prefixes);
|
|
341
|
+
expect(batches).toHaveLength(3);
|
|
342
|
+
expect(batches[0]).toHaveLength(VEND_PATH_CAP);
|
|
343
|
+
expect(batches[1]).toHaveLength(VEND_PATH_CAP);
|
|
344
|
+
expect(batches[2]).toHaveLength(3);
|
|
345
|
+
});
|
|
346
|
+
it("respects an explicit cap override", () => {
|
|
347
|
+
const prefixes = ["a/", "b/", "c/", "d/", "e/"];
|
|
348
|
+
const batches = batchPrefixesForVend(prefixes, 2);
|
|
349
|
+
expect(batches.map((b) => b.length)).toEqual([2, 2, 1]);
|
|
350
|
+
});
|
|
351
|
+
it("returns [] for empty input", () => {
|
|
352
|
+
expect(batchPrefixesForVend([])).toEqual([]);
|
|
353
|
+
});
|
|
354
|
+
});
|
|
355
|
+
describe("listRemoteForScope", () => {
|
|
356
|
+
it("strategy=all calls list once with the company prefix", async () => {
|
|
357
|
+
const calls = [];
|
|
358
|
+
const files = await listRemoteForScope({
|
|
359
|
+
ctx: makeCtx(),
|
|
360
|
+
scope: {
|
|
361
|
+
companyUid: "cmp_indigo",
|
|
362
|
+
syncMode: "all",
|
|
363
|
+
prefixSet: ["companies/indigo/"],
|
|
364
|
+
strategy: "all",
|
|
365
|
+
},
|
|
366
|
+
listFn: async (_ctx, prefix) => {
|
|
367
|
+
calls.push(prefix);
|
|
368
|
+
return [remote({ key: "companies/indigo/a.md", etag: "1" })];
|
|
369
|
+
},
|
|
370
|
+
});
|
|
371
|
+
expect(calls).toEqual(["companies/indigo/"]);
|
|
372
|
+
expect(files.map((f) => f.key)).toEqual(["companies/indigo/a.md"]);
|
|
373
|
+
});
|
|
374
|
+
it("strategy=vend-fanout issues one list per prefix and unions+dedupes", async () => {
|
|
375
|
+
const calls = [];
|
|
376
|
+
const files = await listRemoteForScope({
|
|
377
|
+
ctx: makeCtx(),
|
|
378
|
+
scope: {
|
|
379
|
+
companyUid: "cmp_indigo",
|
|
380
|
+
syncMode: "shared",
|
|
381
|
+
prefixSet: [
|
|
382
|
+
"companies/indigo/meetings/",
|
|
383
|
+
"companies/indigo/scratch/jacob/",
|
|
384
|
+
],
|
|
385
|
+
strategy: "vend-fanout",
|
|
386
|
+
},
|
|
387
|
+
listFn: async (_ctx, prefix) => {
|
|
388
|
+
calls.push(prefix);
|
|
389
|
+
if (prefix === "companies/indigo/meetings/") {
|
|
390
|
+
return [
|
|
391
|
+
remote({ key: "companies/indigo/meetings/a.md", etag: "1" }),
|
|
392
|
+
remote({ key: "companies/indigo/meetings/shared.md", etag: "1" }),
|
|
393
|
+
];
|
|
394
|
+
}
|
|
395
|
+
return [
|
|
396
|
+
remote({ key: "companies/indigo/scratch/jacob/draft.md", etag: "2" }),
|
|
397
|
+
// dedup target — same key reported by both prefixes if they overlap
|
|
398
|
+
remote({ key: "companies/indigo/meetings/shared.md", etag: "1" }),
|
|
399
|
+
];
|
|
400
|
+
},
|
|
401
|
+
});
|
|
402
|
+
expect(calls.sort()).toEqual([
|
|
403
|
+
"companies/indigo/meetings/",
|
|
404
|
+
"companies/indigo/scratch/jacob/",
|
|
405
|
+
]);
|
|
406
|
+
expect(files.map((f) => f.key).sort()).toEqual([
|
|
407
|
+
"companies/indigo/meetings/a.md",
|
|
408
|
+
"companies/indigo/meetings/shared.md",
|
|
409
|
+
"companies/indigo/scratch/jacob/draft.md",
|
|
410
|
+
]);
|
|
411
|
+
});
|
|
412
|
+
it("strategy=vend-fanout with > VEND_PATH_CAP prefixes batches and lists all of them", async () => {
|
|
413
|
+
const prefixes = Array.from({ length: VEND_PATH_CAP + 3 }, (_, i) => `companies/indigo/p${i}/`);
|
|
414
|
+
const calls = new Set();
|
|
415
|
+
await listRemoteForScope({
|
|
416
|
+
ctx: makeCtx(),
|
|
417
|
+
scope: {
|
|
418
|
+
companyUid: "cmp_indigo",
|
|
419
|
+
syncMode: "shared",
|
|
420
|
+
prefixSet: prefixes,
|
|
421
|
+
strategy: "vend-fanout",
|
|
422
|
+
},
|
|
423
|
+
listFn: async (_ctx, prefix) => {
|
|
424
|
+
calls.add(prefix);
|
|
425
|
+
return [];
|
|
426
|
+
},
|
|
427
|
+
});
|
|
428
|
+
expect(calls.size).toBe(VEND_PATH_CAP + 3); // every prefix listed
|
|
429
|
+
});
|
|
430
|
+
it("strategy=vend-fanout uses vendForBatchFn to narrow credentials per batch", async () => {
|
|
431
|
+
const vendCalls = [];
|
|
432
|
+
await listRemoteForScope({
|
|
433
|
+
ctx: makeCtx(),
|
|
434
|
+
scope: {
|
|
435
|
+
companyUid: "cmp_indigo",
|
|
436
|
+
syncMode: "shared",
|
|
437
|
+
prefixSet: ["companies/indigo/a/", "companies/indigo/b/"],
|
|
438
|
+
strategy: "vend-fanout",
|
|
439
|
+
},
|
|
440
|
+
listFn: async () => [],
|
|
441
|
+
vendForBatchFn: async (ctx, paths) => {
|
|
442
|
+
vendCalls.push({ paths });
|
|
443
|
+
return ctx;
|
|
444
|
+
},
|
|
445
|
+
});
|
|
446
|
+
expect(vendCalls).toHaveLength(1); // one batch (≤ VEND_PATH_CAP)
|
|
447
|
+
expect(vendCalls[0]?.paths).toEqual([
|
|
448
|
+
"companies/indigo/a/",
|
|
449
|
+
"companies/indigo/b/",
|
|
450
|
+
]);
|
|
451
|
+
});
|
|
452
|
+
it("strategy=broad-postfilter issues one wide list + client-side filter", async () => {
|
|
453
|
+
const calls = [];
|
|
454
|
+
const files = await listRemoteForScope({
|
|
455
|
+
ctx: makeCtx(),
|
|
456
|
+
scope: {
|
|
457
|
+
companyUid: "cmp_indigo",
|
|
458
|
+
syncMode: "shared",
|
|
459
|
+
prefixSet: ["companies/indigo/meetings/"],
|
|
460
|
+
strategy: "broad-postfilter",
|
|
461
|
+
},
|
|
462
|
+
listFn: async (_ctx, prefix) => {
|
|
463
|
+
calls.push(prefix);
|
|
464
|
+
return [
|
|
465
|
+
remote({ key: "companies/indigo/meetings/a.md" }),
|
|
466
|
+
remote({ key: "companies/indigo/scratch/jacob/draft.md" }),
|
|
467
|
+
];
|
|
468
|
+
},
|
|
469
|
+
});
|
|
470
|
+
expect(calls).toEqual([undefined]); // one broad list, no prefix
|
|
471
|
+
expect(files.map((f) => f.key)).toEqual([
|
|
472
|
+
"companies/indigo/meetings/a.md",
|
|
473
|
+
]);
|
|
474
|
+
});
|
|
475
|
+
it("strategy=vend-fanout short-circuits to [] on empty prefixSet", async () => {
|
|
476
|
+
let listed = false;
|
|
477
|
+
const files = await listRemoteForScope({
|
|
478
|
+
ctx: makeCtx(),
|
|
479
|
+
scope: {
|
|
480
|
+
companyUid: "cmp_indigo",
|
|
481
|
+
syncMode: "shared",
|
|
482
|
+
prefixSet: [],
|
|
483
|
+
strategy: "vend-fanout",
|
|
484
|
+
},
|
|
485
|
+
listFn: async () => {
|
|
486
|
+
listed = true;
|
|
487
|
+
return [];
|
|
488
|
+
},
|
|
489
|
+
});
|
|
490
|
+
expect(listed).toBe(false);
|
|
491
|
+
expect(files).toEqual([]);
|
|
492
|
+
});
|
|
493
|
+
});
|
|
494
|
+
describe("pullCompany (engine orchestrator)", () => {
|
|
495
|
+
let hqRoot;
|
|
496
|
+
beforeEach(() => {
|
|
497
|
+
hqRoot = fs.mkdtempSync(path.join(os.tmpdir(), "hq-pull-company-"));
|
|
498
|
+
});
|
|
499
|
+
afterEach(() => {
|
|
500
|
+
fs.rmSync(hqRoot, { recursive: true, force: true });
|
|
501
|
+
});
|
|
502
|
+
it("records syncMode + prefixSet on the PullRecord for an 'all' pull", async () => {
|
|
503
|
+
const journal = {
|
|
504
|
+
version: "2",
|
|
505
|
+
lastSync: "",
|
|
506
|
+
files: {},
|
|
507
|
+
pulls: [],
|
|
508
|
+
};
|
|
509
|
+
const result = await pullCompany({
|
|
510
|
+
ctx: makeCtx(),
|
|
511
|
+
journal,
|
|
512
|
+
hqRoot,
|
|
513
|
+
scope: {
|
|
514
|
+
companyUid: "cmp_indigo",
|
|
515
|
+
syncMode: "all",
|
|
516
|
+
prefixSet: ["companies/indigo/"],
|
|
517
|
+
strategy: "all",
|
|
518
|
+
},
|
|
519
|
+
listFn: async () => [],
|
|
520
|
+
});
|
|
521
|
+
expect(result.pullRecord.syncMode).toBe("all");
|
|
522
|
+
expect(result.pullRecord.prefixSet).toEqual(["companies/indigo/"]);
|
|
523
|
+
expect(result.pullRecord.scopeChangeDetected).toBe(false);
|
|
524
|
+
expect(journal.pulls).toHaveLength(1);
|
|
525
|
+
});
|
|
526
|
+
it("aborts with ScopeShrinkBlockedError on dirty orphan (default mode)", async () => {
|
|
527
|
+
const abs = path.join(hqRoot, "companies/indigo/scratch/notes.md");
|
|
528
|
+
fs.mkdirSync(path.dirname(abs), { recursive: true });
|
|
529
|
+
fs.writeFileSync(abs, "MODIFIED");
|
|
530
|
+
const journal = {
|
|
531
|
+
version: "2",
|
|
532
|
+
lastSync: "",
|
|
533
|
+
files: {
|
|
534
|
+
"companies/indigo/scratch/notes.md": {
|
|
535
|
+
hash: sha256("ORIGINAL"),
|
|
536
|
+
size: 8,
|
|
537
|
+
syncedAt: new Date().toISOString(),
|
|
538
|
+
direction: "down",
|
|
539
|
+
},
|
|
540
|
+
},
|
|
541
|
+
pulls: [
|
|
542
|
+
{
|
|
543
|
+
pullId: "01PREV",
|
|
544
|
+
companyUid: "cmp_indigo",
|
|
545
|
+
startedAt: "2026-05-19T00:00:00.000Z",
|
|
546
|
+
completedAt: "2026-05-19T00:00:05.000Z",
|
|
547
|
+
syncMode: "all",
|
|
548
|
+
prefixSet: ["companies/indigo/"],
|
|
549
|
+
scopeChangeDetected: false,
|
|
550
|
+
orphansRemoved: 0,
|
|
551
|
+
orphansBlocked: 0,
|
|
552
|
+
},
|
|
553
|
+
],
|
|
554
|
+
};
|
|
555
|
+
await expect(pullCompany({
|
|
556
|
+
ctx: makeCtx(),
|
|
557
|
+
journal,
|
|
558
|
+
hqRoot,
|
|
559
|
+
scope: {
|
|
560
|
+
companyUid: "cmp_indigo",
|
|
561
|
+
syncMode: "shared",
|
|
562
|
+
prefixSet: ["companies/indigo/meetings/"],
|
|
563
|
+
strategy: "vend-fanout",
|
|
564
|
+
},
|
|
565
|
+
listFn: async () => [],
|
|
566
|
+
})).rejects.toBeInstanceOf(ScopeShrinkBlockedError);
|
|
567
|
+
});
|
|
568
|
+
it("applies scope-shrink + records orphansBlocked when forceScopeShrink=true", async () => {
|
|
569
|
+
const dirtyAbs = path.join(hqRoot, "companies/indigo/scratch/dirty.md");
|
|
570
|
+
const cleanAbs = path.join(hqRoot, "companies/indigo/scratch/clean.md");
|
|
571
|
+
fs.mkdirSync(path.dirname(dirtyAbs), { recursive: true });
|
|
572
|
+
fs.writeFileSync(dirtyAbs, "MODIFIED");
|
|
573
|
+
fs.writeFileSync(cleanAbs, "clean");
|
|
574
|
+
const past = Date.now() - 60_000;
|
|
575
|
+
fs.utimesSync(cleanAbs, past / 1000, past / 1000);
|
|
576
|
+
const journal = {
|
|
577
|
+
version: "2",
|
|
578
|
+
lastSync: "",
|
|
579
|
+
files: {
|
|
580
|
+
"companies/indigo/scratch/dirty.md": {
|
|
581
|
+
hash: sha256("ORIGINAL"),
|
|
582
|
+
size: 8,
|
|
583
|
+
syncedAt: new Date().toISOString(),
|
|
584
|
+
direction: "down",
|
|
585
|
+
},
|
|
586
|
+
"companies/indigo/scratch/clean.md": {
|
|
587
|
+
hash: sha256("clean"),
|
|
588
|
+
size: 5,
|
|
589
|
+
syncedAt: new Date().toISOString(),
|
|
590
|
+
direction: "down",
|
|
591
|
+
},
|
|
592
|
+
},
|
|
593
|
+
pulls: [
|
|
594
|
+
{
|
|
595
|
+
pullId: "01PREV",
|
|
596
|
+
companyUid: "cmp_indigo",
|
|
597
|
+
startedAt: "2026-05-19T00:00:00.000Z",
|
|
598
|
+
completedAt: "2026-05-19T00:00:05.000Z",
|
|
599
|
+
syncMode: "all",
|
|
600
|
+
prefixSet: ["companies/indigo/"],
|
|
601
|
+
scopeChangeDetected: false,
|
|
602
|
+
orphansRemoved: 0,
|
|
603
|
+
orphansBlocked: 0,
|
|
604
|
+
},
|
|
605
|
+
],
|
|
606
|
+
};
|
|
607
|
+
const result = await pullCompany({
|
|
608
|
+
ctx: makeCtx(),
|
|
609
|
+
journal,
|
|
610
|
+
hqRoot,
|
|
611
|
+
forceScopeShrink: true,
|
|
612
|
+
scope: {
|
|
613
|
+
companyUid: "cmp_indigo",
|
|
614
|
+
syncMode: "shared",
|
|
615
|
+
prefixSet: ["companies/indigo/meetings/"],
|
|
616
|
+
strategy: "vend-fanout",
|
|
617
|
+
},
|
|
618
|
+
listFn: async () => [],
|
|
619
|
+
});
|
|
620
|
+
expect(result.pullRecord.scopeChangeDetected).toBe(true);
|
|
621
|
+
expect(result.pullRecord.orphansRemoved).toBe(1); // clean
|
|
622
|
+
expect(result.pullRecord.orphansBlocked).toBe(1); // dirty tombstoned
|
|
623
|
+
expect(fs.existsSync(cleanAbs)).toBe(false); // deleted
|
|
624
|
+
expect(fs.existsSync(dirtyAbs)).toBe(true); // preserved
|
|
625
|
+
expect(journal.files["companies/indigo/scratch/dirty.md"]?.removedAt).toBeTruthy();
|
|
626
|
+
});
|
|
627
|
+
it("v1 → v2 migration: empty pulls[] history treats last scope as company-prefix-wide", async () => {
|
|
628
|
+
// No previous PullRecord → engine derives `companies/indigo/` as the
|
|
629
|
+
// "last scope" so a scope shrink to a narrower prefix is correctly
|
|
630
|
+
// detected on the FIRST v2 pull after upgrade.
|
|
631
|
+
const journal = {
|
|
632
|
+
version: "1", // simulate pre-upgrade
|
|
633
|
+
lastSync: "",
|
|
634
|
+
files: {
|
|
635
|
+
"companies/indigo/scratch/jacob/draft.md": {
|
|
636
|
+
hash: sha256("draft"),
|
|
637
|
+
size: 5,
|
|
638
|
+
syncedAt: new Date(Date.now() - 60_000).toISOString(),
|
|
639
|
+
direction: "down",
|
|
640
|
+
},
|
|
641
|
+
},
|
|
642
|
+
};
|
|
643
|
+
const draftAbs = path.join(hqRoot, "companies/indigo/scratch/jacob/draft.md");
|
|
644
|
+
fs.mkdirSync(path.dirname(draftAbs), { recursive: true });
|
|
645
|
+
fs.writeFileSync(draftAbs, "draft");
|
|
646
|
+
const past = Date.now() - 60_000;
|
|
647
|
+
fs.utimesSync(draftAbs, past / 1000, past / 1000);
|
|
648
|
+
const result = await pullCompany({
|
|
649
|
+
ctx: makeCtx(),
|
|
650
|
+
journal,
|
|
651
|
+
hqRoot,
|
|
652
|
+
scope: {
|
|
653
|
+
companyUid: "cmp_indigo",
|
|
654
|
+
syncMode: "shared",
|
|
655
|
+
prefixSet: ["companies/indigo/meetings/"],
|
|
656
|
+
strategy: "vend-fanout",
|
|
657
|
+
},
|
|
658
|
+
listFn: async () => [],
|
|
659
|
+
});
|
|
660
|
+
expect(result.pullRecord.scopeChangeDetected).toBe(true);
|
|
661
|
+
expect(result.pullRecord.orphansRemoved).toBe(1);
|
|
662
|
+
expect(journal.version).toBe("2"); // migrated by appendPullRecord
|
|
663
|
+
});
|
|
664
|
+
it("GC's expired tombstones at the start of every leg", async () => {
|
|
665
|
+
const old = new Date(Date.now() - 31 * 24 * 60 * 60 * 1000).toISOString();
|
|
666
|
+
const journal = {
|
|
667
|
+
version: "2",
|
|
668
|
+
lastSync: "",
|
|
669
|
+
files: {
|
|
670
|
+
"old-tombstone.md": {
|
|
671
|
+
hash: "h",
|
|
672
|
+
size: 1,
|
|
673
|
+
syncedAt: "",
|
|
674
|
+
direction: "down",
|
|
675
|
+
removedAt: old,
|
|
676
|
+
removedReason: "scope_shrink",
|
|
677
|
+
},
|
|
678
|
+
},
|
|
679
|
+
pulls: [],
|
|
680
|
+
};
|
|
681
|
+
const result = await pullCompany({
|
|
682
|
+
ctx: makeCtx(),
|
|
683
|
+
journal,
|
|
684
|
+
hqRoot,
|
|
685
|
+
scope: {
|
|
686
|
+
companyUid: "cmp_indigo",
|
|
687
|
+
syncMode: "all",
|
|
688
|
+
prefixSet: ["companies/indigo/"],
|
|
689
|
+
strategy: "all",
|
|
690
|
+
},
|
|
691
|
+
listFn: async () => [],
|
|
692
|
+
});
|
|
693
|
+
expect(result.tombstonesGcd).toBe(1);
|
|
694
|
+
expect(journal.files["old-tombstone.md"]).toBeUndefined();
|
|
695
|
+
});
|
|
696
|
+
});
|
|
229
697
|
//# sourceMappingURL=remote-pull.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-pull.test.js","sourceRoot":"","sources":["../src/remote-pull.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"remote-pull.test.js","sourceRoot":"","sources":["../src/remote-pull.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Scope-shrink detection + classification + clean removal (US-005).
|
|
3
|
+
*
|
|
4
|
+
* Implements the "hybrid scope-change contract" decided in US-000 Task 3
|
|
5
|
+
* (see companies/indigo/projects/hq-sync-browse-vs-sync/references.md):
|
|
6
|
+
*
|
|
7
|
+
* - Compare the current pull's `prefixSet` against the last `PullRecord`'s
|
|
8
|
+
* `prefixSet` for the same company. Files in the journal covered by the
|
|
9
|
+
* previous scope but NOT covered by the new scope are **orphans**.
|
|
10
|
+
* - Classify each orphan **clean** (safe to silently delete) or **dirty**
|
|
11
|
+
* (locally modified — sacred, never silently delete).
|
|
12
|
+
* - The remote-pull caller drives:
|
|
13
|
+
* * default mode: abort the leg if any dirty orphan exists;
|
|
14
|
+
* * `--force-scope-shrink`: continue, leave dirty files on disk,
|
|
15
|
+
* tombstone their journal entries.
|
|
16
|
+
*
|
|
17
|
+
* The pure-detection layer here intentionally does NOT touch disk for the
|
|
18
|
+
* tombstone write — that lives in `journal.ts`. It DOES touch disk for the
|
|
19
|
+
* orphan classification (hash + stat) because cleanliness is a function of
|
|
20
|
+
* the file's current on-disk state vs the journal.
|
|
21
|
+
*/
|
|
22
|
+
import type { JournalEntry, PullRecord, SyncJournal } from "./types.js";
|
|
23
|
+
export interface OrphanClassification {
|
|
24
|
+
/** Relative path (journal key). */
|
|
25
|
+
path: string;
|
|
26
|
+
/** Journal entry as of last sync. */
|
|
27
|
+
entry: JournalEntry;
|
|
28
|
+
/** True iff the local file is provably unchanged since last sync. */
|
|
29
|
+
clean: boolean;
|
|
30
|
+
/** Why we called it dirty — surfaced in the abort error for operators. */
|
|
31
|
+
dirtyReason?: "modified-after-sync" | "hash-mismatch" | "stat-error";
|
|
32
|
+
}
|
|
33
|
+
export interface ScopeShrinkPlan {
|
|
34
|
+
/** Set of files covered by `lastPrefixSet` but not by `currentPrefixSet`. */
|
|
35
|
+
orphans: OrphanClassification[];
|
|
36
|
+
/** Subset of `orphans` with `clean === true`. */
|
|
37
|
+
clean: OrphanClassification[];
|
|
38
|
+
/** Subset of `orphans` with `clean === false`. */
|
|
39
|
+
dirty: OrphanClassification[];
|
|
40
|
+
/** True iff at least one orphan was found. */
|
|
41
|
+
scopeChangeDetected: boolean;
|
|
42
|
+
}
|
|
43
|
+
export interface BuildScopeShrinkPlanInput {
|
|
44
|
+
journal: SyncJournal;
|
|
45
|
+
hqRoot: string;
|
|
46
|
+
/** Coalesced prefixes used by the LAST pull for this company. */
|
|
47
|
+
lastPrefixSet: string[];
|
|
48
|
+
/** Coalesced prefixes the CURRENT pull will use. */
|
|
49
|
+
currentPrefixSet: string[];
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Build a scope-shrink plan: find orphans, classify each clean/dirty.
|
|
53
|
+
* Pure given the journal + filesystem state — no network, no journal
|
|
54
|
+
* mutation.
|
|
55
|
+
*
|
|
56
|
+
* **Tombstone-aware:** journal entries that already carry a `removedAt`
|
|
57
|
+
* marker are skipped — they represent a prior scope-shrink prune and must
|
|
58
|
+
* not be re-flagged as orphans on each subsequent pull (that's the whole
|
|
59
|
+
* point of the tombstone retention window).
|
|
60
|
+
*
|
|
61
|
+
* **Direction-aware:** only `direction: "down"` entries (and pre-ETag
|
|
62
|
+
* legacy entries without an explicit direction marker) participate in
|
|
63
|
+
* shrink detection. Push-only files (`direction: "up"`) represent local
|
|
64
|
+
* authorship — they aren't in scope-as-pulled, so a scope change doesn't
|
|
65
|
+
* orphan them.
|
|
66
|
+
*/
|
|
67
|
+
export declare function buildScopeShrinkPlan(input: BuildScopeShrinkPlanInput): ScopeShrinkPlan;
|
|
68
|
+
/**
|
|
69
|
+
* Structured error thrown when the engine refuses to proceed because a scope
|
|
70
|
+
* shrink would orphan dirty files. The CLI catches this and renders the
|
|
71
|
+
* operator-facing message; the engine never prints directly.
|
|
72
|
+
*/
|
|
73
|
+
export declare class ScopeShrinkBlockedError extends Error {
|
|
74
|
+
readonly companyUid: string;
|
|
75
|
+
readonly fromMode: PullRecord["syncMode"] | "unknown";
|
|
76
|
+
readonly toMode: PullRecord["syncMode"];
|
|
77
|
+
readonly dirty: OrphanClassification[];
|
|
78
|
+
readonly clean: OrphanClassification[];
|
|
79
|
+
readonly code = "SCOPE_SHRINK_BLOCKED";
|
|
80
|
+
constructor(companyUid: string, fromMode: PullRecord["syncMode"] | "unknown", toMode: PullRecord["syncMode"], dirty: OrphanClassification[], clean: OrphanClassification[]);
|
|
81
|
+
}
|
|
82
|
+
export interface ApplyScopeShrinkInput {
|
|
83
|
+
journal: SyncJournal;
|
|
84
|
+
plan: ScopeShrinkPlan;
|
|
85
|
+
hqRoot: string;
|
|
86
|
+
/**
|
|
87
|
+
* When `true`, dirty files are LEFT ON DISK and their journal entries are
|
|
88
|
+
* tombstoned anyway. When `false` (default), the caller should have
|
|
89
|
+
* already aborted on dirty orphans — this function still tombstones any
|
|
90
|
+
* dirty entries handed to it, on the assumption the caller knows what
|
|
91
|
+
* it's doing.
|
|
92
|
+
*/
|
|
93
|
+
forceScopeShrink: boolean;
|
|
94
|
+
reason?: "scope_shrink" | "narrow_apply" | "manual";
|
|
95
|
+
}
|
|
96
|
+
export interface ApplyScopeShrinkResult {
|
|
97
|
+
cleanRemoved: number;
|
|
98
|
+
dirtyTombstoned: number;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Apply a scope-shrink plan: delete clean orphans on disk + tombstone their
|
|
102
|
+
* journal entries. With `forceScopeShrink: true`, dirty orphans are
|
|
103
|
+
* preserved on disk but their journal entries are also tombstoned.
|
|
104
|
+
*
|
|
105
|
+
* Returns counts for the audit log row (`scope_shrink_blocked` /
|
|
106
|
+
* `scope_shrink_forced`).
|
|
107
|
+
*/
|
|
108
|
+
export declare function applyScopeShrink(input: ApplyScopeShrinkInput): ApplyScopeShrinkResult;
|
|
109
|
+
//# sourceMappingURL=scope-shrink.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scope-shrink.d.ts","sourceRoot":"","sources":["../src/scope-shrink.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACZ,MAAM,YAAY,CAAC;AAIpB,MAAM,WAAW,oBAAoB;IACnC,mCAAmC;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,qCAAqC;IACrC,KAAK,EAAE,YAAY,CAAC;IACpB,qEAAqE;IACrE,KAAK,EAAE,OAAO,CAAC;IACf,0EAA0E;IAC1E,WAAW,CAAC,EACR,qBAAqB,GACrB,eAAe,GACf,YAAY,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,6EAA6E;IAC7E,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,iDAAiD;IACjD,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAC9B,kDAAkD;IAClD,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAC9B,8CAA8C;IAC9C,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,oDAAoD;IACpD,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,yBAAyB,GAC/B,eAAe,CAoBjB;AA8ED;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,KAAK;aAG9B,UAAU,EAAE,MAAM;aAClB,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,SAAS;aAC5C,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC;aAC9B,KAAK,EAAE,oBAAoB,EAAE;aAC7B,KAAK,EAAE,oBAAoB,EAAE;IAN/C,QAAQ,CAAC,IAAI,0BAA0B;gBAErB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,SAAS,EAC5C,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,KAAK,EAAE,oBAAoB,EAAE,EAC7B,KAAK,EAAE,oBAAoB,EAAE;CAShD;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,cAAc,GAAG,cAAc,GAAG,QAAQ,CAAC;CACrD;AAED,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,qBAAqB,GAC3B,sBAAsB,CA4BxB"}
|