@indigoai-us/hq-cloud 6.18.109 → 6.18.110
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/area-ledger-migration.d.ts.map +1 -1
- package/dist/bin/area-ledger-migration.js +5 -3
- package/dist/bin/area-ledger-migration.js.map +1 -1
- package/dist/bin/backup-prune-runner.js +2 -2
- package/dist/bin/backup-prune-runner.js.map +1 -1
- package/dist/bin/runner-output-guard.d.ts +39 -0
- package/dist/bin/runner-output-guard.d.ts.map +1 -0
- package/dist/bin/runner-output-guard.js +104 -0
- package/dist/bin/runner-output-guard.js.map +1 -0
- package/dist/bin/sync-runner-company.d.ts +9 -0
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +76 -6
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner.d.ts +37 -1
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +37 -3
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/cli/conflict.d.ts +30 -1
- package/dist/cli/conflict.d.ts.map +1 -1
- package/dist/cli/conflict.js +69 -3
- package/dist/cli/conflict.js.map +1 -1
- package/dist/cli/reconcile-skip-reason.d.ts +1 -1
- package/dist/cli/reconcile-skip-reason.d.ts.map +1 -1
- package/dist/cli/reconcile-skip-reason.js +2 -0
- package/dist/cli/reconcile-skip-reason.js.map +1 -1
- package/dist/cli/reindex.d.ts.map +1 -1
- package/dist/cli/reindex.js +228 -43
- package/dist/cli/reindex.js.map +1 -1
- package/dist/cli/rescue-core.d.ts +98 -2
- package/dist/cli/rescue-core.d.ts.map +1 -1
- package/dist/cli/rescue-core.js +487 -74
- package/dist/cli/rescue-core.js.map +1 -1
- package/dist/cli/rescue.d.ts.map +1 -1
- package/dist/cli/rescue.js +37 -9
- package/dist/cli/rescue.js.map +1 -1
- package/dist/cli/share.d.ts +35 -8
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +437 -32
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/sync.d.ts +70 -5
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +439 -77
- package/dist/cli/sync.js.map +1 -1
- package/dist/cognito-auth.d.ts +10 -0
- package/dist/cognito-auth.d.ts.map +1 -1
- package/dist/cognito-auth.js +162 -1
- package/dist/cognito-auth.js.map +1 -1
- package/dist/ignore.d.ts.map +1 -1
- package/dist/ignore.js +43 -21
- package/dist/ignore.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/journal-row-store.d.ts +3 -0
- package/dist/journal-row-store.d.ts.map +1 -1
- package/dist/journal-row-store.js +21 -0
- package/dist/journal-row-store.js.map +1 -1
- package/dist/journal-snapshot-decoder.js +2 -0
- package/dist/journal-snapshot-decoder.js.map +1 -1
- package/dist/journal-snapshot-v4.d.ts.map +1 -1
- package/dist/journal-snapshot-v4.js +6 -1
- package/dist/journal-snapshot-v4.js.map +1 -1
- package/dist/journal.d.ts +1 -1
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +20 -20
- package/dist/journal.js.map +1 -1
- package/dist/lib/append-log-merge.d.ts +43 -0
- package/dist/lib/append-log-merge.d.ts.map +1 -0
- package/dist/lib/append-log-merge.js +424 -0
- package/dist/lib/append-log-merge.js.map +1 -0
- package/dist/lib/same-path-upload-lock.d.ts +27 -1
- package/dist/lib/same-path-upload-lock.d.ts.map +1 -1
- package/dist/lib/same-path-upload-lock.js +32 -1
- package/dist/lib/same-path-upload-lock.js.map +1 -1
- package/dist/object-io.d.ts +36 -1
- package/dist/object-io.d.ts.map +1 -1
- package/dist/object-io.js +93 -12
- package/dist/object-io.js.map +1 -1
- package/dist/operation-lock.d.ts +27 -1
- package/dist/operation-lock.d.ts.map +1 -1
- package/dist/operation-lock.js +94 -8
- package/dist/operation-lock.js.map +1 -1
- package/dist/outposts/client.d.ts +19 -6
- package/dist/outposts/client.d.ts.map +1 -1
- package/dist/outposts/client.js +16 -5
- package/dist/outposts/client.js.map +1 -1
- package/dist/outposts/command.d.ts +2 -1
- package/dist/outposts/command.d.ts.map +1 -1
- package/dist/outposts/command.js +81 -13
- package/dist/outposts/command.js.map +1 -1
- package/dist/outposts/self-deploy.d.ts.map +1 -1
- package/dist/outposts/self-deploy.js +3 -0
- package/dist/outposts/self-deploy.js.map +1 -1
- package/dist/private-folder-transport.d.ts +0 -2
- package/dist/private-folder-transport.d.ts.map +1 -1
- package/dist/private-folder-transport.js +17 -16
- package/dist/private-folder-transport.js.map +1 -1
- package/dist/push-identity-fence.d.ts +116 -3
- package/dist/push-identity-fence.d.ts.map +1 -1
- package/dist/push-identity-fence.js +625 -62
- package/dist/push-identity-fence.js.map +1 -1
- package/dist/qmd-reindex.d.ts.map +1 -1
- package/dist/qmd-reindex.js +3 -2
- package/dist/qmd-reindex.js.map +1 -1
- package/dist/s3.d.ts +30 -9
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +110 -82
- package/dist/s3.js.map +1 -1
- package/dist/sync/area-ledger-migration.d.ts +17 -0
- package/dist/sync/area-ledger-migration.d.ts.map +1 -1
- package/dist/sync/area-ledger-migration.js +37 -3
- package/dist/sync/area-ledger-migration.js.map +1 -1
- package/dist/sync/scattered-delete-burst.d.ts +61 -0
- package/dist/sync/scattered-delete-burst.d.ts.map +1 -0
- package/dist/sync/scattered-delete-burst.js +111 -0
- package/dist/sync/scattered-delete-burst.js.map +1 -0
- package/dist/sync/unattended-delete-hold.d.ts +102 -0
- package/dist/sync/unattended-delete-hold.d.ts.map +1 -0
- package/dist/sync/unattended-delete-hold.js +164 -0
- package/dist/sync/unattended-delete-hold.js.map +1 -0
- package/dist/sync-core.d.ts +5 -6
- package/dist/sync-core.d.ts.map +1 -1
- package/dist/sync-core.js +5 -6
- package/dist/sync-core.js.map +1 -1
- package/dist/types.d.ts +13 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/vault-client.d.ts +6 -0
- package/dist/vault-client.d.ts.map +1 -1
- package/dist/vault-client.js +53 -8
- package/dist/vault-client.js.map +1 -1
- package/dist/vault-key-grammar.d.ts +44 -0
- package/dist/vault-key-grammar.d.ts.map +1 -0
- package/dist/vault-key-grammar.js +158 -0
- package/dist/vault-key-grammar.js.map +1 -0
- package/dist/watcher.d.ts.map +1 -1
- package/dist/watcher.js +4 -1
- package/dist/watcher.js.map +1 -1
- package/dist/windows-extended-path.d.ts +22 -0
- package/dist/windows-extended-path.d.ts.map +1 -0
- package/dist/windows-extended-path.js +55 -0
- package/dist/windows-extended-path.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"area-ledger-migration.d.ts","sourceRoot":"","sources":["../../src/bin/area-ledger-migration.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"area-ledger-migration.d.ts","sourceRoot":"","sources":["../../src/bin/area-ledger-migration.ts"],"names":[],"mappings":";AAcA,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACpC,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC3C,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC3C,8EAA8E;IAC9E,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAMD,iFAAiF;AACjF,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,GAAE,gBAAqB,GAAG,MAAM,CAoEtG"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/** Operator-facing runner for the v3-to-area bridge. */
|
|
3
3
|
import * as fs from "node:fs";
|
|
4
4
|
import { fileURLToPath } from "node:url";
|
|
5
|
-
import { AreaLedgerMigration, assertV3OnlyPinAllowed, getStateDir, openJournalStateStoreForMigration, } from "../journal.js";
|
|
5
|
+
import { AreaLedgerMigration, assertV3OnlyPinAllowed, getStateDir, openJournalStateStoreForMigration, readAreaResolverJson, } from "../journal.js";
|
|
6
6
|
import { hasSharedOperationLockForPid, withOperationLockSync } from "../operation-lock.js";
|
|
7
7
|
import { AreaResolver } from "../sync/area-resolver.js";
|
|
8
8
|
function usage() {
|
|
@@ -12,7 +12,7 @@ function usage() {
|
|
|
12
12
|
export function runAreaLedgerMigrationCli(argv, deps = {}) {
|
|
13
13
|
const stdout = deps.stdout ?? process.stdout;
|
|
14
14
|
const stderr = deps.stderr ?? process.stderr;
|
|
15
|
-
const readFile = deps.readFile
|
|
15
|
+
const readFile = deps.readFile;
|
|
16
16
|
const journalIndex = argv.indexOf("--journal");
|
|
17
17
|
const layoutIndex = argv.indexOf("--layout");
|
|
18
18
|
const hqRootIndex = argv.indexOf("--hq-root");
|
|
@@ -41,7 +41,9 @@ export function runAreaLedgerMigrationCli(argv, deps = {}) {
|
|
|
41
41
|
const migration = new AreaLedgerMigration({
|
|
42
42
|
rootDir: getStateDir(),
|
|
43
43
|
journalSlug,
|
|
44
|
-
resolver
|
|
44
|
+
// The resolver file is published by rename, but an older writer may still
|
|
45
|
+
// rewrite it in place; the shared reader retries one torn read.
|
|
46
|
+
resolver: readFile ? AreaResolver.fromJson(readFile(layoutPath)) : readAreaResolverJson(layoutPath).resolver,
|
|
45
47
|
legacyStore: openJournalStateStoreForMigration(journalSlug),
|
|
46
48
|
});
|
|
47
49
|
const recoverMirror = () => migration.recoverLegacyMirrorIfNeeded(deps.migrationLockTimeoutSec ?? 5);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"area-ledger-migration.js","sourceRoot":"","sources":["../../src/bin/area-ledger-migration.ts"],"names":[],"mappings":";AACA,wDAAwD;AACxD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,WAAW,EACX,iCAAiC,
|
|
1
|
+
{"version":3,"file":"area-ledger-migration.js","sourceRoot":"","sources":["../../src/bin/area-ledger-migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
/** Explicit, local-only retention command. Defaults to dry-run. */
|
|
3
|
-
import * as fs from "fs";
|
|
4
3
|
import * as path from "path";
|
|
5
4
|
import { fileURLToPath } from "node:url";
|
|
6
5
|
import { applyBackupPruneBounded, inventoryManagedSnapshots } from "../backup-prune.js";
|
|
7
6
|
import { acquireOperationLock, OperationLockedError } from "../operation-lock.js";
|
|
7
|
+
import { realpathRootSync } from "../windows-extended-path.js";
|
|
8
8
|
/** Parse the full CLI token; partial numeric prefixes are never accepted. */
|
|
9
9
|
export function parsePositiveInteger(value) {
|
|
10
10
|
if (!/^[1-9]\d*$/.test(value))
|
|
@@ -28,7 +28,7 @@ export function runBackupPruneCli(argv = process.argv.slice(2)) {
|
|
|
28
28
|
process.stderr.write("hq-backup-prune: --max-units must be a positive integer\n");
|
|
29
29
|
return 2;
|
|
30
30
|
}
|
|
31
|
-
const root =
|
|
31
|
+
const root = realpathRootSync(rootArg);
|
|
32
32
|
const backupRoot = backupArg ? path.resolve(backupArg) : path.join(process.env.HOME ?? "", ".hq", "backups");
|
|
33
33
|
let lock;
|
|
34
34
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup-prune-runner.js","sourceRoot":"","sources":["../../src/bin/backup-prune-runner.ts"],"names":[],"mappings":";AACA,mEAAmE;AACnE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"backup-prune-runner.js","sourceRoot":"","sources":["../../src/bin/backup-prune-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Broken-pipe guard for the sync runner's stdout and stderr.
|
|
3
|
+
*
|
|
4
|
+
* The desktop app reads a watch runner's protocol over pipes. When the app
|
|
5
|
+
* exits (a quit, a crash, an update restart), the next write to either pipe
|
|
6
|
+
* fails with `EPIPE`. A writable stream with no `error` listener turns that
|
|
7
|
+
* into an uncaught exception, so the runner died mid-pass without releasing
|
|
8
|
+
* its watch-owner lease or writing its final status, and the host was left
|
|
9
|
+
* showing "syncing" with a dead pid.
|
|
10
|
+
*
|
|
11
|
+
* This guard listens for `error` on both streams. A broken-output error
|
|
12
|
+
* (`EPIPE`, a destroyed stream, a reset socket) is swallowed and reported to
|
|
13
|
+
* the subscribers once, so a watch runner started with `--exit-with-parent`
|
|
14
|
+
* can stop the way it stops when the parent-exit monitor fires. Any other
|
|
15
|
+
* stream error keeps its old behavior: it is rethrown as uncaught.
|
|
16
|
+
*/
|
|
17
|
+
export interface GuardedOutputStream {
|
|
18
|
+
on(event: "error", listener: (error: unknown) => void): unknown;
|
|
19
|
+
off(event: "error", listener: (error: unknown) => void): unknown;
|
|
20
|
+
}
|
|
21
|
+
/** True when `error` means the stream's reader is gone (not a real fault). */
|
|
22
|
+
export declare function isBrokenOutputError(error: unknown): boolean;
|
|
23
|
+
/** True once a guarded stream has reported a broken pipe. */
|
|
24
|
+
export declare function runnerOutputBroken(): boolean;
|
|
25
|
+
/**
|
|
26
|
+
* Run `listener` once the runner's output is broken. Runs it right away (on a
|
|
27
|
+
* microtask) when the output already broke. Returns an unsubscribe function.
|
|
28
|
+
*/
|
|
29
|
+
export declare function onRunnerOutputBroken(listener: () => void): () => void;
|
|
30
|
+
/**
|
|
31
|
+
* Attach the guard to `streams` (the process's stdout and stderr by default).
|
|
32
|
+
* `rethrow` receives every error that is not a broken pipe; the default
|
|
33
|
+
* rethrows it as uncaught, which is what Node did with no listener. Returns a
|
|
34
|
+
* function that detaches the guard.
|
|
35
|
+
*/
|
|
36
|
+
export declare function installRunnerOutputGuard(streams?: readonly GuardedOutputStream[], rethrow?: (error: unknown) => void): () => void;
|
|
37
|
+
/** Test seam: forget a reported broken pipe and every subscriber. */
|
|
38
|
+
export declare function resetRunnerOutputGuardForTests(): void;
|
|
39
|
+
//# sourceMappingURL=runner-output-guard.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runner-output-guard.d.ts","sourceRoot":"","sources":["../../src/bin/runner-output-guard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC;IAChE,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC;CAClE;AAUD,8EAA8E;AAC9E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAM3D;AAiBD,6DAA6D;AAC7D,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAerE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,GAAE,SAAS,mBAAmB,EAAqC,EAC1E,OAAO,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAI5B,GACA,MAAM,IAAI,CAYZ;AAED,qEAAqE;AACrE,wBAAgB,8BAA8B,IAAI,IAAI,CAGrD"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Broken-pipe guard for the sync runner's stdout and stderr.
|
|
3
|
+
*
|
|
4
|
+
* The desktop app reads a watch runner's protocol over pipes. When the app
|
|
5
|
+
* exits (a quit, a crash, an update restart), the next write to either pipe
|
|
6
|
+
* fails with `EPIPE`. A writable stream with no `error` listener turns that
|
|
7
|
+
* into an uncaught exception, so the runner died mid-pass without releasing
|
|
8
|
+
* its watch-owner lease or writing its final status, and the host was left
|
|
9
|
+
* showing "syncing" with a dead pid.
|
|
10
|
+
*
|
|
11
|
+
* This guard listens for `error` on both streams. A broken-output error
|
|
12
|
+
* (`EPIPE`, a destroyed stream, a reset socket) is swallowed and reported to
|
|
13
|
+
* the subscribers once, so a watch runner started with `--exit-with-parent`
|
|
14
|
+
* can stop the way it stops when the parent-exit monitor fires. Any other
|
|
15
|
+
* stream error keeps its old behavior: it is rethrown as uncaught.
|
|
16
|
+
*/
|
|
17
|
+
/** Error codes meaning the reader of the stream has gone away. */
|
|
18
|
+
const BROKEN_OUTPUT_CODES = new Set([
|
|
19
|
+
"EPIPE",
|
|
20
|
+
"ECONNRESET",
|
|
21
|
+
"ERR_STREAM_DESTROYED",
|
|
22
|
+
"ERR_STREAM_WRITE_AFTER_END",
|
|
23
|
+
]);
|
|
24
|
+
/** True when `error` means the stream's reader is gone (not a real fault). */
|
|
25
|
+
export function isBrokenOutputError(error) {
|
|
26
|
+
if (!error || typeof error !== "object")
|
|
27
|
+
return false;
|
|
28
|
+
const code = error.code;
|
|
29
|
+
if (typeof code === "string" && BROKEN_OUTPUT_CODES.has(code))
|
|
30
|
+
return true;
|
|
31
|
+
const message = error.message;
|
|
32
|
+
return typeof message === "string" && /\bwrite EPIPE\b/.test(message);
|
|
33
|
+
}
|
|
34
|
+
let outputBroken = false;
|
|
35
|
+
const brokenListeners = new Set();
|
|
36
|
+
function notifyBroken() {
|
|
37
|
+
if (outputBroken)
|
|
38
|
+
return;
|
|
39
|
+
outputBroken = true;
|
|
40
|
+
for (const listener of [...brokenListeners]) {
|
|
41
|
+
try {
|
|
42
|
+
listener();
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
// A subscriber fault must not turn a swallowed EPIPE back into a crash.
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
/** True once a guarded stream has reported a broken pipe. */
|
|
50
|
+
export function runnerOutputBroken() {
|
|
51
|
+
return outputBroken;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Run `listener` once the runner's output is broken. Runs it right away (on a
|
|
55
|
+
* microtask) when the output already broke. Returns an unsubscribe function.
|
|
56
|
+
*/
|
|
57
|
+
export function onRunnerOutputBroken(listener) {
|
|
58
|
+
if (outputBroken) {
|
|
59
|
+
queueMicrotask(() => {
|
|
60
|
+
try {
|
|
61
|
+
listener();
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
/* see notifyBroken */
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
return () => undefined;
|
|
68
|
+
}
|
|
69
|
+
brokenListeners.add(listener);
|
|
70
|
+
return () => {
|
|
71
|
+
brokenListeners.delete(listener);
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Attach the guard to `streams` (the process's stdout and stderr by default).
|
|
76
|
+
* `rethrow` receives every error that is not a broken pipe; the default
|
|
77
|
+
* rethrows it as uncaught, which is what Node did with no listener. Returns a
|
|
78
|
+
* function that detaches the guard.
|
|
79
|
+
*/
|
|
80
|
+
export function installRunnerOutputGuard(streams = [process.stdout, process.stderr], rethrow = (error) => {
|
|
81
|
+
process.nextTick(() => {
|
|
82
|
+
throw error;
|
|
83
|
+
});
|
|
84
|
+
}) {
|
|
85
|
+
const onError = (error) => {
|
|
86
|
+
if (isBrokenOutputError(error)) {
|
|
87
|
+
notifyBroken();
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
rethrow(error);
|
|
91
|
+
};
|
|
92
|
+
for (const stream of streams)
|
|
93
|
+
stream.on("error", onError);
|
|
94
|
+
return () => {
|
|
95
|
+
for (const stream of streams)
|
|
96
|
+
stream.off("error", onError);
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
/** Test seam: forget a reported broken pipe and every subscriber. */
|
|
100
|
+
export function resetRunnerOutputGuardForTests() {
|
|
101
|
+
outputBroken = false;
|
|
102
|
+
brokenListeners.clear();
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=runner-output-guard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runner-output-guard.js","sourceRoot":"","sources":["../../src/bin/runner-output-guard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAOH,kEAAkE;AAClE,MAAM,mBAAmB,GAAwB,IAAI,GAAG,CAAC;IACvD,OAAO;IACP,YAAY;IACZ,sBAAsB;IACtB,4BAA4B;CAC7B,CAAC,CAAC;AAEH,8EAA8E;AAC9E,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,IAAI,GAAI,KAA4B,CAAC,IAAI,CAAC;IAChD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3E,MAAM,OAAO,GAAI,KAA+B,CAAC,OAAO,CAAC;IACzD,OAAO,OAAO,OAAO,KAAK,QAAQ,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACxE,CAAC;AAED,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,MAAM,eAAe,GAAG,IAAI,GAAG,EAAc,CAAC;AAE9C,SAAS,YAAY;IACnB,IAAI,YAAY;QAAE,OAAO;IACzB,YAAY,GAAG,IAAI,CAAC;IACpB,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,eAAe,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC;YACH,QAAQ,EAAE,CAAC;QACb,CAAC;QAAC,MAAM,CAAC;YACP,wEAAwE;QAC1E,CAAC;IACH,CAAC;AACH,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,kBAAkB;IAChC,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAoB;IACvD,IAAI,YAAY,EAAE,CAAC;QACjB,cAAc,CAAC,GAAG,EAAE;YAClB,IAAI,CAAC;gBACH,QAAQ,EAAE,CAAC;YACb,CAAC;YAAC,MAAM,CAAC;gBACP,sBAAsB;YACxB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC;IACzB,CAAC;IACD,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,OAAO,GAAG,EAAE;QACV,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,UAA0C,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAC1E,UAAoC,CAAC,KAAK,EAAE,EAAE;IAC5C,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE;QACpB,MAAM,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;IAED,MAAM,OAAO,GAAG,CAAC,KAAc,EAAQ,EAAE;QACvC,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,YAAY,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,OAAO;QAAE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1D,OAAO,GAAG,EAAE;QACV,KAAK,MAAM,MAAM,IAAI,OAAO;YAAE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,8BAA8B;IAC5C,YAAY,GAAG,KAAK,CAAC;IACrB,eAAe,CAAC,KAAK,EAAE,CAAC;AAC1B,CAAC"}
|
|
@@ -14,6 +14,15 @@ import { type TransferPriority } from "../sync-core.js";
|
|
|
14
14
|
import type { ReconcileApplyCheckpoint } from "../sync/reconcile-cursor.js";
|
|
15
15
|
import type { CooperativePassCheckpoint } from "./sync-runner.js";
|
|
16
16
|
import type { SyncRunnerHashAudit } from "./sync-runner-audit.js";
|
|
17
|
+
/**
|
|
18
|
+
* Refresh-first window for `--direction both`. A machine whose journal lastSync
|
|
19
|
+
* is older than this does not push until a pull has caught it up. Stops a
|
|
20
|
+
* weeks-old satellite copy from deleting or overwriting newer shared files
|
|
21
|
+
* (feedback_32526b78). Override with HQ_SYNC_STALE_PUSH_MAX_AGE_MS; set
|
|
22
|
+
* HQ_SYNC_ALLOW_STALE_PUSH=1 to push anyway.
|
|
23
|
+
*/
|
|
24
|
+
export declare const STALE_PUSH_MAX_AGE_MS: number;
|
|
25
|
+
export declare function isStaleBidirectionalPushBaseline(lastSync: string | undefined, nowMs?: number, maxAgeMs?: number): boolean;
|
|
17
26
|
export interface CompanyFanoutResult {
|
|
18
27
|
stateByCompany: Map<string, CompanyState>;
|
|
19
28
|
errors: Array<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-runner-company.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner-company.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sync-runner-company.d.ts","sourceRoot":"","sources":["../../src/bin/sync-runner-company.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as fs from "fs";
|
|
2
2
|
import * as path from "path";
|
|
3
3
|
import { createHash, randomUUID } from "node:crypto";
|
|
4
|
-
import { listJournalSlugs, JournalIncompleteUpsertError, PERSONAL_VAULT_JOURNAL_SLUG, } from "../journal.js";
|
|
4
|
+
import { listJournalSlugs, JournalIncompleteUpsertError, PERSONAL_VAULT_JOURNAL_SLUG, readJournal, } from "../journal.js";
|
|
5
5
|
import { computePersonalVaultPaths, readCloudBackedSlugsFromManifest, readPersonalAllowlistedSlugsFromManifest, SESSION_LOGS_SYNC_REL, } from "../personal-vault.js";
|
|
6
6
|
import { fetchFileTombstones as defaultFetchFileTombstones } from "../cli/tombstones.js";
|
|
7
7
|
import { mergeLinkWarnings } from "../local-link-warning.js";
|
|
@@ -22,6 +22,40 @@ import { TransferSemaphore } from "../sync-core.js";
|
|
|
22
22
|
import { createFanoutProgressRecorder } from "../sync-progress.js";
|
|
23
23
|
/** Sample paths carried on a forwarded `personal-vault-journal-pruned` event. */
|
|
24
24
|
const PRUNED_SAMPLE_PATHS = 5;
|
|
25
|
+
/**
|
|
26
|
+
* Refresh-first window for `--direction both`. A machine whose journal lastSync
|
|
27
|
+
* is older than this does not push until a pull has caught it up. Stops a
|
|
28
|
+
* weeks-old satellite copy from deleting or overwriting newer shared files
|
|
29
|
+
* (feedback_32526b78). Override with HQ_SYNC_STALE_PUSH_MAX_AGE_MS; set
|
|
30
|
+
* HQ_SYNC_ALLOW_STALE_PUSH=1 to push anyway.
|
|
31
|
+
*/
|
|
32
|
+
export const STALE_PUSH_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
|
|
33
|
+
function stalePushMaxAgeMs() {
|
|
34
|
+
const raw = process.env.HQ_SYNC_STALE_PUSH_MAX_AGE_MS;
|
|
35
|
+
if (raw) {
|
|
36
|
+
const parsed = Number.parseInt(raw, 10);
|
|
37
|
+
if (Number.isFinite(parsed) && parsed > 0)
|
|
38
|
+
return parsed;
|
|
39
|
+
}
|
|
40
|
+
return STALE_PUSH_MAX_AGE_MS;
|
|
41
|
+
}
|
|
42
|
+
function allowStaleBidirectionalPush() {
|
|
43
|
+
const v = (process.env.HQ_SYNC_ALLOW_STALE_PUSH ?? "").toLowerCase();
|
|
44
|
+
return v === "1" || v === "true" || v === "yes";
|
|
45
|
+
}
|
|
46
|
+
export function isStaleBidirectionalPushBaseline(lastSync, nowMs = Date.now(), maxAgeMs = stalePushMaxAgeMs()) {
|
|
47
|
+
if (!lastSync)
|
|
48
|
+
return false;
|
|
49
|
+
const t = Date.parse(lastSync);
|
|
50
|
+
if (!Number.isFinite(t))
|
|
51
|
+
return true;
|
|
52
|
+
return nowMs - t > maxAgeMs;
|
|
53
|
+
}
|
|
54
|
+
function journalSlugForTarget(target) {
|
|
55
|
+
if (target.journalSlug !== undefined)
|
|
56
|
+
return target.journalSlug;
|
|
57
|
+
return target.personalMode === true ? PERSONAL_VAULT_JOURNAL_SLUG : target.slug;
|
|
58
|
+
}
|
|
25
59
|
function journalErrorClass(error) {
|
|
26
60
|
if (error instanceof JournalIncompleteUpsertError)
|
|
27
61
|
return error.errorClass;
|
|
@@ -214,6 +248,10 @@ export async function executeCompanyFanout(options) {
|
|
|
214
248
|
type: "identity-switch-push-held",
|
|
215
249
|
company: companyLabel,
|
|
216
250
|
count: event.count,
|
|
251
|
+
...(event.reason ? { reason: event.reason } : {}),
|
|
252
|
+
...(event.message ? { message: event.message } : {}),
|
|
253
|
+
...(event.action ? { action: event.action } : {}),
|
|
254
|
+
...(event.samplePaths && event.samplePaths.length > 0 ? { samplePaths: event.samplePaths } : {}),
|
|
217
255
|
});
|
|
218
256
|
}
|
|
219
257
|
else if (event.type === "progress") {
|
|
@@ -266,6 +304,22 @@ export async function executeCompanyFanout(options) {
|
|
|
266
304
|
...refusal,
|
|
267
305
|
});
|
|
268
306
|
}
|
|
307
|
+
else if (event.type === "pull-restored-scattered-deletes") {
|
|
308
|
+
const { type: _type, ...restore } = event;
|
|
309
|
+
options.emit({
|
|
310
|
+
type: "pull-restored-scattered-deletes",
|
|
311
|
+
company: companyLabel,
|
|
312
|
+
...restore,
|
|
313
|
+
});
|
|
314
|
+
}
|
|
315
|
+
else if (event.type === "delete-refused-bulk-asymmetry") {
|
|
316
|
+
const { type: _type, ...refusal } = event;
|
|
317
|
+
options.emit({
|
|
318
|
+
type: "delete-refused-bulk-asymmetry",
|
|
319
|
+
company: companyLabel,
|
|
320
|
+
...refusal,
|
|
321
|
+
});
|
|
322
|
+
}
|
|
269
323
|
else if (event.type === "delete-refused-mass-guard") {
|
|
270
324
|
options.emit({
|
|
271
325
|
type: "delete-refused-mass-guard",
|
|
@@ -750,8 +804,8 @@ export async function executeCompanyFanout(options) {
|
|
|
750
804
|
propagateDeletePolicy: options.resolveDeletePolicy(),
|
|
751
805
|
syncMode: scope.syncMode,
|
|
752
806
|
scopeShrinkPolicy: "auto-recover",
|
|
753
|
-
...(options.uploadAuthor?.userSub !== undefined
|
|
754
|
-
? { callerSub: options.uploadAuthor
|
|
807
|
+
...((options.uploadAuthor?.userSub ?? options.signedInSub) !== undefined
|
|
808
|
+
? { callerSub: options.uploadAuthor?.userSub ?? options.signedInSub }
|
|
755
809
|
: {}),
|
|
756
810
|
...(options.telemetryClaims ? { telemetryClaims: options.telemetryClaims } : {}),
|
|
757
811
|
...(scope.prefixSet !== undefined ? { prefixSet: scope.prefixSet } : {}),
|
|
@@ -800,7 +854,23 @@ export async function executeCompanyFanout(options) {
|
|
|
800
854
|
return;
|
|
801
855
|
}
|
|
802
856
|
}
|
|
803
|
-
|
|
857
|
+
let skipPushBecauseStale = false;
|
|
858
|
+
if (doPush && doPull && !allowStaleBidirectionalPush()) {
|
|
859
|
+
const journal = readJournal(journalSlugForTarget(target));
|
|
860
|
+
const maxAgeMs = stalePushMaxAgeMs();
|
|
861
|
+
if (isStaleBidirectionalPushBaseline(journal.lastSync, Date.now(), maxAgeMs)) {
|
|
862
|
+
skipPushBecauseStale = true;
|
|
863
|
+
const lastSync = journal.lastSync || "";
|
|
864
|
+
options.emit({
|
|
865
|
+
type: "push-skipped-stale-baseline",
|
|
866
|
+
company: companyLabel,
|
|
867
|
+
lastSync,
|
|
868
|
+
maxAgeMs,
|
|
869
|
+
message: `Skipping bidirectional push: last sync ${lastSync || "(unknown)"} is older than ${Math.round(maxAgeMs / 86400000)} days. Pulling first so this machine cannot overwrite or delete newer shared files.`,
|
|
870
|
+
});
|
|
871
|
+
}
|
|
872
|
+
}
|
|
873
|
+
if (doPush && !skipPushBecauseStale) {
|
|
804
874
|
activePhase = "push";
|
|
805
875
|
const pushPrefixSet = effectivePushPrefixSet(scope.prefixSet, options.scopePaths ?? []);
|
|
806
876
|
const fullPushPaths = target.personalMode === true
|
|
@@ -997,8 +1067,8 @@ export async function executeCompanyFanout(options) {
|
|
|
997
1067
|
syncMode: pullScope.syncMode,
|
|
998
1068
|
...(holdLocalKeys.length > 0 ? { holdLocalKeys } : {}),
|
|
999
1069
|
scopeShrinkPolicy: "auto-recover",
|
|
1000
|
-
...(options.uploadAuthor?.userSub !== undefined
|
|
1001
|
-
? { callerSub: options.uploadAuthor
|
|
1070
|
+
...((options.uploadAuthor?.userSub ?? options.signedInSub) !== undefined
|
|
1071
|
+
? { callerSub: options.uploadAuthor?.userSub ?? options.signedInSub }
|
|
1002
1072
|
: {}),
|
|
1003
1073
|
...(options.telemetryClaims ? { telemetryClaims: options.telemetryClaims } : {}),
|
|
1004
1074
|
...(options.telemetryClient ? { telemetryClient: options.telemetryClient } : {}),
|