Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Quarantine the alias watcher test and unit-test alias deletion (#5733)

Nick Gomez986e60c457fc
diff --git a/packages/app/tests/integration/stale-external-write-rollback.test.ts b/packages/app/tests/integration/stale-external-write-rollback.test.ts
index a0c2cb348..b8e959656 100644
--- a/packages/app/tests/integration/stale-external-write-rollback.test.ts
+++ b/packages/app/tests/integration/stale-external-write-rollback.test.ts
@@ -370,7 +370,14 @@ describe('stale external write does not roll back an acknowledged agent write',
expect(state.listStaleExternalWrites()).toEqual([]);
});
- test('a delete resolution removes an in-tree symlink at the alias and the watcher attributes it there, not at its target', async () => {
+ test.skip('a delete resolution removes an in-tree symlink at the alias and the watcher attributes it there, not at its target', {
+ tags: ['quarantine'],
+ meta: {
+ issue: 'https://github.com/inkeep/agents-private/issues/5729',
+ owner: 'get-main-green',
+ until: '2026-12-01',
+ },
+ }, async () => {
server = await createTestServer({ debounce: 50, maxDebounce: 200 });
const docName = `alias-delete-${randomUUID()}`;
const target = join(server.contentDir, `${docName}-target.md`);
diff --git a/packages/server/src/conflict-authority.test.ts b/packages/server/src/conflict-authority.test.ts
index 49411578c..408806e85 100644
--- a/packages/server/src/conflict-authority.test.ts
+++ b/packages/server/src/conflict-authority.test.ts
@@ -1,12 +1,15 @@
import {
chmodSync,
existsSync,
+ lstatSync,
mkdirSync,
mkdtempSync,
readdirSync,
readFileSync,
+ realpathSync,
rmSync,
statSync,
+ symlinkSync,
writeFileSync,
} from 'node:fs';
import { tmpdir } from 'node:os';
@@ -926,6 +929,31 @@ describe('ConflictAuthority resolve', () => {
expect(rig.authority.count()).toBe(0);
});
+ test("a reconcile 'delete' of an in-tree symlink removes the alias and keeps its target's bytes", async () => {
+ const realProjectDir = realpathSync(projectDir);
+ const target = join(realProjectDir, 'target.md');
+ const alias = join(realProjectDir, 'alias.md');
+ writeFileSync(target, 'TARGET\n', 'utf-8');
+ symlinkSync('target.md', alias);
+ const authority = new ConflictAuthority({
+ projectDir: realProjectDir,
+ contentDir: realProjectDir,
+ branch: 'main',
+ io: makeIo(),
+ });
+ authority.raise({
+ kind: 'reconcile',
+ file: 'alias.md',
+ reason: 'disk-markers',
+ stages: { base: 'B', ours: 'O', theirs: 'T' },
+ });
+
+ await authority.resolve('alias.md', 'delete');
+ expect(lstatSync(alias, { throwIfNoEntry: false })).toBeUndefined();
+ expect(readFileSync(target, 'utf-8')).toBe('TARGET\n');
+ expect(authority.count()).toBe(0);
+ });
+
test('a host failure leaves the entry in place so the gate stays up', async () => {
const rig = makeAuthority(
makeIo({