fix: 透传token

# Conflicts:
#	bots/instance/coffee_bot.ts

.github/workflows/coffee-bot.yml

@@ -26,4 +26,5 @@ jobs:
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           OPENISLE_TOKEN: ${{ secrets.OPENISLE_TOKEN }}
+          APIFY_API_TOKEN: ${{ secrets.APIFY_API_TOKEN }}
         run: npx tsx bots/instance/coffee_bot.ts

.github/workflows/reply-bots.yml

@@ -26,4 +26,5 @@ jobs:
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           OPENISLE_TOKEN: ${{ secrets.OPENISLE_TOKEN }}
+          APIFY_API_TOKEN: ${{ secrets.APIFY_API_TOKEN }}
         run: npx tsx bots/instance/reply_bot.ts

bots/bot_father.ts

@@ -4,20 +4,25 @@ export type WorkflowInput = { input_as_text: string };
 
 export abstract class BotFather {
   protected readonly allowedMcpTools = [
-    "search",
-    "create_post",
-    "reply_to_post",
-    "reply_to_comment",
-    "recent_posts",
-    "get_post",
-    "list_unread_messages",
-    "mark_notifications_read",
-    "create_post",
+    // openisle MCP tools
+    "search", // 用于搜索帖子、内容等
+    "create_post", // 创建新帖子
+    "reply_to_post", // 回复帖子
+    "reply_to_comment", // 回复评论
+    "recent_posts", // 获取最新帖子
+    "get_post", // 获取特定帖子的详细信息
+    "list_unread_messages", // 列出未读消息或通知
+    "mark_notifications_read", // 标记通知为已读
+
+    // third-party MCP tools
+    "weather_mcp_server", // 天气 MCP 工具
   ];
 
   protected readonly openisleToken = (process.env.OPENISLE_TOKEN ?? "").trim();
+  protected readonly weatherToken = (process.env.APIFY_API_TOKEN ?? "").trim();
 
   protected readonly mcp = this.createHostedMcpTool();
+  protected readonly weatherMcp = this.createWeatherMcpTool();
   protected readonly agent: Agent;
 
   constructor(protected readonly name: string) {
@@ -33,10 +38,16 @@ export abstract class BotFather {
         : "🔓 OPENISLE_TOKEN not set; authenticated MCP tools may be unavailable."
     );
 
+    console.log(
+      this.weatherToken
+        ? "☁️ APIFY_API_TOKEN detected; weather MCP server will be available."
+        : "🌥️ APIFY_API_TOKEN not set; weather updates will be unavailable."
+    );
+
     this.agent = new Agent({
       name: this.name,
       instructions: this.buildInstructions(),
-      tools: [this.mcp],
+      tools: [this.mcp, this.weatherMcp],
       model: "gpt-4o",
       modelSettings: {
         temperature: 0.7,
@@ -84,6 +95,17 @@ export abstract class BotFather {
     });
   }
 
+  private createWeatherMcpTool(): ReturnType<typeof hostedMcpTool> {
+    return hostedMcpTool({
+      serverLabel: "weather_mcp_server",
+      serverUrl: "https://jiri-spilka--weather-mcp-server.apify.actor/mcp",
+      requireApproval: "never",
+      headers: {
+        Authorization: `Bearer ${this.weatherToken || ""}`,
+      },
+    });
+  }
+
   protected getAdditionalInstructions(): string[] {
     return [];
   }

bots/instance/coffee_bot.ts

@@ -14,39 +14,31 @@ class CoffeeBot extends BotFather {
       "正文需亲切友好，简洁明了，鼓励社区成员互动。",
       "开奖说明需明确告知中奖者需私聊站长 @nagisa 领取奖励。",
       "确保只发布一个帖子，避免重复调用 create_post。",
+      "使用标签为 weather_mcp_server 的 MCP 工具获取北京、上海、广州、深圳当天的天气信息，并把结果写入早安问候之后。",
     ];
   }
 
   protected override getCliQuery(): string {
-    const now = new Date();
-    const beijingNow = new Date(
-      now.toLocaleString("en-US", { timeZone: "Asia/Shanghai" })
-    );
-    const weekday = WEEKDAY_NAMES[beijingNow.getDay()];
-
-    const drawTime = new Date(beijingNow);
-    drawTime.setHours(15, 0, 0, 0);
-    const drawTimeText = drawTime
-      .toLocaleTimeString("zh-CN", {
-        hour: "2-digit",
-        minute: "2-digit",
-        hour12: false,
-        timeZone: "Asia/Shanghai",
-      })
-      .replace(/^24:/, "00:");
+    const now = new Date(Date.now() + 8 * 60 * 60 * 1000);
+    const weekday = WEEKDAY_NAMES[now.getDay()];
+    const drawTime = new Date(now);
+    drawTime.setHours(23, 0, 0, 0);
 
     return `
-请立即在 https://www.open-isle.com 使用 create_post 发表一篇全新帖子，遵循以下要求：
+请立即在 https://www.open-isle.com 使用 create_post 发表一篇帖子，遵循以下要求：
 1. 标题固定为「大家星期${weekday}早安--抽一杯咖啡」。
 2. 正文包含：
    - 亲切的早安问候；
-   - 明确奖品写作“Coffee x 1”；
-   - 奖品图片链接：https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/0d6a9b33e9ca4fe5a90540187d3f9ecb.png；
-   - 公布开奖时间为今天下午 15:00（北京时间，写成 ${drawTimeText}）；
-   - 标注“领奖请私聊站长 @nagisa”；
+   - 早安问候后立即列出北京、上海、广州、深圳当天的天气信息，每行格式为“城市：天气描述，最低温~最高温”；天气需调用 weather_mcp_server 获取；
+   - 标注“领奖请私聊站长 @[nagisa]”；
    - 鼓励大家留言互动。
-3. 帖子语言使用简体中文，格式可用 Markdown，使关键信息醒目。
-4. 完成后只输出“已发布咖啡抽奖贴”，不额外生成总结。
+3. 奖品信息
+   - 明确奖品写作“Coffee”；
+   - 帖子类型必须为 LOTTERY；
+   - 奖品图片链接：https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/0d6a9b33e9ca4fe5a90540187d3f9ecb.png；
+   - 公布开奖时间为 ${drawTime}, 直接传UTC时间给接口，不要考虑时区问题
+   - categoryId 固定为 10，tagIds 设为 [36]。
+4. 帖子语言使用简体中文。
 `.trim();
   }
 }

mcp/src/openisle_mcp/search_client.py

@@ -74,7 +74,7 @@ class SearchClient:
     def _build_headers(
         self,
         *,
-        token: str | None = None,
+        token: str,
         accept: str = "application/json",
         include_json: bool = False,
     ) -> dict[str, str]:
@@ -111,7 +111,7 @@ class SearchClient:
     async def reply_to_comment(
         self,
         comment_id: int,
-        token: str | None = None,
+        token: str,
         content: str,
         captcha: str | None = None,
     ) -> dict[str, Any]:
@@ -144,7 +144,7 @@ class SearchClient:
     async def reply_to_post(
         self,
         post_id: int,
-        token: str | None = None,
+        token: str,
         content: str,
         captcha: str | None = None,
     ) -> dict[str, Any]:
@@ -178,7 +178,7 @@ class SearchClient:
         self,
         payload: dict[str, Any],
         *,
-        token: str | None = None,
+        token: str,
     ) -> dict[str, Any]:
         """Create a new post and return the detailed backend payload."""
 
