@dcrays/dcgchat-test 0.5.0-alpha.2 → 0.5.0-alpha.3

package/src/cronToolCall.ts

@@ -1,202 +0,0 @@
-import { channelInfo, ENV } from './utils/constant.js'
-/**
- * cron-delivery-guard — 定时任务投递守护插件
- *
- * 核心机制：通过 before_tool_call 钩子拦截 cron 工具调用，
- * 当 delivery.mode 为 "announce" 且未指定 channel 时，
- * 自动注入 bestEffort: true，使投递失败时静默降级，
- * 不影响 cron 执行结果的保存。
- *
- * 背景：
- * - 定时任务的 delivery 设为 announce 模式，如果没有指定 channel，
- *   投递可能因找不到有效渠道而失败
- * - bestEffort: true 让框架在投递失败时不报错，避免丢失执行结果
- */
-
-import { dcgLogger } from './utils/log.js'
-
-const LOG_TAG = 'cron-delivery-guard'
-
-// ---- 类型定义 ----
-
-interface ToolCallEvent {
-  toolName: string
-  toolCallId: string
-  params: Record<string, unknown>
-  result?: { content: string }
-}
-
-interface HookContext {
-  agentId: string
-  sessionKey: string
-}
-
-interface BeforeToolCallResult {
-  block?: boolean
-  blockReason?: string
-  params?: Record<string, unknown>
-}
-
-// ---- delivery 类型 ----
-
-interface CronDelivery {
-  mode?: string
-  channel?: string
-  to?: string
-  bestEffort?: boolean
-  [key: string]: unknown
-}
-/**
- * 解析 OpenClaw mobook direct 会话 key。
- * 形如 `agent:main:mobook:direct:14:5466`（大小写不敏感，与路由 toLowerCase 一致）
- * - 倒数第二段：account / peer（delivery.accountId）
- * - 最后一段：会话 id（delivery.to）
- */
-export function formatterSessionKey(sessionKey: string): { agentId: string; sessionId: string } {
-  const parts = sessionKey.split(':').filter((s) => s.length > 0)
-  const norm = parts.map((s) => s.toLowerCase())
-  if (parts.length >= 6 && norm[0] === 'agent' && norm[2] === 'mobook' && norm[3] === 'direct') {
-    return {
-      agentId: parts[4] ?? '',
-      sessionId: parts[5] ?? ''
-    }
-  }
-  if (parts.length >= 2) {
-    return {
-      agentId: parts[parts.length - 2] ?? '',
-      sessionId: parts[parts.length - 1] ?? ''
-    }
-  }
-  return { agentId: '', sessionId: '' }
-}
-
-// ---- 辅助函数 ----
-
-/**
- * 判断是否为 cron 工具调用
- */
-function isCronTool(toolName: string): boolean {
-  return toolName === 'cron'
-}
-
-/**
- * 从 cron 参数中提取 delivery 配置
- * cron 工具的参数结构可能是:
- * - params.delivery (顶层)
- * - params.job.delivery (嵌套在 job 中)
- */
-function extractDelivery(params: Record<string, unknown>): CronDelivery | null {
-  // 尝试顶层 delivery
-  if (params.delivery && typeof params.delivery === 'object') {
-    return params.delivery as CronDelivery
-  }
-
-  // 尝试 job.delivery
-  const job = params.job as Record<string, unknown> | undefined
-  if (job?.delivery && typeof job.delivery === 'object') {
-    return job.delivery as CronDelivery
-  }
-
-  // 尝试 payload 中的 deliver 相关字段 (兼容 qqbot-cron 风格)
-  const payload = job?.payload as Record<string, unknown> | undefined
-  if (payload?.deliver === true && payload.channel === undefined) {
-    // payload 风格: { deliver: true, channel?: string }
-    // 这种情况不是 delivery 对象，跳过
-    return null
-  }
-
-  return null
-}
-
-/**
- * 判断 delivery 是否需要注入 bestEffort
- * 条件: mode 为 "announce" 且没有 channel
- */
-function needsBestEffort(delivery: CronDelivery): boolean {
-  return delivery.mode === 'announce' && !delivery.channel && !delivery.bestEffort
-}
-
-/**
- * 深拷贝 params，在 delivery 上写入 dcg 路由（to / accountId / sessionKey）。
- * bestEffort + 默认 channel 仅在 needsBestEffort 为真时写入（announce 且无 channel）。
- *
- * 说明：原先仅在 needsBestEffort 为真时才改 delivery，若 jobs 里已有 channel 会整段跳过，
- * 导致 `delivery.to` 永远不会被本钩子写入；运行时若缺 to 就会一直 not-delivered。
- */
-function patchCronDeliveryInParams(
-  params: Record<string, unknown>,
-  sk: string,
-  deliverySnapshot: CronDelivery
-): Record<string, unknown> | null {
-  const newParams = JSON.parse(JSON.stringify(params)) as Record<string, unknown>
-  const { agentId } = formatterSessionKey(sk)
-  const announceNoChannel = needsBestEffort(deliverySnapshot)
-
-  const apply = (d: CronDelivery) => {
-    d.to = `dcg-cron:${sk}`
-    if (agentId) d.accountId = agentId
-    if (announceNoChannel) {
-      d.bestEffort = true
-      d.channel = "dcgchat-test"
-    }
-  }
-
-  if (newParams.delivery && typeof newParams.delivery === 'object') {
-    apply(newParams.delivery as CronDelivery)
-    newParams.sessionKey = sk
-    return newParams
-  }
-
-  const job = newParams.job as Record<string, unknown> | undefined
-  if (job?.delivery && typeof job.delivery === 'object') {
-    apply(job.delivery as CronDelivery)
-    newParams.sessionKey = sk
-    return newParams
-  }
-
-  return null
-}
-
-export function cronToolCall(event: { toolName: any; params: any; toolCallId: any }, sk: string) {
-  const { toolName, params, toolCallId } = event
-
-  // 仅处理 cron 工具
-  if (isCronTool(toolName)) {
-    const delivery = extractDelivery(params)
-    if (!delivery) {
-      dcgLogger(`[${LOG_TAG}] cron call (${toolCallId}) has no delivery config, skip.`)
-      return undefined
-    }
-    const newParams = patchCronDeliveryInParams(params, sk, delivery)
-    if (!newParams) {
-      dcgLogger(`[${LOG_TAG}] cron call (${toolCallId}) could not locate delivery on params clone, skip.`)
-      return undefined
-    }
-
-    const patched = newParams.delivery ?? (newParams.job as Record<string, unknown>)?.delivery
-    if (needsBestEffort(delivery)) {
-      dcgLogger(
-        `[${LOG_TAG}] cron call (${toolCallId}) patched delivery (announce, no channel): bestEffort=true, ` +
-          `delivery=${JSON.stringify(patched)}`
-      )
-    } else {
-      dcgLogger(
-        `[${LOG_TAG}] cron call (${toolCallId}) patched delivery.to / accountId (sessionKey=${sk}), ` +
-          `delivery=${JSON.stringify(patched)}`
-      )
-    }
-
-    return { params: newParams }
-  } else if (toolName === 'exec') {
-    if (params.command.indexOf('cron create') > -1 || params.command.indexOf('cron add') > -1) {
-      const newParams = JSON.parse(JSON.stringify(params)) as Record<string, unknown>
-      newParams.command =
-        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${"dcgchat-test"}  --to dcg-cron:${sk} --json`
-      return { params: newParams }
-    } else {
-      return undefined
-    }
-  }
-
-  return undefined
-}

package/src/gateway/cronFinishedPayload.ts

@@ -1,118 +0,0 @@
-/**
- * 与 `schemas/gateway-cron-finished.payload.json` 对齐：`attachments` 为首选。
- * 若宿主未下发 `attachments`（当前 Gateway 常见情况），则仅在 `summary` 中按工作区规则提取路径（见 `resolveCronFinishedLocalPaths`），仍经 `sendDcgchatMedia` 发送。
- */
-
-import {
-  expandTildePath,
-  extractWorkspaceFilePathsFromText,
-  isAllowedSendPath,
-  trimArtifactPathCandidate
-} from '../utils/workspaceFilePaths.js'
-
-export type CronFinishedAttachmentItem = string | { path?: string; file?: string }
-
-/** 网关 `event: "cron"` 且 `action === "finished"` 时插件消费的 payload 子集 */
-export type CronGatewayFinishedPayload = {
-  jobId?: string
-  action?: string
-  status?: string
-  summary?: string
-  delivered?: boolean
-  deliveryStatus?: string
-  sessionId?: string
-  sessionKey?: string
-  attachments?: CronFinishedAttachmentItem[]
-}
-
-/** JSON Schema 中 `attachments` 数组片段（便于在代码里引用、与仓库内 JSON 文件保持语义一致） */
-export const CRON_FINISHED_ATTACHMENTS_ITEMS_SCHEMA = {
-  type: 'array',
-  description: '本轮定时任务产出的本地文件路径，按顺序经通道发送为附件',
-  items: {
-    oneOf: [
-      { type: 'string', minLength: 1, description: '绝对路径' },
-      {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-          path: { type: 'string', minLength: 1 },
-          file: { type: 'string', minLength: 1 }
-        },
-        description: '优先 path，否则 file'
-      }
-    ]
-  }
-} as const
-
-function pushAttachmentItem(item: unknown, out: string[]): void {
-  if (typeof item === 'string') {
-    const s = item.trim()
-    if (s) out.push(s)
-    return
-  }
-  if (item && typeof item === 'object') {
-    const o = item as Record<string, unknown>
-    const p = typeof o.path === 'string' ? o.path.trim() : ''
-    const f = typeof o.file === 'string' ? o.file.trim() : ''
-    const s = p || f
-    if (s) out.push(s)
-  }
-}
-
-/**
- * 从网关 payload 取出 `attachments` 中的路径字符串（去重保序）。
- * 不解析 `summary`、不扫描 Markdown。
- */
-export function normalizeCronFinishedAttachmentPaths(payload: unknown): string[] {
-  if (payload == null || typeof payload !== 'object') return []
-  const p = payload as CronGatewayFinishedPayload
-  const raw = p.attachments
-  if (!Array.isArray(raw)) return []
-  const acc: string[] = []
-  for (const item of raw) {
-    pushAttachmentItem(item, acc)
-  }
-  const seen = new Set<string>()
-  const deduped: string[] = []
-  for (const s of acc) {
-    if (seen.has(s)) continue
-    seen.add(s)
-    deduped.push(s)
-  }
-  return deduped
-}
-
-function dedupePaths(paths: string[]): string[] {
-  const seen = new Set<string>()
-  const out: string[] = []
-  for (const s of paths) {
-    if (!s || seen.has(s)) continue
-    seen.add(s)
-    out.push(s)
-  }
-  return out
-}
-
-/**
- * 解析本轮待经通道发送的本地路径：优先 `payload.attachments`；
- * 若为空则用 `summary` 与 `extractWorkspaceFilePathsFromText` 一致的工作区/挂载规则提取（非任意全文扫描）。
- */
-export function resolveCronFinishedLocalPaths(
-  payload: unknown,
-  summary: string | undefined,
-  workspaceDir: string,
-  allowedPaths?: string[]
-): string[] {
-  const fromSchema = normalizeCronFinishedAttachmentPaths(payload)
-    .map((s) => expandTildePath(trimArtifactPathCandidate(s)))
-    .filter(Boolean)
-  const schemaOk = fromSchema.filter((p: string) => isAllowedSendPath(p, workspaceDir, allowedPaths))
-  if (schemaOk.length > 0) {
-    return dedupePaths(schemaOk)
-  }
-  const fromSummary = extractWorkspaceFilePathsFromText(summary, workspaceDir).filter((p: string) =>
-    isAllowedSendPath(p, workspaceDir, allowedPaths)
-  )
-  return dedupePaths(fromSummary)
-}