Merge development_timur into development: completed, docs reviewed #57

New issue

Closed

opened 2026-03-19 07:25:22 +00:00 by despiegk · 0 comments

despiegk commented

2026-03-19 07:25:22 +00:00

Owner

Merge Completion Report

Branch: development_timur → development
Date: 2026-03-19

Status

✅ Merge completed successfully
✅ 23/23 unit tests pass
✅ All merge conflicts resolved
✅ Docs reviewed and corrected
✅ Service TOML files aligned with development_timur specs
⚠️ Integration tests require a running server (not run in this context)

Conflicts Resolved

The following files had merge conflicts (UU / AU / UD) that were resolved:

Cargo.toml — dependency manifest merged
Makefile — build targets merged
README.md — documentation merged
crates/hero_services_server/src/config.rs — unified service config format
crates/hero_services_server/src/install.rs — install pipeline
crates/hero_services_server/src/job_build_manager.rs — build job management
crates/hero_services_server/src/job_test_manager.rs — test job management
crates/hero_services_server/src/service_data.rs — service data collection
crates/hero_services_server/src/zinit.rs — zinit SDK integration
services/forgejo.toml, services/hero_aibroker.toml, services/hero_claude.toml, and others — service TOML files aligned to flat format
services/hero_biz.toml, services/hero_compute.toml, services/hero_foundry.toml, services/hero_foundry_ui.toml — AU conflicts resolved
services/hero_embedder.toml, services/hero_indexer.toml, services/hero_os.toml, etc. — updated to development_timur specs

Docs Reviewed and Updated

All 6 documentation files reviewed against codebase (docs/):

File	Issues Found	Fixed
`docs/architecture.md`	Missing distinction between binary names (`_openrpc`/`_http`) and zinit daemon names (`_server`/`_ui`)	✅
`docs/service.md`	Examples used deprecated `build =` field (should be `source =`); wrong binary names in `exec =` examples (used `_server`/`_ui` instead of `_openrpc`/`_http`)	✅
`docs/ecosystem.md`	Binary naming section incorrectly listed `_openrpc` and `_http` as deprecated — they are the current convention; service profiles section referenced old `services/{profile}/` layout (now flat `services/*.toml`)	✅
`docs/profile.md`	Minor: reference to `build cmd` in service description (should be `source repo`)	✅
`docs/TOML_FORMAT_REFERENCE.md`	No issues — already accurate	—
`docs/ops/deployment.md`	No issues — deployment ops doc accurate	—

Key corrections:

Binary naming: Server binaries use _openrpc suffix (e.g. hero_os_openrpc), UI binaries use _http suffix (e.g. hero_os_http). Zinit daemon names use _server/_ui (these are different concepts and were confused in ecosystem.md and service.md).
source vs build field: In service TOML [server]/[ui] sections, the correct field for the git repo URL is source =. The build = name is a deprecated alias (preserved for backward compatibility via #[serde(alias)]).
Profile/service layout: Services are flat files in services/*.toml. Profiles are in profiles/*.toml. There is no services/{profile}/ subdirectory layout in the current codebase.

Test Results

running 23 tests
test result: ok. 23 passed; 0 failed; 0 ignored

All unit tests in hero_services_server pass. Integration tests (in hero_services_examples/tests/integration.rs) require a live server instance and were not executed in this context.

Reported by automated merge review.

## Merge Completion Report **Branch**: `development_timur` → `development` **Date**: 2026-03-19 --- ## Status - ✅ Merge completed successfully - ✅ 23/23 unit tests pass - ✅ All merge conflicts resolved - ✅ Docs reviewed and corrected - ✅ Service TOML files aligned with `development_timur` specs - ⚠️ Integration tests require a running server (not run in this context) --- ## Conflicts Resolved The following files had merge conflicts (`UU` / `AU` / `UD`) that were resolved: - `Cargo.toml` — dependency manifest merged - `Makefile` — build targets merged - `README.md` — documentation merged - `crates/hero_services_server/src/config.rs` — unified service config format - `crates/hero_services_server/src/install.rs` — install pipeline - `crates/hero_services_server/src/job_build_manager.rs` — build job management - `crates/hero_services_server/src/job_test_manager.rs` — test job management - `crates/hero_services_server/src/service_data.rs` — service data collection - `crates/hero_services_server/src/zinit.rs` — zinit SDK integration - `services/forgejo.toml`, `services/hero_aibroker.toml`, `services/hero_claude.toml`, and others — service TOML files aligned to flat format - `services/hero_biz.toml`, `services/hero_compute.toml`, `services/hero_foundry.toml`, `services/hero_foundry_ui.toml` — AU conflicts resolved - `services/hero_embedder.toml`, `services/hero_indexer.toml`, `services/hero_os.toml`, etc. — updated to `development_timur` specs --- ## Docs Reviewed and Updated All 6 documentation files reviewed against codebase (`docs/`): | File | Issues Found | Fixed | |------|-------------|-------| | `docs/architecture.md` | Missing distinction between binary names (`_openrpc`/`_http`) and zinit daemon names (`_server`/`_ui`) | ✅ | | `docs/service.md` | Examples used deprecated `build =` field (should be `source =`); wrong binary names in `exec =` examples (used `_server`/`_ui` instead of `_openrpc`/`_http`) | ✅ | | `docs/ecosystem.md` | Binary naming section incorrectly listed `_openrpc` and `_http` as **deprecated** — they are the current convention; service profiles section referenced old `services/{profile}/` layout (now flat `services/*.toml`) | ✅ | | `docs/profile.md` | Minor: reference to `build cmd` in service description (should be `source repo`) | ✅ | | `docs/TOML_FORMAT_REFERENCE.md` | No issues — already accurate | — | | `docs/ops/deployment.md` | No issues — deployment ops doc accurate | — | ### Key corrections: 1. **Binary naming**: Server binaries use `_openrpc` suffix (e.g. `hero_os_openrpc`), UI binaries use `_http` suffix (e.g. `hero_os_http`). Zinit daemon names use `_server`/`_ui` (these are different concepts and were confused in `ecosystem.md` and `service.md`). 2. **`source` vs `build` field**: In service TOML `[server]`/`[ui]` sections, the correct field for the git repo URL is `source =`. The `build =` name is a deprecated alias (preserved for backward compatibility via `#[serde(alias)]`). 3. **Profile/service layout**: Services are flat files in `services/*.toml`. Profiles are in `profiles/*.toml`. There is no `services/{profile}/` subdirectory layout in the current codebase. --- ## Test Results ``` running 23 tests test result: ok. 23 passed; 0 failed; 0 ignored ``` All unit tests in `hero_services_server` pass. Integration tests (in `hero_services_examples/tests/integration.rs`) require a live server instance and were not executed in this context. --- *Reported by automated merge review.*