@indigoai-us/hq-cloud 6.18.44-alpha.48 → 6.18.44-alpha.49

package/dist/cli/case-alias.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=case-alias.test.d.ts.map

package/dist/cli/case-alias.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"case-alias.test.d.ts","sourceRoot":"","sources":["../../src/cli/case-alias.test.ts"],"names":[],"mappings":""}

package/dist/cli/case-alias.test.js

@@ -0,0 +1,96 @@
+import { describe, expect, it } from "vitest";
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import { createCaseAliasTracker, directoryFoldsCase, foldVaultKey } from "./case-alias.js";
+describe("case alias tracker (feedback_c8ed69d1)", () => {
+    it("flags a mixed-case journal key when its lower-case twin is listed", () => {
+        const tracker = createCaseAliasTracker(["TikTok-Shop/plan.md", "docs/a.md"], () => false);
+        tracker.observeRemote("tiktok-shop/plan.md");
+        const aliased = tracker.finish();
+        expect(aliased.has("TikTok-Shop/plan.md")).toBe(true);
+        expect(aliased.has("docs/a.md")).toBe(false);
+    });
+    it("flags a lower-case journal key when a mixed-case twin is listed", () => {
+        const journal = new Set(["tiktok-shop/plan.md"]);
+        const tracker = createCaseAliasTracker(journal, (key) => journal.has(key));
+        tracker.observeRemote("TikTok-Shop/plan.md");
+        expect(tracker.finish().has("tiktok-shop/plan.md")).toBe(true);
+    });
+    it("flags keys that differ only in both-sides mixed case", () => {
+        const tracker = createCaseAliasTracker(["Readme/X.md"], () => false);
+        tracker.observeRemote("README/x.md");
+        expect(tracker.finish().has("Readme/X.md")).toBe(true);
+    });
+    it("never flags a key because the same key is listed", () => {
+        const journal = new Set(["TikTok-Shop/plan.md", "docs/a.md"]);
+        const tracker = createCaseAliasTracker(journal, (key) => journal.has(key));
+        tracker.observeRemote("TikTok-Shop/plan.md");
+        tracker.observeRemote("docs/a.md");
+        const aliased = tracker.finish();
+        expect(aliased.has("TikTok-Shop/plan.md")).toBe(false);
+        expect(aliased.has("docs/a.md")).toBe(false);
+    });
+    it("folds Unicode normalization as well as case", () => {
+        const nfd = "Café/menu.md".normalize("NFD");
+        const tracker = createCaseAliasTracker([nfd], () => false);
+        tracker.observeRemote("café/menu.md".normalize("NFC"));
+        expect(tracker.finish().has(nfd)).toBe(true);
+        expect(foldVaultKey(nfd)).toBe(foldVaultKey("CAFÉ/MENU.md"));
+    });
+    it("uses simple case folding, so final sigma matches sigma and capital sigma", () => {
+        // `toLowerCase()` leaves `ς` as `ς` but lowers `Σ` to `σ`; case-insensitive
+        // APFS and NTFS treat all three as the same name.
+        expect(foldVaultKey("ΟΔΟΣ/a.md")).toBe(foldVaultKey("οδος/a.md"));
+        expect(foldVaultKey("οδος/a.md")).toBe(foldVaultKey("οδοσ/a.md"));
+        const journal = new Set(["οδος/a.md"]);
+        const tracker = createCaseAliasTracker(journal, (key) => journal.has(key));
+        tracker.observeRemote("ΟΔΟΣ/a.md");
+        expect(tracker.finish().has("οδος/a.md")).toBe(true);
+    });
+    it("does not use full case folding expansions", () => {
+        // Filesystems fold simply: `ß` and `ss` are different names.
+        expect(foldVaultKey("Straße.md")).not.toBe(foldVaultKey("strasse.md"));
+    });
+    it("stops observing and releases its candidates once finished", () => {
+        const tracker = createCaseAliasTracker(["TikTok-Shop/plan.md"], () => false);
+        const aliased = tracker.finish();
+        tracker.observeRemote("tiktok-shop/plan.md");
+        expect(aliased.size).toBe(0);
+    });
+    it("flags only the exact folded twin among many capitalised candidates", () => {
+        const candidates = Array.from({ length: 50_000 }, (_, i) => `Area/File-${i}.md`);
+        const tracker = createCaseAliasTracker(candidates, () => false);
+        tracker.observeRemote("area/other.md");
+        tracker.observeRemote("area/file-49999.md");
+        const aliased = tracker.finish();
+        expect([...aliased]).toEqual(["Area/File-49999.md"]);
+    });
+});
+describe("directoryFoldsCase", () => {
+    it("measures lookups inside the directory against the real filesystem", () => {
+        const dir = fs.mkdtempSync(path.join(os.tmpdir(), "hq-case-probe-"));
+        try {
+            fs.writeFileSync(path.join(dir, "Probe.md"), "x");
+            // Ground truth from the filesystem itself, not from the platform name.
+            const folds = fs.existsSync(path.join(dir, "pROBE.MD"));
+            expect(directoryFoldsCase(dir)).toBe(folds);
+        }
+        finally {
+            fs.rmSync(dir, { recursive: true, force: true });
+        }
+    });
+    it("reads as not folding when the directory has nothing to compare", () => {
+        const dir = fs.mkdtempSync(path.join(os.tmpdir(), "hq-case-probe-"));
+        try {
+            expect(directoryFoldsCase(dir)).toBe(false);
+            fs.writeFileSync(path.join(dir, "123"), "x");
+            expect(directoryFoldsCase(dir)).toBe(false);
+            expect(directoryFoldsCase(path.join(dir, "missing"))).toBe(false);
+        }
+        finally {
+            fs.rmSync(dir, { recursive: true, force: true });
+        }
+    });
+});
+//# sourceMappingURL=case-alias.test.js.map