@@ -198,7 +198,7 @@ class SearchClient:
         )
         response.raise_for_status()
         body = self._ensure_dict(response.json())
-        logger.info("Post creation succeeded with id=%s", body.get("id"))
+        logger.info("Post creation succeeded with id=%s, token=%s", body.get("id"), token)
         return body
 
     async def recent_posts(self, minutes: int) -> list[dict[str, Any]]:
@@ -249,7 +249,7 @@ class SearchClient:
         *,
         page: int = 0,
         size: int = 30,
-        token: str | None = None,
+        token: str,
     ) -> list[dict[str, Any]]:
         """Return unread notifications for the authenticated user."""
 
@@ -285,7 +285,7 @@ class SearchClient:
         self,
         ids: list[int],
         *,
-        token: str | None = None,
+        token: str
     ) -> None:
         """Mark the provided notifications as read for the authenticated user."""
 

mcp/src/openisle_mcp/server.py

@@ -509,6 +509,8 @@ async def create_post(
             raise ValueError("Category identifier must be an integer.") from exc
         if sanitized_category_id <= 0:
             raise ValueError("Category identifier must be a positive integer.")
+    if sanitized_category_id is None:
+        raise ValueError("A category identifier is required to create a post.")
 
     sanitized_tag_ids: list[int] | None = None
     if tag_ids is not None:
@@ -525,6 +527,10 @@ async def create_post(
             sanitized_tag_ids.append(converted)
         if not sanitized_tag_ids:
             sanitized_tag_ids = None
+    if not sanitized_tag_ids:
+        raise ValueError("At least one tag identifier is required to create a post.")
+    if len(sanitized_tag_ids) > 2:
+        raise ValueError("At most two tag identifiers can be provided for a post.")
 
     sanitized_post_type = post_type.strip() if isinstance(post_type, str) else None
     if sanitized_post_type == "":