Merge development_mik_6_1 into development #28

Merged

mik-tf merged 37 commits from development_mik_6_1 into development 2026-03-18 06:25:24 +00:00

Conversation 0 Commits 37 Files changed 53 +10863 -1380

mik-tf commented 2026-03-18 06:24:50 +00:00

Owner

Copy link

No description provided.

mik-tf added 37 commits 2026-03-18 06:24:51 +00:00

feat: migrate to OServer::run_cli() and rename contexts → spaces ... b51528fc39

- Rewrite hero_os_server main.rs to use OServer::run_cli() for unified
  CLI with start/stop/run/status/logs/ui/zinit subcommands
- Rename context_name → space_name across schemas, types, client, server,
  and app code for user-friendly terminology
- Update build.rs to use hero_rpc_generator (moved from hero_rpc_osis)
- Align herolib_sid dependency to development_kristof branch
- Add trigger_get_pre/trigger_list_pre hooks required by updated generator
- Fix test import (super::server → super)
- Remove redundant bin/hero_os_service (replaced by OServer::run_cli)
- Remove workspace exclude for deleted bin/hero_os_service

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

docs: update Makefile and README to use OServer::run_cli() lifecycle ... 078c12c8ab

The server already migrated to OServer::run_cli() (c14b6c7) but the
Makefile and README still documented the old manual orchestration.
Now make run/stop/status/logs delegate to the server CLI subcommands.

Refs: hero_os#12, hero_rpc#7

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

feat: add zinit lifecycle to hero_os_ui binary ... 90d97af92c

hero_os_ui now uses ZinitLifecycle from hero_rpc_server, matching the
pattern already used by hero_os_server. Supports run/start/stop/status/logs
subcommands. Makefile updated to manage both servers together.

Refs: hero_os#12, hero_rpc#7

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

feat: adopt serve rename — run is now the developer command ... 0fa91d56d8

- hero_os_ui: rename Command::Run→Serve (internal), add Run for dev workflow
- hero_os_server: update doc comments for serve rename
- Makefile: make run delegates to `cargo run -- run` (built-in log streaming)
- Makefile: make start/run both run cargo update first
- README: document run/start/serve naming convention

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

feat: use hero_service for unified lifecycle in hero_os_ui + docs ... e2ab1243b1

Replace manual lifecycle Command enum with #[command(flatten)]
LifecycleCommand from hero_service (via hero_rpc_server re-export).
Adds install subcommand. Update lifecycle.md and add makefile.md docs.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

feat: make install uses cargo run -- install (zinit job_create) ... 523c6e2565

install target now delegates to the binary's install subcommand which
creates a zinit job to copy the binary to ~/hero/bin. start/run
depend on the install job via zinit's DAG.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

feat: direct ZinitLifecycle in binaries, codesign on install ... 2426b1cae0

- Makefile install: cargo build + cp + codesign (fixes macOS
  com.apple.provenance hanging binary in uninterruptible sleep)
- Makefile lifecycle: each binary called directly (no _ctl crate)
- hero_os_ui: fix SERVICE_NAME to "hero_os_ui", update
  ZinitLifecycle::new() to 3-arg signature
- Cargo.toml: add [patch] for local hero_rpc overrides

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

feat: TCP bind retry in hero_os_ui, ZinitLifecycle cleanup, service config overhaul ... 5e6d221d92

- hero_os_ui: add 20-attempt TCP bind retry (500ms backoff) to survive
  zinit restarts while old socket is in TIME_WAIT
- hero_os_app: add brand.rs, routing.rs; update config, controller, registry, theme
- hero_os_server: update main.rs and desktop tests
- hero_os_*/Cargo.toml: dependency updates
- Remove legacy service toml configs, scripts, and docs; add updated docs/

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

feat: add Bootstrap-based OS shell (hero_os_ui_wasm) and --dist flag ... 45514a3d03

Phase 4 of the Dioxus Bootstrap migration. Adds:

- hero_os_ui_wasm: standalone WASM crate providing a Bootstrap-based
  alternative shell for Hero OS using dioxus-bootstrap-css v0.1.6.
  Features navbar with context selector, sidebar with grouped island
  navigation, and iframe-based embedding of migrated service UIs.

- Server --dist flag: hero_os_ui gains an optional --dist argument to
  serve the Bootstrap shell at /shell alongside the main app.

