@hedeqiang/dsh-nl2sql 0.11.2 → 0.12.1

package/lib/client.js

@@ -15,6 +15,20 @@ window.__ModuleLoader__.load({
     // ------------------------------------------------------------ locale
 
     const zh = {
+      'mb.pick.people': "从和机器人说过话的人中选择",
+      'mb.pick.chats': "从机器人所在的群中选择",
+      'mb.pick.refresh': "刷新",
+      'mb.pick.noPeople': "还没有人和机器人说过话。先让对方在群里 @机器人 或私聊发一句话（会提示未开通），这里就会出现，点一下即可添加。",
+      'mb.pick.noChats': "还没有可选的群。把机器人拉进群并 @它一次，或确认应用已开通「获取群信息」权限。",
+      'mb.pick.peopleHint': "点选即可自动填入账号 ID 和名称，也可以在下方手动填写。",
+      'mb.pick.chatsHint': "点选群即可自动填入群 ID 和群名；群内所有成员按该群的权限使用。",
+      'mb.pick.via': "来自渠道：{name}",
+      'mb.pick.taken': "已是成员「{name}」",
+      'mb.pick.refused': "曾因未开通被拒绝",
+      'mb.pick.pending': "待开通",
+      'mb.pick.added': "已添加",
+      'mb.pending.title': "有 {n} 个人或群向机器人提问时因未开通被拒绝，点一下即可添加为成员：",
+      'mb.pending.add': "添加",
       'dash.sourceOf': "数据源",
       'dash.sourceMissing': "该图表的数据源已删除，无法刷新",
       'dash.sourceMissingShort': "数据源已删除",
@@ -1018,6 +1032,20 @@ window.__ModuleLoader__.load({
       'error.generic': '操作失败：{message}',
     }
     const en = {
+      'mb.pick.people': "Pick someone who talked to a bot",
+      'mb.pick.chats': "Pick a group the bot is in",
+      'mb.pick.refresh': "Refresh",
+      'mb.pick.noPeople': "Nobody has talked to a bot yet. Ask them to @-mention the bot or DM it once (they will be told they have no access); they then appear here for one-click adding.",
+      'mb.pick.noChats': "No groups to pick yet. Add the bot to a group and @-mention it once, or check the app can read chat info.",
+      'mb.pick.peopleHint': "Picking fills in the account id and name; you can also type them below.",
+      'mb.pick.chatsHint': "Picking fills in the chat id and name; everyone in the group uses its access.",
+      'mb.pick.via': "via channel: {name}",
+      'mb.pick.taken': "already member \"{name}\"",
+      'mb.pick.refused': "was refused (no access)",
+      'mb.pick.pending': "pending",
+      'mb.pick.added': "added",
+      'mb.pending.title': "{n} people or groups were refused by a bot because they are not members. Click to add:",
+      'mb.pending.add': "Add",
       'dash.sourceOf': "Data source",
       'dash.sourceMissing': "This chart's data source was deleted; it cannot refresh",
       'dash.sourceMissingShort': "source deleted",
@@ -1704,8 +1732,10 @@ window.__ModuleLoader__.load({
 .n2s-hist{border:.5px solid var(--n2s-line-2);border-radius:var(--n2s-radius);overflow:hidden;background:var(--dsw-alias-bg-layer-1)}
 .n2s-hist-row{border-bottom:.5px solid var(--n2s-line)}
 .n2s-hist-row:last-child{border-bottom:0}
-.n2s-hist-main{display:grid;grid-template-columns:76px minmax(0,1fr) 150px 84px 20px;align-items:center;gap:14px;width:100%;padding:11px 16px;border:0;background:transparent;color:inherit;font:inherit;text-align:left;cursor:pointer}
-.n2s-hist-main:hover{background:var(--n2s-hover)}
+.n2s-hist-head{display:flex;align-items:center}
+.n2s-hist-head:hover{background:var(--n2s-hover)}
+.n2s-hist-head .n2s-rowdel{flex:none;margin-right:10px}
+.n2s-hist-main{display:grid;grid-template-columns:76px minmax(0,1fr) 150px 84px 20px;align-items:center;gap:14px;flex:1;min-width:0;width:100%;padding:11px 6px 11px 16px;border:0;background:transparent;color:inherit;font:inherit;text-align:left;cursor:pointer}
 .n2s-hist-main:focus-visible{outline:2px solid var(--n2s-accent);outline-offset:-2px}
 .n2s-hist-what{display:grid;gap:2px;min-width:0}
 .n2s-hist-title{font-size:13px;font-weight:500;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
@@ -1937,11 +1967,17 @@ window.__ModuleLoader__.load({
 .n2s-recent-row:hover .n2s-recent-del,.n2s-recent-del:focus-visible,.n2s-hist-row:hover .n2s-rowdel,.n2s-rowdel:focus-visible{opacity:1}
 .n2s-recent-del:hover,.n2s-rowdel:hover{color:var(--n2s-err)}
 @media (hover:none){.n2s-recent-del,.n2s-rowdel{opacity:1}}
-.n2s-hist-row.has-del{position:relative}
-.n2s-rowdel{position:absolute;top:10px;right:40px;z-index:1}
 .n2s-morebtn{display:flex;align-items:center;justify-content:center;gap:6px;width:100%;height:36px;margin-top:6px;border:.5px dashed var(--n2s-line-2);border-radius:var(--n2s-radius-sm);background:transparent;color:var(--n2s-muted);font:inherit;font-size:13px;cursor:pointer}
 .n2s-morebtn:hover{background:var(--n2s-hover);color:var(--dsw-alias-label-primary)}
 .n2s-btn.danger-text{color:var(--n2s-err)}
+/* ---- member identity picker ---- */
+.n2s-pickchips{display:flex;flex-wrap:wrap;gap:6px}
+.n2s-pickchip{display:inline-flex;align-items:center;gap:6px;max-width:100%;height:30px;padding:0 10px;border:.5px solid var(--n2s-line-2);border-radius:999px;background:var(--n2s-surface);color:inherit;font:inherit;font-size:12.5px;cursor:pointer}
+.n2s-pickchip:hover:not(:disabled){background:var(--n2s-hover)}
+.n2s-pickchip[aria-pressed=true]{border-color:var(--n2s-accent);background:var(--n2s-accent-soft,rgba(51,112,255,.08));color:var(--n2s-accent)}
+.n2s-pickchip:disabled{opacity:.55;cursor:default}
+.n2s-pickchip-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:220px}
+.n2s-idpicker{gap:6px}
 /* ---- dashboard v2 ---- */
 .n2s-srcbadge{display:inline-flex;align-items:center;gap:3px;max-width:160px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex:none}
 .n2s-seg.small button{height:26px;padding:0 10px;font-size:12px}
@@ -2122,6 +2158,10 @@ window.__ModuleLoader__.load({
     /** Current UI language ('zh' | 'en'), updated by the page/tool views on render. */
     let uiLang = 'zh'
     // LocaleSnapshot is { active, locales, revision } (dsh-client-locale); older hosts passed a string.
+    /** Join a list for display in the UI language: 「a、b」 / "a, b". */
+    const joinList = (items, sep) => (items ?? []).filter(x => x !== undefined && x !== null && x !== '').join(sep ?? (uiLang === 'zh' ? '、' : ', '))
+    /** Label + colon in the UI language: 「标签：」 / "Label: ". */
+    const colon = (label) => (uiLang === 'zh' ? `${label}：` : `${label}: `)
     const setUiLang = (snapshot) => {
       const id = typeof snapshot === 'string' ? snapshot : (snapshot?.active ?? snapshot?.locale ?? 'zh')
       uiLang = /^zh/i.test(String(id)) ? 'zh' : 'en'
@@ -3306,7 +3346,7 @@ window.__ModuleLoader__.load({
       if (section === 'glossary') list = k.glossary.length ? k.glossary.map(g => item(g.id, h(React.Fragment, null, g.term, g.synonyms?.length ? h('span', { className: 'n2s-muted n2s-small' }, `  ${g.synonyms.join(' / ')}`) : null),
         h('div', null, h('div', null, g.definition), g.sql && h('code', { className: 'n2s-md-code', style: { display: 'inline-block', marginTop: 6 } }, g.sql)), 'glossary', g)) : empty(t('kb.glossaryEmpty'))
       if (section === 'metric') list = k.metrics.length ? k.metrics.map(m => item(m.id, h(React.Fragment, null, m.name, m.unit ? h('span', { className: 'n2s-badge', style: { marginLeft: 6 } }, m.unit) : null),
-        h('div', null, h('div', { className: 'n2s-mono n2s-small' }, `${m.expression}${m.table ? ` FROM ${m.table}` : ''}${m.filter ? ` WHERE ${m.filter}` : ''}`), m.timeColumn && h('div', { className: 'n2s-muted n2s-small' }, `${t('kb.timeColumn')}: ${m.timeColumn}${m.dimensions?.length ? ` · ${t('kb.dimensions')}: ${m.dimensions.join('、')}` : ''}${m.synonyms?.length ? ` · ${t('kb.synonymsLabel')}: ${m.synonyms.join('、')}` : ''}`), m.description && h('div', { className: 'n2s-muted n2s-small' }, m.description)), 'metric', m)) : empty(t('kb.metricsEmpty'))
+        h('div', null, h('div', { className: 'n2s-mono n2s-small' }, `${m.expression}${m.table ? ` FROM ${m.table}` : ''}${m.filter ? ` WHERE ${m.filter}` : ''}`), m.timeColumn && h('div', { className: 'n2s-muted n2s-small' }, `${t('kb.timeColumn')}: ${m.timeColumn}${m.dimensions?.length ? ` · ${t('kb.dimensions')}: ${m.dimensions.join(uiLang === 'zh' ? '、' : ', ')}` : ''}${m.synonyms?.length ? ` · ${t('kb.synonymsLabel')}: ${m.synonyms.join(uiLang === 'zh' ? '、' : ', ')}` : ''}`), m.description && h('div', { className: 'n2s-muted n2s-small' }, m.description)), 'metric', m)) : empty(t('kb.metricsEmpty'))
       if (section === 'note') {
         const entries = Object.entries(k.notes).sort(([a], [b]) => a.localeCompare(b))
         list = h(React.Fragment, null,
@@ -3385,8 +3425,8 @@ window.__ModuleLoader__.load({
         !list.loading && rows.length === 0 && h('div', { className: 'n2s-empty' }, h('h3', null, t('hist.empty')), h('div', null, t('hist.emptyHint'))),
         rows.length > 0 && h('div', { className: 'n2s-hist', role: 'list' }, rows.map(r => {
           const isOpen = open === r.id
-          return h('div', { key: r.id ?? `${r.at}`, className: 'n2s-hist-row has-del', role: 'listitem' },
-            h('button', { type: 'button', className: 'n2s-iconbtn n2s-rowdel', title: t('hist.deleteOne'), 'aria-label': `${t('hist.deleteOne')}: ${r.title || t('hist.untitled')}`, onClick: () => removeRow(r) }, Icon.trash(14)),
+          return h('div', { key: r.id ?? `${r.at}`, className: 'n2s-hist-row', role: 'listitem' },
+            h('div', { className: 'n2s-hist-head' },
             h('button', { type: 'button', className: 'n2s-hist-main', 'aria-expanded': isOpen, onClick: () => setOpen(isOpen ? null : r.id) },
               statusDot(r.status),
               h('span', { className: 'n2s-hist-what' },
@@ -3395,6 +3435,7 @@ window.__ModuleLoader__.load({
               h('span', { className: 'n2s-hist-when' }, h('span', { title: new Date(r.at).toLocaleString() }, rel(r.at)), h('span', { className: 'src' }, `${t(`hist.source.${r.source}`)} · ${r.datasourceName ?? ''}`)),
               h('span', { className: 'n2s-hist-num' }, r.rows !== undefined ? fmt(t, 'result.rows', { count: r.rows }) : '—', h('br'), r.elapsedMs !== undefined ? `${r.elapsedMs} ms` : ''),
               h('span', { className: 'n2s-hist-chev' }, Icon.chev(12))),
+            h('button', { type: 'button', className: 'n2s-iconbtn n2s-rowdel', title: t('hist.deleteOne'), 'aria-label': `${t('hist.deleteOne')}: ${r.title || t('hist.untitled')}`, onClick: () => removeRow(r) }, Icon.trash(14))),
             isOpen && h('div', { className: 'n2s-hist-detail' },
               r.error && h('div', { className: `n2s-notice ${r.status === 'blocked' ? 'warn' : 'err'}` }, r.error),
               h('div', { style: { position: 'relative' } },
@@ -3491,7 +3532,7 @@ window.__ModuleLoader__.load({
           h('span', { className: 'n2s-tile', 'aria-hidden': true }, svg(16, [h('circle', { key: 1, cx: 8, cy: 8, r: 5.5 }), h('path', { key: 2, d: 'M8 5v3.2l2 1.3' })])),
           h('div', { className: 'n2s-grow', style: { minWidth: 0 } },
             h('div', { className: 'n2s-row', style: { gap: 6 } }, h('span', { className: 'n2s-list2-title' }, r.title), r.channelName && h('span', { className: 'n2s-badge' }, Icon.send(11), r.channelName)),
-            h('div', { className: 'n2s-list2-sub' }, `${t(`rep.period.${r.period}`)} ${r.period === 'weekly' ? r.weekdays.map(d => t(`rep.wd.${d}`)).join('、') + ' ' : ''}${r.time.slice(0, 5)} · ${r.datasourceName} · ${r.scope === 'question' ? r.question : t('rep.scope.dashboard')}`)),
+            h('div', { className: 'n2s-list2-sub' }, `${t(`rep.period.${r.period}`)} ${r.period === 'weekly' ? r.weekdays.map(d => t(`rep.wd.${d}`)).join(uiLang === 'zh' ? '、' : ', ') + ' ' : ''}${r.time.slice(0, 5)} · ${r.datasourceName} · ${r.scope === 'question' ? r.question : t('rep.scope.dashboard')}`)),
           h('div', { className: 'n2s-list2-side' },
             statusDot(r.status),
             h('span', { className: 'n2s-faint n2s-small' }, r.scheduledAt && r.status === 'active' ? `${t('rep.next')} ${new Date(r.scheduledAt).toLocaleString([], { month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' })}` : '')),
@@ -3669,7 +3710,7 @@ window.__ModuleLoader__.load({
 
     // ------------------------------------------- channels: catalog & shapes
     // The host may be older (flat Lark-only channels, no channelCatalog /
-    // botStatus RPCs) or newer (docs/CHANNELS.md). Everything below normalizes
+    // botStatus RPCs) or newer (docs/channels.md). Everything below normalizes
     // both so the pages only deal with { platform, type, config, secretsSet,
     // capabilities, bot }.
 
@@ -4639,7 +4680,7 @@ window.__ModuleLoader__.load({
               h('div', { className: 'n2s-h2', style: { margin: 0 } }, fmt(t, 'dash.count', { count: widgets.length })),
               (mixed || hiddenByScope > 0 || (ds && sourceIds.some(id => id !== ds.id))) && h('div', { className: 'n2s-seg small', role: 'group', 'aria-label': t('dash.scope') },
                 ['all', 'current'].map(v => h('button', { key: v, type: 'button', 'aria-pressed': scope === v, disabled: v === 'current' && !ds, onClick: () => setScope(v) }, v === 'all' ? t('dash.scopeAll') : fmt(t, 'dash.scopeCurrent', { name: ds?.name ?? '' }))))),
-            showSource && h('div', { className: 'n2s-faint n2s-small' }, fmt(t, 'dash.sources', { list: sourceIds.map(id => dsById.get(id)?.name ?? t('dash.sourceMissingShort')).join('、') })),
+            showSource && h('div', { className: 'n2s-faint n2s-small' }, fmt(t, 'dash.sources', { list: sourceIds.map(id => dsById.get(id)?.name ?? t('dash.sourceMissingShort')).join(uiLang === 'zh' ? '、' : ', ') })),
             h('div', { className: 'n2s-faint n2s-small', role: 'status', 'aria-live': 'polite' },
               loadingN > 0 ? fmt(t, 'dash.loadingN', { n: loadingN }) : lastAt ? fmt(t, 'dash.lastRefresh', { time: new Date(lastAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' }) }) : '',
               cachedN > 0 && loadingN === 0 ? h('span', null, ' · ', h('button', { type: 'button', className: 'n2s-link', title: t('dash.cachedHint'), onClick: () => setTick(x => x + 1) }, fmt(t, 'dash.cachedN', { n: cachedN }))) : null,
@@ -4715,7 +4756,7 @@ window.__ModuleLoader__.load({
           h('span', { className: 'n2s-wf-bar' }, h('span', { className: `n2s-wf-fill ${it.delta > 0 ? 'up' : it.delta < 0 ? 'down' : ''}`, style: { width: `${Math.max(2, Math.abs(it.delta) / max * 100)}%` } })),
           h('span', { className: 'n2s-wf-num' }, `${it.delta >= 0 ? '+' : ''}${formatCompact(it.delta)}`),
           h('span', { className: 'n2s-wf-share n2s-faint' }, it.share === null || Math.abs(it.share) > 3 ? '' : `${Math.round(it.share * 100)}%`)))),
-        why.dimensions.filter(d => !d.attribution).length > 0 && h('div', { className: 'n2s-faint n2s-small' }, `${t('drill.failedDims')}：${why.dimensions.filter(d => !d.attribution).map(d => d.dimension).join('、')}`))
+        why.dimensions.filter(d => !d.attribution).length > 0 && h('div', { className: 'n2s-faint n2s-small' }, `${colon(t('drill.failedDims'))}${why.dimensions.filter(d => !d.attribution).map(d => d.dimension).join(uiLang === 'zh' ? '、' : ', ')}`))
     }
 
     // ------------------------------------------------------------ alerts
@@ -4871,7 +4912,7 @@ window.__ModuleLoader__.load({
           h('div', { className: 'n2s-row' }, h('strong', null, fmt(t, 'sc.title', { count: c.changes.length, time: new Date(c.at).toLocaleString([], { month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' }) })), h('span', { className: 'n2s-grow' }),
             h('button', { type: 'button', className: 'n2s-btn small', onClick: async () => { await call('ackSchemaChange', { id: c.id }); list.reload() } }, t('sc.ack'))),
           h('div', { className: 'n2s-small', style: { marginTop: 4 } }, c.changes.slice(0, 8).map(x => `${kindLabel(x.kind)} ${x.table}${x.column ? `.${x.column}` : ''}${x.detail ? `（${x.detail}）` : ''}`).join('；')),
-          c.impacts.length > 0 && h('div', { className: 'n2s-small', style: { marginTop: 4 } }, h('strong', null, `${t('sc.impacts')}：`), c.impacts.slice(0, 8).map(i => `${t(`sc.imp.${i.kind}`)}「${i.name}」`).join('、')))))
+          c.impacts.length > 0 && h('div', { className: 'n2s-small', style: { marginTop: 4 } }, h('strong', null, `${colon(t('sc.impacts'))}`), c.impacts.slice(0, 8).map(i => `${t(`sc.imp.${i.kind}`)}「${i.name}」`).join(uiLang === 'zh' ? '、' : ', ')))))
     }
 
     // -------------------------------------------------- knowledge io
@@ -4940,7 +4981,7 @@ window.__ModuleLoader__.load({
       if (s.kind === 'example') return h('pre', { className: 'n2s-code', style: { marginTop: 6, maxHeight: 140 } }, prettySql(it.sql ?? ''))
       if (s.kind === 'metric') return h('div', null,
         h('div', { className: 'n2s-mono n2s-small' }, `${it.expression}${it.table ? ` FROM ${it.table}` : ''}${it.filter ? ` WHERE ${it.filter}` : ''}`),
-        (it.timeColumn || it.dimensions?.length) && h('div', { className: 'n2s-muted n2s-small' }, [it.timeColumn && `${t('kb.timeColumn')}: ${it.timeColumn}`, it.dimensions?.length && `${t('kb.dimensions')}: ${it.dimensions.join('、')}`].filter(Boolean).join(' · ')))
+        (it.timeColumn || it.dimensions?.length) && h('div', { className: 'n2s-muted n2s-small' }, [it.timeColumn && `${t('kb.timeColumn')}: ${it.timeColumn}`, it.dimensions?.length && `${t('kb.dimensions')}: ${it.dimensions.join(uiLang === 'zh' ? '、' : ', ')}`].filter(Boolean).join(' · ')))
       if (s.kind === 'note') return h('div', { className: 'n2s-small' }, it.text)
       return h('div', null, h('div', { className: 'n2s-small' }, it.definition), it.sql && h('code', { className: 'n2s-md-code', style: { display: 'inline-block', marginTop: 4 } }, it.sql))
     }
@@ -5046,6 +5087,69 @@ window.__ModuleLoader__.load({
         h('button', { type: 'button', className: 'n2s-btn small ghost', style: { justifySelf: 'start' }, onClick: () => onChange([...rows, { platform: rows[rows.length - 1]?.platform ?? platforms[0], id: '', email: '' }]) }, '+ ', t('mb.ids.add')))
     }
 
+    /**
+     * One-click identity picks: people and groups that already talked to a bot
+     * (recorded by the host, including refused ones), plus the groups a bot is
+     * in (channels whose kind can list targets). No id lookup needed.
+     */
+    function IdentityPicker({ t, kind, catalog, onPick, chosen }) {
+      const seen = useAsync(() => call('listSeenIdentities', { kind }).catch(() => []), [kind])
+      const channels = useChannels()
+      const listable = channels.filter(c => (c.capabilities ?? findKind(catalog, c.type)?.kind?.capabilities)?.listTargets)
+      const [groups, setGroups] = useState(null)
+      const [loadingGroups, setLoadingGroups] = useState(false)
+      const loadGroups = async () => {
+        setLoadingGroups(true)
+        const out = []
+        for (const c of listable) {
+          try { for (const g of await call('listChannelTargets', { id: c.id })) out.push({ platform: c.platform, kind: 'chat', id: String(g.id), name: g.name, via: c.name }) } catch (e) { notifyError(e) }
+        }
+        setGroups(out); setLoadingGroups(false)
+      }
+      useEffect(() => { if (kind === 'chat' && listable.length && groups === null) loadGroups() }, [kind, listable.length])
+      const isChosen = (x) => chosen.some(r => r.platform === x.platform && r.id === x.id)
+      const items = [...(seen.value ?? [])]
+      if (kind === 'chat') for (const g of groups ?? []) if (!items.some(x => x.platform === g.platform && x.id === g.id)) items.push(g)
+      const label = (x) => x.name || x.chatName || x.email || x.id
+      return h('div', { className: 'n2s-field full n2s-idpicker' },
+        h('div', { className: 'n2s-row' },
+          h('span', { className: 'n2s-flabel' }, kind === 'chat' ? t('mb.pick.chats') : t('mb.pick.people')),
+          h('span', { className: 'n2s-grow' }),
+          kind === 'chat' && listable.length > 0 && h('button', { type: 'button', className: 'n2s-link n2s-small', disabled: loadingGroups, onClick: loadGroups }, loadingGroups ? h('span', { className: 'n2s-spin' }) : Icon.refresh(12), t('mb.pick.refresh'))),
+        seen.loading && !seen.value ? h('div', { className: 'n2s-skel', style: { height: 34 } }) :
+          items.length === 0
+            ? h('div', { className: 'n2s-faint n2s-small' }, kind === 'chat' ? t('mb.pick.noChats') : t('mb.pick.noPeople'))
+            : h('div', { className: 'n2s-pickchips', role: 'list' }, items.slice(0, 30).map(x => {
+              const taken = x.memberId && !isChosen(x)
+              return h('button', {
+                key: `${x.platform}:${x.id}`, type: 'button', role: 'listitem', className: 'n2s-pickchip', 'aria-pressed': isChosen(x), disabled: Boolean(taken),
+                title: [`${platformName(t, x.platform, catalog)} · ${x.id}`, x.email, x.via ? fmt(t, 'mb.pick.via', { name: x.via }) : '', taken ? fmt(t, 'mb.pick.taken', { name: x.memberName }) : '', x.refused ? t('mb.pick.refused') : ''].filter(Boolean).join('\n'),
+                onClick: () => onPick(x),
+              },
+              h(PlatformMark, { t, platform: x.platform, size: 16 }),
+              h('span', { className: 'n2s-pickchip-name' }, label(x)),
+              x.refused && !x.memberId && h('span', { className: 'n2s-badge warn' }, t('mb.pick.pending')),
+              taken && h('span', { className: 'n2s-faint' }, t('mb.pick.added')),
+              x.lastAt && h('span', { className: 'n2s-faint' }, shortTime(x.lastAt)))
+            })),
+        h('div', { className: 'n2s-faint n2s-small' }, kind === 'chat' ? t('mb.pick.chatsHint') : t('mb.pick.peopleHint')))
+    }
+
+    /** People / groups refused by a bot because they are not members yet: add with one click. */
+    function PendingMembers({ t, onAdd }) {
+      const seen = useAsync(() => call('listSeenIdentities', {}).catch(() => []), [])
+      const { catalog } = useCatalog(t)
+      const pending = (seen.value ?? []).filter(x => x.refused && !x.memberId).slice(0, 6)
+      if (!pending.length) return null
+      return h('div', { className: 'n2s-notice warn n2s-pending', role: 'status', style: { marginBottom: 12 } },
+        h('div', { style: { marginBottom: 6 } }, fmt(t, 'mb.pending.title', { n: pending.length })),
+        h('div', { className: 'n2s-pickchips' }, pending.map(x => h('button', { key: `${x.platform}:${x.kind}:${x.id}`, type: 'button', className: 'n2s-pickchip', onClick: () => onAdd(x), title: `${platformName(t, x.platform, catalog)} · ${x.id}` },
+          h(PlatformMark, { t, platform: x.platform, size: 16 }),
+          h('span', { className: 'n2s-pickchip-name' }, x.name || x.chatName || x.id),
+          h('span', { className: 'n2s-faint' }, x.kind === 'chat' ? t('mb.kind2.chat') : t('mb.kind2.person')),
+          h('span', { className: 'n2s-link' }, t('mb.pending.add'))))))
+    }
+
     function IdentityChips({ t, u, catalog }) {
       const ids = identitiesOf(u)
       if (!ids.length) return h('span', { className: 'n2s-badge warn' }, t('mb.ids.none'))
@@ -5053,11 +5157,11 @@ window.__ModuleLoader__.load({
         h(PlatformMark, { t, platform: x.platform, size: 16 }), h('span', { className: 'n2s-mono' }, x.id || x.email))))
     }
 
-    function UserForm({ t, initial, datasources, onDone, onCancel }) {
+    function UserForm({ t, initial, prefill, datasources, onDone, onCancel }) {
       const { catalog } = useCatalog(t)
       const [form, setForm] = useState(() => {
-        const base = { kind: 'person', name: '', role: 'analyst', allDatasources: initial ? initial.datasourceIds === null : false, datasourceIds: [], note: '', ...(initial ?? {}) }
-        const ids = identitiesOf(initial)
+        const base = { kind: prefill?.kind ?? 'person', name: prefill ? (prefill.name || prefill.chatName || '') : '', role: 'analyst', allDatasources: initial ? initial.datasourceIds === null : false, datasourceIds: [], note: '', ...(initial ?? {}) }
+        const ids = prefill ? [{ platform: prefill.platform, id: prefill.id, ...(prefill.kind === 'person' && prefill.email ? { email: prefill.email } : {}) }] : identitiesOf(initial)
         return { ...base, identities: ids.length ? ids : [{ platform: 'lark', id: '', email: '' }] }
       })
       const [error, setError] = useState(null)
@@ -5089,6 +5193,11 @@ window.__ModuleLoader__.load({
           h('div', { className: 'n2s-field full' }, h('span', { id: 'n2s-mb-kind' }, t('mb.kind')), h('div', { className: 'n2s-seg', role: 'group', 'aria-labelledby': 'n2s-mb-kind', style: { justifySelf: 'start' } }, ['person', 'chat'].map(v => h('button', { key: v, type: 'button', 'aria-pressed': form.kind === v, disabled: Boolean(initial?.id), onClick: () => setForm(f => ({ ...f, kind: v })) }, t(`mb.kind2.${v}`))))),
           h('label', { className: 'n2s-field' }, h('span', null, t('im.name')), h('input', { className: 'n2s-input', value: form.name, onChange: set('name') })),
           h('label', { className: 'n2s-field' }, h('span', null, t('mb.role')), h('select', { className: 'n2s-select', value: form.role, onChange: set('role') }, ['admin', 'analyst', 'viewer'].map(r => h('option', { key: r, value: r }, t(`mb.role.${r}`)))), h('span', { className: 'n2s-faint n2s-small' }, t(`mb.roleHint.${form.role}`))),
+          !initial?.id && h(IdentityPicker, { t, kind: form.kind, catalog, chosen: form.identities, onPick: (x) => setForm(f => {
+            const exists = f.identities.some(r => r.platform === x.platform && r.id === x.id)
+            const rows = exists ? f.identities.filter(r => !(r.platform === x.platform && r.id === x.id)) : [...f.identities.filter(r => r.id || r.email), { platform: x.platform, id: x.id, ...(f.kind === 'person' && x.email ? { email: x.email } : {}) }]
+            return { ...f, identities: rows.length ? rows : [{ platform: x.platform, id: '', email: '' }], name: f.name || (exists ? f.name : (x.name || x.chatName || '')) }
+          }) }),
           h(IdentityEditor, { t, kind: form.kind, rows: form.identities, catalog, errors: idErrors, onChange: (rows) => { setForm(f => ({ ...f, identities: rows })); setIdErrors({}) } }),
           h('div', { className: 'n2s-field full' }, h('span', null, t('mb.scope')),
             h('label', { className: 'n2s-check' }, h('input', { type: 'checkbox', checked: form.allDatasources, onChange: set('allDatasources') }), t('mb.allDs')),
@@ -5179,7 +5288,8 @@ window.__ModuleLoader__.load({
       return h('div', null,
         h(SectionHead, { title: t('tab.members'), desc: t('mb.hint') }, h('button', { type: 'button', className: 'n2s-btn primary', onClick: () => setEditing({}) }, '+ ', t('mb.add'))),
         h(BotsOverview, { t }),
-        editing && h(UserForm, { key: editing.id ?? 'new', t, datasources, initial: editing.id ? editing : null, onCancel: () => setEditing(null), onDone: () => { setEditing(null); users.reload() } }),
+        !editing && h(PendingMembers, { t, onAdd: (x) => setEditing({ prefill: x }) }),
+        editing && h(UserForm, { key: editing.id ?? (editing.prefill ? `p:${editing.prefill.id}` : 'new'), t, datasources, prefill: editing.prefill, initial: editing.id ? editing : null, onCancel: () => setEditing(null), onDone: () => { setEditing(null); users.reload() } }),
         settings.value && h('div', { className: 'n2s-setnote', style: { marginBottom: 10 } },
           t('mb.default'), ' ', h('strong', null, t(`mb.defaultRole.${settings.value.botDefaultRole ?? settings.value.larkDefaultRole ?? 'none'}`)), ' · ',
           h('button', { type: 'button', className: 'n2s-link', onClick: () => fbCtx.navigate?.({ tab: 'admin', section: 'settings' }) }, t('set.changeInSettings'))),
@@ -5191,7 +5301,7 @@ window.__ModuleLoader__.load({
               h('div', { className: 'n2s-grow', style: { minWidth: 0 } },
                 h('div', { className: 'n2s-row', style: { gap: 6 } }, h('span', { className: 'n2s-list2-title' }, u.name), h('span', { className: 'n2s-badge' }, t(`mb.role.${u.role}`)), u.disabled && h('span', { className: 'n2s-badge err' }, t('mb.disabled'))),
                 h('div', { className: 'n2s-row', style: { gap: 6, marginTop: 4 } }, h(IdentityChips, { t, u, catalog }), h('span', { className: 'n2s-muted n2s-small' }, u.datasourceIds === null ? t('mb.allDs') : (u.datasourceNames ?? []).join(uiLang === 'zh' ? '、' : ', ') || t('mb.noDs'))),
-                (u.rowRules ?? []).length > 0 && h('div', { className: 'n2s-list2-sub' }, `${t('mb.rowRules')}：${u.rowRules.map(r => `${r.column} ∈ {${r.values.join(', ')}}`).join('；')}`)),
+                (u.rowRules ?? []).length > 0 && h('div', { className: 'n2s-list2-sub' }, `${colon(t('mb.rowRules'))}${u.rowRules.map(r => `${r.column} ∈ {${r.values.join(', ')}}`).join('；')}`)),
               h('div', { className: 'n2s-list2-side' }, h('span', { className: 'n2s-small' }, us ? fmt(t, 'mb.queries', { n: us.queries }) : t('mb.noUsage')), us?.lastAt && h('span', { className: 'n2s-faint n2s-small' }, new Date(us.lastAt).toLocaleDateString())),
               h(Dropdown, { label: fmt(t, 'ch.actionsFor', { name: u.name }), trigger: { content: Icon.more() }, items: [
                 { label: t('ds.edit'), icon: Icon.edit(14), onClick: () => setEditing(u) },
@@ -5759,7 +5869,7 @@ window.__ModuleLoader__.load({
             h('table', { className: 'n2s-table' }, h('thead', null, h('tr', null, [t('set.section'), t('set.toAdd'), t('set.toUpdate'), t('set.note')].map((x, i) => h('th', { key: i }, x)))),
               h('tbody', null, Object.entries(importState.dry?.report ?? {}).map(([k, r]) => h('tr', { key: k },
                 h('td', null, t(`set.sec.${k}`)), h('td', null, r.add ?? r.added ?? 0), h('td', null, r.update ?? r.updated ?? 0),
-                h('td', { className: 'n2s-muted n2s-small', style: { whiteSpace: 'normal' } }, [r.needsSecret?.length ? fmt(t, 'set.needsSecret', { names: r.needsSecret.join('、') }) : '', r.paused ? t('set.reportsPaused') : '', r.skipped ? fmt(t, 'set.skipped', { n: r.skipped }) : ''].filter(Boolean).join('；')))))),
+                h('td', { className: 'n2s-muted n2s-small', style: { whiteSpace: 'normal' } }, [r.needsSecret?.length ? fmt(t, 'set.needsSecret', { names: r.needsSecret.join(uiLang === 'zh' ? '、' : ', ') }) : '', r.paused ? t('set.reportsPaused') : '', r.skipped ? fmt(t, 'set.skipped', { n: r.skipped }) : ''].filter(Boolean).join('；')))))),
             h('div', { className: 'n2s-row', style: { marginTop: 14, justifyContent: 'flex-end' } },
               h('button', { type: 'button', className: 'n2s-btn ghost', onClick: () => setImportState(null) }, t('ds.cancel')),
               h('button', { type: 'button', className: 'n2s-btn danger', onClick: () => doImport('replace') }, t('kb.replace')),
@@ -5775,7 +5885,7 @@ window.__ModuleLoader__.load({
         row('dataDir', v?.dataDir, true),
         row('runtime', v ? `Node ${v.nodeVersion} · SQLite ${v.sqliteVersion}` : null),
         row('tests', v?.testsCommand, true),
-        row('docs', 'DEVELOPMENT.md'))))
+        row('docs', 'github.com/hedeqiang/dsh-nl2sql'))))
     }
 
     // ------------------------------------------------------------ apply

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hedeqiang/dsh-nl2sql",
-  "version": "0.11.2",
-  "description": "Data Q&A (NL2SQL) for DeepSeek Harness: ask MySQL / PostgreSQL / Elasticsearch / CSV in plain language, charts, dashboards, alerts, IM push and bots (Lark/Feishu, Telegram, WeCom, DingTalk), access control.",
+  "version": "0.12.1",
+  "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",
   "exports": {
     ".": "./index.js",
@@ -29,10 +29,10 @@
     "locale/*.json",
     "icon.svg",
     "README.md",
-    "README.en.md",
     "LICENSE",
     "CHANGELOG.md",
-    "docs/CHANNELS.md"
+    "README.zh-CN.md",
+    "docs/channels.md"
   ],
   "dependencies": {
     "@larksuiteoapi/node-sdk": "1.76.0",
@@ -93,5 +93,9 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "homepage": "https://github.com/hedeqiang/dsh-nl2sql#readme",
+  "bugs": {
+    "url": "https://github.com/hedeqiang/dsh-nl2sql/issues"
   }
 }

package/service/access.js

@@ -99,7 +99,7 @@ export const methods = {
   /**
    * Members: people and group chats on IM platforms, each with a role
    * (admin | analyst | viewer), a data source scope and platform-scoped
-   * identities [{ platform, id, email? }] (see docs/CHANNELS.md). The local
+   * identities [{ platform, id, email? }] (see docs/channels.md). The local
    * owner is implicit. Bot messages from unknown people fall back to
    * settings.botDefaultRole (none = refuse).
    */
@@ -212,6 +212,43 @@ export const methods = {
     }
   },
 
+  /**
+   * Remember an IM identity that talked to a bot (refused or not), so admins can
+   * add it as a member with one click instead of looking up ids. Bounded list,
+   * most recent first; keyed by (platform, kind, id).
+   */
+  noteSeenIdentity({ platform, kind, id, name, email, chatName, channelId, refused }) {
+    if (!platform || !id) return
+    this.state.seenIdentities ??= []
+    const list = this.state.seenIdentities
+    const key = `${platform}:${kind}:${id}`
+    const i = list.findIndex(x => `${x.platform}:${x.kind}:${x.id}` === key)
+    const prev = i >= 0 ? list.splice(i, 1)[0] : {}
+    list.unshift({ ...prev, platform, kind, id: String(id), ...(name ? { name: String(name).slice(0, 60) } : {}), ...(email ? { email: String(email).slice(0, 200) } : {}), ...(chatName ? { chatName: String(chatName).slice(0, 80) } : {}), ...(channelId ? { channelId } : {}), lastAt: Date.now(), count: (prev.count ?? 0) + 1, refused: Boolean(refused) })
+    if (list.length > 200) list.length = 200
+  },
+
+  /**
+   * People and group chats that talked to a bot recently, for the member form:
+   * [{ platform, kind:'person'|'chat', id, name?, email?, chatName?, lastAt, count, refused, memberId? }].
+   * `memberId` is set when the identity already belongs to a member.
+   */
+  listSeenIdentities({ kind, platform } = {}) {
+    const users = (this.state.users ?? []).map(u => normalizeUserRecord(u))
+    // Group chats seen in bot conversations count too (older data has no seen list).
+    const seen = [...(this.state.seenIdentities ?? [])]
+    for (const c of Object.values(this.state.botConversations ?? {})) {
+      if (c.chatType === 'group' && c.chatId && !seen.some(x => x.kind === 'chat' && x.platform === c.platform && x.id === String(c.chatId))) seen.push({ platform: c.platform ?? 'lark', kind: 'chat', id: String(c.chatId), chatName: c.chatName, name: c.chatName, lastAt: c.lastAt ?? c.createdAt, count: 1, refused: false })
+    }
+    return seen
+      .filter(x => (!kind || x.kind === kind) && (!platform || x.platform === platform))
+      .map(x => {
+        const owner = users.find(u => u.kind === x.kind && u.identities.some(i => i.platform === x.platform && i.id === x.id))
+        return { ...x, ...(owner ? { memberId: owner.id, memberName: owner.name } : {}) }
+      })
+      .sort((a, b) => (b.lastAt ?? 0) - (a.lastAt ?? 0))
+  },
+
   /** Back-compat alias of resolveActor for Lark. */
   resolveLarkActor({ openId, email, name, chatId, chatType }) {
     return this.resolveActor({ platform: 'lark', userId: openId, email, name, chatId, chatType })

package/service/bots.js

@@ -1,5 +1,5 @@
 /**
- * Nl2SqlService methods: inbound IM bots (see docs/CHANNELS.md).
+ * Nl2SqlService methods: inbound IM bots (see docs/channels.md).
  * Mixed into the service prototype by index.js; `this` is the service.
  *
  * Every channel whose kind has `capabilities.bot` may carry
@@ -279,10 +279,15 @@ export const methods = {
     const name = label(platform)
     const userId = m.sender?.id != null ? String(m.sender.id) : undefined
     const resolved = this.resolveActor({ platform, userId, email: m.sender?.email, name: m.sender?.name, chatId: m.chatId != null ? String(m.chatId) : m.chatId, chatType: m.chatType })
-    if (resolved.refused) { await reply(resolved.refused); return }
+    // Remember who/which group talked to the bot: the member form offers them as one-click picks.
+    let chatName
+    if (m.chatType === 'group') { try { chatName = typeof m.chatName === 'function' ? await m.chatName() : m.chatName } catch {} }
+    if (userId) this.noteSeenIdentity({ platform, kind: 'person', id: userId, name: m.sender?.name, email: m.sender?.email, channelId: m.channelId, refused: Boolean(resolved.refused) })
+    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|数据源|切换数据源|切换|新对话|reset|start)\s*(.*)$/i)
+    const cmd = text.match(/^\/?(帮助|help|数据源|切换数据源|切换|自动|auto|新对话|reset|start)\s*(.*)$/i)
     // 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 ?? []])
@@ -292,23 +297,35 @@ export const methods = {
     this.state.botConversations ??= {}
     const convs = this.state.botConversations
     const conv = convs[key] ?? { key, channelId: m.channelId ?? null, platform, chatId: m.chatId, chatType: m.chatType, sessionId: null, datasourceId: actor.defaultDatasourceId, createdAt: Date.now() }
+    if (chatName && !conv.chatName) conv.chatName = chatName
     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 ?? '未选择'}${actor.role === 'viewer' ? '\n你是只读成员：可以查询指标库中的指标、已验证的常见问题和看板。' : ''}`); return }
-      if (verb === '数据源') { await reply(`可用数据源：${allowedDs.map(d => d.name).join('、') || '无'}\n当前：${this.findDatasource(conv.datasourceId)?.name ?? '未选择'}`); return }
+      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 target = allowedDs.find(d => d.name === cmd[2].trim() || d.id === cmd[2].trim())
+      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 }
       conv.datasourceId = target.id
+      conv.datasourcePinned = true
       if (conv.sessionId) { this.state.sessions[conv.sessionId] = target.id }
       convs[key] = conv
       await this.save()
-      await reply(`已切换到数据源「${target.name}」。`)
+      await reply(`已切换到数据源「${target.name}」。之后的提问都会查询这个数据源；发送「自动」恢复按问题自动选择。`)
       return
     }
-    const ds = this.findDatasource(conv.datasourceId) ?? allowedDs[0]
+    // Which data source answers: an explicit 切换 wins; otherwise the question picks the most
+    // relevant one among those the member may use (schema + business knowledge), so people
+    // don't need to know data source names. The agent can still switch with nl2sql_datasource.
+    let ds = this.findDatasource(conv.datasourceId) ?? allowedDs[0]
+    let routed = null
+    if (!conv.datasourcePinned && allowedDs.length > 1) {
+      routed = await this.routeDatasource(text, allowedDs).catch(() => null)
+      if (routed?.ds) ds = routed.ds
+    }
     if (!ds) { await reply('没有可访问的数据源，请联系管理员。'); return }
     this.assertAccess(actor, ds)
     if (!this.ctx.get('sessionController')) { await reply('当前 Harness 不支持创建会话（缺少 sessionController）。'); return }
@@ -338,9 +355,17 @@ export const methods = {
         await this.save()
       }
       const where = m.chatType === 'group' ? `群「${conv.chatName ?? m.chatId}」` : '私聊'
-      const prompt = `[${name}${where} · ${actor.name}${actor.role === 'viewer' ? ' · 只读成员' : ''}] ${text}\n\n（回答会以${name}消息发回该聊天：请用简洁的中文 Markdown 写结论，必要时附上查询结果；不要调用 nl2sql_send，也不要向用户提问——有歧义时说明你的假设后直接回答。${actor.role === 'viewer' ? '该成员是只读角色：只能用 nl2sql_metric 查询指标库，或复用 nl2sql_knowledge 中已验证的样例 SQL；不能自由编写 SQL。' : ''}）`
+      const dsLine = allowedDs.length > 1
+        ? (conv.datasourcePinned
+          ? `数据源：${ds.name}（群内已用「切换」指定，请只查询这个数据源）。`
+          : `当前数据源：${ds.name}${routed?.ds ? '（按问题自动选择）' : ''}。该成员可用的数据源：\n${await this.datasourceCatalog(allowedDs)}\n请先判断问题属于哪个数据源：若不是当前数据源，先用 nl2sql_datasource action=use 切换再查询；在回答开头注明使用的数据源。`)
+        : `数据源：${ds.name}。`
+      const prompt = `[${name}${where} · ${actor.name}${actor.role === 'viewer' ? ' · 只读成员' : ''}] ${text}\n\n（${dsLine}\n回答会以${name}消息发回该聊天：请用简洁的中文 Markdown 写结论，必要时附上查询结果；不要调用 nl2sql_send，也不要向用户提问——有歧义时说明你的假设后直接回答。${actor.role === 'viewer' ? '该成员是只读角色：只能用 nl2sql_metric 查询指标库，或复用 nl2sql_knowledge 中已验证的样例 SQL；不能自由编写 SQL。' : ''}）`
       const requestId = platform === 'lark' ? `lark-${m.messageId}` : `${platform}-${m.chatId}-${m.messageId}`
+      if (conv.sessionId && this.state.sessions[conv.sessionId] !== ds.id) { this.state.sessions[conv.sessionId] = ds.id; await this.save() }
       const turn = await this.runAgentTurn({ sessionId: conv.sessionId, title: `${name} · ${conv.chatName ?? actor.name}`, requestId, text: prompt, prepare, timeoutMs: 600000 })
+      const usedDs = this.findDatasource(this.state.sessions[conv.sessionId]) ?? ds
+      if (usedDs.id !== conv.datasourceId) { conv.datasourceId = usedDs.id; convs[key] = conv }
       let body = turn.text
       if (turn.reason === 'timeout') body = `${body ? `${body}\n\n` : ''}<font color='grey'>（查询超过 10 分钟仍未完成，已停止。请缩小范围后重试。）</font>`
       if (turn.reason === 'input-required') body = `${body ? `${body}\n\n` : ''}<font color='grey'>（需要在 Harness 中确认后才能继续，已取消本次回答。）</font>`
@@ -350,7 +375,7 @@ export const methods = {
       let status = turn.reason === 'idle' ? 'ok' : 'error'
       let error = turn.reason === 'idle' ? undefined : turn.reason
       try {
-        await m.reply({ title: text.length > 40 ? `${text.slice(0, 40)}…` : text, text: body || '（没有生成文字回答）', results: shown, footer: `数据问答 · ${ds.name} · ${actor.name}` })
+        await m.reply({ title: text.length > 40 ? `${text.slice(0, 40)}…` : text, text: body || '（没有生成文字回答）', results: shown, footer: `数据问答 · ${usedDs.name} · ${actor.name}` })
       } catch (e) {
         status = 'error'
         error = e.message
@@ -362,6 +387,48 @@ export const methods = {
     })
   },
 
+  /**
+   * Pick the data source a question is about, among `candidates`, only on
+   * strong evidence: the question names the source (name / database /
+   * description), or it matches that source's business knowledge (verified
+   * examples, metrics, glossary). Schema keyword overlap alone is too weak
+   * (English table names vs Chinese questions), so otherwise returns null and
+   * the agent chooses from the catalog in the prompt.
+   */
+  async routeDatasource(question, candidates) {
+    const q = String(question ?? '').toLowerCase()
+    const scored = candidates.map(d => {
+      const named = [d.name, d.database, d.description].filter(x => x && String(x).length >= 2).some(x => q.includes(String(x).toLowerCase()))
+      let know = 0
+      try {
+        const f = this.searchKnowledge(d.id, question, 5)
+        know = Math.max(0, ...f.examples.map(x => x.score), ...f.metrics.map(x => x.score), ...f.glossary.map(x => x.score))
+      } catch {}
+      return { ds: d, score: (named ? 2 : 0) + know }
+    }).sort((a, b) => b.score - a.score)
+    const [top, second] = scored
+    if (!top || top.score < 0.5) return null
+    return top.score - (second?.score ?? 0) >= 0.3 ? { ds: top.ds, score: top.score } : null
+  },
+
+  /** One line per data source for the bot prompt: name, type, description and main tables. */
+  async datasourceCatalog(list) {
+    const lines = []
+    for (const d of list) {
+      let tables = ''
+      try {
+        const schema = this.schemas.get(d.id) ?? await this.readSchemaFile(d.id)
+        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)
+          tables = `；主要表：${top.map(t => `${t.name}${t.comment ? `(${String(t.comment).split(/[\s,，。;；(（]/)[0].slice(0, 12)})` : ''}`).join(', ')}${schema.tables.length > 12 ? ` 等 ${schema.tables.length} 张` : ''}`
+        }
+      } catch {}
+      lines.push(`- ${d.name}（${d.type ?? 'mysql'}${d.database ? ` · ${d.database}` : ''}）${d.description ? `：${d.description.slice(0, 60)}` : ''}${tables}`)
+    }
+    return lines.join('\n')
+  },
+
   /** Run tasks with the same key one after another. */
   serialize(key, task) {
     this.queues ??= new Map()

package/service/channels.js

@@ -1,5 +1,5 @@
 /**
- * Nl2SqlService methods: IM channels (see docs/CHANNELS.md).
+ * Nl2SqlService methods: IM channels (see docs/channels.md).
  * Mixed into the service prototype by index.js; `this` is the service.
  *
  * A channel record (state.channels[]):

package/service/suggestions.js

@@ -14,7 +14,7 @@ import { admitSql, lexSql } from '../sql-guard.js'
 import { textGrams } from './schema.js'
 import { SENSITIVE_NAME, UserError, hashText } from './shared.js'
 
-/** Thresholds (see DEVELOPMENT.md). */
+/** Thresholds (see docs/development.md). */
 export const SUGGEST = {
   shapeMin: 2, // agent queries with the same literal-free shape
   metricMin: 3, // distinct successful queries using the same aggregate + filter on one table