feat: 接入 Shipyard Neo 自迭代 Skill 闭环与管理能力

astrbot/core/astr_main_agent.py

@@ -21,18 +21,32 @@
 from astrbot.core.astr_agent_run_util import AgentRunner
 from astrbot.core.astr_agent_tool_exec import FunctionToolExecutor
 from astrbot.core.astr_main_agent_resources import (
+    ANNOTATE_EXECUTION_TOOL,
+    BROWSER_BATCH_EXEC_TOOL,
+    BROWSER_EXEC_TOOL,
     CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT,
+    CREATE_SKILL_CANDIDATE_TOOL,
+    CREATE_SKILL_PAYLOAD_TOOL,
+    EVALUATE_SKILL_CANDIDATE_TOOL,
     EXECUTE_SHELL_TOOL,
     FILE_DOWNLOAD_TOOL,
     FILE_UPLOAD_TOOL,
+    GET_EXECUTION_HISTORY_TOOL,
+    GET_SKILL_PAYLOAD_TOOL,
     KNOWLEDGE_BASE_QUERY_TOOL,
+    LIST_SKILL_CANDIDATES_TOOL,
+    LIST_SKILL_RELEASES_TOOL,
     LIVE_MODE_SYSTEM_PROMPT,
     LLM_SAFETY_MODE_SYSTEM_PROMPT,
     LOCAL_EXECUTE_SHELL_TOOL,
     LOCAL_PYTHON_TOOL,
+    PROMOTE_SKILL_CANDIDATE_TOOL,
     PYTHON_TOOL,
+    ROLLBACK_SKILL_RELEASE_TOOL,
+    RUN_BROWSER_SKILL_TOOL,
     SANDBOX_MODE_PROMPT,
     SEND_MESSAGE_TO_USER_TOOL,
+    SYNC_SKILL_RELEASE_TOOL,
     TOOL_CALL_PROMPT,
     TOOL_CALL_PROMPT_SKILLS_LIKE_MODE,
     retrieve_knowledge_base,
@@ -781,20 +795,40 @@ def _apply_llm_safety_mode(config: MainAgentBuildConfig, req: ProviderRequest) -
 def _apply_sandbox_tools(
     config: MainAgentBuildConfig, req: ProviderRequest, session_id: str
 ) -> None:
+    _ = session_id
     if req.func_tool is None:
         req.func_tool = ToolSet()
-    if config.sandbox_cfg.get("booter") == "shipyard":
+    booter = config.sandbox_cfg.get("booter", "shipyard_neo")
+    if booter == "shipyard":
         ep = config.sandbox_cfg.get("shipyard_endpoint", "")
         at = config.sandbox_cfg.get("shipyard_access_token", "")
         if not ep or not at:
             logger.error("Shipyard sandbox configuration is incomplete.")
             return
         os.environ["SHIPYARD_ENDPOINT"] = ep
         os.environ["SHIPYARD_ACCESS_TOKEN"] = at
+
     req.func_tool.add_tool(EXECUTE_SHELL_TOOL)
     req.func_tool.add_tool(PYTHON_TOOL)
     req.func_tool.add_tool(FILE_UPLOAD_TOOL)
     req.func_tool.add_tool(FILE_DOWNLOAD_TOOL)
+
+    if booter == "shipyard_neo":
+        req.func_tool.add_tool(BROWSER_EXEC_TOOL)
+        req.func_tool.add_tool(BROWSER_BATCH_EXEC_TOOL)
+        req.func_tool.add_tool(RUN_BROWSER_SKILL_TOOL)
+        req.func_tool.add_tool(GET_EXECUTION_HISTORY_TOOL)
+        req.func_tool.add_tool(ANNOTATE_EXECUTION_TOOL)
+        req.func_tool.add_tool(CREATE_SKILL_PAYLOAD_TOOL)
+        req.func_tool.add_tool(GET_SKILL_PAYLOAD_TOOL)
+        req.func_tool.add_tool(CREATE_SKILL_CANDIDATE_TOOL)
+        req.func_tool.add_tool(LIST_SKILL_CANDIDATES_TOOL)
+        req.func_tool.add_tool(EVALUATE_SKILL_CANDIDATE_TOOL)
+        req.func_tool.add_tool(PROMOTE_SKILL_CANDIDATE_TOOL)
+        req.func_tool.add_tool(LIST_SKILL_RELEASES_TOOL)
+        req.func_tool.add_tool(ROLLBACK_SKILL_RELEASE_TOOL)
+        req.func_tool.add_tool(SYNC_SKILL_RELEASE_TOOL)
+
     req.system_prompt += f"\n{SANDBOX_MODE_PROMPT}\n"
 
 

astrbot/core/astr_main_agent_resources.py

@@ -12,11 +12,25 @@
 from astrbot.core.astr_agent_context import AstrAgentContext
 from astrbot.core.computer.computer_client import get_booter
 from astrbot.core.computer.tools import (
+    AnnotateExecutionTool,
+    BrowserBatchExecTool,
+    BrowserExecTool,
+    CreateSkillCandidateTool,
+    CreateSkillPayloadTool,
+    EvaluateSkillCandidateTool,
     ExecuteShellTool,
     FileDownloadTool,
     FileUploadTool,
+    GetExecutionHistoryTool,
+    GetSkillPayloadTool,
+    ListSkillCandidatesTool,
+    ListSkillReleasesTool,
     LocalPythonTool,
+    PromoteSkillCandidateTool,
     PythonTool,
+    RollbackSkillReleaseTool,
+    RunBrowserSkillTool,
+    SyncSkillReleaseTool,
 )
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.platform.message_session import MessageSession
@@ -446,6 +460,20 @@ async def retrieve_knowledge_base(
 LOCAL_PYTHON_TOOL = LocalPythonTool()
 FILE_UPLOAD_TOOL = FileUploadTool()
 FILE_DOWNLOAD_TOOL = FileDownloadTool()
+BROWSER_EXEC_TOOL = BrowserExecTool()
+BROWSER_BATCH_EXEC_TOOL = BrowserBatchExecTool()
+RUN_BROWSER_SKILL_TOOL = RunBrowserSkillTool()
+GET_EXECUTION_HISTORY_TOOL = GetExecutionHistoryTool()
+ANNOTATE_EXECUTION_TOOL = AnnotateExecutionTool()
+CREATE_SKILL_PAYLOAD_TOOL = CreateSkillPayloadTool()
+GET_SKILL_PAYLOAD_TOOL = GetSkillPayloadTool()
+CREATE_SKILL_CANDIDATE_TOOL = CreateSkillCandidateTool()
+LIST_SKILL_CANDIDATES_TOOL = ListSkillCandidatesTool()
+EVALUATE_SKILL_CANDIDATE_TOOL = EvaluateSkillCandidateTool()
+PROMOTE_SKILL_CANDIDATE_TOOL = PromoteSkillCandidateTool()
+LIST_SKILL_RELEASES_TOOL = ListSkillReleasesTool()
+ROLLBACK_SKILL_RELEASE_TOOL = RollbackSkillReleaseTool()
+SYNC_SKILL_RELEASE_TOOL = SyncSkillReleaseTool()
 
 # we prevent astrbot from connecting to known malicious hosts
 # these hosts are base64 encoded

astrbot/core/computer/booters/base.py

@@ -1,4 +1,9 @@
-from ..olayer import FileSystemComponent, PythonComponent, ShellComponent
+from ..olayer import (
+    BrowserComponent,
+    FileSystemComponent,
+    PythonComponent,
+    ShellComponent,
+)
 
 
 class ComputerBooter:
@@ -11,6 +16,12 @@ def python(self) -> PythonComponent: ...
     @property
     def shell(self) -> ShellComponent: ...
 
+    @property
+    def browser(self) -> BrowserComponent:
+        raise NotImplementedError(
+            f"{self.__class__.__name__} does not support browser capability."
+        )
+
     async def boot(self, session_id: str) -> None: ...
 
     async def shutdown(self) -> None: ...