refactor: rename FC3 to FC throughout codebase

- Rename fc3.py to fc.py, FC3Deployment to FCDeployment
- Rename fc3_rocklet/ to fc_rocklet/
- Update all FC3/FC3 references to FC in comments and strings
- Remove FC3DeploymentConfig backward compatibility alias
- Remove auto_clear_time property (use sandbox_ttl directly)
- Fix async methods in tests (is_session_alive, get_session_stats)
- Update test fixtures to include region and function_name

FC (Function Compute) is Alibaba Cloud serverless compute service.
The naming is simplified from FC3 to FC for clarity.

Change-Id: I4053ac81b47f818cd8644a013857e99415fb9168
Co-developed-by: Claude <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: insight-bit

rock-conf/rock-fc.yml

@@ -0,0 +1,79 @@
+# =============================================================================
+# ROCK Admin 运行时配置 - FC 环境
+# =============================================================================
+#
+# 用途：ROCK Admin 服务启动时加载的运行时配置
+#
+# 使用方式:
+#   rock admin start --env fc
+#   或 export ROCK_CONFIG=rock-conf/rock-fc.yml
+#
+# 注意：此文件不是函数部署配置，FC 函数部署使用
+#   rock/deployments/fc_rocklet/*/s.yaml + s deploy
+#
+# =============================================================================
+#
+# 配置层级说明:
+#
+# ┌─────────────────────────────────────────────────────────────────────┐
+# │  FCConfig (Admin 服务级) - 本文件                                    │
+# │  - Admin 启动时加载，提供默认值和凭证                                 │
+# │  - 服务级设置 (region, account_id, credentials)                     │
+# └─────────────────────────────────────────────────────────────────────┘
+#                           │
+#                           │ merge_with_fc_config()
+#                           ▼
+# ┌─────────────────────────────────────────────────────────────────────┐
+# │  FCDeploymentConfig (API 调用级)                                     │
+# │  - 每个 sandbox API 请求创建                                         │
+# │  - 可覆盖特定字段 (memory, cpus, timeout 等)                         │
+# │  - session_id 与 ROCK sandbox_id 1:1 映射                           │
+# └─────────────────────────────────────────────────────────────────────┘
+#                           │
+#                           │ 用于调用 FC 函数
+#                           ▼
+# ┌─────────────────────────────────────────────────────────────────────┐
+# │  s.yaml (FC 函数部署配置)                                            │
+# │  - 定义 FC 函数资源规格                                              │
+# │  - Session affinity, memory, CPU, timeout 等                        │
+# │  - 通过 `s deploy` 命令部署                                          │
+# │  - 位置: rock/deployments/fc_rocklet/{runtime,container,adapter}/    │
+# └─────────────────────────────────────────────────────────────────────┘
+#
+# =============================================================================
+
+# Ray 配置（FC 环境不使用 Ray 进行沙箱调度，但可用于其他分布式任务）
+ray:
+    runtime_env:
+        working_dir: ./
+        pip: ./requirements_sandbox_actor.txt
+    namespace: "rock-sandbox-fc"
+
+# FC 配置（阿里云函数计算服务级别配置）
+# FC (Function Compute) 是阿里云的无服务器计算服务
+fc:
+    # 连接设置
+    region: "cn-hangzhou"
+    account_id: null  # 阿里云账号 ID，运行时从环境变量或 STS 获取
+    function_name: "rock-rocklet-rt"  # 沙箱运行时函数名
+
+    # 凭证（建议通过环境变量或 STS 临时凭证提供）
+    # access_key_id: null
+    # access_key_secret: null
+    # security_token: null
+
+    # 资源默认值（可被 API 调用覆盖）
+    default_memory: 4096  # MB
+    default_cpus: 2.0
+
+    # 超时默认值（单位：秒）
+    default_session_ttl: 600  # 会话生命周期（秒），对应 s.yaml 中的 sessionTTLInSeconds
+    default_timeout: 30.0  # API 请求超时（秒）
+    default_session_idle_timeout: 60  # 会话空闲超时（秒），对应 s.yaml 中的 sessionIdleTimeoutInSeconds
+
+    # 协议设置
+    session_affinity_header: "x-rock-session-id"
+
+# 预热配置（FC 环境无本地镜像需预热）
+warmup:
+    images: []

