fixed: fix automatic merging behaviour

.github/workflows/cli-deno-tests.yml

@@ -1,43 +1,17 @@
 name: cli-deno-tests
 
 on:
-  push:
-    branches:
-      - main
-      - beta
-    paths:
-      - '.github/workflows/cli-deno-tests.yml'
-      - 'src/apps/cli/**'
-      - 'src/lib/src/API/processSetting.ts'
-      - 'package.json'
-      - 'package-lock.json'
-  pull_request:
-    paths:
-      - '.github/workflows/cli-deno-tests.yml'
-      - 'src/apps/cli/**'
-      - 'src/lib/src/API/processSetting.ts'
-      - 'package.json'
-      - 'package-lock.json'
   workflow_dispatch:
     inputs:
       test_task:
         description: 'Deno test task to run'
         type: choice
         options:
-          - test:ci
-          - test:p2p
-          - test:all
+          - test
           - test:local
           - test:e2e-matrix
-        default: test:ci
-      enable_debug:
-        description: 'Enable verbose and debug logging'
-        type: boolean
-        default: false
-      use_coturn:
-        description: 'Enable local coturn container for P2P tests'
-        type: boolean
-        default: false
+          - test:p2p-sync
+        default: test
 
 permissions:
   contents: read
@@ -53,24 +27,21 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          SELECTED_TASK="${{ github.event_name == 'workflow_dispatch' && inputs.test_task || 'test:ci' }}"
+          SELECTED_TASK="${{ github.event_name == 'workflow_dispatch' && inputs.test_task || 'test' }}"
           echo "[INFO] Selected task set: $SELECTED_TASK"
 
           case "$SELECTED_TASK" in
-            test:ci)
-              TASK_MATRIX='["test:setup-put-cat","test:mirror","test:push-pull","test:sync-two-local","test:sync-locked-remote","test:e2e-matrix:couchdb-enc0","test:e2e-matrix:couchdb-enc1","test:e2e-matrix:minio-enc0","test:e2e-matrix:minio-enc1"]'
-              ;;
-            test:p2p)
-              TASK_MATRIX='["test:p2p-host","test:p2p-peers","test:p2p-sync","test:p2p-three-nodes","test:p2p-upload-download"]'
-              ;;
-            test:all)
-              TASK_MATRIX='["test:setup-put-cat","test:mirror","test:push-pull","test:sync-two-local","test:sync-locked-remote","test:p2p-host","test:p2p-peers","test:p2p-sync","test:p2p-three-nodes","test:p2p-upload-download","test:e2e-matrix:couchdb-enc0","test:e2e-matrix:couchdb-enc1","test:e2e-matrix:minio-enc0","test:e2e-matrix:minio-enc1"]'
+            test)
+              TASK_MATRIX='["test:setup-put-cat","test:mirror","test:push-pull","test:sync-two-local","test:sync-locked-remote","test:p2p-host","test:p2p-peers","test:p2p-sync","test:p2p-three-nodes","test:p2p-upload-download","test:e2e-couchdb","test:e2e-matrix"]'
               ;;
             test:local)
               TASK_MATRIX='["test:setup-put-cat","test:mirror"]'
               ;;
             test:e2e-matrix)
-              TASK_MATRIX='["test:e2e-matrix:couchdb-enc0","test:e2e-matrix:couchdb-enc1","test:e2e-matrix:minio-enc0","test:e2e-matrix:minio-enc1"]'
+              TASK_MATRIX='["test:e2e-matrix"]'
+              ;;
+            test:p2p-sync)
+              TASK_MATRIX='["test:p2p-sync"]'
               ;;
             *)
               echo "[ERROR] Unknown task set: $SELECTED_TASK" >&2
@@ -84,8 +55,6 @@ jobs:
     needs: prepare
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    env:
-      DENO_DIR: ~/.cache/deno
     strategy:
       fail-fast: false
       matrix:
@@ -101,21 +70,12 @@ jobs:
         with:
           node-version: '24.x'
           cache: 'npm'
-          cache-dependency-path: package-lock.json
 
       - name: Setup Deno
         uses: denoland/setup-deno@v2
         with:
           deno-version: v2.x
 
-      - name: Cache Deno dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/deno
-          key: ${{ runner.os }}-deno-${{ hashFiles('src/apps/cli/testdeno/deno.lock', 'src/apps/cli/testdeno/deno.json') }}
-          restore-keys: |
-            ${{ runner.os }}-deno-
-
       - name: Install dependencies
         run: npm ci
 
@@ -142,9 +102,6 @@ jobs:
         env:
           LIVESYNC_DOCKER_MODE: native
           LIVESYNC_CLI_RETRY: 3
-          LIVESYNC_CLI_DEBUG: ${{ inputs.enable_debug == true && '1' || '0' }}
-          LIVESYNC_CLI_VERBOSE: ${{ inputs.enable_debug == true && '1' || '0' }}
-          LIVESYNC_USE_COTURN: ${{ inputs.use_coturn == true && '1' || '0' }}
         run: |
           TASK="${{ matrix.task }}"
           echo "[INFO] Running Deno task: $TASK"
@@ -153,5 +110,5 @@ jobs:
       - name: Stop leftover containers
         if: always()
         run: |
-          docker stop couchdb-test minio-test relay-test coturn-test >/dev/null 2>&1 || true
-          docker rm couchdb-test minio-test relay-test coturn-test >/dev/null 2>&1 || true
+          docker stop couchdb-test minio-test relay-test >/dev/null 2>&1 || true
+          docker rm couchdb-test minio-test relay-test >/dev/null 2>&1 || true

.github/workflows/cli-e2e.yml

@@ -12,6 +12,23 @@ on:
           - two-vaults-couchdb
           - two-vaults-minio
         default: two-vaults-matrix
+  push:
+    branches:
+      - main
+      - beta
+    paths:
+      - '.github/workflows/cli-e2e.yml'
+      - 'src/apps/cli/**'
+      - 'src/lib/src/API/processSetting.ts'
+      - 'package.json'
+      - 'package-lock.json'
+  pull_request:
+    paths:
+      - '.github/workflows/cli-e2e.yml'
+      - 'src/apps/cli/**'
+      - 'src/lib/src/API/processSetting.ts'
+      - 'package.json'
+      - 'package-lock.json'
 
 permissions:
   contents: read

src/apps/cli/.gitignore

@@ -5,5 +5,4 @@ test/test-init.local.sh
 node_modules
 .*.json
 *.env
-!.test.env
-bench-results
+!.test.env

src/apps/cli/testdeno/bench-couchdb.ts

