@dcrays/dcgchat-test 0.6.10 → 0.6.12

package/src/utils/gatewayMsgHandler.ts

@@ -0,0 +1,147 @@
+import type { GatewayEvent } from '../gateway/index.js'
+import { finishedDcgchatCron } from '../cron/message.js'
+import { cronAddHandler } from '../cron/params.js'
+import { sendGatewayRpc } from '../gateway/socket.js'
+import { dcgLogger } from './log.js'
+import { getEffectiveMsgParams } from './params.js'
+import { sendChunk, sendEventMessage } from '../transport.js'
+import { setCronSessionKeyMapsForJob } from '../channel/outboundTarget.js'
+import { resolveRequesterSessionKeyBySubagentRunId } from './subagentRunMap.js'
+import { isSessionActiveForTool } from '../tool.js'
+import { isSessionStreamSuppressed } from './sessionTermination.js'
+import { takeStreamChunkIdxAndAdvance } from './inboundTurnState.js'
+import { agentErrorUserHint } from './agentErrors.js'
+
+function collectCronSessionKeys(payload: Record<string, any>): unknown[] {
+  const job = payload.job ?? {}
+  const delivery = payload.delivery ?? {}
+  const jobDelivery = job.delivery ?? {}
+  return [
+    payload.sessionKey,
+    job.sessionKey,
+    delivery.to,
+    delivery.intended?.to,
+    delivery.resolved?.to,
+    jobDelivery.to,
+    jobDelivery.intended?.to,
+    jobDelivery.resolved?.to
+  ]
+}
+
+function getCronDeliveryTo(job: Record<string, any>): string {
+  return typeof job.delivery?.to === 'string' ? job.delivery.to.replace('dcg-cron:', '').trim() : ''
+}
+
+function getCronSessionKey(job: Record<string, any>): string {
+  return typeof job.sessionKey === 'string' ? job.sessionKey.trim() : ''
+}
+
+function readableErrorText(value: unknown): string {
+  if (typeof value === 'string') return value.trim()
+  if (value instanceof Error) return value.message.trim()
+  if (value && typeof value === 'object' && 'message' in value && typeof value.message === 'string') {
+    return value.message.trim()
+  }
+  return ''
+}
+
+function canSendCronInstallFromAddedEvent(payload: Record<string, any>): boolean {
+  const job = payload.job
+  if (!job || typeof job !== 'object' || Array.isArray(job)) return false
+  return Boolean(getCronSessionKey(job) && getCronDeliveryTo(job))
+}
+
+function sendCronInstallFromAddedEvent(payload: Record<string, any>): void {
+  const job = payload.job as Record<string, any>
+  sendEventMessage({
+    event_type: 'cron',
+    operation_type: 'install',
+    data: {
+      ...job,
+      id: job.id ?? payload.jobId
+    }
+  })
+}
+
+/**
+ * 处理网关 event 帧的副作用（agent 流式输出、cron 同步），并构造供上层分发的 GatewayEvent。
+ */
+export async function handleGatewayEventMessage(msg: { event?: string; payload?: Record<string, unknown>; seq?: number }): Promise<GatewayEvent> {
+  try {
+    // 子agent消息输出
+    if (msg.event === 'agent') {
+      const pl = msg.payload as { runId: string; data?: { delta?: unknown } }
+      const sessionKey = resolveRequesterSessionKeyBySubagentRunId(pl.runId)
+      if (!sessionKey) return { type: msg.event as string, payload: msg.payload, seq: msg.seq as number | undefined }
+      if (!isSessionActiveForTool(sessionKey)) {
+        dcgLogger(`[Gateway] drop subagent delta: session not active, runId=${pl.runId}, sessionKey=${sessionKey}`)
+        return { type: msg.event as string, payload: msg.payload, seq: msg.seq as number | undefined }
+      }
+      if (isSessionStreamSuppressed(sessionKey)) {
+        dcgLogger(`[Gateway] drop subagent delta: stream suppressed, runId=${pl.runId}, sessionKey=${sessionKey}`)
+        return { type: msg.event as string, payload: msg.payload, seq: msg.seq as number | undefined }
+      }
+      if (typeof pl.data?.delta !== 'string' || !pl.data.delta) {
+        return { type: msg.event as string, payload: msg.payload, seq: msg.seq as number | undefined }
+      }
+      const outboundCtx = getEffectiveMsgParams(sessionKey)
+      if (outboundCtx.sessionId) {
+        const chunkIdx = takeStreamChunkIdxAndAdvance(sessionKey)
+        sendChunk(pl.data.delta, outboundCtx, chunkIdx)
+      }
+    }
+    // 定时任务
+    if (msg.event === 'cron') {
+      const p = msg.payload as Record<string, any>
+      if (p?.action === 'started') {
+        const registeredKeys = setCronSessionKeyMapsForJob(p?.jobId ?? p?.job?.id, collectCronSessionKeys(p))
+        dcgLogger(`[Gateway] 定时任务活跃会话: jobId=${String(p?.jobId ?? p?.job?.id ?? '')} keys=${registeredKeys.join(',')}`)
+        dcgLogger(`[Gateway] 定时任务执行开始: ${JSON.stringify(p)}`)
+      } else {
+        dcgLogger(`[Gateway] 收到定时任务事件: ${JSON.stringify(p)}`)
+      }
+      if (p?.action === 'added') {
+        if (canSendCronInstallFromAddedEvent(p)) {
+          sendCronInstallFromAddedEvent(p)
+        } else {
+          await cronAddHandler(p?.jobId as string)
+        }
+      }
+      if (p?.action === 'updated') {
+        const data = (await sendGatewayRpc({ method: 'cron.get', params: { id: p?.jobId as string } })) as Record<string, any>
+        const params = {
+          event_type: 'cron',
+          operation_type: 'install',
+          data
+        }
+        sendEventMessage(params)
+      }
+      if (p?.action === 'removed') {
+        const params = {
+          event_type: 'cron',
+          operation_type: 'remove',
+          data: { ...p }
+        }
+        sendEventMessage(params)
+      }
+      if (p?.action === 'finished') {
+        const jobId = typeof p?.jobId === 'string' ? p.jobId.trim() : ''
+        const summary = typeof p?.summary === 'string' ? p.summary : ''
+        const failureDetail = summary.trim() || readableErrorText(p?.error) || readableErrorText(p?.diagnostics?.summary)
+        const userHint = agentErrorUserHint(failureDetail)
+        let text = ''
+        if (p?.status !== 'ok') {
+          text = '定时任务执行失败' + (userHint || failureDetail ? `\n ${userHint ?? failureDetail}` : '')
+        }
+        finishedDcgchatCron(jobId, text)
+      }
+    }
+  } catch (error) {
+    dcgLogger(`[Gateway] 处理事件失败: ${error}`, 'error')
+  }
+  return {
+    type: msg.event as string,
+    payload: msg.payload,
+    seq: msg.seq as number | undefined
+  }
+}

