sync integration #319

Merged

omarz merged 6 commits from integration into main

2026-06-10 11:41:06 +00:00

omarz commented

2026-06-10 11:40:58 +00:00

Member

No description provided.

omarz added 6 commits

2026-06-10 11:40:59 +00:00

feat(lab): honor supervised binaries; stop starting sibling-supervised daemons a27b6a6f1c

Adds service::is_lab_managed_daemon() — one predicate used by BOTH the
`lab service` path (service_manager.rs) and the `lab build --start` /
fast_teardown path: long-running kind (server/admin/web) AND not supervised.
Replaces the three duplicated `matches!(kind, Server|Admin|Web)` checks.

Fixes `lab build --start` failing on lk-backend ("did not become fully
running") — lk-backend is supervised by hero_livekit_server via its start()
RPC, so lab now installs it but never starts/registers/tears it down
standalone.

Also pins hero_lib + hero_proc_sdk deps to branch=integration (integration
pins integration); lab verified building against hero_lib integration
(supervised) + hero_proc integration.

Refs hero_skills#315.

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

Revert "feat(lab): honor supervised binaries; stop starting sibling-supervised daemons" f64e4d5205

This reverts commit a27b6a6f1c.

Merge branch 'main' into integration 784041d174

Bring recent main-branch lab/install/CI work into integration so it is
not lost when integration is promoted.

Signed-by: mik-tf <mik-tf@noreply.invalid>

feat(lab): anchor release tag to built commit + --prerelease flag 505e83143b

lab build --upload now force-moves the rolling `latest` tag onto the
built commit (git push -f) before uploading, and can mark the release
as a pre-release. Fixes the mis-anchored `latest` tag that pointed at
the development branch regardless of what was built.

- releases.rs: ensure_release takes prerelease + target_commitish
  instead of hardcoding false/"development"; add anchor_tag() helper
  (guarded by an ls-remote branch-tip check so unpushed local commits
  are left untouched)
- orchestrator.rs: RunOptions.prerelease, resolve HEAD, anchor the
  `latest` tag before upload, thread prerelease + target_commitish
  through the upload path
- main.rs: add --prerelease flag (errors without --upload)

Adapts the issue #318 fix to the integration branch (single `latest`
release channel). Refs #318

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

Merge remote-tracking branch 'origin/main' into integration 915443be28

# Conflicts:
#	crates/lab/src/builder/orchestrator.rs
#	crates/lab/src/main.rs
#	crates/lab/src/service/acquire.rs

feat(lab): report built-from branch-commit in lab --version 4d55cc213e

Bake the git branch + short commit into the binary at build time via
build.rs (with LAB_GIT_BRANCH/LAB_GIT_COMMIT overrides for tarball builds
and a `+` dirty-tree marker), and surface it as clap's --version string.

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