9 files changed, 36 insertions, 6 deletions
diff --git a/src/CommandLine/osx/ld64-osx.json b/src/CommandLine/osx/ld64.json
index ddd233b..ddd233b 100644
--- a/src/CommandLine/osx/ld64-osx.json
+++ b/src/CommandLine/osx/ld64.json
diff --git a/src/CommandLine/osx/mld64-osx.json b/src/CommandLine/osx/mld64.json
index 57f08f0..57f08f0 100644
--- a/src/CommandLine/osx/mld64-osx.json
+++ b/src/CommandLine/osx/mld64.json
diff --git a/src/CommandLine/pef-amd64-asm.cpp b/src/CommandLine/pef-amd64-asm.cpp
index 2564f7c..4d955f0 100644
--- a/src/CommandLine/pef-amd64-asm.cpp
+++ b/src/CommandLine/pef-amd64-asm.cpp
@@ -8,8 +8,8 @@
 
 #include <CompilerKit/Detail/Config.h>
 #include <CompilerKit/ErrorID.h>
-#include <CompilerKit/Utilities/Compiler.h>
-#include <CompilerKit/Utilities/DLL.h>
+#include <CompilerKit/Utils/Compiler.h>
+#include <CompilerKit/Utils/DLL.h>
 
 #ifdef __APPLE__
 static auto kPath = "/usr/local/lib/libCompilerKit.dylib";
diff --git a/src/CommandLine/pef-amd64-drv.cpp b/src/CommandLine/pef-amd64-drv.cpp
index aaec55a..7528767 100644
--- a/src/CommandLine/pef-amd64-drv.cpp
+++ b/src/CommandLine/pef-amd64-drv.cpp
@@ -8,8 +8,8 @@
 
 #include <CompilerKit/Detail/Config.h>
 #include <CompilerKit/ErrorID.h>
-#include <CompilerKit/Utilities/Compiler.h>
-#include <CompilerKit/Utilities/DLL.h>
+#include <CompilerKit/Utils/Compiler.h>
+#include <CompilerKit/Utils/DLL.h>
 
 #ifdef __APPLE__
 static auto kPath = "/usr/local/lib/libCompilerKit.dylib";
diff --git a/src/CommandLine/posix/ld64-posix.json b/src/CommandLine/posix/ld64.json
index 0847b41..0847b41 100644
--- a/src/CommandLine/posix/ld64-posix.json
+++ b/src/CommandLine/posix/ld64.json
diff --git a/src/CommandLine/posix/mld64-posix.json b/src/CommandLine/posix/mld64.json
index e408cec..e408cec 100644
--- a/src/CommandLine/posix/mld64-posix.json
+++ b/src/CommandLine/posix/mld64.json
diff --git a/src/CommandLine/posix/udbg.json b/src/CommandLine/posix/udbg.json
new file mode 100644
index 0000000..f3c3114
--- /dev/null
+++ b/src/CommandLine/posix/udbg.json
@@ -0,0 +1,13 @@
+{
+  "compiler_path": "clang++",
+  "compiler_std": "c++20",
+  "headers_path": ["../../include/CompilerKit", "../../include", "../../include/CompilerKit/src/Detail"],
+  "sources_path": ["udbg.cpp"],
+  "output_name": "udbg",
+  "compiler_flags": ["-L/usr/lib", "-lDebuggerKit"],
+  "cpp_macros": [
+    "__DBG__=202603",
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
+  ]
+}
+
diff --git a/src/CommandLine/ptx-drv.cpp b/src/CommandLine/ptx-drv.cpp
index 2e5a72f..3aba279 100644
--- a/src/CommandLine/ptx-drv.cpp
+++ b/src/CommandLine/ptx-drv.cpp
@@ -8,8 +8,8 @@
 
 #include <CompilerKit/Detail/Config.h>
 #include <CompilerKit/ErrorID.h>
-#include <CompilerKit/Utilities/Compiler.h>
-#include <CompilerKit/Utilities/DLL.h>
+#include <CompilerKit/Utils/Compiler.h>
+#include <CompilerKit/Utils/DLL.h>
 
 #ifdef __APPLE__
 static auto kPath = "/usr/local/lib/libCompilerKit.dylib";
diff --git a/src/CommandLine/udbg.cpp b/src/CommandLine/udbg.cpp
new file mode 100644
index 0000000..b3b4dca
--- /dev/null
+++ b/src/CommandLine/udbg.cpp
@@ -0,0 +1,17 @@
+// Copyright 2024-2025, Amlal El Mahrouss (amlal@nekernel.org)
+// Licensed under the Apache License, Version 2.0 (See accompanying
+// file LICENSE or copy at http://www.apache.org/licenses/LICENSE-2.0)
+// Official repository: https://github.com/ne-foss-org/nectar
+
+#include <CompilerKit/Detail/Config.h>
+
+/// @file dbg.cc
+/// @brief Nectar debugger.
+
+CK_IMPORT_C Int32 DebuggerPOSIX(Int32 argc, char const* argv[]);
+
+/// @brief Debugger entrypoint.
+/// @return Status code of debugger.
+Int32 main(Int32 argc, char const* argv[]) {
+  return DebuggerPOSIX(argc, argv);
+}