koishi-plugin-chatluna-affinity 0.0.3 → 0.0.4

package/lib/affinity-store.js

@@ -46,6 +46,7 @@ function extendModel(ctx) {
       platform: 'string',
       selfId: { type: 'string', nullable: true },
       userId: 'string',
+      nickname: { type: 'string', nullable: true },
       affinity: 'integer',
       affinityInited: 'boolean',
       relation: { type: 'string', nullable: true },
@@ -142,7 +143,15 @@ function createAffinityStore(ctx, config, log) {
     const existing = await ctx.database.get(MODEL_NAME, { id });
     const current = existing?.[0];
     const now = new Date();
-    const relationText = relation !== undefined && relation !== null ? String(relation).trim() : undefined;
+    const manual = findManualRelationship(identity.platform, identity.userId);
+    let relationText;
+    if (relation === undefined || relation === null) {
+      relationText = manual?.relation ?? current?.relation ?? '';
+    } else {
+      const trimmed = String(relation).trim();
+      relationText = trimmed ? trimmed : manual?.relation ?? current?.relation ?? '';
+    }
+    const nickname = seed?.nickname || seed?.authorNickname || seed?.session?.nickname || seed?.session?.author?.nickname || seed?.session?.author?.name || '';
 
     const payload = {
       id,
@@ -151,11 +160,16 @@ function createAffinityStore(ctx, config, log) {
       userId: identity.userId,
       affinity: typeof value === 'number' ? value : current?.affinity ?? defaultInitialValue(),
       affinityInited: inited ?? current?.affinityInited ?? false,
-      relation: relationText !== undefined ? relationText : current?.relation ?? '',
+      relation: relationText,
+      nickname: nickname || current?.nickname || manual?.relationNickname || '',
       updatedAt: now,
       relationUpdatedAt: relationText !== undefined ? now : current?.relationUpdatedAt ?? now
     };
 
+    if (nickname && (!current || nickname !== current.nickname)) {
+      payload.nickname = nickname;
+    }
+
     await ctx.database.upsert(MODEL_NAME, [payload]);
     return payload;
   };
@@ -271,14 +285,17 @@ function createAffinityStore(ctx, config, log) {
         : manual?.initialAffinity ?? rollInitial();
       const initial = clampFn(base, config.min, config.max);
       const level = resolveLevelByAffinity(initial);
-      await save({ platform, userId, selfId: session?.selfId }, initial, true, level?.relation ?? '');
+      const desiredRelation = manual?.relation ?? level?.relation ?? '';
+      await save({ platform, userId, selfId: session?.selfId, session }, initial, true, desiredRelation);
       return { affinity: initial, isNew: true };
     }
 
     const normalized = clampFn(record.affinity ?? defaultInitialValue(), config.min, config.max);
     if (normalized !== record.affinity) {
       const level = resolveLevelByAffinity(normalized);
-      await save({ platform, userId, selfId: session?.selfId }, normalized, record.affinityInited, level?.relation ?? record.relation ?? '');
+      const manual = findManualRelationship(platform, userId);
+      const desiredRelation = manual?.relation ?? level?.relation ?? record.relation ?? '';
+      await save({ platform, userId, selfId: session?.selfId, session }, normalized, record.affinityInited, desiredRelation);
     }
     return { affinity: normalized, isNew: false };
   };

package/lib/middleware.js

@@ -128,6 +128,7 @@ function createAnalysisMiddleware(ctx, config, { store, history, cache, getModel
       const jsonCandidate = typeof text === 'string' ? text : String(text ?? '');
       const match = jsonCandidate.match(/\{[\s\S]*\}/);
       let delta = 0;
+      const nickname = session?.author?.nickname || session?.author?.name || session?.user?.nickname || session?.user?.name || session?.username || session?.nickname || '';
       if (match) {
         try {
           const parsed = JSON.parse(match[0]);
@@ -137,7 +138,7 @@ function createAnalysisMiddleware(ctx, config, { store, history, cache, getModel
           if (action === 'increase' && delta <= 0) delta = Math.max(1, Math.abs(delta));
           if (action === 'decrease' && delta >= 0) delta = -Math.max(1, Math.abs(delta));
           if (action === 'hold') delta = 0;
-          if (debugEnabled) log('info', '模型返回', { raw: parsed, parsedDelta: delta, action, userId: session.userId, platform: session.platform });
+          if (debugEnabled) log('info', '模型返回', { raw: parsed, parsedDelta: delta, action, userId: session.userId, platform: session.platform, nickname });
         } catch (error) {
           log('warn', '解析模型响应失败', { text: jsonCandidate, error });
         }
@@ -149,11 +150,12 @@ function createAnalysisMiddleware(ctx, config, { store, history, cache, getModel
         ? Math.min(delta, positiveLimit)
         : Math.max(delta, -negativeLimit);
       const nextAffinity = clampValue(oldAffinity + limitedDelta, config.min, config.max);
+
       if (nextAffinity !== oldAffinity) {
         const level = store.resolveLevelByAffinity(nextAffinity);
-        await store.save({ platform: session.platform, userId: session.userId, selfId: session?.selfId }, nextAffinity, true, level?.relation ?? '');
+        await store.save({ platform: session.platform, userId: session.userId, selfId: session?.selfId, session }, nextAffinity, true, level?.relation ?? '');
         cache.set(session.platform, session.userId, nextAffinity);
-        log('info', '好感度已更新', { oldAffinity, delta: limitedDelta, nextAffinity, userId: session.userId, platform: session.platform });
+        log('info', '好感度已更新', { oldAffinity, delta: limitedDelta, nextAffinity, userId: session.userId, platform: session.platform, nickname });
       } else if (config.useLastAffinity) {
         cache.set(session.platform, session.userId, oldAffinity);
       }

package/lib/schema.js

@@ -36,7 +36,7 @@ const AffinitySchema = Schema.object({
   analysisPrompt: Schema.string()
     .role('textarea')
     .default(
-      '你是好感度管家，需要根据上下文评估是否调整好感度。\n- 关注最近若干条群聊消息，判断整体语气与语境；\n- 当用户友善、感谢、积极互动时，适度增加；\n- 当用户正常交流且无明显倾向时，保持不变；\n- 当用户冒犯、敷衍、重复打扰时，减少；\n- 增加幅度不超过 {{maxIncreasePerMessage}} ，减少幅度不超过 {{maxDecreasePerMessage}} ，并保持在提供的范围内；\n- 使用 action 表示行为：increase 增加、decrease 减少、hold 保持。\n\n角色设定：{{personaPrompt}}\n\n当前好感度：{{currentAffinity}} （范围 {{minAffinity}} ~ {{maxAffinity}}）\n最近 {{historyCount}} 条消息（旧 -> 新）：\n{{historyText}}\n\n本次用户消息：\n{{userMessage}}\n\n请仅输出 JSON：{"delta": 整数, "action": "increase|decrease|hold", "reason": "简短中文原因"}。'
+      '你是好感度管家，需要根据上下文评估是否调整好感度。\n- 仔细阅读最近若干条群聊消息，聚焦语气、内容、语境与互动意图；\n- 只有当用户展现出明确、具体的善意或贡献时（如感谢、称赞、帮助解决问题、分享价值信息、表达真诚关心），才考虑增加；\n- 若用户只是礼貌问候、例行回应、轻度调侃或重复旧话题，可保持不变；\n- 对于冒犯、敷衍、抄袭、频繁打扰、传播负面情绪或破坏氛围的行为，应减少；\n- 增加幅度不超过 {{maxIncreasePerMessage}} ，减少幅度不超过 {{maxDecreasePerMessage}} ，并保持在提供的范围内；\n- 在总结理由时，指明触发增减的具体言辞或行为；\n- 使用 action 表示行为：increase 增加、decrease 减少、hold 保持。\n\n角色设定：{{personaPrompt}}\n\n当前好感度：{{currentAffinity}} （范围 {{minAffinity}} ~ {{maxAffinity}}）\n最近 {{historyCount}} 条消息（旧 -> 新）：\n{{historyText}}\n\n本次用户消息：\n{{userMessage}}\n\n请仅输出 JSON：{"delta": 整数, "action": "increase|decrease|hold", "reason": "简短中文原因"}。'
     )
     .description('好感度分析主提示词'),
   personaPrompt: Schema.string()

package/lib/tools.js

@@ -20,7 +20,7 @@ function createAffinityTool(options) {
       if (!platform || !userId) return 'Missing platform or user ID. Unable to adjust affinity.';
       const value = options.clamp(input.affinity);
       const level = options.resolveLevelByAffinity(value);
-      await options.save({ platform, userId, selfId: session?.selfId }, value, true, level?.relation ?? options.defaultRelation);
+      await options.save({ platform, userId, selfId: session?.selfId, session }, value, true, level?.relation ?? options.defaultRelation);
       options.cache.set(platform, userId, value);
       if (level?.relation) {
         return `Affinity for ${platform}/${userId} set to ${value}. Relationship updated to ${level.relation}.`;
@@ -58,7 +58,7 @@ function createRelationshipTool(options) {
       }
       const baseValue = level ? level.min : options.defaultInitial();
       const base = options.clamp(baseValue);
-      await options.save({ platform, userId, selfId: session?.selfId }, base, true, relationName);
+      await options.save({ platform, userId, selfId: session?.selfId, session }, base, true, relationName);
       options.cache.set(platform, userId, base);
       options.updateRelationshipConfig(userId, relationName, base);
       if (level) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-affinity",
-  "description": "为 ChatLuna 提供{好感度}与{关系}变量并提供对应的工具调用和低好感自动拉黑功能。",
-  "version": "0.0.3",
+  "description": "为 ChatLuna 提供{好感度}与{关系}变量并提供对应的工具调用和低好感自动拉黑功能。仅测试过伪装插件。",
+  "version": "0.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [