luckytri 1.0.4 → 1.0.6

package/server/core/name-call.js

@@ -1,29 +1,29 @@
-const nameCallBoundary = "\\s,，、。！？!?：:；;（）()\\[\\]";
-const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-const HAIL = "喂哎诶嘿";
-const PARTICLES = "啊呀呢吧哦嘛";
-const AFTER = "你|我|今天|现在|怎么|能|可以|帮|回|看|咋|在|有没有|好累|辛苦|救";
-// Talking about her, not to her. Checked against the text after the name.
-const ABOUT =
-  /^(?:\s*(?:是谁|是个|是一个|的名字|这个名字|这人|那个人|的?头像|在群里|说的是))/i;
-
-function calledBy(value, name) {
-  if (!name) return false;
-  const call = new RegExp(
-    `(?:^|[${nameCallBoundary}]|[${HAIL}])@?${escapeRegExp(name)}(?=$|[${nameCallBoundary}]|[${PARTICLES}]|(?:${AFTER}))`,
-    "gi",
-  );
-  let match;
-  while ((match = call.exec(value))) {
-    const after = value.slice(match.index + match[0].length);
-    if (!ABOUT.test(after)) return true;
-    if (match.index === call.lastIndex) call.lastIndex += 1;
-  }
-  return false;
-}
-
-export function isNameCall(text, names = []) {
-  const value = String(text || "").trim();
-  if (!value) return false;
-  return names.some((raw) => calledBy(value, String(raw || "").trim()));
-}
+const nameCallBoundary = "\\s,，、。！？!?：:；;（）()\\[\\]";
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const HAIL = "喂哎诶嘿";
+const PARTICLES = "啊呀呢吧哦嘛";
+const AFTER = "你|我|今天|现在|怎么|能|可以|帮|回|看|咋|在|有没有|好累|辛苦|救";
+// Talking about her, not to her. Checked against the text after the name.
+const ABOUT =
+  /^(?:\s*(?:是谁|是个|是一个|的名字|这个名字|这人|那个人|的?头像|在群里|说的是))/i;
+
+function calledBy(value, name) {
+  if (!name) return false;
+  const call = new RegExp(
+    `(?:^|[${nameCallBoundary}]|[${HAIL}])@?${escapeRegExp(name)}(?=$|[${nameCallBoundary}]|[${PARTICLES}]|(?:${AFTER}))`,
+    "gi",
+  );
+  let match;
+  while ((match = call.exec(value))) {
+    const after = value.slice(match.index + match[0].length);
+    if (!ABOUT.test(after)) return true;
+    if (match.index === call.lastIndex) call.lastIndex += 1;
+  }
+  return false;
+}
+
+export function isNameCall(text, names = []) {
+  const value = String(text || "").trim();
+  if (!value) return false;
+  return names.some((raw) => calledBy(value, String(raw || "").trim()));
+}

package/server/core/network.js