feat: wire 15 Bootstrap service islands into hero_os_app ... 8d72ca94ab

Add optional dependencies and feature flags (bs-*) for all 15
Bootstrap-migrated service UI crates. Each island is gated behind
its own feature flag, with a bootstrap-islands group feature to
enable all at once.

Adds cfg-gated match arms in island_content.rs and island metadata
entries in registry.rs for: hero_services, hero_cloud, hero_indexer,
hero_inspector, hero_voice, hero_proxy, hero_embedder, hero_zinit,
hero_auth, hero_aibroker, hero_redis, hero_books, hero_foundry,
hero_forge, hero_osis.

Also adds media and development archipelago definitions in the
registry for proper grouping.

4 of 15 crates (services, embedder, redis, foundry) have been
converted to library crates and compile successfully. The remaining
11 still need lib.rs conversion in their respective repos.

fix: normalize bootstrap island deps and match arms for hero_os_app integration 3225cfbe50

feat: convert hero_os shell to dioxus-bootstrap-css ... a5c3e44e8a

Replace custom CSS var design system with dioxus-bootstrap-css v0.1.6
components across all shell UI:

- Toolbar: Bootstrap Navbar with dropdown context switcher
- Window: Bootstrap Card with card-header title bar, card-body content
- Login: Bootstrap Card + form-control inputs + alert for errors
- AI Bar: Bootstrap input-group with list-group search results
- Settings: Bootstrap Card, list-group, btn-group, form-switch toggles
- User Island: Bootstrap dropdown menu + Modal for confirmations
- Dock: Bootstrap card for popup panels
- Main: BootstrapHead + ThemeProvider wired to display mode signal

All window management logic (drag, resize, minimize, maximize, z-index)
and keyboard handling preserved unchanged.

feat(part3): full dioxus-bootstrap-css rewrite — shell dock ... 47e3af6e7e

Replace custom inline styles with Bootstrap components: Nav/NavItem for
idle mode, Button for dock items, Card for hierarchical popups, Badge
for active indicators. Remove platform sizing constants that are now
handled by Bootstrap utility classes.

fix: build pipeline fixes for devbootstrap deployment d4fac786a2

fix: dock popup max-width and rename Embed to Development ... 0956af0064

- Dock popup panel: use auto-fit grid with max-width 400px to prevent
  overly wide popups for archipelagos with many islands
- Rename "Embed" archipelago display name to "Development" (keeps
  "embed" ID for routing compatibility)

refactor: consistent hero_* naming, remove duplicates, forge→foundry 01b4720802

fix: registry cleanup — remove duplicates, single hero_* IDs, merge archipelagos ... 5936d376bd

- Remove all old island-* duplicate entries (zinit, redis, forge, embedder,
  indexer, inspector, aibroker, auth, forgejo, hero, hero-service) that have
  bs-* bootstrap replacements
- Remove "media" archipelago — hero_voice moved to intelligence
- Remove "embed" archipelago — hero_embedder merged into development
- Fix archipelago assignments: hero_auth -> development, hero_aibroker -> admin,
  hero_books -> books, hero_embedder -> development
- Remove old override block (no more old islands to rename)
- Clean up default_islands map (remove media, embed entries)
- Remove old match arms in island_content.rs (forgejo, hero, hero_service)

fix: dock organization matching herodev2 ... cf89c966c7

- Move hero_osis from communication to admin archipelago
- Move hero_redis from admin to development archipelago
- Remove roles as separate dock entry (already a tab inside Intelligence)

feat: wire hero_shrimp into hero_os_app (bs-shrimp) ad16829673

Remove duplicate Cloud entry from admin archipelago ... c997e2d291

The old island-compute (embedded iframe, id "compute", display name
"Cloud") was still registered alongside the new bs-cloud bootstrap
island (id "hero_cloud", display name "Cloud"), causing two Cloud
entries in the admin dock. Remove the old island-compute references.

chore: bump dioxus-bootstrap-css to 0.1.7 d9cc28d31a

chore: bump to 0.1.9 e42d1d1efc

chore: bump to 0.2.0 1ea5bdee17

chore: bump to 0.2.1 516fc9933f

fix: allow scrolling in island windows (overflow: auto) 2ff0c2e517

fix: allow scrolling in content area wrapper too 62276e2daf

fix: overflow auto on island content wrapper (the actual inner div) 1f7be45e04

