@indigoai-us/hq-cloud 6.18.87 → 6.18.89

package/dist/cli/rescue-core.js

@@ -1822,6 +1822,40 @@ function rsyncFilterRuleMatches(rawPattern, rel, isDir) {
     const subject = !anchored && !hasSlash ? rel.slice(rel.lastIndexOf("/") + 1) : rel;
     return new RegExp(source).test(subject);
 }
+/**
+ * The rsync filter list for the full (preserve-list) overlay.
+ *
+ * Root-only names are anchored with a leading `/`. rsync matches an
+ * unanchored name at any depth, so `--exclude=workspace` also dropped
+ * `companies/_template/workspace/` and `companies/_template/repos/`, and the
+ * later `_template` include could not bring them back because the first
+ * matching rule wins. `.git` stays unanchored: no nested git directory may be
+ * copied from the release. `--preserve` entries are passed through as given.
+ */
+export function fullOverlayRsyncFilters(extraPreserve = []) {
+    const filters = [
+        "--exclude=.git",
+        "--exclude=/personal",
+        "--exclude=/workspace",
+        "--exclude=/repos",
+        "--exclude=/.github",
+        "--exclude=/.leak-scan",
+        "--exclude=/.hq-sync-journal.json",
+        "--exclude=/.hq",
+        "--exclude=/.hq-conflicts",
+        "--exclude=/.local",
+        "--exclude=/worktrees",
+        "--exclude=/.worktrees",
+        "--exclude=/.sst-sandbox-home",
+        "--exclude=/.tmp-codex-asar",
+        "--include=/companies/",
+        "--include=/companies/_template/***",
+        "--exclude=/companies/*",
+    ];
+    for (const p of extraPreserve)
+        filters.push(`--exclude=${p}`);
+    return filters;
+}
 /**
  * True when rsync's overlay, run with `filters` (the rescue's `--include=` and
  * `--exclude=` list), would transfer `rel`. Every ancestor directory is
@@ -1919,10 +1953,31 @@ function windowsLinkIsUsable(destination, resolvedTarget, targetIsDir) {
 /**
  * Replace `destination` with a native link to the release target unless it
  * is already usable or holds user content. Returns false when left alone.
+ *
+ * Node on Windows returns EACCES from lstat/stat on a WSL LX_SYMLINK reparse
+ * point (feedback_3e1a7445). Treat that as an opaque existing entry and
+ * replace it; do not confuse it with a missing path, or the create step
+ * fails with EEXIST and the broken link stays.
  */
 function replaceWithNativeLink(destination, linkText, resolved, targetIsDir, ops) {
-    const lst = lstatOrNull(destination);
-    if (lst) {
+    let lst;
+    let opaque = false;
+    try {
+        lst = ops.lstat ? ops.lstat(destination) : fs.lstatSync(destination);
+    }
+    catch (error) {
+        const code = error.code;
+        if (code === "ENOENT") {
+            lst = undefined;
+        }
+        else {
+            opaque = true;
+        }
+    }
+    if (opaque) {
+        removeLinkEntry(destination);
+    }
+    else if (lst) {
         if (lst.isDirectory() && !lst.isSymbolicLink())
             return false;
         if (windowsLinkIsUsable(destination, resolved, targetIsDir))
@@ -1971,13 +2026,15 @@ function replaceWithNativeLink(destination, linkText, resolved, targetIsDir, ops
  * links that already resolve to the release target, paths the overlay's
  * filters exclude, and targets that are missing or leave `hqRoot`.
  * Returns the repo-relative paths that were rewritten and any that could not
- * be. No-op off Windows.
+ * be. `fallbackCount` is how many of those used a junction or file copy
+ * because the account cannot create a symlink. No-op off Windows.
  */
 export function normalizeWindowsGitSymlinks(srcDir, hqRoot, filters, env = process.env, platform = process.platform, ops = defaultWindowsLinkOps) {
     const repaired = [];
     const failed = [];
+    let fallbackCount = 0;
     if (platform !== "win32")
-        return { repaired, failed };
+        return { repaired, failed, fallbackCount };
     for (const { rel, sha } of gitSymlinkEntries(srcDir, env)) {
         if (!rsyncFiltersAdmit(filters, rel))
             continue;
@@ -1992,17 +2049,33 @@ export function normalizeWindowsGitSymlinks(srcDir, hqRoot, filters, env = proce
         if (!targetIsDir && !isFileFollow(resolved))
             continue;
         const destination = path.join(hqRoot, rel);
+        const beforeCalls = {
+            junction: 0,
+            copyFile: 0,
+        };
+        const countingOps = {
+            ...ops,
+            junction(resolvedTarget, dest) {
+                beforeCalls.junction += 1;
+                ops.junction(resolvedTarget, dest);
+            },
+            copyFile(resolvedTarget, dest) {
+                beforeCalls.copyFile += 1;
+                ops.copyFile(resolvedTarget, dest);
+            },
+        };
         try {
-            if (!replaceWithNativeLink(destination, linkText, resolved, targetIsDir, ops))
+            if (!replaceWithNativeLink(destination, linkText, resolved, targetIsDir, countingOps))
                 continue;
         }
         catch (error) {
             failed.push({ rel, reason: error instanceof Error ? error.message : String(error) });
             continue;
         }
+        fallbackCount += beforeCalls.junction + beforeCalls.copyFile;
         repaired.push(rel);
     }
-    return { repaired: repaired.sort(), failed };
+    return { repaired: repaired.sort(), failed, fallbackCount };
 }
 function recoveryProof(unresolved, cfg, hqRoot, srcDir, srcSha, rsyncLauncher, rsyncExcludes, env) {
     const newest = [...unresolved].sort((left, right) => right.entry.completedMs - left.entry.completedMs ||
@@ -2330,27 +2403,7 @@ function doRescue(cfg, env, out, err, setTmp, retainTmp, gitReachabilityProbeTim
         pruneNames.push(...ALWAYS_PRESERVED_NAMES);
         for (const p of cfg.extraPreserve)
             pruneNames.push(p);
-        rsyncExcludes = [
-            "--exclude=.git",
-            "--exclude=personal",
-            "--exclude=workspace",
-            "--exclude=repos",
-            "--exclude=.github",
-            "--exclude=.leak-scan",
-            "--exclude=.hq-sync-journal.json",
-            "--exclude=.hq",
-            "--exclude=.hq-conflicts",
-            "--exclude=/.local",
-            "--exclude=/worktrees",
-            "--exclude=/.worktrees",
-            "--exclude=/.sst-sandbox-home",
-            "--exclude=/.tmp-codex-asar",
-            "--include=/companies/",
-            "--include=/companies/_template/***",
-            "--exclude=/companies/*",
-        ];
-        for (const p of cfg.extraPreserve)
-            rsyncExcludes.push(`--exclude=${p}`);
+        rsyncExcludes = fullOverlayRsyncFilters(cfg.extraPreserve);
     }
     // --- Compute the wipe-set top-level roots ---
     const wipeToplevel = [];
@@ -2819,6 +2872,9 @@ function doRescue(cfg, env, out, err, setTmp, retainTmp, gitReachabilityProbeTim
         if (nativeLinks.repaired.length > 0) {
             out(`==> Rewrote ${nativeLinks.repaired.length} symlink(s) in native Windows form: ${nativeLinks.repaired.join(", ")}\n`);
         }
+        if (nativeLinks.fallbackCount > 0) {
+            err("warning: this Windows account cannot create symbolic links (Developer Mode is off, or HQ is not running elevated). Folder links were created as directory junctions, and file links as copies. Enable Developer Mode in Windows Settings so the next update can use normal links.\n");
+        }
         for (const failure of nativeLinks.failed) {
             err(`warning: could not rewrite ${failure.rel} as a native Windows link: ${failure.reason}\n`);
         }