enhance(cli-e2e): update cli-e2e-sync, fix cli-e2e --jobs

cli-e2e/scripts/compare_graph_queries.py

@@ -94,60 +94,84 @@ def run_query(cli_path: Path, config_path: Path, data_dir: Path, graph: str, que
     }
 
 
-def main() -> None:
+def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Compare normalized query payloads between two cli contexts")
     parser.add_argument("--cli", required=True, help="Path to static/logseq-cli.js")
     parser.add_argument("--graph", required=True)
-    parser.add_argument("--query", required=True)
+    parser.add_argument("--query", required=True, action="append")
     parser.add_argument("--config-a", required=True)
     parser.add_argument("--data-dir-a", required=True)
     parser.add_argument("--config-b", required=True)
     parser.add_argument("--data-dir-b", required=True)
     parser.add_argument("--require-result", action="store_true")
-    args = parser.parse_args()
+    return parser.parse_args()
+
+
+
+def main() -> None:
+    args = parse_args()
 
     cli_path = Path(args.cli).expanduser().resolve()
     if not cli_path.exists():
         fail("cli entry file does not exist", cli=str(cli_path))
 
-    left = run_query(
-        cli_path,
-        Path(args.config_a).expanduser().resolve(),
-        Path(args.data_dir_a).expanduser().resolve(),
-        args.graph,
-        args.query,
-    )
-    right = run_query(
-        cli_path,
-        Path(args.config_b).expanduser().resolve(),
-        Path(args.data_dir_b).expanduser().resolve(),
-        args.graph,
-        args.query,
-    )
+    queries = args.query
+    left_config = Path(args.config_a).expanduser().resolve()
+    left_data_dir = Path(args.data_dir_a).expanduser().resolve()
+    right_config = Path(args.config_b).expanduser().resolve()
+    right_data_dir = Path(args.data_dir_b).expanduser().resolve()
 
-    left_result = left["result"]
-    right_result = right["result"]
+    normalized_results = {}
 
-    if args.require_result and (left_result is None or right_result is None):
-        fail("query result is empty", left_result=left_result, right_result=right_result)
-
-    left_normalized = normalize(left_result)
-    right_normalized = normalize(right_result)
-
-    if left_normalized != right_normalized:
-        fail(
-            "normalized query results differ",
-            left_result=left_normalized,
-            right_result=right_normalized,
-            left_payload=left["payload"],
-            right_payload=right["payload"],
+    for query in queries:
+        left = run_query(
+            cli_path,
+            left_config,
+            left_data_dir,
+            args.graph,
+            query,
+        )
+        right = run_query(
+            cli_path,
+            right_config,
+            right_data_dir,
+            args.graph,
+            query,
         )
 
+        left_result = left["result"]
+        right_result = right["result"]
+
+        if args.require_result and (left_result is None or right_result is None):
+            fail(
+                "query result is empty",
+                query=query,
+                left_result=left_result,
+                right_result=right_result,
+            )
+
+        left_normalized = normalize(left_result)
+        right_normalized = normalize(right_result)
+
+        if left_normalized != right_normalized:
+            fail(
+                "normalized query results differ",
+                query=query,
+                left_result=left_normalized,
+                right_result=right_normalized,
+                left_payload=left["payload"],
+                right_payload=right["payload"],
+            )
+
+        normalized_results[query] = left_normalized
+
+    payload_key = "result" if len(normalized_results) == 1 else "results"
+    payload_value = next(iter(normalized_results.values())) if len(normalized_results) == 1 else normalized_results
     print(
         json.dumps(
             {
                 "status": "ok",
-                "result": left_normalized,
+                payload_key: payload_value,
             }
         )
     )

cli-e2e/scripts/random_bidirectional_block_ops.py

@@ -364,6 +364,13 @@ def ensure_non_empty_page(
     )
 
 
+PROFILE_DEFAULT_ROUNDS = {
+    "default": 40,
+    "high-stress": 100,
+}
+
+
+
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         description="Run randomized bidirectional block operations on two synced graph clients"
@@ -375,9 +382,18 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument("--config-b", required=True)
     parser.add_argument("--data-dir-b", required=True)
     parser.add_argument("--page", required=True)
-    parser.add_argument("--rounds-per-client", type=int, default=100)
+    parser.add_argument(
+        "--profile",
+        choices=sorted(PROFILE_DEFAULT_ROUNDS.keys()),
+        default="default",
+        help="Execution profile controlling default stress level",
+    )
+    parser.add_argument("--rounds-per-client", type=int, default=None)
     parser.add_argument("--seed", type=int, default=424242)
-    return parser.parse_args()
+    args = parser.parse_args()
+    if args.rounds_per_client is None:
+        args.rounds_per_client = PROFILE_DEFAULT_ROUNDS[args.profile]
+    return args
 
 
 def main() -> None:

cli-e2e/scripts/wait_sync_status.py

@@ -33,7 +33,11 @@ def parse_int(value: Any) -> int:
         return 0
 
 
-def run_status(args: argparse.Namespace) -> Dict[str, Any]:
+def status_command(args: argparse.Namespace) -> list[str]:
+    existing = getattr(args, "status_command", None)
+    if existing is not None:
+        return existing
+
     command = [
         "node",
         str(Path(args.cli).expanduser().resolve()),
@@ -48,6 +52,13 @@ def run_status(args: argparse.Namespace) -> Dict[str, Any]:
         "--graph",
         args.graph,
     ]
+    args.status_command = command
+    return command
+
+
+
+def run_status(args: argparse.Namespace) -> Dict[str, Any]:
+    command = status_command(args)
 
     result = subprocess.run(command, capture_output=True, text=True)
     if result.returncode != 0: