feat(配置): 添加全局配置默认值支持

扩展全局配置功能，支持为多个模块设置默认值：
1. 添加defaults配置节，支持launch_type、preflight_mode等默认值设置
2. 在部署、生命周期等执行器中支持preflight_mode全局配置
3. 在CR相关操作中支持cr_public_endpoint_check全局配置
4. 在IAM角色创建中支持自定义策略列表和类型
5. 优化区域配置继承逻辑，优先使用全局volcengine.region

(cherry picked from commit 6d29a07a3acf309e9bfb72d8bfd8066b56d60b94)

Author: liulei.88

agentkit/toolkit/builders/ve_pipeline.py

@@ -734,13 +734,22 @@ def config_updater(service: str, cr_config_dict: Dict[str, Any]) -> None:
             if not cr_result.success:
                 raise Exception(cr_result.error)
 
-            # Ensure public endpoint access for image pulls
-            self.reporter.info("Ensuring CR public endpoint access...")
-            public_result = cr_service.ensure_public_endpoint(cr_config)
-            
-            if not public_result.success:
-                error_msg = f"Public endpoint configuration failed: {public_result.error}"
-                raise Exception(error_msg)
+            # Ensure public endpoint access for image pulls (controlled by global config)
+            try:
+                from agentkit.toolkit.config.global_config import get_global_config
+                gc = get_global_config()
+                do_check = getattr(getattr(gc, 'defaults', None), 'cr_public_endpoint_check', None)
+            except Exception:
+                do_check = None
+            if do_check is False:
+                self.reporter.info("Skipping CR public endpoint check per global config")
+            else:
+                self.reporter.info("Ensuring CR public endpoint access...")
+                public_result = cr_service.ensure_public_endpoint(cr_config)
+                
+                if not public_result.success:
+                    error_msg = f"Public endpoint configuration failed: {public_result.error}"
+                    raise Exception(error_msg)
 
             self.reporter.success("CR resource preparation completed")
             self.reporter.info(f"   Instance: {cr_result.instance_name}")
@@ -1131,4 +1140,4 @@ def download_and_show_logs(run_id: str):
             return image_url
 
         except Exception as e:
-            raise Exception(f"Build execution failed: {str(e)}")
+            raise Exception(f"Build execution failed: {str(e)}")

agentkit/toolkit/cli/cli_config.py

@@ -438,6 +438,45 @@ def _set_global_field(field_value: str):
                 config.iam_host = value
             elif field == 'schema':
                 config.iam_schema = value
+        elif section == 'defaults':
+            if field == 'launch_type':
+                clean_value = value.strip() if value is not None else None
+                if clean_value == "":
+                    clean_value = None
+                config.defaults.launch_type = clean_value
+            elif field == 'preflight_mode':
+                clean_value = value.strip().lower() if value is not None else None
+                if clean_value == "":
+                    clean_value = None
+                # Accept only known modes
+                allowed = {"prompt", "fail", "warn", "skip"}
+                if clean_value and clean_value not in allowed:
+                    raise AttributeError(f"Invalid preflight_mode: {value}. Allowed: prompt|fail|warn|skip")
+                config.defaults.preflight_mode = clean_value
+            elif field == 'cr_public_endpoint_check':
+                clean_value = value.strip().lower() if value is not None else None
+                if clean_value == "":
+                    clean_value = None
+                if clean_value is None:
+                    config.defaults.cr_public_endpoint_check = None
+                else:
+                    truthy = {"true", "1", "yes", "y"}
+                    falsy = {"false", "0", "no", "n"}
+                    if clean_value in truthy:
+                        config.defaults.cr_public_endpoint_check = True
+                    elif clean_value in falsy:
+                        config.defaults.cr_public_endpoint_check = False
+                    else:
+                        raise AttributeError(f"Invalid cr_public_endpoint_check: {value}. Allowed: true|false|1|0|yes|no")
+            elif field == 'iam_role_policies':
+                clean_value = value.strip() if value is not None else None
+                if clean_value == "" or clean_value is None:
+                    config.defaults.iam_role_policies = None
+                else:
+                    policies = [p.strip() for p in clean_value.split(',') if p.strip()]
+                    config.defaults.iam_role_policies = policies
+            else:
+                raise AttributeError(f"defaults has no field: {field}")
         else:
             console.print(f"[red]❌ Unknown config section: {section}[/red]")
             console.print("\nSupported sections: volcengine, cr, tos")

