fix(workflow): migrate legacy executor defaults safely

Signed-off-by: yjlu12 <1064690083@qq.com>

Author: lyj715824

core/workflow/configs/__init__.py

@@ -2,12 +2,85 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
 
-from dotenv import load_dotenv
+from dotenv import dotenv_values, load_dotenv
 from loguru import logger
 
-from workflow.configs.app_config import WorkflowConfig
+from workflow.configs.app_config import DEFAULT_CODE_EXECUTOR_TYPE, WorkflowConfig
 from workflow.consts.config_env import EnvStrategy
 
+LEGACY_CODE_EXECUTOR_DEFAULT_COMMENTS = (
+    # Directly previous releases shipped this header.
+    "supported fallback types: disabled, ifly, ifly-v2, langchain (default: disabled)",
+    # Keep compatibility with the earlier security release as well.
+    "supported types: disabled, ifly, ifly-v2, langchain, e2b (default: disabled)",
+)
+
+
+def _read_simple_env_values(env_file: Path, keys: set[str]) -> dict[str, str]:
+    """Read the small set of deployment settings needed before dotenv loading.
+
+    ``load_dotenv`` intentionally keeps existing process variables authoritative.
+    We need to inspect the mounted workflow config once before loading it so that
+    an untouched config from the pre-Pyodide release can be migrated safely.  A
+    non-interpolating read through python-dotenv keeps the compatibility check
+    consistent with the actual load below (including quoting and comments).
+    """
+    try:
+        parsed_values = dotenv_values(
+            dotenv_path=env_file, interpolate=False, encoding="utf-8"
+        )
+    except (OSError, UnicodeError, ValueError):
+        return {}
+
+    return {key: value for key in keys if (value := parsed_values.get(key)) is not None}
+
+
+def _has_legacy_code_executor_signature(env_file: Path) -> bool:
+    """Return whether *env_file* has the historical generated-default header."""
+    try:
+        content = env_file.read_text(encoding="utf-8")
+    except (OSError, UnicodeError):
+        return False
+    normalized_content = " ".join(content.lower().split())
+    return any(
+        signature in normalized_content
+        for signature in LEGACY_CODE_EXECUTOR_DEFAULT_COMMENTS
+    )
+
+
+def _migrate_legacy_code_executor_default(env_file: Path) -> None:
+    """Keep upgrades from the old disabled template zero-configuration.
+
+    Before the built-in Pyodide sandbox became the default, the generated
+    workflow config contained ``CODE_EXEC_TYPE=disabled`` and had no memory
+    limit setting.  Compose deliberately preserves user-mounted config files,
+    so an upgrade would otherwise keep that historical default forever and a
+    fresh Code node would fail even though the new image contains the isolated
+    executor.  Treat only that recognizable, unversioned template as a legacy
+    default.  The historical header is required as an additional fingerprint
+    so a customized config that explicitly sets ``disabled`` is not silently
+    changed.  An explicit process-level ``CODE_EXEC_TYPE`` (including
+    ``disabled``) always wins and remains fail-closed.
+    """
+    if "CODE_EXEC_TYPE" in os.environ:
+        return
+
+    values = _read_simple_env_values(
+        env_file, {"CODE_EXEC_TYPE", "CODE_EXEC_MEMORY_LIMIT_MB"}
+    )
+    if (
+        values.get("CODE_EXEC_TYPE", "").strip().lower() == "disabled"
+        and "CODE_EXEC_MEMORY_LIMIT_MB" not in values
+        and _has_legacy_code_executor_signature(env_file)
+    ):
+        os.environ["CODE_EXEC_TYPE"] = DEFAULT_CODE_EXECUTOR_TYPE
+        logger.warning(
+            "Migrating the legacy workflow code executor default from disabled "
+            "to the built-in isolated LangChain/Pyodide sandbox. Set "
+            "CODE_EXEC_TYPE=disabled as a process environment variable to "
+            "explicitly disable Code nodes."
+        )
+
 
 class EnvLoader(ABC):
     """
@@ -39,6 +112,12 @@ def load(self) -> None:
         :raises ValueError: If no configuration file is found
         """
         if os.path.exists(self.env_file):
