fix: make the daily plan chain survive startup timing and same-day rewrites

Two defects that only showed up on the real machine, both of which left the
schedule frozen on a fallback plan with nothing in the logs to say so.

The plugin asked for a chat provider 0.8s before AstrBot finished loading
them, wrote a template fallback, and stamped it with today's date -- so the
next 24 hours never retried. Resolution now falls back through get_config()
(4.26.6's Context exposes nothing else) and validates the configured id with
get_provider_by_id, because a configured default is not a loaded instance.
When nothing is ready yet the round is skipped instead of downgraded, up to
DAILY_PLAN_PROVIDER_MAX_WAITS rounds.

Once the model recovered, the real plan still could not reach the archive:
the idempotency key is always daily_plan:<date> but the plan dict never
carried a version, so every rewrite re-sent v1 and the memory side rejected
it as version_conflict. The companion swallowed that -- outbox state is only
touched when enqueue accepts, and a same key/version enqueue does not. Plans
now carry a version watermark drawn from both daily_plan and its history, and
any ok=False archive response logs a warning regardless of outbox state.

Verified on the VM: provider wait counted once and no fallback written, plan
generated at v2 with 10 segments from the model, and the stored record
upserted from the 8-segment fallback to the same v2 content.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
这个提交存在于:
YokiiroBW 2026-07-27 04:16:06 +08:00
父节点 2755c6e69d
当前提交 2518f7b6bf
共有 7 个文件被更改,包括 373 次插入 和 0 次删除

查看文件

@ -73,6 +73,10 @@ except Exception:
Converter = None
Solar = None
# 对话 Provider 未就绪时最多跳过几轮日程生成。调度 tick 本身 300 秒一次,
# 因此 5 轮 ≈ 每 5 分钟重试、共 5 次;超过则退回兜底并记错误,避免无限等待。
DAILY_PLAN_PROVIDER_MAX_WAITS = 5
from .constants import (
DEFAULT_DAILY_PLAN_ITEMS,
DEFAULT_HUMANIZED_STATE,
@ -440,6 +444,21 @@ class DailyStateMixin:
if previous is None and upcoming is None: return {}
return {"now_minutes": current.hour * 60 + current.minute, "previous": previous[2] if previous else None, "previous_age": int(max(0, (current - previous[0]).total_seconds() // 60)) if previous else None, "upcoming": upcoming[2] if upcoming else None, "upcoming_in": int(max(0, (upcoming[0] - current).total_seconds() // 60)) if upcoming else None}
async def _note_plan_provider_wait(self) -> int:
"""记一次「Provider 未就绪」,返回已等待轮次。"""
async with self._data_lock:
waited = _safe_int(self.data.get("daily_plan_provider_wait_count"), 0, 0) + 1
self.data["daily_plan_provider_wait_count"] = waited
self.data["daily_plan_provider_wait_at"] = _now_ts()
self._save_data_sync()
return waited
async def _clear_plan_provider_wait(self) -> None:
async with self._data_lock:
if self.data.pop("daily_plan_provider_wait_count", None) is not None:
self.data.pop("daily_plan_provider_wait_at", None)
self._save_data_sync()
async def _ensure_daily_plan(self, force: bool = False) -> dict[str, Any] | None:
if not self.enable_daily_plan and not force:
return None
@ -471,6 +490,25 @@ class DailyStateMixin:
return current_plan
return None
# Provider 还没装载完就别生成:那样只会拿到模板兜底,而兜底一旦写进
# daily_plan 就带上了今天的日期,后续 24 小时都不会再生成——一次 0.8 秒的
# 启动时序问题会毁掉一整天的日程。等下一个 tick 重试即可(tick 本身 5 分钟一次)。
if not self._chat_provider_ready():
waited = await self._note_plan_provider_wait()
if waited <= DAILY_PLAN_PROVIDER_MAX_WAITS:
logger.info(
"[PrivateCompanion] 对话 Provider 尚未就绪,跳过本轮日程生成,等待重试 (%s/%s)",
waited,
DAILY_PLAN_PROVIDER_MAX_WAITS,
)
return None
logger.error(
"[PrivateCompanion] 对话 Provider 连续 %s 轮未就绪,本次改用兜底日程",
DAILY_PLAN_PROVIDER_MAX_WAITS,
)
else:
await self._clear_plan_provider_wait()
plan = await self._generate_daily_plan()
async with self._data_lock:
self.data["daily_plan"] = plan
@ -5959,6 +5997,8 @@ class DailyStateMixin:
"date": plan_date,
"generated_at": _single_line(plan.get("generated_at"), 20) or self._environment_now().strftime("%Y-%m-%d %H:%M"),
"source": _single_line(plan.get("source"), 16),
# 历史条目按日期去重保留,是 daily_plan 被清空后唯一能还原版本水位的地方
"version": _safe_int(plan.get("version"), 1, 1, 10_000_000),
"signature": self._plan_signature(items),
"sample": sample,
"items": compact_items,

查看文件

@ -511,3 +511,23 @@ docs\运维陪伴错题本.md
- 修复或规避:两个回滚副本一律移进 `ops-replace-backups/<时间戳>/`,扫描目录里只留活动插件;替换后立即 `ls` 确认无 `.old`/`.new`/`.stage` 残留。
- 预防规则:任何「原地改名保留旧版」的操作,先确认这个目录会不会被某个扫描器遍历——插件目录、任务目录、配置目录都算。部署脚本里把「回滚副本落到备份区」写成固定步骤,而不是临时决定。
- 验证证据:移出后重启,最新启动窗口内无 ERRO / Traceback / 导入失败;服务 active、NRestarts=0。
## 2026-07-27 — 配置里写了默认 Provider,不等于 Provider 已经装载
- 阶段:M6.1.8 真机日程链路验证
- 类型:功能行为 / 环境
- 现象:VM 上日程恒为 `source=fallback`。时间戳把竞态钉死了:`03:38:53.755` 插件加载 → `03:38:55.558` 主动循环启动 → `03:38:55.798` 解析默认 Provider 失败 → `03:38:56.619` AstrBot 才打出 "Selected ... as default chat model provider"。插件比宿主早 0.8 秒问 Provider。直连 API 探针确认模型本身可用(HTTP 200、315 tokens),问题不在模型。
- 根因:两层。一是 `_default_chat_provider_id` 只认 `get_using_provider()`,4.26.6 的 `Context` 只暴露 `get_config()`,没有 `astrbot_config`/`config` 属性,兜底链断在这里;二是补了配置兜底之后仍然错——从 `provider_settings.default_provider_id` 读到的只是「配置里指定了谁」,实例还没注册,照样拿到 `Provider BOT 1X/gpt-5.6-terra not found`。竞态只是从「拿不到 id」挪到了「拿到了一个没人认的 id」。
- 修复或规避:兜底链读到 id 后必须用 `context.get_provider_by_id(id)` 确认实例真的在;新增 `_chat_provider_ready()` 区分「还没就绪」与「模型不可用」;`_ensure_daily_plan` 在未就绪时跳过本轮而不是写兜底计划,`DAILY_PLAN_PROVIDER_MAX_WAITS = 5` 对应「每 5 分钟重试、共 5 次」,超限才退化。
- 预防规则:启动期取宿主资源,一律区分「配置声明」与「实例可用」,只有后者算就绪。写兜底之前先问一句「现在是真失败,还是只是早了几秒」——把早到当失败,会把降级结果固化成当天的正式数据。
- 验证证据:`tests/test_provider_readiness.py` 8 项;VM 复跑 30s 记 `等待轮次=1` 且不写兜底,第 5 轮 `source=llm` 10 段、8111 tokens、33.4s。
## 2026-07-27 — 幂等键不变、版本号不动,同日改计划会被静默丢弃
- 阶段:M6.1.8 真机归档链路验证
- 类型:数据一致性 / 跨插件契约
- 现象:兜底计划先落库(8 段、v1),同一天模型恢复后生成的真实计划(10 段)在库里完全看不到——`bot_schedule_plan` 最新一条仍是兜底那份,`updated_at` 纹丝不动。outbox 里也没有新条目。既不是失败也不是报错,是彻底无声。
- 根因:`daily_plan` 的幂等键恒为 `daily_plan:<date>`,而 `planning.py` 构造的计划字典**从来不带 `version`**,适配器 `_safe_int(plan.get("version"), 1)` 于是每次都发 v1。记忆侧 `store.py` 判 `version == stored_version` 且指纹不同 → `version_conflict` 拒绝;陪伴侧 `enqueue_outbox` 同键同版本返回 `accepted=False`,而状态更新整段都在 `if ... accepted` 里,于是拒绝结果既不落 outbox 状态也不留日志。M6.1.3 给 `agenda_snapshot` 修过同类问题,但那次只补了「透传 version」,没人问过生产者到底有没有 version。
- 修复或规避:新增 `_next_daily_plan_version(plugin, plan_date)`,同时看 `daily_plan` 与 `daily_plan_history` 取最大版本 +1(历史条目同步补 `version` 字段,运维清空 `daily_plan` 后版本才不会退回 1 撞上库里已有记录);另外把「远端拒绝」的告警移到 `accepted` 判断之外,任何 `ok=False` 都留一条可检索的 warning。
- 预防规则:透传字段之前先确认上游真的在产生它——「把 `version` 传下去」和「`version` 有值」是两件事。凡是同一幂等键会被重复写入的链路,必须有一条测试证明第二次写入改变了库内容,而不是只证明第一次能写进去。
- 验证证据:`tests/test_daily_plan_version.py` 7 项;VM 复跑本地 `v=2 source=llm 10 段` 与库内 `v=2 source=llm 10 段` 一致,`updated_at` 推进到 `2026-07-26T20:13:31Z`。

查看文件

@ -953,6 +953,17 @@ class MemoryCompanionAdapterMixin:
self._memory_companion_send_bot_archive(bridge, envelope),
timeout=max(0.2, min(3.0, _memory_companion_safe_float(getattr(self, "memory_companion_context_timeout_seconds", 1.2), 1.2, 0.2))),
)
if not result.get("ok"):
# outbox 只在 accepted 时才记状态,同键同版本重投会 accepted=False,
# 于是远端拒绝既不落状态也不留日志。真机上一份 version_conflict 就这样
# 让整天的日程归档停在旧版本而无人察觉,这里补一条可检索的告警。
logger.warning(
"[PrivateCompanion] Bot 个人归档被远端拒绝: type=%s key=%s version=%s error=%s",
memory_type,
_single_line(envelope.get("idempotency_key"), 120),
envelope.get("version"),
_single_line(result.get("error_code"), 80) or "unknown",
)
if strict and isinstance(data, dict) and isinstance(outbox_record, dict) and outbox_record.get("accepted", True):
if result.get("ok"):
update_outbox(data, memory_type=memory_type, idempotency_key=envelope["idempotency_key"], state="sent")

查看文件

@ -10,6 +10,28 @@ from .constants import DEFAULT_DAILY_PLAN_ITEMS
from .helpers import _safe_float, _safe_int, _single_line, _today_key
def _next_daily_plan_version(plugin, plan_date: str) -> int:
"""算出该计划日的下一个版本号。
同时看当前 daily_plan 与 daily_plan_history:前者可能被运维清空,后者按日期保留,
两边取最大再 +1,避免清空本地状态后版本回退成 1 撞上库里已有的同版本记录。
"""
data = getattr(plugin, "data", None)
if not isinstance(data, dict):
return 1
target = _single_line(plan_date, 16)
highest = 0
candidates = [data.get("daily_plan")]
history = data.get("daily_plan_history")
if isinstance(history, list):
candidates.extend(history)
for entry in candidates:
if not isinstance(entry, dict) or _single_line(entry.get("date"), 16) != target:
continue
highest = max(highest, _safe_int(entry.get("version"), 1, 1, 10_000_000))
return highest + 1
def pick_detail_segment(plugin, plan: dict[str, Any], enhanced: dict[str, Any]) -> dict[str, Any] | None:
parsed_segments = plugin._collect_detail_segments(plan, enhanced)
if not parsed_segments:
@ -731,6 +753,10 @@ async def generate_daily_plan(plugin) -> dict[str, Any]:
"raw": raw_text,
"items": items,
"quality": quality,
# 同一天重生成(兜底转真实、深夜改计划)必须递增版本:幂等键恒为 daily_plan:<date>,
# 版本不动则记忆侧判 version_conflict 直接丢弃,而陪伴侧 outbox 因同键同版本 accepted=False
# 连错误状态都不会落——整条归档静默消失。
"version": _next_daily_plan_version(plugin, today),
}
calendar_sync = getattr(plugin, "_calendar_sync_generated_plan", None)
if callable(calendar_sync):

查看文件

@ -0,0 +1,79 @@
# -*- coding: utf-8 -*-
"""日程版本水位回归。
真机上暴露的问题:daily_plan 的幂等键恒为 daily_plan:<date>,而计划本身从不带 version。
兜底计划先落库(v1),同一天模型恢复后生成真实计划仍发 v1 —— 记忆侧判 version_conflict
丢弃,陪伴侧 outbox 因同键同版本 accepted=False 连错误状态都不落,整条归档静默消失。
库里于是永远停在那份 8 段兜底上。
"""
from __future__ import annotations
import importlib
import logging
import pathlib
import sys
import types
import unittest
if "astrbot.api" not in sys.modules:
_astrbot = types.ModuleType("astrbot")
_api = types.ModuleType("astrbot.api")
_api.logger = logging.getLogger("test.astrbot")
_astrbot.api = _api
sys.modules.setdefault("astrbot", _astrbot)
sys.modules.setdefault("astrbot.api", _api)
_package_name = "_planver_companion"
_package = types.ModuleType(_package_name)
_package.__path__ = [str(pathlib.Path(__file__).resolve().parents[1])]
sys.modules.setdefault(_package_name, _package)
planning = importlib.import_module(f"{_package_name}.planning")
_next_daily_plan_version = planning._next_daily_plan_version
class _Host:
def __init__(self, data=None):
self.data = data if data is not None else {}
class DailyPlanVersionTests(unittest.TestCase):
def test_first_plan_of_the_day_starts_at_one(self):
self.assertEqual(_next_daily_plan_version(_Host(), "2026-07-27"), 1)
def test_regenerating_the_same_day_bumps_the_version(self):
host = _Host({"daily_plan": {"date": "2026-07-27", "version": 1}})
self.assertEqual(_next_daily_plan_version(host, "2026-07-27"), 2)
def test_a_different_day_restarts_at_one(self):
host = _Host({"daily_plan": {"date": "2026-07-26", "version": 7}})
self.assertEqual(_next_daily_plan_version(host, "2026-07-27"), 1)
def test_history_keeps_the_watermark_when_daily_plan_is_cleared(self):
"""运维清空 daily_plan 后版本不能回退到 1,否则又撞上库里已有的同版本记录。"""
host = _Host({"daily_plan_history": [
{"date": "2026-07-26", "version": 2},
{"date": "2026-07-27", "version": 3},
]})
self.assertEqual(_next_daily_plan_version(host, "2026-07-27"), 4)
def test_takes_the_higher_of_plan_and_history(self):
host = _Host({
"daily_plan": {"date": "2026-07-27", "version": 5},
"daily_plan_history": [{"date": "2026-07-27", "version": 2}],
})
self.assertEqual(_next_daily_plan_version(host, "2026-07-27"), 6)
def test_legacy_entries_without_version_count_as_one(self):
"""升级前写下的计划没有 version 字段,必须视为 v1 而不是 v0。"""
host = _Host({"daily_plan": {"date": "2026-07-27"}})
self.assertEqual(_next_daily_plan_version(host, "2026-07-27"), 2)
def test_missing_or_broken_data_is_tolerated(self):
self.assertEqual(_next_daily_plan_version(_Host(None), "2026-07-27"), 1)
host = _Host({"daily_plan": "不是字典", "daily_plan_history": "也不是列表"})
self.assertEqual(_next_daily_plan_version(host, "2026-07-27"), 1)
if __name__ == "__main__":
unittest.main()

查看文件

@ -0,0 +1,133 @@
# -*- coding: utf-8 -*-
"""对话 Provider 就绪判定回归。
插件的主动循环比 AstrBot 装载 provider 早(实测早 0.8 秒),重启后第一轮维护
去要 provider 时注册表还是空的。此前这会被当成「模型不可用」,直接把模板兜底
写成当天日程——而兜底一旦带上今天的日期,后续 24 小时都不会再生成,一次 0.8 秒
的启动时序问题毁掉一整天。
"""
from __future__ import annotations
import importlib
import pathlib
import sys
import types
import unittest
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent))
import _host_stub # noqa: E402
_host_stub.install()
_PKG = "_prov_companion"
_pkg = types.ModuleType(_PKG)
_pkg.__path__ = [str(pathlib.Path(__file__).resolve().parents[1])]
sys.modules.setdefault(_PKG, _pkg)
token_budget = importlib.import_module(f"{_PKG}.token_budget")
class FakeProvider:
def __init__(self, provider_id):
self._id = provider_id
def meta(self):
return types.SimpleNamespace(id=self._id)
class Ctx:
"""模拟 AstrBot Context 的三条取值路径,可分别关掉。"""
def __init__(self, using=None, all_providers=None, config=None, registered=None):
self._using = using
self._all = all_providers or []
self._config = config
# 已真正注册的实例;配置里写了 id 不等于实例已装载
self._registered = set(registered or [])
def get_provider_by_id(self, provider_id):
return FakeProvider(provider_id) if provider_id in self._registered else None
def get_using_provider(self, umo=None):
return self._using
def get_all_providers(self):
return list(self._all)
def get_config(self):
return self._config
# 直接继承真实 Mixin:用 setattr 搬运会把 staticmethod 变成实例方法
class Host(token_budget.TokenBudgetMixin):
def __init__(self, context=None, llm_provider_id=""):
self.context = context
self.llm_provider_id = llm_provider_id
self.data = {}
def make(**kwargs):
return Host(**kwargs)
class ProviderReadinessTests(unittest.TestCase):
def test_not_ready_when_registry_is_empty(self):
"""启动竞态:provider 一个都还没装载。"""
host = make(context=Ctx(using=None, all_providers=[], config={}))
self.assertFalse(host._chat_provider_ready())
def test_ready_via_get_using_provider(self):
host = make(context=Ctx(using=FakeProvider("BOT 1X/gpt-5.6-terra")))
self.assertTrue(host._chat_provider_ready())
self.assertEqual(host._default_chat_provider_id(), "BOT 1X/gpt-5.6-terra")
def test_falls_back_to_registry_listing(self):
"""get_using_provider 取不到时,注册表里已有 provider 也算就绪。"""
host = make(context=Ctx(using=None, all_providers=[FakeProvider("浅夜 1X/grok-4.5")]))
self.assertEqual(host._default_chat_provider_id(), "浅夜 1X/grok-4.5")
self.assertTrue(host._chat_provider_ready())
def test_falls_back_to_astrbot_config_when_instance_exists(self):
"""4.26.6 的 Context 只有 get_config(),没有 astrbot_config/config 属性。"""
host = make(context=Ctx(using=None, all_providers=[],
config={"provider_settings": {"default_provider_id": "BOT 1X/gpt-5.6-terra"}},
registered=["BOT 1X/gpt-5.6-terra"]))
self.assertEqual(host._default_chat_provider_id(), "BOT 1X/gpt-5.6-terra")
def test_configured_id_without_a_loaded_instance_is_not_ready(self):
"""启动竞态的真实形态:配置里有默认 provider id,实例却还没注册。
误判为就绪会拿到 "Provider ... not found",并把模板兜底固化成当天日程。"""
host = make(context=Ctx(using=None, all_providers=[],
config={"provider_settings": {"default_provider_id": "BOT 1X/gpt-5.6-terra"}},
registered=[]))
self.assertEqual(host._default_chat_provider_id(), "")
self.assertFalse(host._chat_provider_ready())
def test_explicit_plugin_provider_short_circuits(self):
"""插件显式配了 provider 就不必等 AstrBot 注册表。"""
host = make(context=Ctx(using=None, all_providers=[]),
llm_provider_id="浅夜 1X/gemini-3.6-flash-high")
self.assertTrue(host._chat_provider_ready())
def test_broken_context_does_not_raise(self):
class Boom:
def get_using_provider(self, umo=None):
raise RuntimeError("boom")
def get_all_providers(self):
raise RuntimeError("boom")
def get_config(self):
raise RuntimeError("boom")
host = make(context=Boom())
self.assertFalse(host._chat_provider_ready())
def test_max_waits_is_five(self):
"""与「5 分钟一次、共 5 次」的重试口径对齐;tick 本身 300 秒。"""
daily_state = importlib.import_module(f"{_PKG}.daily_state")
self.assertEqual(daily_state.DAILY_PLAN_PROVIDER_MAX_WAITS, 5)
if __name__ == "__main__":
unittest.main()

查看文件

@ -730,8 +730,72 @@ class TokenBudgetMixin:
provider_id = self._provider_id_from_instance(provider)
if provider_id:
return provider_id
# get_using_provider 拿不到时再兜两层:AstrBot 已经选出了默认对话模型
# (启动日志会打印 "Selected ... as default chat model provider"),
# 插件这边不该因为一条取值路径不通就整个放弃——否则所有没有显式配置
# provider 的任务(日程、日记)会静默退化成模板兜底,且无从归因。
fallback_id = self._chat_provider_id_from_registry(context)
if fallback_id:
logger.info("[PrivateCompanion] 默认对话 Provider 经注册表兜底解析: %s", fallback_id)
return fallback_id
logger.warning(
"[PrivateCompanion] 无法解析默认对话 Provider:get_using_provider 与注册表兜底都没有结果;"
"未显式配置 provider 的模型任务将退化为模板兜底"
)
return ""
def _chat_provider_id_from_registry(self, context: Any) -> str:
"""从 AstrBot 的 provider 注册表/配置里兜底取一个可用的对话 Provider id。"""
get_all = getattr(context, "get_all_providers", None)
if callable(get_all):
try:
providers = get_all() or []
except Exception:
providers = []
for provider in providers:
provider_id = self._provider_id_from_instance(provider)
if provider_id:
return provider_id
# 最后再读 AstrBot 自己的 provider_settings.default_provider_id。
# 4.26.6 的 Context 只暴露 get_config(),没有 astrbot_config/config 属性。
config = None
getter = getattr(context, "get_config", None)
if callable(getter):
try:
config = getter()
except Exception:
config = None
settings = config.get("provider_settings") if isinstance(config, dict) else None
if isinstance(settings, dict):
value = _single_line(settings.get("default_provider_id"), 160)
# 配置里写了默认 provider ≠ 该 provider 已经装载。启动竞态下这个 id
# 是有的,实例却还没注册,直接用会拿到 "Provider ... not found"。
# 必须用 get_provider_by_id 确认实例真的在,才算就绪。
if value and self._provider_instance_exists(context, value):
return value
return ""
@staticmethod
def _provider_instance_exists(context: Any, provider_id: str) -> bool:
getter = getattr(context, "get_provider_by_id", None)
if not callable(getter):
return False
try:
return getter(provider_id) is not None
except Exception:
return False
def _chat_provider_ready(self) -> bool:
"""AstrBot 的对话 Provider 是否已经装载完毕。
插件的主动循环启动得比 AstrBot 装载 provider 更早(实测早 0.8 秒),
重启后第一轮维护去要 provider 时注册表还是空的。这不是「模型不可用」,
只是「还没就绪」,两者必须区分开——否则会把模板兜底当成当天计划固化下来。
"""
if _single_line(getattr(self, "llm_provider_id", ""), 160):
return True
return bool(self._default_chat_provider_id())
@staticmethod
def _provider_id_from_instance(provider: Any) -> str:
if provider is None: