@indigoai-us/hq-cloud 6.14.6 → 6.14.8

package/src/cli/rescue-classify-ordering.test.ts

@@ -369,4 +369,125 @@ exec ${JSON.stringify(realGit)} "$@"
     expect(lexists(link)).toBe(true);
     expect(fs.existsSync(path.join(hqRoot, "core/a.md"))).toBe(true);
   });
+
+  it("fails with a typed state-change error when reindex replaces a classified symlink before apply", () => {
+    const hqRoot = makeHqRoot();
+    const target = path.join(hqRoot, "personal/skills/foreman/tests");
+    fs.mkdirSync(target, { recursive: true });
+    const link = path.join(hqRoot, ".claude/skills/personal:foreman/tests");
+    fs.mkdirSync(path.dirname(link), { recursive: true });
+    fs.symlinkSync("../../../personal/skills/foreman/tests", link);
+
+    const args = [
+      "--hq-root", hqRoot,
+      "--source", "test/repo",
+      "--ref", "main",
+      "--floor-sha", floorSha,
+      "--yes",
+      "--no-backup",
+    ];
+    const r = runRescueCapture(args, {
+      ...baseEnv,
+      HQ_RESCUE_FAULT_BEFORE_APPLY_REL: ".claude/skills/personal:foreman/tests",
+      HQ_RESCUE_FAULT_BEFORE_APPLY_KIND: "directory",
+    });
+    const out = `${r.stdout}\n${r.stderr}\n${String(r.threw ?? "")}`;
+
+    expect(r.threw, out).toBeInstanceOf(Error);
+    expect(out).toContain("changed after classification");
+    expect(out).toContain("expected symlink, found directory");
+    expect(out).not.toContain("EISDIR");
+    expect(fs.readFileSync(path.join(hqRoot, "core/a.md"), "utf-8")).toBe("v1\n");
+  });
+
+  it("keeps the full default wipe set out of worktrees and omits transient build state from the snapshot", () => {
+    const hqRoot = makeHqRoot();
+    const backupRoot = path.join(workDir, `backups-${caseSeq}`);
+    const writeTransient = (rel: string) => {
+      const dest = path.join(hqRoot, rel, "large.bin");
+      fs.mkdirSync(path.dirname(dest), { recursive: true });
+      fs.writeFileSync(dest, "reproducible\n");
+    };
+    for (const rel of [
+      "worktrees/repo",
+      ".worktrees/repo",
+      ".sst-sandbox-home/runtime",
+      ".tmp-codex-asar/cache",
+      ".claude/worktrees/agent/repo",
+      ".claude/skills/demo/node_modules/pkg",
+      ".claude/skills/demo/.pnpm-store/v3",
+      ".claude/skills/demo/.sst/build",
+      ".claude/skills/demo/.next/cache",
+      ".claude/skills/demo/target/debug",
+    ]) {
+      writeTransient(rel);
+    }
+
+    const r = runRescueCapture(
+      [
+        "--hq-root", hqRoot,
+        "--source", "test/repo",
+        "--ref", "main",
+        "--floor-sha", floorSha,
+        "--backup-dir", backupRoot,
+        "--yes",
+      ],
+      baseEnv,
+    );
+    const out = `${r.stdout}\n${r.stderr}\n${String(r.threw ?? "")}`;
+
+    expect(r.threw, out).toBeUndefined();
+    expect(r.status, out).toBe(0);
+    for (const rel of ["worktrees", ".worktrees", ".sst-sandbox-home", ".tmp-codex-asar"]) {
+      expect(fs.existsSync(path.join(hqRoot, rel, "repo", "large.bin")) ||
+        fs.existsSync(path.join(hqRoot, rel, "runtime", "large.bin")) ||
+        fs.existsSync(path.join(hqRoot, rel, "cache", "large.bin")), rel).toBe(true);
+    }
+
+    const snapshots = fs.readdirSync(backupRoot).filter((name) => name.startsWith("pre-update-"));
+    expect(snapshots).toHaveLength(1);
+    const snapshot = path.join(backupRoot, snapshots[0]);
+    expect(fs.existsSync(path.join(snapshot, "core/a.md"))).toBe(true);
+    expect(fs.existsSync(path.join(snapshot, "RECOVERY.md"))).toBe(true);
+    for (const rel of [
+      "worktrees",
+      ".worktrees",
+      ".sst-sandbox-home",
+      ".tmp-codex-asar",
+      ".claude/worktrees",
+      ".claude/skills/demo/node_modules",
+      ".claude/skills/demo/.pnpm-store",
+      ".claude/skills/demo/.sst",
+      ".claude/skills/demo/.next",
+      ".claude/skills/demo/target",
+    ]) {
+      expect(lexists(path.join(snapshot, rel)), `snapshot unexpectedly contains ${rel}`).toBe(false);
+    }
+  });
+
+  it("dry-run never allocates or prunes snapshots", () => {
+    const hqRoot = makeHqRoot();
+    const backupRoot = path.join(workDir, `dry-backups-${caseSeq}`);
+    const existing = path.join(backupRoot, "pre-update-existing");
+    fs.mkdirSync(existing, { recursive: true });
+    fs.writeFileSync(path.join(existing, "keep.txt"), "do not prune\n");
+
+    const r = runRescueCapture(
+      [
+        "--hq-root", hqRoot,
+        "--source", "test/repo",
+        "--ref", "main",
+        "--floor-sha", floorSha,
+        "--backup-dir", backupRoot,
+        "--dry-run",
+      ],
+      baseEnv,
+    );
+    const out = `${r.stdout}\n${r.stderr}\n${String(r.threw ?? "")}`;
+
+    expect(r.threw, out).toBeUndefined();
+    expect(r.status, out).toBe(0);
+    expect(fs.readdirSync(backupRoot)).toEqual(["pre-update-existing"]);
+    expect(fs.readFileSync(path.join(existing, "keep.txt"), "utf-8")).toBe("do not prune\n");
+  });
 });