+            # Compose may deliberately pass an empty optional override from
+            # ``.env``.  Treat an empty value as unset so the mounted workflow
+            # config can still supply its defaults.
+            if not os.getenv("CODE_EXEC_TYPE", "").strip():
+                os.environ.pop("CODE_EXEC_TYPE", None)
+            _migrate_legacy_code_executor_default(self.env_file)
             load_dotenv(self.env_file, override=False)
             logger.debug("Using config.env file.")
         else:

core/workflow/tests/test_config_loading.py

@@ -0,0 +1,145 @@
+import os
+from pathlib import Path
+
+import pytest
+
+from workflow.configs import LocalLoader
+
+
+def _write_config(
+    path: Path,
+    *,
+    include_memory_limit: bool = False,
+    legacy_header: str = "fallback",
+) -> None:
+    memory_setting = "CODE_EXEC_MEMORY_LIMIT_MB=256\n" if include_memory_limit else ""
+    if legacy_header == "fallback":
+        header = (
+            "# Supported fallback types: disabled, ifly, ifly-v2, langchain "
+            "(default: disabled)\n"
+        )
+    else:
+        header = (
+            "# Supported types: disabled, ifly, ifly-v2, langchain, e2b "
+            "(default: disabled)\n"
+        )
+    path.write_text(
+        "# Code Executor Settings\n"
+        f"{header}"
+        "CODE_EXEC_TYPE=disabled\n"
+        "CODE_EXEC_TIMEOUT_SEC=10\n"
+        f"{memory_setting}",
+        encoding="utf-8",
+    )
+
+
+def test_legacy_disabled_template_migrates_to_builtin_executor(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    config_file = tmp_path / "config.env"
+    _write_config(config_file)
+    monkeypatch.delenv("CODE_EXEC_TYPE", raising=False)
+
+    loader = LocalLoader()
+    loader.env_file = config_file
+    loader.load()
+
+    assert os.getenv("CODE_EXEC_TYPE") == "langchain"
+
+
+def test_earlier_legacy_disabled_template_migrates_to_builtin_executor(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    config_file = tmp_path / "config.env"
+    _write_config(config_file, legacy_header="types")
+    monkeypatch.delenv("CODE_EXEC_TYPE", raising=False)
+
+    loader = LocalLoader()
+    loader.env_file = config_file
+    loader.load()
+
+    assert os.getenv("CODE_EXEC_TYPE") == "langchain"
+
+
+def test_explicit_process_disabled_setting_remains_fail_closed(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    config_file = tmp_path / "config.env"
+    _write_config(config_file)
+    monkeypatch.setenv("CODE_EXEC_TYPE", "disabled")
+
+    loader = LocalLoader()
+    loader.env_file = config_file
+    loader.load()
+
+    assert os.getenv("CODE_EXEC_TYPE") == "disabled"
+
+
+def test_new_template_can_explicitly_keep_disabled_setting(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    config_file = tmp_path / "config.env"
+    _write_config(config_file, include_memory_limit=True)
+    monkeypatch.delenv("CODE_EXEC_TYPE", raising=False)
+
+    loader = LocalLoader()
+    loader.env_file = config_file
+    loader.load()
+
+    assert os.getenv("CODE_EXEC_TYPE") == "disabled"
+
+
+def test_custom_legacy_config_disabled_setting_is_not_migrated(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    config_file = tmp_path / "config.env"
+    config_file.write_text(
+        "# Code Executor Settings\n"
+        "# Explicit administrator override: keep Code nodes disabled\n"
+        "CODE_EXEC_TYPE=disabled\n",
+        encoding="utf-8",
+    )
+    monkeypatch.delenv("CODE_EXEC_TYPE", raising=False)
+
+    loader = LocalLoader()
+    loader.env_file = config_file
+    loader.load()
+
+    assert os.getenv("CODE_EXEC_TYPE") == "disabled"
+
+
+def test_legacy_header_with_hash_in_value_is_not_migrated(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    config_file = tmp_path / "config.env"
+    config_file.write_text(
+        "# Code Executor Settings\n"
+        "# Supported fallback types: disabled, ifly, ifly-v2, langchain "
+        "(default: disabled)\n"
+        "CODE_EXEC_TYPE=disabled#custom-value\n",
+        encoding="utf-8",
+    )
+    monkeypatch.delenv("CODE_EXEC_TYPE", raising=False)
+
+    loader = LocalLoader()
+    loader.env_file = config_file
+    loader.load()
+
+    assert os.getenv("CODE_EXEC_TYPE") == "disabled#custom-value"
+
+
+def test_empty_process_override_uses_new_template_value(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    config_file = tmp_path / "config.env"
+    config_file.write_text(
+        "CODE_EXEC_TYPE=langchain\nCODE_EXEC_MEMORY_LIMIT_MB=256\n",
+        encoding="utf-8",
+    )
+    monkeypatch.setenv("CODE_EXEC_TYPE", "")
+
+    loader = LocalLoader()
+    loader.env_file = config_file
+    loader.load()
+
+    assert os.getenv("CODE_EXEC_TYPE") == "langchain"

docker/astronAgent/.env.example

@@ -225,6 +225,11 @@ OSS_PRESIGN_EXPIRY_SECONDS_CONSOLE=600
 REDIS_DATABASE_CONSOLE=1
 
 # Internal workflow artifact upload authentication
+# Optional Code-node executor override. Leave empty to use the built-in
+# LangChain/Pyodide isolated sandbox; E2B is only used when enabled per workflow.
+# Set to "disabled" only when Code nodes should be intentionally unavailable.
+CODE_EXEC_TYPE=
+
 # Optional: leave empty to let console-hub generate one token in the shared, private
 # secret volume used read-only by core-agent and core-workflow. If explicitly set,
 # the token must contain at least 32 characters and is atomically synchronized to

docker/astronAgent/docker-compose.yaml

@@ -676,6 +676,9 @@ services:
     container_name: astron-agent-core-workflow
     environment:
       RUNTIME_ENV: "${RUNTIME_ENV:-dev}"
+      # Optional process-level override. Leave empty to use the built-in
+      # LangChain/Pyodide default from config/workflow/config.env.
+      CODE_EXEC_TYPE: "${CODE_EXEC_TYPE:-}"
       WORKFLOW_INTERNAL_API_KEY_FILE: "/app/secrets/workflow/workflow-internal-api-key"
       TENANT_ID: "680ab54f"
       TENANT_KEY_FILE: "/app/secrets/tenant/tenant-key"

docs/CONFIGURATION.md

@@ -281,6 +281,11 @@ network, subprocess, or FFI permissions. E2B is optional; enabling it for a
 workflow makes that workflow use E2B first. Running user-provided code inside
 the core-workflow process (`local`) is not supported.
 
+Upgrade note: an untouched config generated by older releases (`CODE_EXEC_TYPE=disabled`
+without `CODE_EXEC_MEMORY_LIMIT_MB`) is migrated to the built-in sandbox at startup, so
+no manual configuration change is required. To explicitly disable Code nodes, set
+`CODE_EXEC_TYPE=disabled` in the container process environment.
+
 ---
 
 ## 12. Console Module Configuration

docs/zh/CONFIGURATION.md

@@ -278,6 +278,11 @@
 不是必需配置；工作流启用 E2B 后才会优先使用 E2B。用户代码不会在
 `core-workflow` 进程内执行，`local` 执行器不再支持。
 
+升级提示：如果保留了旧版本自动生成的 `config.env`（其中
+`CODE_EXEC_TYPE=disabled` 且没有 `CODE_EXEC_MEMORY_LIMIT_MB`），Workflow
+会在启动时将这个历史默认值迁移为内置沙箱，因此无需手动修改配置。若要
+明确禁用代码节点，请在容器进程环境中设置 `CODE_EXEC_TYPE=disabled`。
+
 ---
 
 ## 12. Console 模块配置