@indigoai-us/hq-cloud 6.16.19 → 6.16.21
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-installation-id.d.ts +66 -0
- package/dist/bin/sync-runner-installation-id.d.ts.map +1 -0
- package/dist/bin/sync-runner-installation-id.js +138 -0
- package/dist/bin/sync-runner-installation-id.js.map +1 -0
- package/dist/bin/sync-runner-manifest.d.ts +120 -0
- package/dist/bin/sync-runner-manifest.d.ts.map +1 -0
- package/dist/bin/sync-runner-manifest.js +348 -0
- package/dist/bin/sync-runner-manifest.js.map +1 -0
- package/dist/bin/sync-runner-manifest.test.d.ts +12 -0
- package/dist/bin/sync-runner-manifest.test.d.ts.map +1 -0
- package/dist/bin/sync-runner-manifest.test.js +510 -0
- package/dist/bin/sync-runner-manifest.test.js.map +1 -0
- package/dist/bin/sync-runner.d.ts +56 -21
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +86 -61
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/bin/sync-runner.test.js +217 -0
- package/dist/bin/sync-runner.test.js.map +1 -1
- package/dist/cli/share-presign-transport.test.d.ts +22 -0
- package/dist/cli/share-presign-transport.test.d.ts.map +1 -0
- package/dist/cli/share-presign-transport.test.js +237 -0
- package/dist/cli/share-presign-transport.test.js.map +1 -0
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +17 -3
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +9 -0
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +123 -0
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/company-slug.d.ts +31 -0
- package/dist/company-slug.d.ts.map +1 -0
- package/dist/company-slug.js +52 -0
- package/dist/company-slug.js.map +1 -0
- package/dist/company-slug.test.d.ts +7 -0
- package/dist/company-slug.test.d.ts.map +1 -0
- package/dist/company-slug.test.js +43 -0
- package/dist/company-slug.test.js.map +1 -0
- package/dist/company-vault-transport.d.ts +69 -0
- package/dist/company-vault-transport.d.ts.map +1 -0
- package/dist/company-vault-transport.js +89 -0
- package/dist/company-vault-transport.js.map +1 -0
- package/dist/company-vault-transport.test.d.ts +12 -0
- package/dist/company-vault-transport.test.d.ts.map +1 -0
- package/dist/company-vault-transport.test.js +97 -0
- package/dist/company-vault-transport.test.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/journal-ledger-index.test.d.ts +15 -0
- package/dist/journal-ledger-index.test.d.ts.map +1 -0
- package/dist/journal-ledger-index.test.js +247 -0
- package/dist/journal-ledger-index.test.js.map +1 -0
- package/dist/journal.d.ts +110 -0
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +253 -5
- package/dist/journal.js.map +1 -1
- package/dist/manifest/US-002.acceptance.test.d.ts +11 -0
- package/dist/manifest/US-002.acceptance.test.d.ts.map +1 -0
- package/dist/manifest/US-002.acceptance.test.js +160 -0
- package/dist/manifest/US-002.acceptance.test.js.map +1 -0
- package/dist/manifest/US-004.acceptance.test.d.ts +12 -0
- package/dist/manifest/US-004.acceptance.test.d.ts.map +1 -0
- package/dist/manifest/US-004.acceptance.test.js +173 -0
- package/dist/manifest/US-004.acceptance.test.js.map +1 -0
- package/dist/manifest/build-manifest.bench.test.d.ts +22 -0
- package/dist/manifest/build-manifest.bench.test.d.ts.map +1 -0
- package/dist/manifest/build-manifest.bench.test.js +544 -0
- package/dist/manifest/build-manifest.bench.test.js.map +1 -0
- package/dist/manifest/build-manifest.d.ts +319 -0
- package/dist/manifest/build-manifest.d.ts.map +1 -0
- package/dist/manifest/build-manifest.js +1043 -0
- package/dist/manifest/build-manifest.js.map +1 -0
- package/dist/manifest/build-manifest.test.d.ts +10 -0
- package/dist/manifest/build-manifest.test.d.ts.map +1 -0
- package/dist/manifest/build-manifest.test.js +1060 -0
- package/dist/manifest/build-manifest.test.js.map +1 -0
- package/dist/manifest/contract.d.ts +290 -0
- package/dist/manifest/contract.d.ts.map +1 -0
- package/dist/manifest/contract.js +476 -0
- package/dist/manifest/contract.js.map +1 -0
- package/dist/manifest/contract.test.d.ts +17 -0
- package/dist/manifest/contract.test.d.ts.map +1 -0
- package/dist/manifest/contract.test.js +283 -0
- package/dist/manifest/contract.test.js.map +1 -0
- package/dist/manifest/import-graph.test.d.ts +25 -0
- package/dist/manifest/import-graph.test.d.ts.map +1 -0
- package/dist/manifest/import-graph.test.js +120 -0
- package/dist/manifest/import-graph.test.js.map +1 -0
- package/dist/manifest/ledger-shard-isolation.test.d.ts +18 -0
- package/dist/manifest/ledger-shard-isolation.test.d.ts.map +1 -0
- package/dist/manifest/ledger-shard-isolation.test.js +153 -0
- package/dist/manifest/ledger-shard-isolation.test.js.map +1 -0
- package/dist/manifest/snapshot-store.d.ts +143 -0
- package/dist/manifest/snapshot-store.d.ts.map +1 -0
- package/dist/manifest/snapshot-store.js +291 -0
- package/dist/manifest/snapshot-store.js.map +1 -0
- package/dist/manifest/snapshot-store.test.d.ts +11 -0
- package/dist/manifest/snapshot-store.test.d.ts.map +1 -0
- package/dist/manifest/snapshot-store.test.js +133 -0
- package/dist/manifest/snapshot-store.test.js.map +1 -0
- package/dist/manifest/upload-manifest.d.ts +301 -0
- package/dist/manifest/upload-manifest.d.ts.map +1 -0
- package/dist/manifest/upload-manifest.js +921 -0
- package/dist/manifest/upload-manifest.js.map +1 -0
- package/dist/manifest/upload-manifest.test.d.ts +10 -0
- package/dist/manifest/upload-manifest.test.d.ts.map +1 -0
- package/dist/manifest/upload-manifest.test.js +1052 -0
- package/dist/manifest/upload-manifest.test.js.map +1 -0
- package/dist/manifest-reconcile.d.ts.map +1 -1
- package/dist/manifest-reconcile.js +1 -26
- package/dist/manifest-reconcile.js.map +1 -1
- package/dist/posix-key.d.ts +36 -0
- package/dist/posix-key.d.ts.map +1 -0
- package/dist/posix-key.js +38 -0
- package/dist/posix-key.js.map +1 -0
- package/dist/s3.d.ts +2 -18
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +6 -20
- package/dist/s3.js.map +1 -1
- package/dist/sync/journal-ledger-stream.d.ts +56 -0
- package/dist/sync/journal-ledger-stream.d.ts.map +1 -0
- package/dist/sync/journal-ledger-stream.js +191 -0
- package/dist/sync/journal-ledger-stream.js.map +1 -0
- package/dist/sync/journal-ledger-stream.test.d.ts +12 -0
- package/dist/sync/journal-ledger-stream.test.d.ts.map +1 -0
- package/dist/sync/journal-ledger-stream.test.js +134 -0
- package/dist/sync/journal-ledger-stream.test.js.map +1 -0
- package/dist/types.d.ts +18 -7
- package/dist/types.d.ts.map +1 -1
- package/package.json +2 -1
|
@@ -0,0 +1,510 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Unit tests for the runner's post-sync manifest upload tail step (US-004).
|
|
3
|
+
*
|
|
4
|
+
* These drive `runPostSyncManifestUploads` directly — the runner's own
|
|
5
|
+
* integration with it (only after a clean pass, never affecting the exit code)
|
|
6
|
+
* is asserted in `sync-runner.test.ts`. The throttle test deliberately uses the
|
|
7
|
+
* REAL `runManifestUploadPass` against a temp HQ root, because "two passes in
|
|
8
|
+
* one day upload once" is a property of the wiring plus the seam, not of a
|
|
9
|
+
* stub.
|
|
10
|
+
*/
|
|
11
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
12
|
+
import * as fs from "fs";
|
|
13
|
+
import * as os from "os";
|
|
14
|
+
import * as path from "path";
|
|
15
|
+
import { readDesktopInstallationId, DESKTOP_CLIENT_HEALTH_STATE_FILE, } from "./sync-runner-installation-id.js";
|
|
16
|
+
import { RUNNER_MANIFEST_PHASE_WALL_MS, runPostSyncManifestUploads, } from "./sync-runner-manifest.js";
|
|
17
|
+
import { MANIFEST_UPLOAD_DISABLED_ENV } from "../manifest/upload-manifest.js";
|
|
18
|
+
const NOW_MS = Date.parse("2026-09-04T12:00:00.000Z");
|
|
19
|
+
let base;
|
|
20
|
+
let hqRoot;
|
|
21
|
+
let stateDir;
|
|
22
|
+
let previousStateDir;
|
|
23
|
+
let previousHome;
|
|
24
|
+
beforeEach(() => {
|
|
25
|
+
base = fs.mkdtempSync(path.join(os.tmpdir(), "hq-runner-manifest-"));
|
|
26
|
+
hqRoot = path.join(base, "hq");
|
|
27
|
+
stateDir = path.join(base, "state");
|
|
28
|
+
fs.mkdirSync(path.join(hqRoot, "companies", "acme"), { recursive: true });
|
|
29
|
+
fs.mkdirSync(stateDir, { recursive: true });
|
|
30
|
+
fs.writeFileSync(path.join(hqRoot, "companies", "acme", "a.md"), "a", "utf8");
|
|
31
|
+
fs.writeFileSync(path.join(hqRoot, "notes.md"), "notes", "utf8");
|
|
32
|
+
// The per-scope upload lock and the journal reader both live under
|
|
33
|
+
// HQ_STATE_DIR — keep them inside this test's temp dir.
|
|
34
|
+
previousStateDir = process.env.HQ_STATE_DIR;
|
|
35
|
+
process.env.HQ_STATE_DIR = stateDir;
|
|
36
|
+
// `readDesktopInstallationId` falls back to `os.homedir()/.hq`, which on
|
|
37
|
+
// POSIX is `$HOME`. Without pinning it, any test that exercises the REAL
|
|
38
|
+
// reader would read the DEVELOPER's own `~/.hq/client-health.json` and pass
|
|
39
|
+
// or fail depending on whose laptop is running it.
|
|
40
|
+
previousHome = process.env.HOME;
|
|
41
|
+
process.env.HOME = path.join(base, "home");
|
|
42
|
+
fs.mkdirSync(path.join(base, "home", ".hq"), { recursive: true });
|
|
43
|
+
});
|
|
44
|
+
afterEach(() => {
|
|
45
|
+
if (previousStateDir === undefined)
|
|
46
|
+
delete process.env.HQ_STATE_DIR;
|
|
47
|
+
else
|
|
48
|
+
process.env.HQ_STATE_DIR = previousStateDir;
|
|
49
|
+
if (previousHome === undefined)
|
|
50
|
+
delete process.env.HOME;
|
|
51
|
+
else
|
|
52
|
+
process.env.HOME = previousHome;
|
|
53
|
+
fs.rmSync(base, { recursive: true, force: true });
|
|
54
|
+
});
|
|
55
|
+
const PERSONAL_TARGET = {
|
|
56
|
+
uid: "ent_person_1",
|
|
57
|
+
slug: "personal",
|
|
58
|
+
personalMode: true,
|
|
59
|
+
};
|
|
60
|
+
const ACME_TARGET = { uid: "ent_acme", slug: "acme" };
|
|
61
|
+
function makeOptions(overrides = {}) {
|
|
62
|
+
const events = [];
|
|
63
|
+
return {
|
|
64
|
+
hqRoot,
|
|
65
|
+
stateDir,
|
|
66
|
+
targets: [ACME_TARGET],
|
|
67
|
+
completedCompanySlugs: new Set(["acme"]),
|
|
68
|
+
apiBaseUrl: "https://api.test",
|
|
69
|
+
getAccessToken: () => Promise.resolve("token"),
|
|
70
|
+
emitEvent: (payload) => events.push(payload),
|
|
71
|
+
env: {},
|
|
72
|
+
now: NOW_MS,
|
|
73
|
+
resolveMachineId: () => "machine-test",
|
|
74
|
+
resolveInstallationId: () => "install-test",
|
|
75
|
+
...overrides,
|
|
76
|
+
events,
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
/** A stub pass that records its options and reports a clean upload. */
|
|
80
|
+
function makeUploadedPass() {
|
|
81
|
+
return vi.fn(async (options) => ({
|
|
82
|
+
status: "uploaded",
|
|
83
|
+
scopeKey: options.scope.kind,
|
|
84
|
+
mode: "full",
|
|
85
|
+
chunkCount: 1,
|
|
86
|
+
uploadedChunks: 1,
|
|
87
|
+
}));
|
|
88
|
+
}
|
|
89
|
+
describe("post-sync manifest uploads", () => {
|
|
90
|
+
it("runs one pass per cleanly-synced scope and emits one event each", async () => {
|
|
91
|
+
const runPass = makeUploadedPass();
|
|
92
|
+
const options = makeOptions({
|
|
93
|
+
targets: [ACME_TARGET, PERSONAL_TARGET],
|
|
94
|
+
completedCompanySlugs: new Set(["acme", "personal"]),
|
|
95
|
+
runPass,
|
|
96
|
+
});
|
|
97
|
+
const emitted = await runPostSyncManifestUploads(options);
|
|
98
|
+
expect(runPass).toHaveBeenCalledTimes(2);
|
|
99
|
+
expect(options.events).toEqual([
|
|
100
|
+
{
|
|
101
|
+
company: "acme",
|
|
102
|
+
scope: "company",
|
|
103
|
+
status: "uploaded",
|
|
104
|
+
mode: "full",
|
|
105
|
+
chunkCount: 1,
|
|
106
|
+
uploadedChunks: 1,
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
company: "personal",
|
|
110
|
+
scope: "personal",
|
|
111
|
+
status: "uploaded",
|
|
112
|
+
mode: "full",
|
|
113
|
+
chunkCount: 1,
|
|
114
|
+
uploadedChunks: 1,
|
|
115
|
+
},
|
|
116
|
+
]);
|
|
117
|
+
expect(emitted).toEqual(options.events);
|
|
118
|
+
});
|
|
119
|
+
it("uses the daemon posture: source desktop, throttle on, no force-full", async () => {
|
|
120
|
+
const runPass = makeUploadedPass();
|
|
121
|
+
await runPostSyncManifestUploads(makeOptions({ runPass }));
|
|
122
|
+
const passed = runPass.mock.calls[0][0];
|
|
123
|
+
expect(passed.source).toBe("desktop");
|
|
124
|
+
expect(passed.ignoreThrottle).toBeUndefined();
|
|
125
|
+
expect(passed.forceFull).toBeUndefined();
|
|
126
|
+
expect(passed.dryRun).toBeUndefined();
|
|
127
|
+
// Manifest rows must join client-health rows on the ENROLLED key — the
|
|
128
|
+
// installation id the desktop heartbeat pinned, NOT the machine id.
|
|
129
|
+
expect(passed.installationId).toBe("install-test");
|
|
130
|
+
expect(passed.machineId).toBe("machine-test");
|
|
131
|
+
expect(passed.scope).toEqual({
|
|
132
|
+
kind: "company",
|
|
133
|
+
companyUid: "ent_acme",
|
|
134
|
+
slug: "acme",
|
|
135
|
+
});
|
|
136
|
+
});
|
|
137
|
+
it("skips a scope whose sync leg aborted or errored", async () => {
|
|
138
|
+
const runPass = makeUploadedPass();
|
|
139
|
+
const options = makeOptions({
|
|
140
|
+
targets: [ACME_TARGET, PERSONAL_TARGET],
|
|
141
|
+
// Only the personal leg completed cleanly.
|
|
142
|
+
completedCompanySlugs: new Set(["personal"]),
|
|
143
|
+
runPass,
|
|
144
|
+
});
|
|
145
|
+
await runPostSyncManifestUploads(options);
|
|
146
|
+
expect(runPass).toHaveBeenCalledTimes(1);
|
|
147
|
+
expect(options.events).toEqual([
|
|
148
|
+
expect.objectContaining({ company: "personal", scope: "personal" }),
|
|
149
|
+
]);
|
|
150
|
+
});
|
|
151
|
+
it("does nothing at all when no scope completed cleanly", async () => {
|
|
152
|
+
const runPass = makeUploadedPass();
|
|
153
|
+
const fetchImpl = vi.fn();
|
|
154
|
+
const options = makeOptions({
|
|
155
|
+
completedCompanySlugs: new Set(),
|
|
156
|
+
runPass,
|
|
157
|
+
fetchImpl: fetchImpl,
|
|
158
|
+
});
|
|
159
|
+
await expect(runPostSyncManifestUploads(options)).resolves.toEqual([]);
|
|
160
|
+
expect(runPass).not.toHaveBeenCalled();
|
|
161
|
+
expect(fetchImpl).not.toHaveBeenCalled();
|
|
162
|
+
expect(options.events).toEqual([]);
|
|
163
|
+
});
|
|
164
|
+
it("does zero work and zero network when the kill switch is set", async () => {
|
|
165
|
+
const runPass = makeUploadedPass();
|
|
166
|
+
const fetchImpl = vi.fn();
|
|
167
|
+
const resolveMachineId = vi.fn(() => "machine-test");
|
|
168
|
+
const options = makeOptions({
|
|
169
|
+
env: { [MANIFEST_UPLOAD_DISABLED_ENV]: "1" },
|
|
170
|
+
runPass,
|
|
171
|
+
resolveMachineId,
|
|
172
|
+
fetchImpl: fetchImpl,
|
|
173
|
+
});
|
|
174
|
+
await expect(runPostSyncManifestUploads(options)).resolves.toEqual([]);
|
|
175
|
+
expect(runPass).not.toHaveBeenCalled();
|
|
176
|
+
expect(fetchImpl).not.toHaveBeenCalled();
|
|
177
|
+
// Not even the identity is resolved — the switch must cost nothing.
|
|
178
|
+
expect(resolveMachineId).not.toHaveBeenCalled();
|
|
179
|
+
expect(options.events).toEqual([]);
|
|
180
|
+
});
|
|
181
|
+
it("survives a pass that throws, and keeps auditing the other scopes", async () => {
|
|
182
|
+
const runPass = vi.fn(async (passOptions) => {
|
|
183
|
+
if (passOptions.scope.kind === "company")
|
|
184
|
+
throw new Error("boom");
|
|
185
|
+
return {
|
|
186
|
+
status: "uploaded",
|
|
187
|
+
scopeKey: "personal",
|
|
188
|
+
mode: "full",
|
|
189
|
+
chunkCount: 1,
|
|
190
|
+
uploadedChunks: 1,
|
|
191
|
+
};
|
|
192
|
+
});
|
|
193
|
+
const diagnostics = [];
|
|
194
|
+
const options = makeOptions({
|
|
195
|
+
targets: [ACME_TARGET, PERSONAL_TARGET],
|
|
196
|
+
completedCompanySlugs: new Set(["acme", "personal"]),
|
|
197
|
+
runPass,
|
|
198
|
+
reportDiagnostic: ({ event }) => diagnostics.push(event),
|
|
199
|
+
});
|
|
200
|
+
const emitted = await runPostSyncManifestUploads(options);
|
|
201
|
+
expect(emitted).toEqual([
|
|
202
|
+
expect.objectContaining({ company: "personal", status: "uploaded" }),
|
|
203
|
+
]);
|
|
204
|
+
expect(diagnostics).toContain("runner.manifest_upload.threw");
|
|
205
|
+
});
|
|
206
|
+
it("abandons a pass that never settles instead of hanging the runner", async () => {
|
|
207
|
+
vi.useFakeTimers();
|
|
208
|
+
try {
|
|
209
|
+
const runPass = vi.fn(() => new Promise(() => undefined));
|
|
210
|
+
const diagnostics = [];
|
|
211
|
+
const options = makeOptions({
|
|
212
|
+
runPass,
|
|
213
|
+
reportDiagnostic: ({ event }) => diagnostics.push(event),
|
|
214
|
+
});
|
|
215
|
+
const pending = runPostSyncManifestUploads(options);
|
|
216
|
+
await vi.advanceTimersByTimeAsync(5 * 60_000);
|
|
217
|
+
await expect(pending).resolves.toEqual([]);
|
|
218
|
+
expect(diagnostics).toContain("runner.manifest_upload.phase_timeout");
|
|
219
|
+
expect(options.events).toEqual([]);
|
|
220
|
+
}
|
|
221
|
+
finally {
|
|
222
|
+
vi.useRealTimers();
|
|
223
|
+
}
|
|
224
|
+
});
|
|
225
|
+
it("reports the pass status verbatim, including a soft skip", async () => {
|
|
226
|
+
const runPass = vi.fn(async () => ({
|
|
227
|
+
status: "soft_skipped",
|
|
228
|
+
scopeKey: "company",
|
|
229
|
+
}));
|
|
230
|
+
const options = makeOptions({ runPass });
|
|
231
|
+
await runPostSyncManifestUploads(options);
|
|
232
|
+
expect(options.events).toEqual([
|
|
233
|
+
{ company: "acme", scope: "company", status: "soft_skipped" },
|
|
234
|
+
]);
|
|
235
|
+
});
|
|
236
|
+
it("POSTs each chunk to /v1/sync-manifest/upload with the caller's bearer", async () => {
|
|
237
|
+
const fetchImpl = vi.fn(async () => new Response(JSON.stringify({
|
|
238
|
+
status: "accepted",
|
|
239
|
+
snapshotId: "snap-server",
|
|
240
|
+
completed: true,
|
|
241
|
+
materialised: true,
|
|
242
|
+
}), { status: 200, headers: { "content-type": "application/json" } }));
|
|
243
|
+
const options = makeOptions({
|
|
244
|
+
targets: [PERSONAL_TARGET],
|
|
245
|
+
completedCompanySlugs: new Set(["personal"]),
|
|
246
|
+
fetchImpl: fetchImpl,
|
|
247
|
+
});
|
|
248
|
+
const emitted = await runPostSyncManifestUploads(options);
|
|
249
|
+
expect(emitted).toEqual([
|
|
250
|
+
expect.objectContaining({ company: "personal", status: "uploaded" }),
|
|
251
|
+
]);
|
|
252
|
+
expect(fetchImpl).toHaveBeenCalled();
|
|
253
|
+
const [url, init] = fetchImpl.mock.calls[0];
|
|
254
|
+
expect(url).toBe("https://api.test/v1/sync-manifest/upload");
|
|
255
|
+
expect(init.method).toBe("POST");
|
|
256
|
+
expect(init.headers.Authorization).toBe("Bearer token");
|
|
257
|
+
});
|
|
258
|
+
it("uploads once across two sync passes inside the 24 h window", async () => {
|
|
259
|
+
const fetchImpl = vi.fn(async () => new Response(JSON.stringify({
|
|
260
|
+
status: "accepted",
|
|
261
|
+
snapshotId: "snap-server",
|
|
262
|
+
completed: true,
|
|
263
|
+
materialised: true,
|
|
264
|
+
}), { status: 200, headers: { "content-type": "application/json" } }));
|
|
265
|
+
const first = await runPostSyncManifestUploads(makeOptions({
|
|
266
|
+
targets: [PERSONAL_TARGET],
|
|
267
|
+
completedCompanySlugs: new Set(["personal"]),
|
|
268
|
+
fetchImpl: fetchImpl,
|
|
269
|
+
}));
|
|
270
|
+
expect(first).toEqual([
|
|
271
|
+
expect.objectContaining({ status: "uploaded", mode: "full" }),
|
|
272
|
+
]);
|
|
273
|
+
const requestsAfterFirst = fetchImpl.mock.calls.length;
|
|
274
|
+
expect(requestsAfterFirst).toBeGreaterThan(0);
|
|
275
|
+
// The daemon calls this after EVERY sync cycle; an hour later the throttle
|
|
276
|
+
// — not the caller — is what keeps a 70k-file walk off the laptop.
|
|
277
|
+
const second = await runPostSyncManifestUploads(makeOptions({
|
|
278
|
+
targets: [PERSONAL_TARGET],
|
|
279
|
+
completedCompanySlugs: new Set(["personal"]),
|
|
280
|
+
now: NOW_MS + 60 * 60 * 1000,
|
|
281
|
+
fetchImpl: fetchImpl,
|
|
282
|
+
}));
|
|
283
|
+
expect(second).toEqual([
|
|
284
|
+
expect.objectContaining({ company: "personal", status: "throttled" }),
|
|
285
|
+
]);
|
|
286
|
+
expect(fetchImpl.mock.calls).toHaveLength(requestsAfterFirst);
|
|
287
|
+
});
|
|
288
|
+
});
|
|
289
|
+
describe("enrolled installation identity (US-004)", () => {
|
|
290
|
+
/** Write a desktop client-health state file into `dir`. */
|
|
291
|
+
function writeHealthState(dir, body) {
|
|
292
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
293
|
+
fs.writeFileSync(path.join(dir, DESKTOP_CLIENT_HEALTH_STATE_FILE), body, "utf8");
|
|
294
|
+
}
|
|
295
|
+
it("reads the id the desktop heartbeat pinned in the state dir", () => {
|
|
296
|
+
writeHealthState(stateDir, JSON.stringify({
|
|
297
|
+
installationId: "e1bff370-b666-4b97-bfa6-d44c4e81f258",
|
|
298
|
+
sequence: 7,
|
|
299
|
+
}));
|
|
300
|
+
expect(readDesktopInstallationId({ stateDir, homeDir: path.join(base, "home") })).toBe("e1bff370-b666-4b97-bfa6-d44c4e81f258");
|
|
301
|
+
});
|
|
302
|
+
it("falls back to the ~/.hq path the Rust heartbeat hard-codes", () => {
|
|
303
|
+
const homeDir = path.join(base, "home");
|
|
304
|
+
writeHealthState(path.join(homeDir, ".hq"), JSON.stringify({ installationId: "from-home-dir-1234" }));
|
|
305
|
+
expect(readDesktopInstallationId({ stateDir, homeDir })).toBe("from-home-dir-1234");
|
|
306
|
+
});
|
|
307
|
+
it("returns undefined when no heartbeat has ever enrolled this host", () => {
|
|
308
|
+
expect(readDesktopInstallationId({ stateDir, homeDir: path.join(base, "home") })).toBeUndefined();
|
|
309
|
+
});
|
|
310
|
+
it("returns undefined for a corrupt or malformed state file", () => {
|
|
311
|
+
const homeDir = path.join(base, "home");
|
|
312
|
+
for (const body of [
|
|
313
|
+
"{ not json",
|
|
314
|
+
"null",
|
|
315
|
+
"[]",
|
|
316
|
+
JSON.stringify({ sequence: 3 }),
|
|
317
|
+
JSON.stringify({ installationId: 42 }),
|
|
318
|
+
// Fails the manifest contract's identifier shape — never send it.
|
|
319
|
+
JSON.stringify({ installationId: "has spaces" }),
|
|
320
|
+
JSON.stringify({ installationId: "" }),
|
|
321
|
+
]) {
|
|
322
|
+
writeHealthState(stateDir, body);
|
|
323
|
+
expect(readDesktopInstallationId({ stateDir, homeDir })).toBeUndefined();
|
|
324
|
+
}
|
|
325
|
+
});
|
|
326
|
+
it("prefers ~/.hq over a relocated state dir when the two disagree", () => {
|
|
327
|
+
// `~/.hq` is the ONLY file the menubar app's Rust heartbeat writes, so it
|
|
328
|
+
// holds the id the server has actually enrolled. A copy under a relocated
|
|
329
|
+
// HQ_STATE_DIR is either identical (harmless) or stale — and uploading
|
|
330
|
+
// under a stale id is a permanent 403 for the host, with no way for the
|
|
331
|
+
// enrolment fence to guess what was meant.
|
|
332
|
+
const homeDir = path.join(base, "home");
|
|
333
|
+
writeHealthState(path.join(homeDir, ".hq"), JSON.stringify({ installationId: "enrolled-by-heartbeat" }));
|
|
334
|
+
writeHealthState(stateDir, JSON.stringify({ installationId: "stale-relocated-copy" }));
|
|
335
|
+
expect(readDesktopInstallationId({ stateDir, homeDir })).toBe("enrolled-by-heartbeat");
|
|
336
|
+
});
|
|
337
|
+
it("still reads a relocated state dir when ~/.hq has no file at all", () => {
|
|
338
|
+
// The fallback must survive the reordering: on a host where state was
|
|
339
|
+
// relocated before the heartbeat ever ran, this is the only copy there is,
|
|
340
|
+
// and finding it beats skipping the audit entirely.
|
|
341
|
+
const homeDir = path.join(base, "home");
|
|
342
|
+
writeHealthState(stateDir, JSON.stringify({ installationId: "only-copy-1234" }));
|
|
343
|
+
expect(readDesktopInstallationId({ stateDir, homeDir })).toBe("only-copy-1234");
|
|
344
|
+
});
|
|
345
|
+
it("skips a malformed ~/.hq file and falls through to the state dir", () => {
|
|
346
|
+
const homeDir = path.join(base, "home");
|
|
347
|
+
writeHealthState(path.join(homeDir, ".hq"), "{ not json");
|
|
348
|
+
writeHealthState(stateDir, JSON.stringify({ installationId: "usable-fallback-1" }));
|
|
349
|
+
expect(readDesktopInstallationId({ stateDir, homeDir })).toBe("usable-fallback-1");
|
|
350
|
+
});
|
|
351
|
+
it("never creates, mints, or rewrites the client-health state file", () => {
|
|
352
|
+
const homeDir = path.join(base, "home");
|
|
353
|
+
fs.mkdirSync(path.join(homeDir, ".hq"), { recursive: true });
|
|
354
|
+
expect(readDesktopInstallationId({ stateDir, homeDir })).toBeUndefined();
|
|
355
|
+
expect(fs.existsSync(path.join(stateDir, DESKTOP_CLIENT_HEALTH_STATE_FILE))).toBe(false);
|
|
356
|
+
expect(fs.existsSync(path.join(homeDir, ".hq", DESKTOP_CLIENT_HEALTH_STATE_FILE))).toBe(false);
|
|
357
|
+
const body = JSON.stringify({ installationId: "pinned-id-0001" });
|
|
358
|
+
writeHealthState(stateDir, body);
|
|
359
|
+
expect(readDesktopInstallationId({ stateDir, homeDir })).toBe("pinned-id-0001");
|
|
360
|
+
expect(fs.readFileSync(path.join(stateDir, DESKTOP_CLIENT_HEALTH_STATE_FILE), "utf8")).toBe(body);
|
|
361
|
+
});
|
|
362
|
+
it("stamps the enrolled id, keeping machineId as the distinct host id", async () => {
|
|
363
|
+
writeHealthState(stateDir, JSON.stringify({ installationId: "enrolled-abcdef" }));
|
|
364
|
+
const runPass = makeUploadedPass();
|
|
365
|
+
await runPostSyncManifestUploads(makeOptions({
|
|
366
|
+
runPass,
|
|
367
|
+
resolveMachineId: () => "hq-root-machine-id",
|
|
368
|
+
// Exercise the REAL reader, not the seam.
|
|
369
|
+
resolveInstallationId: undefined,
|
|
370
|
+
}));
|
|
371
|
+
const passed = runPass.mock.calls[0][0];
|
|
372
|
+
expect(passed.installationId).toBe("enrolled-abcdef");
|
|
373
|
+
expect(passed.machineId).toBe("hq-root-machine-id");
|
|
374
|
+
expect(passed.installationId).not.toBe(passed.machineId);
|
|
375
|
+
});
|
|
376
|
+
it("skips every upload when this host has no enrolled identity", async () => {
|
|
377
|
+
const runPass = makeUploadedPass();
|
|
378
|
+
const fetchImpl = vi.fn();
|
|
379
|
+
const diagnostics = [];
|
|
380
|
+
const options = makeOptions({
|
|
381
|
+
runPass,
|
|
382
|
+
resolveInstallationId: () => undefined,
|
|
383
|
+
fetchImpl: fetchImpl,
|
|
384
|
+
reportDiagnostic: (d) => diagnostics.push(d.event),
|
|
385
|
+
});
|
|
386
|
+
// A guaranteed 403 is worse than no audit: skip, emit nothing, stay quiet.
|
|
387
|
+
await expect(runPostSyncManifestUploads(options)).resolves.toEqual([]);
|
|
388
|
+
expect(runPass).not.toHaveBeenCalled();
|
|
389
|
+
expect(fetchImpl).not.toHaveBeenCalled();
|
|
390
|
+
expect(options.events).toEqual([]);
|
|
391
|
+
expect(diagnostics).toContain("runner.manifest_upload.not_enrolled");
|
|
392
|
+
});
|
|
393
|
+
it("skips rather than throwing when the identity lookup blows up", async () => {
|
|
394
|
+
const runPass = makeUploadedPass();
|
|
395
|
+
const diagnostics = [];
|
|
396
|
+
const options = makeOptions({
|
|
397
|
+
runPass,
|
|
398
|
+
resolveInstallationId: () => {
|
|
399
|
+
throw new Error("boom");
|
|
400
|
+
},
|
|
401
|
+
reportDiagnostic: (d) => diagnostics.push(d.event),
|
|
402
|
+
});
|
|
403
|
+
await expect(runPostSyncManifestUploads(options)).resolves.toEqual([]);
|
|
404
|
+
expect(runPass).not.toHaveBeenCalled();
|
|
405
|
+
expect(diagnostics).toContain("runner.manifest_upload.identity_failed");
|
|
406
|
+
});
|
|
407
|
+
});
|
|
408
|
+
/**
|
|
409
|
+
* The personal leg is identified by `personalMode`, never by the slug string.
|
|
410
|
+
*
|
|
411
|
+
* "personal" is a legal COMPANY slug: an operator can designate a cloud company
|
|
412
|
+
* whose directory is `companies/personal` with its own uid and its own bucket.
|
|
413
|
+
* Keying the scope on the string would build a PERSONAL manifest for it — the
|
|
414
|
+
* personal snapshot scope key, the personal journal shard, the personal walk
|
|
415
|
+
* roots — and upload that tenant's file list under the operator's own vault.
|
|
416
|
+
*/
|
|
417
|
+
describe("runPostSyncManifestUploads — a cloud company may be named 'personal'", () => {
|
|
418
|
+
const COMPANY_NAMED_PERSONAL = { uid: "ent_personal_co", slug: "personal" };
|
|
419
|
+
it("builds a COMPANY scope for a company slug of 'personal'", async () => {
|
|
420
|
+
const runPass = makeUploadedPass();
|
|
421
|
+
await runPostSyncManifestUploads(makeOptions({
|
|
422
|
+
targets: [COMPANY_NAMED_PERSONAL],
|
|
423
|
+
completedCompanySlugs: new Set(["personal"]),
|
|
424
|
+
runPass,
|
|
425
|
+
}));
|
|
426
|
+
expect(runPass).toHaveBeenCalledTimes(1);
|
|
427
|
+
expect(runPass.mock.calls[0]?.[0]?.scope).toEqual({
|
|
428
|
+
kind: "company",
|
|
429
|
+
companyUid: "ent_personal_co",
|
|
430
|
+
slug: "personal",
|
|
431
|
+
});
|
|
432
|
+
});
|
|
433
|
+
it("still builds a PERSONAL scope when personalMode is set", async () => {
|
|
434
|
+
const runPass = makeUploadedPass();
|
|
435
|
+
await runPostSyncManifestUploads(makeOptions({
|
|
436
|
+
targets: [PERSONAL_TARGET],
|
|
437
|
+
completedCompanySlugs: new Set(["personal"]),
|
|
438
|
+
runPass,
|
|
439
|
+
}));
|
|
440
|
+
expect(runPass.mock.calls[0]?.[0]?.scope).toEqual({ kind: "personal" });
|
|
441
|
+
});
|
|
442
|
+
it("keeps the two apart in one fanout, so neither scope is built twice", async () => {
|
|
443
|
+
// The failure mode this guards: both legs collapsing onto `kind: "personal"`,
|
|
444
|
+
// which would make the second pass overwrite the first's snapshot — one
|
|
445
|
+
// scope key, two tenants.
|
|
446
|
+
const runPass = makeUploadedPass();
|
|
447
|
+
await runPostSyncManifestUploads(makeOptions({
|
|
448
|
+
targets: [PERSONAL_TARGET, COMPANY_NAMED_PERSONAL],
|
|
449
|
+
completedCompanySlugs: new Set(["personal"]),
|
|
450
|
+
runPass,
|
|
451
|
+
}));
|
|
452
|
+
const scopes = runPass.mock.calls.map((call) => call[0]?.scope);
|
|
453
|
+
expect(scopes).toEqual([
|
|
454
|
+
{ kind: "personal" },
|
|
455
|
+
{ kind: "company", companyUid: "ent_personal_co", slug: "personal" },
|
|
456
|
+
]);
|
|
457
|
+
});
|
|
458
|
+
});
|
|
459
|
+
describe("runPostSyncManifestUploads — the tail step stats, it does not hash", () => {
|
|
460
|
+
it("pins hashPolicy to 'never' for every scope", async () => {
|
|
461
|
+
// Content hashing after every sync cycle measured at ~9m40s and 2.9 GB RSS
|
|
462
|
+
// on a real vault with a cold journal. The daemon path must never opt into
|
|
463
|
+
// it; `hq sync manifest --full-hash` is where that lives.
|
|
464
|
+
const runPass = makeUploadedPass();
|
|
465
|
+
await runPostSyncManifestUploads(makeOptions({ targets: [ACME_TARGET, PERSONAL_TARGET], completedCompanySlugs: new Set(["acme", "personal"]), runPass }));
|
|
466
|
+
expect(runPass.mock.calls.map((call) => call[0].hashPolicy)).toEqual(["never", "never"]);
|
|
467
|
+
});
|
|
468
|
+
});
|
|
469
|
+
describe("runPostSyncManifestUploads — phase budget reporting", () => {
|
|
470
|
+
afterEach(() => {
|
|
471
|
+
vi.useRealTimers();
|
|
472
|
+
});
|
|
473
|
+
it("counts the remaining scopes from the loop position, not from emitted events", async () => {
|
|
474
|
+
// Two ways a scope leaves the loop WITHOUT emitting an event: it has no uid
|
|
475
|
+
// (no scope can be attributed to it, so it is skipped), and the phase
|
|
476
|
+
// budget runs out before it starts. `eligible.length - emitted.length`
|
|
477
|
+
// counted both as still-pending, so the operator-facing "remaining" was
|
|
478
|
+
// over-reported by one per skipped target.
|
|
479
|
+
const noUid = { slug: "no-uid" };
|
|
480
|
+
const targets = [
|
|
481
|
+
noUid,
|
|
482
|
+
ACME_TARGET,
|
|
483
|
+
{ uid: "ent_b", slug: "b" },
|
|
484
|
+
{ uid: "ent_c", slug: "c" },
|
|
485
|
+
];
|
|
486
|
+
const diagnostics = [];
|
|
487
|
+
// `setSystemTime`, not `advanceTimersByTime`: this must move `Date.now()`
|
|
488
|
+
// past the phase deadline WITHOUT firing the pending phase-abort and
|
|
489
|
+
// per-pass race timers, which would take the `phase_timeout` branch
|
|
490
|
+
// instead of the budget-exhausted one under test.
|
|
491
|
+
vi.useFakeTimers({ shouldAdvanceTime: true });
|
|
492
|
+
const startedAt = Date.now();
|
|
493
|
+
const runPass = vi.fn(async (options) => {
|
|
494
|
+
vi.setSystemTime(startedAt + RUNNER_MANIFEST_PHASE_WALL_MS + 1);
|
|
495
|
+
return { status: "uploaded", scopeKey: options.scope.kind };
|
|
496
|
+
});
|
|
497
|
+
await runPostSyncManifestUploads(makeOptions({
|
|
498
|
+
targets,
|
|
499
|
+
completedCompanySlugs: new Set(["no-uid", "acme", "b", "c"]),
|
|
500
|
+
runPass,
|
|
501
|
+
reportDiagnostic: (diagnostic) => diagnostics.push(diagnostic),
|
|
502
|
+
}));
|
|
503
|
+
// Index 0 skipped (no uid), index 1 ran and spent the budget, so indices 2
|
|
504
|
+
// and 3 are what is left.
|
|
505
|
+
expect(runPass).toHaveBeenCalledTimes(1);
|
|
506
|
+
const exhausted = diagnostics.find((diagnostic) => diagnostic.event === "runner.manifest_upload.phase_budget_exhausted");
|
|
507
|
+
expect(exhausted?.context?.remaining).toBe(2);
|
|
508
|
+
});
|
|
509
|
+
});
|
|
510
|
+
//# sourceMappingURL=sync-runner-manifest.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-runner-manifest.test.js","sourceRoot":"","sources":["../../src/bin/sync-runner-manifest.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,8 @@
|
|
|
29
29
|
* progress per-file download
|
|
30
30
|
* complete per-company summary
|
|
31
31
|
* all-complete aggregate summary after fanout
|
|
32
|
+
* manifest-upload per-scope sync-manifest audit outcome, AFTER
|
|
33
|
+
* all-complete. None on older consumers.
|
|
32
34
|
* stderr — diagnostic stream:
|
|
33
35
|
* error per-file or per-company error
|
|
34
36
|
* auth-error no valid token available (interactive login disabled)
|
|
@@ -61,12 +63,12 @@ import { resolvePullScope, readPinnedPrefixes, SESSIONS_SCOPE_PREFIX, type PullS
|
|
|
61
63
|
import { PERSONAL_VAULT_EXCLUDED_TOP_LEVEL, computePersonalVaultPaths } from "../personal-vault.js";
|
|
62
64
|
import type { SyncOptions, SyncResult, SyncProgressEvent } from "../cli/sync.js";
|
|
63
65
|
import type { ShareOptions, ShareResult } from "../cli/share.js";
|
|
64
|
-
import { type ContextRefresherFactory, type ObjectIOFactory, type PresignTransportClient } from "../object-io.js";
|
|
65
66
|
import { reindexAfterSync } from "../qmd-reindex.js";
|
|
66
67
|
import type { ReindexOptions as QmdReindexOptions } from "../qmd-reindex.js";
|
|
67
68
|
import type { ReindexOptions, ReindexResult } from "../cli/reindex.js";
|
|
68
69
|
import type { TelemetryEventsBatch, TelemetryEventsIngestResult } from "../vault-client.js";
|
|
69
70
|
import { type PostSyncFlagEvaluator } from "./sync-runner-post-sync-flags.js";
|
|
71
|
+
import { type ManifestUploadEventPayload, type RunPostSyncManifestUploadsOptions } from "./sync-runner-manifest.js";
|
|
70
72
|
import type { Clock, LocalDeleteSnapshot, TreeChangeBatch } from "../watcher.js";
|
|
71
73
|
import type { PushReceiver, SyncBatchEngineFn } from "../sync/push-receiver.js";
|
|
72
74
|
import { type EventSyncHandles, type StartEventSyncOptions } from "../sync/event-sync.js";
|
|
@@ -135,26 +137,7 @@ export declare function resolveDeletePolicy(): DeletePropagationPolicy;
|
|
|
135
137
|
* the new personal-vault default exclusions, just to do nothing useful).
|
|
136
138
|
*/
|
|
137
139
|
export declare function resolveSkipPersonal(flag: boolean): boolean;
|
|
138
|
-
|
|
139
|
-
* Resolve the object-transport factory for this sync session.
|
|
140
|
-
*
|
|
141
|
-
* Company vaults (`cmp_*`) ALWAYS use the presigned-URL transport: the client
|
|
142
|
-
* holds no raw AWS credentials (it fetches short-lived signed URLs) and every
|
|
143
|
-
* read/write is authorized server-side per-file, so it never hits the 2048-char
|
|
144
|
-
* STS session-policy ceiling that produced the HQ-59 lockout. The STS-direct-S3
|
|
145
|
-
* (`S3SdkObjectIO`) path for company vaults is RETIRED — there is no env
|
|
146
|
-
* override or rollback lever that can route a company vault back to direct S3.
|
|
147
|
-
* (The former `HQ_SYNC_PRESIGN_TRANSPORT` kill-switch is gone with this change.)
|
|
148
|
-
*
|
|
149
|
-
* Personal vaults (`prs_*`) KEEP the direct-S3/STS path: the membership-gated
|
|
150
|
-
* `list`/`presign` endpoints 403 for the membership-less vend-self model, and a
|
|
151
|
-
* single-owner personal vault has no ACL-scale problem. That cmp_/prs_ split
|
|
152
|
-
* lives inside {@link presignObjectIOFactory}.
|
|
153
|
-
*
|
|
154
|
-
* Returns `null` only when the client predates the presign methods (never in a
|
|
155
|
-
* shipped build); the caller then resets to the SDK default factory.
|
|
156
|
-
*/
|
|
157
|
-
export declare function selectObjectIOFactory(client: Partial<PresignTransportClient>, refresherFor?: ContextRefresherFactory, forceRefresherFor?: ContextRefresherFactory): ObjectIOFactory | null;
|
|
140
|
+
export { selectObjectIOFactory } from "../company-vault-transport.js";
|
|
158
141
|
export { PERSONAL_VAULT_EXCLUDED_TOP_LEVEL, computePersonalVaultPaths };
|
|
159
142
|
/**
|
|
160
143
|
* Every event the runner emits. Channel routing (stdout vs stderr) is
|
|
@@ -434,6 +417,52 @@ export type RunnerEvent = {
|
|
|
434
417
|
type: "conflicts-remaining";
|
|
435
418
|
count: number;
|
|
436
419
|
samplePaths: string[];
|
|
420
|
+
} | ({
|
|
421
|
+
/**
|
|
422
|
+
* Sync-reconciliation audit (US-004): the outcome of ONE scope's
|
|
423
|
+
* manifest upload pass, emitted at most once per scope, AFTER
|
|
424
|
+
* `all-complete`, and only for a scope whose sync leg finished cleanly.
|
|
425
|
+
*
|
|
426
|
+
* Diagnostic-only and strictly additive: it is never an `error`, it must
|
|
427
|
+
* never route through the menubar's `is_alertable_error` classifier, and
|
|
428
|
+
* deployed desktop builds that predate it ignore the unknown type (every
|
|
429
|
+
* parse site is `if let Ok(...)`). None on older consumers.
|
|
430
|
+
*
|
|
431
|
+
* `status` is the pass verdict, not a sync verdict — `throttled`
|
|
432
|
+
* (the 24h per-scope spacing), `disabled` (kill switch) and
|
|
433
|
+
* `soft_skipped` (server has no manifest endpoint yet) are all normal
|
|
434
|
+
* steady-state answers, and even `failed` means only that this audit
|
|
435
|
+
* sample was lost, never that the sync failed.
|
|
436
|
+
*
|
|
437
|
+
* Every field is numeric or a fixed token (company slug included) —
|
|
438
|
+
* never a path, filename, or error message.
|
|
439
|
+
*/
|
|
440
|
+
type: "manifest-upload";
|
|
441
|
+
} & ManifestUploadEventPayload) | {
|
|
442
|
+
/**
|
|
443
|
+
* Phase-level diagnostic from the post-sync manifest tail step.
|
|
444
|
+
*
|
|
445
|
+
* This carries the reasons a pass never ran at all — no enrolled
|
|
446
|
+
* client-health installation, an identity lookup that threw, a phase that
|
|
447
|
+
* threw — which are NOT per-scope outcomes and so have no
|
|
448
|
+
* `manifest-upload` event to ride on.
|
|
449
|
+
*
|
|
450
|
+
* It is deliberately its OWN type and NOT an `error`. The tail step is a
|
|
451
|
+
* best-effort audit that runs after `all-complete`; routing its
|
|
452
|
+
* housekeeping through the runner's `error` channel put a `type:"error"`
|
|
453
|
+
* line on stderr on every host without a menubar heartbeat, which the
|
|
454
|
+
* menubar feeds to Sentry and which made "the sync emitted an error"
|
|
455
|
+
* true for a completely clean sync. Containment is the contract: the tail
|
|
456
|
+
* may describe itself, and may never speak for the sync.
|
|
457
|
+
*
|
|
458
|
+
* Additive: deployed desktop builds that predate it ignore the unknown
|
|
459
|
+
* type (every parse site is `if let Ok(...)`).
|
|
460
|
+
*/
|
|
461
|
+
type: "manifest-upload-diagnostic";
|
|
462
|
+
/** Fixed event token, e.g. `runner.manifest_upload.not_enrolled`. */
|
|
463
|
+
event: string;
|
|
464
|
+
/** Human-readable reason. Never a path, filename, or company. */
|
|
465
|
+
message: string;
|
|
437
466
|
} | {
|
|
438
467
|
/**
|
|
439
468
|
* Diagnostic-only heap-pressure crossing. Emitted at most once per rising
|
|
@@ -661,6 +690,12 @@ export interface RunnerDeps {
|
|
|
661
690
|
collectTelemetry?: () => Promise<void>;
|
|
662
691
|
/** Maximum time to wait for pre-completion telemetry. Defaults to 120s. */
|
|
663
692
|
telemetryTimeoutMs?: number;
|
|
693
|
+
/**
|
|
694
|
+
* Post-sync manifest upload tail step (US-004). Defaults to
|
|
695
|
+
* {@link runPostSyncManifestUploads}. Injected by tests so a runner unit
|
|
696
|
+
* test never walks a tree or opens a socket for the audit.
|
|
697
|
+
*/
|
|
698
|
+
runManifestUploads?: (options: RunPostSyncManifestUploadsOptions) => Promise<ManifestUploadEventPayload[]>;
|
|
664
699
|
}
|
|
665
700
|
export interface RunnerPassResult {
|
|
666
701
|
pushPathResults: Array<{
|