@@ -1,312 +0,0 @@
-import { TempDir } from "./helpers/temp.ts";
-import { applyRemoteSyncSettings, initSettingsFile } from "./helpers/settings.ts";
-import { assertFilesEqual, runCliOrFail } from "./helpers/cli.ts";
-import { startCouchdb, stopCouchdb } from "./helpers/docker.ts";
-import { createDeterministicDataset, type DatasetEntry } from "./helpers/dataset.ts";
-
-type BenchmarkConfig = {
-    couchdbBackendUri: string;
-    couchdbProxyUri: string;
-    couchdbUser: string;
-    couchdbPassword: string;
-    couchdbDbname: string;
-    datasetDirName: string;
-    datasetSeed: string;
-    mdFileCount: number;
-    mdMinSizeBytes: number;
-    mdMaxSizeBytes: number;
-    binFileCount: number;
-    binSizeBytes: number;
-    syncTimeoutSeconds: number;
-    requestedRttMs: number;
-    passphrase: string;
-    encrypt: boolean;
-};
-
-function readEnvString(name: string, fallback: string): string {
-    const value = Deno.env.get(name)?.trim();
-    return value && value.length > 0 ? value : fallback;
-}
-
-function readEnvNumber(name: string, fallback: number): number {
-    const raw = Deno.env.get(name);
-    if (raw === undefined || raw.trim() === "") {
-        return fallback;
-    }
-
-    const parsed = Number(raw);
-    if (!Number.isFinite(parsed) || parsed <= 0) {
-        throw new Error(`${name} must be a positive number, got '${raw}'`);
-    }
-    return parsed;
-}
-
-function readEnvBool(name: string, fallback: boolean): boolean {
-    const raw = Deno.env.get(name);
-    if (raw === undefined || raw.trim() === "") {
-        return fallback;
-    }
-    return /^(1|true|yes|on)$/i.test(raw.trim());
-}
-
-function nowMs(): number {
-    return performance.now();
-}
-
-function formatMs(value: number): string {
-    return `${value.toFixed(1)} ms`;
-}
-
-function formatBytes(value: number): string {
-    if (value < 1024) {
-        return `${value} B`;
-    }
-    const kib = value / 1024;
-    if (kib < 1024) {
-        return `${kib.toFixed(1)} KiB`;
-    }
-    return `${(kib / 1024).toFixed(1)} MiB`;
-}
-
-function buildConfig(): BenchmarkConfig {
-    return {
-        couchdbBackendUri: readEnvString("BENCH_COUCHDB_BACKEND_URI", "http://127.0.0.1:5989"),
-        couchdbProxyUri: readEnvString("BENCH_COUCHDB_URI", "http://127.0.0.1:15989"),
-        couchdbUser: readEnvString("BENCH_COUCHDB_USER", readEnvString("username", "admin")),
-        couchdbPassword: readEnvString("BENCH_COUCHDB_PASSWORD", readEnvString("password", "password")),
-        couchdbDbname: readEnvString("BENCH_COUCHDB_DBNAME", `bench-couchdb-${Date.now()}`),
-        datasetDirName: readEnvString("BENCH_DATASET_DIR", "bench-dataset"),
-        datasetSeed: readEnvString("BENCH_SEED", "livesync-benchmark-seed"),
-        mdFileCount: Math.floor(readEnvNumber("BENCH_MD_FILE_COUNT", 1500)),
-        mdMinSizeBytes: Math.floor(readEnvNumber("BENCH_MD_MIN_SIZE_BYTES", 1024)),
-        mdMaxSizeBytes: Math.floor(readEnvNumber("BENCH_MD_MAX_SIZE_BYTES", 20 * 1024)),
-        binFileCount: Math.floor(readEnvNumber("BENCH_BIN_FILE_COUNT", 500)),
-        binSizeBytes: Math.floor(readEnvNumber("BENCH_BIN_SIZE_BYTES", 100 * 1024)),
-        syncTimeoutSeconds: readEnvNumber("BENCH_SYNC_TIMEOUT", 240),
-        requestedRttMs: Math.floor(readEnvNumber("BENCH_COUCHDB_RTT_MS", 50)),
-        passphrase: readEnvString("BENCH_PASSPHRASE", `bench-${Date.now()}`),
-        encrypt: readEnvBool("BENCH_ENCRYPT", true),
-    };
-}
-
-function readOptionalResultPath(): string | undefined {
-    const raw = Deno.env.get("BENCH_RESULT_JSON")?.trim();
-    if (!raw) {
-        return undefined;
-    }
-    return raw;
-}
-
-function pickSampleFiles(entries: DatasetEntry[]): DatasetEntry[] {
-    if (entries.length === 0) {
-        return [];
-    }
-    const md = entries.find((e) => e.kind === "md");
-    const bin = entries.find((e) => e.kind === "bin");
-    const middle = entries[Math.floor(entries.length / 2)];
-    const last = entries[entries.length - 1];
-    const unique = new Map<string, DatasetEntry>();
-    for (const entry of [md, bin, middle, last]) {
-        if (entry) {
-            unique.set(entry.relativePath, entry);
-        }
-    }
-    return [...unique.values()];
-}
-
-type ProxyHandle = {
-    stop: () => Promise<void>;
-    applied: boolean;
-    note: string;
-};
-
-function startCouchdbProxy(options: { backendUri: string; proxyUri: string; requestedRttMs: number }): ProxyHandle {
-    const backend = new URL(options.backendUri);
-    const proxy = new URL(options.proxyUri);
-    const halfDelayMs = Math.max(1, Math.floor(options.requestedRttMs / 2));
-    const controller = new AbortController();
-
-    const listener = Deno.serve(
-        {
-            hostname: proxy.hostname,
-            port: Number(proxy.port),
-            signal: controller.signal,
-            onError(error) {
-                console.error(`[Proxy] ${String(error)}`);
-                return new Response("proxy error", { status: 502 });
-            },
-        },
-        async (request) => {
-            await new Promise((resolve) => setTimeout(resolve, halfDelayMs));
-
-            const targetUrl = new URL(request.url);
-            targetUrl.protocol = backend.protocol;
-            targetUrl.host = backend.host;
-
-            const headers = new Headers(request.headers);
-            headers.delete("host");
-            headers.delete("content-length");
-
-            let requestBody: ArrayBuffer | undefined;
-            if (request.method !== "GET" && request.method !== "HEAD") {
-                try {
-                    requestBody = await request.arrayBuffer();
-                } catch {
-                    requestBody = undefined;
-                }
-            }
-
-            const upstream = await fetch(targetUrl, {
-                method: request.method,
-                headers,
-                body: requestBody,
-                redirect: "manual",
-            });
-
-            const responseHeaders = new Headers(upstream.headers);
-            responseHeaders.delete("content-length");
-            const responseBody = await upstream.arrayBuffer();
-
-            return new Response(responseBody, {
-                status: upstream.status,
-                statusText: upstream.statusText,
-                headers: responseHeaders,
-            });
-        }
-    );
-
-    return {
-        applied: true,
-        note: `local reverse proxy on ${proxy.origin} with ${halfDelayMs}ms pre-forward delay`,
-        stop: async () => {
-            controller.abort();
-            await listener.finished.catch(() => {});
-        },
-    };
-}
-
-async function main(): Promise<void> {
-    const config = buildConfig();
-    const resultPath = readOptionalResultPath();
-
-    await using workDir = await TempDir.create("livesync-cli-couchdb-bench");
-    const vaultA = workDir.join("vault-a");
-    const vaultB = workDir.join("vault-b");
-    const settingsA = workDir.join("settings-a.json");
-    const settingsB = workDir.join("settings-b.json");
-    await Deno.mkdir(vaultA, { recursive: true });
-    await Deno.mkdir(vaultB, { recursive: true });
-
-    await initSettingsFile(settingsA);
-    await initSettingsFile(settingsB);
-
-    await startCouchdb(config.couchdbBackendUri, config.couchdbUser, config.couchdbPassword, config.couchdbDbname);
-
-    const proxy = startCouchdbProxy({
-        backendUri: config.couchdbBackendUri,
-        proxyUri: config.couchdbProxyUri,
-        requestedRttMs: config.requestedRttMs,
-    });
-
-    try {
-        await Promise.all([
-            applyRemoteSyncSettings(settingsA, {
-                remoteType: "COUCHDB",
-                couchdbUri: config.couchdbProxyUri,
-                couchdbUser: config.couchdbUser,
-                couchdbPassword: config.couchdbPassword,
-                couchdbDbname: config.couchdbDbname,
-                encrypt: config.encrypt,
-                passphrase: config.passphrase,
-            }),
-            applyRemoteSyncSettings(settingsB, {
-                remoteType: "COUCHDB",
-                couchdbUri: config.couchdbProxyUri,
-                couchdbUser: config.couchdbUser,
-                couchdbPassword: config.couchdbPassword,
-                couchdbDbname: config.couchdbDbname,
-                encrypt: config.encrypt,
-                passphrase: config.passphrase,
-            }),
-        ]);
-
-        const seedFiles = await createDeterministicDataset({
-            rootDir: vaultA,
-            datasetDirName: config.datasetDirName,
-            seed: config.datasetSeed,
-            mdCount: config.mdFileCount,
-            mdMinSizeBytes: config.mdMinSizeBytes,
-            mdMaxSizeBytes: config.mdMaxSizeBytes,
-            binCount: config.binFileCount,
-            binSizeBytes: config.binSizeBytes,
-        });
-
-        const mirrorStart = nowMs();
-        await runCliOrFail(vaultA, "--settings", settingsA, "mirror");
-        const mirrorElapsed = nowMs() - mirrorStart;
-
-        const syncAStart = nowMs();
-        await runCliOrFail(vaultA, "--settings", settingsA, "sync");
-        const syncAElapsed = nowMs() - syncAStart;
-
-        const syncBStart = nowMs();
-        await runCliOrFail(vaultB, "--settings", settingsB, "sync");
-        const syncBElapsed = nowMs() - syncBStart;
-
-        const sampleFiles = pickSampleFiles(seedFiles.entries);
-        for (const sample of sampleFiles) {
-            const pulledPath = workDir.join(`pulled-${sample.relativePath.split("/").join("_")}`);
-            await runCliOrFail(vaultB, "--settings", settingsB, "pull", sample.relativePath, pulledPath);
-            await assertFilesEqual(
-                sample.absolutePath,
-                pulledPath,
-                `sample file mismatch after CouchDB sync: ${sample.relativePath}`
-            );
-        }
-
-        const result = {
-            mode: "couchdb-cli-benchmark",
-            couchdbBackendUri: config.couchdbBackendUri,
-            couchdbProxyUri: config.couchdbProxyUri,
-            couchdbDbname: config.couchdbDbname,
-            rttRequestedMs: config.requestedRttMs,
-            proxyApplied: proxy.applied,
-            proxyNote: proxy.note,
-            datasetSeed: config.datasetSeed,
-            datasetDirName: config.datasetDirName,
-            totalFiles: seedFiles.totalFiles,
-            totalBytes: seedFiles.totalBytes,
-            mdFileCount: seedFiles.mdCount,
-            binFileCount: seedFiles.binCount,
-            mirrorElapsedMs: Number(mirrorElapsed.toFixed(1)),
-            syncAElapsedMs: Number(syncAElapsed.toFixed(1)),
-            syncBElapsedMs: Number(syncBElapsed.toFixed(1)),
-            totalSyncElapsedMs: Number((syncAElapsed + syncBElapsed).toFixed(1)),
-            throughputBytesPerSec: Number((seedFiles.totalBytes / ((syncAElapsed + syncBElapsed) / 1000)).toFixed(2)),
-            throughputMiBPerSec: Number(
-                (seedFiles.totalBytes / ((syncAElapsed + syncBElapsed) / 1000) / 1024 / 1024).toFixed(4)
-            ),
-        };
-
-        if (resultPath) {
-            await Deno.writeTextFile(resultPath, JSON.stringify(result, null, 2));
-        }
-
-        console.log(JSON.stringify(result, null, 2));
-        console.error(
-            `[Benchmark] couchdb mirrored ${seedFiles.totalFiles} files (${formatBytes(seedFiles.totalBytes)}) in ${formatMs(
-                mirrorElapsed
-            )}, synced in ${formatMs(syncAElapsed + syncBElapsed)} (${result.throughputBytesPerSec} B/s, ${result.throughputMiBPerSec} MiB/s)`
-        );
-    } finally {
-        await proxy.stop();
-        await stopCouchdb().catch(() => {});
-    }
-}
-
-if (import.meta.main) {
-    main().catch((error) => {
-        console.error(`[Fatal Error]`, error);
-        Deno.exit(1);
-    });
-}

src/apps/cli/testdeno/bench-p2p.ts

