@hedeqiang/dsh-nl2sql 0.13.0 → 0.14.0

package/service/query.js

@@ -9,7 +9,7 @@ import { admitSql, prepareSql, stripSql } from '../sql-guard.js'
 import { cacheKey } from '../store.js'
 import { createHash } from 'node:crypto'
 import { writeXlsx } from '../xlsx.js'
-import { RESULT_CACHE_LIMIT, SENSITIVE_NAME, UserError, columnKind, fillChartHint, fmtNum, maskValue, newId, normalizeChart, suggestChart, summarize } from './shared.js'
+import { RESULT_CACHE_LIMIT, SENSITIVE_NAME, UserError, callContext, columnKind, fillChartHint, fmtNum, maskValue, newId, normalizeChart, suggestChart, summarize } from './shared.js'
 
 export const methods = {
   // ---------------------------------------------------------------- query
@@ -36,6 +36,7 @@ export const methods = {
       await this.save()
       throw new UserError('nl2sql/access-denied', denied)
     }
+    callContext.getStore()?.phase?.('admitted', { datasource: ds.name, title })
     let appliedFilters = []
     if (filters?.length) {
       let f
@@ -108,15 +109,22 @@ export const methods = {
       }
     }
     const started = Date.now()
+    // Optional per-call context (MCP tools/call): progress phases and cancellation.
+    const call = callContext.getStore()
+    call?.phase?.('running', { datasource: ds.name, title })
     let res
     try {
-      res = await this.withDriver(ds, d => d.query(prepared, { timeoutMs: settings.timeoutMs, maxRows: settings.maxRows }))
+      if (call?.signal?.aborted) throw new UserError('query/cancelled', '查询已取消')
+      res = await this.withDriver(ds, d => d.query(prepared, { timeoutMs: settings.timeoutMs, maxRows: settings.maxRows, ...(call?.signal ? { signal: call.signal } : {}) }))
+      if (call?.signal?.aborted) throw new UserError('query/cancelled', '查询已取消')
     } catch (error) {
-      this.audit({ ds, sessionId, source, sql: admitted.sql, title, status: 'error', error: error.message, elapsedMs: Date.now() - started, actor })
+      const cancelled = error.code === 'query/cancelled' || call?.signal?.aborted
+      this.audit({ ds, sessionId, source, sql: admitted.sql, title, status: cancelled ? 'cancelled' : 'error', error: cancelled ? 'cancelled by the client' : error.message, elapsedMs: Date.now() - started, actor })
       await this.save()
       throw error
     }
     const elapsedMs = Date.now() - started
+    call?.phase?.('fetched', { datasource: ds.name, title, rows: Math.min(res.rows.length, settings.maxRows) })
     const truncated = res.rows.length > settings.maxRows
     let cells = truncated ? res.rows.slice(0, settings.maxRows) : res.rows
     const schema = fullSchema

package/service/shared.js

@@ -4,7 +4,13 @@
 import { createHash, randomBytes } from 'node:crypto'
 import { DIALECTS, describeError } from '../drivers.js'
 import { sqliteDialectHints } from '../sqlite-driver.js'
+import { AsyncLocalStorage } from 'node:async_hooks'
 
+/**
+ * Per-call context for long requests (MCP tools/call): { signal?: AbortSignal, phase?(name, info) }.
+ * runQuery reports phases and passes the signal to drivers that can cancel a running statement.
+ */
+export const callContext = new AsyncLocalStorage()
 
 export const SUPPORTED_TYPES = Object.keys(DIALECTS)
 
@@ -231,6 +237,9 @@ RECORD_REF.bitableRun = 'syncId'
 // Daily digest runs (service/proactive.js).
 RECORD_LIMITS.digestRun = 1000
 RECORD_REF.digestRun = 'digestId'
+// MCP per-token call log (service/mcp.js): time, method/tool, data source, ms, status, rows.
+RECORD_LIMITS.mcpCall = 5000
+RECORD_REF.mcpCall = 'tokenId'
 
 /**
  * Growing logs (audit history, feedback, push deliveries, alert events, admin