@indigoai-us/hq-cloud 6.18.44-alpha.8 → 6.18.44

package/dist/cli/rescue-core-stamp.test.js

@@ -1,364 +0,0 @@
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
-import { execFileSync } from "child_process";
-import * as fs from "fs";
-import * as os from "os";
-import * as path from "path";
-import yaml from "js-yaml";
-import { runRescue } from "./rescue-core.js";
-const toolsAvailable = ["git", "rsync", "bash", "diff"].every((bin) => {
-    try {
-        execFileSync("bash", ["-lc", `command -v ${bin}`], { stdio: "ignore" });
-        return true;
-    }
-    catch {
-        return false;
-    }
-});
-const EVENT_CORE_YAML = [
-    "# installed-core metadata from the desktop event fixture",
-    "adapterContractVersion: 3 # keep this comment",
-    "agentSessionContractVersion: 2",
-    "checksums:",
-    "  core: abc123",
-    "hqVersion: 6.18.9",
-    "recommended_packages:",
-    "  - jq",
-    "# replace_from_staging is configuration, not a provenance stamp",
-    "replace_from_staging:",
-    "  enabled: true",
-    "  source: indigoai-us/hq-core-staging",
-    "  ref: main",
-    "",
-].join("\n");
-const STAGING_STAMP_CORE_YAML = [
-    "# event-shaped core metadata",
-    "adapterContractVersion: 3",
-    "agentSessionContractVersion: 2",
-    "checksums:",
-    "  core: abc123",
-    "hqVersion: 6.18.9",
-    "recommended_packages:",
-    "  - jq",
-    "# staging config remains intact",
-    "replace_from_staging:",
-    "  enabled: true",
-    "  ref: main",
-    "# preserve this unrelated footer comment",
-    "replaced_from_staging:",
-    '  source: "indigoai-us/hq-core-staging"',
-    '  ref: "main"',
-    `  last_sync_sha: "${"a".repeat(40)}"`,
-    '  last_sync_at: "2026-01-01T00:00:00Z"',
-    "# this comment between the two provenance blocks survives",
-    "replaced_from_source:",
-    '  source: "old-source"',
-    '  ref: "old-ref"',
-    `  last_sync_sha: "${"b".repeat(40)}"`,
-    '  last_sync_at: "2025-01-01T00:00:00Z"',
-    "# and this comment after the source stamp survives",
-    "",
-].join("\n");
-let fixturesRoot;
-let gitPath;
-let rsyncPath;
-let bashPath;
-let diffPath;
-let gitTemplateDir;
-function isolatedGitEnv(workDir) {
-    return {
-        ...process.env,
-        HOME: path.join(workDir, "home"),
-        XDG_CONFIG_HOME: path.join(workDir, "xdg"),
-        GIT_CONFIG_NOSYSTEM: "1",
-        GIT_CONFIG_GLOBAL: "/dev/null",
-        GIT_AUTHOR_NAME: "hq-rescue-test",
-        GIT_AUTHOR_EMAIL: "hq-rescue-test@example.invalid",
-        GIT_COMMITTER_NAME: "hq-rescue-test",
-        GIT_COMMITTER_EMAIL: "hq-rescue-test@example.invalid",
-    };
-}
-function git(cwd, env, ...args) {
-    return execFileSync(gitPath, args, {
-        cwd,
-        env,
-        stdio: ["ignore", "pipe", "pipe"],
-    })
-        .toString()
-        .trim();
-}
-function write(root, relativePath, content) {
-    const destination = path.join(root, relativePath);
-    fs.mkdirSync(path.dirname(destination), { recursive: true });
-    fs.writeFileSync(destination, content);
-}
-function makeFixture(coreYaml, options = {}) {
-    const workDir = fs.mkdtempSync(path.join(fixturesRoot, "rescue-stamp-"));
-    const source = path.join(workDir, "source");
-    const hqRoot = path.join(workDir, "hq");
-    const stateDir = path.join(workDir, "state");
-    const shimDir = path.join(workDir, "bin");
-    const gitEnv = isolatedGitEnv(workDir);
-    fs.mkdirSync(source, { recursive: true });
-    fs.mkdirSync(shimDir, { recursive: true });
-    fs.mkdirSync(stateDir, { recursive: true });
-    fs.mkdirSync(gitEnv.HOME, { recursive: true });
-    git(workDir, gitEnv, "init", "--initial-branch=main", `--template=${gitTemplateDir}`, source);
-    write(source, "core/a.md", "base scaffold\n");
-    write(source, "core/docs/b.md", "base docs\n");
-    write(source, ".claude/c.sh", "#!/bin/sh\nexit 0\n");
-    write(source, "core/core.yaml", coreYaml);
-    git(source, gitEnv, "add", "-A");
-    git(source, gitEnv, "commit", "-m", "base scaffold");
-    const firstSha = git(source, gitEnv, "rev-parse", "HEAD");
-    let priorSha = firstSha;
-    if (options.priorStamp) {
-        const priorStampedYaml = [
-            coreYaml.replace(/\n*$/, "\n"),
-            "replaced_from_source:",
-            '  source: "test/repo"',
-            '  ref: "main"',
-            `  last_sync_sha: "${firstSha}"`,
-            '  last_sync_at: "2026-01-01T00:00:00Z"',
-            "",
-        ].join("\n");
-        write(source, "core/core.yaml", priorStampedYaml);
-        git(source, gitEnv, "add", "core/core.yaml");
-        git(source, gitEnv, "commit", "-m", "record prior source stamp");
-        priorSha = firstSha;
-        coreYaml = priorStampedYaml;
-    }
-    write(source, "core/a.md", "updated scaffold\n");
-    git(source, gitEnv, "add", "core/a.md");
-    git(source, gitEnv, "commit", "-m", "update scaffold");
-    const sourceSha = git(source, gitEnv, "rev-parse", "HEAD");
-    const sourceCommitTime = git(source, gitEnv, "show", "-s", "--format=%cI", sourceSha);
-    for (const relativePath of ["core", "core/docs", ".claude", "companies", "personal"]) {
-        fs.mkdirSync(path.join(hqRoot, relativePath), { recursive: true });
-    }
-    write(hqRoot, "core/a.md", "base scaffold\n");
-    write(hqRoot, "core/docs/b.md", "base docs\n");
-    write(hqRoot, ".claude/c.sh", "#!/bin/sh\nexit 0\n");
-    write(hqRoot, "core/core.yaml", options.priorStamp ? coreYaml : coreYaml);
-    write(hqRoot, "personal/local-note.md", "keep this user file\n");
-    fs.writeFileSync(path.join(shimDir, "git"), `#!/bin/bash\n` +
-        `if [ "$1" = "clone" ] || [ "$1" = "ls-remote" ]; then\n` +
-        `  args=()\n` +
-        `  for argument in "$@"; do\n` +
-        `    case "$argument" in https://github.com/test/repo*) argument=${JSON.stringify(source)} ;; esac\n` +
-        `    args+=("$argument")\n` +
-        `  done\n` +
-        `  exec ${JSON.stringify(gitPath)} "\${args[@]}"\n` +
-        `fi\n` +
-        `exec ${JSON.stringify(gitPath)} "$@"\n`, { mode: 0o755 });
-    fs.symlinkSync(rsyncPath, path.join(shimDir, "rsync"));
-    fs.symlinkSync(bashPath, path.join(shimDir, "bash"));
-    fs.symlinkSync(diffPath, path.join(shimDir, "diff"));
-    const env = {
-        ...gitEnv,
-        PATH: shimDir,
-        HQ_STATE_DIR: stateDir,
-    };
-    return {
-        workDir,
-        hqRoot,
-        stateDir,
-        coreYamlPath: path.join(hqRoot, "core/core.yaml"),
-        sourceSha,
-        sourceCommitTime,
-        priorSha,
-        env,
-        dispose: () => fs.rmSync(workDir, { recursive: true, force: true }),
-    };
-}
-function runRescueCapture(fixture, stampWriter) {
-    let stdout = "";
-    let stderr = "";
-    const originalOut = process.stdout.write.bind(process.stdout);
-    const originalErr = process.stderr.write.bind(process.stderr);
-    const oldStateDir = process.env.HQ_STATE_DIR;
-    process.stdout.write = ((chunk) => {
-        stdout += String(chunk);
-        return true;
-    });
-    process.stderr.write = ((chunk) => {
-        stderr += String(chunk);
-        return true;
-    });
-    process.env.HQ_STATE_DIR = fixture.stateDir;
-    let status;
-    let thrown;
-    try {
-        const options = {
-            env: fixture.env,
-            ...(stampWriter ? { coreSourceStampWriter: stampWriter } : {}),
-        };
-        status = runRescue([
-            "--hq-root",
-            fixture.hqRoot,
-            "--source",
-            "test/repo",
-            "--ref",
-            "main",
-            "--yes",
-            "--no-backup",
-        ], options).status;
-    }
-    catch (error) {
-        status = -1;
-        thrown = error;
-    }
-    finally {
-        process.stdout.write = originalOut;
-        process.stderr.write = originalErr;
-        if (oldStateDir === undefined)
-            delete process.env.HQ_STATE_DIR;
-        else
-            process.env.HQ_STATE_DIR = oldStateDir;
-    }
-    return { status, stdout, stderr, thrown };
-}
-describe.skipIf(!toolsAvailable)("rescue core.yaml source stamp", () => {
-    beforeAll(() => {
-        fixturesRoot = path.join(process.env.TMPDIR ?? os.tmpdir(), "hq-c183-rescue-stamp");
-        fs.mkdirSync(fixturesRoot, { recursive: true });
-        gitPath = execFileSync("bash", ["-lc", "command -v git"]).toString().trim();
-        rsyncPath = execFileSync("bash", ["-lc", "command -v rsync"]).toString().trim();
-        bashPath = execFileSync("bash", ["-lc", "command -v bash"]).toString().trim();
-        diffPath = execFileSync("bash", ["-lc", "command -v diff"]).toString().trim();
-        gitTemplateDir = path.join(fixturesRoot, "git-template");
-        fs.mkdirSync(gitTemplateDir, { recursive: true });
-    });
-    afterAll(() => {
-        if (fixturesRoot)
-            fs.rmSync(fixturesRoot, { recursive: true, force: true });
-    });
-    it("writes the event-shaped source stamp when PATH has neither yq nor python3", () => {
-        const fixture = makeFixture(EVENT_CORE_YAML);
-        try {
-            expect((fixture.env.PATH ?? "").split(path.delimiter)).toEqual([
-                path.join(fixture.workDir, "bin"),
-            ]);
-            expect(fs.existsSync(path.join(fixture.workDir, "bin", "yq"))).toBe(false);
-            expect(fs.existsSync(path.join(fixture.workDir, "bin", "python3"))).toBe(false);
-            const result = runRescueCapture(fixture);
-            expect(result.thrown).toBeUndefined();
-            expect(result.status, `${result.stdout}\n${result.stderr}`).toBe(0);
-            expect(result.stdout).toContain(`Stamped core/core.yaml: replaced_from_source.last_sync_sha=${fixture.sourceSha}`);
-            const stamped = fs.readFileSync(fixture.coreYamlPath, "utf-8");
-            const expected = EVENT_CORE_YAML +
-                "replaced_from_source:\n" +
-                '  source: "test/repo"\n' +
-                '  ref: "main"\n' +
-                `  last_sync_sha: "${fixture.sourceSha}"\n` +
-                `  last_sync_at: ${JSON.stringify(new Date(fixture.sourceCommitTime)
-                    .toISOString()
-                    .replace(/\.000Z$/, "Z"))}\n`;
-            expect(stamped).toBe(expected);
-            expect(yaml.load(stamped)).toMatchObject({
-                adapterContractVersion: 3,
-                agentSessionContractVersion: 2,
-                checksums: { core: "abc123" },
-                hqVersion: "6.18.9",
-                recommended_packages: ["jq"],
-                replace_from_staging: {
-                    enabled: true,
-                    source: "indigoai-us/hq-core-staging",
-                    ref: "main",
-                },
-                replaced_from_source: {
-                    source: "test/repo",
-                    ref: "main",
-                    last_sync_sha: fixture.sourceSha,
-                },
-            });
-        }
-        finally {
-            fixture.dispose();
-        }
-    });
-    it("preserves unrelated bytes and config while removing only the staging provenance block", () => {
-        const fixture = makeFixture(STAGING_STAMP_CORE_YAML);
-        try {
-            const result = runRescueCapture(fixture);
-            expect(result.status, `${result.stdout}\n${result.stderr}`).toBe(0);
-            const expectedPrefix = STAGING_STAMP_CORE_YAML.slice(0, STAGING_STAMP_CORE_YAML.indexOf("replaced_from_staging:"));
-            const expectedSuffix = "# this comment between the two provenance blocks survives\n";
-            const stamped = fs.readFileSync(fixture.coreYamlPath, "utf-8");
-            expect(stamped).toBe(expectedPrefix +
-                expectedSuffix +
-                "replaced_from_source:\n" +
-                '  source: "test/repo"\n' +
-                '  ref: "main"\n' +
-                `  last_sync_sha: "${fixture.sourceSha}"\n` +
-                `  last_sync_at: ${JSON.stringify(new Date(fixture.sourceCommitTime)
-                    .toISOString()
-                    .replace(/\.000Z$/, "Z"))}\n` +
-                "# and this comment after the source stamp survives\n");
-            const parsed = yaml.load(stamped);
-            expect(parsed.replace_from_staging).toEqual({
-                enabled: true,
-                ref: "main",
-            });
-            expect(parsed).not.toHaveProperty("replaced_from_staging");
-            expect(stamped).toContain("# event-shaped core metadata");
-            expect(stamped).toContain("# staging config remains intact");
-            expect(stamped).toContain("# preserve this unrelated footer comment");
-            expect(stamped).toContain("# this comment between the two provenance blocks survives");
-            expect(stamped).toContain("# and this comment after the source stamp survives");
-        }
-        finally {
-            fixture.dispose();
-        }
-    });
-    it("does not report a failed core.yaml write as stamped", () => {
-        const fixture = makeFixture(EVENT_CORE_YAML);
-        try {
-            const result = runRescueCapture(fixture, () => {
-                throw new Error("injected core.yaml write failure");
-            });
-            expect(result.status).toBe(1);
-            expect(result.stderr).toContain("failed to stamp core/core.yaml");
-            expect(result.stderr).toContain("injected core.yaml write failure");
-            expect(result.stdout).not.toContain("Stamped core/core.yaml:");
-        }
-        finally {
-            fixture.dispose();
-        }
-    });
-    it("reads a prior source stamp without yq", () => {
-        const fixture = makeFixture(EVENT_CORE_YAML, { priorStamp: true });
-        try {
-            const result = runRescueCapture(fixture);
-            expect(result.status, `${result.stdout}\n${result.stderr}`).toBe(0);
-            expect(result.stdout).toContain(`Prior sync: ${fixture.priorSha} from test/repo@main`);
-            expect(result.stdout).toContain("checking cloned release history for floor");
-        }
-        finally {
-            fixture.dispose();
-        }
-    });
-    it("treats a conflict-marked prior core.yaml as unstamped and stamps the overlay", () => {
-        const fixture = makeFixture(EVENT_CORE_YAML);
-        try {
-            fs.writeFileSync(fixture.coreYamlPath, "hqVersion: 1\n<<<<<<< HEAD\nchecksums: a\n=======\nchecksums: b\n>>>>>>> x\n");
-            const result = runRescueCapture(fixture);
-            expect(result.thrown).toBeUndefined();
-            expect(result.status, `${result.stdout}\n${result.stderr}`).toBe(0);
-            expect(result.stderr).toContain("WARN: prior stamp in core/core.yaml is invalid YAML; treating as unstamped");
-            expect(result.stdout).toContain(`Stamped core/core.yaml: replaced_from_source.last_sync_sha=${fixture.sourceSha}`);
-            const stamped = fs.readFileSync(fixture.coreYamlPath, "utf-8");
-            expect(yaml.load(stamped)).toMatchObject({
-                hqVersion: "6.18.9",
-                replaced_from_source: {
-                    source: "test/repo",
-                    ref: "main",
-                    last_sync_sha: fixture.sourceSha,
-                },
-            });
-        }
-        finally {
-            fixture.dispose();
-        }
-    });
-});
-//# sourceMappingURL=rescue-core-stamp.test.js.map

