Merge pull request #7 from dexoron/dev

v0.6.6

.github/workflows/aur.yml

@@ -15,6 +15,8 @@ permissions:
 
 jobs:
   publish-aur:
+    # Не публикуем dev/pre-release теги в AUR
+    if: "!contains(github.ref_name, '-')"
     runs-on: ubuntu-latest
     environment: aur
     steps:
@@ -133,4 +135,4 @@ jobs:
 
           git add PKGBUILD .SRCINFO
           git commit -m "dcr ${{ steps.meta.outputs.pkgver }}"
-          git push
+          git push

.github/workflows/release.yml

@@ -4,6 +4,11 @@ on:
   push:
     tags:
       - "v*"
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Tag to build and upload assets for (e.g. v0.6.5)"
+        required: true
 
 permissions:
   contents: write
@@ -13,12 +18,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          # При ручном запуске чекаутим нужный тег
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Prepare Release Notes
         shell: bash
         run: |
           set -euo pipefail
-          tag="${GITHUB_REF_NAME#v}"
+          # При ручном запуске берём версию из инпута, иначе из тега
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            tag="${{ github.event.inputs.tag }}"
+            tag="${tag#v}"
+          else
+            tag="${GITHUB_REF_NAME#v}"
+          fi
           notes_file=".github/release-notes.md"
           if grep -q "^## \\[${tag}\\]" CHANGELOG.md; then
             awk -v ver="$tag" '
@@ -42,51 +56,147 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          # ── Linux GNU ──────────────────────────────────────────────────────
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            asset_name: dcr-x86_64-unknown-linux-gnu
+
+          - os: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+            apt: gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+            env_cc: CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
+            env_linker: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
+
+          # ── Linux Musl ─────────────────────────────────────────────────────
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+            apt: musl-tools
+            env_cc: CC_x86_64_unknown_linux_musl=musl-gcc
+            env_linker: CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc
+
+          - os: ubuntu-latest
+            target: aarch64-unknown-linux-musl
+            musl_cross: aarch64-linux-musl-cross
+            env_cc: CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc
+            env_linker: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc
+
+          # ── macOS ──────────────────────────────────────────────────────────
           - os: macos-15-intel
             target: x86_64-apple-darwin
-            asset_name: dcr-x86_64-apple-darwin
-          - os: macos-15
+
+          - os: macos-latest
             target: aarch64-apple-darwin
-            asset_name: dcr-aarch64-apple-darwin
+
+          # ── Windows MSVC ───────────────────────────────────────────────────
           - os: windows-latest
             target: x86_64-pc-windows-msvc
-            asset_name: dcr-x86_64-pc-windows-msvc.exe
+
+          - os: windows-latest
+            target: aarch64-pc-windows-msvc
+
+          # ── Windows GNU ────────────────────────────────────────────────────
+          - os: windows-latest
+            target: x86_64-pc-windows-gnu
+
+          # gnullvm исключён: LLVM MinGW не предустановлен на GitHub Actions
 
     runs-on: ${{ matrix.os }}
     needs: notes
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
+
       - name: Download Release Notes
         uses: actions/download-artifact@v4
         with:
           name: release-notes
           path: .github
 
+      - name: Install apt packages
+        if: runner.os == 'Linux' && matrix.apt != ''
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu musl-tools
+          case "${{ matrix.target }}" in
+            aarch64-unknown-linux-gnu)
+              echo "CC_aarch64-unknown-linux-gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
+              echo "AR_aarch64-unknown-linux-gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV
+              ;;
+            x86_64-unknown-linux-musl)
+              echo "CC_x86_64-unknown-linux-musl=x86_64-linux-musl-gcc" >> $GITHUB_ENV
+              ;;
+            aarch64-unknown-linux-musl)
+              curl -L https://musl.cc/aarch64-linux-musl-cross.tgz -o /tmp/musl-aarch64.tgz
+              sudo tar xzf /tmp/musl-aarch64.tgz -C /opt
+              echo "/opt/aarch64-linux-musl-cross/bin" >> $GITHUB_PATH
+              echo "CC_aarch64-unknown-linux-musl=aarch64-linux-musl-gcc" >> $GITHUB_ENV
+              echo "AR_aarch64-unknown-linux-musl=aarch64-linux-musl-ar" >> $GITHUB_ENV
+              ;;
+          esac
+
+      - name: Setup LLVM + MinGW (gnullvm)
+        if: contains(matrix.target, 'gnullvm')
+        shell: pwsh
+        run: |
+          choco install llvm mingw -y --no-progress
+          echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.target }}
 
       - name: Build