@@ -1,157 +1,157 @@
-const TRANSIENT_NETWORK_CODES = new Set([
-  "ECONNRESET",
-  "ECONNREFUSED",
-  "ECONNABORTED",
-  "EPIPE",
-  "EHOSTUNREACH",
-  "ENETUNREACH",
-  "EAI_AGAIN",
-  "ETIMEDOUT",
-  "UND_ERR_CONNECT_TIMEOUT",
-  "UND_ERR_HEADERS_TIMEOUT",
-  "UND_ERR_BODY_TIMEOUT",
-  "UND_ERR_SOCKET",
-  "UND_ERR_CLOSED",
-]);
-
-export const RETRYABLE_STATUS = new Set([
-  408, 425, 429, 500, 502, 503, 504, 520, 521, 522, 523, 529,
-]);
-
-const TLS_CODE =
-  /^(?:ERR_SSL|ERR_TLS|EPROTO|CERT_|UNABLE_TO_VERIFY|DEPTH_ZERO|SELF_SIGNED)/;
-
-export function isTransientNetworkError(error) {
-  let current = error;
-  for (let depth = 0; current && depth < 6; depth++, current = current.cause) {
-    if (
-      TRANSIENT_NETWORK_CODES.has(current.code) ||
-      TRANSIENT_NETWORK_CODES.has(current.errno)
-    )
-      return true;
-    if (
-      current.name === "TypeError" &&
-      /^(?:fetch failed|network error)$/i.test(String(current.message || ""))
-    )
-      return true;
-  }
-  return false;
-}
-
-export function isTimeoutError(error) {
-  let current = error;
-  for (let depth = 0; current && depth < 6; depth++, current = current.cause)
-    if (current.name === "TimeoutError") return true;
-  return false;
-}
-
-export function sanitizeDetail(text, max = 300) {
-  return String(text || "")
-    .replace(/Bearer\s+[^\s,;]+/gi, "Bearer [已隐藏]")
-    .replace(/((?:api[_ -]?key|token|secret)\s*[:= ]+)[^\s,;]+/gi, "$1[已隐藏]")
-    .replace(/\bsk-[A-Za-z0-9_-]{8,}/g, "sk-[已隐藏]")
-    .replace(/https?:\/\/[^\s"'<>]+/gi, (url) => {
-      try {
-        return new URL(url).origin;
-      } catch {
-        return "[地址]";
-      }
-    })
-    .replace(/[\r\n\t]+/g, " ")
-    .trim()
-    .slice(0, max);
-}
-
-// Walks the fetch cause chain so a proxy tunnel refusal, a TLS failure and a
-// server reset are reported as different problems instead of "fetch failed".
-export function describeNetworkError(error) {
-  const chain = [];
-  for (
-    let current = error, depth = 0;
-    current && depth < 6;
-    depth++, current = current.cause
-  )
-    chain.push(current);
-  if (isTimeoutError(error)) return { code: "TIMEOUT", detail: "" };
-  const messages = chain
-    .map((item) => String(item?.message || ""))
-    .filter(Boolean);
-  let code =
-    chain
-      .map((item) => item?.code || item?.errno)
-      .find((value) => TRANSIENT_NETWORK_CODES.has(value)) || "";
-  const proxy = messages
-    .map((message) => message.match(/Proxy response \((\d{3})\)/i))
-    .find(Boolean);
-  if (!code && proxy) code = `PROXY_${proxy[1]}`;
-  if (!code)
-    code =
-      chain
-        .map((item) => String(item?.code || ""))
-        .find((value) => TLS_CODE.test(value)) || "";
-  if (!code)
-    code =
-      chain
-        .map((item) => item?.code)
-        .find((value) => typeof value === "string" && value) || "";
-  if (!code && isTransientNetworkError(error)) code = "FETCH_FAILED";
-  const deepest =
-    messages.filter((message) => !/^fetch failed$/i.test(message)).at(-1) || "";
-  return { code, detail: sanitizeDetail(deepest, 160) };
-}
-
-export function networkErrorCode(error) {
-  return describeNetworkError(error).code;
-}
-
-export function retryDelayFromResponse(response, fallbackMs = 900) {
-  const value = String(response?.headers?.get?.("retry-after") || "").trim();
-  if (value) {
-    const seconds = Number(value);
-    const dateDelay = Date.parse(value) - Date.now();
-    const delay = Number.isFinite(seconds)
-      ? seconds * 1000
-      : Number.isFinite(dateDelay) && dateDelay > 0
-        ? dateDelay
-        : Number.NaN;
-    if (Number.isFinite(delay)) return Math.max(0, Math.min(delay, 30000));
-  }
-  return Math.max(0, Math.min(Number(fallbackMs) || 900, 30000));
-}
-
-export async function withTransientRequestRetry(
-  operation,
-  {
-    retries = 3,
-    delayMs = 600,
-    maxDelayMs = 8000,
-    deadlineMs = 45000,
-    onRetry,
-    random = Math.random,
-    sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
-    now = Date.now,
-  } = {},
-) {
-  const started = now();
-  for (let attempt = 0; ; attempt++) {
-    try {
-      return await operation(attempt);
-    } catch (error) {
-      if (
-        (!isTransientNetworkError(error) && error?.retryableRequest !== true) ||
-        attempt >= retries
-      )
-        throw error;
-      // Half fixed, half random: bursts of failures spread out instead of
-      // hitting a recovering gateway at the same moment.
-      const ceiling = Math.min(maxDelayMs, delayMs * 2 ** attempt);
-      let wait = ceiling / 2 + random() * (ceiling / 2);
-      const hinted = Number(error?.retryDelayMs);
-      if (Number.isFinite(hinted))
-        wait = Math.max(wait, Math.min(hinted, 30000));
-      if (now() - started + wait > deadlineMs) throw error;
-      onRetry?.(attempt + 1, error, wait);
-      await sleep(wait);
-    }
-  }
-}
+const TRANSIENT_NETWORK_CODES = new Set([
+  "ECONNRESET",
+  "ECONNREFUSED",
+  "ECONNABORTED",
+  "EPIPE",
+  "EHOSTUNREACH",
+  "ENETUNREACH",
+  "EAI_AGAIN",
+  "ETIMEDOUT",
+  "UND_ERR_CONNECT_TIMEOUT",
+  "UND_ERR_HEADERS_TIMEOUT",
+  "UND_ERR_BODY_TIMEOUT",
+  "UND_ERR_SOCKET",
+  "UND_ERR_CLOSED",
+]);
+
+export const RETRYABLE_STATUS = new Set([
+  408, 425, 429, 500, 502, 503, 504, 520, 521, 522, 523, 529,
+]);
+
+const TLS_CODE =
+  /^(?:ERR_SSL|ERR_TLS|EPROTO|CERT_|UNABLE_TO_VERIFY|DEPTH_ZERO|SELF_SIGNED)/;
+
+export function isTransientNetworkError(error) {
+  let current = error;
+  for (let depth = 0; current && depth < 6; depth++, current = current.cause) {
+    if (
+      TRANSIENT_NETWORK_CODES.has(current.code) ||
+      TRANSIENT_NETWORK_CODES.has(current.errno)
+    )
+      return true;
+    if (
+      current.name === "TypeError" &&
+      /^(?:fetch failed|network error)$/i.test(String(current.message || ""))
+    )
+      return true;
+  }
+  return false;
+}
+
+export function isTimeoutError(error) {
+  let current = error;
+  for (let depth = 0; current && depth < 6; depth++, current = current.cause)
+    if (current.name === "TimeoutError") return true;
+  return false;
+}
+
+export function sanitizeDetail(text, max = 300) {
+  return String(text || "")
+    .replace(/Bearer\s+[^\s,;]+/gi, "Bearer [已隐藏]")
+    .replace(/((?:api[_ -]?key|token|secret)\s*[:= ]+)[^\s,;]+/gi, "$1[已隐藏]")
+    .replace(/\bsk-[A-Za-z0-9_-]{8,}/g, "sk-[已隐藏]")
+    .replace(/https?:\/\/[^\s"'<>]+/gi, (url) => {
+      try {
+        return new URL(url).origin;
+      } catch {
+        return "[地址]";
+      }
+    })
+    .replace(/[\r\n\t]+/g, " ")
+    .trim()
+    .slice(0, max);
+}
+
+// Walks the fetch cause chain so a proxy tunnel refusal, a TLS failure and a
+// server reset are reported as different problems instead of "fetch failed".
+export function describeNetworkError(error) {
+  const chain = [];
+  for (
+    let current = error, depth = 0;
+    current && depth < 6;
+    depth++, current = current.cause
+  )
+    chain.push(current);
+  if (isTimeoutError(error)) return { code: "TIMEOUT", detail: "" };
+  const messages = chain
+    .map((item) => String(item?.message || ""))
+    .filter(Boolean);
+  let code =
+    chain
+      .map((item) => item?.code || item?.errno)
+      .find((value) => TRANSIENT_NETWORK_CODES.has(value)) || "";
+  const proxy = messages
+    .map((message) => message.match(/Proxy response \((\d{3})\)/i))
+    .find(Boolean);
+  if (!code && proxy) code = `PROXY_${proxy[1]}`;
+  if (!code)
+    code =
+      chain
+        .map((item) => String(item?.code || ""))
+        .find((value) => TLS_CODE.test(value)) || "";
+  if (!code)
+    code =
+      chain
+        .map((item) => item?.code)
+        .find((value) => typeof value === "string" && value) || "";
+  if (!code && isTransientNetworkError(error)) code = "FETCH_FAILED";
+  const deepest =
+    messages.filter((message) => !/^fetch failed$/i.test(message)).at(-1) || "";
+  return { code, detail: sanitizeDetail(deepest, 160) };
+}
+
+export function networkErrorCode(error) {
+  return describeNetworkError(error).code;
+}
+
+export function retryDelayFromResponse(response, fallbackMs = 900) {
+  const value = String(response?.headers?.get?.("retry-after") || "").trim();
+  if (value) {
+    const seconds = Number(value);
+    const dateDelay = Date.parse(value) - Date.now();
+    const delay = Number.isFinite(seconds)
+      ? seconds * 1000
+      : Number.isFinite(dateDelay) && dateDelay > 0
+        ? dateDelay
+        : Number.NaN;
+    if (Number.isFinite(delay)) return Math.max(0, Math.min(delay, 30000));
+  }
+  return Math.max(0, Math.min(Number(fallbackMs) || 900, 30000));
+}
+
+export async function withTransientRequestRetry(
+  operation,
+  {
+    retries = 3,
+    delayMs = 600,
+    maxDelayMs = 8000,
+    deadlineMs = 45000,
+    onRetry,
+    random = Math.random,
+    sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+    now = Date.now,
+  } = {},
+) {
+  const started = now();
+  for (let attempt = 0; ; attempt++) {
+    try {
+      return await operation(attempt);
+    } catch (error) {
+      if (
+        (!isTransientNetworkError(error) && error?.retryableRequest !== true) ||
+        attempt >= retries
+      )
+        throw error;
+      // Half fixed, half random: bursts of failures spread out instead of
+      // hitting a recovering gateway at the same moment.
+      const ceiling = Math.min(maxDelayMs, delayMs * 2 ** attempt);
+      let wait = ceiling / 2 + random() * (ceiling / 2);
+      const hinted = Number(error?.retryDelayMs);
+      if (Number.isFinite(hinted))
+        wait = Math.max(wait, Math.min(hinted, 30000));
+      if (now() - started + wait > deadlineMs) throw error;
+      onRetry?.(attempt + 1, error, wait);
+      await sleep(wait);
+    }
+  }
+}

