@hedeqiang/dsh-nl2sql 0.12.1 → 0.13.0

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@hedeqiang/dsh-nl2sql",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "Ask MySQL, PostgreSQL, Elasticsearch and CSV/Excel in plain language inside DeepSeek Harness: charts, dashboards, alerts, and IM push and bots for Lark/Feishu, Telegram, WeCom and DingTalk.",
   "type": "module",
+  "bin": {
+    "nl2sql-mcp": "bin/nl2sql-mcp.mjs"
+  },
   "exports": {
     ".": "./index.js",
     "./client": "./lib/client.js",
@@ -10,6 +13,8 @@
     "./icon": "./icon.svg"
   },
   "files": [
+    "bin",
+    "docs/mcp.md",
     "index.js",
     "service/*.js",
     "channels/*.js",

package/service/alerts.js

@@ -6,6 +6,9 @@ import { evaluateAlert } from '../analysis.js'
 import { admitSql } from '../sql-guard.js'
 import { UserError, clampInt, newId, oneOf, requireText, upsert } from './shared.js'
 
+/** Fields written by checks (not by the edit form). */
+const ALERT_RUNTIME = ['state', 'lastCheckedAt', 'lastValue', 'lastResultId', 'lastFiredAt', 'lastError']
+
 export const methods = {
   // ---------------------------------------------------------------- alerts
 
@@ -53,6 +56,10 @@ export const methods = {
 
   async saveAlert(input) {
     const a = await this.normalizeAlert(input)
+    // A check may have finished between normalize and now: keep its runtime fields
+    // (last check / fire time, state) from the stored object, never the stale copy.
+    const current = (this.state.alerts ?? []).find(x => x.id === a.id)
+    if (current) for (const k of ALERT_RUNTIME) { if (current[k] === undefined) delete a[k]; else a[k] = current[k] }
     this.state.alerts = upsert(this.state.alerts ?? [], a)
     await this.save()
     this.scheduleAlerts()
@@ -73,33 +80,37 @@ export const methods = {
 
   /** Evaluate an unsaved alert definition (form "dry run"): nothing is stored or pushed. */
   async previewAlert(input) {
-    const tmpId = `preview-${newId('al')}`
-    const saved = this.state.alerts
-    try {
-      const draft = await this.normalizeAlert({ ...input, id: undefined }, tmpId)
-      this.state.alerts = [...(saved ?? []), draft]
-      return await this.checkAlertInner(tmpId, { dryRun: true })
-    } finally {
-      this.state.alerts = saved
-    }
+    // The draft is evaluated on its own: state.alerts is never touched, so concurrent
+    // saves are kept and the draft is never persisted.
+    const draft = await this.normalizeAlert({ ...input, id: undefined }, `preview-${newId('al')}`)
+    return this.checkAlertInner(draft.id, { dryRun: true, draft })
   },
 
-  async checkAlertInner(id, { dryRun = false, force = false } = {}) {
-    const a = (this.state.alerts ?? []).find(x => x.id === id)
-    if (!a) throw new UserError('nl2sql/invalid', '告警不存在')
+  async checkAlertInner(id, { dryRun = false, force = false, draft } = {}) {
+    const found = draft ?? (this.state.alerts ?? []).find(x => x.id === id)
+    if (!found) throw new UserError('nl2sql/invalid', '告警不存在')
+    // Evaluate a snapshot; runtime fields are applied below to the object stored
+    // *after* the query (saveAlert may have replaced it meanwhile).
+    let a = draft ? structuredClone(draft) : { ...found }
     const ds = this.requireDatasource(a.datasourceId)
     let result
+    // Chat-created alerts (service/subscriptions.js) run as their creator, re-resolved now.
+    const actor = a.chatTarget && this.chatAlertActor ? await this.chatAlertActor(a) : undefined
     if (a.source === 'metric') {
       const range = a.grain === 'hour' ? 'last7d' : a.grain === 'month' ? 'thisYear' : a.grain === 'week' ? 'last90d' : 'last30d'
-      result = await this.queryMetric({ datasourceId: ds.id, metric: a.metric, grain: a.grain, range, filters: a.filters, title: `告警 · ${a.name}`, source: 'alert' })
+      result = await this.queryMetric({ datasourceId: ds.id, metric: a.metric, grain: a.grain, range, filters: a.filters, title: `告警 · ${a.name}`, source: 'alert', actor })
     } else {
-      result = await this.runQuery({ sql: a.sql, datasourceId: ds.id, title: `告警 · ${a.name}`, source: 'alert', confirmScan: true })
+      result = await this.runQuery({ sql: a.sql, datasourceId: ds.id, title: `告警 · ${a.name}`, source: 'alert', confirmScan: true, actor })
     }
     // Series: first column = time/category, last numeric column = value.
     const vi = [...result.columns.keys()].reverse().find(i => result.columns[i].kind === 'number')
     const series = vi === undefined ? [] : result.rows.map(r => ({ t: r[0], v: r[vi] === null ? null : Number(r[vi]) }))
     if (a.condition.type !== 'missing' && result.columns.length === 1 && vi === 0) series.splice(0, series.length, ...result.rows.map((r, i) => ({ t: i, v: Number(r[0]) })))
     const ev = evaluateAlert(a.condition, series, { now: Date.now() })
+    if (!draft) {
+      const current = (this.state.alerts ?? []).find(x => x.id === id)
+      if (current) a = current
+    }
     a.lastCheckedAt = Date.now()
     a.lastValue = ev.value ?? null
     a.lastResultId = result.resultId
@@ -111,9 +122,12 @@ export const methods = {
         a.lastFiredAt = Date.now()
         const event = { id: newId('ae'), alertId: a.id, name: a.name, at: Date.now(), value: ev.value ?? null, message: ev.message, resultId: result.resultId }
         this.records.put('alertEvent', event)
-        if (a.channelId) {
+        if (a.channelId || (a.chatTarget && this.deliverAlertToChat)) {
           try {
-            await this.sendToChannel({ channelId: a.channelId, title: `⚠️ 数据告警：${a.name}`, text: `${a.mention ? '<at id=all></at> ' : ''}**${ev.message}**\n\n<font color='grey'>数据源：${ds.name} · 检查时间：${new Date().toLocaleString('zh-CN', { hour12: false })}</font>`, resultIds: [result.resultId], source: 'alert' })
+            // Optional extra Markdown from feature modules (e.g. change attribution, service/proactive.js).
+            const extra = await Promise.resolve(this.beforeAlertPush?.(a, result)).catch(() => null)
+            const msg = { channelId: a.channelId, title: `⚠️ 数据告警：${a.name}`, text: `${a.mention ? '<at id=all></at> ' : ''}**${ev.message}**${extra ? `\n\n${extra}` : ''}\n\n<font color='grey'>数据源：${ds.name} · 检查时间：${new Date().toLocaleString('zh-CN', { hour12: false })}</font>`, resultIds: [result.resultId], source: 'alert' }
+            if (a.chatTarget && this.deliverAlertToChat) await this.deliverAlertToChat(a, msg); else await this.sendToChannel(msg)
             pushed = true
             event.pushed = true
           } catch (error) {
@@ -124,8 +138,9 @@ export const methods = {
       }
     } else if (a.state === 'firing') {
       a.state = 'ok'
-      if (!dryRun && a.channelId && a.notifyRecovery !== false) {
-        try { await this.sendToChannel({ channelId: a.channelId, title: `✅ 告警恢复：${a.name}`, text: ev.message, source: 'alert' }) } catch {}
+      if (!dryRun && (a.channelId || a.chatTarget) && a.notifyRecovery !== false) {
+        const msg = { channelId: a.channelId, title: `✅ 告警恢复：${a.name}`, text: ev.message, source: 'alert' }
+        try { if (a.chatTarget && this.deliverAlertToChat) await this.deliverAlertToChat(a, msg); else await this.sendToChannel(msg) } catch {}
       }
     } else {
       a.state = 'ok'
@@ -163,12 +178,20 @@ export const methods = {
     const last = a.lastCheckedAt ?? 0
     if (a.every === '15m') return last + 15 * 60000
     if (a.every === 'hour') return last + 60 * 60000
-    // daily at HH:MM local time: the most recent slot not yet covered by lastCheckedAt.
+    // daily at HH:MM local wall time: the most recent slot not yet covered by lastCheckedAt.
+    // DST (same rule as the Harness schedule service): a slot that does not exist
+    // that day (spring forward) is skipped; a repeated one (fall back) is the earlier instant.
     const [hh, mm] = String(a.at ?? '09:00').split(':').map(Number)
-    const slot = new Date(now)
-    slot.setHours(hh, mm, 0, 0)
-    if (slot.getTime() > now) slot.setDate(slot.getDate() - 1)
-    return last < slot.getTime() ? slot.getTime() : (() => { const n = new Date(slot); n.setDate(n.getDate() + 1); return n.getTime() })()
+    const today = new Date(now)
+    const slotOn = (offset) => {
+      const d = new Date(today.getFullYear(), today.getMonth(), today.getDate() + offset, hh, mm, 0, 0)
+      return d.getHours() === hh && d.getMinutes() === mm ? d.getTime() : undefined
+    }
+    let prev
+    for (let k = 0; k >= -3 && prev === undefined; k--) { const s = slotOn(k); if (s !== undefined && s <= now) prev = s }
+    if (prev !== undefined && last < prev) return prev
+    for (let k = 0; k <= 3; k++) { const s = slotOn(k); if (s !== undefined && s > now && s > last) return s }
+    return now + 86400000
   },
 
   async withJobLock(key, fn) {
@@ -192,15 +215,26 @@ export const methods = {
             this.checkAlert(a.id),
             new Promise((_, rej) => { const t = setTimeout(() => rej(new Error(`检查超过 ${Math.round(timeoutMs / 1000)} 秒`)), timeoutMs); t.unref?.() }),
           ])
-          a.lastError = undefined
+          // The stored object may have been replaced by an edit meanwhile.
+          const cur = (this.state.alerts ?? []).find(x => x.id === a.id)
+          if (cur) cur.lastError = undefined
           ran.push({ id: a.id, ok: true })
         } catch (error) {
           if (error.code === 'nl2sql/busy') return
-          a.lastError = error.message
-          a.lastCheckedAt = Date.now()
+          const cur = (this.state.alerts ?? []).find(x => x.id === a.id) ?? a
+          cur.lastError = error.message
+          cur.lastCheckedAt = Date.now()
           ran.push({ id: a.id, ok: false, error: error.message })
         }
       }))
+      // Jobs registered by other modules (digest, reconciliation, freshness, quality, goals…):
+      // service.schedulerJobs() returns [{ id, due(now: Date) -> boolean, run() -> Promise }].
+      for (const job of (typeof this.schedulerJobs === 'function' ? this.schedulerJobs(now) : [])) {
+        let isDue = false
+        try { isDue = Boolean(job.due(now)) } catch {}
+        if (!isDue) continue
+        try { await this.withJobLock(`job:${job.id}`, () => job.run()); ran.push({ id: job.id, ok: true }) } catch (error) { if (error.code !== 'nl2sql/busy') ran.push({ id: job.id, ok: false, error: error.message }) }
+      }
       // Daily schema watch (catches up once after downtime).
       const at = this.state.settings.schemaCheckDaily
       if (at) {

package/service/bots.js

@@ -35,6 +35,29 @@ const toast = (type, content) => ({ toast: { type, content } })
 const label = (platform) => PLATFORM_LABEL[platform] ?? platform ?? 'IM'
 const SOURCE = (platform) => `${platform ?? 'im'}bot`
 
+const BARE_COMMANDS = {
+  帮助: 'help', help: 'help', start: 'help',
+  数据源: 'sources', sources: 'sources', datasources: 'sources',
+  自动: 'auto', auto: 'auto',
+  新对话: 'reset', new: 'reset', reset: 'reset',
+}
+
+/**
+ * A bot command, or null for a question. Argument-less commands must be the whole
+ * message (optionally `/`-prefixed, trailing punctuation ignored), so questions like
+ * 「自动续费用户有多少」 reach the agent. `切换` / `切换数据源` / `switch` / `use` take an
+ * argument after whitespace; alone they ask for usage.
+ * → { verb: 'help'|'sources'|'auto'|'reset'|'switch', arg? }
+ */
+export function parseBotCommand(text) {
+  const s = String(text ?? '').trim().replace(/^\//, '').replace(/[\s?？。.!！~～]+$/u, '')
+  const bare = BARE_COMMANDS[s.toLowerCase()]
+  if (bare) return { verb: bare }
+  const m = /^(切换数据源|切换|switch|use)(?:\s+([\s\S]+))?$/i.exec(s)
+  if (m) return { verb: 'switch', arg: (m[2] ?? '').trim() }
+  return null
+}
+
 function hasAggregate(r, dialect) {
   const parsed = parseSelect(r.baseSql ?? r.sql, { dialect })
   return Boolean(parsed?.select?.some(i => i.isAggregate))
@@ -286,8 +309,8 @@ export const methods = {
     if (m.chatType === 'group' && m.chatId) this.noteSeenIdentity({ platform, kind: 'chat', id: String(m.chatId), name: chatName, chatName, channelId: m.channelId, refused: Boolean(resolved.refused) })
     if (resolved.refused) { await this.save(); await reply(resolved.refused); return }
     const actor = resolved.actor
-    // Commands: 帮助 / 数据源 / 切换 <名称> / 新对话
-    const cmd = text.match(/^\/?(帮助|help|数据源|切换数据源|切换|自动|auto|新对话|reset|start)\s*(.*)$/i)
+    // Commands: 帮助 / 数据源 / 切换 <名称> / 自动 / 新对话 (and English aliases).
+    const cmd = parseBotCommand(text)
     // Members with different scopes must not share a conversation: per-user sessions
     // whenever the sender's effective scope or rules differ from the chat's.
     const scopeSig = JSON.stringify([actor.datasourceIds, actor.role, actor.rowRules ?? []])
@@ -301,14 +324,15 @@ export const methods = {
     const allowedDs = this.state.datasources.filter(d => !Array.isArray(actor.datasourceIds) || actor.datasourceIds.includes(d.id))
     if (conv.datasourceId && !allowedDs.some(d => d.id === conv.datasourceId)) conv.datasourceId = allowedDs[0]?.id ?? null
     if (cmd) {
-      const verb = cmd[1].toLowerCase()
-      if (verb === '帮助' || verb === 'help' || verb === 'start') { await reply(`直接${m.chatType === 'group' ? ' @我 ' : ''}提问即可，例如「上周每天的订单量」。\n命令：数据源（查看可用数据源）、切换 <名称>、自动（按问题自动选择数据源）、新对话。\n当前数据源：${this.findDatasource(conv.datasourceId)?.name ?? '未选择'}${conv.datasourcePinned ? '（已指定）' : allowedDs.length > 1 ? '（按问题自动选择）' : ''}${actor.role === 'viewer' ? '\n你是只读成员：可以查询指标库中的指标、已验证的常见问题和看板。' : ''}`); return }
-      if (verb === '数据源') { await reply(`可用数据源：\n${allowedDs.map(d => `· ${d.name}${d.description ? ` — ${d.description}` : ''}`).join('\n') || '无'}\n当前：${this.findDatasource(conv.datasourceId)?.name ?? '未选择'}${conv.datasourcePinned ? '（已指定，发送「自动」恢复按问题自动选择）' : allowedDs.length > 1 ? '（按问题自动选择；发送「切换 <名称>」固定）' : ''}`); return }
-      if (verb === '自动' || verb === 'auto') { delete conv.datasourcePinned; convs[key] = conv; await this.save(); await reply(`已改为按问题自动选择数据源（可用：${allowedDs.map(d => d.name).join('、')}）。`); return }
-      if (verb === '新对话' || verb === 'reset') { conv.sessionId = null; convs[key] = conv; await this.save(); await reply('已开始新对话。'); return }
-      const want = cmd[2].trim().toLowerCase()
-      const target = allowedDs.find(d => d.name.toLowerCase() === want || d.id === cmd[2].trim()) ?? (want ? allowedDs.filter(d => d.name.toLowerCase().includes(want) || (d.database ?? '').toLowerCase() === want) : []).find((_, __, arr) => arr.length === 1)
-      if (!target) { await reply(`找不到可用的数据源「${cmd[2]}」。可用：${allowedDs.map(d => d.name).join('、')}`); return }
+      const { verb } = cmd
+      if (verb === 'help') { await reply(`直接${m.chatType === 'group' ? ' @我 ' : ''}提问即可，例如「上周每天的订单量」。\n命令（单独发送）：\n· 数据源 / sources — 查看可用数据源\n· 切换 <名称> / switch <name> — 固定使用某个数据源\n· 自动 / auto — 按问题自动选择数据源\n· 新对话 / new — 开始新对话\n· 帮助 / help — 显示本说明\n当前数据源：${this.findDatasource(conv.datasourceId)?.name ?? '未选择'}${conv.datasourcePinned ? '（已指定）' : allowedDs.length > 1 ? '（按问题自动选择）' : ''}${actor.role === 'viewer' ? '\n你是只读成员：可以查询指标库中的指标、已验证的常见问题和看板。' : ''}`); return }
+      if (verb === 'sources') { await reply(`可用数据源：\n${allowedDs.map(d => `· ${d.name}${d.description ? ` — ${d.description}` : ''}`).join('\n') || '无'}\n当前：${this.findDatasource(conv.datasourceId)?.name ?? '未选择'}${conv.datasourcePinned ? '（已指定，发送「自动」恢复按问题自动选择）' : allowedDs.length > 1 ? '（按问题自动选择；发送「切换 <名称>」固定）' : ''}`); return }
+      if (verb === 'auto') { delete conv.datasourcePinned; convs[key] = conv; await this.save(); await reply(`已改为按问题自动选择数据源（可用：${allowedDs.map(d => d.name).join('、')}）。`); return }
+      if (verb === 'reset') { conv.sessionId = null; convs[key] = conv; await this.save(); await reply('已开始新对话。'); return }
+      if (!cmd.arg) { await reply(`用法：切换 <数据源名称>（或 switch <name>）。可用：${allowedDs.map(d => d.name).join('、') || '无'}`); return }
+      const want = cmd.arg.toLowerCase()
+      const target = allowedDs.find(d => d.name.toLowerCase() === want || d.id === cmd.arg) ?? allowedDs.filter(d => d.name.toLowerCase().includes(want) || (d.database ?? '').toLowerCase() === want).find((_, __, arr) => arr.length === 1)
+      if (!target) { await reply(`找不到可用的数据源「${cmd.arg}」。可用：${allowedDs.map(d => d.name).join('、')}`); return }
       conv.datasourceId = target.id
       conv.datasourcePinned = true
       if (conv.sessionId) { this.state.sessions[conv.sessionId] = target.id }
@@ -417,7 +441,8 @@ export const methods = {
     for (const d of list) {
       let tables = ''
       try {
-        const schema = this.schemas.get(d.id) ?? await this.readSchemaFile(d.id)
+        // Policy-filtered, like nl2sql_schema: hidden tables never reach the bot prompt.
+        const schema = await this.cachedVisibleSchema(d)
         if (schema?.tables?.length) {
           const rank = { fact: 0, dimension: 1, view: 2, other: 3, log: 4, config: 5 }
           const top = [...schema.tables].sort((a, b) => (rank[a.role] ?? 3) - (rank[b.role] ?? 3) || (b.rows ?? 0) - (a.rows ?? 0)).slice(0, 12)
@@ -475,7 +500,8 @@ export const methods = {
     }
     const waited = await controller.wait({ sessionId: sid, timeoutMs, maxMessages: 1 }, new AbortController().signal)
     const reason = waited?.reason ?? 'idle'
-    if (reason !== 'idle') { try { controller.cancel({ sessionId: sid }) } catch {} }
+    // cancel() is async on DSH controllers: a rejection must not become unhandled.
+    if (reason !== 'idle') void Promise.resolve().then(() => controller.cancel({ sessionId: sid })).catch(() => {})
     const answer = await this.collectTurnByRequest(sid, requestId)
     return { sessionId: sid, reason, ...answer }
   },

package/service/channels.js

@@ -19,6 +19,15 @@ import { UserError, newId, pick, requireText, upsert } from './shared.js'
 const LARK_LEGACY = ['domain', 'appId', 'receiveIdType', 'receiveId']
 const BOT_DEFAULTS = { enabled: false, allowP2p: true, sessionScope: 'chat' }
 
+/** Truncate to `max` UTF-16 units with an ellipsis, without splitting a surrogate pair. */
+export function clip(s, max) {
+  const str = String(s ?? '')
+  if (str.length <= max) return str
+  let cut = max - 1
+  if (/[\uD800-\uDBFF]/.test(str[cut - 1] ?? '')) cut--
+  return `${str.slice(0, cut)}…`
+}
+
 /** ChannelError (or legacy ImError) → UserError with the same code and message. */
 export function channelUserError(error, code) {
   if (!(error instanceof ChannelError || (error?.code && /^(im|channel)\//.test(error.code)))) return error
@@ -172,8 +181,10 @@ export const methods = {
     c.platform = adapter.id
     c.description = String(input.description ?? c.description ?? '').slice(0, 300)
     const { config: configIn, secrets: changed } = splitPayload(input, { ...kind, platform: adapter.id })
-    const stored = existing && !typeChanged ? await this.channelSecrets(existing) : {}
     const keys = secretKeys(kind)
+    // A type change keeps stored secrets whose key the new kind also has (e.g. webhookUrl, token).
+    const stored = existing ? await this.channelSecrets(existing) : {}
+    if (typeChanged) for (const k of Object.keys(stored)) if (!keys.includes(k)) delete stored[k]
     const merged = {}
     for (const k of keys) {
       if (Object.hasOwn(changed, k)) { if (changed[k] !== null) merged[k] = changed[k] } else if (stored[k] !== undefined) merged[k] = stored[k]
@@ -224,9 +235,19 @@ export const methods = {
     await this.stopBot(id)
     this.state.channels = this.state.channels.filter(x => x.id !== id)
     if (c.isDefault && this.state.channels[0]) this.state.channels[0].isDefault = true
-    for (const r of this.state.reports) if (r.channelId === id) delete r.channelId
+    // Drop every reference to the channel: alerts, schema notifications, bot conversations, reports.
+    for (const a of this.state.alerts ?? []) if (a.channelId === id) a.channelId = null
+    if (this.state.settings?.schemaNotifyChannel === id) this.state.settings.schemaNotifyChannel = null
+    for (const [k, conv] of Object.entries(this.state.botConversations ?? {})) if (conv?.channelId === id) delete this.state.botConversations[k]
+    const reports = (this.state.reports ?? []).filter(r => r.channelId === id)
+    for (const r of reports) delete r.channelId
     try { await this.ctx.get('credentials')?.deleteRecord(this.channelSecretKey(id)) } catch {}
     await this.save()
+    // Scheduled report prompts name the channel: rewrite them through the normal report save.
+    for (const r of reports) {
+      if (!r.scheduleId || !this.ctx.get('schedule')) continue
+      try { await this.saveReport({ ...r, channelId: undefined }) } catch (error) { console.warn('nl2sql: cannot update report %s after channel delete: %s', r.id, error.message) }
+    }
     return { deleted: id }
   },
 
@@ -311,10 +332,10 @@ export const methods = {
     const modes = chartModesOf(found.kind)
     const body = text ? String(text).slice(0, 20000) : ''
     const message = {
-      title: requireText(title || resolved[0]?.title || '数据问答', 'title', 100),
+      title: clip(String(title || resolved[0]?.title || '').trim() || '数据问答', 100),
       text: body,
       chartMode: modes.includes(chartMode) ? chartMode : modes.includes(c.chartMode) ? c.chartMode : modes[0],
-      results: resolved.map(r => pick(r, ['title', 'columns', 'rows', 'rowCount', 'truncated', 'chart', 'sql', 'filters', 'error', ...(found.kind.capabilities?.buttons ? ['actions'] : [])])),
+      results: resolved.map(r => ({ ...pick(r, ['title', 'columns', 'rows', 'rowCount', 'truncated', 'chart', 'sql', 'filters', 'error', ...(found.kind.capabilities?.buttons ? ['actions'] : [])]), ...(r.title ? { title: clip(String(r.title), 100) } : {}) })),
       includeSql: Boolean(includeSql),
       mentionAll: mentionAll ?? /<at\s+id\s*=\s*["']?all["']?\s*>/i.test(body),
       ...(template ? { template } : {}),
@@ -328,7 +349,7 @@ export const methods = {
     if (caps.files && wantAttach) {
       const idx = message.results.map((r, i) => (needsAttachment(r, shown) ? i : -1)).filter(i => i >= 0)
       if (idx.length) {
-        const sheets = idx.map(i => ({ name: (message.results[i].title || `结果${i + 1}`).slice(0, 31), columns: message.results[i].columns, rows: message.results[i].rows }))
+        const sheets = idx.map(i => ({ name: message.results[i].title || `结果${i + 1}`, columns: message.results[i].columns, rows: message.results[i].rows }))
         if (includeSql) sheets.push({ name: 'SQL', columns: [{ name: '结果', kind: 'text' }, { name: 'SQL', kind: 'text' }], rows: idx.map(i => [message.results[i].title ?? '', message.results[i].sql ?? '']) })
         const buffer = writeXlsx(sheets, { creator: 'DeepSeek Harness 数据问答' })
         const safe = String(message.title).replace(/[\\/:*?"<>|\s]+/g, '_').slice(0, 60) || '数据'

package/service/dashboards.js

@@ -296,8 +296,11 @@ export const methods = {
   // --------------------------------------------------------- auto overview
 
   /** Build overview widgets for one table from its column roles; runs each query and returns results. */
-  async tableOverview({ datasourceId, table, pin = false }) {
+  async tableOverview({ datasourceId, table, pin = false, actor, sessionId, source = 'ui' }) {
     const ds = this.requireDatasource(datasourceId)
+    // Agent / bot callers run as their actor: scope, row-level rules, viewer limits and audit attribution apply.
+    actor ??= sessionId ? this.actorFor(sessionId) : undefined
+    if (actor) this.assertAccess(actor, ds)
     const schema = await this.visibleSchema(ds)
     const t = schema.tables.find(x => x.name === table)
     if (!t) throw new UserError('nl2sql/unknown-table', `表不存在或无权访问：${table}`)
@@ -305,7 +308,7 @@ export const methods = {
     const results = []
     for (const plan of plans) {
       try {
-        const r = await this.runQuery({ sql: plan.sql, datasourceId: ds.id, title: plan.title, chart: plan.chart, source: 'ui', confirmScan: true })
+        const r = await this.runQuery({ sql: plan.sql, datasourceId: ds.id, sessionId, actor, title: plan.title, chart: plan.chart, source, confirmScan: true })
         results.push(r)
         if (pin) await this.pinWidget({ title: plan.title, sql: plan.sql, datasourceId: ds.id, chart: r.chart, width: plan.width })
       } catch (error) {

package/service/datasources.js

@@ -3,7 +3,7 @@
  * Mixed into the service prototype by index.js; `this` is the service.
  */
 import { DIALECTS, createDriver, describeError } from '../drivers.js'
-import { normalizePolicy, policyActive } from '../policy.js'
+import { filterSchema, normalizePolicy, policyActive } from '../policy.js'
 import { sanitizeTableName } from '../sqlite-driver.js'
 import { join } from 'node:path'
 import { CREDENTIAL_SCOPE, DEFAULT_SETTINGS, RETENTION_MAX, RETENTION_MIN, SUPPORTED_TYPES, UserError, clampInt, newId, oneOf, pick, requireText } from './shared.js'
@@ -308,14 +308,27 @@ export const methods = {
     return current
   },
 
-  async bindSession(sessionId, datasourceId) {
+  /**
+   * The already-analyzed schema (memory or file, no introspection) restricted by the
+   * access policy — the same view nl2sql_schema gives the model. Undefined when not analyzed.
+   */
+  async cachedVisibleSchema(ds) {
+    const schema = this.schemas.get(ds.id) ?? await this.readSchemaFile(ds.id)
+    return schema ? filterSchema(schema, this.policyFor(ds)) : undefined
+  },
+
+  /**
+   * Bind a session to a data source. The page RPC also makes it the page's current data source
+   * (default); agent tools (including bot sessions) pass setCurrent: false so they never move it.
+   */
+  async bindSession(sessionId, datasourceId, { setCurrent = true } = {}) {
     if (!sessionId) throw new UserError('nl2sql/invalid', '缺少会话')
     if (datasourceId === null) {
       delete this.state.sessions[sessionId]
     } else {
       const ds = this.requireDatasource(datasourceId)
       this.state.sessions[sessionId] = ds.id
-      this.state.current = ds.id
+      if (setCurrent) this.state.current = ds.id
     }
     await this.save()
     return this.sessionInfo(sessionId)

package/service/features.js

@@ -0,0 +1,21 @@
+/**
+ * Feature modules. Each entry: { name, methods, rpc?(service), tools?(ctx, service, helpers), start?(ctx, service) }.
+ * - methods: mixed into the service prototype (`this` = service). Methods named `jobs_<name>(now)` return
+ *   scheduler jobs [{ id, due(now), run() }] run by the in-process scheduler (service/alerts.js).
+ * - rpc: page RPC methods; tools: agent tools; start: called after apply (e.g. servers).
+ * New features add a file under service/ and one line here, so they do not edit index.js.
+ */
+import { FEATURE as subscriptions } from './subscriptions.js'
+import { FEATURE as reconcile } from './reconcile.js'
+import { FEATURE as present } from './present.js'
+import { FEATURE as mcp } from './mcp.js'
+import { FEATURE as proactive } from './proactive.js'
+import { FEATURE as freshness } from './freshness.js'
+export const FEATURES = [
+  present,
+  mcp,
+  reconcile,
+  subscriptions,
+  proactive,
+  freshness,
+]