agentworkshop 0.8.6 → 0.8.8

package/app/composables/workshop/useOpsLog.ts

@@ -1,191 +1,191 @@
-/**
- * useOpsLog —— 运维日志(全操作统一记录)的前端单一消费口。
- *
- * 数据权威在 server:audit_log(SQLite)经 GET /api/workshop/ops-logs 按维度查询
- * (产线/产品/Recipe/来源/分类/关键词/时间区间);POST 手动录入人工事件。
- * 实时:WS ops.log 帧经 townBus 旁路 → recent 环形缓冲(实时事件轨只渲染摘要,
- * 详情由 /logs 日志管理页查询),globalThis 单例防重复订阅。
- */
-import { reactive } from 'vue'
-import { useTownBus } from './useTownBus'
-import { apiFetch } from './apiClient'
-import type { AepEnvelope, AepOpsLog } from '#shared/workshop-protocol'
-
-/** 实时事件轨容量(仅摘要;历史完整查询走 REST) */
-const RECENT_CAP = 40
-
-/** audit_log 行投影(REST 返回) */
-export interface OpsLogRow {
-  id: number
-  actor: string
-  actorName: string
-  actorKind: 'user' | 'agent' | 'system'
-  action: string
-  targetKind: string
-  targetId: string
-  detailJson: string
-  at: string
-  lineId: string
-  productId: string
-  recipeId: string
-  kind: string
-  summary: string
-  /** 显式域标识:line=产线日志 / system=全局审计(旧服务缺省时按 lineId 推导) */
-  scope: 'line' | 'system'
-  /** 严重级(2026-10-08 ACK 鉴定):error 红 / warn 黄;历史行/实时帧缺省 info */
-  level?: 'info' | 'warn' | 'error'
-}
-
-export interface OpsLogQuery {
-  lineId?: string
-  productId?: string
-  recipeId?: string
-  actorKind?: string
-  kind?: string
-  level?: string
-  q?: string
-  from?: string
-  to?: string
-  limit?: number
-}
-
-const api = <T>(path: string, init?: RequestInit): Promise<T> =>
-  apiFetch<T>({ base: '/api/workshop/ops-logs', path, init })
-
-function ingestFrame(p: AepOpsLog): OpsLogRow {
-  return {
-    id: 0,
-    actor: p.actor,
-    actorName: p.actorName || p.actor,
-    actorKind: p.actorKind,
-    action: p.action,
-    targetKind: p.targetKind,
-    targetId: p.targetId,
-    detailJson: '',
-    at: p.at,
-    lineId: p.lineId,
-    productId: p.productId,
-    recipeId: p.recipeId,
-    kind: p.kind,
-    summary: p.summary,
-    scope: p.scope ?? (p.lineId ? 'line' : 'system'),
-    level: p.level,
-  }
-}
-
-const createStore = () => {
-  /** 实时事件轨(WS 直推;新→旧) */
-  const recent = reactive<OpsLogRow[]>([])
-  /** 查询结果(REST 快照;/logs 页与实时轨互不干扰) */
-  const results = reactive<OpsLogRow[]>([])
-  const loading = reactive({ list: false, posting: false })
-  const error = reactive({ list: '', post: '' })
-
-  /** 挂 WS 帧(townBus)。引用计数(同 useDaqStream):归零才退订。 */
-  let feedConsumers = 0
-  let feedUnsub: (() => void) | null = null
-  function ensureLive(): () => void {
-    feedConsumers++
-    if (feedConsumers === 1) {
-      void seedRecent()
-      feedUnsub = useTownBus().subscribe(handler)
-    }
-    let done = false
-    return () => {
-      if (done) return
-      done = true
-      if (--feedConsumers === 0) {
-        feedUnsub?.()
-        feedUnsub = null
-      }
-    }
-  }
-
-  function handler(e: AepEnvelope) {
-    if (e.type === 'ops.log') {
-      const row = ingestFrame(e.payload as AepOpsLog)
-      // 产线日志实时轨:服务端只广播 scope=line;客户端再兜一层,防旧版本/旁路污染
-      if (row.scope !== 'line' || !row.lineId) return
-      if (!recent.some(r => r.at === row.at && r.actor === row.actor && r.action === row.action)) {
-        recent.unshift(row)
-        if (recent.length > RECENT_CAP) recent.splice(RECENT_CAP)
-      }
-    }
-  }
-
-  /** 旧服务/旧行缺 scope 时按 lineId 推导,保证前端行类型稳定 */
-  const withScope = (r: OpsLogRow): OpsLogRow => ({ ...r, scope: r.scope ?? (r.lineId ? 'line' : 'system') })
-
-  /** 首屏预填:最近 15 条历史摘要(实时轨不必从零等事件) */
-  async function seedRecent(): Promise<void> {
-    try {
-      const data = await api<{ logs: OpsLogRow[] }>('?limit=15')
-      for (const raw of (data.logs ?? []).reverse()) {
-        const row = withScope(raw)
-        if (row.scope !== 'line') continue
-        if (!recent.some(r => r.at === row.at && r.actor === row.actor && r.action === row.action))
-          recent.unshift(row)
-      }
-    }
-    catch {
-      // 预取失败不阻塞实时轨(下一帧事件照常入列)
-    }
-  }
-
-  async function fetchLogs(query: OpsLogQuery = {}): Promise<void> {
-    loading.list = true
-    error.list = ''
-    try {
-      const qs = new URLSearchParams()
-      for (const [k, v] of Object.entries(query)) {
-        if (v != null && v !== '') qs.set(k, String(v))
-      }
-      const data = await api<{ logs: OpsLogRow[], count: number }>(`?${qs.toString()}`)
-      results.splice(0, results.length, ...(data.logs ?? []).map(withScope))
-    }
-    catch (err) {
-      error.list = apiErrorMessage(err)
-    }
-    finally {
-      loading.list = false
-    }
-  }
-
-  /** 人工手动记录事件(值班/处置/备注;与自动操作同一流水) */
-  async function postManual(input: { summary: string, lineId?: string, productId?: string, recipeId?: string, detail?: Record<string, unknown> }): Promise<void> {
-    loading.posting = true
-    error.post = ''
-    try {
-      await api('', { method: 'POST', body: JSON.stringify(input) })
-    }
-    catch (err) {
-      error.post = apiErrorMessage(err)
-      throw err
-    }
-    finally {
-      loading.posting = false
-    }
-  }
-
-  const store = reactive({
-    recent,
-    results,
-    loading,
-    error,
-    ensureLive,
-    fetchLogs,
-    postManual,
-  })
-  return store
-}
-
-type OpsLogStore = ReturnType<typeof createStore>
-
-const GLOBAL_KEY = '__opsLogStream'
-
-/** 单例(globalThis 挂载;跨组件/跨页面安全) */
-export function useOpsLog(): OpsLogStore {
-  const g = globalThis as typeof globalThis & Record<string, unknown>
-  if (!g[GLOBAL_KEY]) g[GLOBAL_KEY] = createStore()
-  return g[GLOBAL_KEY] as OpsLogStore
-}
+/**
+ * useOpsLog —— 运维日志(全操作统一记录)的前端单一消费口。
+ *
+ * 数据权威在 server:audit_log(SQLite)经 GET /api/workshop/ops-logs 按维度查询
+ * (产线/产品/Recipe/来源/分类/关键词/时间区间);POST 手动录入人工事件。
+ * 实时:WS ops.log 帧经 townBus 旁路 → recent 环形缓冲(实时事件轨只渲染摘要,
+ * 详情由 /logs 日志管理页查询),globalThis 单例防重复订阅。
+ */
+import { reactive } from 'vue'
+import { useTownBus } from './useTownBus'
+import { apiFetch } from './apiClient'
+import type { AepEnvelope, AepOpsLog } from '#shared/workshop-protocol'
+
+/** 实时事件轨容量(仅摘要;历史完整查询走 REST) */
+const RECENT_CAP = 40
+
+/** audit_log 行投影(REST 返回) */
+export interface OpsLogRow {
+  id: number
+  actor: string
+  actorName: string
+  actorKind: 'user' | 'agent' | 'system'
+  action: string
+  targetKind: string
+  targetId: string
+  detailJson: string
+  at: string
+  lineId: string
+  productId: string
+  recipeId: string
+  kind: string
+  summary: string
+  /** 显式域标识:line=产线日志 / system=全局审计(旧服务缺省时按 lineId 推导) */
+  scope: 'line' | 'system'
+  /** 严重级(2026-10-08 ACK 鉴定):error 红 / warn 黄;历史行/实时帧缺省 info */
+  level?: 'info' | 'warn' | 'error'
+}
+
+export interface OpsLogQuery {
+  lineId?: string
+  productId?: string
+  recipeId?: string
+  actorKind?: string
+  kind?: string
+  level?: string
+  q?: string
+  from?: string
+  to?: string
+  limit?: number
+}
+
+const api = <T>(path: string, init?: RequestInit): Promise<T> =>
+  apiFetch<T>({ base: '/api/workshop/ops-logs', path, init })
+
+function ingestFrame(p: AepOpsLog): OpsLogRow {
+  return {
+    id: 0,
+    actor: p.actor,
+    actorName: p.actorName || p.actor,
+    actorKind: p.actorKind,
+    action: p.action,
+    targetKind: p.targetKind,
+    targetId: p.targetId,
+    detailJson: '',
+    at: p.at,
+    lineId: p.lineId,
+    productId: p.productId,
+    recipeId: p.recipeId,
+    kind: p.kind,
+    summary: p.summary,
+    scope: p.scope ?? (p.lineId ? 'line' : 'system'),
+    level: p.level,
+  }
+}
+
+const createStore = () => {
+  /** 实时事件轨(WS 直推;新→旧) */
+  const recent = reactive<OpsLogRow[]>([])
+  /** 查询结果(REST 快照;/logs 页与实时轨互不干扰) */
+  const results = reactive<OpsLogRow[]>([])
+  const loading = reactive({ list: false, posting: false })
+  const error = reactive({ list: '', post: '' })
+
+  /** 挂 WS 帧(townBus)。引用计数(同 useDaqStream):归零才退订。 */
+  let feedConsumers = 0
+  let feedUnsub: (() => void) | null = null
+  function ensureLive(): () => void {
+    feedConsumers++
+    if (feedConsumers === 1) {
+      void seedRecent()
+      feedUnsub = useTownBus().subscribe(handler)
+    }
+    let done = false
+    return () => {
+      if (done) return
+      done = true
+      if (--feedConsumers === 0) {
+        feedUnsub?.()
+        feedUnsub = null
+      }
+    }
+  }
+
+  function handler(e: AepEnvelope) {
+    if (e.type === 'ops.log') {
+      const row = ingestFrame(e.payload as AepOpsLog)
+      // 产线日志实时轨:服务端只广播 scope=line;客户端再兜一层,防旧版本/旁路污染
+      if (row.scope !== 'line' || !row.lineId) return
+      if (!recent.some(r => r.at === row.at && r.actor === row.actor && r.action === row.action)) {
+        recent.unshift(row)
+        if (recent.length > RECENT_CAP) recent.splice(RECENT_CAP)
+      }
+    }
+  }
+
+  /** 旧服务/旧行缺 scope 时按 lineId 推导,保证前端行类型稳定 */
+  const withScope = (r: OpsLogRow): OpsLogRow => ({ ...r, scope: r.scope ?? (r.lineId ? 'line' : 'system') })
+
+  /** 首屏预填:最近 15 条历史摘要(实时轨不必从零等事件) */
+  async function seedRecent(): Promise<void> {
+    try {
+      const data = await api<{ logs: OpsLogRow[] }>('?limit=15')
+      for (const raw of (data.logs ?? []).reverse()) {
+        const row = withScope(raw)
+        if (row.scope !== 'line') continue
+        if (!recent.some(r => r.at === row.at && r.actor === row.actor && r.action === row.action))
+          recent.unshift(row)
+      }
+    }
+    catch {
+      // 预取失败不阻塞实时轨(下一帧事件照常入列)
+    }
+  }
+
+  async function fetchLogs(query: OpsLogQuery = {}): Promise<void> {
+    loading.list = true
+    error.list = ''
+    try {
+      const qs = new URLSearchParams()
+      for (const [k, v] of Object.entries(query)) {
+        if (v != null && v !== '') qs.set(k, String(v))
+      }
+      const data = await api<{ logs: OpsLogRow[], count: number }>(`?${qs.toString()}`)
+      results.splice(0, results.length, ...(data.logs ?? []).map(withScope))
+    }
+    catch (err) {
+      error.list = apiErrorMessage(err)
+    }
+    finally {
+      loading.list = false
+    }
+  }
+
+  /** 人工手动记录事件(值班/处置/备注;与自动操作同一流水) */
+  async function postManual(input: { summary: string, lineId?: string, productId?: string, recipeId?: string, detail?: Record<string, unknown>, level?: 'info' | 'warn' | 'error' }): Promise<void> {
+    loading.posting = true
+    error.post = ''
+    try {
+      await api('', { method: 'POST', body: JSON.stringify(input) })
+    }
+    catch (err) {
+      error.post = apiErrorMessage(err)
+      throw err
+    }
+    finally {
+      loading.posting = false
+    }
+  }
+
+  const store = reactive({
+    recent,
+    results,
+    loading,
+    error,
+    ensureLive,
+    fetchLogs,
+    postManual,
+  })
+  return store
+}
+
+type OpsLogStore = ReturnType<typeof createStore>
+
+const GLOBAL_KEY = '__opsLogStream'
+
+/** 单例(globalThis 挂载;跨组件/跨页面安全) */
+export function useOpsLog(): OpsLogStore {
+  const g = globalThis as typeof globalThis & Record<string, unknown>
+  if (!g[GLOBAL_KEY]) g[GLOBAL_KEY] = createStore()
+  return g[GLOBAL_KEY] as OpsLogStore
+}