package/src/utils/global.ts

@@ -0,0 +1,309 @@
+import type WebSocket from 'ws'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import type { OpenClawConfig, PluginRuntime } from 'openclaw/plugin-sdk'
+import { createPluginRuntimeStore } from 'openclaw/plugin-sdk/runtime-store'
+import { CHANNEL_ID } from './constant.js'
+import { dcgLogger } from './log.js'
+
+/** 配置中 `channels.*.appId` 为该值时，默认工作区落在 `~/.mobook/workspace`（否则 `~/.openclaw/workspace`）。 */
+export const MOBOOK_WORKSPACE_APP_ID = 110
+
+/** socket connection */
+let ws: WebSocket | null = null
+
+export function setWsConnection(next: WebSocket | null) {
+  ws = next
+}
+
+export function getWsConnection(): WebSocket | null {
+  return ws
+}
+
+let config: OpenClawConfig | null = null
+
+export function setOpenClawConfig(next: OpenClawConfig | null) {
+  config = next
+}
+
+export function getOpenClawConfig(): OpenClawConfig | null {
+  return config
+}
+
+function getWorkspacePath(): string | null {
+  const chAppId = config?.channels?.[CHANNEL_ID]?.appId
+  const workspacePath = path.join(os.homedir(), Number(chAppId) === MOBOOK_WORKSPACE_APP_ID ? '.mobook' : '.openclaw', 'workspace')
+  if (fs.existsSync(workspacePath)) {
+    return workspacePath
+  }
+  return null
+}
+
+let workspaceDir: string = getWorkspacePath() ?? ''
+
+export function setWorkspaceDir(dir?: string) {
+  if (dir && dir !== workspaceDir) {
+    workspaceDir = dir
+    dcgLogger(`setWorkspaceDir ==> ${dir}`)
+  }
+}
+
+export function getWorkspaceDir(): string {
+  if (!workspaceDir) {
+    dcgLogger?.('Workspace directory not initialized', 'error')
+  }
+  return workspaceDir
+}
+
+const { setRuntime: setDcgchatRuntime, getRuntime: getDcgchatRuntime } = createPluginRuntimeStore<PluginRuntime>(
+  `${CHANNEL_ID} runtime not initialized`
+)
+export { setDcgchatRuntime, getDcgchatRuntime }
+
+export type MsgSessionStatus = 'running' | 'finished' | ''
+
+const msgStatusBySessionKey = new Map<string, MsgSessionStatus>()
+
+export function setMsgStatus(sessionKey: string, status: MsgSessionStatus) {
+  if (!sessionKey?.trim()) return
+  if (status === '') {
+    msgStatusBySessionKey.delete(sessionKey)
+  } else {
+    msgStatusBySessionKey.set(sessionKey, status)
+  }
+}
+
+export function getMsgStatus(sessionKey: string): MsgSessionStatus {
+  if (!sessionKey?.trim()) return ''
+  return msgStatusBySessionKey.get(sessionKey) ?? ''
+}
+
+/**
+ * 出站媒体去重 bucket：优先本轮用户 `messageId`（与 bot / sendFinal 清理一致），否则书灵 `sessionId`，最后可回落 `sessionKey`。
+ */
+export function resolveOutboundMediaDedupeKey(messageId?: string, sessionId?: string, sessionKeyFallback?: string): string {
+  const mid = messageId?.trim()
+  if (mid) return mid
+  const sid = sessionId?.trim()
+  if (sid) return sid
+  return sessionKeyFallback?.trim() ?? ''
+}
+
+/**
+ * 本地路径用 `path.resolve`、http(s) 用「origin+pathname」并去掉 query，避免仅用 basename 导致跨目录误去重。
+ */
+export function mediaPathDedupeKey(mediaUrl: string): string {
+  const t = mediaUrl.trim()
+  if (!t) return ''
+  if (/^https?:\/\//i.test(t)) {
+    try {
+      const u = new URL(t)
+      return `${u.origin}${u.pathname}`
+    } catch {
+      return t.split('?')[0] ?? t
+    }
+  }
+  try {
+    const r = path.resolve(t)
+    return process.platform === 'win32' ? r.toLowerCase() : r
+  } catch {
+    const n = path.normalize(t)
+    return process.platform === 'win32' ? n.toLowerCase() : n
+  }
+}
+
+/** 已发送媒体去重：外层 dedupe bucket（见 resolveOutboundMediaDedupeKey）→ 内层规范化路径/url key */
+const sentMediaKeysBySession = new Map<string, Set<string>>()
+
+function getSessionMediaSet(dedupeBucketKey: string): Set<string> {
+  let set = sentMediaKeysBySession.get(dedupeBucketKey)
+  if (!set) {
+    set = new Set<string>()
+    sentMediaKeysBySession.set(dedupeBucketKey, set)
+  }
+  return set
+}
+
+export function addSentMediaKey(dedupeBucketKey: string, url: string) {
+  const k = dedupeBucketKey.trim()
+  if (!k) return
+  getSessionMediaSet(k).add(mediaPathDedupeKey(url))
+}
+
+export function hasSentMediaKey(dedupeBucketKey: string, url: string): boolean {
+  const k = dedupeBucketKey.trim()
+  if (!k) return false
+  return sentMediaKeysBySession.get(k)?.has(mediaPathDedupeKey(url)) ?? false
+}
+
+/** 仅删除指定 bucket；`dedupeBucketKey` 为空则 no-op（不做「清空全部」以免误伤）。 */
+export function clearSentMediaKeys(dedupeBucketKey?: string) {
+  const k = dedupeBucketKey?.trim()
+  if (!k) return
+  sentMediaKeysBySession.delete(k)
+}
+
+/** 每个 sessionKey 下多个定时任务 messageId，入队在尾、出队在头（FIFO） */
+const cronMessageIdMap = new Map<string, string[]>()
+
+export function setCronMessageId(sk: string, messageId: string | number | null | undefined) {
+  const mid = messageId != null && messageId !== '' ? String(messageId).trim() : ''
+  if (!sk?.trim() || !mid) return
+  let q = cronMessageIdMap.get(sk)
+  if (!q) {
+    q = []
+    cronMessageIdMap.set(sk, q)
+  }
+  q.push(mid)
+}
+
+/** 窥视队首 messageId（不移除），供发送中与 finished 配对使用 */
+export function getCronMessageId(sk: string): string {
+  if (!sk?.trim()) return ''
+  return cronMessageIdMap.get(sk)?.[0] ?? ''
+}
+
+/** 弹出队首一条，与一次 finished 对应；队列为空时移除 key */
+export function removeCronMessageId(sk: string) {
+  if (!sk?.trim()) return
+  const q = cronMessageIdMap.get(sk)
+  if (!q?.length) return
+  q.shift()
+  if (q.length === 0) {
+    cronMessageIdMap.delete(sk)
+  }
+}
+
+/**
+ * turn 已正常收尾时清空该 sessionKey 的整条 cron 队列。
+ *
+ * 背景：
+ * - `setCronMessageId` 同时服务于两类调用方：
+ *   1. `cron/message.ts onRunCronJob`：每条 cron.run 写入队首，与 `finishedDcgchatCron` 1.2s 后 `removeCronMessageId` 配对消费（队首一条）。
+ *   2. `outboundMedia.ts sendDcgchatMedia` 兜底：未传 `opts.messageId` 且队列为空时写入 `${Date.now()}`，本意是给后续 cron 气泡配 messageId。
+ *      这条 entry 永远不会被 `finishedDcgchatCron` 消费（其队首始终是 onRunCronJob 写入的），且每次 `deliver` 回调都会触发一条 → 队列无限增长。
+ * - turn 收尾时该 sessionKey 下不会再有 in-flight finished 配对，可安全清空。
+ * - 若 1.2s 内 `finishedDcgchatCron` 才被调用，`q.shift()` 在空队列上为 no-op（`removeCronMessageId` 已判空），不报错。
+ */
+export function removeAllCronMessageIdsForSession(sk: string): void {
+  if (!sk?.trim()) return
+  cronMessageIdMap.delete(sk)
+}
+
+/** 用于网关重启时持久化/恢复的全局会话状态快照 */
+export type GlobalSessionStateSnapshot = {
+  msgStatusBySessionKey: Array<[string, MsgSessionStatus]>
+  /** 媒体已发送去重：bucket 为 `resolveOutboundMediaDedupeKey`（优先 messageId） */
+  sentMediaKeysBySession: Array<[string, string[]]>
+  cronMessageIdMap: Array<[string, string[]]>
+}
+
+export function snapshotGlobalSessionState(): GlobalSessionStateSnapshot {
+  const runningEntries = [...msgStatusBySessionKey.entries()].filter(([, status]) => status === 'running')
+  const runningSessionKeys = new Set(runningEntries.map(([k]) => k))
+  return {
+    msgStatusBySessionKey: runningEntries,
+    sentMediaKeysBySession: [],
+    cronMessageIdMap: [...cronMessageIdMap.entries()].filter(([k]) => runningSessionKeys.has(k)).map(([k, q]) => [k, [...q]])
+  }
+}
+
+export function restoreGlobalSessionState(snap: GlobalSessionStateSnapshot | null | undefined): void {
+  if (!snap) return
+  msgStatusBySessionKey.clear()
+  sentMediaKeysBySession.clear()
+  cronMessageIdMap.clear()
+  for (const [k, v] of snap.msgStatusBySessionKey ?? []) {
+    if (typeof k === 'string' && k && v === 'running') {
+      msgStatusBySessionKey.set(k, v)
+    }
+  }
+  for (const [k, arr] of snap.cronMessageIdMap ?? []) {
+    if (typeof k !== 'string' || !k || !Array.isArray(arr)) continue
+    const q = arr.filter((x): x is string => typeof x === 'string' && !!x)
+    if (q.length > 0) cronMessageIdMap.set(k, q)
+  }
+}
+
+/** 与 bot 侧一致：session_id 为 `agentId::对话标识` 时提取 agentId（专家会话可仅依赖此前缀）。 */
+export function extractAgentIdFromConversationId(conversationId: string): string | null {
+  const idx = conversationId.indexOf('::')
+  if (idx <= 0) return null
+  return conversationId.slice(0, idx)
+}
+
+export const getSessionKey = (content: any, accountId: string) => {
+  const { real_mobook, agent_id, agent_clone_code, session_id } = content
+  const core = getDcgchatRuntime()
+
+  const sid = typeof session_id === 'string' ? session_id.trim() : ''
+  const embeddedAgent = sid ? extractAgentIdFromConversationId(sid) : null
+  const agentCode = (typeof agent_clone_code === 'string' && agent_clone_code.trim()) || embeddedAgent || 'main'
+
+  const route = core.channel.routing.resolveAgentRoute({
+    cfg: getOpenClawConfig() as OpenClawConfig,
+    channel: CHANNEL_ID,
+    accountId: accountId || 'default',
+    peer: { kind: 'direct', id: session_id }
+  })
+  return real_mobook == '1' ? route.sessionKey : `agent:${agentCode}:mobook:direct:${agent_id}:${session_id}`.toLowerCase()
+}
+
+interface TakeApartSessionKeyResult {
+  sessionId: string
+  agentId: string
+}
+export function takeApartSessionKey(sk: string): TakeApartSessionKeyResult {
+  const sessionInfo = sk?.split(':')
+  const sessionId = sessionInfo?.at(-1) ?? ''
+  const agentId = sessionInfo?.at(-2) ?? ''
+  return { sessionId, agentId }
+}
+
+export function compressFields(obj: Record<string, unknown>, fields: string[] = []) {
+  const start = 8
+  const end = 8
+  const newObj = { ...obj }
+
+  const compressText = (str: unknown) => {
+    if (typeof str !== 'string') return str
+
+    if (str.length <= start + end) {
+      return str
+    }
+
+    const omittedCount = str.length - start - end
+
+    return str.slice(0, start) + `...省略${omittedCount}个字...` + str.slice(-end)
+  }
+
+  fields.forEach((field) => {
+    if (field in newObj) {
+      newObj[field] = compressText(newObj[field])
+    }
+  })
+
+  return newObj
+}
+
+export function formatText(text: string): string {
+  if (!text) return ''
+  const str = String(text).replace(/\s/g, '')
+  if (!str) return ''
+  if (str.length <= 50) {
+    return str
+  }
+  return str.slice(0, 25) + `...[此处省略${str.length - 50}字]....` + str.slice(-25)
+}
+
+export function isReviserExpert(sessionKey?: string): boolean {
+  if (!sessionKey) return false
+  const segment = sessionKey.split(':')[1]
+  return segment != null && segment.includes('reviser-expert')
+}
+export function isCollectionReviewer(sessionKey?: string): boolean {
+  if (!sessionKey) return false
+  const segment = sessionKey.split(':')[1]
+  return segment != null && segment.includes('collection-reviewer')
+}