package/dist/cli/rescue-core-stamp.test.js.map

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

package/dist/cli/rescue-drift-reconcile.test.d.ts

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

package/dist/cli/rescue-drift-reconcile.test.d.ts.map

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

package/dist/cli/rescue-drift-reconcile.test.js

@@ -1,162 +0,0 @@
-/**
- * Integration test for the rescue convergence guard in src/cli/rescue-core.ts.
- *
- * Regression for the false `.drift-*` litter: in `history_floor` mode the
- * rescue overlay flags a scaffold file as USER-EDIT whenever its blob differs
- * from the *old* baseline (floor). HQ's own Stop hooks rewrite scaffold files
- * every session, so a file routinely drifts from the floor yet lands
- * byte-for-byte identical to the *new* upstream HEAD the overlay is about to
- * write — and the old code rescued it into personal/ with a redundant
- * `.drift-<ts>-<pid>` copy. The guard reclassifies "drifted from floor but
- * identical to upstream HEAD" as UNCHANGED (no rescue).
- *
- * The rescue clones its source from GitHub, so we shim `git clone` to clone a
- * local fixture repo instead. Everything runs under --dry-run (no destructive
- * ops, no backup) and we assert the classification the rescue reports.
- */
-import { describe, it, expect, beforeAll, afterAll } from "vitest";
-import { execFileSync } from "child_process";
-import * as fs from "fs";
-import * as os from "os";
-import * as path from "path";
-import { runRescue } from "./rescue-core.js";
-function hasGit() {
-    try {
-        execFileSync("git", ["--version"], { stdio: "ignore" });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-const gitAvailable = hasGit();
-/** Run the rescue in-process, capturing its stdout/stderr. */
-function runRescueCapture(argv, env) {
-    let stdout = "";
-    let stderr = "";
-    const origOut = process.stdout.write.bind(process.stdout);
-    const origErr = process.stderr.write.bind(process.stderr);
-    process.stdout.write = ((chunk) => {
-        stdout += String(chunk);
-        return true;
-    });
-    process.stderr.write = ((chunk) => {
-        stderr += String(chunk);
-        return true;
-    });
-    let status;
-    try {
-        status = runRescue(argv, { env }).status;
-    }
-    finally {
-        process.stdout.write = origOut;
-        process.stderr.write = origErr;
-    }
-    return { status, stdout, stderr };
-}
-describe.skipIf(!gitAvailable)("rescue drift convergence guard", () => {
-    let workDir;
-    let upstream;
-    let hqRoot;
-    let shimDir;
-    let floorSha;
-    let env;
-    const git = (cwd, ...args) => execFileSync("git", args, {
-        cwd,
-        stdio: ["ignore", "pipe", "pipe"],
-        env: {
-            ...process.env,
-            GIT_AUTHOR_NAME: "t",
-            GIT_AUTHOR_EMAIL: "t@t",
-            GIT_COMMITTER_NAME: "t",
-            GIT_COMMITTER_EMAIL: "t@t",
-        },
-    })
-        .toString()
-        .trim();
-    beforeAll(() => {
-        workDir = fs.mkdtempSync(path.join(os.tmpdir(), "hq-rescue-drift-"));
-        // --- Build a local "upstream" repo: floor commit, then a HEAD commit
-        //     where core/x.md changed (v1 -> v2) and the others stayed put. ---
-        upstream = path.join(workDir, "upstream");
-        fs.mkdirSync(path.join(upstream, "core"), { recursive: true });
-        git(workDir, "init", "-b", "main", "upstream");
-        fs.writeFileSync(path.join(upstream, "core/x.md"), "v1\n");
-        fs.writeFileSync(path.join(upstream, "core/edited.md"), "base\n");
-        fs.writeFileSync(path.join(upstream, "core/keep.md"), "same\n");
-        git(upstream, "add", "-A");
-        git(upstream, "commit", "-m", "floor");
-        floorSha = git(upstream, "rev-parse", "HEAD");
-        // HEAD: only x.md advances.
-        fs.writeFileSync(path.join(upstream, "core/x.md"), "v2\n");
-        git(upstream, "add", "-A");
-        git(upstream, "commit", "-m", "head");
-        // --- Build the local HQ root being rescued. ---
-        hqRoot = path.join(workDir, "hq");
-        fs.mkdirSync(path.join(hqRoot, "core"), { recursive: true });
-        // `companies/` + `personal/` make it "look like" an HQ root (script guard);
-        // both are preserved (never walked).
-        fs.mkdirSync(path.join(hqRoot, "personal"), { recursive: true });
-        fs.mkdirSync(path.join(hqRoot, "companies"), { recursive: true });
-        // Drifted from floor ("v1") but byte-identical to upstream HEAD ("v2").
-        // OLD behavior: rescued to personal/x.md (+ .drift on collision).
-        // NEW behavior: reconciled as UNCHANGED — no rescue.
-        fs.writeFileSync(path.join(hqRoot, "core/x.md"), "v2\n");
-        // Genuinely user-edited: differs from both floor and HEAD -> still rescued.
-        fs.writeFileSync(path.join(hqRoot, "core/edited.md"), "MINE\n");
-        // Untouched vs floor -> UNCHANGED.
-        fs.writeFileSync(path.join(hqRoot, "core/keep.md"), "same\n");
-        // --- git shim: rewrite `git clone <github-url> dest` to the local fixture. ---
-        // Resolve the real git BEFORE the shim is on PATH so we don't recurse.
-        const realGit = execFileSync("bash", ["-lc", "command -v git"]).toString().trim() || "/usr/bin/git";
-        shimDir = path.join(workDir, "shim");
-        fs.mkdirSync(shimDir, { recursive: true });
-        const shim = `#!/usr/bin/env bash
-if [ "$1" = "clone" ] || [ "$1" = "ls-remote" ]; then
-  args=()
-  for a in "$@"; do
-    case "$a" in
-      https://github.com/*) a=${JSON.stringify(upstream)} ;;
-    esac
-    args+=("$a")
-  done
-  exec ${JSON.stringify(realGit)} "\${args[@]}"
-fi
-exec ${JSON.stringify(realGit)} "$@"
-`;
-        fs.writeFileSync(path.join(shimDir, "git"), shim, { mode: 0o755 });
-        env = { ...process.env, PATH: `${shimDir}:${process.env.PATH ?? ""}` };
-    });
-    afterAll(() => {
-        if (workDir)
-            fs.rmSync(workDir, { recursive: true, force: true });
-    });
-    function runRescueDry() {
-        return runRescueCapture([
-            "--hq-root", hqRoot,
-            "--source", "test/repo",
-            "--ref", "main",
-            "--floor-sha", floorSha,
-            "--dry-run",
-            "--yes",
-            "--no-backup",
-        ], env);
-    }
-    it("reconciles a floor-drifted file that is identical to upstream HEAD (no rescue)", () => {
-        const r = runRescueDry();
-        const out = `${r.stdout}\n${r.stderr}`;
-        // Sanity: ran in history_floor mode against our floor.
-        expect(r.status, out).toBe(0);
-        expect(out).toContain(`Baseline: ${floorSha}`);
-        // The drifted-but-identical-to-HEAD file is reconciled, NOT rescued.
-        expect(out).toContain("drift reconciled (identical to upstream HEAD; no rescue): core/x.md");
-        expect(out).not.toMatch(/user-edit \(rescue\): core\/x\.md/);
-        // The genuinely-edited file is still rescued into personal/.
-        expect(out).toContain("user-edit (rescue): core/edited.md  ->  personal/edited.md");
-        // Untouched file classified UNCHANGED.
-        expect(out).toContain("unchanged (preserved in place): core/keep.md");
-        // Summary reflects exactly one reconcile.
-        expect(out).toMatch(/drift reconciled \(== upstream\):\s+1 files/);
-    });
-});
-//# sourceMappingURL=rescue-drift-reconcile.test.js.map

package/dist/cli/rescue-drift-reconcile.test.js.map

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

package/dist/cli/rescue-drop-dir-symlink.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=rescue-drop-dir-symlink.test.d.ts.map

package/dist/cli/rescue-drop-dir-symlink.test.d.ts.map

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