agentkit/toolkit/cli/cli_status.py

@@ -122,15 +122,15 @@ def status_command(
             if result.endpoint_url:
                 table.add_row("🌐 Endpoint", result.endpoint_url)
             if result.service_id:
-                table.add_row("☁️  Service ID", result.service_id)
+                table.add_row("☁️ Service ID", result.service_id)
             if result.uptime_seconds:
                 # Format uptime to human-readable format
                 uptime = result.uptime_seconds
                 hours = uptime // 3600
                 minutes = (uptime % 3600) // 60
                 seconds = uptime % 60
                 uptime_str = f"{hours}h {minutes}m {seconds}s" if hours > 0 else f"{minutes}m {seconds}s"
-                table.add_row("⏱️  Uptime", uptime_str)
+                table.add_row("⏱️ Uptime", uptime_str)
 
             # Extract other information from metadata
             details = result.metadata or {}

agentkit/toolkit/config/global_config.py

@@ -130,8 +130,38 @@ class GlobalConfig:
     iam_host: str = ""
     iam_schema: str = "https"
 
+    @dataclass
+    class Defaults:
+        launch_type: Optional[str] = None
+        preflight_mode: Optional[str] = None
+        cr_public_endpoint_check: Optional[bool] = None
+        iam_role_policies: Optional[list] = None
+        
+        def to_dict(self):
+            data = {}
+            if self.launch_type:
+                data["launch_type"] = self.launch_type
+            if self.preflight_mode:
+                data["preflight_mode"] = self.preflight_mode
+            if self.cr_public_endpoint_check is not None:
+                data["cr_public_endpoint_check"] = self.cr_public_endpoint_check
+            if self.iam_role_policies is not None:
+                data["iam_role_policies"] = self.iam_role_policies
+            return data
+        
+        @classmethod
+        def from_dict(cls, data: dict):
+            return cls(
+                launch_type=data.get("launch_type"),
+                preflight_mode=data.get("preflight_mode"),
+                cr_public_endpoint_check=data.get("cr_public_endpoint_check"),
+                iam_role_policies=data.get("iam_role_policies"),
+            )
+    
+    defaults: 'GlobalConfig.Defaults' = field(default_factory=lambda: GlobalConfig.Defaults())
+    
     def to_dict(self):
-        return {
+        base = {
             "volcengine": self.volcengine.to_dict(),
             "cr": self.cr.to_dict(),
             "tos": self.tos.to_dict(),
@@ -144,6 +174,10 @@ def to_dict(self):
                 "schema": self.iam_schema,
             },
         }
+        defaults_dict = self.defaults.to_dict()
+        if defaults_dict:
+            base["defaults"] = defaults_dict
+        return base
 
     @classmethod
     def from_dict(cls, data: dict):
@@ -155,6 +189,7 @@ def from_dict(cls, data: dict):
             agentkit_schema=(data.get("agentkit", {}) or {}).get("schema", "https"),
             iam_host=(data.get("iam", {}) or {}).get("host", ""),
             iam_schema=(data.get("iam", {}) or {}).get("schema", "https"),
+            defaults=GlobalConfig.Defaults.from_dict(data.get("defaults", {}) or {}),
         )
 
 
@@ -361,6 +396,16 @@ def apply_global_config_defaults(
                 'tos_region': ('tos', 'region'),
             })
 
+        # Region fields (cloud/hybrid) inherit from global volcengine.region when project missing
+        if isinstance(config_obj, (HybridStrategyConfig, CloudStrategyConfig)):
+            field_mappings.update({
+                'region': ('volcengine', 'region'),
+            })
+        if isinstance(config_obj, CloudStrategyConfig):
+            field_mappings.update({
+                'cr_region': ('volcengine', 'region'),
+            })
+        
         # Apply global config values
         for field_name, (section, attr) in field_mappings.items():
             # Skip if the target field does not exist on the config object

agentkit/toolkit/executors/deploy_executor.py