package/dist/cli/case-alias.test.js.map

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

package/dist/cli/conflict-recovery.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=conflict-recovery.test.d.ts.map

package/dist/cli/conflict-recovery.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-recovery.test.d.ts","sourceRoot":"","sources":["../../src/cli/conflict-recovery.test.ts"],"names":[],"mappings":""}

package/dist/cli/conflict-recovery.test.js

@@ -0,0 +1,207 @@
+import { createHash } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, describe, expect, it, vi } from "vitest";
+vi.mock("../sync/fsync-compat.js", async () => {
+    const actual = await vi.importActual("../sync/fsync-compat.js");
+    return { ...actual, fsyncWithCompatibility: vi.fn(actual.fsyncWithCompatibility) };
+});
+import { fsyncWithCompatibility } from "../sync/fsync-compat.js";
+import { preserveRealtimeConflict, realtimeConflictSiblingPath, } from "./conflict.js";
+const directories = [];
+afterEach(() => {
+    for (const directory of directories.splice(0)) {
+        fs.rmSync(directory, { recursive: true, force: true });
+    }
+});
+function root() {
+    const directory = fs.mkdtempSync(path.join(os.tmpdir(), "hq-u55-conflict-"));
+    directories.push(directory);
+    return directory;
+}
+function digest(bytes) {
+    return `sha256:${createHash("sha256").update(bytes).digest("hex")}`;
+}
+function authorization() {
+    return {
+        bearer: "bearer",
+        deviceId: "device-a",
+        capabilityVector: { hqCloud: "1.0.0", hqDesktop: "1.0.0", protocol: 2, journal: 3, durableApply: 1 },
+        lease: { lease: "lease", issuedAt: "2030-01-01T00:00:00.000Z", expiresAt: "2030-01-01T00:01:00.000Z", authorizationEpoch: "epoch-1" },
+    };
+}
+function ackFetch(status, duringAck) {
+    return vi.fn(async () => {
+        duringAck?.();
+        return {
+            ok: status >= 200 && status < 300,
+            status,
+            headers: { get: () => null },
+            body: null,
+            text: async () => "ack response",
+        };
+    });
+}
+describe("realtime conflict sibling vectors", () => {
+    it("uses NFC plus the protocol's lower-case RFC4648 suffix golden", () => {
+        expect(realtimeConflictSiblingPath({
+            scopeUid: "prs_demo",
+            canonicalPath: "notes/cafe\u0301.md",
+            attemptId: "attempt-01",
+        })).toBe("notes/café.conflict-gh3wpjyej2j7lqaz3bo5xfgsbu.md");
+    });
+    it("keeps leading-dot and trailing-dot filenames extensionless", () => {
+        expect(realtimeConflictSiblingPath({ scopeUid: "prs_demo", canonicalPath: ".env", attemptId: "attempt-01" }))
+            .toBe(".env.conflict-ctwymj4ik6slm4yebxhtmykqjg");
+        expect(realtimeConflictSiblingPath({ scopeUid: "prs_demo", canonicalPath: "report.", attemptId: "attempt-01" }))
+            .toBe("report..conflict-7bkmwiyxxbpvkbnplv6vplbkue");
+    });
+    it("truncates only at a complete UTF-8 code point and preserves the extension", () => {
+        const sibling = realtimeConflictSiblingPath({
+            scopeUid: "prs_demo",
+            canonicalPath: `${"😀".repeat(54)}.md`,
+            attemptId: "attempt-01",
+        });
+        const component = sibling.split("/").at(-1);
+        expect(Buffer.byteLength(component, "utf8")).toBe(255);
+        expect(component).toMatch(/\.conflict-[a-z2-7]{26}\.md$/);
+        expect(component.startsWith("😀")).toBe(true);
+        expect(component.includes("\ufffd")).toBe(false);
+    });
+});
+describe("creator-candidate conflict recovery", () => {
+    it("preserves exact fsynced spool bytes before sending conflict-sibling acknowledgement", async () => {
+        const directory = root();
+        const bytes = Buffer.from([0, 255, 1, 2, 3]);
+        const expectedSha256 = digest(bytes);
+        const spool = path.join(directory, "attempt.spool");
+        fs.writeFileSync(spool, bytes);
+        const expectedSibling = realtimeConflictSiblingPath({ scopeUid: "prs_demo", canonicalPath: "notes/lost.bin", attemptId: "attempt-01" });
+        const order = [];
+        const fetchImpl = ackFetch(204, () => {
+            expect(order).toEqual(["recorded"]);
+            expect(fs.readFileSync(path.join(directory, expectedSibling))).toEqual(bytes);
+        });
+        const result = await preserveRealtimeConflict({
+            root: directory,
+            scopeUid: "prs_demo",
+            canonicalPath: "notes/lost.bin",
+            attemptId: "attempt-01",
+            expectedSha256,
+            expectedSize: bytes.byteLength,
+            spoolPath: spool,
+            caseInsensitiveFilesystem: false,
+            recordConflictPreserved: async () => { order.push("recorded"); },
+            creatorCandidate: { apiUrl: "https://sync.example.test", authorization: authorization(), fetchImpl },
+        });
+        expect(result.source).toBe("local-attempt-spool");
+        expect(fsyncWithCompatibility).toHaveBeenCalledWith(expect.any(Number), expect.objectContaining({ site: "realtime conflict directory", handleKind: "directory" }));
+        expect(fs.readFileSync(path.join(directory, result.siblingPath))).toEqual(bytes);
+        expect(fetchImpl).toHaveBeenCalledWith("https://sync.example.test/v2/sync/mutations/attempt-01/candidate-ack", expect.objectContaining({
+            method: "POST",
+            body: JSON.stringify({ evidence: { kind: "conflict-sibling", sha256: expectedSha256 } }),
+        }));
+    });
+    it("recovers exact bytes from the creator-only exact candidate when the spool is absent", async () => {
+        const directory = root();
+        const bytes = Buffer.from("candidate-only bytes\u0000", "utf8");
+        const expectedSha256 = digest(bytes);
+        const candidateReader = {
+            openCandidate: vi.fn(async () => ({
+                url: "https://s3.example.test/exact-version",
+                expiresAt: "2030-01-01T00:01:00.000Z",
+                versionId: "candidate-v7",
+                sha256: expectedSha256,
+                size: bytes.byteLength,
+                body: (async function* () { yield bytes; })(),
+            })),
+        };
+        const fetchImpl = ackFetch(204);
+        const result = await preserveRealtimeConflict({
+            root: directory,
+            scopeUid: "prs_demo",
+            canonicalPath: "notes/lost.bin",
+            attemptId: "attempt-02",
+            expectedSha256,
+            expectedSize: bytes.byteLength,
+            spoolPath: path.join(directory, "missing.spool"),
+            caseInsensitiveFilesystem: false,
+            recordConflictPreserved: async () => undefined,
+            creatorCandidate: {
+                apiUrl: "https://sync.example.test",
+                authorization: authorization(),
+                fetchImpl,
+                candidateReader,
+            },
+        });
+        expect(result.source).toBe("creator-candidate");
+        expect(candidateReader.openCandidate).toHaveBeenCalledTimes(1);
+        expect(fs.readFileSync(path.join(directory, result.siblingPath))).toEqual(bytes);
+    });
+    it("refuses a case-fold collision without acknowledging or overwriting either path", async () => {
+        const directory = root();
+        fs.mkdirSync(path.join(directory, "Notes"));
+        const bytes = Buffer.from("losing bytes");
+        const fetchImpl = ackFetch(204);
+        await expect(preserveRealtimeConflict({
+            root: directory,
+            scopeUid: "prs_demo",
+            canonicalPath: "notes/lost.txt",
+            attemptId: "attempt-03",
+            expectedSha256: digest(bytes),
+            expectedSize: bytes.byteLength,
+            spoolPath: (() => { const spool = path.join(directory, "attempt.spool"); fs.writeFileSync(spool, bytes); return spool; })(),
+            caseInsensitiveFilesystem: true,
+            recordConflictPreserved: async () => undefined,
+            creatorCandidate: { apiUrl: "https://sync.example.test", authorization: authorization(), fetchImpl },
+        })).rejects.toMatchObject({ code: "CASE_COLLISION" });
+        expect(fs.existsSync(path.join(directory, "Notes"))).toBe(true);
+        expect(fetchImpl).not.toHaveBeenCalled();
+    });
+    it("retains the durable sibling when acknowledgement fails, so candidate cleanup remains blocked", async () => {
+        const directory = root();
+        const bytes = Buffer.from("must survive failed acknowledgement");
+        const expectedSha256 = digest(bytes);
+        const spool = path.join(directory, "attempt.spool");
+        fs.writeFileSync(spool, bytes);
+        const sibling = realtimeConflictSiblingPath({ scopeUid: "prs_demo", canonicalPath: "notes/lost.txt", attemptId: "attempt-04" });
+        await expect(preserveRealtimeConflict({
+            root: directory,
+            scopeUid: "prs_demo",
+            canonicalPath: "notes/lost.txt",
+            attemptId: "attempt-04",
+            expectedSha256,
+            expectedSize: bytes.byteLength,
+            spoolPath: spool,
+            caseInsensitiveFilesystem: false,
+            recordConflictPreserved: async () => undefined,
+            creatorCandidate: { apiUrl: "https://sync.example.test", authorization: authorization(), fetchImpl: ackFetch(503) },
+        })).rejects.toMatchObject({ code: "CANDIDATE_UNAVAILABLE" });
+        expect(fs.readFileSync(path.join(directory, sibling))).toEqual(bytes);
+    });
+    it("withholds acknowledgement when the conflict-preserved record is not durable", async () => {
+        const directory = root();
+        const bytes = Buffer.from("record failure must retain recovery material");
+        const expectedSha256 = digest(bytes);
+        const spool = path.join(directory, "attempt.spool");
+        fs.writeFileSync(spool, bytes);
+        const fetchImpl = ackFetch(204);
+        const sibling = realtimeConflictSiblingPath({ scopeUid: "prs_demo", canonicalPath: "notes/record.txt", attemptId: "attempt-05" });
+        await expect(preserveRealtimeConflict({
+            root: directory,
+            scopeUid: "prs_demo",
+            canonicalPath: "notes/record.txt",
+            attemptId: "attempt-05",
+            expectedSha256,
+            expectedSize: bytes.byteLength,
+            spoolPath: spool,
+            caseInsensitiveFilesystem: false,
+            recordConflictPreserved: async () => { throw new Error("WAL unavailable"); },
+            creatorCandidate: { apiUrl: "https://sync.example.test", authorization: authorization(), fetchImpl },
+        })).rejects.toThrow("WAL unavailable");
+        expect(fetchImpl).not.toHaveBeenCalled();
+        expect(fs.readFileSync(path.join(directory, sibling))).toEqual(bytes);
+    });
+});
+//# sourceMappingURL=conflict-recovery.test.js.map

