Skip to content

Honor isolated runtime root over legacy varlock asset env #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsugg merged 5 commits into from
Mar 29, 2026
Merged

Honor isolated runtime root over legacy varlock asset env #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ab2dad
Fix isolated runtime precedence for varlock env resolution
jsugg Mar 29, 2026
412c855
ci: retrigger fresh host acceptance checks
jsugg Mar 29, 2026
205e590
ci: retrigger fresh host browser lab
jsugg Mar 29, 2026
20e3ffa
ci: rerun fresh host browser lab
jsugg Mar 29, 2026
0449f28
Merge remote-tracking branch 'origin/main' into fix/dev-runtime-state…
jsugg Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/clawops/strongclaw_runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,12 @@ def varlock_env_dir(
override = env.get("OPENCLAW_VARLOCK_ENV_PATH") or env.get("VARLOCK_ENV_DIR")
if override:
return expand_user_path(override, home_dir=home_dir)
layout = resolve_runtime_layout(repo_root=repo_root, home_dir=home_dir)
layout = resolve_runtime_layout(repo_root=repo_root, home_dir=home_dir, environ=env)
managed_dir = strongclaw_varlock_dir(home_dir=layout.home_dir, environ=env)
legacy_dir = layout.asset_root / DEFAULT_VARLOCK_ENV_RELATIVE
if layout.uses_isolated_runtime:
materialize_runtime_varlock_assets(repo_root, home_dir=layout.home_dir)
return managed_dir
if (legacy_dir / DEFAULT_VARLOCK_LOCAL_ENV_NAME).exists() or (
legacy_dir / DEFAULT_VARLOCK_PLUGIN_ENV_NAME
).exists():
Expand Down
22 changes: 22 additions & 0 deletions tests/suites/unit/clawops/test_strongclaw_runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,28 @@ def test_varlock_env_dir_defaults_to_managed_config_root(
assert (expected / ".env.local.example").read_text(encoding="utf-8") == "APP_ENV=local\n"


def test_varlock_env_dir_ignores_legacy_asset_env_when_runtime_root_is_isolated(
tmp_path: pathlib.Path,
test_context: TestContext,
) -> None:
repo_root = tmp_path / "assets"
legacy_dir = repo_root / "platform" / "configs" / "varlock"
legacy_dir.mkdir(parents=True)
(legacy_dir / ".env.local").write_text("OPENCLAW_STATE_DIR=~/.openclaw\n", encoding="utf-8")
(legacy_dir / ".env.local.example").write_text("APP_ENV=local\n", encoding="utf-8")
(legacy_dir / ".env.schema").write_text("APP_ENV=\n", encoding="utf-8")
(legacy_dir / ".env.ci.example").write_text("APP_ENV=ci\n", encoding="utf-8")
(legacy_dir / ".env.prod.example").write_text("APP_ENV=prod\n", encoding="utf-8")
runtime_root = tmp_path / "dev-runtime"
test_context.env.set("STRONGCLAW_RUNTIME_ROOT", str(runtime_root))

expected = runtime.varlock_env_dir(repo_root, home_dir=tmp_path / "home")

assert expected == runtime_root / "strongclaw" / "config" / "varlock"
assert expected != legacy_dir
assert (expected / ".env.local.example").read_text(encoding="utf-8") == "APP_ENV=local\n"


def test_managed_python_falls_back_to_current_interpreter(tmp_path: pathlib.Path) -> None:
repo_root = tmp_path / "assets"

Expand Down
Loading