-        run: cargo build --release --target ${{ matrix.target }}
+        shell: bash
+        env:
+          MATRIX_ENV_CC: ${{ matrix.env_cc }}
+          MATRIX_ENV_LINKER: ${{ matrix.env_linker }}
+        run: |
+          if [[ -n "${MATRIX_ENV_CC:-}" ]]; then
+            export "${MATRIX_ENV_CC?}"
+          fi
+          if [[ -n "${MATRIX_ENV_LINKER:-}" ]]; then
+            export "${MATRIX_ENV_LINKER?}"
+          fi
+          cargo build --release --target ${{ matrix.target }}
+
+      - name: Derive version string
+        shell: bash
+        run: |
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            RAW_TAG="${{ github.event.inputs.tag }}"
+          else
+            RAW_TAG="${GITHUB_REF_NAME}"
+          fi
+          echo "RELEASE_TAG=${RAW_TAG}" >> "$GITHUB_ENV"
+          echo "RELEASE_VERSION=${RAW_TAG#v}" >> "$GITHUB_ENV"
+
+      - name: Derive asset name (Unix)
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          echo "ASSET_NAME=dcr-${{ matrix.target }}-${RELEASE_VERSION}" >> "$GITHUB_ENV"
+
+      - name: Derive asset name (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          "ASSET_NAME=dcr-${{ matrix.target }}-$($env:RELEASE_VERSION).exe" >> $env:GITHUB_ENV
 
       - name: Prepare Artifact (Unix)
         if: runner.os != 'Windows'
         shell: bash
-        run: |
-          cp target/${{ matrix.target }}/release/dcr ${{ matrix.asset_name }}
+        run: cp target/${{ matrix.target }}/release/dcr "$ASSET_NAME"
 
       - name: Prepare Artifact (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
-        run: |
-          Copy-Item "target/${{ matrix.target }}/release/dcr.exe" "${{ matrix.asset_name }}"
+        run: Copy-Item "target/${{ matrix.target }}/release/dcr.exe" "$env:ASSET_NAME"
 
       - name: Upload Release Asset
         uses: softprops/action-gh-release@v2
         with:
-          files: ${{ matrix.asset_name }}
+          tag_name: ${{ env.RELEASE_TAG }}
+          files: ${{ env.ASSET_NAME }}
           body_path: .github/release-notes.md
+          prerelease: ${{ contains(env.RELEASE_TAG, '-') }}

AGENT.md

@@ -2,11 +2,11 @@
 
 ## Project Overview
 
-**DCR (Dexoron Cargo Realization)** — CLI-утилита для управления C/C++/ASM проектами в стиле Cargo.
+**DCR (Dexoron Cargo Realization)** — CLI tool for managing C/C++/ASM projects in a Cargo-style.
 
-- **Язык реализации**: Rust (edition 2024)
-- **Лицензия**: MIT
-- **Репозиторий**: [github.com/dexoron/dcr](https://github.com/dexoron/dcr)
+- **Implementation Language**: Rust (edition 2024)
+- **License**: MIT
+- **Repository**: [github.com/dexoron/dcr](https://github.com/dexoron/dcr)
 
 ## Architecture
 
@@ -14,47 +14,35 @@
 
 ```
 src/
-├── main.rs          # Точка входа, маршрутизация CLI-команд
-├── config.rs        # Глобальные константы: профили сборки, шаблон main.c
-├── cli/             # Реализация CLI-команд
+├── main.rs          # Entry point, CLI command routing
+├── config.rs        # Global constants
+├── cli/             # CLI command implementation
 │   ├── new.rs       # dcr new <name>
 │   ├── init.rs      # dcr init
-│   ├── build.rs     # dcr build [--debug|--release]
-│   ├── run.rs       # dcr run [--debug|--release]
-│   ├── clean.rs     # dcr clean [--all]
+│   ├── setup.rs     # dcr setup (registry initialization)
+│   ├── add.rs       # dcr add <name>
+│   ├── build.rs     # dcr build
+│   ├── run.rs       # dcr run
+│   ├── clean.rs     # dcr clean
 │   ├── help.rs      # dcr --help
-│   └── flag_update.rs  # dcr --update (self-update через GitHub Releases)
-├── core/            # Бизнес-логика
-│   ├── config.rs    # Парсинг/валидация/форматирование dcr.toml (struct Config)
-│   ├── deps.rs      # Разрешение path-зависимостей, генерация dcr.lock
-│   ├── runner.rs    # Запуск скомпилированного бинарника
-│   ├── workspace.rs # Поддержка [workspace] и упорядочивание сборки
-│   └── builder/     # Бэкенды компиляторов/ассемблеров
-│       ├── mod.rs   # Общий интерфейс сборки
-│       ├── gcc.rs   # GCC backend
-│       ├── clang.rs # Clang backend
-│       ├── msvc.rs  # MSVC backend
-│       ├── nasm.rs  # NASM backend (ASM)
-│       └── gas.rs   # GAS backend (ASM)
-├── platform/        # Платформенно-зависимая логика
-│   ├── mod.rs       # Общий интерфейс платформ
-│   ├── linux.rs
-│   ├── macos.rs
-│   └── windows.rs
-└── utils/           # Вспомогательные утилиты
-    ├── fs.rs        # Работа с файловой системой
-    ├── log.rs       # Логирование (error, warn)
-    └── text.rs      # Форматирование текста / цвета
+│   └── flag_update.rs  # dcr --update
+├── core/            # Business logic
+│   ├── config.rs    # dcr.toml parsing
+│   ├── registry.rs  # Package index management (RegistryManager)
+│   ├── deps/        # Dependency resolution (path, git)
+│   ├── runner.rs    # Binary execution
+│   ├── workspace.rs # [workspace] support
+│   └── builder/     # Compiler backends (gcc, clang, msvc, nasm, gas)
+├── platform/        # Platform-specific logic
+└── utils/           # Helper utilities
 ```
 
 ### Key Concepts
 
-- **`dcr.toml`** — конфигурационный файл проекта (аналог `Cargo.toml`). Секции: `[package]`, `[build]`, `[toolchain]`, `[dependencies]`, `[workspace]`.
-- **Профили сборки**: `debug` (по умолчанию) и `release`. Встроенные флаги зависят от компилятора. Пользовательские флаги через `build.cflags` / `build.ldflags`.
-- **Инкрементальная сборка**: объектные файлы кешируются по mtime. Отслеживание заголовков пока не реализовано (см. `TODO.md`).
-- **Workspace**: корневой `dcr.toml` с секцией `[workspace]` описывает member-проекты и их зависимости; сборка происходит в топологическом порядке.
-- **Path dependencies**: зависимости по путям автоматически добавляют include/lib-пути; генерируется `dcr.lock`.
-- **Build kinds**: `bin` (бинарник), `staticlib` (`.a`), `sharedlib` (`.so`/`.dylib`/`.dll`).
+- **`~/.dcr/`**: Centralized storage for registries and configurations.
+- **`config.toml`**: File in `~/.dcr/` defining available package indices and their priorities.
+- **`dcr.toml`**: Local project configuration.
+- **Registry System**: `RegistryManager` handles package discovery across multiple indices based on priority.
 
 ## Supported Platforms
 
@@ -69,58 +57,21 @@ src/
 
 | Crate | Purpose |
 |---|---|
-| `reqwest` | HTTP-запросы для `--update` (blocking, rustls-tls) |
-| `serde` | Сериализация/десериализация |
-| `toml` | Парсинг `dcr.toml` |
-| `sha2` | Хеширование при обновлении |
-| `self-replace` | Замена бинарника при `--update` |
+| `reqwest` | HTTP requests |
+| `serde` | Serialization |
+| `toml` | Configuration parsing |
+| `git2` | Git dependency handling |
 
 ## Development
 
 ### Build & Run
-
 ```bash
-cargo build             # debug build
-cargo build --release   # release build
-cargo run -- new hello  # создать проект "hello"
+cargo build --release
+./target/release/dcr setup
 ```
 
-### Code Quality
-
-```bash
-cargo fmt --all
-cargo clippy --all-targets --all-features -- -D warnings
-cargo check
-cargo test
-```
-
-### CI/CD
-
-- **CI**: `.github/workflows/ci.yml` — проверки при PR/push
-- **Release**: `.github/workflows/release.yml` — сборка бинарников при пуше тега `v*`
-
-### Tests
-
-- Интеграционные CLI-тесты: `tests/cli_basic.rs`
-
 ## Code Conventions
-
-- Rust stable edition 2024
-- Форматирование: `cargo fmt`
-- Линтинг: `cargo clippy` без warnings
-- Функции — маленькие и сфокусированные
-- Имена — понятные и описательные
-- Пользовательские сообщения CLI — на английском языке
-- Вывод ошибок/предупреждений через `utils::log::{error, warn}`
-
-## TODO
-
-- В файле `TODO.md`
-
-## Useful Links
-
-- Документация проекта: `docs/`
-- Changelog: `CHANGELOG.md`
-- Contributing: `CONTRIBUTING.md`
-- FAQ: `FAQ.md`
-- Установка: `install.sh` (Linux/macOS), `install.ps1` (Windows)
+- Rust stable edition 2024.
+- `cargo fmt` and `cargo clippy -- -D warnings`.
+- CLI output in English.
+- Use `utils::log` for messaging.

CHANGELOG.md

@@ -1,5 +1,72 @@
 # Changelog
 
+## [0.6.6] - 2026-05-18
+
+Fixed:
+
+- Path dependencies now work correctly: `dcr add` stores them as `{ path =
+"./..." }` tables, `is_registry_dep` properly distinguishes registry strings
+from path/git strings, and `deps/mod.rs` resolves both table-form and
+legacy string-form path dependencies
+- Registry dependency paths no longer hardcoded to `project_root/dcr-index`;
+now use `package_root_from_registry_info()` which resolves relative to the
+registry cache root (`~/.dcr/`)
+- Registry dependencies are now actually built: `build_project_at()` is
+called when `include_dir` or `lib_dir` is missing
+
+Added:
+
+- `SIGINT`/`Ctrl+C` handler via `ctrlc` crate — `dcr build` now checks
+`BUILD_INTERRUPTED` flag at key points and aborts cleanly
+- `utils/build.rs` — extracted shared utilities: `parse_version_info`,
+`normalize_target_os`, `resolve_compiler`, `primary_language`,
+`resolve_pkg_config_flags` and config helpers. Eliminates code duplication
+between `cli/build.rs`, `cli/run.rs`, `cli/clean.rs`, `cli/gen.rs`
+- `utils/fs.rs::with_dir` — extracted common directory-scoped execution
+- `run_command_sync_output` in `builder/common.rs` with global `OUTPUT_MUTEX`
+— synchronized compiler output across all backends (unix_cc, gas, nasm, msvc)
+- New helper functions in `deps/register.rs`: `get_registry_cache_root`,
+`package_root_from_registry_info`, `registry_include_dir`, `registry_lib_dir`,
+`path_from_string_dep`
+- Unit tests for `register.rs` (`is_registry_dep`, `package_root_from_registry_info`),
+`deps/mod.rs` (`path_dep_path`, `push_default_lib_dirs`),
+`utils/build.rs` (`normalize_target_os`, `parse_version_info`)
+
+Removed:
+
+- Removed unused dependencies `indicatif` and `console` from `Cargo.toml`
+
+## [0.6.5] - 2026-05-13
+
+Added:
+
+- New dependency registry system
+- Package type support (`lib`, `app`, `none`) in `dcr.toml`
+- Library packaging functionality: automatically generates `include` and `lib` directories in `target/` for `lib` type projects
+- Expanded CI build targets:
+  - Linux: `aarch64-unknown-linux-gnu`, `x86_64-unknown-linux-musl`, `aarch64-unknown-linux-musl`
+  - Windows: `aarch64-pc-windows-msvc`, `x86_64-pc-windows-gnu`, `aarch64-pc-windows-gnullvm`
+
+Changed:
+
+- `src/core/deps/` modular architecture overhaul
+- Native platform pathing defaults for Linux (now dynamic architecture detection)
+- Improved `run` command output handling
+
+## [0.6.0] - 2026-05-12
+
+Added:
+
+- Full Git dependency support in `dcr.toml`
+  - Support for `git`, `branch`, `tag`, and `rev` fields
+  - Automatic cloning and checkout via `git2`
+  - Dependencies are stored in `target/<profile>/deps/git/`
+- New `dcr add` command for easy dependency management
+  - Short syntax: `github:user/repo`, `gitlab:user/repo`, `path:/to/lib`
+  - Automatic GitHub resolution for `git:user/repo`
+- Visual feedback for dependency fetching with in-place status updates ("Fetching" → "Fetched")
+- Modular dependency management architecture in `src/core/deps/`
+
 ## [0.5.1] - 2026-04-12
 
 Fixed:

Cargo.lock

@@ -35,6 +35,15 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.19.1"
@@ -54,6 +63,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
 dependencies = [
  "find-msvc-tools",
+ "jobserver",
+ "libc",
  "shlex",
 ]
 
@@ -89,13 +100,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "dcr"
-version = "0.5.1"
+name = "ctrlc"
+version = "3.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
 dependencies = [
+ "dispatch2",
+ "nix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "dcr"
+version = "0.6.6"
+dependencies = [
+ "ctrlc",
+ "git2",
  "glob",
  "reqwest",
  "self-replace",
  "serde",
+ "serde_json",
  "sha2",
  "toml",
 ]
@@ -110,6 +135,18 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dispatch2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
+dependencies = [
+ "bitflags",
+ "block2",
+ "libc",
+ "objc2",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -263,6 +300,21 @@ dependencies = [
  "wasip3",
 ]
 
+[[package]]
+name = "git2"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b"
+dependencies = [
+ "bitflags",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "openssl-probe",
+ "openssl-sys",
+ "url",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.3"
@@ -532,6 +584,16 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.4",
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.85"
@@ -554,6 +616,46 @@ version = "0.2.182"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
 
+[[package]]
+name = "libgit2-sys"
+version = "0.18.4+1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b26f66f35e1871b22efcf7191564123d2a446ca0538cde63c23adfefa9b15b7"
+dependencies = [
+ "cc",
+ "libc",
+ "libssh2-sys",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+]
+
+[[package]]
+name = "libssh2-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc3a226e576f50782b3305c5ccf458698f92798987f551c6a02efe8276721e22"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.11.0"
@@ -595,12 +697,57 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "nix"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "objc2"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+dependencies = [
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.115"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "158fe5b292746440aa6e7a7e690e55aeb72d41505e2804c23c6973ad0e9c9781"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -619,6 +766,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
 [[package]]
 name = "potential_utf"
 version = "0.1.4"
@@ -1271,6 +1424,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version_check"
 version = "0.9.5"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dcr"
-version = "0.5.1"
+version = "0.6.6"
 edition = "2024"
 build = "build.rs"
 
@@ -11,3 +11,6 @@ serde = { version = "1", features = ["derive"] }
 self-replace = "1"
 sha2 = "0.10"
 toml = "1.0.3"
+git2 = "0.20.4"
+serde_json = "1"
+ctrlc = "3"

README.md

@@ -17,17 +17,20 @@ The current implementation is written in Rust.
 - Generate IDE integration files (VS Code, CLion) and compilation databases
 - Generate a minimal C project template
 - Build static and shared libraries
+- Dependency management:
+  - Git and Path dependencies with `dcr.lock`
+  - Registry-based dependency resolution
+- Library packaging functionality (auto-generate `include/` and `lib/` for `type = "lib"` packages)
 - ASM projects with NASM/GAS or via GCC/Clang
-- Mixed language projects (`language = ["c", "asm"]` and similar)
-- Cross-compilation with `--target` (short names: `linux`, `macos`, `windows`)
+- Mixed language projects
+- Cross-compilation with `--target` (full triple support and short names)
 - Target-specific configurations and inheritance
-- Update the binary via `dcr --update` (GitHub Releases, not for pacman/AUR installs)
+- Update the binary via `dcr --update` (GitHub Releases)
 
 ## Supported Platforms
-- Linux: `x86_64-unknown-linux-gnu`
-- macOS Intel: `x86_64-apple-darwin`
-- macOS Apple Silicon: `aarch64-apple-darwin`
-- Windows: `x86_64-pc-windows-msvc`
+- Linux: x86_64/aarch64 (GNU and Musl)
+- macOS: x86_64/aarch64
+- Windows: x86_64/aarch64 (MSVC, GNU, LLVM)
 
 ## Installation
 
@@ -106,6 +109,15 @@ Creates a project with the specified name in the current directory.
 ### `dcr init`
 Creates a project in the current directory. The project name is taken from the directory name. The directory must be empty.
 
+### `dcr setup`
+Initializes the registry system by reading `~/.dcr/config.toml` and verifying the availability of configured indices.
+
+### `dcr add <name> <source>`
+Adds a dependency to `dcr.toml`.
+If a registry is configured, `dcr` automatically finds the package.
+Git/Path syntax: `path:`, `github:`, `gitlab:`, `git:`, or a full URL.
+Use `--branch`, `--tag`, or `--rev` for Git dependencies.
+
 ### `dcr build [profile]`
 Builds the project. If no profile is specified, `--debug` is used.
 Use `--force` to rebuild without cache, `--clean` to clean before build.
@@ -177,6 +189,7 @@ See [Cross-compilation guide](docs/dependencies-and-build/cross-compilation.md)
 
 ## Configuration
 The main project file is `dcr.toml`.
+For multi-registry management, use `~/.dcr/config.toml`.
 
 Example `dcr.toml`:
 
@@ -184,11 +197,13 @@ Example `dcr.toml`:
 [package]
 name = "hello"
 version = "0.1.0"
+type = "app" # or "lib", "none"
 
 [build]
 language = "c"
 standard = "c11"
 compiler = "clang"
+kind = "bin" # "bin", "staticlib", "sharedlib"
 # Optional platform hint
 # platform = "x86_64"
 # Optional custom flags
@@ -211,20 +226,22 @@ ldflags = ["-lm"]
 # rcc = "rcc"
 
 [dependencies]
+my_lib = "path:./libs/my_lib"
+cool_lib = { git = "https://github.com/user/cool_lib", tag = "v1.0" }
 ```
 
 Workspace example:
-
-```toml
+...
 [workspace]
 kernel = { path = "src/kernel", deps = ["core", "userspace"] }
 core = { path = "src/core", deps = ["userspace"] }
 userspace = { path = "src/userspace" }
 ```
 
-Path dependencies are supported. DCR will resolve them on build and generate `dcr.lock`.
+Git and Path dependencies are supported. DCR will resolve them on build and generate `dcr.lock`.
+
+Incremental build note: object files are rebuilt when source `.c/.cpp` or included header files change.
 
-Incremental build note: object files are rebuilt when source `.c/.cpp` files change. Header dependency tracking is not implemented yet.
 
 ## Requirements
 - Rust toolchain (`rustc`, `cargo`) - for building DCR from source

TODO.md

@@ -1,9 +1,67 @@
-# TODO
+# DCR TODO.md
 
-- Add external package managers (Conan, vcpkg)
-- Linker script + direct linker control
-- Custom targets/steps
-- Cross-compilation and freestanding targets (-nostdinc, -nostdlib, custom target triple like i686-elf)
-- Mixed C + ASM in one project (compile .c and .s/.S sources together)
-- Per-member include directories in workspace (e.g. include paths for subprojects)
-- Build-time code generation (auto-generated headers, pre-build scripts)
+Priority list of tasks to turn DCR into a true Cargo killer for C/C++ developers.
+
+## 🔥 High Priority (Next Releases)
+
+- [x] **Git dependencies support**  
+  `git = "https://github.com/user/repo.git#branch"` and `git = "..."@tag`
+- [ ] **Conan and vcpkg integration**  
+  Automatic download, installation and linking of packages
+- [ ] **Full freestanding / embedded support**  
+  `-nostdlib`, linker scripts, bare-metal targets (i686-elf, aarch64-none-elf, etc.)
+- [ ] **EFI support**  
+  Dedicated platform configuration for EFI targets
+- [ ] **Custom project name**  
+  Override binary name in `dcr.toml`
+- [ ] **Custom build steps / targets**  
+  Ability to define custom pre-build, post-build, codegen steps in `dcr.toml`
+- [ ] **Improved mixed C/C++/ASM projects**  
+  Better handling of `.S` and `.asm` files with correct flags
+- [ ] **dcr publish + official package registry**  
+  Publish and fetch your own libraries easily
+
+## ✅ Medium Priority
+
+- [ ] **Static analysis** (`dcr check`)  
+  Integration with clang-tidy, cppcheck, include-what-you-use
+- [ ] **Linter + Formatter** (`dcr fmt`, `dcr lint`)
+- [ ] **Hot reload / Live reload** for applications (raylib, SFML, SDL, etc.)
+- [ ] **Better cross-compilation experience**  
+  Ready-to-use toolchains + automatic download
+- [ ] **Linker script support** + direct linker control
+- [ ] **Workspaces improvements**  
+  Per-member include directories, selective builds, better dependency graph
+- [ ] **Build-time code generation**  
+  Support for protobuf, flatbuffers, Qt moc, custom generators
+
+## 📌 Low Priority / Nice to Have
+
+- [ ] Support for Meson and Ninja as alternative backends
+- [ ] Dockerfile generation (`dcr docker init`)
+- [ ] First-class Windows MSVC support (currently works but rough)
+- [ ] Documentation generation (`dcr doc`)
+- [ ] Sanitizers integration (`dcr sanitize`)
+- [ ] Benchmarks and comparison with CMake/Meson
+- [ ] C++20 modules support (when it becomes stable)
+
+## 🧠 Future Ideas
+
+- Official DCR package registry (dcrhub)
+- GUI wrapper (dcr-gui)
+- Plugin system
+- Toolchain manager (like rustup)
+- Zig as alternative compiler
+- deb/rpm/flatpak/AppImage packaging support
+
+---
+
+**Currently in progress:**
+- ...
+
+**Completed in recent releases:**
+- Workspaces
+- Cross-compilation
+- IDE config generation (VS Code, CLion, compile_commands.json)
+- Self-update (`dcr --update`)
+- Header tracking

docs/SUMMARY.md

@@ -21,6 +21,7 @@
 
 * [Global options](commands/global-options.md)
 * [dcr init/new](commands/dcr-init-or-new.md)
+* [dcr add](commands/dcr-add.md)
 * [dcr build](commands/dcr-build.md)
 * [dcr run](commands/dcr-run.md)
 * [dcr clean](commands/dcr-clean.md)

docs/commands/dcr-add.md

@@ -0,0 +1,32 @@
+# dcr add
+
+Add a dependency to `dcr.toml`.
+
+## Usage
+
+```bash
+dcr add <name> <source> [options]
+```
+
+## Sources
+
+- `path:./path/to/lib`: Local directory.
+- `github:user/repo`: GitHub repository.
+- `gitlab:user/repo`: GitLab repository.
+- `git:host.com/user/repo`: Generic Git repository (HTTPS).
+- `https://...`: Full Git URL.
+
+## Options
+
+- `--branch <name>`: Use a specific branch.
+- `--tag <name>`: Use a specific tag.
+- `--rev <sha>`: Use a specific commit hash.
+
+## Examples
+
+```bash
+dcr add my_lib path:./libs/my_lib
+dcr add cool_lib github:user/cool_lib
+dcr add shared_lib gitlab:org/shared --branch develop
+dcr add custom_lib git:git.internal.com/r/lib --tag v1.0.0
+```

docs/configuration/dependencies-section.md

@@ -1,23 +1,36 @@
 # Dependencies section
 
-DCR currently supports path dependencies.
+DCR supports registry-based dependencies and path dependencies.
 
 ## Example
 
 ```toml
 [dependencies]
+# Registry dependency
+mylib = "0.1.0"
+# Git dependency
+json = { git = "https://github.com/nlohmann/json", tag = "v3.11.2" }
+# Path dependency
 frecli = { path = "./lib/frecli", include = ["."], lib = ["."], libs = ["frecli"] }
 ```
 
-## Supported fields per dependency
+## Supported dependency types
 
+### Registry dependencies
+Defined by name and version string. DCR automatically resolves the package from the configured registry index.
+
+### Git dependencies
+Defined by repository URL and optionally branch, tag, or revision.
+- `git` (string, required): repository URL.
+- `branch`, `tag`, `rev` (string, optional): Git reference.
+
+### Path dependencies
 - `path` (string, required): absolute path or path relative to project root.
 - `include` (string array, optional): include directories inside dependency.
 - `lib` (string array, optional): library directories inside dependency.
 - `libs` (string array, optional): library names for linker.
-- `system` (bool, optional): currently `system = true` is rejected.
 
-## Defaults
+## Defaults for path dependencies
 
 - If `include` is omitted, DCR tries `<dep>/include`.
 - If `lib` is omitted, DCR tries `<dep>/lib`, then `<dep>/lib64`.
@@ -25,6 +38,7 @@ frecli = { path = "./lib/frecli", include = ["."], lib = ["."], libs = ["frecli"
 
 ## Validation
 
-- Dependency value must be a TOML table.
-- `path` is mandatory.
+- Dependency value must be a string (registry) or a TOML table (path).
+- Registry dependencies use the version string to match versions in the registry.
+- `path` is mandatory for path dependencies.
 - `include`/`lib`/`libs` must be arrays of strings if provided.

docs/configuration/package-section.md

@@ -6,15 +6,18 @@
 [package]
 name = "my-app"
 version = "0.1.0"
+type = "app"
 ```
 
 ## Fields
 
 - `name` (string, required): used as output artifact base name.
 - `version` (string, required): used in `dcr.lock` project entry.
+- `type` (string, optional): project type (`app`, `lib`, `none`).
 
 ## Notes
 
 - Empty `name` or `version` makes config invalid.
 - `dcr new` sets `name` from the passed project name.
 - `dcr init` sets `name` from current directory name.
+- If `type = "lib"`, DCR generates `include/` and `lib/` directories in the target path, copying public headers and built libraries.

docs/dependencies-and-build/dependency-format.md

@@ -2,25 +2,39 @@
 
 Dependencies are defined in `dcr.toml` under `[dependencies]`.
 
-## Full example
+## Full example (Path)
 
 ```toml
 [dependencies]
 fmt = { path = "./third_party/fmt", include = ["include"], lib = ["lib"], libs = ["fmt"] }
 ```
 
+## Full example (Git)
+
+```toml
+[dependencies]
+json = { git = "https://github.com/nlohmann/json", tag = "v3.11.2" }
+```
+
 ## Field reference
 
-- `path`: required dependency root path.
+- `path`: local path to dependency root.
+- `git`: URL of Git repository.
+- `branch`: Git branch name.
+- `tag`: Git tag name.
+- `rev`: Git commit SHA.
 - `include`: optional include subpaths (absolute or relative to dep root).
 - `lib`: optional library subpaths (absolute or relative to dep root).
 - `libs`: optional linker library names.
 
-## Common valid compact form
+## Common valid compact forms
 
 ```toml
 [dependencies]
 mylib = { path = "./libs/mylib" }
+gitlib = { git = "https://github.com/user/repo" }
+# Shortest form for path
+simple = "./libs/simple"
 ```
 
-In this form DCR will try defaults for include/lib dirs and use `mylib` as the linker library name.
+In these forms DCR will try defaults for include/lib dirs and use the dependency name as the linker library name.

docs/reference-and-help/cli-reference.md

@@ -5,6 +5,8 @@
 ```text
 dcr new <name>
 dcr init
+dcr setup
+dcr add <name> <source>(optional)
 dcr build [--debug|--release]
 dcr run [--debug|--release]
 dcr clean [--debug|--release] [--all]

install.ps1

@@ -1,15 +1,16 @@
 $ErrorActionPreference = 'Stop'
 
-$RepoUrl = 'https://github.com/dexoron/dcr'
-$ApiUrl = 'https://api.github.com/repos/dexoron/dcr/releases/latest'
+$RepoUrl    = 'https://github.com/dexoron/dcr'
+$ApiLatest  = 'https://api.github.com/repos/dexoron/dcr/releases/latest'
+$ApiAll     = 'https://api.github.com/repos/dexoron/dcr/releases'
 $InstallPath = Join-Path $env:LOCALAPPDATA 'dcr'
-$BinPath = Join-Path $env:USERPROFILE '.local\bin'
-$BinaryPath = Join-Path $InstallPath 'dcr.exe'
+$BinPath     = Join-Path $env:USERPROFILE '.local\bin'
+$BinaryPath  = Join-Path $InstallPath 'dcr.exe'
 
-function Info($msg) { Write-Host "[INFO] $msg" -ForegroundColor Cyan }
-function Ok($msg) { Write-Host "[OK] $msg" -ForegroundColor Green }
-function Warn($msg) { Write-Host "[WARN] $msg" -ForegroundColor Yellow }
-function Fail($msg) { Write-Host "[ERROR] $msg" -ForegroundColor Red; exit 1 }
+function Info($msg)  { Write-Host "[INFO] $msg"  -ForegroundColor Cyan   }
+function Ok($msg)    { Write-Host "[OK] $msg"    -ForegroundColor Green  }
+function Warn($msg)  { Write-Host "[WARN] $msg"  -ForegroundColor Yellow }
+function Fail($msg)  { Write-Host "[ERROR] $msg" -ForegroundColor Red; exit 1 }
 
 function Require-Cmd($name) {
     if (-not (Get-Command $name -ErrorAction SilentlyContinue)) {
@@ -17,6 +18,20 @@ function Require-Cmd($name) {
     }
 }
 
+function Select-Channel {
+    Write-Host "Choose channel:"
+    Write-Host "  1) Latest stable release (default)"
+    Write-Host "  2) Latest dev (pre-release)"
+    $choice = Read-Host "Enter 1 or 2 [1]"
+    if ([string]::IsNullOrWhiteSpace($choice)) { $choice = '1' }
+
+    switch ($choice) {
+        '1' { return 'stable' }
+        '2' { return 'dev'    }
+        default { Fail 'Unknown option' }
+    }
+}
+
 function Select-Mode {
     Write-Host "Choose installation mode:"
     Write-Host "  1) Download prebuilt binary from GitHub Release (recommended)"
@@ -26,7 +41,7 @@ function Select-Mode {
 
     switch ($choice) {
         '1' { return 'release' }
-        '2' { return 'build' }
+        '2' { return 'build'   }
         default { Fail 'Unknown option' }
     }
 }
@@ -38,18 +53,35 @@ function Get-Target {
     return 'x86_64-pc-windows-msvc'
 }
 
+function Fetch-ReleaseJson($channel) {
+    if ($channel -eq 'dev') {
+        Info "Looking for latest dev (pre-release)..."
+        $releases = Invoke-RestMethod -Method Get -Uri $ApiAll
+        $pre = $releases | Where-Object { $_.prerelease -eq $true } | Select-Object -First 1
+        if (-not $pre) { Fail "No dev (pre-release) found on GitHub" }
+        return $pre
+    } else {
+        return Invoke-RestMethod -Method Get -Uri $ApiLatest
+    }
+}
+
 function Install-FromRelease {
-    param([string]$target)
+    param([string]$target, [string]$channel)
 
     New-Item -ItemType Directory -Path $InstallPath -Force | Out-Null
 
-    $assetName = "dcr-$target.exe"
-    Info "Fetching latest release..."
-    $release = Invoke-RestMethod -Method Get -Uri $ApiUrl
+    $release = Fetch-ReleaseJson $channel
+    $tag     = $release.tag_name
+    $version = $tag.TrimStart('v')
+
+    # Имя бинарника: dcr-<triple>-<version>.exe
+    $assetName = "dcr-$target-$version.exe"
+
+    Info "Fetching release $tag (channel: $channel)..."
 
     $asset = $release.assets | Where-Object { $_.name -eq $assetName } | Select-Object -First 1
     if (-not $asset) {
-        Fail "Asset $assetName not found in release $($release.tag_name)"
+        Fail "Asset $assetName not found in release $tag"
     }
 
     Info "Downloading $assetName..."
@@ -58,7 +90,7 @@ function Install-FromRelease {
 }
 
 function Install-FromSource {
-    param([string]$target)
+    param([string]$target, [string]$channel)
 
     Require-Cmd 'git'
     Require-Cmd 'cargo'
@@ -67,7 +99,15 @@ function Install-FromSource {
     if (Test-Path $tmp) { Remove-Item -Recurse -Force $tmp }
 
     Info 'Cloning repository...'
-    git clone --depth 1 $RepoUrl $tmp | Out-Null
+    if ($channel -eq 'dev') {
+        # Пробуем ветку dev
+        $result = git clone --depth 1 --branch dev $RepoUrl $tmp 2>&1
+        if ($LASTEXITCODE -ne 0) {
+            git clone --depth 1 $RepoUrl $tmp | Out-Null
+        }
+    } else {
+        git clone --depth 1 $RepoUrl $tmp | Out-Null
+    }
 
     Info 'Building release binary...'
     Push-Location $tmp
@@ -100,14 +140,15 @@ function Setup-Path {
 }
 
 Info 'Starting DCR installation'
-$mode = Select-Mode
-$target = Get-Target
+$channel = Select-Channel
+$mode    = Select-Mode
+$target  = Get-Target
 
 if ($mode -eq 'build') {
-    Install-FromSource -target $target
+    Install-FromSource -target $target -channel $channel
 } else {
-    Install-FromRelease -target $target
+    Install-FromRelease -target $target -channel $channel
 }
 
 Setup-Path
-Ok 'Installation completed successfully'
+Ok 'Installation completed successfully'

install.sh

@@ -6,7 +6,8 @@ INSTALL_PATH="$HOME/.local/share/dcr"
 BINPATH="$HOME/.local/bin"
 LOGFILE="$HOME/.cache/dcr-install.log"
 REPO_URL="https://github.com/dexoron/dcr"
-GITHUB_API="https://api.github.com/repos/dexoron/dcr/releases/latest"
+GITHUB_API_LATEST="https://api.github.com/repos/dexoron/dcr/releases/latest"
+GITHUB_API_ALL="https://api.github.com/repos/dexoron/dcr/releases"
 
 RED='\033[0;31m'
 GREEN='\033[0;32m'
@@ -17,13 +18,16 @@ NC='\033[0m'
 mkdir -p "$(dirname "$LOGFILE")"
 exec > >(tee -a "$LOGFILE") 2>&1
 
-log() { echo -e "${BLUE}[$(date '+%Y-%m-%d %H:%M:%S')]${NC} $1"; }
+log()     { echo -e "${BLUE}[$(date '+%Y-%m-%d %H:%M:%S')]${NC} $1"; }
 success() { echo -e "${GREEN}✔ $1${NC}"; }
-warn() { echo -e "${YELLOW}⚠ $1${NC}"; }
-error() { echo -e "${RED}✖ $1${NC}"; }
+warn()    { echo -e "${YELLOW}⚠ $1${NC}"; }
+error()   { echo -e "${RED}✖ $1${NC}"; }
 
 trap 'error "Error on line $LINENO"; exit 1' ERR
 
+INSTALL_MODE=""
+CHANNEL=""
+
 check_os() {
     case "$(uname -s)" in
         Linux|Darwin) ;;
@@ -37,13 +41,11 @@ detect_target() {
     arch="$(uname -m)"
 
     case "$os:$arch" in
-        Linux:x86_64) TARGET_TRIPLE="x86_64-unknown-linux-gnu" ;;
-        Darwin:x86_64) TARGET_TRIPLE="x86_64-apple-darwin" ;;
+        Linux:x86_64)          TARGET_TRIPLE="x86_64-unknown-linux-gnu" ;;
+        Darwin:x86_64)         TARGET_TRIPLE="x86_64-apple-darwin" ;;
         Darwin:arm64|Darwin:aarch64) TARGET_TRIPLE="aarch64-apple-darwin" ;;
         *) error "Unsupported platform: $os/$arch"; exit 1 ;;
     esac
-
-    ASSET_NAME="dcr-${TARGET_TRIPLE}"
 }
 
 check_common_dependencies() {
@@ -51,14 +53,106 @@ check_common_dependencies() {
 }
 
 check_build_dependencies() {
-    command -v git >/dev/null 2>&1 || { error "git is not installed"; exit 1; }
+    command -v git   >/dev/null 2>&1 || { error "git is not installed"; exit 1; }
     command -v cargo >/dev/null 2>&1 || { error "cargo is not installed"; exit 1; }
 }
 
+select_channel() {
+    echo "Choose channel:"
+    echo "  1) Latest stable release (default)"
+    echo "  2) Latest dev (pre-release)"
+    read -r -p "Enter 1 or 2 [1]: " choice
+
+    case "${choice:-1}" in
+        1) CHANNEL="stable" ;;
+        2) CHANNEL="dev"    ;;
+        *) error "Unknown option"; exit 1 ;;
+    esac
+}
+
+select_install_mode() {
+    echo "Choose installation mode:"
+    echo "  1) Download prebuilt binary from GitHub Release (recommended)"
+    echo "  2) Build from git"
+    read -r -p "Enter 1 or 2 [1]: " choice
+
+    case "${choice:-1}" in
+        1) INSTALL_MODE="release" ;;
+        2) INSTALL_MODE="build"   ;;
+        *) error "Unknown option"; exit 1 ;;
+    esac
+}
+
+# Возвращает JSON нужного релиза в stdout
+fetch_release_json() {
+    if [[ "$CHANNEL" == "dev" ]]; then
+        log "Looking for latest dev (pre-release)..."
+        local json
+        json="$(curl -fsSL "$GITHUB_API_ALL")"
+        # Первый pre-release в списке
+        local result
+        result="$(printf '%s' "$json" | python3 - <<'EOF'
+import sys, json
+releases = json.load(sys.stdin)
+pre = [r for r in releases if r.get("prerelease", False)]
+if not pre:
+    print("{}", end="")
+else:
+    print(json.dumps(pre[0]), end="")
+EOF
+)"
+        if [[ -z "$result" || "$result" == "{}" ]]; then
+            error "No dev (pre-release) found on GitHub"
+            exit 1
+        fi
+        printf '%s' "$result"
+    else
+        curl -fsSL "$GITHUB_API_LATEST"
+    fi
+}
+
+download_binary() {
+    local release_json tag version asset_name download_url
+
+    release_json="$(fetch_release_json)"
+
+    tag="$(printf '%s\n' "$release_json" | \
+        sed -n 's/.*"tag_name": "\([^"]*\)".*/\1/p' | head -n1)"
+    if [[ -z "$tag" ]]; then
+        error "Failed to determine release version"
+        exit 1
+    fi
+
+    # Версия без ведущего 'v'
+    version="${tag#v}"
+    # Имя бинарника: dcr-<triple>-<version>
+    asset_name="dcr-${TARGET_TRIPLE}-${version}"
+
+    log "Fetching release ${tag} (channel: ${CHANNEL})..."
+
+    download_url="$(printf '%s\n' "$release_json" | \
+        sed -n "s#.*\"browser_download_url\": \"\([^\"]*/${asset_name}\)\".*#\1#p" | head -n1)"
+
+    if [[ -z "$download_url" ]]; then
+        error "Asset ${asset_name} not found in release ${tag}"
+        exit 1
+    fi
+
+    mkdir -p "$INSTALL_PATH"
+    curl -fL "$download_url" -o "$INSTALL_PATH/dcr"
+    chmod +x "$INSTALL_PATH/dcr"
+    success "Binary ${asset_name} downloaded (${tag})"
+}
+
 prepare_sources() {
     log "Fetching sources..."
     rm -rf "$TMPDIR"
     git clone --depth 1 "$REPO_URL" "$TMPDIR"
+    if [[ "$CHANNEL" == "dev" ]]; then
+        # Клонируем dev ветку, если она есть
+        git clone --depth 1 --branch dev "$REPO_URL" "$TMPDIR" 2>/dev/null || \
+        git clone --depth 1 "$REPO_URL" "$TMPDIR"
+    fi
     success "Sources fetched"
 }
 
@@ -68,34 +162,6 @@ build_binary() {
     success "Build completed"
 }
 
-fetch_latest_release_json() {
-    curl -fsSL "$GITHUB_API"
-}
-
-download_binary() {
-    log "Fetching latest release..."
-
-    local release_json download_url tag
-    release_json="$(fetch_latest_release_json)"
-
-    tag="$(printf '%s\n' "$release_json" | sed -n 's/.*"tag_name": "\([^"]*\)".*/\1/p' | head -n1)"
-    if [[ -z "$tag" ]]; then
-        error "Failed to determine release version"
-        exit 1
-    fi
-
-    download_url="$(printf '%s\n' "$release_json" | sed -n "s#.*\"browser_download_url\": \"\([^\"]*${ASSET_NAME}\)\".*#\1#p" | head -n1)"
-    if [[ -z "$download_url" ]]; then
-        error "Asset ${ASSET_NAME} not found in release ${tag}"
-        exit 1
-    fi
-
-    mkdir -p "$INSTALL_PATH"
-    curl -fL "$download_url" -o "$INSTALL_PATH/dcr"
-    chmod +x "$INSTALL_PATH/dcr"
-    success "Binary ${ASSET_NAME} downloaded (${tag})"
-}
-
 install_built_binary() {
     mkdir -p "$INSTALL_PATH"
     cp "$TMPDIR/target/release/dcr" "$INSTALL_PATH/dcr"
@@ -122,25 +188,13 @@ cleanup() {
     rm -rf "$TMPDIR" 2>/dev/null || true
 }
 
-select_install_mode() {
-    echo "Choose installation mode:"
-    echo "  1) Download prebuilt binary from GitHub Release (recommended)"
-    echo "  2) Build from git"
-    read -r -p "Enter 1 or 2 [1]: " choice
-
-    case "${choice:-1}" in
-        1) INSTALL_MODE="release" ;;
-        2) INSTALL_MODE="build" ;;
-        *) error "Unknown option"; exit 1 ;;
-    esac
-}
-
 main() {
     log "Starting DCR installation"
 
     check_os
     detect_target
     check_common_dependencies
+    select_channel
     select_install_mode
     cleanup
 
@@ -161,4 +215,4 @@ main() {
     log "Log saved to $LOGFILE"
 }
 
-main "$@"
+main "$@"

src/cli/add.rs

@@ -0,0 +1,201 @@
+use crate::core::config::Config;
+use crate::utils::fs::find_project_root;
+use crate::utils::log::error;
+use crate::utils::text::{BOLD_GREEN, colored};
+use toml::Value;
+use toml::map::Map;
+
+pub struct AddArgs {
+    pub name: String,
+    pub path: Option<String>,
+    pub git: Option<String>,
+    pub branch: Option<String>,
+    pub tag: Option<String>,
+    pub rev: Option<String>,
+}
+
+pub fn add(args: &[String]) -> i32 {
+    let add_args = match parse_add_args(args) {
+        Ok(a) => a,
+        Err(code) => return code,
+    };
+
+    let start_dir = match std::env::current_dir() {
+        Ok(dir) => dir,
+        Err(_) => {
+            error("Failed to determine current directory");
+            return 1;
+        }
+    };
+
+    let root = match find_project_root(&start_dir) {
+        Ok(Some(dir)) => dir,
+        Ok(None) => {
+            error("dcr.toml file not found");
+            return 1;
+        }
+        Err(_) => {
+            error("Failed to find project root");
+            return 1;
+        }
+    };
+
+    let mut config = match Config::open(&root.join("dcr.toml").to_string_lossy()) {
+        Ok(cfg) => cfg,
+        Err(err) => {
+            error(&err.to_string());
+            return 1;
+        }
+    };
+
+    let dep_value = if let Some(git_url) = add_args.git {
+        if add_args.branch.is_none() && add_args.tag.is_none() && add_args.rev.is_none() {
+            let mut table = Map::new();
+            table.insert("git".to_string(), Value::String(git_url));
+            Value::Table(table)
+        } else {
+            let mut table = Map::new();
+            table.insert("git".to_string(), Value::String(git_url));
+            if let Some(b) = add_args.branch {
+                table.insert("branch".to_string(), Value::String(b));
+            }
+            if let Some(t) = add_args.tag {
+                table.insert("tag".to_string(), Value::String(t));
+            }
+            if let Some(r) = add_args.rev {
+                table.insert("rev".to_string(), Value::String(r));
+            }
+            Value::Table(table)
+        }
+    } else if let Some(path) = add_args.path {
+        let mut table = Map::new();
+        table.insert("path".to_string(), Value::String(path));
+        Value::Table(table)
+    } else {
+        error("Dependency source (path or git) must be provided");
+        return 1;
+    };
+
+    let key = format!("dependencies.{}", add_args.name);
+    if let Err(err) = config.edit(&key, dep_value) {
+        error(&format!("Failed to update dcr.toml: {}", err));
+        return 1;
+    }
+
+    println!(
+        "    {} dependency `{}` to dcr.toml",
+        colored("Added", BOLD_GREEN),
+        add_args.name
+    );
+    0
+}
+
+fn parse_add_args(args: &[String]) -> Result<AddArgs, i32> {
+    if args.is_empty() {
+        error("Usage: dcr add <name> <source> [--branch <branch> | --tag <tag> | --rev <rev>]");
+        error("Sources:");
+        error("  user/repo                 -> github.com/user/repo");
+        error("  github:user/repo          -> github.com/user/repo");
+        error("  gitlab:user/repo          -> gitlab.com/user/repo");
+        error("  git:host.com/user/repo    -> host.com/user/repo");
+        error("  path:./path/to/lib        -> local path");
+        return Err(1);
+    }
+
+    let mut name = String::new();
+    let source_spec: String;
+    let mut branch = None;
+    let mut tag = None;
+    let mut rev = None;
+
+    let mut iter = args.iter();
+    if let Some(n) = iter.next() {
+        if n.starts_with("--") {
+            error("First argument must be the dependency name");
+            return Err(1);
+        }
+        name = n.clone();
+    }
+
+    if let Some(s) = iter.next() {
+        if s.starts_with("--") {
+            error("Second argument must be the dependency source");
+            return Err(1);
+        }
+        source_spec = s.clone();
+    } else {
+        error("Dependency source is required");
+        return Err(1);
+    }
+
+    while let Some(arg) = iter.next() {
+        match arg.as_str() {
+            "--branch" => {
+                branch = iter.next().cloned();
+                if branch.is_none() {
+                    error("--branch requires a value");
+                    return Err(1);
+                }
+            }
+            "--tag" => {
+                tag = iter.next().cloned();
+                if tag.is_none() {
+                    error("--tag requires a value");
+                    return Err(1);
+                }
+            }
+            "--rev" => {
+                rev = iter.next().cloned();
+                if rev.is_none() {
+                    error("--rev requires a value");
+                    return Err(1);
+                }
+            }
+            _ => {
+                error(&format!("Unknown argument: {}", arg));
+                return Err(1);
+            }
+        }
+    }
+
+    let mut path = None;
+    let mut git = None;
+
+    if let Some(p) = source_spec.strip_prefix("path:") {
+        path = Some(p.to_string());
+    } else if let Some(g) = source_spec.strip_prefix("github:") {
+        git = Some(format!("https://github.com/{}", g));
+    } else if let Some(g) = source_spec.strip_prefix("gitlab:") {
+        git = Some(format!("https://gitlab.com/{}", g));
+    } else if let Some(g) = source_spec.strip_prefix("git:") {
+        if g.contains('/') && !g.contains('.') {
+            // git:user/repo -> default to github
+            git = Some(format!("https://github.com/{}", g));
+        } else {
+            // git:host.com/user/repo
+            let url = if g.starts_with("http") || g.starts_with("git@") {
+                g.to_string()
+            } else {
+                format!("https://{}", g)
+            };
+            git = Some(url);
+        }
+    } else if source_spec.starts_with("http://")
+        || source_spec.starts_with("https://")
+        || source_spec.starts_with("git@")
+    {
+        git = Some(source_spec);
+    } else {
+        error("Source must have a prefix (path:, git:, github:, gitlab:) or be a full URL");
+        return Err(1);
+    }
+
+    Ok(AddArgs {
+        name,
+        path,
+        git,
+        branch,
+        tag,
+        rev,
+    })
+}

src/cli/build.rs

@@ -3,18 +3,30 @@ use crate::cli::flags::parse_build_run_flags;
 use crate::core::builder::common;
 use crate::core::builder::{BuildContext, build as build_project, collect_sources};
 use crate::core::config::Config;
-use crate::core::deps::resolve_deps;
+use crate::core::deps::{register, resolve_deps};
 use crate::core::workspace::parse_workspace;
-use crate::utils::fs::{check_dir, find_project_root};
-use crate::utils::log::{error, warn};
+use crate::utils::build::{
+    get_bool_with_profile, get_config_opt, get_config_str, get_language_with_profile,
+    normalize_target_os, parse_version_info, profile_table, resolve_compiler,
+    resolve_pkg_config_flags, resolve_tool,
+};
+use crate::utils::fs::{check_dir, find_project_root, with_dir};
+use crate::utils::log::error;
 use crate::utils::text::{BOLD_GREEN, colored};
 use glob::glob;
 use sha2::{Digest, Sha256};
 use std::fs;
 use std::path::{Path, PathBuf};
+use std::sync::Once;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Instant;
 
+static BUILD_INTERRUPTED: AtomicBool = AtomicBool::new(false);
+static SIGNAL_HANDLER: Once = Once::new();
+
 pub fn build(args: &[String]) -> i32 {
+    install_signal_handler();
+    BUILD_INTERRUPTED.store(false, Ordering::SeqCst);
     let start_dir = match std::env::current_dir() {
         Ok(dir) => dir,
         Err(_) => {
@@ -67,77 +79,20 @@ pub fn build(args: &[String]) -> i32 {
     }
 }
 
-fn get_config_str(config: &Config, key: &str) -> String {
-    config
-        .get(key)
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string()
+fn install_signal_handler() {
+    SIGNAL_HANDLER.call_once(|| {
+        let _ = ctrlc::set_handler(|| {
+            BUILD_INTERRUPTED.store(true, Ordering::SeqCst);
+        });
+    });
 }
 
-fn get_config_language(config: &Config, key: &str) -> Result<String, String> {
-    let value = config.get(key).ok_or_else(|| format!("{key} is missing"))?;
-    if let Some(s) = value.as_str() {
-        let trimmed = s.trim();
-        if trimmed.is_empty() {
-            return Err(format!("{key} is empty"));
-        }
-        return Ok(trimmed.to_string());
+fn check_interrupted() -> Result<(), String> {
+    if BUILD_INTERRUPTED.load(Ordering::SeqCst) {
+        Err("Build interrupted".to_string())
+    } else {
+        Ok(())
     }
-    let arr = value
-        .as_array()
-        .ok_or_else(|| format!("{key} must be string or array of strings"))?;
-    let mut parts = Vec::new();
-    for item in arr {
-        let s = item
-            .as_str()
-            .ok_or_else(|| format!("{key} must be string or array of strings"))?;
-        let trimmed = s.trim();
-        if trimmed.is_empty() {
-            return Err(format!("{key} contains empty value"));
-        }
-        parts.push(trimmed.to_string());
-    }
-    if parts.is_empty() {
-        return Err(format!("{key} is empty"));
-    }
-    Ok(parts.join("+"))
-}
-
-fn parse_language_value(value: &toml::Value, key: &str) -> Result<String, String> {
-    if let Some(s) = value.as_str() {
-        let trimmed = s.trim();
-        if trimmed.is_empty() {
-            return Err(format!("{key} is empty"));
-        }
-        return Ok(trimmed.to_string());
-    }
-    let arr = value
-        .as_array()
-        .ok_or_else(|| format!("{key} must be string or array of strings"))?;
-    let mut parts = Vec::new();
-    for item in arr {
-        let s = item
-            .as_str()
-            .ok_or_else(|| format!("{key} must be string or array of strings"))?;
-        let trimmed = s.trim();
-        if trimmed.is_empty() {
-            return Err(format!("{key} contains empty value"));
-        }
-        parts.push(trimmed.to_string());
-    }
-    if parts.is_empty() {
-        return Err(format!("{key} is empty"));
-    }
-    Ok(parts.join("+"))
-}
-
-fn profile_table<'a>(config: &'a Config, profile: &str) -> Option<&'a toml::value::Table> {
-    config
-        .get("build")
-        .and_then(|v| v.as_table())
-        .and_then(|b| b.get(profile))
-        .and_then(|v| v.as_table())
 }
 
 fn get_config_value_raw(
@@ -211,7 +166,7 @@ fn get_string_with_profile_and_target(
     }
 }
 
-fn get_string_with_profile(config: &Config, field: &str, profile: &str) -> String {
+fn get_build_string_with_profile(config: &Config, field: &str, profile: &str) -> String {
     get_string_with_profile_and_target(config, field, profile, None)
 }
 
@@ -275,22 +230,18 @@ fn get_list_with_profile_and_target(
 
 #[cfg(test)]
 mod tests {
+    use crate::utils::build::normalize_target_os;
+
     #[test]
     fn test_normalize_target_os() {
+        assert_eq!(normalize_target_os("linux"), "x86_64-unknown-linux-gnu");
+        assert_eq!(normalize_target_os("macos"), "x86_64-apple-darwin");
+        assert_eq!(normalize_target_os("windows"), "x86_64-pc-windows-msvc");
         assert_eq!(
-            super::normalize_target_os("linux"),
+            normalize_target_os("x86_64-unknown-linux-gnu"),
             "x86_64-unknown-linux-gnu"
         );
-        assert_eq!(super::normalize_target_os("macos"), "x86_64-apple-darwin");
-        assert_eq!(
-            super::normalize_target_os("windows"),
-            "x86_64-pc-windows-msvc"
-        );
-        assert_eq!(
-            super::normalize_target_os("x86_64-unknown-linux-gnu"),
-            "x86_64-unknown-linux-gnu"
-        );
-        assert_eq!(super::normalize_target_os("unknown"), "unknown");
+        assert_eq!(normalize_target_os("unknown"), "unknown");
     }
 }
 
@@ -306,34 +257,6 @@ fn get_targets(config: &Config, profile: &str) -> Result<Vec<String>, String> {
     get_list_with_profile(config, "targets", profile)
 }
 
-fn get_bool_with_profile(config: &Config, field: &str, profile: &str, default: bool) -> bool {
-    let base = config
-        .get(&format!("build.{field}"))
-        .and_then(|v| v.as_bool());
-    let profile_val = profile_table(config, profile)
-        .and_then(|table| table.get(field).and_then(|value| value.as_bool()));
-    profile_val.or(base).unwrap_or(default)
-}
-
-fn get_language_with_profile(config: &Config, profile: &str) -> Result<String, String> {
-    if let Some(table) = profile_table(config, profile)
-        && let Some(value) = table.get("language")
-    {
-        return parse_language_value(value, &format!("build.{profile}.language"));
-    }
-    get_config_language(config, "build.language")
-}
-
-fn get_config_opt(config: &Config, key: &str) -> Option<String> {
-    let value = config.get(key)?.as_str()?;
-    let trimmed = value.trim();
-    if trimmed.is_empty() {
-        None
-    } else {
-        Some(trimmed.to_string())
-    }
-}
-
 fn get_config_list(config: &Config, key: &str) -> Result<Vec<String>, String> {
     let value = match config.get(key) {
         Some(v) => v,
@@ -467,6 +390,7 @@ fn build_from_root(
 
     let start_time = Instant::now();
     for (i, build_target) in targets_to_build.iter().enumerate() {
+        check_interrupted()?;
         if targets_to_build.len() > 1 {
             println!(
                 "    Building target {} of {}: {}",
@@ -476,7 +400,7 @@ fn build_from_root(
             );
         } else {
             println!(
-                "    Building project `{}`\n    Profile: {}\n    Target: {}",
+                "    Building project `{}`\n    Profile: {}\n      Target: {}",
                 colored(&project_name, BOLD_GREEN),
                 colored(profile, BOLD_GREEN),
                 colored(
@@ -523,6 +447,7 @@ fn build_project_at(
     force: bool,
 ) -> Result<(), String> {
     with_dir(project_root, || {
+        check_interrupted()?;
         let items = check_dir(None).map_err(|_| "Failed to read project directory".to_string())?;
         if !items.contains(&"dcr.toml".to_string()) {
             return Err("dcr.toml file not found".to_string());
@@ -530,7 +455,7 @@ fn build_project_at(
         let config = Config::open("./dcr.toml").map_err(|err| err.to_string())?;
         let project_name = get_config_str(&config, "package.name");
         let project_version = get_config_str(&config, "package.version");
-        let build_target_config = get_string_with_profile(&config, "target", profile);
+        let build_target_config = get_build_string_with_profile(&config, "target", profile);
         let build_target = target.or(if build_target_config.is_empty() {
             None
         } else {
@@ -544,6 +469,11 @@ fn build_project_at(
         let build_kind = get_string_with_profile_and_target(&config, "kind", profile, build_target);
         let build_platform =
             get_string_with_profile_and_target(&config, "platform", profile, build_target);
+        let mut build_type =
+            get_string_with_profile_and_target(&config, "type", profile, build_target);
+        if build_type.is_empty() {
+            build_type = get_config_str(&config, "package.type");
+        }
         let tc_cc = get_config_value(&config, "toolchain", "cc", profile, build_target)
             .or_else(|| get_config_opt(&config, "toolchain.cc"));
         let tc_cxx = get_config_value(&config, "toolchain", "cxx", profile, build_target)
@@ -593,7 +523,61 @@ fn build_project_at(
         let target_dir = build_target.map(|t| format!("target/{t}/{profile}"));
         ensure_target_dirs(&items, profile, target_dir);
 
+        let deps_table = config.get("dependencies").and_then(|v| v.as_table());
         let resolved = resolve_deps(&config, profile, build_target, project_root)?;
+
+        // Registry dependencies are cached under the DCR registry root. Build
+        // them as normal DCR projects before the current project is linked.
+        if let Some(deps) = deps_table {
+            for (name, value) in deps {
+                if register::is_registry_dep(value) {
+                    let pkg_info = register::resolve_package_from_registry(name)?;
+                    let version = pkg_info
+                        .get("latest_version")
+                        .or_else(|| pkg_info.get("version"))
+                        .and_then(|v| v.as_str())
+                        .unwrap_or("unknown");
+                    let dep_root = register::package_root_from_registry_info(&pkg_info)?;
+                    let include_dir = dep_root.join("target").join("include");
+                    let lib_dir = dep_root.join("target").join("lib");
+
+                    if !include_dir.exists() || !lib_dir.exists() {
+                        print!(
+                            "\r{:100}\r      {} {} v{}",
+                            "",
+                            colored("Building", BOLD_GREEN),
+                            name,
+                            version
+                        );
+                        std::io::Write::flush(&mut std::io::stdout()).unwrap();
+                        if !dep_root.join("dcr.toml").is_file() {
+                            return Err(format!(
+                                "Registry dependency `{}` is missing dcr.toml at {}",
+                                name,
+                                dep_root.display()
+                            ));
+                        }
+                        build_project_at(&dep_root, profile, build_target, &[], force)?;
+                        print!(
+                            "\r{:100}\r       {} {} v{}",
+                            "",
+                            colored("Ready", BOLD_GREEN),
+                            name,
+                            version
+                        );
+                        println!();
+                    } else {
+                        println!(
+                            "      {} {} v{}",
+                            colored("Ready", BOLD_GREEN),
+                            name,
+                            version
+                        );
+                    }
+                }
+            }
+        }
+
         let (resolved_cflags, resolved_ldflags) =
             resolve_pkg_config_flags(&pkg_configs, &build_cflags, &build_ldflags)?;
         let mut combined_excludes = Vec::new();
@@ -675,6 +659,11 @@ fn build_project_at(
             platform: normalize_platform(&build_platform),
             linker: resolved_linker.as_deref(),
             archiver: resolved_archiver.as_deref(),
+            package_type: if build_type.is_empty() {
+                None
+            } else {
+                Some(build_type.as_str())
+            },
             source_roots: &source_roots,
             exclude_dirs: &combined_excludes,
             include_paths: &combined_includes,
@@ -732,8 +721,12 @@ fn build_project_at(
         );
         if !skip {
             run_build(&ctx)?;
+            check_interrupted()?;
             write_build_fingerprint(&ctx, &fingerprint)?;
         }
+        if ctx.package_type == Some("lib") {
+            package_library(&ctx, &headers)?;
+        }
         let post_steps_dirty = build_steps_need_run(&build_post_steps, &step_vars)?;
         if post_steps_dirty {
             run_build_steps(&build_post_steps, &tool_execs, &step_flags, &step_vars)?;
@@ -743,31 +736,57 @@ fn build_project_at(
     })
 }
 
-fn with_dir<F, T>(dir: &Path, f: F) -> Result<T, String>
-where
-    F: FnOnce() -> Result<T, String>,
-{
-    let prev = std::env::current_dir().map_err(|_| "Failed to get current dir".to_string())?;
-    std::env::set_current_dir(dir).map_err(|_| "Failed to change directory".to_string())?;
-    let result = f();
-    let _ = std::env::set_current_dir(prev);
-    result
-}
+fn package_library(ctx: &BuildContext, headers: &[PathBuf]) -> Result<(), String> {
+    let target_root = if let Some(dir) = ctx.target_dir {
+        Path::new(dir)
+            .parent()
+            .and_then(|p| p.parent())
+            .unwrap_or_else(|| Path::new("target"))
+    } else {
+        Path::new("target")
+    };
 
-pub fn normalize_target_os(target: &str) -> &str {
-    match target {
-        "linux" => "x86_64-unknown-linux-gnu",
-        "macos" => "x86_64-apple-darwin",
-        "windows" => "x86_64-pc-windows-msvc",
-        _ if target.contains('-') => target, // Assume valid triple
-        _ => {
-            warn(&format!(
-                "Unknown target '{}', using as-is. Supported short names: linux, macos, windows",
-                target
-            ));
-            target
+    let include_dir = target_root.join("include");
+    let lib_dir = target_root.join("lib");
+
+    fs::create_dir_all(&include_dir).map_err(|e| e.to_string())?;
+    fs::create_dir_all(&lib_dir).map_err(|e| e.to_string())?;
+
+    for header in headers {
+        if let Some(name) = header.file_name() {
+            let dest = include_dir.join(name);
+            fs::copy(header, dest)
+                .map_err(|e| format!("Failed to copy header {:?}: {}", header, e))?;
         }
     }
+
+    let mut outputs = Vec::new();
+    if ctx.kind == "staticlib" || ctx.kind == "any" {
+        outputs.push(crate::platform::lib_path(
+            ctx.profile,
+            ctx.project_name,
+            ctx.target_dir,
+        ));
+    }
+    if ctx.kind == "sharedlib" || ctx.kind == "any" {
+        outputs.push(crate::platform::shared_lib_path(
+            ctx.profile,
+            ctx.project_name,
+            ctx.target_dir,
+        ));
+    }
+
+    for output in outputs {
+        let path = Path::new(&output);
+        if path.exists()
+            && let Some(name) = path.file_name()
+        {
+            let dest = lib_dir.join(name);
+            fs::copy(path, dest).map_err(|e| format!("Failed to copy lib {:?}: {}", path, e))?;
+        }
+    }
+
+    Ok(())
 }
 
 pub fn normalize_target(target: &str, profile: &str) -> Option<String> {
@@ -793,176 +812,6 @@ fn normalize_platform(platform: &str) -> Option<&str> {
     }
 }
 
-fn resolve_compiler(
-    language: &str,
-    compiler: &str,
-    tc_cc: Option<&str>,
-    tc_cxx: Option<&str>,
-    tc_as: Option<&str>,
-) -> String {
-    let lang = primary_language(language);
-    env_override_compiler(&lang)
-        .or_else(|| toolchain_override_compiler(&lang, tc_cc, tc_cxx, tc_as))
-        .unwrap_or_else(|| compiler.to_string())
-}
-
-fn env_override_compiler(lang: &str) -> Option<String> {
-    if let Ok(value) = std::env::var("DCR_COMPILER") {
-        let trimmed = value.trim();
-        if !trimmed.is_empty() {
-            return Some(trimmed.to_string());
-        }
-    }
-    if lang == "asm" {
-        if let Ok(value) = std::env::var("DCR_AS") {
-            let trimmed = value.trim();
-            if !trimmed.is_empty() {
-                return Some(trimmed.to_string());
-            }
-        }
-        return None;
-    }
-    if (lang == "c++" || lang == "cpp" || lang == "cxx")
-        && let Ok(value) = std::env::var("DCR_CXX")
-    {
-        let trimmed = value.trim();
-        if !trimmed.is_empty() {
-            return Some(trimmed.to_string());
-        }
-    }
-    if let Ok(value) = std::env::var("DCR_CC") {
-        let trimmed = value.trim();
-        if !trimmed.is_empty() {
-            return Some(trimmed.to_string());
-        }
-    }
-    None
-}
-
-fn toolchain_override_compiler(
-    lang: &str,
-    tc_cc: Option<&str>,
-    tc_cxx: Option<&str>,
-    tc_as: Option<&str>,
-) -> Option<String> {
-    if lang == "asm" {
-        return tc_as.map(|v| v.to_string());
-    }
-    if (lang == "c++" || lang == "cpp" || lang == "cxx")
-        && let Some(v) = tc_cxx
-    {
-        return Some(v.to_string());
-    }
-    tc_cc.map(|v| v.to_string())
-}
-
-fn primary_language(language: &str) -> String {
-    let parts: Vec<String> = language
-        .split('+')
-        .map(|p| p.trim().to_lowercase())
-        .filter(|p| !p.is_empty())
-        .collect();
-    for p in &parts {
-        if p == "c++" || p == "cpp" || p == "cxx" {
-            return p.clone();
-        }
-    }
-    if parts.iter().any(|p| p == "c") {
-        return "c".to_string();
-    }
-    if parts.iter().any(|p| p == "asm") {
-        return "asm".to_string();
-    }
-    language.to_lowercase()
-}
-
-fn resolve_tool(env_key: &str, fallback: Option<&str>) -> Option<String> {
-    if let Ok(value) = std::env::var(env_key) {
-        let trimmed = value.trim();
-        if !trimmed.is_empty() {
-            return Some(trimmed.to_string());
-        }
-    }
-    fallback.map(|v| v.to_string())
-}
-
-fn resolve_pkg_config_flags(
-    pkgs: &[String],
-    base_cflags: &[String],
-    base_ldflags: &[String],
-) -> Result<(Vec<String>, Vec<String>), String> {
-    let mut cflags = base_cflags.to_vec();
-    let mut ldflags = base_ldflags.to_vec();
-    if pkgs.is_empty() {
-        return Ok((cflags, ldflags));
-    }
-    for pkg in pkgs {
-        let c_out = run_pkg_config(pkg, "--cflags")?;
-        let l_out = run_pkg_config(pkg, "--libs")?;
-        cflags.extend(split_flags(&c_out));
-        ldflags.extend(split_flags(&l_out));
-    }
-    Ok((cflags, ldflags))
-}
-
-fn run_pkg_config(pkg: &str, arg: &str) -> Result<String, String> {
-    let output = std::process::Command::new("pkg-config")
-        .arg(arg)
-        .arg(pkg)
-        .output()
-        .map_err(|err| format!("Failed to run pkg-config: {err}"))?;
-    if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        return Err(format!("pkg-config failed for {pkg}: {stderr}"));
-    }
-    Ok(String::from_utf8_lossy(&output.stdout).to_string())
-}
-
-fn split_flags(value: &str) -> Vec<String> {
-    let mut out = Vec::new();
-    let mut current = String::new();
-    let mut chars = value.chars().peekable();
-    let mut quote: Option<char> = None;
-    while let Some(ch) = chars.next() {
-        if let Some(q) = quote {
-            if ch == q {
-                quote = None;
-                continue;
-            }
-            if ch == '\\' {
-                if let Some(next) = chars.next() {
-                    current.push(next);
-                }
-                continue;
-            }
-            current.push(ch);
-            continue;
-        }
-        if ch == '"' || ch == '\'' {
-            quote = Some(ch);
-            continue;
-        }
-        if ch.is_whitespace() {
-            if !current.is_empty() {
-                out.push(current.clone());
-                current.clear();
-            }
-            continue;
-        }
-        if ch == '\\' {
-            if let Some(next) = chars.next() {
-                current.push(next);
-            }
-            continue;
-        }
-        current.push(ch);
-    }
-    if !current.is_empty() {
-        out.push(current);
-    }
-    out
-}
-
 struct ToolchainExecs {
     uic: String,
     moc: String,
@@ -1322,44 +1171,6 @@ fn expand_step_value(template: &str, stem: &str, vars: &StepVars) -> String {
         .replace("{version_suffix_dash}", vars.version_suffix_dash)
 }
 
-struct VersionInfo {
-    full: String,
-    major: String,
-    minor: String,
-    patch: String,
-    suffix: String,
-    suffix_dash: String,
-}
-
-fn parse_version_info(version: &str) -> VersionInfo {
-    let mut full = version.trim().to_string();
-    if full.is_empty() {
-        full = "0.0.0".to_string();
-    }
-    let full_clone = full.clone();
-    let (base, suffix) = match full_clone.split_once('-') {
-        Some((head, tail)) => (head, tail),
-        None => (full_clone.as_str(), ""),
-    };
-    let mut parts = base.split('.');
-    let major = parts.next().unwrap_or("0").to_string();
-    let minor = parts.next().unwrap_or("0").to_string();
-    let patch = parts.next().unwrap_or("0").to_string();
-    let suffix_dash = if suffix.is_empty() {
-        "".to_string()
-    } else {
-        format!("-{suffix}")
-    };
-    VersionInfo {
-        full,
-        major,
-        minor,
-        patch,
-        suffix: suffix.to_string(),
-        suffix_dash,
-    }
-}
-
 struct StepVars<'a> {
     profile: &'a str,
     version: &'a str,

src/cli/clean.rs

@@ -1,7 +1,8 @@
 use crate::config::flags;
 use crate::core::config::Config;
 use crate::core::workspace::parse_workspace;
-use crate::utils::fs::{check_dir, find_project_root};
+use crate::utils::build::parse_version_info;
+use crate::utils::fs::{check_dir, find_project_root, with_dir};
 use crate::utils::log::{error, warn};
 use crate::utils::text::{BOLD_GREEN, colored};
 use glob::glob;
@@ -182,17 +183,6 @@ fn clean_project_at(
     })
 }
 
-fn with_dir<F, T>(dir: &Path, f: F) -> Result<T, String>
-where
-    F: FnOnce() -> Result<T, String>,
-{
-    let prev = std::env::current_dir().map_err(|_| "Failed to get current dir".to_string())?;
-    std::env::set_current_dir(dir).map_err(|_| "Failed to change directory".to_string())?;
-    let result = f();
-    let _ = std::env::set_current_dir(prev);
-    result
-}
-
 fn clean_custom_paths(config: &Config, profile: &str) -> Result<(), String> {
     let patterns = match config.get("build.clean") {
         Some(v) => v
@@ -237,41 +227,3 @@ fn substitute_version_vars(value: &str, config: &Config) -> String {
         .replace("{version_suffix}", &info.suffix)
         .replace("{version_suffix_dash}", &info.suffix_dash)
 }
-
-struct VersionInfo {
-    full: String,
-    major: String,
-    minor: String,
-    patch: String,
-    suffix: String,
-    suffix_dash: String,
-}
-
-fn parse_version_info(version: &str) -> VersionInfo {
-    let mut full = version.trim().to_string();
-    if full.is_empty() {
-        full = "0.0.0".to_string();
-    }
-    let full_clone = full.clone();
-    let (base, suffix) = match full_clone.split_once('-') {
-        Some((head, tail)) => (head, tail),
-        None => (full_clone.as_str(), ""),
-    };
-    let mut parts = base.split('.');
-    let major = parts.next().unwrap_or("0").to_string();
-    let minor = parts.next().unwrap_or("0").to_string();
-    let patch = parts.next().unwrap_or("0").to_string();
-    let suffix_dash = if suffix.is_empty() {
-        "".to_string()
-    } else {
-        format!("-{suffix}")
-    };
-    VersionInfo {
-        full,
-        major,
-        minor,
-        patch,
-        suffix: suffix.to_string(),
-        suffix_dash,
-    }
-}

src/cli/flag_update.rs

@@ -3,6 +3,7 @@ use reqwest::blocking::Client;
 use serde::Deserialize;
 use std::fs;
 use std::path::{Path, PathBuf};
+#[cfg(target_os = "linux")]
 use std::process::Command;
 use std::time::{SystemTime, UNIX_EPOCH};
 
@@ -156,14 +157,14 @@ fn temp_binary_path(current_exe: &Path) -> PathBuf {
     current_exe.with_extension(extension)
 }
 
-fn set_executable_permissions(path: &Path) {
+fn set_executable_permissions(_path: &Path) {
     #[cfg(unix)]
     {
         use std::os::unix::fs::PermissionsExt;
-        if let Ok(meta) = fs::metadata(path) {
+        if let Ok(meta) = fs::metadata(_path) {
             let mut perms = meta.permissions();
             perms.set_mode(0o755);
-            let _ = fs::set_permissions(path, perms);
+            let _ = fs::set_permissions(_path, perms);
         }
     }
 }

src/cli/gen.rs

@@ -3,181 +3,15 @@ use crate::core::builder::collect_sources;
 use crate::core::builder::common;
 use crate::core::config::Config;
 use crate::core::workspace::parse_workspace;
+use crate::utils::build::{
+    get_bool_with_profile, get_config_opt, get_config_str, get_language_with_profile_or_default,
+    get_list_with_profile, get_string_with_profile, normalize_target_os, resolve_compiler,
+    resolve_pkg_config_flags_lossy,
+};
 use crate::utils::fs::find_project_root;
-use crate::utils::log::{error, warn};
+use crate::utils::log::error;
 use std::path::{Path, PathBuf};
 
-// ── helpers copied from cli::build (private there) ─────────────────────────
-
-fn get_config_str(config: &Config, key: &str) -> String {
-    config
-        .get(key)
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string()
-}
-
-fn profile_table<'a>(config: &'a Config, profile: &str) -> Option<&'a toml::value::Table> {
-    config
-        .get("build")
-        .and_then(|v| v.as_table())
-        .and_then(|b| b.get(profile))
-        .and_then(|v| v.as_table())
-}
-
-fn get_string_with_profile(config: &Config, field: &str, profile: &str) -> String {
-    let base = get_config_str(config, &format!("build.{field}"));
-    let Some(table) = profile_table(config, profile) else {
-        return base;
-    };
-    let value = table.get(field).and_then(|v| v.as_str()).unwrap_or("");
-    let trimmed = value.trim();
-    if trimmed.is_empty() {
-        base
-    } else {
-        trimmed.to_string()
-    }
-}
-
-fn get_config_list(config: &Config, key: &str) -> Vec<String> {
-    config
-        .get(key)
-        .and_then(|v| v.as_array())
-        .map(|arr| {
-            arr.iter()
-                .filter_map(|v| v.as_str())
-                .map(|s| s.to_string())
-                .collect()
-        })
-        .unwrap_or_default()
-}
-
-fn get_list_with_profile(config: &Config, field: &str, profile: &str) -> Vec<String> {
-    let mut out = get_config_list(config, &format!("build.{field}"));
-    if let Some(table) = profile_table(config, profile)
-        && let Some(extra) = table.get(field).and_then(|v| v.as_array())
-    {
-        out.extend(
-            extra
-                .iter()
-                .filter_map(|v| v.as_str())
-                .map(|s| s.to_string()),
-        );
-    }
-    out
-}
-
-fn get_bool_with_profile(config: &Config, field: &str, profile: &str, default: bool) -> bool {
-    let base = config
-        .get(&format!("build.{field}"))
-        .and_then(|v| v.as_bool());
-    let profile_val =
-        profile_table(config, profile).and_then(|t| t.get(field).and_then(|v| v.as_bool()));
-    profile_val.or(base).unwrap_or(default)
-}
-
-fn get_language_with_profile(config: &Config, profile: &str) -> String {
-    if let Some(table) = profile_table(config, profile)
-        && let Some(value) = table.get("language")
-    {
-        return parse_language_value(value);
-    }
-    let value = config.get("build.language");
-    match value {
-        Some(v) => parse_language_value(v),
-        None => "c".to_string(),
-    }
-}
-
-fn parse_language_value(value: &toml::Value) -> String {
-    if let Some(s) = value.as_str() {
-        return s.trim().to_string();
-    }
-    if let Some(arr) = value.as_array() {
-        let parts: Vec<&str> = arr.iter().filter_map(|v| v.as_str()).collect();
-        return parts.join("+");
-    }
-    "c".to_string()
-}
-
-fn get_config_opt(config: &Config, key: &str) -> Option<String> {
-    let value = config.get(key)?.as_str()?;
-    let trimmed = value.trim();
-    if trimmed.is_empty() {
-        None
-    } else {
-        Some(trimmed.to_string())
-    }
-}
-
-fn resolve_compiler(
-    language: &str,
-    compiler: &str,
-    tc_cc: Option<&str>,
-    tc_cxx: Option<&str>,
-    tc_as: Option<&str>,
-) -> String {
-    let lang = primary_language(language);
-    if let Ok(v) = std::env::var("DCR_COMPILER") {
-        let t = v.trim().to_string();
-        if !t.is_empty() {
-            return t;
-        }
-    }
-    if lang == "asm" {
-        if let Ok(v) = std::env::var("DCR_AS") {
-            let t = v.trim().to_string();
-            if !t.is_empty() {
-                return t;
-            }
-        }
-        if let Some(v) = tc_as {
-            return v.to_string();
-        }
-    }
-    if lang == "c++" || lang == "cpp" || lang == "cxx" {
-        if let Ok(v) = std::env::var("DCR_CXX") {
-            let t = v.trim().to_string();
-            if !t.is_empty() {
-                return t;
-            }
-        }
-        if let Some(v) = tc_cxx {
-            return v.to_string();
-        }
-    }
-    if let Ok(v) = std::env::var("DCR_CC") {
-        let t = v.trim().to_string();
-        if !t.is_empty() {
-            return t;
-        }
-    }
-    if let Some(v) = tc_cc {
-        return v.to_string();
-    }
-    compiler.to_string()
-}
-
-fn primary_language(language: &str) -> String {
-    let parts: Vec<String> = language
-        .split('+')
-        .map(|p| p.trim().to_lowercase())
-        .filter(|p| !p.is_empty())
-        .collect();
-    for p in &parts {
-        if p == "c++" || p == "cpp" || p == "cxx" {
-            return p.clone();
-        }
-    }
-    if parts.iter().any(|p| p == "c") {
-        return "c".to_string();
-    }
-    if parts.iter().any(|p| p == "asm") {
-        return "asm".to_string();
-    }
-    language.to_lowercase()
-}
-
 /// Like `deps::resolve_deps` but does NOT require lib directories to exist.
 /// Used by `gen` commands where the project may not have been built yet.
 struct GenDeps {
@@ -310,53 +144,6 @@ fn resolve_deps_for_gen(config: &Config, profile: &str, project_root: &Path) ->
     }
 }
 
-fn resolve_pkg_config_flags(
-    pkgs: &[String],
-    base_cflags: &[String],
-    base_ldflags: &[String],
-) -> (Vec<String>, Vec<String>) {
-    let mut cflags = base_cflags.to_vec();
-    let mut ldflags = base_ldflags.to_vec();
-    for pkg in pkgs {
-        match std::process::Command::new("pkg-config")
-            .arg("--cflags")
-            .arg(pkg)
-            .output()
-        {
-            Ok(out) if out.status.success() => {
-                let s = String::from_utf8_lossy(&out.stdout);
-                cflags.extend(s.split_whitespace().map(|v| v.to_string()));
-            }
-            Ok(out) => {
-                let err = String::from_utf8_lossy(&out.stderr);
-                eprintln!("Warning: pkg-config --cflags {pkg} failed: {err}");
-            }
-            Err(e) => {
-                eprintln!("Warning: pkg-config --cflags {pkg} error: {e}");
-            }
-        }
-
-        match std::process::Command::new("pkg-config")
-            .arg("--libs")
-            .arg(pkg)
-            .output()
-        {
-            Ok(out) if out.status.success() => {
-                let s = String::from_utf8_lossy(&out.stdout);
-                ldflags.extend(s.split_whitespace().map(|v| v.to_string()));
-            }
-            Ok(out) => {
-                let err = String::from_utf8_lossy(&out.stderr);
-                eprintln!("Warning: pkg-config --libs {pkg} failed: {err}");
-            }
-            Err(e) => {
-                eprintln!("Warning: pkg-config --libs {pkg} error: {e}");
-            }
-        }
-    }
-    (cflags, ldflags)
-}
-
 // ── public API ───────────────────────────────────────────────────────────────
 
 /// Everything needed to generate output for one project member.
@@ -422,7 +209,7 @@ fn collect_project_info_inner(root: &Path, profile: &str) -> Result<ProjectInfo,
 
     let name = get_config_str(&config, "package.name");
     let version = get_config_str(&config, "package.version");
-    let language = get_language_with_profile(&config, profile);
+    let language = get_language_with_profile_or_default(&config, profile);
     let standard = get_string_with_profile(&config, "standard", profile);
     let compiler_s = get_string_with_profile(&config, "compiler", profile);
     let kind = get_string_with_profile(&config, "kind", profile);
@@ -464,7 +251,7 @@ fn collect_project_info_inner(root: &Path, profile: &str) -> Result<ProjectInfo,
 
     let resolved = resolve_deps_for_gen(&config, profile, root);
     let (resolved_cflags, resolved_ldflags) =
-        resolve_pkg_config_flags(&pkg_configs, &base_cflags, &base_ldflags);
+        resolve_pkg_config_flags_lossy(&pkg_configs, &base_cflags, &base_ldflags);
 
     // Build exclude/include pattern lists (same logic as cli::build)
     let mut combined_excludes: Vec<PathBuf> = Vec::new();
@@ -541,6 +328,7 @@ fn collect_project_info_inner(root: &Path, profile: &str) -> Result<ProjectInfo,
         platform: normalize_platform(&platform),
         linker: resolved_linker.as_deref(),
         archiver: resolved_archiver.as_deref(),
+        package_type: None,
         source_roots: &source_roots,
         exclude_dirs: &combined_excludes,
         include_paths: &combined_includes,
@@ -1394,22 +1182,6 @@ fn parse_gen_args(args: &[String]) -> Result<(PathBuf, String), i32> {
     Ok((root, profile))
 }
 
-fn normalize_target_os(s: &str) -> &str {
-    match s {
-        "linux" => "x86_64-unknown-linux-gnu",
-        "macos" => "x86_64-apple-darwin",
-        "windows" => "x86_64-pc-windows-msvc",
-        _ if s.contains('-') => s, // Assume valid triple
-        _ => {
-            warn(&format!(
-                "Unknown target '{}', using as-is. Supported short names: linux, macos, windows",
-                s
-            ));
-            s
-        }
-    }
-}
-
 fn normalize_target(s: &str, profile: &str) -> Option<String> {
     let trimmed = normalize_target_os(s.trim());
     if trimmed.is_empty() {

src/cli/help.rs

@@ -12,6 +12,7 @@ pub fn help() -> i32 {
     println!("    init              Initialize the current directory as a project");
     println!("    build [--profile] Build the project (default: --debug)");
     println!("    run [--profile]   Build and run the project (default: --debug)");
+    println!("    tree              Display the dependency tree");
     println!("    test              Run project tests (alias: tests)");
     println!("    clean             Remove the target directory");
     println!("    gen <subcommand>  Generate IDE integration files");

src/cli/mod.rs

@@ -1,3 +1,4 @@
+pub mod add;
 pub mod build;
 pub mod clean;
 pub mod flag_update;
@@ -7,4 +8,6 @@ pub mod help;
 pub mod init;
 pub mod new;
 pub mod run;
+pub mod setup;
 pub mod test;
+pub mod tree;

src/cli/run.rs

@@ -2,10 +2,11 @@ use crate::cli::build::build;
 use crate::cli::flags::parse_build_run_flags;
 use crate::core::config::Config;
 use crate::core::runner::run_binary;
+use crate::utils::build::{normalize_target_os, parse_version_info};
 use crate::utils::fs::find_project_root;
+use crate::utils::fs::with_dir;
 use crate::utils::log::error;
 use crate::utils::text::{BOLD_GREEN, colored};
-use std::path::Path;
 use std::process::Command;
 
 fn get_run_cmd(
@@ -36,15 +37,6 @@ fn get_run_cmd(
     }
 }
 
-fn normalize_target_os(s: &str) -> &str {
-    match s {
-        "linux" => "x86_64-unknown-linux-gnu",
-        "macos" => "x86_64-apple-darwin",
-        "windows" => "x86_64-pc-windows-msvc",
-        _ => s,
-    }
-}
-
 pub fn run(args: &[String]) -> i32 {
     let start_dir = match std::env::current_dir() {
         Ok(dir) => dir,
@@ -152,17 +144,6 @@ pub fn run(args: &[String]) -> i32 {
     1
 }
 
-fn with_dir<F, T>(dir: &Path, f: F) -> Result<T, String>
-where
-    F: FnOnce() -> Result<T, String>,
-{
-    let prev = std::env::current_dir().map_err(|_| "Failed to get current dir".to_string())?;
-    std::env::set_current_dir(dir).map_err(|_| "Failed to change directory".to_string())?;
-    let result = f();
-    let _ = std::env::set_current_dir(prev);
-    result
-}
-
 fn run_shell(cmd: &str) -> i32 {
     let status = if cfg!(target_os = "windows") {
         Command::new("cmd").arg("/C").arg(cmd).status()
@@ -186,41 +167,3 @@ fn substitute_run_vars(cmd: &str, profile: &str, version: &str) -> String {
         .replace("{version_suffix}", &info.suffix)
         .replace("{version_suffix_dash}", &info.suffix_dash)
 }
-
-struct VersionInfo {
-    full: String,
-    major: String,
-    minor: String,
-    patch: String,
-    suffix: String,
-    suffix_dash: String,
-}
-
-fn parse_version_info(version: &str) -> VersionInfo {
-    let mut full = version.trim().to_string();
-    if full.is_empty() {
-        full = "0.0.0".to_string();
-    }
-    let full_clone = full.clone();
-    let (base, suffix) = match full_clone.split_once('-') {
-        Some((head, tail)) => (head, tail),
-        None => (full_clone.as_str(), ""),
-    };
-    let mut parts = base.split('.');
-    let major = parts.next().unwrap_or("0").to_string();
-    let minor = parts.next().unwrap_or("0").to_string();
-    let patch = parts.next().unwrap_or("0").to_string();
-    let suffix_dash = if suffix.is_empty() {
-        "".to_string()
-    } else {
-        format!("-{suffix}")
-    };
-    VersionInfo {
-        full,
-        major,
-        minor,
-        patch,
-        suffix: suffix.to_string(),
-        suffix_dash,
-    }
-}

src/cli/setup.rs

@@ -0,0 +1,16 @@
+pub fn setup(_args: &[String]) -> i32 {
+    println!("Setting up DCR registries...");
+    match crate::core::registry::RegistryManager::load() {
+        Ok(manager) => {
+            println!("Loaded {} registries.", manager.config.registry.len());
+            for (name, reg) in manager.config.registry {
+                println!("- {}: {} (priority {})", name, reg.url, reg.priority);
+            }
+            0
+        }
+        Err(e) => {
+            println!("Error: {}", e);
+            1
+        }
+    }
+}

src/cli/test.rs

@@ -1,12 +1,15 @@
 use crate::cli::build;
 use crate::config::{FILE_DCR_TEST_H, FILE_TEST_C, flags};
 use crate::core::config::Config;
-use crate::utils::fs::find_project_root;
+use crate::utils::build::{
+    get_config_opt, get_config_str, get_language_with_profile, get_list_with_profile,
+    get_string_with_profile, resolve_compiler, resolve_pkg_config_flags,
+};
+use crate::utils::fs::{find_project_root, with_dir};
 use crate::utils::log::error;
 use crate::utils::text::{BOLD_GREEN, BOLD_RED, RESET, colored};
-use std::env;
 use std::fs;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 
 const BOLD_BLUE: &str = "\x1b[1m\x1b[94m";
@@ -80,67 +83,79 @@ fn run_testsuite() -> Result<i32, String> {
     }
 
     let config = Config::open("./dcr.toml").map_err(|_| "Failed to read dcr.toml".to_string())?;
-    let name = config
-        .get("package.name")
-        .and_then(|v| v.as_str())
-        .ok_or("package.name not found in dcr.toml")?;
-    let kind = config
-        .get("package.kind")
-        .and_then(|v| v.as_str())
-        .unwrap_or("bin");
-
-    let compiler = env::var("DCR_CC").unwrap_or_else(|_| "cc".to_string());
     let profile = "release";
-    let flags_vec = flags(profile).unwrap_or(&[]);
-    let flags_str = flags_vec.join(" ");
+    let name = get_config_str(&config, "package.name");
+    let language = get_language_with_profile(&config, profile)?;
+    let compiler_cfg = get_string_with_profile(&config, "compiler", profile);
+    let standard = get_string_with_profile(&config, "standard", profile);
+    let package_type = get_config_str(&config, "package.type");
+    let build_kind = get_string_with_profile(&config, "kind", profile);
+    let tc_cc = get_config_opt(&config, "toolchain.cc");
+    let tc_cxx = get_config_opt(&config, "toolchain.cxx");
+    let tc_as = get_config_opt(&config, "toolchain.as");
+    let compiler = resolve_compiler(
+        &language,
+        &compiler_cfg,
+        tc_cc.as_deref(),
+        tc_cxx.as_deref(),
+        tc_as.as_deref(),
+    );
 
-    let test_c = "./tests/test.c";
-    if !Path::new(test_c).exists() {
+    let mut cflags: Vec<String> = flags(profile)
+        .unwrap_or(&[])
+        .iter()
+        .map(|v| v.to_string())
+        .collect();
+    cflags.extend(get_list_with_profile(&config, "cflags", profile));
+    let ldflags = get_list_with_profile(&config, "ldflags", profile);
+    let pkg_configs = get_list_with_profile(&config, "pkg_config", profile);
+    let (cflags, ldflags) = resolve_pkg_config_flags(&pkg_configs, &cflags, &ldflags)?;
+    let includes = test_include_dirs(&config, profile);
+    let test_sources = collect_test_sources()?;
+    if test_sources.is_empty() {
         return Err("tests/test.c not found; run 'dcr test --init' first".to_string());
     }
 
-    // Compile test.c to object
-    let obj_path = "./tests/test.o";
-    let compile_cmd = format!("{} -c {} -o {} {}", compiler, test_c, obj_path, flags_str);
-    let compile_status = Command::new("sh")
-        .arg("-c")
-        .arg(&compile_cmd)
-        .status()
-        .map_err(|_| format!("Failed to compile {}", test_c))?;
-    if !compile_status.success() {
-        return Err(format!("Compilation of {} failed", test_c));
+    let link_project_lib =
+        package_type == "lib" || build_kind == "staticlib" || build_kind == "sharedlib";
+    let mut stdout = String::new();
+    let mut declared = Vec::new();
+    let mut suite_success = true;
+
+    fs::create_dir_all("./tests/target")
+        .map_err(|e| format!("Failed to create tests/target: {e}"))?;
+    for source in &test_sources {
+        declared.extend(extract_test_names_path(source));
+        let stem = source
+            .file_stem()
+            .and_then(|v| v.to_str())
+            .unwrap_or("test");
+        let obj_path = Path::new("./tests/target").join(format!("{stem}.o"));
+        let bin_path =
+            Path::new("./tests/target").join(format!("{stem}{}", std::env::consts::EXE_SUFFIX));
+
+        compile_test_source(&compiler, &standard, &cflags, &includes, source, &obj_path)?;
+        link_test_binary(
+            &compiler,
+            &ldflags,
+            link_project_lib.then_some(name.as_str()),
+            &obj_path,
+            &bin_path,
+        )?;
+
+        let out = Command::new(&bin_path)
+            .output()
+            .map_err(|_| format!("Failed to run `{}`", bin_path.display()))?;
+        stdout.push_str(&String::from_utf8_lossy(&out.stdout));
+        let stderr = String::from_utf8_lossy(&out.stderr);
+        if !stderr.trim().is_empty() {
+            eprint!("{}", stderr);
+        }
+        if !out.status.success() {
+            suite_success = false;
+        }
     }
 
-    // Link
-    let bin_path = format!("./tests/test{}", std::env::consts::EXE_SUFFIX);
-    let link_cmd = if kind == "lib" {
-        format!(
-            "{} {} -o {} -Ltarget/release -l{}",
-            compiler, obj_path, bin_path, name
-        )
-    } else {
-        format!("{} {} -o {}", compiler, obj_path, bin_path)
-    };
-    let link_status = Command::new("sh")
-        .arg("-c")
-        .arg(&link_cmd)
-        .status()
-        .map_err(|_| format!("Failed to link {}", bin_path))?;
-    if !link_status.success() {
-        return Err(format!("Linking of {} failed", bin_path));
-    }
-
-    let out = Command::new(&bin_path)
-        .output()
-        .map_err(|_| format!("Failed to run `{bin_path}`"))?;
-
-    let stdout = String::from_utf8_lossy(&out.stdout);
-    let stderr = String::from_utf8_lossy(&out.stderr);
-    if !stderr.trim().is_empty() {
-        eprint!("{}", stderr);
-    }
-
-    let declared = extract_test_names("./tests/test.c");
     let mut pass = 0;
     let mut skip = 0;
     let mut fail = 0;
@@ -189,7 +204,7 @@ fn run_testsuite() -> Result<i32, String> {
     }
 
     if !parsed_any {
-        if out.status.success() {
+        if suite_success {
             for name in &declared {
                 println!("{} {}", colored("[PASS]", BOLD_GREEN), name);
             }
@@ -216,12 +231,104 @@ fn run_testsuite() -> Result<i32, String> {
     print_field("FAIL", fail, BOLD_RED);
     println!("{}", colored("=====================", BOLD_GREEN));
 
-    if fail > 0 || !out.status.success() {
+    if fail > 0 || !suite_success {
         return Ok(1);
     }
     Ok(0)
 }
 
+fn collect_test_sources() -> Result<Vec<PathBuf>, String> {
+    let tests_dir = Path::new("./tests");
+    if !tests_dir.is_dir() {
+        return Ok(Vec::new());
+    }
+    let mut sources = Vec::new();
+    for entry in fs::read_dir(tests_dir).map_err(|e| format!("Failed to read tests/: {e}"))? {
+        let path = entry
+            .map_err(|e| format!("Failed to read tests/: {e}"))?
+            .path();
+        if path.extension().and_then(|v| v.to_str()) == Some("c") {
+            sources.push(path);
+        }
+    }
+    sources.sort();
+    Ok(sources)
+}
+
+fn test_include_dirs(config: &Config, profile: &str) -> Vec<String> {
+    let mut dirs = vec![
+        "./tests".to_string(),
+        "./src".to_string(),
+        "./target/include".to_string(),
+    ];
+    dirs.extend(get_list_with_profile(config, "include", profile));
+    dirs
+}
+
+fn compile_test_source(
+    compiler: &str,
+    standard: &str,
+    cflags: &[String],
+    includes: &[String],
+    source: &Path,
+    obj_path: &Path,
+) -> Result<(), String> {
+    let mut cmd = Command::new(compiler);
+    cmd.arg("-c").arg(source).arg("-o").arg(obj_path);
+    if !standard.trim().is_empty() {
+        cmd.arg(format!("-std={}", standard.trim()));
+    }
+    for flag in cflags {
+        cmd.arg(flag);
+    }
+    for dir in includes {
+        cmd.arg(format!("-I{dir}"));
+    }
+    let output = cmd
+        .output()
+        .map_err(|e| format!("Failed to compile {}: {e}", source.display()))?;
+    print_command_output(&output);
+    if !output.status.success() {
+        return Err(format!("Compilation of {} failed", source.display()));
+    }
+    Ok(())
+}
+
+fn link_test_binary(
+    compiler: &str,
+    ldflags: &[String],
+    project_lib: Option<&str>,
+    obj_path: &Path,
+    bin_path: &Path,
+) -> Result<(), String> {
+    let mut cmd = Command::new(compiler);
+    cmd.arg(obj_path);
+    if let Some(name) = project_lib {
+        cmd.arg("-Ltarget/lib").arg(format!("-l{name}"));
+    }
+    for flag in ldflags {
+        cmd.arg(flag);
+    }
+    cmd.arg("-o").arg(bin_path);
+    let output = cmd
+        .output()
+        .map_err(|e| format!("Failed to link {}: {e}", bin_path.display()))?;
+    print_command_output(&output);
+    if !output.status.success() {
+        return Err(format!("Linking of {} failed", bin_path.display()));
+    }
+    Ok(())
+}
+
+fn print_command_output(output: &std::process::Output) {
+    if !output.stdout.is_empty() {
+        print!("{}", String::from_utf8_lossy(&output.stdout));
+    }
+    if !output.stderr.is_empty() {
+        eprint!("{}", String::from_utf8_lossy(&output.stderr));
+    }
+}
+
 fn ensure_test_header() -> Result<(), String> {
     fs::create_dir_all("./tests").map_err(|_| "Failed to create tests/".to_string())?;
     fs::write("./tests/dcr_test.h", FILE_DCR_TEST_H)
@@ -233,7 +340,7 @@ fn ensure_test_header() -> Result<(), String> {
     Ok(())
 }
 
-fn extract_test_names(path: &str) -> Vec<String> {
+fn extract_test_names_path(path: &Path) -> Vec<String> {
     let Ok(content) = fs::read_to_string(path) else {
         return Vec::new();
     };
@@ -256,14 +363,3 @@ fn print_field(label: &str, value: i32, color: &str) {
         println!("{}{}:  {}{}", color, label, value, RESET);
     }
 }
-
-fn with_dir<F, T>(dir: &Path, f: F) -> Result<T, String>
-where
-    F: FnOnce() -> Result<T, String>,
-{
-    let prev = std::env::current_dir().map_err(|_| "Failed to get current dir".to_string())?;
-    std::env::set_current_dir(dir).map_err(|_| "Failed to change directory".to_string())?;
-    let result = f();
-    let _ = std::env::set_current_dir(prev);
-    result
-}

src/cli/tree.rs

@@ -0,0 +1,118 @@
+use crate::core::config::Config;
+use crate::utils::log::error;
+use crate::utils::text::{BOLD_CYAN, printc};
+use std::collections::HashSet;
+use std::path::{Path, PathBuf};
+use toml::Value;
+
+pub fn tree(_args: &[String]) -> i32 {
+    let current_dir = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("."));
+    let config = match Config::open("dcr.toml") {
+        Ok(c) => c,
+        Err(_) => {
+            error("dcr.toml not found in current directory");
+            return 1;
+        }
+    };
+
+    let name = config
+        .get("package.name")
+        .and_then(|v| v.as_str())
+        .unwrap_or("unknown");
+    let version = config
+        .get("package.version")
+        .and_then(|v| v.as_str())
+        .unwrap_or("0.0.0");
+
+    printc(&format!("{} v{}", name, version), BOLD_CYAN);
+
+    let mut seen = HashSet::new();
+    seen.insert(name.to_string());
+
+    if let Some(deps) = config.get("dependencies").and_then(|v| v.as_table()) {
+        print_deps(deps, &current_dir, "", &mut seen);
+    }
+
+    0
+}
+
+fn print_deps(
+    deps: &toml::value::Table,
+    base_path: &Path,
+    prefix: &str,
+    seen: &mut HashSet<String>,
+) {
+    let mut dep_list: Vec<_> = deps.iter().collect();
+    dep_list.sort_by_key(|(name, _)| *name);
+
+    for (i, (name, value)) in dep_list.iter().enumerate() {
+        let is_last = i == dep_list.len() - 1;
+        let connector = if is_last { "└── " } else { "├── " };
+        let child_prefix = if is_last { "    " } else { "│   " };
+
+        let dep_path = resolve_dep_path(value, base_path);
+        let mut version = String::new();
+        let mut sub_deps = None;
+        let mut resolved_path = None;
+
+        if let Some(path) = &dep_path {
+            let dcr_toml = path.join("dcr.toml");
+            if dcr_toml.exists()
+                && let Ok(config) = Config::open(&dcr_toml.to_string_lossy())
+            {
+                if let Some(v) = config.get("package.version").and_then(|v| v.as_str()) {
+                    version = format!(" v{}", v);
+                }
+                sub_deps = config
+                    .get("dependencies")
+                    .and_then(|v| v.as_table())
+                    .cloned();
+                resolved_path = Some(path.clone());
+            }
+        }
+
+        if version.is_empty() {
+            version = match value {
+                Value::String(s) if s.starts_with("git:") || s.starts_with("github:") => {
+                    format!(" ({})", s)
+                }
+                Value::Table(t) => {
+                    if let Some(v) = t.get("version").and_then(|v| v.as_str()) {
+                        format!(" v{}", v)
+                    } else if let Some(git) = t.get("git").and_then(|v| v.as_str()) {
+                        format!(" ({})", git)
+                    } else {
+                        "".to_string()
+                    }
+                }
+                _ => "".to_string(),
+            };
+        }
+
+        println!("{}{}{}{}", prefix, connector, name, version);
+
+        if let Some(s_deps) = sub_deps
+            && !seen.contains(*name)
+        {
+            seen.insert(name.to_string());
+            let new_prefix = format!("{}{}", prefix, child_prefix);
+            if let Some(path) = resolved_path {
+                print_deps(&s_deps, &path, &new_prefix, seen);
+            }
+            seen.remove(*name);
+        }
+    }
+}
+
+fn resolve_dep_path(value: &Value, base_path: &Path) -> Option<PathBuf> {
+    match value {
+        Value::String(s) => s
+            .strip_prefix("path:")
+            .map(|stripped| base_path.join(stripped)),
+        Value::Table(t) => t
+            .get("path")
+            .and_then(|v| v.as_str())
+            .map(|path| base_path.join(path)),
+        _ => None,
+    }
+}

src/core/builder/common.rs

@@ -1,5 +1,9 @@
 use std::fs;
 use std::path::{Path, PathBuf};
+use std::process::Command;
+use std::sync::{Mutex, OnceLock};
+
+static OUTPUT_MUTEX: OnceLock<Mutex<()>> = OnceLock::new();
 
 pub fn collect_sources(
     roots: &[PathBuf],
@@ -153,6 +157,65 @@ pub fn has_glob_magic(value: &str) -> bool {
     value.chars().any(|c| matches!(c, '*' | '?' | '['))
 }
 
+pub fn parallel_build<F>(total_tasks: usize, task_fn: F) -> Result<(), String>
+where
+    F: Fn(usize) -> Result<(), String> + Sync + Send,
+{
+    let num_threads = std::thread::available_parallelism()
+        .map(|n| n.get())
+        .unwrap_or(1);
+
+    let counter = std::sync::atomic::AtomicUsize::new(0);
+    let err_msg = std::sync::Mutex::new(None);
+
+    std::thread::scope(|s| {
+        for _ in 0..num_threads {
+            s.spawn(|| {
+                loop {
+                    if err_msg.lock().unwrap().is_some() {
+                        break;
+                    }
+
+                    let i = counter.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+                    if i >= total_tasks {
+                        break;
+                    }
+
+                    if let Err(e) = task_fn(i) {
+                        let mut err = err_msg.lock().unwrap();
+                        if err.is_none() {
+                            *err = Some(e);
+                        }
+                        break;
+                    }
+                }
+            });
+        }
+    });
+
+    if let Some(err) = err_msg.into_inner().unwrap() {
+        return Err(err);
+    }
+
+    Ok(())
+}
+
+pub fn run_command_sync_output(cmd: &mut Command) -> Result<(), String> {
+    let output = cmd.output().map_err(|err| format!("Build failed: {err}"))?;
+    let _guard = OUTPUT_MUTEX.get_or_init(|| Mutex::new(())).lock().unwrap();
+    if !output.stdout.is_empty() {
+        print!("{}", String::from_utf8_lossy(&output.stdout));
+    }
+    if !output.stderr.is_empty() {
+        eprint!("{}", String::from_utf8_lossy(&output.stderr));
+    }
+    if output.status.success() {
+        Ok(())
+    } else {
+        Err("Build failed".to_string())
+    }
+}
+
 pub fn normalize_source_path(path: &Path) -> String {
     if !path.is_absolute() {
         return path.to_string_lossy().to_string();

src/core/builder/gas.rs

@@ -107,25 +107,38 @@ fn build_objects(
     ctx: &BuildContext,
     obj_ext: &str,
 ) -> Result<Vec<String>, String> {
-    let mut objects = Vec::new();
-    for source in sources {
-        let obj_path = common::object_path(obj_dir, source, obj_ext);
-        if let Some(parent) = Path::new(&obj_path).parent() {
-            fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
-        }
-        if common::needs_rebuild(source, &obj_path) {
-            let mut cmd = Command::new(assembler);
-            cmd.arg(source).arg("-o").arg(&obj_path);
-            for flag in ctx.cflags {
-                cmd.arg(flag);
-            }
-            match cmd.status() {
-                Ok(status) if status.success() => {}
-                Ok(_) => return Err("Build failed".to_string()),
-                Err(err) => return Err(format!("Build failed: {err}")),
-            }
-        }
-        objects.push(obj_path);
-    }
+    let objects: Vec<String> = sources
+        .iter()
+        .map(|s| common::object_path(obj_dir, s, obj_ext))
+        .collect();
+
+    common::parallel_build(sources.len(), |i| {
+        build_object(assembler, &sources[i], &objects[i], ctx)
+    })?;
+
     Ok(objects)
 }
+
+fn build_object(
+    assembler: &str,
+    source: &str,
+    obj_path: &str,
+    ctx: &BuildContext,
+) -> Result<(), String> {
+    if let Some(parent) = Path::new(obj_path).parent() {
+        fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
+    }
+
+    if !common::needs_rebuild(source, obj_path) {
+        return Ok(());
+    }
+
+    let mut cmd = Command::new(assembler);
+    cmd.arg(source).arg("-o").arg(obj_path);
+
+    for flag in ctx.cflags {
+        cmd.arg(flag);
+    }
+
+    common::run_command_sync_output(&mut cmd)
+}

src/core/builder/mod.rs

@@ -17,6 +17,7 @@ pub struct BuildContext<'a> {
     pub platform: Option<&'a str>,
     pub linker: Option<&'a str>,
     pub archiver: Option<&'a str>,
+    pub package_type: Option<&'a str>,
     pub source_roots: &'a [std::path::PathBuf],
     pub exclude_dirs: &'a [std::path::PathBuf],
     pub include_paths: &'a [String],

src/core/builder/msvc.rs

@@ -185,6 +185,8 @@ fn default_flags(profile: &str) -> &'static [&'static str] {
     }
 }
 
+static OUTPUT_MUTEX: std::sync::Mutex<()> = std::sync::Mutex::new(());
+
 fn build_objects(
     compiler: &str,
     sources: &[String],
@@ -192,96 +194,124 @@ fn build_objects(
     ctx: &BuildContext,
     obj_ext: &str,
 ) -> Result<Vec<String>, String> {
-    let mut objects = Vec::new();
-    for source in sources {
-        let obj_path = common::object_path(obj_dir, source, obj_ext);
-        if let Some(parent) = Path::new(&obj_path).parent() {
-            fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
-        }
-        if common::needs_rebuild(source, &obj_path) {
-            let mut cmd = Command::new(compiler);
-            cmd.arg("/nologo");
-            match ctx.language.to_lowercase().as_str() {
-                "c" => {
-                    cmd.arg("/TC");
-                }
-                "c++" | "cpp" | "cxx" => {
-                    cmd.arg("/TP");
-                }
-                _ => {
-                    return Err("Unsupported language".to_string());
-                }
-            }
-            if !ctx.standard.is_empty() && ctx.language.to_lowercase() != "asm" {
-                let std_flag = msvc_standard_flag(ctx.language, ctx.standard)?;
-                cmd.arg(std_flag);
-            }
-            if let Some(flag) = msvc_arch_flag(ctx.platform) {
-                cmd.arg(flag);
-            }
-            if ctx.cflags.is_empty() {
-                for flag in default_flags(ctx.profile) {
-                    cmd.arg(flag);
-                }
-            }
-            for flag in ctx.cflags {
-                cmd.arg(flag);
-            }
-            for dir in ctx.include_dirs {
-                cmd.arg(format!("/I{dir}"));
-            }
-            cmd.arg("/c").arg(source).arg(format!("/Fo:{}", obj_path));
-            cmd.arg("/showIncludes");
+    let objects: Vec<String> = sources
+        .iter()
+        .map(|s| common::object_path(obj_dir, s, obj_ext))
+        .collect();
 
-            if std::env::var("DCR_DEBUG").is_ok() {
-                eprintln!("[dcr] {:?}", cmd);
-            }
-            let output = cmd.output().map_err(|err| format!("Build failed: {err}"))?;
-            let stdout = String::from_utf8_lossy(&output.stdout);
-            let stderr = String::from_utf8_lossy(&output.stderr);
+    common::parallel_build(sources.len(), |i| {
+        build_object(compiler, &sources[i], &objects[i], ctx)
+    })?;
 
-            let mut headers = Vec::new();
-            let mut clean_stdout = String::new();
-            for line in stdout.lines() {
-                if let Some(stripped) = line.strip_prefix("Note: including file:") {
-                    headers.push(stripped.trim().to_string());
-                } else if let Some(stripped) = line.strip_prefix("Примечание: включение файла:")
-                {
-                    headers.push(stripped.trim().to_string());
-                } else {
-                    clean_stdout.push_str(line);
-                    clean_stdout.push('\n');
-                }
-            }
-
-            if !output.status.success() {
-                eprint!("{}", clean_stdout);
-                eprint!("{}", stderr);
-                return Err("Build failed".to_string());
-            } else {
-                let trimmed_out = clean_stdout.trim();
-                let trimmed_err = stderr.trim();
-                let src_filename = Path::new(source)
-                    .file_name()
-                    .and_then(|v| v.to_str())
-                    .unwrap_or("");
-                if !trimmed_out.is_empty() && trimmed_out != src_filename {
-                    print!("{}", clean_stdout);
-                }
-                if !trimmed_err.is_empty() {
-                    eprintln!("{}", trimmed_err);
-                }
-            }
-
-            let d_path = Path::new(&obj_path).with_extension("d");
-            let mut d_content = format!("{}: \\\n", obj_path.replace('\\', "/"));
-            for h in headers {
-                let escaped = h.replace('\\', "/").replace(" ", "\\ ");
-                d_content.push_str(&format!("  {} \\\n", escaped));
-            }
-            std::fs::write(&d_path, d_content).map_err(|err| format!("d file error: {err}"))?;
-        }
-        objects.push(obj_path);
-    }
     Ok(objects)
 }
+
+fn build_object(
+    compiler: &str,
+    source: &str,
+    obj_path: &str,
+    ctx: &BuildContext,
+) -> Result<(), String> {
+    if let Some(parent) = Path::new(obj_path).parent() {
+        fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
+    }
+
+    if !common::needs_rebuild(source, obj_path) {
+        return Ok(());
+    }
+
+    let mut cmd = Command::new(compiler);
+    cmd.arg("/nologo");
+
+    match ctx.language.to_lowercase().as_str() {
+        "c" => {
+            cmd.arg("/TC");
+        }
+        "c++" | "cpp" | "cxx" => {
+            cmd.arg("/TP");
+        }
+        _ => return Err("Unsupported language".to_string()),
+    }
+
+    if !ctx.standard.is_empty() && ctx.language.to_lowercase() != "asm" {
+        let std_flag = msvc_standard_flag(ctx.language, ctx.standard)?;
+        cmd.arg(std_flag);
+    }
+
+    if let Some(flag) = msvc_arch_flag(ctx.platform) {
+        cmd.arg(flag);
+    }
+
+    if ctx.cflags.is_empty() {
+        for flag in default_flags(ctx.profile) {
+            cmd.arg(flag);
+        }
+    }
+
+    for flag in ctx.cflags {
+        cmd.arg(flag);
+    }
+
+    for dir in ctx.include_dirs {
+        cmd.arg(format!("/I{dir}"));
+    }
+
+    cmd.arg("/c").arg(source).arg(format!("/Fo:{}", obj_path));
+    cmd.arg("/showIncludes");
+
+    if std::env::var("DCR_DEBUG").is_ok() {
+        eprintln!("[dcr] {:?}", cmd);
+    }
+
+    let output = cmd.output().map_err(|err| format!("Build failed: {err}"))?;
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    let stderr = String::from_utf8_lossy(&output.stderr);
+
+    let mut headers = Vec::new();
+    let mut clean_stdout = String::new();
+
+    for line in stdout.lines() {
+        if let Some(stripped) = line.strip_prefix("Note: including file:") {
+            headers.push(stripped.trim().to_string());
+        } else if let Some(stripped) = line.strip_prefix("Примечание: включение файла:")
+        {
+            headers.push(stripped.trim().to_string());
+        } else {
+            clean_stdout.push_str(line);
+            clean_stdout.push('\n');
+        }
+    }
+
+    let _lock = OUTPUT_MUTEX.lock().unwrap();
+
+    if !output.status.success() {
+        eprint!("{}", clean_stdout);
+        eprint!("{}", stderr);
+        return Err("Build failed".to_string());
+    }
+
+    let trimmed_out = clean_stdout.trim();
+    let trimmed_err = stderr.trim();
+    let src_filename = Path::new(source)
+        .file_name()
+        .and_then(|v| v.to_str())
+        .unwrap_or("");
+
+    if !trimmed_out.is_empty() && trimmed_out != src_filename {
+        print!("{}", clean_stdout);
+    }
+
+    if !trimmed_err.is_empty() {
+        eprintln!("{}", trimmed_err);
+    }
+
+    let d_path = Path::new(obj_path).with_extension("d");
+    let mut d_content = format!("{}: \\\n", obj_path.replace('\\', "/"));
+    for h in headers {
+        let escaped = h.replace('\\', "/").replace(" ", "\\ ");
+        d_content.push_str(&format!("  {} \\\n", escaped));
+    }
+    fs::write(&d_path, d_content).map_err(|err| format!("d file error: {err}"))?;
+
+    Ok(())
+}

src/core/builder/nasm.rs

@@ -107,37 +107,53 @@ fn build_objects(
     ctx: &BuildContext,
     obj_ext: &str,
 ) -> Result<Vec<String>, String> {
-    let mut objects = Vec::new();
+    let objects: Vec<String> = sources
+        .iter()
+        .map(|s| common::object_path(obj_dir, s, obj_ext))
+        .collect();
+
     let format = nasm_format(ctx.platform);
-    for source in sources {
-        let obj_path = common::object_path(obj_dir, source, obj_ext);
-        if let Some(parent) = Path::new(&obj_path).parent() {
-            fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
-        }
-        if common::needs_rebuild(source, &obj_path) {
-            let mut cmd = Command::new(assembler);
-            cmd.arg("-f")
-                .arg(format)
-                .arg(source)
-                .arg("-o")
-                .arg(&obj_path);
-            for flag in ctx.cflags {
-                cmd.arg(flag);
-            }
-            if std::env::var("DCR_DEBUG").is_ok() {
-                eprintln!("[dcr] {:?}", cmd);
-            }
-            match cmd.status() {
-                Ok(status) if status.success() => {}
-                Ok(_) => return Err("Build failed".to_string()),
-                Err(err) => return Err(format!("Build failed: {err}")),
-            }
-        }
-        objects.push(obj_path);
-    }
+
+    common::parallel_build(sources.len(), |i| {
+        build_object(assembler, &sources[i], &objects[i], format, ctx)
+    })?;
+
     Ok(objects)
 }
 
+fn build_object(
+    assembler: &str,
+    source: &str,
+    obj_path: &str,
+    format: &str,
+    ctx: &BuildContext,
+) -> Result<(), String> {
+    if let Some(parent) = Path::new(obj_path).parent() {
+        fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
+    }
+
+    if !common::needs_rebuild(source, obj_path) {
+        return Ok(());
+    }
+
+    let mut cmd = Command::new(assembler);
+    cmd.arg("-f")
+        .arg(format)
+        .arg(source)
+        .arg("-o")
+        .arg(obj_path);
+
+    for flag in ctx.cflags {
+        cmd.arg(flag);
+    }
+
+    if std::env::var("DCR_DEBUG").is_ok() {
+        eprintln!("[dcr] {:?}", cmd);
+    }
+
+    common::run_command_sync_output(&mut cmd)
+}
+
 fn nasm_format(platform: Option<&str>) -> &'static str {
     if let Some(p) = platform {
         let p = p.to_lowercase().replace('-', "_");

src/core/builder/unix_cc.rs

@@ -132,56 +132,77 @@ fn build_objects(
     ctx: &BuildContext,
     obj_ext: &str,
 ) -> Result<Vec<String>, String> {
-    let mut objects = Vec::new();
-    for source in sources {
-        let obj_path = common::object_path(obj_dir, source, obj_ext);
-        if let Some(parent) = Path::new(&obj_path).parent() {
-            fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
-        }
-        if common::needs_rebuild(source, &obj_path) {
-            let mut cmd = Command::new(compiler);
-            cmd.arg("-c").arg(source).arg("-o").arg(&obj_path);
-            if ctx.kind == "sharedlib" {
-                cmd.arg("-fPIC");
-            }
-            if let Some(flag) = asm_lang_flag(source) {
-                cmd.arg("-x").arg(flag);
-            }
-            if let Some(platform) = ctx.platform
-                && !platform.trim().is_empty()
-            {
-                cmd.arg(format!("-march={}", platform));
-            }
-            if !ctx.standard.is_empty() && ctx.language.to_lowercase() != "asm" {
-                cmd.arg(format!("-std={}", ctx.standard));
-            }
-            if ctx.cflags.is_empty() {
-                for flag in default_flags(ctx.profile) {
-                    cmd.arg(flag);
-                }
-            }
-            for flag in ctx.cflags {
-                cmd.arg(flag);
-            }
-            for dir in ctx.include_dirs {
-                cmd.arg(format!("-I{dir}"));
-            }
-            let d_path = Path::new(&obj_path).with_extension("d");
-            cmd.arg("-MMD").arg("-MF").arg(&d_path);
-            if std::env::var("DCR_DEBUG").is_ok() {
-                eprintln!("[dcr] {:?}", cmd);
-            }
-            match cmd.status() {
-                Ok(status) if status.success() => {}
-                Ok(_) => return Err("Build failed".to_string()),
-                Err(err) => return Err(format!("Build failed: {err}")),
-            }
-        }
-        objects.push(obj_path);
-    }
+    let objects: Vec<String> = sources
+        .iter()
+        .map(|s| common::object_path(obj_dir, s, obj_ext))
+        .collect();
+
+    common::parallel_build(sources.len(), |i| {
+        build_object(compiler, &sources[i], &objects[i], ctx)
+    })?;
+
     Ok(objects)
 }
 
+fn build_object(
+    compiler: &str,
+    source: &str,
+    obj_path: &str,
+    ctx: &BuildContext,
+) -> Result<(), String> {
+    if let Some(parent) = Path::new(obj_path).parent() {
+        fs::create_dir_all(parent).map_err(|err| format!("obj dir error: {err}"))?;
+    }
+
+    if !common::needs_rebuild(source, obj_path) {
+        return Ok(());
+    }
+
+    let mut cmd = Command::new(compiler);
+    cmd.arg("-c").arg(source).arg("-o").arg(obj_path);
+
+    if ctx.kind == "sharedlib" {
+        cmd.arg("-fPIC");
+    }
+
+    if let Some(flag) = asm_lang_flag(source) {
+        cmd.arg("-x").arg(flag);
+    }
+
+    if let Some(platform) = ctx.platform
+        && !platform.trim().is_empty()
+    {
+        cmd.arg(format!("-march={}", platform));
+    }
+
+    if !ctx.standard.is_empty() && ctx.language.to_lowercase() != "asm" {
+        cmd.arg(format!("-std={}", ctx.standard));
+    }
+
+    if ctx.cflags.is_empty() {
+        for flag in default_flags(ctx.profile) {
+            cmd.arg(flag);
+        }
+    }
+
+    for flag in ctx.cflags {
+        cmd.arg(flag);
+    }
+
+    for dir in ctx.include_dirs {
+        cmd.arg(format!("-I{dir}"));
+    }
+
+    let d_path = Path::new(obj_path).with_extension("d");
+    cmd.arg("-MMD").arg("-MF").arg(&d_path);
+
+    if std::env::var("DCR_DEBUG").is_ok() {
+        eprintln!("[dcr] {:?}", cmd);
+    }
+
+    common::run_command_sync_output(&mut cmd)
+}
+
 fn asm_lang_flag(source: &str) -> Option<&'static str> {
     let ext = Path::new(source).extension().and_then(|v| v.to_str())?;
     match ext {

src/core/config.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+use std::collections::BTreeMap;
 use std::fs;
 use std::path::{Path, PathBuf};
 use toml::Value;
@@ -51,6 +53,98 @@ impl From<toml::ser::Error> for ConfigError {
 pub struct Config {
     path: PathBuf,
     data: Value,
+    typed: DcrConfig,
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Clone, Deserialize)]
+pub struct DcrConfig {
+    pub package: PackageConfig,
+    pub build: BuildConfig,
+    #[serde(default)]
+    pub dependencies: BTreeMap<String, DependencyConfig>,
+    #[serde(default)]
+    pub toolchain: Option<ToolchainConfig>,
+    #[serde(default)]
+    pub workspace: BTreeMap<String, WorkspaceMemberConfig>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct PackageConfig {
+    pub name: String,
+    pub version: String,
+    #[serde(default, rename = "type")]
+    pub pkg_type: Option<String>,
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Clone, Deserialize)]
+pub struct BuildConfig {
+    pub language: LanguageConfig,
+    pub standard: String,
+    pub compiler: String,
+    #[serde(default)]
+    pub kind: Option<String>,
+    #[serde(default)]
+    pub target: Option<String>,
+    #[serde(default)]
+    pub platform: Option<String>,
+    #[serde(default)]
+    pub cflags: Vec<String>,
+    #[serde(default)]
+    pub ldflags: Vec<String>,
+    #[serde(default)]
+    pub exclude: Vec<String>,
+    #[serde(default)]
+    pub include: Vec<String>,
+    #[serde(default)]
+    pub roots: Vec<String>,
+    #[serde(default)]
+    pub clean: Vec<String>,
+    #[serde(default)]
+    pub src_disable: Option<bool>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+#[serde(untagged)]
+pub enum LanguageConfig {
+    One(String),
+    Many(Vec<String>),
+}
+
+impl LanguageConfig {
+    fn values(&self) -> Vec<&str> {
+        match self {
+            LanguageConfig::One(value) => vec![value.as_str()],
+            LanguageConfig::Many(values) => values.iter().map(String::as_str).collect(),
+        }
+    }
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Clone, Deserialize)]
+#[serde(untagged)]
+pub enum DependencyConfig {
+    Version(String),
+    Table(BTreeMap<String, Value>),
+}
+
+#[derive(Debug, Clone, Deserialize, Default)]
+pub struct ToolchainConfig {
+    pub cc: Option<String>,
+    pub cxx: Option<String>,
+    #[serde(rename = "as")]
+    pub assembler: Option<String>,
+    pub ar: Option<String>,
+    pub ld: Option<String>,
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Clone, Deserialize)]
+pub struct WorkspaceMemberConfig {
+    pub path: String,
+    #[serde(default)]
+    pub deps: Vec<String>,
 }
 
 impl Config {
@@ -63,7 +157,8 @@ impl Config {
             write_toml(&path, &default_value)?;
             default_value
         };
-        let cfg = Self { path, data };
+        let typed = parse_typed_config(&data)?;
+        let cfg = Self { path, data, typed };
         cfg.validate()?;
         Ok(cfg)
     }
@@ -74,11 +169,27 @@ impl Config {
             return Err(ConfigError::Invalid("dcr.toml not found".into()));
         }
         let data = read_toml(&path)?;
-        let cfg = Self { path, data };
+        let typed = parse_typed_config(&data)?;
+        let cfg = Self { path, data, typed };
         cfg.validate()?;
         Ok(cfg)
     }
 
+    #[allow(dead_code)]
+    pub fn typed(&self) -> &DcrConfig {
+        &self.typed
+    }
+
+    #[allow(dead_code)]
+    pub fn package(&self) -> &PackageConfig {
+        &self.typed.package
+    }
+
+    #[allow(dead_code)]
+    pub fn build_config(&self) -> &BuildConfig {
+        &self.typed.build
+    }
+
     pub fn get(&self, key: &str) -> Option<&Value> {
         let parts: Vec<&str> = key.split('.').collect();
         get_path(&self.data, &parts)
@@ -98,118 +209,59 @@ impl Config {
     }
 
     pub fn validate(&self) -> Result<(), ConfigError> {
-        let package = self
-            .get("package")
-            .and_then(|v| v.as_table())
-            .ok_or_else(|| ConfigError::Invalid("missing [package]".into()))?;
+        if self.typed.package.name.trim().is_empty() {
+            return Err(ConfigError::Invalid("package.name is empty".into()));
+        }
+        if self.typed.package.version.trim().is_empty() {
+            return Err(ConfigError::Invalid("package.version is empty".into()));
+        }
+        validate_package_name(&self.typed.package.name)?;
 
-        for key in ["name", "version"] {
-            let value = package.get(key).and_then(|v| v.as_str()).unwrap_or("");
-            if value.trim().is_empty() {
-                return Err(ConfigError::Invalid(format!("package.{key} is empty")));
+        if let Some(pkg_type) = &self.typed.package.pkg_type {
+            let pkg_type = pkg_type.trim();
+            if !pkg_type.is_empty() && pkg_type != "lib" && pkg_type != "app" && pkg_type != "none"
+            {
+                return Err(ConfigError::Invalid(
+                    "package.type must be 'lib', 'app', or 'none'".into(),
+                ));
             }
         }
 
-        let build = self
-            .get("build")
-            .and_then(|v| v.as_table())
-            .ok_or_else(|| ConfigError::Invalid("missing [build]".into()))?;
-
-        if let Some(language) = build.get("language") {
-            self.validate_language(language)?;
-        } else {
-            return Err(ConfigError::Invalid("build.language is empty".into()));
+        validate_language_config(&self.typed.build.language, "build.language")?;
+        if self.typed.build.standard.trim().is_empty() {
+            return Err(ConfigError::Invalid("build.standard is empty".into()));
         }
-        for key in ["standard", "compiler"] {
-            let value = build.get(key).and_then(|v| v.as_str()).unwrap_or("");
-            if value.trim().is_empty() {
-                return Err(ConfigError::Invalid(format!("build.{key} is empty")));
-            }
+        if self.typed.build.compiler.trim().is_empty() {
+            return Err(ConfigError::Invalid("build.compiler is empty".into()));
         }
-        if let Some(platform) = build.get("platform")
-            && !platform
-                .as_str()
-                .map(|v| !v.trim().is_empty())
-                .unwrap_or(false)
+        if let Some(platform) = &self.typed.build.platform
+            && platform.trim().is_empty()
         {
             return Err(ConfigError::Invalid("build.platform is empty".into()));
         }
-        if let Some(toolchain) = self.get("toolchain").and_then(|v| v.as_table()) {
-            for key in ["cc", "cxx", "as", "ar", "ld"] {
-                if let Some(v) = toolchain.get(key)
-                    && !v.as_str().map(|s| !s.trim().is_empty()).unwrap_or(false)
-                {
-                    return Err(ConfigError::Invalid(format!("toolchain.{key} is invalid")));
-                }
-            }
-        }
-        if let Some(kind) = build.get("kind").and_then(|v| v.as_str()) {
+        validate_toolchain(self.typed.toolchain.as_ref())?;
+        if let Some(kind) = &self.typed.build.kind {
             let kind = kind.trim();
             if !kind.is_empty() && kind != "bin" && kind != "staticlib" && kind != "sharedlib" {
                 return Err(ConfigError::Invalid("build.kind is invalid".into()));
             }
         }
-        if let Some(exclude) = build.get("exclude") {
-            let arr = exclude.as_array().ok_or_else(|| {
-                ConfigError::Invalid("build.exclude must be an array of strings".into())
-            })?;
-            for item in arr {
-                let s = item.as_str().unwrap_or("");
-                if s.trim().is_empty() {
-                    return Err(ConfigError::Invalid(
-                        "build.exclude contains empty value".into(),
-                    ));
-                }
-            }
-        }
-        if let Some(include) = build.get("include") {
-            let arr = include.as_array().ok_or_else(|| {
-                ConfigError::Invalid("build.include must be an array of strings".into())
-            })?;
-            for item in arr {
-                let s = item.as_str().unwrap_or("");
-                if s.trim().is_empty() {
-                    return Err(ConfigError::Invalid(
-                        "build.include contains empty value".into(),
-                    ));
-                }
-            }
-        }
-        if let Some(roots) = build.get("roots") {
-            let arr = roots.as_array().ok_or_else(|| {
-                ConfigError::Invalid("build.roots must be an array of strings".into())
-            })?;
-            for item in arr {
-                let s = item.as_str().unwrap_or("");
-                if s.trim().is_empty() {
-                    return Err(ConfigError::Invalid(
-                        "build.roots contains empty value".into(),
-                    ));
-                }
-            }
-        }
-        if let Some(src_disable) = build.get("src_disable")
-            && !src_disable.is_bool()
-        {
-            return Err(ConfigError::Invalid(
-                "build.src_disable must be a boolean".into(),
-            ));
-        }
-        if let Some(clean) = build.get("clean") {
-            let arr = clean.as_array().ok_or_else(|| {
-                ConfigError::Invalid("build.clean must be an array of strings".into())
-            })?;
-            for item in arr {
-                let s = item.as_str().unwrap_or("");
-                if s.trim().is_empty() {
-                    return Err(ConfigError::Invalid(
-                        "build.clean contains empty value".into(),
-                    ));
-                }
-            }
+        validate_string_list(&self.typed.build.exclude, "build.exclude")?;
+        validate_string_list(&self.typed.build.include, "build.include")?;
+        validate_string_list(&self.typed.build.roots, "build.roots")?;
+        validate_string_list(&self.typed.build.clean, "build.clean")?;
+        validate_string_list(&self.typed.build.cflags, "build.cflags")?;
+        validate_string_list(&self.typed.build.ldflags, "build.ldflags")?;
+        if let Some(target) = &self.typed.build.target {
+            validate_non_empty_string(target, "build.target")?;
         }
         for profile in ["release", "debug"] {
-            if let Some(section) = build.get(profile) {
+            if let Some(section) = self
+                .data
+                .get("build")
+                .and_then(|v| v.as_table())
+                .and_then(|build| build.get(profile))
+            {
                 let table = section.as_table().ok_or_else(|| {
                     ConfigError::Invalid(format!("build.{profile} must be a table"))
                 })?;
@@ -226,12 +278,93 @@ impl Config {
 
     fn set(&mut self, key: &str, value: Value) -> Result<(), ConfigError> {
         let parts: Vec<&str> = key.split('.').collect();
+        let previous = self.data.clone();
         set_path(&mut self.data, &parts, value)?;
+        self.typed = match parse_typed_config(&self.data) {
+            Ok(typed) => typed,
+            Err(err) => {
+                self.data = previous;
+                return Err(err);
+            }
+        };
+        if let Err(err) = self.validate() {
+            self.data = previous;
+            self.typed = parse_typed_config(&self.data)?;
+            return Err(err);
+        }
         self.save()?;
         Ok(())
     }
 }
 
+fn parse_typed_config(value: &Value) -> Result<DcrConfig, ConfigError> {
+    value.clone().try_into().map_err(ConfigError::TomlDe)
+}
+
+fn validate_package_name(name: &str) -> Result<(), ConfigError> {
+    let trimmed = name.trim();
+    if trimmed != name {
+        return Err(ConfigError::Invalid(
+            "package.name must not contain leading or trailing whitespace".into(),
+        ));
+    }
+    if trimmed == "." || trimmed == ".." || trimmed.contains("..") {
+        return Err(ConfigError::Invalid("package.name is invalid".into()));
+    }
+    if !trimmed
+        .chars()
+        .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
+    {
+        return Err(ConfigError::Invalid(
+            "package.name must contain only ASCII letters, digits, '_' or '-'".into(),
+        ));
+    }
+    Ok(())
+}
+
+fn validate_language_config(language: &LanguageConfig, key: &str) -> Result<(), ConfigError> {
+    let values = language.values();
+    if values.is_empty() {
+        return Err(ConfigError::Invalid(format!("{key} is empty")));
+    }
+    for value in values {
+        validate_non_empty_string(value, key)?;
+    }
+    Ok(())
+}
+
+fn validate_toolchain(toolchain: Option<&ToolchainConfig>) -> Result<(), ConfigError> {
+    let Some(toolchain) = toolchain else {
+        return Ok(());
+    };
+    for (key, value) in [
+        ("cc", toolchain.cc.as_deref()),
+        ("cxx", toolchain.cxx.as_deref()),
+        ("as", toolchain.assembler.as_deref()),
+        ("ar", toolchain.ar.as_deref()),
+        ("ld", toolchain.ld.as_deref()),
+    ] {
+        if let Some(value) = value {
+            validate_non_empty_string(value, &format!("toolchain.{key}"))?;
+        }
+    }
+    Ok(())
+}
+
+fn validate_string_list(values: &[String], key: &str) -> Result<(), ConfigError> {
+    for value in values {
+        validate_non_empty_string(value, key)?;
+    }
+    Ok(())
+}
+
+fn validate_non_empty_string(value: &str, key: &str) -> Result<(), ConfigError> {
+    if value.trim().is_empty() {
+        return Err(ConfigError::Invalid(format!("{key} contains empty value")));
+    }
+    Ok(())
+}
+
 impl Config {
     fn validate_language(&self, value: &Value) -> Result<(), ConfigError> {
         if let Some(s) = value.as_str() {
@@ -398,6 +531,11 @@ fn default_toml() -> Result<Value, ConfigError> {
         "version".to_string(),
         Value::String(DEFAULT_VERSION.to_string()),
     );
+    package.insert("type".to_string(), Value::String("none".to_string()));
+    package.insert("description".to_string(), Value::String("".to_string()));
+    package.insert("author".to_string(), Value::String("".to_string()));
+    package.insert("license".to_string(), Value::String("MIT".to_string()));
+
     let mut build = Map::new();
     build.insert(
         "language".to_string(),
@@ -458,7 +596,29 @@ fn format_toml(value: &Value) -> Result<String, ConfigError> {
     let mut out = String::new();
     out.push_str("[package]\n");
     out.push_str(&format!("name = \"{name}\"\n"));
-    out.push_str(&format!("version = \"{version}\"\n\n"));
+    out.push_str(&format!("version = \"{version}\"\n"));
+
+    for key in [
+        "type",
+        "description",
+        "author",
+        "authors",
+        "homepage",
+        "license",
+        "repository",
+        "readme",
+        "keywords",
+        "categories",
+    ] {
+        if let Some(val) = package.get(key) {
+            match val {
+                Value::String(s) => out.push_str(&format!("{key} = \"{s}\"\n")),
+                Value::Array(_) => out.push_str(&format!("{key} = {}\n", format_string_array(val))),
+                _ => {}
+            }
+        }
+    }
+    out.push('\n');
 
     out.push_str("[build]\n");
     if language.starts_with('[') {
@@ -522,21 +682,36 @@ fn format_dep_value(value: &Value) -> String {
         Value::String(s) => format!("\"{s}\""),
         Value::Table(tbl) => {
             let mut parts = Vec::new();
+            if let Some(v) = tbl.get("version").and_then(|v| v.as_str()) {
+                parts.push(format!("version = \"{v}\""));
+            }
             if let Some(v) = tbl.get("path").and_then(|v| v.as_str()) {
                 parts.push(format!("path = \"{v}\""));
             }
+            if let Some(v) = tbl.get("git").and_then(|v| v.as_str()) {
+                parts.push(format!("git = \"{v}\""));
+            }
+            if let Some(v) = tbl.get("branch").and_then(|v| v.as_str()) {
+                parts.push(format!("branch = \"{v}\""));
+            }
+            if let Some(v) = tbl.get("tag").and_then(|v| v.as_str()) {
+                parts.push(format!("tag = \"{v}\""));
+            }
+            if let Some(v) = tbl.get("rev").and_then(|v| v.as_str()) {
+                parts.push(format!("rev = \"{v}\""));
+            }
+            if let Some(v) = tbl.get("default-features").and_then(|v| v.as_bool()) {
+                parts.push(format!(
+                    "default-features = {}",
+                    if v { "true" } else { "false" }
+                ));
+            }
+            if let Some(v) = tbl.get("features") {
+                parts.push(format!("features = {}", format_string_array(v)));
+            }
             if let Some(v) = tbl.get("system").and_then(|v| v.as_bool()) {
                 parts.push(format!("system = {}", if v { "true" } else { "false" }));
             }
-            if let Some(v) = tbl.get("include") {
-                parts.push(format!("include = {}", format_string_array(v)));
-            }
-            if let Some(v) = tbl.get("lib") {
-                parts.push(format!("lib = {}", format_string_array(v)));
-            }
-            if let Some(v) = tbl.get("libs") {
-                parts.push(format!("libs = {}", format_string_array(v)));
-            }
             format!("{{ {} }}", parts.join(", "))
         }
         _ => "\"\"".to_string(),
@@ -618,6 +793,21 @@ mod tests {
         assert!(config.is_ok(), "should open valid toml");
     }
 
+    #[test]
+    fn exposes_typed_config() {
+        let dir = temp_dir("typed_config");
+        let path = write_toml_file(
+            &dir,
+            "[package]\nname = \"typed\"\nversion = \"1.2.3\"\ntype = \"lib\"\n\n[build]\nlanguage = [\"c\", \"c++\"]\nstandard = \"c11\"\ncompiler = \"clang\"\nkind = \"staticlib\"\ncflags = [\"-Wall\"]\n\n[dependencies]\nfoo = \"1.0.0\"\n",
+        );
+        let config = Config::open(&path.to_string_lossy()).unwrap();
+        assert_eq!(config.package().name, "typed");
+        assert_eq!(config.typed().package.version, "1.2.3");
+        assert_eq!(config.build_config().compiler, "clang");
+        assert_eq!(config.build_config().cflags, ["-Wall"]);
+        assert!(config.typed().dependencies.contains_key("foo"));
+    }
+
     #[test]
     fn open_invalid_toml_syntax() {
         let dir = temp_dir("open_invalid");
@@ -654,6 +844,35 @@ mod tests {
         assert!(result.is_err(), "missing [build] should fail validation");
     }
 
+    #[test]
+    fn validate_wrong_field_type_fails() {
+        let dir = temp_dir("wrong_type");
+        let path = write_toml_file(
+            &dir,
+            "[package]\nname = \"test\"\nversion = \"0.1.0\"\n\n[build]\nlanguage = \"c\"\nstandard = \"c11\"\ncompiler = [\"clang\"]\nkind = \"bin\"\n\n[dependencies]\n",
+        );
+        let result = Config::open(&path.to_string_lossy());
+        assert!(
+            result.is_err(),
+            "typed config should reject wrong field types"
+        );
+    }
+
+    #[test]
+    fn validate_invalid_package_names_fail() {
+        for name in [
+            "../evil", "bad/name", "bad name", "", " name", "name ", "a.b",
+        ] {
+            let dir = temp_dir("bad_name");
+            let content = format!(
+                "[package]\nname = \"{name}\"\nversion = \"0.1.0\"\n\n[build]\nlanguage = \"c\"\nstandard = \"c11\"\ncompiler = \"clang\"\nkind = \"bin\"\n\n[dependencies]\n"
+            );
+            let path = write_toml_file(&dir, &content);
+            let result = Config::open(&path.to_string_lossy());
+            assert!(result.is_err(), "package name `{name}` should fail");
+        }
+    }
+
     #[test]
     fn validate_empty_language_fails() {
         let dir = temp_dir("empty_lang");

src/core/deps.rs

@@ -1,390 +0,0 @@
-use crate::core::config::Config;
-use sha2::{Digest, Sha256};
-use std::fs;
-use std::path::{Path, PathBuf};
-use toml::Value;
-
-#[derive(Debug, Clone)]
-pub struct DepSpec {
-    pub name: String,
-    pub path_raw: String,
-    pub include_raw: Option<Vec<String>>,
-    pub lib_raw: Option<Vec<String>>,
-    pub libs_raw: Option<Vec<String>>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ResolvedDeps {
-    pub include_dirs: Vec<String>,
-    pub lib_dirs: Vec<String>,
-    pub libs: Vec<String>,
-}
-
-pub fn resolve_deps(
-    config: &Config,
-    profile: &str,
-    target: Option<&str>,
-    project_root: &Path,
-) -> Result<ResolvedDeps, String> {
-    let project_name = config
-        .get("package.name")
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string();
-    let project_version = config
-        .get("package.version")
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string();
-    let deps = parse_dependencies(config, profile, target)?;
-    if deps.is_empty() {
-        return Ok(ResolvedDeps {
-            include_dirs: Vec::new(),
-            lib_dirs: Vec::new(),
-            libs: Vec::new(),
-        });
-    }
-
-    let mut include_dirs = Vec::new();
-    let mut lib_dirs = Vec::new();
-    let mut libs = Vec::new();
-    let mut lock_packages = Vec::new();
-
-    for dep in deps {
-        let dep_path_raw = expand_profile(&dep.path_raw, profile);
-        let dep_path = resolve_path(project_root, &dep_path_raw)?;
-        if !dep_path.is_dir() {
-            return Err(format!(
-                "Dependency '{}' path is not a directory: {}",
-                dep.name,
-                dep_path.display()
-            ));
-        }
-
-        let include = resolve_paths(&dep_path, dep.include_raw.as_deref(), &["include"], profile)?;
-        let lib = resolve_paths(
-            &dep_path,
-            dep.lib_raw.as_deref(),
-            &["lib", "lib64"],
-            profile,
-        )?;
-        let libs_list = dep
-            .libs_raw
-            .clone()
-            .unwrap_or_else(|| vec![dep.name.clone()]);
-
-        if include.is_empty() || lib.is_empty() {
-            return Err(format!(
-                "Dependency '{}' missing include/lib dirs. Add include/lib in dcr.toml.",
-                dep.name
-            ));
-        }
-
-        include_dirs.extend(include.iter().map(|p| p.to_string_lossy().to_string()));
-        lib_dirs.extend(lib.iter().map(|p| p.to_string_lossy().to_string()));
-        libs.extend(libs_list.iter().cloned());
-
-        let dep_cache = project_root
-            .join("target")
-            .join(profile)
-            .join("deps")
-            .join(&dep.name);
-        sync_dep_dir(&dep_path, &dep_cache)
-            .map_err(|err| format!("Failed to sync dep {}: {err}", dep.name))?;
-
-        let dep_version = read_dep_version(&dep_path).unwrap_or_else(|| "0.0.0".to_string());
-        let dep_checksum = compute_checksum(&dep_path)
-            .map_err(|err| format!("Failed to hash dep {}: {err}", dep.name))?;
-        lock_packages.push(DepLock {
-            name: dep.name.clone(),
-            version: dep_version,
-            checksum: dep_checksum,
-            source: format!("path+{}", dep.path_raw),
-        });
-    }
-
-    write_lock(
-        project_root,
-        &project_name,
-        &project_version,
-        &lock_packages,
-    )?;
-
-    Ok(ResolvedDeps {
-        include_dirs,
-        lib_dirs,
-        libs,
-    })
-}
-
-#[derive(Debug, Clone)]
-struct DepLock {
-    name: String,
-    version: String,
-    checksum: String,
-    source: String,
-}
-
-fn parse_dependencies(
-    config: &Config,
-    profile: &str,
-    target: Option<&str>,
-) -> Result<Vec<DepSpec>, String> {
-    let mut deps_table = None;
-    // Order: dependencies.target.profile, dependencies.profile.target, dependencies.target, dependencies.profile, dependencies
-    let combinations = if let Some(t) = target {
-        let normalized_t = crate::cli::build::normalize_target_os(t);
-        vec![
-            format!("dependencies.{}.{}", normalized_t, profile),
-            format!("dependencies.{}.{}", profile, normalized_t),
-            format!("dependencies.{}", normalized_t),
-            format!("dependencies.{}", profile),
-            "dependencies".to_string(),
-        ]
-    } else {
-        vec![
-            format!("dependencies.{}", profile),
-            "dependencies".to_string(),
-        ]
-    };
-    for key in combinations {
-        if let Some(val) = config.get(&key).and_then(|v| v.as_table()) {
-            deps_table = Some(val);
-            break;
-        }
-    }
-    let deps_table = match deps_table {
-        Some(t) => t,
-        None => return Ok(Vec::new()),
-    };
-    let mut deps = Vec::new();
-    for (name, value) in deps_table {
-        match value {
-            Value::Table(tbl) => {
-                if tbl.get("system").and_then(|v| v.as_bool()).unwrap_or(false) {
-                    return Err(format!(
-                        "Dependency '{}' uses system=true, which is not supported yet",
-                        name
-                    ));
-                }
-                let path = tbl
-                    .get("path")
-                    .and_then(|v| v.as_str())
-                    .ok_or_else(|| format!("Dependency '{}' missing path", name))?
-                    .to_string();
-                let include = parse_string_list(tbl.get("include"), name, "include")?;
-                let lib = parse_string_list(tbl.get("lib"), name, "lib")?;
-                let libs = parse_string_list(tbl.get("libs"), name, "libs")?;
-                deps.push(DepSpec {
-                    name: name.to_string(),
-                    path_raw: path,
-                    include_raw: include,
-                    lib_raw: lib,
-                    libs_raw: libs,
-                });
-            }
-            _ => {
-                return Err(format!(
-                    "Dependency '{}' must be a table with path/include/lib",
-                    name
-                ));
-            }
-        }
-    }
-    deps.sort_by(|a, b| a.name.cmp(&b.name));
-    Ok(deps)
-}
-
-fn parse_string_list(
-    value: Option<&Value>,
-    dep_name: &str,
-    key: &str,
-) -> Result<Option<Vec<String>>, String> {
-    let Some(value) = value else { return Ok(None) };
-    let list = value.as_array().ok_or_else(|| {
-        format!(
-            "Dependency '{}' field '{}' must be an array of strings",
-            dep_name, key
-        )
-    })?;
-    let mut out = Vec::new();
-    for item in list {
-        let s = item
-            .as_str()
-            .ok_or_else(|| format!("Dependency '{}' field '{}' must be strings", dep_name, key))?;
-        out.push(s.to_string());
-    }
-    Ok(Some(out))
-}
-
-fn resolve_path(project_root: &Path, raw: &str) -> Result<PathBuf, String> {
-    let p = Path::new(raw);
-    let full = if p.is_absolute() {
-        p.to_path_buf()
-    } else {
-        project_root.join(p)
-    };
-    Ok(full)
-}
-
-fn resolve_paths(
-    base: &Path,
-    raw: Option<&[String]>,
-    defaults: &[&str],
-    profile: &str,
-) -> Result<Vec<PathBuf>, String> {
-    let mut out = Vec::new();
-    if let Some(raw) = raw {
-        for r in raw {
-            let expanded = expand_profile(r, profile);
-            let p = Path::new(&expanded);
-            let full = if p.is_absolute() {
-                p.to_path_buf()
-            } else {
-                base.join(p)
-            };
-            if !full.exists() {
-                return Err(format!("Path does not exist: {}", full.display()));
-            }
-            out.push(full);
-        }
-        return Ok(out);
-    }
-
-    for d in defaults {
-        let candidate = base.join(d);
-        if candidate.exists() {
-            out.push(candidate);
-        }
-    }
-    Ok(out)
-}
-
-fn expand_profile(raw: &str, profile: &str) -> String {
-    raw.replace("{profile}", profile)
-}
-
-fn sync_dep_dir(src: &Path, dst: &Path) -> std::io::Result<()> {
-    if dst.exists() {
-        fs::remove_dir_all(dst)?;
-    }
-    copy_dir_all(src, dst)
-}
-
-fn copy_dir_all(src: &Path, dst: &Path) -> std::io::Result<()> {
-    fs::create_dir_all(dst)?;
-    for entry in fs::read_dir(src)? {
-        let entry = entry?;
-        let ty = entry.file_type()?;
-        let from = entry.path();
-        let to = dst.join(entry.file_name());
-        if ty.is_dir() {
-            copy_dir_all(&from, &to)?;
-        } else {
-            fs::copy(&from, &to)?;
-        }
-    }
-    Ok(())
-}
-
-fn write_lock(
-    project_root: &Path,
-    project_name: &str,
-    project_version: &str,
-    packages: &[DepLock],
-) -> Result<(), String> {
-    let mut out = String::new();
-    if !packages.is_empty() {
-        out.push_str("[[package]]\n");
-        out.push_str(&format!("name = \"{}\"\n", escape_value(project_name)));
-        out.push_str(&format!(
-            "version = \"{}\"\n",
-            escape_value(project_version)
-        ));
-        out.push_str(&format!(
-            "dependencies = [{}]\n\n",
-            quote_list(&packages.iter().map(|p| p.name.clone()).collect::<Vec<_>>())
-        ));
-    }
-    for pkg in packages {
-        out.push_str("[[package]]\n");
-        out.push_str(&format!("name = \"{}\"\n", escape_value(&pkg.name)));
-        out.push_str(&format!("version = \"{}\"\n", escape_value(&pkg.version)));
-        out.push_str(&format!("source = \"{}\"\n", escape_value(&pkg.source)));
-        out.push_str(&format!("checksum = \"{}\"\n", escape_value(&pkg.checksum)));
-        out.push('\n');
-    }
-    fs::write(project_root.join("dcr.lock"), out)
-        .map_err(|err| format!("Failed to write dcr.lock: {err}"))?;
-    Ok(())
-}
-
-fn quote_list(items: &[String]) -> String {
-    items
-        .iter()
-        .map(|s| format!("\"{}\"", escape_value(s)))
-        .collect::<Vec<_>>()
-        .join(", ")
-}
-
-fn escape_value(input: &str) -> String {
-    input.replace('\\', "\\\\").replace('"', "\\\"")
-}
-
-fn read_dep_version(dep_path: &Path) -> Option<String> {
-    let path = dep_path.join("dcr.toml");
-    let content = fs::read_to_string(path).ok()?;
-    let value: Value = content.parse().ok()?;
-    value
-        .get("package")
-        .and_then(|v| v.as_table())
-        .and_then(|t| t.get("version"))
-        .and_then(|v| v.as_str())
-        .map(|s| s.to_string())
-}
-
-fn compute_checksum(root: &Path) -> Result<String, String> {
-    let mut files = Vec::new();
-    collect_files(root, root, &mut files)?;
-    files.sort();
-    let mut hasher = Sha256::new();
-    for rel in files {
-        hasher.update(rel.as_bytes());
-        let data =
-            fs::read(root.join(&rel)).map_err(|err| format!("failed to read {}: {err}", rel))?;
-        hasher.update(&data);
-    }
-    let hash = hasher.finalize();
-    Ok(to_hex(&hash))
-}
-
-fn collect_files(root: &Path, dir: &Path, out: &mut Vec<String>) -> Result<(), String> {
-    for entry in fs::read_dir(dir).map_err(|err| format!("read_dir failed: {err}"))? {
-        let entry = entry.map_err(|err| format!("read_dir failed: {err}"))?;
-        let path = entry.path();
-        let name = entry.file_name();
-        let name_str = name.to_string_lossy();
-        if name_str == "target" {
-            continue;
-        }
-        if path.is_dir() {
-            collect_files(root, &path, out)?;
-        } else if path.is_file() {
-            let rel = path
-                .strip_prefix(root)
-                .unwrap_or(&path)
-                .to_string_lossy()
-                .to_string();
-            out.push(rel);
-        }
-    }
-    Ok(())
-}
-
-fn to_hex(bytes: &[u8]) -> String {
-    let mut out = String::with_capacity(bytes.len() * 2);
-    for b in bytes {
-        out.push_str(&format!("{:02x}", b));
-    }
-    out
-}

src/core/deps/common.rs

@@ -0,0 +1,111 @@
+#[allow(dead_code)]
+use std::fs;
+use std::path::{Path, PathBuf};
+
+#[derive(Debug, Clone)]
+#[allow(dead_code)]
+pub enum DepSource {
+    Path(String),
+    Git {
+        url: String,
+        branch: Option<String>,
+        tag: Option<String>,
+        rev: Option<String>,
+    },
+    Registry {
+        version: String,
+        features: Option<Vec<String>>,
+    },
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Clone)]
+pub struct DepSpec {
+    pub name: String,
+    pub source: DepSource,
+    pub include_raw: Option<Vec<String>>,
+    pub lib_raw: Option<Vec<String>>,
+    pub libs_raw: Option<Vec<String>>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct ResolvedDeps {
+    pub include_dirs: Vec<String>,
+    pub lib_dirs: Vec<String>,
+    pub libs: Vec<String>,
+}
+
+#[allow(dead_code)]
+pub fn resolve_path(project_root: &Path, raw: &str) -> Result<PathBuf, String> {
+    let p = Path::new(raw);
+    let full = if p.is_absolute() {
+        p.to_path_buf()
+    } else {
+        project_root.join(p)
+    };
+    Ok(full)
+}
+
+#[allow(dead_code)]
+pub fn resolve_paths(
+    base: &Path,
+    raw: Option<&[String]>,
+    defaults: &[&str],
+    profile: &str,
+) -> Result<Vec<PathBuf>, String> {
+    let mut out = Vec::new();
+    if let Some(raw) = raw {
+        for r in raw {
+            let expanded = expand_profile(r, profile);
+            let p = Path::new(&expanded);
+            let full = if p.is_absolute() {
+                p.to_path_buf()
+            } else {
+                base.join(p)
+            };
+            if !full.exists() {
+                return Err(format!("Path does not exist: {}", full.display()));
+            }
+            out.push(full);
+        }
+        return Ok(out);
+    }
+
+    for d in defaults {
+        let candidate = base.join(d);
+        if candidate.exists() {
+            out.push(candidate);
+        }
+    }
+    Ok(out)
+}
+
+#[allow(dead_code)]
+pub fn expand_profile(raw: &str, profile: &str) -> String {
+    raw.replace("{profile}", profile)
+}
+
+#[allow(dead_code)]
+pub fn sync_dep_dir(src: &Path, dst: &Path) -> std::io::Result<()> {
+    if dst.exists() {
+        fs::remove_dir_all(dst)?;
+    }
+    copy_dir_all(src, dst)
+}
+
+#[allow(dead_code)]
+pub fn copy_dir_all(src: &Path, dst: &Path) -> std::io::Result<()> {
+    fs::create_dir_all(dst)?;
+    for entry in fs::read_dir(src)? {
+        let entry = entry?;
+        let ty = entry.file_type()?;
+        let from = entry.path();
+        let to = dst.join(entry.file_name());
+        if ty.is_dir() {
+            copy_dir_all(&from, &to)?;
+        } else {
+            fs::copy(&from, &to)?;
+        }
+    }
+    Ok(())
+}

src/core/deps/git.rs

@@ -0,0 +1,54 @@
+use std::path::Path;
+
+#[allow(dead_code)]
+pub fn fetch_git_dep(
+    url: &str,
+    target_dir: &Path,
+    branch: Option<&str>,
+    tag: Option<&str>,
+    rev: Option<&str>,
+) -> Result<(), String> {
+    if target_dir.exists() {
+        return Ok(());
+    }
+
+    let mut builder = git2::build::RepoBuilder::new();
+    if let Some(b) = branch {
+        builder.branch(b);
+    }
+
+    let repo = builder
+        .clone(url, target_dir)
+        .map_err(|e| format!("failed to clone {}: {}", url, e))?;
+
+    if let Some(t) = tag {
+        checkout_ref(&repo, &format!("refs/tags/{}", t))?;
+    } else if let Some(r) = rev {
+        checkout_ref(&repo, r)?;
+    }
+
+    Ok(())
+}
+
+#[allow(dead_code)]
+fn checkout_ref(repo: &git2::Repository, reference_str: &str) -> Result<(), String> {
+    let (object, reference) = repo
+        .revparse_ext(reference_str)
+        .map_err(|e| format!("failed to find ref {}: {}", reference_str, e))?;
+
+    repo.checkout_tree(&object, None).map_err(|e| {
+        let ref_name = reference.as_ref().and_then(|r| r.name()).unwrap_or("HEAD");
+        format!("failed to checkout {}: {}", ref_name, e)
+    })?;
+
+    match reference {
+        Some(gref) => {
+            let ref_name = gref.name().unwrap_or("HEAD");
+            repo.set_head(ref_name)
+        }
+        None => repo.set_head_detached(object.id()),
+    }
+    .map_err(|e| format!("failed to set HEAD: {}", e))?;
+
+    Ok(())
+}

src/core/deps/lock.rs

@@ -0,0 +1,120 @@
+use sha2::{Digest, Sha256};
+use std::fs;
+use std::path::Path;
+use toml::Value;
+
+#[derive(Debug, Clone)]
+pub struct DepLock {
+    pub name: String,
+    pub version: String,
+    pub checksum: String,
+    pub source: String,
+}
+
+pub fn write_lock(
+    project_root: &Path,
+    project_name: &str,
+    project_version: &str,
+    packages: &[DepLock],
+) -> Result<(), String> {
+    let mut out = String::new();
+    out.push_str("[[package]]\n");
+    out.push_str(&format!("name = \"{}\"\n", escape_value(project_name)));
+    out.push_str(&format!(
+        "version = \"{}\"\n",
+        escape_value(project_version)
+    ));
+    if !packages.is_empty() {
+        out.push_str(&format!(
+            "dependencies = [{}]\n",
+            quote_list(&packages.iter().map(|p| p.name.clone()).collect::<Vec<_>>())
+        ));
+    }
+    out.push('\n');
+
+    for pkg in packages {
+        out.push_str("[[package]]\n");
+        out.push_str(&format!("name = \"{}\"\n", escape_value(&pkg.name)));
+        out.push_str(&format!("version = \"{}\"\n", escape_value(&pkg.version)));
+        out.push_str(&format!("source = \"{}\"\n", escape_value(&pkg.source)));
+        out.push_str(&format!("checksum = \"{}\"\n", escape_value(&pkg.checksum)));
+        out.push('\n');
+    }
+    fs::write(project_root.join("dcr.lock"), out)
+        .map_err(|err| format!("Failed to write dcr.lock: {err}"))?;
+    Ok(())
+}
+
+fn quote_list(items: &[String]) -> String {
+    items
+        .iter()
+        .map(|s| format!("\"{}\"", escape_value(s)))
+        .collect::<Vec<_>>()
+        .join(", ")
+}
+
+fn escape_value(input: &str) -> String {
+    input.replace('\\', "\\\\").replace('"', "\\\"")
+}
+
+#[allow(dead_code)]
+pub fn read_dep_version(dep_path: &Path) -> Option<String> {
+    let path = dep_path.join("dcr.toml");
+    let content = fs::read_to_string(path).ok()?;
+    let value: Value = content.parse().ok()?;
+    value
+        .get("package")
+        .and_then(|v| v.as_table())
+        .and_then(|t| t.get("version"))
+        .and_then(|v| v.as_str())
+        .map(|s| s.to_string())
+}
+
+#[allow(dead_code)]
+pub fn compute_checksum(root: &Path) -> Result<String, String> {
+    let mut files = Vec::new();
+    collect_files(root, root, &mut files)?;
+    files.sort();
+    let mut hasher = Sha256::new();
+    for rel in files {
+        hasher.update(rel.as_bytes());
+        let data =
+            fs::read(root.join(&rel)).map_err(|err| format!("failed to read {}: {err}", rel))?;
+        hasher.update(&data);
+    }
+    let hash = hasher.finalize();
+    Ok(to_hex(&hash))
+}
+
+#[allow(dead_code)]
+fn collect_files(root: &Path, dir: &Path, out: &mut Vec<String>) -> Result<(), String> {
+    for entry in fs::read_dir(dir).map_err(|err| format!("read_dir failed: {err}"))? {
+        let entry = entry.map_err(|err| format!("read_dir failed: {err}"))?;
+        let path = entry.path();
+        let name = entry.file_name();
+        let name_str = name.to_string_lossy();
+        if name_str == "target" {
+            continue;
+        }
+        if path.is_dir() {
+            collect_files(root, &path, out)?;
+        } else if path.is_file() {
+            let rel = path
+                .strip_prefix(root)
+                .unwrap_or(&path)
+                .to_string_lossy()
+                .to_string();
+            out.push(rel);
+        }
+    }
+    Ok(())
+}
+
+#[allow(dead_code)]
+fn to_hex(bytes: &[u8]) -> String {
+    let mut out = String::with_capacity(bytes.len() * 2);
+    for b in bytes {
+        out.push_str(&format!("{:02x}", b));
+    }
+    out
+}

src/core/deps/mod.rs

@@ -0,0 +1,166 @@
+pub mod common;
+pub mod git;
+pub mod lock;
+pub mod register;
+
+use crate::core::config::Config;
+use crate::core::deps::common::ResolvedDeps;
+use std::path::Path;
+
+pub fn resolve_deps(
+    config: &Config,
+    _profile: &str,
+    _target: Option<&str>,
+    project_root: &Path,
+) -> Result<ResolvedDeps, String> {
+    let mut resolved = ResolvedDeps::default();
+    let project_name = config
+        .get("package.name")
+        .and_then(|v| v.as_str())
+        .unwrap_or("")
+        .to_string();
+    let project_version = config
+        .get("package.version")
+        .and_then(|v| v.as_str())
+        .unwrap_or("")
+        .to_string();
+
+    let deps_table = config.get("dependencies").and_then(|v| v.as_table());
+    let lock_packages = Vec::new();
+
+    if let Some(deps) = deps_table {
+        for (name, value) in deps {
+            if register::is_registry_dep(value) {
+                let pkg_info = register::resolve_package_from_registry(name)?;
+                let dep_root = register::package_root_from_registry_info(&pkg_info)?;
+
+                resolved.include_dirs.push(
+                    register::registry_include_dir(&dep_root)
+                        .to_string_lossy()
+                        .to_string(),
+                );
+                resolved.lib_dirs.push(
+                    register::registry_lib_dir(&dep_root)
+                        .to_string_lossy()
+                        .to_string(),
+                );
+                resolved.libs.push(name.clone());
+            } else if let Some(path) = path_dep_path(value) {
+                let dep_root = project_root.join(path);
+                if let Some(table) = value.as_table() {
+                    if let Some(includes) = table.get("include").and_then(|v| v.as_array()) {
+                        for inc in includes {
+                            if let Some(inc_str) = inc.as_str() {
+                                resolved
+                                    .include_dirs
+                                    .push(dep_root.join(inc_str).to_string_lossy().to_string());
+                            }
+                        }
+                    } else {
+                        push_if_exists(&mut resolved.include_dirs, &dep_root.join("include"));
+                    }
+
+                    if let Some(lib_dirs) = table.get("lib").and_then(|v| v.as_array()) {
+                        for lib_dir in lib_dirs {
+                            if let Some(lib_dir_str) = lib_dir.as_str() {
+                                resolved
+                                    .lib_dirs
+                                    .push(dep_root.join(lib_dir_str).to_string_lossy().to_string());
+                            }
+                        }
+                    } else {
+                        push_default_lib_dirs(&mut resolved.lib_dirs, &dep_root);
+                    }
+
+                    if let Some(libs) = table.get("libs").and_then(|v| v.as_array()) {
+                        for lib in libs {
+                            if let Some(lib_str) = lib.as_str() {
+                                resolved.libs.push(lib_str.to_string());
+                            }
+                        }
+                    } else {
+                        resolved.libs.push(name.clone());
+                    }
+                } else {
+                    push_if_exists(&mut resolved.include_dirs, &dep_root.join("include"));
+                    push_default_lib_dirs(&mut resolved.lib_dirs, &dep_root);
+                    resolved.libs.push(name.clone());
+                }
+            }
+        }
+    }
+
+    crate::core::deps::lock::write_lock(
+        project_root,
+        &project_name,
+        &project_version,
+        &lock_packages,
+    )?;
+
+    Ok(resolved)
+}
+
+fn path_dep_path(value: &toml::Value) -> Option<&str> {
+    if let Some(table) = value.as_table() {
+        return table.get("path").and_then(|v| v.as_str());
+    }
+    register::path_from_string_dep(value)
+}
+
+fn push_if_exists(paths: &mut Vec<String>, path: &Path) {
+    if path.exists() {
+        paths.push(path.to_string_lossy().to_string());
+    }
+}
+
+fn push_default_lib_dirs(paths: &mut Vec<String>, dep_root: &Path) {
+    for dir in ["lib", "lib64"] {
+        push_if_exists(paths, &dep_root.join(dir));
+    }
+    push_if_exists(paths, &dep_root.join("target").join("lib"));
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use toml::Value;
+
+    #[test]
+    fn path_dep_path_supports_table_and_legacy_strings() {
+        let table = Value::Table(
+            [(
+                "path".to_string(),
+                Value::String("./libs/mylib".to_string()),
+            )]
+            .into_iter()
+            .collect(),
+        );
+        assert_eq!(path_dep_path(&table), Some("./libs/mylib"));
+        assert_eq!(
+            path_dep_path(&Value::String("path:./libs/mylib".to_string())),
+            Some("./libs/mylib")
+        );
+        assert_eq!(
+            path_dep_path(&Value::String("./libs/mylib".to_string())),
+            Some("./libs/mylib")
+        );
+        assert_eq!(path_dep_path(&Value::String("1.2.3".to_string())), None);
+    }
+
+    #[test]
+    fn default_lib_dirs_include_packaged_library_output() {
+        let root = std::env::temp_dir().join(format!(
+            "dcr_default_lib_dirs_{}_{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ));
+        std::fs::create_dir_all(root.join("target/lib")).unwrap();
+        let mut paths = Vec::new();
+        push_default_lib_dirs(&mut paths, &root);
+        assert!(paths.iter().any(|p| p.ends_with("target/lib")));
+        let _ = std::fs::remove_dir_all(root);
+    }
+}

src/core/deps/register.rs

@@ -0,0 +1,196 @@
+use serde::{Deserialize, Serialize};
+use serde_json::Value as JsonValue;
+use std::fs;
+use std::path::{Path, PathBuf};
+use toml::Value as TomlValue;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Registry {
+    pub url: String,
+    pub priority: i32,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct DcrConfig {
+    pub registry: std::collections::HashMap<String, Registry>,
+}
+
+pub fn get_registry_config() -> Option<DcrConfig> {
+    let home = std::env::var("HOME").ok()?;
+    let config_path = Path::new(&home).join(".dcr/config.toml");
+    if !config_path.exists() {
+        return None;
+    }
+
+    let content = fs::read_to_string(config_path).ok()?;
+    toml::from_str(&content).ok()
+}
+
+pub fn get_index_path() -> PathBuf {
+    std::env::var("DCR_INDEX_PATH")
+        .map(PathBuf::from)
+        .unwrap_or_else(|_| {
+            let home = std::env::var("HOME").unwrap_or_else(|_| ".".to_string());
+            Path::new(&home).join(".dcr").join("index.json")
+        })
+}
+
+pub fn get_registry_cache_root() -> PathBuf {
+    get_index_path()
+        .parent()
+        .map(Path::to_path_buf)
+        .unwrap_or_else(|| PathBuf::from("."))
+}
+
+pub fn package_root_from_registry_info(pkg_info: &JsonValue) -> Result<PathBuf, String> {
+    let raw_path = pkg_info
+        .get("path")
+        .and_then(|v| v.as_str())
+        .ok_or("Registry package is missing path")?;
+    if raw_path.trim().is_empty() {
+        return Err("Registry package path is empty".to_string());
+    }
+
+    let path = Path::new(raw_path);
+    let full_path = if path.is_absolute() {
+        path.to_path_buf()
+    } else {
+        get_registry_cache_root().join(path)
+    };
+
+    if full_path.file_name().and_then(|v| v.to_str()) == Some("dcr.toml") {
+        return full_path
+            .parent()
+            .map(Path::to_path_buf)
+            .ok_or_else(|| format!("Invalid registry package path: {}", full_path.display()));
+    }
+
+    Ok(full_path)
+}
+
+pub fn registry_include_dir(dep_root: &Path) -> PathBuf {
+    dep_root.join("target").join("include")
+}
+
+pub fn registry_lib_dir(dep_root: &Path) -> PathBuf {
+    dep_root.join("target").join("lib")
+}
+
+pub fn resolve_package_from_registry(name: &str) -> Result<JsonValue, String> {
+    let config = get_registry_config().ok_or("No registry config found")?;
+    let mut registries: Vec<(&String, &Registry)> = config.registry.iter().collect();
+    registries.sort_by_key(|b| std::cmp::Reverse(b.1.priority));
+
+    for (_name_reg, _reg) in registries {
+        let index_path = get_index_path();
+        if index_path.exists() {
+            let index_content = fs::read_to_string(&index_path).map_err(|e| e.to_string())?;
+            let index: JsonValue =
+                serde_json::from_str(&index_content).map_err(|e| e.to_string())?;
+            if let Some(pkgs) = index.get("packages").and_then(|v| v.as_array()) {
+                for pkg in pkgs {
+                    if pkg.get("name").and_then(|v| v.as_str()) == Some(name) {
+                        return Ok(pkg.clone());
+                    }
+                }
+            }
+        }
+    }
+    Err(format!(
+        "Package {} not found in registry (checked: {:?})",
+        name,
+        get_index_path()
+    ))
+}
+
+pub fn is_registry_dep(value: &TomlValue) -> bool {
+    if let Some(raw) = value.as_str() {
+        let raw = raw.trim();
+        return !is_path_like_string(raw) && !is_git_like_string(raw);
+    }
+    if let Some(table) = value.as_table() {
+        return !table.contains_key("git")
+            && !table.contains_key("path")
+            && !table.contains_key("url")
+            && !table.contains_key("version");
+    }
+    false
+}
+
+pub fn path_from_string_dep(value: &TomlValue) -> Option<&str> {
+    let raw = value.as_str()?.trim();
+    if let Some(path) = raw.strip_prefix("path:") {
+        return Some(path);
+    }
+    if is_path_like_string(raw) {
+        return Some(raw);
+    }
+    None
+}
+
+fn is_path_like_string(raw: &str) -> bool {
+    raw.starts_with("path:")
+        || raw.starts_with("./")
+        || raw.starts_with("../")
+        || raw.starts_with('/')
+        || raw.starts_with("~/")
+        || raw.contains('\\')
+}
+
+fn is_git_like_string(raw: &str) -> bool {
+    raw.starts_with("git:")
+        || raw.starts_with("github:")
+        || raw.starts_with("gitlab:")
+        || raw.starts_with("http://")
+        || raw.starts_with("https://")
+        || raw.starts_with("git@")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use toml::map::Map;
+
+    #[test]
+    fn registry_dep_detection_excludes_local_and_git_strings() {
+        assert!(is_registry_dep(&TomlValue::String("1.2.3".to_string())));
+        assert!(!is_registry_dep(&TomlValue::String(
+            "path:./libs/mylib".to_string()
+        )));
+        assert!(!is_registry_dep(&TomlValue::String(
+            "./libs/mylib".to_string()
+        )));
+        assert!(!is_registry_dep(&TomlValue::String(
+            "git:https://example.com/repo.git".to_string()
+        )));
+    }
+
+    #[test]
+    fn registry_dep_detection_excludes_source_tables() {
+        let mut path_table = Map::new();
+        path_table.insert(
+            "path".to_string(),
+            TomlValue::String("./libs/mylib".to_string()),
+        );
+        assert!(!is_registry_dep(&TomlValue::Table(path_table)));
+
+        let mut registry_table = Map::new();
+        registry_table.insert("features".to_string(), TomlValue::Array(Vec::new()));
+        assert!(is_registry_dep(&TomlValue::Table(registry_table)));
+    }
+
+    #[test]
+    fn registry_package_root_accepts_package_dir_or_manifest_path() {
+        let pkg = serde_json::json!({ "path": "/tmp/pkg" });
+        assert_eq!(
+            package_root_from_registry_info(&pkg).unwrap(),
+            PathBuf::from("/tmp/pkg")
+        );
+
+        let pkg = serde_json::json!({ "path": "/tmp/pkg/dcr.toml" });
+        assert_eq!(
+            package_root_from_registry_info(&pkg).unwrap(),
+            PathBuf::from("/tmp/pkg")
+        );
+    }
+}

src/core/mod.rs

@@ -1,5 +1,6 @@
 pub mod builder;
 pub mod config;
 pub mod deps;
+pub mod registry;
 pub mod runner;
 pub mod workspace;

src/core/registry.rs

@@ -0,0 +1,41 @@
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::fs;
+use std::path::PathBuf;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Registry {
+    pub url: String,
+    pub priority: i32,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Config {
+    pub registry: HashMap<String, Registry>,
+}
+
+pub struct RegistryManager {
+    pub config: Config,
+    #[allow(dead_code)]
+    pub path: PathBuf,
+}
+
+impl RegistryManager {
+    pub fn load() -> Result<Self, Box<dyn std::error::Error>> {
+        let home = std::env::var("HOME")?;
+        let dcr_dir = PathBuf::from(home).join(".dcr");
+        let config_path = dcr_dir.join("config.toml");
+
+        if !config_path.exists() {
+            return Err("Config file ~/.dcr/config.toml not found".into());
+        }
+
+        let content = fs::read_to_string(&config_path)?;
+        let config: Config = toml::from_str(&content)?;
+
+        Ok(Self {
+            config,
+            path: dcr_dir,
+        })
+    }
+}

src/core/runner.rs

@@ -1,44 +1,21 @@
 use crate::platform;
-use crate::utils::fs::check_dir;
-use crate::utils::log::warn;
 use std::path::Path;
 use std::process::Command;
 
 pub fn run_binary(project_name: &str, profile: &str, target_dir: Option<&str>) -> i32 {
     let bin_path = platform::bin_path(profile, project_name, target_dir);
     if Path::new(&bin_path).exists() {
-        let output = Command::new(&bin_path)
-            .output()
-            .unwrap_or_else(|_| panic!("Failed to run {}", bin_path));
-        print!("{}", String::from_utf8_lossy(&output.stdout));
-        eprint!("{}", String::from_utf8_lossy(&output.stderr));
-        return output.status.code().unwrap_or(1);
+        let output = Command::new(&bin_path).output();
+        match output {
+            Ok(o) => {
+                print!("{}", String::from_utf8_lossy(&o.stdout));
+                eprint!("{}", String::from_utf8_lossy(&o.stderr));
+                return o.status.code().unwrap_or(0);
+            }
+            Err(_) => {
+                return 1;
+            }
+        }
     }
-
-    if target_dir.is_none()
-        && check_dir(Some(&format!("target/{profile}")))
-            .unwrap_or_default()
-            .contains(&profile.to_string())
-    {
-        warn("Launch of the latest release");
-        let bin_path = platform::bin_path(profile, project_name, target_dir);
-        let output = Command::new(&bin_path)
-            .output()
-            .unwrap_or_else(|_| panic!("Failed to run {}", &bin_path));
-        print!("{}", String::from_utf8_lossy(&output.stdout));
-        eprint!("{}", String::from_utf8_lossy(&output.stderr));
-        return output.status.code().unwrap_or(1);
-    }
-
-    if target_dir.is_some() && Path::new(&bin_path).exists() {
-        warn("Launch of the latest release");
-        let output = Command::new(&bin_path)
-            .output()
-            .unwrap_or_else(|_| panic!("Failed to run {}", &bin_path));
-        print!("{}", String::from_utf8_lossy(&output.stdout));
-        eprint!("{}", String::from_utf8_lossy(&output.stderr));
-        return output.status.code().unwrap_or(1);
-    }
-
     1
 }

src/core/workspace.rs

@@ -1,4 +1,5 @@
 use crate::core::config::Config;
+use crate::utils::build::normalize_target_os;
 use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use toml::Value;
@@ -24,7 +25,7 @@ pub fn parse_workspace(
     let mut table = None;
     // Order: workspace.target.profile, workspace.profile.target, workspace.target, workspace.profile, workspace
     let combinations = if let Some(t) = target {
-        let normalized_t = crate::cli::build::normalize_target_os(t);
+        let normalized_t = normalize_target_os(t);
         vec![
             format!("workspace.{}.{}", normalized_t, profile),
             format!("workspace.{}.{}", profile, normalized_t),

src/main.rs

@@ -18,8 +18,11 @@ fn main() {
     let code = match cmd {
         "new" => cli::r#new::new(rest),
         "init" => cli::init::init(rest),
+        "setup" => cli::setup::setup(rest),
+        "add" => cli::add::add(rest),
         "build" => cli::build::build(rest),
         "run" => cli::run::run(rest),
+        "tree" => cli::tree::tree(rest),
         "test" | "tests" => cli::test::test(rest),
         "clean" => cli::clean::clean(rest),
         "gen" => cli::r#gen::r#gen(rest),

src/platform/linux.rs

@@ -1,7 +1,11 @@
 pub fn bin_path(profile: &str, name: &str, target_dir: Option<&str>) -> String {
     match target_dir {
         Some(dir) => format!("{}/{}", dir.trim_end_matches('/'), name),
-        None => format!("./target/{profile}/{name}"),
+        None => {
+            let arch = std::env::consts::ARCH;
+            let target = format!("{arch}-unknown-linux-gnu");
+            format!("./target/{target}/{profile}/{name}")
+        }
     }
 }
 
@@ -25,12 +29,16 @@ mod tests {
 
     #[test]
     fn bin_path_default() {
-        assert_eq!(bin_path("debug", "hello", None), "./target/debug/hello");
+        let arch = std::env::consts::ARCH;
+        let expected = format!("./target/{arch}-unknown-linux-gnu/debug/hello");
+        assert_eq!(bin_path("debug", "hello", None), expected);
     }
 
     #[test]
     fn bin_path_release() {
-        assert_eq!(bin_path("release", "hello", None), "./target/release/hello");
+        let arch = std::env::consts::ARCH;
+        let expected = format!("./target/{arch}-unknown-linux-gnu/release/hello");
+        assert_eq!(bin_path("release", "hello", None), expected);
     }
 
     #[test]

src/utils/build.rs

@@ -0,0 +1,376 @@
+use crate::core::config::Config;
+use crate::utils::log::warn;
+
+pub struct VersionInfo {
+    pub full: String,
+    pub major: String,
+    pub minor: String,
+    pub patch: String,
+    pub suffix: String,
+    pub suffix_dash: String,
+}
+
+pub fn parse_version_info(version: &str) -> VersionInfo {
+    let mut full = version.trim().to_string();
+    if full.is_empty() {
+        full = "0.0.0".to_string();
+    }
+    let full_clone = full.clone();
+    let (base, suffix) = match full_clone.split_once('-') {
+        Some((head, tail)) => (head, tail),
+        None => (full_clone.as_str(), ""),
+    };
+    let mut parts = base.split('.');
+    let major = parts.next().unwrap_or("0").to_string();
+    let minor = parts.next().unwrap_or("0").to_string();
+    let patch = parts.next().unwrap_or("0").to_string();
+    let suffix_dash = if suffix.is_empty() {
+        "".to_string()
+    } else {
+        format!("-{suffix}")
+    };
+    VersionInfo {
+        full,
+        major,
+        minor,
+        patch,
+        suffix: suffix.to_string(),
+        suffix_dash,
+    }
+}
+
+pub fn normalize_target_os(target: &str) -> &str {
+    match target {
+        "linux" => "x86_64-unknown-linux-gnu",
+        "macos" => "x86_64-apple-darwin",
+        "windows" => "x86_64-pc-windows-msvc",
+        _ if target.contains('-') => target,
+        _ => {
+            warn(&format!(
+                "Unknown target '{}', using as-is. Supported short names: linux, macos, windows",
+                target
+            ));
+            target
+        }
+    }
+}
+
+pub fn get_config_str(config: &Config, key: &str) -> String {
+    config
+        .get(key)
+        .and_then(|v| v.as_str())
+        .unwrap_or("")
+        .to_string()
+}
+
+pub fn profile_table<'a>(config: &'a Config, profile: &str) -> Option<&'a toml::value::Table> {
+    config
+        .get("build")
+        .and_then(|v| v.as_table())
+        .and_then(|b| b.get(profile))
+        .and_then(|v| v.as_table())
+}
+
+pub fn get_config_opt(config: &Config, key: &str) -> Option<String> {
+    let value = config.get(key)?.as_str()?;
+    let trimmed = value.trim();
+    if trimmed.is_empty() {
+        None
+    } else {
+        Some(trimmed.to_string())
+    }
+}
+
+pub fn get_string_with_profile(config: &Config, field: &str, profile: &str) -> String {
+    let base = get_config_str(config, &format!("build.{field}"));
+    let Some(table) = profile_table(config, profile) else {
+        return base;
+    };
+    let value = table.get(field).and_then(|v| v.as_str()).unwrap_or("");
+    let trimmed = value.trim();
+    if trimmed.is_empty() {
+        base
+    } else {
+        trimmed.to_string()
+    }
+}
+
+pub fn get_config_list(config: &Config, key: &str) -> Vec<String> {
+    config
+        .get(key)
+        .and_then(|v| v.as_array())
+        .map(|arr| {
+            arr.iter()
+                .filter_map(|v| v.as_str())
+                .map(|s| s.to_string())
+                .collect()
+        })
+        .unwrap_or_default()
+}
+
+pub fn get_list_with_profile(config: &Config, field: &str, profile: &str) -> Vec<String> {
+    let mut out = get_config_list(config, &format!("build.{field}"));
+    if let Some(table) = profile_table(config, profile)
+        && let Some(extra) = table.get(field).and_then(|v| v.as_array())
+    {
+        out.extend(
+            extra
+                .iter()
+                .filter_map(|v| v.as_str())
+                .map(|s| s.to_string()),
+        );
+    }
+    out
+}
+
+pub fn get_bool_with_profile(config: &Config, field: &str, profile: &str, default: bool) -> bool {
+    let base = config
+        .get(&format!("build.{field}"))
+        .and_then(|v| v.as_bool());
+    let profile_val =
+        profile_table(config, profile).and_then(|t| t.get(field).and_then(|v| v.as_bool()));
+    profile_val.or(base).unwrap_or(default)
+}
+
+pub fn get_language_with_profile(config: &Config, profile: &str) -> Result<String, String> {
+    if let Some(table) = profile_table(config, profile)
+        && let Some(value) = table.get("language")
+    {
+        return parse_language_value(value, "build.language");
+    }
+    match config.get("build.language") {
+        Some(v) => parse_language_value(v, "build.language"),
+        None => Err("build.language is missing".to_string()),
+    }
+}
+
+pub fn get_language_with_profile_or_default(config: &Config, profile: &str) -> String {
+    get_language_with_profile(config, profile).unwrap_or_else(|_| "c".to_string())
+}
+
+pub fn parse_language_value(value: &toml::Value, key: &str) -> Result<String, String> {
+    if let Some(s) = value.as_str() {
+        let trimmed = s.trim();
+        if trimmed.is_empty() {
+            return Err(format!("{key} is empty"));
+        }
+        return Ok(trimmed.to_string());
+    }
+    let arr = value
+        .as_array()
+        .ok_or_else(|| format!("{key} must be string or array of strings"))?;
+    let mut parts = Vec::new();
+    for item in arr {
+        let s = item
+            .as_str()
+            .ok_or_else(|| format!("{key} must be string or array of strings"))?;
+        let trimmed = s.trim();
+        if trimmed.is_empty() {
+            return Err(format!("{key} contains empty value"));
+        }
+        parts.push(trimmed.to_string());
+    }
+    if parts.is_empty() {
+        return Err(format!("{key} is empty"));
+    }
+    Ok(parts.join("+"))
+}
+
+pub fn resolve_compiler(
+    language: &str,
+    compiler: &str,
+    tc_cc: Option<&str>,
+    tc_cxx: Option<&str>,
+    tc_as: Option<&str>,
+) -> String {
+    let lang = primary_language(language);
+    env_override_compiler(&lang)
+        .or_else(|| toolchain_override_compiler(&lang, tc_cc, tc_cxx, tc_as))
+        .unwrap_or_else(|| compiler.to_string())
+}
+
+fn env_override_compiler(lang: &str) -> Option<String> {
+    if let Ok(value) = std::env::var("DCR_COMPILER") {
+        let trimmed = value.trim();
+        if !trimmed.is_empty() {
+            return Some(trimmed.to_string());
+        }
+    }
+    if lang == "asm" {
+        if let Ok(value) = std::env::var("DCR_AS") {
+            let trimmed = value.trim();
+            if !trimmed.is_empty() {
+                return Some(trimmed.to_string());
+            }
+        }
+        return None;
+    }
+    if (lang == "c++" || lang == "cpp" || lang == "cxx")
+        && let Ok(value) = std::env::var("DCR_CXX")
+    {
+        let trimmed = value.trim();
+        if !trimmed.is_empty() {
+            return Some(trimmed.to_string());
+        }
+    }
+    if let Ok(value) = std::env::var("DCR_CC") {
+        let trimmed = value.trim();
+        if !trimmed.is_empty() {
+            return Some(trimmed.to_string());
+        }
+    }
+    None
+}
+
+fn toolchain_override_compiler(
+    lang: &str,
+    tc_cc: Option<&str>,
+    tc_cxx: Option<&str>,
+    tc_as: Option<&str>,
+) -> Option<String> {
+    if lang == "asm" {
+        return tc_as.map(|v| v.to_string());
+    }
+    if (lang == "c++" || lang == "cpp" || lang == "cxx")
+        && let Some(v) = tc_cxx
+    {
+        return Some(v.to_string());
+    }
+    tc_cc.map(|v| v.to_string())
+}
+
+pub fn primary_language(language: &str) -> String {
+    let parts: Vec<String> = language
+        .split('+')
+        .map(|p| p.trim().to_lowercase())
+        .filter(|p| !p.is_empty())
+        .collect();
+    for p in &parts {
+        if p == "c++" || p == "cpp" || p == "cxx" {
+            return p.clone();
+        }
+    }
+    if parts.iter().any(|p| p == "c") {
+        return "c".to_string();
+    }
+    if parts.iter().any(|p| p == "asm") {
+        return "asm".to_string();
+    }
+    language.to_lowercase()
+}
+
+pub fn resolve_tool(env_key: &str, fallback: Option<&str>) -> Option<String> {
+    if let Ok(value) = std::env::var(env_key) {
+        let trimmed = value.trim();
+        if !trimmed.is_empty() {
+            return Some(trimmed.to_string());
+        }
+    }
+    fallback.map(|v| v.to_string())
+}
+
+pub fn resolve_pkg_config_flags(
+    pkgs: &[String],
+    base_cflags: &[String],
+    base_ldflags: &[String],
+) -> Result<(Vec<String>, Vec<String>), String> {
+    let mut cflags = base_cflags.to_vec();
+    let mut ldflags = base_ldflags.to_vec();
+    for pkg in pkgs {
+        let c_out = run_pkg_config(pkg, "--cflags")?;
+        let l_out = run_pkg_config(pkg, "--libs")?;
+        cflags.extend(split_flags(&c_out));
+        ldflags.extend(split_flags(&l_out));
+    }
+    Ok((cflags, ldflags))
+}
+
+pub fn resolve_pkg_config_flags_lossy(
+    pkgs: &[String],
+    base_cflags: &[String],
+    base_ldflags: &[String],
+) -> (Vec<String>, Vec<String>) {
+    match resolve_pkg_config_flags(pkgs, base_cflags, base_ldflags) {
+        Ok(flags) => flags,
+        Err(err) => {
+            eprintln!("Warning: {err}");
+            (base_cflags.to_vec(), base_ldflags.to_vec())
+        }
+    }
+}
+
+fn run_pkg_config(pkg: &str, arg: &str) -> Result<String, String> {
+    let output = std::process::Command::new("pkg-config")
+        .arg(arg)
+        .arg(pkg)
+        .output()
+        .map_err(|err| format!("Failed to run pkg-config: {err}"))?;
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        return Err(format!("pkg-config failed for {pkg}: {stderr}"));
+    }
+    Ok(String::from_utf8_lossy(&output.stdout).to_string())
+}
+
+fn split_flags(value: &str) -> Vec<String> {
+    let mut out = Vec::new();
+    let mut current = String::new();
+    let mut chars = value.chars().peekable();
+    let mut quote: Option<char> = None;
+    while let Some(ch) = chars.next() {
+        if let Some(q) = quote {
+            if ch == q {
+                quote = None;
+            } else {
+                current.push(ch);
+            }
+            continue;
+        }
+        match ch {
+            '\'' | '"' => quote = Some(ch),
+            '\\' => {
+                if let Some(next) = chars.next() {
+                    current.push(next);
+                }
+            }
+            c if c.is_whitespace() => {
+                if !current.is_empty() {
+                    out.push(std::mem::take(&mut current));
+                }
+            }
+            c => current.push(c),
+        }
+    }
+    if !current.is_empty() {
+        out.push(current);
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn normalize_target_short_names() {
+        assert_eq!(normalize_target_os("linux"), "x86_64-unknown-linux-gnu");
+        assert_eq!(normalize_target_os("macos"), "x86_64-apple-darwin");
+        assert_eq!(normalize_target_os("windows"), "x86_64-pc-windows-msvc");
+        assert_eq!(
+            normalize_target_os("x86_64-unknown-linux-gnu"),
+            "x86_64-unknown-linux-gnu"
+        );
+        assert_eq!(normalize_target_os("unknown"), "unknown");
+    }
+
+    #[test]
+    fn parse_version_parts() {
+        let info = parse_version_info("1.2.3-beta");
+        assert_eq!(info.full, "1.2.3-beta");
+        assert_eq!(info.major, "1");
+        assert_eq!(info.minor, "2");
+        assert_eq!(info.patch, "3");
+        assert_eq!(info.suffix, "beta");
+        assert_eq!(info.suffix_dash, "-beta");
+    }
+}

src/utils/fs.rs

@@ -29,3 +29,14 @@ pub fn find_project_root(start: &Path) -> io::Result<Option<PathBuf>> {
     }
     Ok(None)
 }
+
+pub fn with_dir<F, T>(dir: &Path, f: F) -> Result<T, String>
+where
+    F: FnOnce() -> Result<T, String>,
+{
+    let prev = std::env::current_dir().map_err(|_| "Failed to get current dir".to_string())?;
+    std::env::set_current_dir(dir).map_err(|_| "Failed to change directory".to_string())?;
+    let result = f();
+    let _ = std::env::set_current_dir(prev);
+    result
+}

src/utils/mod.rs

@@ -1,3 +1,4 @@
+pub mod build;
 pub mod fs;
 pub mod log;
 pub mod text;

tests/cli_basic.rs

@@ -221,6 +221,180 @@ fn workspace_build_and_clean_all() {
     );
 }
 
+#[test]
+fn dcr_add_dependencies() {
+    let dir = unique_sandbox_dir("add_dep");
+    let out = run_dcr(&["init"], &dir);
+    assert!(out.status.success(), "dcr init should succeed");
+
+    // Test path: prefix
+    let out = run_dcr(&["add", "mylib", "path:./libs/mylib"], &dir);
+    assert!(out.status.success(), "dcr add path should succeed");
+    let toml = std::fs::read_to_string(dir.join("dcr.toml")).unwrap();
+    assert!(
+        toml.contains("mylib = { path = \"./libs/mylib\" }"),
+        "path dep not found in toml"
+    );
+
+    // Test github: prefix
+    let out = run_dcr(&["add", "gh_lib", "github:user/repo"], &dir);
+    assert!(out.status.success(), "dcr add github should succeed");
+    let toml = std::fs::read_to_string(dir.join("dcr.toml")).unwrap();
+    assert!(
+        toml.contains("gh_lib = { git = \"https://github.com/user/repo\" }"),
+        "github dep not found in toml"
+    );
+
+    // Test git: prefix (generic)
+    let out = run_dcr(&["add", "custom_git", "git:host.com/user/repo"], &dir);
+    assert!(out.status.success(), "dcr add custom git should succeed");
+    let toml = std::fs::read_to_string(dir.join("dcr.toml")).unwrap();
+    assert!(
+        toml.contains("custom_git = { git = \"https://host.com/user/repo\" }"),
+        "custom git dep not found in toml"
+    );
+
+    // Test git: prefix (github default)
+    let out = run_dcr(&["add", "git_short", "git:user/repo"], &dir);
+    assert!(out.status.success(), "dcr add git short should succeed");
+    let toml = std::fs::read_to_string(dir.join("dcr.toml")).unwrap();
+    assert!(
+        toml.contains("git_short = { git = \"https://github.com/user/repo\" }"),
+        "git short dep not found in toml"
+    );
+
+    // Test flags (branch)
+    let out = run_dcr(
+        &["add", "branch_lib", "github:user/repo", "--branch", "dev"],
+        &dir,
+    );
+    assert!(out.status.success(), "dcr add with branch should succeed");
+    let toml = std::fs::read_to_string(dir.join("dcr.toml")).unwrap();
+    assert!(
+        toml.contains("branch_lib = { git = \"https://github.com/user/repo\", branch = \"dev\" }"),
+        "branch lib not found in toml"
+    );
+
+    // Test failure on no prefix
+    let out = run_dcr(&["add", "fail_lib", "user/repo"], &dir);
+    assert!(!out.status.success(), "dcr add without prefix should fail");
+}
+
+#[test]
+fn dcr_builds_lib_package() {
+    let Some(compiler) = available_compiler() else {
+        eprintln!("no compiler found; skipping lib package test");
+        return;
+    };
+
+    let dir = unique_sandbox_dir("lib_package");
+    let out = run_dcr(&["init"], &dir);
+    assert!(out.status.success(), "dcr init should succeed");
+
+    let toml = std::fs::read_to_string(dir.join("dcr.toml")).unwrap();
+    let updated_toml = toml
+        .replace("kind = \"bin\"", "kind = \"staticlib\"")
+        .replace("type = \"none\"", "type = \"lib\"");
+    std::fs::write(dir.join("dcr.toml"), updated_toml).expect("failed to write toml");
+
+    std::fs::write(dir.join("src").join("my_lib.h"), "void hello();")
+        .expect("failed to write header");
+
+    let envs = [("DCR_COMPILER", compiler)];
+    let out = run_dcr_env(&["build"], &dir, &envs);
+    if !out.status.success() {
+        eprintln!("stdout: {}", String::from_utf8_lossy(&out.stdout));
+        eprintln!("stderr: {}", String::from_utf8_lossy(&out.stderr));
+    }
+    assert!(out.status.success(), "dcr build should succeed");
+
+    let target_dir = dir.join("target");
+    assert!(
+        target_dir.join("include").join("my_lib.h").is_file(),
+        "include/my_lib.h missing"
+    );
+    assert!(target_dir.join("lib").exists(), "lib directory missing");
+}
+
+#[test]
+fn registry_dependency_is_built_from_cache() {
+    let Some(compiler) = available_compiler() else {
+        eprintln!("no compiler found; skipping registry dependency build test");
+        return;
+    };
+
+    let root = unique_sandbox_dir("registry_dep");
+    let home = root.join("home");
+    let dcr_home = home.join(".dcr");
+    let dep = root.join("cache").join("mylib");
+    let app = root.join("app");
+    std::fs::create_dir_all(dcr_home.as_path()).expect("failed to create dcr home");
+    std::fs::create_dir_all(dep.join("src")).expect("failed to create dep src");
+    std::fs::create_dir_all(app.join("src")).expect("failed to create app src");
+
+    std::fs::write(
+        dcr_home.join("config.toml"),
+        "[registry.local]\nurl = \"file://local\"\npriority = 1\n",
+    )
+    .expect("failed to write registry config");
+    std::fs::write(
+        dcr_home.join("index.json"),
+        format!(
+            "{{\"packages\":[{{\"name\":\"mylib\",\"latest_version\":\"0.1.0\",\"path\":\"{}\"}}]}}",
+            dep.display()
+        ),
+    )
+    .expect("failed to write registry index");
+
+    std::fs::write(
+        dep.join("dcr.toml"),
+        "[package]\nname = \"mylib\"\nversion = \"0.1.0\"\ntype = \"lib\"\n\n[build]\nlanguage = \"c\"\nstandard = \"c11\"\ncompiler = \"clang\"\nkind = \"staticlib\"\n\n[dependencies]\n",
+    )
+    .expect("failed to write dep dcr.toml");
+    std::fs::write(dep.join("src").join("mylib.h"), "int answer(void);\n")
+        .expect("failed to write header");
+    std::fs::write(
+        dep.join("src").join("mylib.c"),
+        "int answer(void) { return 42; }\n",
+    )
+    .expect("failed to write dep source");
+
+    std::fs::write(
+        app.join("dcr.toml"),
+        "[package]\nname = \"app\"\nversion = \"0.1.0\"\ntype = \"none\"\n\n[build]\nlanguage = \"c\"\nstandard = \"c11\"\ncompiler = \"clang\"\nkind = \"bin\"\n\n[dependencies]\nmylib = \"0.1.0\"\n",
+    )
+    .expect("failed to write app dcr.toml");
+    std::fs::write(
+        app.join("src").join("main.c"),
+        "#include \"mylib.h\"\nint main(void) { return answer() == 42 ? 0 : 1; }\n",
+    )
+    .expect("failed to write app source");
+
+    let index_path = dcr_home.join("index.json");
+    let envs = [
+        ("DCR_COMPILER", compiler),
+        ("HOME", home.to_str().unwrap()),
+        ("DCR_INDEX_PATH", index_path.to_str().unwrap()),
+    ];
+    let out = run_dcr_env(&["build"], &app, &envs);
+    if !out.status.success() {
+        eprintln!("stdout: {}", String::from_utf8_lossy(&out.stdout));
+        eprintln!("stderr: {}", String::from_utf8_lossy(&out.stderr));
+    }
+    assert!(
+        out.status.success(),
+        "registry dependency build should succeed"
+    );
+    assert!(
+        dep.join("target").join("include").join("mylib.h").is_file(),
+        "registry dependency headers were not packaged"
+    );
+    assert!(
+        dep.join("target").join("lib").exists(),
+        "registry dependency library directory missing"
+    );
+}
+
 #[test]
 fn dcr_test_runs_without_sandbox_dependency() {
     let Some(compiler) = available_compiler() else {