@indigoai-us/hq-cloud 6.14.6 → 6.14.7

package/dist/scope-shrink.js

@@ -34,6 +34,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import { hashFile, tombstoneEntry } from "./journal.js";
+import { localPathForVaultKey } from "./local-path-codec.js";
 import { isCoveredByAny, } from "./prefix-coalesce.js";
 /**
  * Build a scope-shrink plan: find orphans, classify each clean/dirty.
@@ -101,7 +102,7 @@ export function buildScopeShrinkPlan(input) {
  * and the operator-facing message points at the path either way.
  */
 function classifyOrphan(relPath, entry, hqRoot) {
-    const absPath = path.join(hqRoot, relPath);
+    const absPath = localPathForVaultKey(hqRoot, relPath);
     let stat;
     try {
         stat = fs.lstatSync(absPath);
@@ -280,9 +281,9 @@ export function applyScopeShrink(input) {
     const quarantinedPaths = [];
     const dirtyKeptPaths = [];
     for (const orphan of plan.clean) {
-        const absPath = path.join(hqRoot, orphan.path);
+        const absPath = localPathForVaultKey(hqRoot, orphan.path);
         if (quarantining) {
-            const destAbs = path.join(input.quarantineRoot, orphan.path);
+            const destAbs = localPathForVaultKey(input.quarantineRoot, orphan.path);
             quarantineOrphan(absPath, destAbs);
             tombstoneEntry(journal, orphan.path, reason);
             cleanQuarantined++;

package/dist/scope-shrink.js.map

@@ -1 +1 @@
-{"version":3,"file":"scope-shrink.js","sourceRoot":"","sources":["../src/scope-shrink.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scope-shrink.js","sourceRoot":"","sources":["../src/scope-shrink.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cloud",
-  "version": "6.14.6",
+  "version": "6.14.7",
   "description": "HQ by Indigo cloud sync engine — bidirectional S3 sync for mobile access",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/presign-transport-e2e.mjs

@@ -82,17 +82,19 @@ async function main() {
 
   const stamp = Date.now().toString(36);
   const prefix = `shared/_presign_e2e_${stamp}/`;
-  const fileKey = `${prefix}probe.txt`;
+  const fileKey = `${prefix}hooks/presign-e2e-hook.sh`;
+  const legacyKey = `${prefix}hooks/legacy-e2e-hook.sh`;
   const linkKey = `${prefix}link`;
   const author = { userSub: "e2e-probe-sub", email: "hassaan@getindigo.ai" };
 
   const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "presign-e2e-"));
-  const localUp = path.join(tmp, "up.txt");
-  const localDown = path.join(tmp, "down.txt");
+  const localUp = path.join(tmp, "presign-e2e-hook.sh");
+  const localDown = path.join(tmp, "downloaded-hook.sh");
+  const legacyDown = path.join(tmp, "legacy-hook.sh");
   const localLink = path.join(tmp, "link");
-  const content = `presign-transport probe ${stamp}\n${"x".repeat(2000)}`;
+  const content = `#!/usr/bin/env bash\n# presign-transport probe ${stamp}\n${"x".repeat(2000)}`;
   fs.writeFileSync(localUp, content);
-  fs.chmodSync(localUp, 0o640);
+  fs.chmodSync(localUp, 0o755);
 
   let allCreated = [];
   try {
@@ -125,8 +127,8 @@ async function main() {
       head?.metadata?.["created-by"],
     );
     check(
-      "metadata.hq-mode round-trips as 640",
-      head?.metadata?.["hq-mode"] === "640",
+      "metadata.hq-mode round-trips as 755",
+      head?.metadata?.["hq-mode"] === "755",
       head?.metadata?.["hq-mode"],
     );
     check(
@@ -135,13 +137,13 @@ async function main() {
       `${head?.etag} vs ${row?.etag}`,
     );
 
-    // ---- GET (presigned download, bytes + mode applied) -----------------
+    // ---- GET (presigned download to an empty destination, bytes + mode) --
     const dl = await downloadFile(ctx, fileKey, localDown);
     const got = fs.readFileSync(localDown, "utf-8");
     check("downloadFile bytes match upload", got === content);
     check(
-      "downloaded file mode is 0640 (hq-mode applied)",
-      (fs.lstatSync(localDown).mode & 0o777) === 0o640,
+      "downloaded hook mode is 0755 (hq-mode applied)",
+      (fs.lstatSync(localDown).mode & 0o777) === 0o755,
       "0" + (fs.lstatSync(localDown).mode & 0o777).toString(8),
     );
     check(
@@ -149,6 +151,50 @@ async function main() {
       dl?.metadata?.["created-by"] === author.email,
     );
 
+    // ---- Legacy hq-mode fallback ----------------------------------------
+    // Create a pre-hq-mode object through the same real presigned PUT
+    // endpoint, deliberately omitting metadata. A legacy remote overwrite
+    // must retain the known-good local executable mode instead of silently
+    // replacing the hook with the receiver's usual 0644 umask default.
+    const legacyPresign = await vault.presign({
+      companyUid,
+      op: "put",
+      keys: [{ key: legacyKey, op: "put", contentType: "text/x-shellscript" }],
+    });
+    const legacyPut = legacyPresign.results[0];
+    if (!legacyPut?.url) throw new Error("legacy PUT presign was not returned");
+    const legacyPutResponse = await fetch(legacyPut.url, {
+      method: "PUT",
+      headers: legacyPut.headers,
+      body: "#!/usr/bin/env bash\necho legacy hook\n",
+    });
+    if (!legacyPutResponse.ok) {
+      throw new Error(`legacy presigned PUT failed: ${legacyPutResponse.status}`);
+    }
+    allCreated.push(legacyKey);
+    const legacyHead = await headRemoteFile(ctx, legacyKey);
+    check(
+      "legacy object deliberately has no hq-mode metadata",
+      legacyHead?.metadata?.["hq-mode"] === undefined,
+      legacyHead?.metadata?.["hq-mode"],
+    );
+    fs.writeFileSync(legacyDown, "#!/usr/bin/env bash\necho prior hook\n");
+    fs.chmodSync(legacyDown, 0o755);
+    const legacyDownload = await downloadFile(ctx, legacyKey, legacyDown);
+    check(
+      "legacy hook fallback retains existing 0755 mode (not 0644)",
+      (fs.lstatSync(legacyDown).mode & 0o777) === 0o755,
+      "0" + (fs.lstatSync(legacyDown).mode & 0o777).toString(8),
+    );
+    check(
+      "legacy hq-mode fallback is surfaced for repair telemetry",
+      legacyDownload.modeWarnings?.some(
+        (warning) =>
+          warning.reason === "missing-hq-mode" &&
+          warning.fallback === "preserved-local-mode",
+      ) === true,
+    );
+
     // ---- SYMLINK round-trip --------------------------------------------
     const ln = await uploadSymlink(ctx, "../target/path.txt", linkKey, author);
     allCreated.push(linkKey);
@@ -164,6 +210,7 @@ async function main() {
 
     // ---- DELETE (presigned) --------------------------------------------
     await deleteRemoteFile(ctx, fileKey);
+    await deleteRemoteFile(ctx, legacyKey);
     await deleteRemoteFile(ctx, linkKey);
     allCreated = [];
     const afterFile = await headRemoteFile(ctx, fileKey);

package/scripts/vault-rebaseline.sh

@@ -91,12 +91,17 @@ AWS_ARGS=()
 [ -n "$AWS_PROFILE_OVERRIDE" ] && AWS_ARGS+=(--profile "$AWS_PROFILE_OVERRIDE")
 AWS_ARGS+=(--region "$AWS_REGION_OVERRIDE")
 
+command -v jq >/dev/null || {
+  echo "error: jq is required to preserve existing S3 metadata during hq-mode repair" >&2
+  exit 2
+}
+
 # Tmp dirs.
 BASELINE="$(mktemp -d -t hq-rebaseline-baseline-XXXXXX)"
 STAGING="$(mktemp -d -t hq-rebaseline-stage-XXXXXX)"
 
 cleanup() {
-  local rc=$?
+  local rc="${1:-$?}"
   if [ "$KEEP_TMP" = "1" ]; then
     echo "==> --keep-tmp set; preserving $BASELINE and $STAGING" >&2
   else
@@ -212,6 +217,48 @@ SYNC_ARGS=("s3" "sync" "$STAGING/" "s3://$BUCKET/" "--size-only")
 
 aws "${AWS_ARGS[@]}" "${SYNC_ARGS[@]}"
 
+# `aws s3 sync` carries bytes but does not derive hq-cloud's per-file hq-mode
+# metadata. Re-upload ONLY regular objects that lack a valid mode, taking the
+# permission bits from this freshly cloned release tree (the canonical git
+# manifest). This is the one-time repair for legacy objects: a fresh pull can
+# now restore shipped hooks/scripts from metadata rather than guessing from
+# content. Existing user metadata is retained, including created-by fields.
+n_mode_backfilled=0
+MODE_META_DIR="$(mktemp -d -t hq-rebaseline-mode-meta-XXXXXX)"
+cleanup_mode_meta() { rm -rf "${MODE_META_DIR:-}"; }
+trap 'rc=$?; cleanup_mode_meta; cleanup "$rc"' EXIT
+mode_index=0
+while IFS= read -r -d '' src; do
+  rel="${src#"$STAGING/"}"
+  # Symlink records intentionally have no hq-mode (their mode is OS-owned).
+  grep -Fqx -- "$rel" "$SYMLIST" && continue
+
+  mode="$(stat -c '%a' "$src")"
+  head_json="$MODE_META_DIR/$mode_index.head.json"
+  metadata_json="$MODE_META_DIR/$mode_index.metadata.json"
+  mode_index=$((mode_index + 1))
+  aws "${AWS_ARGS[@]}" s3api head-object \
+    --bucket "$BUCKET" --key "$rel" --output json > "$head_json"
+  existing_mode="$(jq -r '.Metadata["hq-mode"] // empty' "$head_json")"
+  if [[ "$existing_mode" =~ ^[0-7]{1,4}$ ]]; then
+    continue
+  fi
+
+  jq -c --arg mode "$mode" \
+    '(.Metadata // {}) + {"hq-mode": $mode}' \
+    "$head_json" > "$metadata_json"
+  content_type="$(jq -r '.ContentType // empty' "$head_json")"
+  if [ "$DRY_RUN" = "1" ]; then
+    echo "    would backfill hq-mode=$mode: $rel" >&2
+  else
+    PUT_ARGS=(s3api put-object --bucket "$BUCKET" --key "$rel" --body "$src" --metadata "file://$metadata_json")
+    [ -n "$content_type" ] && PUT_ARGS+=(--content-type "$content_type")
+    aws "${AWS_ARGS[@]}" "${PUT_ARGS[@]}" >/dev/null
+    echo "    backfilled hq-mode=$mode: $rel" >&2
+  fi
+  n_mode_backfilled=$((n_mode_backfilled + 1))
+done < <(find "$STAGING" -type f -print0)
+
 # Stamp the hq-symlink-target metadata header on every marker so the menubar
 # pull materializes them as real symlinks (apps/hq-cloud/src/s3.ts:466-468
 # prefers header detection; body sniff is fallback).
@@ -271,5 +318,6 @@ echo "    version:       $VERSION ($SOURCE_REPO@$REF)" >&2
 echo "    pushed:        $n_files files, $n_syms symlinks (gross — preserved excluded)" >&2
 echo "    user-state preserved: $n_preserved files" >&2
 echo "    stamped:       $n_stamped" >&2
+echo "    hq-mode backfilled: $n_mode_backfilled" >&2
 echo "    deleted:       $n_deleted (v14 cruft)" >&2
 exit 0

package/scripts/vault-rescue.sh

@@ -120,6 +120,11 @@ AWS_ARGS=()
 [ -n "$AWS_PROFILE_OVERRIDE" ] && AWS_ARGS+=(--profile "$AWS_PROFILE_OVERRIDE")
 AWS_ARGS+=(--region "$AWS_REGION_OVERRIDE")
 
+command -v jq >/dev/null || {
+  echo "error: jq is required to preserve existing S3 metadata during hq-mode repair" >&2
+  exit 2
+}
+
 # Tmp dir setup.
 if [ -n "$TMP_DIR_OVERRIDE" ]; then
   TMP_DIR="$TMP_DIR_OVERRIDE"
@@ -201,8 +206,9 @@ echo "==> [3/3] push $TMP_DIR/  ->  s3://$BUCKET/" >&2
 # per apps/hq-cloud/src/s3.ts:417). Skip a minimal denylist that should
 # never round-trip through S3.
 STAGING="$(mktemp -d -t hq-vault-rescue-stage-XXXXXX)"
+MODE_META_DIR="$(mktemp -d -t hq-vault-rescue-mode-meta-XXXXXX)"
 add_staging_cleanup() {
-  rm -rf "${STAGING:-}"
+  rm -rf "${STAGING:-}" "${MODE_META_DIR:-}"
 }
 # Chain cleanup: existing trap removes TMP_DIR; we also need STAGING gone.
 trap '{ add_staging_cleanup; cleanup; }' EXIT
@@ -261,6 +267,40 @@ echo "    staged files=$n_files symlinks=$n_symlinks skipped=$n_skipped" >&2
 echo "    aws s3 sync $STAGING/ -> s3://$BUCKET/ --size-only --delete" >&2
 aws "${AWS_ARGS[@]}" s3 sync "$STAGING/" "s3://$BUCKET/" --size-only --delete
 
+# The AWS CLI moves bytes without hq-cloud's hq-mode metadata. Re-upload only
+# regular objects that need the one-time repair, preserving existing S3 user
+# metadata. For release-shipped files the rescue overlay supplied these modes
+# from the trusted hq-core git tree, so a fresh pull restores hooks/scripts
+# from canonical metadata instead of trying to infer executability from bytes.
+n_mode_backfilled=0
+mode_index=0
+while IFS= read -r -d '' src; do
+  rel="${src#"$STAGING/"}"
+  # Symlink records intentionally have no hq-mode (their mode is OS-owned).
+  grep -Fqx -- "$rel" "$SYMLINK_LIST" && continue
+
+  mode="$(stat -c '%a' "$src")"
+  head_json="$MODE_META_DIR/$mode_index.head.json"
+  metadata_json="$MODE_META_DIR/$mode_index.metadata.json"
+  mode_index=$((mode_index + 1))
+  aws "${AWS_ARGS[@]}" s3api head-object \
+    --bucket "$BUCKET" --key "$rel" --output json > "$head_json"
+  existing_mode="$(jq -r '.Metadata["hq-mode"] // empty' "$head_json")"
+  if [[ "$existing_mode" =~ ^[0-7]{1,4}$ ]]; then
+    continue
+  fi
+
+  jq -c --arg mode "$mode" \
+    '(.Metadata // {}) + {"hq-mode": $mode}' \
+    "$head_json" > "$metadata_json"
+  content_type="$(jq -r '.ContentType // empty' "$head_json")"
+  PUT_ARGS=(s3api put-object --bucket "$BUCKET" --key "$rel" --body "$src" --metadata "file://$metadata_json")
+  [ -n "$content_type" ] && PUT_ARGS+=(--content-type "$content_type")
+  aws "${AWS_ARGS[@]}" "${PUT_ARGS[@]}" >/dev/null
+  echo "    backfilled hq-mode=$mode: $rel" >&2
+  n_mode_backfilled=$((n_mode_backfilled + 1))
+done < <(find "$STAGING" -type f -print0)
+
 # Stamp the hq-symlink metadata header on every symlink-marker object so
 # the menubar pull materializes them as real symlinks (apps/hq-cloud/src/
 # s3.ts:466-468 prefers header detection; body-sniff is fallback).
@@ -288,4 +328,5 @@ echo "    version:   $VERSION ($SOURCE_REPO@$REF)" >&2
 echo "    files:     $n_files" >&2
 echo "    symlinks:  $n_symlinks" >&2
 echo "    stamped:   $n_stamped" >&2
+echo "    hq-mode backfilled: $n_mode_backfilled" >&2
 echo "    skipped:   $n_skipped" >&2

package/src/cli/reindex.ts

@@ -32,6 +32,7 @@ import {
   type CloudTelemetryClient,
   type TelemetryClaims,
 } from "../telemetry-events.js";
+import { decodeLocalVaultSegment, encodeLocalVaultSegment } from "../local-path-codec.js";
 
 export interface ReindexOptions {
   /** HQ root to operate on. Defaults to process.cwd(). */
@@ -565,7 +566,7 @@ export function reindex(opts: ReindexOptions = {}): ReindexResult {
       if (skillName.startsWith("_")) continue;
       if (!isFile(path.join(skillPath, "SKILL.md"))) continue;
 
-      const wrapperName = `${ns}:${skillName}`;
+      const wrapperName = encodeLocalVaultSegment(`${ns}:${skillName}`);
       const wrapper = path.join(root, ".claude", "skills", wrapperName);
       expectedWrappers.add(wrapperName);
 
@@ -641,13 +642,14 @@ export function reindex(opts: ReindexOptions = {}): ReindexResult {
     const entryPath = path.join(skillsDir, entry);
     const lst = lstatOrNull(entryPath);
     if (!lst) continue; // accept broken symlinks (lstat still succeeds)
-    if (!entry.includes(":")) continue; // not a namespaced wrapper
+    const canonicalEntry = decodeLocalVaultSegment(entry);
+    if (!canonicalEntry.includes(":")) continue; // not a namespaced wrapper
     if (expectedWrappers.has(entry)) continue; // maintained this run
 
     // A wrapper is "managed" only when its namespace prefix matches the
     // namespace encoded in its symlink target — this distinguishes
     // script-produced wrappers from hand-authored composite wrappers.
-    const ns = entry.slice(0, entry.indexOf(":"));
+    const ns = canonicalEntry.slice(0, canonicalEntry.indexOf(":"));
     const matchTarget = (t: string | null, p: string): boolean => {
       if (!t) return false;
       if (t.startsWith(`${p}/personal/skills/`)) return ns === "personal";

package/src/cli/rescue-core.ts

@@ -105,6 +105,22 @@ function run(
   };
 }
 
+/**
+ * Cygwin's rsync is a POSIX program even when Node gave us a native Win32
+ * path. Keep UNC paths in Cygwin's documented `//server/share` form and map
+ * drive roots explicitly instead of relying on Cygwin's native-path fallback.
+ */
+export function toCygwinRsyncPath(localPath: string): string {
+  const slashPath = localPath.replaceAll("\\", "/");
+  if (/^\/\/[^/]+\/[^/]+(?:\/|$)/.test(slashPath)) return slashPath;
+
+  const drivePath = /^([a-z]):\/(.*)$/i.exec(slashPath);
+  if (drivePath) {
+    return `/cygdrive/${drivePath[1]!.toLowerCase()}/${drivePath[2]}`;
+  }
+  return localPath;
+}
+
 function redactGitDiagnostic(output: string, ghToken: string): string {
   let redacted = output;
   if (ghToken) redacted = redacted.replaceAll(ghToken, "***");
@@ -739,7 +755,13 @@ function doRescue(
       if (rsyncAvailable) {
         const r = run(
           "rsync",
-          ["-a", "--exclude=node_modules/", "--exclude=.git/", srcAbs, destParent + "/"],
+          [
+            "-a",
+            "--exclude=node_modules/",
+            "--exclude=.git/",
+            toCygwinRsyncPath(srcAbs),
+            toCygwinRsyncPath(destParent + "/"),
+          ],
           { env },
         );
         if (r.status !== 0) cpA(srcAbs, destParent);
@@ -841,6 +863,24 @@ function doRescue(
   // Actions run in classification (walk) order — the same order the old
   // interleaved walk mutated in — so per-file output and on-disk results are
   // unchanged versus before the two-phase split.
+  const overlayProtect: string[] = [];
+  if (fs.statSync(unchangedList).size > 0) {
+    overlayProtect.push(`--exclude-from=${unchangedList}`);
+  }
+  const overlayArgs = [
+    "-a",
+    ...overlayProtect,
+    ...rsyncExcludes,
+    toCygwinRsyncPath(srcDir + "/"),
+    toCygwinRsyncPath(hqRoot + "/"),
+  ];
+  // Exercise the exact overlay command before any classified delete/move. A
+  // Cygwin path conversion or filter failure therefore leaves the root intact.
+  const overlayPreflight = run("rsync", ["--dry-run", ...overlayArgs], { env });
+  if (overlayPreflight.status !== 0) {
+    err(overlayPreflight.stderr);
+    throw new ExitError(overlayPreflight.status || 1);
+  }
   ctx.actions = buildRescueActions(ctx);
   applyClassifiedActions(ctx, backupDir);
 
@@ -866,15 +906,22 @@ function doRescue(
 
   // --- Overlay source onto HQ root ---
   out("==> Overlaying source onto HQ root ...\n");
-  const overlayProtect: string[] = [];
-  if (fs.statSync(unchangedList).size > 0) {
-    overlayProtect.push(`--exclude-from=${unchangedList}`);
-  }
-  const overlay = run(
-    "rsync",
-    ["-a", ...overlayProtect, ...rsyncExcludes, srcDir + "/", hqRoot + "/"],
-    { env },
-  );
+  // `unchangedList` is only populated during applyClassifiedActions above, so
+  // re-derive the --exclude-from protect list HERE. Building overlayArgs before
+  // classification left the list empty, so unchanged files were overlaid and
+  // their mtimes reset to clone time (rescue-mtime-preserve regression). The
+  // early overlayArgs remain correct for the pre-classification dry-run.
+  const overlayRunArgs =
+    fs.statSync(unchangedList).size > 0
+      ? [
+          "-a",
+          `--exclude-from=${unchangedList}`,
+          ...rsyncExcludes,
+          toCygwinRsyncPath(srcDir + "/"),
+          toCygwinRsyncPath(hqRoot + "/"),
+        ]
+      : overlayArgs;
+  const overlay = run("rsync", overlayRunArgs, { env });
   if (overlay.status !== 0) {
     // bash runs under set -e: a failed rsync aborts with its status.
     err(overlay.stderr);

package/src/cli/rescue.test.ts

@@ -1,5 +1,12 @@
 import { describe, it, expect } from "vitest";
 import { buildRescueArgs, extractLockTimeout } from "./rescue.js";
+import { toCygwinRsyncPath } from "./rescue-core.js";
+import {
+  decodeLocalVaultSegment,
+  encodeLocalVaultSegment,
+  localPathForVaultKey,
+  vaultKeyForLocalPath,
+} from "../local-path-codec.js";
 
 describe("extractLockTimeout", () => {
   it("returns the explicit option untouched when extraArgs is empty/absent", () => {
@@ -95,3 +102,30 @@ describe("buildRescueArgs", () => {
     expect(buildRescueArgs({ paths: [] })).toEqual([]);
   });
 });
+
+describe("Windows sync path adapters", () => {
+  it("converts drive-letter and UNC rsync arguments to Cygwin paths", () => {
+    expect(toCygwinRsyncPath("C:\\HQ\\core\\")).toBe("/cygdrive/c/HQ/core/");
+    expect(toCygwinRsyncPath("D:/HQ/workspace")).toBe("/cygdrive/d/HQ/workspace");
+    expect(toCygwinRsyncPath("\\\\fileserver\\hq-share\\HQ\\")).toBe(
+      "//fileserver/hq-share/HQ/",
+    );
+  });
+
+  it("round-trips Windows-safe local names without changing canonical vault keys", () => {
+    const win32 = true;
+    expect(encodeLocalVaultSegment("core:skill", win32)).toBe("core%3Askill");
+    expect(encodeLocalVaultSegment("core%3Askill", win32)).toBe("core%253Askill");
+    expect(encodeLocalVaultSegment("core\u0000skill", win32)).toBe("core%00skill");
+    expect(decodeLocalVaultSegment("core%3Askill", win32)).toBe("core:skill");
+
+    // Pull materializes the key under a safe filename, while the journal and
+    // the following push retain the original canonical S3 key.
+    const canonicalKey = "factory:slack/apps/web/oauth-token.json";
+    const pulledLocalPath = localPathForVaultKey("C:\\HQ\\companies\\acme", canonicalKey, win32);
+    expect(pulledLocalPath).toContain("factory%3Aslack");
+    const journalKey = canonicalKey;
+    const pushedKey = vaultKeyForLocalPath("C:\\HQ\\companies\\acme", pulledLocalPath, win32);
+    expect(pushedKey).toBe(journalKey);
+  });
+});

package/src/cli/share.ts

@@ -11,6 +11,7 @@ import * as path from "path";
 import type { EntityContext, VaultServiceConfig, SyncJournal } from "../types.js";
 import { resolveEntityContext, isExpiringSoon, refreshEntityContext } from "../context.js";
 import { createSyncProgressRecorder } from "../sync-progress.js";
+import { localPathForVaultKey, vaultKeyForLocalPath } from "../local-path-codec.js";
 import {
   uploadFile,
   uploadSymlink,
@@ -788,7 +789,7 @@ function wrapFilterWithScope(
 ): (absPath: string, isDir?: boolean) => boolean {
   return (absPath: string, isDir?: boolean) => {
     if (!underlying(absPath, isDir)) return false;
-    const rel = path.relative(syncRoot, absPath).split(path.sep).join("/");
+    const rel = vaultKeyForLocalPath(syncRoot, absPath);
     if (rel === "" || rel.startsWith("..")) return true; // root / outside — defer
     if (isDir) {
       if (isDirInScope(rel, prefixSet)) return true;
@@ -819,7 +820,7 @@ export function wrapFilterWithIgnoreVisibility(
     if (allowed) return true;
 
     onAnyExcluded?.();
-    const rel = path.relative(hqRoot, absPath).split(path.sep).join("/");
+    const rel = vaultKeyForLocalPath(hqRoot, absPath);
     if (rel === "" || rel.startsWith("..")) return false;
     if (!isExpectedIgnore(rel)) onIgnoreExcluded(rel);
     return false;
@@ -1456,13 +1457,13 @@ async function writePushConflictMirror(
   try {
     const detectedAt = new Date().toISOString();
     const machineId = readShortMachineId(run.hqRoot);
-    const originalRelative = path.relative(run.hqRoot, item.absolutePath);
+    const originalRelative = vaultKeyForLocalPath(run.hqRoot, item.absolutePath);
     const conflictRelative = buildConflictPath(
       originalRelative,
       detectedAt,
       machineId,
     );
-    const conflictAbs = path.join(run.hqRoot, conflictRelative);
+    const conflictAbs = localPathForVaultKey(run.hqRoot, conflictRelative);
     if (!isMaterializationPathStillContained(run.syncRoot, conflictAbs)) {
       run.emit({
         type: "error",
@@ -1787,7 +1788,7 @@ function collectFiles(
         console.error(`  Warning: ${p} is outside company folder, skipping.`);
         continue;
       }
-      const relativePath = toPosixKey(path.relative(syncRoot, absolutePath));
+      const relativePath = vaultKeyForLocalPath(syncRoot, absolutePath);
       // Probe the filter with both isDir hints — we don't know whether
       // the link's target is a file or a directory without
       // stat-following the link, which we explicitly avoid (it would
@@ -1817,7 +1818,7 @@ function collectFiles(
       if (!filter(absolutePath, true)) continue;
       results.push(...walkDir(absolutePath, syncRoot, filter));
     } else if (lstat.isFile()) {
-      const relativePath = toPosixKey(path.relative(syncRoot, absolutePath));
+      const relativePath = vaultKeyForLocalPath(syncRoot, absolutePath);
       if (filter(absolutePath)) {
         results.push({ kind: "file", absolutePath, relativePath });
       }
@@ -1867,7 +1868,7 @@ function walkDir(
       results.push({
         kind: "symlink",
         absolutePath,
-        relativePath: toPosixKey(path.relative(syncRoot, absolutePath)),
+        relativePath: vaultKeyForLocalPath(syncRoot, absolutePath),
         target: fs.readlinkSync(absolutePath),
       });
       continue;
@@ -1883,7 +1884,7 @@ function walkDir(
       results.push({
         kind: "file",
         absolutePath,
-        relativePath: toPosixKey(path.relative(syncRoot, absolutePath)),
+        relativePath: vaultKeyForLocalPath(syncRoot, absolutePath),
       });
     }
   }
@@ -2002,11 +2003,11 @@ function resolveDeleteScopeRoots(
     if (!isWithin(syncRoot, absolutePath)) continue;
     const stat = fs.statSync(absolutePath);
     if (!stat.isDirectory()) continue;
-    const rel = path.relative(syncRoot, absolutePath);
+    const rel = vaultKeyForLocalPath(syncRoot, absolutePath);
     if (rel === "" || rel === ".") {
       return [""];
     }
-    prefixes.add(rel.split(path.sep).join("/"));
+    prefixes.add(rel);
   }
   return Array.from(prefixes);
 }
@@ -2244,7 +2245,7 @@ async function computeDeletePlan(
     );
     if (!inScope) continue;
     inScopeJournalEntries++;
-    const localPath = path.join(syncRoot, relativeKey);
+    const localPath = localPathForVaultKey(syncRoot, relativeKey);
     let presentLocally = true;
     try {
       fs.lstatSync(localPath);