@@ -89,6 +89,21 @@ def execute(
             Exception: Any exception during deployment is caught and returned as failed result
         """
         try:
+            # Override preflight_mode from global config defaults if configured
+            try:
+                from agentkit.toolkit.config.global_config import get_global_config
+                gc = get_global_config()
+                gm = getattr(getattr(gc, 'defaults', None), 'preflight_mode', None)
+                if gm:
+                    gm_map = {
+                        'prompt': PreflightMode.PROMPT,
+                        'fail': PreflightMode.FAIL,
+                        'warn': PreflightMode.WARN,
+                        'skip': PreflightMode.SKIP,
+                    }
+                    preflight_mode = gm_map.get(gm.lower(), preflight_mode)
+            except Exception:
+                pass
             self.logger.info("Loading configuration...")
             config = self._load_config(config_dict, config_file)
             self._validate_config(config)

agentkit/toolkit/executors/init_executor.py

@@ -440,6 +440,13 @@ def _setup_config_launch_type(self, config_manager, common_config):
             # Create config directly to avoid auto-injection from global config
             cloud_config = CloudStrategyConfig()
 
+            # Region: prefer global volcengine.region if available
+            global_region = None
+            if global_config and getattr(global_config.volcengine, 'region', None):
+                global_region = global_config.volcengine.region
+            cloud_config.region = global_region or 'cn-beijing'
+            cloud_config.cr_region = global_region or 'cn-beijing'
+            
             # Empty string means "inherit from global config at runtime"
             if global_config and global_config.cr.instance_name:
                 cloud_config.cr_instance_name = ""
@@ -464,10 +471,11 @@ def _setup_config_launch_type(self, config_manager, common_config):
             else:
                 cloud_config.tos_prefix = "agentkit-builds"
 
-            if global_config and global_config.tos.region:
-                cloud_config.tos_region = ""
+            # TOS region: prefer explicit value from global.tos.region; otherwise use global volcengine.region
+            if global_config and getattr(global_config.tos, 'region', None):
+                cloud_config.tos_region = global_config.tos.region
             else:
-                cloud_config.tos_region = "cn-beijing"
+                cloud_config.tos_region = cloud_config.region
 
             # Project-specific values (always set, not inherited)
             cloud_config.cr_repo_name = common_config.agent_name
@@ -481,6 +489,11 @@ def _setup_config_launch_type(self, config_manager, common_config):
             # Create config directly to avoid auto-injection from global config
             # Hybrid mode only needs CR config (no TOS needed)
             hybrid_config = HybridStrategyConfig()
+            # Region: prefer global volcengine.region
+            global_region = None
+            if global_config and getattr(global_config.volcengine, 'region', None):
+                global_region = global_config.volcengine.region
+            hybrid_config.region = global_region or 'cn-beijing'
 
             if global_config and global_config.cr.instance_name:
                 hybrid_config.cr_instance_name = ""
@@ -519,7 +532,13 @@ def _create_config_file(
         config_manager = get_config(config_path=config_file_path)
         common_config = config_manager.get_common_config()
 
-        common_config.launch_type = 'cloud'
+        try:
+            global_cfg = get_global_config()
+            default_lt = getattr(getattr(global_cfg, 'defaults', None), 'launch_type', None)
+        except Exception:
+            default_lt = None
+        
+        common_config.launch_type = default_lt or 'cloud'
         common_config.language = language
         common_config.language_version = language_version
         common_config.agent_name = project_name

agentkit/toolkit/executors/lifecycle_executor.py

@@ -135,6 +135,22 @@ def launch(
 
             # Preflight check: verify required cloud services for both build and deploy
             # We do this once at the start for better UX (single prompt for all missing services)
+            # Override preflight_mode from global config defaults if configured
+            try:
+                from agentkit.toolkit.config.global_config import get_global_config
+                gc = get_global_config()
+                gm = getattr(getattr(gc, 'defaults', None), 'preflight_mode', None)
+                if gm:
+                    gm_map = {
+                        'prompt': PreflightMode.PROMPT,
+                        'fail': PreflightMode.FAIL,
+                        'warn': PreflightMode.WARN,
+                        'skip': PreflightMode.SKIP,
+                    }
+                    preflight_mode = gm_map.get(gm.lower(), preflight_mode)
+            except Exception:
+                pass
+            
             if preflight_mode != PreflightMode.SKIP:
                 # Load config first to get launch_type
                 config = self._load_config(config_dict, config_file)

agentkit/toolkit/strategies/hybrid_strategy.py

@@ -304,10 +304,19 @@ def _handle_cr_push(self, common_config: CommonConfig, result: BuildResult, stra
         if not ensure_result.success:
             raise Exception(ensure_result.error or "Failed to ensure CR resources")
 
-        # Ensure public endpoint is enabled for CR instance
-        public_result = cr_service.ensure_public_endpoint(cr_cfg)
-        if not public_result.success:
-            raise Exception(public_result.error or "Failed to enable CR public endpoint")
+        # Ensure public endpoint is enabled for CR instance (controlled by global config)
+        try:
+            from agentkit.toolkit.config.global_config import get_global_config
+            gc = get_global_config()
+            do_check = getattr(getattr(gc, 'defaults', None), 'cr_public_endpoint_check', None)
+        except Exception:
+            do_check = None
+        if do_check is False:
+            self.reporter.info("Skipping CR public endpoint check per global config")
+        else:
+            public_result = cr_service.ensure_public_endpoint(cr_cfg)
+            if not public_result.success:
+                raise Exception(public_result.error or "Failed to enable CR public endpoint")
 
         # Write back any auto-created names to config
         if ensure_result.instance_name and ensure_result.instance_name != strategy_config.cr_instance_name:

agentkit/toolkit/volcengine/iam.py

@@ -252,7 +252,13 @@ def create_role(self, role_name: str, trust_policy_document: str) -> Optional[Cr
             data="{}"
         )
         response_data = json.loads(res)
-        return CreateRoleResponse(**response_data.get('Result', {}))
+        result_data = response_data.get('Result', {})
+        role_data = result_data.get('Role')
+        if isinstance(role_data, dict):
+            tpd = role_data.get('TrustPolicyDocument')
+            if isinstance(tpd, dict):
+                role_data['TrustPolicyDocument'] = json.dumps(tpd)
+        return CreateRoleResponse(**result_data)
 
 
     def attach_role_policy(self, role_name: str, policy_name: str, policy_type: str) -> Optional[AttachRolePolicyResponse]:
@@ -293,20 +299,31 @@ def ensure_role_for_agentkit(self, role_name: str) -> bool:
             AgentKitTosAccess
             AgentKitToolAccess
             '''
-            policies = [
-                "ArkReadOnlyAccess",
-                "TLSReadOnlyAccess",
-                "APMPlusServerReadOnlyAccess",
-                "VikingdbReadOnlyAccess",
-                "ESCloudReadOnlyAccess",
-                "LLMShieldProtectSdkAccess",
-                "AgentKitReadOnlyAccess",
-                "TorchlightApiFullAccess",
-                "Mem0ReadOnlyAccess",
-                "IDReadOnlyAccess",
-                "AgentKitTosAccess",
-                "AgentKitToolAccess",
-            ]
-            for policy in policies:
+            try:
+                from agentkit.toolkit.config.global_config import get_global_config
+                gc = get_global_config()
+                defaults = getattr(gc, 'defaults', None)
+                custom_policies = getattr(defaults, 'iam_role_policies', None) if defaults else None
+            except Exception:
+                custom_policies = None
+            
+            if custom_policies and isinstance(custom_policies, list) and len(custom_policies) > 0:
+                to_attach = custom_policies
+            else:
+                to_attach = [
+                    "ArkReadOnlyAccess",
+                    "TLSReadOnlyAccess",
+                    "APMPlusServerReadOnlyAccess",
+                    "VikingdbReadOnlyAccess",
+                    "ESCloudReadOnlyAccess",
+                    "LLMShieldProtectSdkAccess",
+                    "AgentKitReadOnlyAccess",
+                    "TorchlightApiFullAccess",
+                    "Mem0ReadOnlyAccess",
+                    "IDReadOnlyAccess",
+                    "AgentKitTosAccess",
+                    "AgentKitToolAccess",
+                ]
+            for policy in to_attach:
                 self.attach_role_policy(role_name, policy_name=policy, policy_type="System")
         return True