@@ -1,223 +0,0 @@
-import { TempDir } from "./helpers/temp.ts";
-import { applyP2pSettings, applyP2pTestTweaks, initSettingsFile } from "./helpers/settings.ts";
-import { startCliInBackground } from "./helpers/backgroundCli.ts";
-import { discoverPeer, maybeStartLocalRelay, stopLocalRelayIfStarted } from "./helpers/p2p.ts";
-import { assertFilesEqual, runCliOrFail } from "./helpers/cli.ts";
-import { createDeterministicDataset, type DatasetEntry } from "./helpers/dataset.ts";
-
-type BenchmarkConfig = {
-    relay: string;
-    appId: string;
-    roomId: string;
-    passphrase: string;
-    datasetDirName: string;
-    datasetSeed: string;
-    mdFileCount: number;
-    mdMinSizeBytes: number;
-    mdMaxSizeBytes: number;
-    binFileCount: number;
-    binSizeBytes: number;
-    peersTimeoutSeconds: number;
-    syncTimeoutSeconds: number;
-};
-
-function readEnvString(name: string, fallback: string): string {
-    const value = Deno.env.get(name)?.trim();
-    return value && value.length > 0 ? value : fallback;
-}
-
-function readEnvNumber(name: string, fallback: number): number {
-    const raw = Deno.env.get(name);
-    if (raw === undefined || raw.trim() === "") {
-        return fallback;
-    }
-
-    const parsed = Number(raw);
-    if (!Number.isFinite(parsed) || parsed <= 0) {
-        throw new Error(`${name} must be a positive number, got '${raw}'`);
-    }
-    return parsed;
-}
-
-function nowMs(): number {
-    return performance.now();
-}
-
-function formatMs(value: number): string {
-    return `${value.toFixed(1)} ms`;
-}
-
-function formatBytes(value: number): string {
-    if (value < 1024) {
-        return `${value} B`;
-    }
-    const kib = value / 1024;
-    if (kib < 1024) {
-        return `${kib.toFixed(1)} KiB`;
-    }
-    const mib = kib / 1024;
-    return `${mib.toFixed(1)} MiB`;
-}
-
-function buildConfig(): BenchmarkConfig {
-    return {
-        relay: readEnvString("BENCH_RELAY", "ws://localhost:4000/"),
-        appId: readEnvString("BENCH_APP_ID", "self-hosted-livesync-cli-benchmark"),
-        roomId: readEnvString("BENCH_ROOM_ID", `bench-room-${Date.now()}`),
-        passphrase: readEnvString("BENCH_PASSPHRASE", `bench-${Date.now()}`),
-        datasetDirName: readEnvString("BENCH_DATASET_DIR", "bench-dataset"),
-        datasetSeed: readEnvString("BENCH_SEED", "livesync-benchmark-seed"),
-        mdFileCount: Math.floor(readEnvNumber("BENCH_MD_FILE_COUNT", 1500)),
-        mdMinSizeBytes: Math.floor(readEnvNumber("BENCH_MD_MIN_SIZE_BYTES", 1024)),
-        mdMaxSizeBytes: Math.floor(readEnvNumber("BENCH_MD_MAX_SIZE_BYTES", 20 * 1024)),
-        binFileCount: Math.floor(readEnvNumber("BENCH_BIN_FILE_COUNT", 500)),
-        binSizeBytes: Math.floor(readEnvNumber("BENCH_BIN_SIZE_BYTES", 100 * 1024)),
-        peersTimeoutSeconds: readEnvNumber("BENCH_PEERS_TIMEOUT", 20),
-        syncTimeoutSeconds: readEnvNumber("BENCH_SYNC_TIMEOUT", 240),
-    };
-}
-
-function readOptionalResultPath(): string | undefined {
-    const raw = Deno.env.get("BENCH_RESULT_JSON")?.trim();
-    if (!raw) {
-        return undefined;
-    }
-    return raw;
-}
-
-function pickSampleFiles(entries: DatasetEntry[]): DatasetEntry[] {
-    if (entries.length === 0) {
-        return [];
-    }
-    const md = entries.find((e) => e.kind === "md");
-    const bin = entries.find((e) => e.kind === "bin");
-    const middle = entries[Math.floor(entries.length / 2)];
-    const last = entries[entries.length - 1];
-    const unique = new Map<string, DatasetEntry>();
-    for (const entry of [md, bin, middle, last]) {
-        if (entry) {
-            unique.set(entry.relativePath, entry);
-        }
-    }
-    return [...unique.values()];
-}
-
-async function main(): Promise<void> {
-    const config = buildConfig();
-    const resultPath = readOptionalResultPath();
-
-    const relayStarted = await maybeStartLocalRelay(config.relay);
-    await using workDir = await TempDir.create("livesync-cli-p2p-bench");
-
-    const hostVault = workDir.join("vault-host");
-    const clientVault = workDir.join("vault-client");
-    const hostSettings = workDir.join("settings-host.json");
-    const clientSettings = workDir.join("settings-client.json");
-
-    await Promise.all([
-        Deno.mkdir(hostVault, { recursive: true }),
-        Deno.mkdir(clientVault, { recursive: true }),
-        initSettingsFile(hostSettings),
-        initSettingsFile(clientSettings),
-    ]);
-
-    await Promise.all([
-        applyP2pSettings(hostSettings, config.roomId, config.passphrase, config.appId, config.relay, "~.*"),
-        applyP2pSettings(clientSettings, config.roomId, config.passphrase, config.appId, config.relay, "~.*"),
-    ]);
-
-    await Promise.all([
-        applyP2pTestTweaks(hostSettings, "p2p-bench-host", config.passphrase),
-        applyP2pTestTweaks(clientSettings, "p2p-bench-client", config.passphrase),
-    ]);
-
-    const seedFiles = await createDeterministicDataset({
-        rootDir: hostVault,
-        datasetDirName: config.datasetDirName,
-        seed: config.datasetSeed,
-        mdCount: config.mdFileCount,
-        mdMinSizeBytes: config.mdMinSizeBytes,
-        mdMaxSizeBytes: config.mdMaxSizeBytes,
-        binCount: config.binFileCount,
-        binSizeBytes: config.binSizeBytes,
-    });
-
-    const mirrorStart = nowMs();
-    await runCliOrFail(hostVault, "--settings", hostSettings, "mirror");
-    const mirrorElapsed = nowMs() - mirrorStart;
-
-    const host = startCliInBackground(hostVault, "--settings", hostSettings, "p2p-host");
-    try {
-        const hostReadyStart = nowMs();
-        await host.waitUntilContains("P2P host is running", 20000);
-        const hostReadyElapsed = nowMs() - hostReadyStart;
-
-        const peerDiscoveryStart = nowMs();
-        const peer = await discoverPeer(clientVault, clientSettings, config.peersTimeoutSeconds);
-        const peerDiscoveryElapsed = nowMs() - peerDiscoveryStart;
-
-        const syncStart = nowMs();
-        await runCliOrFail(
-            clientVault,
-            "--settings",
-            clientSettings,
-            "p2p-sync",
-            peer.id,
-            String(config.syncTimeoutSeconds)
-        );
-        const syncElapsed = nowMs() - syncStart;
-
-        const sampleFiles = pickSampleFiles(seedFiles.entries);
-        for (const sample of sampleFiles) {
-            const pulledPath = workDir.join(`pulled-${sample.relativePath.replaceAll("/", "_")}`);
-            await runCliOrFail(clientVault, "--settings", clientSettings, "pull", sample.relativePath, pulledPath);
-            await assertFilesEqual(
-                sample.absolutePath,
-                pulledPath,
-                `sample file mismatch after sync: ${sample.relativePath}`
-            );
-        }
-
-        const result = {
-            mode: "p2p-cli-benchmark",
-            relay: config.relay,
-            appId: config.appId,
-            roomId: config.roomId,
-            datasetSeed: config.datasetSeed,
-            datasetDirName: config.datasetDirName,
-            peerId: peer.id,
-            peerName: peer.name,
-            totalFiles: seedFiles.totalFiles,
-            totalBytes: seedFiles.totalBytes,
-            mdFileCount: seedFiles.mdCount,
-            binFileCount: seedFiles.binCount,
-            mirrorElapsedMs: Number(mirrorElapsed.toFixed(1)),
-            hostReadyElapsedMs: Number(hostReadyElapsed.toFixed(1)),
-            peerDiscoveryElapsedMs: Number(peerDiscoveryElapsed.toFixed(1)),
-            syncElapsedMs: Number(syncElapsed.toFixed(1)),
-            throughputBytesPerSec: Number((seedFiles.totalBytes / (syncElapsed / 1000)).toFixed(2)),
-            throughputMiBPerSec: Number((seedFiles.totalBytes / (syncElapsed / 1000) / 1024 / 1024).toFixed(4)),
-        };
-
-        if (resultPath) {
-            await Deno.writeTextFile(resultPath, JSON.stringify(result, null, 2));
-        }
-
-        console.log(JSON.stringify(result, null, 2));
-        console.error(
-            `[Benchmark] mirrored ${seedFiles.totalFiles} files (${formatBytes(seedFiles.totalBytes)}) in ${formatMs(mirrorElapsed)}, ` +
-                `synced in ${formatMs(syncElapsed)} ` +
-                `(${result.throughputBytesPerSec} B/s, ${result.throughputMiBPerSec} MiB/s)`
-        );
-    } finally {
-        await host.stop();
-        await stopLocalRelayIfStarted(relayStarted);
-    }
-}
-
-if (import.meta.main) {
-    main().catch((error) => {
-        console.error(`[Fatal Error]`, error);
-        Deno.exit(1);
-    });
-}

src/apps/cli/testdeno/bench-run-item1.sh