package/src/utils/inboundTurnState.ts

@@ -0,0 +1,66 @@
+/**
+ * 入站 generation 与流式分片序号（bot 与会话清理共用）。
+ * 独立模块以避免 bot 与 sessionTermination 之间的循环依赖。
+ */
+
+const inboundGenerationBySessionKey = new Map<string, number>()
+const streamChunkIdxBySessionKey = new Map<string, number>()
+
+/**
+ * stop 序列号：每条 /stop 在 turn 开始时递增，用于 stale handler 判定。
+ * 与 generation 独立：generation 区分不同用户消息，stopSeq 区分 /stop 与普通消息。
+ */
+const stopSeqBySessionKey = new Map<string, number>()
+
+/** 每条入站消息在 turn 开始时单调递增；用于 stale handler 判定 */
+export function bumpInboundGeneration(sessionKey: string): number {
+  const n = (inboundGenerationBySessionKey.get(sessionKey) ?? 0) + 1
+  inboundGenerationBySessionKey.set(sessionKey, n)
+  return n
+}
+
+export function getInboundGeneration(sessionKey: string): number {
+  return inboundGenerationBySessionKey.get(sessionKey) ?? 0
+}
+
+/**
+ * 每条 /stop 在 turn 开始时单调递增；用于 stale handler 判定（与 generation 独立检查）。
+ * 普通消息 bumpGeneration 时不 bump stopSeq，只有 /stop 才 bump。
+ */
+export function bumpStopSeq(sessionKey: string): number {
+  const n = (stopSeqBySessionKey.get(sessionKey) ?? 0) + 1
+  stopSeqBySessionKey.set(sessionKey, n)
+  return n
+}
+
+export function getStopSeq(sessionKey: string): number {
+  return stopSeqBySessionKey.get(sessionKey) ?? 0
+}
+
+/** 第一条 /stop 后的新用户消息已接管会话时，消费 stop 标记，避免后续消息一直被当作 after-stop。 */
+export function clearStopSeqForSession(sessionKey: string): void {
+  stopSeqBySessionKey.delete(sessionKey)
+}
+
+/** 会话完全终止时清理 generation 与 streamChunkIdx，防止 Map 泄漏 */
+export function clearInboundGenerationForSession(sessionKey: string): void {
+  inboundGenerationBySessionKey.delete(sessionKey)
+  streamChunkIdxBySessionKey.delete(sessionKey)
+  stopSeqBySessionKey.delete(sessionKey)
+}
+
+/** 本轮正常收尾时仅删除分片序号（generation 保留） */
+export function deleteStreamChunkIdxForSession(sessionKey: string): void {
+  streamChunkIdxBySessionKey.delete(sessionKey)
+}
+
+export function resetStreamChunkIdxForSession(sessionKey: string, value: number): void {
+  streamChunkIdxBySessionKey.set(sessionKey, value)
+}
+
+/** 返回当前序号并将计数 +1，供 sendChunk(..., prev) 使用 */
+export function takeStreamChunkIdxAndAdvance(sessionKey: string): number {
+  const prev = streamChunkIdxBySessionKey.get(sessionKey) ?? 0
+  streamChunkIdxBySessionKey.set(sessionKey, prev + 1)
+  return prev
+}

