diff --git a/main.py b/main.py index 65784fa..579f472 100644 --- a/main.py +++ b/main.py @@ -152,6 +152,7 @@ from .p4_manual_review import ( ) from . import p4_live_runtime from .p4_runtime_gate import apply_confinement_gate, build_warmth_projection +from .reply_temperature import compose_reply_temperature from .segmented_message import flatten_component_chunks, split_plain_component_chain_detailed from .token_budget import TokenBudgetMixin from .balance_awareness import BalanceAwarenessMixin @@ -10171,8 +10172,36 @@ wakeup_type={_single_line(wakeup.get('type'), 40)} score={_single_line(wakeup.ge if not runtime_state or runtime_state.get("confinement_state") == "active": return projection = build_warmth_projection(runtime_state) - tier = _single_line(projection.get("tier"), 20) - boundary = _single_line(projection.get("boundary"), 120) + p4_tier = _single_line(projection.get("tier"), 20) + if not p4_tier: + return + daily_state = getattr(self, "data", {}).get("daily_state") if isinstance(getattr(self, "data", None), dict) else {} + schedule = "" + segment_getter = getattr(self, "_current_detail_segment_for_update", None) + if callable(segment_getter): + try: + segment = segment_getter() + except Exception: + segment = None + if isinstance(segment, dict): + schedule = " ".join( + _single_line(segment.get(key), 80) + for key in ("title", "name", "summary", "activity", "location") + if _single_line(segment.get(key), 80) + )[:240] + context = _single_line( + getattr(event, "message_str", "") or getattr(event, "private_companion_group_text", ""), + 280, + ) + composed = compose_reply_temperature( + p4_tier, + energy=daily_state.get("energy") if isinstance(daily_state, dict) else None, + mood=(daily_state.get("mood_bias") or daily_state.get("mood")) if isinstance(daily_state, dict) else None, + schedule=schedule, + context=context, + ) + tier = _single_line(composed.get("tier"), 20) + boundary = _single_line(composed.get("instruction"), 120) if not tier or not boundary: return marker = "" @@ -10181,7 +10210,8 @@ wakeup_type={_single_line(wakeup.get('type'), 40)} score={_single_line(wakeup.ge if marker in current_prompt or marker in current_turn_prompt: return text = ( - "【关系温度】只用于调整表达亲近度,不改变安全权限。" + "【最终回复温度】综合用户关系好感的安全上限与 Bot 当前日程、心情和本轮上下文," + "只用于调整表达亲近度、长短和节奏,不改变安全权限。" f"当前表达档位:{tier}。{boundary}" ) placement = "prompt" if self._append_turn_prompt_fragment_by_position( @@ -10196,7 +10226,12 @@ wakeup_type={_single_line(wakeup.get('type'), 40)} score={_single_line(wakeup.ge text=text, source="p4_warmth", mode="private" if self._safe_event_is_private(event) else "group", - metadata={"tier": tier, "placement": placement}, + metadata={ + "tier": tier, + "p4_cap": _single_line(composed.get("cap_tier"), 20), + "contextual_tier": _single_line(composed.get("state_tier"), 20), + "placement": placement, + }, ) @staticmethod diff --git a/memory_companion_adapter.py b/memory_companion_adapter.py index 709b9e0..1f1d26f 100644 --- a/memory_companion_adapter.py +++ b/memory_companion_adapter.py @@ -2127,3 +2127,28 @@ class MemoryCompanionAdapterMixin: except Exception as exc: self._memory_companion_optional_dependency_failed(exc, where="get_relationship_phase") return {"phase": "unknown", "momentum": 0.0} + + def _memory_companion_peek_relationship_phase(self, *, session_id: str = "") -> dict[str, Any]: + """Read the Memory relationship phase without creating a default state.""" + bridge = self._memory_companion_bridge() + if bridge is None: + return {"observed": False, "phase": "unknown", "momentum_band": "unknown", "status": "unavailable"} + getter = getattr(bridge, "peek_relationship_phase", None) + if not callable(getter): + return {"observed": False, "phase": "unknown", "momentum_band": "unknown", "status": "unsupported"} + try: + result = getter(session_id=session_id, scope="private") + except Exception as exc: + self._memory_companion_optional_dependency_failed(exc, where="peek_relationship_phase") + return {"observed": False, "phase": "unknown", "momentum_band": "unknown", "status": "unavailable"} + if not isinstance(result, dict): + return {"observed": False, "phase": "unknown", "momentum_band": "unknown", "status": "invalid"} + phase = _single_line(result.get("phase"), 40) or "unknown" + status = "observed" if bool(result.get("observed")) and phase != "unknown" else "not_observed" + return { + "observed": status == "observed", + "phase": phase, + "momentum_band": _single_line(result.get("momentum_band"), 20) or "unknown", + "touch_count": max(0, min(256, int(result.get("touch_count") or 0))), + "status": status, + } diff --git a/page_api.py b/page_api.py index cf6dd4b..cbb0717 100644 --- a/page_api.py +++ b/page_api.py @@ -9164,6 +9164,15 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiUsersGroupsMixin): relationship_state = self._emotion_relationship_state_summary(rel_state) pending_emotion_judgement = self._emotion_pending_judgement_summary(user.get("pending_emotion_judgement")) last_emotion_judgement_error = self._single_line(user.get("last_emotion_judgement_error"), 160) + relationship_score = self._int(user.get("relationship_score")) + relationship_basis = { + "value": relationship_score, + "band": ( + "亲近基础" if relationship_score >= 55 + else "熟悉基础" if relationship_score >= 3 + else "初始基础" + ), + } return { "user_id": user_id_text, "display_name": display_name, @@ -9233,7 +9242,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiUsersGroupsMixin): "inbound_count": user.get("inbound_count", 0), "reply_count": user.get("reply_count", 0), "proactive_sent_count": user.get("proactive_sent_count", 0), - "relationship_score": user.get("relationship_score", 0), + "relationship_basis": relationship_basis, "relationship_stage": relationship_stage, "relationship_state": relationship_state, "pending_emotion_judgement": pending_emotion_judgement, @@ -9253,6 +9262,97 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiUsersGroupsMixin): ], } + def _relationship_panel( + self, + user_id: str, + user: dict[str, Any], + *, + relationship_stage: str, + worldbook_member: dict[str, Any] | None, + ) -> dict[str, Any]: + """Build a safe, user-scoped relationship display projection.""" + score = self._int(user.get("relationship_score")) + inbound = max(0, self._int(user.get("inbound_count"))) + proactive = max(0, self._int(user.get("proactive_sent_count"))) + replies = max(0, self._int(user.get("reply_count"))) + reply_rate = replies / proactive if proactive else 0.0 + if proactive <= 0: + reply_band = "暂无主动样本" + elif reply_rate >= 0.65: + reply_band = "回应稳定" + elif reply_rate >= 0.30: + reply_band = "有回应" + else: + reply_band = "回应较少" + + memory_phase = { + "status": "unavailable", + "label": "记忆关系阶段暂不可用", + "momentum_band": "unknown", + } + session_id = self._single_line(user.get("umo"), 200) + getter = getattr(self.plugin, "_memory_companion_peek_relationship_phase", None) + if session_id and callable(getter): + try: + raw_phase = getter(session_id=session_id) + except Exception: + raw_phase = {} + if isinstance(raw_phase, dict): + phase_labels = { + "acquaintance": "陌生", + "familiar": "熟悉", + "close": "亲近", + "intimate": "亲密", + "deeply_bonded": "深度连接", + } + phase = self._single_line(raw_phase.get("phase"), 32) + phase_status = self._single_line(raw_phase.get("status"), 24) + if phase_status == "observed" and phase in phase_labels: + memory_phase = { + "status": "observed", + "label": phase_labels[phase], + "momentum_band": self._single_line(raw_phase.get("momentum_band"), 20) or "steady", + } + elif phase_status in {"not_observed", "unsupported", "unavailable", "invalid"}: + memory_phase = { + "status": phase_status, + "label": "尚未观察到记忆关系阶段" if phase_status == "not_observed" else "记忆关系阶段暂不可用", + "momentum_band": "unknown", + } + + network_status = "已登记节点" if isinstance(worldbook_member, dict) else "未登记节点" + network_linked = False + pending_count = 0 + if isinstance(worldbook_member, dict): + network_linked = bool( + worldbook_member.get("linked_qq_user_id") + or worldbook_member.get("linked_bili_profile_id") + or worldbook_member.get("external_ids") + ) + pending_count = max(0, self._int(worldbook_member.get("pending_observation_count"))) + return { + "relationship_basis": { + "value": score, + "band": "亲近基础" if score >= 55 else "熟悉基础" if score >= 3 else "初始基础", + }, + "relationship_stage": self._single_line(relationship_stage, 20) or "未分层", + "interaction": { + "inbound_count": inbound, + "reply_count": replies, + "reply_band": reply_band, + }, + "memory_phase": memory_phase, + "network": { + "status": network_status, + "linked_identity": network_linked, + "pending_observation_count": pending_count, + }, + "reply_temperature": { + "status": "live_chat_only", + "label": "真实聊天时由好感上限与当前日程、心情、上下文合成", + }, + } + def _emotion_relationship_state_summary(self, state: Any) -> dict[str, Any]: if not isinstance(state, dict): return {} diff --git a/page_api_users_groups.py b/page_api_users_groups.py index 3d86f94..037e39d 100644 --- a/page_api_users_groups.py +++ b/page_api_users_groups.py @@ -43,6 +43,12 @@ class PrivateCompanionPageApiUsersGroupsMixin: if not isinstance(user, dict): return self._error("用户不存在") detail = self._user_summary(user_id, user) + detail["relationship_panel"] = self._relationship_panel( + user_id, + user, + relationship_stage=str(detail.get("relationship_stage") or ""), + worldbook_member=worldbook_member, + ) route_status_getter = getattr(self.plugin, "_private_delivery_route_status", None) delivery_route = route_status_getter(user_id, user) if callable(route_status_getter) else {} detail.update( diff --git a/pages/陪伴面板/app.js b/pages/陪伴面板/app.js index 235874d..4b70441 100644 --- a/pages/陪伴面板/app.js +++ b/pages/陪伴面板/app.js @@ -5203,7 +5203,7 @@ const setupGuideSteps = [ { tab: "worldbook", groupIndex: 2, - title: "关系网词条", + title: "关系网节点", tag: "主动功能与其他配置", body: "这里可配置第一条关系网用户词条。关系网不是首次可用的前提;没有资料时可先跳过,之后再到关系网页补充。", checks: ["填写身份 QQ 与名称", "补充别名和关系资料", "确认自登记说明"], @@ -7497,7 +7497,7 @@ function setupGuideWorldbookDraftHtml() { ${setupGuideText("worldbookBoundaryNote", "互动边界", "例如:不公开聊隐私;不拿某个话题开玩笑。", true)}
${escapeHtml(item.name || item.user_id || "未命名成员")}