rock-conf/rock-fc3.yml

@@ -62,6 +62,83 @@ class OssConfig:
     role_arn: str = ""
 
 
+@dataclass
+class FCConfig:
+    """FC (Function Compute) 服务级配置，用于 Admin。
+
+    提供 FC 沙箱部署的默认值和凭证。
+    API 调用可通过 FCDeploymentConfig 覆盖特定字段。
+
+    FC (Function Compute) 是阿里云的无服务器计算服务：
+    https://www.alibabacloud.com/product/function-compute
+
+    配置层级：
+    ┌─────────────────────────────────────────────────────────────────────┐
+    │  FCConfig (Admin 服务级) - 本文件                                    │
+    │  - Admin 启动时加载，提供默认值和凭证                                 │
+    │  - 服务级设置 (region, account_id, credentials)                     │
+    └─────────────────────────────────────────────────────────────────────┘
+                              │
+                              │ merge_with_fc_config()
+                              ▼
+    ┌─────────────────────────────────────────────────────────────────────┐
+    │  FCDeploymentConfig (API 调用级)                                     │
+    │  - 每个 sandbox API 请求创建                                         │
+    │  - session_id 与 ROCK sandbox_id 1:1 映射                           │
+    │  - 用于调用已部署的 FC 函数，不涉及函数部署                            │
+    └─────────────────────────────────────────────────────────────────────┘
+                              │
+                              │ 调用已部署的 FC 函数
+                              ▼
+    ┌─────────────────────────────────────────────────────────────────────┐
+    │  s.yaml (FC 函数部署配置)                                            │
+    │  - 定义 FC 函数资源规格，通过 `s deploy` 部署                         │
+    │  - 函数部署是前置条件，Admin 调用时函数已存在                           │
+    └─────────────────────────────────────────────────────────────────────┘
+    """
+
+    # Connection settings (service-level defaults)
+    region: str = "cn-hangzhou"
+    """Alibaba Cloud region for FC function."""
+
+    account_id: str | None = None
+    """Alibaba Cloud account ID."""
+
+    function_name: str = "rock-rocklet-rt"
+    """Default FC function name for sandbox runtime."""
+
+    # Credentials (service-level, sensitive)
+    access_key_id: str | None = None
+    """Alibaba Cloud AccessKey ID for authentication."""
+
+    access_key_secret: str = field(default="", repr=False)
+    """Alibaba Cloud AccessKey Secret for authentication."""
+
+    security_token: str | None = None
+    """Alibaba Cloud STS security token for temporary credentials."""
+
+    # Resource defaults (can be overridden by API)
+    default_memory: int = 4096
+    """Default memory allocation in MB for FC function."""
+
+    default_cpus: float = 2.0
+    """Default CPU cores for FC function."""
+
+    # Timeout defaults (can be overridden by API, all in seconds)
+    default_session_ttl: int = 600
+    """Default session time-to-live in seconds for sandbox auto-cleanup."""
+
+    default_timeout: float = 30.0
+    """Default request timeout in seconds for FC API calls."""
+
+    default_session_idle_timeout: int = 60
+    """Default session idle timeout in seconds. Matches s.yaml sessionIdleTimeoutInSeconds."""
+
+    # Protocol settings (service-level fixed)
+    session_affinity_header: str = "x-rock-session-id"
+    """Header field name for session affinity routing."""
+
+
 @dataclass
 class ProxyServiceConfig:
     timeout: float = 180.0
@@ -200,6 +277,7 @@ class RockConfig:
     redis: RedisConfig = field(default_factory=RedisConfig)
     sandbox_config: SandboxConfig = field(default_factory=SandboxConfig)
     oss: OssConfig = field(default_factory=OssConfig)