@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-RESULTS_ROOT="${SCRIPT_DIR}/bench-results"
-TIMESTAMP="$(date +%Y%m%d-%H%M%S)"
-OUT_DIR="${RESULTS_ROOT}/${TIMESTAMP}"
-
-mkdir -p "${OUT_DIR}"
-
-echo "[bench-wrapper] output directory: ${OUT_DIR}"
-
-echo "[bench-wrapper] running p2p benchmark"
-(
-  cd "${SCRIPT_DIR}"
-  BENCH_RESULT_JSON="${OUT_DIR}/p2p.json" deno task bench:p2p
-)
-
-echo "[bench-wrapper] running couchdb benchmark with RTT ${BENCH_COUCHDB_RTT_MS:-default} ms (emulating HTTP network latency)"
-(
-  cd "${SCRIPT_DIR}"
-  BENCH_RESULT_JSON="${OUT_DIR}/couchdb.json" deno task bench:couchdb
-)
-
-cat > "${OUT_DIR}/README.txt" <<EOF
-Bench wrapper result set
-
-Generated at: ${TIMESTAMP}
-Directory: ${OUT_DIR}
-
-Files:
-- p2p.json
-- couchdb.json
-EOF
-
-echo "[bench-wrapper] verify outputs by cat"
-echo "========== ${OUT_DIR}/README.txt =========="
-cat "${OUT_DIR}/README.txt"
-echo "========== ${OUT_DIR}/p2p.json =========="
-cat "${OUT_DIR}/p2p.json"
-echo "========== ${OUT_DIR}/couchdb.json =========="
-cat "${OUT_DIR}/couchdb.json"
-
-echo "[bench-wrapper] done"
-echo "[bench-wrapper] result directory: ${OUT_DIR}"

src/apps/cli/testdeno/deno.json

@@ -12,16 +12,8 @@
         "test:p2p-sync": "deno test --env-file=.test.env -A --no-check test-p2p-sync.ts",
         "test:p2p-three-nodes": "deno test --env-file=.test.env -A --no-check test-p2p-three-nodes-conflict.ts",
         "test:p2p-upload-download": "deno test --env-file=.test.env -A --no-check test-p2p-upload-download-repro.ts",
-        "bench:p2p": "deno run --env-file=.test.env -A --no-check bench-p2p.ts",
-        "bench:couchdb": "deno run --env-file=.test.env -A --no-check bench-couchdb.ts",
-        "bench:item1": "bash ./bench-run-item1.sh",
-        "bench:item1:full": "BENCH_MD_FILE_COUNT=1500 BENCH_MD_MIN_SIZE_BYTES=1024 BENCH_MD_MAX_SIZE_BYTES=20480 BENCH_BIN_FILE_COUNT=500 BENCH_BIN_SIZE_BYTES=102400 BENCH_COUCHDB_RTT_MS=50 bash ./bench-run-item1.sh",
         "test:e2e-couchdb": "deno test --env-file=.test.env -A --no-check test-e2e-two-vaults-couchdb.ts",
