koishi-plugin-chatluna-affinity 0.2.3-alpha.3 → 0.2.3

package/client/types.ts

@@ -19,6 +19,9 @@ export interface Config {
     schedule?: {
         enabled?: boolean
         model?: string
+        personaSource?: 'none' | 'chatluna' | 'custom'
+        personaChatlunaPreset?: string
+        personaCustomPreset?: string
         variableName?: string
         currentVariableName?: string
         registerTool?: boolean

package/lib/index.d.ts

@@ -14,4 +14,4 @@ export * from './renders';
 export * from './commands';
 export * from './integrations';
 export { ConfigSchema, AffinitySchema, BlacklistSchema, RelationshipSchema, ScheduleSchema, OtherVariablesSchema, NativeToolsSchema, XmlToolsSchema, OtherCommandsSchema, OtherSettingsSchema } from './schema';
-export declare const usage = "\n## \u66F4\u65B0\u65E5\u5FD7\n\n0.2.3-alpha.3\n- \u4FEE\u590D\u65E0\u6CD5\u9009\u62E9\u65E5\u7A0B\u6A21\u578B\u7684\u95EE\u9898\n\n0.2.3-alpha.2\n- \u4FEE\u590D\u597D\u611F\u5EA6\u66F4\u65B0\u65F6\u672A\u66F4\u65B0 chatCount \u7684\u95EE\u9898\n\n0.2.3-alpha.1\n- \u65B0\u589E XML \u5DE5\u5177\uFF0C\u89E3\u6790\u539F\u59CB\u8F93\u51FA\u4E2D\u7684 <poke id=\"\" /> \u6233\u4E00\u6233\u3001<emoji message_id=\"\" emoji_id=\"\" /> \u8868\u60C5\u56DE\u5E94\u3001<delete message_id=\"\" /> \u64A4\u56DE\u6D88\u606F\n- \u91CD\u6784\u597D\u611F\u5EA6\uFF0C\u4ECE\u4F9D\u8D56\u5916\u90E8\u6A21\u578B\u6539\u4E3A\u89E3\u6790\u539F\u59CB\u8F93\u51FA\u4E2D\u7684 <affinity delta=\"\" action=\"increase|decrease\" id=\"\" />\n";
+export declare const usage = "\n## \u66F4\u65B0\u65E5\u5FD7\n\n0.2.3\n- OneBot \u534F\u8BAE\u65B0\u589E NapCat/LLBot \u72EC\u7ACB\u9009\u9879\uFF0C\u6309\u914D\u7F6E\u9009\u62E9\u534F\u8BAE\n\n0.2.3-alpha.4\n- \u4FEE\u590D\u65E5\u7A0B\u751F\u6210\u63D0\u793A\u8BCD\u4EBA\u8BBE\u6CE8\u5165\u53D8\u91CF {persona} \u5931\u6548\u7684\u95EE\u9898\uFF0C\u65B0\u589E\u6A21\u578B\u9009\u62E9\u4E0E\u4EBA\u8BBE\u6CE8\u5165\u9009\u9879\n- \u5929\u6C14\u670D\u52A1\u5207\u6362\u4E3A open-meteo\uFF0C\u4E0D\u518D\u9700\u8981\u63D0\u4F9B token\n\n0.2.3-alpha.3\n- \u4FEE\u590D\u65E0\u6CD5\u9009\u62E9\u65E5\u7A0B\u6A21\u578B\u7684\u95EE\u9898\n";

package/lib/index.js

@@ -427,25 +427,25 @@ var AffinitySchema = import_koishi.Schema.object({
   characterPromptTemplate: import_koishi.Schema.string().role("textarea").default(
     `## \u52A8\u4F5C\u6307\u4EE4
 \u4F60\u53EF\u4EE5\u6839\u636E\u9700\u8981\u521B\u5EFA\u4E00\u4E2A\u72EC\u7ACB\u7684 \`<actions>\` \u5143\u7D20\u3002\u5B83\u7528\u4E8E\u6267\u884C\u975E\u8BED\u8A00\u7684\u7CFB\u7EDF\u6307\u4EE4\u3002\u5982\u679C\u4E0D\u9700\u8981\u6267\u884C\u4EFB\u4F55\u52A8\u4F5C\uFF0C\u8BF7\u7701\u7565\u6B64\u5143\u7D20\u3002
-1. **\u6233\u4E00\u6233**: \`<poke id="user_id" />\`
-   - **\u9002\u7528\u573A\u666F**:
-     - \u5F53\u4F60\u60F3\u5F15\u8D77\u67D0\u4EBA\u7684\u6CE8\u610F\u65F6\u3002
-     - \u5F53\u5BF9\u65B9\u8BF4\u4E86\u8BA9\u4F60\u611F\u5230\u65E0\u8BED\u3001\u65E0\u89C6\u4F60\u3001\u6216\u8005\u4F60\u60F3\u901A\u8FC7\u80A2\u4F53\u4E92\u52A8\u8C03\u4F83\u5BF9\u65B9\u65F6\u3002
-     - \u4F5C\u4E3A\u4E00\u79CD\u4FCF\u76AE\u7684\u6253\u62DB\u547C\u65B9\u5F0F\u3002
-2. **\u8868\u60C5\u56DE\u5E94**: \`<emoji message_id="message_id" emoji_id="emoji_id" />\`
-   - \u7528\u4E8E\u5BF9\u4E0A\u4E0B\u6587\u4E2D\u7684\u7279\u5B9A\u6D88\u606F\u8FDB\u884C\u8868\u60C5\u56DE\u5E94\u3002
-   - **emoji_id \u5BF9\u5E94\u8868**:
-     - 424: \u8D5E\u540C (\u7EA2\u8272\u6309\u94AE)
-     - 10068: \u95EE\u53F7
-     - 265: \u9006\u5929 (\u5730\u94C1\u8001\u4EBA\u624B\u673A)
-     - 76: \u70B9\u8D5E
-     - 66: \u7231\u5FC3
-3. **\u64A4\u56DE\u6D88\u606F**: \`<delete message_id="message_id" />\`
-   - \u7528\u4E8E\u64A4\u56DE\u6307\u5B9A\u6D88\u606F\u3002
-4. **\u597D\u611F\u5EA6\u66F4\u65B0**: \`<affinity delta="5" action="increase" id="user_id"/>\`
-   - delta: \u597D\u611F\u5EA6\u53D8\u5316\u91CF\uFF08\u6B63\u6574\u6570\uFF09
-   - action: increase \u6216 decrease
-   - id: \u76EE\u6807\u7528\u6237 ID
+1. **\u6233\u4E00\u6233**: \`<poke id="user_id" />\` 
+  - **\u9002\u7528\u573A\u666F**:
+    - \u5F53\u4F60\u60F3\u5F15\u8D77\u67D0\u4EBA\u7684\u6CE8\u610F\u65F6\u3002
+    - \u5F53\u5BF9\u65B9\u8BF4\u4E86\u8BA9\u4F60\u611F\u5230\u65E0\u8BED\u3001\u65E0\u89C6\u4F60\u3001\u6216\u8005\u4F60\u60F3\u901A\u8FC7\u80A2\u4F53\u4E92\u52A8\u8C03\u4F83\u5BF9\u65B9\u65F6\u3002
+    - \u4F5C\u4E3A\u4E00\u79CD\u4FCF\u76AE\u7684\u6253\u62DB\u547C\u65B9\u5F0F\u3002
+2. **\u8868\u60C5\u56DE\u5E94**: \`<emoji message_id="message_id" emoji_id="emoji_id" />\` 
+  - \u7528\u4E8E\u5BF9\u4E0A\u4E0B\u6587\u4E2D\u7684\u7279\u5B9A\u6D88\u606F\u8FDB\u884C\u8868\u60C5\u56DE\u5E94\u3002
+  - **emoji_id \u5BF9\u5E94\u8868**:
+    - 424: \u8D5E\u540C (\u7EA2\u8272\u6309\u94AE)
+    - 10068: \u95EE\u53F7
+    - 265: \u9006\u5929 (\u5730\u94C1\u8001\u4EBA\u624B\u673A)
+    - 76: \u70B9\u8D5E
+    - 66: \u7231\u5FC3
+3. **\u64A4\u56DE\u6D88\u606F**: \`<delete message_id="message_id" />\` 
+  - \u7528\u4E8E\u64A4\u56DE\u6307\u5B9A\u6D88\u606F\u3002
+4. **\u597D\u611F\u5EA6\u66F4\u65B0**: \`<affinity delta="5" action="increase" id="user_id"/>\` 
+  - delta: \u597D\u611F\u5EA6\u53D8\u5316\u91CF\uFF08\u6B63\u6574\u6570\uFF09
+  - action: increase \u6216 decrease
+  - id: \u76EE\u6807\u7528\u6237 ID
 
 **\u683C\u5F0F\u793A\u4F8B**:
 \`\`\`xml
@@ -539,7 +539,14 @@ var import_koishi4 = require("koishi");
 var ScheduleSchema = import_koishi4.Schema.object({
   schedule: import_koishi4.Schema.object({
     enabled: import_koishi4.Schema.boolean().default(true).description("\u662F\u5426\u542F\u7528\u65E5\u7A0B\u529F\u80FD"),
-    model: import_koishi4.Schema.dynamic("model").default("").description("\u65E5\u7A0B\u751F\u6210\u4F7F\u7528\u7684\u6A21\u578B\uFF0C\u7559\u7A7A\u5219\u4F7F\u7528 ChatLuna \u9ED8\u8BA4\u6A21\u578B"),
+    model: import_koishi4.Schema.dynamic("model").default("").description("\u65E5\u7A0B\u751F\u6210\u4F7F\u7528\u7684\u6A21\u578B"),
+    personaSource: import_koishi4.Schema.union([
+      import_koishi4.Schema.const("none").description("\u4E0D\u6CE8\u5165\u4EBA\u8BBE"),
+      import_koishi4.Schema.const("chatluna").description("\u4F7F\u7528 ChatLuna \u4E3B\u63D2\u4EF6\u4EBA\u8BBE"),
+      import_koishi4.Schema.const("custom").description("\u4F7F\u7528\u81EA\u5B9A\u4E49\u4EBA\u8BBE")
+    ]).default("none").description("\u4EBA\u8BBE\u6CE8\u5165\u6765\u6E90"),
+    personaChatlunaPreset: import_koishi4.Schema.dynamic("preset").default("\u65E0").hidden((_, cfg) => (cfg?.personaSource || "none") !== "chatluna").description("\u5F53\u9009\u62E9\u4E3B\u63D2\u4EF6\u9884\u8BBE\u65F6\uFF0C\u6307\u5B9A\u8981\u6CE8\u5165\u7684 ChatLuna \u9884\u8BBE"),
+    personaCustomPreset: import_koishi4.Schema.string().role("textarea").default("").hidden((_, cfg) => (cfg?.personaSource || "none") !== "custom").description("\u5F53\u9009\u62E9\u81EA\u5B9A\u4E49\u4EBA\u8BBE\u65F6\u6CE8\u5165\u7684\u6587\u672C\u5185\u5BB9"),
     variableName: import_koishi4.Schema.string().default("schedule").description("\u4ECA\u65E5\u65E5\u7A0B\u53D8\u91CF\u540D\u79F0"),
     currentVariableName: import_koishi4.Schema.string().default("currentSchedule").description("\u5F53\u524D\u65E5\u7A0B\u53D8\u91CF\u540D\u79F0"),
     outfitVariableName: import_koishi4.Schema.string().default("outfit").description("\u4ECA\u65E5\u7A7F\u642D\u53D8\u91CF\u540D\u79F0"),
@@ -553,6 +560,9 @@ var ScheduleSchema = import_koishi4.Schema.object({
   }).default({
     enabled: true,
     model: "",
+    personaSource: "none",
+    personaChatlunaPreset: "\u65E0",
+    personaCustomPreset: "",
     variableName: "schedule",
     currentVariableName: "currentSchedule",
     outfitVariableName: "outfit",
@@ -572,11 +582,6 @@ var WeatherSchema = import_koishi5.Schema.object({
   weather: import_koishi5.Schema.object({
     enabled: import_koishi5.Schema.boolean().default(false).description("\u662F\u5426\u542F\u7528\u5929\u6C14\u529F\u80FD"),
     variableName: import_koishi5.Schema.string().default("weather").description("\u5929\u6C14\u53D8\u91CF\u540D\u79F0"),
-    apiToken: import_koishi5.Schema.string().role("secret").default("").description("ALAPI \u5929\u6C14 API Token\uFF08\u53EF\u5728 https://alapi.cn/dashboard/data/token \u83B7\u53D6\uFF09"),
-    searchType: import_koishi5.Schema.union([
-      import_koishi5.Schema.const("city").description("\u6309\u57CE\u5E02\u540D\u79F0"),
-      import_koishi5.Schema.const("ip").description("\u6309\u5F53\u524D IP \u5B9A\u4F4D")
-    ]).default("city").description("\u5929\u6C14\u641C\u7D22\u65B9\u5F0F"),
     cityName: import_koishi5.Schema.string().default("").description("\u57CE\u5E02\u540D\u79F0\uFF08\u5982\uFF1A\u957F\u6C99\uFF09"),
     hourlyRefresh: import_koishi5.Schema.boolean().default(false).description("\u6BCF\u5C0F\u65F6\u5237\u65B0\u5929\u6C14\u6570\u636E\uFF08\u5173\u95ED\u5219\u6BCF\u5929\u5237\u65B0\u4E00\u6B21\uFF09"),
     registerTool: import_koishi5.Schema.boolean().default(false).description("\u6CE8\u518C ChatLuna \u5DE5\u5177\uFF1A\u83B7\u53D6\u5929\u6C14"),
@@ -584,8 +589,6 @@ var WeatherSchema = import_koishi5.Schema.object({
   }).default({
     enabled: false,
     variableName: "weather",
-    apiToken: "",
-    searchType: "city",
     cityName: "",
     hourlyRefresh: false,
     registerTool: false,
@@ -656,6 +659,8 @@ var OtherVariablesSchema = import_koishi6.Schema.object({
 // src/schema/tools.ts
 var import_koishi7 = require("koishi");
 var NativeToolsSchema = import_koishi7.Schema.object({
+  enableNapCatProtocol: import_koishi7.Schema.boolean().default(true).description("\u542F\u7528 NapCat OneBot \u534F\u8BAE\uFF08\u4E0E LLBot \u4E8C\u9009\u4E00\uFF09"),
+  enableLlbotProtocol: import_koishi7.Schema.boolean().default(false).description("\u542F\u7528 LLBot OneBot \u534F\u8BAE\uFF08\u4E0E NapCat \u4E8C\u9009\u4E00\uFF09"),
   enablePokeTool: import_koishi7.Schema.boolean().default(false).description("\u6CE8\u518C ChatLuna \u5DE5\u5177\uFF1A\u6233\u4E00\u6233"),
   pokeToolName: import_koishi7.Schema.string().default("poke_user").description("ChatLuna \u5DE5\u5177\u540D\u79F0\uFF1A\u6233\u4E00\u6233"),
   enableSetSelfProfileTool: import_koishi7.Schema.boolean().default(false).description("\u6CE8\u518C ChatLuna \u5DE5\u5177\uFF1A\u4FEE\u6539\u81EA\u8EAB\u8D26\u6237\u4FE1\u606F"),
@@ -700,8 +705,10 @@ var NativeToolsSchema = import_koishi7.Schema.object({
 }).description("\u539F\u751F\u5DE5\u5177");
 var XmlToolsSchema = import_koishi7.Schema.object({
   enablePokeXmlTool: import_koishi7.Schema.boolean().default(false).description('\u542F\u7528 XML \u5F62\u5F0F\u7684\u6233\u4E00\u6233\u8C03\u7528\uFF08\u89E3\u6790 &lt;poke id=""/&gt;\uFF09'),
-  enableEmojiXmlTool: import_koishi7.Schema.boolean().default(false).description('\u542F\u7528 XML \u5F62\u5F0F\u7684\u6D88\u606F\u8868\u60C5\u8C03\u7528\uFF08\u89E3\u6790 &lt;emoji message_id="" emoji_id=""/&gt;\uFF09'),
-  enableDeleteXmlTool: import_koishi7.Schema.boolean().default(false).description('\u542F\u7528 XML \u5F62\u5F0F\u7684\u6D88\u606F\u64A4\u56DE\u8C03\u7528\uFF08\u89E3\u6790 &lt;delete message_id=""/&gt;\uFF09')
+  enableEmojiXmlTool: import_koishi7.Schema.boolean().default(false).description(
+    '\u542F\u7528 XML \u5F62\u5F0F\u7684\u6D88\u606F\u8868\u60C5\u8C03\u7528\uFF08\u89E3\u6790 &lt;emoji message_id="" emoji_id=""/&gt;\uFF0C\u9700 chatluna-character \u5F00\u542F enableMessageId\uFF0C\u53EF\u7528\u8868\u60C5 ID \u89C1 https://bot.q.qq.com/wiki/develop/gosdk/model/emoji \uFF09'
+  ),
+  enableDeleteXmlTool: import_koishi7.Schema.boolean().default(false).description('\u542F\u7528 XML \u5F62\u5F0F\u7684\u6D88\u606F\u64A4\u56DE\u8C03\u7528\uFF08\u89E3\u6790 &lt;delete message_id=""/&gt;\uFF0C\u9700 chatluna-character \u5F00\u542F enableMessageId\uFF09')
 }).description("XML \u5DE5\u5177");
 var OtherCommandsSchema = import_koishi7.Schema.object({
   groupListRenderAsImage: import_koishi7.Schema.boolean().default(false).description("\u5C06\u7FA4\u804A\u5217\u8868\u6E32\u67D3\u4E3A\u56FE\u7247\uFF08affinity.groupList\uFF09"),
@@ -7003,66 +7010,83 @@ function createWeatherProvider(deps) {
 }
 
 // src/services/weather/api.ts
-var API_BASE_URL = "https://v3.alapi.cn/api/tianqi";
-function findCurrentHourWeather(hours, timezone) {
-  if (!hours || !hours.length) return null;
-  const now = /* @__PURE__ */ new Date();
-  const formatter = new Intl.DateTimeFormat("zh-CN", {
-    timeZone: timezone,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    hour12: false
-  });
-  const parts = formatter.formatToParts(now);
-  const year = parts.find((p) => p.type === "year")?.value;
-  const month = parts.find((p) => p.type === "month")?.value;
-  const day = parts.find((p) => p.type === "day")?.value;
-  const hour = parts.find((p) => p.type === "hour")?.value;
-  const currentHourStr = `${year}-${month}-${day} ${hour}:00:00`;
-  const exactMatch = hours.find((h15) => h15.time === currentHourStr);
-  if (exactMatch) return exactMatch;
-  const currentHourNum = parseInt(hour || "0", 10);
-  const currentDateStr = `${year}-${month}-${day}`;
-  for (const h15 of hours) {
-    if (!h15.time.startsWith(currentDateStr)) continue;
-    const hourMatch = h15.time.match(/(\d{2}):\d{2}:\d{2}$/);
-    if (!hourMatch) continue;
-    const hourNum = parseInt(hourMatch[1], 10);
-    if (hourNum === currentHourNum) return h15;
-  }
-  return hours[0];
-}
-function formatCurrentWeather(data, hourData, timezone) {
-  const now = /* @__PURE__ */ new Date();
+var GEO_API_BASE_URL = "https://geocoding-api.open-meteo.com/v1/search";
+var FORECAST_API_BASE_URL = "https://api.open-meteo.com/v1/forecast";
+var MAX_RETRY = 3;
+var wait = (ms) => new Promise((resolve2) => {
+  setTimeout(resolve2, ms);
+});
+var WEATHER_CODE_MAP = {
+  0: "\u6674",
+  1: "\u591A\u4E91",
+  2: "\u591A\u4E91",
+  3: "\u9634",
+  45: "\u6709\u96FE",
+  48: "\u96FE\u51BB",
+  51: "\u5C0F\u96E8",
+  53: "\u4E2D\u96E8",
+  55: "\u5927\u96E8",
+  56: "\u5C0F\u96E8",
+  57: "\u4E2D\u96E8",
+  61: "\u5C0F\u96E8",
+  63: "\u4E2D\u96E8",
+  65: "\u5927\u96E8",
+  66: "\u51BB\u96E8",
+  67: "\u51BB\u96E8",
+  71: "\u5C0F\u96EA",
+  73: "\u4E2D\u96EA",
+  75: "\u5927\u96EA",
+  77: "\u96EA\u7C92",
+  80: "\u9635\u96E8",
+  81: "\u9635\u96E8",
+  82: "\u66B4\u96E8",
+  85: "\u9635\u96EA",
+  86: "\u9635\u96EA",
+  95: "\u96F7\u9635\u96E8",
+  96: "\u96F7\u9635\u96E8",
+  99: "\u96F7\u9635\u96E8"
+};
+var formatTemp = (value) => {
+  if (!Number.isFinite(value)) return "";
+  return Number.isInteger(value) ? `${value}` : `${Number(value.toFixed(1))}`;
+};
+var resolveWeatherText = (code) => {
+  if (code === void 0 || code === null) return "";
+  return WEATHER_CODE_MAP[code] || "\u672A\u77E5";
+};
+var formatCurrentWeather = (data, geo, current, daily, timezone) => {
+  const now = new Date(current.time);
   const timeFormatter = new Intl.DateTimeFormat("zh-CN", {
     timeZone: timezone,
     hour: "2-digit",
     minute: "2-digit",
     hour12: false
   });
+  const minTemp = daily?.temperature_2m_min?.[0];
+  const maxTemp = daily?.temperature_2m_max?.[0];
+  const weatherText = resolveWeatherText(current.weather_code);
+  const windSpeed = current.wind_speed_10m ?? 0;
   return {
-    city: data.city,
-    province: data.province,
-    date: data.date,
+    city: geo.name,
+    province: geo.admin1 || geo.country || "",
+    date: current.time.slice(0, 10),
     time: timeFormatter.format(now),
-    weather: hourData?.wea || data.weather,
-    temp: hourData?.temp ?? data.temp,
-    minTemp: data.min_temp,
-    maxTemp: data.max_temp,
-    wind: hourData?.wind || data.wind,
-    windLevel: hourData?.wind_level || data.wind_power,
-    humidity: data.humidity,
-    airLevel: data.aqi?.air_level || "",
-    airTips: data.aqi?.air_tips || ""
-  };
-}
-function formatWeatherText(weather) {
+    weather: weatherText,
+    temp: current.temperature_2m,
+    minTemp: minTemp ?? current.temperature_2m,
+    maxTemp: maxTemp ?? current.temperature_2m,
+    wind: "\u98CE\u901F",
+    windLevel: `${formatTemp(windSpeed)} km/h`,
+    humidity: `${current.relative_humidity_2m}%`,
+    airLevel: "",
+    airTips: ""
+  };
+};
+var formatWeatherText = (weather) => {
   const lines = [
     `\u{1F4CD} ${weather.province} ${weather.city}`,
     `\u{1F4C5} ${weather.date} ${weather.time}`,
-    `\u{1F324}\uFE0F ${weather.weather}\uFF0C${weather.temp}\xB0C\uFF08${weather.minTemp}~${weather.maxTemp}\xB0C\uFF09`,
+    `\u{1F324}\uFE0F ${weather.weather}\uFF0C${formatTemp(weather.temp)}\xB0C\uFF08${formatTemp(weather.minTemp)}~${formatTemp(weather.maxTemp)}\xB0C\uFF09`,
     `\u{1F4A8} ${weather.wind} ${weather.windLevel}`,
     `\u{1F4A7} \u6E7F\u5EA6 ${weather.humidity}`
   ];
@@ -7070,20 +7094,16 @@ function formatWeatherText(weather) {
     lines.push(`\u{1F32B}\uFE0F \u7A7A\u6C14\u8D28\u91CF\uFF1A${weather.airLevel}`);
   }
   return lines.join("\n");
-}
+};
 function createWeatherApi(deps) {
   const { ctx, weatherConfig, log } = deps;
-  const timezone = "Asia/Shanghai";
+  const defaultTimezone = "Asia/Shanghai";
   const cache = /* @__PURE__ */ new Map();
-  const buildRequestParams = (options) => {
-    const params = {
-      token: weatherConfig.apiToken
-    };
-    const city = (options?.city || weatherConfig.cityName || "").trim();
-    if (city) params.city = city;
-    return params;
+  const geoCache = /* @__PURE__ */ new Map();
+  const formatCityKey = (options) => {
+    return (options?.city || weatherConfig.cityName || "").trim();
   };
-  const buildCacheKey = (now, cityKey) => {
+  const buildCacheKey = (now, cityKey, timezone) => {
     const formatter = new Intl.DateTimeFormat("zh-CN", {
       timeZone: timezone,
       year: "numeric",
@@ -7095,42 +7115,86 @@ function createWeatherApi(deps) {
     const timeKey = formatter.format(now).replace(/[\/\s:]/g, "-");
     return `${cityKey || "default"}-${timeKey}`;
   };
-  const fetchWeather = async (options) => {
-    if (!weatherConfig.enabled || !weatherConfig.apiToken) {
+  const geocode = async (city, retryCount = 0) => {
+    if (!city) return null;
+    const cached = geoCache.get(city);
+    const now = Date.now();
+    if (cached && cached.expiresAt > now) return cached.result;
+    try {
+      const params = new URLSearchParams({
+        name: city,
+        count: "1",
+        language: "zh",
+        format: "json"
+      });
+      const url = `${GEO_API_BASE_URL}?${params.toString()}`;
+      const response = await ctx.http.get(url);
+      const result = response.results && response.results[0];
+      if (!result) {
+        log("warn", "\u672A\u627E\u5230\u57CE\u5E02\u7ECF\u7EAC\u5EA6", { city });
+        return null;
+      }
+      geoCache.set(city, { result, expiresAt: now + 24 * 60 * 60 * 1e3 });
+      return result;
+    } catch (error) {
+      if (retryCount < MAX_RETRY - 1) {
+        log("warn", `\u5730\u7406\u7F16\u7801\u5931\u8D25\uFF0C${retryCount + 1}/${MAX_RETRY} \u6B21\u91CD\u8BD5\u4E2D...`, { city, error });
+        await wait(2e3 * (retryCount + 1));
+        return geocode(city, retryCount + 1);
+      }
+      log("warn", "\u5730\u7406\u7F16\u7801\u5931\u8D25\uFF0C\u5DF2\u8FBE\u5230\u6700\u5927\u91CD\u8BD5\u6B21\u6570", { city, error });
       return null;
     }
+  };
+  const fetchWeather = async (options, retryCount = 0) => {
+    if (!weatherConfig.enabled) return null;
     const now = /* @__PURE__ */ new Date();
-    const cityKey = (options?.city || weatherConfig.cityName || "").trim();
+    const cityKey = formatCityKey(options);
     if (!cityKey) return null;
-    const currentKey = buildCacheKey(now, cityKey);
+    const geo = await geocode(cityKey);
+    if (!geo) return null;
+    const timezone = geo.timezone || defaultTimezone;
+    const currentKey = buildCacheKey(now, cityKey, timezone);
     if (cache.has(currentKey)) return cache.get(currentKey) || null;
     try {
-      const params = buildRequestParams(options);
-      if (!params.city) return null;
-      const queryString = new URLSearchParams(params).toString();
-      const url = `${API_BASE_URL}?${queryString}`;
+      const params = new URLSearchParams({
+        latitude: String(geo.latitude),
+        longitude: String(geo.longitude),
+        current: "temperature_2m,relative_humidity_2m,precipitation,weather_code,wind_speed_10m",
+        daily: "weather_code,temperature_2m_max,temperature_2m_min",
+        timezone
+      });
+      const url = `${FORECAST_API_BASE_URL}?${params.toString()}`;
       const response = await ctx.http.get(url);
-      if (!response.success || response.code !== 200 || !response.data) {
-        log("warn", "\u5929\u6C14 API \u8BF7\u6C42\u5931\u8D25", { message: response.message, code: response.code, city: params.city });
+      const current = response?.current;
+      const daily = response?.daily;
+      if (!current) {
+        log("warn", "\u5929\u6C14 API \u7F3A\u5C11\u5F53\u524D\u5929\u6C14\u6570\u636E", { city: cityKey });
         return cache.get(currentKey) || null;
       }
-      const data = response.data;
-      const hourData = findCurrentHourWeather(data.hour, timezone);
-      const current = formatCurrentWeather(data, hourData, timezone);
+      const currentWeather = formatCurrentWeather(response, geo, current, daily, timezone);
+      const weatherText = resolveWeatherText(current.weather_code);
+      const minTemp = daily?.temperature_2m_min?.[0] ?? current.temperature_2m;
+      const maxTemp = daily?.temperature_2m_max?.[0] ?? current.temperature_2m;
       const cachedData = {
-        current,
-        dailyWeather: data.weather,
-        hourlyWeather: hourData?.wea || data.weather,
-        dailyTemp: data.temp,
-        dailyMinTemp: data.min_temp,
-        dailyMaxTemp: data.max_temp,
-        hourlyTemp: hourData?.temp ?? data.temp
+        current: currentWeather,
+        dailyWeather: weatherText,
+        hourlyWeather: weatherText,
+        dailyTemp: current.temperature_2m,
+        dailyMinTemp: minTemp,
+        dailyMaxTemp: maxTemp,
+        hourlyTemp: current.temperature_2m
       };
       cache.set(currentKey, cachedData);
-      log("debug", "\u5929\u6C14\u6570\u636E\u5DF2\u66F4\u65B0", { city: current.city, daily: cachedData.dailyWeather, hourly: cachedData.hourlyWeather });
+      log("debug", "\u5929\u6C14\u6570\u636E\u5DF2\u66F4\u65B0", { city: currentWeather.city, daily: cachedData.dailyWeather, hourly: cachedData.hourlyWeather });
       return cachedData;
     } catch (error) {
-      log("warn", "\u83B7\u53D6\u5929\u6C14\u6570\u636E\u5931\u8D25", error);
+      if (retryCount < MAX_RETRY - 1) {
+        log("warn", `\u83B7\u53D6\u5929\u6C14\u6570\u636E\u5931\u8D25\uFF0C${retryCount + 1}/${MAX_RETRY} \u6B21\u91CD\u8BD5\u4E2D...`, error);
+        await wait(2e3 * (retryCount + 1));
+        return fetchWeather(options, retryCount + 1);
+      }
+      log("warn", "\u83B7\u53D6\u5929\u6C14\u6570\u636E\u5931\u8D25\uFF0C\u5DF2\u8FBE\u5230\u6700\u5927\u91CD\u8BD5\u6B21\u6570", error);
       return cache.get(currentKey) || null;
     }
   };
@@ -7429,13 +7493,22 @@ async function callOneBotAPI(internal, action, params, fallbacks = []) {
 // src/integrations/onebot/tools/poke.ts
 async function sendPoke(params) {
   try {
-    const { session, userId, groupId, log } = params;
+    const { session, userId, groupId, log, protocol } = params;
     const { error, internal, session: validatedSession } = ensureOneBotSession(session);
     if (error) return error;
     const resolvedGroupId = groupId?.trim() || validatedSession?.guildId || validatedSession?.channelId || validatedSession?.roomId;
     const payload = { user_id: userId };
     if (resolvedGroupId) payload.group_id = resolvedGroupId;
-    if (typeof internal._request === "function") {
+    if (protocol === "llbot") {
+      const action = payload.group_id ? "group_poke" : "friend_poke";
+      if (typeof internal._request === "function") {
+        await internal._request(action, payload);
+      } else if (typeof internal[action] === "function") {
+        await internal[action](payload);
+      } else {
+        throw new Error(`\u5F53\u524D\u9002\u914D\u5668\u672A\u5B9E\u73B0 ${action} API\u3002`);
+      }
+    } else if (typeof internal._request === "function") {
       await internal._request("send_poke", payload);
     } else if (typeof internal.sendPoke === "function") {
       await internal.sendPoke(
@@ -7457,7 +7530,7 @@ async function sendPoke(params) {
   }
 }
 function createPokeTool(deps) {
-  const { toolName, log } = deps;
+  const { toolName, log, protocol } = deps;
   return new class extends import_tools8.StructuredTool {
     name = toolName || "poke_user";
     description = "Poke (nudge) a specified user in a group or private conversation.";
@@ -7469,7 +7542,7 @@ function createPokeTool(deps) {
     });
     async _call(input, _manager, runnable) {
       const session = getSession(runnable);
-      return sendPoke({ session, userId: input.userId, groupId: input.groupId, log });
+      return sendPoke({ session, userId: input.userId, groupId: input.groupId, log, protocol });
     }
   }();
 }
@@ -7479,7 +7552,7 @@ var import_zod8 = require("zod");
 var import_tools9 = require("@langchain/core/tools");
 var genders = { unknown: "0", male: "1", female: "2" };
 function createSetProfileTool(deps) {
-  const { toolName, log } = deps;
+  const { toolName, log, protocol } = deps;
   return new class extends import_tools9.StructuredTool {
     name = toolName || "set_self_profile";
     description = "Update the bot's own QQ profile (nickname, signature, gender).";
@@ -7495,7 +7568,7 @@ function createSetProfileTool(deps) {
         if (error) return error;
         const payload = { nickname: input.nickname };
         if (input.signature) payload.personal_note = input.signature;
-        if (input.gender) payload.sex = genders[input.gender];
+        if (input.gender && protocol !== "llbot") payload.sex = genders[input.gender];
         await callOneBotAPI(internal, "set_qq_profile", payload, ["setQQProfile"]);
         const message = "\u673A\u5668\u4EBA\u8D44\u6599\u5DF2\u66F4\u65B0\u3002";
         log?.("info", message);
@@ -7555,9 +7628,12 @@ var import_zod10 = require("zod");
 var import_tools11 = require("@langchain/core/tools");
 async function sendMsgEmoji(params) {
   try {
-    const { session, messageId, emojiId, log } = params;
+    const { session, messageId, emojiId, log, protocol } = params;
     if (!session) return "No session context available.";
     if (session.platform !== "onebot") return "This tool only supports OneBot platform.";
+    if (protocol === "llbot" && !session.guildId && !session.channelId) {
+      return "\u5F53\u524D\u4F1A\u8BDD\u4E0D\u662F\u7FA4\u804A\uFF0CLLBot \u4E0D\u652F\u6301\u79C1\u804A\u8868\u60C5\u56DE\u5E94\u3002";
+    }
     const messageIdRaw = messageId.trim();
     const emojiIdRaw = emojiId.trim();
     if (!messageIdRaw) return "message_id is required.";
@@ -7580,7 +7656,7 @@ async function sendMsgEmoji(params) {
   }
 }
 function createSetMsgEmojiTool(deps) {
-  const { toolName, log } = deps;
+  const { toolName, log, protocol } = deps;
   return new class extends import_tools11.StructuredTool {
     name = toolName || "set_msg_emoji";
     description = "React to a message with an emoji by messageId. Required: message_id and emoji_id (emoji ID).";
@@ -7590,7 +7666,7 @@ function createSetMsgEmojiTool(deps) {
     });
     async _call(input, _manager, runnable) {
       const session = getSession(runnable);
-      return sendMsgEmoji({ session, messageId: input.messageId, emojiId: input.emojiId, log });
+      return sendMsgEmoji({ session, messageId: input.messageId, emojiId: input.emojiId, log, protocol });
     }
   }();
 }
@@ -7599,7 +7675,7 @@ function createSetMsgEmojiTool(deps) {
 var import_zod11 = require("zod");
 var import_tools12 = require("@langchain/core/tools");
 function createFakeMessageTool(deps) {
-  const { toolName, log } = deps;
+  const { toolName, log, protocol } = deps;
   return new class extends import_tools12.StructuredTool {
     name = toolName || "send_fake_msg";
     description = "Forge messages for one or more users and send as a merged forward. Accepts messages array or senderId + texts. Requires OneBot and send_forward_msg support.";
@@ -7642,6 +7718,18 @@ function createFakeMessageTool(deps) {
         if (!targetGroupId) {
           return "Missing targetGroupId. Provide targetGroupId or run inside a group session.";
         }
+        const buildForwardContent = (content) => [{
+          type: "text",
+          data: { text: content }
+        }];
+        const buildLegacyNodes = (targets) => targets.map((node) => ({
+          type: "node",
+          data: {
+            name: node.data.name,
+            uin: node.data.uin,
+            content: node.data.content.map((segment) => segment.data.text || "").filter(Boolean).join("")
+          }
+        }));
         const nodes = (() => {
           const buildNodesFromMessages = (messages) => {
             return messages.map((item) => {
@@ -7656,7 +7744,7 @@ function createFakeMessageTool(deps) {
                 data: {
                   name: displayName2 || uin,
                   uin,
-                  content: text
+                  content: buildForwardContent(text)
                 }
               };
             }).filter((v) => Boolean(v));
@@ -7688,7 +7776,7 @@ function createFakeMessageTool(deps) {
             data: {
               name: displayName,
               uin: senderId,
-              content
+              content: buildForwardContent(content)
             }
           }));
         })();
@@ -7708,12 +7796,22 @@ function createFakeMessageTool(deps) {
         );
         const { error, internal } = ensureOneBotSession(session);
         if (error) return error;
-        await callOneBotAPI(
-          internal,
-          "send_forward_msg",
-          { group_id: targetGroupId, messages: nodes },
-          ["sendForwardMsg"]
-        );
+        if (protocol === "llbot") {
+          await callOneBotAPI(
+            internal,
+            "send_group_forward_msg",
+            { group_id: targetGroupId, messages: nodes },
+            ["sendGroupForwardMsg"]
+          );
+        } else {
+          const legacyNodes = buildLegacyNodes(nodes);
+          await callOneBotAPI(
+            internal,
+            "send_forward_msg",
+            { group_id: targetGroupId, messages: legacyNodes },
+            ["sendForwardMsg"]
+          );
+        }
         const senderSet = Array.from(new Set(nodes.map((n) => n.data.uin || n.data.name).filter(Boolean)));
         const senderLabel = senderSet.length ? senderSet.join(",") : "unknown";
         const success = `Forged ${nodes.length} messages from ${senderLabel} and forwarded to group ${targetGroupId}.`;
@@ -7731,7 +7829,7 @@ function createFakeMessageTool(deps) {
 var import_zod12 = require("zod");
 var import_tools13 = require("@langchain/core/tools");
 function createForwardMessageTool(deps) {
-  const { toolName, messageStore, log } = deps;
+  const { toolName, messageStore, log, protocol } = deps;
   return new class extends import_tools13.StructuredTool {
     name = toolName || "send_forward_msg";
     description = "Forward messages as a merged forward to a group. messageIds is required to specify messages to forward. Requires message_id exposure via chatluna-character enableMessageId.";
@@ -7749,11 +7847,11 @@ function createForwardMessageTool(deps) {
           return "Missing targetGroupId. Provide targetGroupId or run inside a group session.";
         }
         const explicitIds = Array.isArray(input.messageIds) && input.messageIds.length ? input.messageIds.map((id) => id.trim()).filter(Boolean) : [];
-        let nodes;
+        let legacyNodes;
         if (explicitIds.length > 0) {
           const found = messageStore.findByIds(session, explicitIds);
           const map = new Map(found.map((msg) => [msg.messageId, msg]));
-          nodes = explicitIds.map((id) => {
+          legacyNodes = explicitIds.map((id) => {
             const hit = map.get(id);
             if (!hit) return null;
             return {
@@ -7761,11 +7859,11 @@ function createForwardMessageTool(deps) {
               data: {
                 name: hit.username || hit.userId || "\u672A\u77E5\u7528\u6237",
                 uin: hit.userId || session.userId || "",
-                content: hit.content
+                content: String(hit.content || "")
               }
             };
           }).filter((item) => item !== null);
-          if (!nodes.length) {
+          if (!legacyNodes.length) {
             return "No messages found for provided messageIds.";
           }
         } else {
@@ -7773,13 +7871,30 @@ function createForwardMessageTool(deps) {
         }
         const { error, internal } = ensureOneBotSession(session);
         if (error) return error;
-        await callOneBotAPI(
-          internal,
-          "send_forward_msg",
-          { group_id: targetGroupId, messages: nodes },
-          ["sendForwardMsg"]
-        );
-        const success = `Forwarded ${nodes.length} messages to group ${targetGroupId}.`;
+        if (protocol === "llbot") {
+          const llbotNodes = legacyNodes.map((node) => ({
+            type: "node",
+            data: {
+              name: node.data.name,
+              uin: node.data.uin,
+              content: [{ type: "text", data: { text: node.data.content } }]
+            }
+          }));
+          await callOneBotAPI(
+            internal,
+            "send_group_forward_msg",
+            { group_id: targetGroupId, messages: llbotNodes },
+            ["sendGroupForwardMsg"]
+          );
+        } else {
+          await callOneBotAPI(
+            internal,
+            "send_forward_msg",
+            { group_id: targetGroupId, messages: legacyNodes },
+            ["sendForwardMsg"]
+          );
+        }
+        const success = `Forwarded ${legacyNodes.length} messages to group ${targetGroupId}.`;
         log?.("info", success);
         return success;
       } catch (error) {
@@ -8473,7 +8588,7 @@ function resolveVariableNames(config) {
     "\u968F\u673A\u53D8\u91CF",
     config.random?.variableName || config.otherVariables?.random?.variableName || "random"
   );
-  if (config.weather?.enabled && config.weather?.apiToken) {
+  if (config.weather?.enabled) {
     push("\u5929\u6C14\u53D8\u91CF", config.weather.variableName || "weather");
   }
   const scheduleConfig = config.schedule || {};
@@ -8500,7 +8615,7 @@ function resolveToolNames(config) {
   if (config.enablePokeTool) {
     tools.push(`\u6233\u4E00\u6233\u5DE5\u5177\uFF1A${(config.pokeToolName || "poke_user").trim()}`);
   }
-  if (config.weather?.enabled && config.weather?.apiToken && config.weather?.registerTool) {
+  if (config.weather?.enabled && config.weather?.registerTool) {
     tools.push(`\u5929\u6C14\u5DE5\u5177\uFF1A${(config.weather.toolName || "get_weather").trim() || "get_weather"}`);
   }
   if (config.enableSetSelfProfileTool) {
@@ -8581,6 +8696,17 @@ function apply(ctx, config) {
     });
   });
   const log = createLogger2(ctx, config);
+  const resolveOneBotProtocol = () => {
+    if (config.enableNapCatProtocol && config.enableLlbotProtocol) {
+      log("warn", "NapCat \u4E0E LLBot \u534F\u8BAE\u540C\u65F6\u542F\u7528\uFF0C\u5C06\u4F18\u5148\u4F7F\u7528 LLBot\u3002");
+      return "llbot";
+    }
+    if (config.enableLlbotProtocol) return "llbot";
+    if (config.enableNapCatProtocol) return "napcat";
+    log("warn", "\u672A\u542F\u7528 OneBot \u534F\u8BAE\u9009\u9879\uFF0C\u9ED8\u8BA4\u4F7F\u7528 NapCat\u3002");
+    return "napcat";
+  };
+  const onebotProtocol = resolveOneBotProtocol();
   log("warn", "\u26A0\uFE0F \u5347\u7EA7\u63D0\u793A\uFF1A0.2.1-alpha.10 \u7248\u672C\u540E\u6570\u636E\u5E93\u7ED3\u6784\u5DF2\u91CD\u6784\uFF0C\u82E5\u51FA\u73B0\u6570\u636E\u5E93\u76F8\u5173\u9519\u8BEF\uFF0C\u8BF7\u6267\u884C affinity.clearall \u547D\u4EE4\u6E05\u9664\u6570\u636E\u540E\u91CD\u8BD5\u3002\u597D\u611F\u5EA6\u5206\u6790\u63D0\u793A\u8BCD\u4E0E\u65E5\u7A0B\u751F\u6210\u63D0\u793A\u8BCD\u5DF2\u66F4\u65B0\uFF0C\u82E5\u60A8\u81EA\u5B9A\u4E49\u8FC7\u63D0\u793A\u8BCD\uFF0C\u8BF7\u5C06\u5176\u6062\u590D\u9ED8\u8BA4\u4EE5\u5E94\u7528\u6700\u65B0\u7248\u672C\u3002");
   const cache = createAffinityCache();
   const store = createAffinityStore({ ctx, config, log });
@@ -8636,12 +8762,35 @@ function apply(ctx, config) {
     toolName: "get_weather"
   };
   const weatherApi = createWeatherApi({ ctx, weatherConfig, log });
+  const resolveSchedulePersonaPreset = (_session) => {
+    const scheduleCfg = config.schedule || {};
+    const source = scheduleCfg.personaSource || "none";
+    const chatluna = ctx.chatluna;
+    if (source === "chatluna") {
+      let presetName = String(scheduleCfg.personaChatlunaPreset ?? "").trim();
+      if (presetName === "\u65E0") presetName = "";
+      if (presetName) {
+        const presetRef = chatluna?.preset?.getPreset?.(presetName);
+        const presetValue = presetRef?.value;
+        if (typeof presetValue === "string") return presetValue;
+        const rawText = presetValue?.rawText;
+        if (typeof rawText === "string") return rawText;
+        const configPrompt = presetValue?.config?.prompt;
+        if (typeof configPrompt === "string") return configPrompt;
+      }
+      return chatluna?.personaPrompt || "";
+    }
+    if (source === "custom") {
+      return String(scheduleCfg.personaCustomPreset ?? "").trim();
+    }
+    return "";
+  };
   let scheduleModelRef;
   let defaultModelRef;
   const scheduleManager = createScheduleManager(ctx, config, {
     getModel: () => scheduleModelRef?.value ?? scheduleModelRef ?? defaultModelRef?.value ?? defaultModelRef ?? null,
     getMessageContent,
-    resolvePersonaPreset: () => "",
+    resolvePersonaPreset: () => resolveSchedulePersonaPreset(),
     getWeatherText: () => weatherApi.getDailyWeather(),
     renderSchedule: renders.schedule,
     log
@@ -8736,7 +8885,7 @@ function apply(ctx, config) {
             const session = rawModelResponseSessionMap.get(rawModelResponseGuildId) || null;
             if (session && targetIds.length) {
               for (const userId of targetIds) {
-                void sendPoke({ session, userId, log });
+                void sendPoke({ session, userId, log, protocol: onebotProtocol });
               }
             } else if (targetIds.length) {
               log("warn", "\u68C0\u6D4B\u5230\u6233\u4E00\u6233\u6807\u8BB0\u4F46\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587", {
@@ -8758,7 +8907,13 @@ function apply(ctx, config) {
                 const messageId = String(match[1] || "").trim();
                 const emojiId = String(match[2] || "").trim();
                 if (messageId && emojiId) {
-                  void sendMsgEmoji({ session, messageId, emojiId, log });
+                  void sendMsgEmoji({
+                    session,
+                    messageId,
+                    emojiId,
+                    log,
+                    protocol: onebotProtocol
+                  });
                 }
               }
             } else {
@@ -8949,7 +9104,7 @@ function apply(ctx, config) {
       promptRenderer?.registerFunctionProvider?.(randomName, randomProvider);
       log("info", `\u968F\u673A\u6570\u53D8\u91CF\u5DF2\u6CE8\u518C: ${randomName}`);
     }
-    if (weatherConfig.enabled && weatherConfig.apiToken) {
+    if (weatherConfig.enabled) {
       const weatherProvider = createWeatherProvider({ weatherApi });
       const weatherVariableName = String(weatherConfig.variableName || "weather").trim();
       if (weatherVariableName) {
@@ -8997,11 +9152,11 @@ function apply(ctx, config) {
       plugin.registerTool(toolName, {
         selector: () => true,
         authorization: (session) => session?.platform === "onebot",
-        createTool: () => createPokeTool({ ctx, toolName, log })
+        createTool: () => createPokeTool({ ctx, toolName, log, protocol: onebotProtocol })
       });
       log("info", `\u6233\u4E00\u6233\u5DE5\u5177\u5DF2\u6CE8\u518C: ${toolName}`);
     }
-    if (weatherConfig.enabled && weatherConfig.apiToken && weatherConfig.registerTool) {
+    if (weatherConfig.enabled && weatherConfig.registerTool) {
       const weatherToolName = String(weatherConfig.toolName || "get_weather").trim() || "get_weather";
       plugin.registerTool(weatherToolName, {
         selector: () => true,
@@ -9014,7 +9169,7 @@ function apply(ctx, config) {
       plugin.registerTool(toolName, {
         selector: () => true,
         authorization: (session) => session?.platform === "onebot",
-        createTool: () => createSetProfileTool({ ctx, toolName, log })
+        createTool: () => createSetProfileTool({ ctx, toolName, log, protocol: onebotProtocol })
       });
       log("info", `\u8BBE\u7F6E\u8D44\u6599\u5DE5\u5177\u5DF2\u6CE8\u518C: ${toolName}`);
     }
@@ -9032,7 +9187,7 @@ function apply(ctx, config) {
       plugin.registerTool(toolName, {
         selector: () => true,
         authorization: (session) => session?.platform === "onebot",
-        createTool: () => createSetMsgEmojiTool({ toolName, log })
+        createTool: () => createSetMsgEmojiTool({ toolName, log, protocol: onebotProtocol })
       });
       log("info", `\u6D88\u606F\u8868\u60C5\u5DE5\u5177\u5DF2\u6CE8\u518C: ${toolName}`);
     }
@@ -9044,7 +9199,8 @@ function apply(ctx, config) {
         createTool: () => createForwardMessageTool({
           toolName,
           messageStore,
-          log
+          log,
+          protocol: onebotProtocol
         })
       });
       log("info", `\u5408\u5E76\u8F6C\u53D1\u6D88\u606F\u5DE5\u5177\u5DF2\u6CE8\u518C: ${toolName}`);
@@ -9054,7 +9210,7 @@ function apply(ctx, config) {
       plugin.registerTool(toolName, {
         selector: () => true,
         authorization: (session) => session?.platform === "onebot",
-        createTool: () => createFakeMessageTool({ toolName, log })
+        createTool: () => createFakeMessageTool({ toolName, log, protocol: onebotProtocol })
       });
       log("info", `\u4F2A\u9020\u6D88\u606F\u5DE5\u5177\u5DF2\u6CE8\u518C: ${toolName}`);
     }
@@ -9087,15 +9243,15 @@ function apply(ctx, config) {
 var usage = `
 ## \u66F4\u65B0\u65E5\u5FD7
 
-0.2.3-alpha.3
-- \u4FEE\u590D\u65E0\u6CD5\u9009\u62E9\u65E5\u7A0B\u6A21\u578B\u7684\u95EE\u9898
+0.2.3
+- OneBot \u534F\u8BAE\u65B0\u589E NapCat/LLBot \u72EC\u7ACB\u9009\u9879\uFF0C\u6309\u914D\u7F6E\u9009\u62E9\u534F\u8BAE
 
-0.2.3-alpha.2
-- \u4FEE\u590D\u597D\u611F\u5EA6\u66F4\u65B0\u65F6\u672A\u66F4\u65B0 chatCount \u7684\u95EE\u9898
+0.2.3-alpha.4
+- \u4FEE\u590D\u65E5\u7A0B\u751F\u6210\u63D0\u793A\u8BCD\u4EBA\u8BBE\u6CE8\u5165\u53D8\u91CF {persona} \u5931\u6548\u7684\u95EE\u9898\uFF0C\u65B0\u589E\u6A21\u578B\u9009\u62E9\u4E0E\u4EBA\u8BBE\u6CE8\u5165\u9009\u9879
+- \u5929\u6C14\u670D\u52A1\u5207\u6362\u4E3A open-meteo\uFF0C\u4E0D\u518D\u9700\u8981\u63D0\u4F9B token
 
-0.2.3-alpha.1
-- \u65B0\u589E XML \u5DE5\u5177\uFF0C\u89E3\u6790\u539F\u59CB\u8F93\u51FA\u4E2D\u7684 &lt;poke id="" /&gt; \u6233\u4E00\u6233\u3001&lt;emoji message_id="" emoji_id="" /&gt; \u8868\u60C5\u56DE\u5E94\u3001&lt;delete message_id="" /&gt; \u64A4\u56DE\u6D88\u606F
-- \u91CD\u6784\u597D\u611F\u5EA6\uFF0C\u4ECE\u4F9D\u8D56\u5916\u90E8\u6A21\u578B\u6539\u4E3A\u89E3\u6790\u539F\u59CB\u8F93\u51FA\u4E2D\u7684 &lt;affinity delta="" action="increase|decrease" id="" /&gt;
+0.2.3-alpha.3
+- \u4FEE\u590D\u65E0\u6CD5\u9009\u62E9\u65E5\u7A0B\u6A21\u578B\u7684\u95EE\u9898
 `;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/integrations/chatluna/tools/schedule.d.ts

@@ -14,9 +14,9 @@ export declare function createScheduleTool(deps: ScheduleToolDeps): {
     schema: z.ZodObject<{
         query: z.ZodOptional<z.ZodEnum<["full", "current"]>>;
     }, "strip", z.ZodTypeAny, {
-        query?: "full" | "current" | undefined;
+        query?: "current" | "full" | undefined;
     }, {
-        query?: "full" | "current" | undefined;
+        query?: "current" | "full" | undefined;
     }>;
     _call(input: {
         query?: "full" | "current";

package/lib/integrations/onebot/api.d.ts

@@ -3,6 +3,7 @@
  * 提供 OneBot 平台 API 调用的辅助函数
  */
 import type { Session } from 'koishi';
+export type OneBotProtocol = 'napcat' | 'llbot';
 export interface OneBotInternal {
     _request?: (action: string, params: Record<string, unknown>) => Promise<unknown>;
     [key: string]: unknown;

package/lib/integrations/onebot/tools/poke.d.ts

@@ -5,15 +5,18 @@
 import { z } from 'zod';
 import type { Context, Session } from 'koishi';
 import type { LogFn } from '../../../types';
+import { type OneBotProtocol } from '../api';
 export interface PokeToolDeps {
     ctx: Context;
     toolName: string;
+    protocol: OneBotProtocol;
     log?: LogFn;
 }
 export interface SendPokeParams {
     session: Session | null;
     userId: string;
     groupId?: string;
+    protocol: OneBotProtocol;
     log?: LogFn;
 }
 export declare function sendPoke(params: SendPokeParams): Promise<string>;

package/lib/integrations/onebot/tools/profile.d.ts

@@ -5,9 +5,11 @@
 import { z } from 'zod';
 import type { Context } from 'koishi';
 import type { LogFn } from '../../../types';
+import { type OneBotProtocol } from '../api';
 export interface ProfileToolDeps {
     ctx: Context;
     toolName: string;
+    protocol: OneBotProtocol;
     log?: LogFn;
 }
 export declare function createSetProfileTool(deps: ProfileToolDeps): {

package/lib/integrations/onebot/tools/send-fake-msg.d.ts

@@ -4,8 +4,10 @@
  */
 import { z } from 'zod';
 import type { LogFn } from '../../../types';
+import { type OneBotProtocol } from '../api';
 export interface FakeMessageToolDeps {
     toolName: string;
+    protocol: OneBotProtocol;
     log?: LogFn;
 }
 export declare function createFakeMessageTool(deps: FakeMessageToolDeps): {

package/lib/integrations/onebot/tools/send-forward-msg.d.ts

@@ -5,9 +5,11 @@
 import { z } from 'zod';
 import type { LogFn } from '../../../types';
 import type { MessageStore } from '../../../services/message/store';
+import { type OneBotProtocol } from '../api';
 export interface ForwardMessageToolDeps {
     toolName: string;
     messageStore: MessageStore;
+    protocol: OneBotProtocol;
     log?: LogFn;
 }
 export declare function createForwardMessageTool(deps: ForwardMessageToolDeps): {

package/lib/integrations/onebot/tools/set-msg-emoji.d.ts

@@ -5,14 +5,17 @@
 import { StructuredTool } from '@langchain/core/tools';
 import type { LogFn } from '../../../types';
 import type { Session } from 'koishi';
+import { type OneBotProtocol } from '../api';
 export interface SetMsgEmojiToolDeps {
     toolName: string;
+    protocol: OneBotProtocol;
     log?: LogFn;
 }
 export interface SendMsgEmojiParams {
     session: Session | null;
     messageId: string;
     emojiId: string;
+    protocol: OneBotProtocol;
     log?: LogFn;
 }
 export declare function sendMsgEmoji(params: SendMsgEmojiParams): Promise<string>;

package/lib/schema/index.d.ts

@@ -111,6 +111,9 @@ export declare const ConfigSchema: Schema<{
     schedule?: ({
         enabled?: boolean | null | undefined;
         model?: any;
+        personaSource?: "none" | "chatluna" | "custom" | null | undefined;
+        personaChatlunaPreset?: any;
+        personaCustomPreset?: string | null | undefined;
         variableName?: string | null | undefined;
         currentVariableName?: string | null | undefined;
         outfitVariableName?: string | null | undefined;
@@ -126,8 +129,6 @@ export declare const ConfigSchema: Schema<{
     weather?: ({
         enabled?: boolean | null | undefined;
         variableName?: string | null | undefined;
-        apiToken?: string | null | undefined;
-        searchType?: "city" | "ip" | null | undefined;
         cityName?: string | null | undefined;
         hourlyRefresh?: boolean | null | undefined;
         registerTool?: boolean | null | undefined;
@@ -154,6 +155,8 @@ export declare const ConfigSchema: Schema<{
         max?: number | null | undefined;
     } & import("cosmokit").Dict) | null | undefined;
 } & {
+    enableNapCatProtocol?: boolean | null | undefined;
+    enableLlbotProtocol?: boolean | null | undefined;
     enablePokeTool?: boolean | null | undefined;
     pokeToolName?: string | null | undefined;
     enableSetSelfProfileTool?: boolean | null | undefined;
@@ -306,6 +309,9 @@ export declare const ConfigSchema: Schema<{
     schedule: Schemastery.ObjectT<{
         enabled: Schema<boolean, boolean>;
         model: Schema<any, any>;
+        personaSource: Schema<"none" | "chatluna" | "custom", "none" | "chatluna" | "custom">;
+        personaChatlunaPreset: Schema<any, any>;
+        personaCustomPreset: Schema<string, string>;
         variableName: Schema<string, string>;
         currentVariableName: Schema<string, string>;
         outfitVariableName: Schema<string, string>;
@@ -321,8 +327,6 @@ export declare const ConfigSchema: Schema<{
     weather: Schemastery.ObjectT<{
         enabled: Schema<boolean, boolean>;
         variableName: Schema<string, string>;
-        apiToken: Schema<string, string>;
-        searchType: Schema<"city" | "ip", "city" | "ip">;
         cityName: Schema<string, string>;
         hourlyRefresh: Schema<boolean, boolean>;
         registerTool: Schema<boolean, boolean>;
@@ -349,6 +353,8 @@ export declare const ConfigSchema: Schema<{
         max: Schema<number, number>;
     }>;
 } & {
+    enableNapCatProtocol: boolean;
+    enableLlbotProtocol: boolean;
     enablePokeTool: boolean;
     pokeToolName: string;
     enableSetSelfProfileTool: boolean;

package/lib/schema/schedule.d.ts

@@ -7,6 +7,9 @@ export declare const ScheduleSchema: Schema<Schemastery.ObjectS<{
     schedule: Schema<Schemastery.ObjectS<{
         enabled: Schema<boolean, boolean>;
         model: Schema<any, any>;
+        personaSource: Schema<"none" | "chatluna" | "custom", "none" | "chatluna" | "custom">;
+        personaChatlunaPreset: Schema<any, any>;
+        personaCustomPreset: Schema<string, string>;
         variableName: Schema<string, string>;
         currentVariableName: Schema<string, string>;
         outfitVariableName: Schema<string, string>;
@@ -20,6 +23,9 @@ export declare const ScheduleSchema: Schema<Schemastery.ObjectS<{
     }>, Schemastery.ObjectT<{
         enabled: Schema<boolean, boolean>;
         model: Schema<any, any>;
+        personaSource: Schema<"none" | "chatluna" | "custom", "none" | "chatluna" | "custom">;
+        personaChatlunaPreset: Schema<any, any>;
+        personaCustomPreset: Schema<string, string>;
         variableName: Schema<string, string>;
         currentVariableName: Schema<string, string>;
         outfitVariableName: Schema<string, string>;
@@ -35,6 +41,9 @@ export declare const ScheduleSchema: Schema<Schemastery.ObjectS<{
     schedule: Schema<Schemastery.ObjectS<{
         enabled: Schema<boolean, boolean>;
         model: Schema<any, any>;
+        personaSource: Schema<"none" | "chatluna" | "custom", "none" | "chatluna" | "custom">;
+        personaChatlunaPreset: Schema<any, any>;
+        personaCustomPreset: Schema<string, string>;
         variableName: Schema<string, string>;
         currentVariableName: Schema<string, string>;
         outfitVariableName: Schema<string, string>;
@@ -48,6 +57,9 @@ export declare const ScheduleSchema: Schema<Schemastery.ObjectS<{
     }>, Schemastery.ObjectT<{
         enabled: Schema<boolean, boolean>;
         model: Schema<any, any>;
+        personaSource: Schema<"none" | "chatluna" | "custom", "none" | "chatluna" | "custom">;
+        personaChatlunaPreset: Schema<any, any>;
+        personaCustomPreset: Schema<string, string>;
         variableName: Schema<string, string>;
         currentVariableName: Schema<string, string>;
         outfitVariableName: Schema<string, string>;

package/lib/schema/tools.d.ts

@@ -4,6 +4,8 @@
  */
 import { Schema } from 'koishi';
 export declare const NativeToolsSchema: Schema<Schemastery.ObjectS<{
+    enableNapCatProtocol: Schema<boolean, boolean>;
+    enableLlbotProtocol: Schema<boolean, boolean>;
     enablePokeTool: Schema<boolean, boolean>;
     pokeToolName: Schema<string, string>;
     enableSetSelfProfileTool: Schema<boolean, boolean>;
@@ -38,6 +40,8 @@ export declare const NativeToolsSchema: Schema<Schemastery.ObjectS<{
         panSouMaxResults: Schema<number, number>;
     }>>;
 }>, Schemastery.ObjectT<{
+    enableNapCatProtocol: Schema<boolean, boolean>;
+    enableLlbotProtocol: Schema<boolean, boolean>;
     enablePokeTool: Schema<boolean, boolean>;
     pokeToolName: Schema<string, string>;
     enableSetSelfProfileTool: Schema<boolean, boolean>;

package/lib/schema/weather.d.ts

@@ -7,8 +7,6 @@ export declare const WeatherSchema: Schema<Schemastery.ObjectS<{
     weather: Schema<Schemastery.ObjectS<{
         enabled: Schema<boolean, boolean>;
         variableName: Schema<string, string>;
-        apiToken: Schema<string, string>;
-        searchType: Schema<"city" | "ip", "city" | "ip">;
         cityName: Schema<string, string>;
         hourlyRefresh: Schema<boolean, boolean>;
         registerTool: Schema<boolean, boolean>;
@@ -16,8 +14,6 @@ export declare const WeatherSchema: Schema<Schemastery.ObjectS<{
     }>, Schemastery.ObjectT<{
         enabled: Schema<boolean, boolean>;
         variableName: Schema<string, string>;
-        apiToken: Schema<string, string>;
-        searchType: Schema<"city" | "ip", "city" | "ip">;
         cityName: Schema<string, string>;
         hourlyRefresh: Schema<boolean, boolean>;
         registerTool: Schema<boolean, boolean>;
@@ -27,8 +23,6 @@ export declare const WeatherSchema: Schema<Schemastery.ObjectS<{
     weather: Schema<Schemastery.ObjectS<{
         enabled: Schema<boolean, boolean>;
         variableName: Schema<string, string>;
-        apiToken: Schema<string, string>;
-        searchType: Schema<"city" | "ip", "city" | "ip">;
         cityName: Schema<string, string>;
         hourlyRefresh: Schema<boolean, boolean>;
         registerTool: Schema<boolean, boolean>;
@@ -36,8 +30,6 @@ export declare const WeatherSchema: Schema<Schemastery.ObjectS<{
     }>, Schemastery.ObjectT<{
         enabled: Schema<boolean, boolean>;
         variableName: Schema<string, string>;
-        apiToken: Schema<string, string>;
-        searchType: Schema<"city" | "ip", "city" | "ip">;
         cityName: Schema<string, string>;
         hourlyRefresh: Schema<boolean, boolean>;
         registerTool: Schema<boolean, boolean>;

package/lib/services/weather/api.d.ts

@@ -1,5 +1,5 @@
 /**
- * ALAPI 天气 API 服务
+ * 天气 API 服务（open-meteo）
  * 提供天气数据获取和当前时段天气解析
  */
 import type { Context } from 'koishi';
@@ -28,6 +28,6 @@ export declare function createWeatherApi(deps: WeatherApiDeps): {
     getDailyWeather: (options?: WeatherQueryOptions) => Promise<string>;
     getHourlyWeather: (options?: WeatherQueryOptions) => Promise<string>;
     invalidateCache: () => void;
-    fetchWeather: (options?: WeatherQueryOptions) => Promise<CachedWeatherData | null>;
+    fetchWeather: (options?: WeatherQueryOptions, retryCount?: number) => Promise<CachedWeatherData | null>;
 };
 export type WeatherApi = ReturnType<typeof createWeatherApi>;

package/lib/types/config.d.ts

@@ -119,6 +119,8 @@ export interface Config {
     userInfo: UserInfoConfig;
     botInfo: BotInfoConfig;
     groupInfo: GroupInfoConfig;
+    enableNapCatProtocol: boolean;
+    enableLlbotProtocol: boolean;
     enablePokeTool: boolean;
     pokeToolName: string;
     enablePokeXmlTool: boolean;

package/lib/types/schedule-config.d.ts

@@ -5,6 +5,9 @@
 export interface ScheduleConfig {
     enabled: boolean;
     model?: string;
+    personaSource?: 'none' | 'chatluna' | 'custom';
+    personaChatlunaPreset?: string;
+    personaCustomPreset?: string;
     variableName: string;
     currentVariableName: string;
     outfitVariableName: string;

package/lib/types/weather.d.ts

@@ -1,71 +1,7 @@
 /**
  * 天气相关类型定义
- * 包含 ALAPI 天气 API 响应结构
+ * 定义天气数据结构与配置项
  */
-export interface WeatherHourData {
-    time: string;
-    temp: number;
-    wea: string;
-    wea_code: string;
-    wind: string;
-    wind_level: string;
-}
-export interface WeatherAqi {
-    air: string;
-    air_level: string;
-    air_tips: string;
-    pm25: string;
-    pm10: string;
-    co: string;
-    no2: string;
-    so2: string;
-    o3: string;
-}
-export interface WeatherIndex {
-    type: string;
-    level: string;
-    name: string;
-    content: string;
-}
-export interface WeatherData {
-    city: string;
-    city_en: string;
-    province: string;
-    province_en: string;
-    city_id: string;
-    date: string;
-    update_time: string;
-    weather: string;
-    weather_code: string;
-    temp: number;
-    min_temp: number;
-    max_temp: number;
-    wind: string;
-    wind_speed: string;
-    wind_power: string;
-    rain: string;
-    rain_24h: string;
-    humidity: string;
-    visibility: string;
-    pressure: string;
-    air: string;
-    air_pm25: string;
-    sunrise: string;
-    sunset: string;
-    aqi: WeatherAqi;
-    index: WeatherIndex[];
-    alarm: unknown[];
-    hour: WeatherHourData[];
-}
-export interface WeatherApiResponse {
-    request_id: string;
-    success: boolean;
-    message: string;
-    code: number;
-    data: WeatherData;
-    time: number;
-    usage: number;
-}
 export interface CurrentWeather {
     city: string;
     province: string;
@@ -84,8 +20,6 @@ export interface CurrentWeather {
 export interface WeatherConfig {
     enabled: boolean;
     variableName: string;
-    apiToken: string;
-    searchType: 'city' | 'ip';
     cityName: string;
     hourlyRefresh: boolean;
     registerTool?: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-affinity",
   "description": "为 ChatLuna Character 提供更多变量及工具，例如 {好感度}、{关系}、{日程}、{天气}、{用户信息}、{机器人信息}、{群信息}等变量并提供对应的工具调用和低好感自动拉黑功能。",
-  "version": "0.2.3-alpha.3",
+  "version": "0.2.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -110,6 +110,13 @@ MIT © 2024-present chatluna-affinity contributors
 
 ## 更新日志
 
+0.2.3
+- OneBot 协议新增 NapCat/LLBot 独立选项，按配置选择协议
+
+0.2.3-alpha.4
+- 修复日程生成提示词人设注入变量 {persona} 失效的问题，新增模型选择与人设注入选项
+- 天气服务切换为 open-meteo，不再需要提供 token
+
 0.2.3-alpha.3
 - 修复无法选择日程模型的问题