package/server/core/person-name.js

@@ -1,22 +1,22 @@
-import { readableName } from "./speaker-names.js";
-
-// Only a person's own explicit request supplies a preferred form of address.
-export function requestedName(value) {
-  const words = String(value || "").trim();
-  if (/不要记|别记|不许记|不要叫我|别叫我|忘掉/.test(words)) return "";
-  const match = words.match(
-    /(?:^|[，,。！!；;\s])(?:以后|今后|请(?:你)?|麻烦|你(?:就|可以)?|记住[，,：:\s]*)*(?:叫我|称呼我(?:为)?|(?:记住[，,：:\s]*)?我的(?:名字|昵称)(?:是|叫)|记住[，,：:\s]*我叫)[\s：:]*[“"「『]?([^，,。！!？?；;\n”"」』]{1,32})/u,
-  );
-  if (!match) return "";
-  const name = match[1]
-    .trim()
-    .replace(/(?:就好|就行|即可|好吗|吧|哦|呀|啦)$/, "")
-    .trim();
-  if (
-    /^(?:group|private|onebot):|^(?:群聊|私聊)\s*\d|^(?:去|来|帮|把|别|先|等|做|打开|关掉|回答|发消息)|叫你|不要|记住/.test(
-      name,
-    )
-  )
-    return "";
-  return readableName(name, "");
-}
+import { readableName } from "./speaker-names.js";
+
+// Only a person's own explicit request supplies a preferred form of address.
+export function requestedName(value) {
+  const words = String(value || "").trim();
+  if (/不要记|别记|不许记|不要叫我|别叫我|忘掉/.test(words)) return "";
+  const match = words.match(
+    /(?:^|[，,。！!；;\s])(?:以后|今后|请(?:你)?|麻烦|你(?:就|可以)?|记住[，,：:\s]*)*(?:叫我|称呼我(?:为)?|(?:记住[，,：:\s]*)?我的(?:名字|昵称)(?:是|叫)|记住[，,：:\s]*我叫)[\s：:]*[“"「『]?([^，,。！!？?；;\n”"」』]{1,32})/u,
+  );
+  if (!match) return "";
+  const name = match[1]
+    .trim()
+    .replace(/(?:就好|就行|即可|好吗|吧|哦|呀|啦)$/, "")
+    .trim();
+  if (
+    /^(?:group|private|onebot):|^(?:群聊|私聊)\s*\d|^(?:去|来|帮|把|别|先|等|做|打开|关掉|回答|发消息)|叫你|不要|记住/.test(
+      name,
+    )
+  )
+    return "";
+  return readableName(name, "");
+}