fix: increase desktop bottom gap to prevent dock overlap with window content 4de01e8f8b

Merge remote-tracking branch 'origin/development_dioxus_bootstrap_2' into development ... 2c5dbfc3cc

# Conflicts:
#	crates/hero_os/Cargo.toml
#	crates/hero_os_server/Cargo.toml
#	crates/hero_os_ui/src/main.rs

Merge remote-tracking branch 'origin/development_mik_6_1' into development ... 6fb799d8a5

# Conflicts:
#	Cargo.toml
#	config.toml
#	crates/hero_os/Cargo.toml
#	crates/hero_os_app/src/island_content.rs
#	crates/hero_os_app/src/registry.rs
#	crates/hero_os_app/src/styles.css
#	crates/hero_os_server/Cargo.toml

Session 9: fix 5 TODOs + AI assistant enhancements ... 66829a1f1a

- Songs: 3 per context (acid_trumpet, gymnopedie_no1, there_it_is), orphan TOMLs removed
- Embedder: ensure_models_downloaded() in lib, called from hero_osis_server init
- AI Assistant: SSE parser for Shrimp responses, message field fix
- Auth/Redis SSO: postMessage token from island components + sso-login endpoint
- AI stop button with AbortController
- Multi-conversation support (Shrimp backend + UI sidebar + localStorage persistence)

Issue: lhumina_code/home#23

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Merge remote-tracking branch 'origin/development' into development_mik_6_1 f0179aa258

chore: add generated_profile.rs from development merge ... c2ecdd4901

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix: remove dead bootstrap-islands deps, patch block, and duplicate functions ... f393c8fb5e

- Remove 14 _ui_wasm path deps (none exist on any branch)
- Remove bs-* features and bootstrap-islands group
- Remove [patch] block for hero_rpc (not in workspace)
- Remove forge/forgejo embed island path deps
- Remove duplicate desktopstate/windowstate trigger functions

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix: resolve WASM RefCell panic with dioxus 0.7.3 ... 4b15ef298e

Combine three mount-time use_effect+spawn blocks into a single
sequential task to prevent concurrent signal mutations in the
single-threaded WASM executor. Guard context-change effect with
initialized flag to avoid duplicate work on mount.

Also: commit Cargo.lock (removed from .gitignore) to prevent
future dependency version drift. Applications should always pin
their dependency versions via the lock file.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix: revert bootstrap merge, pin wasm-bindgen 0.2.114, fix auth device_sid ... 37ec9b31b7

Reverts hero_os_app to pre-bootstrap-merge state (commit 66829a1)
to remove dioxus-bootstrap-css dependency that was incorrectly merged
from development_dioxus_bootstrap_2 into development.

Changes:
- hero_os_app/src: restored to Session 9 state (no dioxus-bootstrap-css)
- auth_service.rs: pass "web-browser" as device_sid for login
- Cargo.toml: pin wasm-bindgen=0.2.114, js-sys=0.3.91, web-sys=0.3.91
- Cargo.toml: fix patch URL from ssh:// to https:// so local overrides work
- Cargo.lock: regenerated with correct pinned versions
- config.toml: restored for build.rs profile generation

Root cause: development_dioxus_bootstrap_2 merge changed hero_os_app to use
BootstrapHead/ThemeProvider, added URL routing with replaceState flooding,
and introduced concurrent signal mutations causing WASM runtime crashes.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

feat: add Voice island + Compute iframe in Hero OS shell ... 31c8a39103

- Register Voice island in Intelligence archipelago (registry.rs)
- Add Voice iframe render entry to island_content.rs
- Switch Compute from broken WASM island to ExternalServiceIframe
- Remove unused ComputeApp import

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

mik-tf merged commit 5e16d603a1 into development 2026-03-18 06:25:24 +00:00

mik-tf referenced this pull request from a commit 2026-03-18 06:25:25 +00:00

Merge pull request 'Merge development_mik_6_1 into development' (#28) from development_mik_6_1 into development

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

prio_critical

  

prio_low

  

type_bug

  

type_contact

  

type_issue

  

type_lead

  

type_question

  

type_story

  

type_task

No labels

prio_critical

prio_low

type_bug

type_contact

type_issue

type_lead

type_question

type_story

type_task

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

lhumina_code/hero_os!28

No description provided.