@indigoai-us/hq-cloud 6.16.57 → 6.16.58-alpha.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/bin/sync-runner-company.d.ts +14 -0
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +42 -8
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner-company.test.js +55 -0
- package/dist/bin/sync-runner-company.test.js.map +1 -1
- package/dist/bin/sync-runner-planning.d.ts +12 -3
- package/dist/bin/sync-runner-planning.d.ts.map +1 -1
- package/dist/bin/sync-runner-planning.js +65 -3
- package/dist/bin/sync-runner-planning.js.map +1 -1
- package/dist/bin/sync-runner-planning.test.js +172 -1
- package/dist/bin/sync-runner-planning.test.js.map +1 -1
- package/dist/bin/sync-runner-watch-loop.d.ts +51 -2
- package/dist/bin/sync-runner-watch-loop.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-loop.js +409 -165
- package/dist/bin/sync-runner-watch-loop.js.map +1 -1
- package/dist/bin/sync-runner-watch-routes.d.ts +19 -2
- package/dist/bin/sync-runner-watch-routes.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-routes.js +40 -5
- package/dist/bin/sync-runner-watch-routes.js.map +1 -1
- package/dist/bin/sync-runner-watch-routes.test.js +47 -0
- package/dist/bin/sync-runner-watch-routes.test.js.map +1 -1
- package/dist/bin/sync-runner.d.ts +59 -5
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +48 -4
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/bin/sync-runner.test.js +1553 -192
- package/dist/bin/sync-runner.test.js.map +1 -1
- package/dist/cli/onepass-pull-planner-regressions.test.d.ts +2 -0
- package/dist/cli/onepass-pull-planner-regressions.test.d.ts.map +1 -0
- package/dist/cli/onepass-pull-planner-regressions.test.js +300 -0
- package/dist/cli/onepass-pull-planner-regressions.test.js.map +1 -0
- package/dist/cli/onepass-pull-planner.test.d.ts +2 -0
- package/dist/cli/onepass-pull-planner.test.d.ts.map +1 -0
- package/dist/cli/onepass-pull-planner.test.js +266 -0
- package/dist/cli/onepass-pull-planner.test.js.map +1 -0
- package/dist/cli/share.d.ts +19 -0
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +55 -0
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/share.test.js +87 -1
- package/dist/cli/share.test.js.map +1 -1
- package/dist/cli/streaming-pull-planner.bench.test.d.ts +15 -0
- package/dist/cli/streaming-pull-planner.bench.test.d.ts.map +1 -0
- package/dist/cli/streaming-pull-planner.bench.test.js +273 -0
- package/dist/cli/streaming-pull-planner.bench.test.js.map +1 -0
- package/dist/cli/sync-scope.test.js +8 -0
- package/dist/cli/sync-scope.test.js.map +1 -1
- package/dist/cli/sync.d.ts +12 -0
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +297 -125
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +255 -2
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/journal-row-store.d.ts +40 -5
- package/dist/journal-row-store.d.ts.map +1 -1
- package/dist/journal-row-store.js +240 -21
- package/dist/journal-row-store.js.map +1 -1
- package/dist/journal-row-store.test.js +54 -0
- package/dist/journal-row-store.test.js.map +1 -1
- package/dist/journal-snapshot-v4.d.ts.map +1 -1
- package/dist/journal-snapshot-v4.js +11 -6
- package/dist/journal-snapshot-v4.js.map +1 -1
- package/dist/journal-store.test.js +324 -7
- package/dist/journal-store.test.js.map +1 -1
- package/dist/journal.d.ts +51 -16
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +303 -79
- package/dist/journal.js.map +1 -1
- package/dist/lib/exit-codes.d.ts +15 -0
- package/dist/lib/exit-codes.d.ts.map +1 -1
- package/dist/lib/exit-codes.js +15 -0
- package/dist/lib/exit-codes.js.map +1 -1
- package/dist/personal-vault.d.ts.map +1 -1
- package/dist/personal-vault.js +10 -3
- package/dist/personal-vault.js.map +1 -1
- package/dist/personal-vault.test.js +35 -0
- package/dist/personal-vault.test.js.map +1 -1
- package/dist/remote-pull.d.ts.map +1 -1
- package/dist/remote-pull.js +9 -2
- package/dist/remote-pull.js.map +1 -1
- package/dist/remote-pull.test.js +59 -2
- package/dist/remote-pull.test.js.map +1 -1
- package/dist/s3.d.ts +1 -0
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +20 -2
- package/dist/s3.js.map +1 -1
- package/dist/s3.list-cost.test.d.ts +2 -0
- package/dist/s3.list-cost.test.d.ts.map +1 -0
- package/dist/s3.list-cost.test.js +51 -0
- package/dist/s3.list-cost.test.js.map +1 -0
- package/dist/sync/area-ledger.d.ts +27 -3
- package/dist/sync/area-ledger.d.ts.map +1 -1
- package/dist/sync/area-ledger.js +149 -39
- package/dist/sync/area-ledger.js.map +1 -1
- package/dist/sync/area-ledger.test.js +192 -5
- package/dist/sync/area-ledger.test.js.map +1 -1
- package/dist/sync/parallel-sync-coordinator.test.js +29 -0
- package/dist/sync/parallel-sync-coordinator.test.js.map +1 -1
- package/dist/sync/realtime-telemetry.d.ts +1 -1
- package/dist/sync/realtime-telemetry.d.ts.map +1 -1
- package/dist/sync/realtime-telemetry.js +14 -6
- package/dist/sync/realtime-telemetry.js.map +1 -1
- package/dist/sync/realtime-telemetry.test.js +136 -16
- package/dist/sync/realtime-telemetry.test.js.map +1 -1
- package/dist/sync/remote-file-spool.d.ts +16 -0
- package/dist/sync/remote-file-spool.d.ts.map +1 -0
- package/dist/sync/remote-file-spool.js +91 -0
- package/dist/sync/remote-file-spool.js.map +1 -0
- package/dist/sync/remote-file-spool.test.d.ts +2 -0
- package/dist/sync/remote-file-spool.test.d.ts.map +1 -0
- package/dist/sync/remote-file-spool.test.js +77 -0
- package/dist/sync/remote-file-spool.test.js.map +1 -0
- package/dist/sync/state-store.d.ts +6 -0
- package/dist/sync/state-store.d.ts.map +1 -1
- package/dist/sync/state-store.js +14 -2
- package/dist/sync/state-store.js.map +1 -1
- package/dist/watcher.d.ts +12 -0
- package/dist/watcher.d.ts.map +1 -1
- package/dist/watcher.js +131 -0
- package/dist/watcher.js.map +1 -1
- package/dist/watcher.test.js +63 -0
- package/dist/watcher.test.js.map +1 -1
- package/package.json +2 -1
|
@@ -54,7 +54,12 @@ export type MembershipResolution = {
|
|
|
54
54
|
pendingInviteCount?: number;
|
|
55
55
|
} | {
|
|
56
56
|
status: "memberships";
|
|
57
|
-
memberships:
|
|
57
|
+
memberships: RunnerMembership[];
|
|
58
|
+
};
|
|
59
|
+
/** A membership target carried into planning, including a safely unresolved slug. */
|
|
60
|
+
export type RunnerMembership = Pick<Membership, "companyUid"> & {
|
|
61
|
+
/** A caller-namespace lookup proved this slug belongs to no accessible company. */
|
|
62
|
+
unresolvedSlug?: string;
|
|
58
63
|
};
|
|
59
64
|
export declare function resolveMembershipsForRun(options: {
|
|
60
65
|
personal: boolean;
|
|
@@ -69,7 +74,7 @@ export declare function resolveMembershipsForRun(options: {
|
|
|
69
74
|
runClaimDance: (client: VaultClientSurface, claims: IdentityClaims, stderr: {
|
|
70
75
|
write: (chunk: string) => boolean | void;
|
|
71
76
|
}) => Promise<number>;
|
|
72
|
-
listMemberships: (client: VaultClientSurface) => Promise<
|
|
77
|
+
listMemberships: (client: VaultClientSurface) => Promise<RunnerMembership[]>;
|
|
73
78
|
}): Promise<MembershipResolution>;
|
|
74
79
|
/**
|
|
75
80
|
* Company slugs the desktop app has paused via per-workspace Off toggles.
|
|
@@ -80,7 +85,7 @@ export declare function resolveMembershipsForRun(options: {
|
|
|
80
85
|
*/
|
|
81
86
|
export declare function resolveSkipCompanies(envValue?: string | undefined): Set<string>;
|
|
82
87
|
export declare function buildFanoutPlan(options: {
|
|
83
|
-
memberships:
|
|
88
|
+
memberships: RunnerMembership[];
|
|
84
89
|
companies: boolean;
|
|
85
90
|
personal: boolean;
|
|
86
91
|
skipPersonal: boolean;
|
|
@@ -89,6 +94,8 @@ export declare function buildFanoutPlan(options: {
|
|
|
89
94
|
resolveSkipPersonal: (flag: boolean) => boolean;
|
|
90
95
|
/** Optional company-slug denylist (desktop per-workspace Off toggles). */
|
|
91
96
|
skipCompanies?: Set<string>;
|
|
97
|
+
/** Emits resolution outcomes through the runner's existing protocol seam. */
|
|
98
|
+
emit?: (event: RunnerEvent) => void;
|
|
92
99
|
}): Promise<{
|
|
93
100
|
status: "setup-needed";
|
|
94
101
|
reason: SetupNeededReason;
|
|
@@ -96,6 +103,8 @@ export declare function buildFanoutPlan(options: {
|
|
|
96
103
|
status: "plan";
|
|
97
104
|
plan: RunnerTarget[];
|
|
98
105
|
deferredUnresolved: number;
|
|
106
|
+
unresolvedCompanies?: number;
|
|
107
|
+
skippedCompanies?: number;
|
|
99
108
|
}>;
|
|
100
109
|
export declare function emitFanoutPlan(emit: (event: RunnerEvent) => void, plan: RunnerTarget[]): void;
|
|
101
110
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-runner-planning.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner-planning.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,UAAU,EAChB,MAAM,aAAa,CAAC;AAMrB,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAExE,UAAU,cAAc;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;OAQG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;;;;;OAUG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;AAEtE,MAAM,MAAM,oBAAoB,GAC5B;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,iBAAiB,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,GAClF;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"sync-runner-planning.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner-planning.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,25 @@ export async function resolveMembershipsForRun(options) {
|
|
|
24
24
|
}
|
|
25
25
|
return { status: "memberships", memberships };
|
|
26
26
|
}
|
|
27
|
+
const requestedCompany = options.company;
|
|
28
|
+
const findInMyNamespace = options.client.entity.findInMyNamespace;
|
|
29
|
+
if (!findInMyNamespace) {
|
|
30
|
+
throw new Error("vault client does not support caller-namespace company lookup");
|
|
31
|
+
}
|
|
32
|
+
const entity = await findInMyNamespace("company", requestedCompany);
|
|
33
|
+
if (entity?.type === "company" && entity.uid.startsWith("cmp_")) {
|
|
34
|
+
return {
|
|
35
|
+
status: "memberships",
|
|
36
|
+
memberships: [{ companyUid: entity.uid }],
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
// A namespace miss is not evidence that this is a slug: one-shot callers
|
|
40
|
+
// may supply a literal company UID. Hand it to the existing planner, whose
|
|
41
|
+
// entity.get call is the UID endpoint; it never performs a global slug
|
|
42
|
+
// lookup. Thus a foreign slug cannot be reinterpreted as another tenant.
|
|
27
43
|
return {
|
|
28
44
|
status: "memberships",
|
|
29
|
-
memberships: [{ companyUid:
|
|
45
|
+
memberships: [{ companyUid: requestedCompany }],
|
|
30
46
|
};
|
|
31
47
|
}
|
|
32
48
|
/**
|
|
@@ -49,7 +65,19 @@ export async function buildFanoutPlan(options) {
|
|
|
49
65
|
const skipCompanies = options.skipCompanies ?? new Set();
|
|
50
66
|
const plan = [];
|
|
51
67
|
let deferredUnresolved = 0;
|
|
68
|
+
let unresolvedCompanies = 0;
|
|
69
|
+
let skippedCompanies = 0;
|
|
52
70
|
for (const m of options.memberships) {
|
|
71
|
+
if (m.unresolvedSlug) {
|
|
72
|
+
unresolvedCompanies += 1;
|
|
73
|
+
options.emit?.({
|
|
74
|
+
type: "error",
|
|
75
|
+
company: m.unresolvedSlug,
|
|
76
|
+
path: "(company-resolution)",
|
|
77
|
+
message: "company slug is not in caller namespace",
|
|
78
|
+
});
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
53
81
|
let slug = m.companyUid;
|
|
54
82
|
let name;
|
|
55
83
|
// Carried onto the target so downstream consumers (manifest reconciliation)
|
|
@@ -62,8 +90,16 @@ export async function buildFanoutPlan(options) {
|
|
|
62
90
|
let entityResolved = false;
|
|
63
91
|
try {
|
|
64
92
|
const info = await options.client.entity.get(m.companyUid);
|
|
65
|
-
if (!info)
|
|
93
|
+
if (!info) {
|
|
94
|
+
unresolvedCompanies += 1;
|
|
95
|
+
options.emit?.({
|
|
96
|
+
type: "error",
|
|
97
|
+
company: m.companyUid,
|
|
98
|
+
path: "(company-resolution)",
|
|
99
|
+
message: "company entity lookup returned no entity",
|
|
100
|
+
});
|
|
66
101
|
continue;
|
|
102
|
+
}
|
|
67
103
|
slug = info.slug || m.companyUid;
|
|
68
104
|
name = info.name;
|
|
69
105
|
bucketName = info.bucketName;
|
|
@@ -95,6 +131,13 @@ export async function buildFanoutPlan(options) {
|
|
|
95
131
|
err !== null &&
|
|
96
132
|
"statusCode" in err &&
|
|
97
133
|
err.statusCode === 404)) {
|
|
134
|
+
unresolvedCompanies += 1;
|
|
135
|
+
options.emit?.({
|
|
136
|
+
type: "error",
|
|
137
|
+
company: m.companyUid,
|
|
138
|
+
path: "(company-resolution)",
|
|
139
|
+
message: "company entity lookup returned 404",
|
|
140
|
+
});
|
|
98
141
|
continue;
|
|
99
142
|
}
|
|
100
143
|
// Best-effort — keep UID as the display identifier.
|
|
@@ -107,10 +150,23 @@ export async function buildFanoutPlan(options) {
|
|
|
107
150
|
// without a successful upload pass.
|
|
108
151
|
if (skipCompanies.has(slug.toLowerCase()) ||
|
|
109
152
|
skipCompanies.has(m.companyUid.toLowerCase())) {
|
|
153
|
+
skippedCompanies += 1;
|
|
154
|
+
options.emit?.({
|
|
155
|
+
type: "company-skipped",
|
|
156
|
+
company: slug,
|
|
157
|
+
reason: "skip-companies",
|
|
158
|
+
});
|
|
110
159
|
continue;
|
|
111
160
|
}
|
|
112
161
|
if (skipCompanies.size > 0 && !entityResolved) {
|
|
113
162
|
deferredUnresolved += 1;
|
|
163
|
+
unresolvedCompanies += 1;
|
|
164
|
+
options.emit?.({
|
|
165
|
+
type: "error",
|
|
166
|
+
company: m.companyUid,
|
|
167
|
+
path: "(company-resolution)",
|
|
168
|
+
message: "company entity lookup did not resolve a slug while skipCompanies is active",
|
|
169
|
+
});
|
|
114
170
|
continue;
|
|
115
171
|
}
|
|
116
172
|
plan.push({
|
|
@@ -148,7 +204,13 @@ export async function buildFanoutPlan(options) {
|
|
|
148
204
|
return { status: "setup-needed", reason: "no-person-entity" };
|
|
149
205
|
}
|
|
150
206
|
}
|
|
151
|
-
return {
|
|
207
|
+
return {
|
|
208
|
+
status: "plan",
|
|
209
|
+
plan,
|
|
210
|
+
deferredUnresolved,
|
|
211
|
+
...(unresolvedCompanies > 0 ? { unresolvedCompanies } : {}),
|
|
212
|
+
...(skippedCompanies > 0 ? { skippedCompanies } : {}),
|
|
213
|
+
};
|
|
152
214
|
}
|
|
153
215
|
export function emitFanoutPlan(emit, plan) {
|
|
154
216
|
emit({ type: "fanout-plan", companies: plan });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-runner-planning.js","sourceRoot":"","sources":["../../src/bin/sync-runner-planning.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,0BAA0B,EAC1B,yBAAyB,GAE1B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"sync-runner-planning.js","sourceRoot":"","sources":["../../src/bin/sync-runner-planning.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,65 @@
|
|
|
1
1
|
import { describe, expect, it, vi } from "vitest";
|
|
2
2
|
import { buildFanoutPlan, resolveMembershipsForRun } from "./sync-runner-planning.js";
|
|
3
|
+
import { VaultNotFoundError } from "../vault-client.js";
|
|
4
|
+
import { isWatchRouteSelected, routeChangeToTarget, } from "./sync-runner-watch-routes.js";
|
|
3
5
|
const noopStderr = { write: () => true };
|
|
4
6
|
function clientStub(overrides = {}) {
|
|
7
|
+
const entityOverrides = overrides.entity;
|
|
5
8
|
return {
|
|
9
|
+
...overrides,
|
|
6
10
|
entity: {
|
|
7
11
|
get: () => Promise.resolve(undefined),
|
|
12
|
+
findInMyNamespace: vi.fn().mockResolvedValue(null),
|
|
8
13
|
listByType: () => Promise.resolve([]),
|
|
14
|
+
...entityOverrides,
|
|
9
15
|
},
|
|
10
|
-
...overrides,
|
|
11
16
|
};
|
|
12
17
|
}
|
|
13
18
|
describe("resolveMembershipsForRun — setup-needed reasons", () => {
|
|
19
|
+
it("keeps periodic --companies memberships as UIDs without consulting the slug resolver", async () => {
|
|
20
|
+
const client = clientStub();
|
|
21
|
+
const findInMyNamespace = vi.mocked(client.entity.findInMyNamespace);
|
|
22
|
+
expect(findInMyNamespace).toBeTypeOf("function");
|
|
23
|
+
if (!findInMyNamespace)
|
|
24
|
+
throw new Error("missing namespace resolver");
|
|
25
|
+
client.entity.get = vi.fn().mockResolvedValue({
|
|
26
|
+
uid: "cmp_indigo",
|
|
27
|
+
slug: "indigo",
|
|
28
|
+
type: "company",
|
|
29
|
+
status: "active",
|
|
30
|
+
});
|
|
31
|
+
const result = await resolveMembershipsForRun({
|
|
32
|
+
personal: false,
|
|
33
|
+
companies: true,
|
|
34
|
+
client,
|
|
35
|
+
claims: null,
|
|
36
|
+
stderr: noopStderr,
|
|
37
|
+
runClaimDance: () => Promise.resolve(0),
|
|
38
|
+
listMemberships: () => Promise.resolve([{ companyUid: "cmp_indigo" }]),
|
|
39
|
+
});
|
|
40
|
+
expect(result).toEqual({
|
|
41
|
+
status: "memberships",
|
|
42
|
+
memberships: [{ companyUid: "cmp_indigo" }],
|
|
43
|
+
});
|
|
44
|
+
expect(findInMyNamespace).not.toHaveBeenCalled();
|
|
45
|
+
if (result.status !== "memberships")
|
|
46
|
+
throw new Error("expected memberships");
|
|
47
|
+
const planned = await buildFanoutPlan({
|
|
48
|
+
memberships: result.memberships,
|
|
49
|
+
companies: true,
|
|
50
|
+
personal: false,
|
|
51
|
+
skipPersonal: false,
|
|
52
|
+
client,
|
|
53
|
+
claims: null,
|
|
54
|
+
resolveSkipPersonal: () => false,
|
|
55
|
+
});
|
|
56
|
+
expect(planned).toMatchObject({
|
|
57
|
+
status: "plan",
|
|
58
|
+
plan: [expect.objectContaining({ uid: "cmp_indigo", slug: "indigo" })],
|
|
59
|
+
});
|
|
60
|
+
expect(client.entity.get).toHaveBeenCalledTimes(1);
|
|
61
|
+
expect(client.entity.get).toHaveBeenCalledWith("cmp_indigo");
|
|
62
|
+
});
|
|
14
63
|
// Each reason must come from its OWN trigger. Collapsing them back into a
|
|
15
64
|
// bare `setup-needed` is what left joiners unable to tell "you have no team"
|
|
16
65
|
// apart from "you have an invite waiting".
|
|
@@ -97,6 +146,65 @@ describe("resolveMembershipsForRun — setup-needed reasons", () => {
|
|
|
97
146
|
});
|
|
98
147
|
});
|
|
99
148
|
describe("buildFanoutPlan — setup-needed reasons", () => {
|
|
149
|
+
it("reports a company entity lookup that returned no entity instead of silently dropping it", async () => {
|
|
150
|
+
const events = [];
|
|
151
|
+
const result = await buildFanoutPlan({
|
|
152
|
+
memberships: [{ companyUid: "cmp_missing" }],
|
|
153
|
+
companies: false,
|
|
154
|
+
personal: false,
|
|
155
|
+
skipPersonal: false,
|
|
156
|
+
client: clientStub(),
|
|
157
|
+
claims: null,
|
|
158
|
+
resolveSkipPersonal: () => false,
|
|
159
|
+
emit: (event) => events.push(event),
|
|
160
|
+
});
|
|
161
|
+
expect(result).toMatchObject({
|
|
162
|
+
status: "plan",
|
|
163
|
+
plan: [],
|
|
164
|
+
deferredUnresolved: 0,
|
|
165
|
+
unresolvedCompanies: 1,
|
|
166
|
+
});
|
|
167
|
+
expect(events).toEqual([
|
|
168
|
+
{
|
|
169
|
+
type: "error",
|
|
170
|
+
company: "cmp_missing",
|
|
171
|
+
path: "(company-resolution)",
|
|
172
|
+
message: "company entity lookup returned no entity",
|
|
173
|
+
},
|
|
174
|
+
]);
|
|
175
|
+
});
|
|
176
|
+
it("reports a 404 company entity lookup distinctly instead of silently dropping it", async () => {
|
|
177
|
+
const events = [];
|
|
178
|
+
const result = await buildFanoutPlan({
|
|
179
|
+
memberships: [{ companyUid: "cmp_deleted" }],
|
|
180
|
+
companies: false,
|
|
181
|
+
personal: false,
|
|
182
|
+
skipPersonal: false,
|
|
183
|
+
client: clientStub({
|
|
184
|
+
entity: {
|
|
185
|
+
get: () => Promise.reject(new VaultNotFoundError("company deleted")),
|
|
186
|
+
listByType: () => Promise.resolve([]),
|
|
187
|
+
},
|
|
188
|
+
}),
|
|
189
|
+
claims: null,
|
|
190
|
+
resolveSkipPersonal: () => false,
|
|
191
|
+
emit: (event) => events.push(event),
|
|
192
|
+
});
|
|
193
|
+
expect(result).toMatchObject({
|
|
194
|
+
status: "plan",
|
|
195
|
+
plan: [],
|
|
196
|
+
deferredUnresolved: 0,
|
|
197
|
+
unresolvedCompanies: 1,
|
|
198
|
+
});
|
|
199
|
+
expect(events).toEqual([
|
|
200
|
+
{
|
|
201
|
+
type: "error",
|
|
202
|
+
company: "cmp_deleted",
|
|
203
|
+
path: "(company-resolution)",
|
|
204
|
+
message: "company entity lookup returned 404",
|
|
205
|
+
},
|
|
206
|
+
]);
|
|
207
|
+
});
|
|
100
208
|
it("resolves an agent machine identity to only its claimed personal vault", async () => {
|
|
101
209
|
const agentUid = "agt_01J9AGENTSELF0000000000000";
|
|
102
210
|
const listByType = vi.fn((type) => Promise.resolve(type === "agent"
|
|
@@ -274,4 +382,67 @@ describe("buildFanoutPlan — setup-needed reasons", () => {
|
|
|
274
382
|
expect(result.status).toBe("plan");
|
|
275
383
|
});
|
|
276
384
|
});
|
|
385
|
+
// The watcher-ingress gate and this resolver are the two halves of the
|
|
386
|
+
// company-boundary decision for a `--company <slug> --watch` daemon. The gate
|
|
387
|
+
// is what must fail closed: once a foreign slug reaches
|
|
388
|
+
// `resolveMembershipsForRun`, the caller-namespace lookup can resolve it and
|
|
389
|
+
// the runner syncs a tenant the operator never selected.
|
|
390
|
+
describe("watcher ingress keeps a foreign company slug away from the namespace lookup", () => {
|
|
391
|
+
const selection = {
|
|
392
|
+
companies: false,
|
|
393
|
+
company: true,
|
|
394
|
+
companySlug: "acme",
|
|
395
|
+
personal: false,
|
|
396
|
+
skipPersonal: false,
|
|
397
|
+
};
|
|
398
|
+
const other = "bet" + "a";
|
|
399
|
+
async function resolveIfWatcherSelected(relPath, client) {
|
|
400
|
+
const route = routeChangeToTarget(relPath);
|
|
401
|
+
if (!route || !isWatchRouteSelected(route, selection))
|
|
402
|
+
return null;
|
|
403
|
+
return resolveMembershipsForRun({
|
|
404
|
+
personal: false,
|
|
405
|
+
companies: false,
|
|
406
|
+
company: route.kind === "company" ? route.slug : undefined,
|
|
407
|
+
client,
|
|
408
|
+
claims: null,
|
|
409
|
+
stderr: noopStderr,
|
|
410
|
+
runClaimDance: () => Promise.resolve(0),
|
|
411
|
+
listMemberships: () => Promise.resolve([]),
|
|
412
|
+
});
|
|
413
|
+
}
|
|
414
|
+
it("never resolves a routed slug the run was not scoped to", async () => {
|
|
415
|
+
const client = clientStub();
|
|
416
|
+
const findInMyNamespace = vi.mocked(client.entity.findInMyNamespace);
|
|
417
|
+
if (!findInMyNamespace)
|
|
418
|
+
throw new Error("missing namespace resolver");
|
|
419
|
+
findInMyNamespace.mockResolvedValue({
|
|
420
|
+
uid: "cmp_foreign",
|
|
421
|
+
slug: other,
|
|
422
|
+
type: "company",
|
|
423
|
+
status: "active",
|
|
424
|
+
});
|
|
425
|
+
const resolved = await resolveIfWatcherSelected(["companies", other, "knowledge/a.md"].join("/"), client);
|
|
426
|
+
expect(resolved).toBeNull();
|
|
427
|
+
expect(findInMyNamespace).not.toHaveBeenCalled();
|
|
428
|
+
});
|
|
429
|
+
it("still resolves the run's own company slug", async () => {
|
|
430
|
+
const client = clientStub();
|
|
431
|
+
const findInMyNamespace = vi.mocked(client.entity.findInMyNamespace);
|
|
432
|
+
if (!findInMyNamespace)
|
|
433
|
+
throw new Error("missing namespace resolver");
|
|
434
|
+
findInMyNamespace.mockResolvedValue({
|
|
435
|
+
uid: "cmp_acme",
|
|
436
|
+
slug: "acme",
|
|
437
|
+
type: "company",
|
|
438
|
+
status: "active",
|
|
439
|
+
});
|
|
440
|
+
const resolved = await resolveIfWatcherSelected(["companies", "acme", "knowledge/a.md"].join("/"), client);
|
|
441
|
+
expect(resolved).toEqual({
|
|
442
|
+
status: "memberships",
|
|
443
|
+
memberships: [{ companyUid: "cmp_acme" }],
|
|
444
|
+
});
|
|
445
|
+
expect(findInMyNamespace).toHaveBeenCalledWith("company", "acme");
|
|
446
|
+
});
|
|
447
|
+
});
|
|
277
448
|
//# sourceMappingURL=sync-runner-planning.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-runner-planning.test.js","sourceRoot":"","sources":["../../src/bin/sync-runner-planning.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sync-runner-planning.test.js","sourceRoot":"","sources":["../../src/bin/sync-runner-planning.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,53 @@ import { type FeatureSwitch } from "../sync/feature-flags.js";
|
|
|
4
4
|
import { HeapCensus } from "./sync-runner-heap-telemetry.js";
|
|
5
5
|
import type { TelemetryClaims } from "../telemetry-events.js";
|
|
6
6
|
import type { JournalEntry } from "../types.js";
|
|
7
|
-
import type { Direction, RunnerLoopDeps, RunnerPassOutcome } from "./sync-runner.js";
|
|
7
|
+
import type { CooperativePassCheckpoint, Direction, RunnerLoopDeps, RunnerPassOutcome } from "./sync-runner.js";
|
|
8
|
+
/** A deferred full chore must get the next admission after this long. */
|
|
9
|
+
export declare const CHORE_STARVATION_CAP_MS: number;
|
|
10
|
+
export type GuardedWorkClass = "realtime" | "chore";
|
|
11
|
+
export interface GuardedPassContext {
|
|
12
|
+
/**
|
|
13
|
+
* A durable boundary in a chore. While the chore awaits this promise it
|
|
14
|
+
* owns no mutable pass state, so queued realtime work can use the existing
|
|
15
|
+
* root lock under a single-flight cooperative hand-off.
|
|
16
|
+
*/
|
|
17
|
+
checkpoint: CooperativePassCheckpoint;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* One durable-state owner at a time for a full chore. Realtime work never runs
|
|
21
|
+
* beside that chore: it explicitly awaits `checkpoint()` after a completed
|
|
22
|
+
* durable unit, then resumes once the hand-off is finished. A separately
|
|
23
|
+
* tracked, explicitly opted-in watcher fast pass may use the pre-existing
|
|
24
|
+
* scoped fast-over-slow exception, but never while a chore owns durable state.
|
|
25
|
+
*/
|
|
26
|
+
export declare class CooperativePassScheduler<T> {
|
|
27
|
+
private readonly now;
|
|
28
|
+
private readonly starvationCapMs;
|
|
29
|
+
private readonly pending;
|
|
30
|
+
private active;
|
|
31
|
+
private activeFastRealtime;
|
|
32
|
+
private stopped;
|
|
33
|
+
private _handoffActive;
|
|
34
|
+
constructor(now: () => number, starvationCapMs?: number);
|
|
35
|
+
get handoffActive(): boolean;
|
|
36
|
+
get hasActiveChore(): boolean;
|
|
37
|
+
get hasActiveSlowRealtime(): boolean;
|
|
38
|
+
pendingLaneCount(lane: "fast" | "slow"): number;
|
|
39
|
+
submit(task: (context: GuardedPassContext) => Promise<T>, workClass: GuardedWorkClass, lane?: "fast" | "slow", allowFastRealtimeOvertake?: boolean): Promise<T>;
|
|
40
|
+
stop(): void;
|
|
41
|
+
private drain;
|
|
42
|
+
private takeNext;
|
|
43
|
+
private nextRealtimeIndex;
|
|
44
|
+
private nextFastRealtime;
|
|
45
|
+
private hasStarvedChore;
|
|
46
|
+
private canStartFastRealtime;
|
|
47
|
+
private start;
|
|
48
|
+
private complete;
|
|
49
|
+
private startFastRealtime;
|
|
50
|
+
private completeFastRealtime;
|
|
51
|
+
private execute;
|
|
52
|
+
private checkpoint;
|
|
53
|
+
}
|
|
8
54
|
/**
|
|
9
55
|
* Area storage is AUTO by default and only applies after durable cutover.
|
|
10
56
|
* Pass the env switch (`auto`/`on`/`off`) or a boolean force-on/force-off.
|
|
@@ -178,7 +224,10 @@ export interface ParsedLoopArgs {
|
|
|
178
224
|
direction?: Direction;
|
|
179
225
|
}
|
|
180
226
|
export interface WatchLoopRuntime {
|
|
181
|
-
runPassWithOperationLockAlreadyHeld: (passArgv: string[]) =>
|
|
227
|
+
runPassWithOperationLockAlreadyHeld: (passArgv: string[], checkpoint?: CooperativePassCheckpoint, onJournalsReady?: () => void, onAppliedUpserts?: (upserts: ReadonlyArray<{
|
|
228
|
+
relativePath: string;
|
|
229
|
+
contentHash: string;
|
|
230
|
+
}>) => void) => Promise<number | RunnerPassOutcome>;
|
|
182
231
|
authRequiredPassExit: number;
|
|
183
232
|
defaultGetIdTokenClaims: () => ({
|
|
184
233
|
email?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-runner-watch-loop.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner-watch-loop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sync-runner-watch-loop.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner-watch-loop.ts"],"names":[],"mappings":"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"}
|