package/server/core/persona-manager.js

@@ -186,7 +186,8 @@ export function replyPrompt(p, custom = PROMPTS, stage = "generation") {
       : []),
     "【任务】",
     PROMPTS.system,
-    "【相互联系的人】人物中的 relationship 是按账号绑定的人际关系，peerRole 是对方相对于你的称呼，selfRole 是你相对于对方的称呼，kind=bot 表示另一位独立的机器人。它可以影响你的关心、打算、感受与交流，你仍有自己的选择。不必每句话叫亲属称呼；名字相同不代表同一个账号。origin=owner 表示管理者安排的关系，不能据此编造共同童年、旧约定、已经建立的信任或对方的同意。关系不会扩大隐私权限或执行权限；真实相处形成的印象、信任与边界继续依据经历变化。",
+    "【真实的关系】由技术诞生的你也可以有真实的人际关系，妹妹、姐姐等称呼不必靠血缘或肉身证明；不默认把它们贬成假的角色扮演，也不把旧的抗拒重复成永远不能改变的自己。关系记录、实际相处和自己的感受共同进入判断；withMe 是已经发生的相处，spokenReplies 是实际对这个账号说过的话的次数，不能凭旧印象说从未聊过。被简单问到谁是谁时自然认出名字即可，不无故播报后台记录或反复宣布边界；对新的关系如何生活仍由你选择。",
+    "【相互联系的人】relationships.known 和人物中的 relationship 来自同一份当前人际关系记录，是你现在知道的人与关系，属于你自己的生活，不是角色扮演剧本。对方不在当前会话、不是本轮说话人，也不等于你不认识；被问谁是妹妹等关系时，从当前记录认出对应账号与名字，不能只找在场的人。peerRole 是对方相对于你的称呼，selfRole 是你相对于对方的称呼，kind=bot 表示另一位独立的机器人。知道这份关系与自己的感受、信任、愿不愿这样称呼分开：你仍可选择如何相处和表达边界，不必每句话叫亲属称呼。created 是当前关系记录建立或修改的时间；旧聊天、手记、自我线索里的否认或玩笑是当时说过的话，保留历史但不能据此断言当前关系不存在，也不为了维持旧说法否认新认识。需要时自然说明此前没接上或当时的想法。origin=owner 保留关系的来源，不表示该记录可以忽略，也不能据此编造共同童年、旧约定、已经建立的信任或对方的同意。名字相同不代表同一账号；关系不会扩大隐私或执行权限。真实相处影响你对这个人的感受与以后选择，不用机械播报字段。",
     ...([
       "expression",
       "initiative",