merge all repo's and make sure specs in order #56

New issue

Closed

opened 2026-03-19 07:22:46 +00:00 by despiegk · 1 comment

despiegk commented

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

Owner

No description provided.

despiegk commented

2026-03-19 07:26:18 +00:00

Author

Owner

Merge Completed: development_timur → development

What was done

All merge conflicts between development (HEAD) and development_timur have been resolved and the codebase is now aligned with timur's specs.

Conflicts resolved

File	Resolution
`Cargo.toml`	zinit_sdk → `https://forge.ourworld.tf/geomind_code/zinit.git, branch = "development_kristof"`
`Makefile`	Used timur's `zinit build service` / `zinit start --tree` approach
`config.rs` (tests)	Used timur's `_openrpc`/`_http` binary names, `source =` field, removed `ports`
`install.rs`	HEAD's `do_run` wait loop; removed dead `ports.first()` health check branch
`job_build_manager.rs`	timur's `job_id` naming, explicit RetryPolicy fields, `compute_elapsed_secs` helper
`job_test_manager.rs`	Same as above
`service_data.rs` / `zinit.rs`	Cleaner timur patterns (no `.clone()` before `.unwrap()`)

Service TOML alignment with development_timur

hero_os.toml — exec → hero_os_openrpc, restored island-router and island-books features
hero_osis.toml — exec → hero_osis_openrpc
hero_indexer.toml — restored HERO_INDEXER_DATA in both [server.env] and [ui.env]
hero_biz.toml, hero_compute.toml, hero_foundry.toml, hero_foundry_ui.toml — updated to timur's format (source = "ssh://...", no install =, no ports =, no [profile] section)

Documentation

All 6 docs files reviewed and corrected:

docs/service.md — corrected build → source field, binary naming (_openrpc/_http), fixed examples
docs/ecosystem.md — corrected binary naming section (was backwards: listed current convention as deprecated)
docs/architecture.md — added binary filename vs zinit name clarification
docs/profile.md — minor correction
docs/TOML_FORMAT_REFERENCE.md / docs/ops/deployment.md — no changes needed

Test results

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

All 23 unit tests pass. Integration tests require a running server (not run in CI context).

Note: a separate tracking issue #57 was auto-created — can be closed.

## Merge Completed: development_timur → development ### What was done All merge conflicts between `development` (HEAD) and `development_timur` have been resolved and the codebase is now aligned with timur's specs. ### Conflicts resolved | File | Resolution | |------|------------| | `Cargo.toml` | zinit_sdk → `https://forge.ourworld.tf/geomind_code/zinit.git, branch = "development_kristof"` | | `Makefile` | Used timur's `zinit build service` / `zinit start --tree` approach | | `config.rs` (tests) | Used timur's `_openrpc`/`_http` binary names, `source =` field, removed `ports` | | `install.rs` | HEAD's `do_run` wait loop; removed dead `ports.first()` health check branch | | `job_build_manager.rs` | timur's `job_id` naming, explicit RetryPolicy fields, `compute_elapsed_secs` helper | | `job_test_manager.rs` | Same as above | | `service_data.rs` / `zinit.rs` | Cleaner timur patterns (no `.clone()` before `.unwrap()`) | ### Service TOML alignment with development_timur - `hero_os.toml` — exec → `hero_os_openrpc`, restored `island-router` and `island-books` features - `hero_osis.toml` — exec → `hero_osis_openrpc` - `hero_indexer.toml` — restored `HERO_INDEXER_DATA` in both `[server.env]` and `[ui.env]` - `hero_biz.toml`, `hero_compute.toml`, `hero_foundry.toml`, `hero_foundry_ui.toml` — updated to timur's format (`source = "ssh://..."`, no `install =`, no `ports =`, no `[profile]` section) ### Documentation All 6 docs files reviewed and corrected: - `docs/service.md` — corrected `build` → `source` field, binary naming (`_openrpc`/`_http`), fixed examples - `docs/ecosystem.md` — corrected binary naming section (was backwards: listed current convention as deprecated) - `docs/architecture.md` — added binary filename vs zinit name clarification - `docs/profile.md` — minor correction - `docs/TOML_FORMAT_REFERENCE.md` / `docs/ops/deployment.md` — no changes needed ### Test results ``` test result: ok. 23 passed; 0 failed; 0 ignored ``` All 23 unit tests pass. Integration tests require a running server (not run in CI context). Note: a separate tracking issue #57 was auto-created — can be closed.