+    fc: FCConfig = field(default_factory=FCConfig)
     runtime: RuntimeConfig = field(default_factory=RuntimeConfig)
     proxy_service: ProxyServiceConfig = field(default_factory=ProxyServiceConfig)
     scheduler: SchedulerConfig = field(default_factory=SchedulerConfig)
@@ -238,6 +316,8 @@ def from_env(cls, config_path: str | None = None):
             kwargs["sandbox_config"] = SandboxConfig(**config["sandbox_config"])
         if "oss" in config:
             kwargs["oss"] = OssConfig(**config["oss"])
+        if "fc" in config:
+            kwargs["fc"] = FCConfig(**config["fc"])
         if "runtime" in config:
             kwargs["runtime"] = RuntimeConfig(**config["runtime"])
         if "proxy_service" in config:

rock/config.py

@@ -214,58 +214,126 @@ def get_deployment(self) -> AbstractDeployment:
         return RemoteDeployment.from_config(self)
 
 
-class FC3DeploymentConfig(DeploymentConfig):
-    """Configuration for Alibaba Cloud Function Compute 3.0 deployment.
+class FCDeploymentConfig(DeploymentConfig):
+    """Configuration for Alibaba Cloud Function Compute deployment.
 
-    This deployment type enables serverless sandbox execution using FC3
+    This deployment type enables serverless sandbox execution using FC
     with WebSocket session management for stateful operations.
+
+    FC (Function Compute) is Alibaba Cloud's serverless compute service:
+    https://www.alibabacloud.com/product/function-compute
+
+    Configuration Hierarchy:
+    ┌─────────────────────────────────────────────────────────────────────┐
+    │  FCConfig (Admin 服务级) - 本文件                                    │
+    │  - Admin 启动时加载，提供默认值和凭证                                 │
+    │  - 服务级设置 (region, account_id, credentials)                     │
+    └─────────────────────────────────────────────────────────────────────┘
+                              │
+                              │ merge_with_fc_config()
+                              ▼
+    ┌─────────────────────────────────────────────────────────────────────┐
+    │  FCDeploymentConfig (API 调用级)                                     │
+    │  - 每个 sandbox API 请求创建                                         │
+    │  - session_id 与 ROCK sandbox_id 1:1 映射                           │
+    │  - 用于调用已部署的 FC 函数，不涉及函数部署                            │
+    │  - sandbox_ttl/sandbox_idle_timeout: ROCK 内部沙箱生命周期管理        │
+    └─────────────────────────────────────────────────────────────────────┘
+                              │
+                              │ 调用已部署的 FC 函数
+                              ▼
+    ┌─────────────────────────────────────────────────────────────────────┐
+    │  s.yaml (FC 函数部署配置)                                            │
+    │  - 定义 FC 函数资源规格，通过 `s deploy` 部署                         │
+    │  - Session affinity, memory, CPU, timeout 等                        │
+    │  - 位置: rock/deployments/fc_rocklet/{runtime,container,adapter}/    │
+    │  - 函数部署是前置条件，Admin 调用时函数已存在                           │
+    └─────────────────────────────────────────────────────────────────────┘
+
+    The session_id serves as both the FC session identifier (for WebSocket
+    stateful invocation routing) and the ROCK sandbox_id (for business logic).
     """
 
-    type: Literal["fc3"] = "fc3"
-    """Deployment type discriminator."""
+    type: Literal["fc"] = "fc"
+    """Deployment type discriminator for JSON/YAML parsing."""
+
+    session_id: str | None = None
+    """FC session identifier for stateful invocation routing.
+
+    This serves as both:
+    - FC native session_id: Routes WebSocket requests to the same function instance
+    - ROCK sandbox_id: Used for lifecycle management, billing, and state tracking
 