package/dist/cli/conflict-recovery.test.js.map

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

package/dist/cli/conflict-winner.test.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Unit tests for the version-aware conflict winner (`pickWinner`), the
+ * frontmatter `version:` parser it relies on, and the strategy gate that
+ * decides when sync/share defer to it instead of a fixed side.
+ */
+export {};
+//# sourceMappingURL=conflict-winner.test.d.ts.map

package/dist/cli/conflict-winner.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-winner.test.d.ts","sourceRoot":"","sources":["../../src/cli/conflict-winner.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/dist/cli/conflict-winner.test.js

@@ -0,0 +1,98 @@
+/**
+ * Unit tests for the version-aware conflict winner (`pickWinner`), the
+ * frontmatter `version:` parser it relies on, and the strategy gate that
+ * decides when sync/share defer to it instead of a fixed side.
+ */
+import { afterEach, describe, expect, it } from "vitest";
+import { MTIME_TIE_TOLERANCE_MS, parseFrontmatterVersion, pickWinner, usesVersionAwareWinner, } from "./conflict.js";
+const md = (version, body = "body\n") => Buffer.from(version === null
+    ? `# no frontmatter\n${body}`
+    : `---\ntitle: t\nversion: ${version}\n---\n${body}`);
+const T0 = new Date("2026-06-01T00:00:00.000Z");
+const later = (ms) => new Date(T0.getTime() + ms);
+describe("parseFrontmatterVersion", () => {
+    it("reads an integer version from a leading frontmatter block", () => {
+        expect(parseFrontmatterVersion(md(8))).toBe(8);
+        expect(parseFrontmatterVersion(md("'10'"))).toBe(10);
+        expect(parseFrontmatterVersion(Buffer.from("---\r\nversion: 3\r\n---\r\nx"))).toBe(3);
+    });
+    it("returns null without a fence, past the closing fence, or for non-integers", () => {
+        expect(parseFrontmatterVersion(md(null))).toBeNull();
+        expect(parseFrontmatterVersion(Buffer.from("---\ntitle: t\n---\nversion: 9\n"))).toBeNull();
+        expect(parseFrontmatterVersion(Buffer.from("---\nversion: 1.2\n---\n"))).toBeNull();
+        expect(parseFrontmatterVersion(Buffer.from("---\nversion: v2\n---\n"))).toBeNull();
+        expect(parseFrontmatterVersion(null)).toBeNull();
+        expect(parseFrontmatterVersion(Buffer.alloc(0))).toBeNull();
+    });
+});
+describe("pickWinner", () => {
+    it("higher frontmatter version wins regardless of mtime (the version: 8 vs 10 incident)", () => {
+        // Local is NEWER by mtime but carries the older version: the cloud copy
+        // at version 10 must win — this is exactly the parked-twin bug.
+        expect(pickWinner({
+            localBytes: md(8),
+            remoteBytes: md(10),
+            localMtime: later(60_000),
+            remoteMtime: T0,
+        })).toEqual({ winner: "remote", reason: "version", localVersion: 8, remoteVersion: 10 });
+        expect(pickWinner({
+            localBytes: md(12),
+            remoteBytes: md(10),
+            localMtime: T0,
+            remoteMtime: later(60_000),
+        })).toEqual({ winner: "local", reason: "version", localVersion: 12, remoteVersion: 10 });
+    });
+    it("falls back to the newer mtime when only one side (or neither) has a version", () => {
+        expect(pickWinner({ localBytes: md(8), remoteBytes: md(null), localMtime: T0, remoteMtime: later(5_000) })).toEqual({ winner: "remote", reason: "mtime" });
+        expect(pickWinner({ localBytes: md(null, "a"), remoteBytes: md(null, "b"), localMtime: later(5_000), remoteMtime: T0 })).toEqual({ winner: "local", reason: "mtime" });
+    });
+    it("equal versions fall through to mtime and keep the versions on the decision", () => {
+        expect(pickWinner({ localBytes: md(4, "a"), remoteBytes: md(4, "b"), localMtime: later(5_000), remoteMtime: T0 })).toEqual({ winner: "local", reason: "mtime", localVersion: 4, remoteVersion: 4 });
+    });
+    it("treats sub-tolerance mtime gaps and unknown mtimes as a tie → remote (historical keep)", () => {
+        expect(pickWinner({
+            localBytes: md(null, "a"),
+            remoteBytes: md(null, "b"),
+            localMtime: later(MTIME_TIE_TOLERANCE_MS - 1),
+            remoteMtime: T0,
+        })).toEqual({ winner: "remote", reason: "default" });
+        expect(pickWinner({ localBytes: md(null, "a"), remoteBytes: md(null, "b"), localMtime: T0, remoteMtime: null })).toEqual({ winner: "remote", reason: "default" });
+        expect(pickWinner({ localBytes: null, remoteBytes: md(null, "b") })).toEqual({ winner: "remote", reason: "default" });
+    });
+    it("byte-identical bodies are not a divergence: local kept", () => {
+        expect(pickWinner({ localBytes: md(1), remoteBytes: md(1), localMtime: T0, remoteMtime: later(99_000) })).toEqual({ winner: "local", reason: "identical" });
+    });
+    it("accepts epoch-millisecond mtimes as well as Dates", () => {
+        expect(pickWinner({
+            localBytes: md(null, "a"),
+            remoteBytes: md(null, "b"),
+            localMtime: T0.getTime() + 10_000,
+            remoteMtime: T0.getTime(),
+        })).toEqual({ winner: "local", reason: "mtime" });
+    });
+});
+describe("usesVersionAwareWinner", () => {
+    const descriptor = Object.getOwnPropertyDescriptor(process.stdin, "isTTY");
+    afterEach(() => {
+        if (descriptor)
+            Object.defineProperty(process.stdin, "isTTY", descriptor);
+        else
+            delete process.stdin.isTTY;
+    });
+    it("is the default for `keep` and for an unset strategy off a TTY", () => {
+        Object.defineProperty(process.stdin, "isTTY", { value: undefined, configurable: true });
+        expect(usesVersionAwareWinner("keep")).toBe(true);
+        expect(usesVersionAwareWinner(undefined)).toBe(true);
+    });
+    it("leaves the interactive prompt in charge of an unset strategy on a TTY", () => {
+        Object.defineProperty(process.stdin, "isTTY", { value: true, configurable: true });
+        expect(usesVersionAwareWinner(undefined)).toBe(false);
+        expect(usesVersionAwareWinner("keep")).toBe(true);
+    });
+    it("never overrides the explicit strategies", () => {
+        expect(usesVersionAwareWinner("overwrite")).toBe(false);
+        expect(usesVersionAwareWinner("abort")).toBe(false);
+        expect(usesVersionAwareWinner("publish-local")).toBe(false);
+    });
+});
+//# sourceMappingURL=conflict-winner.test.js.map

package/dist/cli/conflict-winner.test.js.map

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

package/dist/cli/doctor.test.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Unit tests for `hq sync doctor` (US-003,
+ * hq-sync-windows-skill-symlink-collision): skill-key family dedupe in the
+ * vault + junk-wrapper GC in the local `.claude/skills/` farm.
+ *
+ * The object store is dependency-injected (`SyncDoctorOptions.store`) with an
+ * in-memory fake, so no test touches a network or a real vault. Local-farm
+ * cases run against a mkdtemp root with real symlinks (the same approach as
+ * s3.symlink-materialize.test.ts) and pin win32 naming via the injectable
+ * `win32` option rather than the host platform.
+ */
+export {};
+//# sourceMappingURL=doctor.test.d.ts.map

package/dist/cli/doctor.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"doctor.test.d.ts","sourceRoot":"","sources":["../../src/cli/doctor.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG"}