package/src/utils/log.ts

@@ -0,0 +1,77 @@
+import { RuntimeEnv } from 'openclaw/plugin-sdk'
+import { CHANNEL_ID } from './constant.js'
+
+let logger: RuntimeEnv | null = null
+const STACK_ROOT = 'openclaw-dcgchat'
+/** 发布包 scope，与 @dcrays/dcgchat-test 前段一致，用于匹配已安装到 node_modules 下的路径 */
+const SCOPE = '@dcrays/dcgchat'
+
+function isOurCodePath(line: string): boolean {
+  if (line.includes(STACK_ROOT)) return true
+  if (line.includes(SCOPE)) return true
+  // 无 node_modules 的本地单文件 /dist/index.js
+  if (line.replaceAll('\\', '/').includes('dist/index.js') && !line.includes('node_modules')) {
+    return true
+  }
+  return false
+}
+
+function isOtherNodeModuleLine(line: string): boolean {
+  if (!line.includes('node_modules/')) return false
+  // 本扩展装在 host 的 node_modules 下时，路径仍要保留
+  if (line.includes('node_modules/@dcrays/')) return false
+  if (line.includes(`node_modules/${STACK_ROOT}/`)) return false
+  return true
+}
+
+export function setLogger(next: RuntimeEnv | null) {
+  logger = next
+}
+
+function buildFilteredStack(): string {
+  const stack = new Error().stack
+  if (!stack) return ''
+  const frames = stack
+    .split('\n')
+    .slice(1)
+    .map((line) => line.trim())
+    .filter(
+      (line) =>
+        isOurCodePath(line) &&
+        !isOtherNodeModuleLine(line) &&
+        !line.includes('dcgLogger') &&
+        !line.includes('buildFilteredStack')
+    )
+    .map((line) => {
+      const normalized = line.replaceAll('\\', '/')
+      const fromRoot = normalized.indexOf(`${STACK_ROOT}/`)
+      if (fromRoot >= 0) {
+        const trimmed = normalized.slice(fromRoot + STACK_ROOT.length + 1)
+        return normalized.startsWith('at ') ? `at ${trimmed}` : trimmed
+      }
+      const scopeIdx = normalized.indexOf(`${SCOPE}`)
+      if (scopeIdx >= 0) {
+        const tail = normalized.slice(scopeIdx)
+        return normalized.startsWith('at ') ? `at ${tail}` : tail
+      }
+      return normalized.replace(/^at\s+/, '')
+    })
+
+  if (!frames.length) return ''
+  return `\nstack:\n${frames.join('\n')}`
+}
+
+export function dcgLogger(
+  message: string,
+  type: 'log' | 'error' = 'log',
+  options?: { includeStack?: boolean }
+): void {
+  const includeStack = options?.includeStack ?? false
+  const stack = includeStack ? buildFilteredStack() : ''
+  const fullMessage = `${message}${stack}`
+  if (logger) {
+    logger[type](`书灵墨宝🚀 ~ [${new Date().toISOString()}] ${fullMessage}`)
+  } else {
+    console[type](`书灵墨宝🚀 ~ ${new Date().toISOString()} [${CHANNEL_ID}]: ${fullMessage}`)
+  }
+}