-    function_name: str = "rock-rocklet-rt"
-    """FC3 function name for the sandbox runtime."""
+    If None, will be auto-generated as 'fc-{uuid}'.
+    """
+
+    # Connection settings (optional, use FCConfig defaults if not provided)
+    function_name: str | None = None
+    """FC function name. If None, uses FCConfig.function_name."""
 
-    region: str = "cn-hangzhou"
-    """Alibaba Cloud region for the FC3 function."""
+    region: str | None = None
+    """Alibaba Cloud region. If None, uses FCConfig.region."""
 
     account_id: str | None = None
-    """Alibaba Cloud account ID."""
+    """Alibaba Cloud account ID. If None, uses FCConfig.account_id."""
 
     access_key_id: str | None = None
-    """Alibaba Cloud AccessKey ID for authentication."""
+    """AccessKey ID. If None, uses FCConfig.access_key_id."""
 
     access_key_secret: str | None = Field(default=None, repr=False, exclude=True)
-    """Alibaba Cloud AccessKey Secret for authentication."""
+    """AccessKey Secret. If None, uses FCConfig.access_key_secret."""
 
     security_token: str | None = None
-    """Alibaba Cloud STS security token for temporary credentials."""
+    """STS security token. If None, uses FCConfig.security_token."""
 
-    memory: int = 4096
-    """Memory allocation in MB for the FC3 function."""
+    # Resource settings (optional, use FCConfig defaults if not provided)
+    memory: int | None = None
+    """Memory in MB. If None, uses FCConfig.default_memory."""
 
-    cpus: float = 2.0
-    """CPU cores allocated for the FC3 function."""
+    cpus: float | None = None
+    """CPU cores. If None, uses FCConfig.default_cpus."""
 
-    session_affinity_header: str = "x-rock-session-id"
-    """Header field name for session affinity."""
+    # Timeout settings (optional, use FCConfig defaults if not provided, all in seconds)
+    sandbox_ttl: int | None = None
+    """Sandbox time-to-live in seconds. If None, uses FCConfig.default_session_ttl."""
 
-    sandbox_ttl_minutes: int = 10
-    """Time-to-live in minutes for sandbox auto-cleanup."""
+    sandbox_idle_timeout: int | None = None
+    """Sandbox idle timeout in seconds. If None, uses FCConfig.default_session_idle_timeout."""
 
-    timeout: float = 30.0
-    """Request timeout in seconds for FC3 API calls."""
+    timeout: float | None = None
+    """Request timeout in seconds. If None, uses FCConfig.default_timeout."""
 
     def get_deployment(self) -> AbstractDeployment:
-        from rock.deployments.fc3 import FC3Deployment
+        from rock.deployments.fc import FCDeployment
 
-        return FC3Deployment.from_config(self)
+        return FCDeployment.from_config(self)
 
-    @property
-    def auto_clear_time(self) -> int:
-        """Alias for sandbox_ttl_minutes for compatibility."""
-        return self.sandbox_ttl_minutes
+    def merge_with_fc_config(self, fc_config: "FCConfig") -> "FCDeploymentConfig":
+        """Merge this config with FCConfig defaults.
+
+        Args:
+            fc_config: Admin-level FC configuration with defaults.
+
+        Returns:
+            New FCDeploymentConfig with all fields populated.
+        """
+        from rock.config import FCConfig
+
+        return FCDeploymentConfig(
+            type=self.type,
+            session_id=self.session_id,
+            function_name=self.function_name or fc_config.function_name,
+            region=self.region or fc_config.region,
+            account_id=self.account_id or fc_config.account_id,
+            access_key_id=self.access_key_id or fc_config.access_key_id,
+            access_key_secret=self.access_key_secret or fc_config.access_key_secret,
+            security_token=self.security_token or fc_config.security_token,
+            memory=self.memory or fc_config.default_memory,
+            cpus=self.cpus or fc_config.default_cpus,
+            sandbox_ttl=self.sandbox_ttl or fc_config.default_session_ttl,
+            sandbox_idle_timeout=self.sandbox_idle_timeout or fc_config.default_session_idle_timeout,
+            timeout=self.timeout or fc_config.default_timeout,
+        )
 
 
 def get_deployment(config: DeploymentConfig) -> AbstractDeployment: