Addresses review 1863 (delta) on PR #119. MUST-FIX: - detailsToHtml (the raw-HTML path used for a details nested inside columns/spanned cells) now emits `<details${open}>`, mirroring the top-level case, so `open` no longer silently drops every round trip. - Remove the dead `resolveApplyClient` delete-cap hook from the engine `runCycle`: the orchestrator stopped passing it, so the hook + its dry-run pass were inert. Deletes are soft (Trash) + always logged and engine convergence is the guard, so no cap is re-added — just the dead wiring removed. TEST COVERAGE: - space-lock: heartbeat refresh CAS-miss (eval -> 0) and Redis-error (eval throws) both abort the in-flight fn's signal. - cycle: a pre-aborted signal (and an abort during the pull read) throws before the push apply / first destructive phase. - converter: htmlEmbed source VALUE + height survive; encode/decode UTF-8 symmetry and '' -> ''; footnote definition body + ref/def id match; transclusionReference both ids survive; fix the bad transclusionSource fixture (wrong `pageId` attr + empty content -> schema `id` + a block child); nested details `open` parity test. - orchestrator: autoMergeConflicts:true reaches engine settings; default false on a missing settings row. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
145 lines
5.4 KiB
TypeScript
145 lines
5.4 KiB
TypeScript
import { describe, it, expect, vi } from "vitest";
|
|
import { runCycle, type RunCycleDeps } from "../src/engine/cycle";
|
|
|
|
// A fake VaultGit recording the staging calls. An EMPTY vault/tree lets the real
|
|
// readExisting/computePullActions/applyPullActions/runPush run trivially (no
|
|
// files, no pages) so we can assert runCycle's choreography without real git.
|
|
function fakeVault(overrides: Record<string, any> = {}) {
|
|
const order: string[] = [];
|
|
const rec =
|
|
(name: string, ret?: any) =>
|
|
async (...args: any[]) => {
|
|
order.push(args.length ? `${name}:${args.join(",")}` : name);
|
|
return ret;
|
|
};
|
|
const vault: any = {
|
|
order,
|
|
assertGitAvailable: rec("assertGitAvailable"),
|
|
ensureRepo: rec("ensureRepo"),
|
|
isMergeInProgress: vi.fn(async () => false),
|
|
ensureBranch: rec("ensureBranch"),
|
|
checkout: rec("checkout"),
|
|
listTrackedFiles: vi.fn(async () => [] as string[]),
|
|
// push-side git surface (empty diff -> a clean no-op push)
|
|
stageAll: rec("stageAll"),
|
|
commit: rec("commit", { committed: false }),
|
|
merge: rec("merge", { ok: true, conflict: false, output: "" }),
|
|
readRef: vi.fn(async () => null),
|
|
revParse: vi.fn(async () => "0000000000000000000000000000000000000000"),
|
|
diffNameStatus: vi.fn(async () => [] as any[]),
|
|
showFileAtRef: vi.fn(async () => ""),
|
|
updateRef: rec("updateRef"),
|
|
fastForwardBranch: rec("fastForwardBranch", { ok: true }),
|
|
...overrides,
|
|
};
|
|
return vault;
|
|
}
|
|
|
|
function baseDeps(vault: any, over: Partial<RunCycleDeps> = {}): RunCycleDeps {
|
|
return {
|
|
spaceId: "space-1",
|
|
client: {
|
|
listSpaceTree: vi.fn(async () => ({ pages: [], complete: true })),
|
|
getPageJson: vi.fn(),
|
|
importPageMarkdown: vi.fn(),
|
|
createPage: vi.fn(),
|
|
deletePage: vi.fn(),
|
|
movePage: vi.fn(),
|
|
renamePage: vi.fn(),
|
|
listRecentSince: vi.fn(),
|
|
listTrash: vi.fn(),
|
|
restorePage: vi.fn(),
|
|
} as any,
|
|
vault,
|
|
settings: { vaultPath: "/vault" } as any,
|
|
fs: {
|
|
readFile: vi.fn(async () => ""),
|
|
writeFile: vi.fn(async () => undefined),
|
|
mkdir: vi.fn(async () => undefined),
|
|
rm: vi.fn(async () => undefined),
|
|
},
|
|
log: vi.fn(),
|
|
...over,
|
|
};
|
|
}
|
|
|
|
describe("runCycle (composition)", () => {
|
|
it("short-circuits with skipped:'merge-in-progress' and runs no pull/push", async () => {
|
|
const vault = fakeVault({ isMergeInProgress: vi.fn(async () => true) });
|
|
const deps = baseDeps(vault);
|
|
|
|
const res = await runCycle(deps);
|
|
|
|
expect(res).toEqual({ ran: false, skipped: "merge-in-progress" });
|
|
// Never advanced to the pull (listSpaceTree) or push.
|
|
expect(deps.client.listSpaceTree).not.toHaveBeenCalled();
|
|
expect(vault.order).not.toContain("checkout:docmost");
|
|
});
|
|
|
|
it("stages ensureRepo -> ensureBranch(docmost,main) -> checkout(docmost) BEFORE pulling", async () => {
|
|
const vault = fakeVault();
|
|
const deps = baseDeps(vault);
|
|
|
|
const res = await runCycle(deps);
|
|
|
|
expect(res.ran).toBe(true);
|
|
const ensureRepoIdx = vault.order.indexOf("ensureRepo");
|
|
const ensureBranchIdx = vault.order.indexOf("ensureBranch:docmost,main");
|
|
const checkoutIdx = vault.order.indexOf("checkout:docmost");
|
|
expect(ensureRepoIdx).toBeGreaterThanOrEqual(0);
|
|
expect(ensureBranchIdx).toBeGreaterThan(ensureRepoIdx);
|
|
expect(checkoutIdx).toBeGreaterThan(ensureBranchIdx);
|
|
expect(deps.client.listSpaceTree).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("runs a SINGLE push planning pass (no dry-run; the delete-cap hook is gone)", async () => {
|
|
const vault = fakeVault();
|
|
const deps = baseDeps(vault);
|
|
|
|
const res = await runCycle(deps);
|
|
expect(res.ran).toBe(true);
|
|
// There is exactly one runPush (the apply) — no separate dry-run pass.
|
|
// diffNameStatus is read once per runPush; assert a single planning pass.
|
|
expect(vault.diffNameStatus).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("throws on a PRE-aborted signal BEFORE applying the pull (first destructive phase)", async () => {
|
|
const vault = fakeVault();
|
|
const controller = new AbortController();
|
|
controller.abort();
|
|
const deps = baseDeps(vault, { signal: controller.signal });
|
|
|
|
await expect(runCycle(deps)).rejects.toThrow();
|
|
|
|
// The signal is checked AFTER planning but BEFORE the first write phase:
|
|
// the tree was listed (planning) but neither destructive phase advanced —
|
|
// no pull merge and no push diff.
|
|
expect(deps.client.listSpaceTree).toHaveBeenCalledTimes(1);
|
|
expect(vault.order).not.toContain("merge:main");
|
|
expect(vault.diffNameStatus).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("throws BEFORE the push apply when the signal aborts during the pull phase", async () => {
|
|
// Abort mid-cycle: the signal fires while listSpaceTree (the pull read)
|
|
// runs, so the SECOND checkpoint (before runPush) trips and the push apply
|
|
// never starts.
|
|
const controller = new AbortController();
|
|
const vault = fakeVault();
|
|
const deps = baseDeps(vault, {
|
|
signal: controller.signal,
|
|
client: {
|
|
...baseDeps(vault).client,
|
|
listSpaceTree: vi.fn(async () => {
|
|
controller.abort();
|
|
return { pages: [], complete: true };
|
|
}),
|
|
} as any,
|
|
});
|
|
|
|
await expect(runCycle(deps)).rejects.toThrow();
|
|
// Pull planning ran but the push never did (aborted at a checkpoint).
|
|
expect(deps.client.listSpaceTree).toHaveBeenCalledTimes(1);
|
|
expect(vault.diffNameStatus).not.toHaveBeenCalled();
|
|
});
|
|
});
|