diff --git a/packages/astrbot_agent/_conf_schema.json b/astrbot/builtin_stars/astrbot_agent/_conf_schema.json
similarity index 100%
rename from packages/astrbot_agent/_conf_schema.json
rename to astrbot/builtin_stars/astrbot_agent/_conf_schema.json
diff --git a/packages/astrbot_agent/commands/file.py b/astrbot/builtin_stars/astrbot_agent/commands/file.py
similarity index 99%
rename from packages/astrbot_agent/commands/file.py
rename to astrbot/builtin_stars/astrbot_agent/commands/file.py
index 110d8d1d0..cca2acdda 100644
--- a/packages/astrbot_agent/commands/file.py
+++ b/astrbot/builtin_stars/astrbot_agent/commands/file.py
@@ -1,12 +1,14 @@
 import os
-from astrbot.api.event import AstrMessageEvent, MessageChain
+
+import astrbot.api.message_components as Comp
 from astrbot.api import logger
 from astrbot.api.all import Context
-import astrbot.api.message_components as Comp
+from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot.core.utils.session_waiter import (
-    session_waiter,
     SessionController,
+    session_waiter,
 )
+
 from ..sandbox_client import SandboxClient
 
 
diff --git a/packages/astrbot_agent/main.py b/astrbot/builtin_stars/astrbot_agent/main.py
similarity index 90%
rename from packages/astrbot_agent/main.py
rename to astrbot/builtin_stars/astrbot_agent/main.py
index 89bae42a6..a20c5c822 100644
--- a/packages/astrbot_agent/main.py
+++ b/astrbot/builtin_stars/astrbot_agent/main.py
@@ -1,13 +1,14 @@
 import os
+
 import astrbot.api.star as star
-from astrbot.api import logger
-from astrbot.api.event import filter, AstrMessageEvent
+from astrbot.api import AstrBotConfig, logger
+from astrbot.api.event import AstrMessageEvent, filter
 from astrbot.api.provider import ProviderRequest
-from astrbot.api import AstrBotConfig
-from .tools.fs import CreateFileTool, ReadFileTool
-from .tools.shell import ExecuteShellTool
-from .tools.python import PythonTool
+
 from .commands.file import FileCommand
+from .tools.fs import CreateFileTool, ReadFileTool
+from .tools.python import PythonTool
+from .tools.shell import ExecuteShellTool
 
 
 class Main(star.Star):
@@ -21,7 +22,7 @@ class Main(star.Star):
         os.environ["SHIPYARD_ENDPOINT"] = self.endpoint
         os.environ["SHIPYARD_ACCESS_TOKEN"] = self.access_token
 
-        context.add_llm_tool(
+        context.add_llm_tools(
             CreateFileTool(), ExecuteShellTool(), PythonTool(), ReadFileTool()
         )
 
diff --git a/packages/astrbot_agent/metadata.yaml b/astrbot/builtin_stars/astrbot_agent/metadata.yaml
similarity index 100%
rename from packages/astrbot_agent/metadata.yaml
rename to astrbot/builtin_stars/astrbot_agent/metadata.yaml
diff --git a/packages/astrbot_agent/sandbox_client.py b/astrbot/builtin_stars/astrbot_agent/sandbox_client.py
similarity index 91%
rename from packages/astrbot_agent/sandbox_client.py
rename to astrbot/builtin_stars/astrbot_agent/sandbox_client.py
index b49137fc5..27cfcdeb9 100644
--- a/packages/astrbot_agent/sandbox_client.py
+++ b/astrbot/builtin_stars/astrbot_agent/sandbox_client.py
@@ -1,6 +1,8 @@
 import os
 import uuid
-from shipyard import ShipyardClient, SessionShip, Spec
+
+from shipyard import SessionShip, ShipyardClient, Spec
+
 from astrbot.api import logger
 
 
@@ -11,7 +13,7 @@ class SandboxClient:
 
     def __new__(cls):
         if cls._instance is None:
-            cls._instance = super(SandboxClient, cls).__new__(cls)
+            cls._instance = super().__new__(cls)
         return cls._instance
 
     def __init__(self):
diff --git a/packages/astrbot_agent/tools/fs.py b/astrbot/builtin_stars/astrbot_agent/tools/fs.py
similarity index 99%
rename from packages/astrbot_agent/tools/fs.py
rename to astrbot/builtin_stars/astrbot_agent/tools/fs.py
index b404481d9..452118b28 100644
--- a/packages/astrbot_agent/tools/fs.py
+++ b/astrbot/builtin_stars/astrbot_agent/tools/fs.py
@@ -1,7 +1,9 @@
 import json
+from dataclasses import dataclass, field
+
 from astrbot.api import FunctionTool
 from astrbot.api.event import AstrMessageEvent
-from dataclasses import dataclass, field
+
 from ..sandbox_client import SandboxClient
 
 
diff --git a/packages/astrbot_agent/tools/python.py b/astrbot/builtin_stars/astrbot_agent/tools/python.py
similarity index 99%
rename from packages/astrbot_agent/tools/python.py
rename to astrbot/builtin_stars/astrbot_agent/tools/python.py
index a78ae6a86..60968627f 100644
--- a/packages/astrbot_agent/tools/python.py
+++ b/astrbot/builtin_stars/astrbot_agent/tools/python.py
@@ -1,7 +1,10 @@
+from dataclasses import dataclass, field
+
 import mcp
+
 from astrbot.api import FunctionTool
 from astrbot.api.event import AstrMessageEvent
-from dataclasses import dataclass, field
+
 from ..sandbox_client import SandboxClient
 
 
diff --git a/packages/astrbot_agent/tools/shell.py b/astrbot/builtin_stars/astrbot_agent/tools/shell.py
similarity index 99%
rename from packages/astrbot_agent/tools/shell.py
rename to astrbot/builtin_stars/astrbot_agent/tools/shell.py
index bc9b4c1a6..94e6fd985 100644
--- a/packages/astrbot_agent/tools/shell.py
+++ b/astrbot/builtin_stars/astrbot_agent/tools/shell.py
@@ -1,7 +1,9 @@
 import json
+from dataclasses import dataclass, field
+
 from astrbot.api import FunctionTool
 from astrbot.api.event import AstrMessageEvent
-from dataclasses import dataclass, field
+
 from ..sandbox_client import SandboxClient