@indigoai-us/hq-cloud 6.18.74 → 6.18.76
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/agent-codex-instructions.d.ts.map +1 -1
- package/dist/agent-codex-instructions.js +4 -1
- package/dist/agent-codex-instructions.js.map +1 -1
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +14 -0
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner-manifest.d.ts.map +1 -1
- package/dist/bin/sync-runner-manifest.js +17 -2
- package/dist/bin/sync-runner-manifest.js.map +1 -1
- package/dist/bin/sync-runner-watch-loop.d.ts +33 -1
- package/dist/bin/sync-runner-watch-loop.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-loop.js +83 -20
- package/dist/bin/sync-runner-watch-loop.js.map +1 -1
- package/dist/bin/sync-runner.d.ts +5 -0
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/cli/reindex-knowledge.d.ts.map +1 -1
- package/dist/cli/reindex-knowledge.js +6 -1
- package/dist/cli/reindex-knowledge.js.map +1 -1
- package/dist/cli/rescue-core.d.ts +77 -0
- package/dist/cli/rescue-core.d.ts.map +1 -1
- package/dist/cli/rescue-core.js +467 -14
- package/dist/cli/rescue-core.js.map +1 -1
- package/dist/cli/share.d.ts +130 -0
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +50 -14
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/sync.d.ts +46 -5
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +274 -23
- package/dist/cli/sync.js.map +1 -1
- package/dist/cloud-placeholder.d.ts +6 -0
- package/dist/cloud-placeholder.d.ts.map +1 -1
- package/dist/cloud-placeholder.js +16 -7
- package/dist/cloud-placeholder.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/board-merge.d.ts +25 -0
- package/dist/lib/board-merge.d.ts.map +1 -0
- package/dist/lib/board-merge.js +201 -0
- package/dist/lib/board-merge.js.map +1 -0
- package/dist/lib/readlink-safe.d.ts +24 -1
- package/dist/lib/readlink-safe.d.ts.map +1 -1
- package/dist/lib/readlink-safe.js +29 -2
- package/dist/lib/readlink-safe.js.map +1 -1
- package/dist/manifest/build-manifest.d.ts.map +1 -1
- package/dist/manifest/build-manifest.js +2 -1
- package/dist/manifest/build-manifest.js.map +1 -1
- package/dist/manifest/upload-manifest.d.ts +11 -0
- package/dist/manifest/upload-manifest.d.ts.map +1 -1
- package/dist/manifest/upload-manifest.js +60 -3
- package/dist/manifest/upload-manifest.js.map +1 -1
- package/dist/s3.d.ts +15 -0
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +22 -6
- package/dist/s3.js.map +1 -1
- package/dist/scope-shrink.d.ts +86 -3
- package/dist/scope-shrink.d.ts.map +1 -1
- package/dist/scope-shrink.js +177 -24
- package/dist/scope-shrink.js.map +1 -1
- package/dist/session-log-capture.d.ts.map +1 -1
- package/dist/session-log-capture.js +18 -2
- package/dist/session-log-capture.js.map +1 -1
- package/dist/skill-telemetry.d.ts.map +1 -1
- package/dist/skill-telemetry.js +10 -5
- package/dist/skill-telemetry.js.map +1 -1
- package/dist/sync/area-ledger.d.ts +4 -2
- package/dist/sync/area-ledger.d.ts.map +1 -1
- package/dist/sync/area-ledger.js +16 -4
- package/dist/sync/area-ledger.js.map +1 -1
- package/dist/sync/pull-scope.d.ts +7 -0
- package/dist/sync/pull-scope.d.ts.map +1 -1
- package/dist/sync/pull-scope.js +2 -0
- package/dist/sync/pull-scope.js.map +1 -1
- package/dist/sync/scope-inventory-client.d.ts.map +1 -1
- package/dist/sync/scope-inventory-client.js +2 -1
- package/dist/sync/scope-inventory-client.js.map +1 -1
- package/dist/types.d.ts +20 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/watcher.d.ts.map +1 -1
- package/dist/watcher.js +23 -0
- package/dist/watcher.js.map +1 -1
- package/package.json +1 -1
package/dist/cli/share.d.ts
CHANGED
|
@@ -1015,5 +1015,135 @@ declare function isWithinLexicalOrReal(parent: string, child: string, hqRoot: st
|
|
|
1015
1015
|
* under the link's key — silently flattening the link topology.
|
|
1016
1016
|
*/
|
|
1017
1017
|
declare function collectFiles(paths: string[], hqRoot: string, syncRoot: string, filter: (p: string, isDir?: boolean) => boolean, hooks?: CollectHooks): Promise<CollectedEntry[]>;
|
|
1018
|
+
/**
|
|
1019
|
+
* Reason a candidate was bucketed into `refusedStale`. Discriminated so
|
|
1020
|
+
* consumers (UI, telemetry, the event logger) can branch on intent without
|
|
1021
|
+
* string-comparing the placeholder etag value.
|
|
1022
|
+
* - `"stale-etag"` → currency-gated saw a real etag mismatch (peer
|
|
1023
|
+
* drift). `journalEtag` and `remoteEtag` are both
|
|
1024
|
+
* real ETag values.
|
|
1025
|
+
* - `"legacy-no-etag"` → journal entry was written before remoteEtag was
|
|
1026
|
+
* tracked. `journalEtag` and `remoteEtag` are
|
|
1027
|
+
* placeholder sentinels — do not display as ETags.
|
|
1028
|
+
*/
|
|
1029
|
+
type RefusedStaleReason = "stale-etag" | "legacy-no-etag" | "bulk-asymmetry" | "mass-delete-absolute-volume" | "mass-delete-release-owned-root" | "divergent-local" | "missing-delete-intent" | "intent-changed" | "recreated-locally" | "cloud-placeholder" | "marker-mismatch";
|
|
1030
|
+
/**
|
|
1031
|
+
* Three buckets returned by computeDeletePlan, exposed so the execution
|
|
1032
|
+
* loop can take a different action for each:
|
|
1033
|
+
* - `toDelete` → issue DeleteObject + drop journal entry.
|
|
1034
|
+
* - `toTombstone` → no DeleteObject (remote already 404), drop journal
|
|
1035
|
+
* entry. Lets the journal converge with reality even
|
|
1036
|
+
* when the remote was cleaned out-of-band.
|
|
1037
|
+
* - `refusedStale` → no DeleteObject, no journal change. Some other
|
|
1038
|
+
* device modified the remote object since this device
|
|
1039
|
+
* last synced it; the next pull leg re-pulls via the
|
|
1040
|
+
* same `hasRemoteChanged` path the conflict detector
|
|
1041
|
+
* uses. Emitted as `delete-refused-stale-etag` events.
|
|
1042
|
+
*/
|
|
1043
|
+
interface DeletePlan {
|
|
1044
|
+
toDelete: Array<{
|
|
1045
|
+
key: string;
|
|
1046
|
+
intentVersion: 1 | null;
|
|
1047
|
+
/** Reindex replaced this exact symlink key with a real Knowledge dir. */
|
|
1048
|
+
materializedKnowledgeDir?: boolean;
|
|
1049
|
+
}>;
|
|
1050
|
+
toTombstone: string[];
|
|
1051
|
+
refusedStale: Array<{
|
|
1052
|
+
key: string;
|
|
1053
|
+
journalEtag: string;
|
|
1054
|
+
remoteEtag: string;
|
|
1055
|
+
reason: RefusedStaleReason;
|
|
1056
|
+
}>;
|
|
1057
|
+
/**
|
|
1058
|
+
* Locally-absent keys whose sibling `<name>.hqcloud` exists but is not a
|
|
1059
|
+
* valid placeholder for them. Never deleted; reported as refused.
|
|
1060
|
+
*/
|
|
1061
|
+
placeholderRefused?: string[];
|
|
1062
|
+
/**
|
|
1063
|
+
* Populated only when the bulk-asymmetry circuit-breaker tripped. The
|
|
1064
|
+
* caller emits `delete-refused-bulk-asymmetry` as a one-shot summary so
|
|
1065
|
+
* the UI gets one banner-grade signal in addition to the per-key
|
|
1066
|
+
* `delete-refused-stale-etag` events under `refusedStale`.
|
|
1067
|
+
*/
|
|
1068
|
+
bulkAsymmetry?: {
|
|
1069
|
+
candidates: number;
|
|
1070
|
+
inScope: number;
|
|
1071
|
+
ratio: number;
|
|
1072
|
+
samplePaths: string[];
|
|
1073
|
+
};
|
|
1074
|
+
}
|
|
1075
|
+
/**
|
|
1076
|
+
* Walk every journal key in `scopeRoots` whose local file is missing from
|
|
1077
|
+
* disk and bucket each candidate into the right action per `policy`. Hard
|
|
1078
|
+
* filters that drop a candidate entirely (no bucket) — regardless of policy:
|
|
1079
|
+
*
|
|
1080
|
+
* 1. Its key must match (or sit beneath) one of the `scopeRoots` prefixes.
|
|
1081
|
+
* 2. Its local file must be missing from disk (lstat ENOENT). We use
|
|
1082
|
+
* `lstat` (not `existsSync`) so a dangling symlink — a link whose
|
|
1083
|
+
* target has been removed but whose link file is still on disk —
|
|
1084
|
+
* counts as "still present locally" and is NOT delete-propagated.
|
|
1085
|
+
* Pre-fix, existsSync followed the link, returned false, and the
|
|
1086
|
+
* entry was queued for remote DeleteObject in the same sync that
|
|
1087
|
+
* had just uploaded it via `uploadSymlink` — the link round-tripped
|
|
1088
|
+
* as "upload, then delete" in one cycle. ENOENT means truly absent
|
|
1089
|
+
* → eligible; other lstat errors propagate.
|
|
1090
|
+
* 3. The current ignore filter (`shouldSync`) accepts the key — paths
|
|
1091
|
+
* filtered out by `.hqignore` / `.gitignore` / `DEFAULT_IGNORES` are
|
|
1092
|
+
* never delete-propagated. Closes the failure mode where a path lives
|
|
1093
|
+
* in the vault (and journal) but the local walk skips it because of
|
|
1094
|
+
* asymmetric ignore rules.
|
|
1095
|
+
*
|
|
1096
|
+
* Dual-hint probe: by the time we're considering this entry for
|
|
1097
|
+
* remote deletion, the local file is already gone — we have no way to
|
|
1098
|
+
* know whether it was a regular file or a symlink record. A single
|
|
1099
|
+
* `isDir=false` probe would silently keep the remote record alive
|
|
1100
|
+
* whenever the only matching `.hqinclude` allowlist pattern is dir-
|
|
1101
|
+
* only (e.g. `companies/*\/knowledge/`), since gitignore's slash
|
|
1102
|
+
* semantics reject the slashless probe. The same dual-hint pattern in
|
|
1103
|
+
* `walkDir`/`collectFiles` (push) and `computePullPlan` (pull) applies
|
|
1104
|
+
* symmetrically here. Pure path lookup, no I/O.
|
|
1105
|
+
* 4. The key does NOT match `EPHEMERAL_PATH_PATTERN`. Conflict mirrors
|
|
1106
|
+
* are local-only artifacts that should never have been journaled in
|
|
1107
|
+
* the first place; the dedicated reconcile command sweeps already-
|
|
1108
|
+
* journaled mirrors. Excluding them here keeps a regular `sync now`
|
|
1109
|
+
* from accidentally deleting a mirror another device is still
|
|
1110
|
+
* reviewing.
|
|
1111
|
+
*
|
|
1112
|
+
* Then per-policy bucketing:
|
|
1113
|
+
*
|
|
1114
|
+
* - `"currency-gated"` (default, safest): issue a HEAD against the remote.
|
|
1115
|
+
* 200 + `normalizeEtag(remote) === entry.remoteEtag` → `toDelete`.
|
|
1116
|
+
* 200 + mismatch → `refusedStale` (peer drift; let pull re-pull).
|
|
1117
|
+
* 404 → `toTombstone` (remote was cleaned out-of-band).
|
|
1118
|
+
* If the journal entry has no recorded `remoteEtag` (legacy entries
|
|
1119
|
+
* written before etag tracking), the candidate falls back to
|
|
1120
|
+
* `refusedStale` with `reason: "legacy-no-etag"` — we can't prove
|
|
1121
|
+
* currency without an etag, so refusal is the safe direction. The
|
|
1122
|
+
* journal entry survives so a future sync with a recorded etag can
|
|
1123
|
+
* re-evaluate.
|
|
1124
|
+
*
|
|
1125
|
+
* HEAD calls are batched at `DELETE_PLAN_HEAD_CONCURRENCY` so a large
|
|
1126
|
+
* candidate set (e.g. a one-shot reconcile sweep) doesn't serialize
|
|
1127
|
+
* into N×RTT latency. The candidate set is materialized into a list
|
|
1128
|
+
* first (synchronous filters above), then the HEAD pass runs in
|
|
1129
|
+
* bounded-parallel chunks.
|
|
1130
|
+
*
|
|
1131
|
+
* Note: there is a TOCTOU window between this HEAD and the eventual
|
|
1132
|
+
* `deleteRemoteFile` call in the share() execution loop. If a peer
|
|
1133
|
+
* overwrites the object in that window (~50-200ms), the resulting
|
|
1134
|
+
* delete-marker lands on a newer version than we verified. S3
|
|
1135
|
+
* versioning makes the worst case recoverable (prior versions are
|
|
1136
|
+
* retained), and the conditional-delete primitive does not exist on
|
|
1137
|
+
* S3 DeleteObject — only PutObject/CopyObject accept `IfMatch`. The
|
|
1138
|
+
* window is bounded, not zero. Realtime sync (separate work) reduces
|
|
1139
|
+
* it further by keeping the journal continuously fresh.
|
|
1140
|
+
* - `"owned-only"`: include only entries with `direction === "up"`. No
|
|
1141
|
+
* HEAD round-trip. Goes to `toDelete`. Legacy fallback.
|
|
1142
|
+
* - `"all"`: include every candidate. No HEAD, no direction check. Goes
|
|
1143
|
+
* to `toDelete`. Caller has explicitly opted out of safety gates.
|
|
1144
|
+
*
|
|
1145
|
+
* Empty `scopeRoots` ⇒ empty plan (caller didn't opt in).
|
|
1146
|
+
*/
|
|
1147
|
+
export declare function computeDeletePlan(journal: SyncJournal, syncRoot: string, scopeRoots: string[], shouldSync: (filePath: string, isDir?: boolean) => boolean, policy: "currency-gated" | "owned-only" | "all", ctx: EntityContext, companyScoped?: boolean, skipSecretPaths?: boolean, excludedPaths?: ReadonlySet<string>): Promise<DeletePlan>;
|
|
1018
1148
|
export {};
|
|
1019
1149
|
//# sourceMappingURL=share.d.ts.map
|
package/dist/cli/share.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/cli/share.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/cli/share.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAmClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAY7C,OAAO,EAYL,6BAA6B,EAW9B,MAAM,eAAe,CAAC;AA6BvB,OAAO,KAAK,EAAwC,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAOL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAwBzB,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAOL,KAAK,0BAA0B,EAChC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAahF,OAAO,EAA4B,KAAK,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAkFtG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,eAAO,MAAM,sBAAsB,QACmD,CAAC;AAEvF;;;;;;;;;GASG;AACH;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,QAAqB,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAElD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAExD;AAiBD,iBAAS,0BAA0B,IAAI,IAAI,CAI1C;AAED,iBAAS,2BAA2B,IAAI,IAAI,CAI3C;AAED,iBAAS,4BAA4B,IAAI;IACvC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3B,CAKA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;CAmBpB,CAAC;AAEF;;;;;;;;;GASG;AACH,KAAK,YAAY,GACb;IACE,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IAOb,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B,GACD;IACE,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IAIrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,CAAC,CAAC;CACT,GACD;IACE,MAAM,EAAE,qBAAqB,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,GACD;IACE,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IAMrB,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9D,CAAC;AAEN,UAAU,QAAQ;IAChB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,oFAAoF;IACpF,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED;;;;;;;;;GASG;AACH,oDAAoD;AACpD,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAsDD,iBAAS,kBAAkB,CACzB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC,CAAC,CAAC,GACzD,OAAO,CAaT;AAkDD;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,QAAS,CAAC;AAIxD,wBAAgB,0CAA0C,CACxD,EAAE,EAAE,MAAM,GAAG,SAAS,GACrB,IAAI,CAEN;AAiDD;;;;;GAKG;AACH,KAAK,sBAAsB,GAAG,OAAO,GAAG,cAAc,CAAC;AAyBvD,UAAU,kBAAkB;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,0BAA0B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACzC;AAED,iBAAS,eAAe,CACtB,YAAY,EAAE,cAAc,EAAE,EAC9B,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,OAAO,EACtB,WAAW,CAAC,EAAE,MAAM,IAAI,EACxB,kBAAkB,GAAE,sBAA8B,EAClD,cAAc,CAAC,EAAE,kBAAkB,GAClC,QAAQ,CA6LV;AAsID,iBAAS,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;;GAIG;AACH,iBAAe,4BAA4B,CACzC,YAAY,EAAE,cAAc,EAAE,EAC9B,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,OAAO,EACtB,WAAW,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,EACrC,qBAAqB,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,EAClE,kBAAkB,GAAE,sBAA8B,EAClD,cAAc,CAAC,EAAE,kBAAkB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAyCnB;AAkED,MAAM,WAAW,YAAY;IAC3B,iFAAiF;IACjF,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,8CAA8C;IAC9C,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wCAAwC;IACxC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC;;;;;;;;;;;;;;;;;;OAkBG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;;OAKG;IACH,wBAAwB,CAAC,EAAE,kBAAkB,CAAC;IAC9C;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;IAC7C,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,gHAAgH;IAChH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iFAAiF;IACjF,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE;QACzB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,IAAI,CAAC;KAChB,KAAK,IAAI,CAAC;IACX,yEAAyE;IACzE,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,iFAAiF;IACjF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,8DAA8D;IAC9D,gBAAgB,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IACxC,8EAA8E;IAC9E,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACtD;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG;QACxD,wFAAwF;QACxF,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;QACtC,+EAA+E;QAC/E,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;QAC5B,mFAAmF;QACnF,uBAAuB,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;YAC/D,KAAK,EAAE,CAAC,CAAC;YACT,WAAW,EAAE,OAAO,CAAC;YACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;SACtB,CAAC,CAAC;KACJ,CAAC;IACF;;;;;;;;;;;;;OAaG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;;;;;;;OAgBG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCG;IACH,qBAAqB,CAAC,EAAE,gBAAgB,GAAG,YAAY,GAAG,KAAK,CAAC;IAChE;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;;OAYG;IACH,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/B;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACvD;;;OAGG;IACH,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C;;;;;;;;;;;;;;;;;;;OAmBG;IACH,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;;;;;OASG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,2EAA2E;IAC3E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACpE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE;QACvB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,wBAAwB,CAAC;QACjC,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,KAAK,IAAI,CAAC;CACZ;AAED,MAAM,WAAW,+BAA+B;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,qBAAqB,GAAG,CAClC,KAAK,EAAE,+BAA+B,KACnC,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAEzC,qBAAa,6BAA8B,SAAQ,KAAK;aAC1B,KAAK,EAAE,MAAM,EAAE;gBAAf,KAAK,EAAE,MAAM,EAAE;CAO5C;AAED,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG,SAAS,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAEtF;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,6EAA6E;IAC7E,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IACzB,4DAA4D;IAC5D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;gBAE5C,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,qBAAqB,CAAC,EAAE,QAAQ,EAAE,MAAM;CAuBtF;AAED,0EAA0E;AAC1E,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;gBAEb,KAAK,EAAE,MAAM,EAAE;CAa5B;AA6BD,6EAA6E;AAC7E,eAAO,MAAM,wBAAwB,OAAQ,CAAC;AAE9C,MAAM,WAAW,WAAW;IAC1B,qEAAqE;IACrE,eAAe,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5D;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;OAOG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;;;;;OASG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;;;;;OAQG;IACH,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC;;;;;;;OAOG;IACH,0BAA0B,EAAE,MAAM,CAAC;IACnC,kGAAkG;IAClG,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;;;;;OAOG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAC9B;;;;;;;;OAQG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAC7B;;;;OAIG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;;;;;;;OAiBG;IACH,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B;;;;;;;OAOG;IACH,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC;;;;OAIG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,4EAA4E;IAC5E,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;IAChC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,iEAAiE;IACjE,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,wBAAwB,GAChC,YAAY,GACZ,gBAAgB,GAChB,gBAAgB,GAChB,6BAA6B,GAC7B,gCAAgC,GAChC,iBAAiB,GACjB,uBAAuB,GACvB,gBAAgB,GAChB,mBAAmB,GAGnB,mBAAmB,GACnB,iBAAiB,GACjB,gBAAgB,GAChB,gBAAgB,CAAC;AAErB,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,QAAQ,GAAG,WAAW,CAAC;IAClC,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACnC;AAoDD,mFAAmF;AACnF,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAE7C;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAUlE;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,EACvB,GAAG,SAA6B,GAC/B;IACD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,YAAY,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvD,WAAW,EAAE,MAAM,CAAC;CACrB,CAmBA;AAED,kFAAkF;AAClF,wBAAgB,gCAAgC,CAAC,KAAK,EAAE;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,EAAE,CA2BX;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,EACzD,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,EAC3C,aAAa,CAAC,EAAE,MAAM,IAAI,EAC1B,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC3C,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAY/C;AAED;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAEvE;AA0ID,KAAK,cAAc,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,MAAM,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAGlE;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAO/D;AA6eD,8EAA8E;AAC9E,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQlF;AA6pGD,+DAA+D;AAC/D,iBAAS,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAejD;AAssBD;;;;GAIG;AACH,eAAO,MAAM,2CAA2C,MAAM,CAAC;AAmU/D;;;GAGG;AACH,iBAAS,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAgN5D;AAED;;;;;;;;;GASG;AACH,KAAK,cAAc,GACf;IACE,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE,CAAC;CAClD,GACD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpF;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,UAAU,YAAY;IACpB,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,KAAK,IAAI,CAAC;IAC/E,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC;IACtD,uDAAuD;IACvD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,iBAAS,gBAAgB,CACvB,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,MAAsB,GAC1B,MAAM,CAuBR;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,iBAAS,qBAAqB,CAC5B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACvC,OAAO,CAwBT;AA8HD;;;;;;;;;;;GAWG;AACH,iBAAe,YAAY,CACzB,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,EAC/C,KAAK,GAAE,YAAiB,GACvB,OAAO,CAAC,cAAc,EAAE,CAAC,CAuH3B;AA0QD;;;;;;;;;;GAUG;AACH,KAAK,kBAAkB,GACnB,YAAY,GACZ,gBAAgB,GAChB,gBAAgB,GAChB,6BAA6B,GAC7B,gCAAgC,GAChC,iBAAiB,GACjB,uBAAuB,GACvB,gBAAgB,GAChB,mBAAmB,GAGnB,mBAAmB,GACnB,iBAAiB,CAAC;AAwDtB;;;;;;;;;;;;GAYG;AACH,UAAU,UAAU;IAClB,QAAQ,EAAE,KAAK,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,aAAa,EAAE,CAAC,GAAG,IAAI,CAAC;QACxB,yEAAyE;QACzE,wBAAwB,CAAC,EAAE,OAAO,CAAC;KACpC,CAAC,CAAC;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,YAAY,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,kBAAkB,CAAC;KAC5B,CAAC,CAAC;IACH;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B;;;;;OAKG;IACH,aAAa,CAAC,EAAE;QACd,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,EAAE,CAAC;KACvB,CAAC;CACH;AAwFD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuEG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,EAC1D,MAAM,EAAE,gBAAgB,GAAG,YAAY,GAAG,KAAK,EAC/C,GAAG,EAAE,aAAa,EAIlB,aAAa,GAAE,OAAc,EAC7B,eAAe,GAAE,OAAe,EAChC,aAAa,GAAE,WAAW,CAAC,MAAM,CAAa,GAC7C,OAAO,CAAC,UAAU,CAAC,CAkerB"}
|
package/dist/cli/share.js
CHANGED
|
@@ -35,6 +35,7 @@ import { hasRemoteChanged, isAccessDenied, resolveActiveCompany, resolveTransfer
|
|
|
35
35
|
import { buildConflictBackupPath, buildConflictId, buildConflictProbePath, readShortMachineId, } from "../lib/conflict-file.js";
|
|
36
36
|
import { appendConflictEntry, findReusableConflictBackup } from "../lib/conflict-index.js";
|
|
37
37
|
import { appendIfUnchanged, isAppendOnlyPath, mergeAppendOnly } from "../lib/append-only-merge.js";
|
|
38
|
+
import { isBoardJsonPath, mergeBoardJson, replaceIfUnchanged } from "../lib/board-merge.js";
|
|
38
39
|
import { findLandedUpload, followLandedUploads, SamePathUploadHold, samePathUploadKey, SamePathUploadSupersededError, } from "../lib/same-path-upload-lock.js";
|
|
39
40
|
import { isLocallyIneligibleForPush } from "../lib/cloud-authoritative.js";
|
|
40
41
|
import { isOntologyEntityKey, ONTOLOGY_MULTI_WRITER_FLAG, resolveOntologyEntityPush, } from "../lib/ontology-entity-push.js";
|
|
@@ -47,7 +48,7 @@ import { PlanLimitPauseStore, planLimitPauseNow, PLAN_LIMIT_PAUSE_RETRY_MS, } fr
|
|
|
47
48
|
import { describeError } from "../lib/describe-error.js";
|
|
48
49
|
import { isTransientHttpStatusError } from "../lib/net-errors.js";
|
|
49
50
|
import { isRetryableIdentityRefusal, isTerminalIdentityRefusal, } from "../cognito-auth.js";
|
|
50
|
-
import { readlinkOrNull } from "../lib/readlink-safe.js";
|
|
51
|
+
import { readlinkOrNull, readlinkPortableSync } from "../lib/readlink-safe.js";
|
|
51
52
|
import { checkpointReconcileApply } from "../sync/reconcile-cursor.js";
|
|
52
53
|
import { isMassDeleteGuardOverrideEnabled, MASS_DELETE_ABSOLUTE_CEILING, MASS_DELETE_SAMPLE_CAP, massDeleteGuardReason, resolveMassDeleteGuards, } from "../sync/mass-delete-guards.js";
|
|
53
54
|
import { directoryFoldsCase, findCaseFoldedLocalKey, foldVaultKey, } from "./case-alias.js";
|
|
@@ -82,7 +83,7 @@ async function remoteContentDiffers(ctx, relativePath, localHash, hqRoot, symlin
|
|
|
82
83
|
try {
|
|
83
84
|
await downloadFile(ctx, relativePath, probePath, symlinkOptions);
|
|
84
85
|
const remoteHash = fs.lstatSync(probePath).isSymbolicLink()
|
|
85
|
-
? hashSymlinkTarget(
|
|
86
|
+
? hashSymlinkTarget(readlinkPortableSync(probePath))
|
|
86
87
|
: hashFile(probePath);
|
|
87
88
|
return remoteHash !== localHash;
|
|
88
89
|
}
|
|
@@ -2508,6 +2509,7 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2508
2509
|
localPath: it.absolutePath,
|
|
2509
2510
|
isSymlink: it.kind === "symlink",
|
|
2510
2511
|
...(it.kind === "file" ? { contentHash: it.localHash } : {}),
|
|
2512
|
+
...(it.kind === "symlink" ? { symlinkTarget: it.target } : {}),
|
|
2511
2513
|
...(baselineEtag ? { ifMatch: baselineEtag } : {}),
|
|
2512
2514
|
author: run.options.author,
|
|
2513
2515
|
};
|
|
@@ -2935,7 +2937,7 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2935
2937
|
let freshContentConverged = false;
|
|
2936
2938
|
if (!journalEntry && item.kind === "symlink") {
|
|
2937
2939
|
const remoteTarget = await readVerifiedRemoteSymlinkTarget(run.ctx, relativePath);
|
|
2938
|
-
const localTarget =
|
|
2940
|
+
const localTarget = readlinkPortableSync(absolutePath);
|
|
2939
2941
|
if (remoteTarget !== null && materializedTargetMatchesWire(absolutePath, localTarget, remoteTarget)) {
|
|
2940
2942
|
const localStat = fs.lstatSync(absolutePath);
|
|
2941
2943
|
updateEntry(run.journal, relativePath, hashSymlinkTarget(localTarget), 0, "down", absolutePath, {
|
|
@@ -3031,7 +3033,39 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
3031
3033
|
// still at that etag, silently promoting the divergent local to write
|
|
3032
3034
|
// authority. Route through conflict (keep/abort/overwrite) instead.
|
|
3033
3035
|
const divergentLocalHonesty = !!journalEntry?.localDiverges;
|
|
3034
|
-
|
|
3036
|
+
const twoSidedChange = (localChanged && remoteChanged) || isFreshCollision || divergentLocalHonesty;
|
|
3037
|
+
// A company board is merged by entry id against the cloud copy before
|
|
3038
|
+
// every upload, not only on a two-sided change: a local board that lost
|
|
3039
|
+
// entries (recreated fresh, or written from a stale copy) must never
|
|
3040
|
+
// replace a cloud board that still holds them. When the local board
|
|
3041
|
+
// already holds every cloud entry it uploads as usual; otherwise the
|
|
3042
|
+
// cloud entries are merged into the local file and the next pass
|
|
3043
|
+
// publishes the union. An unparseable board keeps the ordinary upload.
|
|
3044
|
+
if (!twoSidedChange &&
|
|
3045
|
+
item.kind === "file" &&
|
|
3046
|
+
isBoardJsonPath(relativePath) &&
|
|
3047
|
+
usesVersionAwareWinner(run.onConflict)) {
|
|
3048
|
+
const boardProbe = await probeRemoteForWinner(run, item, remoteMeta.lastModified, remoteChangedSinceJournal, remoteMeta.etag);
|
|
3049
|
+
if (boardProbe.peekBody() === undefined) {
|
|
3050
|
+
// The cloud board could not be read, so the merge cannot prove the
|
|
3051
|
+
// upload drops nothing. Leave the journal alone; the next pass retries.
|
|
3052
|
+
boardProbe.discard();
|
|
3053
|
+
counters.filesSkipped++;
|
|
3054
|
+
return;
|
|
3055
|
+
}
|
|
3056
|
+
const outcome = mergeAppendOnlyPushConflict(run, item, boardProbe, normalizeEtag(remoteMeta.etag), mergeBoardJson, replaceIfUnchanged);
|
|
3057
|
+
boardProbe.discard();
|
|
3058
|
+
if (outcome === "publish-local") {
|
|
3059
|
+
fenceOnObservedRemote = true;
|
|
3060
|
+
}
|
|
3061
|
+
else if (outcome !== "not-mergeable") {
|
|
3062
|
+
if (outcome === "write-failed")
|
|
3063
|
+
hadUploadFailure = true;
|
|
3064
|
+
counters.filesSkipped++;
|
|
3065
|
+
return;
|
|
3066
|
+
}
|
|
3067
|
+
}
|
|
3068
|
+
if (twoSidedChange) {
|
|
3035
3069
|
// Cloud-authoritative paths are already skipped at the top of
|
|
3036
3070
|
// processUploadItem (before HEAD), so anything reaching here is a genuine
|
|
3037
3071
|
// conflict on a client-owned file, or a flag-gated ontology entity.
|
|
@@ -3071,8 +3105,10 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
3071
3105
|
decision &&
|
|
3072
3106
|
winnerProbe &&
|
|
3073
3107
|
item.kind === "file" &&
|
|
3074
|
-
isAppendOnlyPath(relativePath)) {
|
|
3075
|
-
const outcome =
|
|
3108
|
+
(isAppendOnlyPath(relativePath) || isBoardJsonPath(relativePath))) {
|
|
3109
|
+
const outcome = isBoardJsonPath(relativePath)
|
|
3110
|
+
? mergeAppendOnlyPushConflict(run, item, winnerProbe, normalizeEtag(remoteMeta.etag), mergeBoardJson, replaceIfUnchanged)
|
|
3111
|
+
: mergeAppendOnlyPushConflict(run, item, winnerProbe, normalizeEtag(remoteMeta.etag));
|
|
3076
3112
|
if (outcome !== "not-mergeable") {
|
|
3077
3113
|
const conflictIndex = conflictPaths.lastIndexOf(relativePath);
|
|
3078
3114
|
if (conflictIndex >= 0)
|
|
@@ -4223,7 +4259,7 @@ async function probeRemoteForWinner(run, item, remoteMtime, remoteChangedSinceJo
|
|
|
4223
4259
|
function hashProbeEntry(entryPath) {
|
|
4224
4260
|
const lstat = fs.lstatSync(entryPath);
|
|
4225
4261
|
if (lstat.isSymbolicLink()) {
|
|
4226
|
-
return hashSymlinkTarget(
|
|
4262
|
+
return hashSymlinkTarget(readlinkPortableSync(entryPath));
|
|
4227
4263
|
}
|
|
4228
4264
|
const noFollow = fs.constants.O_NOFOLLOW ?? 0;
|
|
4229
4265
|
const fd = fs.openSync(entryPath, fs.constants.O_RDONLY | noFollow);
|
|
@@ -4302,7 +4338,7 @@ function recordPushConflictNotice(run, item, backupPath, sideKept, decision, rem
|
|
|
4302
4338
|
* Returns "not-mergeable" when either body is not line text, leaving the probe
|
|
4303
4339
|
* untouched for the ordinary conflict rule.
|
|
4304
4340
|
*/
|
|
4305
|
-
function mergeAppendOnlyPushConflict(run, item, probe, remoteEtag) {
|
|
4341
|
+
function mergeAppendOnlyPushConflict(run, item, probe, remoteEtag, merge = mergeAppendOnly, writeMerged = appendIfUnchanged) {
|
|
4306
4342
|
const remoteBody = probe.peekBody();
|
|
4307
4343
|
if (!remoteBody)
|
|
4308
4344
|
return "not-mergeable";
|
|
@@ -4316,7 +4352,7 @@ function mergeAppendOnlyPushConflict(run, item, probe, remoteEtag) {
|
|
|
4316
4352
|
noteSwallowedError((line) => process.stderr.write(line), "hq-cloud.append_only_local_read_failed", error, { quietOnAbsence: false });
|
|
4317
4353
|
return "not-mergeable";
|
|
4318
4354
|
}
|
|
4319
|
-
const merged =
|
|
4355
|
+
const merged = merge(localBody, remoteBody);
|
|
4320
4356
|
if (!merged)
|
|
4321
4357
|
return "not-mergeable";
|
|
4322
4358
|
probe.discard();
|
|
@@ -4324,13 +4360,13 @@ function mergeAppendOnlyPushConflict(run, item, probe, remoteEtag) {
|
|
|
4324
4360
|
return "publish-local";
|
|
4325
4361
|
let appended;
|
|
4326
4362
|
try {
|
|
4327
|
-
appended =
|
|
4363
|
+
appended = writeMerged(item.absolutePath, localBody, merged);
|
|
4328
4364
|
}
|
|
4329
4365
|
catch (error) {
|
|
4330
4366
|
run.emit({
|
|
4331
4367
|
type: "error",
|
|
4332
4368
|
path: item.relativePath,
|
|
4333
|
-
message:
|
|
4369
|
+
message: `${isBoardJsonPath(item.relativePath) ? "could not merge the cloud board entries into the local board" : "could not add the cloud's lines to the local file"}: ${describeError(error)}`,
|
|
4334
4370
|
});
|
|
4335
4371
|
return "write-failed";
|
|
4336
4372
|
}
|
|
@@ -4388,7 +4424,7 @@ async function adoptRemoteOnPush(run, item, remoteHash, decision, probe) {
|
|
|
4388
4424
|
renameOrRaiseWindowsBlocked(item.absolutePath, backupAbs);
|
|
4389
4425
|
localMovedAside = true;
|
|
4390
4426
|
backupHash = item.kind === "symlink"
|
|
4391
|
-
? hashSymlinkTarget(
|
|
4427
|
+
? hashSymlinkTarget(readlinkPortableSync(backupAbs))
|
|
4392
4428
|
: hashFile(backupAbs);
|
|
4393
4429
|
if (backupHash !== item.localHash) {
|
|
4394
4430
|
throw new Error("conflict backup verification failed");
|
|
@@ -4428,7 +4464,7 @@ async function adoptRemoteOnPush(run, item, remoteHash, decision, probe) {
|
|
|
4428
4464
|
const localLstat = fs.lstatSync(item.absolutePath);
|
|
4429
4465
|
const isLocalSymlink = localLstat.isSymbolicLink();
|
|
4430
4466
|
const remoteBodyHash = isLocalSymlink
|
|
4431
|
-
? hashSymlinkTarget(
|
|
4467
|
+
? hashSymlinkTarget(readlinkPortableSync(item.absolutePath))
|
|
4432
4468
|
: (downloaded?.contentHash ?? hashFile(item.absolutePath));
|
|
4433
4469
|
const remoteBodySize = isLocalSymlink
|
|
4434
4470
|
? 0
|
|
@@ -6118,7 +6154,7 @@ const DELETE_PLAN_HEAD_CONCURRENCY = 16;
|
|
|
6118
6154
|
*
|
|
6119
6155
|
* Empty `scopeRoots` ⇒ empty plan (caller didn't opt in).
|
|
6120
6156
|
*/
|
|
6121
|
-
async function computeDeletePlan(journal, syncRoot, scopeRoots, shouldSync, policy, ctx,
|
|
6157
|
+
export async function computeDeletePlan(journal, syncRoot, scopeRoots, shouldSync, policy, ctx,
|
|
6122
6158
|
// True for a COMPANY-scoped push (personalMode !== true). This distinguishes
|
|
6123
6159
|
// the canonical knowledge-marker layout from the personal-vault layout; it
|
|
6124
6160
|
// does not reinterpret ordinary vault-relative path segments.
|