package/app/config/schema.ts

@@ -68,6 +68,10 @@ export const appConfigSchema = z.object({
       user: z.string().default('postgres'),
       password: z.string().default('awshop'),
       database: z.string().default('awshop'),
+      /** 连接池上限(写入攒批 + 并发查询共用) */
+      poolMax: z.number().int().min(1).max(32).default(8),
+      /** 单条 SQL 超时(ms),防异常查询长期占用连接 */
+      statementTimeoutMs: z.number().int().min(1000).max(300000).default(30000),
     }),
     // 对象存储(v2 帧管线:图像帧像素;MinIO S3 兼容。不可达 → 本地磁盘降级,采集不中断)
     objectstore: z.object({
@@ -78,8 +82,18 @@ export const appConfigSchema = z.object({
       bucket: z.string().default('daq'),
     }).optional(),
     // 保留策略(legacy DAQ_TS_RETENTION_H / DAQ_FRAME_RETENTION_H)
-    tsRetentionH: z.number().int().min(1).max(8760).default(168),
+    // raw 样本 30 天 → 1m 聚合 1 年 → 1h 聚合永久(0 = 永久)
+    tsRetentionH: z.number().int().min(1).max(87600).default(720),
     frameRetentionH: z.number().int().min(1).max(8760).default(720),
+    rollup: z.object({
+      enabled: z.boolean().default(true),
+      intervalMs: z.number().int().min(60000).max(86400000).default(600000),
+      lagMs: z.number().int().min(60000).max(3600000).default(300000),
+      windowMs: z.number().int().min(60000).max(86400000).default(3600000),
+      maxWindowsPerRun: z.number().int().min(1).max(512).default(24),
+      minuteRetentionH: z.number().int().min(1).max(87600).default(8760),
+      hourRetentionH: z.number().int().min(0).max(87600).default(0),
+    }).default({}),
     // 导出护栏(设置化;硬上限在 server/services/workshop/daq/export-limits.ts 再钳一次)
     export: z.object({
       pagesPerNode: z.number().int().min(1).max(2000).default(400),

package/app/pages/logs/composables/useLogsManual.ts

@@ -1,68 +1,71 @@
-/**
- * 人工记录(值班/处置/备注)弹窗的开合与提交。
- *
- * 草稿由弹窗组件持有(打开时按筛选口径重置),这里只保留「开合 + 提交」两个动作:
- * 成功后立即重查一次(人工事件与自动操作同一流水,必须立刻出现在结果表里)、关窗、提示;
- * 失败由 useOpsLog.error.post 承载(弹窗保持打开,输入不丢),同时弹一条全局错误提示。
- */
-import { ref } from 'vue'
-import { message } from 'ant-design-vue'
-import { useOpsLog } from '@/app/composables/workshop/useOpsLog'
-
-/** 人工记录草稿(弹窗内编辑;提交时按需折叠成 detail.note) */
-export interface LogsManualDraft {
-  summary: string
-  detail: string
-  lineId: string
-  productId: string
-  recipeId: string
-}
-
-/** 人工记录的归属口径(打开弹窗时 = 筛选区当前维度) */
-export interface LogsManualScope {
-  lineId: string
-  productId: string
-  recipeId: string
-}
-
-export interface LogsManualDeps {
-  /** 提交成功后的重查(页面接 useLogsQuery 的 doQuery) */
-  onPosted: () => void
-}
-
-export function useLogsManual(deps: LogsManualDeps) {
-  const opsLog = useOpsLog()
-  const { t: tt } = useI18n()
-
-  const manualOpen = ref(false)
-
-  function openManual(): void {
-    manualOpen.value = true
-  }
-
-  async function submitManual(draft: LogsManualDraft): Promise<void> {
-    // 产线日志只接收带产线归属的记录;少这一维会落成全局审计,用户在日志页看不到
-    if (!draft.lineId.trim()) {
-      message.error(tt('logs.mLineRequired'))
-      return
-    }
-    try {
-      const note = draft.detail.trim()
-      await opsLog.postManual({
-        summary: draft.summary.trim(),
-        lineId: draft.lineId,
-        productId: draft.productId,
-        recipeId: draft.recipeId,
-        ...(note ? { detail: { note } } : {}),
-      })
-      message.success(tt('logs.mOk'))
-      manualOpen.value = false
-      deps.onPosted()
-    }
-    catch (err) {
-      message.error(apiErrorMessage(err))
-    }
-  }
-
-  return { manualOpen, openManual, submitManual }
-}
+/**
+ * 人工记录(值班/处置/备注)弹窗的开合与提交。
+ *
+ * 草稿由弹窗组件持有(打开时按筛选口径重置),这里只保留「开合 + 提交」两个动作:
+ * 成功后立即重查一次(人工事件与自动操作同一流水,必须立刻出现在结果表里)、关窗、提示;
+ * 失败由 useOpsLog.error.post 承载(弹窗保持打开,输入不丢),同时弹一条全局错误提示。
+ */
+import { ref } from 'vue'
+import { message } from 'ant-design-vue'
+import { useOpsLog } from '@/app/composables/workshop/useOpsLog'
+
+/** 人工记录草稿(弹窗内编辑;提交时按需折叠成 detail.note) */
+export interface LogsManualDraft {
+  summary: string
+  detail: string
+  lineId: string
+  productId: string
+  recipeId: string
+  /** 严重级(2026-10-29):值班上报异常选 warn/error,与自动 error-ledger 同一口径 */
+  level: 'info' | 'warn' | 'error'
+}
+
+/** 人工记录的归属口径(打开弹窗时 = 筛选区当前维度) */
+export interface LogsManualScope {
+  lineId: string
+  productId: string
+  recipeId: string
+}
+
+export interface LogsManualDeps {
+  /** 提交成功后的重查(页面接 useLogsQuery 的 doQuery) */
+  onPosted: () => void
+}
+
+export function useLogsManual(deps: LogsManualDeps) {
+  const opsLog = useOpsLog()
+  const { t: tt } = useI18n()
+
+  const manualOpen = ref(false)
+
+  function openManual(): void {
+    manualOpen.value = true
+  }
+
+  async function submitManual(draft: LogsManualDraft): Promise<void> {
+    // 产线日志只接收带产线归属的记录;少这一维会落成全局审计,用户在日志页看不到
+    if (!draft.lineId.trim()) {
+      message.error(tt('logs.mLineRequired'))
+      return
+    }
+    try {
+      const note = draft.detail.trim()
+      await opsLog.postManual({
+        summary: draft.summary.trim(),
+        lineId: draft.lineId,
+        productId: draft.productId,
+        recipeId: draft.recipeId,
+        level: draft.level,
+        ...(note ? { detail: { note } } : {}),
+      })
+      message.success(tt('logs.mOk'))
+      manualOpen.value = false
+      deps.onPosted()
+    }
+    catch (err) {
+      message.error(apiErrorMessage(err))
+    }
+  }
+
+  return { manualOpen, openManual, submitManual }
+}

package/app/pages/logs/index.vue

@@ -1,9 +1,15 @@
 <template>
   <div class="page">
-    <!-- 页头(aw-page-head 规范:kicker + 大标题 + 描述)+ 手动记录入口 -->
+    <!-- 页头(kicker + 大标题 + 描述)+ 实时轨计数 + 错误/告警快捷筛选 + 导出 + 手动记录入口 -->
     <LogsPageHead
       :recent-count="opsLog.recent.length"
+      :error-count="liveErrorCount"
+      :warn-count="liveWarnCount"
+      :active-level="q.level"
+      :can-export="opsLog.results.length > 0"
       @manual="openManual"
+      @quick="quickLevel"
+      @export="exportCsv"
     />
 
     <!-- 维度筛选:产线 → 产品 → Recipe 级联 + 来源/分类/严重级/关键词 -->
@@ -80,6 +86,33 @@ const manualScope = computed<LogsManualScope>(() => ({
   recipeId: q.recipeId,
 }))
 
+/** 实时轨的 error/warn 计数(页头快捷 chip 的数字;环形缓冲容量内) */
+const liveErrorCount = computed(() => opsLog.recent.filter(r => r.level === 'error').length)
+const liveWarnCount = computed(() => opsLog.recent.filter(r => r.level === 'warn').length)
+
+/** 快捷级别筛选:点 error/warn chip 即设 level 并重查;再次点同级 = 取消 */
+function quickLevel(level: string): void {
+  q.level = q.level === level ? '' : level
+  doQuery()
+}
+
+/** 当前快照导出 CSV(事故报告/工单附件;客户端生成,不落服务端状态) */
+function exportCsv(): void {
+  const esc = (v: unknown) => `"${String(v ?? '').replace(/"/g, '""').replace(/\r?\n/g, ' ')}"`
+  const header = ['id', 'at', 'level', 'scope', 'actorKind', 'actorName', 'kind', 'action', 'summary', 'lineId', 'productId', 'recipeId']
+  const lines = [header.join(',')]
+  for (const r of opsLog.results as Array<Record<string, unknown>>) {
+    lines.push(header.map(k => esc(r[k])).join(','))
+  }
+  const blob = new Blob(['\uFEFF' + lines.join('\n')], { type: 'text/csv;charset=utf-8' })
+  const url = URL.createObjectURL(blob)
+  const a = document.createElement('a')
+  a.href = url
+  a.download = `ops-logs-${new Date().toISOString().slice(0, 19).replace(/[:T]/g, '-')}.csv`
+  a.click()
+  URL.revokeObjectURL(url)
+}
+
 onMounted(() => {
   ws.ensureConnected()
   opsLog.ensureLive()