Checkpoint peering identity and opt-in discovery

scraper/test/scraper.test.js

@@ -87,6 +87,8 @@ test('metadata refresh preserves legacy and manual fields while updating untouch
   const third = mergeImportedMetadata(second, { description: 'First', 'x-anilist': { id: 42 } }, 'Fallback');
   assert.equal(mergeImportedMetadata(third, { description: 'Revised', 'x-anilist': { id: 42 } }, 'Fallback').description, 'Revised');
   assert.throws(() => mergeImportedMetadata(first, { 'x-anilist': { id: 99 } }, 'Fallback'), /identity conflict/);
+  assert.throws(() => mergeImportedMetadata({ 'x-work-identity': { scheme: 'mangacircus-work-v1', kind: 'origin', value: 'a'.repeat(64) } },
+    { 'x-work-identity': { scheme: 'mangacircus-work-v1', kind: 'origin', value: 'b'.repeat(64) } }, 'Fallback'), /work identity conflict/);
 });
 
 test('publisher rejects a conflicting work ID before fetching any pages', async t => {
@@ -107,6 +109,23 @@ test('publisher rejects a conflicting work ID before fetching any pages', async
   assert.equal((await fs.readdir(manga)).includes('v01'), false);
 });
 
+test('publisher explains an unresolved same-title folder collision without touching its contents', async t => {
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'mcscraper-title-collision-'));
+  t.after(() => fs.rm(root, { recursive: true, force: true }));
+  const manga = path.join(root, 'Same Title');
+  await fs.mkdir(manga);
+  await fs.writeFile(path.join(manga, 'manga.json'), JSON.stringify({ title: 'Same Title' }));
+  await fs.writeFile(path.join(manga, 'operator-note.txt'), 'keep');
+  let requested = 0;
+  await assert.rejects(publishManifest({ version: 1,
+    series: { title: 'Same Title', direction: 'rtl', sources: [{ name: 'Peer', url: 'peer://p123/m123' }] },
+    chapters: [{ number: '1', source: { name: 'Peer', url: 'peer://p123/m123' }, pages: [{ url: 'https://example.test/page.png' }] }],
+  }, { libraryRoot: root, httpClient: { async get() { requested++; throw new Error('unexpected request'); } } }),
+  /could not be safely matched.*No files were overwritten.*Choose the existing manga/s);
+  assert.equal(requested, 0);
+  assert.equal(await fs.readFile(path.join(manga, 'operator-note.txt'), 'utf8'), 'keep');
+});
+
 test('queue scopes select exact catalog slices', () => {
   const chapters = [
     { id: 'a', number: '1', volume: '1' }, { id: 'b', number: '2', volume: '1' },