-        "test:e2e-matrix": "deno test --env-file=.test.env -A --no-check test-e2e-two-vaults-matrix.ts",
-        "test:e2e-matrix:couchdb-enc0": "deno test --env-file=.test.env -A --no-check --filter='e2e matrix: COUCHDB-enc0' test-e2e-two-vaults-matrix.ts",
-        "test:e2e-matrix:couchdb-enc1": "deno test --env-file=.test.env -A --no-check --filter='e2e matrix: COUCHDB-enc1' test-e2e-two-vaults-matrix.ts",
-        "test:e2e-matrix:minio-enc0": "deno test --env-file=.test.env -A --no-check --filter='e2e matrix: MINIO-enc0' test-e2e-two-vaults-matrix.ts",
-        "test:e2e-matrix:minio-enc1": "deno test --env-file=.test.env -A --no-check --filter='e2e matrix: MINIO-enc1' test-e2e-two-vaults-matrix.ts"
+        "test:e2e-matrix": "deno test --env-file=.test.env -A --no-check test-e2e-two-vaults-matrix.ts"
     },
     "imports": {
         "@std/assert": "jsr:@std/assert@^1.0.13",

src/apps/cli/testdeno/helpers/backgroundCli.ts

@@ -1,4 +1,4 @@
-import { CLI_DIR, TEE_ENABLED, formatTeeCommand, createLineTeeWriter } from "./cli.ts";
+import { CLI_DIR } from "./cli.ts";
 import { join } from "@std/path";
 
 const CLI_DIST = join(CLI_DIR, "dist", "index.cjs");
@@ -12,9 +12,10 @@ function decorateArgs(args: string[]): string[] {
 async function pump(
     stream: ReadableStream<Uint8Array>,
     sink: (text: string) => void,
-    teeTarget: { write: (chunk: Uint8Array) => void; close: () => void } | null
+    teeTarget: WritableStream<Uint8Array> | null
 ): Promise<void> {
     const reader = stream.getReader();
+    const writer = teeTarget?.getWriter();
     const dec = new TextDecoder();
     try {
         while (true) {
@@ -22,12 +23,12 @@ async function pump(
             if (done) break;
             if (!value) continue;
             sink(dec.decode(value, { stream: true }));
-            if (teeTarget) {
-                teeTarget.write(value);
+            if (writer) {
+                await writer.write(value);
             }
         }
     } finally {
-        if (teeTarget) teeTarget.close();
+        if (writer) writer.releaseLock();
         reader.releaseLock();
     }
 }
@@ -42,20 +43,19 @@ export class BackgroundCliProcess {
         readonly child: Deno.ChildProcess,
         readonly args: string[]
     ) {
-        const cliArgs = decorateArgs(args);
         this.#stdoutDone = pump(
             child.stdout,
             (text) => {
                 this.#stdout += text;
             },
-            TEE_ENABLED ? createLineTeeWriter(child.pid, "stdout", (chunk) => Deno.stdout.writeSync(chunk)) : null
+            null
         );
         this.#stderrDone = pump(
             child.stderr,
             (text) => {
                 this.#stderr += text;
             },
-            TEE_ENABLED ? createLineTeeWriter(child.pid, "stderr", (chunk) => Deno.stderr.writeSync(chunk)) : null
+            null
         );
     }
 
@@ -101,20 +101,12 @@ export class BackgroundCliProcess {
 }
 
 export function startCliInBackground(...args: string[]): BackgroundCliProcess {
-    const cliArgs = decorateArgs(args);
     const child = new Deno.Command("node", {
-        args: [CLI_DIST, ...cliArgs],
+        args: [CLI_DIST, ...decorateArgs(args)],
         cwd: CLI_DIR,
         stdin: "null",
         stdout: "piped",
         stderr: "piped",
     }).spawn();
-
-    if (TEE_ENABLED) {
-        Deno.stdout.writeSync(
-            new TextEncoder().encode(`[CLI tee pid=${child.pid}] process(bg): ${formatTeeCommand(cliArgs)}\n`)
-        );
-    }
-
     return new BackgroundCliProcess(child, args);
 }

src/apps/cli/testdeno/helpers/cli.ts

@@ -20,7 +20,7 @@ export interface CliResult {
     code: number;
 }
 
-export const TEE_ENABLED = Deno.env.get("LIVESYNC_TEST_TEE") === "1";
+const TEE_ENABLED = Deno.env.get("LIVESYNC_TEST_TEE") === "1";
 const VERBOSE_ENABLED = Deno.env.get("LIVESYNC_CLI_VERBOSE") === "1";
 const DEBUG_ENABLED = Deno.env.get("LIVESYNC_CLI_DEBUG") === "1";
 
@@ -39,73 +39,27 @@ function concatChunks(chunks: Uint8Array[]): Uint8Array {
     return out;
 }
 
-export function formatTeeCommand(args: string[]): string {
-    return ["node", CLI_DIST, ...args].map((part) => JSON.stringify(part)).join(" ");
-}
-
-export function createLineTeeWriter(
-    pid: number,
-    streamName: "stdout" | "stderr",
-    writer: (chunk: Uint8Array) => void
-): { write: (chunk: Uint8Array) => void; close: () => void } {
-    const enc = new TextEncoder();
-    const dec = new TextDecoder();
-    let pending = "";
-    let headerWritten = false;
-    const emitLine = (line: string) => {
-        if (!headerWritten) {
-            writer(enc.encode(`[CLI tee pid=${pid}:${streamName}]\n`));
-            headerWritten = true;
-        }
-        writer(enc.encode(`[CLI tee pid=${pid}:${streamName}] ${line}\n`));
-    };
-
-    const flush = (final = false) => {
-        let index = pending.indexOf("\n");
-        while (index >= 0) {
-            const line = pending.slice(0, index).replace(/\r$/, "");
-            pending = pending.slice(index + 1);
-            emitLine(line);
-            index = pending.indexOf("\n");
-        }
-        if (final && pending.length > 0) {
-            emitLine(pending.replace(/\r$/, ""));
-            pending = "";
-        }
-    };
-
-    return {
-        write(chunk: Uint8Array) {
-            pending += dec.decode(chunk, { stream: true });
-            flush(false);
-        },
-        close() {
-            pending += dec.decode();
-            flush(true);
-        },
-    };
-}
-
 async function collectStream(
     stream: ReadableStream<Uint8Array>,
-    teeTarget: { write: (chunk: Uint8Array) => void; close: () => void } | null
+    teeTarget: WritableStream<Uint8Array> | null
 ): Promise<Uint8Array> {
     const reader = stream.getReader();
     const chunks: Uint8Array[] = [];
+    const writer = teeTarget?.getWriter();
     try {
         while (true) {
             const { done, value } = await reader.read();
             if (done) break;
             if (value) {
                 chunks.push(value);
-                if (teeTarget) {
-                    teeTarget.write(value);
+                if (writer) {
+                    await writer.write(value);
                 }
             }
         }
     } finally {
-        if (teeTarget) {
-            teeTarget.close();
+        if (writer) {
+            writer.releaseLock();
         }
         reader.releaseLock();
     }
@@ -122,20 +76,8 @@ async function runNodeCommand(args: string[], stdinData?: Uint8Array): Promise<C
         stderr: "piped",
     }).spawn();
 
-    if (TEE_ENABLED) {
-        Deno.stdout.writeSync(
-            new TextEncoder().encode(`[CLI tee pid=${child.pid}] process: ${formatTeeCommand(cliArgs)}\n`)
-        );
-    }
-
-    const stdoutPromise = collectStream(
-        child.stdout,
-        TEE_ENABLED ? createLineTeeWriter(child.pid, "stdout", (chunk) => Deno.stdout.writeSync(chunk)) : null
-    );
-    const stderrPromise = collectStream(
-        child.stderr,
-        TEE_ENABLED ? createLineTeeWriter(child.pid, "stderr", (chunk) => Deno.stderr.writeSync(chunk)) : null
-    );
+    const stdoutPromise = collectStream(child.stdout, TEE_ENABLED ? Deno.stdout.writable : null);
+    const stderrPromise = collectStream(child.stderr, TEE_ENABLED ? Deno.stderr.writable : null);
 
     if (stdinData) {
         const w = child.stdin.getWriter();

src/apps/cli/testdeno/helpers/dataset.ts

@@ -1,123 +0,0 @@
-export type DeterministicDatasetConfig = {
-    rootDir: string;
-    datasetDirName: string;
-    seed: string;
-    mdCount: number;
-    mdMinSizeBytes: number;
-    mdMaxSizeBytes: number;
-    binCount: number;
-    binSizeBytes: number;
-};
-
-export type DatasetEntry = {
-    kind: "md" | "bin";
-    relativePath: string;
-    absolutePath: string;
-    size: number;
-};
-
-export type DeterministicDataset = {
-    rootDir: string;
-    datasetDirName: string;
-    seed: string;
-    entries: DatasetEntry[];
-    totalFiles: number;
-    totalBytes: number;
-    mdCount: number;
-    binCount: number;
-};
-
-function fnv1a32(input: string): number {
-    let hash = 0x811c9dc5;
-    for (let i = 0; i < input.length; i++) {
-        hash ^= input.charCodeAt(i) & 0xff;
-        hash = Math.imul(hash, 0x01000193);
-    }
-    return hash >>> 0;
-}
-
-function createXorshift32(seed: number): () => number {
-    let state = seed >>> 0;
-    if (state === 0) {
-        state = 0x9e3779b9;
-    }
-    return () => {
-        state ^= state << 13;
-        state ^= state >>> 17;
-        state ^= state << 5;
-        return state >>> 0;
-    };
-}
-
-function createTextBytes(size: number, fileIndex: number, seed: string): Uint8Array {
-    const template =
-        `# Bench file ${fileIndex}\n` +
-        `seed: ${seed}\n` +
-        "lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n";
-
-    const templateBytes = new TextEncoder().encode(template);
-    const out = new Uint8Array(size);
-    for (let i = 0; i < size; i++) {
-        out[i] = templateBytes[i % templateBytes.length];
-    }
-    return out;
-}
-
-function toPath(rootDir: string, relativePath: string): string {
-    return `${rootDir}/${relativePath}`;
-}
-
-export async function createDeterministicDataset(config: DeterministicDatasetConfig): Promise<DeterministicDataset> {
-    if (config.mdCount < 0 || config.binCount < 0) {
-        throw new Error("mdCount and binCount must be non-negative");
-    }
-    if (config.mdMinSizeBytes <= 0 || config.mdMaxSizeBytes <= 0 || config.binSizeBytes <= 0) {
-        throw new Error("all size values must be positive");
-    }
-    if (config.mdMinSizeBytes > config.mdMaxSizeBytes) {
-        throw new Error("mdMinSizeBytes must be <= mdMaxSizeBytes");
-    }
-
-    const datasetRoot = toPath(config.rootDir, config.datasetDirName);
-    const mdDir = `${datasetRoot}/md`;
-    const binDir = `${datasetRoot}/bin`;
-    await Deno.mkdir(mdDir, { recursive: true });
-    await Deno.mkdir(binDir, { recursive: true });
-
-    const nextRandom = createXorshift32(fnv1a32(config.seed));
-    const mdRange = config.mdMaxSizeBytes - config.mdMinSizeBytes + 1;
-    const entries: DatasetEntry[] = [];
-
-    for (let index = 0; index < config.mdCount; index++) {
-        const size = config.mdMinSizeBytes + (nextRandom() % mdRange);
-        const relativePath = `${config.datasetDirName}/md/file-${String(index).padStart(4, "0")}.md`;
-        const absolutePath = toPath(config.rootDir, relativePath);
-        const body = createTextBytes(size, index, config.seed);
-        await Deno.writeFile(absolutePath, body);
-        entries.push({ kind: "md", relativePath, absolutePath, size });
-    }
-
-    for (let index = 0; index < config.binCount; index++) {
-        const size = config.binSizeBytes;
-        const relativePath = `${config.datasetDirName}/bin/file-${String(index).padStart(4, "0")}.bin`;
-        const absolutePath = toPath(config.rootDir, relativePath);
-        const body = new Uint8Array(size);
-        for (let i = 0; i < size; i++) {
-            body[i] = nextRandom() & 0xff;
-        }
-        await Deno.writeFile(absolutePath, body);
-        entries.push({ kind: "bin", relativePath, absolutePath, size });
-    }
-
-    const totalBytes = entries.reduce((sum, e) => sum + e.size, 0);
-    return {
-        rootDir: config.rootDir,
-        datasetDirName: config.datasetDirName,
-        seed: config.seed,
-        entries,
-        totalFiles: entries.length,
-        totalBytes,
-        mdCount: config.mdCount,
-        binCount: config.binCount,
-    };
-}

src/apps/cli/testdeno/helpers/docker.ts

@@ -14,11 +14,6 @@ type DockerInvoker = {
 
 let dockerInvokerPromise: Promise<DockerInvoker> | null = null;
 const DOCKER_TEE = Deno.env.get("LIVESYNC_DOCKER_TEE") === "1" || Deno.env.get("LIVESYNC_TEST_TEE") === "1";
-const trackedContainers = new Set<string>();
-const CLEANUP_SIGNALS: Deno.Signal[] = ["SIGINT", "SIGTERM"];
-let signalCleanupHandlersInstalled = false;
-let signalCleanupInProgress = false;
-const signalCleanupHandlers = new Map<Deno.Signal, () => void>();
 
 // ---------------------------------------------------------------------------
 // Low-level docker wrapper
@@ -32,53 +27,29 @@ function parseCommand(command: string): { bin: string; prefix: string[] } {
     return { bin: parts[0], prefix: parts.slice(1) };
 }
 
-async function collectStream(
-    stream: ReadableStream<Uint8Array>,
-    teeTarget: ((chunk: Uint8Array) => void) | null
-): Promise<Uint8Array> {
-    const reader = stream.getReader();
-    const chunks: Uint8Array[] = [];
-    try {
-        while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-            if (!value) continue;
-            chunks.push(value);
-            if (teeTarget) {
-                teeTarget(value);
-            }
-        }
-    } finally {
-        reader.releaseLock();
-    }
-
-    const total = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
-    const out = new Uint8Array(total);
-    let offset = 0;
-    for (const chunk of chunks) {
-        out.set(chunk, offset);
-        offset += chunk.length;
-    }
-    return out;
-}
-
 async function runCommand(bin: string, args: string[]): Promise<{ code: number; stdout: string; stderr: string }> {
+    const cmd = new Deno.Command(bin, {
+        args,
+        stdin: "null",
+        stdout: "piped",
+        stderr: "piped",
+    });
     try {
-        const child = new Deno.Command(bin, {
-            args,
-            stdin: "null",
-            stdout: "piped",
-            stderr: "piped",
-        }).spawn();
-        const stdoutPromise = collectStream(child.stdout, DOCKER_TEE ? (chunk) => Deno.stdout.writeSync(chunk) : null);
-        const stderrPromise = collectStream(child.stderr, DOCKER_TEE ? (chunk) => Deno.stderr.writeSync(chunk) : null);
-        const [status, stdout, stderr] = await Promise.all([child.status, stdoutPromise, stderrPromise]);
+        const { code, stdout, stderr } = await cmd.output();
         const dec = new TextDecoder();
         const result = {
-            code: status.code,
+            code,
             stdout: dec.decode(stdout),
             stderr: dec.decode(stderr),
         };
+        if (DOCKER_TEE) {
+            if (result.stdout.trim().length > 0) {
+                console.log(`[docker:${bin}] ${result.stdout.trimEnd()}`);
+            }
+            if (result.stderr.trim().length > 0) {
+                console.error(`[docker:${bin}] ${result.stderr.trimEnd()}`);
+            }
+        }
         return result;
     } catch (err) {
         if (err instanceof Deno.errors.NotFound) {
@@ -188,73 +159,6 @@ async function dockerOrFail(...args: string[]): Promise<string> {
     return r.stdout;
 }
 
-async function stopAndRemoveContainer(container: string): Promise<void> {
-    await docker("stop", container).catch(() => {});
-    await docker("rm", container).catch(() => {});
-}
-
-async function cleanupTrackedContainers(reason: string): Promise<void> {
-    const names = [...trackedContainers];
-    if (names.length === 0) return;
-
-    console.warn(`[WARN] cleaning up tracked containers on ${reason}: ${names.join(", ")}`);
-    for (const container of names.reverse()) {
-        await stopAndRemoveContainer(container);
-        trackedContainers.delete(container);
-    }
-}
-
-async function handleSignalCleanup(signal: Deno.Signal): Promise<void> {
-    if (signalCleanupInProgress) return;
-    signalCleanupInProgress = true;
-    try {
-        await cleanupTrackedContainers(`signal ${signal}`);
-    } finally {
-        Deno.exit(signal === "SIGINT" ? 130 : 143);
-    }
-}
-
-function ensureSignalCleanupHandlers(): void {
-    if (signalCleanupHandlersInstalled) return;
-    signalCleanupHandlersInstalled = true;
-    for (const signal of CLEANUP_SIGNALS) {
-        const listener = () => {
-            void handleSignalCleanup(signal);
-        };
-        try {
-            Deno.addSignalListener(signal, listener);
-            signalCleanupHandlers.set(signal, listener);
-        } catch {
-            // Unsupported signal on this platform.
-        }
-    }
-}
-
-function removeSignalCleanupHandlers(): void {
-    if (!signalCleanupHandlersInstalled) return;
-    for (const [signal, listener] of signalCleanupHandlers) {
-        try {
-            Deno.removeSignalListener(signal, listener);
-        } catch {
-            // Ignore if already removed or unsupported.
-        }
-    }
-    signalCleanupHandlers.clear();
-    signalCleanupHandlersInstalled = false;
-}
-
-function trackContainer(container: string): void {
-    ensureSignalCleanupHandlers();
-    trackedContainers.add(container);
-}
-
-function untrackContainer(container: string): void {
-    trackedContainers.delete(container);
-    if (trackedContainers.size === 0) {
-        removeSignalCleanupHandlers();
-    }
-}
-
 function sleep(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -331,8 +235,8 @@ const MINIO_IMAGE = "minio/minio";
 const MINIO_MC_IMAGE = "minio/mc";
 
 export async function stopCouchdb(): Promise<void> {
-    await stopAndRemoveContainer(COUCHDB_CONTAINER);
-    untrackContainer(COUCHDB_CONTAINER);
+    await docker("stop", COUCHDB_CONTAINER);
+    await docker("rm", COUCHDB_CONTAINER);
 }
 
 /**
@@ -361,7 +265,6 @@ export async function startCouchdb(couchdbUri: string, user: string, password: s
         "COUCHDB_SINGLE_NODE=y",
         COUCHDB_IMAGE
     );
-    trackContainer(COUCHDB_CONTAINER);
 
     console.log("[INFO] initialising CouchDB");
     await initCouchdb(couchdbUri, user, password);
@@ -462,8 +365,8 @@ function shQuote(value: string): string {
 }
 
 export async function stopMinio(): Promise<void> {
-    await stopAndRemoveContainer(MINIO_CONTAINER);
-    untrackContainer(MINIO_CONTAINER);
+    await docker("stop", MINIO_CONTAINER);
+    await docker("rm", MINIO_CONTAINER);
 }
 
 async function initMinioBucket(
@@ -543,7 +446,6 @@ export async function startMinio(
         "--console-address",
         ":9001"
     );
-    trackContainer(MINIO_CONTAINER);
 
     console.log(`[INFO] initialising MinIO test bucket: ${bucket}`);
     let initialised = false;
@@ -591,8 +493,8 @@ EOF
 exec /app/strfry --config /tmp/strfry.conf relay`;
 
 export async function stopP2pRelay(): Promise<void> {
-    await stopAndRemoveContainer(P2P_RELAY_CONTAINER);
-    untrackContainer(P2P_RELAY_CONTAINER);
+    await docker("stop", P2P_RELAY_CONTAINER);
+    await docker("rm", P2P_RELAY_CONTAINER);
 }
 
 /**
@@ -621,51 +523,8 @@ export async function startP2pRelay(): Promise<void> {
         "-lc",
         STRFRY_BOOTSTRAP_SH
     );
-    trackContainer(P2P_RELAY_CONTAINER);
 }
 
 export function isLocalP2pRelay(relayUrl: string): boolean {
-    return relayUrl.includes("localhost") || relayUrl.includes("127.0.0.1") || relayUrl.includes("[::1]");
-}
-
-// ---------------------------------------------------------------------------
-// Coturn (STUN/TURN)
-// ---------------------------------------------------------------------------
-const COTURN_CONTAINER = "coturn-test";
-const COTURN_IMAGE = "coturn/coturn:latest";
-
-export async function stopCoturn(): Promise<void> {
-    await stopAndRemoveContainer(COTURN_CONTAINER);
-    untrackContainer(COTURN_CONTAINER);
-}
-
-export async function startCoturn(
-    port = 3478,
-    user = "testuser",
-    pass = "testpass",
-    realm = "livesync.test"
-): Promise<void> {
-    console.log("[INFO] stopping leftover Coturn container if present");
-    await stopCoturn().catch(() => {});
-
-    const { getOptimalLoopbackIp } = await import("./net.ts");
-    const externalIp = await getOptimalLoopbackIp();
-
-    console.log(`[INFO] starting local Coturn container with external-ip ${externalIp}`);
-    await dockerOrFail(
-        "run",
-        "-d",
-        "--name",
-        COTURN_CONTAINER,
-        "-p",
-        `${port}:${port}`,
-        "-p",
-        `${port}:${port}/udp`,
-        COTURN_IMAGE,
-        "--log-file=stdout",
-        `--external-ip=${externalIp}`,
-        `--user=${user}:${pass}`,
-        `--realm=${realm}`
-    );
-    trackContainer(COTURN_CONTAINER);
+    return relayUrl === "ws://localhost:4000" || relayUrl === "ws://localhost:4000/";
 }

src/apps/cli/testdeno/helpers/net.ts

@@ -1,68 +0,0 @@
-type WaitForPortOptions = {
-    timeoutMs?: number;
-    intervalMs?: number;
-    connectTimeoutMs?: number;
-};
-
-function sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-async function connectWithTimeout(hostname: string, port: number, timeoutMs: number): Promise<void> {
-    let timer: number | undefined;
-    try {
-        const connPromise = Deno.connect({ hostname, port });
-        const timeoutPromise = new Promise<never>((_, reject) => {
-            timer = setTimeout(() => reject(new Error(`connect timeout after ${timeoutMs}ms`)), timeoutMs);
-        });
-        const conn = await Promise.race([connPromise, timeoutPromise]);
-        conn.close();
-    } finally {
-        if (timer !== undefined) {
-            clearTimeout(timer);
-        }
-    }
-}
-
-export async function waitForPort(hostname: string, port: number, options: WaitForPortOptions = {}): Promise<void> {
-    const timeoutMs = options.timeoutMs ?? 15000;
-    const intervalMs = options.intervalMs ?? 250;
-    const connectTimeoutMs = options.connectTimeoutMs ?? 1000;
-
-    const started = Date.now();
-    let lastError: unknown;
-
-    while (Date.now() - started < timeoutMs) {
-        try {
-            await connectWithTimeout(hostname, port, connectTimeoutMs);
-            return;
-        } catch (error) {
-            lastError = error;
-            await sleep(intervalMs);
-        }
-    }
-
-    throw new Error(
-        `Port ${hostname}:${port} did not become ready within ${timeoutMs}ms` +
-            (lastError ? ` (last error: ${String(lastError)})` : "")
-    );
-}
-
-export async function getOptimalLoopbackIp(): Promise<string> {
-    const ipv4 = "127.0.0.1";
-    const ipv6 = "::1";
-
-    try {
-        const l = Deno.listen({ hostname: ipv4, port: 0 });
-        l.close();
-        return ipv4;
-    } catch {
-        try {
-            const l = Deno.listen({ hostname: ipv6, port: 0 });
-            l.close();
-            return ipv6;
-        } catch {
-            return ipv4; // fallback to default
-        }
-    }
-}

src/apps/cli/testdeno/helpers/p2p.ts

@@ -1,26 +1,11 @@
 import { runCli } from "./cli.ts";
-import { isLocalP2pRelay, startP2pRelay, stopP2pRelay, startCoturn, stopCoturn } from "./docker.ts";
-import { waitForPort } from "./net.ts";
+import { isLocalP2pRelay, startP2pRelay, stopP2pRelay } from "./docker.ts";
 
 export type PeerEntry = {
     id: string;
     name: string;
 };
 
-function sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-function parseRelayEndpoint(relay: string): { hostname: string; port: number } {
-    const url = new URL(relay);
-    const port = url.port ? Number(url.port) : url.protocol === "ws:" ? 80 : url.protocol === "wss:" ? 443 : NaN;
-    if (!Number.isFinite(port)) {
-        throw new Error(`Unsupported relay URL: ${relay}`);
-    }
-    const hostname = url.hostname === "localhost" ? "127.0.0.1" : url.hostname;
-    return { hostname, port };
-}
-
 export function parsePeerLines(output: string): PeerEntry[] {
     return output
         .split(/\r?\n/)
@@ -35,58 +20,28 @@ export async function discoverPeer(
     timeoutSeconds: number,
     targetPeer?: string
 ): Promise<PeerEntry> {
-    const retries = Math.max(0, Number(Deno.env.get("LIVESYNC_P2P_PEERS_RETRY") ?? "3"));
-    let lastCombined = "";
-
-    for (let attempt = 0; attempt <= retries; attempt++) {
-        const result = await runCli(vaultDir, "--settings", settingsFile, "p2p-peers", String(timeoutSeconds));
-        lastCombined = result.combined;
-
-        if (result.code === 0) {
-            const peers = parsePeerLines(result.stdout);
-            if (targetPeer) {
-                const matched = peers.find((peer) => peer.id === targetPeer || peer.name === targetPeer);
-                if (matched) return matched;
-            }
-            if (peers.length > 0) {
-                return peers[0];
-            }
-
-            const fallback = result.combined.match(/Advertisement from\s+([^\s]+)/);
-            if (fallback?.[1]) {
-                return { id: fallback[1], name: fallback[1] };
-            }
-        }
-
-        if (attempt < retries) {
-            const waitMs = 400 * (attempt + 1);
-            console.warn(
-                `[WARN] p2p-peers returned no usable peers, retrying (${attempt + 1}/${retries}) in ${waitMs}ms`
-            );
-            await sleep(waitMs);
-            continue;
-        }
-
-        throw new Error(
-            result.code !== 0 ? `p2p-peers failed\n${result.combined}` : `No peers discovered\n${result.combined}`
-        );
+    const result = await runCli(vaultDir, "--settings", settingsFile, "p2p-peers", String(timeoutSeconds));
+    if (result.code !== 0) {
+        throw new Error(`p2p-peers failed\n${result.combined}`);
     }
-
-    throw new Error(`No peers discovered\n${lastCombined}`);
+    const peers = parsePeerLines(result.stdout);
+    if (targetPeer) {
+        const matched = peers.find((peer) => peer.id === targetPeer || peer.name === targetPeer);
+        if (matched) return matched;
+    }
+    if (peers.length === 0) {
+        const fallback = result.combined.match(/Advertisement from\s+([^\s]+)/);
+        if (fallback?.[1]) {
+            return { id: fallback[1], name: fallback[1] };
+        }
+        throw new Error(`No peers discovered\n${result.combined}`);
+    }
+    return peers[0];
 }
 
 export async function maybeStartLocalRelay(relay: string): Promise<boolean> {
     if (!isLocalP2pRelay(relay)) return false;
     await startP2pRelay();
-    const endpoint = parseRelayEndpoint(relay);
-    await waitForPort(endpoint.hostname, endpoint.port, {
-        timeoutMs: Number(Deno.env.get("LIVESYNC_P2P_RELAY_READY_TIMEOUT_MS") ?? "15000"),
-        intervalMs: Number(Deno.env.get("LIVESYNC_P2P_RELAY_READY_INTERVAL_MS") ?? "250"),
-        connectTimeoutMs: Number(Deno.env.get("LIVESYNC_P2P_RELAY_CONNECT_TIMEOUT_MS") ?? "1000"),
-    });
-    // Docker proxy accepts TCP connections instantly before the container's internal process is fully ready.
-    // Wait an additional few seconds to ensure strfry is actually accepting WebSockets.
-    await sleep(3000);
     return true;
 }
 
@@ -95,17 +50,3 @@ export async function stopLocalRelayIfStarted(started: boolean): Promise<void> {
         await stopP2pRelay().catch(() => {});
     }
 }
-
-export async function maybeStartCoturn(turnServers: string): Promise<boolean> {
-    if (turnServers.includes("localhost") || turnServers.includes("127.0.0.1") || turnServers.includes("[::1]")) {
-        await startCoturn();
-        return true;
-    }
-    return false;
-}
-
-export async function stopCoturnIfStarted(started: boolean): Promise<void> {
-    if (started) {
-        await stopCoturn().catch(() => {});
-    }
-}

src/apps/cli/testdeno/helpers/settings.ts

@@ -172,8 +172,7 @@ export async function applyP2pSettings(
     passphrase: string,
     appId = "self-hosted-livesync-cli-tests",
     relays = "ws://localhost:4000/",
-    autoAccept = "~.*",
-    turnServers = "turn:127.0.0.1:3478"
+    autoAccept = "~.*"
 ): Promise<void> {
     const data = JSON.parse(await Deno.readTextFile(settingsFile));
     data.P2P_Enabled = true;
@@ -185,9 +184,6 @@ export async function applyP2pSettings(
     data.P2P_relays = relays;
     data.P2P_AutoAcceptingPeers = autoAccept;
     data.P2P_AutoDenyingPeers = "";
-    data.P2P_turnServers = turnServers;
-    data.P2P_turnUsername = "testuser";
-    data.P2P_turnCredential = "testpass";
     data.P2P_IsHeadless = true;
     data.isConfigured = true;
     await Deno.writeTextFile(settingsFile, JSON.stringify(data, null, 2));

src/apps/cli/testdeno/test-p2p-peers-local-relay.ts

@@ -2,28 +2,13 @@ import { assert } from "@std/assert";
 import { TempDir } from "./helpers/temp.ts";
 import { initSettingsFile, applyP2pSettings, applyP2pTestTweaks } from "./helpers/settings.ts";
 import { startCliInBackground } from "./helpers/backgroundCli.ts";
-import {
-    discoverPeer,
-    maybeStartLocalRelay,
-    stopLocalRelayIfStarted,
-    maybeStartCoturn,
-    stopCoturnIfStarted,
-} from "./helpers/p2p.ts";
-import { getOptimalLoopbackIp } from "./helpers/net.ts";
+import { discoverPeer, maybeStartLocalRelay, stopLocalRelayIfStarted } from "./helpers/p2p.ts";
 
 Deno.test("p2p-peers: discovers host through local relay", async () => {
-    const loopbackIp = await getOptimalLoopbackIp();
-    const loopbackHost = loopbackIp === "::1" ? "[::1]" : loopbackIp;
-    
-    const relay = Deno.env.get("RELAY") ?? `ws://${loopbackHost}:4000/`;
+    const relay = Deno.env.get("RELAY") ?? "ws://localhost:4000/";
     const roomId = Deno.env.get("ROOM_ID") ?? `room-${Date.now()}`;
     const passphrase = Deno.env.get("PASSPHRASE") ?? "test";
     const timeoutSeconds = Number(Deno.env.get("TIMEOUT_SECONDS") ?? "8");
-    const nonce = `${Date.now()}-${crypto.randomUUID().slice(0, 8)}`;
-    const hostPeerName = Deno.env.get("HOST_PEER_NAME") ?? `p2p-host-${nonce}`;
-    const clientPeerName = Deno.env.get("CLIENT_PEER_NAME") ?? `p2p-client-${nonce}`;
-    const useCoturn = Deno.env.get("LIVESYNC_USE_COTURN") !== "0";
-    const turnServers = Deno.env.get("TURN_SERVERS") ?? (useCoturn ? `turn:${loopbackHost}:3478` : "none");
 
     await using workDir = await TempDir.create("livesync-cli-p2p-peers-local-relay");
     const hostVault = workDir.join("vault-host");
@@ -34,43 +19,24 @@ Deno.test("p2p-peers: discovers host through local relay", async () => {
     await Deno.mkdir(clientVault, { recursive: true });
 
     const relayStarted = await maybeStartLocalRelay(relay);
-    const coturnStarted = await maybeStartCoturn(turnServers);
     try {
         await initSettingsFile(hostSettings);
         await initSettingsFile(clientSettings);
-        await applyP2pSettings(
-            hostSettings,
-            roomId,
-            passphrase,
-            "self-hosted-livesync-cli-tests",
-            relay,
-            "~.*",
-            turnServers
-        );
-        await applyP2pSettings(
-            clientSettings,
-            roomId,
-            passphrase,
-            "self-hosted-livesync-cli-tests",
-            relay,
-            "~.*",
-            turnServers
-        );
-        await applyP2pTestTweaks(hostSettings, hostPeerName, passphrase);
-        await applyP2pTestTweaks(clientSettings, clientPeerName, passphrase);
+        await applyP2pSettings(hostSettings, roomId, passphrase, "self-hosted-livesync-cli-tests", relay);
+        await applyP2pSettings(clientSettings, roomId, passphrase, "self-hosted-livesync-cli-tests", relay);
+        await applyP2pTestTweaks(hostSettings, "p2p-host", passphrase);
+        await applyP2pTestTweaks(clientSettings, "p2p-client", passphrase);
 
         const host = startCliInBackground(hostVault, "--settings", hostSettings, "p2p-host");
         try {
             await host.waitUntilContains("P2P host is running", 20000);
-            const peer = await discoverPeer(clientVault, clientSettings, timeoutSeconds, hostPeerName);
+            const peer = await discoverPeer(clientVault, clientSettings, timeoutSeconds);
             assert(peer.id.length > 0);
             assert(peer.name.length > 0);
-            assert(peer.name === hostPeerName, `expected peer '${hostPeerName}', got '${peer.name}'`);
         } finally {
             await host.stop();
         }
     } finally {
         await stopLocalRelayIfStarted(relayStarted);
-        await stopCoturnIfStarted(coturnStarted);
     }
 });

src/apps/cli/testdeno/test-p2p-sync.ts

@@ -2,30 +2,15 @@ import { assert } from "@std/assert";
 import { TempDir } from "./helpers/temp.ts";
 import { initSettingsFile, applyP2pSettings, applyP2pTestTweaks } from "./helpers/settings.ts";
 import { startCliInBackground } from "./helpers/backgroundCli.ts";
-import {
-    discoverPeer,
-    maybeStartLocalRelay,
-    stopLocalRelayIfStarted,
-    maybeStartCoturn,
-    stopCoturnIfStarted,
-} from "./helpers/p2p.ts";
+import { discoverPeer, maybeStartLocalRelay, stopLocalRelayIfStarted } from "./helpers/p2p.ts";
 import { runCli } from "./helpers/cli.ts";
-import { getOptimalLoopbackIp } from "./helpers/net.ts";
 
 Deno.test("p2p-sync: discovers peer and completes sync", async () => {
-    const loopbackIp = await getOptimalLoopbackIp();
-    const loopbackHost = loopbackIp === "::1" ? "[::1]" : loopbackIp;
-    
-    const relay = Deno.env.get("RELAY") ?? `ws://${loopbackHost}:4000/`;
+    const relay = Deno.env.get("RELAY") ?? "ws://localhost:4000/";
     const roomId = Deno.env.get("ROOM_ID") ?? `room-${Date.now()}`;
     const passphrase = Deno.env.get("PASSPHRASE") ?? "test";
     const peersTimeout = Number(Deno.env.get("PEERS_TIMEOUT") ?? "12");
     const syncTimeout = Number(Deno.env.get("SYNC_TIMEOUT") ?? "15");
-    const nonce = `${Date.now()}-${crypto.randomUUID().slice(0, 8)}`;
-    const hostPeerName = Deno.env.get("HOST_PEER_NAME") ?? `p2p-host-${nonce}`;
-    const clientPeerName = Deno.env.get("CLIENT_PEER_NAME") ?? `p2p-client-${nonce}`;
-    const useCoturn = Deno.env.get("LIVESYNC_USE_COTURN") !== "0";
-    const turnServers = Deno.env.get("TURN_SERVERS") ?? (useCoturn ? `turn:${loopbackHost}:3478` : "none");
 
     await using workDir = await TempDir.create("livesync-cli-p2p-sync");
     const hostVault = workDir.join("vault-host");
@@ -36,30 +21,13 @@ Deno.test("p2p-sync: discovers peer and completes sync", async () => {
     await Deno.mkdir(clientVault, { recursive: true });
 
     const relayStarted = await maybeStartLocalRelay(relay);
-    const coturnStarted = await maybeStartCoturn(turnServers);
     try {
         await initSettingsFile(hostSettings);
         await initSettingsFile(clientSettings);
-        await applyP2pSettings(
-            hostSettings,
-            roomId,
-            passphrase,
-            "self-hosted-livesync-cli-tests",
-            relay,
-            "~.*",
-            turnServers
-        );
-        await applyP2pSettings(
-            clientSettings,
-            roomId,
-            passphrase,
-            "self-hosted-livesync-cli-tests",
-            relay,
-            "~.*",
-            turnServers
-        );
-        await applyP2pTestTweaks(hostSettings, hostPeerName, passphrase);
-        await applyP2pTestTweaks(clientSettings, clientPeerName, passphrase);
+        await applyP2pSettings(hostSettings, roomId, passphrase, "self-hosted-livesync-cli-tests", relay);
+        await applyP2pSettings(clientSettings, roomId, passphrase, "self-hosted-livesync-cli-tests", relay);
+        await applyP2pTestTweaks(hostSettings, "p2p-host", passphrase);
+        await applyP2pTestTweaks(clientSettings, "p2p-client", passphrase);
 
         const host = startCliInBackground(hostVault, "--settings", hostSettings, "p2p-host");
         try {
@@ -68,7 +36,7 @@ Deno.test("p2p-sync: discovers peer and completes sync", async () => {
                 clientVault,
                 clientSettings,
                 peersTimeout,
-                Deno.env.get("TARGET_PEER") ?? hostPeerName
+                Deno.env.get("TARGET_PEER") ?? undefined
             );
             const syncResult = await runCli(
                 clientVault,
@@ -87,6 +55,5 @@ Deno.test("p2p-sync: discovers peer and completes sync", async () => {
         }
     } finally {
         await stopLocalRelayIfStarted(relayStarted);
-        await stopCoturnIfStarted(coturnStarted);
     }
 });

src/apps/cli/testdeno/test-p2p-three-nodes-conflict.ts

@@ -1,33 +1,17 @@
 import { assert } from "@std/assert";
 import { TempDir } from "./helpers/temp.ts";
-import { applyP2pSettings, applyP2pTestTweaks, initSettingsFile } from "./helpers/settings.ts";
+import { applyP2pSettings, initSettingsFile } from "./helpers/settings.ts";
 import { startCliInBackground } from "./helpers/backgroundCli.ts";
-import {
-    discoverPeer,
-    maybeStartLocalRelay,
-    stopLocalRelayIfStarted,
-    maybeStartCoturn,
-    stopCoturnIfStarted,
-} from "./helpers/p2p.ts";
+import { discoverPeer, maybeStartLocalRelay, stopLocalRelayIfStarted } from "./helpers/p2p.ts";
 import { jsonStringField, runCliOrFail, runCliWithInputOrFail, sanitiseCatStdout } from "./helpers/cli.ts";
-import { getOptimalLoopbackIp } from "./helpers/net.ts";
 
 Deno.test("p2p: three nodes detect and resolve conflicts", async () => {
-    const loopbackIp = await getOptimalLoopbackIp();
-    const loopbackHost = loopbackIp === "::1" ? "[::1]" : loopbackIp;
-    
-    const relay = Deno.env.get("RELAY") ?? `ws://${loopbackHost}:4000/`;
-    const roomId = Deno.env.get("ROOM_ID") ?? `room-${Date.now()}`;
-    const passphrase = Deno.env.get("PASSPHRASE") ?? "test";
-    const appId = "self-hosted-livesync-cli-tests";
+    const relay = Deno.env.get("RELAY") ?? "ws://localhost:4000/";
+    const roomId = `${Deno.env.get("ROOM_ID_PREFIX") ?? "p2p-room"}-${Date.now()}`;
+    const passphrase = `${Deno.env.get("PASSPHRASE_PREFIX") ?? "p2p-pass"}-${Date.now()}`;
+    const appId = Deno.env.get("APP_ID") ?? "self-hosted-livesync-cli-tests";
     const peersTimeout = Number(Deno.env.get("PEERS_TIMEOUT") ?? "10");
     const syncTimeout = Number(Deno.env.get("SYNC_TIMEOUT") ?? "15");
-    const nonce = `${Date.now()}-${crypto.randomUUID().slice(0, 8)}`;
-    const hostPeerName = Deno.env.get("HOST_PEER_NAME") ?? `p2p-host-${nonce}`;
-    const peerNameB = Deno.env.get("PEER_NAME_B") ?? `p2p-client-b-${nonce}`;
-    const peerNameC = Deno.env.get("PEER_NAME_C") ?? `p2p-client-c-${nonce}`;
-    const useCoturn = Deno.env.get("LIVESYNC_USE_COTURN") !== "0";
-    const turnServers = Deno.env.get("TURN_SERVERS") ?? (useCoturn ? `turn:${loopbackHost}:3478` : "none");
 
     await using workDir = await TempDir.create("livesync-cli-p2p-3nodes");
     const vaultA = workDir.join("vault-a");
@@ -41,23 +25,17 @@ Deno.test("p2p: three nodes detect and resolve conflicts", async () => {
     await Deno.mkdir(vaultC, { recursive: true });
 
     const relayStarted = await maybeStartLocalRelay(relay);
-    const coturnStarted = await maybeStartCoturn(turnServers);
     try {
-        await initSettingsFile(settingsA);
-        await initSettingsFile(settingsB);
-        await initSettingsFile(settingsC);
-        await applyP2pSettings(settingsA, roomId, passphrase, appId, relay, "~.*", turnServers);
-        await applyP2pSettings(settingsB, roomId, passphrase, appId, relay, "~.*", turnServers);
-        await applyP2pSettings(settingsC, roomId, passphrase, appId, relay, "~.*", turnServers);
-        await applyP2pTestTweaks(settingsA, hostPeerName, passphrase);
-        await applyP2pTestTweaks(settingsB, peerNameB, passphrase);
-        await applyP2pTestTweaks(settingsC, peerNameC, passphrase);
+        for (const settings of [settingsA, settingsB, settingsC]) {
+            await initSettingsFile(settings);
+            await applyP2pSettings(settings, roomId, passphrase, appId, relay);
+        }
 
         const host = startCliInBackground(vaultA, "--settings", settingsA, "p2p-host");
         try {
             await host.waitUntilContains("P2P host is running", 20000);
-            const peerFromB = await discoverPeer(vaultB, settingsB, peersTimeout, hostPeerName);
-            const peerFromC = await discoverPeer(vaultC, settingsC, peersTimeout, hostPeerName);
+            const peerFromB = await discoverPeer(vaultB, settingsB, peersTimeout);
+            const peerFromC = await discoverPeer(vaultC, settingsC, peersTimeout);
             const targetPath = "p2p/conflicted-from-two-clients.txt";
 
             await runCliWithInputOrFail("from-client-b-v1\n", vaultB, "--settings", settingsB, "put", targetPath);
@@ -136,6 +114,5 @@ Deno.test("p2p: three nodes detect and resolve conflicts", async () => {
         }
     } finally {
         await stopLocalRelayIfStarted(relayStarted);
-        await stopCoturnIfStarted(coturnStarted);
     }
 });

src/apps/cli/testdeno/test_dev_deno.md

@@ -281,7 +281,7 @@ deno task test:sync-two-local
 
 ## Continuous Integration
 
-The GitHub Actions workflow `.github/workflows/cli-deno-tests.yml` runs automatically on pushes and pull requests affecting the CLI, executing the non-P2P test suite (`test:ci`). P2P tests (`test:p2p`) are excluded from automatic execution and must be run via manual dispatch (`workflow_dispatch`). You can optionally check the "Enable verbose and debug logging" checkbox during a manual dispatch to produce detailed trace logs for troubleshooting.
+The GitHub Actions workflow `.github/workflows/cli-deno-tests.yml` is used to run these tests automatically on push and pull requests affecting the CLI.
 
 ---
 

updates.md

@@ -3,6 +3,14 @@ Since 19th July, 2025 (beta1 in 0.25.0-beta1, 13th July, 2025)
 
 The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsidian-livesync/blob/main/updates_old.md). Because 0.25 got a lot of updates, thankfully, compatibility is kept and we do not need breaking changes! In other words, when get enough stabled. The next version will be v1.0.0. Even though it my hope.
 
+## Unreleased
+
+8th June, 2026
+
+### Fixed
+
+- Prevented the automatic merging of conflicted revisions when one of the revisions has been deleted, which was causing deleted files to reappear (#911).
+
 ## 0.25.73
 
 4th June, 2026